Mon Oct 16 09:54:54 UTC 2006

Author: stransky

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

Modified Files:
	bind.spec 
Removed Files:
	bind-9.2.0rc3-varrun.patch bind-9.2.1-key.patch 
	bind-9.2.2-nsl.patch bind-9.2.4-config.patch 
	bind-9.2.4-handle_send_errors.patch bind-9.2.4rc7-pie.patch 
	bind-9.3.0-handle-send-errors.patch 
	bind-9.3.0-missing-dnssec-tools.patch 
	bind-9.3.1-dbus-0.6.patch bind-9.3.1-dbus_archdep_libdir.patch 
	bind-9.3.1-dbus_restart.patch 
	bind-9.3.1-fix_no_dbus_daemon.patch 
	bind-9.3.1-fix_sdb_ldap.patch bind-9.3.1-fix_sdb_pgsql.patch 
	bind-9.3.1-flush-cache.patch 
	bind-9.3.1-next_server_on_referral.patch 
	bind-9.3.1-no_servfail_stops.patch bind-9.3.1-redhat_doc.patch 
	bind-9.3.1-reject_resolv_conf_errors.patch 
	bind-9.3.1-sdb_dbus.patch 
	bind-9.3.1-t_no_default_lookups.patch bind-9.3.1.dbus.patch 
	bind-9.3.1beta2-openssl-suffix.patch 
	bind-9.3.1rc1-fix_libbind_includedir.patch 
	bind-9.3.1rc1-no-libtool-for-PIEs.patch 
	bind-9.3.1rc1-sdb.patch bind-9.3.1rc1-sdbsrc.patch 
	bind-9.3.2-9_3_3_bind.patch bind-9.3.2-9_3_3_dig.patch 
	bind-9.3.2-9_3_3_dns.patch bind-9.3.2-9_3_3_dnssec.patch 
	bind-9.3.2-9_3_3_isc.patch bind-9.3.2-9_3_3_isccfg.patch 
	bind-9.3.2-9_3_3_lwres.patch bind-9.3.2-9_3_3_named.patch 
	bind-9.3.2-9_3_3_nsupdate.patch 
	bind-9.3.2-9_3_3_resolver.patch bind-9.3.2-9_3_3_tests.patch 
	bind-9.3.2-9_3_3_validator.patch bind-9.3.2-bz173961.patch 
	bind-9.3.2-bz177854.patch 
	bind-9.3.2-bz187286_fix_host_cname.patch 
	bind-9.3.2-ch1991_rt15813.patch 
	bind-9.3.2-ch1994_rt15694.patch 
	bind-9.3.2-ch1997_rt15818.patch 
	bind-9.3.2-ch2009_rt15808.patch 
	bind-9.3.2-ch2013_rt15941.patch 
	bind-9.3.2-ch2024_rt16027.patch 
	bind-9.3.2-prctl_set_dumpable.patch 
	bind-9.3.2-redhat_doc.patch bind-9.3.2-rrsig.patch 
	bind-9.3.2b1-PIE.patch bind-9.3.2b1-fix_sdb_ldap.patch 
	bind-9.3.2b1-fix_sdb_pgsql.patch bind-9.3.2b2-dbus.patch 
	bind-9.3.2b2-no_servfail_stops.patch 
	bind-9.3.2b2-rndckey.patch bind-9.3.2b2-sdbsrc.patch 
	bind-9.3.2rc1-dbus-0.6.patch bind-bsdcompat.patch 
	bind-nonexec.patch bind-posixthreads.patch 
	libbind-9.3.1rc1-fix_h_errno.patch 
Log Message:
removed old patches


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108

--- bind.spec	11 Sep 2006 08:38:04 -0000	1.107
+++ bind.spec	16 Oct 2006 09:54:52 -0000	1.108
@@ -12,18 +12,19 @@
 %{?!selinux:	%define selinux     1}
 %define		bind_dir      /var/named
 %define    	chroot_prefix %{bind_dir}/chroot
+%define         prever             rc2
 #
 Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server.
 Name: 		bind
 License: 	BSD-like
