From ddab05fd84b7fa1d67fcd18b532f0427189d8df1 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 29 Jul 2012 00:03:59 +0000 Subject: Sun Jul 29 00:03:59 UTC 2012 --- core/btrfs-progs/70-btrfs.rules | 1 + core/btrfs-progs/PKGBUILD | 13 +++++++++---- core/btrfs-progs/initcpio-hook-btrfs | 5 ++++- core/btrfs-progs/initcpio-install-btrfs | 4 +++- core/iptables/PKGBUILD | 19 ++++++++++++------ core/iptables/iptables-1.4.12-fixresore.patch | 28 +++++++++++++++++++++++++++ core/iw/PKGBUILD | 4 ++-- 7 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 core/btrfs-progs/70-btrfs.rules create mode 100644 core/iptables/iptables-1.4.12-fixresore.patch (limited to 'core') diff --git a/core/btrfs-progs/70-btrfs.rules b/core/btrfs-progs/70-btrfs.rules new file mode 100644 index 000000000..c0e8c776c --- /dev/null +++ b/core/btrfs-progs/70-btrfs.rules @@ -0,0 +1 @@ +ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs", RUN+="/usr/bin/btrfs device scan /dev/%k" diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 8b3f37ea8..2c5b6f907 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160394 2012-06-01 13:21:40Z dreisner $ +# $Id: PKGBUILD 164224 2012-07-27 20:04:40Z dreisner $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski pkgname=btrfs-progs pkgver=0.19.20120328 -pkgrel=3 +pkgrel=4 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64) depends=('glibc' 'e2fsprogs') @@ -13,11 +13,13 @@ conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') license=('GPL2') source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz + 70-btrfs.rules initcpio-install-btrfs initcpio-hook-btrfs) md5sums=('f4504e73cf9254779b78d5b2318ac570' - '3eae9bf1541e297fa72aa40ebf7320c6' - 'b09688a915a0ec8f40e2f5aacbabc9ad') + '345c62c8b267082361729ca5b647518f' + 'e5186ec3fe8a809b7473470128d1c4ab' + '9fb35142755b477a96cb7292f3d64839') build() { cd $srcdir/$pkgname-$pkgver @@ -33,6 +35,9 @@ package() { mkdir -p ${pkgdir}/sbin ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs + # add udev rule + install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules" + # install mkinitcpio hooks install -Dm644 "$srcdir/initcpio-install-btrfs" \ "$pkgdir/usr/lib/initcpio/install/btrfs" diff --git a/core/btrfs-progs/initcpio-hook-btrfs b/core/btrfs-progs/initcpio-hook-btrfs index 7965d0a8a..913cec528 100644 --- a/core/btrfs-progs/initcpio-hook-btrfs +++ b/core/btrfs-progs/initcpio-hook-btrfs @@ -1,7 +1,10 @@ #!/usr/bin/ash run_hook() { - btrfs device scan + # if udevd is running, this is done async by add/change events + if [ "$udevd_running" -ne 1 ]; then + btrfs device scan + fi } # vim: set ft=sh ts=4 sw=4 et: diff --git a/core/btrfs-progs/initcpio-install-btrfs b/core/btrfs-progs/initcpio-install-btrfs index a70a324ed..aad263378 100644 --- a/core/btrfs-progs/initcpio-install-btrfs +++ b/core/btrfs-progs/initcpio-install-btrfs @@ -1,9 +1,11 @@ #!/bin/bash build() { - add_all_modules btrfs + add_module btrfs add_binary btrfs add_runscript + + add_file /usr/lib/udev/rules.d/70-btrfs.rules } help() { diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index d2c859de4..cc6e506e1 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162152 2012-06-22 12:55:41Z dreisner $ +# $Id: PKGBUILD 164210 2012-07-27 14:54:09Z ibiru $ # Maintainer: Ronald van Haren # Contributor: Thomas Baechler pkgname=iptables pkgver=1.4.14 -pkgrel=2 +pkgrel=3 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') @@ -23,10 +23,11 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-nat.rules empty-raw.rules empty-security.rules - 0503-extension_cppflags.patch - iptables.service - ip6tables.service - iptables-flush) + 0503-extension_cppflags.patch + iptables-1.4.12-fixresore.patch + iptables.service + ip6tables.service + iptables-flush) backup=(etc/conf.d/iptables) sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' @@ -40,6 +41,7 @@ sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' '44626980a52e49f345a0b1e1ca03060f3a35763c' + '7c018d48445ae41c0b9f345747e54b94cb0997b3' '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') @@ -52,6 +54,11 @@ build() { patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch + # Fix scope issue exposed by gcc 4.7 (patch by fryasu) + # http://bugzilla.netfilter.org/show_bug.cgi?id=774 + # (This will most likely be fixed in iptables 1.4.15) + patch -Np1 -i ${srcdir}/iptables-1.4.12-fixresore.patch + ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ diff --git a/core/iptables/iptables-1.4.12-fixresore.patch b/core/iptables/iptables-1.4.12-fixresore.patch new file mode 100644 index 000000000..94358f779 --- /dev/null +++ b/core/iptables/iptables-1.4.12-fixresore.patch @@ -0,0 +1,28 @@ +diff -Nur iptables-1.4.12.2/iptables/ip6tables-restore.c iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c +--- iptables-1.4.12.2/iptables/ip6tables-restore.c 2012-01-03 02:19:09.000000000 +0900 ++++ iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c 2012-03-01 10:56:10.000000000 +0900 +@@ -380,9 +380,9 @@ + quote_open = 0; + escaped = 0; + param_len = 0; ++ char param_buffer[1024]; + + for (curchar = parsestart; *curchar; curchar++) { +- char param_buffer[1024]; + + if (quote_open) { + if (escaped) { +diff -Nur iptables-1.4.12.2/iptables/iptables-restore.c iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c +--- iptables-1.4.12.2/iptables/iptables-restore.c 2012-01-03 02:19:09.000000000 +0900 ++++ iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c 2012-03-01 10:56:00.000000000 +0900 +@@ -377,9 +377,9 @@ + quote_open = 0; + escaped = 0; + param_len = 0; ++ char param_buffer[1024]; + + for (curchar = parsestart; *curchar; curchar++) { +- char param_buffer[1024]; + + if (quote_open) { + if (escaped) { diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index 10ea7859d..189ef3e55 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159175 2012-05-17 10:12:16Z thomas $ +# $Id: PKGBUILD 164233 2012-07-28 01:51:21Z eric $ # Maintainer: Thomas Bächler pkgname=iw @@ -9,7 +9,7 @@ arch=("i686" "x86_64") url="http://wireless.kernel.org/en/users/Documentation/iw" license=("GPL") depends=("libnl") -makedepends=("kernel-headers") +makedepends=("linux-api-headers") source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) sha256sums=('989b5677588e32de6eda97bf978810b366a7620f78f26f9cc61c15bdb434218a') -- cgit v1.2.3-54-g00ecf