rpms/bind/F-8 bind-9.3.2-redhat_doc.patch, 1.4, 1.5 bind-9.4.0-sdb-sqlite-bld.patch, 1.2, 1.3 bind.spec, 1.225, 1.226 named.init, 1.59, 1.60 bind-9.3.1rc1-sdb.patch, 1.6, NONE

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22379

Modified Files:
	bind-9.3.2-redhat_doc.patch bind-9.4.0-sdb-sqlite-bld.patch 
	bind.spec named.init 
Removed Files:
	bind-9.3.1rc1-sdb.patch 
Log Message:
- added bind-sdb again, contains SDB modules and DLZ modules (#374261)
- bind-9.3.1rc1-sdb.patch replaced by bind-9.5-sdb.patch


bind-9.3.2-redhat_doc.patch:

Index: bind-9.3.2-redhat_doc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/bind-9.3.2-redhat_doc.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bind-9.3.2-redhat_doc.patch	16 Oct 2007 16:41:25 -0000	1.4
+++ bind-9.3.2-redhat_doc.patch	15 Nov 2007 10:50:41 -0000	1.5
@@ -48,9 +48,9 @@
 +\fBRed Hat BIND SDB support:\fR
 +.PP
 +Red Hat ships named with compiled in Simplified Database Backend modules that ISC
-+provides in the "contrib/sdb" directory.
++provides in the "contrib/sdb" directory. Install bind-sdb package if you want use them
 +.PP
-+The SDB modules for LDAP, PostGreSQL, DirDB and SQLite are compiled into named.
++The SDB modules for LDAP, PostGreSQL, DirDB and SQLite are compiled into named-sdb.
 +.PP
 +See the documentation for the various SDB modules in /usr/share/doc/bind-sdb-*/ .
 +.br

bind-9.4.0-sdb-sqlite-bld.patch:

Index: bind-9.4.0-sdb-sqlite-bld.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/bind-9.4.0-sdb-sqlite-bld.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bind-9.4.0-sdb-sqlite-bld.patch	20 Jul 2007 11:31:19 -0000	1.2
+++ bind-9.4.0-sdb-sqlite-bld.patch	15 Nov 2007 10:50:41 -0000	1.3
@@ -1,5 +1,5 @@
---- bind-9.4.0/bin/named/main.c.sdb-sqlite-bld	2007-03-12 14:00:05.000000000 +0100
-+++ bind-9.4.0/bin/named/main.c	2007-03-12 14:02:34.000000000 +0100
+--- bind-9.4.0/bin/named/main-sdb.c.sdb-sqlite-bld	2007-03-12 14:00:05.000000000 +0100
++++ bind-9.4.0/bin/named/main-sdb.c	2007-03-12 14:02:34.000000000 +0100
 @@ -74,6 +74,7 @@
  /* #include "xxdb.h" */
  #include "ldapdb.h"


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/bind.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- bind.spec	12 Nov 2007 16:07:06 -0000	1.225
+++ bind.spec	15 Nov 2007 10:50:41 -0000	1.226
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	16.2.%{RELEASEVER}%{?dist}
+Release: 	16.3.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,7 +69,7 @@
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
-Patch12: 	bind-9.3.1rc1-sdb.patch
+Patch12: 	bind-9.5-sdb.patch
 Patch62:        bind-9.4.0-sdb-sqlite-bld.patch
 Patch68:	bind-9.4.1-ldap-api.patch
 
@@ -90,8 +90,8 @@
 Requires(post): grep, chkconfig >= 1.3.26
 Requires(pre): 	shadow-utils
 Requires(preun):chkconfig >= 1.3.26
-Obsoletes: bind-config, caching-nameserver, bind-sdb
-Provides:  bind-config, caching-nameserver, bind-sdb
+Obsoletes: bind-config, caching-nameserver
+Provides:  bind-config, caching-nameserver
 %if %{selinux}
 Requires(post):	policycoreutils
 %endif
@@ -121,11 +121,23 @@
 which resolves host names to IP addresses; a resolver library
 (routines for applications to use when interfacing with DNS); and
 tools for verifying that the DNS server is operating properly.
-It also includes SDB (Simplified Database Backend) which includes support for
-using alternative Zone Databases stored in an LDAP server (ldapdb),
-a postgreSQL database (pgsqldb), an sqlite database (sqlitedb),
+
+%if %{SDB}
+%package sdb
+Summary: BIND server with database backends and DLZ suppport
+Group:   System Environment/Daemons
+Requires: bind = %{epoch}:%{version}-%{release}
+
+%description sdb
+BIND (Berkeley Internet Name Domain) is an implementation of the DNS
+(Domain Name System) protocols. BIND includes a DNS server (named-sdb)
+which has compiled-in SDB (Simplified Database Backend) which includes
+support for using alternative Zone Databases stored in an LDAP server
+(ldapdb), a postgreSQL database (pgsqldb), an sqlite database (sqlitedb),
 or in the filesystem (dirdb), in addition to the standard in-memory RBT
-(Red Black Tree) zone database.
+(Red Black Tree) zone database. It also includes support for DLZ
+(Dynamic Loadable Zones)
+%endif
 
 %package  libs
 Summary:  Libraries used by the BIND DNS packages
@@ -194,6 +206,7 @@
 %patch69 -p1 -b .generate-xml
 %if %{SDB}
 %patch11 -p1 -b .sdbsrc
+cp -f bin/named/main.c bin/named/main-sdb.c
 # SDB ldap
 cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named
 # SDB postgreSQL
@@ -455,6 +468,14 @@
 fi;
 :;
 
+%if %{SDB}
+%post sdb
+/sbin/service named try-restart > /dev/null 2>&1 || :;
+
+%postun sdb
+/sbin/service named try-restart > /dev/null 2>&1 || :;
+%endif
+
 %triggerpostun -- bind < 8.2.2_P5-15
 /sbin/chkconfig --add named
 /sbin/ldconfig
@@ -537,12 +558,6 @@
 %{_sbindir}/named-bootconf
 %{_sbindir}/rndc*
 %{_sbindir}/named-compilezone
-%if %{SDB}
-%{_sbindir}/zone2ldap
-%{_sbindir}/ldap2zone
-%{_sbindir}/zonetodb
-%{_sbindir}/zone2sqlite
-%endif
 %defattr(0644,root,root,0755)
 %{_mandir}/man5/named.conf.5*
 %{_mandir}/man5/rndc.conf.5*
@@ -554,10 +569,6 @@
 %{_mandir}/man8/named-checkzone.8*
 %{_mandir}/man8/named-compilezone.8*
 %{_mandir}/man8/rndc-confgen.8*
-%if %{SDB}
-%{_mandir}/man1/zone2ldap.1*
-%doc contrib/sdb/ldap/README.ldap contrib/sdb/ldap/INSTALL.ldap contrib/sdb/pgsql/README.sdb_pgsql
-%endif
 %doc CHANGES COPYRIGHT README
 %doc doc/arm doc/misc
 %doc sample/
@@ -568,12 +579,22 @@
 %attr(750,root,root) %{_sbindir}/namedGetForwarders
 %attr(750,root,root) %{_sbindir}/namedSetForwarders
 %endif
+
 %if %{SDB}
+%files sdb
+%defattr(0644,root,root,0755)
+%{_mandir}/man1/zone2ldap.1*
+%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
+%defattr(0750,root,root,0755)
+%{_sbindir}/named-sdb
+%{_sbindir}/zone2ldap
+%{_sbindir}/ldap2zone
+%{_sbindir}/zonetodb
+%{_sbindir}/zone2sqlite
 %endif
 
-
 %files libs
 %defattr(-,root,root,0755)
 %{_libdir}/*so.*
@@ -648,6 +669,10 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Nov 15 2007 Adam Tkac <atkac redhat com> 32:9.5.0-16.3.a6
+- added bind-sdb again, contains SDB modules and DLZ modules
+- bind-9.3.1rc1-sdb.patch replaced by bind-9.5-sdb.patch
+
 * Mon Nov 12 2007 Adam Tkac <atkac redhat com> 32:9.5.0-16.2.a6
 - removed Requires: openldap, postgresql, mysql, db4, unixODBC (#374261)
 - new L.ROOT-SERVERS.NET address


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/named.init,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- named.init	5 Sep 2007 09:56:24 -0000	1.59
+++ named.init	15 Nov 2007 10:50:41 -0000	1.60
@@ -26,6 +26,11 @@
 RETVAL=0
 export KRB5_KTNAME=${KEYTAB_FILE:-/etc/named.keytab}
 
+named='named'
+if [ -x /usr/sbin/named-sdb ]; then
+	named='named-sdb'
+fi
+
 # Don't kill named during clean-up
 NAMED_SHUTDOWN_TIMEOUT=${NAMED_SHUTDOWN_TIMEOUT:-100}
 
@@ -63,7 +68,7 @@
   [ "${NETWORKING}" = "no" ] && exit 1
 
 
-  [ -x /usr/sbin/named ] || exit 5
+  [ -x /usr/sbin/"$named" ] || exit 5
 
   # Handle -c option
   previous_option='unspecified';
@@ -83,7 +88,7 @@
 
   # all pre-start is done, lets start named
   echo -n $"Starting named: "
-  if [ -n "`/sbin/pidof -o %PPID named`" ]; then
+  if [ -n "`/sbin/pidof -o %PPID "$named"`" ]; then
     echo -n $"named: already running"
     failure
     echo
@@ -112,19 +117,18 @@
   # check if configuration is correct
   if [ -x /usr/sbin/named-checkconf ] && [ -x /usr/sbin/named-checkzone ] && /usr/sbin/named-checkconf $ckcf_options ${named_conf} >/dev/null 2>&1; then
 
-    daemon /usr/sbin/named -u named ${OPTIONS};
+    daemon /usr/sbin/"$named" -u named ${OPTIONS};
     RETVAL=$?
     if [ $RETVAL -eq 0 ]; then
-      rm -f /var/run/named.pid;
-      rm -f /var/run/named_sdb.pid;
-      ln -s $ROOTDIR/var/run/named/named.pid /var/run/named.pid;
+      rm -f /var/run/{named,named-sdb}.pid;
+      ln -s $ROOTDIR/var/run/named/"$named".pid /var/run/"$named".pid;
     fi;
 
-    if [ -n "`/sbin/pidof -o %PPID named`" ]; then
+    if [ -n "`/sbin/pidof -o %PPID "$named"`" ]; then
       # Verify that named actually started (JM 2006-10-04)
-      if [ ! -e $ROOTDIR/var/run/named/named.pid ]; then
+      if [ ! -e $ROOTDIR/var/run/named/"$named".pid ]; then
       # If there is not a file containing the PID of the now running named daemon then create it (JM 2006-10-04)
-        echo `/sbin/pidof -o %PPID named` > $ROOTDIR/var/run/named/named.pid;
+        echo `/sbin/pidof -o %PPID "$named"` > $ROOTDIR/var/run/named/"$named".pid;
       fi;
     fi;
   else
@@ -152,12 +156,12 @@
   [ -x /usr/sbin/rndc ] && /usr/sbin/rndc stop >/dev/null 2>&1;
   RETVAL=$?
   # is it still here?
-  if /sbin/pidof -o %PPID named >/dev/null; then
+  if /sbin/pidof -o %PPID "$named" >/dev/null; then
     timeout=0
     while : ; do
-      if /sbin/pidof -o %PPID named >/dev/null; then
+      if /sbin/pidof -o %PPID "$named" >/dev/null; then
         if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then
-          killproc named -TERM >/dev/null 2>&1
+          killproc "$named" -TERM >/dev/null 2>&1
           RETVAL=$?
           echo $"no response, killing with -TERM "
           break
@@ -174,7 +178,7 @@
   # remove pid files
   if [ $RETVAL -eq 0 ]; then
     rm -f /var/lock/subsys/named
-    rm -f /var/run/named.pid
+    rm -f /var/run/{named,named-sdb}.pid
   fi;
 
   # unmount mounted filesystems/directories
@@ -201,7 +205,7 @@
 
 rhstatus() {
   [ -x /usr/sbin/rndc ] && /usr/sbin/rndc status;
-  status /usr/bin/named;
+  status /usr/sbin/"$named";
   return $?
 }	
 restart() {
@@ -209,14 +213,14 @@
 	start
 }	
 reload() {
-        echo -n $"Reloading named: "
-	p=`/sbin/pidof -o %PPID named`	
+        echo -n $"Reloading "$named": "
+	p=`/sbin/pidof -o %PPID "$named"`
 	RETVAL=$?
 	if [ "$RETVAL" -eq 0 ]; then 
 	    /usr/sbin/rndc reload >/dev/null 2>&1 || /bin/kill -HUP $p;
 	    RETVAL=$?
         fi
-	[ "$RETVAL" -eq 0 ] && success $"named reload" || failure $"named reload"
+	[ "$RETVAL" -eq 0 ] && success $"$named reload" || failure $"$named reload"
         echo
 	return $RETVAL
 }


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