-Version: 	9.3.2
-Release: 	33%{?dist}
+Version: 	9.3.3
+Release: 	0.1.%{prever}%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
 Group: 		System Environment/Daemons
 #
-Source: 	ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.gz
+Source: 	ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}%{prever}.tar.gz
 Source1: 	named.sysconfig
 Source2: 	named.init
 Source3: 	named.logrotate
@@ -57,59 +58,28 @@
 Source31:       named.root.hints
 #
 Patch:  	bind-9.2.0rc3-varrun.patch
-Patch1: 	bind-9.3.2b2-rndckey.patch
+Patch1: 	bind-9.3.3rc2-rndckey.patch
 Patch2: 	bind-9.3.1beta2-openssl-suffix.patch
-Patch3: 	bind-posixthreads.patch
 Patch4: 	bind-bsdcompat.patch
 Patch5: 	bind-nonexec.patch
 Patch6: 	bind-9.2.2-nsl.patch
-Patch7: 	bind-9.2.4rc7-pie.patch
-Patch8: 	bind-9.3.0-handle-send-errors.patch
-Patch9: 	bind-9.3.0-missing-dnssec-tools.patch
 Patch10: 	bind-9.3.2b1-PIE.patch
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
 Patch12: 	bind-9.3.1rc1-sdb.patch
 Patch13: 	bind-9.3.1rc1-fix_libbind_includedir.patch
 Patch14: 	libbind-9.3.1rc1-fix_h_errno.patch
-Patch15: 	bind-9.3.2b2-dbus.patch
+Patch15: 	bind-9.3.3rc2-dbus.patch
 Patch16: 	bind-9.3.2-redhat_doc.patch
 Patch17: 	bind-9.3.2b1-fix_sdb_ldap.patch
-Patch18: 	bind-9.3.1-reject_resolv_conf_errors.patch
 Patch19: 	bind-9.3.1-next_server_on_referral.patch
 Patch20: 	bind-9.3.2b2-no_servfail_stops.patch
-Patch21: 	bind-9.3.2b1-fix_sdb_pgsql.patch
 Patch22: 	bind-9.3.1-sdb_dbus.patch
 Patch23: 	bind-9.3.1-dbus_archdep_libdir.patch
-Patch24: 	bind-9.3.1-t_no_default_lookups.patch
-Patch25: 	bind-9.3.1-fix_no_dbus_daemon.patch
-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
-Patch30:	bind-9.3.2-bz187286_fix_host_cname.patch
-Patch31:	bind-9.3.2-bz173961.patch
+Patch28: 	bind-9.3.3rc2-dbus-0.6.patch
 Patch32:	bind-9.3.2-prctl_set_dumpable.patch
-Patch33:	bind-9.3.2-ch2024_rt16027.patch
-Patch34:        bind-9.3.2-ch2013_rt15941.patch
-Patch35:	bind-9.3.2-ch2009_rt15808.patch
-Patch36:	bind-9.3.2-ch1997_rt15818.patch
-Patch37:	bind-9.3.2-ch1994_rt15694.patch
-Patch38:	bind-9.3.2-ch1991_rt15813.patch
-Patch39:	bind-9.3.2-9_3_3_validator.patch
-Patch40:	bind-9.3.2-9_3_3_resolver.patch
-Patch41:	bind-9.3.2-9_3_3_dns.patch
-Patch42:	bind-9.3.2-9_3_3_isc.patch
-Patch43:        bind-9.3.2-9_3_3_bind.patch
-Patch44:	bind-9.3.2-9_3_3_isccfg.patch
-Patch45:	bind-9.3.2-9_3_3_lwres.patch
-Patch46:	bind-9.3.2-9_3_3_named.patch
-Patch47:	bind-9.3.2-9_3_3_dig.patch
-Patch48:	bind-9.3.2-9_3_3_dnssec.patch
-Patch49:	bind-9.3.2-9_3_3_nsupdate.patch
-Patch50:	bind-9.3.2-9_3_3_tests.patch
-Patch51:	bind-9.3.2-rrsig.patch
+Patch51:	bind-9.3.2-tmpfile.patch
 #
-Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2
+Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26
 Requires(pre): 	shadow-utils
 Requires(preun):chkconfig >= 1.3.26
@@ -196,7 +166,6 @@
 along with BIND to implement their primary system DNS resolver service.
 If you would like to set up a caching name server, you'll need to install
 bind, bind-libs, and bind-utils along with this package.
-This package replaces the caching-nameserver package.
 
 
 %package   chroot
@@ -236,7 +205,8 @@
 %package sdb
 Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server with database backends.
 Group: System Environment/Daemons
-Requires: bind-libs = %{epoch}:%{version}-%{release}, bind-utils = %{epoch}:%{version}-%{release},  glibc  >= 2.2
+PreReq:   bind       = %{epoch}:%{version}-%{release}
+Requires: bind-utils = %{epoch}:%{version}-%{release}
 Requires(post):   bash, coreutils, sed, grep, mktemp
 Requires(preun):  bash, coreutils, sed, grep
 %if %{selinux}
@@ -260,28 +230,13 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{prever}
 %patch -p1 -b .varrun
 %patch1 -p1 -b .key
 %patch2 -p1 -b .openssl_suffix
-#%define         posix_threads       0
-#%if %{posix_threads}
-#%patch3 -p1 -b .posixthreads
-#^- This patch is no longer required and would not work anyway (see BZ 87525).
-#%endif
 %patch4 -p1 -b .bsdcompat
 %patch5 -p1 -b .nonexec
 %patch6 -p1 -b .nsl
-#%patch7 -p1 -b .pie
-# This patch now in patch10
-#%patch8 -p1 -b .handle_send_errors
-# This patch is now in ISC bind-9.3.1x
-#
-#%patch9 -p1 -b .missing_dnssec_tools
-#RIP dnssec-signkey and dnssec-makekeyset:
-#1852.	[cleanup]	Remove last vestiges of dnssec-signkey and
-#			dnssec-makekeyset (removed from Makefile years ago).
-#
 %patch10 -p1 -b .PIE
 %if %{SDB}
 %patch11 -p1 -b .sdbsrc
@@ -319,52 +274,26 @@
 %if %{SDB}
 %patch17 -p1 -b .fix_sdb_ldap
 %endif
-# %patch18 -p1 -b .reject_resolv_conf_errors
-# patch now upstream.
 %patch19 -p1 -b .next_server_on_referral
 %patch20 -p1 -b .no_servfail_stops
-# patches now upstream :
-#%patch21 -p1 -b .fix_sdb_pgsql
-#%patch24 -p1 -b .-t_no_default_lookups
 %if %{WITH_DBUS}
-%patch25 -p1 -b .fix_no_dbus_daemon
-%patch26 -p1 -b .flush_cache
-%patch27 -p1 -b .dbus_restart
 %patch28 -p1 -b .dbus-0.6
-# this patch no longer required (kernel now fixed):
-# %patch29 -p1 -b .bz177854
-%patch30 -p1 -b .bz187286_fix_host_cname
-%patch31 -p1 -b .bz173961
-%patch32 -p1 -b .prctl_set_dumpable
-%patch33 -p1 -b .ch2024_rt16027
-%patch34 -p1 -b .ch2013_rt15941
-%patch35 -p1 -b .ch2009_rt15808
-%patch36 -p1 -b .ch1997_rt15818
-%patch37 -p1 -b .ch1994_rt15694
-%patch38 -p1 -b .ch1991_rt15813
-%patch39 -p1 -b .9_3_3_validator
-%patch40 -p1 -b .9_3_3_resolver
-%patch41 -p1 -b .9_3_3_dns
-%patch42 -p1 -b .9_3_3_isc
-%patch43 -p1 -b .9_3_3_bind
-%patch44 -p1 -b .9_3_3_isccfg
-%patch45 -p1 -b .9_3_3_lwres
-%patch46 -p1 -b .9_3_3_named 
-%patch47 -p1 -b .9_3_3_dig
-%patch48 -p1 -b .9_3_3_dnssec
-%patch49 -p1 -b .9_3_3_nsupdate
-%patch50 -p1 -b .9_3_3_tests
-%patch51 -p1 -b .rrsig
 #
 # this must follow all dbus patches:
