rpms/bind/devel bind-chroot-admin.in, 1.27, 1.28 bind.spec, 1.231, 1.232 bind-9.5-random_ports.patch, 1.1, NONE

Adam Tkac (atkac) fedora-extras-commits at redhat.com
Tue Dec 4 13:44:54 UTC 2007


Author: atkac

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

Modified Files:
	bind-chroot-admin.in bind.spec 
Removed Files:
	bind-9.5-random_ports.patch 
Log Message:
- bind-9.5-random_ports.patch was removed because upstream doesn't
  like it. query-source{,v6} options are sufficient (#391931)
- bind-chroot-admin called restorecon on /proc filesystem (#405281)



Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- bind-chroot-admin.in	26 Oct 2007 10:33:01 -0000	1.27
+++ bind-chroot-admin.in	4 Dec 2007 13:44:21 -0000	1.28
@@ -264,11 +264,15 @@
     chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.,dynamic/*/.} >/dev/null 2>&1;
     if [ -e $changed ]; then
 	if selinux_enabled && [ -x /sbin/restorecon ]; then
-	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX} >/dev/null 2>&1;
+	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/{dev,etc,var} >/dev/null 2>&1;
 	   /sbin/restorecon /etc/named.*    >/dev/null 2>&1;
 	   /sbin/restorecon /etc/rndc.key   >/dev/null 2>&1;
 	   /sbin/restorecon /etc/rndc.conf  >/dev/null 2>&1;
-	   /sbin/restorecon -R /var/named   >/dev/null 2>&1;
+	   for all in `ls /var/named`; do
+		if [ "x$all" != "xchroot" ]; then
+		    restorecon -R /var/named/"$all" > /dev/null 2>&1;
+		fi
+	   done
 	fi;
 	/sbin/service named try-restart
 	rm -f $changed;


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- bind.spec	26 Nov 2007 19:26:22 -0000	1.231
+++ bind.spec	4 Dec 2007 13:44:21 -0000	1.232
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	18.3.%{RELEASEVER}%{?dist}
+Release: 	18.4.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,7 +62,6 @@
 Patch69:	bind-9.5.0-generate-xml.patch
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
-Patch83:	bind-9.5-random_ports.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -255,7 +254,6 @@
 %patch72 -p1 -b .64bit
 %endif
 %patch73 -p1 -b .libidn
-%patch83 -p1 -b .ports
 :;
 
 
@@ -665,6 +663,11 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Dec 03 2007 Adam Tkac <atkac redhat com> 32:9.5.0-18.4.a7
+- bind-9.5-random_ports.patch was removed because upstream doesn't
+  like it. query-source{,v6} options are sufficient (#391931)
+- bind-chroot-admin called restorecon on /proc filesystem (#405281)
+
 * Mon Nov 26 2007 Adam Tkac <atkac redhat com> 32:9.5.0-18.3.a7
 - removed edns patch to keep compatibility with vanilla bind
   (#275091, comment #20)


--- bind-9.5-random_ports.patch DELETED ---




More information about the fedora-extras-commits mailing list