rpms/tcp_wrappers/devel tcp_wrappers-7.6-196326.patch, NONE, 1.1 tcp_wrappers.spec, 1.29, 1.30

[Tomas Janousek (tjanouse)]

Author: tjanouse

Update of /cvs/pkgs/rpms/tcp_wrappers/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv956

Modified Files:
	tcp_wrappers.spec 
Added Files:
	tcp_wrappers-7.6-196326.patch 
Log Message:
* Thu Jun 28 2007 Tomas Janousek <tjanouse at redhat.com> - 7.6-48
- dropped the hostname resolving patch
- resolve the address given to hosts_ctl to hostname, if hostname not given
- compare localhost and localhost.localdomain as the same


tcp_wrappers-7.6-196326.patch:

--- NEW FILE tcp_wrappers-7.6-196326.patch ---
--- tcp_wrappers_7.6/hosts_access.c.196326	2007-06-28 13:44:10.000000000 +0200
+++ tcp_wrappers_7.6/hosts_access.c	2007-06-28 15:33:45.000000000 +0200
@@ -346,6 +346,9 @@
 	return (STR_NE(string, unknown));
     } else if (tok[(n = strlen(tok)) - 1] == '.') {	/* prefix */
 	return (STRN_EQ(tok, string, n));
+    } else if ((STR_EQ(tok, "localhost") || STR_EQ(tok, "localhost.localdomain"))
+	    && (STR_EQ(string, "localhost") || STR_EQ(string, "localhost.localdomain"))) {
+	return (YES); /* these localhosts are equivalent */
     } else {					/* exact match */
 #ifdef INET6
 	struct addrinfo hints, *res;


Index: tcp_wrappers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcp_wrappers/devel/tcp_wrappers.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tcp_wrappers.spec	28 Jun 2007 13:28:22 -0000	1.29
+++ tcp_wrappers.spec	28 Jun 2007 13:40:29 -0000	1.30
@@ -31,6 +31,7 @@
 Patch18: tcp_wrappers-7.6-restore_sigalarm.patch
 Patch19: tcp_wrappers-7.6-siglongjmp.patch
 Patch20: tcp_wrappers-7.6-sigchld.patch
+Patch21: tcp_wrappers-7.6-196326.patch
 # required by sin_scope_id in ipv6 patch
 BuildRequires: glibc-devel >= 2.2		
 BuildRoot: %{_tmppath}/%{name}-root
@@ -87,6 +88,7 @@
 %patch18 -p1 -b .restore_sigalarm
 %patch19 -p1 -b .siglongjmp
 %patch20 -p1 -b .sigchld
+%patch21 -p1 -b .196326
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR" LDFLAGS="-pie" MAJOR=%{LIB_MAJOR} MINOR=%{LIB_MINOR} REL=%{LIB_REL} linux
@@ -146,6 +148,7 @@
 * Thu Jun 28 2007 Tomas Janousek <tjanouse at redhat.com> - 7.6-48
 - dropped the hostname resolving patch
 - resolve the address given to hosts_ctl to hostname, if hostname not given
+- compare localhost and localhost.localdomain as the same
 
 * Wed Jun 06 2007 Tomas Janousek <tjanouse at redhat.com> - 7.6-47
 - fix the hostname resolving patch for x86_64