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

83 files changed, 1379 insertions, 592 deletions

diff --git a/extra/acf-alpine-baselayout/APKBUILD b/extra/acf-alpine-baselayout/APKBUILD
index c3e9574cf2..1f29cfb0b1 100644
--- a/extra/acf-alpine-baselayout/APKBUILD
+++ b/extra/acf-alpine-baselayout/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-alpine-baselayout
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=0
 pkgdesc="A web-based system administration interface for alpine-baselayout"
 url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout"
@@ -12,4 +12,4 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="5b5c503f3350c5ef9f4cf5be81719e4e  acf-alpine-baselayout-0.5.0.tar.bz2"
+md5sums="385620401b12c68e7bea1138505a1376  acf-alpine-baselayout-0.5.1.tar.bz2"
diff --git a/extra/acf-alpine-conf/APKBUILD b/extra/acf-alpine-conf/APKBUILD
index 8467e6324d..fdb808017c 100644
--- a/extra/acf-alpine-conf/APKBUILD
+++ b/extra/acf-alpine-conf/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-alpine-conf
-pkgver=0.3.12
+pkgver=0.3.14
 pkgrel=0
 pkgdesc="A web-based system administration interface for alpine-conf"
 url="http://git.alpinelinux.org/cgit/acf-alpine-conf"
@@ -12,4 +12,4 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="b4c5d5dd614a3585f4c941e847798f71  acf-alpine-conf-0.3.12.tar.bz2"
+md5sums="7f1f61e3188c0eadeba80b9436b26ebb  acf-alpine-conf-0.3.14.tar.bz2"
diff --git a/extra/acf-core/APKBUILD b/extra/acf-core/APKBUILD
index 1dc55275b9..73212736b3 100644
--- a/extra/acf-core/APKBUILD
+++ b/extra/acf-core/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-core
-pkgver=0.6.0
+pkgver=0.7.0
 pkgrel=0
 pkgdesc="A web-based system administration interface framework"
 url="http://git.alpinelinux.org/cgit/acf-core"
@@ -12,4 +12,4 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="2b92e14da6b20cb093626f861025f92f  acf-core-0.6.0.tar.bz2"
+md5sums="dbddfe49acb7cffc9b2bc4dbd11bb675  acf-core-0.7.0.tar.bz2"
diff --git a/extra/acf-fetchmail/APKBUILD b/extra/acf-fetchmail/APKBUILD
index 3065d63a72..c4638e342d 100644
--- a/extra/acf-fetchmail/APKBUILD
+++ b/extra/acf-fetchmail/APKBUILD
@@ -1,6 +1,6 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 pkgname=acf-fetchmail
-pkgver=0.3.0
+pkgver=0.4.0
 pkgrel=0
 pkgdesc="A web-based system administration interface for fetchmail"
 url="http://git.alpinelinux.org/cgit/acf-fetchmail"
@@ -18,4 +18,4 @@ build() {
 
 }
 
-md5sums="1fa9a7a46382757bdbae99fed539e28d  acf-fetchmail-0.3.0.tar.bz2"
+md5sums="71c9d1245d4fa700e452e7a728ab42a8  acf-fetchmail-0.4.0.tar.bz2"
diff --git a/extra/acf-postgresql/APKBUILD b/extra/acf-postgresql/APKBUILD
index a86446ca82..88e8d68c75 100644
--- a/extra/acf-postgresql/APKBUILD
+++ b/extra/acf-postgresql/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Mika Havela <mika.havela@gmail.com>
 pkgname=acf-postgresql
-pkgver=0.2.0
+pkgver=0.3.0
 pkgrel=0
 pkgdesc="ACF module for postgresql"
 url="http://git.alpinelinux.org/cgit/$pkgname"
@@ -19,4 +19,4 @@ build() {
 
 }
 
-md5sums="9cef31e42ee80fbf5487835c52cf44b9  acf-postgresql-0.2.0.tar.bz2"
+md5sums="e2d712f1522c9ce9bd8f4a2a5bbe3209  acf-postgresql-0.3.0.tar.bz2"
diff --git a/extra/acf-samba/APKBUILD b/extra/acf-samba/APKBUILD
index e238c1b21a..af07548594 100644
--- a/extra/acf-samba/APKBUILD
+++ b/extra/acf-samba/APKBUILD
@@ -1,6 +1,6 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 pkgname=acf-samba
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=0
 pkgdesc="A web-based system administration interface for samba"
 url="http://git.alpinelinux.org/cgit/acf-samba"
@@ -18,4 +18,4 @@ build() {
 
 }
 
-md5sums="092b41c639e47936674900b0c28f695e  acf-samba-0.2.0.tar.bz2"
+md5sums="927edc6bb2204369b44ee8cd6dbc18a0  acf-samba-0.2.1.tar.bz2"
diff --git a/extra/acf-weblog/APKBUILD b/extra/acf-weblog/APKBUILD
new file mode 100644
index 0000000000..15847a3f48
--- /dev/null
+++ b/extra/acf-weblog/APKBUILD
@@ -0,0 +1,20 @@
+# Contributor: Ted Trask <ttrask01@yahoo.com>
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
+pkgname=acf-weblog
+pkgver=0.2.0
+pkgrel=1
+pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
+url="http://git.alpinelinux.org/cgit/acf-weblog"
+license="GPL-2"
+depends="acf-core lua luasql-postgres wget postgresql-client"
+makedepends=""
+install=
+subpackages=""
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="c3981ef8eca4684480d3df9474fc338b  acf-weblog-0.2.0.tar.bz2"
diff --git a/extra/apr-util/APKBUILD b/extra/apr-util/APKBUILD
index e41878c324..38ab8eadf3 100644
--- a/extra/apr-util/APKBUILD
+++ b/extra/apr-util/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apr-util
-pkgver=1.3.4
+pkgver=1.3.7
 pkgrel=0
 pkgdesc="The Apache Portable Runtime"
 url="http://apr.apache.org/"
 license="APACHE"
-depends="apr expat libuuid"
+depends=
 subpackages="$pkgname-dev"
 makedepends="apr-dev expat-dev e2fsprogs-dev"
 source="http://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2"
