Merge remote-tracking branch 'alpine/master'

37 files changed, 467 insertions, 475 deletions

diff --git a/main/abuild/0001-Delete-downloaded-source-if-fails-md5sum.patch b/main/abuild/0001-Delete-downloaded-source-if-fails-md5sum.patch
deleted file mode 100644
index 2bace192eb..0000000000
--- a/main/abuild/0001-Delete-downloaded-source-if-fails-md5sum.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3ce5ea77d1ec3760e4961b63def94e6f5bb73d24 Mon Sep 17 00:00:00 2001
-From: Ted Trask <ttrask01@yahoo.com>
-Date: Fri, 11 Feb 2011 15:09:44 +0000
-Subject: [PATCH 1/2] Delete downloaded source if fails md5sum
-
----
- abuild.in |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index 551d759..22f50fd 100755
---- a/abuild.in
-+++ b/abuild.in
-@@ -167,7 +167,10 @@ md5check() {
- 	fi
- 	fetch || return 1
- 	msg "Checking md5sums..."
--	cd "$srcdir" && echo "$md5sums" | md5sum -c 
-+	cd "$srcdir"
-+	if ! echo "$md5sums" | md5sum -c; then
-+		cleancache && return 1
-+	fi
- }
- 
- # verify upstream sources
--- 
-1.6.6.1
-
diff --git a/main/abuild/0001-abuild-only-warn-when-we-think-there-should-have-bee.patch b/main/abuild/0001-abuild-only-warn-when-we-think-there-should-have-bee.patch
deleted file mode 100644
index a2ca264b22..0000000000
--- a/main/abuild/0001-abuild-only-warn-when-we-think-there-should-have-bee.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 479cca4a44124b36f41872940adfb183597f40e7 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Jan 2011 20:21:33 +0000
-Subject: [PATCH] abuild: only warn when we think there should have been noarch
-
-and we dont want -dev packages to be noarch
----
- abuild.in |   12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index 904b1c3..0b602ca 100755
---- a/abuild.in
-+++ b/abuild.in
-@@ -566,6 +566,11 @@ dir_has_arch_binaries() {
- 	return 1
- }
- 
-+# returns true if this is the -dev package
-+is_dev_pkg() {
-+	test "${subpkgname%-dev}" != "$subpkgname"
-+}
-+
- # check that noarch is set if needed
- archcheck() {
- 	options_has "!archcheck" && return 0
-@@ -573,10 +578,9 @@ archcheck() {
- 		[ "$arch" != "noarch" ] && return 0
- 		error "Arch specific binaries found so arch must not be set to \"noarch\""
- 		return 1
--	else
--		[ "$arch" = "noarch" ] && return 0
--		error "No arch specific binaries found so arch should be set to \"noarch\""
--		return 1
-+	elif [ "$arch" != "noarch" ] && ! is_dev_pkg; then
-+		# we dont want -dev package go to noarch
-+		warning "No arch specific binaries found so arch should probably be set to \"noarch\""
- 	fi
- 	return 0
- }
--- 
-1.7.3.4
-
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 598bd92a2e..e6efcd2ec4 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,13 +1,10 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgdesc="Script to build Alpine Packages"
 pkgname=abuild
-pkgver=2.7.2
-pkgrel=2
+pkgver=2.7.3
+pkgrel=0
 url=http://git.alpinelinux.org/cgit/abuild/
 source="http://git.alpinelinux.org/cgit/abuild.git/snapshot/abuild-$pkgver.tar.bz2
-	0001-abuild-only-warn-when-we-think-there-should-have-bee.patch
-	enhanced-subpkgdesc.patch
-	0001-Delete-downloaded-source-if-fails-md5sum.patch
 	"
 depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1"
 makedepends="openssl-dev pkgconfig"
@@ -40,7 +37,4 @@ package() {
 	install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
 }
 
-md5sums="6b621f93e51faf19dc1edffbfaba67d1  abuild-2.7.2.tar.bz2
-865f1e53e76cb77abb356cd6bb5b9588  0001-abuild-only-warn-when-we-think-there-should-have-bee.patch
-7fbc7dd27edae8cc5b2bc0a499aac8b6  enhanced-subpkgdesc.patch
-29b02ad1d49939e4fe7ad6b022188992  0001-Delete-downloaded-source-if-fails-md5sum.patch"
+md5sums="b1e1f1deb38311dbbe94eefaaa731872  abuild-2.7.3.tar.bz2"
diff --git a/main/abuild/enhanced-subpkgdesc.patch b/main/abuild/enhanced-subpkgdesc.patch
deleted file mode 100644
index 3bcc767251..0000000000
--- a/main/abuild/enhanced-subpkgdesc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0187915cc2caed5bfe5fbd1f41da003d9d691fa0 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Fri, 28 Jan 2011 00:46:43 +0000
-Subject: default_doc/default_dev: enhanced pkgdesc
-
----
-diff --git a/abuild.in b/abuild.in
-index 904b1c3..551d759 100755
---- a/abuild.in
-+++ b/abuild.in
-@@ -757,7 +757,9 @@ default_doc() {
- 	depends="$depends_doc"
- 	install="$install_doc"
- 	triggers="$triggers_doc"
-+	pkgdesc="$pkgdesc (documentation)"
- 	arch=${arch_doc:-"noarch"}
-+
- 	local i
- 	for i in doc man info html sgml licenses gtk-doc; do
- 		if [ -d "$pkgdir/usr/share/$i" ]; then
-@@ -806,6 +808,8 @@ default_dev() {
- 	depends="$pkgname $depends_dev"
- 	install="$install_dev"
- 	triggers="$triggers_dev"
-+	pkgdesc="$pkgdesc (development files)"
-+
- 	for i in $origsubpackages; do
- 		[ "${i%:*}" = "$subpkgname" ] || depends="$depends ${i%:*}"
- 	done
---
-cgit v0.8.3.3
diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD
index 62962f8c64..28c746a526 100644
--- a/main/acf-kamailio/APKBUILD
+++ b/main/acf-kamailio/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-kamailio
-pkgver=0.3.1
+pkgver=0.3.2
 pkgrel=0
 pkgdesc="A web-based system administration interface for kamailio"
 url="http://git.alpinelinux.org/cgit/acf-kamailio"
@@ -20,4 +20,4 @@ package() {
 
 }
 
-md5sums="3a5dee290865ad5266dd7d3f3c822e69  acf-kamailio-0.3.1.tar.bz2"
+md5sums="8721b248bad1556949a7c8b9c6c03d08  acf-kamailio-0.3.2.tar.bz2"
diff --git a/main/bitlbee/APKBUILD b/main/bitlbee/APKBUILD
index 40dacb0c68..61a970c087 100644
--- a/main/bitlbee/APKBUILD
+++ b/main/bitlbee/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 pkgname=bitlbee
-pkgver=3.0.1
-pkgrel=3
+pkgver=3.0.2
+pkgrel=0
 pkgdesc="An IRC to other chat networks gateway"
 url="http://www.bitlbee.org/"
 arch="all"
@@ -52,7 +52,7 @@ otr() {
     mv "$pkgdir"/usr/lib/bitlbee "$subpkgdir"/usr/lib
 }
 
-md5sums="4d00c6e09859b653f955b16b988db0ac  bitlbee-3.0.1.tar.gz
-1837acd53669d7590a13172d5653a24d  bitlbee.initd
+md5sums="214084bd2980047288d2c71c6b5052b7  bitlbee-3.0.2.tar.gz
+6b3c70649ececec230d145b62778ad61  bitlbee.initd
 bf07d39a4b652c63415b411229c5e281  bitlbee.confd
 2d91f7ae46d69560d7f156f282dceaef  bitlbee.post-install"
diff --git a/main/bitlbee/bitlbee.initd b/main/bitlbee/bitlbee.initd
index 0bbd04871e..92bab34abd 100644
--- a/main/bitlbee/bitlbee.initd
+++ b/main/bitlbee/bitlbee.initd
@@ -21,7 +21,7 @@ start() {
 
 stop() {
 	ebegin "Stopping ${name}"
-		start-stop-daemon --signal 15 --quiet \
+		start-stop-daemon --stop --signal 9 --quiet \
 			--pidfile /var/run/$name.pid  \
 			--exec ${daemon}
 	eend $?
diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD
index 0f69b2e344..eaa03a3200 100644
--- a/main/boost/APKBUILD
+++ b/main/boost/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=boost
-pkgver=1.45.0
+pkgver=1.46.0
 
 _x=${pkgver%%.*}	# strip .y.z
 _y=${pkgver%.*}		# strip .z
@@ -133,4 +133,4 @@ wave() { _mvlib wave; }
 wserialization() { _mvlib wserialization; }
 
 
-md5sums="739792c98fafb95e7a6b5da23a30062c  boost_1_45_0.tar.gz"
+md5sums="820393d5746553c192db7b81ba0e53fe  boost_1_46_0.tar.gz"
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index a4e9fa5ef8..109e639d21 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.18.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -13,6 +13,8 @@ triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*"
 source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	$pkgname-1.11.1-bb.patch
 	busybox-uname-is-not-gnu.patch
+	busybox-1.18.3-buildsys.patch
+	busybox-1.18.3-klogd.patch
 	busybox-1.18.3-wget.patch
 	loginutils-sha512.patch
 	busyboxconfig"
@@ -75,6 +77,8 @@ static() {
 md5sums="660af4d44661d32b22025a66f4f78df2  busybox-1.18.3.tar.bz2
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
 b5375210f13fd6e1ca61a565e8fabd35  busybox-uname-is-not-gnu.patch
+1270a714d2ed9940f04379c97bb83cba  busybox-1.18.3-buildsys.patch
+f2277e7a31d04295bd9d56a98ff1535b  busybox-1.18.3-klogd.patch
 abe065069fed8458eedbdad48c115e1f  busybox-1.18.3-wget.patch
 d21d70d590e9e04bfc65ecb23b9d1617  loginutils-sha512.patch
 181310149cad8fce22aba96220cbbd38  busyboxconfig"
diff --git a/main/busybox/busybox-1.18.3-buildsys.patch b/main/busybox/busybox-1.18.3-buildsys.patch
new file mode 100644
index 0000000000..330b73fbb8
--- /dev/null
+++ b/main/busybox/busybox-1.18.3-buildsys.patch
@@ -0,0 +1,10 @@
+--- busybox-1.18.3/Config.in
++++ busybox-1.18.3-buildsys/Config.in
+@@ -126,7 +126,6 @@ config FEATURE_INSTALLER
+ config INSTALL_NO_USR
+ 	bool "Don't use /usr"
+ 	default n
+-	depends on FEATURE_INSTALLER
+ 	help
+ 	  Disable use of /usr. busybox --install and "make install"
+ 	  will install applets only to /bin and /sbin,
diff --git a/main/busybox/busybox-1.18.3-klogd.patch b/main/busybox/busybox-1.18.3-klogd.patch
new file mode 100644
index 0000000000..2272cd0030
--- /dev/null
+++ b/main/busybox/busybox-1.18.3-klogd.patch
@@ -0,0 +1,45 @@
+--- busybox-1.18.3/sysklogd/klogd.c
++++ busybox-1.18.3-klogd/sysklogd/klogd.c
+@@ -150,12 +150,41 @@ int klogd_main(int argc UNUSED_PARAM, ch
+ 	 */
+ 	klogd_open();
+ 	openlog("kernel", 0, LOG_KERN);
++	/*
++	 * glibc problem: for some reason, glibc changes LOG_KERN to LOG_USER
++	 * above. The logic behind this is that standard
++	 * http://pubs.opengroup.org/onlinepubs/9699919799/functions/syslog.html
++	 * says the following about openlog and syslog:
++	 * "LOG_USER
++	 *  Messages generated by arbitrary processes.
++	 *  This is the default facility identifier if none is specified."
++	 *
++	 * I believe glibc misinterpreted this text as "if openlog's
++	 * third parameter is 0 (=LOG_KERN), treat it as LOG_USER".
++	 * Whereas it was meant to say "if *syslog* is called with facility
++	 * 0 in its 1st parameter without prior call to openlog, then perform
++	 * implicit openlog(LOG_USER)".
++	 *
++	 * As a result of this, eh, feature, standard klogd was forced
++	 * to open-code its own openlog and syslog implementation (!).
++	 *
++	 * Note that prohibiting openlog(LOG_KERN) on libc level does not
++	 * add any security: any process can open a socket to "/dev/log"
++	 * and write a string "<0>Voila, a LOG_KERN + LOG_EMERG message"
++	 *
++	 * Google code search tells me there is no widespread use of
++	 * openlog("foo", 0, 0), thus fixing glibc won't break userspace.
++	 *
++	 * The bug against glibc was filed:
++	 * bugzilla.redhat.com/show_bug.cgi?id=547000
++	 */
+ 
+ 	if (i)
+ 		klogd_setloglevel(i);
+ 
+-	bb_signals(BB_FATAL_SIGS, record_signo);
+ 	signal(SIGHUP, SIG_IGN);
++	/* We want klogd_read to not be restarted, thus _norestart: */
++	bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo);
+ 
+ 	syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
+ 
diff --git a/main/bzr/APKBUILD b/main/bzr/APKBUILD
new file mode 100644
index 0000000000..1b64dd8cab
--- /dev/null
+++ b/main/bzr/APKBUILD
@@ -0,0 +1,29 @@
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=bzr
+pkgver=2.3.0
+pkgrel=0
+pkgdesc="A scalable distributed SCM tool"
+url="http://bazaar.canonical.com/"
+arch="all"
+license="GPL"
+depends="python"
+makedepends="python-dev"
+subpackages="$pkgname-doc"
+source="http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	python setup.py build
+}
+
+package() { 
+	cd "$srcdir"/$pkgname-$pkgver
+	python setup.py install --root="$pkgdir" || return 1
+}
+
+doc() {
+	mkdir -p "$subpkgdir"/usr/share
+	mv "$pkgdir"/usr/man "$subpkgdir"/usr/share/man
+}
+
+md5sums="2d8bc55d43209189a209361178d9d372  bzr-2.3.0.tar.gz"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index da9b7a8ddb..22414ed042 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
-pkgver=2.0.9
-pkgrel=1
+pkgver=2.0.11
+pkgrel=0
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
 arch="all"
@@ -96,7 +96,7 @@ config() {
 	mkdir -p "$subpkgdir"/etc/dovecot/conf.d
 }
 
-md5sums="3a8692ba9e6f680436f6e44f6f6795f1  dovecot-2.0.9.tar.gz
+md5sums="088a850d6583a7ec0a8074ce929b3496  dovecot-2.0.11.tar.gz
 aec5cc797ab2acf72ce3b6bb1030345f  dovecot.logrotate
 c58b474dca20e6e60fa4f1f5b9c726e1  dovecot.initd
 95cf57ecc835882228bbbb019ce3abf8  dovecot-sample-config.post-install"
diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD
index 208c28a712..5423c19501 100644
--- a/main/firefox/APKBUILD
+++ b/main/firefox/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=firefox
-pkgver=3.6.14
+pkgver=3.6.15
 _xulver=1.9.2.14
 pkgrel=2
 pkgdesc="firefox web browser (unofficial branding)"
@@ -86,7 +86,7 @@ package() {
 	install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/firefox-safe.desktop
 }
 
-md5sums="ab0d00cd33e6b2388429dda1c01abd01  firefox-3.6.14.source.tar.bz2
+md5sums="fcf8042948d91f1f3d9c33599b79cf35  firefox-3.6.15.source.tar.bz2
 7938f0054456f3767d2427dff137ab34  mozconfig
 f437e94acff8f810991271ef4677d859  firefox-agent.patch
 1807651225b021e043154f8bba715a19  firefox-defaults.patch
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 3ccfd40477..46072d6af7 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -7,7 +7,7 @@ _specs_gcc_ver=4.4.3
 
 _uclibc_abiver=0.9.32
 
-pkgrel=4
+pkgrel=6
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 arch="all"
diff --git a/main/gtk-xfce-engine/APKBUILD b/main/gtk-xfce-engine/APKBUILD
index 69985ba4d9..cd9fb1b880 100644
--- a/main/gtk-xfce-engine/APKBUILD
+++ b/main/gtk-xfce-engine/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk-xfce-engine
-pkgver=2.8.0
+pkgver=2.8.1
 pkgrel=0
 pkgdesc="A port of Xfce engine to GTK+-2.0"
 url="http://www.xfce.org/"
@@ -25,4 +25,4 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="195f4dc2e6632143ca9ca6bd17ca4680  gtk-xfce-engine-2.8.0.tar.bz2"
+md5sums="8a6527b61b0554cda11d06f66a567314  gtk-xfce-engine-2.8.1.tar.bz2"
diff --git a/main/libc0.9.32/1.patch b/main/libc0.9.32/1.patch
deleted file mode 100644
index 49a43df0a3..0000000000
--- a/main/libc0.9.32/1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ca7ec3c7b1a65070d9abbf2414b6a2f24917d863 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Wed, 20 Oct 2010 09:41:31 -0500
-Subject: [PATCH 1/2] libc: Fix build with stack protector enabled on x86_64.
-
-The code used HIDDEN_JUMPTARGET() but these symbols aren't aliased.
-So we just replace that with __chk_fail@PLT.
----
- libc/string/x86_64/memcpy.S |    2 +-
- libc/string/x86_64/memset.S |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libc/string/x86_64/memcpy.S b/libc/string/x86_64/memcpy.S
-index 6d941e0..f8b9e23 100644
---- a/libc/string/x86_64/memcpy.S
-+++ b/libc/string/x86_64/memcpy.S
-@@ -30,7 +30,7 @@
- ENTRY (__memcpy_chk)
- 	cmpq	%rdx, %rcx
- #if defined __UCLIBC_HAS_SSP__
--	jb	HIDDEN_JUMPTARGET (__chk_fail)
-+	jb	__chk_fail@PLT
- #endif
- END (__memcpy_chk)
- #endif
-diff --git a/libc/string/x86_64/memset.S b/libc/string/x86_64/memset.S
-index df265f3..38744cf 100644
---- a/libc/string/x86_64/memset.S
-+++ b/libc/string/x86_64/memset.S
-@@ -33,7 +33,7 @@
- ENTRY (__memset_chk)
- 	cmpq	%rdx, %rcx
- #if defined __UCLIBC_HAS_SSP__
--	jb	HIDDEN_JUMPTARGET (__chk_fail)
-+	jb	__chk_fail@PLT
- #endif
- END (__memset_chk)
- #endif
--- 
-1.7.2.1
-
diff --git a/main/libc0.9.32/2.patch b/main/libc0.9.32/2.patch
deleted file mode 100644
index 57064f5454..0000000000
--- a/main/libc0.9.32/2.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 1560d8c409c802ea06ecb921fcc5a534b70d32d7 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Wed, 20 Oct 2010 09:48:33 -0500
-Subject: [PATCH 2/2] libpthread: Fix compilation on x86_64.
-
----
- .../sysdeps/unix/sysv/linux/x86_64/lowlevellock.S  |    2 +-
- .../unix/sysv/linux/x86_64/lowlevelrobustlock.S    |    2 +-
- .../sysv/linux/x86_64/pthread_cond_timedwait.S     |   10 +---------
- .../sysv/linux/x86_64/pthread_rwlock_timedrdlock.S |    2 +-
- .../sysv/linux/x86_64/pthread_rwlock_timedwrlock.S |    2 +-
- .../sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S |    2 +-
- 6 files changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
-index f875323..5f1d11e 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
-@@ -163,7 +163,7 @@ __lll_timedlock_wait:
- 	cfi_startproc
- # ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- #  ifdef __PIC__
--	cmpl	$0, __have_futex_clock_realtime(%rip)
-+	cmpl	$0, __have_futex_clock_realtime@PLT
- #  else
- 	cmpl	$0, __have_futex_clock_realtime
- #  endif
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
-index 2eb8e29..bfd9a14 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
-@@ -118,7 +118,7 @@ __lll_robust_timedlock_wait:
- 	cfi_startproc
- # ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- #  ifdef __PIC__
--	cmpl	$0, __have_futex_clock_realtime(%rip)
-+	cmpl	$0, __have_futex_clock_realtime@PLT
- #  else
- 	cmpl	$0, __have_futex_clock_realtime
- #  endif
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-index 3a965ad..787298d 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-@@ -98,7 +98,7 @@ __pthread_cond_timedwait:
- 22:
- #ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- #  ifdef __PIC__
--	cmpl	$0, __have_futex_clock_realtime(%rip)
-+	cmpl	$0, __have_futex_clock_realtime@PLT
- #  else
- 	cmpl	$0, __have_futex_clock_realtime
- #  endif
-@@ -437,14 +437,6 @@ __pthread_cond_timedwait:
- 	/* Only clocks 0 and 1 are allowed so far.  Both are handled in the
- 	   kernel.  */
- 	leaq	32(%rsp), %rsi
--#  ifdef SHARED
--	movq	__vdso_clock_gettime@GOTPCREL(%rip), %rax
--	movq	(%rax), %rax
--	PTR_DEMANGLE (%rax)
--	jz	26f
--	call	*%rax
--	jmp	27f
--#  endif
- 26:	movl	$__NR_clock_gettime, %eax
- 	syscall
- 27:
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-index 3629ffb..5329ddd 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-@@ -96,7 +96,7 @@ pthread_rwlock_timedrdlock:
- 11:
- #ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- #  ifdef __PIC__
--	cmpl	$0, __have_futex_clock_realtime(%rip)
-+	cmpl	$0, __have_futex_clock_realtime@PLT
- #  else
- 	cmpl	$0, __have_futex_clock_realtime
- #  endif
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-index 23e1ee1..e31c014 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-@@ -93,7 +93,7 @@ pthread_rwlock_timedwrlock:
- 11:
- #ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- #  ifdef __PIC__
--	cmpl	$0, __have_futex_clock_realtime(%rip)
-+	cmpl	$0, __have_futex_clock_realtime@PLT
- #  else
- 	cmpl	$0, __have_futex_clock_realtime
- #  endif
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
-index 704a222..7dfc788 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
-@@ -61,7 +61,7 @@ sem_timedwait:
- 
- #ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- #  ifdef __PIC__
--	cmpl	$0, __have_futex_clock_realtime(%rip)
-+	cmpl	$0, __have_futex_clock_realtime@PLT
- #  else
- 	cmpl	$0, __have_futex_clock_realtime
- #  endif
--- 
-1.7.2.1
-
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index 1b21d2ee41..7e5d8d82a3 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -4,7 +4,7 @@ pkgname=libc$_abiver
 _gitver=
 pkgver=0.9.32_rc2
 _ver=${pkgver/_/-}
-pkgrel=1
+pkgrel=2
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
 license="LGPL-2"
@@ -20,8 +20,8 @@ _snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2"
 _snapfile="$pkgname-$pkgver.tar.bz2"
 source="http://uclibc.org/downloads/uClibc-${_ver}.tar.bz2
 	compat-stack-guard.patch
-	1.patch
-	2.patch
+	ssp.patch
+	pthread.patch
 	0001-libm-x86_64-implement-fesetround.patch
 	arm-nptl-tls.patch
 	uclibcconfig.x86
@@ -120,8 +120,8 @@ libthread_db() {
 
 md5sums="c8d2cd2c4dbcf5218b6db843cf66ac0f  uClibc-0.9.32-rc2.tar.bz2
 4d408f72142ce55a0754948cc9cfe447  compat-stack-guard.patch
-8f55efc31c41bf70d99006a7d2f7fe1e  1.patch
-350a608e3d3b148af882f6e074225465  2.patch
+6401044fb02f80c5e50a568d2948a5d7  ssp.patch
+c92ab246b4f92487c98938a297208829  pthread.patch
 e0c901502602f7e9e002d910d0f32ab9  0001-libm-x86_64-implement-fesetround.patch
 2b4e27207b15e2d4b3e9b853513634f6  arm-nptl-tls.patch
 145aaeb1833159397cfac9902e3877ab  uclibcconfig.x86
diff --git a/main/libc0.9.32/pthread.patch b/main/libc0.9.32/pthread.patch
new file mode 100644
index 0000000000..47f99b217d
--- /dev/null
+++ b/main/libc0.9.32/pthread.patch
@@ -0,0 +1,81 @@
+--- uClibc-0.9.32-rc2.orig/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
++++ uClibc-0.9.32-rc2/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+@@ -163,7 +163,7 @@
+ 	cfi_startproc
+ # ifndef __ASSUME_FUTEX_CLOCK_REALTIME
+ #  ifdef __PIC__
+-	cmpl	$0, __have_futex_clock_realtime(%rip)
++	cmpl	$0, __have_futex_clock_realtime@GOTOFF(%rip)
+ #  else
+ 	cmpl	$0, __have_futex_clock_realtime
+ #  endif
+--- uClibc-0.9.32-rc2.orig/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
++++ uClibc-0.9.32-rc2/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
+@@ -118,7 +118,7 @@
+ 	cfi_startproc
+ # ifndef __ASSUME_FUTEX_CLOCK_REALTIME
+ #  ifdef __PIC__
+-	cmpl	$0, __have_futex_clock_realtime(%rip)
++	cmpl	$0, __have_futex_clock_realtime@GOTOFF(%rip)
+ #  else
+ 	cmpl	$0, __have_futex_clock_realtime
+ #  endif
+--- uClibc-0.9.32-rc2.orig/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
++++ uClibc-0.9.32-rc2/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+@@ -98,7 +98,7 @@
+ 22:
+ #ifndef __ASSUME_FUTEX_CLOCK_REALTIME
+ #  ifdef __PIC__
+-	cmpl	$0, __have_futex_clock_realtime(%rip)
++	cmpl	$0, __have_futex_clock_realtime@GOTOFF(%rip)
+ #  else
+ 	cmpl	$0, __have_futex_clock_realtime
+ #  endif
+@@ -437,14 +437,6 @@
+ 	/* Only clocks 0 and 1 are allowed so far.  Both are handled in the
+ 	   kernel.  */
+ 	leaq	32(%rsp), %rsi
+-#  ifdef SHARED
+-	movq	__vdso_clock_gettime@GOTPCREL(%rip), %rax
+-	movq	(%rax), %rax
+-	PTR_DEMANGLE (%rax)
+-	jz	26f
+-	call	*%rax
+-	jmp	27f
+-#  endif
+ 26:	movl	$__NR_clock_gettime, %eax
+ 	syscall
+ 27:
+--- uClibc-0.9.32-rc2.orig/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
++++ uClibc-0.9.32-rc2/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
+@@ -96,7 +96,7 @@
+ 11:
+ #ifndef __ASSUME_FUTEX_CLOCK_REALTIME
+ #  ifdef __PIC__
+-	cmpl	$0, __have_futex_clock_realtime(%rip)
++	cmpl	$0, __have_futex_clock_realtime@GOTOFF(%rip)
+ #  else
+ 	cmpl	$0, __have_futex_clock_realtime
+ #  endif
+--- uClibc-0.9.32-rc2.orig/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
++++ uClibc-0.9.32-rc2/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
+@@ -93,7 +93,7 @@
+ 11:
+ #ifndef __ASSUME_FUTEX_CLOCK_REALTIME
+ #  ifdef __PIC__
+-	cmpl	$0, __have_futex_clock_realtime(%rip)
++	cmpl	$0, __have_futex_clock_realtime@GOTOFF(%rip)
+ #  else
+ 	cmpl	$0, __have_futex_clock_realtime
+ #  endif
+--- uClibc-0.9.32-rc2.orig/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
++++ uClibc-0.9.32-rc2/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
+@@ -61,7 +61,7 @@
+ 
+ #ifndef __ASSUME_FUTEX_CLOCK_REALTIME
+ #  ifdef __PIC__
+-	cmpl	$0, __have_futex_clock_realtime(%rip)
++	cmpl	$0, __have_futex_clock_realtime@GOTOFF(%rip)
+ #  else
+ 	cmpl	$0, __have_futex_clock_realtime
+ #  endif
diff --git a/main/libc0.9.32/ssp.patch b/main/libc0.9.32/ssp.patch
new file mode 100644
index 0000000000..f0f75a7d85
--- /dev/null
+++ b/main/libc0.9.32/ssp.patch
@@ -0,0 +1,27 @@
+--- uClibc-0.9.32-rc2/libc/sysdeps/linux/common/ssp.c
++++ uClibc-0.9.32-rc2.mod/libc/sysdeps/linux/common/ssp.c
+@@ -86,6 +86,7 @@
+ }
+ 
+ void __stack_chk_fail(void) attribute_noreturn __cold;
++libc_hidden_proto(__stack_chk_fail)
+ void __stack_chk_fail(void)
+ {
+ 	static const char msg1[] = "stack smashing detected: ";
+@@ -99,8 +100,10 @@
+ 	while(1)
+ 		terminate();
+ }
++libc_hidden_def(__stack_chk_fail)
+ 
+ void __chk_fail(void) attribute_noreturn;
++libc_hidden_proto(__chk_fail)
+ void __chk_fail(void)
+ {
+ 	static const char msg1[] = "buffer overflow detected: ";
+@@ -114,4 +117,5 @@
+ 	while(1)
+ 		terminate();
+ }
++libc_hidden_def(__chk_fail)
+ 
diff --git a/main/libmicrohttpd/APKBUILD b/main/libmicrohttpd/APKBUILD
index 07a0355e4d..829a7ff5c3 100644
--- a/main/libmicrohttpd/APKBUILD
+++ b/main/libmicrohttpd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libmicrohttpd
-pkgver=0.9.7
+pkgver=0.9.8
 pkgrel=0
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 url="http://www.gnu.org/software/libmicrohttpd/"
@@ -42,4 +42,4 @@ package() {
                 "$pkgdir"/usr/include/plibc.h
 }
 
-md5sums="a16b50a7167fd4e64b67e182a3d9a7c2  libmicrohttpd-0.9.7.tar.gz"
+md5sums="888f9d852a4a9d26ba1a63d1c7ce915e  libmicrohttpd-0.9.8.tar.gz"
diff --git a/main/libnih/APKBUILD b/main/libnih/APKBUILD
new file mode 100644
index 0000000000..18de63cf31
--- /dev/null
+++ b/main/libnih/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=libnih
+pkgver=1.0.3
+pkgrel=0
+pkgdesc="glib-like library for embedded use"
+url="http://launchpad.net/libnih"
+arch="all"
+license="LGPL"
+depends=
+depends_dev="dbus-dev expat-dev gettext-dev"
+makedepends="$depends_dev pkgconfig"
+install=""
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://launchpad.net/libnih/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"
+
+_builddir="${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--libdir=/lib \
+		--sysconfdir=/etc \
+		--localstatedir=/var || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="db7990ce55e01daffe19006524a1ccb0  libnih-1.0.3.tar.gz"
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index 584341b1ac..e5917ba62e 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=lighttpd
 pkgver=1.4.28
 _streamver=2.2.0
-pkgrel=5
+pkgrel=6
 pkgdesc="a secure, fast, compliant and very flexible web-server"
 url="http://www.lighttpd.net/"
 arch="all"
@@ -10,7 +10,7 @@ license="custom"
 install="$pkgname.pre-install $pkgname.post-install"
 depends=
 makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua-dev pkgconfig
-	automake autoconf"
+	automake autoconf openldap-dev"
 source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.tar.bz2
 	http://h264.code-shop.com/download/lighttpd-1.4.18_mod_h264_streaming-$_streamver.tar.gz
 	$pkgname.initd
@@ -51,7 +51,6 @@ build() {
 		--enable-lfs \
 		--libdir=/usr/lib/lighttpd \
 		--without-mysql \
-		--without-ldap \
 		--without-attr \
 		--without-kerberos5 \
 		--without-fam \
@@ -60,6 +59,7 @@ build() {
 		--without-gdbm \
 		--without-memcache \
 		--with-bzip2 \
+		--with-ldap \
 		--with-openssl \
 		--with-lua || return 1
 
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 58811b2877..9a8bf7df3d 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
 pkgname=linux-${_flavor}
 pkgver=2.6.37.2
 _kernver=2.6.37
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -149,4 +149,4 @@ bb5798f2a2a5af13219d1a250c4dad11  patch-2.6.37.2.bz2
 ea7a7eb2775b71ae5ef24d029a4905bd  xfrm-fix-gre-key-endianess.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
 9d6679f515c2232cb1e3eea6dd22d867  kernelconfig.x86
-b72e1345ceddbe2d0d9de35e342b336d  kernelconfig.x86_64"
+4e2dd7974084ef158da769018df91d68  kernelconfig.x86_64"
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64
index e63003cdc3..4b3c528f6d 100644
--- a/main/linux-grsec/kernelconfig.x86_64
+++ b/main/linux-grsec/kernelconfig.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37 Kernel Configuration
-# Thu Feb 24 23:45:57 2011
+# Linux/x86_64 2.6.37.2 Kernel Configuration
+# Fri Mar  4 17:06:10 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -116,14 +116,19 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
-# CONFIG_CGROUP_NS is not set
-# CONFIG_CGROUP_FREEZER is not set
-# CONFIG_CGROUP_DEVICE is not set
-# CONFIG_CPUSETS is not set
-# CONFIG_CGROUP_CPUACCT is not set
-# CONFIG_RESOURCE_COUNTERS is not set
-# CONFIG_CGROUP_SCHED is not set
-# CONFIG_BLK_CGROUP is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+# CONFIG_PROC_PID_CPUSET is not set
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+# CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -214,6 +219,7 @@ CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
 CONFIG_BLOCK_COMPAT=y
 
 #
@@ -222,6 +228,7 @@ CONFIG_BLOCK_COMPAT=y
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=m
 CONFIG_IOSCHED_CFQ=y
+# CONFIG_CFQ_GROUP_IOSCHED is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -2435,7 +2442,7 @@ CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_TTY_PRINTK is not set
 CONFIG_PRINTER=m
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index ea0d99d298..b0ade140cd 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.3.1
+pkgrel=0
 pkgdesc="Tool to generate initramfs images for Alpine"
 url=http://git.alpinelinux.org/cgit/mkinitfs
 depends="busybox apk-tools>=2.0"
 triggers="$pkgname.trigger:/usr/share/kernel/*"
 source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
 	eglibc.patch
-	xen-domU.patch
 	"
 arch="all"
 license="GPL-2"
@@ -43,6 +42,5 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make install DESTDIR="$pkgdir" || return 1
 }
-md5sums="fb53ace85fc7d1980bc19cb258ed00c4  mkinitfs-2.3.0.tar.bz2
-e59c2f7de496fe430b07e32fd812ebe0  eglibc.patch
-e9fedfe527aa5313516585c4b5042c79  xen-domU.patch"
+md5sums="9062a151c30154b957edbcc65f7e42a6  mkinitfs-2.3.1.tar.bz2
+e59c2f7de496fe430b07e32fd812ebe0  eglibc.patch"
diff --git a/main/mkinitfs/xen-domU.patch b/main/mkinitfs/xen-domU.patch
deleted file mode 100644
index 56b8b2b231..0000000000
--- a/main/mkinitfs/xen-domU.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- mkinitfs-2.3.0.orig/Makefile
-+++ mkinitfs-2.3.0/Makefile
-@@ -16,6 +16,7 @@
- 		modules.d/ext3 \
- 		modules.d/ext4 \
- 		modules.d/floppy \
-+		modules.d/jfs \
- 		modules.d/lvm \
- 		modules.d/raid \
- 		modules.d/reiserfs \
-@@ -23,9 +24,11 @@
- 		modules.d/ubifs \
- 		modules.d/usb \
- 		modules.d/xfs \
-+		modules.d/xen \
- 		files.d/bootchart \
- 		files.d/base \
--		files.d/lvm
-+		files.d/lvm \
-+		files.d/xen
- 
- SCRIPTS		:= $(SBIN_FILES) initramfs-init 
- IN_FILES	:= $(addsuffix .in,$(SCRIPTS))
---- /dev/null
-+++ mkinitfs-2.3.0/files.d/xen
-@@ -0,0 +1,2 @@
-+/dev/xvd[a-z]*
-+
---- /dev/null
-+++ mkinitfs-2.3.0/modules.d/jfs
-@@ -0,0 +1 @@
-+kernel/fs/jfs
---- /dev/null
-+++ mkinitfs-2.3.0/modules.d/xen
-@@ -0,0 +1,3 @@
-+kernel/drivers/xen
-+kernel/drivers/block/xen-blkfront.ko
-+
diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD
index 38d9246461..434af575f7 100644
--- a/main/open-vm-tools-grsec/APKBUILD
+++ b/main/open-vm-tools-grsec/APKBUILD
@@ -1,21 +1,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 _flavor=grsec
+_realname=open-vm-tools
+_realver=2011.02.23
+_realsubver=368700
 
 # source the kernel version
 if [ -f ../../main/linux-${_flavor}/APKBUILD ]; then
         . ../../main/linux-${_flavor}/APKBUILD
 fi
 
+_kver=$pkgver
 _kernelver="$pkgver-r$pkgrel"
 _abi_release=${pkgver}-${_flavor}
 _kpkgrel=$pkgrel
-_realname=open-vm-tools
+pkgname="$_realname-$_flavor"
+pkgver=$_kver
+_mypkgrel=0
+pkgrel=$(($_kpkgrel + $_mypkgrel))
 
-pkgname=open-vm-tools-$_flavor
-pkgver=2011.01.24
-_pkgsubver=354108
-pkgrel=2
 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
 url="http://open-vm-tools.sourceforge.net/"
 arch="all"
@@ -23,11 +26,11 @@ license="LGPL"
 subpackages=""
 depends="linux-${_flavor}=${_kernelver}"
 makedepends="glib-dev gettext-dev linux-${_flavor}-dev=${_kernelver}"
-source="http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-$_pkgsubver.tar.gz
+source="http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$_realver-$_realsubver.tar.gz
 	vmware-modules.initd
 	"
 
-_builddir="$srcdir/$_realname-$pkgver-$_pkgsubver"
+_builddir="$srcdir/$_realname-$_realver-$_realsubver"
 
 prepare() {
 	cd "$_builddir"
@@ -57,5 +60,5 @@ package() {
 	done
 }
 
-md5sums="b324efa55bb3f1198100cad838e9272b  open-vm-tools-2011.01.24-354108.tar.gz
+md5sums="488601e384daeab2c6ffd81e1a95cad7  open-vm-tools-2011.02.23-368700.tar.gz
 f16058de6e4251a509f87017f1684887  vmware-modules.initd"
diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD
index fb84dc2a7a..8b4b232304 100644
--- a/main/open-vm-tools/APKBUILD
+++ b/main/open-vm-tools/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=open-vm-tools
-pkgver=2011.01.24
-_pkgsubver=354108
-pkgrel=3
+pkgver=2011.02.23
+_pkgsubver=368700
+pkgrel=0
 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
 url="http://open-vm-tools.sourceforge.net/"
 arch="all"
@@ -22,7 +22,6 @@ source="http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-$_p
 	libm.patch
 	open-vm-tools.initd
 	procmgrposix.patch
-	open-vm-tools.desktop
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver-$_pkgsubver
@@ -49,6 +48,7 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
+		--sysconfdir=/etc \
 		--disable-unity \
 		--with-dnet \
 		--with-icu \
@@ -68,11 +68,6 @@ package() {
 	# create a link to abuild gets happy
 	ln -s open-vm-tools/plugins/vmsvc/libhgfsServer.so \
 		"$pkgdir"/usr/lib/libhgfsServer.so.0
-	
-	# dont bother create a -dev package
-	rm -f "$pkgdir"/usr/lib/*.a "$pkgdir"/usr/lib/*.la
-	install -Dm644 "$srcdir"/open-vm-tools.desktop \
-		"$pkgdir"/etc/xdg/open-vm-tools.desktop
 	install -Dm755 "$srcdir"/open-vm-tools.initd \
 		"$pkgdir"/etc/init.d/open-vm-tools
 }
@@ -83,20 +78,18 @@ gtk() {
 		"$subpkgdir"/usr/lib/open-vm-tools/plugins \
 		"$subpkgdir"/etc/
 	mv "$pkgdir"/usr/bin/vmware-toolbox \
-		"$pkgdir"/usr/bin/vmware-user \
+		"$pkgdir"/usr/bin/vmware-user-suid-wrapper \
 		"$subpkgdir"/usr/bin/
 	mv "$pkgdir"/etc/xdg "$subpkgdir"/etc/
 	mv "$pkgdir"/usr/lib/open-vm-tools/plugins/vmusr \
 		"$subpkgdir"/usr/lib/open-vm-tools/plugins/
-
 }
 
-md5sums="b324efa55bb3f1198100cad838e9272b  open-vm-tools-2011.01.24-354108.tar.gz
+md5sums="488601e384daeab2c6ffd81e1a95cad7  open-vm-tools-2011.02.23-368700.tar.gz
 49e2e394d0b567fa71fcd295e96bc1c8  getloadavg-uclibc.patch
 82840b6bed002284b9bd2358707ee826  codeset-uclibc.patch
 840e4d6ff3f53fc22bdedf4d64aabc91  ecvt.patch
 89c7449323ddac4666b73a8467baf95a  iconv-uclibc.patch
 7d02fc25aba5c248f3d98dac238f175b  libm.patch
 c96644aa42d611fae853a3a2095efc47  open-vm-tools.initd
-7b833102a56009bdfc2fef2fb9ffa297  procmgrposix.patch
-8e6ba9470663eea7ecdd7135a883e016  open-vm-tools.desktop"
+7b833102a56009bdfc2fef2fb9ffa297  procmgrposix.patch"
diff --git a/main/open-vm-tools/open-vm-tools.desktop b/main/open-vm-tools/open-vm-tools.desktop
deleted file mode 100644
index 2107a62e0b..0000000000
--- a/main/open-vm-tools/open-vm-tools.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=vmware-user
-Name=VMware User Agent
-X-KDE-autostart-phase=1
-NoDisplay=true
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index 6941c18267..f3c519e81f 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openldap
 pkgver=2.4.24
-pkgrel=2
+pkgrel=3
 pkgdesc="LDAP Server"
 url="http://www.openldap.org/"
 arch="all"
@@ -73,6 +73,8 @@ package() {
 	install -Dm755 ../slapd.initd "$pkgdir"/etc/init.d/slapd
 	install -Dm755 ../slapd.confd "$pkgdir"/etc/conf.d/slapd
 	install -Dm755 ../slurpd.initd "$pkgdir"/etc/init.d/slurpd
+	# FIXME: symlinks in sbin are symlinked to /usr/lib/slapd 
+	ln -s /usr/sbin/slapd "$pkgdir"/usr/lib/slapd
 }
 
 libldap() {
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index b4146be14d..a7944d459d 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -3,12 +3,12 @@
 pkgname=php
 pkgver=5.3.5
 _suhosinver=5.3.4-0.9.10
-pkgrel=6
+pkgrel=7
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 arch="all"
 license="PHP-3"
-depends="$pkgname-common $pkgname-cgi"
+depends="$pkgname-cgi"
 install="$pkgname.post-upgrade"
 makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev
 	curl-dev libpng-dev jpeg-dev freetype-dev libmcrypt-dev mysql-dev
@@ -71,7 +71,6 @@ source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
 	suhosin-patch-5.3.4-0.9.10.patch
 	php-fpm.init
 	php5-module.conf
-	$install
 	"
 
 _apiver="20090626"
@@ -95,6 +94,17 @@ prepare() {
 	fi
 }
 
+_do_build() {
+	local _flavor="$1"
+	shift
+	local _builddir="$srcdir"/build-$_flavor
+	mkdir -p "$_builddir"
+	cd "$_builddir"
+	"$_srcdir"/configure $@ || return 1
+	sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile  # see #183
+	make || return 1
+}
+
 build() {
 	_phpconfig="--build=${CHOST:-i486-alpine-linux-uclibc} \
 		--prefix=/usr \
@@ -108,8 +118,7 @@ build() {
 		--disable-static \
 		--enable-shared \
 		--mandir=/usr/share/man \
-		--with-pic \
-		--without-pear \
+		--with-pic
 		"
 
 	_phpextensions="--enable-bcmath=shared \
@@ -174,85 +183,86 @@ build() {
 		--without-db3 \
 		--without-qdbm \
 		"
-#		--with-enchant=shared,/usr \
-#		--with-tidy=shared \
 
-	# cgi and fcgi
-	cp -a "$srcdir"/$pkgname-$pkgver "$srcdir"/$pkgname-cgi
-	cd "$srcdir"/$pkgname-cgi
-	./configure ${_phpconfig} \
+	# cgi, fcgi, cli, pear and extensions
+	_do_build cgi \
+		${_phpconfig} \
 		--disable-cli \
 		--enable-cgi \
-		${_phpextensions}
-	sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile  # see #183
-	make || return 1
+		--enable-cli \
+		--with-pcntl \
+		--with-pear \
+		${_phpextensions} \
+		|| return 1
 
 	# fpm
-	cp -a "$srcdir"/$pkgname-cgi "$srcdir"/$pkgname-fpm
-	cd "$srcdir"/$pkgname-fpm
-	./configure ${_phpconfig} \
+	cp -a "$srcdir"/build-cgi "$srcdir"/build-fpm
+	_do_build fpm \
+		${_phpconfig} \
 		--disable-cli \
 		--enable-fpm \
-		${_phpextensions}
-	sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile  # see #183
-	make || return 1
+		${_phpextensions} \
+		|| return 1
 
 	# apache2
-	cp -a "$srcdir"/$pkgname-cgi "$srcdir"/$pkgname-apache2
-	cd "$srcdir"/$pkgname-apache2
-	./configure ${_phpconfig} \
+	cp -a "$srcdir"/build-cgi "$srcdir"/build-apache2
+	_do_build apache2 \
+		${_phpconfig} \
 		--disable-cli \
 		--with-apxs2 \
-		${_phpextensions}
-	sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile  # see #183
-	make || return 1
+		${_phpextensions} \
+		|| return 1
 
 	# embed
-	cp -a "$srcdir"/$pkgname-cgi "$srcdir"/$pkgname-embed
-	cd "$srcdir"/$pkgname-embed
-	./configure ${_phpconfig} \
+	cp -a "$srcdir"/build-cgi "$srcdir"/build-embed
+	_do_build embed \
+		${_phpconfig} \
 		--disable-cli \
 		--enable-embed=shared \
-		${_phpextensions}
-	sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile  # see #183
-	make || return 1
-
-	# cli and pear
-	cp -a "$srcdir"/$pkgname-cgi "$srcdir"/$pkgname-cli-pear
-	cd "$srcdir"/$pkgname-cli-pear
-	./configure ${_phpconfig} \
-		--disable-cgi \
-		--with-readline \
-		--enable-pcntl \
-		--with-pear \
-		${_phpextensions}
-	sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile  # see #183
-	make || return 1
+		${_phpextensions} \
+		|| return 1
 }
 
 package() {
-	mkdir -p "$pkgdir" && return 0
-}
+	cd "$srcdir"/build-cgi
 
-dev() {
-	pkgdesc="PHP Development Files"
-	mkdir -p "$subpkgdir"/usr/lib/php/ "$subpkgdir"/usr/bin/
-	cp -a "$srcdir"/php-cli-pear/build "$subpkgdir"/usr/lib/php/build-cli-pear
-	cp -a "$srcdir"/php-cgi/build "$subpkgdir"/usr/lib/php/build-cgi
-	cp -a "$srcdir"/php-fpm/build "$subpkgdir"/usr/lib/php/build-fpm
-	cp -a "$srcdir"/php-apache2/build "$subpkgdir"/usr/lib/php/build-apache2
-	cp -a "$srcdir"/php-embed/build "$subpkgdir"/usr/lib/php/build-embed
-	ln -fs /usr/lib/php/build-cgi "$subpkgdir"/usr/lib/php/build
+	# install php-cgi, cli, pear and modules
+	make -j1 install install-pear INSTALL_ROOT="$pkgdir" || return 1
+
+	# cleanup after pear
+	find "$pkgdir" -name '.*' | xargs rm -rf || return 1
 
-	install -m 755  "$srcdir"/php-cli-pear/scripts/phpize "$subpkgdir"/usr/bin/
+	# install fpm
+	install -D -m755 "$srcdir"/build-fpm/sapi/fpm/php-fpm \
+		"$pkgdir"/usr/bin/php-fpm || return 1
+	install -D -m644 "$srcdir"/build-fpm/sapi/fpm/php-fpm.conf \
+		"$pkgdir"/etc/php/php-fpm.conf || return 1
+	install -D -m755 "$srcdir"/php-fpm.init "$pkgdir"/etc/init.d/php-fpm
+	# enable some default options
+	sed -ri -e "s~^;(error_log)(.*)~\1 = /var/log/php-fpm.log~" \
+		-e "s/^;(pm.start_servers)/\1/" \
+	 	-e "s/^;(pm.min_spare_servers)/\1/" \
+		-e "s/^;(pm.max_spare_servers)/\1/" \
+		"$pkgdir"/etc/php/php-fpm.conf || return 1
+	
+	# install apache2
+	install -D -m755 "$srcdir"/build-apache2/libs/libphp5.so \
+		"$pkgdir"/usr/lib/apache2/libphp5.so || return 1
+	install -D -m644 "$srcdir"/php5-module.conf \
+		"$pkgdir"/etc/apache2/conf.d/php5-module.conf || return 1
+
+	# install embed
+	install -D -m755 "$srcdir"/build-embed/libs/libphp5.so \
+		"$pkgdir"/usr/lib/libphp5.so || return 1
+	install -D -m644 "$_srcdir"/sapi/embed/php_embed.h \
+		"$pkgdir"/usr/include/php/sapi/embed/php_embed.h || return 1
 }
 
-doc() {
-	pkgdesc="PHP Documentation"
-	install -D -m644 "$srcdir"/$pkgname-cli-pear/sapi/cli/php.1 "$subpkgdir"/usr/share/man/man1/php.1
-	install -D -m644 "$srcdir"/$pkgname-cli-pear/scripts/man1/phpize.1 "$subpkgdir"/usr/share/man/man1/phpize.1
-	install -D -m644 "$srcdir"/$pkgname-cli-pear/scripts/man1/php-config.1 "$subpkgdir"/usr/share/man/man1/php-config.1
-	install -D -m644 "$srcdir"/$pkgname-fpm/sapi/fpm/php-fpm.8 "$subpkgdir"/usr/share/man/man8/php-fpm.8
+dev() {
+	default_dev
+	mkdir -p "$subpkgdir"/usr/lib/php
+	mv "$pkgdir"/usr/lib/php/build \
+		"$subpkgdir"/usr/lib/php/ || return 1
 }
 
 common() {
@@ -267,57 +277,68 @@ common() {
 
 cgi() {
 	pkgdesc="PHP Common Gateway Interface (CGI)"
-	install -D -m755 "$srcdir"/$pkgname-cgi/sapi/cgi/php-cgi "$subpkgdir"/usr/bin/php-cgi
+	replaces="php"
+	depends="php-common"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/php-cgi "$subpkgdir"/usr/bin/
 }
 
 cli() {
 	pkgdesc="PHP Command Line Interface (CLI)"
-	install -D -m755 "$srcdir"/$pkgname-cli-pear/sapi/cli/php "$subpkgdir"/usr/bin/php
+	replaces="php-dev"
+	depends="php-common"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/php "$subpkgdir"/usr/bin/ || return 1
+	# provide phpize here instead of -dev due to pecl command
+	mv "$pkgdir"/usr/bin/phpize "$subpkgdir"/usr/bin/ || return 1
 }
 
 fpm() {
 	pkgdesc="PHP FastCGI Process Manager (FPM)"
-
-	install -D -m755 "$srcdir"/$pkgname-fpm/sapi/fpm/php-fpm "$subpkgdir"/usr/bin/php-fpm
-	install -D -m644 "$srcdir"/$pkgname-fpm/sapi/fpm/php-fpm.conf "$subpkgdir"/etc/php/php-fpm.conf
-	install -D -m755 "$srcdir"/php-fpm.init "$subpkgdir"/etc/init.d/php-fpm
-
-	# enable some default options
-	sed -ri "s~^;(error_log)(.*)~\1 = /var/log/php-fpm.log~" "$subpkgdir"/etc/php/php-fpm.conf
-	sed -ri "s/^;(pm.start_servers)/\1/" "$subpkgdir"/etc/php/php-fpm.conf
-	sed -ri "s/^;(pm.min_spare_servers)/\1/" "$subpkgdir"/etc/php/php-fpm.conf
-	sed -ri "s/^;(pm.max_spare_servers)/\1/" "$subpkgdir"/etc/php/php-fpm.conf
+	depends="php-common"
+	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/etc/php
+	mv "$pkgdir"/usr/bin/php-fpm "$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/etc/init.d "$subpkgdir"/etc/ || return 1
+	mv "$pkgdir"/etc/php/php-fpm.conf "$subpkgdir"/etc/php/
+	
 }
 
 apache2() {
 	pkgdesc="PHP Module for Apache2"
-	install -D -m755 "$srcdir"/$pkgname-apache2/libs/libphp5.so "$subpkgdir"/usr/lib/apache2/libphp5.so
-	install -D -m644 "$srcdir"/php5-module.conf "$subpkgdir"/etc/apache2/conf.d/php5-module.conf
+	depends="php-common"
+	mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/etc
+	mv "$pkgdir"/usr/lib/apache2 "$subpkgdir"/usr/lib/ &&\
+		mv "$pkgdir"/etc/apache2 "$subpkgdir"/etc
 }
 
 embed() {
 	pkgdesc="PHP Embed Library"
-	install -D -m755 "$srcdir"/$pkgname-embed/libs/libphp5.so "$subpkgdir"/usr/lib/libphp5.so
-	install -D -m644 "$srcdir"/$pkgname-$pkgver/sapi/embed/php_embed.h "$subpkgdir"/usr/include/php/sapi/embed/php_embed.h
+	depends="php-common"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libphp5.so "$subpkgdir"/usr/lib/
 }
 
 pear() {
 	pkgdesc="PHP Extension and Application Repository (PEAR)"
-	depends="php"
-	cd "$srcdir"/$pkgname-cli-pear
-	make INSTALL_ROOT="$subpkgdir" install-pear || return 1
-	for _rmpear in `find "$subpkgdir" -name '.*'`; do
-		rm -rf ${_rmpear}
-	done
+	depends="php-cli"
+	mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/etc/php \
+		"$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/pecl \
+		"$pkgdir"/usr/bin/pear \
+		"$pkgdir"/usr/bin/peardev \
+		"$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/etc/php/pear.conf \
+		"$subpkgdir"/etc/php/ || return 1
+	mv "$pkgdir"/usr/share/pear \
+		"$subpkgdir"/usr/share/ || return 1
 }
 
 _mv_mod() {
 	pkgdesc="$1 php extension"
 	mkdir -p "$subpkgdir"/$_extdir
-	mv "$srcdir"/php-cgi/modules/${1}.so "$subpkgdir"/$_extdir/ || return 1
+	mv "$pkgdir"/$_extdir/${1}.so "$subpkgdir"/$_extdir/ || return 1
 	install -d "$subpkgdir"/etc/php/conf.d
 	echo "extension=${1}.so" > "$subpkgdir"/etc/php/conf.d/${1}.ini
-	return 0
 }
 
 bcmath()	{ _mv_mod bcmath; }
@@ -348,8 +369,8 @@ pdo_pgsql()	{ _mv_mod pdo_pgsql; }
 pdo_sqlite()	{ _mv_mod pdo_sqlite; }
 phar()		{
 			_mv_mod phar;
-			cd "$srcdir"/$pkgname-cli-pear
-			make INSTALL_ROOT="$subpkgdir" install-pharcmd || return 1
+			mkdir -p "$subpkgdir"/usr/bin
+			mv "$pkgdir"/usr/bin/phar* "$subpkgdir"/usr/bin/
 		}
 posix()		{ _mv_mod posix; }
 pgsql()		{ _mv_mod pgsql; }
@@ -375,5 +396,4 @@ md5sums="8aaf20c95e91f25c5b6a591e5d6d61b9  php-5.3.5.tar.bz2
 26adfe0e744ec05fa9e368bbdee83176  php-uclibc.patch
 289ca647771170f096985951047174e7  suhosin-patch-5.3.4-0.9.10.patch
 8f2bb2b744a2de50025842cb51fb6a3a  php-fpm.init
-67719f428f44ec004da18705cbabe2ee  php5-module.conf
-6b7ebe6e1eedaada03d830bcf2fdc575  php.post-upgrade"
+67719f428f44ec004da18705cbabe2ee  php5-module.conf"
diff --git a/main/ristretto/APKBUILD b/main/ristretto/APKBUILD
index b2667bef86..020137e62a 100644
--- a/main/ristretto/APKBUILD
+++ b/main/ristretto/APKBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ristretto
-pkgver=0.0.91
+pkgver=0.0.93
 pkgrel=0
 pkgdesc="Ristretto is a image viewer for Xfce"
 url="http://goodies.xfce.org/projects/applications/ristretto"
 arch="all"
 license="GPL-2"
 depends="desktop-file-utils hicolor-icon-theme"
-makedepends="pkgconfig libxfcegui4-dev dbus-glib-dev libexif-dev intltool
-	gettext-dev libiconv-dev thunar-dev"
+makedepends="libxfce4ui-dev dbus-glib-dev libexif-dev thunar-dev"
 install=
 source="http://archive.xfce.org/src/apps/ristretto/0.0/ristretto-$pkgver.tar.bz2"
 
@@ -26,4 +25,4 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="1df541b920f044ac9f3731b2a0fe02d1  ristretto-0.0.91.tar.bz2"
+md5sums="74dcdf0fcbf7039852b817732a91fb6c  ristretto-0.0.93.tar.bz2"
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 69e049a3c5..4ba7f39888 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
-pkgver=3.5.7
+pkgver=3.5.8
 pkgrel=0
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
@@ -151,7 +151,7 @@ client() {
 }
 
 
-md5sums="b04441da711df05a1525bf57b92c051b  samba-3.5.7.tar.gz
+md5sums="355b4530c20997e94aebc74cd6ea5307  samba-3.5.8.tar.gz
 c8a7f6ac5df2f73dbf023e25ea39927b  samba.initd
 c150433426e18261e6e3eed3930e1a76  samba.confd
 b7cafabfb4fa5b3ab5f2e857d8d1c733  samba.logrotate
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index e24e973365..d6197afa2b 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wine
-pkgver=1.3.14
+pkgver=1.3.15
 pkgrel=0
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
@@ -38,5 +38,5 @@ package() {
 	make prefix="$pkgdir"/usr install || return 1
 	mkdir -p "$pkgdir"/etc/wine
 }
-md5sums="c99c8f518d3b2a13a739dfbd6c417e80  wine-1.3.14.tar.bz2
+md5sums="5ddc07f0a1c7b05f4cf52292aafc98e3  wine-1.3.15.tar.bz2
 6ebeaa64eddf97be3267db236ce84b71  dn_skipname.patch"
diff --git a/main/xfce4-vala/APKBUILD b/main/xfce4-vala/APKBUILD
new file mode 100644
index 0000000000..518cc201d0
--- /dev/null
+++ b/main/xfce4-vala/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xfce4-vala
+pkgver=4.8.0
+pkgrel=0
+pkgdesc="Vala bindings for Xfce4"
+url="http://wiki.xfce.org/vala-bindings"
+arch="x86 x86_64"
+license="LGPL"
+depends="exo-dev libxfce4util-dev libxfce4menu-dev libxfce4ui-dev
+	xfce4-panel-dev xfconf-dev vala"
+makedepends=""
+install=
+subpackages=
+source="http://archive.xfce.org/src/bindings/xfce4-vala/${pkgver%.*}/xfce4-vala-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="0d2012486160767cb3a5583f61969b9c  xfce4-vala-4.8.0.tar.bz2"