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

9 files changed, 158 insertions, 19 deletions

diff --git a/testing/kqemu-grsec/APKBUILD b/testing/kqemu-grsec/APKBUILD
new file mode 100644
index 000000000..b9527fa87
--- /dev/null
+++ b/testing/kqemu-grsec/APKBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
+_flavor=grsec
+_realname=kqemu
+# source the kernel version
+if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
+	. ../../main/linux-$_flavor/APKBUILD
+fi
+_kernelver=$pkgver-r$pkgrel
+_abi_release=$pkgver-${_flavor}
+
+pkgname=${_realname}-${_flavor}
+pkgver=1.4.0_pre1
+_realver=1.4.0pre1
+pkgrel=10
+pkgdesc="$_flavor kernel modules for kemu"
+url="http://www.nongnu.org/qemu/"
+license="GPL"
+depends="linux-${_flavor}=${_kernelver}"
+install=
+makedepends="linux-${_flavor}-dev=${_kernelver}"
+subpackages=
+source="http://www.nongnu.org/qemu/kqemu-$_realver.tar.gz"
+
+build() {
+	cd "$srcdir"/$_realname-$_realver
+	./configure --kernel-path=/lib/modules/${_abi_release}/build
+	make || return 1
+	install -D -m644 kqemu.ko \
+		"$pkgdir"/lib/modules/${_abi_release}/misc/kqemu.ko \
+		|| return 1
+} 
+md5sums="d738d8ca7332211ab716ec3213d82ee1  kqemu-1.4.0pre1.tar.gz"
diff --git a/testing/kqemu-vserver/APKBUILD b/testing/kqemu-vserver/APKBUILD
new file mode 100644
index 000000000..eccb63bf4
--- /dev/null
+++ b/testing/kqemu-vserver/APKBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
+_flavor=vserver
+_realname=kqemu
+# source the kernel version
+if [ -f ../../testing/linux-$_flavor/APKBUILD ]; then
+	. ../../testing/linux-$_flavor/APKBUILD
+fi
+_kernelver=$pkgver-r$pkgrel
+_abi_release=$pkgver-${_flavor}
+
+pkgname=${_realname}-${_flavor}
+pkgver=1.4.0_pre1
+_realver=1.4.0pre1
+pkgrel=0
+pkgdesc="$_flavor kernel modules for kemu"
+url="http://www.nongnu.org/qemu/"
+license="GPL"
+depends="linux-${_flavor}=${_kernelver}"
+install=
+makedepends="linux-${_flavor}-dev=${_kernelver}"
+subpackages=
+source="http://www.nongnu.org/qemu/kqemu-$_realver.tar.gz"
+
+build() {
+	cd "$srcdir"/$_realname-$_realver
+	./configure --kernel-path=/lib/modules/${_abi_release}/build
+	make || return 1
+	install -D -m644 kqemu.ko \
+		"$pkgdir"/lib/modules/${_abi_release}/misc/kqemu.ko \
+		|| return 1
+} 
+md5sums="d738d8ca7332211ab716ec3213d82ee1  kqemu-1.4.0pre1.tar.gz"
diff --git a/testing/linux-vserver/APKBUILD b/testing/linux-vserver/APKBUILD
index 245d1b11e..ba925b87f 100644
--- a/testing/linux-vserver/APKBUILD
+++ b/testing/linux-vserver/APKBUILD
@@ -4,11 +4,11 @@ _flavor=vserver
 pkgname=linux-${_flavor}
 pkgver=2.6.30.8
 _kernver=2.6.30
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with vserver"
 url="http://linux-vserver.org/"
 depends="mkinitfs linux-firmware"
-makedepends="perl installkernel"
+makedepends="perl installkernel bash"
 _config=${config:-kernelconfig}
 install=
 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
@@ -119,4 +119,4 @@ md5sums="7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 7e9b405b840bf5ecc70d208bfccee5f9  patch-2.6.30.8.bz2
 37e45dcf0eb69e8cc8665522dde28f1a  patch-2.6.30.6-vs2.3.0.36.14-pre8.diff
 ca05fd252783b82e01610e775cf56498  net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
