[arch-commits] Commit in dnsutils/trunk (PKGBUILD remove-bind.patch tools-only.patch)

Gaetan Bisson bisson at archlinux.org
Mon Aug 29 05:30:12 UTC 2011


    Date: Monday, August 29, 2011 @ 01:30:11
  Author: bisson
Revision: 136401

implement FS#25801

Added:
  dnsutils/trunk/remove-bind.patch
Modified:
  dnsutils/trunk/PKGBUILD
Deleted:
  dnsutils/trunk/tools-only.patch

-------------------+
 PKGBUILD          |   32 ++++++++++++++++++--------------
 remove-bind.patch |   25 +++++++++++++++++++++++++
 tools-only.patch  |   25 -------------------------
 3 files changed, 43 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-29 05:28:19 UTC (rev 136400)
+++ PKGBUILD	2011-08-29 05:30:11 UTC (rev 136401)
@@ -8,45 +8,49 @@
 # 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'
+pkgdesc='DNS utilities: dig host nslookup'
+url='http://www.isc.org/software/bind/'
+license=('custom:ISC')
 arch=('i686' 'x86_64')
-url='https://www.isc.org/software/bind'
-license=('custom:ISC')
 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 ../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'
 
-	patch -p1 -i ../tools-only.patch
-	export STD_CDEFINES='-DDIG_SIGCHASE'
-
 	./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"
 }

Added: remove-bind.patch
===================================================================
--- remove-bind.patch	                        (rev 0)
+++ remove-bind.patch	2011-08-29 05:30:11 UTC (rev 136401)
@@ -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@

Deleted: tools-only.patch
===================================================================
--- tools-only.patch	2011-08-29 05:28:19 UTC (rev 136400)
+++ tools-only.patch	2011-08-29 05:30:11 UTC (rev 136401)
@@ -1,25 +0,0 @@
-diff -Naur bind-9.7.1-P2.orig/bin/Makefile.in bind-9.7.1-P2/bin/Makefile.in
---- bind-9.7.1-P2.orig/bin/Makefile.in	2009-10-05 08:07:08.000000000 -0400
-+++ bind-9.7.1-P2/bin/Makefile.in	2010-07-22 15:55:00.000000000 -0400
-@@ -19,8 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
--		check confgen @PKCS11_TOOLS@
-+SUBDIRS =	dig nsupdate
- TARGETS =
- 
- @BIND9_MAKE_RULES@
-diff -Naur bind-9.7.1-P2.orig/lib/Makefile.in bind-9.7.1-P2/lib/Makefile.in
---- bind-9.7.1-P2.orig/lib/Makefile.in	2007-06-19 19:47:13.000000000 -0400
-+++ bind-9.7.1-P2/lib/Makefile.in	2010-07-22 15:56:29.000000000 -0400
-@@ -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@




More information about the arch-commits mailing list