+#
+cp -fp contrib/dbus/{dbus_mgr.c,dbus_service.c} bin/named
+cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %if %{SDB}
-cp -fp bin/named/{dbus_mgr.c,dbus_service.c,log.c,server.c} bin/named_sdb
-cp -fp bin/named/include/named/{dbus_mgr.h,dbus_service.h,globals.h,server.h,log.h,types.h} bin/named_sdb/include/named
+cp -fp contrib/dbus/{dbus_mgr.c,dbus_service.c} bin/named_sdb
+cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named_sdb/include/named
+cp -fp bin/named/{log.c,server.c} bin/named_sdb
+cp -fp bin/named/include/named/{globals.h,server.h,log.h,types.h} bin/named_sdb/include/named
 %endif
 %endif
+%patch32 -p1 -b .prctl_set_dumpable
+%patch51 -p1 -b .tmp
 :;
 
-
 %build
 libtoolize --copy --force; aclocal; autoconf
 cp -f /usr/share/libtool/config.{guess,sub} .
@@ -532,6 +461,7 @@
 /usr/lib/rpm/brp-compress
 exit 0
 %endif
+chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib*so.*
 :;
 
 
@@ -580,7 +510,7 @@
 %doc doc/arm doc/misc
 %doc sample/
 %if %{WITH_DBUS}
-%doc doc/README.DBUS
+%doc contrib/dbus/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(750,root,root) %{_sbindir}/namedGetForwarders
@@ -588,7 +518,7 @@
 %endif
 
 %files libs
