From ef02e1b8d43cddf0117874dbd4aef63ce5347d41 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 10 Feb 2019 03:08:41 -0200 Subject: [PATCH] bind: revert to 9.11.5 9.13.6 is Unstable-Development Revert "bind: update to 9.13.6" This reverts commit c67e7441f003df841343e3df6766d98aee618aba. --- common/shlibs | 14 +++++++------- srcpkgs/bind/template | 31 +++++++++++++++++++------------ 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/common/shlibs b/common/shlibs index 3d02fc5ce2..6e060392dc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1028,13 +1028,13 @@ libgssglue.so.1 libgssglue-0.3_1 libtirpc.so.3 libtirpc-1.0.2_1 librpcsecgss.so.3 librpcsecgss-0.19_1 libnfsidmap.so.0 libnfsidmap-0.24_1 -libbind9.so.1302 bind-libs-9.13.6_1 -libdns.so.1306 bind-libs-9.13.6_1 -libirs.so.1301 bind-libs-9.13.6_1 -libisc.so.1306 bind-libs-9.13.6_1 -libisccc.so.1302 bind-libs-9.13.6_1 -libisccfg.so.1302 bind-libs-9.13.6_1 -libns.so.1304 bind-libs-9.13.6_1 +libbind9.so.161 bind-libs-9.11.5_1 +libdns.so.1104 bind-libs-9.11.5_1 +libirs.so.161 bind-libs-9.11.5_1 +libisc.so.1100 bind-libs-9.11.5_1 +libisccc.so.161 bind-libs-9.11.5_1 +libisccfg.so.163 bind-libs-9.11.5_1 +liblwres.so.161 bind-libs-9.11.5_1 libplist.so.3 libplist-1.12_1 libplist++.so.3 libplist++-1.12_1 libnsbmp.so.0 libnsbmp-0.0.3_1 diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index 244bdaf563..177954a07f 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -1,26 +1,27 @@ # Template file for 'bind' pkgname=bind -version=9.13.6 -revision=1 +reverts="9.13.6_1" +version=9.11.5 +revision=6 _fullver="${version}${_patchver:+-${_patchver}}" wrksrc="${pkgname}-${_fullver}" build_style=gnu-configure configure_args="--disable-static --enable-threads --enable-largefile --with-libtool --enable-atomic --sysconfdir=/etc/named --enable-epoll --enable-ipv6 --with-randomdev=/dev/random --with-ecdsa=yes --with-eddsa=no - --with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --without-gssapi - --without-gost --without-python --enable-openssl-hash --with-readline - --with-tuning=default --enable-fetchlimit --enable-sit --with-libidn2 + --with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --without-gssapi --without-gost + --enable-openssl-hash --with-readline --with-tuning=default + --enable-fetchlimit --enable-sit --with-libidn2 $(vopt_enable seccomp) $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")" -hostmakedepends="automake libtool perl pkg-config" -makedepends="libressl-devel libxml2-devel libcap-devel readline-devel - libatomic-devel libidn2-devel $(vopt_if geoip geoip-devel)" +hostmakedepends="automake libtool perl" +makedepends="libressl-devel libxml2-devel libcap-devel readline-devel libatomic-devel + libidn2-devel $(vopt_if geoip geoip-devel) $(vopt_if seccomp libseccomp-devel)" short_desc="Berkeley Internet Name Domain server" maintainer="Juan RP " license="ISC" homepage="https://www.isc.org/software/bind/" distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.gz" -checksum=ae771f209fd807d6cb9db20e16ee96ec4ba44b2052cda8c4487ddacae124870e +checksum=a4cae11dad954bdd4eb592178f875bfec09fcc7e29fe0f6b7a4e5b5c6bc61322 conf_files="/etc/named/named.conf" system_accounts="named" @@ -28,9 +29,13 @@ named_descr="BIND DNS server" named_homedir="/var/named" make_dirs="/var/named 0770 root named" -build_options="geoip" +build_options="geoip seccomp" build_options_default="geoip" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" seccomp" +fi + pre_configure() { autoreconf -fi # disable bin tests for now. @@ -51,7 +56,7 @@ post_install() { bind-libs_package() { short_desc+=" - Runtime libraries" pkg_install() { - vmove usr/lib/lib*.so.* + vmove usr/lib/*.so.* } } @@ -70,9 +75,11 @@ bind-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/bin/isc-config.sh + vmove usr/bin/bind9-config vmove usr/share/man/man1/isc-config.sh.1 vmove usr/share/man/man1/bind9-config.1 vmove usr/include - vmove usr/lib/lib*.so + vmove usr/share/man/man3 + vmove usr/lib/*.so } }