rpms/xinetd/devel xinetd-2.3.14-ipv6confusion.patch, NONE, 1.1 xinetd.spec, 1.68, 1.69

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9185

Modified Files:
	xinetd.spec 
Added Files:
	xinetd-2.3.14-ipv6confusion.patch 
Log Message:
Corrected port parsing code (IPv4 and IPv6 were switched)
Commented patches I'm familiar with in spec file


xinetd-2.3.14-ipv6confusion.patch:
 ident.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xinetd-2.3.14-ipv6confusion.patch ---
--- xinetd-2.3.14/xinetd/ident.c.jw	2010-03-10 17:49:53.000000000 +1100
+++ xinetd-2.3.14/xinetd/ident.c	2010-03-10 17:50:30.000000000 +1100
@@ -108,12 +108,12 @@
    memcpy( &sin_bind, &sin_local, sizeof(sin_bind) ) ;
    local_port = 0;
    remote_port = 0;
-   if( sin_remote.sa.sa_family == AF_INET ) {
+   if( sin_remote.sa.sa_family == AF_INET6 ) {
       local_port = ntohs( sin_local.sa_in6.sin6_port ) ;
       remote_port = ntohs( sin_remote.sa_in6.sin6_port ) ;
       sin_contact.sa_in6.sin6_port = htons( IDENTITY_SERVICE_PORT ) ;
       sin_bind.sa_in.sin_port = 0 ;
-   } else if( sin_remote.sa.sa_family == AF_INET6 ) {
+   } else if( sin_remote.sa.sa_family == AF_INET ) {
       local_port = ntohs( sin_local.sa_in.sin_port ) ;
       remote_port = ntohs( sin_remote.sa_in.sin_port ) ;
       sin_contact.sa_in.sin_port = htons( IDENTITY_SERVICE_PORT ) ;


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- xinetd.spec	19 Mar 2010 08:08:32 -0000	1.68
+++ xinetd.spec	19 Mar 2010 08:50:56 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -19,11 +19,23 @@ Patch6: xinetd-2.3.14-man-section.patch
 Patch7: xinetd-2.3.11-PIE.patch
 Patch8: xinetd-2.3.14-ident-bind.patch
 Patch9: xinetd-2.3.14-readable-debuginfo.patch
+# Patch for clean reconfiguration using newer versions of autotools
 Patch10: xinetd-2.3.14-autoconf.patch
+# Completely rewritten socket handling code (it uses poll() instead 
+# of select() function)
 Patch11: xinetd-2.3.14-poll.patch
+# New configuration option (limit for files opened by child process)
 Patch12: xinetd-2.3.14-file-limit.patch
+# When using tcpmux, xinetd ended up with sigsegv
+# (detection of NULL pointer in pollfd structure was missing)
 Patch13: xinetd-2.3.14-tcpmux.patch
+# When service is destroyed, destroy also its
+# file descriptor in array given to poll function
 Patch14: xinetd-2.3.14-clean-pfd.patch
+# xinetd confuses ipv6 and ipv4 port parsing
+# - furtunately, they have the same format, so everything
+#   works even without this patch
+Patch15: xinetd-2.3.14-ipv6confusion.patch
 
 BuildRequires: autoconf, automake
 BuildRequires: libselinux-devel >= 1.30
@@ -66,6 +78,7 @@ located in the /etc/xinetd.d directory.
 %patch12 -p1 -b .file-limit
 %patch13 -p1 -b .tcpmux
 %patch14 -p1 -b .clean-pfd
+%patch15 -p1 -b .ipv6confusion
 
 aclocal
 autoconf
@@ -125,6 +138,10 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Fri Mar 19 2010 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-31
+- corrected port parsing code (IPv4 and IPv6 were switched)
+- commented patches I'm familiar with in spec file
+
 * Fri Mar 19 2010 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-30
 - fixed flooding log with error messages when disabled service at runtime
 - updated release number to 30 to prevent rpm from detecting this as downgrade