-5db2d023915e69fbcab0e1eec4f31402  kernelconfig"
+0f32935a865e6b2ab9e4623a02f9d85a  kernelconfig"
diff --git a/testing/linux-vserver/kernelconfig b/testing/linux-vserver/kernelconfig
index 2a3501250..b6db32b21 100644
--- a/testing/linux-vserver/kernelconfig
+++ b/testing/linux-vserver/kernelconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30.7-vs2.3.0.36.14-pre8
-# Tue Sep 22 11:34:29 2009
+# Linux kernel version: 2.6.30.8-vs2.3.0.36.14-pre8
+# Mon Oct  5 08:18:08 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -200,7 +200,6 @@ CONFIG_PARAVIRT_GUEST=y
 CONFIG_VMI=y
 # CONFIG_KVM_CLOCK is not set
 CONFIG_KVM_GUEST=y
-CONFIG_LGUEST_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_SPINLOCKS is not set
 # CONFIG_PARAVIRT_CLOCK is not set
@@ -245,6 +244,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
@@ -280,8 +280,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
@@ -289,7 +289,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
@@ -302,7 +303,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
@@ -1551,6 +1552,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
@@ -2262,7 +2264,7 @@ CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
 CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=y
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
@@ -3772,7 +3774,6 @@ CONFIG_RTC_DRV_PCF50633=m
 #
 # on-CPU RTC drivers
 #
-# CONFIG_DMADEVICES is not set
 CONFIG_AUXDISPLAY=y
 CONFIG_KS0108=m
 CONFIG_KS0108_PORT=0x378
@@ -4314,9 +4315,8 @@ CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 # CONFIG_KVM_TRACE is not set
-CONFIG_LGUEST=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_BINARY_PRINTF=y
diff --git a/testing/util-vserver/APKBUILD b/testing/util-vserver/APKBUILD
index 802315b95..31b076f4e 100644
--- a/testing/util-vserver/APKBUILD
+++ b/testing/util-vserver/APKBUILD
@@ -2,31 +2,47 @@
 pkgname=util-vserver
 pkgver=0.30.216_pre2841
 _realver=0.30.216-pre2841
-pkgrel=1
+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 coreutils"
+	pkgconfig libtool"
 depends="bash"
 
 source="http://people.linux-vserver.org/~dhozac/t/uv-testing/util-vserver-$_realver.tar.bz2
+	chmod.patch
+	ensc_pathprog.patch
+	validate.patch
+	alpine.patch
 	"
 subpackages="$pkgname-doc $pkgname-dev"
 
 build() {
 	local i
 	cd "$srcdir"/$pkgname-$_realver
+	patch -p1 -i ../chmod.patch || return 1
+	patch -p1 -i ../ensc_pathprog.patch || return 1
+	patch -p1 -i ../validate.patch || return 1
+	aclocal -I m4 && autoconf && automake && libtoolize || return 1
+
+	# this is an ugly workaround
+	sed -i -e "s:as_echo=.*:as_echo=echo:g" configure
 
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \
 		--with-initscripts=gentoo \
-		--localstatedir=/var 
+		--localstatedir=/var \
+		|| return 1
 
 	make || return 1
 	make DESTDIR="$pkgdir/" install install-distribution
 }
 
