[arch-commits] Commit in bind/trunk (7 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Sat Apr 27 23:58:00 UTC 2013
Date: Sunday, April 28, 2013 @ 01:58:00
Author: seblu
Revision: 89201
- syntax cleanup
- remove services
- use prepare func
Added:
bind/trunk/01-remove-tools.patch
(from rev 89200, bind/trunk/remove-tools.patch)
bind/trunk/bind.install
(from rev 89200, bind/trunk/install)
Modified:
bind/trunk/PKGBUILD
Deleted:
bind/trunk/install
bind/trunk/named
bind/trunk/named.conf.d
bind/trunk/remove-tools.patch
-----------------------+
01-remove-tools.patch | 12 +++++++
PKGBUILD | 82 +++++++++++++++++++++++-------------------------
bind.install | 21 ++++++++++++
install | 21 ------------
named | 49 ----------------------------
named.conf.d | 4 --
remove-tools.patch | 12 -------
7 files changed, 73 insertions(+), 128 deletions(-)
Copied: bind/trunk/01-remove-tools.patch (from rev 89200, bind/trunk/remove-tools.patch)
===================================================================
--- 01-remove-tools.patch (rev 0)
+++ 01-remove-tools.patch 2013-04-27 23:58:00 UTC (rev 89201)
@@ -0,0 +1,12 @@
+diff -aur old/bin/Makefile.in new/bin/Makefile.in
+--- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700
++++ new/bin/Makefile.in 2011-08-28 19:14:17.025674400 -0700
+@@ -19,7 +19,7 @@
+ VPATH = @srcdir@
+ top_srcdir = @top_srcdir@
+
+-SUBDIRS = named rndc dig dnssec tests tools nsupdate \
++SUBDIRS = named rndc dnssec tests tools nsupdate \
+ check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
+ TARGETS =
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-27 22:51:06 UTC (rev 89200)
+++ PKGBUILD 2013-04-27 23:58:00 UTC (rev 89201)
@@ -1,12 +1,13 @@
# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Sébastien Luttringer
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
# Contributor: judd <jvinet at zeroflux.org>
# Contributor: Mario Vazquez <mario_vazq at hotmail.com>
pkgname=bind
_pkgver=9.9.2-P2
pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=2
pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
url='http://www.isc.org/software/bind/'
license=('custom:ISC')
@@ -15,71 +16,68 @@
depends=('openssl' 'krb5' 'libxml2')
source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
'root.hint::http://www.internic.net/zones/named.root'
- 'remove-tools.patch'
'tmpfiles.d'
- 'named'
'named.conf'
- 'named.conf.d'
'named.service'
'named.logrotate'
'localhost.zone'
- '127.0.0.zone')
+ '127.0.0.zone'
+ '01-remove-tools.patch')
sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d'
'029f89c49550c40ec7a95116b6a33f0e5a041094'
- '14264affa71bcfe7703d0fb7c3556c4c47efaa8b'
'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
- '47f9ac4f6f70bc9167c1cf7859a298531197ad20'
'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
- '7848edbfb9a848843f57c11c02b0289eefd42d00'
'7de92fff4b90c4821b3b133a05affd186fb93951'
'3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
'76a0d4cd1b913db177a5a375bebc47e5956866ec'
- '53be0f1437ebe595240d8dbdd819939582b97fb9')
+ '53be0f1437ebe595240d8dbdd819939582b97fb9'
+ '14264affa71bcfe7703d0fb7c3556c4c47efaa8b')
provides=('dns-server')
-install=install
+install=$pkgname.install
backup=('etc/logrotate.d/named'
'etc/conf.d/named'
'etc/named.conf')
+prepare() {
+ patch -p1 -d bind-$_pkgver < 01-remove-tools.patch
+}
+
build() {
- cd "${srcdir}/bind-${_pkgver}"
-
- patch -p1 -i ../remove-tools.patch
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static \
- --disable-linux-caps \
- --with-openssl \
- --with-libxml2 \
- --with-libtool \
-
- make
+ cd bind-$_pkgver
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-linux-caps \
+ --with-openssl \
+ --with-libxml2 \
+ --with-libtool
+ make
}
package() {
- cd "${srcdir}/bind-${_pkgver}"
+ cd "bind-$_pkgver"
- install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- make DESTDIR="${pkgdir}" install
+ make DESTDIR="$pkgdir" install
- rmdir "${pkgdir}/var/run"
- install -d "${pkgdir}"/usr/share/doc/bind
- install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
+ rmdir "$pkgdir/var/run"
+ install -d "$pkgdir/usr/share/doc/$pkgname"
+ install doc/arm/*.html "$pkgdir/usr/share/doc/$pkgname"
- install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
- install -D -m644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/named.conf
- install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
- install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service
- install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
- install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
+ cd "$srcdir"
+ install -D -m644 tmpfiles.d "$pkgdir/usr/lib/tmpfiles.d/named.conf"
+ install -D -m644 named.service "$pkgdir/usr/lib/systemd/system/named.service"
+ install -D -m600 named.logrotate "$pkgdir/etc/logrotate.d/named"
+ install -D -m640 -o 0 -g 40 named.conf "$pkgdir/etc/named.conf"
- install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
- install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named
- install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named
- install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named
+ install -d -m750 -o 0 -g 40 "$pkgdir/var/named"
+ install -m640 -o 0 -g 40 root.hint "$pkgdir/var/named"
+ install -m640 -o 0 -g 40 127.0.0.zone "$pkgdir/var/named"
+ install -m640 -o 0 -g 40 localhost.zone "$pkgdir/var/named"
}
+
+# vim:set ts=2 sw=2 et:
Copied: bind/trunk/bind.install (from rev 89200, bind/trunk/install)
===================================================================
--- bind.install (rev 0)
+++ bind.install 2013-04-27 23:58:00 UTC (rev 89201)
@@ -0,0 +1,21 @@
+post_install() {
+ getent group named &>/dev/null || groupadd -g 40 named
+ getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
+ passwd -l named &>/dev/null
+
+ touch var/log/named.log
+ chown named:named var/log/named.log
+
+ # create an rndc.key if it doesn't already exist
+ if [[ ! -s etc/rndc.key ]]; then
+ usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
+ chown root:named etc/rndc.key
+ chmod 640 etc/rndc.key
+ fi
+}
+
+pre_remove() {
+ getent passwd named &>/dev/null && userdel named >/dev/null
+ getent group named &>/dev/null && groupdel named >/dev/null
+ return 0
+}
Deleted: install
===================================================================
--- install 2013-04-27 22:51:06 UTC (rev 89200)
+++ install 2013-04-27 23:58:00 UTC (rev 89201)
@@ -1,21 +0,0 @@
-post_install() {
- getent group named &>/dev/null || groupadd -g 40 named
- getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
- passwd -l named &>/dev/null
-
- touch var/log/named.log
- chown named:named var/log/named.log
-
- # create an rndc.key if it doesn't already exist
- if [[ ! -s etc/rndc.key ]]; then
- usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
- chown root:named etc/rndc.key
- chmod 640 etc/rndc.key
- fi
-}
-
-pre_remove() {
- getent passwd named &>/dev/null && userdel named >/dev/null
- getent group named &>/dev/null && groupdel named >/dev/null
- return 0
-}
Deleted: named
===================================================================
--- named 2013-04-27 22:51:06 UTC (rev 89200)
+++ named 2013-04-27 23:58:00 UTC (rev 89201)
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/named
-
-PIDFILE=/run/named/named.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
-
-case "$1" in
- start)
- stat_busy "Starting BIND"
- [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon named
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping BIND"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon named
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- reload)
- stat_busy "Reloading BIND"
- [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|reload|restart}"
-esac
-exit 0
Deleted: named.conf.d
===================================================================
--- named.conf.d 2013-04-27 22:51:06 UTC (rev 89200)
+++ named.conf.d 2013-04-27 23:58:00 UTC (rev 89201)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to BIND
-#
-NAMED_ARGS="-u named"
Deleted: remove-tools.patch
===================================================================
--- remove-tools.patch 2013-04-27 22:51:06 UTC (rev 89200)
+++ remove-tools.patch 2013-04-27 23:58:00 UTC (rev 89201)
@@ -1,12 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in 2011-08-28 19:14:17.025674400 -0700
-@@ -19,7 +19,7 @@
- VPATH = @srcdir@
- top_srcdir = @top_srcdir@
-
--SUBDIRS = named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS = named rndc dnssec tests tools nsupdate \
- check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
- TARGETS =
-
More information about the arch-commits
mailing list