Thu Apr 26 00:01:31 UTC 2012

5 files changed, 98 insertions, 27 deletions

diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD
index 075c30db6..b2489c6a1 100644
--- a/core/dnsutils/PKGBUILD
+++ b/core/dnsutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152442 2012-03-06 23:41:04Z bisson $
+# $Id: PKGBUILD 157123 2012-04-24 08:19:47Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: mario <mario_vazq@hotmail.com>
@@ -8,20 +8,18 @@ pkgname=dnsutils
 # Use a period and not a hyphen before the patch level for proper versioning.
 pkgver=9.9.0
 _pkgver=9.9.0
-pkgrel=1
+pkgrel=2
 
 pkgdesc='DNS utilities: dig host nslookup'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
 arch=('i686' 'x86_64')
 options=('!makeflags')
-depends=('openssl' 'krb5' 'idnkit')
+depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'remove-bind.patch'
-        'trusted-key.key')
+        'remove-bind.patch')
 sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094'
-          'b465ef6160b004838f04de9978fe1be8422af777'
-          'ca93da30c89de4365b846325d6ec4674a3e4fc02')
+          'b465ef6160b004838f04de9978fe1be8422af777')
 
 replaces=('bind-tools' 'host')
 
@@ -49,7 +47,6 @@ build() {
 
 package() {
 	cd "${srcdir}/bind-${_pkgver}"
-	install -Dm644 ../trusted-key.key "${pkgdir}"/etc/trusted-key.key
 	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	cd bin; make DESTDIR="${pkgdir}" install
 }
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 88ad2f13d..b7b888031 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155732 2012-04-06 00:04:08Z tomegun $
+# $Id: PKGBUILD 157131 2012-04-24 12:21:20Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
-pkgver=7
-pkgrel=2
+pkgver=8
+pkgrel=1
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64')
 url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
@@ -17,7 +17,7 @@ source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.t
         "depmod-search.conf"
         "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch"
         "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch")
-md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb'
+md5sums=('d4e3d038b5370b1e8ff237c55666aa64'
          'dd62cbf62bd8f212f51ef8c43bec9a77'
          'ba73b9e98db1abbf41274f922fcfbd55'
          'c9af56636c5667cf4ce3a31ea56e03d9')
diff --git a/core/ldns/Makefile.patch b/core/ldns/Makefile.patch
new file mode 100644
index 000000000..d98291ac9
--- /dev/null
+++ b/core/ldns/Makefile.patch
@@ -0,0 +1,20 @@
+--- old/Makefile.in	2012-01-12 00:11:36.000000000 +1100
++++ new/Makefile.in	2012-01-27 11:36:16.110154453 +1100
+@@ -130,7 +130,7 @@
+ 		exit -1 ; \
+ 	fi
+ drill/drill: $(DRILL_LOBJS) $(LIB)
+-	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill
++	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill
+ 
+ install-drill: drill/drill
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+@@ -157,7 +157,7 @@
+ 		exit -1 ; \
+ 	fi
+ $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB)
+-	$(LINK_EXE) $@.lo $(LIBS) -lldns -o $@
++	$(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@
+ 
+ $(TESTNS): $(TESTNS_LOBJS) $(LIB)
+ 	$(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS)
diff --git a/core/ldns/PKGBUILD b/core/ldns/PKGBUILD
new file mode 100644
index 000000000..bd7fe152d
--- /dev/null
+++ b/core/ldns/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 157125 2012-04-24 08:19:51Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: mathieui <mathieui@mathieui.net>
+# Contributor: jiribb <jiribb@gmail.com>
+
+pkgname=ldns
+pkgver=1.6.12
+pkgrel=2
+pkgdesc='Fast DNS library supporting recent RFCs'
+url='http://www.nlnetlabs.nl/projects/ldns/'
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+options=('!libtool')
+depends=('openssl' 'dnssec-anchors')
+optdepends=('libpcap: ldns-dpa tool')
+makedepends=('libpcap')
+source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'Makefile.patch')
+sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa'
+          '01bce260e9639d9cd26109a689dddf2498e5026a')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../Makefile.patch
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-static=no \
+		--disable-rpath \
+		--with-drill \
+		--with-examples \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+
+	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 5acc1fdfd..e4e2520ac 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 153965 2012-03-21 06:20:49Z pierre $
+# $Id: PKGBUILD 157127 2012-04-24 08:19:54Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=5.9p1
-pkgrel=8
+pkgver=6.0p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools'
-arch=('i686' 'x86_64')
-license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
-depends=('krb5' 'openssl' 'libedit')
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('x11-ssh-askpass: input passphrase in X without a terminal')
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
         'sshd.close-sessions'
         'sshd.confd'
         'sshd.pam'
         'sshd')
-sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
+sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
           '954bf1660aa32620c37034320877f4511b767ccb'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
           '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
           '21fa88de6cc1c7912e71655f50896ba17991a1c2')
 
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -31,19 +32,27 @@ build() {
 		--prefix=/usr \
 		--libexecdir=/usr/lib/ssh \
 		--sysconfdir=/etc/ssh \
-		--with-privsep-user=nobody \
-		--with-md5-passwords \
+		--with-ldns \
+		--with-libedit \
+		--with-ssl-engine \
 		--with-pam \
-		--with-mantype=man \
-		--with-xauth=/usr/bin/xauth \
+		--with-privsep-user=nobody \
 		--with-kerberos5=/usr \
-		--with-ssl-engine \
-		--with-libedit=/usr/lib \
-		--disable-strip # stripping is done by makepkg
+		--with-xauth=/usr/bin/xauth \
+		--with-mantype=man \
+		--with-md5-passwords \
 
 	make
 }
 
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	# The connect.sh test must be run by a user with a decent login shell;
+	# chroot builds use nobody with /bin/false.
+	make tests || true
+}
+
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install