-md5sums="71c3f2012d0159aac22fee098be063e9  util-vserver-0.30.216-pre2841.tar.bz2"
+md5sums="71c3f2012d0159aac22fee098be063e9  util-vserver-0.30.216-pre2841.tar.bz2
+73c7437dea6937a57cf38d166ef83c09  chmod.patch
+ff8f561f672524eb46fe633f584ef60e  ensc_pathprog.patch
+da8b70c4fd40e68894b3903ffd121397  validate.patch
+65fee3e086d2dd413526609c9ee782e5  alpine.patch"
diff --git a/testing/util-vserver/alpine.patch b/testing/util-vserver/alpine.patch
new file mode 100644
index 000000000..a9914a4b8
--- /dev/null
+++ b/testing/util-vserver/alpine.patch
@@ -0,0 +1,21 @@
+diff -ru a/distrib/alpine/initpost b/distrib/alpine/initpost
+--- a/distrib/alpine/initpost	2009-10-02 18:36:00.000000000 +0000
++++ b/distrib/alpine/initpost	2009-10-02 18:42:35.000000000 +0000
+@@ -24,7 +24,7 @@
+ cd "$vdir"
+ 
+ echo ">>> Creating missing dirs..."
+-$_CHROOT_SH mkdir proc sys dev home etc etc/rcL.d etc/rcK.d 2>/dev/null
++$_CHROOT_SH mkdir -p proc sys dev home etc 2>/dev/null
+ 
+ # remove mtab which is a link
+ if test -e "$vdir/etc/mtab"; then
+@@ -37,7 +37,7 @@
+ $_VSERVER "$vserver" stop  &>/dev/null || true
+ $_VSERVER "$vserver" start --rescue --rescue-init /bin/busybox sh -c '
+ 	/bin/busybox --install -s
+-	/sbin/rc_add -s 20 -k syslog
++	/sbin/rc-update add syslog boot
+ '
+ 
+ # set up hostname
diff --git a/testing/util-vserver/chmod.patch b/testing/util-vserver/chmod.patch
new file mode 100644
index 000000000..53861e893
--- /dev/null
+++ b/testing/util-vserver/chmod.patch
@@ -0,0 +1,12 @@
+diff -ru a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2009-09-29 13:48:10.000000000 +0000
++++ b/Makefile.am	2009-09-29 13:50:00.000000000 +0000
+@@ -149,7 +149,7 @@
+ 			@mkdir -p $$(dirname '$@')
+ 			@echo "$(SED) -e '...' $*.pathsubst >$*"
+ 			@$(SED) -e '$(pathsubst_RULES)' '$<' >'$@.tmp'
+-			@-chmod --reference='$<' '$@.tmp'
++			@-chmod $$(stat -c %a '$<') '$@.tmp'
+ 			@if cmp -s '$@.tmp' '$*'; then \
+ 				echo "... no changes, reusing old version"; \
+ 				rm -f '$@.tmp'; \
diff --git a/testing/util-vserver/ensc_pathprog.patch b/testing/util-vserver/ensc_pathprog.patch
new file mode 100644
index 000000000..e14c1f6da
--- /dev/null
+++ b/testing/util-vserver/ensc_pathprog.patch
@@ -0,0 +1,14 @@
+diff -ru a/m4/ensc_pathprog.m4 b/m4/ensc_pathprog.m4
+--- a/m4/ensc_pathprog.m4	2009-10-02 17:25:49.000000000 +0000
++++ b/m4/ensc_pathprog.m4	2009-10-02 17:31:28.000000000 +0000
+@@ -61,7 +61,9 @@
+ 
+ 	if test "x$5" = x; then
+ 		if test -h "${$1}"; then
+-			$1=`readlink -f "${$1}"`
++			case `readlink "{$1}"` in
++				../*) $1=`readlink -f "${$1}"`;;
++			esac
+ 		fi
+ 	fi
+ 
diff --git a/testing/util-vserver/validate.patch b/testing/util-vserver/validate.patch
new file mode 100644
index 000000000..081dce5a3
--- /dev/null
+++ b/testing/util-vserver/validate.patch
@@ -0,0 +1,10 @@
+diff -ru a/m4/validate.am b/m4/validate.am
+--- a/m4/validate.am	2009-10-02 17:57:03.000000000 +0000
++++ b/m4/validate.am	2009-10-02 17:58:15.000000000 +0000
+@@ -26,5 +26,5 @@
+ .%-up-to-date:
+ 			@rm -f  .*-up-to-date
+ 			@$(MAKE) -s clean
+-			@touch -t 197001020000 '$@'
++			@cp -a Makefile.am '$@'
+ 			@$(MAKE) -s $(BUILT_SOURCES)