rpms/bind/FC-3 bind.spec,1.47,1.48
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jul 12 22:14:36 UTC 2005
Author: jvdias
Update of /cvs/dist/rpms/bind/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv17185
Modified Files:
bind.spec
Log Message:
fix bugs named init bugs 151852, 155848 157601; fix man-page bug 155848; fix SDB LDAP
Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-3/bind.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- bind.spec 11 Mar 2005 18:44:54 -0000 1.47
+++ bind.spec 12 Jul 2005 22:14:33 -0000 1.48
@@ -8,7 +8,7 @@
Name: bind
License: BSD-like
Version: 9.2.5
-Release: 1
+Release: 2
Epoch: 24
Url: http://www.isc.org/products/BIND/
Buildroot: %{_tmppath}/%{name}-root
@@ -24,6 +24,7 @@
Source6: bind-chroot.tar.gz
Source7: bind-9.2.5rc1-sdb_tools-Makefile.in
Source8: dnszone.schema
+Source9: libbind-man.tar.gz
# http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt
Patch: bind-9.2.0rc3-varrun.patch
Patch1: bind-9.2.1-key.patch
@@ -40,6 +41,8 @@
Patch12: bind-9.2.5rc1-sdb.patch
Patch13: bind-9.2.5rc1-fix_libbind_includedir.patch
Patch14: libbind-9.2.5-fix_h_errno.patch
+Patch15: bind-9.2.5-redhat_doc.patch
+Patch16: bind-9.2.5-fix_sdb_ldap.patch
Requires(pre,preun): shadow-utils
Requires(post,preun): chkconfig
Requires(post): textutils, fileutils, sed, grep
@@ -178,6 +181,8 @@
%patch13 -p1 -b .fix_libbind_includedir
%patch14 -p1 -b .fix_h_errno
%endif
+%patch15 -p1 -b .redhat_doc
+%patch16 -p1 -b .fix_sdb_ldap
%build
libtoolize --copy --force; aclocal; autoconf
@@ -207,6 +212,9 @@
--with-openssl=/usr
%endif
make
+if [ $? -ne 0 ]; then
+ exit $?;
+fi;
cp %{SOURCE5} doc/rfc
gzip -9 doc/rfc/*
@@ -249,6 +257,9 @@
mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema
install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/openldap/schema/dnszone.schema
%endif
+%if %{LIBBIND}
+gunzip < %{SOURCE9} | (cd $RPM_BUILD_ROOT/usr/share; tar -xpf -)
+%endif
%if %{test}
if [ "`whoami`" = 'root' ]; then
set -e
@@ -270,6 +281,7 @@
else
echo 'test==1 : only root can run the tests (they require an ifconfig).';
fi
+:;
%endif
%pre
@@ -298,6 +310,7 @@
chown root:named /etc/rndc.conf /etc/rndc.key /etc/named.conf
/sbin/ldconfig
fi
+:;
%preun
if [ "$1" = 0 ]; then
@@ -306,6 +319,7 @@
/usr/sbin/groupdel named 2>/dev/null || :;
/sbin/chkconfig --del named || :;
fi
+:;
%postun
if [ "$1" -ge 1 ]; then
@@ -321,10 +335,12 @@
/etc/rc.d/init.d/named stop >/dev/null 2>&1 || :;
fi;
fi;
+:;
%triggerpostun -- bind < 8.2.2_P5-15
/sbin/chkconfig --add named
/sbin/ldconfig
+:;
%triggerpostun -n bind -- bind <= 22:9.3.0-2
if [ "$1" -gt 0 ]; then
@@ -358,6 +374,7 @@
%clean
rm -rf ${RPM_BUILD_ROOT}
# ${RPM_BUILD_DIR}/%{name}-%{version}
+:;
%post libs -p /sbin/ldconfig
@@ -425,7 +442,7 @@
%{_includedir}/isccc
%{_includedir}/isccfg
%{_includedir}/lwres
-%{_mandir}/man3/*
+%{_mandir}/man3/lwres*
%{_bindir}/isc-config.sh
%doc doc/draft doc/rfc
@@ -435,6 +452,9 @@
%defattr(-,root,root)
%{_libdir}/libbind.*
%{_includedir}/bind
+%{_mandir}/man3/libbind-*
+%{_mandir}/man7/libbind-*
+%{_mandir}/man5/libbind-*
%post libbind-devel -p /sbin/ldconfig
@@ -462,16 +482,17 @@
%if %{SDB}
%files sdb
-%defattr(-,root,root)
+%defattr(-,root,named)
%{_sbindir}/named_sdb
%config /etc/openldap/schema/dnszone.schema
%{_sbindir}/zone2ldap
+%{_sbindir}/ldap2zone
%{_sbindir}/zonetodb
%{_mandir}/man1/zone2ldap.1*
%doc contrib/sdb/ldap/README.ldap contrib/sdb/ldap/INSTALL.ldap
%post sdb
-if [ "$1" -eq 1 ]; then
+if [ "$1" -ge 1 ]; then
# check that dnszone.schema is installed in OpenLDAP's slapd.conf
if [ -x /usr/sbin/named_sdb ] && [ -f /etc/openldap/slapd.conf ]; then
# include the LDAP dnszone.schema in slapd.conf:
@@ -493,9 +514,10 @@
fi;
fi;
fi;
+:;
%preun sdb
-if [ -x /usr/sbin/named_sdb ] && [ -f /etc/openldap/slapd.conf ]; then
+if [ "$1" -eq 0 ] && [ -x /usr/sbin/named_sdb ] && [ -f /etc/openldap/slapd.conf ]; then
if /bin/egrep -q '^include.*\dnszone.schema' /etc/openldap/slapd.conf; then
tf=`/bin/mktemp /tmp/XXXXXX`
/bin/egrep -v '^include.*dnszone\.schema' /etc/openldap/slapd.conf > $tf
@@ -505,6 +527,7 @@
[ -x /etc/init.d/ldap ] && /etc/init.d/ldap condrestart >/dev/null 2>&1 || :;
fi;
fi;
+:;
%endif # SDB
@@ -567,7 +590,7 @@
safe_replace /etc/named.custom "%{prefix}/etc/named.custom" root named 644 '' || :;
fi
safe_replace /etc/named.conf "%{prefix}/etc/named.conf" root named 644 "$default_ndc"
-/usr/bin/find /var/named -type f | /bin/egrep -v /var/named/chroot | while read f;
+/usr/bin/find /var/named -xdev -type f | /bin/egrep -v '/var/named/chroot' | while read f;
do
d=`/usr/bin/dirname $f`;
if test '!' -d "%{prefix}$d"; then
@@ -590,7 +613,7 @@
%preun chroot
if [ "$1" = "0" ]; then
- /usr/bin/find /var/named/chroot -type f | while read f;
+ /usr/bin/find /var/named/chroot -xdev -type f | while read f;
do
F=`echo $f | sed 's#/var/named/chroot##'`;
if /usr/bin/test -L $F && test `/usr/bin/readlink $F` = $f; then
@@ -606,6 +629,7 @@
fi
/etc/init.d/named condrestart >/dev/null 2>&1 || :;
fi
+:;
%triggerpostun -n bind-chroot -- bind-chroot
# Fix mess left by bind-chroot-9.2.2's %preun (bug 131803)
@@ -617,10 +641,22 @@
/etc/init.d/named condrestart >/dev/null 2>&1 || :;
fi;
fi;
+:;
%changelog
+* Tue Jul 12 2005 Jason Vas Dias <jvdias at redhat.com> - 24.9.2.5-2
+- fix bug 157950: dig / host / nslookup should reject invalid resolv.conf
+ files and not use uninitialized garbage nameserver values
+ (ISC bug 14841 raised).
+- fix bug 154335: named.init: don't rely on 'rndc stop' for 'service named stop'
+- fix bug 157601: give named.init a configtest function
+- fix bug 151852: if chroot-ed, mount proc on $ROOTDIR/proc to allow sysconf(...)
+- fix bug 155848: add NOTES section to named.8 man-page with info on all Red Hat
+ BIND quirks and SELinux DDNS / slave zone file configuration
+- fix SDB ldap : upgrade zone2ldap to BIND9 + openldap2.2, add ldap2zone
+
* Fri Mar 11 2005 Jason Vas Dias <jvdias at redhat.com> - 24:9.2.5-1
-- Upgrade to ISC BIND 9.3.1 (final release) released today.
+- Upgrade to ISC BIND 9.2.5 (final release) released today.
* Wed Mar 9 2005 Jason Vas Dias <jvdias at redhat.com> - 24:9.2.5-1
- fix bug 150288: h_errno not being accessed / set correctly in libbind
More information about the fedora-cvs-commits
mailing list