[arch-commits] Commit in dnsutils/trunk (PKGBUILD bind.so_bsdcompat.diff)

[Gaetan Bisson]

    Date: Monday, December 20, 2010 @ 18:54:01
  Author: bisson
Revision: 103525

upstream update

Modified:
  dnsutils/trunk/PKGBUILD
Deleted:
  dnsutils/trunk/bind.so_bsdcompat.diff

------------------------+
 PKGBUILD               |   25 +++++++++++--------------
 bind.so_bsdcompat.diff |   11 -----------
 2 files changed, 11 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-20 23:48:44 UTC (rev 103524)
+++ PKGBUILD	2010-12-20 23:54:01 UTC (rev 103525)
@@ -3,8 +3,8 @@
 # Contributor: mario <mario_vazq at hotmail.com>
 pkgname=dnsutils
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.7.1.P2
-_pkgver=9.7.1-P2
+pkgver=9.7.2.P3
+_pkgver=9.7.2-P3
 pkgrel=1
 pkgdesc="Various DNS utilities - dig host nslookup nsupdate"
 arch=(i686 x86_64)
@@ -13,24 +13,21 @@
 depends=('openssl')
 replaces=('bind-tools' 'host')
 options=('makeflags')
-source=(http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz
-	bind.so_bsdcompat.diff tools-only.patch)
-md5sums=('bd6be63cc910d04da39103d441871596'
-         '447d58721cfee0e1e377b46f7d50b327'
-         'be0558f70ed81d90e68e6b6003ba12ed')
+source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
+        'tools-only.patch')
+sha1sums=('ca621a23e79298b4da14a3884690edbccda410d4'
+          'ac88c89e25c26d73095a3dd85e1ca1070d184ded')
 
 build() {
   cd "${srcdir}/bind-${_pkgver}"
-  patch -Np0 -i "${srcdir}/bind.so_bsdcompat.diff" || return 1
-  patch -Np1 -i "${srcdir}/tools-only.patch" || return 1
+  patch -p1 < ../tools-only.patch
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-		--with-openssl=yes --disable-linux-caps --without-libxml2 || return 1
-  make || return 1
+		--with-openssl=yes --disable-linux-caps --without-libxml2
+  make
 }
 
 package() {
   cd "${srcdir}/bind-${_pkgver}/bin"
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 ../COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 ../COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: bind.so_bsdcompat.diff
===================================================================
--- bind.so_bsdcompat.diff	2010-12-20 23:48:44 UTC (rev 103524)
+++ bind.so_bsdcompat.diff	2010-12-20 23:54:01 UTC (rev 103525)
@@ -1,11 +0,0 @@
---- ./lib/isc/unix/socket.c.orig	2005-11-03 17:08:42.000000000 -0600
-+++ ./lib/isc/unix/socket.c	2006-02-18 13:09:15.000000000 -0600
-@@ -245,6 +245,8 @@
- 
- #define SOCK_DEAD(s)			((s)->references == 0)
- 
-+#undef SO_BSDCOMPAT
-+
- static void
- manager_log(isc_socketmgr_t *sockmgr,
- 	    isc_logcategory_t *category, isc_logmodule_t *module, int level,