From d14a25fc4f65ae3d6e62f4668e9cb88d74834255 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 18 Mar 2012 00:02:54 +0000 Subject: Sun Mar 18 00:02:53 UTC 2012 --- core/e2fsprogs/PKGBUILD | 7 +- core/krb5/PKGBUILD | 37 ++----- core/pcmciautils/PKGBUILD | 12 ++- core/udev/0001-reinstate-TIMEOUT-handling.patch | 126 ++++++++++++++++++++++++ core/udev/PKGBUILD | 18 ++-- core/util-linux/PKGBUILD | 7 +- 6 files changed, 161 insertions(+), 46 deletions(-) create mode 100644 core/udev/0001-reinstate-TIMEOUT-handling.patch (limited to 'core') diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index bd9f609fa..9233159be 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147737 2012-01-27 16:09:24Z dan $ +# $Id: PKGBUILD 153601 2012-03-16 15:10:42Z ronald $ # Maintainer: Ronald van Haren # Contributor: judd pkgname=e2fsprogs -pkgver=1.42 +pkgver=1.42.1 pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') @@ -16,8 +16,9 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('e69bc63bc319e4d1e4242cc278bfd442a60646e6' +sha1sums=('c25c73de98737b5f6fb9debec36bfb6416b0ac07' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') + build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index e93b19963..0868fcdd9 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144896 2011-12-09 11:55:57Z stephane $ +# $Id: PKGBUILD 153617 2012-03-16 17:46:18Z stephane $ # Maintainer: Stéphane Gaudreault pkgname=krb5 -pkgver=1.9.2 -pkgrel=2 +pkgver=1.10.1 +pkgrel=1 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -14,40 +14,20 @@ provides=('heimdal') replaces=('heimdal') conflicts=('heimdal') backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') -source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar krb5-kadmind krb5-kdc - krb5-kpropd - krb5-1.9.1-config-script.patch - krb5-1.9.1-2011-007.patch) -sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' + krb5-kpropd) +sha1sums=('f9f3b77173f68b268b43e4f9c29bf7c9f3fd1f0e' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' - '7f402078fa65bb9ff1beb6cbbbb017450df78560' - '7342410760cf44bfa01bb99bb4c49e12496cb46f' - 'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7') + '7f402078fa65bb9ff1beb6cbbbb017450df78560') options=('!emptydirs') build() { tar zxvf ${pkgname}-${pkgver}.tar.gz cd "${srcdir}/${pkgname}-${pkgver}/src" - # - Make krb5-config suppress CFLAGS output when called with --libs - # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391 - # - # - Omit extra libraries because their interfaces are not exposed to applications - # by libkrb5, unless do_deps is set to 1, which indicates that the caller - # wants the whole list. - # - # Patch from upstream : - # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 - patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch - - # Apply upstream patch to fix a null pointer dereference when processing TGS requests - # CVE-2011-1530 - # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt - patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch - # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 @@ -62,7 +42,8 @@ build() { --disable-rpath \ --without-tcl \ --enable-dns-for-realm \ - --with-ldap + --with-ldap \ + --without-system-verto make } diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD index fee30155d..59959a831 100644 --- a/core/pcmciautils/PKGBUILD +++ b/core/pcmciautils/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 134400 2011-08-03 16:55:02Z tomegun $ -# Maintainer: Tobias Powalowski +# $Id: PKGBUILD 153635 2012-03-16 22:34:37Z tomegun $ +# Maintainer: Tom Gundersen +# Contributor: Tobias Powalowski pkgname=pcmciautils pkgver=018 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for inserting and removing PCMCIA cards" arch=(i686 x86_64) url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" @@ -11,7 +12,8 @@ groups=('base') # sysfsutils will not be required in the next release depends=('udev' 'sysfsutils') conflicts=('pcmcia-cs') -source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2) +# source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) options=(!makeflags) build() { @@ -24,4 +26,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('5d85669b3440baa4532363da6caaf1b4') +md5sums=('964c802994677a71b38ec56554aa229f') diff --git a/core/udev/0001-reinstate-TIMEOUT-handling.patch b/core/udev/0001-reinstate-TIMEOUT-handling.patch new file mode 100644 index 000000000..9b251b283 --- /dev/null +++ b/core/udev/0001-reinstate-TIMEOUT-handling.patch @@ -0,0 +1,126 @@ +From 86617453cd78bf88d347f0e75a5be8b5ebac6c2e Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Thu, 15 Mar 2012 02:12:43 +0100 +Subject: [PATCH] reinstate TIMEOUT= handling + +This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and +57c6f8ae5f52a6e8ffc66a54966346f733dded39. + +Signed-off-by: Tom Gundersen +--- + src/libudev-device.c | 19 +++++++++++++++++++ + src/libudev-private.h | 1 + + src/udevd.c | 13 ++++++++++--- + 3 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/libudev-device.c b/src/libudev-device.c +index 10f28b8..639c367 100644 +--- a/src/libudev-device.c ++++ b/src/libudev-device.c +@@ -68,6 +68,7 @@ struct udev_device { + struct udev_list tags_list; + unsigned long long int seqnum; + unsigned long long int usec_initialized; ++ int timeout; + int devlink_priority; + int refcount; + dev_t devnum; +@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum) + return 0; + } + ++int udev_device_get_timeout(struct udev_device *udev_device) ++{ ++ return udev_device->timeout; ++} ++ ++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) ++{ ++ char num[32]; ++ ++ udev_device->timeout = timeout; ++ snprintf(num, sizeof(num), "%u", timeout); ++ udev_device_add_property(udev_device, "TIMEOUT", num); ++ return 0; ++} ++ + const char *udev_device_get_devpath_old(struct udev_device *udev_device) + { + return udev_device->devpath_old; +@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, + udev_device_set_devpath_old(udev_device, &property[12]); + } else if (strncmp(property, "SEQNUM=", 7) == 0) { + udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10)); ++ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { ++ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); + } else if (strncmp(property, "IFINDEX=", 8) == 0) { + udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10)); + } else if (strncmp(property, "DEVMODE=", 8) == 0) { +@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev) + udev_list_init(udev, &udev_device->sysattr_value_list, true); + udev_list_init(udev, &udev_device->sysattr_list, false); + udev_list_init(udev, &udev_device->tags_list, true); ++ udev_device->timeout = -1; + udev_device->watch_handle = -1; + /* copy global properties */ + udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) +diff --git a/src/libudev-private.h b/src/libudev-private.h +index 5f5c64a..ec63b67 100644 +--- a/src/libudev-private.h ++++ b/src/libudev-private.h +@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); + void udev_device_set_is_initialized(struct udev_device *udev_device); + int udev_device_add_tag(struct udev_device *udev_device, const char *tag); + void udev_device_cleanup_tags_list(struct udev_device *udev_device); ++int udev_device_get_timeout(struct udev_device *udev_device); + unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); + void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); + int udev_device_get_devlink_priority(struct udev_device *udev_device); +diff --git a/src/udevd.c b/src/udevd.c +index 1702217..88e9272 100644 +--- a/src/udevd.c ++++ b/src/udevd.c +@@ -401,7 +401,7 @@ out: + } + } + +-static void event_run(struct event *event) ++static void event_run(struct event *event, bool force) + { + struct udev_list_node *loop; + +@@ -427,7 +427,7 @@ static void event_run(struct event *event) + return; + } + +- if (children >= children_max) { ++ if (!force && children >= children_max) { + if (children_max > 1) + info(event->udev, "maximum number (%i) of children reached\n", children); + return; +@@ -461,6 +461,13 @@ static int event_queue_insert(struct udev_device *dev) + + event->state = EVENT_QUEUED; + udev_list_node_append(&event->node, &event_list); ++ ++ /* run all events with a timeout set immediately */ ++ if (udev_device_get_timeout(dev) > 0) { ++ event_run(event, true); ++ return 0; ++ } ++ + return 0; + } + +@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev) + continue; + } + +- event_run(event); ++ event_run(event, false); + } + } + +-- +1.7.9.4 + diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index bc45f9f4e..114f524b9 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153480 2012-03-14 23:26:14Z tomegun $ +# $Id: PKGBUILD 153633 2012-03-16 22:34:33Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Aaron Griffin # Contributor: Tobias Powalowski @@ -6,14 +6,15 @@ pkgname=udev pkgver=181 -pkgrel=4 +pkgrel=5 pkgdesc="The userspace dev tools (udev)" -depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils' 'acl') +depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'acl') install=udev.install arch=(i686 x86_64) license=('GPL') makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz + 0001-reinstate-TIMEOUT-handling.patch initcpio-hooks-udev initcpio-install-udev) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" @@ -24,6 +25,8 @@ options=(!makeflags !libtool) build() { cd $srcdir/$pkgname-$pkgver + patch -p1 -i ../0001-reinstate-TIMEOUT-handling.patch + ./configure --prefix=/usr \ --with-rootprefix= \ --sysconfdir=/etc \ @@ -39,6 +42,10 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install + # install the mkinitpcio hook + install -D -m644 ../initcpio-hooks-udev ${pkgdir}/usr/lib/initcpio/hooks/udev + install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev + # udevd moved, symlink to make life easy for restarting udevd manually ln -s ../../lib/udev/udevd ${pkgdir}/usr/bin/udevd @@ -52,11 +59,8 @@ package() { s#GROUP="tape"#GROUP="storage"#g; s#GROUP="cdrom"#GROUP="optical"#g' $i done - - # install the mkinitpcio hook - install -D -m644 ../initcpio-hooks-udev ${pkgdir}/lib/initcpio/hooks/udev - install -D -m644 ../initcpio-install-udev ${pkgdir}/lib/initcpio/install/udev } md5sums=('0d7af750702620a871b9f9b98d8ad859' + 'f758b3e62ab77a1a6b7be12bb900cb2d' 'a4dd853050bf2e0ae6b2e3d2c75499c2' 'ee0bfe91a20fff12cc25ab1d1e024853') diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index d0d499374..69bc92981 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153482 2012-03-14 23:26:17Z tomegun $ +# $Id: PKGBUILD 153637 2012-03-16 22:34:40Z tomegun $ # Maintainer: Tom Gundersen # Contributor: judd pkgname=util-linux pkgver=2.21 -pkgrel=5 +pkgrel=6 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -30,7 +30,8 @@ build() { --libdir=/usr/lib \ --enable-write \ --enable-raw \ - --disable-wall + --disable-wall \ + --enable-libmount-mount make } -- cgit v1.2.3-54-g00ecf