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

author: Michael Mason <ms13sp@gmail.com> 2009-05-28 13:32:41 +0000
committer: Michael Mason <ms13sp@gmail.com> 2009-05-28 13:32:41 +0000
commit: 1e2f0b801eee6597e0ab8ffeecb740ef01abb45d (patch)
tree: a4dcd60d3c11ddc72c25ef269df6c1a18ee04951
parent: 6a4d7e81f3565b5c531abedf0b81d988391f5e92 (diff)
parent: ed1b3209b6c34161e0f7ca150d99655da23214c0 (diff)
download: aports-1e2f0b801eee6597e0ab8ffeecb740ef01abb45d.tar.bz2
aports-1e2f0b801eee6597e0ab8ffeecb740ef01abb45d.tar.xz
199 files changed, 3642 insertions, 655 deletions
diff --git a/core/alpine-baselayout/APKBUILD b/core/alpine-baselayout/APKBUILD
index d02b76c7a..85ab41322 100644
--- a/core/alpine-baselayout/APKBUILD
+++ b/core/alpine-baselayout/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-baselayout
 pkgver=2.0_alpha11
-pkgrel=0
+pkgrel=1
 pkgdesc="Alpine base dir structure and init scripts"
 url=http://git.alpinelinux.org/cgit/alpine-baselayout
 depends="uclibc"
@@ -12,5 +12,6 @@ build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make
 	make install PREFIX= DESTDIR="$pkgdir" || return 1
+	chmod 700 "$pkgdir"/root
 }
 md5sums="5b9d5506690e7cf41e92be5202c40630  alpine-baselayout-2.0_alpha11.tar.bz2"
diff --git a/core/alpine-conf/APKBUILD b/core/alpine-conf/APKBUILD
index ccc0985fc..4aafab795 100644
--- a/core/alpine-conf/APKBUILD
+++ b/core/alpine-conf/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=2.0_alpha8
+pkgver=2.0_beta1
 pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
@@ -18,4 +18,4 @@ build() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="d1cd127629dd9f15739bdbce28583f6f  alpine-conf-2.0_alpha8.tar.bz2"
+md5sums="29db1b2c4a6fce82a4588a2e24a7f085  alpine-conf-2.0_beta1.tar.bz2"
diff --git a/core/apk-tools/APKBUILD b/core/apk-tools/APKBUILD
index d518586ae..d1c5c0c63 100644
--- a/core/apk-tools/APKBUILD
+++ b/core/apk-tools/APKBUILD
@@ -1,16 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
-pkgver=2.0_pre11
-pkgrel=0
+pkgver=2.0_pre12
+pkgrel=1
 pkgdesc="Alpine Package Keeper - package manager for alpine"
 depends="uclibc"
 makedepends="zlib-dev"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+	fd-leak.patch"
 url="http://git.alpinelinux.org/cgit/apk-tools/"
 license=GPL-2
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
+	patch -p1 < ../fd-leak.patch || return 1
 	sed -i -e 's:-Werror::' Make.rules
 	make
 	make DESTDIR="$pkgdir" install
@@ -23,4 +25,5 @@ build() {
 	ln -s apk apk_version
 }
 
-md5sums="1befa14958bebfe141bbb027937e3043  apk-tools-2.0_pre11.tar.bz2"
+md5sums="042d28b5cb8ddafe6add63766bc6c17a  apk-tools-2.0_pre12.tar.bz2
+66e915fb667e5ac382ecb801decf2c1c  fd-leak.patch"
diff --git a/core/apk-tools/fd-leak.patch b/core/apk-tools/fd-leak.patch
new file mode 100644
index 000000000..5f6a55ff8
--- /dev/null
+++ b/core/apk-tools/fd-leak.patch
@@ -0,0 +1,24 @@
+commit bd6278fb28d1d87a58a591244fe1069aa4216a6f
+Author: Natanael Copa <ncopa@alpinelinux.org>
+Date:   Tue May 26 14:12:02 2009 +0000
+
+    fetch: fix fd leak
+    
+    we should always close the in-stream, not only on failure.
+
+diff --git a/src/fetch.c b/src/fetch.c
+index 9e0d930..f3c651b 100644
+--- a/src/fetch.c
++++ b/src/fetch.c
+@@ -95,10 +95,10 @@ static int fetch_package(struct fetch_ctx *fctx,
+ 	}
+ 
+ 	r = apk_istream_splice(is, fd, pkg->size, NULL, NULL);
++	is->close(is);
+ 	if (fd != STDOUT_FILENO)
+ 		close(fd);
+ 	if (r != pkg->size) {
+-		is->close(is);
+ 		apk_error("Unable to download '%s'", file);
+ 		unlink(file);
+ 		return -1;
diff --git a/core/busybox/APKBUILD b/core/busybox/APKBUILD
index b95266d32..a6ad2e193 100644
--- a/core/busybox/APKBUILD
+++ b/core/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.13.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 license=GPL-2
@@ -28,7 +28,11 @@ build() {
 		fi
 	done
 
-	cp ../busyboxconfig .config
+	# we set the install prefix with sed since it might differ depending
+	# on abuild version
+	sed -e "s:^CONFIG_PREFIX=.*:CONFIG_PREFIX=\"$pkgdir\":" \
+		../busyboxconfig > .config
+
 	make silentoldconfig || return 1
 	make || return 1
 	make install DESTDIR="$pkgdir"
@@ -46,4 +50,4 @@ a743ec04f378b8456a725c7270b0be8b  busybox-1.13.2-modprobe-errormsg.patch
 0b5b2d7db201f90cd08f4a3164ee29a1  bb-tar-numeric-owner.patch
 56b78c358797cd15fb64719a48939267  busybox.post-install
 56b78c358797cd15fb64719a48939267  busybox.post-upgrade
-f28a6eedb13cbaa85e1b4d23cb9042ff  busyboxconfig"
+2ecfd91c98b347be6834a9c0f3a42f52  busyboxconfig"
diff --git a/core/busybox/busyboxconfig b/core/busybox/busyboxconfig
index 1a4373d24..696ff9a2a 100644
--- a/core/busybox/busyboxconfig
+++ b/core/busybox/busyboxconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.13.4
-# Mon Apr 20 11:44:45 2009
+# Tue May 26 06:17:14 2009
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -70,7 +70,7 @@ CONFIG_INSTALL_APPLET_DONT=y
 # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
 # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
 # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="../../pkg"
+CONFIG_PREFIX="../../pkg/busybox"
 
 #
 # Busybox Library Tuning
@@ -82,8 +82,8 @@ CONFIG_FEATURE_FAST_TOP=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 CONFIG_FEATURE_EDITING_VI=y
-CONFIG_FEATURE_EDITING_HISTORY=31
-# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+CONFIG_FEATURE_EDITING_HISTORY=255
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
 CONFIG_FEATURE_TAB_COMPLETION=y
 CONFIG_FEATURE_USERNAME_COMPLETION=y
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
diff --git a/core/curl/APKBUILD b/core/curl/APKBUILD
index 4e0082190..c54e9ce31 100644
--- a/core/curl/APKBUILD
+++ b/core/curl/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=curl
-pkgver=7.19.4
+pkgver=7.19.5
 pkgrel=0
 pkgdesc="An URL retrival utility and library"
 url="http://curl.haxx.se"
@@ -24,4 +24,4 @@ build() {
 	chmod +x "$pkgdir"/usr/bin/curl-config
 }
 
-md5sums="2734167c1e5f7ce6be99b75d2d371d85  curl-7.19.4.tar.bz2"
+md5sums="426d161661dce70c8ea9ad8f553363a3  curl-7.19.5.tar.bz2"
diff --git a/core/file/APKBUILD b/core/file/APKBUILD
index e1943b266..7754f6ced 100644
--- a/core/file/APKBUILD
+++ b/core/file/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=file
-pkgver=5.01
+pkgver=5.03
 pkgrel=0
 pkgdesc="File type identification utility"
 url="http://www.darwinsys.com/file/"
@@ -18,5 +18,5 @@ build ()
 	make || return 1
 	make DESTDIR="$pkgdir" install
 }
-md5sums="e492d6309728ace56b113de1960e3024  file-5.01.tar.gz
+md5sums="d05f08a53e5c2f51f8ee6a4758c0cc53  file-5.03.tar.gz
 28513788ba4d556ccd538867dc6205ab  nocxx.patch"
diff --git a/core/gcc/APKBUILD b/core/gcc/APKBUILD
index 49c919417..dbb656603 100644
--- a/core/gcc/APKBUILD
+++ b/core/gcc/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gcc
 pkgver=4.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 license="GPL LGPL"
 depends="gmp mpfr libgcc binutils"
 makedepends="bison flex gmp-dev mpfr-dev texinfo"
-subpackages="$pkgname-doc g++:gpp libgcc"
+subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc"
 source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2
 	00_all_gcc-4.0-cvs-incompat.patch
@@ -18,6 +18,7 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
 	gcc4-stack-protector-uclibc-no_tls.patch
 	gcc-4.2.0-cc1-no-stack-protector.patch
 	pt_gnu_eh_frame.patch
+	gcc-spec-env.patch
 	"
 
 build () 
@@ -74,10 +75,18 @@ build ()
 
 	# binutils provides libiberty.a
 	rm -f "$pkgdir"/usr/lib/libiberty.a
+}
 
