Fri May 24 00:06:06 PDT 2013

10 files changed, 56 insertions, 114 deletions

diff --git a/core/ifenslave/PKGBUILD b/core/ifenslave/PKGBUILD
index a730f2f5e..32caed5b0 100644
--- a/core/ifenslave/PKGBUILD
+++ b/core/ifenslave/PKGBUILD
@@ -1,21 +1,17 @@
-# $Id: PKGBUILD 142704 2011-11-13 10:10:10Z bisson $
-# Maintainer: 
+# $Id: PKGBUILD 186263 2013-05-23 06:41:01Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=ifenslave
 pkgver=1.1.0
-pkgrel=7
+pkgrel=8
 pkgdesc='Utility for bonding ethernet interfaces'
-arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/en/Net:Bonding'
+arch=('i686' 'x86_64')
 license=('GPL2')
-depends=('glibc')
 makedepends=('linux-api-headers')
-backup=('etc/conf.d/bonding')
-source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=65968fbf'
-        'bonding.conf.d')
-sha1sums=('c657d9e6b8acb983bb8ef856f8f7f25ee6bf4f73'
-          '6843971c0254768868b556af33289d7d32d6208d')
+source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=450faacc')
+sha1sums=('cf0ca36e4a82f259f4bd5d7268ce758581a76fb0')
 
 build() {
 	cd "${srcdir}"
@@ -24,6 +20,5 @@ build() {
 
 package() {
 	cd "${srcdir}"
-	install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave
-	install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding
+	install -Dm755 ifenslave "${pkgdir}"/usr/bin/ifenslave
 }
diff --git a/core/ifenslave/bonding.conf.d b/core/ifenslave/bonding.conf.d
deleted file mode 100644
index 3092c5e95..000000000
--- a/core/ifenslave/bonding.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Settings for ethernet bonding
-#
-# For each bond interface declared in INTERFACES (in rc.conf), declare
-# a bond_${IF} variable that contains the real ethernet interfaces that
-# should be bonded to the bond interface with the ifenslave utility.
-# Then list the bond interface name in the BOND_INTERFACES array.
-#
-
-#bond_bond0="eth0 eth1"
-#BOND_INTERFACES=(bond0)
-
diff --git a/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD
index fee4867a2..dc7ed30a6 100644
--- a/core/jfsutils/PKGBUILD
+++ b/core/jfsutils/PKGBUILD
@@ -1,21 +1,30 @@
-# $Id: PKGBUILD 142848 2011-11-17 00:38:27Z bisson $
+# $Id: PKGBUILD 186264 2013-05-23 06:41:02Z bisson $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=jfsutils
 pkgver=1.1.15
-pkgrel=3
+pkgrel=4
 pkgdesc='JFS filesystem utilities'
-arch=('i686' 'x86_64')
 url='http://jfs.sourceforge.net'
+arch=('i686' 'x86_64')
 license=('GPL')
+depends=('util-linux')
+source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz"
+        'inttypes.patch')
+sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50'
+          '88551e7d8418bab0df4643dce248110d4c9b0a53')
+
 groups=('base')
-depends=('util-linux-ng')
-source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../inttypes.patch
+}
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --sbindir=/sbin 
+	./configure --prefix=/usr --sbindir=/usr/bin 
 	make
 }
 
diff --git a/core/jfsutils/inttypes.patch b/core/jfsutils/inttypes.patch
new file mode 100644
index 000000000..2018bb8a8
--- /dev/null
+++ b/core/jfsutils/inttypes.patch
@@ -0,0 +1,12 @@
+diff -Naur old/libfs/devices.h new/libfs/devices.h
+--- old/libfs/devices.h	2005-11-23 07:43:55.000000000 +1100
++++ new/libfs/devices.h	2013-01-06 11:30:25.381538024 +1100
+@@ -40,6 +40,8 @@
+ #define ERROR_INVALID_PARAMETER	87
+ #define ERROR_DISK_FULL		112
+ 
++#include <inttypes.h>
++
+ struct stat;
+ 
+ int ujfs_get_dev_size(FILE *, int64_t * size);
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index 3ac08c05d..b58c7fec7 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -1,29 +1,23 @@
-# $Id: PKGBUILD 175740 2013-01-21 04:49:48Z bisson $
+# $Id: PKGBUILD 186265 2013-05-23 06:41:04Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rfkill
-pkgver=0.4
-pkgrel=7
+pkgver=0.5
+pkgrel=1
 pkgdesc='Tool for enabling and disabling wireless devices'
-url='http://linuxwireless.org/en/users/Documentation/rfkill'
+url='http://wireless.kernel.org/en/users/Documentation/rfkill'
 license=('custom')
 arch=('i686' 'x86_64')
