[arch-commits] Commit in bind/trunk (PKGBUILD sysusers.conf)

[Sébastien Luttringer]

    Date: Friday, June 12, 2015 @ 01:23:37
  Author: seblu
Revision: 240615

upgpkg: bind 9.10.2.P1-1

- merge dnsutils in bind-tools
- fix FS#45228

Modified:
  bind/trunk/PKGBUILD
  bind/trunk/sysusers.conf

---------------+
 PKGBUILD      |   65 ++++++++++++++++++++++++++++++++++++++------------------
 sysusers.conf |    2 -
 2 files changed, 46 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-11 20:45:56 UTC (rev 240614)
+++ PKGBUILD	2015-06-11 23:23:37 UTC (rev 240615)
@@ -4,23 +4,17 @@
 # Contributor: judd <jvinet at zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq at hotmail.com>
 
-pkgname=bind
-_pkgver=9.10.2
+pkgbase=bind
+pkgname=(bind bind-tools)
+_pkgver=9.10.2-P1
 pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='The ISC BIND nameserver'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
 arch=('i686' 'x86_64')
 options=('!emptydirs')
-depends=('openssl' 'krb5' 'libxml2' 'libcap')
-provides=('dns-server')
-backup=('etc/named.conf'
-        'var/named/127.0.0.zone'
-        'var/named/localhost.zone'
-        'var/named/localhost.ip6.zone'
-        'var/named/empty.zone')
-install=$pkgname.install
+makedepends=('libcap' 'libxml2' 'zlib' 'krb5' 'e2fsprogs' 'openssl' 'readline'
+ 'idnkit' 'geoip' 'dnssec-anchors' 'python')
 validpgpkeys=('2B48A38AE1CF9886435F89EE45AC7857189CDBC5'
               'ADBE9446286C794905F1E0756FA6EBC9911A4C02') #ISC, Inc
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc}
@@ -32,10 +26,10 @@
         'localhost.ip6.zone'
         '127.0.0.zone'
         'empty.zone')
-sha1sums=('4ddb2670976c06af7e86352616383958d82c51ce'
+sha1sums=('1c25e0d3faeac4c78ef338e7a6f1145f53d973f3'
           'SKIP'
           'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
-          '6bebf4ff8ca4482a83f4d3dbf176d9bffd89eefa'
+          '9537f4835a1f736788d0733c7996a10db2d4eee4'
           'c017aae379c32c7cb1aa1ad84776b83e3a5c139f'
           'cb2e81b4cbf9efafb3e81e3752f0154e779cc7ec'
           '6704303a6ed431a29b1d8fe7b12decd4d1f2f50f'
@@ -44,9 +38,6 @@
           '4f4457b310cbbeadca2272eced062a9c2b2b42fe')
 
 prepare() {
-  # remove dig to avoid conflict with dnsutils
-  sed -i 's/dig//' $pkgname-$_pkgver/bin/Makefile.in
-
   msg2 'Getting a fresh version of root DNS'
   # no more using source array, lack of versioning.
   curl -o root.hint http://www.internic.net/zones/named.root
@@ -61,6 +52,10 @@
     --sbindir=/usr/bin \
     --localstatedir=/var \
     --disable-static \
+    --with-python=/usr/bin/python \
+    --with-geoip \
+    --with-ipv6 \
+    --with-idn \
     --with-openssl \
     --with-libxml2 \
     --with-libtool
@@ -67,12 +62,24 @@
   make
 }
 
-package() {
-  pushd "bind-$_pkgver"
+package_bind() {
+  pkgdesc='The ISC DNS Server'
+  provides=('dns-server')
+  depends=('glibc' 'libxml2' 'libcap' 'openssl' 'geoip' 'bind-tools')
+  backup=('etc/named.conf'
+          'var/named/127.0.0.zone'
+          'var/named/localhost.zone'
+          'var/named/localhost.ip6.zone'
+          'var/named/empty.zone')
+  install=$pkgname.install
+
+  cd "bind-$_pkgver"
   install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  make DESTDIR="$pkgdir" install
-  popd
+  for _d in bin/{check,confgen,named,rndc}; do
+    (cd "$_d" && make DESTDIR="$pkgdir" install)
+  done
 
+  cd "$srcdir"
   install -D -m644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
   install -D -m644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 
@@ -87,4 +94,22 @@
   install    -m640 -o 0 -g 40 empty.zone "$pkgdir/var/named"
 }
 
+package_bind-tools() {
+  pkgdesc='The ISC DNS tools'
+  depends=('glibc' 'libcap' 'libxml2' 'zlib' 'krb5' 'e2fsprogs' 'openssl'
+    'readline' 'geoip' 'idnkit' 'dnssec-anchors')
+  optdepends=('python: for python scripts')
+  conflicts=('dnsutils')
+  replaces=('dnsutils' 'host')
+  provides=("dnsutils=$pkgver")
+
+  cd "bind-$_pkgver"
+  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  make DESTDIR="$pkgdir" SUBDIRS="" install
+  (cd lib && make DESTDIR="$pkgdir" install)
+  for _d in bin/{dig,dnssec,delv,nsupdate,python,tools}; do
+    (cd "$_d" && make DESTDIR="$pkgdir" install)
+  done
+}
+
 # vim:set ts=2 sw=2 et:

Modified: sysusers.conf
===================================================================
--- sysusers.conf	2015-06-11 20:45:56 UTC (rev 240614)
+++ sysusers.conf	2015-06-11 23:23:37 UTC (rev 240615)
@@ -1 +1 @@
-u named 40 "BIND DNS Server" /var/named
+u named 40 "BIND DNS Server" -