bind: update to 9.9.4

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7883 ec354946-7b23-47d6-9f5a-488ba84defc7

b/bind/bind-vl.spec

@@ -1,39 +1,50 @@
 %define _localstatedir /var
 
-%define pversion 9.6.ESV.R8
-%define sversion 9.6-ESV-R8
+%define sname bind
+%define pname bind
+%define pversion 9.9.4
+%define sversion 9.9.4
 %define bind_epoch 1
+# fixed <BTS:VineLinux:1139>
+%define old_bind_version 1:9.9.2p2-1vl7
 
 %define bind_uid  25
 %define bind_gid  25
 
 Summary: A DNS (Domain Name System) server.
 Summary(ja): DNS (Domain Name System) サーバ
-Name: bind
+Name: %{pname}
 Version: %{pversion}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
+Epoch: %{bind_epoch}
 License: distributable
 Group: System Environment/Daemons
-Source: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{sversion}.tar.gz
+Source: ftp://ftp.isc.org/isc/bind9/%{version}/%{sname}-%{sversion}.tar.gz
 Source1: bind-manpages.tar.bz2
 Source2: named.sysconfig
 Source3: named.init
 Source4: named.logrotate
 Source5: keygen.c
-Url: http://www.isc.org/bind.html
+URL: http://www.isc.org/bind.html
 Patch1: bind-9.3.3rc2-rndckey.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: openssl-devel glibc-devel libtool
-BuildRequires: libxml2-devel libcap-devel
-Requires(pre): chkconfig, sh-utils, textutils, fileutils, shadow-utils, perl, sed
-Requires(pre): bind-utils = %{bind_epoch}:%{version}-%{release}
-Requires: bind-libs = %{bind_epoch}:%{version}-%{release}
+BuildRequires: libxml2-devel
+BuildRequires: libcap-devel
+Requires: %{pname}-libs = %{bind_epoch}:%{version}-%{release}
+Requires(pre): shadow-utils
+Requires(post): %{pname}-utils = %{bind_epoch}:%{version}-%{release}
+Requires(post): coreutils, chkconfig
+Requires(preun): initscripts, chkconfig
+#Requires(triggerpostun): chkconfig
 Conflicts: bind9 <= 9.2.1-0vl5, bind-current
 Obsoletes: bind9 <= 9.2.1-0vl5
-epoch: %{bind_epoch}
+Obsoletes: bind-current < 1:9.9.4-1
 
 Vendor: Project Vine
 Distribution: Vine Linux
+Packager: daisuke
 
 %description
 BIND (Berkeley Internet Name Domain) is an implementation of the DNS
@@ -55,6 +66,7 @@ the caching-nameserver package.
 %package libs
 Summary: Libraries used by various DNS packages
 Group: System Environment/Libraries
+Obsoletes: bind-current-libs <= %{old_bind_version}
 
 %description libs
 Contains libraries used by both the bind server package as well as the utils packages.
@@ -64,10 +76,11 @@ Contains libraries used by both the bind server package as well as the utils pac
 Summary: Utilities for querying DNS name servers.
 Summary(ja): DNS ネームサーバに問い合わせをするユーティリティ
 Group: Applications/System
-Requires: bind-libs = %{bind_epoch}:%{version}-%{release}
-Conflicts: bind9-utils <= 9.2.1-0vl5, bind-current-utils
+Requires: %{pname}-libs = %{bind_epoch}:%{version}-%{release}
+Conflicts: bind9-utils <= 9.2.1-0vl5
+Conflicts: bind-current-utils
 Obsoletes: bind9-utils <= 9.2.1-0vl5