-source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+source=("https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'service.unblock'
         'service.block'
-        'rules.d'
-        'conf.d'
-        'rc.d')
-sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b'
-          '4d0ef151891c32c882dcec8b03ab7204f015d0d1'
-          'c44581c4cc19509f53afd0abea1341cc30751fe2'
-          '6390eaa793b473098aaa11b13c5254d611a4c13a'
-          'd969fe927a9fb2926af43a311a7c1fa126fe59a9'
-          '380af0b002f51543557306ed68a27f0059fd5a6f')
-
-backup=('etc/conf.d/rfkill')
+        'rules.d')
+sha1sums=('03025d4ae285c40d5c19ec99ef7b317afda9d900'
+          '5f4a04a434df2ca28ca6687326c67c1f125aa3d4'
+          '6cc294af37232469cd5ba63455b571fe258e1cc6'
+          '6390eaa793b473098aaa11b13c5254d611a4c13a')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -32,11 +26,9 @@ build() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+	make SBINDIR=/usr/bin DESTDIR="${pkgdir}" install
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
 	install -Dm644 ../service.block "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
 	install -Dm644 ../service.unblock "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
-	install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill"
-	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill"
 }
diff --git a/core/rfkill/conf.d b/core/rfkill/conf.d
deleted file mode 100644
index 4483da26c..000000000
--- a/core/rfkill/conf.d
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# /etc/conf.d/rfkill
-# Configuration for the rfkill startup script
-#
-
-# List of devices to block on startup (space-separated)
-RFKILL_BLOCK=""
-
-# List of devices to unblock on startup (space-separated)
-RFKILL_UNBLOCK="all"
-
-# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ...
-# See "rfkill list" for available devices
-# Examples:
-#
-# Block all bluetooth devices:
-# RFKILL_BLOCK="bluetooth"
-#
-# Unblock the phy0 wifi device and all wwan devices:
-# RFKILL_UNBLOCK="phy0 wwan"
diff --git a/core/rfkill/rc.d b/core/rfkill/rc.d
deleted file mode 100755
index ce90ee150..000000000
--- a/core/rfkill/rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rfkill
-
-case "$1" in
-  start)
-    for device in ${RFKILL_BLOCK}; do
-      stat_busy "Blocking rfkill device: ${device}"
-      /usr/sbin/rfkill block ${device}
-      if [ $? -eq 0 ]; then
-        stat_done
-      else
-        stat_fail
-      fi
-    done
-    for device in ${RFKILL_UNBLOCK}; do
-      stat_busy "Unblocking rfkill device: ${device}"
-      /usr/sbin/rfkill unblock ${device}
-      if [ $? -eq 0 ]; then
-        stat_done
-      else
-        stat_fail
-      fi
-    done
-    ;;
-  stop)
-    ;;
-  restart)
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start}"
-    exit 1
-    ;;
-esac
-exit 0
diff --git a/core/rfkill/service.block b/core/rfkill/service.block
index 420272c5d..ede74d12d 100644
--- a/core/rfkill/service.block
+++ b/core/rfkill/service.block
@@ -4,7 +4,7 @@ After=rfkill-unblock@all.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/rfkill block %I
+ExecStart=/usr/bin/rfkill block %I
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/rfkill/service.unblock b/core/rfkill/service.unblock
index 40f4e3244..94ebf35af 100644
--- a/core/rfkill/service.unblock
+++ b/core/rfkill/service.unblock
@@ -4,7 +4,7 @@ After=rfkill-block@all.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/rfkill unblock %I
+ExecStart=/usr/bin/rfkill unblock %I
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index 6c377cc12..57ba7574f 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165574 2012-08-25 15:33:20Z bisson $
+# $Id: PKGBUILD 186266 2013-05-23 06:41:05Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=wireless_tools
 pkgver=29
-pkgrel=7
+pkgrel=8
 pkgdesc='Tools allowing to manipulate the Wireless Extensions'
 url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
 license=('GPL')
@@ -15,16 +15,20 @@ source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgve
 sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710'
           '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72')
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}.${pkgver}"
 	patch -p1 -i ../dense.patch # FS#15363
+}
+
+build() {
+	cd "${srcdir}/${pkgname}.${pkgver}"
 	make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}"
 }
 
 package() {
 	cd "${srcdir}/${pkgname}.${pkgver}"
 	make \
-		INSTALL_DIR="${pkgdir}/usr/sbin" \
+		INSTALL_DIR="${pkgdir}/usr/bin" \
 		INSTALL_LIB="${pkgdir}/usr/lib" \
 		INSTALL_INC="${pkgdir}/usr/include" \
 		INSTALL_MAN="${pkgdir}/usr/share/man" \