Merge branch 'master' of git://git.alpinelinux.org/aports

9 files changed, 53 insertions, 127 deletions

diff --git a/testing/apcupsd/APKBUILD b/testing/apcupsd/APKBUILD
deleted file mode 100644
index 4adc8c0966..0000000000
--- a/testing/apcupsd/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=apcupsd
-pkgver=3.14.7
-pkgrel=0
-pkgdesc="A Daemon to control APC UPSes"
-subpackages="$pkgname-doc"
-url="http://www.apcupsd.org"
-license="GPL-2"
-depends="util-linux-ng"
-makedepends=
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	apcupsd.initd
-	apcupsd-alpine.patch
-	"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 < ../apcupsd-alpine.patch || return 1
-
-	ac_cv_path_SHUTDOWN="/sbin/poweroff" \
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-usb
-	make || return 1
-	make DESTDIR=$pkgdir install
-	install -D -m755 "$srcdir"/apcupsd.initd "$pkgdir"/etc/init.d/apcupsd
-}
-
-md5sums="bb2f8e4fc6b2f5d7b3e236eb57b81640  apcupsd-3.14.7.tar.gz
-0798cd407de6f199d4c267036ec54c5b  apcupsd.initd
-08d9cc703cdd4275d342882deed1d719  apcupsd-alpine.patch"
diff --git a/testing/apcupsd/apcupsd-alpine.patch b/testing/apcupsd/apcupsd-alpine.patch
deleted file mode 100644
index 3f5c6965b7..0000000000
--- a/testing/apcupsd/apcupsd-alpine.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/platforms/apccontrol.in	Mon Oct 26 09:12:30 2009
-+++ b/platforms/apccontrol.in	Mon Oct 26 09:36:47 2009
-@@ -20,11 +20,20 @@
- 
- APCPID=@PIDDIR@/apcupsd.pid
- APCUPSD=@sbindir@/apcupsd
--SHUTDOWN=@SHUTDOWN@
-+POWEROFF=/sbin/poweroff
-+REBOOT=/sbin/reboot
- SCRIPTSHELL=@SCRIPTSHELL@
- SCRIPTDIR=@sysconfdir@
--WALL=wall
-+WALL=_wall
- 
-+_wall() {
-+	local i
-+	local msg=$(cat)
-+	for i in /dev/pts/*; do
-+		[ -c "$i" ] && echo "$msg" > $i
-+	done
-+}
-+	
- #
- # Concatenate all output from this script to the events file
- #  Note, the following kills the script in a power fail situation
-@@ -100,11 +109,13 @@
-     ;;
-     doreboot)
- 	echo "UPS ${2} initiating Reboot Sequence" | ${WALL}
--	${SHUTDOWN} -r now "apcupsd UPS ${2} initiated reboot"
-+	echo "apcupsd UPS ${2} initiated reboot" | ${WALL}
-+	$REBOOT
-     ;;
-     doshutdown)
- 	echo "UPS ${2} initiated Shutdown Sequence" | ${WALL}
--	${SHUTDOWN} -h now "apcupsd UPS ${2} initiated shutdown"
-+	echo "apcupsd UPS ${2} initiated shutdown" | ${WALL}
-+	$POWEROFF
-     ;;
-     annoyme)
- 	echo "Power problems with UPS ${2}. Please logoff." | ${WALL}
diff --git a/testing/apcupsd/apcupsd.initd b/testing/apcupsd/apcupsd.initd
deleted file mode 100644
index 5265347f41..0000000000
--- a/testing/apcupsd/apcupsd.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/apcupsd.init.2,v 1.1 2009/01/15 15:21:11 flameeyes Exp $
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
-	INSTANCE="apcupsd"
-fi
-
-depend() {
-	use net
-	after firewall
-}
-
-start() {
-	rm -f /etc/apcupsd/powerfail
-
-	export SERVICE="${SVCNAME}"
-
-	ebegin "Starting APC UPS daemon"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /sbin/apcupsd -- \
-		-f "/etc/apcupsd/${INSTANCE}.conf" \
-		-P "/var/run/${SVCNAME}.pid"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping APC UPS daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-            	--retry TERM/5/TERM/5 \
-		--exec /sbin/apcupsd
-	eend $?
-}
-
diff --git a/testing/dahdi-linux-vserver/APKBUILD b/testing/dahdi-linux-vserver/APKBUILD
index 1638b5f117..14c26a0078 100644
--- a/testing/dahdi-linux-vserver/APKBUILD
+++ b/testing/dahdi-linux-vserver/APKBUILD
@@ -34,15 +34,22 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna
 	dahdi-2.6.31.patch
 	"
 
-build() {
+prepare() {
 	cd "$srcdir/$_realname-$_dahdiver"
 	for i in ../*.patch ../*.diff; do
 		msg "Applying $i"
 		patch -p1 < $i || return 1;
 	done
+}
 
+build() {
+	cd "$srcdir/$_realname-$_dahdiver"
 	make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \
 		|| return 1
+}
+
+package() {
+	cd "$srcdir/$_realname-$_dahdiver"
 	make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \
 		DESTDIR="$pkgdir" install
 	rm -rf "$pkgdir"/lib/firmware "$pkgdir"/usr/lib/hotplug/firmware \
diff --git a/testing/kqemu-vserver/APKBUILD b/testing/kqemu-vserver/APKBUILD
index ffa5f0c01c..8f88148f04 100644
--- a/testing/kqemu-vserver/APKBUILD
+++ b/testing/kqemu-vserver/APKBUILD
@@ -12,7 +12,7 @@ _abi_release=$pkgver-${_flavor}
 pkgname=${_realname}-${_flavor}
 pkgver=$pkgver
 _realver=1.4.0pre1
-pkgrel=0
+pkgrel=1
 pkgdesc="$_flavor kernel modules for kemu"
 url="http://www.nongnu.org/qemu/"
 license="GPL"
@@ -22,11 +22,22 @@ makedepends="linux-${_flavor}-dev=${_kernelver}"
 subpackages=
 source="http://www.nongnu.org/qemu/kqemu-$_realver.tar.gz"
 
+# override the kernel's prepare()
+prepare() {
+	cd "$srcdir"/$_realname-$_realver
+	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' kqemu-linux.c
+}
+
 build() {
 	cd "$srcdir"/$_realname-$_realver
 	export CFLAGS="$CFLAGS -fno-pie -fno-stack-protector"
+	export KERNEL_CFLAGS="$CFLAGS"
 	./configure --kernel-path=/lib/modules/${_abi_release}/build
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$_realname-$_realver
 	install -D -m644 kqemu.ko \
 		"$pkgdir"/lib/modules/${_abi_release}/misc/kqemu.ko \
 		|| return 1
diff --git a/testing/linux-vserver/APKBUILD b/testing/linux-vserver/APKBUILD
index fac250fe4d..2f449f684c 100644
--- a/testing/linux-vserver/APKBUILD
+++ b/testing/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=2.6.31.4
+pkgver=2.6.31.5
 _kernver=2.6.31
 pkgrel=0
 pkgdesc="Linux kernel with vserver"
@@ -13,7 +13,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
 install=
 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
-	http://vserver.13thfloor.at/Experimental/patch-2.6.31.4-vs2.3.0.36.19.diff
+	http://vserver.13thfloor.at/Experimental/patch-2.6.31.5-vs2.3.0.36.21.diff
 	kernelconfig.x86
 	"
 subpackages="$pkgname-dev"
@@ -21,7 +21,7 @@ license="GPL-2"
 
 _abi_release=${pkgver}-${_flavor}
 
-_prepare() {
+prepare() {
 	cd "$srcdir"/linux-$_kernver
 	if [ "$_kernver" != "$pkgver" ]; then
 		bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1
@@ -48,10 +48,12 @@ menuconfig() {
 }
 
 build() {
-	_prepare || return 1
 	cd "$srcdir"/build
 	make CC="$CC" || return 1
+}
 
+package() {
+	cd "$srcdir"/build
 	mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules
 	make modules_install install \
 		INSTALL_MOD_PATH="$pkgdir" \
@@ -112,6 +114,6 @@ dev() {
 }
 
 md5sums="84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-02078f4231baee4f0004212f2875df2b  patch-2.6.31.4.bz2
-e42d6fe6420b6e0f980fbf8e0aa29b1c  patch-2.6.31.4-vs2.3.0.36.19.diff
-c9080604a8926fefb2a0ec9ede42f09a  kernelconfig.x86"
+6cac5e59d5562b591cdda485941204d5  patch-2.6.31.5.bz2
+cdb4da685b9d57196de435eb58c39843  patch-2.6.31.5-vs2.3.0.36.21.diff
+f24e62dda29c2562b8e271542d613d20  kernelconfig.x86"
diff --git a/testing/linux-vserver/kernelconfig.x86 b/testing/linux-vserver/kernelconfig.x86
index 0644b5c0da..b1ecce4280 100644
--- a/testing/linux-vserver/kernelconfig.x86
+++ b/testing/linux-vserver/kernelconfig.x86
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.31.4-vs2.3.0.36.19
-# Fri Oct 16 15:01:25 2009
+# Linux kernel version: 2.6.31.5-vs2.3.0.36.21
+# Mon Oct 26 21:20:26 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -260,6 +260,7 @@ CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
 # CONFIG_PROCESSOR_SELECT is not set
 CONFIG_CPU_SUP_INTEL=y
@@ -296,8 +297,8 @@ CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_X86_CPU_DEBUG=m
 # CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 # CONFIG_VMSPLIT_2G is not set
@@ -305,7 +306,8 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_X86_PAE=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -318,7 +320,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
@@ -1587,6 +1589,7 @@ CONFIG_IEEE1394_DV1394=m
 CONFIG_I2O=m
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_I2O_CONFIG=m
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
@@ -3817,7 +3820,6 @@ CONFIG_DMA_ENGINE=y
 # DMA Clients
 #
 CONFIG_NET_DMA=y
-# CONFIG_ASYNC_TX_DMA is not set
 CONFIG_DMATEST=m
 CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
diff --git a/testing/util-vserver/APKBUILD b/testing/util-vserver/APKBUILD
index 4d70b9f81d..92faf45798 100644
--- a/testing/util-vserver/APKBUILD
+++ b/testing/util-vserver/APKBUILD
@@ -2,16 +2,17 @@
 pkgname=util-vserver
 pkgver=0.30.216_pre2849
 _realver=0.30.216-pre2849
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux-VServer admin utilities"
 url="http://www.nongnu.org/util-vserver/"
 license="GPL"
 # needs coreutils for touch -t
 makedepends="iptables-dev e2fsprogs-dev beecrypt-dev autoconf automake
 	pkgconfig libtool"
-depends="bash"
+depends="bash make"
 
 source="http://people.linux-vserver.org/~dhozac/t/uv-testing/util-vserver-$_realver.tar.bz2
+	busybox.patch
 	chmod.patch
 	ensc_pathprog.patch
 	validate.patch
@@ -51,6 +52,7 @@ build() {
 }
 
 md5sums="af4c22b420320bdd94a1756f3c90de20  util-vserver-0.30.216-pre2849.tar.bz2
+62b7b9bbe5902b95f4614272af003dfd  busybox.patch
 73c7437dea6937a57cf38d166ef83c09  chmod.patch
 ff8f561f672524eb46fe633f584ef60e  ensc_pathprog.patch
 da8b70c4fd40e68894b3903ffd121397  validate.patch
diff --git a/testing/util-vserver/busybox.patch b/testing/util-vserver/busybox.patch
new file mode 100644
index 0000000000..cc471cc4eb
--- /dev/null
+++ b/testing/util-vserver/busybox.patch
@@ -0,0 +1,11 @@
+--- a/scripts/start-vservers	Mon Oct 26 13:58:40 2009
++++ b/scripts/start-vservers	Mon Oct 26 13:59:31 2009
+@@ -131,7 +131,7 @@
+     d=$__CONFDIR/${vservers[$i]}/apps/init
+     f=$d/mark
+     { test -n "$OPTION_MARK_ANY"; } || \
+-    { test -n "$OPTION_MARK" -a -r "$f" && grep -qx "$OPTION_MARK" "$f"; } || \
++    { test -n "$OPTION_MARK" -a -r "$f" && grep -q "^${OPTION_MARK}$" "$f"; } || \
+     { test -z "$OPTION_MARK" && test ! -e "$f"; } || \
+     unset vservers[$i]
+ done