@@ -29,4 +29,4 @@ build() {
 	rm "$pkgdir"/usr/lib/*.exp
 }
 
-md5sums="adfbe525cf3914cf769340e8f6a6d14b  apr-util-1.3.4.tar.bz2"
+md5sums="2ed3ae6734290296faa193e1177d50e6  apr-util-1.3.7.tar.bz2"
diff --git a/extra/apr/APKBUILD b/extra/apr/APKBUILD
index 275d6680e9..bee01f8dca 100644
--- a/extra/apr/APKBUILD
+++ b/extra/apr/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apr
-pkgver=1.3.3
+pkgver=1.3.5
 pkgrel=0
 pkgdesc="The Apache Portable Runtime"
 url="http://apr.apache.org/"
 license="APACHE"
-depends="libuuid"
+depends=
 makedepends="e2fsprogs-dev"
 subpackages="$pkgname-dev"
 source="http://www.apache.org/dist/$pkgname/$pkgname-$pkgver.tar.bz2"
@@ -32,4 +32,4 @@ dev() {
 	return 0
 }
 
-md5sums="2090c21dee4f0eb1512604127dcd158f  apr-1.3.3.tar.bz2"
+md5sums="9ac9a00eaa190937fdbbde7b4f03ac1e  apr-1.3.5.tar.bz2"
diff --git a/extra/asterisk/APKBUILD b/extra/asterisk/APKBUILD
index cf2de2eb9f..7e8bb1d182 100644
--- a/extra/asterisk/APKBUILD
+++ b/extra/asterisk/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=1.6.0.9
-pkgrel=4
+pkgver=1.6.0.10
+pkgrel=1
 pkgdesc="Asterisk: A Module Open Source PBX System"
 url="http://www.asterisk.org/"
 license="GPL"
-depends="dahdi-linux"
+depends=
 makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev
 	postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev tar
 	freetds-dev openssl-dev"
@@ -85,7 +85,7 @@ tds() {
 	_find_and_move '*_tds*'
 }
 
-md5sums="9142461a5ae047a5493bcb610963bc42  asterisk-1.6.0.9.tar.gz
+md5sums="c5e3ceaea876e602b1057d751278b497  asterisk-1.6.0.10.tar.gz
 b00c9d98ce2ad445501248a197c6e436  100-uclibc-daemon.patch
 929f740db7043b4553544ebcc7315c91  101-caps-uclibc.patch
 97b39fd9777a2521d4f9f095482b7ac2  102-gsm-pic.patch
diff --git a/extra/b43-fwcutter/APKBUILD b/extra/b43-fwcutter/APKBUILD
new file mode 100644
index 0000000000..0a7f4cc6a4
--- /dev/null
+++ b/extra/b43-fwcutter/APKBUILD
@@ -0,0 +1,24 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=b43-fwcutter
+pkgver=012
+pkgrel=0
+pkgdesc="Tool to extract firmware from Broadcom drivers"
+url="http://linuxwireless.org/en/users/Drivers/b43"
+license="GPL"
+depends=""
+makedepends=""
+install=
+subpackages="$pkgname-doc"
+source="http://bu3sch.de/b43/fwcutter/b43-fwcutter-012.tar.bz2"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make || return 1
+	make PREFIX="$pkgdir"/usr install
+	mkdir -p "$pkgdir"/usr/share/
+	mv "$pkgdir"/usr/man "$pkgdir"/usr/share/
+}
+
+md5sums="69eadf67b459f313a8d6b37aaabef96c  b43-fwcutter-012.tar.bz2"
diff --git a/extra/bc/APKBUILD b/extra/bc/APKBUILD
index af84e8df8b..d5f1851f2d 100644
--- a/extra/bc/APKBUILD
+++ b/extra/bc/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bc
 pkgver=1.06
-pkgrel=0
+pkgrel=1
 pkgdesc="arbitrary precision numeric processing language (calculator)"
 url="http://www.gnu.org/software/bc/bc.html"
 license="GPL"
-depends="uclibc readline"
+depends=
 makedepends="flex readline-dev"
 install=
 subpackages="$pkgname-doc"
diff --git a/extra/ca-certificates/APKBUILD b/extra/ca-certificates/APKBUILD
index f4d33e8db6..e39567de17 100644
--- a/extra/ca-certificates/APKBUILD
+++ b/extra/ca-certificates/APKBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ca-certificates
-pkgver=20080809
-pkgrel=1
+pkgver=20090709
+pkgrel=0
 pkgdesc="Common CA certificates PEM files"
 url="http://packages.debian.org/sid/ca-certificates"
 license="MPL GPL"
 depends="run-parts openssl"
 install=ca-certificates.post-install
 source="http://ftp.no.debian.org/debian/pool/main/c/$pkgname/${pkgname}_${pkgver}_all.deb
-	$pkgname-20080514-warn-on-bad-symlinks.patch
 	$install
 	"
 
@@ -16,8 +15,6 @@ build () {
 	cd "$srcdir"
 	ar x "$srcdir"/${pkgname}_${pkgver}_all.deb || return 1
 	tar -zxf ./data.tar.gz
-	patch -p0 < "$srcdir"/$pkgname-20080514-warn-on-bad-symlinks.patch \
-		|| return 1
 
 	mkdir -p "$pkgdir"
 	cp -Ra usr etc "$pkgdir"/
@@ -29,6 +26,5 @@ build () {
 	find . -name '*.crt' | sort | cut -b3-
 	) > "$pkgdir"/etc/ca-certificates.conf
 }
-md5sums="3c44f9c232c2335da26d969c716af44d  ca-certificates_20080809_all.deb
-fda24bd37c6cd55b9dd2ea7ef7b59778  ca-certificates-20080514-warn-on-bad-symlinks.patch
+md5sums="72c284149d15b336a1758af819192d21  ca-certificates_20090709_all.deb
 83a92f371137ac9f046c94452bf17058  ca-certificates.post-install"
diff --git a/extra/ca-certificates/ca-certificates-20080514-warn-on-bad-symlinks.patch b/extra/ca-certificates/ca-certificates-20080514-warn-on-bad-symlinks.patch
deleted file mode 100644
index f9462da658..0000000000
--- a/extra/ca-certificates/ca-certificates-20080514-warn-on-bad-symlinks.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-http://bugs.gentoo.org/234816
-http://bugs.debian.org/495224
-
-Do not redirect error output from c_rehash in update-ca-certificates, as
-some errors, especially broken symlinks, can cause trouble for some
-applications like current openldap.
-
-2008-08-15 Martin von Gagern <Martin.vGagern@gmx.net>
-
---- usr/sbin/update-ca-certificates
-+++ usr/sbin/update-ca-certificates
-@@ -83,7 +83,7 @@
-   # only run if set of files has changed
- 
-   if [ "$verbose" = 0 ]; then
--    c_rehash . > /dev/null 2>&1
-+    c_rehash . > /dev/null
-   else
-     c_rehash .
-   fi
diff --git a/extra/clamav/APKBUILD b/extra/clamav/APKBUILD
index 7972c549d2..a4daebc2ff 100644
--- a/extra/clamav/APKBUILD
+++ b/extra/clamav/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=clamav
-pkgver=0.95.1
+pkgver=0.95.2
 pkgrel=0
 pkgdesc="An anti-virus toolkit for UNIX"
 url="http://www.clamav.net/"
 license="GPL"
-depends="zlib gmp"
-install="$pkgname.pre-install $pkgname.post-install"
-makedepends="gmp-dev zlib-dev"
+depends="logrotate"
+install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-upgrade"
+makedepends="ncurses-dev zlib-dev"
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	clamd.initd
@@ -16,6 +16,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	freshclam.initd
 	freshclam.confd
 	clamav-0.95.1-nls.patch
+	clamav.logrotate
 	$install"
 
 build() {
@@ -24,25 +25,48 @@ build() {
 	patch -p0 -i "$srcdir/clamav-0.95.1-nls.patch" || return 1
 
 	./configure --prefix=/usr \
-		--sysconfdir=/etc \
+		--sysconfdir=/etc/clamav \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-clamav
+		--without-iconv
 	make || return 1
 	make DESTDIR="$pkgdir" install
 
+	# Change /etc/clamd.conf to be usable out of the box
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"$pkgdir"/etc/clamav/clamd.conf
+
+	# Do the same for /etc/freshclam.conf
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"$pkgdir"/etc/clamav/freshclam.conf
+
 	install -m755 -D "$srcdir"/clamd.initd "$pkgdir"/etc/init.d/clamd
 	install -m644 -D "$srcdir"/clamd.confd "$pkgdir"/etc/conf.d/clamd
         install -m755 -D "$srcdir"/freshclam.initd "$pkgdir"/etc/init.d/freshclam
 	install -m644 -D "$srcdir"/freshclam.confd "$pkgdir"/etc/conf.d/freshclam
+	install -m644 -D "$srcdir"/clamav.logrotate "$pkgdir"/etc/logrotate.d/clamav
 	mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav
 }
 
-md5sums="c802d4b372e455849cfcb0d776fc72d8  clamav-0.95.1.tar.gz
-04f32738c037c96c3fd2c4fa7781fc7a  clamd.initd
-e84205681f64c07af9ec5b6a3dd8bc38  clamd.confd
-fe3cfca9e1355183117936bea6fc6783  freshclam.initd
-e84205681f64c07af9ec5b6a3dd8bc38  freshclam.confd
+md5sums="930362397d30e01ba81b5f24c1046d48  clamav-0.95.2.tar.gz
+adbbfa835f9dea213289719d983f1600  clamd.initd
+567bc32b657dd7031b9b7beaa946203a  clamd.confd
+f43b987a0c37e6576face04a830263ac  freshclam.initd
+e48466ddfb56f66c623b83e58777b778  freshclam.confd
 0d08fd29656bd4b018ecf8ce9706ac55  clamav-0.95.1-nls.patch
+dffa5af2e7a563fc00fcd52ec4c02347  clamav.logrotate
 275e05587e2da782781829a1862d57b1  clamav.pre-install
-ec4d600097a15e64dfb714e7739a1804  clamav.post-install"
+ec4d600097a15e64dfb714e7739a1804  clamav.post-install
+c9e80578c6e82d6154bc91f18dfd23ea  clamav.pre-upgrade"
diff --git a/extra/clamav/clamav.logrotate b/extra/clamav/clamav.logrotate
new file mode 100644
index 0000000000..7574428413
--- /dev/null
+++ b/extra/clamav/clamav.logrotate
@@ -0,0 +1,15 @@
+/var/log/clamav/clamd.log {
+	missingok
+	postrotate
+		/etc/init.d/clamd logfix
+		/bin/kill -HUP `cat /var/run/clamav/clamd.pid 2> /dev/null` 2>/dev/null || true
+	endscript
+}
+
+/var/log/clamav/freshclam.log {
+	missingok
+	postrotate
+		/etc/init.d/freshclam logfix
+		/bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2> /dev/null` 2>/dev/null || true
+	endscript
+}
diff --git a/extra/clamav/clamav.pre-upgrade b/extra/clamav/clamav.pre-upgrade
new file mode 100644
index 0000000000..9956f95d63
--- /dev/null
+++ b/extra/clamav/clamav.pre-upgrade
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# make sure we don't lose our config
+mkdir -p /etc/clamav
+if [ -f /etc/clamav.conf ]; then
+	mv /etc/clamav.conf /etc/clamav/
+	ln -s clamav/clamav.conf /etc/clamav.conf
+fi
+
+if [ -f /etc/freshclam.conf ]; then
+	mv /etc/freshclam.conf /etc/clamav/
+	ln -s clamav/freshclam.conf /etc/freshclam.conf
+fi
+
+exit 0
+
diff --git a/extra/clamav/clamd.confd b/extra/clamav/clamd.confd
index 8d08b6868c..bc8072aead 100644
--- a/extra/clamav/clamd.confd
+++ b/extra/clamav/clamd.confd
@@ -1,5 +1,6 @@
-#
-# Specify daemon $OPTS here.
-#
 
-OPTS=""
+CLAMD_NICELEVEL=0
+
+# make sure we also start freshclam
+# comment out if you dont want start freshclam
+rc_need="freshclam"
diff --git a/extra/clamav/clamd.initd b/extra/clamav/clamd.initd
index 8aad87fb6f..d3b9155572 100644
--- a/extra/clamav/clamd.initd
+++ b/extra/clamav/clamd.initd
@@ -1,25 +1,32 @@
 #!/sbin/runscript
 
-# Sample init.d file for alpine linux.
-
+opts="logfix reload"
 NAME=clamd
-DAEMON=/usr/sbin/$NAME
+CONF=/etc/clamav/clamd.conf
 
 depend() {
 	need net
+	provide antivirus
 }
 
 start() {
+	local clamd_socket=$(awk '$1 == "LocalSocket" { print $2 }' $CONF)
+
+	logfix
+
+	if [ -S "${clamd_socket:=/tmp/clamd}" ]; then
+		rm -f ${clamd_socket}
+	fi
 	ebegin "Starting ${NAME}"
-		start-stop-daemon --start --quiet --background \
-			--exec ${DAEMON} -- ${OPTS}
-	eend $?
+	start-stop-daemon --start --quiet \
+		--nicelevel ${CLAMD_NICELEVEL:-0} \
+		--exec /usr/sbin/clamd
+	eend $? "Failed to start ${NAME}"
 }
 
 stop() {
 	ebegin "Stopping ${NAME}"
-		start-stop-daemon --stop --quiet \
-			--exec ${DAEMON} --name $NAME \
+	start-stop-daemon --stop --quiet --exec /usr/sbin/clamd
 	eend $?
 }
 
@@ -30,7 +37,20 @@ reload() {
 		return 1
 	fi
 	start-stop-daemon --stop --oknodo --signal HUP \
-		--exec ${DAEMON} --name $NAME
+		--exec /usr/sbin/clamd
 	eend $?
 }
 
+logfix() {
+	# fix clamd log permissions
+	# (might be clobbered by logrotate or something)
+	local logfile=`awk '$1 == "LogFile" { print $2 }' $CONF`
+	local clamav_user=`awk '$1 == "User" { print $2 }' $CONF`
+	if [ -n "${logfile}" ] && [ -n "${clamav_user}" ]; then
+		if [ ! -f "${logfile}" ]; then
+			touch ${logfile}
+		fi
+		chown ${clamav_user} ${logfile}
+		chmod 640 ${logfile}
+	fi
+}
diff --git a/extra/clamav/freshclam.confd b/extra/clamav/freshclam.confd
index 8d08b6868c..17559037da 100644
--- a/extra/clamav/freshclam.confd
+++ b/extra/clamav/freshclam.confd
@@ -1,5 +1,3 @@
-#
-# Specify daemon $OPTS here.
-#
 
-OPTS=""
+FRESHCLAM_NICELEVEL=0
+
diff --git a/extra/clamav/freshclam.initd b/extra/clamav/freshclam.initd
index e4643bc609..7961c7f807 100644
--- a/extra/clamav/freshclam.initd
+++ b/extra/clamav/freshclam.initd
@@ -1,23 +1,32 @@
 #!/sbin/runscript
 
+opts="logfix reload"
+
 NAME=freshclam
 DAEMON=/usr/bin/$NAME
+CONF=/etc/clamav/freshclam.conf
 
 depend() {
 	need net
 }
 
 start() {
-	ebegin "Starting ${NAME}"
-		start-stop-daemon --start --quiet --background \
-			--exec ${DAEMON} -- -d ${OPTS}
-	eend $?
+	ebegin "Starting freshclam"
+	start-stop-daemon --start --quiet \
+		--nicelevel ${FRESHCLAM_NICELEVEL:-0} \
+		--exec /usr/bin/freshclam -- -d
+	retcode=$?
+	if [ ${retcode} = 1 ]; then
+		eend 0
+		einfo "Virus databases are already up to date."
+	else
+		eend ${retcode} "Failed to start freshclam"
+	fi
 }
 
 stop() {
 	ebegin "Stopping ${NAME}"
-		start-stop-daemon --stop --quiet \
-			--exec ${DAEMON} --name $NAME \
+	start-stop-daemon --stop --quiet --name ${NAME}
 	eend $?
 }
 
@@ -32,3 +41,18 @@ reload() {
 	eend $?
 }
 
+
+logfix() {
+	# fix freshclam log permissions
+	# (might be clobbered by logrotate or something)
+	logfile=$(awk '$1 == "UpdateLogFile" { print $2 }' $CONF)
+	local freshclam_user=$(awk '$1 == "DatabaseOwner" { print $2 }' $CONF)
+	if [ -n "${logfile}" -a -n "${clamav_user}" ]; then
+		if [ ! -f "${logfile}" ]; then
+			touch ${logfile}
+		fi	
+		chown ${freshclam_user} ${logfile}
+		chmod 640 ${logfile}
+	fi
+}
+
diff --git a/extra/dahdi-linux-grsec/APKBUILD b/extra/dahdi-linux-grsec/APKBUILD
new file mode 100644
index 0000000000..48327be73a
--- /dev/null
+++ b/extra/dahdi-linux-grsec/APKBUILD
@@ -0,0 +1,57 @@
+# Contributor: Timo Teras <timo.teras@iki.fi>
+# Maintainer: Timo Teras <timo.teras@iki.fi>
+
+_flavor=grsec
+
+# source the kernel version
+if [ -f ../linux-${_flavor}/APKBUILD ]; then
+	. ../linux-${_flavor}/APKBUILD
+fi
+
+_abi_release=${pkgver:-2.6.29.5}-${_flavor}
+_realname=dahdi-linux
+
+pkgname=${_realname}-${_flavor}
+pkgver=2.2.0
+pkgrel=2
+pkgdesc="Digium Asterisk Hardware Device Interface drivers"
+url="http://www.asterisk.org"
+license="GPL"
+depends="dahdi-linux"
+# we need wget and tar because make install downloads firmware and uses fancy
+# options for tar and wget.
+makedepends="linux-${_flavor}-dev wget tar perl"
+install=
+subpackages=
+source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realname}-$pkgver.tar.gz
+	dahdi-depmod.patch
+	dahdi-bri_dchan.patch
+	dahdi-zaphfc.patch
+	zaphfc-dahdi-flortz.diff
+	dahdi-linux-2.2.0-hfc-4s.patch
+	"
+
+build() {
+	cd "$srcdir/$_realname-$pkgver"
+	for i in ../*.patch ../*.diff; do
+		msg "Applying $i"
+		patch -p1 < $i || return 1;
+	done
+
+	make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \
+		|| return 1
+	make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \
+		DESTDIR="$pkgdir" install
+}
+
+# since we sourced the APKBUILD above we got the dev() function there to
+# so we override it again.
+dev() {
+	default_dev
+}
+md5sums="a6b1a24a436e1c1fd08b99d27cfe3f38  dahdi-linux-2.2.0.tar.gz
+c78fb8d80f9efdffd950297c88ff9273  dahdi-depmod.patch
+4b41a82ff390ac64c08092c5a3eab6a8  dahdi-bri_dchan.patch
+a822c092f0548cd13f5e8d8cba053af6  dahdi-zaphfc.patch
+291c5c44c86ab02443a742415461ddca  zaphfc-dahdi-flortz.diff
+68dfe17a49cca15ae439fd83f4ccfbc5  dahdi-linux-2.2.0-hfc-4s.patch"
diff --git a/extra/dahdi-linux/dahdi-bri_dchan.patch b/extra/dahdi-linux-grsec/dahdi-bri_dchan.patch
index 80a80256c6..d7a3fe859b 100644
--- a/extra/dahdi-linux/dahdi-bri_dchan.patch
+++ b/extra/dahdi-linux-grsec/dahdi-bri_dchan.patch
@@ -37,8 +37,8 @@
  
  struct dahdi_span {
  	spinlock_t lock;
---- a/drivers/dahdi/dahdi_config.h
-+++ b/drivers/dahdi/dahdi_config.h
+--- a/include/dahdi/dahdi_config.h
++++ b/include/dahdi/dahdi_config.h
 @@ -174,4 +174,10 @@
   */
  /* #define	OPTIMIZE_CHANMUTE */
diff --git a/extra/dahdi-linux/dahdi-depmod.patch b/extra/dahdi-linux-grsec/dahdi-depmod.patch
index 289aad403b..289aad403b 100644
--- a/extra/dahdi-linux/dahdi-depmod.patch
+++ b/extra/dahdi-linux-grsec/dahdi-depmod.patch
diff --git a/extra/dahdi-linux/dahdi-linux-2.1.0.4-hfc-4s.patch b/extra/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch
index e6011a4038..67857e2f7d 100644
--- a/extra/dahdi-linux/dahdi-linux-2.1.0.4-hfc-4s.patch
+++ b/extra/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch
@@ -1,6 +1,5 @@
-diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/dahdi/wcb4xxp/base.c
---- a/drivers/dahdi/wcb4xxp/base.c	2008-12-17 15:57:56.000000000 +0000
-+++ b/drivers/dahdi/wcb4xxp/base.c	2009-03-10 00:47:02.000000000 +0000
+--- a/drivers/dahdi/wcb4xxp/base.c	2009-06-24 13:17:03.000000000 +0000
++++ b/drivers/dahdi/wcb4xxp/base.c	2009-06-24 13:40:15.000000000 +0000
 @@ -75,7 +75,7 @@
  #define DBG_SPANFILTER		((1 << bspan->port) & spanfilter)
  
@@ -10,31 +9,30 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  #ifdef LOOPBACK_SUPPORTED
  static int loopback = 0;
  #endif
-@@ -110,10 +110,21 @@ static struct proc_dir_entry *myproc;
+@@ -114,9 +114,21 @@
  struct devtype {
  	char *desc;
  	unsigned int flags;
-+	int ports;   	/* Number of ports the card has */
-+	int has_ec;  	/* Does the card have an Echo Canceller  */
-+	enum cards_ids card_type;	/* Card type - Digium B410P, ... */	
++	int ports;      /* Number of ports the card has */
++	int has_ec;     /* Does the card have an Echo Canceller  */
++	enum cards_ids card_type;       /* Card type - Digium B410P, ... */
  };
  
 -static struct devtype wcb4xxp = { "Wildcard B410P", 0 };
--
 +static struct devtype wcb4xxp = { "Wildcard B410P", .ports = 4, .has_ec = 1, .card_type = B410P  };
-+static struct devtype hfc2s =	{ "HFC-2S Junghanns.NET duoBRI PCI", .ports = 2, .has_ec = 0, .card_type = DUOBRI };
-+static struct devtype hfc4s =	{ "HFC-4S Junghanns.NET quadBRI PCI", .ports = 4, .has_ec = 0, .card_type = QUADBRI };
-+static struct devtype hfc8s =	{ "HFC-4S Junghanns.NET octoBRI PCI", .ports = 8, .has_ec = 0, .card_type = OCTOBRI };
++static struct devtype hfc2s =  { "HFC-2S Junghanns.NET duoBRI PCI", .ports = 2, .has_ec = 0, .card_type = DUOBRI };
++static struct devtype hfc4s =  { "HFC-4S Junghanns.NET quadBRI PCI", .ports = 4, .has_ec = 0, .card_type = QUADBRI };
++static struct devtype hfc8s =  { "HFC-4S Junghanns.NET octoBRI PCI", .ports = 8, .has_ec = 0, .card_type = OCTOBRI };
 +static struct devtype hfc2s_OV ={ "OpenVox B200P", .ports = 2, .has_ec = 0, .card_type = B200P_OV };
 +static struct devtype hfc4s_OV ={ "OpenVox B400P", .ports = 4, .has_ec = 0, .card_type = B400P_OV };
 +static struct devtype hfc8s_OV ={ "OpenVox B800P", .ports = 8, .has_ec = 0, .card_type = B800P_OV }; 
 +static struct devtype hfc2s_BN ={ "BeroNet BN2S0", .ports = 2, .has_ec = 0, .card_type = BN2S0 };
 +static struct devtype hfc4s_BN ={ "BeroNet BN4S0", .ports = 4, .has_ec = 0, .card_type = BN4S0 };
-+static struct devtype hfc8s_BN ={ "BeroNet BN8S0", .ports = 8, .has_ec = 0, .card_type = BN8S0 }; 
++static struct devtype hfc8s_BN ={ "BeroNet BN8S0", .ports = 8, .has_ec = 0, .card_type = BN8S0 };
  
- #if 0
- static const char *wcb4xxp_rcsdata = "$RCSfile: base.c,v $ $Revision: 5576 $";
-@@ -385,7 +396,14 @@ static void hfc_gpio_init(struct b4xxp *
+ static int echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp,
+ 			   struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec);
+@@ -403,7 +415,14 @@
  
  	mb();
  
@@ -50,7 +48,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  
  	mb();
  
-@@ -600,13 +618,16 @@ static void ec_init(struct b4xxp *b4)
+@@ -618,13 +637,16 @@
  	unsigned char b;
  	unsigned int i, j, mask;
  
@@ -68,7 +66,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  			ec_write(b4, i, 0x1a8 + j, 0x00);	/* GPIO out */
  			ec_write(b4, i, 0x1ac + j, 0x00);	/* GPIO dir */
  			ec_write(b4, i, 0x1b0 + j, 0x00);	/* GPIO sel */
-@@ -990,7 +1011,15 @@ static void hfc_assign_dchan_fifo(struct
+@@ -1008,7 +1030,15 @@
  	int fifo, hfc_chan;
  	unsigned long irq_flags;
  
@@ -85,7 +83,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  	hfc_chan = (port * 4) + 2;
  
  /* record the host's FIFO # in the span fifo array */
-@@ -1192,7 +1221,7 @@ static void hfc_update_st_timers(struct 
+@@ -1210,7 +1240,7 @@
  	int i, j;
  	struct b4xxp_span *s;
  
@@ -94,7 +92,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  		s = &b4->spans[i];
  
  		for (j=HFC_T1; j <= HFC_T3; j++) {
-@@ -1394,12 +1423,21 @@ static void hfc_init_all_st(struct b4xxp
+@@ -1413,12 +1443,21 @@
  
  	gpio = b4xxp_getreg8(b4, R_GPI_IN3);
  
@@ -118,7 +116,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  		s->te_mode = !nt;
  
  		dev_info(b4->dev, "Port %d: %s mode\n", i + 1, (nt ? "NT" : "TE"));
-@@ -1755,9 +1793,15 @@ static void b4xxp_init_stage1(struct b4x
+@@ -1774,9 +1813,15 @@
  
  /*
   * set up the clock controller
@@ -136,7 +134,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  	flush_pci();
  
  	udelay(100);				/* wait a bit for clock to settle */
-@@ -1788,7 +1832,7 @@ static void b4xxp_init_stage2(struct b4x
+@@ -1807,7 +1852,7 @@
  
  /*
   * set up the flow controller.
@@ -145,7 +143,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
   * FIFO 0 connects Port 1 B0 using HFC channel 16 and PCM timeslots 0/1.
   * FIFO 1 connects Port 1 B1 using HFC channel 17 and PCM timeslots 4/5.
   * FIFO 2 connects Port 2 B0 using HFC channel 20 and PCM timeslots 8/9.
-@@ -1803,14 +1847,35 @@ static void b4xxp_init_stage2(struct b4x
+@@ -1822,14 +1867,35 @@
   *
   * D channels are handled by FIFOs 8-11.
   * FIFO 8 connects Port 1 D using HFC channel 3
@@ -155,8 +153,8 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
 + * FIFO 9 connects Port 2 D using HFC channel 7
 + * FIFO 10 connects Port 3 D using HFC channel 11
 + * FIFO 11 connects Port 4 D using HFC channel 15
-  *
-  * D channel FIFOs are operated in HDLC mode and interrupt on end of frame.
++ *
++ * D channel FIFOs are operated in HDLC mode and interrupt on end of frame.
 + * 
 + * B channel map: (8 ports cards without Hardware Echo Cancel)
 + * FIFO 0 connects Port 1 B0 using HFC channel 0
@@ -169,7 +167,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
 + *
 + * All B channel FIFOs have their HDLC controller in transparent mode,
 + * and only the FIFO for B0 on each port has its interrupt operational.
-+ *
+  *
 + * D channels are handled by FIFOs 16-23.
 + * FIFO 16 connects Port 1 D using HFC channel 3
 + * FIFO 17 connects Port 2 D using HFC channel 7
@@ -177,7 +175,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
 + * FIFO 19 connects Port 4 D using HFC channel 15
 + * ................
 + * FIFO 23 connects Port 8 D using HFC channel 31
-+ * D channel FIFOs are operated in HDLC mode and interrupt on end of frame.
+  * D channel FIFOs are operated in HDLC mode and interrupt on end of frame.
   */
  	for (span=0; span < b4->numspans; span++) {
 -		if (vpmsupport) {
@@ -185,7 +183,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  			hfc_assign_bchan_fifo_ec(b4, span, 0);
  			hfc_assign_bchan_fifo_ec(b4, span, 1);
  		} else {
-@@ -1835,6 +1900,145 @@ static void b4xxp_setleds(struct b4xxp *
+@@ -1854,6 +1920,145 @@
  	ec_write(b4, 0, 0x1a8 + 3, val);
  }
  
@@ -331,7 +329,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  static void b4xxp_set_span_led(struct b4xxp *b4, int span, unsigned char val)
  {
  	int shift, spanmask;
-@@ -1852,6 +2056,18 @@ static void b4xxp_update_leds(struct b4x
+@@ -1871,6 +2076,18 @@
  	int i;
  	struct b4xxp_span *bspan;
  
@@ -350,16 +348,16 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  	b4->blinktimer++;
  	for (i=0; i < b4->numspans; i++) {
  		bspan = &b4->spans[i];
-@@ -2138,7 +2354,7 @@ static void init_spans(struct b4xxp *b4)
+@@ -2174,7 +2391,7 @@
  		bspan->span.close  = b4xxp_close;
  		bspan->span.ioctl = b4xxp_ioctl;
  		bspan->span.hdlc_hard_xmit = b4xxp_hdlc_hard_xmit;
 -		if (vpmsupport)
 +		if (vpmsupport && b4->has_ec)
- 			bspan->span.echocan = b4xxp_echocan;
+ 			bspan->span.echocan_create = echocan_create;
  
  /* HDLC stuff */
-@@ -2245,13 +2461,24 @@ DAHDI_IRQ_HANDLER(b4xxp_interrupt)
+@@ -2281,13 +2498,24 @@
  static void b4xxp_bottom_half(unsigned long data)
  {
  	struct b4xxp *b4 = (struct b4xxp *)data;
@@ -385,7 +383,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  
  	for (i=0; i < 8; i++) {
  		b = b2 = b4->fifo_irqstatus[i];
-@@ -2260,7 +2487,7 @@ static void b4xxp_bottom_half(unsigned l
+@@ -2296,7 +2524,7 @@
  			fifo = i*4 + j;
  
  			if (b & V_IRQ_FIFOx_TX) {
@@ -394,7 +392,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  /*
   * WOW I don't like this.
   * It's bad enough that I have to send a fake frame to get an HDLC TX FIFO interrupt,
-@@ -2269,7 +2496,7 @@ static void b4xxp_bottom_half(unsigned l
+@@ -2305,7 +2533,7 @@
   * Yuck.  It works well, but yuck.
   */
  					do {
@@ -403,7 +401,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  					}  while (k);
  				} else {
  					if (printk_ratelimit())
-@@ -2278,7 +2505,7 @@ static void b4xxp_bottom_half(unsigned l
+@@ -2314,7 +2542,7 @@
  			}
  
  			if (b & V_IRQ_FIFOx_RX) {
@@ -412,7 +410,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  /*
   * I have to loop here until hdlc_rx_frame says there are no more frames waiting.
   * for whatever reason, the HFC will not generate another interrupt if there are
-@@ -2286,7 +2513,7 @@ static void b4xxp_bottom_half(unsigned l
+@@ -2322,7 +2550,7 @@
   * i.e. I get an int when F1 changes, not when F1 != F2.
   */
  					do {
@@ -421,7 +419,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  					} while (k);
  				} else {
  					if (printk_ratelimit())
-@@ -2368,8 +2595,8 @@ static int b4xxp_proc_read_one(char *buf
+@@ -2404,8 +2632,8 @@
  	sprintf(sBuf, "Card %d, PCI identifier %s, IRQ %d\n", b4->cardno + 1, b4->dev->bus_id, b4->irq);
  
  	strcat(sBuf,"Tx:\n");
@@ -432,7 +430,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  			chan = b4->spans[i/3].chans[i%3];
  			sprintf(str, "%02x ", chan->writechunk[j]);
  			strcat(sBuf, str);
-@@ -2379,8 +2606,8 @@ static int b4xxp_proc_read_one(char *buf
+@@ -2415,8 +2643,8 @@
  	}
  
  	strcat(sBuf, "\nRx:\n");
@@ -443,7 +441,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  			chan = b4->spans[i / 3].chans[i % 3];
  			sprintf(str, "%02x%c", chan->readchunk[j], (i == 11) ? '\n' : ' ');
  			strcat(sBuf, str);
-@@ -2388,7 +2615,7 @@ static int b4xxp_proc_read_one(char *buf
+@@ -2424,7 +2652,7 @@
  	}
  
  	strcat(sBuf, "\nPort states:\n");
@@ -452,7 +450,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  		int state;
  		char *x;
  		struct b4xxp_span *s = &b4->spans[i];
-@@ -2483,7 +2710,8 @@ static int __devinit b4xx_probe(struct p
+@@ -2519,7 +2747,8 @@
  /* card found, enabled and main struct allocated.  Fill it out. */
  	b4->magic = WCB4XXP_MAGIC;
  	b4->variety = dt->desc;
@@ -462,7 +460,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  	b4->pdev = pdev;
  	b4->dev = &pdev->dev;
  	pci_set_drvdata(pdev, b4);
-@@ -2497,7 +2725,7 @@ static int __devinit b4xx_probe(struct p
+@@ -2533,7 +2762,7 @@
  	spin_lock_init(&b4->fifolock);
  
  	x = b4xxp_getreg8(b4, R_CHIP_ID);
@@ -471,7 +469,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  		dev_err(&pdev->dev, "Unknown/unsupported controller detected (R_CHIP_ID = 0x%02x)\n", x);
  		goto err_out_free_mem;
  	}
-@@ -2512,7 +2740,7 @@ static int __devinit b4xx_probe(struct p
+@@ -2548,7 +2777,7 @@
  */
  
  /* TODO: determine whether this is a 2, 4 or 8 port card */
@@ -480,7 +478,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  	b4->syncspan = -1;		/* sync span is unknown */
  	if (b4->numspans > MAX_SPANS_PER_CARD) {
  		dev_err(b4->dev, "Driver does not know how to handle a %d span card!\n", b4->numspans);
-@@ -2660,7 +2888,17 @@ static void __devexit b4xxp_remove(struc
+@@ -2696,7 +2925,17 @@
  static struct pci_device_id b4xx_ids[] __devinitdata =
  {
  	{ 0xd161, 0xb410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wcb4xxp },
@@ -499,7 +497,7 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  };
  
  static struct pci_driver b4xx_driver = {
-@@ -2719,7 +2957,7 @@ MODULE_PARM_DESC(timer_1_ms, "NT: msec t
+@@ -2756,7 +2995,7 @@
  MODULE_PARM_DESC(timer_3_ms, "TE: msec to wait for link activation, NT: unused.");
  
  MODULE_AUTHOR("Digium Incorporated <support@digium.com>");
@@ -508,9 +506,8 @@ diff -rupN /drivers/dahdi/wcb4xxp/base.c /usr/src/dahdi-linux-2.1.0.4/drivers/da
  MODULE_LICENSE("GPL");
  
  MODULE_DEVICE_TABLE(pci, b4xx_ids);
-diff -rupN /usr/src/originales/dahdi-linux-2.1.0.4/drivers/dahdi/wcb4xxp/wcb4xxp.h /usr/src/dahdi-linux-2.1.0.4/drivers/dahdi/wcb4xxp/wcb4xxp.h
---- a/drivers/dahdi/wcb4xxp/wcb4xxp.h	2008-11-24 04:14:37.000000000 +0000
-+++ b/drivers/dahdi/wcb4xxp/wcb4xxp.h	2009-03-09 23:50:18.000000000 +0000
+--- a/drivers/dahdi/wcb4xxp/wcb4xxp.h	2009-06-24 13:17:03.000000000 +0000
++++ b/drivers/dahdi/wcb4xxp/wcb4xxp.h	2009-06-24 13:18:07.000000000 +0000
 @@ -378,7 +378,7 @@
  #define HFC_T3					2
  
@@ -520,7 +517,7 @@ diff -rupN /usr/src/originales/dahdi-linux-2.1.0.4/drivers/dahdi/wcb4xxp/wcb4xxp
  
  #define WCB4XXP_CHANNELS_PER_SPAN		3	/* 2 B-channels and 1 D-Channel for each BRI span */
  #define WCB4XXP_HDLC_BUF_LEN			32	/* arbitrary, just the max # of byts we will send to DAHDI per call */
-@@ -414,6 +414,19 @@ struct b4xxp_span {
+@@ -415,6 +415,19 @@
  	struct dahdi_chan _chans[WCB4XXP_CHANNELS_PER_SPAN]; /* Backing memory */
  };
  
@@ -540,7 +537,7 @@ diff -rupN /usr/src/originales/dahdi-linux-2.1.0.4/drivers/dahdi/wcb4xxp/wcb4xxp
  /* This structure exists one per card */
  struct b4xxp {
  	unsigned magic;				/* magic value to make sure we're looking at our struct */
-@@ -448,10 +461,12 @@ struct b4xxp {
+@@ -449,10 +462,12 @@
  	int globalconfig;			/* Whether global setup has been done */
  	int syncspan;				/* span that HFC uses for sync on this card */
  	int running;				/* interrupts are enabled */
diff --git a/extra/dahdi-linux/dahdi-zaphfc.patch b/extra/dahdi-linux-grsec/dahdi-zaphfc.patch
index b711c07ff9..b711c07ff9 100644
--- a/extra/dahdi-linux/dahdi-zaphfc.patch
+++ b/extra/dahdi-linux-grsec/dahdi-zaphfc.patch
diff --git a/extra/dahdi-linux/zaphfc-dahdi-flortz.diff b/extra/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff
index 719accdc69..719accdc69 100644
--- a/extra/dahdi-linux/zaphfc-dahdi-flortz.diff
+++ b/extra/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff
diff --git a/extra/dahdi-linux/APKBUILD b/extra/dahdi-linux/APKBUILD
index 80121e1b0a..b0f6edf789 100644
--- a/extra/dahdi-linux/APKBUILD
+++ b/extra/dahdi-linux/APKBUILD
@@ -1,56 +1,35 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
+
 pkgname=dahdi-linux
-_kernflavor=grsec
-_kernver=2.6.28.9
-pkgver=2.1.0.4
-pkgrel=7
-pkgdesc="Digium Asterisk Hardware Device Interface drivers"
+pkgver=2.2.0
+pkgrel=1
+pkgdesc="Firmware for Digium Asterisk Hardware Device Interface drivers"
 url="http://www.asterisk.org"
 license="GPL"
-depends="linux-grsec"
+depends=
 # we need wget and tar because make install downloads firmware and uses fancy
 # options for tar and wget.
-makedepends="linux-grsec-dev linux-grsec-sources wget tar perl"
+makedepends="wget tar"
 install=
-subpackages="$pkgname-dev $pkgname-grsec:mod"
-source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/$pkgname-$pkgver.tar.gz
-	dahdi-depmod.patch
-	dahdi-bri_dchan.patch
-	dahdi-zaphfc.patch
-	zaphfc-dahdi-flortz.diff
-	$pkgname-2.1.0.4-hfc-4s.patch
-	"
+subpackages="$pkgname-dev"
+source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/$pkgname-$pkgver.tar.gz"
 
-build() {
-	local kout="$srcdir"/grsec
-	local ksrc="/usr/src/linux-$_kernver-$_kernflavor"
-	mkdir -p "$kout"
-	cd "$kout"
-	cp /boot/config-grsec .config
-	cp /boot/Module.symvers-grsec Module.symvers
-	make -C $ksrc O=$PWD silentoldconfig || return 1
-	make modules_prepare
+# We onlin install the firwares in this package since those are common for all
+# kernel flavors. We also install the headers for the -dev package.
+#
+# The kernel drivers themselves are built from separate build recipe.
 
-	cd "$srcdir/$pkgname-$pkgver"
-	for i in ../*.patch; do
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	for i in ../*.patch ../*.diff; do
+		[ -f "$i" ] || continue
 		msg "Applying $i"
 		patch -p1 < $i || return 1;
 	done
 
-	make \
-		KVERS="$_kernver-$_kernflavor" KSRC="$kout" \
-		KCONFIG="$kout/.config" DYNFS="yes" MODULES_EXTRA="zaphfc" \
-		|| return 1
-	make DESTDIR="$pkgdir" \
-		KVERS="$_kernver-$_kernflavor" KSRC="$kout" \
-		KCONFIG="$kout/.config" DYNFS="yes" MODULES_EXTRA="zaphfc" \
-		install
+	make DESTDIR="$pkgdir" HOTPLUG_FIRMWARE=yes \
+		install-include install-firmware 
 }
 
-md5sums="ef2d34c394e8b600ad392560efc56920  dahdi-linux-2.1.0.4.tar.gz
-c78fb8d80f9efdffd950297c88ff9273  dahdi-depmod.patch
-1c9c44497fc883c6a5381abc93e5e6cf  dahdi-bri_dchan.patch
-a822c092f0548cd13f5e8d8cba053af6  dahdi-zaphfc.patch
-291c5c44c86ab02443a742415461ddca  zaphfc-dahdi-flortz.diff
-b01c57444be3a87f6f71dd71c4451ec7  dahdi-linux-2.1.0.4-hfc-4s.patch"
+md5sums="a6b1a24a436e1c1fd08b99d27cfe3f38  dahdi-linux-2.2.0.tar.gz"
diff --git a/extra/dahdi-tools/APKBUILD b/extra/dahdi-tools/APKBUILD
index 278483422b..9a1538fab6 100644
--- a/extra/dahdi-tools/APKBUILD
+++ b/extra/dahdi-tools/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=dahdi-tools
-pkgver=2.1.0.2
-pkgrel=1
+pkgver=2.2.0
+pkgrel=0
 pkgdesc="Digium Asterisk Hardware Device Interface management utilities"
 url="http://www.asterisk.org"
 license="GPL"
-depends="dahdi-linux newt"
+depends="dahdi-linux"
 depends_dev="dahdi-linux-dev newt-dev"
 makedepends="dahdi-linux-dev perl newt-dev"
 install=
@@ -23,10 +23,10 @@ build() {
 		--infodir=/usr/share/info
 	sed -i -e 's/$(CC) $(LDFLAGS) -o $@ $^/$(CC) $^ $(LDFLAGS) -o $@/' Makefile
 	make || return 1
-	make DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/dahdi
 }
 
-md5sums="2e0c2866112932e54aacf3dc62f548ca  dahdi-tools-2.1.0.2.tar.gz
-78095255f5bf640e8dde374b28897524  dahdi-tools.initd"
+md5sums="a018f452f3851a312ff51705ac44de37  dahdi-tools-2.2.0.tar.gz
+d9702271dba6ff250f4d9a252f4dbf4c  dahdi-tools.initd"
diff --git a/extra/dahdi-tools/dahdi-tools.initd b/extra/dahdi-tools/dahdi-tools.initd
index ccdace428e..5e99122a5a 100644
--- a/extra/dahdi-tools/dahdi-tools.initd
+++ b/extra/dahdi-tools/dahdi-tools.initd
@@ -2,6 +2,12 @@
 
 conf=/etc/dahdi/system.conf
 
+depend() {
+	before asterisk
+	after hwdrivers modules
+	keyword novserver
+}
+
 start() {
 	ebegin "Starting dahdi"
 	/usr/sbin/dahdi_cfg
diff --git a/extra/dhcpcd/APKBUILD b/extra/dhcpcd/APKBUILD
index 81fe0190b0..110f2c4c0b 100644
--- a/extra/dhcpcd/APKBUILD
+++ b/extra/dhcpcd/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcpcd
-pkgver=5.0.4
+pkgver=5.0.6
 pkgrel=0
 pkgdesc="RFC2131 compliant DHCP client"
 url="http://roy.marples.name/projects/dhcpcd/"
 license="BSD-2"
-depends="uclibc"
+depends=
 makedepends=""
 install=
 subpackages="$pkgname-doc"
@@ -23,4 +23,4 @@ build() {
 
 }
 
-md5sums="0b920a8094ee3a8c16c973794561feef  dhcpcd-5.0.4.tar.bz2"
+md5sums="600716ddbfa2525a7ef7ae0968a8158a  dhcpcd-5.0.6.tar.bz2"
diff --git a/extra/dovecot/APKBUILD b/extra/dovecot/APKBUILD
index ae9101db59..67d1c87078 100644
--- a/extra/dovecot/APKBUILD
+++ b/extra/dovecot/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
-pkgver=1.1.16
+pkgver=1.2.1
 pkgrel=0
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
@@ -10,7 +10,7 @@ depends=
 makedepends="libcap-dev zlib-dev openssl-dev bzip2-dev"
 install="dovecot.pre-install"
 subpackages="$pkgname-doc $pkgname-dev"
-source="http://www.dovecot.org/releases/1.1/$pkgname-$pkgver.tar.gz
+source="http://www.dovecot.org/releases/1.2/$pkgname-$pkgver.tar.gz
 	dovecot.initd
 	$install
 	"
@@ -22,8 +22,6 @@ build() {
 		--sysconfdir=/etc/dovecot \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--enable-ipv6 \
-		--with-pop3d \
 		--with-ssl=openssl || return 1
 
 	make || return 1
@@ -32,6 +30,6 @@ build() {
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-md5sums="2e20c761416b16aa0fe9cac260ca0d2d  dovecot-1.1.16.tar.gz
+md5sums="c269cfe38fc40061e232dd28e5fe3721  dovecot-1.2.1.tar.gz
 573e14589a6f8424d55753a2794ab99a  dovecot.initd
 f0f8893411f5e482e14f40a81a177b19  dovecot.pre-install"
diff --git a/extra/freetds/APKBUILD b/extra/freetds/APKBUILD
index 84a95aaf9d..5e58429d9c 100644
--- a/extra/freetds/APKBUILD
+++ b/extra/freetds/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=freetds
 pkgver=0.82
-pkgrel=0
+pkgrel=1
 pkgdesc="Tabular Datastream Library"
 url="http://www.freetds.org/"
 license="GPL"
-depends="uclibc unixodbc readline"
+depends=
 makedepends="unixodbc-dev readline-dev"
 install=
 subpackages="$pkgname-doc $pkgname-dev"
@@ -21,9 +21,6 @@ build() {
 		--infodir=/usr/share/info
 	make || return 1
 	make DESTDIR="$pkgdir" install
-
-	# install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	# install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
 md5sums="3df6b2e83fd420e90f1becbd1162990a  freetds-0.82.tar.gz"
diff --git a/extra/gd/APKBUILD b/extra/gd/APKBUILD
index b7e58fe8e9..75cd56cc48 100644
--- a/extra/gd/APKBUILD
+++ b/extra/gd/APKBUILD
@@ -2,17 +2,18 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=gd
 pkgver=2.0.35
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for the dynamic creation of images by programmers"
 url="http://www.libgd.org/"
 license="custom"
-depends="libpng libjpeg freetype zlib"
-makedepends="libpng-dev libjpeg-dev freetype-dev zlib-dev"
+depends=
+makedepends="libpng-dev jpeg-dev freetype-dev zlib-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
+	find -name configure | xargs touch
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
diff --git a/extra/gdb/APKBUILD b/extra/gdb/APKBUILD
index b6905cd278..a851da3141 100644
--- a/extra/gdb/APKBUILD
+++ b/extra/gdb/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gdb
 pkgver=6.8
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNU Debugger"
 url="http://sources.redhat.com/gdb/"
 license="GPL3"
-depends="ncurses expat readline"
-makedepends="ncurses-dev expat-dev readline-dev"
+depends=
+makedepends="ncurses-dev expat-dev"
 subpackages="$pkgname-doc"
 source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2
 	50_all_gdb-pie-1.patch
@@ -23,8 +23,8 @@ build () {
 	done
 
 	./configure --prefix=/usr \
-		--with-system-readline \
 		--disable-nls \
+		--without-system-readline \
 		--disable-werror \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
diff --git a/extra/glib/APKBUILD b/extra/glib/APKBUILD
index f67d78014e..81c189dc81 100644
--- a/extra/glib/APKBUILD
+++ b/extra/glib/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=glib
-pkgver=2.20.3
-pkgrel=0
+pkgver=2.20.4
+pkgrel=1
 pkgdesc="Common C routines used by Gtk+ and other libs"
 url="http://www.gtk.org"
 license='GPL'
@@ -10,11 +10,14 @@ makedepends="gettext-dev libiconv-dev pkgconfig"
 source="http://ftp.gnome.org/pub/gnome/sources/glib/${pkgver%.*}/glib-$pkgver.tar.bz2"
 subpackages="$pkgname-doc $pkgname-dev"
 
-depends_dev="perl gettext libiconv"
+depends_dev="perl gettext-dev libiconv-dev"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
+	# busybox env does not handle the -w after perl. we remove it for now
+	sed -i -e '1,1s/ -w//' gobject/glib-mkenums.in
+
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man
 	make || return 1
@@ -27,4 +30,4 @@ dev() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="1173688c58b4b62809c83bb07a2cf71a  glib-2.20.3.tar.bz2"
+md5sums="346916673c0eab72191cf44b4afe535f  glib-2.20.4.tar.bz2"
diff --git a/extra/gross/APKBUILD b/extra/gross/APKBUILD
index 986c0eb913..fd6e018e95 100644
--- a/extra/gross/APKBUILD
+++ b/extra/gross/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gross
 pkgver=1.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Greylisting of suspicious sources"
 url="http://code.google.com/p/gross/"
 license="BSD"
-depends="uclibc c-ares"
+depends=
 makedepends="c-ares-dev autoconf automake libtool sed"
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-doc $pkgname-dev"
@@ -45,10 +45,10 @@ build() {
 }
 
 md5sums="f8f81b36850dcda30cb81799b9cee3b6  gross-1.0.1.tar.gz
-37b83bd0d94f66c733d5562c0327b70f  gross.initd
+b0d8635b64c4a90d72c49e868f4c4c32  gross.initd
 5ca1c6e51c3243236e6564480b20279b  gross.confd
 bb75b119ac96b8f99831ce6df810003f  gross-1.0.1-configure.ac.patch
 7c504b653c71dcf7b192bc487b3516fd  gross-1.0.1-default-conf.patch
 16e184d59d520db565388f010cc75e83  gross-1.0.1-user.patch
-4b55d1c5534167946cc11376d1b05c34  gross.post-install
-8f6e45b98888dbb9971f7681bf431f6f  gross.pre-install"
+8f6e45b98888dbb9971f7681bf431f6f  gross.pre-install
+4b55d1c5534167946cc11376d1b05c34  gross.post-install"
diff --git a/extra/gross/gross.initd b/extra/gross/gross.initd
index c67293e17f..3d1c43d708 100644
--- a/extra/gross/gross.initd
+++ b/extra/gross/gross.initd
@@ -2,8 +2,8 @@
 
 NAME="grossd"
 DAEMON="/usr/sbin/$NAME"
-USER="gross"
-GROUP="gross"
+DAEMON_USER="gross"
+DAEMON_GROUP="gross"
 
 depend() {
 	need net
@@ -12,18 +12,18 @@ depend() {
 check_config() {
 	if [ ! -f /var/db/gross/state ] ; then
 		einfo "Generating Gross database..."
-		install -dD -o${USER} -g${GROUP} /var/db/gross
-		${DAEMON} -Cu ${USER} > /dev/null
+		install -dD -o${DAEMON_USER} -g${DAEMON_GROUP} /var/db/gross
+		${DAEMON} -Cu ${DAEMON_USER} > /dev/null
 	fi
 }
 
 start() {
 	check_config || return 1
 	ebegin "Starting ${NAME}"
-	start-stop-daemon --start --quiet --background \
+	start-stop-daemon --start --quiet \
 		--exec ${DAEMON} -- \
 		-p /var/run/gross/grossd.pid \
-		-u ${USER} ${OPTS}
+		-u ${DAEMON_USER} ${OPTS}
 	eend $?
 }
 
diff --git a/extra/gzip/APKBUILD b/extra/gzip/APKBUILD
index 9b4de58015..eb06884d6d 100644
--- a/extra/gzip/APKBUILD
+++ b/extra/gzip/APKBUILD
@@ -2,14 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gzip
 pkgver=1.3.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A popular data compression program"
 subpackages="$pkgname-doc"
-arch=""
 url="http://www.gnu.org/software/gzip/"
 license="GPL2"
-depends="uclibc"
-makedepends=""
+depends=
+makedepends=
 install="$pkgname.post-deinstall"
 source="http://ftp.gnu.org/gnu/gzip/gzip-1.3.12.tar.gz
 	$install"
@@ -17,11 +16,19 @@ source="http://ftp.gnu.org/gnu/gzip/gzip-1.3.12.tar.gz
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
+	# avoid text relocation
+	export DEFS="NO_ASM"
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
+		--disable-nls \
 		--infodir=/usr/share/info
 	make || return 1
 	make DESTDIR=$pkgdir install
+
+	mkdir -p "$pkgdir"/bin
+	mv "$pkgdir"/usr/bin/gzip "$pkgdir"/usr/bin/gunzip "$pkgdir"/bin/
+	ln -s /bin/gzip "$pkgdir"/usr/bin/gzip
+	ln -s /bin/gunzip "$pkgdir"/usr/bin/gunzip
 }
 md5sums="b5bac2d21840ae077e0217bc5e4845b1  gzip-1.3.12.tar.gz
 b84506d253e04db3c5af9016fead45a3  gzip.post-deinstall"
diff --git a/extra/heimdal/APKBUILD b/extra/heimdal/APKBUILD
index 6b1ccc1ef2..a494e201a6 100644
--- a/extra/heimdal/APKBUILD
+++ b/extra/heimdal/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=heimdal
 pkgver=1.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An implementation of Kerberos 5"
 url="http://www.h5l.org/"
 license="BSD"
diff --git a/extra/icu/APKBUILD b/extra/icu/APKBUILD
index 8bbacde8d9..c2150b3ec8 100644
--- a/extra/icu/APKBUILD
+++ b/extra/icu/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=icu
-pkgver=4.2.0.1
-_ver=4_2_0_1
+pkgver=4.2.1
+_ver=4_2_1
 pkgrel=0
 pkgdesc="International Components for Unicode library"
 url="http://www.icu-project.org/"
@@ -24,4 +24,4 @@ build ()
 	install -Dm644 "$srcdir"/icu/license.html \
 		"$pkgdir"/usr/share/licenses/icu/license.html
 }
-md5sums="fd80d21ea863e47ee57b95d466752701  icu4c-4_2_0_1-src.tgz"
+md5sums="e3738abd0d3ce1870dc1fd1f22bba5b1  icu4c-4_2_1-src.tgz"
diff --git a/extra/imagemagick/APKBUILD b/extra/imagemagick/APKBUILD
index ba660d19fd..183b1e82cc 100644
--- a/extra/imagemagick/APKBUILD
+++ b/extra/imagemagick/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imagemagick
-pkgver=6.5.3.2
-_pkgver=6.5.3-2
+pkgver=6.5.3.10
+_pkgver=6.5.3-10
 pkgrel=0
 pkgdesc="A collection of tools and libraries for many image formats"
 url="http://www.imagemagick.org/"
 license="GPL"
 depends=
-makedepends="zlib-dev libpng-dev libjpeg-dev freetype-dev"
+makedepends="zlib-dev libpng-dev jpeg-dev freetype-dev perl-dev"
 subpackages="$pkgname-doc $pkgname-dev"
 source="ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-$_pkgver.tar.gz"
 
@@ -28,8 +28,8 @@ build() {
 		--without-x \
 		--with-modules
 	make || return 1
-	make DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install
 
 }
 
-md5sums="51547d4deafdba1d74ea4225805e63e9  ImageMagick-6.5.3-2.tar.gz"
+md5sums="d33621ea195792aeeec79900e7d1e395  ImageMagick-6.5.3-10.tar.gz"
diff --git a/extra/jpeg/APKBUILD b/extra/jpeg/APKBUILD
new file mode 100644
index 0000000000..c795091a4d
--- /dev/null
+++ b/extra/jpeg/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Carlo Landmeter <clandmeter at gmail>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=jpeg
+pkgver=7
+pkgrel=0
+pkgdesc="JPEG image tools"
+url="http://www.ijg.org/"
+license="AS-IS"
+depends=
+makedepends=
+install=
+subpackages="$pkgname-doc $pkgname-dev libjpeg"
+source="http://www.ijg.org/files/jpegsrc.v${pkgver}.tar.gz"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--enable-shared 
+	make || return 1
+	make -j1 install DESTDIR="$pkgdir"
+	install -Dm644 jpegint.h "$pkgdir"/usr/include/jpegint.h
+}
+
+libjpeg() {
+	pkgdesc="JPEG image library"
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libjpeg* "$subpkgdir"/usr/lib/
+}
+
+
+md5sums="382ef33b339c299b56baf1296cda9785  jpegsrc.v7.tar.gz"
diff --git a/extra/lftp/APKBUILD b/extra/lftp/APKBUILD
index ec65710608..239573c121 100644
--- a/extra/lftp/APKBUILD
+++ b/extra/lftp/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=lftp
 pkgver=3.7.14
-pkgrel=0
+pkgrel=1
 pkgdesc="LFTP is sophisticated ftp/http client"
 url="http://lftp.yar.ru/"
 license="GPL"
-depends="uclibc ncurses libgcc openssl readline uclibc++"
+depends=
 makedepends="openssl-dev uclibc++-dev readline-dev ncurses-dev gettext-dev"
 subpackages="$pkgname-doc"
 source="http://ftp.yars.free.net/pub/source/lftp/lftp-${pkgver}.tar.bz2"
diff --git a/extra/libgcrypt/APKBUILD b/extra/libgcrypt/APKBUILD
index c858e68848..efe95c1abf 100644
--- a/extra/libgcrypt/APKBUILD
+++ b/extra/libgcrypt/APKBUILD
@@ -1,29 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libgcrypt
 pkgver=1.4.4
-pkgrel=0
+pkgrel=1
 pkgdesc="general purpose crypto library based on the code used in GnuPG"
 url="http://www.gnupg.org"
 license="LGPL"
-depends="libgpg-error"
+depends=
 makedepends="libgpg-error-dev texinfo"
 subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
-	nocxx.patch"
+source="ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
+
+depends_dev="libgpg-error-dev"
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	msg "Punting useless cpp checks..."
-	patch configure < "$srcdir"/nocxx.patch || return 1
-
-	./configure --prefix=/usr \
-		--disable-padlock-support \
+	./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
+		--prefix=/usr \
+		--enable-padlock-support \
 		--disable-static
 
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	rm -f ${pkgdir}/usr/share/info/dir
 }
-md5sums="34105aa927e23c217741966496b97e67  libgcrypt-1.4.4.tar.bz2
-28513788ba4d556ccd538867dc6205ab  nocxx.patch"
+md5sums="34105aa927e23c217741966496b97e67  libgcrypt-1.4.4.tar.bz2"
diff --git a/extra/libidn/APKBUILD b/extra/libidn/APKBUILD
index 5b19b784ec..afcb59c788 100644
--- a/extra/libidn/APKBUILD
+++ b/extra/libidn/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libidn
-pkgver=1.14
+pkgver=1.15
 pkgrel=0
 pkgdesc="An encode and decode library for internationalized domain names"
 url="http://www.gnu.org/software/libidn/"
 license="GPL"
-depends="uclibc"
+depends=
 makedepends=""
 install=
 subpackages="$pkgname-doc $pkgname-dev"
@@ -26,4 +26,4 @@ build() {
 
 }
 
-md5sums="2ac3913b2d6c42bf445e7c55db3e2a99  libidn-1.14.tar.gz"
+md5sums="482a25b7b223e52f967fafd284a1a992  libidn-1.15.tar.gz"
diff --git a/extra/libjpeg/APKBUILD b/extra/libjpeg/APKBUILD
deleted file mode 100644
index 54545ff04f..0000000000
--- a/extra/libjpeg/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter at gmail>
-# Maintainer: Carlo Landmeter <clandmeter at gmail>
-pkgname=libjpeg
-pkgver=6b
-pkgrel=1
-pkgdesc="Library of JPEG support functions"
-url="http://www.ijg.org/"
-license="custom"
-depends=""
-makedepends="libtool"
-install=
-subpackages="$pkgname-doc $pkgname-dev"
-source="ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${pkgver}.tar.gz"
-
-build() {
-	cd "$srcdir/jpeg-$pkgver"
-
-	cp /usr/share/libtool/config/config.guess ./
-	cp /usr/share/libtool/config/config.sub ./
-	sed -i "s|./libtool|libtool|" configure
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-shared \
-		--enable-static
-	make || return 1
-	for i in bin lib include share/man/man1; do
-		mkdir -p "$pkgdir"/usr/"$i"
-	done
-	make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man/man1 install
-	install -Dm644 jpegint.h "$pkgdir"/usr/include/jpegint.h
-}
-
-md5sums="dbd5f3b47ed13132f04c685d608a7547  jpegsrc.v6b.tar.gz"
diff --git a/extra/libtheora/APKBUILD b/extra/libtheora/APKBUILD
index 584a5335bc..e3b3999a3d 100644
--- a/extra/libtheora/APKBUILD
+++ b/extra/libtheora/APKBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libtheora
 pkgver=1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="An open video codec developed by the Xiph.org"
 url="http://www.xiph.org"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="libogg uclibc"
-makedepends="libvorbis-dev libogg-dev g++"
+depends=
+makedepends="libvorbis-dev libogg-dev"
 source="http://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.bz2"
 
+depends_dev="libogg-dev"
 build ()
 {
 	cd "$srcdir"/libtheora-$pkgver
diff --git a/extra/lighttpd/APKBUILD b/extra/lighttpd/APKBUILD
index 94b5360691..0abe6dea70 100644
--- a/extra/lighttpd/APKBUILD
+++ b/extra/lighttpd/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lighttpd
-pkgver=1.4.22
+pkgver=1.4.23
 pkgrel=0
 pkgdesc="a secure, fast, compliant and very flexible web-server"
 url="http://www.lighttpd.net/"
 license="custom"
 install="$pkgname.pre-install $pkgname.post-install"
-depends="pcre openssl zlib lua"
+depends=
 makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua-dev pkgconfig"
 source="http://www.$pkgname.net/download/$pkgname-$pkgver.tar.bz2
 	$pkgname.initd
@@ -67,7 +67,7 @@ build() {
 		install -m644 "$srcdir"/$i "$pkgdir"/etc/lighttpd/$i
 	done
 }
-md5sums="ed4ca3897eadf419c893b03fee53c982  lighttpd-1.4.22.tar.bz2
+md5sums="0ab6bb7b17bf0f515ce7dce68e5e215a  lighttpd-1.4.23.tar.bz2
 6910842e8ba496e8aa984ab30a46eb72  lighttpd.initd
 0dede109282bfe685bdec6b35f0e4b6b  lighttpd.confd
 e250fe505d07733e920348bea0909c29  lighttpd.pre-install
diff --git a/extra/lm_sensors/APKBUILD b/extra/lm_sensors/APKBUILD
index 8bd7e3b66c..0327dc7751 100644
--- a/extra/lm_sensors/APKBUILD
+++ b/extra/lm_sensors/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lm_sensors
-pkgver=3.1.0
+pkgver=3.1.1
 pkgrel=0
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring."
 url="http://www.lm-sensors.org/"
 license="GPL"
-depends="uclibc sysfsutils rrdtool"
+depends="sysfsutils rrdtool"
 makedepends="perl rrdtool-dev bison flex"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-detect"
 #install=sensors.install
@@ -55,7 +55,7 @@ detect() {
 	mv usr/sbin/sensors-detect "$subpkgdir"/usr/bin/
 }
 
-md5sums="e23130eaa46c66b861729835e08bdccf  lm_sensors-3.1.0.tar.bz2
+md5sums="613d7cfa23b70c0abae3fabb0a72ff5f  lm_sensors-3.1.1.tar.bz2
 b6e7de1a1768f7a6ea2e00c226331877  lm_sensors-3.1.0-sensors-detect-alpine.patch
 58f4c9193a903711ace7fa0754693bd2  fancontrol.initd
 2c7e97203da2c39bc9fbfc2a4849cfd4  lm_sensors.initd
diff --git a/extra/lua/APKBUILD b/extra/lua/APKBUILD
index c42d1c9d24..5e41bc03ad 100644
--- a/extra/lua/APKBUILD
+++ b/extra/lua/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua
 pkgver=5.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A powerful light-weight programming language designed for extending applications."
 url="http://www.lua.org/"
 license="MIT"
-depends="readline"
+depends=
 makedepends="readline-dev libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.$pkgname.org/ftp/$pkgname-$pkgver.tar.gz
diff --git a/extra/luasql-postgres/APKBUILD b/extra/luasql-postgres/APKBUILD
new file mode 100644
index 0000000000..36756ca657
--- /dev/null
+++ b/extra/luasql-postgres/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=luasql-postgres
+pkgver=2.1.1
+pkgrel=0
+pkgdesc="LuaSQL is a simple interface from Lua to a DBMS"
+url="http://www.keplerproject.org/luasql/"
+license="MIT"
+depends="lua"
+makedepends="lua-dev postgresql-dev"
+install=
+subpackages=
+source="http://luaforge.net/frs/download.php/2686/luasql-$pkgver.tar.gz
+	config.new
+	"
+
+build() {
+	cd "$srcdir/luasql-$pkgver"
+	cp "$srcdir/config.new" config
+
+	make || return 1
+	mkdir -p "$pkgdir"/usr/lib/lua/5.1/luasql
+	cp src/postgres.so "$pkgdir"/usr/lib/lua/5.1/luasql
+}
+
+md5sums="63bdd57de4b9d1be336ba112d8cb69eb  luasql-2.1.1.tar.gz
+6ee28fa90394da6a7e38cf507d56ba80  config.new"
diff --git a/extra/luasql-postgres/config.new b/extra/luasql-postgres/config.new
new file mode 100644
index 0000000000..a8650c5511
--- /dev/null
+++ b/extra/luasql-postgres/config.new
@@ -0,0 +1,59 @@
+# Driver (leave uncommented ONLY the line with the name of the driver)
+#T= mysql
+#T= oci8
+#T= odbc
+T= postgres
+#T= sqlite
+#T=sqlite3
+
+# Installation directories
+
+# Default prefix
+PREFIX = /usr
+
+# System's libraries directory (where binary libraries are installed)
+LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
+
+# System's lua directory (where Lua libraries are installed)
+LUA_DIR= $(PREFIX)/share/lua/5.1
+
+# Lua includes directory
+LUA_INC= $(PREFIX)/include
+
+# Lua version number (first and second digits of target version)
+LUA_VERSION_NUM= 514
+
+# OS dependent
+LIB_OPTION= -shared #for Linux
+#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
+
+LIBNAME= $T.so
+COMPAT_DIR= ../compat/src
+
+# Compilation parameters
+# Driver specific
+######## MySQL
+#DRIVER_LIBS= -L/usr/local/mysql/lib -lmysqlclient -lz
+#DRIVER_INCS= -I/usr/local/mysql/include
+######## Oracle OCI8
+#DRIVER_LIBS= -L/home/oracle/OraHome1/lib -lz -lclntsh
+#DRIVER_INCS= -I/home/oracle/OraHome1/rdbms/demo -I/home/oracle/OraHome1/rdbms/public
+######## PostgreSQL
+DRIVER_LIBS= -L/usr/pgsql/lib -lpq
+DRIVER_INCS= -I/usr/pgsql/include
+######## SQLite
+#DRIVER_LIBS= -lsqlite
+#DRIVER_INCS=
+######## SQLite3
+#DRIVER_LIBS= -L/opt/local/lib -lsqlite3
+#DRIVER_INCS= -I/opt/local/include
+######## ODBC
+#DRIVER_LIBS= -L/usr/local/lib -lodbc
+#DRIVER_INCS= -DUNIXODBC -I/usr/local/include
+
+WARN= -Wall -Wmissing-prototypes -Wmissing-declarations -ansi -pedantic
+INCS= -I$(LUA_INC)
+CFLAGS= -O2 $(WARN) -I$(COMPAT_DIR) $(DRIVER_INCS) $(INCS) $(DEFS)
+CC= gcc
+
+# $Id: config,v 1.8 2007/10/27 22:55:27 carregal Exp $
diff --git a/extra/mini_httpd/APKBUILD b/extra/mini_httpd/APKBUILD
index 2751979769..4f7167e709 100644
--- a/extra/mini_httpd/APKBUILD
+++ b/extra/mini_httpd/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mini_httpd
 pkgver=1.19
-pkgrel=0
+pkgrel=1
 pkgdesc="Small forking webserver with ssl and ipv6 support"
 url="http://www.acme.com/software/mini_httpd/"
 license="BSD"
-depends="uclibc openssl"
+depends=
 makedepends="openssl-dev"
 subpackages="$pkgname-doc"
 source="http://www.acme.com/software/mini_httpd/$pkgname-$pkgver.tar.gz
-	$pkgname.confd
 	$pkgname.conf.sample
 	$pkgname.initd
 	"
@@ -36,10 +35,8 @@ build() {
 	install -D -m644 ../mini_httpd.conf.sample \
 		"$pkgdir"/etc/mini_httpd.conf
 	install -D -m755 ../mini_httpd.initd "$pkgdir"/etc/init.d/mini_httpd
-	install -D -m644 ../mini_httpd.confd "$pkgdir"/etc/conf.d/mini_httpd
 }
 
 md5sums="7c68293ad265ecfe2edea917912f6f1f  mini_httpd-1.19.tar.gz
-8ec70211497d79a26d33006b0ce19aa0  mini_httpd.confd
-fd62c1809f658400acf2082eacd08bb8  mini_httpd.conf.sample
-ec52d2db1ce52f1b088d474aeefe9da8  mini_httpd.initd"
+ec656aadd4751a3f4f6e8c788a5237f2  mini_httpd.conf.sample
+804e5cba1537bddac195e64b5b50d609  mini_httpd.initd"
diff --git a/extra/mini_httpd/mini_httpd.conf.sample b/extra/mini_httpd/mini_httpd.conf.sample
index f215652fe6..397a331ad3 100644
--- a/extra/mini_httpd/mini_httpd.conf.sample
+++ b/extra/mini_httpd/mini_httpd.conf.sample
@@ -13,6 +13,9 @@ port=80
 #port=443
 user=nobody
 ##
+## The DOCROOT
+dir=/var/www/localhost/htdocs
+##
 ## CGI:
 ##	?	match a single char
 ##	*	matches any string excluding "/"
@@ -25,7 +28,6 @@ chroot
 #nochroot
 ##
 logfile=/var/log/mini_httpd.log
-pidfile=/var/run/mini_httpd.pid
 ##
 #charset=iso-8859-1
 ##
diff --git a/extra/mini_httpd/mini_httpd.confd b/extra/mini_httpd/mini_httpd.confd
deleted file mode 100644
index b5e9a8f23e..0000000000
--- a/extra/mini_httpd/mini_httpd.confd
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.confd-1.19,v 1.2 2007/08/26 21:20:21 bangert Exp $
-
-## Config file for /etc/init.d/mini_httpd
-
-## the startup-dir of mini_httpd is the docroot, so we specify it here
-## and the init-script does a "cd" prior to startup:
-MINI_HTTPD_DOCROOT="/var/www/localhost/htdocs"
-
-## There are 2 ways to configure mini_httpd:
-##	1) specify all params on the cmd-line
-##	2) use a config-file (and start with "-C <conf-file>")
-## Note: 1) and 2) can be mixed.
-##
-## We choose 1) here -- if you have a more complicated setup read
-## mini_httpd(8) for details on 2).
-
-# MINI_HTTPD_OPTS="-p 8080 -u nobody -r -i /var/run/mini_httpd.pid -l /var/log/mini_httpd.log -d ${MINI_HTTPD_DOCROOT}"
-
-## to add cgi-support you should switch over to a config-file, a sample can
-## be found in your DOCDESTTREE (/usr/share/doc/mini_httpd-xxxx) named
-##     mini_httpd.conf.sample.gz
-## copy the sample to /etc/mini_httpd.conf and replace the MINI_HTTPD_OPTS-line
-## above by:
-MINI_HTTPD_OPTS="-C /etc/mini_httpd.conf"
diff --git a/extra/mini_httpd/mini_httpd.initd b/extra/mini_httpd/mini_httpd.initd
index ccaf53d31f..4460a539ef 100644
--- a/extra/mini_httpd/mini_httpd.initd
+++ b/extra/mini_httpd/mini_httpd.initd
@@ -3,27 +3,23 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.init,v 1.2 2007/08/26 21:20:21 bangert Exp $
 
+pidfile=/var/run/${SVCNAME}.pid
+
 depend() {
 	need net
 }
 
 start() {
-	ebegin "Starting mini_httpd"
-	if [ ! -d "$MINI_HTTPD_DOCROOT" ]; then
-		eend 1 "MINI_HTTPD_DOCROOT not set correctly in /etc/conf.d/mini_httpd"
-		exit 1
-	fi
-	start-stop-daemon --quiet --start --startas /usr/sbin/mini_httpd \
-		--pidfile /var/run/mini_httpd.pid -- ${MINI_HTTPD_OPTS}
+	ebegin "Starting $SVCNAME"
+	start-stop-daemon --quiet --start --exec /usr/sbin/mini_httpd \
+		--pidfile $pidfile -- -i $pidfile \
+		${MINI_HTTPD_OPTS:--C /etc/${SVCNAME}.conf}
 	eend $?
 }
 
 stop() {
-	local rc
-
-	ebegin "Stopping mini_httpd"
-	start-stop-daemon --quiet --stop --pidfile /var/run/mini_httpd.pid
-	rc=$?
-	rm -f /var/run/mini_httpd.pid
-	eend $rc
+	ebegin "Stopping $SVCNAME"
+	start-stop-daemon --quiet --stop --pidfile $pidfile
+	eend $?
 }
+
diff --git a/extra/mysql/APKBUILD b/extra/mysql/APKBUILD
index fbe666b0ff..de03c127da 100644
--- a/extra/mysql/APKBUILD
+++ b/extra/mysql/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mysql
-pkgver=5.0.77
-pkgrel=1
+pkgver=5.0.83
+pkgrel=0
 pkgdesc="A fast SQL database server"
 url="http://www.mysql.com/"
 license='GPL'
-depends="readline openssl uclibc++ zlib"
+depends=
 makedepends="libtool uclibc++-dev readline-dev openssl-dev ncurses-dev zlib-dev"
 source="http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.0/${pkgname}-${pkgver}.tar.gz
 $pkgname.initd
@@ -32,14 +32,10 @@ build() {
         install -Dm 644 "$startdir"/$pkgname.mycnf $pkgdir/etc/mysql/my.cnf
         install -dDo mysql $pkgdir/var/log/mysql
         install -dDo mysql $pkgdir/var/run/mysqld
-
-	# we dont want this be pulled in in the make depends resolving but we
-	# want it in the binary package dependency so we add it late.
-	depends="$depends libmysqlclient"
 }
 
 libmysqlclient() {
-	depends="uclibc openssl zlib"
+	pkgdesc="MySQL client library"
 	mkdir -p "$subpkgdir"/usr/lib/mysql
 	mv "$pkgdir"/usr/lib/mysql/libmysqlclient.so* "$subpkgdir"/usr/lib/mysql
 	# make symlinks
@@ -55,7 +51,7 @@ test() {
 }
 
 client() {
-	depends="libmysqlclient ncurses zlib"
+	pkgdesc="client for the MySQL database"
 	install=""
 	local bins="myisam_ftdump mysql mysqlaccess mysqladmin mysqlbug mysqlcheck
 	mysql_client_test mysqldump mysqldumpslow mysql_explain_log mysql_find_rows
@@ -69,6 +65,6 @@ client() {
 	done
 }
 
-md5sums="6c30a20c9059daf053a301e927eb1667  mysql-5.0.77.tar.gz
+md5sums="051392064a1e32cca5c23a593908b10e  mysql-5.0.83.tar.gz
 3ce9827b22d8fbbb29d83a91cbe98ffc  mysql.initd
 15a7e3ddd6a40bf5a1eb3a8c69d9c34c  mysql.mycnf"
diff --git a/extra/ngircd/APKBUILD b/extra/ngircd/APKBUILD
new file mode 100644
index 0000000000..2f618a0776
--- /dev/null
+++ b/extra/ngircd/APKBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=ngircd
+pkgver=14.1
+pkgrel=0
+pkgdesc="Next Generation IRC Daemon"
+url="http://ngircd.barton.de/"
+license="GPL"
+makedepends=""
+makedepends="openssl-dev zlib-dev"
+install="$pkgname.pre-install"
+source="ftp://ftp.berlios.de/pub/$pkgname/$pkgname-$pkgver.tar.gz
+	$pkgname.initd
+	$install"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	sed -i \
+		-e "s:/usr/local/etc/ngircd.motd:/etc/ngircd/ngircd.motd:" \
+		-e "s:;ServerUID = 65534:ServerUID = ngircd:" \
+		-e "s:;ServerGID = 65534:ServerGID = nogroup:" \
+		doc/sample-ngircd.conf
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc/ngircd \
+		--mandir=/usr/share/man \
+		--without-ident \
+		--with-openssl
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+	install -Dm755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+}
+
+md5sums="eef90855414c35bfb6590d17e24ee06f  ngircd-14.1.tar.gz
+1a91f517ef865b51d67b77ceb28e4261  ngircd.initd
+c8fbedf0690f35ba565e6a1937afd4fb  ngircd.pre-install"
diff --git a/extra/ngircd/ngircd.initd b/extra/ngircd/ngircd.initd
new file mode 100644
index 0000000000..807d844e8d
--- /dev/null
+++ b/extra/ngircd/ngircd.initd
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ngircd/files/ngircd.init.d,v 1.3 2006/01/02 15:31:27 swegener Exp $
+
+depend() {
+	need net
+	provide ircd
+}
+
+start() {
+	ebegin "Starting ngIRCd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/ngircd
+	eend $? "Failed to start ngIRCd"
+}
+
+stop() {
+	ebegin "Stopping ngIRCd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/ngircd
+	eend $? "Failed to stop ngIRCd"
+}
diff --git a/extra/ngircd/ngircd.pre-install b/extra/ngircd/ngircd.pre-install
new file mode 100644
index 0000000000..062e37ae4f
--- /dev/null
+++ b/extra/ngircd/ngircd.pre-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+adduser -H -h /etc/ngircd -s /bin/false -D ngircd 2>/dev/null
+exit 0
diff --git a/extra/pgcluster/APKBUILD b/extra/pgcluster/APKBUILD
index 155b3c4154..9d92b9b65b 100644
--- a/extra/pgcluster/APKBUILD
+++ b/extra/pgcluster/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=pgcluster
 pkgver=1.9.0_rc5
 _myver=1.9.0rc5
-pkgrel=0
+pkgrel=1
 pkgdesc="PostgreSQL with multi-master cluster/replication patch"
 url="http://pgfoundry.org/projects/pgcluster/"
 license="BSD"
diff --git a/extra/php/APKBUILD b/extra/php/APKBUILD
index a07bba0cda..f1a36a24e9 100644
--- a/extra/php/APKBUILD
+++ b/extra/php/APKBUILD
@@ -1,53 +1,92 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
-# Maintainer: Carlo Landmeter <clandmeter at gmail>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=php
-pkgver=5.2.9
+pkgver=5.2.10
 pkgrel=0
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
-depends="uclibc pcre libxml2"
+depends=
 makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev
-curl-dev libpng-dev libjpeg-dev freetype-dev libmcrypt-dev mysql-dev sqlite-dev
-libtool libltdl postgresql-dev"
+	curl-dev libpng-dev jpeg-dev freetype-dev libmcrypt-dev mysql-dev
+	sqlite-dev libtool libltdl postgresql-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-bcmath $pkgname-bz2
-$pkgname-calendar $pkgname-curl $pkgname-exif $pkgname-ftp $pkgname-gd
-$pkgname-iconv $pkgname-json $pkgname-mcrypt $pkgname-mime_magic
-$pkgname-mysql $pkgname-mysqli $pkgname-openssl $pkgname-pdo
-$pkgname-pdo_mysql $pkgname-pdo_sqlite $pkgname-posix $pkgname-session
-$pkgname-shmop $pkgname-soap $pkgname-sockets $pkgname-sqlite $pkgname-sysvmsg
-$pkgname-sysvsem $pkgname-sysvshm $pkgname-xmlrpc $pkgname-zip $pkgname-zlib 
-$pkgname-postgresql $pkgname-pdo_pgsql"
+	$pkgname-calendar $pkgname-curl $pkgname-exif $pkgname-ftp $pkgname-gd
+	$pkgname-iconv $pkgname-json $pkgname-mcrypt $pkgname-mime_magic
+	$pkgname-mysql $pkgname-mysqli $pkgname-openssl $pkgname-pdo
+	$pkgname-pdo_mysql $pkgname-pdo_sqlite $pkgname-posix $pkgname-session
+	$pkgname-shmop $pkgname-soap $pkgname-sockets $pkgname-sqlite
+	$pkgname-sysvmsg $pkgname-sysvsem $pkgname-sysvshm $pkgname-xmlrpc
+	$pkgname-zip $pkgname-zlib $pkgname-postgresql $pkgname-pdo_pgsql"
 source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2"
 
 build() {
         cd "$srcdir/$pkgname-$pkgver"
 
-        ./configure \
-        --prefix=/usr --sysconfdir=/etc/php --with-layout=GNU \
-        --with-config-file-path=/etc/php \
-	--with-config-file-scan-dir=/etc/php/conf.d \
-        --enable-inline-optimization --disable-debug --disable-rpath \
-        --disable-static --enable-shared --mandir=/usr/share/man \
-        --with-openssl=shared --with-zlib=shared --enable-bcmath=shared \
-        --with-bz2=shared --enable-calendar=shared --with-curl=shared \
-        --enable-exif=shared --enable-ftp=shared --with-gd=shared \
-        --with-jpeg-dir=shared,/usr --with-png-dir=shared,/usr \
-	--enable-gd-native-ttf --enable-mbstring=shared --with-mcrypt=shared \
-	--with-mysql=shared --with-mysql-sock=/tmp/mysql.sock \
-	--with-mysql=shared --with-mysqli=shared --with-pear=/usr/share/pear \
-        --enable-pdo=shared --with-pdo-mysql=shared \
-	--with-pdo-sqlite=shared,/usr --enable-fastcgi \
-        --with-sqlite=shared --enable-sqlite-utf8 --enable-shmop=shared \
-        --enable-soap=shared --enable-sysvmsg=shared --enable-sysvsem=shared \
-        --enable-sysvshm=shared --enable-zip=shared --enable-posix=shared \
-        --enable-sockets=shared --enable-xml --with-ttf=shared \
-        --enable-session=shared --with-regex=php --with-pcre-regex=/usr \
-        --enable-mbstring=all --enable-mbregex --enable-json=shared \
-        --with-iconv=shared --with-xmlrpc=shared --enable-cgi \
-	--with-freetype-dir=shared,/usr --with-mime-magic=shared \
-        --enable-discard-path --enable-force-cgi-redirect --disable-cli \
-	--with-pgsql=shared --with-pdo-pgsql=shared --with-pic
+        ./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
+		--prefix=/usr \
+		--sysconfdir=/etc/php \
+		--with-layout=GNU \
+		--with-config-file-path=/etc/php \
+		--with-config-file-scan-dir=/etc/php/conf.d \
+		--enable-inline-optimization \
+		--disable-debug \
+		--disable-rpath \
+		--disable-static \
+		--enable-shared \
+		--mandir=/usr/share/man \
+		--with-openssl=shared \
+		--with-zlib=shared \
+		--enable-bcmath=shared \
+		--with-bz2=shared \
+		--enable-calendar=shared \
+		--with-curl=shared \
+		--enable-exif=shared \
+		--enable-ftp=shared \
+		--with-gd=shared \
+		--with-jpeg-dir=shared,/usr \
+		--with-png-dir=shared,/usr \
+		--enable-gd-native-ttf \
+		--enable-mbstring=shared \
+		--with-mcrypt=shared \
+		--with-mysql=shared \
+		--with-mysql-sock=/tmp/mysql.sock \
+		--with-mysql=shared \
+		--with-mysqli=shared \
+		--with-pear=/usr/share/pear \
+		--enable-pdo=shared \
+		--with-pdo-mysql=shared \
+		--with-pdo-sqlite=shared,/usr \
+		--enable-fastcgi \
+		--with-sqlite=shared \
+		--enable-sqlite-utf8 \
+		--enable-shmop=shared \
+		--enable-soap=shared \
+		--enable-sysvmsg=shared \
+		--enable-sysvsem=shared \
+		--enable-sysvshm=shared \
+		--enable-zip=shared \
+		--enable-posix=shared \
+		--enable-sockets=shared \
+		--enable-xml \
+		--with-ttf=shared \
+		--enable-session=shared \
+		--with-regex=php \
+		--with-pcre-regex=/usr \
+		--enable-mbstring=all \
+		--enable-mbregex \
+		--enable-json=shared \
+		--with-iconv=shared \
+		--with-xmlrpc=shared \
+		--enable-cgi \
+		--with-freetype-dir=shared,/usr \
+		--with-mime-magic=shared \
+		--enable-discard-path \
+		--enable-force-cgi-redirect \
+		--disable-cli \
+		--with-pgsql=shared \
+		--with-pdo-pgsql=shared \
+		--with-pic
 
         make || return 1
         make -j1 INSTALL_ROOT="$pkgdir" install || return 1
@@ -62,163 +101,38 @@ _mv_mod() {
 	rmdir "$pkgdir/$d" 2>/dev/null
 	return 0
 }
-	
-	
-bcmath() {
-	depends="uclibc $pkgname"
-	_mv_mod bcmath
-}
-
-bz2() {
-	depends="uclibc $pkgname"
-	_mv_mod bz2
-}
-
-calendar() {
-	depends="uclibc $pkgname"
-	_mv_mod calendar
-}
-
-curl() {
-	depends="uclibc $pkgname curl"
-	_mv_mod curl
-}
-
-exif() {
-	depends="uclibc $pkgname"
-	_mv_mod exif
-}
-
-ftp() {
-	depends="uclibc $pkgname openssl"
-	_mv_mod ftp
-}
-
-gd() {
-	depends="uclibc $pkgname freetype libpng libjpeg zlib"
-	_mv_mod gd
-}
-
-iconv() {
-	depends="uclibc $pkgname libiconv"
-	_mv_mod iconv
-}
 
-json() {
-	depends="uclibc $pkgname"
-	_mv_mod json
-}
-
-mcrypt() {
-	depends="uclibc $pkgname libmcrypt"
-	_mv_mod mcrypt
-}
-
-mime_magic() {
-	depends="uclibc $pkgname"
-	_mv_mod mime_magic
-}
-
-
-mysql() {
-	depends="uclibc $pkgname libmysqlclient"
-	_mv_mod mysql
-}
-
-mysqli() {
-	depends="uclibc $pkgname libmysqlclient zlib openssl"
-	_mv_mod mysqli
-}
-
-openssl() {
-	depends="uclibc $pkgname openssl"
-	_mv_mod openssl
-}
-
-pdo() {
-	depends="uclibc $pkgname"
-	_mv_mod pdo
-}
-
-pdo_mysql() {
-	depends="uclibc $pkgname libmysqlclient zlib openssl"
-	_mv_mod pdo_mysql
-}
-
-pdo_sqlite() {
-	depends="uclibc $pkgname sqlite"
-	_mv_mod pdo_sqlite
-}
-
-posix() {
-	depends="uclibc $pkgname"
-	_mv_mod posix
-}
-
-session() {
-	depends="uclibc $pkgname"
-	_mv_mod session
-}
-
-shmop() {
-	depends="uclibc $pkgname"
-	_mv_mod shmop
-}
-
-soap() {
-	depends="uclibc $pkgname libxml2 zlib"
-	_mv_mod soap
-}
-
-sockets() {
-	depends="uclibc $pkgname"
-	_mv_mod sockets
-}
-
-sqlite() {
-	depends="uclibc $pkgname"
-	_mv_mod sqlite
-}
-
-sysvmsg() {
-	depends="uclibc $pkgname"
-	_mv_mod sysvmsg
-}
-
-sysvsem() {
-	depends="uclibc $pkgname"
-	_mv_mod sysvsem
-}
-
-sysvshm() {
-	depends="uclibc $pkgname"
-	_mv_mod sysvshm
-}
-
-xmlrpc() {
-	depends="uclibc $pkgname libiconv libxml2 zlib"
-	_mv_mod xmlrpc
-}
-
-zip() {
-	depends="uclibc $pkgname zlib"
-	_mv_mod zip
-}
-
-zlib() {
-	depends="uclibc $pkgname zlib"
-	_mv_mod zlib
-}
-
-postgresql() {
-	depends="uclibc $pkgname postgresql"
-	_mv_mod pgsql
-}
-
-pdo_pgsql() {
-	depends="uclibc $pkgname postgresql"
-	_mv_mod pdo_pgsql
-}
+bcmath()	{ _mv_mod bcmath; }
+bz2()		{ _mv_mod bz2; }
+calendar()	{ _mv_mod calendar; }
+curl()		{ _mv_mod curl; }
+exif()		{ _mv_mod exif; }
+ftp()		{ _mv_mod ftp; }
+gd()		{ _mv_mod gd; }
+iconv()		{ _mv_mod iconv; }
+json()		{ _mv_mod json; }
+mcrypt()	{ _mv_mod mcrypt; }
+mime_magic()	{ _mv_mod mime_magic; }
+mysql()		{ _mv_mod mysql; }
+mysqli()	{ _mv_mod mysqli; }
+openssl()	{ _mv_mod openssl; }
+pdo()		{ _mv_mod pdo; }
+pdo_mysql()	{ _mv_mod pdo_mysql; }
+pdo_sqlite()	{ _mv_mod pdo_sqlite; }
+posix()		{ _mv_mod posix; }
+session()	{ _mv_mod session; }
+shmop()		{ _mv_mod shmop; }
+soap()		{ _mv_mod soap; }
+sockets()	{ _mv_mod sockets; }
+sqlite()	{ _mv_mod sqlite; }
+sysvmsg()	{ _mv_mod sysvmsg; }
+sysvsem()	{ _mv_mod sysvsem; }
+sysvshm()	{ _mv_mod sysvshm; }
+xmlrpc()	{ _mv_mod xmlrpc; }
+zip()		{ _mv_mod zip; }
+zlib()		{ _mv_mod zlib; }
+postgresql()	{ _mv_mod pgsql; }
+pdo_pgsql()	{ _mv_mod pdo_pgsql; }
 
 # devleoper package
 dev() {
@@ -227,4 +141,4 @@ dev() {
 	mv "$pkgdir"/usr/lib/php/build "$subpkgdir"/usr/lib/php/
 }
 
-md5sums="280d6cda7f72a4fc6de42fda21ac2db7  php-5.2.9.tar.bz2"
+md5sums="15c7b5a87f57332d6fc683528e28247b  php-5.2.10.tar.bz2"
diff --git a/extra/postgresql/APKBUILD b/extra/postgresql/APKBUILD
index 8ab9528108..7d6cb61bd6 100644
--- a/extra/postgresql/APKBUILD
+++ b/extra/postgresql/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postgresql
 pkgver=8.3.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A sophisticated object-relational DBMS"
 url="http://www.postgresql.org/"
 license="BSD"
-depends="uclibc openssl libpq bbsuid zlib"
+depends="bbsuid"
 makedepends="readline-dev openssl-dev zlib-dev"
 subpackages="$pkgname-dev $pkgname-doc libpq $pkgname-client"
 source="ftp://ftp.$pkgname.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2
@@ -31,14 +31,14 @@ build() {
 }
 
 libpq() {
-	depends="uclibc openssl"
+	depends=
 	pkgdesc="PostgreSQL libraries"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libpq.so* "$subpkgdir"/usr/lib/
 }
 
 client() {
-	depends="uclibc openssl libpq readline"
+	depends=
 	pkgdesc="PostgreSQL client"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/psql "$subpkgdir"/usr/bin/
diff --git a/extra/quagga/APKBUILD b/extra/quagga/APKBUILD
index d69803cb42..aaa3fc64d0 100644
--- a/extra/quagga/APKBUILD
+++ b/extra/quagga/APKBUILD
@@ -1,18 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=quagga
-pkgver=0.99.12
+pkgver=0.99.13
 pkgrel=0
 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
 url="http://quagga.net/"
 license="GPL-2"
 depends="iproute2"
-makedepends="readline-dev ncurses-dev
+makedepends="readline-dev ncurses-dev gawk
 	autoconf automake libtool"
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.quagga.net/download/$pkgname-$pkgver.tar.gz
 	$pkgname-0.99.11-link-libcap.patch
-	$pkgname-0.99.11-ipv6.patch
 	$pkgname-0.99.11-ipv6-only.patch
 	$pkgname-0.99.11-del-routes.patch
 	$pkgname-0.99.11-zombie.patch
@@ -63,9 +62,8 @@ build() {
 	done
 	install -Dm644 "$srcdir/zebra.confd" "$pkgdir"/etc/conf.d/zebra
 }
-md5sums="d2bb513f4ac113dbb300c15a0bd0a241  quagga-0.99.12.tar.gz
+md5sums="55a7d2dcf016580a7c7412b3518cd942  quagga-0.99.13.tar.gz
 8f99d41a8ed79e51704e8f655d255f29  quagga-0.99.11-link-libcap.patch
-d73000d128eaf20a17ffb15b5ca1805a  quagga-0.99.11-ipv6.patch
 44c517e988273e0e5076d24f3959a125  quagga-0.99.11-ipv6-only.patch
 1cbcf60a637b2577dee4d6df711e1247  quagga-0.99.11-del-routes.patch
 ce345725f2e7240cebe0fd5ac2b2fc48  quagga-0.99.11-zombie.patch
diff --git a/extra/quagga/quagga-0.99.11-ipv6.patch b/extra/quagga/quagga-0.99.11-ipv6.patch
deleted file mode 100644
index b7b0b3d252..0000000000
--- a/extra/quagga/quagga-0.99.11-ipv6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nru quagga-0.99.11.orig/lib/sockopt.c quagga-0.99.11/lib/sockopt.c
---- quagga-0.99.11.orig/lib/sockopt.c	2008-09-05 14:27:26.000000000 +0000
-+++ quagga-0.99.11/lib/sockopt.c	2008-10-13 21:46:13.000000000 +0000
-@@ -530,6 +530,7 @@
-           return -1;
-         };
-       
-+#ifdef HAVE_IPV6
-       /* If this does not work, then all users of this sockopt will need to
-        * differentiate between IPv4 and IPv6, and keep seperate sockets for
-        * each. 
-@@ -546,6 +547,7 @@
-            su2->sin6.sin6_addr.s6_addr32[2] = htonl(0xffff);
-            memcpy (&su2->sin6.sin6_addr.s6_addr32[3], &su->sin.sin_addr, 4);
-         }
-+#endif /* HAVE_IPV6 */
-     }
-   
-   memset (&md5sig, 0, sizeof (md5sig));
diff --git a/extra/ruby/APKBUILD b/extra/ruby/APKBUILD
index cb01f4be51..ffeb781502 100644
--- a/extra/ruby/APKBUILD
+++ b/extra/ruby/APKBUILD
@@ -1,13 +1,13 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=ruby
-pkgver=1.8.7_p160
-_pkgver=1.8.7-p160
-pkgrel=2
+pkgver=1.8.7_p174
+_pkgver=1.8.7-p174
+pkgrel=1
 pkgdesc="An object-oriented language for quick and easy programming"
 url="http://www.ruby-lang.org/en/"
 license="Ruby"
-depends="zlib openssl libiconv gdbm db readline"
+depends=
 makedepends="zlib-dev openssl-dev libiconv-dev gdbm-dev db-dev readline-dev"
 subpackages="$pkgname-doc $pkgname-dev"
 source="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${pkgname}-${_pkgver}.tar.bz2"
@@ -22,15 +22,23 @@ build() {
 	# as it's risky with newer compilers to leave it as it is.
 	export CFLAGS="$CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
 
-	./configure --prefix=/usr \
+	# turn off distcc/ccache
+	# http://bugs.alpinelinux.org/issues/show/1
+	export CC=cc
+
+	./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--with-sitedir='/usr/local/lib/site_ruby' \
+		--with-extra-site-search-path='/usr/lib/site_ruby/$(ruby_ver)/i686-linux' \
 		--enable-shared
 	make || return 1
 	make DESTDIR="$pkgdir" install
+
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}"/COPYING || return 1
 
 }
 
-md5sums="f8ddb886b8a81cf005f53e9a9541091d  ruby-1.8.7-p160.tar.bz2"
+md5sums="88c45aaf627b4404e5e4273cb03ba2ee  ruby-1.8.7-p174.tar.bz2"
diff --git a/extra/run-parts/APKBUILD b/extra/run-parts/APKBUILD
index ac7cd9f76c..5854fa5d81 100644
--- a/extra/run-parts/APKBUILD
+++ b/extra/run-parts/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=run-parts
-pkgver=3.0.1
+pkgver=3.1.3
 pkgrel=0
 pkgdesc="run-parts from the debianutils package"
 url="http://packages.qa.debian.org/d/debianutils.html"
 license="GPL"
-depends="uclibc"
+depends=
 subpackages="$pkgname-doc"
 source="http://ftp.debian.org/debian/pool/main/d/debianutils/debianutils_$pkgver.tar.gz"
 
@@ -16,4 +16,4 @@ build () {
 	install -D -m755 run-parts $pkgdir/usr/bin/run-parts
 	install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8
 }
-md5sums="bb476fd2bc76e6aa9106b6c922d0799a  debianutils_3.0.1.tar.gz"
+md5sums="42c759ff41851313bb0b9c419598c04c  debianutils_3.1.3.tar.gz"
diff --git a/extra/samba/APKBUILD b/extra/samba/APKBUILD
index c05a80f1b7..c28a6e2de3 100644
--- a/extra/samba/APKBUILD
+++ b/extra/samba/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
-pkgver=3.3.5
-pkgrel=1
+pkgver=3.3.6
+pkgrel=0
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 license="GPL3"
@@ -94,6 +94,6 @@ tdb() {
 		usr/bin/tdb*
 }
 
-md5sums="8fa0e3c5daaba4c2ce2fb871a5f3157a  samba-3.3.5.tar.gz
-df66f9e44bff016c76c41935e959557c  samba.initd
+md5sums="858cb6c640358be0e81297c5de615a3c  samba-3.3.6.tar.gz
+1b701fdb22c52c63b3af0e4a286a9329  samba.initd
 c150433426e18261e6e3eed3930e1a76  samba.confd"
diff --git a/extra/samba/samba.initd b/extra/samba/samba.initd
index 67f65a339f..d2d395a989 100644
--- a/extra/samba/samba.initd
+++ b/extra/samba/samba.initd
@@ -30,12 +30,12 @@ stop_nmbd() {
 }
 
 start_winbindd() {
-	start-stop-daemon --start --quiet --exec /usr/sbin/winbindd \
-		-- $winbindd_options
+	start-stop-daemon --start --quiet --exec /usr/sbin/winbindd -- \
+		$winbindd_options
 }
 
 stop_winbindd() {
-	start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/winbindd
+	start-stop-daemon --stop --quiet --pidfile /var/run/samba/winbindd.pid
 }
 
 start() {
diff --git a/extra/squid/APKBUILD b/extra/squid/APKBUILD
index b19dd85dcf..ac840cbbd5 100644
--- a/extra/squid/APKBUILD
+++ b/extra/squid/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=squid
 pkgver=2.7.6
 _ver=2.7.STABLE6
-pkgrel=4
+pkgrel=5
 pkgdesc="A full-featured Web proxy cache server."
 url="http://www.squid-cache.org"
 install="squid.post-install"
@@ -86,6 +86,7 @@ build() {
 		"$pkgdir"/etc/logrotate.d/squid
 
 	mkdir -p "$pkgdir"/var/cache/squid "$pkgdir"/var/log/squid
+	chmod +x "$pkgdir"/usr/lib/squid/*
 }
 
 
diff --git a/extra/sysklogd/APKBUILD b/extra/sysklogd/APKBUILD
new file mode 100644
index 0000000000..e3fe8badc5
--- /dev/null
+++ b/extra/sysklogd/APKBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=sysklogd
+pkgver=1.5
+pkgrel=0
+pkgdesc="System and kernel log daemons"
+url="http://www.infodrom.org/projects/sysklogd/"
+license="GPL BSD"
+subpackages="$pkgname-doc"
+depends="logrotate"
+makedepends=""
+source="http://www.infodrom.org/projects/$pkgname/download/$pkgname-$pkgver.tar.gz
+	sysklogd.logrotate
+	sysklogd.initd
+	sysklogd.confd
+	sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
+	sysklogd-1.4.2-caen-owl-syslogd-bind.diff
+	sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
+	sysklogd-1.5-build.patch
+	LICENSE"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+
+	for i in ../*.patch ../*.diff; do
+		msg "Applying $i..."
+		patch -p1 < $i || return 1
+	done
+
+	export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" 
+	make || return 1
+	install -d "$pkgdir"/usr/sbin
+	install -d "$pkgdir"/usr/share/man/man5 
+	install -d "$pkgdir"/usr/share/man/man8
+	make INSTALL=install prefix="$pkgdir" install
+	install -D -m644 ../sysklogd.logrotate \
+		"$pkgdir"/etc/logrotate.d/sysklogd
+	install -D -m755 ../sysklogd.initd "$pkgdir"/etc/init.d/sysklogd
+	install -D -m644 ../sysklogd.confd "$pkgdir"/etc/conf.d/sysklogd
+	install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+md5sums="e053094e8103165f98ddafe828f6ae4b  sysklogd-1.5.tar.gz
+40304e92b2f6a92e252de24c5e3ca88e  sysklogd.logrotate
+9332657663a9f4286e5c61d22c46378f  sysklogd.initd
+e25d7b583b7e4bd8be503b89e1771e90  sysklogd.confd
+3b7ba3aa6519f96f11165a7d5900a8b1  sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
+4715e1dd2deb7a9ac137e004210e3154  sysklogd-1.4.2-caen-owl-syslogd-bind.diff
+6c0a416e40a678cf99c454b0e98185c9  sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
+c71826d1a4f3f7e8ffa57adbfc24f1ce  sysklogd-1.5-build.patch
+7930f7ff5038e1318511624e348581cc  LICENSE"
diff --git a/extra/sysklogd/LICENSE b/extra/sysklogd/LICENSE
new file mode 100644
index 0000000000..7e9b5d59c3
--- /dev/null
+++ b/extra/sysklogd/LICENSE
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 1983, 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
diff --git a/extra/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff b/extra/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
new file mode 100644
index 0000000000..40b8817d4e
--- /dev/null
+++ b/extra/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
@@ -0,0 +1,162 @@
+http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff?rev=1.2;content-type=text%2Fplain
+diff -upk.orig sysklogd-1.4.2.orig/klogd.8 sysklogd-1.4.2/klogd.8
+--- sysklogd-1.4.2.orig/klogd.8	2005-03-11 16:12:09 +0000
++++ sysklogd-1.4.2/klogd.8	2005-08-18 14:37:47 +0000
+@@ -18,6 +19,12 @@ klogd \- Kernel Log Daemon
+ .RB [ " \-f "
+ .I fname
+ ]
++.RB [ " \-u "
++.I username
++]
++.RB [ " \-j "
++.I chroot_dir
++]
+ .RB [ " \-iI " ]
+ .RB [ " \-n " ]
+ .RB [ " \-o " ]
+@@ -53,6 +60,20 @@ stderr.
+ .BI "\-f " file
+ Log messages to the specified filename rather than to the syslog facility.
+ .TP
++.BI "\-u " username
++Tells klogd to become the specified user and drop root privileges before
++starting logging.
++.TP
++.BI "\-j " chroot_dir
++Tells klogd to
++.BR chroot (2)
++into this directory after initializing.
++This option is only valid if the \-u option is also used to run klogd
++without root privileges.
++Note that the use of this option will prevent \-i and \-I from working
++unless you set up the chroot directory in such a way that klogd can still
++read the kernel module symbols.
++.TP
+ .BI "\-i \-I"
+ Signal the currently executing klogd daemon.  Both of these switches control
+ the loading/reloading of symbol information.  The \-i switch signals the
+diff -upk.orig sysklogd-1.4.2.orig/klogd.c sysklogd-1.4.2/klogd.c
+--- sysklogd-1.4.2.orig/klogd.c	2005-08-18 12:29:52 +0000
++++ sysklogd-1.4.2/klogd.c	2005-08-18 14:37:47 +0000
+@@ -261,6 +261,8 @@
+ #include <stdarg.h>
+ #include <paths.h>
+ #include <stdlib.h>
++#include <pwd.h>
++#include <grp.h>
+ #include "klogd.h"
+ #include "ksyms.h"
+ #ifndef TESTING
+@@ -315,6 +317,9 @@ static enum LOGSRC {none, proc, kernel} 
+ int debugging = 0;
+ int symbols_twice = 0;
+ 
++char *server_user = NULL;
++char *chroot_dir = NULL;
++int log_flags = 0;
+ 
+ /* Function prototypes. */
+ extern int ksyslog(int type, char *buf, int len);
+@@ -535,8 +540,9 @@ static enum LOGSRC GetKernelLogSrc(void)
+ 	 * First do a stat to determine whether or not the proc based
+ 	 * file system is available to get kernel messages from.
+ 	 */
+-	if ( use_syscall ||
+-	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT)) )
++	if (!server_user &&
++	    (use_syscall ||
++	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT))))
+ 	{
+ 	  	/* Initialize kernel logging. */
+ 	  	ksyslog(1, NULL, 0);
+@@ -983,6 +989,27 @@ static void LogProcLine(void)
+ }
+ 
+ 
++static int drop_root(void)
++{
++	struct passwd *pw;
++
++	if (!(pw = getpwnam(server_user))) return -1;
++
++	if (!pw->pw_uid) return -1;
++
++	if (chroot_dir) {
++		if (chdir(chroot_dir)) return -1;
++		if (chroot(".")) return -1;
++	}
++
++	if (setgroups(0, NULL)) return -1;
++	if (setgid(pw->pw_gid)) return -1;
++	if (setuid(pw->pw_uid)) return -1;
++
++	return 0;
++}
++
++
+ int main(argc, argv)
+ 
+ 	int argc;
+@@ -1000,7 +1027,7 @@ int main(argc, argv)
+ 	chdir ("/");
+ #endif
+ 	/* Parse the command-line. */
+-	while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF)
++	while ((ch = getopt(argc, argv, "c:df:u:j:iIk:nopsvx2")) != EOF)
+ 		switch((char)ch)
+ 		{
+ 		    case '2':		/* Print lines with symbols twice. */
+@@ -1022,6 +1049,10 @@ int main(argc, argv)
+ 		    case 'I':
+ 			SignalDaemon(SIGUSR2);
+ 			return(0);
++		    case 'j':		/* chroot 'j'ail */
++			chroot_dir = optarg;
++			log_flags |= LOG_NDELAY;
++			break;
+ 		    case 'k':		/* Kernel symbol file. */
+ 			symfile = optarg;
+ 			break;
+@@ -1037,6 +1068,9 @@ int main(argc, argv)
+ 		    case 's':		/* Use syscall interface. */
+ 			use_syscall = 1;
+ 			break;
++		    case 'u':		/* Run as this user */
++			server_user = optarg;
++			break;
+ 		    case 'v':
+ 			printf("klogd %s.%s\n", VERSION, PATCHLEVEL);
+ 			exit (1);
+@@ -1045,6 +1079,10 @@ int main(argc, argv)
+ 			break;
+ 		}
+ 
++	if (chroot_dir && !server_user) {
++		fputs("'-j' is only valid with '-u'\n", stderr);
++		exit(1);
++	}
+ 
+ 	/* Set console logging level. */
+ 	if ( log_level != (char *) 0 )
+@@ -1158,7 +1196,7 @@ int main(argc, argv)
+ 		}
+ 	}
+ 	else
+-		openlog("kernel", 0, LOG_KERN);
++		openlog("kernel", log_flags, LOG_KERN);
+ 
+ 
+ 	/* Handle one-shot logging. */
+@@ -1191,6 +1229,11 @@ int main(argc, argv)
+ 		}
+ 	}
+ 
++	if (server_user && drop_root()) {
++		syslog(LOG_ALERT, "klogd: failed to drop root");
++		Terminate();
++	}
++
+         /* The main loop. */
+ 	while (1)
+ 	{
diff --git a/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff b/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
new file mode 100644
index 0000000000..ad311a512c
--- /dev/null
+++ b/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
@@ -0,0 +1,103 @@
+http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff?rev=1.1;content-type=text%2Fplain
+diff -upk.orig sysklogd-1.4.2.orig/sysklogd.8 sysklogd-1.4.2/sysklogd.8
+--- sysklogd-1.4.2.orig/sysklogd.8	2004-07-09 17:33:32 +0000
++++ sysklogd-1.4.2/sysklogd.8	2005-08-18 14:40:25 +0000
+@@ -15,6 +15,9 @@ sysklogd \- Linux system logging utiliti
+ .I config file
+ ]
+ .RB [ " \-h " ] 
++.RB [ " \-i "
++.I IP address
++]
+ .RB [ " \-l "
+ .I hostlist
+ ]
+@@ -104,6 +107,13 @@ Specifying this switch on the command li
+ This can cause syslog loops that fill up hard disks quite fast and
+ thus needs to be used with caution.
+ .TP
++.BI "\-i " "IP address"
++If
++.B syslogd
++is configured to accept log input from a UDP port, specify an IP address
++to bind to, rather than the default of INADDR_ANY.  The address must be in
++dotted quad notation, DNS host names are not allowed.
++.TP
+ .BI "\-l " "hostlist"
+ Specify a hostname that should be logged only with its simple hostname
+ and not the fqdn.  Multiple hosts may be specified using the colon
+diff -upk.orig sysklogd-1.4.2.orig/syslogd.c sysklogd-1.4.2/syslogd.c
+--- sysklogd-1.4.2.orig/syslogd.c	2005-08-18 14:33:22 +0000
++++ sysklogd-1.4.2/syslogd.c	2005-08-18 14:40:25 +0000
+@@ -774,6 +774,8 @@ char	**LocalHosts = NULL;	/* these hosts
+ int	NoHops = 1;		/* Can we bounce syslog messages through an
+ 				   intermediate host. */
+ 
++char	*bind_addr = NULL;	/* bind UDP port to this interface only */
++
+ extern	int errno;
+ 
+ /* Function prototypes. */
+@@ -878,7 +880,7 @@ int main(argc, argv)
+ 		funix[i]  = -1;
+ 	}
+ 
+-	while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF)
++	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
+ 		switch((char)ch) {
+ 		case 'a':
+ 			if (nfunix < MAXFUNIX)
+@@ -895,9 +897,17 @@ int main(argc, argv)
+ 		case 'h':
+ 			NoHops = 0;
+ 			break;
++		case 'i':
++			if (bind_addr) {
++				fprintf(stderr, "Only one -i argument allowed, "
++					"the first one is taken.\n");
++				break;
++			}
++			bind_addr = optarg;
++			break;
+ 		case 'l':
+ 			if (LocalHosts) {
+-				fprintf (stderr, "Only one -l argument allowed," \
++				fprintf(stderr, "Only one -l argument allowed, "
+ 					"the first one is taken.\n");
+ 				break;
+ 			}
+@@ -1244,7 +1254,7 @@ int main(argc, argv)
+ int usage()
+ {
+ 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
+-		" [-s domainlist] [-f conffile]\n");
++		" [-s domainlist] [-f conffile] [-i IP address]\n");
+ 	exit(1);
+ }
+ 
+@@ -1286,15 +1296,22 @@ static int create_inet_socket()
+ 	int fd, on = 1;
+ 	struct sockaddr_in sin;
+ 
++	memset(&sin, 0, sizeof(sin));
++	sin.sin_family = AF_INET;
++	sin.sin_port = LogPort;
++	if (bind_addr) {
++		if (!inet_aton(bind_addr, &sin.sin_addr)) {
++			logerror("syslog: not a valid IP address to bind to.");
++			return -1;
++		}
++	}
++
+ 	fd = socket(AF_INET, SOCK_DGRAM, 0);
+ 	if (fd < 0) {
+ 		logerror("syslog: Unknown protocol, suspending inet service.");
+ 		return fd;
+ 	}
+ 
+-	memset(&sin, 0, sizeof(sin));
+-	sin.sin_family = AF_INET;
+-	sin.sin_port = LogPort;
+ 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \
+ 		       (char *) &on, sizeof(on)) < 0 ) {
+ 		logerror("setsockopt(REUSEADDR), suspending inet");
diff --git a/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff b/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
new file mode 100644
index 0000000000..8c3f571f3c
--- /dev/null
+++ b/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
@@ -0,0 +1,118 @@
+http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff?rev=1.1;content-type=text%2Fplain
+diff -upk.orig sysklogd-1.4.2.orig/sysklogd.8 sysklogd-1.4.2/sysklogd.8
+--- sysklogd-1.4.2.orig/sysklogd.8	2005-08-18 14:40:25 +0000
++++ sysklogd-1.4.2/sysklogd.8	2005-08-18 14:41:26 +0000
+@@ -32,6 +32,9 @@ sysklogd \- Linux system logging utiliti
+ .RB [ " \-s "
+ .I domainlist
+ ]
++.RB [ " \-u"
++.IB username
++]
+ .RB [ " \-v " ]
+ .LP
+ .SH DESCRIPTION
+@@ -161,6 +164,19 @@ is specified and the host logging resolv
+ no domain would be cut, you will have to specify two domains like:
+ .BR "\-s north.de:infodrom.north.de" .
+ .TP
++.BI "\-u " "username"
++This causes the
++.B syslogd
++daemon to become the named user before starting up logging.
++
++Note that when this option is in use,
++.B syslogd
++will open all log files as root when the daemon is first started;
++however, after a
++.B SIGHUP
++the files will be reopened as the non-privileged user.  You should
++take this into account when deciding the ownership of the log files.
++.TP
+ .B "\-v"
+ Print version and exit.
+ .LP
+diff -upk.orig sysklogd-1.4.2.orig/syslogd.c sysklogd-1.4.2/syslogd.c
+--- sysklogd-1.4.2.orig/syslogd.c	2005-08-18 14:40:25 +0000
++++ sysklogd-1.4.2/syslogd.c	2005-08-18 14:41:26 +0000
+@@ -524,6 +524,10 @@ static char sccsid[] = "@(#)syslogd.c	5.
+ #include <arpa/nameser.h>
+ #include <arpa/inet.h>
+ #include <resolv.h>
++
++#include <pwd.h>
++#include <grp.h>
++
+ #ifndef TESTING
+ #include "pidfile.h"
+ #endif
+@@ -775,6 +779,7 @@ int	NoHops = 1;		/* Can we bounce syslog
+ 				   intermediate host. */
+ 
+ char	*bind_addr = NULL;	/* bind UDP port to this interface only */
++char	*server_user = NULL;	/* user name to run server as */
+ 
+ extern	int errno;
+ 
+@@ -827,6 +832,21 @@ static int set_nonblock_flag(int desc)
+ 	return fcntl(desc, F_SETFL, flags | O_NONBLOCK);
+ }
+ 
++static int drop_root(void)
++{
++	struct passwd *pw;
++
++	if (!(pw = getpwnam(server_user))) return -1;
++
++	if (!pw->pw_uid) return -1;
++
++	if (initgroups(server_user, pw->pw_gid)) return -1;
++	if (setgid(pw->pw_gid)) return -1;
++	if (setuid(pw->pw_uid)) return -1;
++
++	return 0;
++}
++
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
+@@ -880,7 +900,7 @@ int main(argc, argv)
+ 		funix[i]  = -1;
+ 	}
+ 
+-	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
++	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:u:v")) != EOF)
+ 		switch((char)ch) {
+ 		case 'a':
+ 			if (nfunix < MAXFUNIX)
+@@ -933,6 +953,9 @@ int main(argc, argv)
+ 			}
+ 			StripDomains = crunch_list(optarg);
+ 			break;
++		case 'u':
++			server_user = optarg;
++			break;
+ 		case 'v':
+ 			printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
+ 			exit (0);
+@@ -1100,6 +1123,11 @@ int main(argc, argv)
+ 		kill (ppid, SIGTERM);
+ #endif
+ 
++	if (server_user && drop_root()) {
++		dprintf("syslogd: failed to drop root\n");
++		exit(1);
++	}
++
+ 	/* Main loop begins here. */
+ 	for (;;) {
+ 		int nfds;
+@@ -1254,7 +1282,7 @@ int main(argc, argv)
+ int usage()
+ {
+ 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
+-		" [-s domainlist] [-f conffile] [-i IP address]\n");
++		" [-s domainlist] [-f conffile] [-i IP address] [-u username]\n");
+ 	exit(1);
+ }
+ 
diff --git a/extra/sysklogd/sysklogd-1.5-build.patch b/extra/sysklogd/sysklogd-1.5-build.patch
new file mode 100644
index 0000000000..6175cdfe78
--- /dev/null
+++ b/extra/sysklogd/sysklogd-1.5-build.patch
@@ -0,0 +1,20 @@
+respect env CC/CFLAGS/CPPFLAGS/LDFLAGS
+
+--- a/Makefile
++++ b/Makefile
+@@ -17,14 +17,12 @@
+ #   along with this program; if not, write to the Free Software
+ #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+-CC= gcc
+ #SKFLAGS= -g -DSYSV -Wall
+ #LDFLAGS= -g
+-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
++SKFLAGS= $(CFLAGS) $(CPPFLAGS) -DSYSV -Wall -fno-strength-reduce
+ # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+ # $(shell getconf LFS_SKFLAGS)
+-LDFLAGS= -s
+ 
+ # Look where your install program is.
+ INSTALL = /usr/bin/install
diff --git a/extra/sysklogd/sysklogd.confd b/extra/sysklogd/sysklogd.confd
new file mode 100644
index 0000000000..c973573911
--- /dev/null
+++ b/extra/sysklogd/sysklogd.confd
@@ -0,0 +1,6 @@
+# Config file for /etc/init.d/sysklogd
+
+SYSLOGD="-m 0"
+# send warnings and above to the console
+KLOGD="-c 3 -2"
+
diff --git a/extra/sysklogd/sysklogd.initd b/extra/sysklogd/sysklogd.initd
new file mode 100644
index 0000000000..59db00fc99
--- /dev/null
+++ b/extra/sysklogd/sysklogd.initd
@@ -0,0 +1,79 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/files/sysklogd.rc6,v 1.12 2007/05/01 12:49:04 uberlord Exp $
+
+opts="reload"
+
+depend() {
+	need clock hostname cron
+	provide logger
+}
+
+start_daemon() {
+	local retval=0
+	local daemon="$1"
+	local options="$2"
+
+	[ -z "${daemon}" ] && return 1
+
+	ebegin "sysklogd -> start: ${daemon}"
+	start-stop-daemon --start --exec /usr/sbin/"${daemon}" \
+		--pidfile /var/run/"${daemon}".pid -- ${options}
+	retval=$?
+	eend ${retval} "Failed to start ${daemon}"
+
+	return ${retval}
+}
+
+stop_daemon() {
+	local retval=0
+	local daemon="$1"
+
+	[ -z "${daemon}" ] && return 1
+	
+	ebegin "sysklogd -> stop: ${daemon}"
+	# syslogd can be stubborn some times (--retry 15)...
+	start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid
+	retval=$?
+	eend ${retval} "Failed to stop ${daemon}"
+
+	return ${retval}
+}
+
+start() {
+	start_daemon "syslogd" "${SYSLOGD}" || return 1
+
+	# vservers should not start klogd
+	[ "$RC_SYS" = "VSERVER" ] && return 0
+	# klogd do not always start proper if started too early
+	sleep 1
+
+	if ! start_daemon "klogd" "${KLOGD}" ; then
+		stop_daemon "syslogd"
+		return 1
+	fi
+
+	return 0
+}
+
+stop() {
+	if [ "$RC_SYS" != "VSERVER" ]; then
+		stop_daemon "klogd" || return 1
+	fi
+	stop_daemon "syslogd" || return 1 
+	return 0
+}
+
+reload() {
+	local ret=0
+
+	ebegin "Reloading configuration"
+
+	start-stop-daemon --stop --oknodo --signal HUP --pidfile /var/run/syslogd.pid
+	ret=$((${ret} + $?))
+	start-stop-daemon --stop --oknodo --signal USR1 --pidfile /var/run/klogd.pid
+	ret=$((${ret} + $?))
+
+	eend ${ret}
+}
diff --git a/extra/sysklogd/sysklogd.logrotate b/extra/sysklogd/sysklogd.logrotate
new file mode 100644
index 0000000000..29afd15bd4
--- /dev/null
+++ b/extra/sysklogd/sysklogd.logrotate
@@ -0,0 +1,6 @@
+/var/log/messages /var/log/auth /var/log/mail /var/log/errors /var/log/kernel {
+    sharedscripts
+    postrotate
+	    /etc/init.d/sysklogd --quiet reload
+    endscript
+}
diff --git a/extra/tmux/APKBUILD b/extra/tmux/APKBUILD
new file mode 100644
index 0000000000..7edc932264
--- /dev/null
+++ b/extra/tmux/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=tmux
+pkgver=0.9
+pkgrel=0
+pkgdesc="Tool to control multiple terminals from a single terminal"
+url="http://tmux.sourceforge.net/"
+license="BSD"
+depends=""
+makedepends="ncurses-dev"
+install=
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	build.patch"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	patch -p1 < ../build.patch || return 1
+
+	./configure 
+	make || return 1
+	make DESTDIR="$pkgdir" PREFIX=/usr install
+
+}
+
+md5sums="2d1df646a6977bb7d9b20e53770d5593  tmux-0.9.tar.gz
+373cabbc35601c3ee71fde0877f5fe83  build.patch"
diff --git a/extra/tmux/build.patch b/extra/tmux/build.patch
new file mode 100644
index 0000000000..b16c4f4cab
--- /dev/null
+++ b/extra/tmux/build.patch
@@ -0,0 +1,23 @@
+diff -ru tmux-0.9.orig/GNUmakefile tmux-0.9/GNUmakefile
+--- tmux-0.9.orig/GNUmakefile	2009-07-09 08:11:37.000000000 +0000
++++ tmux-0.9/GNUmakefile	2009-07-09 08:12:09.000000000 +0000
+@@ -53,5 +53,5 @@
+ install:	all
+ 		$(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin
+ 		$(INSTALLBIN) tmux $(DESTDIR)$(PREFIX)/bin/tmux
+-		$(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man1
+-		$(INSTALLMAN) tmux.1 $(DESTDIR)$(PREFIX)/man/man1/tmux.1
++		$(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man1
++		$(INSTALLMAN) tmux.1 $(DESTDIR)$(PREFIX)/share/man/man1/tmux.1
+diff -ru tmux-0.9.orig/configure tmux-0.9/configure
+--- tmux-0.9.orig/configure	2009-07-09 08:11:37.000000000 +0000
++++ tmux-0.9/configure	2009-07-09 08:12:20.000000000 +0000
+@@ -82,7 +82,7 @@
+ 	compat/strtonum.c \
+         compat/getopt.c \
+ 	compat/vis.c
+-CFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE
++CFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -std=c99
+ LIBS+= -lcrypt -lutil
+ EOF
+ 	;;
diff --git a/extra/xvidcore/APKBUILD b/extra/xvidcore/APKBUILD
index f5dc166972..64858bf8df 100644
--- a/extra/xvidcore/APKBUILD
+++ b/extra/xvidcore/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xvidcore
 pkgver=1.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="XviD is an open source MPEG-4 video codec"
 url="http://www.xvid.org/"
 license="GPL"
@@ -13,7 +13,8 @@ source="http://downloads.xvid.org/downloads/$pkgname-$pkgver.tar.bz2"
 build () 
 { 
 	cd "$srcdir"/$pkgname/build/generic
-	./configure --prefix=/usr
+	./configure --prefix=/usr \
+		--disable-assembly
 	make || return 1
 	make DESTDIR="$pkgdir" install
 	cd "$pkgdir"/usr/lib