rpms/bind/devel bind-9.3.2-bz177854.patch, NONE, 1.1 bind.spec, 1.86, 1.87

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5511

Modified Files:
	bind.spec 
Added Files:
	bind-9.3.2-bz177854.patch 
Log Message:
fix bug 177854

bind-9.3.2-bz177854.patch:
 ifiter_ioctl.c |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

--- NEW FILE bind-9.3.2-bz177854.patch ---
--- bind-9.3.2/lib/isc/unix/ifiter_ioctl.c.bz177854	2005-10-13 21:13:07.000000000 -0500
+++ bind-9.3.2/lib/isc/unix/ifiter_ioctl.c	2006-01-16 17:50:37.000000000 -0500
@@ -50,7 +50,7 @@
 #define VALID_IFITER(t)		ISC_MAGIC_VALID(t, IFITER_MAGIC)
 
 #define ISC_IF_INET6_SZ \
-    sizeof("00000000000000000000000000000001 01 80 10 80 XXXXXXloXXXXXXXX\n")
+    sizeof("0000:0000:0000:0000:0000:0000:0000:0001 01 80 10 80 XXXXXXloXXXXXXXX\n")
 
 struct isc_interfaceiter {
 	unsigned int		magic;		/* Magic number. */
@@ -463,11 +463,21 @@
 	res = sscanf(iter->entry, "%32[a-f0-9] %x %x %x %x %16s\n",
 		     address, &ifindex, &prefix, &flag3, &flag4, name);
 	if (res != 6) {
-		isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
-			      ISC_LOGMODULE_INTERFACE, ISC_LOG_ERROR,
-			      "/proc/net/if_inet6:sscanf() -> %d (expected 6)",
-			      res);
-		return (ISC_R_FAILURE);
+		/* temporary fix to deal with broken kernel-2.6.15-1854+ : */
+		res = sscanf(iter->entry, 
+			     "%4[a-f0-9]:%4[a-f0-9]:%4[a-f0-9]:%4[a-f0-9]:"
+                             "%4[a-f0-9]:%4[a-f0-9]:%4[a-f0-9]:%4[a-f0-9] %x %x %x %x %16s\n",
+			     &(address[0]),&(address[4]),&(address[8]),&(address[12]),
+			     &(address[16]),&(address[20]),&(address[24]),&(address[28]),
+			     &ifindex, &prefix, &flag3, &flag4, name);
+		if ( res != 13 )
+		{
+			isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
+				      ISC_LOGMODULE_INTERFACE, ISC_LOG_ERROR,
+				      "/proc/net/if_inet6:sscanf() -> %d (expected 6)",
+				      res);
+			return (ISC_R_FAILURE);
+		}
 	}
 	if (strlen(address) != 32) {
 		isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- bind.spec	21 Dec 2005 21:35:59 -0000	1.86
+++ bind.spec	16 Jan 2006 23:34:34 -0000	1.87
@@ -9,7 +9,7 @@
 Name: bind
 License: BSD-like
 Version: 9.3.2
-Release: 1
+Release: 2
 Epoch:   30
 Url: http://www.isc.org/products/BIND/
 Buildroot: %{_tmppath}/%{name}-root
@@ -62,6 +62,7 @@
 Patch26: bind-9.3.1-flush-cache.patch
 Patch27: bind-9.3.1-dbus_restart.patch
 Patch28: bind-9.3.2rc1-dbus-0.6.patch
+Patch29: bind-9.3.2-bz177854.patch
 Requires(pre,preun): shadow-utils
 Requires(post,preun): chkconfig
 Requires(post): textutils, fileutils, sed, grep
@@ -242,6 +243,7 @@
 %patch26 -p1 -b .flush_cache
 %patch27 -p1 -b .dbus_restart
 %patch28 -p1 -b .dbus-0.6
+%patch29 -p1 -b .bz177854
 #
 # this must follow all dbus patches:
 %if %{WITH_DBUS}
@@ -750,6 +752,10 @@
 :;
 
 %changelog
+* Mon Jan 16 2006 Jason Vas Dias <jvdias at redhat.com> - 30.9.3.2-2
+- fix bug 177854: temporary fix for broken kernel-2.6.15-1854+ 
+  /proc/net/if_inet6 format
+
 * Wed Dec 21 2005 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-1
 - Upgrade to 9.3.2, released today