Thu Sep 1 23:14:36 UTC 2011

7 files changed, 57 insertions, 35 deletions

diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD
index 724bb5c4d..a436f93d4 100644
--- a/core/dnsutils/PKGBUILD
+++ b/core/dnsutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130510 2011-07-07 02:37:46Z bisson $
+# $Id: PKGBUILD 136711 2011-08-31 16:36:37Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: mario <mario_vazq@hotmail.com>
@@ -8,41 +8,49 @@ pkgname=dnsutils
 # Use a period and not a hyphen before the patch level for proper versioning.
 pkgver=9.8.0.P4
 _pkgver=9.8.0-P4
-pkgrel=1
+pkgrel=2
 
-pkgdesc='Various DNS utilities - dig host nslookup nsupdate'
-arch=('i686' 'x86_64')
-url='https://www.isc.org/software/bind'
+pkgdesc='DNS utilities: dig host nslookup'
+url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
+arch=('i686' 'x86_64')
 depends=('openssl' 'idnkit')
-replaces=('bind-tools' 'host')
 options=('!makeflags')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'tools-only.patch')
+        'remove-bind.patch')
 sha1sums=('969864200c1516a8bea54266de60f316d79182b4'
-          'ac88c89e25c26d73095a3dd85e1ca1070d184ded')
+          'b465ef6160b004838f04de9978fe1be8422af777')
+
+replaces=('bind-tools' 'host')
 
 build() {
 	cd "${srcdir}/bind-${_pkgver}"
 
-	patch -p1 -i ../tools-only.patch
+	patch -p1 -i ../remove-bind.patch
 	export STD_CDEFINES='-DDIG_SIGCHASE'
 
+	# hack to remove unused bloat from the binaries
+	CFLAGS+=' -fdata-sections -ffunction-sections'
+	LDFLAGS+=' -Wl,--gc-sections'
+
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--with-openssl=yes \
-		--with-idn=yes \
+		--disable-static \
 		--disable-linux-caps \
+		--with-openssl \
+		--with-idn \
 
 	make
 }
 
 package() {
-	cd "${srcdir}/bind-${_pkgver}/bin"
+	cd "${srcdir}/bind-${_pkgver}"
+
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
+	cd bin
 	make DESTDIR="${pkgdir}" install
 
-	install -Dm644 ../COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/core/dnsutils/remove-bind.patch b/core/dnsutils/remove-bind.patch
new file mode 100644
index 000000000..19d650964
--- /dev/null
+++ b/core/dnsutils/remove-bind.patch
@@ -0,0 +1,25 @@
+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:16:17.245495043 -0700
+@@ -19,8 +19,7 @@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
+-		check confgen @PKCS11_TOOLS@
++SUBDIRS =	dig
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
+diff -aur old/lib/Makefile.in new/lib/Makefile.in
+--- old/lib/Makefile.in	2007-06-19 16:47:13.000000000 -0700
++++ new/lib/Makefile.in	2011-08-28 19:17:50.828688599 -0700
+@@ -23,7 +23,7 @@
+ # Attempt to disable parallel processing.
+ .NOTPARALLEL:
+ .NO_PARALLEL:
+-SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
++SUBDIRS =	isc dns isccfg bind9 lwres
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD
index 21f3f6722..53e35fb32 100644
--- a/core/libevent/PKGBUILD
+++ b/core/libevent/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127366 2011-06-13 18:59:12Z eric $
+# $Id: PKGBUILD 136737 2011-08-31 19:39:15Z eric $
 # Maintainer: 
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=libevent
-pkgver=2.0.12
+pkgver=2.0.13
 pkgrel=1
 pkgdesc="An event notification library"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('openssl')
 optdepends=('python2: to use event_rpcgen.py')
 options=('!libtool')
 source=("http://www.monkey.org/~provos/libevent-$pkgver-stable.tar.gz")
-md5sums=('42986228baf95e325778ed328a93e070')
+md5sums=('af786b4b3f790c9d3279792edf7867fc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index 69ee72ca5..1bb34eb31 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 134117 2011-08-01 17:55:07Z tpowa $
+# $Id: PKGBUILD 136623 2011-08-31 07:26:31Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -7,7 +7,7 @@
 
 pkgname=nfs-utils
 pkgver=1.2.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'
@@ -28,9 +28,9 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
         kernel-3.0-segfault.patch)
 install=nfs-utils.install
 md5sums=('938dc0574f3eb9891a8ed4746f806277'
-         'fc508e10cdf5e8ddd80373b1b2bc99a1'
+         'dd0d65fc6e8f422fa12520813098264b'
          'f73f197a16b02c3e248488ec35c4cf43'
-         '5ae080f6117cef3140f02bc162bdc755'
+         'e619f18354ff958ed624d05d08853d8f'
          '2bf71def3263325643a09458635520f0'
          'ff585faf410a62c4333a027c50b56bae'
          'eb4f4027fab6fc1201f1ca04f5954c76'
diff --git a/core/nfs-utils/nfs-common b/core/nfs-utils/nfs-common
index 13742bde3..7b16b4b3c 100644
--- a/core/nfs-utils/nfs-common
+++ b/core/nfs-utils/nfs-common
@@ -2,9 +2,6 @@
 
 daemon_name=nfs-common
 
-# daemon dependencies
-DAEMON_DEPENDS=('rpcbind')
-
 NEED_STATD=
 STATD_OPTS=
 NEED_IDMAPD=
@@ -124,8 +121,7 @@ get_pid() {
 
 case "$1" in
   start)
-    ck_depends ${DAEMON_DEPENDS[@]}
-
+    ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; }
     rc=0
     if [ "$NEED_STATD" = yes ]; then
       stat_busy "Starting $STATD_DAEMON_NAME daemon"
diff --git a/core/nfs-utils/nfs-server b/core/nfs-utils/nfs-server
index 9574cbc12..6aa609d8c 100644
--- a/core/nfs-utils/nfs-server
+++ b/core/nfs-utils/nfs-server
@@ -2,9 +2,6 @@
 
 daemon_name=nfs-server
 
-# daemon dependencies
-DAEMON_DEPENDS=('nfs-common')
-
 NFSD_COUNT=
 NFSD_OPTS=
 NEED_SVCGSSD=
@@ -85,8 +82,7 @@ get_pid() {
 
 case "$1" in
   start)
-    ck_depends ${DAEMON_DEPENDS[@]}
-
+    ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; }
     rc=0
     stat_busy "Mounting nfsd filesystem"
     do_modprobe nfsd
diff --git a/core/nfsidmap/PKGBUILD b/core/nfsidmap/PKGBUILD
index f744598ce..a402e5c84 100644
--- a/core/nfsidmap/PKGBUILD
+++ b/core/nfsidmap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111577 2011-02-27 18:55:50Z tpowa $
+# $Id: PKGBUILD 136619 2011-08-31 07:19:40Z tpowa $
 # Maintainer: 
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=nfsidmap
 pkgver=0.24
-pkgrel=2
+pkgrel=3
 pkgdesc="Library to help mapping IDs, mainly for NFSv4"
 arch=('i686' 'x86_64')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
@@ -24,9 +24,6 @@ package() {
   cd $srcdir/lib$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 
-  # remove idmap manpage provided by nfs-utils!
-  rm $pkgdir/usr/share/man/man5/idmapd.conf.5
-
   # install license
   install -Dm644 COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE
 }