+libcxx() {
+	pkgdesc="GNU C++ standard runtime library"
+	depends="uclibc libgcc"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libstdc++.so* "$subpkgdir"/usr/lib/
 }
 
 gpp() {
+	pkgdesc="GNU C++ standard library and compiler"
+	depends="uclibc libstdc++"
 	local libexec=usr/libexec/gcc/${CHOST:-i486-alpine-linux-uclibc}/$pkgver
 	mkdir -p "$subpkgdir/$libexec" \
 		"$subpkgdir"/usr/bin \
@@ -91,6 +100,7 @@ gpp() {
 }
 
 libgcc() {
+	pkgdesc="GNU C compiler runtime library"
 	depends="uclibc"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libgcc_s.so* "$subpkgdir"/usr/lib/
@@ -106,4 +116,5 @@ f0c6c419318537505ec2717a139a091b  00_all_gcc-4.0-cvs-incompat.patch
 ed3f5a947fed432fbef1dc0e71977ae7  03_all_gcc-4.3.2-hardened-default.patch
 15e77082db0e1a131af98debd3016290  gcc4-stack-protector-uclibc-no_tls.patch
 cff2e73a8455bfa844dcdd9c229b0875  gcc-4.2.0-cc1-no-stack-protector.patch
-2db1e3482c5dd59dab70f701afa2ca80  pt_gnu_eh_frame.patch"
+2db1e3482c5dd59dab70f701afa2ca80  pt_gnu_eh_frame.patch
+c4045bfa85d8be780affd465be9d8ca8  gcc-spec-env.patch"
diff --git a/core/gcc/gcc-spec-env.patch b/core/gcc/gcc-spec-env.patch
new file mode 100644
index 000000000..9d5e666a5
--- /dev/null
+++ b/core/gcc/gcc-spec-env.patch
@@ -0,0 +1,41 @@
+    Add support for external spec file via the GCC_SPECS env var.  This
+    allows us to easily control pie/ssp defaults with gcc-config profiles.
+
+    Original patch by Rob Holland.  Extended to support multiple
+    entries separated by ':' by Kevin F. Quinn
+
+--- gcc-4/gcc/gcc.c
++++ gcc-4/gcc/gcc.c
+@@ -6482,6 +6482,32 @@
+ 
+   /* Process any user specified specs in the order given on the command
+      line.  */
++#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
++  /* Add specs listed in GCC_SPECS.  Note; in the process of separating
++   * each spec listed, the string is overwritten at token boundaries
++   * (':') with '\0', an effect of strtok_r().
++   */
++  GET_ENVIRONMENT (specs_file, "GCC_SPECS");
++  if (specs_file && (strlen(specs_file) > 0))
++    {
++      char *spec, *saveptr;
++      for (spec=strtok_r(specs_file,":",&saveptr);
++           spec!=NULL;
++           spec=strtok_r(NULL,":",&saveptr))
++        {
++          struct user_specs *user = (struct user_specs *)
++            xmalloc (sizeof (struct user_specs));
++
++          user->next = (struct user_specs *) 0;
++          user->filename = spec;
++          if (user_specs_tail)
++            user_specs_tail->next = user;
++          else
++            user_specs_head = user;
++          user_specs_tail = user;
++        }
++    }
++#endif
+   for (uptr = user_specs_head; uptr; uptr = uptr->next)
+     {
+       char *filename = find_a_file (&startfile_prefixes, uptr->filename,
diff --git a/core/git/APKBUILD b/core/git/APKBUILD
index 8731bb1d1..b1873649d 100644
--- a/core/git/APKBUILD
+++ b/core/git/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
-pkgver=1.6.2.4
+pkgver=1.6.2.5
 pkgrel=0
 pkgdesc="GIT - the stupid content tracker"
 url="http://git.or.cz/"
@@ -26,6 +26,6 @@ build () {
 	make prefix=/usr DESTDIR="$pkgdir" $makeopts install
 }
 
-md5sums="c24d796879bb09e1cc5545bf3a3d7cf6  git-1.6.2.4.tar.bz2
+md5sums="7ecacfbc97188b7680addf954ecf481f  git-1.6.2.5.tar.bz2
 89fe31c2317c285ed18527a700da7844  git-1.6.0.4-noperl.patch
 04e1bdf76a0bac568f8488daad07dce7  bb-tar.patch"
diff --git a/core/iproute2/APKBUILD b/core/iproute2/APKBUILD
index 1fc5e534e..12cc37327 100644
--- a/core/iproute2/APKBUILD
+++ b/core/iproute2/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="IP Routing Utilities"
 url="http://www.linux-foundation.org/en/Net:Iproute2"
 license="GPL2"
 depends="uclibc"
-makedepends=""
+makedepends="bison flex"
 subpackages="$pkgname-doc"
 source="http://devresources.linux-foundation.org/dev/$pkgname/download/$pkgname-$pkgver.tar.bz2"
 
diff --git a/core/libtool/APKBUILD b/core/libtool/APKBUILD
index 185e2df9f..3d2ab55f0 100644
--- a/core/libtool/APKBUILD
+++ b/core/libtool/APKBUILD
@@ -2,21 +2,19 @@
 pkgname=libtool
 pkgver=2.2.6a
 _myver=2.2.6
-pkgrel=2
+pkgrel=4
 pkgdesc="A generic library support script"
 license='GPL'
 url="http://www.gnu.org/software/libtool"
 source="ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.gz"
-depends="uclibc libltdl"
-subpackages="libltdl"
+depends="uclibc libltdl bash"
+subpackages="libltdl $pkgname-doc"
 
 build() {
-	cd $srcdir/$pkgname-$_myver
+	cd "$srcdir"/$pkgname-$_myver
 	./configure --prefix=/usr
 	make || return 1
-	make DESTDIR=${startdir}/pkg install
-
-	rm -f ${pkgdir}/usr/share/info/dir
+	make DESTDIR="$pkgdir" install
 }
 
 libltdl() {
diff --git a/core/mkinitfs/APKBUILD b/core/mkinitfs/APKBUILD
index 9441399df..f4a37223f 100644
--- a/core/mkinitfs/APKBUILD
+++ b/core/mkinitfs/APKBUILD
@@ -1,19 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
-pkgver=1.3
-pkgrel=1
+pkgver=1.5
+pkgrel=0
 pkgdesc="Tool to generate initramfs images for Alpine"
 url=http://git.alpinelinux.org/cgit/mkinitfs
 depends="busybox"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
-	mkinitfs-1.3-fix.patch"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
 license="GPL-2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 < ../mkinitfs-1.3-fix.patch || return 1
 	make
 	make install DESTDIR="$pkgdir" || return 1
 }
-md5sums="c1285091a1ab336906fb0c6dfaf623de  mkinitfs-1.3.tar.bz2
-24caa6fd11bec9ff59a869dd9328fd03  mkinitfs-1.3-fix.patch"
+md5sums="0a7eefb454fc96763983048ee60a1bcd  mkinitfs-1.5.tar.bz2"
diff --git a/core/mkinitfs/mkinitfs-1.3-fix.patch b/core/mkinitfs/mkinitfs-1.3-fix.patch
deleted file mode 100644
index e161a011e..000000000
--- a/core/mkinitfs/mkinitfs-1.3-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 3cffe48a9e2dbcd0d794b34dc7e1c1e043c437d5
-Author: Natanael Copa <ncopa@alpinelinux.org>
-Date:   Fri May 1 13:24:37 2009 +0000
-
-    bugfix for the dependency tracing
-
-diff --git a/mkinitfs.in b/mkinitfs.in
-index 2e2dce6..37a948e 100755
---- a/mkinitfs.in
-+++ b/mkinitfs.in
-@@ -69,7 +69,7 @@ initfs_base() {
- 
- find_kmod_deps() {
- 	awk '
--function recursedeps(k,		j) {
-+function recursedeps(k,		j, dep) {
- 	if (k in visited)
- 		return;
- 	visited[k] = 1;
-@@ -133,8 +133,8 @@ usage: mkinitfs [-hkLl] [-b basedir] [-c configfile] [-F features] [-f fstab]
- options:
- 	-b  prefix files and kernel modules with basedir
- 	-c  use configfile instead of $config
--	-F  use fstab instead of $fstab
--	-f  use specified features
-+	-f  use fstab instead of $fstab
-+	-F  use specified features
- 	-h  print this help
- 	-i  use initfile as init instead of $init
- 	-k  keep tempdir
diff --git a/core/openrc/APKBUILD b/core/openrc/APKBUILD
index b75ffa871..ecf30e076 100644
--- a/core/openrc/APKBUILD
+++ b/core/openrc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openrc
 pkgver=0.4.3
-pkgrel=3
+pkgrel=4
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="http://roy.marples.name/openrc"
 license='BSD-2'
@@ -46,6 +46,6 @@ md5sums="57ca95533e629f06a0775e176e19bdb5  openrc-0.4.3.tar.bz2
 dcdcb34591e3d9eaaaf82db736cc5135  openrc-gendepends-speedup.patch
 c32e15b0858eef708497e7ee6355a055  hostname.initd
 33ca3e558c42cdd17adccbc7807298f7  keymaps.initd
-894c7f72448bfd7884314725ed83072a  modules.initd
+5608e6e3d836ad01b9714e5b41d223cb  modules.initd
 747168eee535e845179eaef5a3fcb334  networking.initd
 6e834194b246563fc5acd77e91e038c4  openrc.post-install"
diff --git a/core/openrc/modules.initd b/core/openrc/modules.initd
index eecfb8237..14e28e2e8 100644
--- a/core/openrc/modules.initd
+++ b/core/openrc/modules.initd
@@ -4,6 +4,7 @@ description="Loads a user defined list of kernel modules."
 
 depend()
 {
+	before hwclock
 	keyword noopenvz noprefix novserver
 }
 
diff --git a/core/openssh/APKBUILD b/core/openssh/APKBUILD
index 0261ba8eb..b81ae46ef 100644
--- a/core/openssh/APKBUILD
+++ b/core/openssh/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=openssh
 pkgver=5.2_p1
 _myver=5.2p1
-pkgrel=0
+pkgrel=1
 pkgdesc="Port of OpenBSD's free SSH release"
 url="http://www.openssh.org/portable.html"
 license="as-is"
@@ -25,6 +25,7 @@ build ()
 		--mandir=/usr/share/man \
 	        --with-ldflags="${LDFLAGS}" \
 	        --disable-strip \
+		--disable-lastlog \
 	        --sysconfdir=/etc/ssh \
         	--datadir=/usr/share/openssh \
 	        --with-privsep-path=/var/empty \
diff --git a/core/syslinux/APKBUILD b/core/syslinux/APKBUILD
index adeb4b565..c05168cf1 100644
--- a/core/syslinux/APKBUILD
+++ b/core/syslinux/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=syslinux
-pkgver=3.75
+pkgver=3.80
 pkgrel=0
 pkgdesc="a boot loader for the Linux operating system which operates off an MS-DOS/Windows FAT filesystem."
 url="http://syslinux.org"
@@ -21,5 +21,5 @@ build ()
 	make INSTALLROOT="$pkgdir" MANDIR=/usr/share/man local-install
 }
 
-md5sums="daddab10857b73c08d7278da4fdb0781  syslinux-3.75.tar.bz2
+md5sums="b909ea282a408dfb5dd95c5e0fa3d5b5  syslinux-3.80.tar.bz2
 c08398d165d29e48711e55058e2897de  syslinux-3.72-nopie.patch"
diff --git a/core/uclibc/APKBUILD b/core/uclibc/APKBUILD
index 836dff1b5..67baa2828 100644
--- a/core/uclibc/APKBUILD
+++ b/core/uclibc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=uclibc
 pkgver=0.9.30.1
-pkgrel=5
+pkgrel=6
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
 license="LGPL-2"
@@ -14,6 +14,7 @@ source="http://uclibc.org/downloads/$_mynamever.tar.bz2
 	$pkgname-0.9.30.1-resolv.patch
 	uclibc-0.9.30.1-pthread_getattr_np.patch
 	0001-ldd-segfault-fix.patch
+	ppoll.patch
 	uclibcconfig
 	"
 
@@ -48,4 +49,5 @@ md5sums="1a4b84e5536ad8170563ffa88c34679c  uClibc-0.9.30.1.tar.bz2
 ea91460617601b6e084ead66bc3948f5  uclibc-0.9.30.1-resolv.patch
 cf80c0d44a41e02f389be427ee615d61  uclibc-0.9.30.1-pthread_getattr_np.patch
 4079b20c763727863bc53408e4988434  0001-ldd-segfault-fix.patch
+60738298e377295d359768a09adac0bb  ppoll.patch
 a4512d5594f1b450ffbf2ff9eda6263b  uclibcconfig"
diff --git a/core/uclibc/ppoll.patch b/core/uclibc/ppoll.patch
new file mode 100644
index 000000000..e73733e21
--- /dev/null
+++ b/core/uclibc/ppoll.patch
@@ -0,0 +1,59 @@
+commit f82635e74a7e174f71f955eaa4f5dc788e596cc0
+Author: Denis Vlasenko <vda.linux@googlemail.com>
+Date:   Wed Jan 28 23:42:01 2009 +0000
+
+    fix ppoll. we forgot to pass 5th parameter to the syscall
+
+diff --git a/libc/sysdeps/linux/common/ppoll.c b/libc/sysdeps/linux/common/ppoll.c
+index edcb1dc..d550ae8 100644
+--- a/libc/sysdeps/linux/common/ppoll.c
++++ b/libc/sysdeps/linux/common/ppoll.c
+@@ -17,6 +17,7 @@
+    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+    02111-1307 USA.  */
+ 
++#include <signal.h>
+ #include <sys/syscall.h>
+ #include <sys/poll.h>
+ 
+@@ -26,24 +27,26 @@
+ 
+ # define __NR___libc_ppoll __NR_ppoll
+ static __always_inline
+-_syscall4(int, __libc_ppoll, struct pollfd *, fds,
+-	nfds_t, nfds, const struct timespec *, timeout,
+-	const __sigset_t *, sigmask)
++_syscall5(int, __libc_ppoll,
++	struct pollfd *, fds,
++	nfds_t, nfds,
++	const struct timespec *, timeout,
++	const __sigset_t *, sigmask,
++	size_t, sigsetsize)
+ 
+ int
+-ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
++ppoll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
+        const __sigset_t *sigmask)
+ {
+-  /* The Linux kernel can in some situations update the timeout value.
+-     We do not want that so use a local variable.  */
+-  struct timespec tval;
+-  if (timeout != NULL)
+-    {
+-      tval = *timeout;
+-      timeout = &tval;
+-    }
+-
+-  return __libc_ppoll(fds, nfds, timeout, sigmask);
++	/* The Linux kernel can in some situations update the timeout value.
++	   We do not want that so use a local variable.  */
++	struct timespec tval;
++	if (timeout != NULL) {
++		tval = *timeout;
++		timeout = &tval;
++	}
++
++	return __libc_ppoll(fds, nfds, timeout, sigmask, _NSIG / 8);
+ }
+ libc_hidden_def(ppoll)
+ 
diff --git a/core/util-vserver/APKBUILD b/core/util-vserver/APKBUILD
index 34dc3647e..dbce95df8 100644
--- a/core/util-vserver/APKBUILD
+++ b/core/util-vserver/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Linux-VServer admin utilities"
 url="http://www.nongnu.org/util-vserver/"
 license='GPL'
 depends="uclibc"
-makedepends="iptables-dev e2fsprogs beecrypt-dev autoconf automake"
+makedepends="iptables-dev e2fsprogs beecrypt-dev autoconf automake g++"
 source="http://ftp.linux-vserver.org/pub/utils/$pkgname/$pkgname-$pkgver.tar.bz2
 	$pkgname-$pkgver-touch-t.patch"
 subpackages="$pkgname-doc $pkgname-dev"
diff --git a/core/xfsprogs/APKBUILD b/core/xfsprogs/APKBUILD
index 22def063a..6efce7220 100644
--- a/core/xfsprogs/APKBUILD
+++ b/core/xfsprogs/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfsprogs
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=0
 pkgdesc="XFS filesystem utilities"
 url="http://oss.sgi.com/projects/xfs/"
 license="LGPL"
 depends="e2fsprogs"
-makedepends="e2fsprogs-dev autoconf"
+makedepends="e2fsprogs-dev bash"
 subpackages="$pkgname-dev $pkgname-doc"
 source="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-$pkgver.tar.gz
 	xfsprogs-3.0.0-gzip.patch
@@ -18,7 +18,6 @@ build() {
 		msg "Applying $i..."
 		patch -p1 < $i || return 1
 	done
-	autoconf
 	
 	export DEBUG=-DNDEBUG
 	export OPTIMIZER="$CFLAGS"
@@ -29,8 +28,8 @@ build() {
 		--libexecdir=/usr/lib \
 		--enable-gettext=no
 
-	make || return 1
+	make SHELL=/bin/bash || return 1
 	make -j1 DIST_ROOT="$pkgdir" install install-dev
 }
-md5sums="ec734f935ec87ebb8be890d29380a3e6  xfsprogs-3.0.0.tar.gz
+md5sums="d7f879a21692d4f7abc16a20479b0829  xfsprogs-3.0.1.tar.gz
 c72865de30f55343e843dd4fd49a91c5  xfsprogs-3.0.0-gzip.patch"
diff --git a/extra/acf-alpine-baselayout/APKBUILD b/extra/acf-alpine-baselayout/APKBUILD
index 4a33ac223..ad95472d1 100644
--- a/extra/acf-alpine-baselayout/APKBUILD
+++ b/extra/acf-alpine-baselayout/APKBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-alpine-baselayout
-pkgver=0.4.9
-pkgrel=1
+pkgver=0.4.12
+pkgrel=0
 pkgdesc="A web-based system administration interface for alpine-baselayout"
 url="http://dev.alpinelinux.org/alpine/acf"
 license="GPL-2"
 depends="acf-core json4lua lua luaposix"
-source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="b460d7e82282d967c9331701e7765fd8  acf-alpine-baselayout-0.4.9.tar.bz2"
+md5sums="9a492c3e2a2491dc2e451286ce297db9  acf-alpine-baselayout-0.4.12.tar.bz2"
diff --git a/extra/acf-core/APKBUILD b/extra/acf-core/APKBUILD
index ce54b56b6..7c77b2d8d 100644
--- a/extra/acf-core/APKBUILD
+++ b/extra/acf-core/APKBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-core
-pkgver=0.4.20
-pkgrel=1
+pkgver=0.4.22
+pkgrel=0
 pkgdesc="A web-based system administration interface framework"
 url="http://dev.alpinelinux.org/alpine/acf"
 license="GPL-2"
-depends="acf-skins lua luaposix md5"
+depends="acf-skins haserl lua luaposix md5"
 source="http://dev.alpinelinux.org/alpine/acf/core/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="8c0721305651203f6e188bb7cfece380  acf-core-0.4.20.tar.bz2"
+md5sums="c491d0decae8fe8341a685f2f0247815  acf-core-0.4.22.tar.bz2"
diff --git a/extra/acf-gross/APKBUILD b/extra/acf-gross/APKBUILD
new file mode 100644
index 000000000..12a31c5f9
--- /dev/null
+++ b/extra/acf-gross/APKBUILD
@@ -0,0 +1,15 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=acf-gross
+pkgver=0.1.0
+pkgrel=0
+pkgdesc="A web-based system administration interface for gross"
+url="http://git.alpinelinux.org/cgit/acf-gross"
+license="GPL-2"
+depends="acf-core lua gross"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+}
+md5sums="24647773752931c4d00d44f60d15608f  acf-gross-0.1.0.tar.bz2"
diff --git a/extra/acf-iptables/APKBUILD b/extra/acf-iptables/APKBUILD
index e494a5152..9033723fa 100644
--- a/extra/acf-iptables/APKBUILD
+++ b/extra/acf-iptables/APKBUILD
@@ -1,6 +1,6 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 pkgname=acf-iptables
-pkgver=0.0.2
+pkgver=0.1.0
 pkgrel=0
 pkgdesc="A web-based system administration interface for iptables"
 url="http://dev.alpinelinux.org/alpine/acf"
@@ -9,7 +9,7 @@ depends="acf-core lua iptables"
 makedepends=""
 install=
 subpackages=""
-source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -18,4 +18,4 @@ build() {
 
 }
 
-md5sums="6a9b06f45a5d37c8cb5ef6191fd47821  acf-iptables-0.0.2.tar.bz2"
+md5sums="02ef8d8538c91ed842346860105bdd94  acf-iptables-0.1.0.tar.bz2"
diff --git a/extra/acf-openssh/APKBUILD b/extra/acf-openssh/APKBUILD
index dbafb8142..327946583 100644
--- a/extra/acf-openssh/APKBUILD
+++ b/extra/acf-openssh/APKBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-openssh
-pkgver=0.1.2
+pkgver=0.1.4
 pkgrel=0
 pkgdesc="A web-based system administration interface for openssh"
 url="http://dev.alpinelinux.org/alpine/acf"
 license="GPL-2"
 depends="acf-core lua openssh"
-source="http://dev.alpinelinux.org/alpine/acf/${pkgname:4}/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="241b32e6f44844d0b4f72b7014e8c813  acf-openssh-0.1.2.tar.bz2"
+md5sums="3cfd5a933b2f3d65037e096da582936f  acf-openssh-0.1.4.tar.bz2"
diff --git a/extra/acf-ppp/APKBUILD b/extra/acf-ppp/APKBUILD
new file mode 100644
index 000000000..e4389f6eb
--- /dev/null
+++ b/extra/acf-ppp/APKBUILD
@@ -0,0 +1,15 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=acf-ppp
+pkgver=0.1.0
+pkgrel=0
+pkgdesc="A web-based system administration interface for ppp"
+url="http://git.alpinelinux.org/cgit/acf-ppp"
+license="GPL-2"
+depends="acf-core lua ppp"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+}
+md5sums="62f30adc3c8a86b4bf79e3762154a7a5  acf-ppp-0.1.0.tar.bz2"
diff --git a/extra/alsa-lib/APKBUILD b/extra/alsa-lib/APKBUILD
index 7bb0b7bec..b844b54ff 100644
--- a/extra/alsa-lib/APKBUILD
+++ b/extra/alsa-lib/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alsa-lib
-pkgver=1.0.19
+pkgver=1.0.20
 pkgrel=0
 pkgdesc="An alternative implementation of Linux sound support"
 url="http://www.alsa-project.org"
@@ -18,5 +18,5 @@ build ()
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" install
 }
-md5sums="73db3666c211e5fb023bb77450cf430d  alsa-lib-1.0.19.tar.bz2
+md5sums="6e9080ba1faa5d3739d14dd76c62d8dc  alsa-lib-1.0.20.tar.bz2
 28513788ba4d556ccd538867dc6205ab  nocxx.patch"
diff --git a/extra/aspell/APKBUILD b/extra/aspell/APKBUILD
new file mode 100644
index 000000000..30589a1a3
--- /dev/null
+++ b/extra/aspell/APKBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=aspell
+pkgver=0.60.6
+_pkgmajorver=${pkgver%.*}
+pkgrel=0
+pkgdesc="A spell checker designed to eventually replace Ispell"
+url="http://aspell.net/"
+license="LGPL"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="uclibc ncurses libgcc uclibc++"
+makedepends="ncurses-dev uclibc++-dev"
+install=
+source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+	libmath.patch"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	export CXX=${CXX_UC:-g++-uc}
+
+	./configure --prefix=/usr || return 1
+
+	# we want add -lm to linker flag for libaspell so wil build that
+	# separately. this is just an ugly workaround
+	make libaspell.la LDFLAGS="$LDFLAGS -lm" || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+	ln -s $pkgname-${_pkgmajorver} "$pkgdir"/usr/lib/$pkgname || return 1
+}
+md5sums="bc80f0198773d5c05086522be67334eb  aspell-0.60.6.tar.gz
+715f4e138ab33b27201d90cbc98b4fb3  libmath.patch"
diff --git a/extra/aspell/libmath.patch b/extra/aspell/libmath.patch
new file mode 100644
index 000000000..3fad33a5d
--- /dev/null
+++ b/extra/aspell/libmath.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.orig	2009-05-21 08:22:51.000000000 +0000
++++ b/Makefile	2009-05-21 08:23:06.000000000 +0000
+@@ -568,7 +568,7 @@
+ 	lib/string_list-c.cpp lib/find_speller.cpp lib/speller-c.cpp \
+ 	lib/string_pair_enumeration-c.cpp lib/new_checker.cpp \
+ 	modules/filter/url.cpp $(am__append_3)
+-libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB)
++libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB) -lm
+ libaspell_la_LDFLAGS = -version-info 16:4:1 -no-undefined
+ #libaspell_la_LDFLAGS = -version-info 16:4:0 -no-undefined
+ libpspell_la_SOURCES = lib/dummy.cpp
diff --git a/extra/asterisk/200-uclibc-daemon.patch b/extra/asterisk/100-uclibc-daemon.patch
index 4956791d4..4956791d4 100644
--- a/extra/asterisk/200-uclibc-daemon.patch
+++ b/extra/asterisk/100-uclibc-daemon.patch
diff --git a/extra/asterisk/asterisk-04-1.6.0-beta7.1-caps-uclibc.patch b/extra/asterisk/101-caps-uclibc.patch
index 1acf87f34..1acf87f34 100644
--- a/extra/asterisk/asterisk-04-1.6.0-beta7.1-caps-uclibc.patch
+++ b/extra/asterisk/101-caps-uclibc.patch
diff --git a/extra/asterisk/asterisk-01-1.6.0-gsm-pic.patch b/extra/asterisk/102-gsm-pic.patch
index 71370ec0b..71370ec0b 100644
--- a/extra/asterisk/asterisk-01-1.6.0-gsm-pic.patch
+++ b/extra/asterisk/102-gsm-pic.patch
diff --git a/extra/asterisk/APKBUILD b/extra/asterisk/APKBUILD
index 650183c7a..17acd6df7 100644
--- a/extra/asterisk/APKBUILD
+++ b/extra/asterisk/APKBUILD
@@ -1,9 +1,8 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=1.6.2.0_beta1
-_myver=1.6.2.0-beta1
-pkgrel=4
+pkgver=1.6.0.9
+pkgrel=1
 pkgdesc="Asterisk: A Module Open Source PBX System"
 url="http://www.asterisk.org/"
 license="GPL"
@@ -14,23 +13,18 @@ makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
 	$pkgname-tds"
-source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$_myver.tar.gz
-	asterisk-01-1.6.0-gsm-pic.patch
-	asterisk-02-1.6.0-uclibc.patch
-	asterisk-03-1.6.2.0-beta1-to-r186562.patch
-	asterisk-04-1.6.0-beta7.1-caps-uclibc.patch
-	asterisk-05-1.6.1-glob-uclibc.patch
-	asterisk-06-overlapped-enum.patch
-	asterisk-07-issue14068.patch
-	200-uclibc-daemon.patch
+source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz
+	100-uclibc-daemon.patch
+	101-caps-uclibc.patch
+	102-gsm-pic.patch	
 	asterisk.pre-install
 	asterisk.post-install
 	asterisk.initd
 	asterisk.confd"
 
 build() {
-	cd "$srcdir/$pkgname-$_myver"
-	for i in ../*.patch; do
+	cd "$srcdir/$pkgname-$pkgver"
+	for i in ../[1-9]*.patch; do
 		msg "Apply $i"
 		patch -p1 < $i || return 1
 	done
@@ -56,6 +50,7 @@ build() {
 	make -j1 || return 1
 	make -j1 DESTDIR="$pkgdir" install
 
+	install -d "$pkgdir"/var/run/asterisk
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
@@ -88,15 +83,10 @@ tds() {
 	_find_and_move '*_tds*'
 }
 
-md5sums="1a44f295fc9e72d19da7f42d095e6c60  asterisk-1.6.2.0-beta1.tar.gz
-97b39fd9777a2521d4f9f095482b7ac2  asterisk-01-1.6.0-gsm-pic.patch
-53b0b2a1527972722a50c8c5b560e63e  asterisk-02-1.6.0-uclibc.patch
-9f5d2412feea58ed49e2dff5cfd1fb8f  asterisk-03-1.6.2.0-beta1-to-r186562.patch
-929f740db7043b4553544ebcc7315c91  asterisk-04-1.6.0-beta7.1-caps-uclibc.patch
-c37928e95ebef36aad097accfdbbfcb8  asterisk-05-1.6.1-glob-uclibc.patch
-1b49f980e56dc7ce493a046eadff3545  asterisk-06-overlapped-enum.patch
-95bdc48553cc18c9d3807ac96956fc8a  asterisk-07-issue14068.patch
-b00c9d98ce2ad445501248a197c6e436  200-uclibc-daemon.patch
+md5sums="9142461a5ae047a5493bcb610963bc42  asterisk-1.6.0.9.tar.gz
+b00c9d98ce2ad445501248a197c6e436  100-uclibc-daemon.patch
+929f740db7043b4553544ebcc7315c91  101-caps-uclibc.patch
+97b39fd9777a2521d4f9f095482b7ac2  102-gsm-pic.patch
 b4a97cb1ec3cc3f71a10ce8c067ab430  asterisk.pre-install
 62ecffc90b6714b85f377d1fac73c58b  asterisk.post-install
 bbcd152417bb7c838b25cb6007db91da  asterisk.initd
diff --git a/extra/asterisk/asterisk-02-1.6.0-uclibc.patch b/extra/asterisk/asterisk-02-1.6.0-uclibc.patch
deleted file mode 100644
index 774baf53e..000000000
--- a/extra/asterisk/asterisk-02-1.6.0-uclibc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: Makefile
-===================================================================
---- a/Makefile.orig	2008-01-29 19:22:47.000000000 +0200
-+++ b/Makefile	2008-03-27 13:13:34.000000000 +0200
-@@ -259,6 +259,10 @@
-   ASTCFLAGS+=-pthread
- endif
- 
-+ifeq ($(OSARCH),linux-uclibc)
-+  AST_LIBS+=-lpthread -ldl
-+endif
-+
- ifeq ($(OSARCH),SunOS)
-   ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2
- endif
-Index: utils/Makefile
-===================================================================
---- a/utils/Makefile.orig	2008-03-27 13:14:16.000000000 +0200
-+++ b/utils/Makefile	2008-03-27 13:15:06.000000000 +0200
-@@ -29,6 +29,10 @@
-   UTILS:=$(filter-out muted,$(UTILS))
- endif
- 
-+ifeq ($(OSARCH),linux-uclibc)
-+  LIBS+=-lpthread -lm -ldl
-+endif
-+
- ifeq ($(OSARCH),OpenBSD)
-   UTILS:=$(filter-out muted,$(UTILS))
- endif
diff --git a/testing/bc/APKBUILD b/extra/bc/APKBUILD
index f49208038..af84e8df8 100644
--- a/testing/bc/APKBUILD
+++ b/extra/bc/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
-# Maintainer: 
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bc
 pkgver=1.06
 pkgrel=0
diff --git a/testing/coreutils/APKBUILD b/extra/coreutils/APKBUILD
index 0dc4e1f75..4f3a62cb3 100644
--- a/testing/coreutils/APKBUILD
+++ b/extra/coreutils/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
-# Maintainer: 
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=coreutils
-pkgver=7.1
-pkgrel=1
+pkgver=7.4
+pkgrel=0
 pkgdesc="The basic file, shell and text manipulation utilities"
 url="http://www.gnu.org/software/coreutils/"
 license="GPL"
@@ -26,6 +26,6 @@ build() {
 
 }
 
-md5sums="cbb2b3d1718ee1237b808e00b5c11b1e  coreutils-7.1.tar.gz
+md5sums="c52f4f64dda9a245c38e74c09fdd86d2  coreutils-7.4.tar.gz
 b84506d253e04db3c5af9016fead45a3  coreutils.post-deinstall
 b84506d253e04db3c5af9016fead45a3  coreutils.post-upgrade"
diff --git a/testing/coreutils/coreutils.post-deinstall b/extra/coreutils/coreutils.post-deinstall
index 99b57c463..99b57c463 100644
--- a/testing/coreutils/coreutils.post-deinstall
+++ b/extra/coreutils/coreutils.post-deinstall
diff --git a/testing/coreutils/coreutils.post-upgrade b/extra/coreutils/coreutils.post-upgrade
index 3e2b3c2a2..3e2b3c2a2 120000
--- a/testing/coreutils/coreutils.post-upgrade
+++ b/extra/coreutils/coreutils.post-upgrade
diff --git a/extra/cpufreqd/APKBUILD b/extra/cpufreqd/APKBUILD
new file mode 100644
index 000000000..98d7f94cf
--- /dev/null
+++ b/extra/cpufreqd/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=cpufreqd
+pkgver=2.3.4
+pkgrel=1
+pkgdesc="A small daemon to adjust cpu speed (and indeed voltage)"
+url="http://sourceforge.net/projects/cpufreqd"
+license="GPL2"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="cpufrequtils sysfsutils uclibc"
+makedepends="cpufrequtils-dev sysfsutils-dev g++"
+install=
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+	cpufreqd.initd"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--sysconfdir=/etc
+	make LIBS=-lpthread || return 1
+	make DESTDIR="$pkgdir" install
+	install -Dm 755 ../cpufreqd.initd "$pkgdir"/etc/init.d/cpufreqd \
+		|| return 1
+}
+md5sums="f4193f688305566a8422dd3989667668  cpufreqd-2.3.4.tar.bz2
+4c3298abc888ac4f688249ee542ce784  cpufreqd.initd"
diff --git a/extra/cpufreqd/cpufreqd.initd b/extra/cpufreqd/cpufreqd.initd
new file mode 100644
index 000000000..fbacebad7
--- /dev/null
+++ b/extra/cpufreqd/cpufreqd.initd
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/files/cpufreqd-init.d,v 1.1 2007/05/17 08:51:45 phreak Exp $
+
+CONFIGFILE=/etc/cpufreqd.conf
+
+depend() {
+	need localmount
+	use logger lm_sensors
+}
+
+checkconfig() {
+	if [ ! -f ${CONFIGFILE} ]; then
+		eerror "Configuration file ${CONFIGFILE} not found"
+		return 1
+	fi
+
+	if [ ! -e /proc/cpufreq ] ; then
+		for cpu in /sys/devices/system/cpu/cpu[0-9]* ; do
+                        # We need just one cpu supporting freq scaling.
+                        [ -e ${cpu}/cpufreq ] && return 0
+		done
+		eerror "cpufreqd requires the kernel to be configured with CONFIG_CPU_FREQ"
+		eerror "Make sure that the appropiate drivers for your CPU are available."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting CPU Frequency Daemon"
+	start-stop-daemon --start --exec /usr/sbin/cpufreqd -- \
+		-f ${CONFIGFILE}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping CPU Frequency Daemon"
+	start-stop-daemon --stop --exec /usr/sbin/cpufreqd
+	eend ${?}
+}
diff --git a/extra/cpufrequtils/APKBUILD b/extra/cpufrequtils/APKBUILD
new file mode 100644
index 000000000..50cb2d1b0
--- /dev/null
+++ b/extra/cpufrequtils/APKBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=cpufrequtils
+pkgver=005
+pkgrel=0
+pkgdesc="Userspace tools for the kernel cpufreq subsystem"
+url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
+license="GPL"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="sysfsutils uclibc"
+makedepends="sysfsutils-dev uclibc libtool"
+source="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/$pkgname-$pkgver.tar.bz2
+	cpufrequtils-005-build.patch
+	cpufrequtils-005-nls.patch
+	$pkgname.initd
+	$pkgname.confd"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	for i in ../*.patch; do
+		msg "Applying $i..."
+		patch -p1 < $i || return 1
+	done
+
+	# distcc and ccache makes libtool confused about the tag.
+	# we save 4k by disabling the 2.4 kernel support (PROC=false)
+	make -j1 LIBTOOL_OPT="--tag=CC --silent" \
+		NLS=false \
+		PROC=false \
+		|| return 1
+	make mandir=/usr/share/man \
+		NLS=false \
+		DESTDIR="$pkgdir" \
+		install || return 1
+	install -D -m755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -D -m644 ../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+}
+md5sums="73a41589fe74b73fc530f4179f2c6142  cpufrequtils-005.tar.bz2
+0b007dbd9fcb3acf55a8570f21b2f5d4  cpufrequtils-005-build.patch
+d88bee4d20c8b72d8edd50c2af5d4600  cpufrequtils-005-nls.patch
+b9b80ef2f1b6c5e7ce0476037a8bce6b  cpufrequtils.initd
+d47ff635eef03248c633486eaeec191d  cpufrequtils.confd"
diff --git a/extra/cpufrequtils/cpufrequtils-005-build.patch b/extra/cpufrequtils/cpufrequtils-005-build.patch
new file mode 100644
index 000000000..7dbe57043
--- /dev/null
+++ b/extra/cpufrequtils/cpufrequtils-005-build.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -158,10 +158,10 @@ endif
+ 
+ # if DEBUG is enabled, then we do not strip or optimize
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGDEF  += -O1 -g -DDEBUG
++	CFLAGDEF  += -DDEBUG
+ 	STRIPCMD = /bin/true -Since_we_are_debugging
+ else
+-	CFLAGDEF  += $(OPTIMIZATION) -fomit-frame-pointer
++	CFLAGDEF  += $(OPTIMIZATION)
+ 	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+ endif
+ 
+@@ -191,7 +191,7 @@ libcpufreq: libcpufreq.la
+ 
+ cpufreq-%: libcpufreq.la $(UTIL_OBJS)
+ 	$(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I. -I./lib/ -c -o utils/$@.o utils/$*.c
+-	$(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I./lib/ -L. -L./.libs/ -lcpufreq -o $@ utils/$@.o
++	$(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g $(LDFLAGS) -I./lib/ -L. -L./.libs/ -o $@ utils/$@.o -lcpufreq
+ 	$(QUIET) $(STRIPCMD) $@
+ 
+ utils: cpufreq-info cpufreq-set
diff --git a/extra/cpufrequtils/cpufrequtils-005-nls.patch b/extra/cpufrequtils/cpufrequtils-005-nls.patch
new file mode 100644
index 000000000..7a0336fff
--- /dev/null
+++ b/extra/cpufrequtils/cpufrequtils-005-nls.patch
@@ -0,0 +1,73 @@
+make nls/gettext support optional
+
+patch by Jos van der Ende <seraph@xs4all.nl>
+
+http://bugs.gentoo.org/205576
+
+--- cpufrequtils-005/Makefile
++++ cpufrequtils-005/Makefile
+@@ -141,6 +141,7 @@
+ ifeq ($(strip $(NLS)),true)
+ 	INSTALL_NLS += install-gmo
+ 	COMPILE_NLS += update-gmo
++	CFLAGDEF += -DNLS
+ endif
+ 
+ 
+--- cpufrequtils-005/utils/info.c
++++ cpufrequtils-005/utils/info.c
+@@ -10,7 +10,6 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <libintl.h>
+ #include <locale.h>
+ 
+ #include <getopt.h>
+@@ -18,9 +17,18 @@
+ #include "cpufreq.h"
+ 
+ 
++#ifdef NLS
++#include <libintl.h>
+ #define _(String) gettext (String)
+ #define gettext_noop(String) String
+ #define N_(String) gettext_noop (String)
++#else
++#define gettext_noop(String) String
++#define _(String) gettext_noop (String)
++#define gettext(String) gettext_noop (String)
++#define N_(String) gettext_noop (String)
++#define textdomain(String)
++#endif
+ 
+ #define LINE_LEN 10
+ 
+--- cpufrequtils-005/utils/set.c
++++ cpufrequtils-005/utils/set.c
+@@ -12,16 +12,24 @@
+ #include <limits.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include <libintl.h>
+ #include <locale.h>
+ 
+ #include <getopt.h>
+ 
+ #include "cpufreq.h"
+ 
++#ifdef NLS
++#include <libintl.h>
+ #define _(String) gettext (String)
+ #define gettext_noop(String) String
+ #define N_(String) gettext_noop (String)
++#else
++#define gettext_noop(String) String
++#define _(String) gettext_noop (String)
++#define gettext(String) gettext_noop (String)
++#define N_(String) gettext_noop (String)
++#define textdomain(String)
++#endif
+ 
+ #define NORM_FREQ_LEN 32
+ 
diff --git a/extra/cpufrequtils/cpufrequtils.confd b/extra/cpufrequtils/cpufrequtils.confd
new file mode 100644
index 000000000..68f5b7594
--- /dev/null
+++ b/extra/cpufrequtils/cpufrequtils.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/cpufrequtils: config file for /etc/init.d/cpufrequtils
+
+# Options when starting cpufreq (given to the `cpufreq-set` program)
+START_OPTS="--governor ondemand"
+
+# Options when stopping cpufreq (given to the `cpufreq-set` program)
+STOP_OPTS="--governor performance"
diff --git a/extra/cpufrequtils/cpufrequtils.initd b/extra/cpufrequtils/cpufrequtils.initd
new file mode 100644
index 000000000..9aadd94c1
--- /dev/null
+++ b/extra/cpufrequtils/cpufrequtils.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-005,v 1.2 2008/10/21 21:20:59 vapier Exp $
+
+affect_change() {
+	local c ret=0
+	ebegin "Running cpufreq-set $*"
+	for c in $(cpufreq-info -o | awk '$1 == "CPU" { print $2 }') ; do
+		cpufreq-set -c ${c} $*
+		: $((ret+=$?))
+	done
+	eend ${ret}
+}
+
+start() {
+	affect_change ${START_OPTS}
+}
+
+stop() {
+	affect_change ${STOP_OPTS}
+}
diff --git a/testing/cracklib-words/APKBUILD b/extra/cracklib-words/APKBUILD
index b46043926..b46043926 100644
--- a/testing/cracklib-words/APKBUILD
+++ b/extra/cracklib-words/APKBUILD
diff --git a/testing/cvs/APKBUILD b/extra/cvs/APKBUILD
index bcfcea6f2..bcfcea6f2 100644
--- a/testing/cvs/APKBUILD
+++ b/extra/cvs/APKBUILD
diff --git a/extra/dansguardian/APKBUILD b/extra/dansguardian/APKBUILD
index be2361b38..5ed84d76a 100644
--- a/extra/dansguardian/APKBUILD
+++ b/extra/dansguardian/APKBUILD
@@ -1,12 +1,13 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dansguardian
 pkgver=2.10.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Web content filter"
 url="http://dansguardian.org"
 license="GPL"
-depends="uclibc uclibc++"
-makedepends="zlib-dev uclibc++-dev pcre-dev pkgconfig"
+depends="uclibc uclibc++ libiconv libgcc pcre zlib"
+makedepends="zlib-dev uclibc++-dev pcre-dev pkgconfig libiconv-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc"
 source="http://dansguardian.org/downloads/2/Stable/$pkgname-$pkgver.tar.gz
@@ -25,7 +26,8 @@ build() {
 		--with-proxyuser=dansguar \
 		--with-proxygroup=dansguar \
 		--with-logdir=/var/log/dansguardian \
-		--with-piddir=/var/run/
+		--with-piddir=/var/run/ \
+		--enable-ntlm
 	make || return 1
 	make DESTDIR="$pkgdir" install
 
diff --git a/testing/dhcpcd/APKBUILD b/extra/dhcpcd/APKBUILD
index 945b6d88c..81fe0190b 100644
--- a/testing/dhcpcd/APKBUILD
+++ b/extra/dhcpcd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcpcd
-pkgver=4.0.12
+pkgver=5.0.4
 pkgrel=0
 pkgdesc="RFC2131 compliant DHCP client"
 url="http://roy.marples.name/projects/dhcpcd/"
@@ -14,14 +14,13 @@ source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-	make DESTDIR="$pkgdir" install
+	make LIBEXECDIR=/lib/dhcpcd \
+		DBDIR=/var/lib/dhcpcd
+	make LIBEXECDIR=/lib/dhcpcd \
+		DBDIR=/var/lib/dhcpcd \
+		DESTDIR="$pkgdir" \
+		install
 
 }
 
-md5sums="595311cb85071b2f11e6ca246a20d5c7  dhcpcd-4.0.12.tar.bz2"
+md5sums="0b920a8094ee3a8c16c973794561feef  dhcpcd-5.0.4.tar.bz2"
diff --git a/testing/dialog/APKBUILD b/extra/dialog/APKBUILD
index 998787443..99619e31c 100644
--- a/testing/dialog/APKBUILD
+++ b/extra/dialog/APKBUILD
@@ -1,7 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: 
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dialog
-pkgver=1.1-20080819
+pkgver=1.1.20080819
+_ver=${pkgver%.*}-${pkgver##*.}
 pkgrel=0
 pkgdesc="A script-interpreter which provides a set of curses"
 url="http://invisible-island.net/dialog/dialog.html"
@@ -13,7 +14,7 @@ subpackages="$pkgname-doc"
 source="ftp://invisible-island.net/dialog/$pkgname.tar.gz"
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgname-$_ver"
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
@@ -21,9 +22,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="3caebd641a9f337b980becb4444336c5  dialog.tar.gz"
diff --git a/extra/djbdns/APKBUILD b/extra/djbdns/APKBUILD
index 0181c1ad0..10de87979 100644
--- a/extra/djbdns/APKBUILD
+++ b/extra/djbdns/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=djbdns
 pkgver=1.05
-pkgrel=24
+pkgrel=25
 pkgdesc="Excellent high-performance DNS services"
 url="http://cr.yp.to/djbdns.html"
 license="public-domain"
@@ -79,7 +79,7 @@ dfd675b2775efcbb604413a84db8bf1a  dnsroots.patch
 c7be73fe2fb4ae02d5096fa2c1f55a68  1.05-errno.patch
 1292500c04baba3995d9753fe40fdc94  1.05-response.patch
 7695bf50559c09798ec852b578ac8698  tinydns.pre-install
-d7be449f5f90457ba785aebb1cadbf88  tinydns.initd
+39622a5eaaf9b6c6a461dfb10b7951a3  tinydns.initd
 7dcf6674c07d46c736b3c25d9c92384a  tinydns.confd
 e09c3a6ba6917e16f4736ab5c070dbe9  dnscache.pre-install
 e368a86ddc320937d663dd47684ba410  dnscache.initd
diff --git a/extra/djbdns/tinydns.initd b/extra/djbdns/tinydns.initd
index 0f5106ea7..396b8ab33 100755
--- a/extra/djbdns/tinydns.initd
+++ b/extra/djbdns/tinydns.initd
@@ -97,7 +97,7 @@ start() {
 
 stop() {
 	ebegin "Stopping tinydns"
-	start-stop-daemon --stop -m --pidfile ${VARRUN}.pid  --oknodo \
+	start-stop-daemon --stop --pidfile ${VARRUN}.pid  --oknodo \
 		--exec $DAEMON && rm ${VARRUN}.pid
 	eend $?
 }
diff --git a/extra/dovecot/APKBUILD b/extra/dovecot/APKBUILD
index 821db24af..657d8fd2c 100644
--- a/extra/dovecot/APKBUILD
+++ b/extra/dovecot/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
 pkgver=1.1.14
-pkgrel=0
+pkgrel=1
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
 license="LGPL-2.1"
@@ -19,7 +19,7 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
 	./configure --prefix=/usr \
-		--sysconfdir=/etc \
+		--sysconfdir=/etc/dovecot \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--enable-ipv6 \
diff --git a/extra/gross/APKBUILD b/extra/gross/APKBUILD
new file mode 100644
index 000000000..986c0eb91
--- /dev/null
+++ b/extra/gross/APKBUILD
@@ -0,0 +1,54 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gross
+pkgver=1.0.1
+pkgrel=0
+pkgdesc="Greylisting of suspicious sources"
+url="http://code.google.com/p/gross/"
+license="BSD"
+depends="uclibc c-ares"
+makedepends="c-ares-dev autoconf automake libtool sed"
+install="$pkgname.pre-install $pkgname.post-install"
+subpackages="$pkgname-doc $pkgname-dev"
+source="http://gross.googlecode.com/files/$pkgname-$pkgver.tar.gz
+	$pkgname.initd
+	$pkgname.confd
+	gross-1.0.1-configure.ac.patch
+	gross-1.0.1-default-conf.patch
+	gross-1.0.1-user.patch
+	$install"
+
+build() {
+        cd "$srcdir/$pkgname-$pkgver"
+
+	for _i in ../*.patch; do
+		msg "Applying $_i..."
+		patch -p1 < $_i || return 1
+	done
+	msg "Running autotools..."
+	aclocal --force && autoconf && automake --add-missing \
+		&& libtoolize --force --copy || return 1
+
+	export lt_SED='/bin/sed'
+	export lt_cv_path_SED='/bin/sed'
+        ./configure --prefix=/usr \
+                --sysconfdir=/etc \
+                --mandir=/usr/share/man \
+                --infodir=/usr/share/info
+
+        make -j1 || return 1
+        make -j1 DESTDIR="$pkgdir" install
+
+        install -dD "$pkgdir"/var/run/gross
+        install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/gross
+        install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/gross
+}
+
+md5sums="f8f81b36850dcda30cb81799b9cee3b6  gross-1.0.1.tar.gz
+37b83bd0d94f66c733d5562c0327b70f  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"
diff --git a/extra/gross/gross-1.0.1-configure.ac.patch b/extra/gross/gross-1.0.1-configure.ac.patch
new file mode 100644
index 000000000..80f9ea776
--- /dev/null
+++ b/extra/gross/gross-1.0.1-configure.ac.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac.orig	2008-05-29 16:18:56 +0000
++++ b/configure.ac	2008-05-30 09:10:48 +0000
+@@ -52,7 +52,7 @@
+ then
+     AC_DEFINE([USE_SEM_OPEN], [], [Use sem_open() instead of sem_init()])
+ else
+-    AC_SEARCH_LIBS(sem_init, [rt], ,
++    AC_SEARCH_LIBS(sem_init, [rt pthread], ,
+ 	AC_MSG_ERROR([Can't compile without semaphores.])
+     )
+ fi
+@@ -101,7 +101,7 @@
+ AC_MSG_CHECKING([whether to disable dnsbl checking])
+ AC_ARG_ENABLE(dnsbl,
+     AC_HELP_STRING([--disable-dnsbl], [Disable dnsbl checking]),
+-    [AC_MSG_RESULT([yes]) ; dnsbl="no"],
++    [AC_MSG_RESULT([yes]) ; dnsbl="$enableval"],
+     [AC_MSG_RESULT([no]) ; dnsbl="yes"]
+ )
+ 
diff --git a/extra/gross/gross-1.0.1-default-conf.patch b/extra/gross/gross-1.0.1-default-conf.patch
new file mode 100644
index 000000000..39cd90709
--- /dev/null
+++ b/extra/gross/gross-1.0.1-default-conf.patch
@@ -0,0 +1,17 @@
+diff -ru gross-1.0.1.orig/doc/examples/grossd.conf gross-1.0.1/doc/examples/grossd.conf
+--- gross-1.0.1.orig/doc/examples/grossd.conf	2008-06-03 09:27:37 +0000
++++ gross-1.0.1/doc/examples/grossd.conf	2008-06-03 09:31:33 +0000
+@@ -71,11 +71,13 @@
+ # 'statefile' is the full path of the file that the server will use to
+ # store the state information. 
+ # statefile = /var/db/grossd.state
++statefile = /var/db/gross/state
+ 
+ # 'pidfile' is the full path of the file grossd writes its pid into.
+ # You can set parameter 'check', if you want to keep grossd
+ # from starting if pidfile already exists.
+ # pidfile = /var/run/grossd.pid;check
++pidfile = /var/run/gross/grossd.pid
+ 
+ # 'log_method' is used to list all the possible logging facilities.
+ # currently only syslog is implemented
diff --git a/extra/gross/gross-1.0.1-user.patch b/extra/gross/gross-1.0.1-user.patch
new file mode 100644
index 000000000..a20279f00
--- /dev/null
+++ b/extra/gross/gross-1.0.1-user.patch
@@ -0,0 +1,72 @@
+Index: src/gross.c
+===================================================================
+--- a/src/gross.c	(revision 491)
++++ b/src/gross.c	(working copy)
+@@ -553,7 +553,7 @@
+ void
+ usage(void)
+ {
+-	printf("Usage: grossd [-CDdhnPprV] [-f configfile]\n");
++	printf("Usage: grossd [-CDdhnPpruV] [-f configfile]\n");
+ 	printf("       -C	create statefile and exit\n");
+ 	printf("       -D	Enable debug logging (insane verbosity with -DD)\n");
+ 	printf("       -d	Run grossd as a foreground process\n");
+@@ -563,6 +563,7 @@
+ 	printf("       -p file  write the process id in a pidfile\n");
+ 	printf("       -P file  same as -p, but pid file must not exist\n");
+ 	printf("       -r	disable replication\n");
++	printf("       -u user  run gross as user\n");	
+ 	printf("       -V	version information\n");
+ 	exit(EXIT_USAGE);
+ }
+@@ -612,6 +613,7 @@
+ 	pool_limits_t limits;
+ 	sigset_t mask, oldmask;
+ 	struct passwd *pwd;
++	char *user = "nobody";
+ 
+ #ifdef DNSBL
+ 	dns_check_info_t *dns_check_info;
+@@ -623,7 +625,7 @@
+ 		daemon_shutdown(EXIT_FATAL, "Couldn't initialize context");
+ 
+ 	/* command line arguments */
+-	while ((c = getopt(argc, argv, ":drf:VCDnp:P:")) != -1) {
++	while ((c = getopt(argc, argv, ":drf:VCDnp:P:u:")) != -1) {
+ 		switch (c) {
+ 		case 'd':
+ 			ctx->config.flags |= FLG_NODAEMON;
+@@ -663,6 +665,9 @@
+ 			ctx->config.flags |= FLG_CHECK_PIDFILE;
+ 			ctx->config.flags |= FLG_CREATE_PIDFILE;
+ 			break;
++		case 'u':
++			user = optarg;
++			break;
+ 		case 'h':
+ 			usage();
+ 			break;
+@@ -675,16 +680,16 @@
+ 
+ 	/* grossd doesn't need to be running as root */
+ 	if (geteuid() == 0) {
+-		logstr(GLOG_DEBUG, "Running as root: setuid() to 'nobody'");
+-		pwd = getpwnam("nobody");
++		logstr(GLOG_DEBUG, "Running as root: setuid() to '%s'", user);
++		pwd = getpwnam(user);
+ 		if (NULL == pwd)
+-			daemon_shutdown(EXIT_FATAL, "Running as root: can't find user 'nobody'");
++			daemon_shutdown(EXIT_FATAL, "Running as root: can't find user '%s'", user);
+ 		if (setgid(pwd->pw_gid) != 0)
+-			daemon_shutdown(EXIT_FATAL, "Running as root: can't setgid(%d) to 'nobody': %s",
+-			    pwd->pw_gid, strerror(errno));
++			daemon_shutdown(EXIT_FATAL, "Running as root: can't setgid(%d) to '%s': %s",
++			    pwd->pw_gid, user, strerror(errno));
+ 		if (setuid(pwd->pw_uid) != 0)
+-			daemon_shutdown(EXIT_FATAL, "Running as root: can't setuid(%d) to 'nobody': %s",
+-			    pwd->pw_uid, strerror(errno));
++			daemon_shutdown(EXIT_FATAL, "Running as root: can't setuid(%d) to '%s': %s",
++			    pwd->pw_uid, user, strerror(errno));
+ 	}
+ 
+ 	config = default_config();
diff --git a/extra/gross/gross.confd b/extra/gross/gross.confd
new file mode 100644
index 000000000..646e12f9d
--- /dev/null
+++ b/extra/gross/gross.confd
@@ -0,0 +1,6 @@
+#
+# Specify daemon $OPTS here.
+#
+
+OPTS=""
+
diff --git a/extra/gross/gross.initd b/extra/gross/gross.initd
new file mode 100644
index 000000000..c67293e17
--- /dev/null
+++ b/extra/gross/gross.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+
+NAME="grossd"
+DAEMON="/usr/sbin/$NAME"
+USER="gross"
+GROUP="gross"
+
+depend() {
+	need net
+}
+
+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
+	fi
+}
+
+start() {
+	check_config || return 1
+	ebegin "Starting ${NAME}"
+	start-stop-daemon --start --quiet --background \
+		--exec ${DAEMON} -- \
+		-p /var/run/gross/grossd.pid \
+		-u ${USER} ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${NAME}"
+	start-stop-daemon --stop --pidfile /var/run/gross/grossd.pid
+	eend $?
+}
+
diff --git a/extra/gross/gross.post-install b/extra/gross/gross.post-install
new file mode 100644
index 000000000..df06670a4
--- /dev/null
+++ b/extra/gross/gross.post-install
@@ -0,0 +1,2 @@
+#!/bin/sh
+chown -R gross:gross /var/run/gross
diff --git a/extra/gross/gross.pre-install b/extra/gross/gross.pre-install
new file mode 100644
index 000000000..c3844d7a5
--- /dev/null
+++ b/extra/gross/gross.pre-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+adduser -H -s /bin/false -D gross 2>/dev/null
+exit 0
diff --git a/extra/haserl/APKBUILD b/extra/haserl/APKBUILD
index 7df805848..2c4e08e49 100644
--- a/extra/haserl/APKBUILD
+++ b/extra/haserl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=haserl
 pkgver=0.9.25
-pkgrel=0
+pkgrel=1
 pkgdesc="Html And Shell Embedded Report Language"
 url="http://haserl.sourceforge.net/"
 license="GPL-2"
@@ -16,6 +16,7 @@ build() {
 	./configure --prefix=/usr --with-lua || return 1
 	make || return 1
 	make DESTDIR="$pkgdir/" install
+	chmod 4111 "$pkgdir"/usr/bin/haserl
 }
 
 md5sums="906c634a2af4ac3a4b656ef4e244c4cd  haserl-0.9.25.tar.gz"
diff --git a/extra/heimdal/001_all_heimdal-no_libedit.patch b/extra/heimdal/001_all_heimdal-no_libedit.patch
new file mode 100644
index 000000000..a551bdce1
--- /dev/null
+++ b/extra/heimdal/001_all_heimdal-no_libedit.patch
@@ -0,0 +1,10 @@
+--- cf/krb-readline.m4	2005-06-16 18:28:32.000000000 +0200
++++ cf/krb-readline.m4	2005-06-27 23:17:06.000000000 +0200
+@@ -6,7 +6,6 @@
+ dnl el_init
+ 
+ AC_DEFUN([KRB_READLINE],[
+-AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
+ if test "$ac_cv_func_el_init" = yes ; then
+ 	AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
+ 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
diff --git a/extra/heimdal/002_all_heimdal-fPIC.patch b/extra/heimdal/002_all_heimdal-fPIC.patch
new file mode 100644
index 000000000..c67dbae76
--- /dev/null
+++ b/extra/heimdal/002_all_heimdal-fPIC.patch
@@ -0,0 +1,12 @@
+--- lib/editline/Makefile.am	2005-06-16 18:28:44.000000000 +0200
++++ lib/editline/Makefile.am	2005-06-27 23:21:02.000000000 +0200
+@@ -41,6 +41,9 @@
+ 
+ EXTRA_DIST = $(man_MANS)
+ 
++$(libeditline_la_OBJECTS): %.lo: %.c
++	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
+ snprintf.c:
+ 	$(LN_S) $(srcdir)/../roken/snprintf.c .
+ strdup.c:
diff --git a/extra/heimdal/003_all_heimdal-rxapps.patch b/extra/heimdal/003_all_heimdal-rxapps.patch
new file mode 100644
index 000000000..40fc05f08
--- /dev/null
+++ b/extra/heimdal/003_all_heimdal-rxapps.patch
@@ -0,0 +1,22 @@
+--- appl/kx/rxtelnet.in	2005-06-16 18:29:10.000000000 +0200
++++ appl/kx/rxtelnet.in	2005-06-27 23:21:34.000000000 +0200
+@@ -2,7 +2,7 @@
+ # $Id: rxtelnet.in,v 1.31 2004/03/07 17:22:06 lha Exp $
+ #
+ usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
+-binary=telnet
++binary=ktelnet
+ term=
+ kx_args=-P
+ while true
+--- appl/kx/rxterm.in	2005-06-16 18:29:10.000000000 +0200
++++ appl/kx/rxterm.in	2005-06-27 23:21:55.000000000 +0200
+@@ -2,7 +2,7 @@
+ # $Id: rxterm.in,v 1.23 2002/03/18 17:37:34 joda Exp $
+ #
+ usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
+-binary=rsh
++binary=krsh
+ term=xterm
+ while true
+ do
diff --git a/extra/heimdal/005_all_heimdal-suid_fix.patch b/extra/heimdal/005_all_heimdal-suid_fix.patch
new file mode 100644
index 000000000..35a9ed9f6
--- /dev/null
+++ b/extra/heimdal/005_all_heimdal-suid_fix.patch
@@ -0,0 +1,20 @@
+--- appl/su/Makefile.am	2005-06-16 18:27:46.000000000 +0200
++++ appl/su/Makefile.am	2005-06-27 23:25:21.000000000 +0200
+@@ -7,6 +7,7 @@
+ bin_PROGRAMS = su
+ bin_SUIDS = su
+ su_SOURCES = su.c supaths.h
++su_LDFLAGS = -Wl,-z,now
+ man_MANS = su.1
+ 
+ LDADD = $(LIB_kafs) \
+--- appl/otp/Makefile.am	2005-06-16 18:28:46.000000000 +0200
++++ appl/otp/Makefile.am	2005-06-27 23:25:40.000000000 +0200
+@@ -8,6 +8,7 @@
+ bin_SUIDS = otp
+ otp_SOURCES = otp.c otp_locl.h
+ otpprint_SOURCES = otpprint.c otp_locl.h
++otp_LDFLAGS = -Wl,-z,now
+ 
+ man_MANS = otp.1  otpprint.1
+ 
diff --git a/extra/heimdal/013_all_heimdal-pthread-lib.patch b/extra/heimdal/013_all_heimdal-pthread-lib.patch
new file mode 100644
index 000000000..19f879407
--- /dev/null
+++ b/extra/heimdal/013_all_heimdal-pthread-lib.patch
@@ -0,0 +1,11 @@
+--- heimdal-0.7.1/cf/pthreads.m4.old	2005-09-09 12:12:28.000000000 +0000
++++ heimdal-0.7.1/cf/pthreads.m4	2005-09-17 22:23:23.000000000 +0000
+@@ -32,7 +32,7 @@
+ 	2.*)
+ 		native_pthread_support=yes
+ 		PTHREADS_CFLAGS=-pthread
+-		PTHREADS_LIBS=-pthread
++		PTHREADS_LIBS=-lpthread
+ 		;;
+ 	esac
+ 	;;
diff --git a/extra/heimdal/014_all_heimdal-path.patch b/extra/heimdal/014_all_heimdal-path.patch
new file mode 100644
index 000000000..36a86f1f9
--- /dev/null
+++ b/extra/heimdal/014_all_heimdal-path.patch
@@ -0,0 +1,50 @@
+--- appl/rcp/rcp.c.old	2006-05-03 13:31:59.398493625 +0200
++++ appl/rcp/rcp.c	2006-05-03 13:32:04.494485981 +0200
+@@ -34,7 +34,7 @@
+ #include "rcp_locl.h"
+ #include <getarg.h>
+ 
+-#define RSH_PROGRAM "rsh"
++#define RSH_PROGRAM "krsh"
+ 
+ struct  passwd *pwd;
+ uid_t	userid;
+--- appl/rcp/rcp_locl.h.old	2006-05-03 02:30:31.602025409 +0200
++++ appl/rcp/rcp_locl.h	2006-05-03 02:30:35.886018983 +0200
+@@ -64,4 +64,4 @@
+ #define	_PATH_CP	"/bin/cp"
+ #endif
+ #undef _PATH_RSH
+-#define	_PATH_RSH	BINDIR "/rsh"
++#define	_PATH_RSH	BINDIR "/krsh"
+--- appl/telnet/telnetd/telnetd.h.old	2006-05-03 02:23:14.582680939 +0200
++++ appl/telnet/telnetd/telnetd.h	2006-05-03 02:23:23.746667193 +0200
+@@ -192,7 +192,7 @@
+ #endif
+ 
+ #undef _PATH_LOGIN
+-#define _PATH_LOGIN	BINDIR "/login"
++#define _PATH_LOGIN	BINDIR "/klogin"
+ 
+ /* fallbacks */
+ 
+--- appl/login/shadow.c.old	2006-05-05 06:31:29.517138115 +0200
++++ appl/login/shadow.c	2006-05-05 06:32:26.433052741 +0200
+@@ -38,7 +38,7 @@
+ #ifdef HAVE_SHADOW_H
+ 
+ #ifndef _PATH_CHPASS
+-#define _PATH_CHPASS "/usr/bin/passwd"
++#define _PATH_CHPASS "/usr/bin/kpasswd"
+ #endif
+ 
+ static int
+@@ -52,7 +52,7 @@
+         printf("fork /bin/passwd");
+         exit(1);
+     case 0:
+-        execlp(_PATH_CHPASS, "passwd", who->pw_name, (char *) 0);
++        execlp(_PATH_CHPASS, "kpasswd", who->pw_name, (char *) 0);
+         exit(1);
+     default:
+         waitpid(pid, &status, 0);
diff --git a/extra/heimdal/022_all_heimdal-as-needed.patch b/extra/heimdal/022_all_heimdal-as-needed.patch
new file mode 100644
index 000000000..69c791778
--- /dev/null
+++ b/extra/heimdal/022_all_heimdal-as-needed.patch
@@ -0,0 +1,22 @@
+--- lib/roken/Makefile.am.old	2007-11-05 19:42:53.000000000 +0100
++++ lib/roken/Makefile.am	2007-11-05 19:43:12.000000000 +0100
+@@ -107,7 +107,7 @@
+ 	ifaddrs.hin		\
+ 	vis.hin	
+ 
+-libroken_la_LIBADD = @LTLIBOBJS@
++libroken_la_LIBADD = @LTLIBOBJS@ $(LIB_crypt)
+ 
+ $(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h $(XHEADERS)
+ 
+--- lib/editline/Makefile.am.old	2007-11-05 19:46:08.000000000 +0100
++++ lib/editline/Makefile.am	2007-11-05 20:06:54.000000000 +0100
+@@ -36,6 +36,8 @@
+ 	unix.h \
+ 	$(EXTRA_SOURCE)
+ 
++libeditline_la_LIBADD = $(LIB_tgetent)
++
+ EXTRA_SOURCE = $(ES) 
+ 
+ libel_compat_la_SOURCES = edit_compat.c edit_compat.h
diff --git a/extra/heimdal/APKBUILD b/extra/heimdal/APKBUILD
new file mode 100644
index 000000000..a7b52ae06
--- /dev/null
+++ b/extra/heimdal/APKBUILD
@@ -0,0 +1,156 @@
+# Maintainer: Leonardo Arena <rnalrd@gmail.com>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=heimdal
+pkgver=1.2.1
+pkgrel=1
+pkgdesc="An implementation of Kerberos 5"
+url="http://www.h5l.org/"
+license="BSD"
+depends="uclibc sqlite readline openssl e2fsprogs"
+makedepends="gawk readline-dev e2fsprogs-dev"
+install=
+subpackages="$pkgname-doc $pkgname-dev $pkgname-ftp $pkgname-telnet \
+$pkgname-su $pkgname-rsh $pkgname-rcp $pkgname-pagsh $pkgname-kf"
+source="http://www.h5l.org/dist/src/$pkgname-$pkgver.tar.gz
+001_all_heimdal-no_libedit.patch
+002_all_heimdal-fPIC.patch
+003_all_heimdal-rxapps.patch
+005_all_heimdal-suid_fix.patch
+013_all_heimdal-pthread-lib.patch
+014_all_heimdal-path.patch
+022_all_heimdal-as-needed.patch
+heimdal-system_sqlite.patch
+heimdal-r23235-kb5-libwind_la.patch
+heimdal-r23238-kb5_locl_h-wind_h.patch
+"
+
+build() {
+	[ -e /usr/lib/libasn1.so ] && echo "## remove old heimdal pkg first ##" && return 1
+
+	cd "$srcdir/$pkgname-$pkgver"
+	
+	patch -Np0 -i ../../001_all_heimdal-no_libedit.patch || return 1
+	patch -Np0 -i ../../002_all_heimdal-fPIC.patch || return 1
+	patch -Np0 -i ../../003_all_heimdal-rxapps.patch || return 1
+	patch -Np0 -i ../../005_all_heimdal-suid_fix.patch || return 1
+	patch -Np1 -i ../../013_all_heimdal-pthread-lib.patch || return 1
+	patch -Np0 -i ../../014_all_heimdal-path.patch || return 1
+	patch -Np0 -i ../../022_all_heimdal-as-needed.patch || return 1
+	patch -Np0 -i ../../heimdal-system_sqlite.patch || return 1
+	patch -Np2 -i ../../heimdal-r23235-kb5-libwind_la.patch || return 1
+	patch -Np2 -i ../../heimdal-r23238-kb5_locl_h-wind_h.patch || return 1
+
+	# name clash with ruserpass in netdb.h
+	sed -i -e 's/ruserpass/ruserpw/g' appl/ftp/ftp/*.[ch] || return 1
+
+	sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \
+	doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
+	lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5
+
+
+	export LDFLAGS="${LDFLAGS} -Wl,--as-needed"
+
+	./configure --prefix=/usr \
+		--enable-shared=yes --without-x \
+		--disable-berkeley-db \
+		--disable-netinfo \
+		--with-readline-lib=/usr/lib \
+		--with-readline-include=/usr/include/readline \
+		--with-openssl=/usr
+
+	make || return 1
+	make DESTDIR="$pkgdir" exec_prefix=/usr sysconfdir=/etc \
+	mandir=/usr/share/man infodir=/usr/share/info datadir=/var/lib/heimdal \
+	localstatedir=/var/lib/heimdal libexecdir=/usr/sbin install
+
+	install -m644 -D krb5.conf ${pkgdir}/etc/krb5.conf || return 1
+	install -m755 -D ../../heimdal-kadmind.init ${pkgdir}/etc/init.d/heimdal-kadmind
+	install -m755 -D ../../heimdal-kdc.init ${pkgdir}/etc/init.d/heimdal-kdc
+	install -m755 -D ../../heimdal-kpasswdd.init ${pkgdir}/etc/init.d/heimdal-kpasswdd
+
+	# Remove editline, we use libreadline
+	rm ${pkgdir}/usr/lib/libeditline.* || return 1
+	rm ${pkgdir}/usr/include/editline.h || return 1
+	rm ${pkgdir}/usr/share/man/man3/editline.* || return 1
+
+	# Rename daemons and their manpages
+	for i in telnetd ftpd rshd; do
+		mv ${pkgdir}/usr/share/man/man8/${i}.8 ${pkgdir}/usr/share/man/man8/k${i}.8 || return 1
+		mv ${pkgdir}/usr/sbin/${i} ${pkgdir}/usr/sbin/k${i} || return 1
+	done
+
+	# Rename clients and their manpages
+	for i in rcp rsh telnet ftp su login; do
+		if [ -f ${pkgdir}/usr/share/man/man1/${i}.1 ]; then
+			mv ${pkgdir}/usr/share/man/man1/${i}.1 ${pkgdir}/usr/share/man/man1/k${i}.1 || return 1
+		fi
+		mv ${pkgdir}/usr/bin/${i} ${pkgdir}/usr/bin/k${i} || return 1
+	done
+	rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8}
+
+	# Remove conflicts 
+	rm ${pkgdir}/usr/share/man/man5/ftpusers.5*
+
+	# Compress info pages
+	for page in heimdal hx509; do
+		gzip -9 ${pkgdir}/usr/share/info/${page}.info
+	done
+
+	# Install the license
+	install -d ${pkgdir}/usr/share/licenses/${pkgname}
+	install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \
+	${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+}
+
+ftp() {
+	mkdir -p $subpkgdir/usr/bin/
+	mv $pkgdir/usr/bin/kftp $subpkgdir/usr/bin/kftp
+	mkdir -p $subpkgdir/usr/sbin/
+	mv $pkgdir/usr/sbin/kftpd $subpkgdir/usr/sbin/kftpd
+}
+
+telnet() {
+	mkdir -p $subpkgdir/usr/bin/
+	mv $pkgdir/usr/bin/ktelnet $subpkgdir/usr/bin/ktelnet
+	mkdir -p $subpkgdir/usr/sbin/
+	mv $pkgdir/usr/sbin/ktelnetd $subpkgdir/usr/sbin/ktelnetd
+}
+
+su() {
+	mkdir -p $subpkgdir/usr/bin/
+	mv $pkgdir/usr/bin/ksu $subpkgdir/usr/bin/ksu
+}
+
+rsh() {
+	mkdir -p $subpkgdir/usr/bin/
+	mv $pkgdir/usr/bin/krsh $subpkgdir/usr/bin/krsh
+	mkdir -p $subpkgdir/usr/sbin/
+	mv $pkgdir/usr/sbin/krshd $subpkgdir/usr/sbin/krshd
+}
+
+rcp() {
+        mkdir -p $subpkgdir/usr/bin/
+	mv $pkgdir/usr/bin/krcp $subpkgdir/usr/bin/krcp
+}
+
+pagsh() {
+        mkdir -p $subpkgdir/usr/bin/
+        mv $pkgdir/usr/bin/pagsh $subpkgdir/usr/bin/pagsh
+}
+
+kf() {
+        mkdir -p $subpkgdir/usr/bin/
+        mv $pkgdir/usr/bin/kf $subpkgdir/usr/bin/kf
+}
+
+md5sums="6e5028077e2a6b101a4a72801ba71b9e  heimdal-1.2.1.tar.gz
+98e28f11f906c967aac22d6184102c9e  001_all_heimdal-no_libedit.patch
+6d5571bdedba2e2423b90bccdbac2c0a  002_all_heimdal-fPIC.patch
+2feec3924ee5230b54175b4d4000c872  003_all_heimdal-rxapps.patch
+45aeb207f360f9f4e9e0fabc8bfeecbc  005_all_heimdal-suid_fix.patch
+1b8665b771c4eb6b56ea8582c96e56e3  013_all_heimdal-pthread-lib.patch
+8208ae8c0b6ff5ab4f64af1693e9e396  014_all_heimdal-path.patch
+d7649e078c87d2ca997080f0deb527c0  022_all_heimdal-as-needed.patch
+949a389ebe7652861b2e178a7e0f1ed9  heimdal-system_sqlite.patch
+072f6b2550693adb30117394b1dd354e  heimdal-r23235-kb5-libwind_la.patch
+7b4537b0e8bde95214211091e55eacf5  heimdal-r23238-kb5_locl_h-wind_h.patch"
diff --git a/extra/heimdal/heimdal-kadmind.init b/extra/heimdal/heimdal-kadmind.init
new file mode 100755
index 000000000..b58ac994d
--- /dev/null
+++ b/extra/heimdal/heimdal-kadmind.init
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kadmind,v 1.3 2004/09/13 22:44:54 solar Exp $
+
+depend() {
+	need net
+	use heimdal-kdc
+	after logger
+}
+
+start() {
+	ebegin "Starting heimdal kadmind"
+		/usr/sbin/kadmind  &
+		echo $! > /var/run/heimdal-kadmind.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping heimdal kadmind"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/sbin/kadmind
+	eend $?
+}
diff --git a/extra/heimdal/heimdal-kdc.init b/extra/heimdal/heimdal-kdc.init
new file mode 100755
index 000000000..753a101c3
--- /dev/null
+++ b/extra/heimdal/heimdal-kdc.init
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc,v 1.2 2004/09/13 15:40:34 dragonheart Exp $
+
+depend() {
+	need net
+	after logger
+}
+
+start() {
+	ebegin "Starting heimdal kdc"
+	start-stop-daemon --start --quiet --exec \
+		/usr/sbin/kdc -- --detach
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping heimdal kdc"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/sbin/kdc
+	eend $?
+}
diff --git a/extra/heimdal/heimdal-kpasswdd.init b/extra/heimdal/heimdal-kpasswdd.init
new file mode 100755
index 000000000..517cb8621
--- /dev/null
+++ b/extra/heimdal/heimdal-kpasswdd.init
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kpasswdd,v 1.3 2004/09/13 22:44:54 solar Exp $
+
+depend() {
+	need net
+	use heimdal-kdc
+	after logger
+}
+
+start() {
+	ebegin "Starting heimdal kpasswdd"
+	start-stop-daemon --background --start --quiet --exec \
+		/usr/sbin/kpasswdd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping heimdal kpasswdd"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/sbin/kpasswdd
+	eend $?
+}
diff --git a/extra/heimdal/heimdal-r23235-kb5-libwind_la.patch b/extra/heimdal/heimdal-r23235-kb5-libwind_la.patch
new file mode 100644
index 000000000..88c02e598
--- /dev/null
+++ b/extra/heimdal/heimdal-r23235-kb5-libwind_la.patch
@@ -0,0 +1,10 @@
+--- trunk/heimdal/lib/krb5/Makefile.am	2008-06-01 22:25:41 UTC (rev 23234)
++++ trunk/heimdal/lib/krb5/Makefile.am	2008-06-01 22:25:53 UTC (rev 23235)
+@@ -57,6 +57,7 @@
+ 	$(LIB_com_err) \
+ 	$(LIB_hcrypto) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
++	../wind/libwind.la \
+ 	$(LIBADD_roken) \
+ 	$(LIB_door_create) \
+ 	$(LIB_dlopen)
diff --git a/extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch b/extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
new file mode 100644
index 000000000..5390b2cf6
--- /dev/null
+++ b/extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
@@ -0,0 +1,11 @@
+--- trunk/heimdal/lib/krb5/krb5_locl.h	2008-06-01 22:26:24 UTC (rev 23237)
++++ trunk/heimdal/lib/krb5/krb5_locl.h	2008-06-01 22:26:43 UTC (rev 23238)
+@@ -131,6 +131,8 @@
+ #include <parse_time.h>
+ #include <base64.h>
+ 
++#include <wind.h>
++
+ #include "crypto-headers.h"
+
+
diff --git a/extra/heimdal/heimdal-system_sqlite.patch b/extra/heimdal/heimdal-system_sqlite.patch
new file mode 100644
index 000000000..2f8254e4d
--- /dev/null
+++ b/extra/heimdal/heimdal-system_sqlite.patch
@@ -0,0 +1,56 @@
+diff -Naur tmp-old/configure.in tmp-new/configure.in
+--- configure.in	2008-06-08 08:06:38.000000000 +0000
++++ configure.in	2008-06-08 08:15:29.000000000 +0000
+@@ -104,6 +104,8 @@
+ 
+ KRB_PTHREADS
+ 
++PKG_CHECK_MODULES([sqlite], [sqlite3])
++
+ AC_ARG_ENABLE(dce, 
+ 	AS_HELP_STRING([--enable-dce],[if you want support for DCE/DFS PAG's]))
+ if test "$enable_dce" = yes; then
+diff -Naur tmp-old/lib/Makefile.am tmp-new/lib/Makefile.am
+--- lib/Makefile.am	2008-06-07 16:53:11.000000000 +0000
++++ lib/Makefile.am	2008-06-07 16:55:58.000000000 +0000
+@@ -18,6 +18,6 @@
+ dir_hcrypto = hcrypto
+ endif
+ 
+-SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 sqlite \
++SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 \
+ 	$(dir_hcrypto) hx509 krb5 ntlm kafs gssapi hdb kadm5 \
+ 	auth $(dir_45) $(dir_otp) $(dir_dce)
+diff -Naur tmp-old/lib/krb5/Makefile.am tmp-new/lib/krb5/Makefile.am
+--- lib/krb5/Makefile.am	2008-06-07 16:54:02.000000000 +0000
++++ lib/krb5/Makefile.am	2008-06-08 08:17:00.000000000 +0000
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err -I$(srcdir)/../sqlite
++AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err $(sqlite_CFLAGS)
+ 
+ bin_PROGRAMS = verify_krb5_conf
+ 
+@@ -53,7 +53,7 @@
+ 
+ libkrb5_la_LIBADD = \
+ 	$(LIB_pkinit) \
+-	../sqlite/libsqlite.la \
++	$(sqlite_LIBS) \
+ 	$(LIB_com_err) \
+ 	$(LIB_hcrypto) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+diff -Naur tmp-old/lib/krb5/scache.c tmp-new/lib/krb5/scache.c
+--- lib/krb5/scache.c	2008-06-07 16:54:30.000000000 +0000
++++ lib/krb5/scache.c	2008-06-07 17:01:43.000000000 +0000
+@@ -32,7 +32,7 @@
+  */
+ 
+ #include "krb5_locl.h"
+-#include "sqlite3.h"
++#include <sqlite3.h>
+ 
+ RCSID("$Id: heimdal-system_sqlite.patch,v 1.1 2008/06/11 07:27:47 mueli Exp $");
+ 
diff --git a/extra/hunspell/APKBUILD b/extra/hunspell/APKBUILD
new file mode 100644
index 000000000..6883855ae
--- /dev/null
+++ b/extra/hunspell/APKBUILD
@@ -0,0 +1,23 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=hunspell
+pkgver=1.2.8
+pkgrel=0
+pkgdesc="Spell checker and morphological analyzer library and program"
+url="http://hunspell.sourceforge.net/"
+license="GPL LGPL MPL"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="libgcc uclibc++"
+makedepends="uclibc++-dev"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+
+build ()
+{
+	cd "$srcdir/hunspell-$pkgver"
+	export CXX="${CXX_UC:-g++-uc}"
+
+	./configure --prefix=/usr --disable-static || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+	rm -rf "$pkgdir"/usr/share/locale/locale.alias
+}
+md5sums="1177af54a09e320d2c24015f29c3a93e  hunspell-1.2.8.tar.gz"
diff --git a/testing/hypermail/APKBUILD b/extra/hypermail/APKBUILD
index 6e4f41237..6e4f41237 100644
--- a/testing/hypermail/APKBUILD
+++ b/extra/hypermail/APKBUILD
diff --git a/testing/hypermail/mdir2mbox.lua b/extra/hypermail/mdir2mbox.lua
index dd883e02d..dd883e02d 100644
--- a/testing/hypermail/mdir2mbox.lua
+++ b/extra/hypermail/mdir2mbox.lua
diff --git a/extra/iputils/APKBUILD b/extra/iputils/APKBUILD
new file mode 100644
index 000000000..02face483
--- /dev/null
+++ b/extra/iputils/APKBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=iputils
+pkgver=20071127
+pkgrel=1
+pkgdesc="IP Configuration Utilities (and Ping)"
+url="http://www.linuxfoundation.org/en/Net:Iputils"
+license="GPL"
+install=$pkgname.post-install
+depends="uclibc"
+source="http://www.skbuff.net/$pkgname/$pkgname-s$pkgver.tar.bz2
+	$pkgname-20070202-no-open-max.patch
+	$install"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-s$pkgver
+	patch -Np1 -i ../iputils-20070202-no-open-max.patch || return 1
+	make KERNEL_INCLUDE=/usr/include || return 1
+	for i in arping clockdiff rarpd rdisc tftpd tracepath tracepath6; do
+		install -D -m755 $i "$pkgdir"/usr/sbin/$i
+	done
+	for i in ping ping6 traceroute6; do
+		install -D -m4755 $i "$pkgdir"/bin/$i
+	done
+}
+md5sums="12245e9927d60ff5cf4a99d265bcb7d3  iputils-s20071127.tar.bz2
+a2cbc0174dd883f68297aa7f3e7c4f5c  iputils-20070202-no-open-max.patch
+b84506d253e04db3c5af9016fead45a3  iputils.post-install"
diff --git a/extra/iputils/iputils-20070202-no-open-max.patch b/extra/iputils/iputils-20070202-no-open-max.patch
new file mode 100644
index 000000000..5013ba4fd
--- /dev/null
+++ b/extra/iputils/iputils-20070202-no-open-max.patch
@@ -0,0 +1,16 @@
+the OPEN_MAX define has been removed in newer kernel headers so use the
+proper method of getting the value dynamically
+
+http://bugs.gentoo.org/195861
+
+--- a/rdisc.c
++++ b/rdisc.c
+@@ -247,7 +247,7 @@ void do_fork(void)
+ 	if ((pid=fork()) != 0)
+ 		exit(0);
+ 
+-	for (t = 0; t < OPEN_MAX; t++)
++	for (t = 0; t < sysconf(_SC_OPEN_MAX); t++)
+ 		if (t != s)
+ 			close(t);
+ 
diff --git a/extra/iputils/iputils.post-install b/extra/iputils/iputils.post-install
new file mode 100644
index 000000000..99b57c463
--- /dev/null
+++ b/extra/iputils/iputils.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+busybox --install -s
diff --git a/extra/irssi/APKBUILD b/extra/irssi/APKBUILD
index a39655940..bdb3c16c9 100644
--- a/extra/irssi/APKBUILD
+++ b/extra/irssi/APKBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=irssi
-pkgver=0.8.13_rc1
-_pkgver=0.8.13-rc1
+pkgver=0.8.13
+#_pkgver=0.8.13-rc1
 pkgrel=0
 pkgdesc="A modular textUI IRC client with IPv6 support"
 url="http://irssi.org/"
 license='GPL'
 depends="glib ncurses ncurses-terminfo openssl"
-makedepends="glib-dev openssl-dev ncurses-dev perl-dev pkgconfig"
-source="http://irssi.org/files/irssi-${_pkgver}.tar.bz2"
+makedepends="glib-dev openssl-dev ncurses-dev perl-dev pkgconfig g++"
+source="http://irssi.org/files/irssi-${pkgver}.tar.bz2"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-perl"
 
 build() {
-	cd "$srcdir/$pkgname-${_pkgver}"
+	cd "$srcdir/$pkgname-${pkgver}"
 
 	./configure --prefix=/usr \
 	--sysconfdir=/etc \
@@ -31,4 +31,4 @@ perl() {
 	mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/
 }
 
-md5sums="b7543c08d6709b148a1907e2a3fb6f10  irssi-0.8.13-rc1.tar.bz2"
+md5sums="0d6fc2203832b514eff014fffd574664  irssi-0.8.13.tar.bz2"
diff --git a/extra/lftp/APKBUILD b/extra/lftp/APKBUILD
index e1ee1b586..ec6571060 100644
--- a/extra/lftp/APKBUILD
+++ b/extra/lftp/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=lftp
-pkgver=3.7.11
-pkgrel=1
+pkgver=3.7.14
+pkgrel=0
 pkgdesc="LFTP is sophisticated ftp/http client"
 url="http://lftp.yar.ru/"
 license="GPL"
@@ -28,4 +28,4 @@ build() {
 
 }
 
-md5sums="ffe8415ace828bdf2f7b79d8cbbfbbc9  lftp-3.7.11.tar.bz2"
+md5sums="723d372833d6a94c15cc78cc98565517  lftp-3.7.14.tar.bz2"
diff --git a/extra/libpng/APKBUILD b/extra/libpng/APKBUILD
index 41fe56070..b67830693 100644
--- a/extra/libpng/APKBUILD
+++ b/extra/libpng/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=libpng
-pkgver=1.2.35
+pkgver=1.2.36
 pkgrel=0
 pkgdesc="Portable Network Graphics library"
 url="http://www.libpng.org/"
@@ -22,4 +22,4 @@ build() {
 	install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE || return 1
 }
 
-md5sums="8ca6246930a57d5be7adc7c4e7fb5e00  libpng-1.2.35.tar.gz"
+md5sums="4779cd011409ea9b591e11638781f0bf  libpng-1.2.36.tar.gz"
diff --git a/extra/libsndfile/APKBUILD b/extra/libsndfile/APKBUILD
index 758c59bf5..471c45a65 100644
--- a/extra/libsndfile/APKBUILD
+++ b/extra/libsndfile/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libsndfile
-pkgver=1.0.19
+pkgver=1.0.20
 pkgrel=0
 pkgdesc="A C library for reading and writing files containing sampled sound"
 url="http://www.mega-nerd.com/libsndfile"
@@ -19,4 +19,4 @@ build () {
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="8fa24b0c0a8758543427c9741ea06924  libsndfile-1.0.19.tar.gz"
+md5sums="e0553e12c7a467af44693e95e2eac668  libsndfile-1.0.20.tar.gz"
diff --git a/extra/libtheora/APKBUILD b/extra/libtheora/APKBUILD
new file mode 100644
index 000000000..584a5335b
--- /dev/null
+++ b/extra/libtheora/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libtheora
+pkgver=1.0
+pkgrel=0
+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++"
+source="http://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.bz2"
+
+build ()
+{
+	cd "$srcdir"/libtheora-$pkgver
+	./configure --prefix=/usr \
+		--enable-shared \
+		--disable-static || return 1
+
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+	install -m755 -d ""$pkgdir"/usr/share/licenses/$pkgname"
+	install -m644 LICENSE COPYING "$pkgdir"/usr/share/licenses/$pkgname/
+}
+md5sums="c963937053f45a7878954bed37ceb182  libtheora-1.0.tar.bz2"
diff --git a/extra/libusb-compat/APKBUILD b/extra/libusb-compat/APKBUILD
new file mode 100644
index 000000000..23e16cfa5
--- /dev/null
+++ b/extra/libusb-compat/APKBUILD
@@ -0,0 +1,20 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libusb-compat
+pkgver=0.1.0
+pkgrel=0
+pkgdesc="Compatility for older libusb"
+url="http://libusb.sourceforge.net/"
+license="LGPL"
+subpackages="$pkgname-dev"
+depends="uclibc libusb"
+makedepends="libusb-dev"
+source="http://downloads.sourceforge.net/libusb/$pkgname-$pkgver.tar.bz2"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr --disable-build-docs
+	make || return 1
+	make DESTDIR="$pkgdir" install
+}
+md5sums="652e1d9e6c6912fd924a5ad204f6d48b  libusb-compat-0.1.0.tar.bz2"
diff --git a/extra/libusb/APKBUILD b/extra/libusb/APKBUILD
new file mode 100644
index 000000000..7234ad31d
--- /dev/null
+++ b/extra/libusb/APKBUILD
@@ -0,0 +1,20 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libusb
+pkgver=1.0.1
+pkgrel=0
+pkgdesc="Library to enable user space application programs to communicate with USB devices"
+url="http://libusb.sourceforge.net/"
+license="LGPL"
+subpackages="$pkgname-dev"
+depends="uclibc"
+makedepends=""
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr --disable-build-docs
+	make || return 1
+	make DESTDIR="$pkgdir" install
+}
+md5sums="8fb0e066678a0d294894b5b2969cb4b3  libusb-1.0.1.tar.bz2"
diff --git a/extra/libvorbis/APKBUILD b/extra/libvorbis/APKBUILD
new file mode 100644
index 000000000..c4c071343
--- /dev/null
+++ b/extra/libvorbis/APKBUILD
@@ -0,0 +1,23 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libvorbis
+pkgver=1.2.0
+pkgrel=0
+pkgdesc="Vorbis codec library"
+url="http://www.xiph.org/ogg/vorbis/"
+license="custom"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="libogg uclibc"
+makedepends="libogg-dev g++"
+#source="http://people.xiph.org/~giles/2008/$pkgname-$pkgver.tar.gz"
+source="http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--disable-static || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+md5sums="478646358c49f34aedcce58948793619  libvorbis-1.2.0.tar.gz"
diff --git a/extra/neon/APKBUILD b/extra/neon/APKBUILD
index e6af49c71..76d099e47 100644
--- a/extra/neon/APKBUILD
+++ b/extra/neon/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=neon
-pkgver=0.28.3
+pkgver=0.28.4
 pkgrel=1
 pkgdesc="HTTP and WebDAV client library with a C interface"
 url="http://www.webdav.org/neon/"
@@ -15,7 +15,7 @@ build () {
 	./configure --prefix=/usr \
 		--with-ssl \
 		--with-expat \
-		--disable-gssapi \
+		--without-gssapi \
 		--disable-nls \
 		--disable-socks \
 		--enable-shared \
@@ -24,4 +24,4 @@ build () {
 	make || return 1
 	make DESTDIR="$pkgdir" install
 }
-md5sums="47599a328862ce64ac3c52726d6daa12  neon-0.28.3.tar.gz"
+md5sums="6c3b94362af743d046e198e9fcbe4a85  neon-0.28.4.tar.gz"
diff --git a/extra/nfs-utils/APKBUILD b/extra/nfs-utils/APKBUILD
index 112cc58e7..6a51efb1b 100644
--- a/extra/nfs-utils/APKBUILD
+++ b/extra/nfs-utils/APKBUILD
@@ -1,7 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nfs-utils
-pkgver=1.1.5
-pkgrel=1
+pkgver=1.1.6
+pkgrel=0
 pkgdesc="kernel-mode NFS"
 url="http://nfs.sourceforge.net/"
 license="GPL"
@@ -45,7 +46,7 @@ build() {
 	install -m755 -D tools/rpcgen/rpcgen "$pkgdir"/usr/bin/rpcgen
 }
 
-md5sums="2848072a5e53840b9bc520fbb6782b57  nfs-utils-1.1.5.tar.bz2
+md5sums="b0d1b8ec5c8c081a340cfc77bb8670cd  nfs-utils-1.1.6.tar.bz2
 4538f67470c916f8da9c76a17e314906  nfs.initd
 09135438d6df50b868bbe5a2260f973c  nfs.confd
 4f1bb7b2412ce5952ecb5ec22d8ed99d  nfs.exports
diff --git a/extra/perl-uri/APKBUILD b/extra/perl-uri/APKBUILD
new file mode 100644
index 000000000..e95b8411c
--- /dev/null
+++ b/extra/perl-uri/APKBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=perl-uri
+pkgver=1.37
+pkgrel=0
+pkgdesc="Perl Module: form Resource Identifiers (absolute and relative)"
+url="http://search.cpan.org/dist/URI/"
+license="PerlArtistic"
+subpackages="$pkgname-doc"
+depends="perl"
+makedepends=""
+source="http://www.cpan.org/authors/id/G/GA/GAAS/URI-$pkgver.tar.gz"
+
+build ()
+{
+	cd "$srcdir"/URI-$pkgver
+	perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make || return 1
+	make install DESTDIR="$pkgdir" || return 1
+	find "$pkgdir" -name perllocal.pod -delete
+	find "$pkgdir" -name .packlist -delete
+}
+md5sums="b81b3610b78654e11c099f74a5247860  URI-1.37.tar.gz"
diff --git a/extra/postfix/APKBUILD b/extra/postfix/APKBUILD
index 93ad33c94..dc0d0e8c3 100644
--- a/extra/postfix/APKBUILD
+++ b/extra/postfix/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postfix
 pkgver=2.5.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)"
 url="http://www.postfix.org/"
 license="IPL-1"
@@ -41,6 +41,8 @@ build () {
 	local ccargs="-DHAS_DLOPEN -DHAS_SHL_LOAD"
 	local auxlibs="$LDFLAGS -lpthread -lcrypt"
 
+	ccargs="$ccargs -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
+
 	# pcre
 	ccargs="$ccargs -DHAS_PCRE"
 	#auxlibs="$auxlibs -lpcre"
@@ -113,7 +115,7 @@ _mv_dict() {
 	depends="postfix uclibc $@"
 	install="postfix-${m}.post-install"
 	mkdir -p "$subpkgdir"/usr/lib/postfix
-	mv "$pkgdir"/usr/libexec/postfix/dict_${m}.so \
+	mv "$pkgdir"/usr/lib/postfix/dict_${m}.so \
 		"$subpkgdir"/usr/lib/postfix/
 }
 
diff --git a/extra/quagga/APKBUILD b/extra/quagga/APKBUILD
index 130de822b..05d2ac872 100644
--- a/extra/quagga/APKBUILD
+++ b/extra/quagga/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=quagga
 pkgver=0.99.11
-pkgrel=9
+pkgrel=10
 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
 url="http://quagga.net/"
 license="GPL-2"
@@ -18,6 +18,7 @@ source="http://www.quagga.net/download/$pkgname-$pkgver.tar.gz
 	$pkgname-0.99.11-del-routes.patch
 	$pkgname-0.99.11-zombie.patch
 	$pkgname-0.99.11-fd-leak.patch
+	$pkgname-CVE-2009-1572.patch
 	bgpd.initd
 	ospf6d.initd
 	ospfd.initd
@@ -72,6 +73,7 @@ d73000d128eaf20a17ffb15b5ca1805a  quagga-0.99.11-ipv6.patch
 1cbcf60a637b2577dee4d6df711e1247  quagga-0.99.11-del-routes.patch
 ce345725f2e7240cebe0fd5ac2b2fc48  quagga-0.99.11-zombie.patch
 e2391e19b542ec1743776ca9e36ac11a  quagga-0.99.11-fd-leak.patch
+ab0119615ef8379b523fce30e774f93e  quagga-CVE-2009-1572.patch
 cc109a746273bc0d6aee9d758e7524ab  bgpd.initd
 44547b687343ebfed7524cebc5626067  ospf6d.initd
 89b0cf4e70172bfcd195b2869cae28da  ospfd.initd
diff --git a/extra/quagga/quagga-CVE-2009-1572.patch b/extra/quagga/quagga-CVE-2009-1572.patch
new file mode 100644
index 000000000..70d33d94d
--- /dev/null
+++ b/extra/quagga/quagga-CVE-2009-1572.patch
@@ -0,0 +1,461 @@
+* bgpd/bgp_aspath.c: (aspath_make_str_count) "assert (len < str_size)" was
+  getting hit under certain 4-byte ASN conditions.  New realloc strategy.
+* bgpd/bgp_aspath.c: (aspath_key_make) const warning fix.
+
+"%d" -> "%u" 4-byte ASN corrections.  Prevent negative number when ASN is
+above 2^31.:
+
+  bgpd/bgp_attr.c
+  bgpd/bgp_community.c
+  bgpd/bgp_debug.c
+  bgpd/bgp_ecommunity.c
+  bgpd/bgp_mplsvpn.c
+  bgpd/bgp_packet.c
+  bgpd/bgp_route.c
+  bgpd/bgp_vty.c
+  bgpd/bgpd.c
+---
+ bgpd/bgp_aspath.c     |   85 ++++++++++++++++++-------------------------------
+ bgpd/bgp_attr.c       |    2 +-
+ bgpd/bgp_community.c  |    2 +-
+ bgpd/bgp_debug.c      |    2 +-
+ bgpd/bgp_ecommunity.c |    4 +-
+ bgpd/bgp_mplsvpn.c    |    6 ++--
+ bgpd/bgp_packet.c     |    8 ++--
+ bgpd/bgp_route.c      |    8 ++--
+ bgpd/bgp_vty.c        |   20 ++++++------
+ bgpd/bgpd.c           |   10 +++---
+ 10 files changed, 62 insertions(+), 85 deletions(-)
+
+diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
+index 006fc91..a1e4608 100644
+--- a/bgpd/bgp_aspath.c
++++ b/bgpd/bgp_aspath.c
+@@ -393,25 +393,6 @@ aspath_delimiter_char (u_char type, u_char which)
+   return ' ';
+ }
+ 
+-/* countup asns from this segment and index onward */
+-static int
+-assegment_count_asns (struct assegment *seg, int from)
+-{
+-  int count = 0;
+-  while (seg)
+-    {
+-      if (!from)
+-        count += seg->length;
+-      else
+-        {
+-          count += (seg->length - from);
+-          from = 0;
+-        }
+-      seg = seg->next;
+-    }
+-  return count;
+-}
+-
+ unsigned int
+ aspath_count_confeds (struct aspath *aspath)
+ {
+@@ -521,6 +502,21 @@ aspath_count_numas (struct aspath *aspath)
+   return num;
+ }
+ 
++static void
++aspath_make_str_big_enough (int len,
++			    char **str_buf,
++			    int *str_size,
++			    int count_to_be_added)
++{
++#define TERMINATOR 1
++  while (len + count_to_be_added + TERMINATOR > *str_size)
++    {
++      *str_size *= 2;
++      *str_buf = XREALLOC (MTYPE_AS_STR, *str_buf, *str_size);
++    }
++#undef TERMINATOR
++}
++
+ /* Convert aspath structure to string expression. */
+ static char *
+ aspath_make_str_count (struct aspath *as)
+@@ -540,18 +536,7 @@ aspath_make_str_count (struct aspath *as)
+   
+   seg = as->segments;
+   
+-  /* ASN takes 5 chars at least, plus seperator, see below.
+-   * If there is one differing segment type, we need an additional
+-   * 2 chars for segment delimiters, and the final '\0'.
+-   * Hopefully this is large enough to avoid hitting the realloc
+-   * code below for most common sequences.
+-   *
+-   * With 32bit ASNs, this range will increase, but only worth changing
+-   * once there are significant numbers of ASN >= 100000
+-   */
+-#define ASN_STR_LEN (5 + 1)
+-  str_size = MAX (assegment_count_asns (seg, 0) * ASN_STR_LEN + 2 + 1,
+-                  ASPATH_STR_DEFAULT_LEN);
++  str_size = ASPATH_STR_DEFAULT_LEN;
+   str_buf = XMALLOC (MTYPE_AS_STR, str_size);
+ 
+   while (seg)
+@@ -575,32 +560,24 @@ aspath_make_str_count (struct aspath *as)
+             return NULL;
+         }
+       
+-      /* We might need to increase str_buf, particularly if path has
+-       * differing segments types, our initial guesstimate above will
+-       * have been wrong.  need 5 chars for ASN, a seperator each and
+-       * potentially two segment delimiters, plus a space between each
+-       * segment and trailing zero.
+-       *
+-       * This may need to revised if/when significant numbers of
+-       * ASNs >= 100000 are assigned and in-use on the internet...
+-       */
+-#define SEGMENT_STR_LEN(X) (((X)->length * ASN_STR_LEN) + 2 + 1 + 1)
+-      if ( (len + SEGMENT_STR_LEN(seg)) > str_size)
+-        {
+-          str_size = len + SEGMENT_STR_LEN(seg);
+-          str_buf = XREALLOC (MTYPE_AS_STR, str_buf, str_size);
+-        }
+-#undef ASN_STR_LEN
+-#undef SEGMENT_STR_LEN
+-      
+       if (seg->type != AS_SEQUENCE)
+-        len += snprintf (str_buf + len, str_size - len, 
+-			 "%c", 
+-                         aspath_delimiter_char (seg->type, AS_SEG_START));
++	{
++	  aspath_make_str_big_enough (len, &str_buf, &str_size, 1); /* %c */
++	  len += snprintf (str_buf + len, str_size - len, 
++			   "%c", 
++			   aspath_delimiter_char (seg->type, AS_SEG_START));
++	}
+       
+       /* write out the ASNs, with their seperators, bar the last one*/
+       for (i = 0; i < seg->length; i++)
+         {
++#define APPROX_DIG_CNT(x) (x < 100000U ? 5 : 10)
++	  /* %u + %c + %c + " " (last two are below loop) */
++	  aspath_make_str_big_enough (len,
++				      &str_buf,
++				      &str_size,
++				      APPROX_DIG_CNT(seg->as[i]) + 1 + 1 + 1);
++
+           len += snprintf (str_buf + len, str_size - len, "%u", seg->as[i]);
+           
+           if (i < (seg->length - 1))
+@@ -1771,8 +1748,8 @@ aspath_key_make (void *p)
+ static int
+ aspath_cmp (const void *arg1, const void *arg2)
+ {
+-  const struct assegment *seg1 = ((struct aspath *)arg1)->segments;
+-  const struct assegment *seg2 = ((struct aspath *)arg2)->segments;
++  const struct assegment *seg1 = ((const struct aspath *)arg1)->segments;
++  const struct assegment *seg2 = ((const struct aspath *)arg2)->segments;
+   
+   while (seg1 || seg2)
+     {
+diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
+index d116c30..f38db41 100644
+--- a/bgpd/bgp_attr.c
++++ b/bgpd/bgp_attr.c
+@@ -857,7 +857,7 @@ static int bgp_attr_aspath_check( struct peer *peer,
+ 	  && ! aspath_firstas_check (attr->aspath, peer->as))
+  	{
+  	  zlog (peer->log, LOG_ERR,
+- 		"%s incorrect first AS (must be %d)", peer->host, peer->as);
++ 		"%s incorrect first AS (must be %u)", peer->host, peer->as);
+  	  bgp_notify_send (peer,
+  			   BGP_NOTIFY_UPDATE_ERR,
+  			   BGP_NOTIFY_UPDATE_MAL_AS_PATH);
+diff --git a/bgpd/bgp_community.c b/bgpd/bgp_community.c
+index 1cafdb3..a05ea6c 100644
+--- a/bgpd/bgp_community.c
++++ b/bgpd/bgp_community.c
+@@ -282,7 +282,7 @@ community_com2str  (struct community *com)
+ 	default:
+ 	  as = (comval >> 16) & 0xFFFF;
+ 	  val = comval & 0xFFFF;
+-	  sprintf (pnt, "%d:%d", as, val);
++	  sprintf (pnt, "%u:%d", as, val);
+ 	  pnt += strlen (pnt);
+ 	  break;
+ 	}
+diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
+index 757b9cf..1d5bf6b 100644
+--- a/bgpd/bgp_debug.c
++++ b/bgpd/bgp_debug.c
+@@ -205,7 +205,7 @@ bgp_dump_attr (struct peer *peer, struct attr *attr, char *buf, size_t size)
+     snprintf (buf + strlen (buf), size - strlen (buf), ", atomic-aggregate");
+ 
+   if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_AGGREGATOR)))
+-    snprintf (buf + strlen (buf), size - strlen (buf), ", aggregated by %d %s",
++    snprintf (buf + strlen (buf), size - strlen (buf), ", aggregated by %u %s",
+ 	      attr->extra->aggregator_as,
+ 	      inet_ntoa (attr->extra->aggregator_addr));
+ 
+diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
+index c08673c..27c3cd6 100644
+--- a/bgpd/bgp_ecommunity.c
++++ b/bgpd/bgp_ecommunity.c
+@@ -673,7 +673,7 @@ ecommunity_ecom2str (struct ecommunity *ecom, int format)
+ 	  eas.val = (*pnt++ << 8);
+ 	  eas.val |= (*pnt++);
+ 
+-	  len = sprintf( str_buf + str_pnt, "%s%d:%d", prefix,
++	  len = sprintf( str_buf + str_pnt, "%s%u:%d", prefix,
+                         eas.as, eas.val );
+ 	  str_pnt += len;
+ 	  first = 0;
+@@ -688,7 +688,7 @@ ecommunity_ecom2str (struct ecommunity *ecom, int format)
+ 	  eas.val |= (*pnt++ << 8);
+ 	  eas.val |= (*pnt++);
+ 
+-	  len = sprintf (str_buf + str_pnt, "%s%d:%d", prefix,
++	  len = sprintf (str_buf + str_pnt, "%s%u:%d", prefix,
+ 			 eas.as, eas.val);
+ 	  str_pnt += len;
+ 	  first = 0;
+diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
+index ac90f3c..72ad089 100644
+--- a/bgpd/bgp_mplsvpn.c
++++ b/bgpd/bgp_mplsvpn.c
+@@ -265,7 +265,7 @@ prefix_rd2str (struct prefix_rd *prd, char *buf, size_t size)
+   if (type == RD_TYPE_AS)
+     {
+       decode_rd_as (pnt + 2, &rd_as);
+-      snprintf (buf, size, "%d:%d", rd_as.as, rd_as.val);
++      snprintf (buf, size, "%u:%d", rd_as.as, rd_as.val);
+       return buf;
+     }
+   else if (type == RD_TYPE_IP)
+@@ -371,7 +371,7 @@ show_adj_route_vpn (struct vty *vty, struct peer *peer, struct prefix_rd *prd)
+                     vty_out (vty, "Route Distinguisher: ");
+ 
+                     if (type == RD_TYPE_AS)
+-                      vty_out (vty, "%d:%d", rd_as.as, rd_as.val);
++                      vty_out (vty, "%u:%d", rd_as.as, rd_as.val);
+                     else if (type == RD_TYPE_IP)
+                       vty_out (vty, "%s:%d", inet_ntoa (rd_ip.ip), rd_ip.val);
+ 
+@@ -478,7 +478,7 @@ bgp_show_mpls_vpn (struct vty *vty, struct prefix_rd *prd, enum bgp_show_type ty
+ 		    vty_out (vty, "Route Distinguisher: ");
+ 
+ 		    if (type == RD_TYPE_AS)
+-		      vty_out (vty, "%d:%d", rd_as.as, rd_as.val);
++		      vty_out (vty, "%u:%d", rd_as.as, rd_as.val);
+ 		    else if (type == RD_TYPE_IP)
+ 		      vty_out (vty, "%s:%d", inet_ntoa (rd_ip.ip), rd_ip.val);
+ 		  
+diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
+index 1422bad..de02bb8 100644
+--- a/bgpd/bgp_packet.c
++++ b/bgpd/bgp_packet.c
+@@ -813,7 +813,7 @@ bgp_open_send (struct peer *peer)
+   length = bgp_packet_set_size (s);
+ 
+   if (BGP_DEBUG (normal, NORMAL))
+-    zlog_debug ("%s sending OPEN, version %d, my as %d, holdtime %d, id %s", 
++    zlog_debug ("%s sending OPEN, version %d, my as %u, holdtime %d, id %s", 
+ 	       peer->host, BGP_VERSION_4, local_as,
+ 	       send_holdtime, inet_ntoa (peer->local_id));
+ 
+@@ -1184,7 +1184,7 @@ bgp_open_receive (struct peer *peer, bgp_size_t size)
+ 
+   /* Receive OPEN message log  */
+   if (BGP_DEBUG (normal, NORMAL))
+-    zlog_debug ("%s rcv OPEN, version %d, remote-as (in open) %d,"
++    zlog_debug ("%s rcv OPEN, version %d, remote-as (in open) %u,"
+                 " holdtime %d, id %s",
+ 	        peer->host, version, remote_as, holdtime,
+ 	        inet_ntoa (remote_id));
+@@ -1277,7 +1277,7 @@ bgp_open_receive (struct peer *peer, bgp_size_t size)
+ 	  else
+ 	    {
+ 	      if (BGP_DEBUG (normal, NORMAL))
+-		zlog_debug ("%s bad OPEN, remote AS is %d, expected %d",
++		zlog_debug ("%s bad OPEN, remote AS is %u, expected %u",
+ 			    peer->host, remote_as, peer->as);
+ 	      bgp_notify_send_with_data (peer, BGP_NOTIFY_OPEN_ERR,
+ 					 BGP_NOTIFY_OPEN_BAD_PEER_AS,
+@@ -1431,7 +1431,7 @@ bgp_open_receive (struct peer *peer, bgp_size_t size)
+   if (remote_as != peer->as)
+     {
+       if (BGP_DEBUG (normal, NORMAL))
+-	zlog_debug ("%s bad OPEN, remote AS is %d, expected %d",
++	zlog_debug ("%s bad OPEN, remote AS is %u, expected %u",
+ 		   peer->host, remote_as, peer->as);
+       bgp_notify_send_with_data (peer, 
+ 				 BGP_NOTIFY_OPEN_ERR, 
+diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
+index 50407e4..6b7828c 100644
+--- a/bgpd/bgp_route.c
++++ b/bgpd/bgp_route.c
+@@ -834,7 +834,7 @@ bgp_announce_check (struct bgp_info *ri, struct peer *peer, struct prefix *p,
+     {
+       if (BGP_DEBUG (filter, FILTER))  
+         zlog (peer->log, LOG_DEBUG, 
+-	      "%s [Update:SEND] suppress announcement to peer AS %d is AS path.",
++	      "%s [Update:SEND] suppress announcement to peer AS %u is AS path.",
+ 	      peer->host, peer->as);
+       return 0;
+     }
+@@ -847,7 +847,7 @@ bgp_announce_check (struct bgp_info *ri, struct peer *peer, struct prefix *p,
+ 	{
+ 	  if (BGP_DEBUG (filter, FILTER))  
+ 	    zlog (peer->log, LOG_DEBUG, 
+-		  "%s [Update:SEND] suppress announcement to peer AS %d is AS path.",
++		  "%s [Update:SEND] suppress announcement to peer AS %u is AS path.",
+ 		  peer->host,
+ 		  bgp->confed_id);
+ 	  return 0;
+@@ -1163,7 +1163,7 @@ bgp_announce_check_rsclient (struct bgp_info *ri, struct peer *rsclient,
+     {
+       if (BGP_DEBUG (filter, FILTER))
+         zlog (rsclient->log, LOG_DEBUG,
+-             "%s [Update:SEND] suppress announcement to peer AS %d is AS path.",
++             "%s [Update:SEND] suppress announcement to peer AS %u is AS path.",
+              rsclient->host, rsclient->as);
+       return 0;
+     }
+@@ -5956,7 +5956,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
+       if (CHECK_FLAG (binfo->flags, BGP_INFO_STALE))
+ 	vty_out (vty, ", (stale)");
+       if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_AGGREGATOR)))
+-	vty_out (vty, ", (aggregated by %d %s)", 
++	vty_out (vty, ", (aggregated by %u %s)", 
+ 	         attr->extra->aggregator_as,
+ 		 inet_ntoa (attr->extra->aggregator_addr));
+       if (CHECK_FLAG (binfo->peer->af_flags[afi][safi], PEER_FLAG_REFLECTOR_CLIENT))
+diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
+index bd94c66..96719a1 100644
+--- a/bgpd/bgp_vty.c
++++ b/bgpd/bgp_vty.c
+@@ -360,11 +360,11 @@ DEFUN (router_bgp,
+ 	       VTY_NEWLINE);
+       return CMD_WARNING;
+     case BGP_ERR_AS_MISMATCH:
+-      vty_out (vty, "BGP is already running; AS is %d%s", as, VTY_NEWLINE);
++      vty_out (vty, "BGP is already running; AS is %u%s", as, VTY_NEWLINE);
+       return CMD_WARNING;
+     case BGP_ERR_INSTANCE_MISMATCH:
+       vty_out (vty, "BGP view name and AS number mismatch%s", VTY_NEWLINE);
+-      vty_out (vty, "BGP instance is already running; AS is %d%s",
++      vty_out (vty, "BGP instance is already running; AS is %u%s",
+ 	       as, VTY_NEWLINE);
+       return CMD_WARNING;
+     }
+@@ -1306,10 +1306,10 @@ peer_remote_as_vty (struct vty *vty, const char *peer_str,
+   switch (ret)
+     {
+     case BGP_ERR_PEER_GROUP_MEMBER:
+-      vty_out (vty, "%% Peer-group AS %d. Cannot configure remote-as for member%s", as, VTY_NEWLINE);
++      vty_out (vty, "%% Peer-group AS %u. Cannot configure remote-as for member%s", as, VTY_NEWLINE);
+       return CMD_WARNING;
+     case BGP_ERR_PEER_GROUP_PEER_TYPE_DIFFERENT:
+-      vty_out (vty, "%% The AS# can not be changed from %d to %s, peer-group members must be all internal or all external%s", as, as_str, VTY_NEWLINE);
++      vty_out (vty, "%% The AS# can not be changed from %u to %s, peer-group members must be all internal or all external%s", as, as_str, VTY_NEWLINE);
+       return CMD_WARNING;
+     }
+   return bgp_vty_return (vty, ret);
+@@ -1647,7 +1647,7 @@ DEFUN (neighbor_set_peer_group,
+ 
+   if (ret == BGP_ERR_PEER_GROUP_PEER_TYPE_DIFFERENT)
+     {
+-      vty_out (vty, "%% Peer with AS %d cannot be in this peer-group, members must be all internal or all external%s", as, VTY_NEWLINE);
++      vty_out (vty, "%% Peer with AS %u cannot be in this peer-group, members must be all internal or all external%s", as, VTY_NEWLINE);
+       return CMD_WARNING;
+     }
+ 
+@@ -6912,7 +6912,7 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi)
+               
+               /* Usage summary and header */
+               vty_out (vty,
+-                       "BGP router identifier %s, local AS number %d%s",
++                       "BGP router identifier %s, local AS number %u%s",
+                        inet_ntoa (bgp->router_id), bgp->as, VTY_NEWLINE);
+ 
+               ents = bgp_table_count (bgp->rib[afi][safi]);
+@@ -6959,7 +6959,7 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi)
+ 
+ 	  vty_out (vty, "4 ");
+ 
+-	  vty_out (vty, "%5d %7d %7d %8d %4d %4lu ",
++	  vty_out (vty, "%5u %7d %7d %8d %4d %4lu ",
+ 		   peer->as,
+ 		   peer->open_in + peer->update_in + peer->keepalive_in
+ 		   + peer->notify_in + peer->refresh_in + peer->dynamic_cap_in,
+@@ -7469,8 +7469,8 @@ bgp_show_peer (struct vty *vty, struct peer *p)
+ 
+   /* Configured IP address. */
+   vty_out (vty, "BGP neighbor is %s, ", p->host);
+-  vty_out (vty, "remote AS %d, ", p->as);
+-  vty_out (vty, "local AS %d%s, ",
++  vty_out (vty, "remote AS %u, ", p->as);
++  vty_out (vty, "local AS %u%s, ",
+ 	   p->change_local_as ? p->change_local_as : p->local_as,
+ 	   CHECK_FLAG (p->flags, PEER_FLAG_LOCAL_AS_NO_PREPEND) ?
+ 	   " no-prepend" : "");
+@@ -8252,7 +8252,7 @@ bgp_show_rsclient_summary (struct vty *vty, struct bgp *bgp,
+                       "Route Server's BGP router identifier %s%s",
+                       inet_ntoa (bgp->router_id), VTY_NEWLINE);
+              vty_out (vty,
+-              "Route Server's local AS number %d%s", bgp->as,
++              "Route Server's local AS number %u%s", bgp->as,
+                        VTY_NEWLINE);
+ 
+              vty_out (vty, "%s", VTY_NEWLINE);
+diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
+index 8eb0d2e..cebde0a 100644
+--- a/bgpd/bgpd.c
++++ b/bgpd/bgpd.c
+@@ -4512,13 +4512,13 @@ bgp_config_write_peer (struct vty *vty, struct bgp *bgp,
+ 	    vty_out (vty, " neighbor %s peer-group%s", addr,
+ 		     VTY_NEWLINE);
+ 	  if (peer->as)
+-	    vty_out (vty, " neighbor %s remote-as %d%s", addr, peer->as,
++	    vty_out (vty, " neighbor %s remote-as %u%s", addr, peer->as,
+ 		     VTY_NEWLINE);
+ 	}
+       else
+ 	{
+ 	  if (! g_peer->as)
+-	    vty_out (vty, " neighbor %s remote-as %d%s", addr, peer->as,
++	    vty_out (vty, " neighbor %s remote-as %u%s", addr, peer->as,
+ 		     VTY_NEWLINE);
+ 	  if (peer->af_group[AFI_IP][SAFI_UNICAST])
+ 	    vty_out (vty, " neighbor %s peer-group %s%s", addr,
+@@ -4528,7 +4528,7 @@ bgp_config_write_peer (struct vty *vty, struct bgp *bgp,
+       /* local-as. */
+       if (peer->change_local_as)
+ 	if (! peer_group_active (peer))
+-	  vty_out (vty, " neighbor %s local-as %d%s%s", addr,
++	  vty_out (vty, " neighbor %s local-as %u%s%s", addr,
+ 		   peer->change_local_as,
+ 		   CHECK_FLAG (peer->flags, PEER_FLAG_LOCAL_AS_NO_PREPEND) ?
+ 		   " no-prepend" : "", VTY_NEWLINE);
+@@ -4917,7 +4917,7 @@ bgp_config_write (struct vty *vty)
+ 	vty_out (vty, "!%s", VTY_NEWLINE);
+ 
+       /* Router bgp ASN */
+-      vty_out (vty, "router bgp %d", bgp->as);
++      vty_out (vty, "router bgp %u", bgp->as);
+ 
+       if (bgp_option_check (BGP_OPT_MULTIPLE_INSTANCE))
+ 	{
+@@ -4978,7 +4978,7 @@ bgp_config_write (struct vty *vty)
+ 	  vty_out (vty, " bgp confederation peers");
+ 
+          for (i = 0; i < bgp->confed_peers_cnt; i++)
+-           vty_out(vty, " %d", bgp->confed_peers[i]);
++           vty_out(vty, " %u", bgp->confed_peers[i]);
+ 
+           vty_out (vty, "%s", VTY_NEWLINE);
+ 	}
+-- 
+1.6.0.6
+_______________________________________________
+Quagga-dev mailing list
+Quagga-dev@lists.quagga.net
+http://lists.quagga.net/mailman/listinfo/quagga-dev
+\ No newline at end of file
diff --git a/extra/roundcubemail/APKBUILD b/extra/roundcubemail/APKBUILD
index 1d08879e9..f56de7b77 100644
--- a/extra/roundcubemail/APKBUILD
+++ b/extra/roundcubemail/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=roundcubemail
-pkgver=0.2.1
+pkgver=0.2.2
 pkgrel=0
 pkgdesc="A PHP web-based mail client"
 url="http://www.roundcube.net"
@@ -16,4 +16,4 @@ build ()
 	cd "${_instdir}"
 	cp -ra "$srcdir"/roundcubemail-$pkgver/* .
 }
-md5sums="d49bfea590cdca3d6b221903217e0c55  roundcubemail-0.2.1.tar.gz"
+md5sums="992bd125a5f3c91e81f1eebbdef63575  roundcubemail-0.2.2.tar.gz"
diff --git a/extra/rsync/APKBUILD b/extra/rsync/APKBUILD
index 294f6cdf3..4b0e8f120 100644
--- a/extra/rsync/APKBUILD
+++ b/extra/rsync/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rsync
-pkgver=3.0.5
+pkgver=3.0.6
 pkgrel=0
 pkgdesc="A file transfer program to keep remote files in sync"
 url="http://samba.anu.edu.au/rsync/"
@@ -29,7 +29,7 @@ build() {
 	install -D -m 644 ../rsyncd.logrotate ${pkgdir}/etc/logrotate.d/rsyncd
 }
 
-md5sums="a130e736c011572cb423b6245e97fc4b  rsync-3.0.5.tar.gz
+md5sums="e9865d093a18e4668b9d31b635dc8e99  rsync-3.0.6.tar.gz
 492d13dbba49a9e7c77c89d01b4f617a  rsyncd.initd
 e5e62e8cef29e09c22e8ba8152ec1751  rsyncd.confd
 a99211a14af1766ba849035241cd5bb2  rsyncd.conf
diff --git a/extra/samba/APKBUILD b/extra/samba/APKBUILD
index 2de6053f3..f69b0de08 100644
--- a/extra/samba/APKBUILD
+++ b/extra/samba/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
 pkgver=3.2.11
-pkgrel=0
+pkgrel=1
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 license="GPL3"
 subpackages="$pkgname-dev $pkgname-doc winbind $pkgname-common 
 	$pkgname-initscript tdb"
-depends="db popt ncurses uclibc samba-initscript samba-common tdb"
-makedepends="db-dev popt-dev ncurses-dev"
+depends="db popt ncurses uclibc samba-initscript samba-common tdb libldap heimdal"
+makedepends="db-dev popt-dev ncurses-dev openldap-dev heimdal-dev"
 source="http://us1.$pkgname.org/$pkgname/ftp/stable/$pkgname-$pkgver.tar.gz
 	samba.initd
 	samba.confd
@@ -26,7 +26,7 @@ build() {
 		--with-logfilebase=/var/log/samba \
 		--with-libdir=/usr/lib/samba \
 		--without-pam \
-		--without-ads \
+		--with-ads \
 		--with-libsmbclient \
 		--disable-nss-wrapper \
 		--disable-dnssd \
@@ -62,7 +62,7 @@ _mv_files() {
 
 winbind() {
 	pkgdesc="Samba user and group resolver"
-	depends="uclibc samba-common popt samba-initscript"
+	depends="uclibc samba-common popt samba-initscript libldap heimdal"
 	cd "$pkgdir"
 	_mv_files \
 		usr/bin/wbinfo \
@@ -74,7 +74,7 @@ winbind() {
 
 common() {
 	pkgdesc="Samba common files for both client an servers"
-	depends="uclibc popt tdb"
+	depends="uclibc popt tdb libldap heimdal"
 	cd "$pkgdir"
 	_mv_files \
 		usr/bin/net \
diff --git a/extra/subversion/APKBUILD b/extra/subversion/APKBUILD
index 454b4da9e..5d0c213aa 100644
--- a/extra/subversion/APKBUILD
+++ b/extra/subversion/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=subversion
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=0
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 url="http://subversion.tigris.org/"
@@ -32,7 +32,7 @@ build() {
 	install -Dm755 "$srcdir"/svnserve.initd "$pkgdir"/etc/init.d/svnserve
 	install -Dm644 "$srcdir"/svnserve.confd "$pkgdir"/etc/conf.d/svnserve
 }
-md5sums="32014fe70397357fa1e0ef8f937a0232  subversion-1.6.1.tar.gz
+md5sums="93f128306b11e1a1c64ff51338777952  subversion-1.6.2.tar.gz
 d084a7558053784886bc858b94fa9186  svnserve.confd
 06cf9328f63a935654971052a2c3594a  svnserve.initd
 bfd0d890c07830f1a6010891dd25fa5c  subversion.pre-install"
diff --git a/extra/tcl/APKBUILD b/extra/tcl/APKBUILD
index 12205b0fa..32a9eff63 100644
--- a/extra/tcl/APKBUILD
+++ b/extra/tcl/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=tcl
-pkgver=8.5.6
+pkgver=8.5.7
 pkgrel=0
 pkgdesc="The Tcl scripting language"
 url="http://tcl.sourceforge.net/"
@@ -30,4 +30,4 @@ build ()
         -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib'," \
         ${pkgdir}/usr/lib/tclConfig.sh
 }
-md5sums="d0b0b3ff7600ff63135c710b575265cd  tcl8.5.6-src.tar.gz"
+md5sums="f70ad8f78b5e4a9f792fe101f22b125f  tcl8.5.7-src.tar.gz"
diff --git a/extra/transmission/APKBUILD b/extra/transmission/APKBUILD
index b3886e3d3..0942c1b2a 100644
--- a/extra/transmission/APKBUILD
+++ b/extra/transmission/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer:Carlo Landmeter
 pkgname=transmission
-pkgver=1.51
+pkgver=1.61
 pkgel=0
 pkgdesc="Fast, easy, and fee BitToent client (CLI tools daemon and webinterface)"
 url="http://www.tansmissionbt.com"
 install="$pkgname.pre-install"
 license="MIT"
 depends="curl"
-makedepends="openssl-dev pkgconfig curl-dev"
+makedepends="openssl-dev pkgconfig curl-dev g++"
 source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
 	transmission-daemon.initd
 	transmission-daemon.confd
@@ -26,7 +26,7 @@ build() {
         install -D -m755 "$srcdir"/transmission-daemon.initd "$pkgdir"/etc/init.d/transmission-daemon
         install -D -m644 "$srcdir"/transmission-daemon.confd "$pkgdir"/etc/conf.d/transmission-daemon
 }
-md5sums="b93439fbd0040ad6eb448f70a48355f5  transmission-1.51.tar.bz2
+md5sums="0b0428f4a6237a64dc8b7d378ace3f06  transmission-1.61.tar.bz2
 b3b921242bdc3b33a8ac05fc30653b6c  transmission-daemon.initd
 89478a70fcd93463e1dd8d751da994da  transmission-daemon.confd
 f1c8d94e1f7ff77c23a7e92d3860754d  transmission.pre-install"
diff --git a/extra/udev/APKBUILD b/extra/udev/APKBUILD
new file mode 100644
index 000000000..d25b5faa4
--- /dev/null
+++ b/extra/udev/APKBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=udev
+pkgver=142
+pkgrel=0
+pkgdesc="The userspace dev tools (udev)"
+url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+license="GPL"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="uclibc"
+makedepends=""
+install=
+source="http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
+	write_root_link_rule
+	move_tmp_persistent_rules.sh
+	udev-mount.initd
+	udev-postmount.initd
+	udev.initd"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--exec-prefix="" \
+		--with-libdir-name=/lib
+	make || return 1
+	make DESTDIR="$pkgdir" install
+	chmod +x "$pkgdir"/lib/udev/write_*_rules
+	for _i in write_root_link_rule move_tmp_persistent_rules.sh; do
+		install -Dm755 ../$_i "$pkgdir"/lib/udev/$_i
+	done
+	for _i in udev udev-mount udev-postmount; do
+		install -Dm755 ../$_i.initd "$pkgdir"/etc/init.d/$_i
+	done
+}
+md5sums="3edc4cf383dccb06d866c5156d59ddd5  udev-142.tar.bz2
+c9de7581099cdfdcd105666cd98a0f0a  write_root_link_rule
+7bf11e11519117f743483c73e0767750  move_tmp_persistent_rules.sh
+12760065a66ccbddc9e3a86a6cd2231c  udev-mount.initd
+bffb42859ca508cfe1d9fa0a169ba810  udev-postmount.initd
+e913f8f122e8879252d2a05de7dd7499  udev.initd"
diff --git a/extra/udev/move_tmp_persistent_rules.sh b/extra/udev/move_tmp_persistent_rules.sh
new file mode 100755
index 000000000..1a0259798
--- /dev/null
+++ b/extra/udev/move_tmp_persistent_rules.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+. /etc/init.d/functions.sh
+
+# store persistent-rules that got created while booting
+# when / was still read-only
+store_persistent_rules() {
+	local file dest
+
+	for file in /dev/.udev/tmp-rules--*; do
+		dest=${file##*tmp-rules--}
+		[ "$dest" = '*' ] && break
+		type=${dest##70-persistent-}
+		type=${type%%.rules}
+		ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d"
+		cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file"
+		eend $? "Failed moving persistent rules!"
+	done
+}
+
+store_persistent_rules
+
+# vim:ts=4
diff --git a/extra/udev/udev-mount.initd b/extra/udev/udev-mount.initd
new file mode 100755
index 000000000..839565a5b
--- /dev/null
+++ b/extra/udev/udev-mount.initd
@@ -0,0 +1,83 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Mount tmpfs on /dev"
+[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev
+
+mount_dev_directory()
+{
+	# No options are processed here as they should all be in /etc/fstab
+	ebegin "Mounting /dev"
+	if fstabinfo --quiet /dev; then
+		mount -n /dev
+	else
+		# Some devices require exec, Bug #92921
+		mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev
+	fi
+	eend $?
+}
+
+seed_dev()
+{
+	# Seed /dev with some things that we know we need
+
+	# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
+	# to $CONSOLE with/without bootsplash before udevd creates it
+	[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
+	[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
+	[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
+
+	# udevd will dup its stdin/stdout/stderr to /dev/null
+	# and we do not want a file which gets buffered in ram
+	[ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
+
+	# so udev can add its start-message to dmesg
+	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
+
+	# copy over any persistant things
+	if [ -d /lib/udev/devices ]; then
+		cp -RPp /lib/udev/devices/* /dev 2>/dev/null
+	fi
+
+	# Not provided by sysfs but needed
+	ln -snf /proc/self/fd /dev/fd
+	ln -snf fd/0 /dev/stdin
+	ln -snf fd/1 /dev/stdout
+	ln -snf fd/2 /dev/stderr
+	[ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
+
+	# Create problematic directories
+	mkdir -p /dev/pts /dev/shm
+	return 0
+}
+
+
+start()
+{
+	# do not run this on too old baselayout - udev-addon is already loaded!
+	if [ ! -f /etc/init.d/sysfs ]; then
+		eerror "The $SVCNAME init-script is written for baselayout-2!"
+		eerror "Please do not use it with baselayout-1!".
+		return 1
+	fi
+
+	_start
+}
+
+_start()
+{
+	mount_dev_directory || return 1
+
+	# Selinux lovin; /selinux should be mounted by selinux-patched init
+	if [ -x /sbin/restorecon -a -c /selinux/null ]; then
+		restorecon /dev > /selinux/null
+	fi
+
+	# make sure it exists
+	mkdir -p /dev/.udev
+	
+	seed_dev
+
+	return 0
+}
diff --git a/extra/udev/udev-postmount.initd b/extra/udev/udev-postmount.initd
new file mode 100755
index 000000000..96beb845b
--- /dev/null
+++ b/extra/udev/udev-postmount.initd
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/136/udev-postmount.initd,v 1.3 2009/02/23 16:30:53 zzam Exp $
+
+depend() {
+	need localmount
+}
+
+dir_writeable()
+{
+        mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
+}
+
+start() {
+	# check if this system uses udev
+	[ -d /dev/.udev/ ] || return 0
+
+	# only continue if rules-directory is writable
+	dir_writeable /etc/udev/rules.d || return 0
+
+	# store persistent-rules that got created while booting
+	# when / was still read-only
+	/lib/udev/move_tmp_persistent_rules.sh
+}
+
+stop() {
+	:
+}
+
+# vim:ts=4
diff --git a/extra/udev/udev-start.sh b/extra/udev/udev-start.sh
new file mode 100644
index 000000000..87c3a6ac9
--- /dev/null
+++ b/extra/udev/udev-start.sh
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev
+
+compat_volume_nodes()
+{
+	# Only do this for baselayout-1*
+	# This check is likely to get false positives due to some multilib stuff,
+	# but that should not matter, as this can only happen on old openrc versions
+	# no longer available as ebuilds.
+	if [ ! -e /lib/librc.so ]; then
+
+		# Create nodes that udev can't
+		[ -x /sbin/lvm ] && \
+			/sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null
+		# Running evms_activate on a LiveCD causes lots of headaches
+		[ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \
+			/sbin/evms_activate -q &>/dev/null
+	fi
+}
+
+start_initd()
+{
+	(
+		. /etc/init.d/"$1"
+		_start
+	)
+}
+
+# mount tmpfs on /dev
+start_initd udev-mount || exit 1
+
+# Create a file so that our rc system knows it's still in sysinit.
+# Existance means init scripts will not directly run.
+# rc will remove the file when done with sysinit.
+# this is no longer needed as of openrc-0.4.0
+touch /dev/.rcsysinit
+
+# load device tarball
+start_initd udev-dev-tarball
+
+# run udevd
+start_initd udev || exit 1
+
+compat_volume_nodes
+
+# inject into boot runlevel
+IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1
+
+# udev started successfully
diff --git a/extra/udev/udev.initd b/extra/udev/udev.initd
new file mode 100755
index 000000000..26774ab4a
--- /dev/null
+++ b/extra/udev/udev.initd
@@ -0,0 +1,239 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Run udevd and create the device-nodes"
+
+[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf
+
+rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}}
+
+depend()
+{
+	provide dev
+	if yesno "${rc_device_tarball:-no}"; then
+		need sysfs udev-mount udev-dev-tarball
+	else
+		need sysfs udev-mount
+	fi
+	before checkfs fsck
+
+	# udev does not work inside vservers
+	keyword novserver
+}
+
+cleanup()
+{
+	# fail more gracely and not leave udevd running
+	start-stop-daemon --stop --exec /sbin/udevd
+	exit 1
+}
+
+disable_hotplug_agent()
+{
+	if [ -e /proc/sys/kernel/hotplug ]; then
+		echo "" >/proc/sys/kernel/hotplug
+	fi
+}
+
+root_link()
+{
+	/lib/udev/write_root_link_rule
+}
+
+rules_disable_switch()
+{
+	# this function disables rules files
+	# by creating new files with the same name
+	# in a temp rules directory with higher priority
+	local d=/dev/.udev/rules.d bname="$1" onoff="$2"
+
+	if yesno "${onoff}"; then
+		mkdir -p "$d"
+		echo "# This file disables ${bname} due to /etc/conf.d/udev" \
+			> "${d}/${bname}"
+	else
+		rm -f "${d}/${bname}"
+	fi
+}
+
+start_udevd()
+{
+	# load unix domain sockets if built as module, Bug #221253
+	if [ -e /proc/modules ] ; then
+		modprobe -q unix 2>/dev/null
+	fi
+	ebegin "Starting udevd"
+	start-stop-daemon --start --exec /sbin/udevd -- --daemon
+	eend $?
+}
+
+# populate /dev with devices already found by the kernel
+populate_dev()
+{
+	if get_bootparam "nocoldplug" ; then
+		rc_coldplug="NO"
+		ewarn "Skipping udev coldplug as requested in kernel cmdline"
+	fi
+
+	ebegin "Populating /dev with existing devices through uevents"
+	if yesno "${rc_coldplug}"; then
+		udevadm trigger
+	else
+		# Do not run any init-scripts, Bug #206518
+		udevadm control --env do_not_run_plug_service=1
+
+		# only create device nodes
+		udevadm trigger --attr-match=dev
+
+		# run persistent-net stuff, bug 191466
+		udevadm trigger --subsystem-match=net
+	fi
+	eend $?
+
+	ebegin "Waiting for uevents to be processed"
+	udevadm settle --timeout=${udev_settle_timeout:-60}
+	eend $?
+
+	udevadm control --env do_not_run_plug_service=
+	return 0
+}
+
+# for debugging
+start_udevmonitor()
+{
+	yesno "${udev_monitor:-no}" || return 0
+
+	udevmonitor_log=/dev/.udev/udevmonitor.log
+	udevmonitor_pid=/dev/.udev/udevmonitor.pid
+
+	einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events"
+	start-stop-daemon --start --stdout "${udevmonitor_log}" \
+		--make-pidfile --pidfile "${udevmonitor_pid}" \
+		--background --exec /sbin/udevadm -- monitor ${udev_monitor_opts}
+}
+
+stop_udevmonitor()
+{
+	yesno "${udev_monitor:-no}" || return 0
+
+	if yesno "${udev_monitor_keep_running:-no}"; then
+		ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}"
+	else
+		einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}"
+		start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm
+	fi
+}
+
+display_hotplugged_services() {
+	local svcfile= svc= services=
+	for svcfile in "${RC_SVCDIR}"/hotplugged/*; do
+		svc="${svcfile##*/}"
+		[ -x "${svcfile}" ] || continue
+
+		# do not display this - better: do only inject it later :)
+		[ "$svc" = "udev-postmount" ] && continue
+
+		services="${services} ${svc}"
+	done
+	[ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}"
+}
+
+inject_postmount_initd() {
+	if ! mark_service_hotplugged udev-postmount; then
+		IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1
+	fi
+	#einfo "Injected udev-postmount service"
+}
+
+check_persistent_net()
+{
+	# check if there are problems with persistent-net
+	local syspath= devs= problem=false
+	for syspath in /sys/class/net/*_rename*; do
+		if [ -d "${syspath}" ]; then
+			devs="${devs} ${syspath##*/}"
+			problem=true
+		fi
+	done
+
+	${problem} || return 0
+
+	eerror "UDEV: Your system has a problem assigning persistent names"
+	eerror "to these network interfaces: ${devs}"
+
+	einfo "Checking persistent-net rules:"
+	# the sed-expression lists all duplicate lines
+	# from the input, like "uniq -d" does, but uniq
+	# is installed into /usr/bin and not available at boot.
+	dups=$(
+	RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
+	. /lib/udev/rule_generator.functions
+	find_all_rules 'NAME=' '.*' | \
+	tr ' ' '\n' | \
+	sort | \
+	sed '$!N; s/^\(.*\)\n\1$/\1/; t; D'
+	)
+	if [ -n "${dups}" ]; then
+		ewarn "The rules create multiple entries assigning these names:"
+		eindent
+		ewarn "${dups}"
+		eoutdent
+	else
+		ewarn "Found no duplicate names in persistent-net rules,"
+		ewarn "there must be some other problem!"
+	fi
+	return 1
+}
+
+check_udev_works()
+{
+	# should exist on every system, else udev failed
+	if [ ! -e /dev/zero ]; then
+		eerror "Assuming udev failed somewhere, as /dev/zero does not exist."
+		return 1
+	fi
+	return 0
+}
+
+start()
+{
+	# do not run this on old baselayout where udev-addon gets loaded
+	if [ ! -f /etc/init.d/sysfs ]; then
+		eerror "The $SVCNAME init-script is written for baselayout-2!"
+		eerror "Please do not use it with baselayout-1!".
+		return 1
+	fi
+
+	_start
+	
+	display_hotplugged_services
+
+	inject_postmount_initd
+}
+
+_start()
+{
+	root_link
+	rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}"
+	rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no}
+	
+	disable_hotplug_agent
+	start_udevd || cleanup
+	start_udevmonitor
+	populate_dev || cleanup
+
+	check_persistent_net
+
+	check_udev_works || cleanup
+	stop_udevmonitor
+
+	return 0
+}
+
+stop() {
+	ebegin "Stopping udevd"
+	start-stop-daemon --stop --exec /sbin/udevd
+	eend $?
+}
+
diff --git a/extra/udev/write_root_link_rule b/extra/udev/write_root_link_rule
new file mode 100755
index 000000000..8eaea1176
--- /dev/null
+++ b/extra/udev/write_root_link_rule
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# This script should run before doing udevtrigger at boot.
+# It will create a rule matching the device directory / is on, and
+# creating /dev/root symlink pointing on its device node.
+#
+# This is especially useful for hal looking at /proc/mounts containing
+# a line listing /dev/root as device:
+#   /dev/root / reiserfs rw 0 0
+# 
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2 of the License.
+#
+# (c) 2007-2008 Matthias Schwarzott <zzam@gentoo.org>
+
+eval $(udevadm info --export --export-prefix="ROOT_" --device-id-of-file=/)
+
+[ $? = 0 ] || exit 0
+[ "$ROOT_MAJOR" = 0 ] && exit 0
+
+DIR=/dev/.udev/rules.d
+[ -d "$DIR" ] || mkdir -p "$DIR"
+RULES=$DIR/10-root-link.rules
+
+echo "# Created by /lib/udev/write_root_link_rule" > "${RULES}"
+echo "# This rule should create /dev/root as link to real root device." >> "${RULES}"
+echo "SUBSYSTEM==\"block\", ENV{MAJOR}==\"$ROOT_MAJOR\", ENV{MINOR}==\"$ROOT_MINOR\", SYMLINK+=\"root\"" >> "${RULES}"
+
diff --git a/extra/unrar/APKBUILD b/extra/unrar/APKBUILD
new file mode 100644
index 000000000..3bb9ad5dd
--- /dev/null
+++ b/extra/unrar/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+pkgname=unrar
+pkgver=3.9.3
+pkgrel=0
+pkgdesc="The RAR uncompression program"
+url="http://www.rarlab.com"
+license="GPL"
+depends="uclibc uclibc++ libgcc"
+makedepends="uclibc++-dev"
+subpackages="$pkgname-doc"
+source="http://www.rarlab.com/rar/unrarsrc-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir/$pkgname"
+
+	export CXX=g++-uc
+
+	make -f makefile.unix || return 1
+	install -Dm755 unrar "$pkgdir"/usr/bin/unrar
+
+	install -Dm644 license.txt "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+
+}
+
+md5sums="94963c803ea2398146d309b3d398c490  unrarsrc-3.9.3.tar.gz"
diff --git a/extra/usbutils/APKBUILD b/extra/usbutils/APKBUILD
new file mode 100644
index 000000000..1f46e0900
--- /dev/null
+++ b/extra/usbutils/APKBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=usbutils
+pkgver=0.82
+pkgrel=0
+pkgdesc="USB Device Utilities"
+url="http://linux-usb.sourceforge.net/"
+license="GPL"
+subpackags="$pkgname-doc"
+depends="uclibc libusb"
+makedepends="pkgconfig libusb-compat-dev"
+source="http://downloads.sourceforge.net/sourceforge/linux-usb/$pkgname-$pkgver.tar.gz"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	rm usb.ids
+	wget http://www.linux-usb.org/usb.ids
+	./configure --prefix=/usr \
+		--datadir=/usr/share/hwdata \
+		--disable-zlib
+	make || return 1
+	make DESTDIR="$pkgdir" install
+}
+md5sums="6e393cc7423b5d228fa3d34c21481ae4  usbutils-0.82.tar.gz"
diff --git a/testing/asterisk/200-uclibc-daemon.patch b/testing/asterisk/200-uclibc-daemon.patch
new file mode 100644
index 000000000..4956791d4
--- /dev/null
+++ b/testing/asterisk/200-uclibc-daemon.patch
@@ -0,0 +1,44 @@
+diff -Nru asterisk-1.6.1-beta4.org/main/asterisk.c asterisk-1.6.1-beta4/main/asterisk.c
+--- asterisk-1.6.1-beta4.org/main/asterisk.c	2008-12-12 23:05:58.000000000 +0100
++++ asterisk-1.6.1-beta4/main/asterisk.c	2008-12-23 15:28:21.000000000 +0100
+@@ -3295,9 +3295,40 @@
+ #if HAVE_WORKING_FORK
+ 	if (ast_opt_always_fork || !ast_opt_no_fork) {
+ #ifndef HAVE_SBIN_LAUNCHD
++#ifndef __UCLIBC__
+ 		if (daemon(1, 0) < 0) {
+ 			ast_log(LOG_ERROR, "daemon() failed: %s\n", strerror(errno));
+ 		}
++#else
++		/*
++		 * workaround for uClibc-0.9.29 mipsel bug:
++		 * recursive mutexes do not work if uClibc daemon() function has been called,
++		 * if parent thread locks a mutex
++		 * the child thread cannot acquire a lock with the same name
++		 * (same code works if daemon() is not called)
++		 * but duplication of uClibc daemon.c code in here does work.
++		 */
++		int fd;
++		switch (fork()) {
++			case -1:
++				exit(1);
++			case 0:
++				break;
++			default:
++				_exit(0);
++		}
++		if (setsid() == -1)
++			exit(1);
++		if (fork())
++			_exit(0);
++		if ((fd = open("/dev/null", O_RDWR, 0)) != -1) {
++			dup2(fd, STDIN_FILENO);
++			dup2(fd, STDOUT_FILENO);
++			dup2(fd, STDERR_FILENO);
++			if (fd > 2)
++				close(fd);
++		}
++#endif
+ 		ast_mainpid = getpid();
+ 		/* Blindly re-write pid file since we are forking */
+ 		unlink(ast_config_AST_PID);
diff --git a/testing/asterisk/APKBUILD b/testing/asterisk/APKBUILD
new file mode 100644
index 000000000..ced7f2119
--- /dev/null
+++ b/testing/asterisk/APKBUILD
@@ -0,0 +1,101 @@
+# Contributor: Timo Teras <timo.teras@iki.fi>
+# Maintainer: Timo Teras <timo.teras@iki.fi>
+pkgname=asterisk
+pkgver=1.6.2.0_beta1
+_myver=1.6.2.0-beta1
+pkgrel=4
+pkgdesc="Asterisk: A Module Open Source PBX System"
+url="http://www.asterisk.org/"
+license="GPL"
+depends="ncurses popt zlib newt dahdi-linux dahdi-tools libltdl libpri freetds"
+makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev
+	postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev g++ tar
+	freetds-dev"
+install="$pkgname.pre-install $pkgname.post-install"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
+	$pkgname-tds"
+source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$_myver.tar.gz
+	asterisk-01-1.6.0-gsm-pic.patch
+	asterisk-03-1.6.2.0-beta1-to-r186562.patch
+	asterisk-04-1.6.0-beta7.1-caps-uclibc.patch
+	asterisk-05-1.6.1-glob-uclibc.patch
+	asterisk-06-overlapped-enum.patch
+	asterisk-07-issue14068.patch
+	200-uclibc-daemon.patch
+	asterisk.pre-install
+	asterisk.post-install
+	asterisk.initd
+	asterisk.confd"
+
+build() {
+	cd "$srcdir/$pkgname-$_myver"
+	for i in ../*.patch; do
+		msg "Apply $i"
+		patch -p1 < $i || return 1
+	done
+
+	sed -i -e 's/PBX_ICONV=1/PBX_ICONV=0/g' configure.ac
+
+	./bootstrap.sh
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--libdir=/usr/lib \
+		--localstatedir=/var \
+		--disable-xmldoc --with-gsm=internal \
+		--without-iconv --with-popt --with-z --with-newt \
+		--with-odbc --with-postgres --with-tds \
+		--with-dahdi --with-pri --with-tonezone \
+		|| return 1
+
+	# and figure out which modules to build
+	rm menuselect.makeopts
+	make menuselect.makeopts
+	make -j1 || return 1
+	make -j1 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
+}
+
+_find_and_move() {
+	local pattern="$1"
+	cd "$pkgdir" || return 1
+	find -name "$pattern" -type f | while read f; do
+		local dest="$subpkgdir/${f%/*}"
+		mkdir -p "$dest"
+		mv "$f" "$dest"
+	done
+}
+
+pgsql() {
+	depends="uclibc asterisk libpq zlib"
+	install=
+	_find_and_move '*_pgsql*'
+}
+
+odbc() {
+	depends="uclibc asterisk unixodbc"
+	install=
+	_find_and_move '*odbc*'
+}
+
+tds() {
+	depends="uclibc asterisk freetds"
+	install=
+	_find_and_move '*_tds*'
+}
+
+md5sums="1a44f295fc9e72d19da7f42d095e6c60  asterisk-1.6.2.0-beta1.tar.gz
+97b39fd9777a2521d4f9f095482b7ac2  asterisk-01-1.6.0-gsm-pic.patch
+9f5d2412feea58ed49e2dff5cfd1fb8f  asterisk-03-1.6.2.0-beta1-to-r186562.patch
+929f740db7043b4553544ebcc7315c91  asterisk-04-1.6.0-beta7.1-caps-uclibc.patch
+c37928e95ebef36aad097accfdbbfcb8  asterisk-05-1.6.1-glob-uclibc.patch
+1b49f980e56dc7ce493a046eadff3545  asterisk-06-overlapped-enum.patch
+95bdc48553cc18c9d3807ac96956fc8a  asterisk-07-issue14068.patch
+b00c9d98ce2ad445501248a197c6e436  200-uclibc-daemon.patch
+b4a97cb1ec3cc3f71a10ce8c067ab430  asterisk.pre-install
+62ecffc90b6714b85f377d1fac73c58b  asterisk.post-install
+bbcd152417bb7c838b25cb6007db91da  asterisk.initd
+ed31d7ba37bcf8b0346dcf8593c395f0  asterisk.confd"
diff --git a/testing/asterisk/asterisk-01-1.6.0-gsm-pic.patch b/testing/asterisk/asterisk-01-1.6.0-gsm-pic.patch
new file mode 100644
index 000000000..71370ec0b
--- /dev/null
+++ b/testing/asterisk/asterisk-01-1.6.0-gsm-pic.patch
@@ -0,0 +1,54 @@
+---  a/codecs/gsm/Makefile.org	2008-03-29 11:33:09.000000000 +0100
++++  b/codecs/gsm/Makefile	2008-03-29 11:44:40.000000000 +0100
+@@ -37,23 +37,6 @@
+ ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
+ ######### probably require gcc. 
+ 
+-ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
+-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
+-ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
+-OPTIMIZE+=-march=$(PROC)
+-endif
+-endif
+-endif
+-
+-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+-#This works for even old (2.96) versions of gcc and provides a small boost either way.
+-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
+-#So we go lowest common available by gcc and go a step down, still a step up from
+-#the default as we now have a better instruction set to work with. - Belgarath
+-ifeq ($(PROC),ultrasparc)
+-OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 
+-endif
+-
+ PG =
+ #PG = -g -pg
+ ######### Profiling flags.  If you don't know what that means, leave it blank.
+@@ -208,12 +191,10 @@
+ # XXX Keep a space after each findstring argument
+ # XXX should merge with GSM_OBJECTS
+ ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
+-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
++ifneq ($(K6OPT),)
+ GSM_SOURCES+= $(SRC)/k6opt.s
+ endif
+ endif
+-endif
+ 
+ TOAST_SOURCES = $(SRC)/toast.c 		\
+ 		$(SRC)/toast_lin.c	\
+@@ -260,12 +241,10 @@
+ 		$(SRC)/table.o
+ 
+ ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
+-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
++ifneq ($(K6OPT),)
+ GSM_OBJECTS+= $(SRC)/k6opt.o
+ endif
+ endif
+-endif
+ 
+ TOAST_OBJECTS =	$(SRC)/toast.o 		\
+ 		$(SRC)/toast_lin.o	\
diff --git a/extra/asterisk/asterisk-03-1.6.2.0-beta1-to-r186562.patch b/testing/asterisk/asterisk-03-1.6.2.0-beta1-to-r186562.patch
index 21ff8236e..21ff8236e 100644
--- a/extra/asterisk/asterisk-03-1.6.2.0-beta1-to-r186562.patch
+++ b/testing/asterisk/asterisk-03-1.6.2.0-beta1-to-r186562.patch
diff --git a/testing/asterisk/asterisk-04-1.6.0-beta7.1-caps-uclibc.patch b/testing/asterisk/asterisk-04-1.6.0-beta7.1-caps-uclibc.patch
new file mode 100644
index 000000000..1acf87f34
--- /dev/null
+++ b/testing/asterisk/asterisk-04-1.6.0-beta7.1-caps-uclibc.patch
@@ -0,0 +1,17 @@
+--- asterisk-1.6.0-beta7.1/configure.ac.orig	2008-04-04 07:31:06 +0000
++++ asterisk-1.6.0-beta7.1/configure.ac	2008-04-04 07:36:14 +0000
+@@ -522,9 +522,11 @@
+ 
+ AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
+ 
+-if test "x${host_os}" = "xlinux-gnu" ; then
+-  AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
+-fi
++case "${host_os}" in
++    linux*)
++    AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
++    ;;
++esac
+ 
+ # BSD might not have exp2, and/or log2
+ AST_EXT_LIB_CHECK([EXP2L], [m], [exp2l])
diff --git a/extra/asterisk/asterisk-05-1.6.1-glob-uclibc.patch b/testing/asterisk/asterisk-05-1.6.1-glob-uclibc.patch
index 477513a23..477513a23 100644
--- a/extra/asterisk/asterisk-05-1.6.1-glob-uclibc.patch
+++ b/testing/asterisk/asterisk-05-1.6.1-glob-uclibc.patch
diff --git a/extra/asterisk/asterisk-06-overlapped-enum.patch b/testing/asterisk/asterisk-06-overlapped-enum.patch
index a040b6c76..a040b6c76 100644
--- a/extra/asterisk/asterisk-06-overlapped-enum.patch
+++ b/testing/asterisk/asterisk-06-overlapped-enum.patch
diff --git a/extra/asterisk/asterisk-07-issue14068.patch b/testing/asterisk/asterisk-07-issue14068.patch
index 49cad1681..49cad1681 100644
--- a/extra/asterisk/asterisk-07-issue14068.patch
+++ b/testing/asterisk/asterisk-07-issue14068.patch
diff --git a/testing/asterisk/asterisk.confd b/testing/asterisk/asterisk.confd
new file mode 100644
index 000000000..fe9f138ab
--- /dev/null
+++ b/testing/asterisk/asterisk.confd
@@ -0,0 +1,91 @@
+#
+# Additional options for asterisk
+#
+# see "asterisk -h" for a list of options
+#
+ASTERISK_OPTS=""
+
+#
+# User and group to run asterisk as
+#
+# Value: double-colon separated list of user and group, or empty to run as root:
+#
+#
+# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
+#          "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
+#         ":asterisk" to run as user "root" and group "asterisk"
+#                  "" to run as user "root" and group "root"
+#
+ASTERISK_USER="asterisk"
+
+#
+# Nicelevel
+#
+# Set the priority of the asterisk process
+#
+# Value: (highest) -20..19 (lowest)
+#
+#ASTERISK_NICE="19"
+
+#
+# Wrapper script
+#
+# Value: yes or no/empty
+#
+ASTERISK_WRAPPER="no"
+
+############# Wrapper script settings #############
+
+#
+# Send crash notifications emails to this address
+# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
+#
+# Value: Email address or empty to disable
+#
+#ASTERISK_NOTIFY_EMAIL="root"
+
+#
+# Send asterisk's output to this terminal
+#
+# Value: Full path to device node or a number
+#
+#ASTERISK_TTY="/dev/tty9"
+
+#
+# Start an asterisk console on the terminal specified by ASTERISK_TTY
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# Value: yes or no/empty
+#
+ASTERISK_CONSOLE="no"
+
+#
+# Maximum size of core files. 
+#
+# Value: Size in bytes, unlimited for no limit or empty to disable.
+# 
+#ASTERISK_CORE_SIZE="unlimited"
+
+#
+# ASTERISK_CORE_DIR
+#
+# Value: Directory (will be created if non-existant), default is /tmp
+#
+ASTERISK_CORE_DIR="/var/lib/asterisk/coredump"
+
+#
+# Max number of filedescriptors
+#
+# Value: Number of descriptors
+#
+#ASTERISK_MAX_FD="1024"
+
+#
+# Kill these tasks after asterisk crashed (ASTERISK_WRAPPER=yes only!)
+#
+# Warning! This will kill _ALL_ tasks with the specified names!
+#
+# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
+#
+#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
diff --git a/testing/asterisk/asterisk.initd b/testing/asterisk/asterisk.initd
new file mode 100644
index 000000000..dc69aacf4
--- /dev/null
+++ b/testing/asterisk/asterisk.initd
@@ -0,0 +1,245 @@
+#!/sbin/runscript
+
+opts="${opts} forcestop reload"
+
+is_running() {
+	if [ -z "$(pidof asterisk)" ]; then
+		return 1
+	else
+		PID="$(cat /var/run/asterisk/asterisk.pid)"
+		for x in $(pidof asterisk); do
+			if [ "${x}" = "${PID}" ]; then
+				return 0
+			fi	
+		done
+	fi
+
+	return 1
+}
+
+asterisk_run_loop() {
+	local OPTS ARGS MSG NICE=""
+	local result=0 signal=0
+
+	# default options
+	OPTS="-f"  # don't fork / detach breaks wrapper script...
+
+	# filter (redundant) arguments
+	ARGS="$(echo "${@}" | sed -e "s:-c\|-f::g")"
+
+	# mangle yes/no options
+	ASTERISK_CONSOLE="$(echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]')"
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			mkdir -m750 -p "${ASTERISK_CORE_DIR}"
+
+			if [ -n "${ASTERISK_USER}" ]; then
+				chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}"
+			fi
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		echo "   Core dump size            : ${ASTERISK_CORE_SIZE}"
+		echo "   Core dump location        : ${ASTERISK_CORE_DIR}"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		echo "   Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		echo "   Nice level                : ${ASTERISK_NICE}"
+		NICE="nice -n ${ASTERISK_NICE} --"
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			echo "   Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			echo "   Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in ${ASTERISK_TTY} \
+			 /dev/tty${ASTERISK_TTY} \
+			 /dev/vc/${ASTERISK_TTY}
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			echo "   Messages are sent to      : ${TTY}"
+	fi
+
+	if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then
+		echo "   Starting Asterisk console : ${ASTERISK_CONSOLE}"
+		OPTS="${OPTS} -c"
+	fi
+
+	OPTS="${OPTS} ${ARGS}"
+
+	while :; do
+
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F ${TTY} sane
+			${NICE} /usr/sbin/asterisk ${OPTS} >${TTY} 2>&1 <${TTY}
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk ${OPTS} &>/dev/null
+			result=$?
+		fi		
+
+		if [ $result -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ $result -gt 128 ]; then
+				signal=$((result -  128))
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-$(date "+%Y%m%d-%h%M%s")"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 $(pidof ${X});
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >${TTY} \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\n\r${MSG}\n\r" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep 5
+		echo "Restarting Asterisk..."
+	done
+	return 0
+}
+
+start() {
+	local OPTS USER GROUP PID
+	local tmp x
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then 
+			OPTS="--nicelevel ${ASTERISK_NICE}"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	fi
+
+	if [ -n "${ASTERISK_USER}" ]; then
+		USER=$(echo $ASTERISK_USER | sed 's/:.*//')
+		GROUP=$(echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }')
+		if [ -n "${USER}" ]; then
+			ASTERISK_OPTS="${ASTERISK_OPTS} -U ${USER}"
+		fi
+		if [ -n "${GROUP}" ]; then
+			ASTERISK_OPTS="${ASTERISK_OPTS} -G ${GROUP}"
+			GROUP=":${GROUP}"	# make it look nice...
+		fi
+		ebegin "Starting asterisk PBX (as ${USER}${GROUP})"
+	else
+		ebegin "Starting asterisk PBX (as root)"
+	fi
+
+	if [ "$(echo ${ASTERISK_WRAPPER} | tr '[:upper:]' '[:lower:]')" != "yes" ]; then
+		start-stop-daemon --start --exec /usr/sbin/asterisk \
+			${OPTS} -- ${ASTERISK_OPTS}
+		result=$?
+	else
+		asterisk_run_loop ${ASTERISK_OPTS} 2>/dev/null &
+		result=$?
+	fi
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2 
+		is_running
+		result=$?
+	fi
+
+	eend $result
+}
+
+forcestop() {
+	ebegin "Stopping asterisk PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	if ! is_running; then
+		eerror "Asterisk is not running!"
+		return 0
+	fi
+
+	ebegin "Stopping asterisk PBX now"
+	/usr/sbin/asterisk -r -x "core stop now" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for asterisk to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt=`expr $cnt + 1`
+			if [ $cnt -gt 60 ] ; then
+				# Waited 120 seconds now. Fail.
+				echo
+				eend 1 "Failed."
+				return
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	if is_running; then
+		ebegin "Forcing asterisk to reload configuration"
+		/usr/sbin/asterisk -r -x "modules reload" &>/dev/null
+		eend $?
+	else
+		eerror "Asterisk is not running!"
+	fi
+}
diff --git a/testing/asterisk/asterisk.post-install b/testing/asterisk/asterisk.post-install
new file mode 100644
index 000000000..fd51c7fa5
--- /dev/null
+++ b/testing/asterisk/asterisk.post-install
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+chown -R asterisk:asterisk /var/*/asterisk
+chown -R asterisk:asterisk /etc/asterisk
+chmod -R u=rwX,g=rX,o= /etc/asterisk
+
+# set IP ToS
+# iptables -A OUTPUT -t mangle -p udp -m udp --dport 5060 -j DSCP --set-dscp 0x28
+#iptables -A OUTPUT -t mangle -p udp -m udp --sport 10000:20000 -j DSCP --set-dscp 0x28
+# more info:  http://www.voip-info.org/wiki-Asterisk+non-root
+
diff --git a/testing/asterisk/asterisk.pre-install b/testing/asterisk/asterisk.pre-install
new file mode 100644
index 000000000..f4724251f
--- /dev/null
+++ b/testing/asterisk/asterisk.pre-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+user=asterisk
+home=/var/lib/asterisk
+adduser -h $home -s /bin/false -D $user 2>/dev/null
+mkdir -p $home
+chown $user:$user $home
+exit 0
+
diff --git a/testing/igmpproxy/APKBUILD b/testing/igmpproxy/APKBUILD
new file mode 100644
index 000000000..5c0358d90
--- /dev/null
+++ b/testing/igmpproxy/APKBUILD
@@ -0,0 +1,29 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=igmpproxy
+pkgver=0.1_beta4
+pkgrel=0
+pkgdesc="a simple dynamic Multicast Routing Daemon using only IGMP signalling"
+url="http://sourceforge.net/projects/igmpproxy/"
+license="GPL"
+depends="uclibc"
+makedepends=""
+install=
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--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="0a16178aeca5d1bf54c129cec9597f85  igmpproxy-0.1_beta4.tar.gz"
diff --git a/testing/opensips-cp/APKBUILD b/testing/opensips-cp/APKBUILD
new file mode 100644
index 000000000..3d7ea8c72
--- /dev/null
+++ b/testing/opensips-cp/APKBUILD
@@ -0,0 +1,21 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=opensips-cp
+pkgver=2.0
+pkgrel=0
+pkgdesc="Web Control Panel Application for the OpenSIPS SIP server"
+url="http://opensips-cp.sourceforge.net/"
+license="GPL"
+depends="php"
+makedepends=""
+install=
+options="!strip"
+#subpackages="$pkgname-doc $pkgname-dev"
+source="http://downloads.sourceforge.net/$pkgname/${pkgname}_$pkgver.tgz"
+
+build() {
+	mkdir -p "$pkgdir"/usr/share/webapps
+	cp -r "$srcdir"/$pkgname "$pkgdir"/usr/share/webapps/$pkgname
+}
+
+md5sums="c9b4f4476e231e0d64682c2b07c66965  opensips-cp_2.0.tgz"
diff --git a/testing/opensips/APKBUILD b/testing/opensips/APKBUILD
index bf8db6383..ab98d4ba6 100644
--- a/testing/opensips/APKBUILD
+++ b/testing/opensips/APKBUILD
@@ -1,24 +1,37 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: 
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=opensips
 pkgver=1.5.0
-pkgrel=0
+pkgrel=3
 pkgdesc="Flexible and customizable sip routing engine"
 url="http://www.opensips.org/"
 license="GPL"
 depends="uclibc expat"
 makedepends="bison flex expat-dev coreutils"
-install=
-subpackages=""
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-notls_src.tar.gz"
+install="$pkgname.pre-install $pkgname.post-install"
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-notls_src.tar.gz
+	$install
+	$pkgname.initd"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver-notls"
+	sed -i -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \
+		-e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' Makefile.defs
 
-	make || return 1
-	make all || return 1
-	make DESTDIR="$pkgdir" install
+	cd scripts
+	sed -i -e 's:/var/run/opensips.pid:/var/run/opensips/opensips.pid:g' \
+		opensipsctl.base opensipsctlrc osipsconsole osipsconsolerc
+	cd ..
 
+	make prefix=/usr || return 1
+	make prefix=/usr basedir="$pkgdir" install
+	chmod 750 "$pkgdir"/etc/opensips/opensips.cfg
+	install -d "$pkgdir"/var/run/opensips
+	install -Dm755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-md5sums="ba99592a6e42e8b4dc2d38964420dfec  opensips-1.5.0-notls_src.tar.gz"
+md5sums="ba99592a6e42e8b4dc2d38964420dfec  opensips-1.5.0-notls_src.tar.gz
+3a8a5d3c4c23ce9f2fc60b449ad61820  opensips.pre-install
+d9b551148d2b60466c05b4295b935091  opensips.post-install
+6606574b4872cbc5114e490f962ca096  opensips.initd"
diff --git a/testing/opensips/opensips.initd b/testing/opensips/opensips.initd
new file mode 100644
index 000000000..5805908f0
--- /dev/null
+++ b/testing/opensips/opensips.initd
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+
+daemon=/usr/sbin/opensips
+pidfile=/var/run/opensips/opensips.pid
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting OpenSIPS"
+	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \
+		-- \
+		-u ${OPENSIPS_USER:-opensips} \
+		-g ${OPENSIPS_GROUP:-opensips} \
+		-P $pidfile  
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping OpenSIPS"
+	start-stop-daemon --stop --quiet --pidfile $pidfile
+	eend $?
+}
+
diff --git a/testing/opensips/opensips.post-install b/testing/opensips/opensips.post-install
new file mode 100644
index 000000000..eb9d86d98
--- /dev/null
+++ b/testing/opensips/opensips.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+chown -R opensips:opensips /var/run/opensips
+chgrp opensips /etc/opensips/opensips.cfg
+exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
new file mode 100644
index 000000000..4b9ccd418
--- /dev/null
+++ b/testing/opensips/opensips.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+adduser -H -h /var/empty -s /bin/false -D opensips  2>/dev/null
+
+exit 0
diff --git a/x11/atk/APKBUILD b/x11/atk/APKBUILD
index cee5544e6..d65e9698d 100644
--- a/x11/atk/APKBUILD
+++ b/x11/atk/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=atk
-pkgver=1.24.0
+pkgver=1.26.0
 pkgrel=0
 pkgdesc="A library providing a set of interfaces for accessibility"
 url="http://www.gtk.org/"
 license="LGPL"
 subpackages="$pkgname-dev $pkgname-doc"
 depends="glib libiconv gettext uclibc"
-makedepends="pkgconfig glib-dev gettext-dev libiconv-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.24/$pkgname-$pkgver.tar.bz2"
+makedepends="pkgconfig glib-dev gettext-dev libiconv-dev g++"
+source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
 
 build () 
 { 
@@ -19,4 +19,4 @@ build ()
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="fb0ee9c7f18b15b490a0168b13740a4d  atk-1.24.0.tar.bz2"
+md5sums="719229408019c548855673840679f156  atk-1.26.0.tar.bz2"
diff --git a/x11/compositeproto/APKBUILD b/x11/compositeproto/APKBUILD
new file mode 100644
index 000000000..2e4b340a0
--- /dev/null
+++ b/x11/compositeproto/APKBUILD
@@ -0,0 +1,20 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=compositeproto
+pkgver=0.4
+pkgrel=0
+pkgdesc="X11 Composite extension wire protocol"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="fixesproto"
+makedepends=""
+source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+md5sums="6281344d656d4e0c8e9db4918efe3d1d  compositeproto-0.4.tar.bz2"
diff --git a/x11/dri2proto/APKBUILD b/x11/dri2proto/APKBUILD
index 3491cae0a..cdb196217 100644
--- a/x11/dri2proto/APKBUILD
+++ b/x11/dri2proto/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dri2proto
-pkgver=1.99.3
+pkgver=2.0
 pkgrel=0
 pkgdesc="X11 DRI protocol"
 url="http://xorg.freedesktop.org/"
@@ -17,4 +17,4 @@ build ()
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="fffbbb3c26368ac63d408e81c51ec374  dri2proto-1.99.3.tar.bz2"
+md5sums="26f6515322ec50691584ac74291b4254  dri2proto-2.0.tar.bz2"
diff --git a/x11/enchant/APKBUILD b/x11/enchant/APKBUILD
new file mode 100644
index 000000000..d5cd02e6e
--- /dev/null
+++ b/x11/enchant/APKBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=enchant
+pkgver=1.4.2
+pkgrel=0
+pkgdesc="A wrapper library for generic spell checking"
+url="http://www.abisource.com/enchant/"
+license="LGPL"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="aspell dbus-glib hunspell uclibc libstdc++ gettext libgcc"
+makedepends="aspell-dev dbus-glib-dev hunspell-dev libiconv-dev gettext-dev"
+source="http://www.abisource.com/downloads/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+
+	./configure --prefix=/usr --disable-static || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="fe4558269ff59f569ab9581c907d58cb  enchant-1.4.2.tar.gz"
diff --git a/x11/exo/APKBUILD b/x11/exo/APKBUILD
new file mode 100644
index 000000000..bb51c9f02
--- /dev/null
+++ b/x11/exo/APKBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# TODO: libnotify hal
+pkgname=exo
+pkgver=0.3.101
+pkgrel=0
+pkgdesc="Extensions to Xfce by os-cillation"
+url="http://www.os-cillation.com/article.php?sid=40"
+license="GPL-2 LGPL-2"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="libxfce4util hicolor-icon-theme gtk+ gettext libiconv uclibc"
+makedepends="intltool libxfce4util-dev perl perl-uri gtk+-dev gettext-dev
+	libiconv-dev"
+install=
+source="http://www.xfce.org/archive/xfce-4.6.1/src/$pkgname-$pkgver.tar.bz2"
+
+depends_dev="gtk+-dev libxfce4util-dev"
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--libexecdir=/usr/lib/xfce4 \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-python \
+		--enable-notifications \
+		|| return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="1c0eebb360f53eab70454b70e1bde36e  exo-0.3.101.tar.bz2"
diff --git a/x11/giblib/APKBUILD b/x11/giblib/APKBUILD
new file mode 100644
index 000000000..e8428bae0
--- /dev/null
+++ b/x11/giblib/APKBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=giblib
+pkgver=1.2.4
+pkgrel=0
+pkgdesc="Giblib is a library that feh uses as a wrapper to imlib2"
+url="http://linuxbrit.co.uk/giblib/"
+license="MIT"
+subpackages="$pkgname-doc $pkgname-dev"
+depends="imlib2 libxext libx11 freetype uclibc"
+makedepends="imlib2-dev libxext-dev libx11-dev freetype-dev g++"
+source="http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" docsdir=/usr/share/doc/giblib install || return 1
+	install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
+md5sums="c810ef5389baf24882a1caca2954385e  giblib-1.2.4.tar.gz"
diff --git a/x11/intltool/APKBUILD b/x11/intltool/APKBUILD
index c73092fad..cc50fcba7 100644
--- a/x11/intltool/APKBUILD
+++ b/x11/intltool/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=intltool
-pkgver=0.40.5
+pkgver=0.40.6
 pkgrel=0
 pkgdesc="The internationalization tool collection"
 url="http://freedesktop.org/wiki/Software/intltool"
@@ -15,4 +15,4 @@ build () {
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="3e7ded6f50d88cf8b8bb505eaf591775  intltool-0.40.5.tar.bz2"
+md5sums="69bc0353323112f42ad4f9cf351bc3e5  intltool-0.40.6.tar.bz2"
diff --git a/x11/libdrm/APKBUILD b/x11/libdrm/APKBUILD
index 6bcd0f99c..7cb84e774 100644
--- a/x11/libdrm/APKBUILD
+++ b/x11/libdrm/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libdrm
-pkgver=2.4.7
+pkgver=2.4.9
 pkgrel=0
 pkgdesc="Userspace interface to kernel DRM services"
 url="http://dri.freedesktop.org/"
@@ -16,4 +16,4 @@ build() {
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="696007a9090c237fd8e6c8ee84d897d7  libdrm-2.4.7.tar.bz2"
+md5sums="a7eacf9d4532391c7a53709da8f34495  libdrm-2.4.9.tar.bz2"
diff --git a/x11/libpciaccess/APKBUILD b/x11/libpciaccess/APKBUILD
index 5d53efe12..8d10b4f8c 100644
--- a/x11/libpciaccess/APKBUILD
+++ b/x11/libpciaccess/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libpciaccess
-pkgver=0.10.5
+pkgver=0.10.6
 pkgrel=0
 pkgdesc="X11 PCI access library"
 url="http://xorg.freedesktop.org/"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
 depends="uclibc"
-makedepends="pkgconfig"
+makedepends="pkgconfig g++"
 source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
 
 build() {
@@ -17,4 +17,4 @@ build() {
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="617bebf31e5685c83f935009aeae5f38  libpciaccess-0.10.5.tar.bz2"
+md5sums="ba25eb7582f69428648e8c67564d68e5  libpciaccess-0.10.6.tar.bz2"
diff --git a/x11/libsoup/APKBUILD b/x11/libsoup/APKBUILD
index 91acb9fae..25cd81f8a 100644
--- a/x11/libsoup/APKBUILD
+++ b/x11/libsoup/APKBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libsoup
-pkgver=2.26.0
+pkgver=2.26.1
 pkgrel=0
 pkgdesc="Gnome HTTP Library"
 url="http://www.gnome.org"
 license="LGPL"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="glib gnutls libxml2 uclibc libiconv"
-makedepends="pkgconfig glib-dev gnutls-dev libxml2-dev libiconv-dev g++"
+depends="glib gnutls libxml2 uclibc libiconv libgcrypt libgpg-error"
+makedepends="pkgconfig glib-dev gnutls-dev libxml2-dev libiconv-dev gettext-dev
+	libgcrypt-dev libgpg-error-dev g++"
 source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
 
 depends_dev="glib-dev libxml2-dev gnutls-dev"
@@ -23,4 +24,4 @@ build ()
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="9df9d2b3304213641d3214a774d75ee1  libsoup-2.26.0.tar.bz2"
+md5sums="94c0495dc8bf213709bdb175ab224c7e  libsoup-2.26.1.tar.bz2"
diff --git a/x11/libx11/012_ru_RU_UTF-8_XLC_LOCALE.diff b/x11/libx11/012_ru_RU_UTF-8_XLC_LOCALE.diff
deleted file mode 100644
index 218c906b1..000000000
--- a/x11/libx11/012_ru_RU_UTF-8_XLC_LOCALE.diff
+++ /dev/null
@@ -1,237 +0,0 @@
-Index: libx11/nls/locale.dir.pre
-===================================================================
---- libx11.orig/nls/locale.dir.pre	2006-08-02 22:04:01.000000000 +0000
-+++ libx11/nls/locale.dir.pre	2006-08-02 22:04:04.000000000 +0000
-@@ -436,7 +436,7 @@
- pt_BR.UTF-8/XLC_LOCALE:			pt_BR.UTF-8
- en_US.UTF-8/XLC_LOCALE:			pt_PT.UTF-8
- en_US.UTF-8/XLC_LOCALE:			ro_RO.UTF-8
--en_US.UTF-8/XLC_LOCALE:			ru_RU.UTF-8
-+ru_RU.UTF-8/XLC_LOCALE:			ru_RU.UTF-8
- en_US.UTF-8/XLC_LOCALE:			ru_UA.UTF-8
- en_US.UTF-8/XLC_LOCALE:         rw_RW.UTF-8
- en_US.UTF-8/XLC_LOCALE:			se_NO.UTF-8
-Index: libx11/nls/ru_RU.UTF-8/XLC_LOCALE.pre
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/XLC_LOCALE.pre	2006-08-02 22:04:04.000000000 +0000
-@@ -0,0 +1,169 @@
-+XCOMM
-+XCOMM	XLocale Database Sample for ru_RU.UTF-8
-+XCOMM	Derived from en_US.UTF-8
-+XCOMM
-+
-+XCOMM
-+XCOMM 	XLC_FONTSET category
-+XCOMM
-+XLC_FONTSET
-+
-+on_demand_loading	True
-+
-+object_name		generic
-+
-+XCOMM 	fs0 class (7 bit ASCII)
-+fs0	{
-+	charset	{
-+		name	ISO8859-1:GL
-+	}
-+	font	{
-+		primary	ISO8859-1:GL
-+		vertical_rotate	all
-+	}
-+}
-+XCOMM	fs1 class (ISO8859 families)
-+fs1	{
-+	charset	{
-+		name	ISO8859-1:GR
-+	}
-+	font	{
-+		primary	ISO8859-1:GR
-+	}
-+}
-+XCOMM	fs2 class (KOI8-R)
-+fs2	{
-+	charset	{
-+		name	KOI8-R:GR
-+	}
-+	font	{
-+		primary	KOI8-R:GR
-+	}
-+}
-+XCOMM	fs3 class (MICROSOFT-CP1251)
-+fs3	{
-+	charset	{
-+		name	MICROSOFT-CP1251:GR
-+	}
-+	font	{
-+		primary	MICROSOFT-CP1251:GR
-+	}
-+}
-+XCOMM	fs4 class (ISO8859-5)
-+fs4	{
-+	charset	{
-+		name	ISO8859-5:GR
-+	}
-+	font	{
-+		primary	ISO8859-5:GR
-+	}
-+}
-+XCOMM 	fs5 class (Kanji)
-+fs5	{
-+	charset	{
-+		name	JISX0208.1983-0:GL
-+	}
-+	font	{
-+		primary	JISX0208.1983-0:GL
-+	}
-+}
-+XCOMM	fs6 class (Korean Character)
-+fs6	{
-+	charset	{
-+		name	KSC5601.1987-0:GL
-+	}
-+	font	{
-+		primary	KSC5601.1987-0:GL
-+	}
-+}
-+XCOMM	fs7 class (Chinese Han Character)
-+fs7	{
-+	charset	{
-+		name	GB2312.1980-0:GL
-+	}
-+	font	{
-+		primary	GB2312.1980-0:GL
-+	}
-+}
-+XCOMM	fs8 class (Half Kana)
-+fs8	{
-+	charset	{
-+		name	JISX0201.1976-0:GR
-+	}
-+	font	{
-+		primary		JISX0201.1976-0:GR
-+		vertical_rotate	all
-+	}
-+}
-+XCOMM	ISO10646 should come last so the fonts above will actually be used
-+XCOMM	fs9 class
-+fs9	{
-+	charset	{
-+		name	ISO10646-1
-+	}
-+	font	{
-+		primary	ISO10646-1
-+	}
-+}
-+END XLC_FONTSET
-+
-+XCOMM
-+XCOMM 	XLC_XLOCALE category
-+XCOMM
-+XLC_XLOCALE
-+
-+encoding_name		UTF-8
-+mb_cur_max		6
-+state_depend_encoding	False
-+
-+XCOMM	cs0 class
-+cs0	{
-+	side		GL:Default
-+	length		1
-+	ct_encoding	ISO8859-1:GL
-+}
-+
-+XCOMM	cs1 class
-+cs1     {
-+        side            GR:Default
-+        length          1
-+        ct_encoding     ISO8859-1:GR
-+}
-+
-+XCOMM	cs2 class
-+cs2	{
-+	side		GR
-+	length		2
-+	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;			JISX0208.1983-1:GL; JISX0208.1983-1:GR
-+
-+}
-+
-+XCOMM	cs3 class
-+cs3     {
-+        side            GL
-+        length          2
-+        ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;                        KSC5601.1987-1:GL; KSC5601.1987-1:GR
-+
-+}
-+
-+XCOMM	cs4 class
-+cs4     {
-+        side            GR
-+        length          2
-+        ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
-+}
-+
-+XCOMM	cs5 class
-+cs5	{
-+	side		GR
-+	length		1
-+	ct_encoding	JISX0201.1976-0:GR
-+}
-+
-+XCOMM	cs6 class
-+cs6	{
-+	side		none
-+	ct_encoding	ISO10646-1
-+}
-+
-+END XLC_XLOCALE
-Index: libx11/nls/ru_RU.UTF-8/XI18N_OBJS
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/XI18N_OBJS	2006-08-02 22:04:04.000000000 +0000
-@@ -0,0 +1,7 @@
-+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
-+#
-+#	XI18N objects table for en_US.UTF-8 locale
-+#
-+XLC	common/xlcUTF8Load	_XlcUtf8Loader	# XLC_open
-+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
-+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
-Index: libx11/configure.ac
-===================================================================
---- libx11.orig/configure.ac	2006-08-02 20:31:39.000000000 +0000
-+++ libx11/configure.ac	2006-08-02 22:04:04.000000000 +0000
-@@ -400,6 +400,7 @@
- 	   nls/mulelao-1/Makefile
- 	   nls/nokhchi-1/Makefile
- 	   nls/pt_BR.UTF-8/Makefile
-+	   nls/ru_RU.UTF-8/Makefile
- 	   nls/tatar-cyr/Makefile
- 	   nls/th_TH/Makefile
- 	   nls/th_TH.UTF-8/Makefile
-Index: libx11/nls/Makefile.am
-===================================================================
---- libx11.orig/nls/Makefile.am	2006-08-02 20:31:30.000000000 +0000
-+++ libx11/nls/Makefile.am	2006-08-02 22:04:04.000000000 +0000
-@@ -52,6 +52,7 @@
- 	mulelao-1		\
- 	nokhchi-1		\
- 	pt_BR.UTF-8		\
-+	ru_RU.UTF-8		\
- 	tatar-cyr		\
- 	th_TH			\
- 	th_TH.UTF-8		\
-Index: libx11/nls/ru_RU.UTF-8/Compose.pre
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/Compose.pre	2006-08-02 22:04:04.000000000 +0000
-@@ -0,0 +1 @@
-+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
-Index: libx11/nls/ru_RU.UTF-8/Makefile.am
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/Makefile.am	2006-08-02 22:04:04.000000000 +0000
-@@ -0,0 +1,3 @@
-+x11thislocaledir = $(X11_LOCALEDATADIR)/ru_RU.UTF-8
-+
-+include $(top_srcdir)/nls/localerules.in
diff --git a/x11/libx11/APKBUILD b/x11/libx11/APKBUILD
index 315925cc4..34f30f983 100644
--- a/x11/libx11/APKBUILD
+++ b/x11/libx11/APKBUILD
@@ -1,32 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libx11
-pkgver=1.2
+pkgver=1.2.1
 pkgrel=0
 pkgdesc="X11 client-side library"
 url="http://xorg.freedesktop.org/"
 license="custom:XFREE86"
 depends="uclibc libxcb libxau libxdmcp"
 subpackages="$pkgname-dev $pkgname-doc"
-makedepends="libxcb-dev libxau-dev libxdmcp-dev xproto xextproto
+makedepends="g++ libxcb-dev libxau-dev libxdmcp-dev xproto xextproto
 	xf86bigfontproto xtrans kbproto inputproto util-macros pkgconfig
-	autoconf automake libtool"
+	"
 source="http://xorg.freedesktop.org/releases/individual/lib/libX11-$pkgver.tar.bz2
-	012_ru_RU_UTF-8_XLC_LOCALE.diff
 	"
 
 depends_dev="xproto kbproto libxau-dev libxdmcp-dev libxcb-dev"
 
 build() {
 	cd "$srcdir"/libX11-$pkgver
-	for i in ../*.diff; do
-		msg "Applying $i..."
-		patch -p1 < $i || return 1
-	done
-
-	libtoolize --force --copy || return 1
-	aclocal || return 1
-	autoconf || return 1
-	automake --add-missing || return 1
 
 	./configure --prefix=/usr \
 		--with-xcb || return 1
@@ -36,5 +26,4 @@ build() {
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-md5sums="c6265b59ea2b594fd68e33f9125b4d20  libX11-1.2.tar.bz2
-c7e38a68b932ed557bc71979eed2a8a1  012_ru_RU_UTF-8_XLC_LOCALE.diff"
+md5sums="2f2beb98e71f397e1209beaca4e97cb1  libX11-1.2.1.tar.bz2"
diff --git a/x11/libxcb/APKBUILD b/x11/libxcb/APKBUILD
index ebfddcdfc..e3a5fd5fe 100644
--- a/x11/libxcb/APKBUILD
+++ b/x11/libxcb/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxcb
-pkgver=1.1.93
-pkgrel=1
+pkgver=1.2
+pkgrel=0
 pkgdesc="X11 client-side library"
 url="http://xcb.freedesktop.org/"
 license="custom"
 depends="xcb-proto libxdmcp libxau uclibc"
 subpackages="$pkgname-dev $pkgname-doc"
-makedepends="libxdmcp-dev libxau-dev libxslt libpthread-stubs pkgconfig python"
+makedepends="g++ libxdmcp-dev libxau-dev libxslt libpthread-stubs pkgconfig python"
 source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2
 	"
 depends_dev="libpthread-stubs libxau-dev libxdmcp-dev"
@@ -20,4 +20,4 @@ build() {
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="1e401dd361c38ccaa97a3a835da4caa3  libxcb-1.1.93.tar.bz2"
+md5sums="ae32b7846a7d83f5ec542a5431117564  libxcb-1.2.tar.bz2"
diff --git a/x11/libxdmcp/APKBUILD b/x11/libxdmcp/APKBUILD
index 2493fc7b9..e5d537380 100644
--- a/x11/libxdmcp/APKBUILD
+++ b/x11/libxdmcp/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxdmcp
 pkgver=1.0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 Display Manager Control Protocol library"
 url="http://xorg.freedesktop.org/"
 license="custom"
-depends="xproto uclibc"
-makedepends="pkgconfig"
+depends="uclibc"
+makedepends="xproto pkgconfig g++"
 subpackages="$pkgname-dev"
 source="http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-$pkgver.tar.bz2"
 
@@ -15,6 +15,6 @@ build() {
 	./configure --prefix=/usr \
 		--sysconfdir=/etc 
 	make || return 1
-	make DESTDIR=${startdir}/pkg install || return 1
+	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="10facf2bc7cbd5e5c1a698b8a210a582  libXdmcp-1.0.2.tar.bz2"
diff --git a/x11/libxfce4util/APKBUILD b/x11/libxfce4util/APKBUILD
new file mode 100644
index 000000000..47602e7ce
--- /dev/null
+++ b/x11/libxfce4util/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libxfce4util
+pkgver=4.6.1
+pkgrel=0
+pkgdesc="Basic utility non-GUI functions for Xfce"
+url="http://www.xfce.org/"
+license="GPL-2"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="glib gettext uclibc libiconv"
+makedepends="pkgconfig glib-dev gettext-dev libiconv-dev"
+source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
+
+depends_dev="glib-dev"
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--libexecdir=/usr/lib \
+		--localstatedir=/var \
+		--disable-static
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="eac51d58179cbcadc3f802450a8ec9cd  libxfce4util-4.6.1.tar.bz2"
diff --git a/x11/libxfont/APKBUILD b/x11/libxfont/APKBUILD
index 4921ac33c..74b270039 100644
--- a/x11/libxfont/APKBUILD
+++ b/x11/libxfont/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxfont
-pkgver=1.3.4
+pkgver=1.4.0
 pkgrel=0
 pkgdesc="X11 font rasterisation library"
 url="http://xorg.freedesktop.org/"
@@ -20,4 +20,4 @@ build() {
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="788371ee566ef97ed4ca0794873b38cf  libXfont-1.3.4.tar.bz2"
+md5sums="3a8e06b25912ef339d70a8ba003da9b5  libXfont-1.4.0.tar.bz2"
diff --git a/x11/libxvmc/APKBUILD b/x11/libxvmc/APKBUILD
new file mode 100644
index 000000000..6c87bcf70
--- /dev/null
+++ b/x11/libxvmc/APKBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libxvmc
+pkgver=1.0.4
+pkgrel=0
+pkgdesc="X11 Video Motion Compensation extension library"
+url="http://xorg.freedesktop.org/"
+license="custom"
+subpackages="$pkgname-dev"
+depends="libxv libxext libx11 uclibc"
+makedepends="pkgconfig libxv-dev libxext-dev libx11-dev"
+source="http://xorg.freedesktop.org//releases/individual/lib/libXvMC-$pkgver.tar.bz2"
+
+depends_dev="xproto videoproto libxv-dev libx11-dev libxext-dev"
+
+build ()
+{
+	cd "$srcdir"/libXvMC-$pkgver
+	./configure --prefix=/usr --sysconfdir=/etc
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="b54600573daf9d1a29b952e8d35b389e  libXvMC-1.0.4.tar.bz2"
diff --git a/x11/libxxf86vm/APKBUILD b/x11/libxxf86vm/APKBUILD
index 561431772..0b26f0d98 100644
--- a/x11/libxxf86vm/APKBUILD
+++ b/x11/libxxf86vm/APKBUILD
@@ -7,7 +7,8 @@ url="http://xorg.freedesktop.org/"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
 depends="uclibc libx11 libxext"
-makedepends="pkgconfig xproto libx11-dev xf86vidmodeproto xextproto libxext-dev"
+makedepends="pkgconfig xproto libx11-dev xf86vidmodeproto xextproto
+	libxext-dev g++"
 source="http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-$pkgver.tar.bz2"
 
 depends_dev="xf86vidmodeproto libx11-dev libxext-dev"
diff --git a/x11/mesa/APKBUILD b/x11/mesa/APKBUILD
index 803b7b774..0228457e6 100644
--- a/x11/mesa/APKBUILD
+++ b/x11/mesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=7.4
-pkgrel=0
+pkgver=7.4.1
+pkgrel=2
 pkgdesc="Mesa DRI OpenGL library and drivers"
 url="http://www.mesa3d.org"
 license="LGPL"
@@ -23,6 +23,9 @@ build ()
 		msg "Applying $i..."
 		patch -p1 -i $i || return 1
 	done
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
+
 	./configure --prefix=/usr \
 		--with-dri-driverdir=/usr/lib/xorg/modules/dri \
 		--with-dri-drivers=swrast \
@@ -39,6 +42,6 @@ build ()
 	install -m755 -d "$pkgdir"/usr/lib/xorg/modules/extensions
 	ln -sf libglx.xorg "$pkgdir"/usr/lib/xorg/modules/extensions/libglx.so || return 1
 }
-md5sums="7ecddb341a2691e0dfdb02f697109834  MesaLib-7.4.tar.bz2
+md5sums="423260578b653818ba66c2fcbde6d7ad  MesaLib-7.4.1.tar.bz2
 f0baa948d9810f268413111ee439d24b  mesa-7.1-link-shared.patch
 75e1bb69f384e9d60544fa03c15cc0ec  mesa-7.4-parallel.patch"
diff --git a/x11/midori/APKBUILD b/x11/midori/APKBUILD
index 4c1d7ea9e..e41f1249e 100644
--- a/x11/midori/APKBUILD
+++ b/x11/midori/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=midori
-pkgver=0.1.5
+pkgver=0.1.6
 pkgrel=0
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -26,16 +26,11 @@ makedepends="
 	"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
 source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2
-	midori-0.1.5-fpic.patch
 	$install"
 
 build () 
 { 
 	cd "$srcdir"/$pkgname-$pkgver
-	for i in ../*.patch; do
-		msg "Applying $i..."
-		patch -p1 < $i || return 1
-	done
 	./configure --prefix=/usr \
 		--jobs=${MAKEFLAGS/-j/} \
 		--enable-libidn \
@@ -48,8 +43,7 @@ build ()
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="dccaddeb49d7def8a19cf497cb7eabf8  midori-0.1.5.tar.bz2
-8f36ef6716f2fc8ae9924471f3647e94  midori-0.1.5-fpic.patch
+md5sums="afed64074b2ed195aae171b2178650e1  midori-0.1.6.tar.bz2
 a373e86256d1cd179791e486d2862d44  midori.post-install
 a373e86256d1cd179791e486d2862d44  midori.post-upgrade
 e962d246f1861faf94b70b37b0d3ef66  midori.post-deinstall"
diff --git a/x11/midori/midori-0.1.5-fpic.patch b/x11/midori/midori-0.1.5-fpic.patch
deleted file mode 100644
index 82dc761dd..000000000
--- a/x11/midori/midori-0.1.5-fpic.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ed2a35d70b78232562aeb1ba0158fe785916c96b Mon Sep 17 00:00:00 2001
-From: Christian Dywan <christian@twotoasts.de>
-Date: Sun, 29 Mar 2009 22:14:43 +0000
-Subject: Don't expressly use libkatze in extensions to avoid -fPIC problem
-
----
-diff --git a/extensions/wscript_build b/extensions/wscript_build
-index 8ce7027..1ea845d 100644
---- a/extensions/wscript_build
-+++ b/extensions/wscript_build
-@@ -26,5 +26,4 @@ for extension in extensions:
-     obj.includes = '..'
-     obj.source = source
-     obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
--    obj.uselib_local = 'katze'
-     obj.install_path = '${LIBDIR}/midori'
-diff --git a/katze/wscript_build b/katze/wscript_build
-index 27a24fc..52c282d 100644
---- a/katze/wscript_build
-+++ b/katze/wscript_build
-@@ -12,6 +12,3 @@ obj.find_sources_in_dirs ('.')
- obj.add_marshal_file ('marshal.list', 'katze_cclosure_marshal')
- obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML'
- obj.install_path = None
--
--if platform.architecture ()[0] == '64bit':
--    obj.env.append_value ('CCFLAGS', '-fPIC')
-diff --git a/midori/wscript_build b/midori/wscript_build
-index 91f5302..87eba0e 100644
---- a/midori/wscript_build
-+++ b/midori/wscript_build
-@@ -14,9 +14,6 @@ obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE WEBKIT LIBXML HILDON'
- obj.uselib_local = 'katze'
- obj.install_path = None
- 
--if platform.architecture ()[0] == '64bit':
--    obj.env.append_value ('CCFLAGS', '-fPIC')
--
- obj = bld.new_task_gen ('cc', 'staticlib')
- obj.name = 'panels'
- obj.target = 'panels'
-@@ -26,9 +23,6 @@ obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML'
- obj.uselib_local = 'midori'
- obj.install_path = None
- 
--if platform.architecture ()[0] == '64bit':
--    obj.env.append_value ('CCFLAGS', '-fPIC')
--
- obj = bld.new_task_gen ('cc', 'program')
- obj.target = 'midori'
- obj.includes = '. .. ../panels'
---
-cgit v0.8.2-1-g6063
diff --git a/x11/pango/APKBUILD b/x11/pango/APKBUILD
index 4b441b157..11d11992e 100644
--- a/x11/pango/APKBUILD
+++ b/x11/pango/APKBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pango
-pkgver=1.24.0
+pkgver=1.24.1
 pkgrel=0
 pkgdesc="A library for layout and rendering of text"
 url="http://www.pango.org/"
 license="LGPL"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="glib cairo libxft uclibc gettext libiconv"
-makedepends="pkgconfig glib-dev cairo-dev libxft-dev gettext-dev libiconv-dev"
+depends="glib cairo libxft uclibc gettext libiconv expat"
+makedepends="pkgconfig glib-dev cairo-dev libxft-dev gettext-dev libiconv-dev
+	expat-dev"
 install="pango.post-install $pkgname.pre-deinstall"
 source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
 	$install"
@@ -22,6 +23,6 @@ build ()
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="d209f41079833cd2ef2c5e580ab9c5ee  pango-1.24.0.tar.bz2
+md5sums="af0beac1dd1825e241c5728081f16acd  pango-1.24.1.tar.bz2
 457d66ce8a405fca12009b3c2c06bfa6  pango.post-install
 daaca20be2a577d5bcd395ca53d4b4c0  pango.pre-deinstall"
diff --git a/x11/scrot/APKBUILD b/x11/scrot/APKBUILD
new file mode 100644
index 000000000..cf9cf1a54
--- /dev/null
+++ b/x11/scrot/APKBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=scrot
+pkgver=0.8
+pkgrel=2
+pkgdesc="A simple command-line screenshot utility for X"
+url="http://linuxbrit.co.uk/scrot/"
+license="MIT"
+subpackages="$pkgname-doc"
+depends="giblib uclibc imlib2 libx11"
+makedepends="giblib-dev imlib2-dev libx11-dev"
+source="http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz"
+
+build () 
+{ 
+	cd $srcdir/$pkgname-$pkgver
+	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	make || return 1
+	make DESTDIR=$pkgdir docsdir=/usr/share/doc/scrot install || return 1
+	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+md5sums="ccae904d225609571bdd3b03445c1e88  scrot-0.8.tar.gz"
diff --git a/x11/startup-notification/APKBUILD b/x11/startup-notification/APKBUILD
new file mode 100644
index 000000000..34f81011e
--- /dev/null
+++ b/x11/startup-notification/APKBUILD
@@ -0,0 +1,23 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=startup-notification
+pkgver=0.10
+pkgrel=0
+pkgdesc="Monitor and display application startup"
+url="http://www.freedesktop.org"
+license="LGPL"
+subpackages="$pkgname-dev"
+depends="libx11 libsm xcb-util"
+makedepends="libx11-dev libsm-dev xcb-util-dev"
+source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--localstatedir=/var \
+		--sysconfdir=/etc \
+		|| return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="bca0ed1c74bc4e483ea2ed12a5717354  startup-notification-0.10.tar.gz"
diff --git a/x11/terminal/APKBUILD b/x11/terminal/APKBUILD
new file mode 100644
index 000000000..5aa92b365
--- /dev/null
+++ b/x11/terminal/APKBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=terminal
+pkgver=0.2.12
+pkgrel=0
+pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
+url="http://www.xfce.org/projects/terminal/"
+license="GPL-2"
+subpackages="$pkgname-doc"
+depends="exo vte dbus-glib startup-notification hicolor-icon-theme"
+makedepends="pkgconfig exo-dev vte-dev dbus-glib-dev gettext-dev libiconv-dev
+	intltool"
+install=
+source="http://www.xfce.org/archive/xfce-4.6.1/src/Terminal-$pkgver.tar.bz2
+	$pkgname-dont-die-on-dbus-kill.patch"
+
+build ()
+{
+	cd "$srcdir"/Terminal-$pkgver
+	patch -p1 -i "$srcdir"/terminal-dont-die-on-dbus-kill.patch || return 1
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--libexecdir=/usr/lib/xfce4 \
+		--localstatedir=/var \
+		--disable-static \
+		|| return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="adb419d279c9fc16d02291c052190717  Terminal-0.2.12.tar.bz2
+cd10397b10a859338eba56b01c0b73b2  terminal-dont-die-on-dbus-kill.patch"
diff --git a/x11/terminal/terminal-dont-die-on-dbus-kill.patch b/x11/terminal/terminal-dont-die-on-dbus-kill.patch
new file mode 100644
index 000000000..3b0da1709
--- /dev/null
+++ b/x11/terminal/terminal-dont-die-on-dbus-kill.patch
@@ -0,0 +1,10 @@
+--- a/terminal/terminal-dbus.c.orig	2007-01-23 22:25:12.000000000 +0000
++++ b/terminal/terminal-dbus.c	2007-01-23 22:25:50.000000000 +0000
+@@ -191,6 +191,7 @@ terminal_dbus_register_service (Terminal
+ 
+   /* register DBus connection with GLib main loop */
+   dbus_connection_setup_with_g_main (connection, NULL);
++  dbus_connection_set_exit_on_disconnect (connection, FALSE);
+ 
+   if (dbus_bus_request_name (connection, TERMINAL_DBUS_SERVICE, 0, &derror) < 0)
+     {
diff --git a/x11/vte/APKBUILD b/x11/vte/APKBUILD
new file mode 100644
index 000000000..7d488ddcd
--- /dev/null
+++ b/x11/vte/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=vte
+pkgver=0.20.2
+pkgrel=0
+pkgdesc="Virtual Terminal Emulator library"
+url="http://www.gnome.org"
+license="LGPL"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="gtk+ uclibc gettext libiconv"
+makedepends="gtk+-dev intltool python gettext-dev libiconv-dev"
+source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.20/$pkgname-$pkgver.tar.bz2"
+
+depends_dev="glib-dev pango-dev gtk+-dev"
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--libexecdir=/usr/lib/vte \
+		--localstatedir=/var \
+		--disable-static \
+		|| return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="d38484da2974bb049de8831e294aa7d1  vte-0.20.2.tar.bz2"
diff --git a/x11/webkit/APKBUILD b/x11/webkit/APKBUILD
index cd74e81fd..e0a8aa809 100644
--- a/x11/webkit/APKBUILD
+++ b/x11/webkit/APKBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=webkit
-pkgver=1.1.4
+pkgver=1.1.7
 pkgrel=0
 pkgdesc="portable web rendering engine WebKit for GTK+"
 url="http://webkitgtk.org/"
 license="LGPL BSD"
 depends="uclibc libsoup pango gtk+ libjpeg libpng libxml2 gperf icu cairo
 	atk gnutls sqlite libxslt libxt libiconv gettext zlib libgcrypt
-	libgpg-error expat libuuid"
+	libgpg-error expat libuuid enchant"
 makedepends="
 	libsoup-dev pango-dev gtk+-dev libjpeg-dev libpng-dev libxml2-dev
 	gperf pkgconfig bison flex uclibc++-dev icu-dev cairo-dev atk-dev
 	gnutls-dev sqlite-dev libxslt-dev libxt-dev libiconv-dev gettext-dev
 	zlib-dev libgcrypt-dev libgpg-error-dev expat-dev e2fsprogs-dev
+	enchant-dev
 	"
 install=
 subpackages="$pkgname-dev gtklauncher"
@@ -40,4 +41,4 @@ gtklauncher() {
 		"$subpkgdir"/usr/bin/GtkLauncher
 }
 
-md5sums="2c941eb9ad9e791fba9b57bf252e3f04  webkit-1.1.4.tar.gz"
+md5sums="f681773e29898509741cd3bc293816f4  webkit-1.1.7.tar.gz"
diff --git a/x11/xcb-proto/APKBUILD b/x11/xcb-proto/APKBUILD
index 030e2f732..eab264f91 100644
--- a/x11/xcb-proto/APKBUILD
+++ b/x11/xcb-proto/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xcb-proto
-pkgver=1.3
-pkgrel=1
+pkgver=1.4
+pkgrel=0
 pkgdesc="XML-XCB protocol descriptions"
 url="http://xcb.freedesktop.org/"
 license="custom"
@@ -17,4 +17,4 @@ build() {
 	install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
 	install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }
-md5sums="d9275a714e83ab9c1f9b260c6eff1609  xcb-proto-1.3.tar.bz2"
+md5sums="45a599289a81189b9812ccb00911eed8  xcb-proto-1.4.tar.bz2"
diff --git a/x11/xcb-utils/APKBUILD b/x11/xcb-util/APKBUILD
index 22b454dfb..22b454dfb 100644
--- a/x11/xcb-utils/APKBUILD
+++ b/x11/xcb-util/APKBUILD
diff --git a/x11/xf86-input-evdev/APKBUILD b/x11/xf86-input-evdev/APKBUILD
index 04ff0597d..8ebdfd665 100644
--- a/x11/xf86-input-evdev/APKBUILD
+++ b/x11/xf86-input-evdev/APKBUILD
@@ -1,21 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-input-evdev
-pkgver=2.2.1
-pkgrel=0
+pkgver=2.2.2
+pkgrel=2
 pkgdesc="X.org evdev input driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
 depends="uclibc"
-makedepends="pkgconfig libxkbfile-dev xorg-server-dev g++"
+makedepends="pkgconfig libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev
+	g++"
 source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
+
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="ed0ec2f11a2fc94355d083a03e2f9844  xf86-input-evdev-2.2.1.tar.bz2"
+md5sums="23341f098e7fe8ec13ef06ef784ac51a  xf86-input-evdev-2.2.2.tar.bz2"
diff --git a/x11/xf86-input-keyboard/APKBUILD b/x11/xf86-input-keyboard/APKBUILD
new file mode 100644
index 000000000..d1d26924e
--- /dev/null
+++ b/x11/xf86-input-keyboard/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xf86-input-keyboard
+pkgver=1.3.2
+pkgrel=1
+pkgdesc="X.org keyboard input driver"
+url="http://xorg.freedesktop.org/"
+license="custom"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="uclibc"
+makedepends="pkgconfig libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev
+	g++"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
+
+	./configure --prefix=/usr || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+md5sums="d6fe929c4f6085d6dd67f197ae9c42f6  xf86-input-keyboard-1.3.2.tar.bz2"
diff --git a/x11/xf86-input-mouse/APKBUILD b/x11/xf86-input-mouse/APKBUILD
new file mode 100644
index 000000000..d26bcb303
--- /dev/null
+++ b/x11/xf86-input-mouse/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xf86-input-mouse
+pkgver=1.4.0
+pkgrel=1
+pkgdesc="X.org mouse input driver"
+url="http://xorg.freedesktop.org/"
+license="custom"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="uclibc"
+makedepends="pkgconfig libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev
+	g++"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
+
+	./configure --prefix=/usr || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+md5sums="e7dc0759c14a9bfd373917a49e5f7c7d  xf86-input-mouse-1.4.0.tar.bz2"
diff --git a/x11/xf86-video-apm/APKBUILD b/x11/xf86-video-apm/APKBUILD
index dad9c115c..770aa031b 100644
--- a/x11/xf86-video-apm/APKBUILD
+++ b/x11/xf86-video-apm/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-apm
 pkgver=1.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Alliance ProMotion video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,9 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
+
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-ark/APKBUILD b/x11/xf86-video-ark/APKBUILD
index 99e371c03..58d66e5ed 100644
--- a/x11/xf86-video-ark/APKBUILD
+++ b/x11/xf86-video-ark/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ark
 pkgver=0.7.1
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for ark cards"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-ast/APKBUILD b/x11/xf86-video-ast/APKBUILD
index aceb2cea2..c4c0e690b 100644
--- a/x11/xf86-video-ast/APKBUILD
+++ b/x11/xf86-video-ast/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ast
 pkgver=0.88.8
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for ASpeedTech cards"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-ati/APKBUILD b/x11/xf86-video-ati/APKBUILD
index 7cfcee8c8..6526d3647 100644
--- a/x11/xf86-video-ati/APKBUILD
+++ b/x11/xf86-video-ati/APKBUILD
@@ -1,20 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ati
 pkgver=6.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="ATI video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="uclibc"
+depends="uclibc mesa libpciaccess"
 makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto libdrm-dev xf86driproto glproto"
+	videoproto renderproto libdrm-dev xf86driproto glproto mesa-dev"
 
 source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
+
 	./configure --prefix=/usr \
 		|| return 1
 	make || return 1
diff --git a/x11/xf86-video-chips/APKBUILD b/x11/xf86-video-chips/APKBUILD
index 2bc881432..5510d0b0a 100644
--- a/x11/xf86-video-chips/APKBUILD
+++ b/x11/xf86-video-chips/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-chips
 pkgver=1.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Chips and Technologies video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-cirrus/APKBUILD b/x11/xf86-video-cirrus/APKBUILD
index e725080a8..8c8bdf559 100644
--- a/x11/xf86-video-cirrus/APKBUILD
+++ b/x11/xf86-video-cirrus/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-cirrus
 pkgver=1.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Cirrus Logic video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-dummy/APKBUILD b/x11/xf86-video-dummy/APKBUILD
index 91ed8f82e..197ad5dc8 100644
--- a/x11/xf86-video-dummy/APKBUILD
+++ b/x11/xf86-video-dummy/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-dummy
 pkgver=0.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for dummy cards"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-fbdev/APKBUILD b/x11/xf86-video-fbdev/APKBUILD
index d7631b30e..dce1002a5 100644
--- a/x11/xf86-video-fbdev/APKBUILD
+++ b/x11/xf86-video-fbdev/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-fbdev
 pkgver=0.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="video driver for framebuffer device"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-geode/APKBUILD b/x11/xf86-video-geode/APKBUILD
index 4c91e7911..716748753 100644
--- a/x11/xf86-video-geode/APKBUILD
+++ b/x11/xf86-video-geode/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-geode
 pkgver=2.11.1
-pkgrel=0
+pkgrel=1
 pkgdesc="AMD Geode GX and LX video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-glint/APKBUILD b/x11/xf86-video-glint/APKBUILD
index 25f6673ec..f0405f337 100644
--- a/x11/xf86-video-glint/APKBUILD
+++ b/x11/xf86-video-glint/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-glint
 pkgver=1.2.2
-pkgrel=0
+pkgrel=1
 pkgdesc="GLINT/Permedia video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-i128/APKBUILD b/x11/xf86-video-i128/APKBUILD
index a14d5b21e..0d2c7757e 100644
--- a/x11/xf86-video-i128/APKBUILD
+++ b/x11/xf86-video-i128/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-i128
 pkgver=1.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Number 9 I128 video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-i740/APKBUILD b/x11/xf86-video-i740/APKBUILD
index 846a8feca..de5d2f759 100644
--- a/x11/xf86-video-i740/APKBUILD
+++ b/x11/xf86-video-i740/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-i740
 pkgver=1.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Intel i740 video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-intel/APKBUILD b/x11/xf86-video-intel/APKBUILD
index 22828d5f0..5d6c698fb 100644
--- a/x11/xf86-video-intel/APKBUILD
+++ b/x11/xf86-video-intel/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-intel
 pkgver=2.7.0
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for Intel cards"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-mach64/APKBUILD b/x11/xf86-video-mach64/APKBUILD
index 82e92b5f8..69ce2012b 100644
--- a/x11/xf86-video-mach64/APKBUILD
+++ b/x11/xf86-video-mach64/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-mach64
 pkgver=6.8.0
-pkgrel=0
+pkgrel=1
 pkgdesc="ATI Mach64 video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-newport/APKBUILD b/x11/xf86-video-newport/APKBUILD
index b8774cd84..f2a50f663 100644
--- a/x11/xf86-video-newport/APKBUILD
+++ b/x11/xf86-video-newport/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-newport
 pkgver=0.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Newport video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-nv/APKBUILD b/x11/xf86-video-nv/APKBUILD
index 51616c82e..343124dce 100644
--- a/x11/xf86-video-nv/APKBUILD
+++ b/x11/xf86-video-nv/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-nv
-pkgver=2.1.12
-pkgrel=0
+pkgver=2.1.13
+pkgrel=1
 pkgdesc="Nvidia video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,9 +15,12 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
+
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="42f12a36d7afc26c817e8e8f5c8b7274  xf86-video-nv-2.1.12.tar.bz2"
+md5sums="c3231c8808a11eb4ca066e43e0f1a273  xf86-video-nv-2.1.13.tar.bz2"
diff --git a/x11/xf86-video-openchrome/APKBUILD b/x11/xf86-video-openchrome/APKBUILD
new file mode 100644
index 000000000..18d5dfdfa
--- /dev/null
+++ b/x11/xf86-video-openchrome/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xf86-video-openchrome
+pkgver=0.2.903
+pkgrel=1
+pkgdesc="X.Org driver for VIA/S3G cards"
+url="http://xorg.freedesktop.org/"
+license="custom"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="uclibc libxvmc"
+makedepends="pkgconfig g++ xorg-server-dev libxi-dev libxvmc-dev fontsproto
+	randrproto videoproto renderproto xf86driproto mesa-dev"
+
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
+
+	./configure --prefix=/usr || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+md5sums="c0820787e89958c9114d359b6a3cd464  xf86-video-openchrome-0.2.903.tar.bz2"
diff --git a/x11/xf86-video-r128/APKBUILD b/x11/xf86-video-r128/APKBUILD
index 88d1a41b5..b5bae4270 100644
--- a/x11/xf86-video-r128/APKBUILD
+++ b/x11/xf86-video-r128/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-r128
 pkgver=6.8.0
-pkgrel=0
+pkgrel=1
 pkgdesc="ATI Rage128 video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-radeonhd/APKBUILD b/x11/xf86-video-radeonhd/APKBUILD
index 396e4334c..c71823475 100644
--- a/x11/xf86-video-radeonhd/APKBUILD
+++ b/x11/xf86-video-radeonhd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-radeonhd
-pkgver=1.2.4
-pkgrel=0
+pkgver=1.2.5
+pkgrel=1
 pkgdesc="Experimental Radeon HD video driver."
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,9 +15,11 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="3c9cfffe7e3d795dde59ea0eef7361b1  xf86-video-radeonhd-1.2.4.tar.bz2"
+md5sums="10669b08101cb6d69894cc44b47e5094  xf86-video-radeonhd-1.2.5.tar.bz2"
diff --git a/x11/xf86-video-rendition/APKBUILD b/x11/xf86-video-rendition/APKBUILD
index 07ce66d5f..784c4128b 100644
--- a/x11/xf86-video-rendition/APKBUILD
+++ b/x11/xf86-video-rendition/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-rendition
 pkgver=4.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Rendition video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-s3/APKBUILD b/x11/xf86-video-s3/APKBUILD
index 14d6cbb2d..924ab86fa 100644
--- a/x11/xf86-video-s3/APKBUILD
+++ b/x11/xf86-video-s3/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-s3
 pkgver=0.6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for s3 cards"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-s3virge/APKBUILD b/x11/xf86-video-s3virge/APKBUILD
index c4b60e3e0..531c672c7 100644
--- a/x11/xf86-video-s3virge/APKBUILD
+++ b/x11/xf86-video-s3virge/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-s3virge
 pkgver=1.10.2
-pkgrel=0
+pkgrel=1
 pkgdesc="S3 ViRGE video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-savage/APKBUILD b/x11/xf86-video-savage/APKBUILD
index ec26f09cf..425efa3fa 100644
--- a/x11/xf86-video-savage/APKBUILD
+++ b/x11/xf86-video-savage/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-savage
 pkgver=2.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="S3 Savage video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-siliconmotion/APKBUILD b/x11/xf86-video-siliconmotion/APKBUILD
index 784450d1a..49bef9182 100644
--- a/x11/xf86-video-siliconmotion/APKBUILD
+++ b/x11/xf86-video-siliconmotion/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-siliconmotion
 pkgver=1.7.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Silicon Motion video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-sunffb/APKBUILD b/x11/xf86-video-sunffb/APKBUILD
index b4a347e53..e4e07d9d2 100644
--- a/x11/xf86-video-sunffb/APKBUILD
+++ b/x11/xf86-video-sunffb/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-sunffb
 pkgver=1.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="SUNFFB video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-sunleo/APKBUILD b/x11/xf86-video-sunleo/APKBUILD
index 8c61b2ee4..99268b925 100644
--- a/x11/xf86-video-sunleo/APKBUILD
+++ b/x11/xf86-video-sunleo/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-sunleo
 pkgver=1.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Leo video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-tdfx/APKBUILD b/x11/xf86-video-tdfx/APKBUILD
index 4b1ca59dd..082213ce7 100644
--- a/x11/xf86-video-tdfx/APKBUILD
+++ b/x11/xf86-video-tdfx/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-tdfx
 pkgver=1.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="3Dfx video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-tseng/APKBUILD b/x11/xf86-video-tseng/APKBUILD
index f82df56ae..733a3832a 100644
--- a/x11/xf86-video-tseng/APKBUILD
+++ b/x11/xf86-video-tseng/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-tseng
 pkgver=1.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Tseng Labs video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-v4l/APKBUILD b/x11/xf86-video-v4l/APKBUILD
index 879b401ed..e04835e38 100644
--- a/x11/xf86-video-v4l/APKBUILD
+++ b/x11/xf86-video-v4l/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-v4l
 pkgver=0.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="video4linux driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,8 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xf86-video-vesa/APKBUILD b/x11/xf86-video-vesa/APKBUILD
index fdb3e930d..f03785831 100644
--- a/x11/xf86-video-vesa/APKBUILD
+++ b/x11/xf86-video-vesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-vesa
 pkgver=2.2.0
-pkgrel=0
+pkgrel=2
 pkgdesc="X.org vesa video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -15,6 +15,9 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
+
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/x11/xinit/APKBUILD b/x11/xinit/APKBUILD
index 78120e2e0..20b65c1b7 100644
--- a/x11/xinit/APKBUILD
+++ b/x11/xinit/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xinit
 pkgver=1.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org initialisation program "
 url="http://xorg.freedesktop.org/"
 license="GPL"
@@ -19,6 +19,7 @@ build ()
 	./configure --prefix=/usr || return 1
 	make XINITDIR=/etc/X11/xinit || return 1
 	make XINITDIR=/etc/X11/xinit DESTDIR="$pkgdir" install || return 1
+	chmod +x "$pkgdir"/usr/bin/startx
 	install -m755 -d "$pkgdir"/etc/skel
 	install -m755 -d "$pkgdir"/etc/X11/xinit
 	install -m755 "$srcdir"/xinitrc "$pkgdir"/etc/skel/.xinitrc || return 1
diff --git a/x11/xorg-server/APKBUILD b/x11/xorg-server/APKBUILD
index 81728c601..62bb2608c 100644
--- a/x11/xorg-server/APKBUILD
+++ b/x11/xorg-server/APKBUILD
@@ -1,12 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
-pkgver=1.6.0
-pkgrel=4
+pkgver=1.6.1
+pkgrel=3
 pkgdesc="X.Org X servers"
 url="http://xorg.freedesktop.org"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc xfbdev"
 depends="
+	font-misc-misc
+	font-cursor-misc
 	libpciaccess
 	libx11
 	libxdamage
@@ -19,6 +21,9 @@ depends="
 	pixman
 	uclibc
 	libgcc
+	xkeyboard-config
+	xkbcomp
+	xinit
 	"
 makedepends="
 	libpciaccess-dev
@@ -34,6 +39,7 @@ makedepends="
 	pixman-dev
 
 	bigreqsproto
+	compositeproto
 	damageproto
 	fixesproto
 	inputproto
@@ -54,49 +60,49 @@ makedepends="
 #	xorg-server-utils xorg-utils xorg-fonts-misc xbitmaps libdrm>=2.3.1
 #	diffutils xf86-input-evdev"
 
-source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2
-	nocxx.patch"
+source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2"
 
 depends_dev="pixman-dev libpciaccess-dev"
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	patch configure < ../nocxx.patch || return 1
+
+	# xorg modules does not work with the -z now and it seems like we
+	# cannot pass over the linker flag to .so files. so we tweak the
+	# gcc specs.
+	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
+	export GCC_SPECS="$srcdir"/gcc-specs
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc/X11 \
 		--localstatedir=/var \
+		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/100dpi:unscaled,/usr/share/fonts/75dpi:unscaled,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
+		--with-xkb-path=/usr/share/X11/xkb \
+		--with-xkb-output=/var/lib/xkb \
+		--with-dri-driver-path=/usr/lib/xorg/modules/dri \
+		--enable-composite \
 		--enable-dri \
 		--enable-ipv6 \
 		--enable-xfbdev \
 		--enable-kdrive \
-		--enable-kdrive-vesa \
-		--enable-randr \
 		--enable-xorg \
 		--enable-xv \
+		--enable-xres \
 		--disable-xephyr \
-		--disable-composite \
 		--disable-config-dbus \
 		--disable-config-hal \
 		--disable-dmx \
 		--disable-glx \
-		--disable-glx-tsl \
-		--disable-install-libxf86config \
 		--disable-tslib \
 		--disable-xfree86-utils \
 		--disable-xinerama \
 		--disable-xnest \
-		--disable-xorgcfg \
 		--disable-xsdl \
-		--disable-xvfb \
 		--disable-aiglx \
-		--disable-xres \
 		--disable-xvmc \
 		--disable-screensaver \
-		--disable-glx \
 		--disable-xinerama \
 		--disable-xace \
-		--disable-dbe \
 		|| return 1
 
 #		--enable-xnest \
@@ -164,5 +170,4 @@ xephyr() {
 	mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/
 }
 
-md5sums="aafe73f5807ce8bb534727ecb72467c7  xorg-server-1.6.0.tar.bz2
-28513788ba4d556ccd538867dc6205ab  nocxx.patch"
+md5sums="ed0878bf32a24d4948c3b8a122a39eff  xorg-server-1.6.1.tar.bz2"
diff --git a/x11/xorg-server/nocxx.patch b/x11/xorg-server/nocxx.patch
deleted file mode 100644
index beb1ab900..000000000
--- a/x11/xorg-server/nocxx.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure	2004-12-07 21:34:23.205172545 +0000
-+++ b/configure	2004-12-07 21:37:17.726654782 +0000
-@@ -5148,10 +5148,8 @@
-   :
- else
-   { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+See \`config.log' for more details." >&5;}
-+   { echo "C++ sucks, ignoring ..." >&5; }; }
- fi
- 
- ac_ext=cc
diff --git a/x11/xproto/APKBUILD b/x11/xproto/APKBUILD
index ad2f0fcf9..92261b1e3 100644
--- a/x11/xproto/APKBUILD
+++ b/x11/xproto/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xproto
-pkgver=7.0.14
+pkgver=7.0.15
 pkgrel=0
 pkgdesc="X11 core wire protocol and auxiliary headers"
 url="http://xorg.freedesktop.org/"
@@ -18,4 +18,4 @@ build ()
 	install -D -m644 "$srcdir"/$pkgname-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-md5sums="5bbf47f4ad6eb3b3f3a119231abe8e5e  xproto-7.0.14.tar.bz2"
+md5sums="1a2b31430d04340be2e49e8b6445e076  xproto-7.0.15.tar.bz2"
author	Michael Mason <ms13sp@gmail.com>	2009-05-28 13:32:41 +0000
committer	Michael Mason <ms13sp@gmail.com>	2009-05-28 13:32:41 +0000
commit	1e2f0b801eee6597e0ab8ffeecb740ef01abb45d (patch)
tree	a4dcd60d3c11ddc72c25ef269df6c1a18ee04951
parent	6a4d7e81f3565b5c531abedf0b81d988391f5e92 (diff)
parent	ed1b3209b6c34161e0f7ca150d99655da23214c0 (diff)
download	aports-1e2f0b801eee6597e0ab8ffeecb740ef01abb45d.tar.bz2 aports-1e2f0b801eee6597e0ab8ffeecb740ef01abb45d.tar.xz