Fri May 25 00:02:35 UTC 2012

7 files changed, 52 insertions, 43 deletions

diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD
index b2489c6a1..5466de114 100644
--- a/core/dnsutils/PKGBUILD
+++ b/core/dnsutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157123 2012-04-24 08:19:47Z bisson $
+# $Id: PKGBUILD 159411 2012-05-23 22:28:25Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: mario <mario_vazq@hotmail.com>
@@ -6,9 +6,9 @@
 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=2
+pkgver=9.9.1
+_pkgver=9.9.1
+pkgrel=1
 
 pkgdesc='DNS utilities: dig host nslookup'
 url='http://www.isc.org/software/bind/'
@@ -18,7 +18,7 @@ options=('!makeflags')
 depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'remove-bind.patch')
-sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094'
+sha1sums=('c963de85ba6f55d7615471b29b356efe6c844e9c'
           'b465ef6160b004838f04de9978fe1be8422af777')
 
 replaces=('bind-tools' 'host')
diff --git a/core/ldns/PKGBUILD b/core/ldns/PKGBUILD
index bd7fe152d..e936b0b9d 100644
--- a/core/ldns/PKGBUILD
+++ b/core/ldns/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157125 2012-04-24 08:19:51Z bisson $
+# $Id: PKGBUILD 159413 2012-05-23 22:28:28Z 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
+pkgver=1.6.13
+pkgrel=1
 pkgdesc='Fast DNS library supporting recent RFCs'
 url='http://www.nlnetlabs.nl/projects/ldns/'
 license=('custom:BSD')
@@ -14,16 +14,12 @@ 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')
+source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('859f633d10b763f06b602e2113828cbbd964c7eb')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	patch -p1 -i ../Makefile.patch
-
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index d9d5619a0..4d8ed4bb0 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -1,23 +1,20 @@
-# $Id: PKGBUILD 150279 2012-02-16 08:29:09Z tpowa $
+# $Id: PKGBUILD 159402 2012-05-23 20:09:18Z tomegun $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
 pkgver=3.1.9
-pkgrel=1
+pkgrel=2
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64)
 license=('GPL2')
 groups=('base')
-url="http://mj.ucw.cz/pciutils.html"
-optdepends=('sh: required by update-pciids')
-makedepends=('wget')
-depends=('glibc')
+url="http://mj.ucw.cz/sw/pciutils/"
+depends=('glibc' 'hwids')
 source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
        ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
 md5sums=('e958f5ffb93b12972964381c38f27eb3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./update-pciids.sh
   make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
   cp lib/libpci.a "${srcdir}/"
   make clean
@@ -28,4 +25,6 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
   install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
+  # this is now supplied by the hwids package
+  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8.gz,hwdata}}
 }
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 0251c026c..9916a3a9c 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158599 2012-05-05 02:34:43Z dreisner $
+# $Id: PKGBUILD 159406 2012-05-23 20:09:27Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,9 +6,9 @@
 
 pkgname=udev
 pkgver=182
-pkgrel=2
+pkgrel=4
 pkgdesc="The userspace dev tools (udev)"
-depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl')
+depends=('util-linux' 'glib2' 'kmod' 'hwids' 'bash' 'acl')
 install=udev.install
 arch=(i686 x86_64)
 license=('GPL')
@@ -22,6 +22,11 @@ url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
 backup=(etc/udev/udev.conf)
 groups=('base')
 options=(!makeflags !libtool)
+md5sums=('023877e6cc0d907994b8c648beab542b'
+         '0fa3eac115ad0140af1582d941b15f2c'
+         '94b816896bf23275c0598fc8e07270c3'
+         'e433c11d38cf4f877b41d06e2753ebe0'
+         'e6faf4c3fe456f10d8efd2487d5e3cb7')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -33,7 +38,9 @@ build() {
               --sysconfdir=/etc \
               --libexecdir=/usr/lib \
               --with-systemdsystemunitdir=/usr/lib/systemd/system \
-              --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware
+              --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \
+              --with-usb-ids-path=/usr/share/hwdata/usb.ids \
+              --with-pci-ids-path=/usr/share/hwdata/pci.ids
 
   make
 }
@@ -67,8 +74,3 @@ package() {
                s#GROUP="cdrom"#GROUP="optical"#g' $i
   done
 }
-md5sums=('023877e6cc0d907994b8c648beab542b'
-         '0fa3eac115ad0140af1582d941b15f2c'
-         '94b816896bf23275c0598fc8e07270c3'
-         'a4dd853050bf2e0ae6b2e3d2c75499c2'
-         'd2b16edc6d806b5dafdbbad43ae5a3de')
diff --git a/core/udev/initcpio-hooks-udev b/core/udev/initcpio-hooks-udev
index 87aa7960f..313a88130 100644
--- a/core/udev/initcpio-hooks-udev
+++ b/core/udev/initcpio-hooks-udev
@@ -1,9 +1,20 @@
-# vim: set ft=sh:
-run_hook ()
-{
-    msg -n ":: Triggering uevents..."
+#!/usr/bin/ash
+
+run_earlyhook() {
+    /usr/lib/udev/udevd --daemon --resolve-names=never
+    udevd_running=1
+}
+
+run_hook() {
+    msg ":: Triggering uevents..."
     udevadm trigger --action=add --type=subsystems
     udevadm trigger --action=add --type=devices
     udevadm settle
-    msg "done."
 }
+
+run_cleanuphook() {
+    udevadm control --exit
+    udevadm info --cleanup-db
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/udev/initcpio-install-udev b/core/udev/initcpio-install-udev
index 6bc9cfb28..e33664459 100644
--- a/core/udev/initcpio-install-udev
+++ b/core/udev/initcpio-install-udev
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 build() {
-    FILES="/etc/udev/udev.conf"
-    SCRIPT="udev"
-
+    add_file "/etc/udev/udev.conf"
     add_binary /usr/lib/udev/udevd
     add_binary /usr/bin/udevadm
 
@@ -13,6 +11,8 @@ build() {
     for tool in ata_id scsi_id; do
         add_file "/usr/lib/udev/$tool"
     done
+
+    add_runscript
 }
 
 help() {
diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD
index 7a926591f..65b4963cb 100644
--- a/core/usbutils/PKGBUILD
+++ b/core/usbutils/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 153529 2012-03-15 17:34:25Z tomegun $
+# $Id: PKGBUILD 159404 2012-05-23 20:09:22Z tomegun $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
 pkgname=usbutils
 pkgver=005
-pkgrel=1
+pkgrel=2
 pkgdesc="USB Device Utilities"
 arch=(i686 x86_64)
 license=('GPL')
 groups=('base')
-depends=('libusb')
+depends=('libusb' 'hwids')
 optdepends=('python2: for lsusb.py usage'
-            'coreutils: for lsusb.py usage'
-            'wget: for update-usbids.sh usage')
+            'coreutils: for lsusb.py usage')
 url="http://linux-usb.sourceforge.net/"
 # currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
 source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
@@ -30,6 +29,8 @@ build() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
+  # this is now in the hwids package
+  rm -rf $pkgdir/usr/{share/hwdata,sbin}
 }
 md5sums=('6a21f7b6c02b76df5e8a7c208d746654'
          '45766196895b4cc50b53cd56e1bbf3d1')