rpms/bind/devel bind-9.3.2-bz173961.patch, 1.1, 1.2 bind.spec, 1.105, 1.106

Wed Apr 19 00:37:19 UTC 2006

Author: jvdias

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

Modified Files:
	bind-9.3.2-bz173961.patch bind.spec 
Log Message:
- apply upstream patch for ncache_adderesult segfault bug 173961 addenda
- fix bug 188382: rpm --verify permissions inconsistencies
- fix bug 189186: use /sbin/service instead of initscript
- rebuild for new gcc, glibc-kernheaders


bind-9.3.2-bz173961.patch:
 resolver.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

Index: bind-9.3.2-bz173961.patch
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-9.3.2-bz173961.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- bind-9.3.2-bz173961.patch	4 Apr 2006 20:53:59 -0000	1.1
+++ bind-9.3.2-bz173961.patch	19 Apr 2006 00:37:16 -0000	1.2
@@ -1,11 +1,56 @@
 --- bind-9.3.2/lib/dns/resolver.c.bz173961	2005-10-13 21:38:48.000000000 -0400
-+++ bind-9.3.2/lib/dns/resolver.c	2006-04-04 14:23:26.000000000 -0400
-@@ -3794,7 +3794,7 @@
- 			result = ISC_R_SUCCESS;
++++ bind-9.3.2/lib/dns/resolver.c	2006-04-18 15:01:15.000000000 -0400
+@@ -3763,23 +3763,28 @@
+ 		  isc_result_t *eresultp)
+ {
+ 	isc_result_t result;
++	dns_rdataset_t rdataset;
++
++	if (ardataset == NULL) {
++		dns_rdataset_init(&rdataset);
++		ardataset = &rdataset;
++	}
+ 	result = dns_ncache_add(message, cache, node, covers, now,
+ 				maxttl, ardataset);
+-	if (result == DNS_R_UNCHANGED) {
++	if ((result == DNS_R_UNCHANGED) || (result == ISC_R_SUCCESS)) {
+ 		/*
+-		 * The data in the cache are better than the negative cache
+-		 * entry we're trying to add.
++		 * If the cache now contains a negative entry and we
++		 * care about whether it is DNS_R_NCACHENXDOMAIN or
++		 * DNS_R_NCACHENXRRSET then extract it.
+ 		 */
+-		if (ardataset != NULL && ardataset->type == 0) {
++		if (ardataset->type == 0) {
+ 			/*
+-			 * The cache data is also a negative cache
+-			 * entry.
++			 * The cache data is a negative cache entry.
+ 			 */
+ 			if (NXDOMAIN(ardataset))
+ 				*eresultp = DNS_R_NCACHENXDOMAIN;
+ 			else
+ 				*eresultp = DNS_R_NCACHENXRRSET;
+-			result = ISC_R_SUCCESS;
+ 		} else {
+ 			/*
+ 			 * Either we don't care about the nature of the
+@@ -3791,14 +3796,11 @@
+ 			 * XXXRTH  There's a CNAME/DNAME problem here.
+ 			 */
+ 			*eresultp = ISC_R_SUCCESS;
+-			result = ISC_R_SUCCESS;
  		}
- 	} else if (result == ISC_R_SUCCESS) {
+-	} else if (result == ISC_R_SUCCESS) {
 -		if (NXDOMAIN(ardataset))
-+	        if ((ardataset != NULL) && NXDOMAIN(ardataset))
- 			*eresultp = DNS_R_NCACHENXDOMAIN;
- 		else
- 			*eresultp = DNS_R_NCACHENXRRSET;
+-			*eresultp = DNS_R_NCACHENXDOMAIN;
+-		else
+-			*eresultp = DNS_R_NCACHENXRRSET;
++		result = ISC_R_SUCCESS;
+ 	}
++	if ((ardataset == &rdataset) && dns_rdataset_isassociated(ardataset))
++		dns_rdataset_disassociate(ardataset);
+ 
+ 	return (result);
+ }


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- bind.spec	14 Apr 2006 01:49:36 -0000	1.105
+++ bind.spec	19 Apr 2006 00:37:16 -0000	1.106
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	20.FC6
+Release: 	22.FC6
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -391,6 +391,7 @@
 touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/rndc.key
 touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/null
 touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/random
+touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/zero
 #end chroot
 make DESTDIR=${RPM_BUILD_ROOT} install
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.conf
@@ -496,13 +497,13 @@
 
 
 %files
-%defattr(0640,root,root,0750)
+%defattr(0640,root,named,0750)
 %dir /var/named
-%defattr(0640,named,named,0750)
+%defattr(0660,named,named,0770)
 %dir /var/named/slaves
 %dir /var/named/data
 %dir /var/run/named
-%defattr(0754,root,root,0755)
+%defattr(0750,root,root,0750)
 %config /etc/rc.d/init.d/named
 %defattr(0640,root,named,0750)
 %config(noreplace) /etc/sysconfig/named
@@ -543,8 +544,8 @@
 %doc doc/README.DBUS
 %attr(644,root,root) %config /etc/dbus-1/system.d/named.conf
 %attr(644,root,root) %config /usr/share/dbus-1/services/named.service
-%attr(754,root,root) %{_sbindir}/namedGetForwarders
-%attr(754,root,root) %{_sbindir}/namedSetForwarders
+%attr(750,root,root) %{_sbindir}/namedGetForwarders
+%attr(750,root,root) %{_sbindir}/namedSetForwarders
 %endif
 
 %files libs
@@ -584,25 +585,25 @@
 
 %files config
 %defattr(0640,root,named,0750)
-%config /etc/named.caching-nameserver.conf
+%config %verify(not link) /etc/named.caching-nameserver.conf
 %ghost %config %{chroot_prefix}/etc/named.caching-nameserver.conf
-%config /etc/named.rfc1912.zones
+%config %verify(not link) /etc/named.rfc1912.zones
 %ghost %config %{chroot_prefix}/etc/named.rfc1912.zones
 %ghost %config(noreplace) /etc/named.conf
 %ghost %config(noreplace) %{chroot_prefix}/etc/named.conf
-%config /var/named/named.ca
+%config %verify(not link) /var/named/named.ca
 %ghost  %config %{chroot_prefix}/var/named/named.ca
-%config /var/named/named.local
+%config %verify(not link) /var/named/named.local
 %ghost  %config %{chroot_prefix}/var/named/named.local
-%config /var/named/localhost.zone
+%config %verify(not link) /var/named/localhost.zone
 %ghost  %config %{chroot_prefix}/var/named/localhost.zone
-%config /var/named/localdomain.zone
+%config %verify(not link) /var/named/localdomain.zone
 %ghost  %config %{chroot_prefix}/var/named/localdomain.zone
-%config /var/named/named.ip6.local
+%config %verify(not link) /var/named/named.ip6.local
 %ghost  %config %{chroot_prefix}/var/named/named.ip6.local
-%config /var/named/named.broadcast
+%config %verify(not link) /var/named/named.broadcast
 %ghost  %config %{chroot_prefix}/var/named/named.broadcast
-%config /var/named/named.zero
+%config %verify(not link) /var/named/named.zero
 %ghost  %config %{chroot_prefix}/var/named/named.zero
 %defattr(0644,root,root,0755)
 %doc Copyright
@@ -689,7 +690,7 @@
 
 %preun
 if [ "$1" = 0 ]; then
-   /etc/rc.d/init.d/named stop >/dev/null 2>&1 || :;
+   /sbin/service named stop >/dev/null 2>&1 || :;
    /sbin/chkconfig --del named || :;
 fi
 :;
@@ -697,7 +698,7 @@
 %postun
 /sbin/ldconfig
 if [ "$1" -ge 1 ]; then
-   /etc/rc.d/init.d/named condrestart >/dev/null 2>&1 || :;
+   /sbin/service named condrestart >/dev/null 2>&1 || :;
 fi;
 :;
 
@@ -720,14 +721,6 @@
 fi
 :;
 
-%postun utils
-if [ $1 = 0 ]; then
-   if [ -f /var/lock/subsys/named ]; then
-      /etc/rc.d/init.d/named stop >/dev/null  2>&1 || :;
-   fi;
-fi;
-:;
-
 
 %post libs -p /sbin/ldconfig
 
@@ -812,6 +805,12 @@
 :;
 
 %changelog
+* Tue Apr 18 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-22
+- apply upstream patch for ncache_adderesult segfault bug 173961 addenda
+- fix bug 188382: rpm --verify permissions inconsistencies
+- fix bug 189186: use /sbin/service instead of initscript
+- rebuild for new gcc, glibc-kernheaders
+
 * Tue Apr 04 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-20
 - fix resolver.c ncache_adderesult segfault reported in addenda to bug 173961 
   (upstream bugs #15642, #15528 ?)


