From eb55d9b467e66e0eafcbf1e8d1e9f1e58a35a306 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mar 19 2010 10:40:07 +0000 Subject: Backport multiple changes from devel branch: 9.7.0-6.P1 - update to 9.7.0-P1 9.7.0-5 - bind-sdb now requires bind 9.7.0-4 - add man-pages ldap2zone.1 zonetodb.1 zone2sqlite.1 named-sdb.8 (#525655) 9.7.0-3 - fix multilib issue (#478718) [jgorig] 9.7.0-2 - improve automatic DNSSEC reconfiguration trigger - initscript now returns 2 in case that action doesn't exist (#523435) - enable/disable chroot when bind-chroot is installed/uninstalled --- diff --git a/.cvsignore b/.cvsignore index f35f86c..5fbfb17 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -bind-9.7.0.tar.gz +bind-9.7.0-P1.tar.gz config-6.tar.bz2 diff --git a/bind.spec b/bind.spec index ae5334f..f08ccda 100644 --- a/bind.spec +++ b/bind.spec @@ -2,11 +2,11 @@ # Red Hat BIND package .spec file # -#%define PATCHVER P1 -#%define VERSION %{version}-%{PATCHVER} +%define PATCHVER P1 +#%define VERSION %{version} #%define PREVER rc2 #%define VERSION %{version}%{PREVER} -%define VERSION %{version} +%define VERSION %{version}-%{PATCHVER} %{?!SDB: %define SDB 1} %{?!test: %define test 0} @@ -21,7 +21,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.7.0 -Release: 1%{?dist} +Release: 6.%{PATCHVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,6 +40,10 @@ Source21: Copyright.caching-nameserver Source25: named.conf.sample Source28: config-6.tar.bz2 Source30: ldap2zone.c +Source31: ldap2zone.1 +Source32: named-sdb.8 +Source33: zonetodb.1 +Source34: zone2sqlite.1 # Common patches Patch5: bind-nonexec.patch @@ -54,6 +58,7 @@ Patch102:bind-95-rh452060.patch Patch106:bind93-rh490837.patch Patch107:bind97-dist-pkcs11.patch Patch108:bind97-managed-keyfile.patch +Patch109:bind97-rh478718.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -117,6 +122,7 @@ will have a label of "zone,zsk|ksk,xxx" and an id of the keytag in hex. %package sdb Summary: BIND server with database backends and DLZ support Group: System Environment/Daemons +Requires: bind %description sdb BIND (Berkeley Internet Name Domain) is an implementation of the DNS @@ -234,6 +240,7 @@ mkdir m4 %patch102 -p1 -b .rh452060 %patch106 -p0 -b .rh490837 %patch107 -p1 -b .dist-pkcs11 +%patch109 -p1 -b .rh478718 # Sparc and s390 arches need to use -fPIE %ifarch sparcv9 sparc64 s390 s390x @@ -360,6 +367,12 @@ find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';'; # /usr/lib/rpm/brp-compress # +#SDB manpages +install -m 644 %{SOURCE31} ${RPM_BUILD_ROOT}%{_mandir}/man1/ldap2zone.1 +install -m 644 %{SOURCE32} ${RPM_BUILD_ROOT}%{_mandir}/man8/named-sdb.8 +install -m 644 %{SOURCE33} ${RPM_BUILD_ROOT}%{_mandir}/man1/zonetodb.1 +install -m 644 %{SOURCE34} ${RPM_BUILD_ROOT}%{_mandir}/man1/zone2sqlite.1 + # Ghost config files: touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log @@ -446,8 +459,14 @@ fi [ -r '/etc/named.conf' ] || exit 0 cp -fp /etc/named.conf /etc/named.conf.rpmsave if grep -Eq '/etc/(named.dnssec.keys|pki/dnssec-keys)' /etc/named.conf; then + if grep -q 'dlv.isc.org.conf' /etc/named.conf; then + # DLV is configured, reconfigure it to new configuration + sed -i -e 's/.*dnssec-lookaside.*dlv\.isc\.org\..*/dnssec-lookaside auto;\ +bindkeys-file "\/etc\/named.iscdlv.key";/' /etc/named.conf + fi sed -i -e '/.*named\.dnssec\.keys.*/d' -e '/.*pki\/dnssec-keys.*/d' \ /etc/named.conf + /sbin/service named try-restart > /dev/null 2>&1 || :; fi %post chroot @@ -460,6 +479,10 @@ if [ "$1" -gt 0 ]; then /bin/mknod %{chroot_prefix}/dev/null c 1 3 rm -f %{chroot_prefix}/etc/localtime cp /etc/localtime %{chroot_prefix}/etc/localtime + if ! grep -q '^ROOTDIR=' /etc/sysconfig/named; then + echo 'ROOTDIR=/var/named/chroot' >> /etc/sysconfig/named + /sbin/service named try-restart > /dev/null 2>&1 || :; + fi fi; :; @@ -473,6 +496,17 @@ fi; if [ "$1" -eq 0 ]; then rm -f %{chroot_prefix}/dev/{random,zero,null} rm -f %{chroot_prefix}/etc/localtime + if grep -q '^ROOTDIR=' /etc/sysconfig/named; then + # NOTE: Do NOT call `service named try-restart` because chroot + # files will remain mounted. + START=no + [ -e /var/lock/subsys/named ] && START=yes + /sbin/service named stop > /dev/null 2>&1 || :; + sed -i -e '/^ROOTDIR=.*/d' /etc/sysconfig/named + if [ "x$START" = xyes ]; then + /sbin/service named start > /dev/null 2>&1 || :; + fi + fi fi :; @@ -553,6 +587,10 @@ rm -rf ${RPM_BUILD_ROOT} %files sdb %defattr(-,root,root,-) %{_mandir}/man1/zone2ldap.1* +%{_mandir}/man1/ldap2zone.1* +%{_mandir}/man1/zonetodb.1* +%{_mandir}/man1/zone2sqlite.1* +%{_mandir}/man8/named-sdb.8* %doc contrib/sdb/ldap/README.ldap contrib/sdb/ldap/INSTALL.ldap contrib/sdb/pgsql/README.sdb_pgsql %dir %{_sysconfdir}/openldap/schema %config(noreplace) %{_sysconfdir}/openldap/schema/dnszone.schema @@ -624,6 +662,23 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Fri Mar 19 2010 Adam Tkac 32:9.7.0-6.P1 +- update to 9.7.0-P1 + +* Tue Mar 16 2010 Jan Görig 32:9.7.0-5 +- bind-sdb now requires bind + +* Mon Mar 15 2010 Jan Görig 32:9.7.0-4 +- add man-pages ldap2zone.1 zonetodb.1 zone2sqlite.1 named-sdb.8 (#525655) + +* Mon Mar 01 2010 Adam Tkac 32:9.7.0-3 +- fix multilib issue (#478718) [jgorig] + +* Mon Mar 01 2010 Adam Tkac 32:9.7.0-2 +- improve automatic DNSSEC reconfiguration trigger +- initscript now returns 2 in case that action doesn't exist (#523435) +- enable/disable chroot when bind-chroot is installed/uninstalled + * Wed Feb 17 2010 Adam Tkac 32:9.7.0-1 - update to 9.7.0 final diff --git a/bind97-rh478718.patch b/bind97-rh478718.patch new file mode 100644 index 0000000..c6ea596 --- /dev/null +++ b/bind97-rh478718.patch @@ -0,0 +1,30 @@ +diff -up bind-9.7.0/configure.in.rh478718 bind-9.7.0/configure.in +--- bind-9.7.0/configure.in.rh478718 2010-03-01 14:50:02.331207076 +0100 ++++ bind-9.7.0/configure.in 2010-03-01 14:50:21.501207488 +0100 +@@ -2540,6 +2540,10 @@ main() { + AC_MSG_RESULT($arch) + fi + ++if test ! "$arch" = "x86_64" -a "$have_xaddq" = "yes"; then ++ AC_MSG_ERROR([XADDQ present but disabled by Fedora patch!]) ++fi ++ + if test "$have_atomic" = "yes"; then + AC_MSG_CHECKING([compiler support for inline assembly code]) + +diff -up bind-9.7.0/lib/isc/include/isc/platform.h.in.rh478718 bind-9.7.0/lib/isc/include/isc/platform.h.in +--- bind-9.7.0/lib/isc/include/isc/platform.h.in.rh478718 2010-03-01 14:50:31.421207522 +0100 ++++ bind-9.7.0/lib/isc/include/isc/platform.h.in 2010-03-01 14:50:40.313707286 +0100 +@@ -255,7 +255,11 @@ + * If the "xaddq" operation (64bit xadd) is available on this architecture, + * ISC_PLATFORM_HAVEXADDQ will be defined. + */ +-@ISC_PLATFORM_HAVEXADDQ@ ++#ifdef __x86_64__ ++#define ISC_PLATFORM_HAVEXADDQ 1 ++#else ++#undef ISC_PLATFORM_HAVEXADDQ ++#endif + + /* + * If the "atomic swap" operation is available on this architecture, diff --git a/named.init b/named.init index ce5c745..1fe5dbd 100755 --- a/named.init +++ b/named.init @@ -263,7 +263,7 @@ case "$1" in *) echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" [ "x$1" = "x" ] && exit 0 - exit 3 + exit 2 esac exit $RETVAL diff --git a/sources b/sources index 7c95025..4e30996 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c245b5d1aa0a4f53d9538faa1efe2c3f bind-9.7.0.tar.gz +78e3e38c6252e41ded1afa1aeb183622 bind-9.7.0-P1.tar.gz 90bd7f32fd5717b8294313b6b5ccc742 config-6.tar.bz2