-
+Obsoletes: bind-current-utils <= %{old_bind_version}
 
 %description utils
 Bind-utils contains a collection of utilities for querying DNS (Domain
@@ -84,11 +97,12 @@ servers.
 Summary: Include files and libraries needed for bind DNS development.
 Summary(ja): bind DNS 開発に必要なインクルードファイルとライブラリ
 Group: Development/Libraries
-Requires: bind = %{bind_epoch}:%{version}-%{release}
-Requires: bind-libs = %{bind_epoch}:%{version}-%{release}
-Conflicts: bind9-devel <= 9.2.1-0vl5, bind-current-devel
+Requires: %{pname} = %{bind_epoch}:%{version}-%{release}
+Requires: %{pname}-libs = %{bind_epoch}:%{version}-%{release}
+Conflicts: bind9-devel <= 9.2.1-0vl5
+Conflicts: bind-current-devel
 Obsoletes: bind9-devel <= 9.2.1-0vl5
-
+Obsoletes: bind-current-devel <= %{old_bind_version}
 
 %description devel
 The bind-devel package contains all the include files and the 
@@ -103,12 +117,22 @@ bind.
 %prep
 %setup -n bind-%{sversion} -q
 %patch1 -p1 -b .key
+perl -pi -e 's/^(SUBDIRS =.+)dlzexternal(.+)$/\1\2/' bin/tests/system/Makefile.in
 
 %build
 libtoolize --copy --force
 aclocal
 autoconf
-%configure --with-libtool --with-openssl=/usr --enable-threads
+%configure \
+  --with-libtool \
+  --with-openssl=/usr \
+  --disable-openssl-version-ceck \
+  --enable-threads \
+  --enable-ipv6 \
+  --with-pic \
+  --with-dlz-dlopen \
+  --enable-filter-aaaa \
+  --enable-fixed-rrset
 make %{?_smp_mflags}
 
 %install
@@ -133,8 +157,7 @@ rm -f man5/named.conf.5.gz
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/named
 
-# fix permissions
-chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
+chmod +x %{buildroot}%{_libdir}/*.so.*
 
 %pre
 if [ "$1" -eq 1 ]; then
@@ -183,13 +206,19 @@ fi
 /sbin/chkconfig --add named
 /sbin/ldconfig
 
+%triggerpostun -- bind-current < 1:9.9.4-1
+/sbin/chkconfig --add named
+/sbin/ldconfig
+
 %clean
 rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 
 %files
@@ -201,6 +230,7 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 %config(noreplace) %{_sysconfdir}/sysconfig/named
 %config(noreplace) %attr(0640,root,named) %{_sysconfdir}/rndc.conf
 %config(noreplace) %attr(0640,root,named) %{_sysconfdir}/rndc.key
+%config(noreplace) %attr(0640,root,named) %{_sysconfdir}/bind.keys
 
 %{_sbindir}/dnssec*
 %{_sbindir}/lwresd
@@ -210,7 +240,14 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 %{_sbindir}/named-compilezone
 %{_sbindir}/rndc*
 %{_sbindir}/dns-keygen
-
+%{_sbindir}/arpaname
+%{_sbindir}/ddns-confgen
+%{_sbindir}/genrandom
+%{_sbindir}/isc-hmac-fixup
+%{_sbindir}/named-journalprint
+%{_sbindir}/nsec3hash
+
+%{_mandir}/man1/arpaname.1*
 %{_mandir}/man5/resolv.conf.5*
 %{_mandir}/man5/named.conf.5*
 %{_mandir}/man5/rndc.conf.5*
@@ -222,6 +259,11 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 %{_mandir}/man8/named-checkzone.8*
 %{_mandir}/man8/named-compilezone.8*
 %{_mandir}/man8/rndc-confgen.8*
+%{_mandir}/man8/ddns-confgen.8*
+%{_mandir}/man8/genrandom.8*
+%{_mandir}/man8/isc-hmac-fixup.8*
+%{_mandir}/man8/named-journalprint.8*
+%{_mandir}/man8/nsec3hash.8*
 
 %attr(-,named,named) %dir %{_var}/named
 %attr(-,named,named) %dir %{_var}/run/named
@@ -255,56 +297,61 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version}
 %{_bindir}/isc-config.sh
 
 %changelog
-* Thu Mar 28 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 9.6.ESV.R8-2
-- remove Conflicts from libs
+* Tue Oct 08 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 9.9.4-1
+- update to 9.9.4(ESV)
 
-* Wed Oct 10 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.6.ESV.R8-1
-- new upstream release with secrity fix (CVE-2012-5166) 
+* Thu Mar 28 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 9.9.2p2-1
+- update to 9.9.2-P2
+- remove .la
+- remove Conflicts/Obsoletes from libs subpackage.
+- add configure options
+  --enable-ipv6 --with-pic --enable-filter-aaaa --enable-fixed-rrset
 
-* Thu Sep 13 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 9.6.ESV.R7.P3-1
-- new upstream release with secrity fix (CVE-2012-4244)
+* Tue Dec 18 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.8.4p1-1
+- new upstream release.
+- added an option "--with-dlz-dlopen".
 
+* Tue May 31 2011 IWAI, Masaharu <iwai@alib.jp> 9.8.0p2-2
+- Obosoletes: bind.* < 1:9.6.ESV.R1
+ - fixed <BTS:VineLinux:1139>
 
-* Wed Jul 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 9.6.ESV.R7.P2-1
-- new upstream release with secrity fix (CVE-2012-3817)
-- fix permission of shared libs
-- remove .la
+* Sun May 29 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.8.0p2-1
+- new upstream release with security fix (CVE-2011-1910) 
 
-* Tue Jun  5 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.6.ESV.R7.P1-1
-- new upstream release with security fix (CVE-2012-1667)
+* Tue May 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 9.8.0p1-2
+- add BuildRequires: libxml2-devel, libcap-devel
 
-* Fri Nov 18 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.6.ESV.R5.P1-1
-- new upstream release with security fix (CVE-2011-4313) 
+* Mon May  9 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.8.0p1-1
+- new upstream release with security fix (CVE-2011-1907)
+- fix changelog typo
 
-* Wed Jul  6 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.6.ESV.R4.P3-1
-- new upstream release with security fix (CVE-2011-2464)
-- use hoge(pre) tags instead of old hogepre tags
+* Sat Apr 09 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 9.8.0-2
+- Obosoletes: bind.* < 1:9.6.ESV.R1
 
-* Sat May 28 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.6.ESV.R4.P1-1
-- new upstream release with security fix (CVE-2011-1910)
+* Thu Apr 07 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 9.8.0-1
+- update to 9.8.0
+- remove Provides: bind.* = %%{bind_epoch}:%{version}-%{release}
 
-* Thu Mar 31 2011 IWAI, Masaharu <iwai@alib.jp> 9.6.ESV.R4-1
-- new upstream release
-
-* Mon Jan 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 9.6.ESV.R2-4
+* Mon Jan 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 9.7.2P2-3
 - rebuild with openssl-1.0.0c
 
-* Fri Jan 07 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 9.6.ESV.R2-3
-- rebuild package
+* Sun Oct 24 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.7.2P2-2
+- fix Req: in bind package
 
-* Sun Oct 24 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.6.ESV.R2-2
-- change spec filename bind9-vl -> bind-vl
+* Wed Oct 20 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.7.2P2-1
+- change package name bind -> bind-current
+- add epoch 1
+- new upstream release
 
-* Thu Oct  7 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.6.ESV.R2-1
-- new upstream ESV release 
-- add BR: libxml2-devel libcap-devel
+* Sat Jul 17 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 9.7.1P2-1
+- new upstream release
 
-* Wed Aug 18 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.6.ESV.R1-2
-- add Conflicts bind-current
+* Fri Feb 12 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 9.6.1P3-4
+- rebuilt with gcc-4.4.3-3 on ppc
 
-* Tue Aug 17 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.6.ESV.R1-1
-- new upstream ESV release
-- add epoch 1 to upgrade from exist bind package
+* Sat Feb  6 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 9.6.1P3-3
+- rebuilt with new toolchains (for VineSeed)
+- s/BuildPrereq/BuildRequires/
 
 * Thu Jan 21 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 9.6.1P3-2
 - add man1/isc-config.sh.1 into devel file list