diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/cryptsetup/PKGBUILD | 17 | ||||
| -rw-r--r-- | core/cryptsetup/encrypt_hook | 249 | ||||
| -rw-r--r-- | core/cryptsetup/encrypt_install | 37 | ||||
| -rw-r--r-- | core/dnsutils/PKGBUILD | 10 | ||||
| -rw-r--r-- | core/ldns/PKGBUILD | 14 | ||||
| -rw-r--r-- | core/libevent/PKGBUILD | 14 | ||||
| -rw-r--r-- | core/pciutils/PKGBUILD | 13 | ||||
| -rw-r--r-- | core/udev/PKGBUILD | 20 | ||||
| -rw-r--r-- | core/udev/initcpio-hooks-udev | 21 | ||||
| -rw-r--r-- | core/udev/initcpio-install-udev | 6 | ||||
| -rw-r--r-- | core/usbutils/PKGBUILD | 11 |
11 files changed, 212 insertions, 200 deletions
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index b4a12b532..d25c8efe8 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 157320 2012-04-26 22:51:21Z eric $ +# $Id: PKGBUILD 159428 2012-05-24 08:14:23Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup -pkgver=1.4.1 -pkgrel=3 +pkgver=1.4.2 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -15,13 +15,14 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) -sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb' - '71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88' - '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757' - 'ddbbdcb8eff93a3a7622ec633e90d5c0d68e3afbeaf942dc2309adab345047d4') +sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7' + '4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed' + 'e4c00e2da274bf4cab3f72a0de779790a11a946d36b83144e74d3791e230b262' + 'cba1dc38ff6cc4d3740d0badfb2b151bb03d19e8e9fa497569ac2fb6f4196e0e') + build() { cd "${srcdir}"/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static --sbindir=/sbin + ./configure --prefix=/usr --disable-static make } diff --git a/core/cryptsetup/encrypt_hook b/core/cryptsetup/encrypt_hook index 956b18023..0f35782c6 100644 --- a/core/cryptsetup/encrypt_hook +++ b/core/cryptsetup/encrypt_hook @@ -1,148 +1,137 @@ -# vim: set ft=sh: -# TODO this one needs some work to work with lots of different -# encryption schemes -run_hook () -{ - /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - mkdir /dev/mapper - mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi - [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" - - # Get keyfile if specified - ckeyfile="/crypto_keyfile.bin" - if [ "x${cryptkey}" != "x" ]; then - ckdev="$(echo "${cryptkey}" | cut -d: -f1)" - ckarg1="$(echo "${cryptkey}" | cut -d: -f2)" - ckarg2="$(echo "${cryptkey}" | cut -d: -f3)" - if poll_device "${ckdev}" ${rootdelay}; then - case ${ckarg1} in - *[!0-9]*) - # Use a file on the device - # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path - mkdir /ckey - mount -r -t ${ckarg1} ${ckdev} /ckey - dd if=/ckey/${ckarg2} of=${ckeyfile} >/dev/null 2>&1 - umount /ckey - ;; - *) - # Read raw data from the block device - # ckarg1 is numeric: ckarg1=offset, ckarg2=length - dd if=${ckdev} of=${ckeyfile} bs=1 skip=${ckarg1} count=${ckarg2} >/dev/null 2>&1 - ;; - esac - fi - [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." - fi +#!/usr/bin/ash - if [ -n "${cryptdevice}" ]; then - DEPRECATED_CRYPT=0 - cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" - cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" - cryptoptions="$(echo "${cryptdevice}" | cut -d: -f3)" - else - DEPRECATED_CRYPT=1 - cryptdev="${root}" - cryptname="root" - fi +run_hook() { + modprobe -a -q dm-crypt >/dev/null 2>&1 + [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" - warn_deprecated() { - echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated" - echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." - } - - OLDIFS="${IFS}" - IFS="," - for cryptopt in ${cryptoptions}; do - case ${cryptopt} in - allow-discards) - echo "Enabling TRIM/discard support." - cryptargs="${cryptargs} --allow-discards" + # Get keyfile if specified + ckeyfile="/crypto_keyfile.bin" + if [ -n "$cryptkey" ]; then + IFS=: read ckdev ckarg1 ckarg2 <<EOF +$cryptkey +EOF + if poll_device "${ckdev}" ${rootdelay}; then + case ${ckarg1} in + *[!0-9]*) + # Use a file on the device + # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path + mkdir /ckey + mount -r -t "$ckarg1" "$ckdev" /ckey + dd if="/ckey/$ckarg2" of="$ckeyfile" >/dev/null 2>&1 + umount /ckey ;; *) - echo "Encryption option '${cryptopt}' not known, ignoring." >&2 + # Read raw data from the block device + # ckarg1 is numeric: ckarg1=offset, ckarg2=length + dd if="$ckdev" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 ;; esac - done - IFS="${OLDIFS}" + fi + [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." + fi - if poll_device "${cryptdev}" ${rootdelay}; then - if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - dopassphrase=1 - # If keyfile exists, try to use that - if [ -f ${ckeyfile} ]; then - if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then - dopassphrase=0 - else - echo "Invalid keyfile. Reverting to passphrase." - fi - fi - # Ask for a passphrase - if [ ${dopassphrase} -gt 0 ]; then - echo "" - echo "A password is required to access the ${cryptname} volume:" + if [ -n "${cryptdevice}" ]; then + DEPRECATED_CRYPT=0 + IFS=: read cryptdev cryptname cryptoptions <<EOF +$cryptdevice +EOF + else + DEPRECATED_CRYPT=1 + cryptdev="${root}" + cryptname="root" + fi - #loop until we get a real password - while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do - sleep 2; - done - fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ ${DEPRECATED_CRYPT} -eq 1 ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - exit 1 - fi - elif [ -n "${crypto}" ]; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - msg "Non-LUKS encrypted device found..." - if [ $# -ne 5 ]; then - err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" - err "Non-LUKS decryption not attempted..." - return 1 - fi - exe="/sbin/cryptsetup create ${cryptname} ${cryptdev} ${cryptargs}" - tmp=$(echo "${crypto}" | cut -d: -f1) - [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f2) - [ -n "${tmp}" ] && exe="${exe} --cipher \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f3) - [ -n "${tmp}" ] && exe="${exe} --key-size \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f4) - [ -n "${tmp}" ] && exe="${exe} --offset \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f5) - [ -n "${tmp}" ] && exe="${exe} --skip \"${tmp}\"" - if [ -f ${ckeyfile} ]; then - exe="${exe} --key-file ${ckeyfile}" + warn_deprecated() { + echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated" + echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." + } + + for cryptopt in ${cryptoptions//,/ }; do + case ${cryptopt} in + allow-discards) + echo "Enabling TRIM/discard support." + cryptargs="${cryptargs} --allow-discards" + ;; + *) + echo "Encryption option '${cryptopt}' not known, ignoring." >&2 + ;; + esac + done + + if poll_device "${cryptdev}" ${rootdelay}; then + if cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + dopassphrase=1 + # If keyfile exists, try to use that + if [ -f ${ckeyfile} ]; then + if eval cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then + dopassphrase=0 else - exe="${exe} --verify-passphrase" - echo "" - echo "A password is required to access the ${cryptname} volume:" + echo "Invalid keyfile. Reverting to passphrase." fi - eval "${exe} ${CSQUIET}" + fi + # Ask for a passphrase + if [ ${dopassphrase} -gt 0 ]; then + echo "" + echo "A password is required to access the ${cryptname} volume:" - if [ $? -ne 0 ]; then - err "Non-LUKS device decryption failed. verify format: " - err " crypto=hash:cipher:keysize:offset:skip" - exit 1 + #loop until we get a real password + while ! eval cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do + sleep 2; + done + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ ${DEPRECATED_CRYPT} -eq 1 ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - exit 1 + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + elif [ -n "${crypto}" ]; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + msg "Non-LUKS encrypted device found..." + if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then + err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" + err "Non-LUKS decryption not attempted..." + return 1 + fi + exe="cryptsetup create $cryptname $cryptdev $cryptargs" + IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF +$crypto +EOF + [ -n "$c_hash" ] && exe="$exe --hash '$c_hash'" + [ -n "$c_cipher" ] && exe="$exe --cipher '$c_cipher'" + [ -n "$c_keysize" ] && exe="$exe --key-size '$c_keysize'" + [ -n "$c_offset" ] && exe="$exe --offset '$c_offset'" + [ -n "$c_skip" ] && exe="$exe --skip '$c_skip'" + if [ -f "$ckeyfile" ]; then + exe="$exe --key-file $ckeyfile" + else + exe="$exe --verify-passphrase" + echo "" + echo "A password is required to access the ${cryptname} volume:" + fi + eval "$exe $CSQUIET" + + if [ $? -ne 0 ]; then + err "Non-LUKS device decryption failed. verify format: " + err " crypto=hash:cipher:keysize:offset:skip" + exit 1 + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" fi else - err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified." + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 fi + else + err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified." fi - rm -f ${ckeyfile} fi + rm -f ${ckeyfile} } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/cryptsetup/encrypt_install b/core/cryptsetup/encrypt_install index 9ed50e863..79d2f3e4b 100644 --- a/core/cryptsetup/encrypt_install +++ b/core/cryptsetup/encrypt_install @@ -1,26 +1,39 @@ -# vim: set ft=sh: +#!/bin/bash -build() -{ +build() { if [ -z "${CRYPTO_MODULES}" ]; then - MODULES=" dm-crypt $(all_modules "/crypto/") " + MODULES=" dm-crypt $(all_modules "/crypto/")" else - MODULES=" dm-crypt ${CRYPTO_MODULES} " + MODULES=" dm-crypt $CRYPTO_MODULES" fi FILES="" SCRIPT="encrypt" - [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" - [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" - add_binary "/sbin/dmsetup" + + add_binary "cryptsetup" + add_binary "dmsetup" add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" } -help () -{ -cat<<HELPEOF - This hook allows for an encrypted root device. +help() { + cat <<HELPEOF +This hook allows for an encrypted root device. Users should specify the device +to be unlocked using 'cryptdevice=device:dmname' on the kernel command line, +where 'device' is the path to the raw device, and 'dmname' is the name given to +the device after unlocking, and will be available as /dev/mapper/dmname. + +For unlocking via keyfile, 'cryptkey=device:fstype:path' should be specified on +the kernel cmdline, where 'device' represents the raw block device where the key +exists, 'fstype' is the filesystem type of 'device' (or auto), and 'path' is +the absolute path of the keyfile within the device. + +Without specifying a keyfile, you will be prompted for the password at runtime. +This means you must have a keyboard available to input it, and you may need +the keymap hook as well to ensure that the keyboard is using the layout you +expect. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD index ea2d5bf2c..d39b1fff5 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 78138e088..827ca787c 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/libevent/PKGBUILD b/core/libevent/PKGBUILD index df3b43553..f5f669745 100644 --- a/core/libevent/PKGBUILD +++ b/core/libevent/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 155924 2012-04-09 13:39:42Z tomegun $ +# $Id: PKGBUILD 159369 2012-05-22 19:07:09Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Judd <jvinet@zeroflux.org> pkgname=libevent -pkgver=2.0.18 +pkgver=2.0.19 pkgrel=1 pkgdesc="An event notification library" arch=('i686' 'x86_64' 'mips64el') url="http://www.monkey.org/~provos/libevent/" -license=('GPL2') +license=('BSD') depends=('openssl') optdepends=('python2: to use event_rpcgen.py') options=('!libtool') -source=(https://github.com/downloads/libevent/libevent/libevent-$pkgver-stable.tar.gz{,.asc}) +source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-stable.tar.gz{,.asc}) build() { cd "${srcdir}/${pkgname}-${pkgver}-stable" @@ -23,12 +23,12 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}-stable" - make check + make check || true # this never worked, should be taken upstream } package() { cd "${srcdir}/${pkgname}-${pkgver}-stable" make DESTDIR="${pkgdir}" install } -md5sums=('aa1ce9bc0dee7b8084f6855765f2c86a' - '225bb6c417cfb31298e1e96d0eddca4a') +md5sums=('91111579769f46055b0a438f5cc59572' + 'a211997b20913954f744a665f31f77d2') diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index 74caa29f6..987d32d9e 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 'mips64el') 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 e859ab6f7..4818c8e4a 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 mips64el) 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 b1445cda9..0617e9318 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 'mips64el') 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') |