rpms/bind/F-13 bind97-rh478718.patch, NONE, 1.1 .cvsignore, 1.64, 1.65 bind.spec, 1.340, 1.341 named.init, 1.78, 1.79 sources, 1.73, 1.74
Adam Tkac
atkac at fedoraproject.org
Fri Mar 19 10:40:07 UTC 2010
- Previous message: rpms/icu/devel icu.spec,1.104,1.105
- Next message: rpms/udev/F-12 hid2hci.patch, NONE, 1.1 udev-145-cdrom.patch, NONE, 1.1 udev-145-rename.patch, NONE, 1.1 udev-147-virtio.patch, NONE, 1.1 udev.git-38a3cde11bc77af49a96245b8a8a0f2b583a344c.patch, NONE, 1.1 udev.git-d7e2d38c1f0ead2239808dd117577a99a3ad3cde.patch, NONE, 1.1 udev.git-fa0612104ad30d4228aa7782308a77e21b7f6fb5.patch, NONE, 1.1 start_udev, 1.86, 1.87 udev-145-modem-modeswitch.patch, 1.2, 1.3 udev.spec, 1.301, 1.302
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: atkac
Update of /cvs/pkgs/rpms/bind/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21744
Modified Files:
.cvsignore bind.spec named.init sources
Added Files:
bind97-rh478718.patch
Log Message:
Backport multiple changes from devel branch:
* Fri Mar 19 2010 Adam Tkac <atkac redhat com> 32:9.7.0-6.P1
- update to 9.7.0-P1
* Tue Mar 16 2010 Jan Görig <jgorig redhat com> 32:9.7.0-5
- bind-sdb now requires bind
* Mon Mar 15 2010 Jan Görig <jgorig redhat com> 32:9.7.0-4
- add man-pages ldap2zone.1 zonetodb.1 zone2sqlite.1 named-sdb.8 (#525655)
* Mon Mar 01 2010 Adam Tkac <atkac redhat com> 32:9.7.0-3
- fix multilib issue (#478718) [jgorig]
* Mon Mar 01 2010 Adam Tkac <atkac redhat com> 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
bind97-rh478718.patch:
configure.in | 4 ++++
lib/isc/include/isc/platform.h.in | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
--- NEW FILE bind97-rh478718.patch ---
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.
*/
- at 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,
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-13/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore 17 Feb 2010 15:49:41 -0000 1.64
+++ .cvsignore 19 Mar 2010 10:40:06 -0000 1.65
@@ -1,2 +1,2 @@
-bind-9.7.0.tar.gz
+bind-9.7.0-P1.tar.gz
config-6.tar.bz2
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-13/bind.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -p -r1.340 -r1.341
--- bind.spec 17 Feb 2010 15:49:41 -0000 1.340
+++ bind.spec 19 Mar 2010 10:40:06 -0000 1.341
@@ -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 Dom
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"
%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
# /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 <atkac redhat com> 32:9.7.0-6.P1
+- update to 9.7.0-P1
+
+* Tue Mar 16 2010 Jan Görig <jgorig redhat com> 32:9.7.0-5
+- bind-sdb now requires bind
+
+* Mon Mar 15 2010 Jan Görig <jgorig redhat com> 32:9.7.0-4
+- add man-pages ldap2zone.1 zonetodb.1 zone2sqlite.1 named-sdb.8 (#525655)
+
+* Mon Mar 01 2010 Adam Tkac <atkac redhat com> 32:9.7.0-3
+- fix multilib issue (#478718) [jgorig]
+
+* Mon Mar 01 2010 Adam Tkac <atkac redhat com> 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 <atkac redhat com> 32:9.7.0-1
- update to 9.7.0 final
Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-13/named.init,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- named.init 15 Feb 2010 16:07:02 -0000 1.78
+++ named.init 19 Mar 2010 10:40:07 -0000 1.79
@@ -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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-13/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources 17 Feb 2010 15:49:41 -0000 1.73
+++ sources 19 Mar 2010 10:40:07 -0000 1.74
@@ -1,2 +1,2 @@
-c245b5d1aa0a4f53d9538faa1efe2c3f bind-9.7.0.tar.gz
+78e3e38c6252e41ded1afa1aeb183622 bind-9.7.0-P1.tar.gz
90bd7f32fd5717b8294313b6b5ccc742 config-6.tar.bz2
- Previous message: rpms/icu/devel icu.spec,1.104,1.105
- Next message: rpms/udev/F-12 hid2hci.patch, NONE, 1.1 udev-145-cdrom.patch, NONE, 1.1 udev-145-rename.patch, NONE, 1.1 udev-147-virtio.patch, NONE, 1.1 udev.git-38a3cde11bc77af49a96245b8a8a0f2b583a344c.patch, NONE, 1.1 udev.git-d7e2d38c1f0ead2239808dd117577a99a3ad3cde.patch, NONE, 1.1 udev.git-fa0612104ad30d4228aa7782308a77e21b7f6fb5.patch, NONE, 1.1 start_udev, 1.86, 1.87 udev-145-modem-modeswitch.patch, 1.2, 1.3 udev.spec, 1.301, 1.302
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list