-%defattr(0755,root,root,0755)
+%defattr(-,root,root,0755)
 %{_libdir}/*so.*
 
 %files utils
@@ -604,14 +534,16 @@
 %{_mandir}/man1/nslookup.1*
 
 %files devel
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,0755)
 %{_libdir}/libbind9.a
 %{_libdir}/libdns.a
 %{_libdir}/libisc.a
 %{_libdir}/libisccc.a
 %{_libdir}/libisccfg.a
 %{_libdir}/liblwres.a
+%if %{LIBBIND}
 %exclude %{_libdir}/libbind.so
+%endif
 %{_libdir}/*so
 %{_includedir}/bind9
 %{_includedir}/dns
@@ -674,7 +606,7 @@
 %if %{LIBBIND}
 
 %files libbind-devel
-%defattr(0755,root,root,0755)
+%defattr(-,root,root,0755)
 %{_libdir}/libbind.so*
 %defattr(0644,root,root,0755) 
 %{_libdir}/libbind.a
@@ -770,8 +702,8 @@
 
 %post -n caching-nameserver
 if [ "$1" -gt 0 ]; then
-   /usr/bin/chcon system_u:object_r:named_conf_t  /etc/named.caching-nameserver.conf >/dev/null 2>&1 || :;
-   /usr/bin/chcon system_u:object_r:named_conf_t  /etc/named.rfc1912.zones >/dev/null 2>&1 || :;
+   /sbin/restorecon /etc/named.caching-nameserver.conf >/dev/null 2>&1 || :;
+   /sbin/restorecon /etc/named.rfc1912.zones >/dev/null 2>&1 || :;
    . /usr/sbin/bind-chroot-admin --sync;
 fi;
 :;
@@ -846,6 +778,10 @@
 :;
 
 %changelog
+* Mon Oct 16 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.3-0.1.rc2
+- update to the latest upstream (9.3.3rc2)
+- backported some fixes from devel
+
 * Mon Sep 11 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.2-33
 - added fix for CVE-2006-4095
 - added bind to PreReq (#202542)


--- bind-9.2.0rc3-varrun.patch DELETED ---


--- bind-9.2.1-key.patch DELETED ---


--- bind-9.2.2-nsl.patch DELETED ---


--- bind-9.2.4-config.patch DELETED ---


--- bind-9.2.4-handle_send_errors.patch DELETED ---


--- bind-9.2.4rc7-pie.patch DELETED ---


--- bind-9.3.0-handle-send-errors.patch DELETED ---


--- bind-9.3.0-missing-dnssec-tools.patch DELETED ---


--- bind-9.3.1-dbus-0.6.patch DELETED ---


--- bind-9.3.1-dbus_archdep_libdir.patch DELETED ---


--- bind-9.3.1-dbus_restart.patch DELETED ---


--- bind-9.3.1-fix_no_dbus_daemon.patch DELETED ---


--- bind-9.3.1-fix_sdb_ldap.patch DELETED ---


--- bind-9.3.1-fix_sdb_pgsql.patch DELETED ---


--- bind-9.3.1-flush-cache.patch DELETED ---


--- bind-9.3.1-next_server_on_referral.patch DELETED ---


--- bind-9.3.1-no_servfail_stops.patch DELETED ---


--- bind-9.3.1-redhat_doc.patch DELETED ---


--- bind-9.3.1-reject_resolv_conf_errors.patch DELETED ---


--- bind-9.3.1-sdb_dbus.patch DELETED ---


--- bind-9.3.1-t_no_default_lookups.patch DELETED ---


--- bind-9.3.1.dbus.patch DELETED ---


--- bind-9.3.1beta2-openssl-suffix.patch DELETED ---


--- bind-9.3.1rc1-fix_libbind_includedir.patch DELETED ---


--- bind-9.3.1rc1-no-libtool-for-PIEs.patch DELETED ---


--- bind-9.3.1rc1-sdb.patch DELETED ---


--- bind-9.3.1rc1-sdbsrc.patch DELETED ---


--- bind-9.3.2-9_3_3_bind.patch DELETED ---


--- bind-9.3.2-9_3_3_dig.patch DELETED ---


--- bind-9.3.2-9_3_3_dns.patch DELETED ---


--- bind-9.3.2-9_3_3_dnssec.patch DELETED ---


--- bind-9.3.2-9_3_3_isc.patch DELETED ---


--- bind-9.3.2-9_3_3_isccfg.patch DELETED ---


--- bind-9.3.2-9_3_3_lwres.patch DELETED ---


--- bind-9.3.2-9_3_3_named.patch DELETED ---


--- bind-9.3.2-9_3_3_nsupdate.patch DELETED ---


--- bind-9.3.2-9_3_3_resolver.patch DELETED ---


--- bind-9.3.2-9_3_3_tests.patch DELETED ---


--- bind-9.3.2-9_3_3_validator.patch DELETED ---


--- bind-9.3.2-bz173961.patch DELETED ---


--- bind-9.3.2-bz177854.patch DELETED ---


--- bind-9.3.2-bz187286_fix_host_cname.patch DELETED ---


--- bind-9.3.2-ch1991_rt15813.patch DELETED ---


--- bind-9.3.2-ch1994_rt15694.patch DELETED ---


--- bind-9.3.2-ch1997_rt15818.patch DELETED ---


--- bind-9.3.2-ch2009_rt15808.patch DELETED ---


--- bind-9.3.2-ch2013_rt15941.patch DELETED ---


--- bind-9.3.2-ch2024_rt16027.patch DELETED ---


--- bind-9.3.2-prctl_set_dumpable.patch DELETED ---


--- bind-9.3.2-redhat_doc.patch DELETED ---


--- bind-9.3.2-rrsig.patch DELETED ---


--- bind-9.3.2b1-PIE.patch DELETED ---


--- bind-9.3.2b1-fix_sdb_ldap.patch DELETED ---


--- bind-9.3.2b1-fix_sdb_pgsql.patch DELETED ---


--- bind-9.3.2b2-dbus.patch DELETED ---


--- bind-9.3.2b2-no_servfail_stops.patch DELETED ---


--- bind-9.3.2b2-rndckey.patch DELETED ---


--- bind-9.3.2b2-sdbsrc.patch DELETED ---


--- bind-9.3.2rc1-dbus-0.6.patch DELETED ---


--- bind-bsdcompat.patch DELETED ---


--- bind-nonexec.patch DELETED ---


--- bind-posixthreads.patch DELETED ---


--- libbind-9.3.1rc1-fix_h_errno.patch DELETED ---


