rpms/bind/devel bind-96-temporary-libbind.patch, NONE, 1.1 .cvsignore, 1.45, 1.46 bind.spec, 1.284, 1.285 named.init, 1.68, 1.69 sources, 1.54, 1.55 bind-9.5-dbus-leak.patch, 1.1, NONE bind-9.5-dbus-va_end.patch, 1.1, NONE bind-9.5-dbus_archdep_libdir.patch, 1.1, NONE bind-9.5.0-dbus.patch, 1.1, NONE bind-chroot-admin.in, 1.30, NONE named-dbus.conf, 1.1, NONE named.service, 1.1, NONE namedGetForwarders, 1.3, NONE namedSetForwarders, 1.1, NONE
Adam Tkac
atkac at fedoraproject.org
Mon Nov 10 16:37:17 UTC 2008
Author: atkac
Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20765
Modified Files:
.cvsignore bind.spec named.init sources
Added Files:
bind-96-temporary-libbind.patch
Removed Files:
bind-9.5-dbus-leak.patch bind-9.5-dbus-va_end.patch
bind-9.5-dbus_archdep_libdir.patch bind-9.5.0-dbus.patch
bind-chroot-admin.in named-dbus.conf named.service
namedGetForwarders namedSetForwarders
Log Message:
- 9.6.0b1 release
- don't build ODBC and Berkeley DB DLZ drivers
- end of bind-chroot-admin script, copy config files to chroot manually
- /proc doesn't have to be mounted to chroot
- temporary use libbind from 9.5 series, noone has been released for 9.6 yet
- removed all deprecated stuff from CVS
bind-96-temporary-libbind.patch:
--- NEW FILE bind-96-temporary-libbind.patch ---
diff -up bind-9.6.0b1/configure.in.libbind bind-9.6.0b1/configure.in
--- bind-9.6.0b1/configure.in.libbind 2008-11-10 15:43:33.000000000 +0100
+++ bind-9.6.0b1/configure.in 2008-11-10 15:43:51.000000000 +0100
@@ -23,6 +23,8 @@ AC_REVISION($Revision: 1.456 $)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.59)
+AC_CONFIG_SUBDIRS(lib/bind)
+
AC_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore 24 Sep 2008 09:00:03 -0000 1.45
+++ .cvsignore 10 Nov 2008 16:36:46 -0000 1.46
@@ -1,4 +1,5 @@
config-4.tar.bz2
libbind-man.tar.gz
bind-chroot.tar.bz2
-bind-9.5.1b2.tar.gz
+bind-9.6.0b1.tar.gz
+libbind-9.5.1b2.tar.bz2
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- bind.spec 3 Nov 2008 11:36:03 -0000 1.284
+++ bind.spec 10 Nov 2008 16:36:46 -0000 1.285
@@ -2,13 +2,12 @@
# Red Hat BIND package .spec file
#
-%define PREVER b2
+%define PREVER b1
%define VERSION %{version}%{PREVER}
%{?!SDB: %define SDB 1}
%{?!LIBBIND: %define LIBBIND 1}
%{?!test: %define test 0}
-%{?!WITH_DBUS: %define WITH_DBUS 0} # + dynamic forwarder table management with D-BUS
%{?!bind_uid: %define bind_uid 25}
%{?!bind_gid: %define bind_gid 25}
%{?!GSSTSIG: %define GSSTSIG 1}
@@ -18,8 +17,8 @@
Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
Name: bind
License: ISC
-Version: 9.5.1
-Release: 0.8.4.%{PREVER}%{?dist}
+Version: 9.6.0
+Release: 0.1.%{PREVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,18 +33,19 @@
Source7: bind-9.3.1rc1-sdb_tools-Makefile.in
Source8: dnszone.schema
Source9: libbind-man.tar.gz
-Source10: named-dbus.conf
-Source11: named.service
Source12: README.sdb_pgsql
-Source13: namedSetForwarders
-Source14: namedGetForwarders
Source21: Copyright.caching-nameserver
-Source22: bind-chroot-admin.in
Source24: libbind.pc
Source25: named.conf.sample
Source28: config-4.tar.bz2
Source30: ldap2zone.c
+%if %{LIBBIND}
+# XXX libbind is going to be a separate product in 9.6 series but it wasn't
+# released yet. Use libbind from 9.5 series
+Source31: libbind-9.5.1b2.tar.bz2
+%endif
+
# Common patches
Patch0: bind-9.2.0rc3-varrun.patch
Patch1: bind-9.3.3rc2-rndckey.patch
@@ -58,6 +58,9 @@
Patch87: bind-9.5-parallel-build.patch
Patch95: bind-95-sdlz-include.patch
Patch96: bind-95-rh469440.patch
+%if %{LIBBIND}
+Patch97: bind-96-temporary-libbind.patch
+%endif
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -67,12 +70,6 @@
# needs inpection
Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
-# D-BUS patches
-Patch15: bind-9.5.0-dbus.patch
-Patch23: bind-9.5-dbus_archdep_libdir.patch
-Patch81: bind-9.5-dbus-leak.patch
-Patch82: bind-9.5-dbus-va_end.patch
-
# IDN paches
Patch73: bind-9.5-libidn.patch
Patch83: bind-9.5-libidn2.patch
@@ -90,10 +87,6 @@
BuildRequires: libidn-devel
%if %{SDB}
BuildRequires: openldap-devel, postgresql-devel, sqlite-devel, mysql-devel
-BuildRequires: db4-devel unixODBC-devel
-%endif
-%if %{WITH_DBUS}
-BuildRequires: dbus-devel
%endif
%if %{test}
BuildRequires: net-tools
@@ -176,6 +169,14 @@
%prep
%setup -q -n %{name}-%{VERSION}
+%if %{LIBBIND}
+# XXX temporary libbind workaround
+pushd lib
+tar xf %{SOURCE31}
+popd
+sed -i 's/SUBDIRS\(.*\)/SUBDIRS\1 lib\/bind/' Makefile.in
+%endif
+
# Common patches
%patch0 -p1 -b .varrun
%patch1 -p1 -b .key
@@ -208,23 +209,11 @@
%endif
%if %{LIBBIND}
%patch13 -p1 -b .fix_libbind_includedir
-%endif
-%if %{WITH_DBUS}
-%patch15 -p1 -b .dbus
-%patch23 -p1 -b .dbus_archdep_libdir
-%patch81 -p1 -b .leak
-%patch82 -p1 -b .va_end
+%patch97 -p1 -b .temporary-libbind
%endif
%if %{SDB}
%patch17 -p1 -b .fix_sdb_ldap
%endif
-%if %{WITH_DBUS}
-#
-# 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
-%endif
%if %{SDB}
%patch62 -p1 -b .sdb-sqlite-bld
%endif
@@ -251,8 +240,8 @@
%build
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
-export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-export STD_CDEFINES="$CPPFLAGS"
+export CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED -D_GNU_SOURCE"
+export STD_CFLAGS="$CPPFLAGS"
sed -i -e \
's/RELEASEVER=\(.*\)/RELEASEVER=\1-RedHat-%{version}-%{release}/' \
@@ -260,13 +249,6 @@
libtoolize -c -f; aclocal --force; autoheader -f; autoconf -f
-%if %{WITH_DBUS}
-%ifarch s390x x86_64 ppc64 sparc64
-# every 64-bit arch EXCEPT ia64 has dbus architecture dependant
-# includes in /usr/lib64/dbus-1.0/include
-export DBUS_ARCHDEP_LIBDIR=lib64
-%endif
-%endif
if pkg-config openssl ; then
export CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
@@ -280,17 +262,11 @@
--with-pic \
--disable-static \
--disable-openssl-version-check \
- --enable-getifaddrs=glibc \
-%if %{LIBBIND}
- --enable-libbind \
-%endif
%if %{SDB}
--with-dlz-ldap=yes \
--with-dlz-postgres=yes \
--with-dlz-mysql=yes \
--with-dlz-filesystem=yes \
- --with-dlz-odbc=yes \
- --with-dlz-bdb=yes \
%endif
%if %{GSSTSIG}
--with-gssapi=yes \
@@ -346,13 +322,10 @@
tar --no-same-owner -jxvf %{SOURCE6} --directory ${RPM_BUILD_ROOT}/%{chroot_prefix}
# these are required to prevent them being erased during upgrade of previous
# versions that included them (bug #130121):
-touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/named.conf
-touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/named.rfc1912.zones
-touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/rndc.key
touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/null
touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/random
touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/zero
-touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/var/log/named.log
+touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/localtime
#end chroot
make DESTDIR=${RPM_BUILD_ROOT} install
@@ -373,14 +346,6 @@
mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig
install -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libbind.pc
%endif
-%if %{WITH_DBUS}
-mkdir -p ${RPM_BUILD_ROOT}/etc/dbus-1/system.d
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/dbus-1/services
-cp -fp %{SOURCE10} ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/named.conf
-cp -fp %{SOURCE11} ${RPM_BUILD_ROOT}%{_datadir}/dbus-1/services/named.service
-cp -fp %{SOURCE13} ${RPM_BUILD_ROOT}%{_sbindir}/namedSetForwarders
-cp -fp %{SOURCE14} ${RPM_BUILD_ROOT}%{_sbindir}/namedGetForwarders
-%endif
# Files required to run test-suite outside of build tree:
cp -fp config.h ${RPM_BUILD_ROOT}/%{_includedir}/bind9
@@ -398,17 +363,10 @@
# configuration files:
tar -C ${RPM_BUILD_ROOT} -xjf %{SOURCE28}
-for f in /etc/named.conf /var/named/{named.ca,named.localhost,named.loopback,named.empty}; do
- touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/$f;
-done
install -m 644 %{SOURCE5} ./rfc1912.txt
install -m 644 %{SOURCE21} ./Copyright
-# bind-chroot-admin script:
-sed -e 's^@BIND_CHROOT_PREFIX@^'%{chroot_prefix}'^;s^@BIND_DIR@^'%{bind_dir}'^' < %{SOURCE22} > bind-chroot-admin;
-install -m 755 bind-chroot-admin ${RPM_BUILD_ROOT}/%{_sbindir}
-
# sample bind configuration files for %doc:
mkdir -p sample/etc sample/var/named/{data,slaves}
install -m 644 %{SOURCE25} sample/etc/named.conf
@@ -438,7 +396,6 @@
# rndc.key has to have correct perms and ownership, CVE-2007-6283
[ -e /etc/rndc.key ] && chown root:named /etc/rndc.key
[ -e /etc/rndc.key ] && chmod 0640 /etc/rndc.key
- [ -x /usr/sbin/bind-chroot-admin ] && /usr/sbin/bind-chroot-admin --sync;
fi
:;
@@ -477,7 +434,14 @@
%post chroot
if [ "$1" -gt 0 ]; then
- /usr/sbin/bind-chroot-admin --enable > /dev/null 2>&1;
+ [ -e %{chroot_prefix}/dev/random ] || \
+ /bin/mknod %{chroot_prefix}/dev/random c 1 8
+ [ -e %{chroot_prefix}/dev/zero ] || \
+ /bin/mknod %{chroot_prefix}/dev/zero c 1 5
+ [ -e %{chroot_prefix}/dev/zero ] || \
+ /bin/mknod %{chroot_prefix}/dev/null c 1 3
+ rm -f %{chroot_prefix}/etc/localtime
+ cp /etc/localtime %{chroot_prefix}/etc/localtime
fi;
:;
@@ -489,7 +453,8 @@
%preun chroot
if [ "$1" -eq 0 ]; then
- /usr/sbin/bind-chroot-admin --disable > /dev/null 2>&1;
+ rm -f %{chroot_prefix}/dev/{random,zero,null}
+ rm -f %{chroot_prefix}/etc/localtime
fi
:;
@@ -549,13 +514,6 @@
%doc sample/
%doc Copyright
%doc rfc1912.txt
-%if %{WITH_DBUS}
-%doc contrib/dbus/README.DBUS
-%config %{_sysconfdir}/dbus-1/system.d/named.conf
-%config %{_datadir}/dbus-1/services/named.service
-%{_sbindir}/namedGetForwarders
-%{_sbindir}/namedSetForwarders
-%endif
%if %{SDB}
%files sdb
@@ -607,20 +565,14 @@
%endif
%files chroot
+
%defattr(0640,root,named,0750)
%dir %{chroot_prefix}
%dir %{chroot_prefix}/dev
%dir %{chroot_prefix}/etc
-%ghost %config(noreplace) %{chroot_prefix}/etc/named.conf
-%ghost %config(noreplace) %{chroot_prefix}/etc/named.rfc1912.zones
-%ghost %config(noreplace) %{chroot_prefix}/etc/rndc.key
%dir %{chroot_prefix}/var
-%dir %{chroot_prefix}/var/run
-%dir %{chroot_prefix}/var/named
-%ghost %config %{chroot_prefix}/var/named/named.ca
-%ghost %config %{chroot_prefix}/var/named/named.localhost
-%ghost %config %{chroot_prefix}/var/named/named.loopback
-%ghost %config %{chroot_prefix}/var/named/named.empty
+%dir %{chroot_prefix}/var/run
+%dir %{chroot_prefix}/var/named
%defattr(0660,named,named,0770)
%dir %{chroot_prefix}/var/named/slaves
%dir %{chroot_prefix}/var/named/data
@@ -628,14 +580,20 @@
%dir %{chroot_prefix}/var/run/named
%dir %{chroot_prefix}/var/tmp
%dir %{chroot_prefix}/var/log
-%ghost %{chroot_prefix}/var/log/named.log
+%defattr(-,root,root,-)
%ghost %{chroot_prefix}/dev/null
%ghost %{chroot_prefix}/dev/random
%ghost %{chroot_prefix}/dev/zero
-%defattr(-,root,root,-)
-%{_sbindir}/bind-chroot-admin
+%ghost %{chroot_prefix}/etc/localtime
%changelog
+* Mon Nov 10 2008 Adam Tkac <atkac redhat com> 32:9.6.0-0.1.b1
+- 9.6.0b1 release
+- don't build ODBC and Berkeley DB DLZ drivers
+- end of bind-chroot-admin script, copy config files to chroot manually
+- /proc doesn't have to be mounted to chroot
+- temporary use libbind from 9.5 series, noone has been released for 9.6 yet
+
* Mon Nov 03 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.8.4.b2
- dig/host: use only IPv4 addresses when -4 option is specified (#469440)
Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- named.init 13 May 2008 07:09:15 -0000 1.68
+++ named.init 10 Nov 2008 16:36:47 -0000 1.69
@@ -84,17 +84,6 @@
OPTIONS="${OPTIONS} -t ${ROOTDIR}"
ckcf_options="$ckcf_options -t ${ROOTDIR}";
[ -s /etc/localtime ] && cp -fp /etc/localtime ${ROOTDIR}/etc/localtime;
- [ -d ${ROOTDIR}/proc ] || mkdir -p ${ROOTDIR}/proc;
- if ! egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then
- mount --bind -n /proc ${ROOTDIR}/proc >/dev/null 2>&1;
- fi
- if [ ! -z $dbusEnabled ]; then
- if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then
- mkdir -p ${ROOTDIR}/var/run/dbus
- [ -d /var/run/dbus ] || mkdir -p /var/run/dbus;
- mount --bind -n /var/run/dbus ${ROOTDIR}/var/run/dbus > /dev/null 2>&1;
- fi;
- fi;
fi
RETVAL=0
@@ -160,17 +149,6 @@
rm -f /var/run/{named,named-sdb}.pid
fi;
- # unmount mounted filesystems/directories
- if [ -n "${ROOTDIR}" -a "x${ROOTDIR}" != "x/" ]; then
- if egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then
- umount ${ROOTDIR}/proc >/dev/null 2>&1
- fi
- if [ ! -z $dbusEnabled ]; then
- if egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then
- umount ${ROOTDIR}/var/run/dbus > /dev/null 2>&1
- fi;
- fi;
- fi;
if [ $RETVAL -eq 0 ]; then
success
else
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources 24 Sep 2008 09:00:04 -0000 1.54
+++ sources 10 Nov 2008 16:36:47 -0000 1.55
@@ -1,4 +1,5 @@
de68e10e91e05ab100be879b5bcaa6cb config-4.tar.bz2
13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz
4faa4395b955e5f8a3d50f308b9fabc8 bind-chroot.tar.bz2
-7c2ca5b5c49b6259498a3822142afd34 bind-9.5.1b2.tar.gz
+29d868ead2c985f522e2edf6c5152310 bind-9.6.0b1.tar.gz
+3d1dad3630ec3510c8ab0ac2217a3317 libbind-9.5.1b2.tar.bz2
--- bind-9.5-dbus-leak.patch DELETED ---
--- bind-9.5-dbus-va_end.patch DELETED ---
--- bind-9.5-dbus_archdep_libdir.patch DELETED ---
--- bind-9.5.0-dbus.patch DELETED ---
--- bind-chroot-admin.in DELETED ---
--- named-dbus.conf DELETED ---
--- named.service DELETED ---
--- namedGetForwarders DELETED ---
--- namedSetForwarders DELETED ---
More information about the fedora-extras-commits
mailing list