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

67 files changed, 697 insertions, 429 deletions

diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index ee03901a..c0ad27dc 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgdesc="Script to build Alpine Packages"
 pkgname=abuild
-pkgver=2.0_rc2
+pkgver=2.0_rc4
 pkgrel=0
 url=http://git.alpinelinux.org/cgit/abuild/
 source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
 	"
 depends="fakeroot file sudo pax-utils openssl apk-tools"
-makedepends="openssl-dev"
+makedepends="openssl-dev pkgconfig"
 license=GPL-2
 
 build() {
@@ -17,4 +17,4 @@ build() {
 	install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
 }
 
-md5sums="d6d0de5791cd8bbb468b1da1dbac8138  abuild-2.0_rc2.tar.bz2"
+md5sums="d5ba5058ba6550c6eac49d6921a2271f  abuild-2.0_rc4.tar.bz2"
diff --git a/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch b/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch
new file mode 100644
index 00000000..f7ce644d
--- /dev/null
+++ b/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch
@@ -0,0 +1,43 @@
+From fbe26c92439f4b4f19ee09ec07798a5bbaec0d77 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 29 Jul 2009 19:30:36 +0000
+Subject: [PATCH] lbu: remove packages.list if exist
+
+fixes http://redmine.alpinelinux.org/issues/show/94
+---
+ lbu.in |   10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/lbu.in b/lbu.in
+index 48e615e..b84682a 100644
+--- a/lbu.in
++++ b/lbu.in
+@@ -233,6 +233,12 @@ cmd_package() {
+ 	tmppkg="$tmpdir/$(basename $pkg)"
+ 
+ 	cd "${ROOT:-/}"
++	# remove old package.list
++	if [ -f etc/lbu/packages.list ] && [ -f var/lib/apk/world ]; then
++		echo "Note: Removing /etc/lbu/packages.list."
++		echo "      /var/lib/apk/world will be used."
++		rm -f etc/lbu/packages.list
++	fi
+ 	currentlist=$(apk audit --backup -q)
+ 	if [ -f var/lib/apk/world ]; then
+ 		currentlist="$currentlist var/lib/apk/world"
+@@ -391,10 +397,10 @@ cmd_commit() {
+ 		}' | xargs rm 2>/dev/null
+ 
+ 	# remove obsolete file. some older version of alpine needs this
+-	# to be ble to upgrade
++	# to be able to upgrade
+ 	if [ -z "$DRYRUN" ] && [ -f $mnt/packages.list ]; then
+ 		echo "Note: Removing packages.list from $(basename $mnt)."
+-		echo "      $PACKAGES_LIST will be used."
++		echo "      /var/lib/apk/world will be used."
+ 		rm -f $mnt/packages.list
+ 	fi
+ 
+-- 
+1.6.3.3
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 08e641d0..46d5b982 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,16 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=2.0_beta3
-pkgrel=0
+pkgrel=1
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+	0001-lbu-remove-packages.list-if-exist.patch
 	"
 license="GPL-2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
+	patch -p1 -i ../0001-lbu-remove-packages.list-if-exist.patch || return 1
 
 	make || return 1
 	make install PREFIX= DESTDIR="$pkgdir"
@@ -18,4 +20,5 @@ build() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="7786d6d526e96a3fdf51b9284d063caa  alpine-conf-2.0_beta3.tar.bz2"
+md5sums="7786d6d526e96a3fdf51b9284d063caa  alpine-conf-2.0_beta3.tar.bz2
+b09f9702fc6599fcb7d9bfbc855c8b5c  0001-lbu-remove-packages.list-if-exist.patch"
diff --git a/main/apk-tools/0001-db-fix-checksum-storing-to-db.patch b/main/apk-tools/0001-db-fix-checksum-storing-to-db.patch
new file mode 100644
index 00000000..c54fe73b
--- /dev/null
+++ b/main/apk-tools/0001-db-fix-checksum-storing-to-db.patch
@@ -0,0 +1,73 @@
+From c1fe6d08f3ba77bf13b098216fc5e5bcd4ba23f7 Mon Sep 17 00:00:00 2001
+From: Timo Teras <timo.teras@iki.fi>
+Date: Thu, 30 Jul 2009 11:55:59 +0300
+Subject: [PATCH] db: fix checksum storing to db
+
+also take precautions in audit code if the db is missing the
+checksum.
+---
+ src/audit.c    |    7 +++----
+ src/database.c |    8 ++++++--
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/audit.c b/src/audit.c
+index 31965df..76bd492 100644
+--- a/src/audit.c
++++ b/src/audit.c
+@@ -69,10 +69,9 @@ static int audit_directory(apk_hash_item item, void *ctx)
+ 		} else {
+ 			dbf = apk_db_file_query(db, bdir, APK_BLOB_STR(de->d_name));
+ 			if (dbf != NULL) {
+-				if (apk_file_get_info(tmp, dbf->csum.type, &fi) < 0)
+-					continue;
+-
+-				if (apk_checksum_compare(&fi.csum, &dbf->csum) == 0)
++				if (dbf->csum.type != APK_CHECKSUM_NONE &&
++				    apk_file_get_info(tmp, dbf->csum.type, &fi) == 0 &&
++				    apk_checksum_compare(&fi.csum, &dbf->csum) == 0)
+ 					continue;
+ 
+ 				reason = 'U';
+diff --git a/src/database.c b/src/database.c
+index 968d55e..16ae94b 100644
+--- a/src/database.c
++++ b/src/database.c
+@@ -1458,6 +1458,7 @@ static int apk_db_install_archive_entry(void *_ctx,
+ 			 diri->dir->name, file->name);
+ 		r = apk_archive_entry_extract(ae, is, alt_name,
+ 					      extract_cb, ctx);
++		memcpy(&file->csum, &ae->csum, sizeof(file->csum));
+ 	} else {
+ 		if (apk_verbosity >= 3)
+ 			apk_message("%s", ae->name);
+@@ -1502,7 +1503,8 @@ static void apk_db_purge_pkg(struct apk_database *db, struct apk_package *pkg,
+ 			hash = apk_blob_hash_seed(key.filename, diri->dir->hash);
+ 			if (!(diri->dir->flags & APK_DBDIRF_PROTECTED) ||
+ 			    (apk_flags & APK_PURGE) ||
+-			    (apk_file_get_info(name, file->csum.type, &fi) == 0 &&
++			    (file->csum.type != APK_CHECKSUM_NONE &&
++			     apk_file_get_info(name, file->csum.type, &fi) == 0 &&
+ 			     apk_checksum_compare(&file->csum, &fi.csum) == 0))
+ 				unlink(name);
+ 			if (apk_verbosity >= 3)
+@@ -1565,6 +1567,7 @@ static void apk_db_migrate_files(struct apk_database *db,
+ 			if ((diri->dir->flags & APK_DBDIRF_PROTECTED) &&
+ 			    (r == 0) &&
+ 			    (ofile == NULL ||
++			     ofile->csum.type == APK_CHECKSUM_NONE ||
+ 			     apk_checksum_compare(&ofile->csum, &fi.csum) != 0)) {
+ 				/* Protected directory, with file without
+ 				 * db entry, or local modifications.
+@@ -1575,7 +1578,8 @@ static void apk_db_migrate_files(struct apk_database *db,
+ 				    ofile->csum.type != file->csum.type)
+ 					apk_file_get_info(name, file->csum.type, &fi);
+ 				if ((apk_flags & APK_CLEAN_PROTECTED) ||
+-				    apk_checksum_compare(&file->csum, &fi.csum) == 0)
++				    (file->csum.type != APK_CHECKSUM_NONE &&
++				     apk_checksum_compare(&file->csum, &fi.csum) == 0))
+ 					unlink(tmpname);
+ 			} else {
+ 				/* Overwrite the old file */
+-- 
+1.6.3.3
+
diff --git a/main/apk-tools/0001-io-fix-corruption-of-big-files-on-mmap-write.patch b/main/apk-tools/0001-io-fix-corruption-of-big-files-on-mmap-write.patch
new file mode 100644
index 00000000..4261ce52
--- /dev/null
+++ b/main/apk-tools/0001-io-fix-corruption-of-big-files-on-mmap-write.patch
@@ -0,0 +1,76 @@
+From 67108bf07a67811ea91fc965f3f1592a4a70044e Mon Sep 17 00:00:00 2001
+From: Timo Teras <timo.teras@iki.fi>
+Date: Fri, 31 Jul 2009 10:50:15 +0300
+Subject: [PATCH] io: fix corruption of big files on mmap write
+
+remember to increment destination pointer; and munmap the proper
+base address.
+---
+ src/io.c |   27 +++++++++++++--------------
+ 1 files changed, 13 insertions(+), 14 deletions(-)
+
+diff --git a/src/io.c b/src/io.c
+index 18e89d3..3929ba1 100644
+--- a/src/io.c
++++ b/src/io.c
+@@ -114,21 +114,19 @@ size_t apk_istream_splice(void *stream, int fd, size_t size,
+ {
+ 	static void *splice_buffer = NULL;
+ 	struct apk_istream *is = (struct apk_istream *) stream;
+-	unsigned char *buf = MAP_FAILED;
+-	size_t bufsz, done = 0, r, togo, mmapped = 0;
++	unsigned char *buf, *mmapbase = MAP_FAILED;
++	size_t bufsz, done = 0, r, togo;
+ 
+ 	bufsz = size;
+ 	if (size > 128 * 1024) {
+ 		if (ftruncate(fd, size) == 0)
+-			buf = mmap(NULL, size, PROT_READ | PROT_WRITE,
+-				   MAP_SHARED, fd, 0);
+-		if (buf != MAP_FAILED) {
+-			mmapped = 1;
+-			if (bufsz > 2*1024*1024)
+-				bufsz = 2*1024*1024;
+-		}
++			mmapbase = mmap(NULL, size, PROT_READ | PROT_WRITE,
++					MAP_SHARED, fd, 0);
++		if (bufsz > 2*1024*1024)
++			bufsz = 2*1024*1024;
++		buf = mmapbase;
+ 	}
+-	if (!mmapped) {
++	if (mmapbase == MAP_FAILED) {
+ 		if (splice_buffer == NULL)
+ 			splice_buffer = malloc(256*1024);
+ 		buf = splice_buffer;
+@@ -149,13 +147,14 @@ size_t apk_istream_splice(void *stream, int fd, size_t size,
+ 		if (r < 0)
+ 			goto err;
+ 
+-		if (!mmapped) {
++		if (mmapbase == MAP_FAILED) {
+ 			if (write(fd, buf, r) != r) {
+ 				if (r < 0)
+ 					r = -errno;
+ 				goto err;
+ 			}
+-		}
++		} else
++			buf += r;
+ 
+ 		done += r;
+ 		if (r != togo)
+@@ -163,8 +162,8 @@ size_t apk_istream_splice(void *stream, int fd, size_t size,
+ 	}
+ 	r = done;
+ err:
+-	if (mmapped)
+-		munmap(buf, size);
++	if (mmapbase != MAP_FAILED)
++		munmap(mmapbase, size);
+ 	return r;
+ }
+ 
+-- 
+1.6.3.3
+
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index c14ba430..7db8f8a3 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,11 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
-pkgver=2.0_pre16
-pkgrel=0
+pkgver=2.0_pre17
+pkgrel=2
 pkgdesc="Alpine Package Keeper - package manager for alpine"
 depends=
 makedepends="zlib-dev openssl-dev pkgconfig"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+	0001-db-fix-checksum-storing-to-db.patch
+	0001-io-fix-corruption-of-big-files-on-mmap-write.patch
 	"
 
 
@@ -15,6 +17,9 @@ license=GPL-2
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	sed -i -e 's:-Werror::' Make.rules
+	patch -p1 -i ../0001-db-fix-checksum-storing-to-db.patch || return 1
+	patch -p1 -i ../0001-io-fix-corruption-of-big-files-on-mmap-write.patch\
+		|| return 1
 
 	make || return 1
 	make DESTDIR="$pkgdir" install
@@ -27,4 +32,6 @@ build() {
 	ln -s apk apk_version
 }
 
-md5sums="6a8495fa42607649f1cb71dfea4fe70f  apk-tools-2.0_pre16.tar.bz2"
+md5sums="4d31c9ae51b357a8514e99a8750af0b6  apk-tools-2.0_pre17.tar.bz2
+d7944308cefe6f5fc45a24e1840d087e  0001-db-fix-checksum-storing-to-db.patch
+57693255bb36abe74423578b83ff2cf4  0001-io-fix-corruption-of-big-files-on-mmap-write.patch"
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 38ab8ead..39290bdf 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apr-util
-pkgver=1.3.7
+pkgver=1.3.8
 pkgrel=0
 pkgdesc="The Apache Portable Runtime"
 url="http://apr.apache.org/"
@@ -29,4 +29,4 @@ build() {
 	rm "$pkgdir"/usr/lib/*.exp
 }
 
-md5sums="2ed3ae6734290296faa193e1177d50e6  apr-util-1.3.7.tar.bz2"
+md5sums="34a0e815cdc2b79bf561468b84ff1aa3  apr-util-1.3.8.tar.bz2"
diff --git a/main/apr/APKBUILD b/main/apr/APKBUILD
index bee01f8d..d0145f90 100644
--- a/main/apr/APKBUILD
+++ b/main/apr/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apr
-pkgver=1.3.5
+pkgver=1.3.7
 pkgrel=0
 pkgdesc="The Apache Portable Runtime"
 url="http://apr.apache.org/"
@@ -32,4 +32,4 @@ dev() {
 	return 0
 }
 
-md5sums="9ac9a00eaa190937fdbbde7b4f03ac1e  apr-1.3.5.tar.bz2"
+md5sums="1414f695a236a2bf8e470ca624d6a2e8  apr-1.3.7.tar.bz2"
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 533bfa71..22a725ac 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bind
-pkgver=9.6.0_p1
-pkgrel=1
+pkgver=9.6.1_p1
+pkgrel=0
 pkgdesc="BIND - Berkeley Internet Name Domain - Name Server and tools"
 url="http://www.isc.org"
 license="as-is"
-depends=uclibc
+depends=
 makedepends="openssl-dev"
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-tools"
diff --git a/main/busybox/0001-install-compat-fix-for-mode-of-created-files.patch b/main/busybox/0001-install-compat-fix-for-mode-of-created-files.patch
new file mode 100644
index 00000000..a17ca235
--- /dev/null
+++ b/main/busybox/0001-install-compat-fix-for-mode-of-created-files.patch
@@ -0,0 +1,40 @@
+From 1f363a086779152ab04067e81484b8bb69e4af72 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 15 Jun 2009 18:13:51 +0200
+Subject: [PATCH] install: compat fix for mode of created files.
+
+By Mat Hostetter (mhostetter AT tilera.com)
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ coreutils/install.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/coreutils/install.c b/coreutils/install.c
+index 24fb402..2e604be 100644
+--- a/coreutils/install.c
++++ b/coreutils/install.c
+@@ -129,7 +129,7 @@ int install_main(int argc, char **argv)
+ 	if (opts & OPT_PRESERVE_TIME) {
+ 		copy_flags |= FILEUTILS_PRESERVE_STATUS;
+ 	}
+-	mode = 0666;
++	mode = 0755; /* GNU coreutils 6.10 compat */
+ 	if (opts & OPT_MODE)
+ 		bb_parse_mode(mode_str, &mode);
+ 	uid = (opts & OPT_OWNER) ? get_ug_id(uid_str, xuname2uid) : getuid();
+@@ -175,8 +175,9 @@ int install_main(int argc, char **argv)
+ 			}
+ 		}
+ 
+-		/* Set the file mode */
+-		if ((opts & OPT_MODE) && chmod(dest, mode) == -1) {
++		/* Set the file mode (always, not only with -m).
++		 * GNU coreutils 6.10 is not affected by umask. */
++		if (chmod(dest, mode) == -1) {
+ 			bb_perror_msg("can't change %s of %s", "permissions", dest);
+ 			ret = EXIT_FAILURE;
+ 		}
+-- 
+1.6.3.3
+
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 94621bb4..3a5a6f87 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,17 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
-pkgver=1.14.2
-pkgrel=2
+pkgver=1.14.3
+pkgrel=0
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 license="GPL-2"
 depends=
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
-	busybox-1.14.2-df.patch
-	busybox-1.14.2-ls.patch
-	busybox-1.14.2-udhcpd.patch
 	$pkgname-1.11.1-bb.patch
+	0001-install-compat-fix-for-mode-of-created-files.patch
 	bb-tar-numeric-owner.patch
 	$install
 	busyboxconfig"
@@ -46,11 +44,9 @@ build() {
 	ln -s /bin/busybox "$pkgdir"/bin/sh
 }
 
-md5sums="c13b09b4125688d5fca5c95a79bf814a  busybox-1.14.2.tar.bz2
-a34c5e72c3f5308838ddc3bf70642136  busybox-1.14.2-df.patch
-b261df2f193bb97d8e3e59e02c957780  busybox-1.14.2-ls.patch
-ca9a77bd4f6000d2b031a2cee555fcd6  busybox-1.14.2-udhcpd.patch
+md5sums="d170bf5f97a41aec3a505eab690d5699  busybox-1.14.3.tar.bz2
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
+73d39c57483084298c7e46bdbbbea8d1  0001-install-compat-fix-for-mode-of-created-files.patch
 0b5b2d7db201f90cd08f4a3164ee29a1  bb-tar-numeric-owner.patch
 56b78c358797cd15fb64719a48939267  busybox.post-install
 56b78c358797cd15fb64719a48939267  busybox.post-upgrade
diff --git a/main/busybox/busybox-1.14.2-df.patch b/main/busybox/busybox-1.14.2-df.patch
deleted file mode 100644
index 7829f5fb..00000000
--- a/main/busybox/busybox-1.14.2-df.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- busybox-1.14.2/coreutils/df.c	Sun Jul  5 22:59:28 2009
-+++ busybox-1.14.2-df/coreutils/df.c	Sun Jul  5 23:00:09 2009
-@@ -44,7 +44,6 @@
- 	FILE *mount_table;
- 	struct mntent *mount_entry;
- 	struct statfs s;
--	static const char ignored_mounts[] ALIGN1 = "rootfs\0";
- 
- 	enum {
- 		OPT_KILO  = (1 << 0),
-@@ -120,7 +119,7 @@
- 			mount_point = *argv++;
- 			if (!mount_point)
- 				break;
--			mount_entry = find_mount_point(mount_point, bb_path_mtab_file);
-+			mount_entry = find_mount_point(mount_point);
- 			if (!mount_entry) {
- 				bb_error_msg("%s: can't find mount point", mount_point);
-  set_error:
-@@ -154,8 +153,8 @@
- 						) / (blocks_used + s.f_bavail);
- 			}
- 
--			/* GNU coreutils 6.10 skip certain mounts, try to be compatible.  */
--			if (index_in_strings(device, ignored_mounts) != -1)
-+			/* GNU coreutils 6.10 skips certain mounts, try to be compatible.  */
-+			if (strcmp(device, "rootfs") == 0)
- 				continue;
- 
- #ifdef WHY_WE_DO_IT_FOR_DEV_ROOT_ONLY
---- busybox-1.14.2/include/libbb.h	Sun Jul  5 22:59:31 2009
-+++ busybox-1.14.2-df/include/libbb.h	Sun Jul  5 23:00:09 2009
-@@ -1025,7 +1025,7 @@
- 
- #ifdef HAVE_MNTENT_H
- extern int match_fstype(const struct mntent *mt, const char *fstypes) FAST_FUNC;
--extern struct mntent *find_mount_point(const char *name, const char *table) FAST_FUNC;
-+extern struct mntent *find_mount_point(const char *name) FAST_FUNC;
- #endif
- extern void erase_mtab(const char * name) FAST_FUNC;
- extern unsigned int tty_baud_to_value(speed_t speed) FAST_FUNC;
---- busybox-1.14.2/libbb/find_mount_point.c	Sun Jul  5 22:59:24 2009
-+++ busybox-1.14.2-df/libbb/find_mount_point.c	Sun Jul  5 23:00:09 2009
-@@ -17,7 +17,7 @@
-  * Given any other file (or directory), find the mount table entry for its
-  * filesystem.
-  */
--struct mntent* FAST_FUNC find_mount_point(const char *name, const char *table)
-+struct mntent* FAST_FUNC find_mount_point(const char *name)
- {
- 	struct stat s;
- 	dev_t mountDevice;
-@@ -25,27 +25,35 @@
- 	struct mntent *mountEntry;
- 
- 	if (stat(name, &s) != 0)
--		return 0;
-+		return NULL;
- 
--	if ((s.st_mode & S_IFMT) == S_IFBLK)
-+	if (S_ISBLK(s.st_mode))
- 		mountDevice = s.st_rdev;
- 	else
- 		mountDevice = s.st_dev;
- 
- 
--	mountTable = setmntent(table ? table : bb_path_mtab_file, "r");
-+	mountTable = setmntent(bb_path_mtab_file, "r");
- 	if (!mountTable)
- 		return 0;
- 
--	while ((mountEntry = getmntent(mountTable)) != 0) {
-+	while ((mountEntry = getmntent(mountTable)) != NULL) {
-+		/* rootfs mount in Linux 2.6 exists always,
-+		 * and it makes sense to always ignore it.
-+		 * Otherwise people can't reference their "real" root! */
-+		if (strcmp(mountEntry->mnt_fsname, "rootfs") == 0)
-+			continue;
-+
- 		if (strcmp(name, mountEntry->mnt_dir) == 0
- 		 || strcmp(name, mountEntry->mnt_fsname) == 0
- 		) { /* String match. */
- 			break;
- 		}
--		if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice)	/* Match the device. */
-+		/* Match the device. */
-+		if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice)
- 			break;
--		if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice)	/* Match the directory's mount point. */
-+		/* Match the directory's mount point. */
-+		if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice)
- 			break;
- 	}
- 	endmntent(mountTable);
---- busybox-1.14.2/util-linux/mkfs_minix.c	Sun Jul  5 22:59:30 2009
-+++ busybox-1.14.2-df/util-linux/mkfs_minix.c	Sun Jul  5 23:00:09 2009
-@@ -624,7 +624,6 @@
- int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
- {
--	struct mntent *mp;
- 	unsigned opt;
- 	char *tmp;
- 	struct stat statbuf;
-@@ -683,11 +682,8 @@
- 		G.total_blocks = 65535;
- 
- 	/* Check if it is mounted */
--	mp = find_mount_point(G.device_name, NULL);
--	if (mp && strcmp(G.device_name, mp->mnt_fsname) == 0)
--		bb_error_msg_and_die("%s is mounted on %s; "
--				"refusing to make a filesystem",
--				G.device_name, mp->mnt_dir);
-+	if (find_mount_point(G.device_name))
-+		bb_error_msg_and_die("can't format mounted filesystem");
- 
- 	xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
- 	if (fstat(dev_fd, &statbuf) < 0)
---- busybox-1.14.2/util-linux/mkfs_vfat.c	Sun Jul  5 22:59:30 2009
-+++ busybox-1.14.2-df/util-linux/mkfs_vfat.c	Sun Jul  5 23:00:35 2009
-@@ -273,10 +273,10 @@
- 			device_num == 0x0d00 || // xd
- 			device_num == 0x1600 )  // hdc, hdd
- 		)
--			bb_error_msg_and_die("Will not try to make filesystem on full-disk device (use -I if wanted)");
-+			bb_error_msg_and_die("will not try to make filesystem on full-disk device (use -I if wanted)");
- 		// can't work on mounted filesystems
--		if (find_mount_point(device_name, NULL))
--			bb_error_msg_and_die("Can't format mounted filesystem");
-+		if (find_mount_point(device_name))
-+			bb_error_msg_and_die("can't format mounted filesystem");
- #endif
- 		// get true sector size
- 		// (parameter must be int*, not long* or size_t*)
diff --git a/main/busybox/busybox-1.14.2-ls.patch b/main/busybox/busybox-1.14.2-ls.patch
deleted file mode 100644
index 64e0a94f..00000000
--- a/main/busybox/busybox-1.14.2-ls.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff -urpN busybox-1.14.2/coreutils/ls.c busybox-1.14.2-ls/coreutils/ls.c
---- busybox-1.14.2/coreutils/ls.c	2009-06-22 00:40:29.000000000 +0200
-+++ busybox-1.14.2-ls/coreutils/ls.c	2009-07-03 12:46:16.000000000 +0200
-@@ -144,8 +144,7 @@ static const char ls_options[] ALIGN1 =
- 	USE_FEATURE_LS_FOLLOWLINKS("L")   /* 1, 24 */
- 	USE_FEATURE_LS_RECURSIVE("R")     /* 1, 25 */
- 	USE_FEATURE_HUMAN_READABLE("h")   /* 1, 26 */
--	USE_SELINUX("K") /* 1, 27 */
--	USE_SELINUX("Z") /* 1, 28 */
-+	USE_SELINUX("KZ") /* 2, 28 */
- 	USE_FEATURE_AUTOWIDTH("T:w:") /* 2, 30 */
- 	;
- enum {
-@@ -162,6 +161,16 @@ enum {
- 	OPT_Q = (1 << 10),
- 	//OPT_A = (1 << 11),
- 	//OPT_k = (1 << 12),
-+	OPTBIT_color = 13
-+		+ 4 * ENABLE_FEATURE_LS_TIMESTAMPS
-+		+ 4 * ENABLE_FEATURE_LS_SORTFILES
-+		+ 2 * ENABLE_FEATURE_LS_FILETYPES
-+		+ 1 * ENABLE_FEATURE_LS_FOLLOWLINKS
-+		+ 1 * ENABLE_FEATURE_LS_RECURSIVE
-+		+ 1 * ENABLE_FEATURE_HUMAN_READABLE
-+		+ 2 * ENABLE_SELINUX
-+		+ 2 * ENABLE_FEATURE_AUTOWIDTH,
-+	OPT_color = 1 << OPTBIT_color,
- };
- 
- enum {
-@@ -889,16 +898,6 @@ static int list_single(const struct dnod
- }
- 
- 
--/* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
--#if ENABLE_FEATURE_LS_COLOR
--/* long option entry used only for --color, which has no short option
-- * equivalent */
--static const char ls_color_opt[] ALIGN1 =
--	"color\0" Optional_argument "\xff" /* no short equivalent */
--	;
--#endif
--
--
- int ls_main(int argc UNUSED_PARAM, char **argv)
- {
- 	struct dnode **dnd;
-@@ -911,8 +910,25 @@ int ls_main(int argc UNUSED_PARAM, char 
- 	int dnfiles;
- 	int dndirs;
- 	int i;
-+#if ENABLE_FEATURE_LS_COLOR
-+	/* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
-+	/* coreutils 6.10:
-+	 * # ls --color=BOGUS
-+	 * ls: invalid argument 'BOGUS' for '--color'
-+	 * Valid arguments are:
-+	 * 'always', 'yes', 'force'
-+	 * 'never', 'no', 'none'
-+	 * 'auto', 'tty', 'if-tty'
-+	 * (and substrings: "--color=alwa" work too)
-+	 */
-+	static const char ls_longopts[] ALIGN1 =
-+		"color\0" Optional_argument "\xff"; /* no short equivalent */
-+	static const char color_str[] ALIGN1 =
-+		"always\0""yes\0""force\0"
-+		"auto\0""tty\0""if-tty\0";
- 	/* need to initialize since --color has _an optional_ argument */
--	USE_FEATURE_LS_COLOR(const char *color_opt = "always";)
-+	const char *color_opt = color_str; /* "always" */
-+#endif
- 
- 	INIT_G();
- 
-@@ -927,7 +943,7 @@ int ls_main(int argc UNUSED_PARAM, char 
- #endif
- 
- 	/* process options */
--	USE_FEATURE_LS_COLOR(applet_long_options = ls_color_opt;)
-+	USE_FEATURE_LS_COLOR(applet_long_options = ls_longopts;)
- #if ENABLE_FEATURE_AUTOWIDTH
- 	opt_complementary = "T+:w+"; /* -T N, -w N */
- 	opt = getopt32(argv, ls_options, &tabstops, &terminal_width
-@@ -966,13 +982,20 @@ int ls_main(int argc UNUSED_PARAM, char 
- 		if (!p || (p[0] && strcmp(p, "none") != 0))
- 			show_color = 1;
- 	}
--	if (opt & (1 << i)) {  /* next flag after short options */
--		if (strcmp("always", color_opt) == 0)
--			show_color = 1;
--		else if (strcmp("never", color_opt) == 0)
-+	if (opt & OPT_color) {
-+		if (color_opt[0] == 'n')
- 			show_color = 0;
--		else if (strcmp("auto", color_opt) == 0 && isatty(STDOUT_FILENO))
--			show_color = 1;
-+		else switch (index_in_substrings(color_str, color_opt)) {
-+		case 3:
-+		case 4:
-+		case 5:
-+			if (isatty(STDOUT_FILENO)) {
-+		case 0:
-+		case 1:
-+		case 2:
-+				show_color = 1;
-+			}
-+		}
- 	}
- #endif
- 
-diff -urpN busybox-1.14.2/testsuite/ls/ls-1-works busybox-1.14.2-ls/testsuite/ls/ls-1-works
---- busybox-1.14.2/testsuite/ls/ls-1-works	2009-06-22 00:32:00.000000000 +0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-1-works	2009-07-02 14:28:45.000000000 +0200
-@@ -1,4 +1,4 @@
- [ -n "$d" ] || d=..
--ls -1 "$d" > logfile.gnu
--busybox ls -1 "$d" > logfile.bb
--cmp logfile.gnu logfile.bb
-+LC_ALL=C ls -1 "$d" > logfile.gnu
-+LC_ALL=C busybox ls -1 "$d" > logfile.bb
-+diff -ubw logfile.gnu logfile.bb
-diff -urpN busybox-1.14.2/testsuite/ls/ls-h-works busybox-1.14.2-ls/testsuite/ls/ls-h-works
---- busybox-1.14.2/testsuite/ls/ls-h-works	2009-06-22 00:32:00.000000000 +0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-h-works	2009-07-02 14:28:45.000000000 +0200
-@@ -1,4 +1,4 @@
- [ -n "$d" ] || d=..
--ls -h "$d" > logfile.gnu
--busybox ls -h "$d" > logfile.bb
--cmp logfile.gnu logfile.bb
-+LC_ALL=C ls -h "$d" > logfile.gnu
-+LC_ALL=C busybox ls -h "$d" > logfile.bb
-+diff -ubw logfile.gnu logfile.bb
-diff -urpN busybox-1.14.2/testsuite/ls/ls-l-works busybox-1.14.2-ls/testsuite/ls/ls-l-works
---- busybox-1.14.2/testsuite/ls/ls-l-works	2009-06-22 00:32:00.000000000 +0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-l-works	2009-07-02 14:28:45.000000000 +0200
-@@ -1,4 +1,4 @@
- [ -n "$d" ] || d=..
- LC_ALL=C ls -l "$d" > logfile.gnu
--busybox ls -l "$d" > logfile.bb
--diff -w logfile.gnu logfile.bb
-+LC_ALL=C busybox ls -l "$d" > logfile.bb
-+diff -ubw logfile.gnu logfile.bb
-diff -urpN busybox-1.14.2/testsuite/ls/ls-s-works busybox-1.14.2-ls/testsuite/ls/ls-s-works
---- busybox-1.14.2/testsuite/ls/ls-s-works	2009-06-22 00:32:00.000000000 +0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-s-works	2009-07-02 14:28:45.000000000 +0200
-@@ -1,4 +1,4 @@
- [ -n "$d" ] || d=..
- LC_ALL=C ls -1s "$d" > logfile.gnu
--busybox ls -1s "$d" > logfile.bb
--cmp logfile.gnu logfile.bb
-+LC_ALL=C busybox ls -1s "$d" > logfile.bb
-+diff -ubw logfile.gnu logfile.bb
diff --git a/main/busybox/busybox-1.14.2-udhcpd.patch b/main/busybox/busybox-1.14.2-udhcpd.patch
deleted file mode 100644
index a1502b41..00000000
--- a/main/busybox/busybox-1.14.2-udhcpd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpN busybox-1.14.2/networking/udhcp/files.c busybox-1.14.2-udhcpd/networking/udhcp/files.c
---- busybox-1.14.2/networking/udhcp/files.c	2009-06-22 00:40:29.000000000 +0200
-+++ busybox-1.14.2-udhcpd/networking/udhcp/files.c	2009-07-07 14:58:39.000000000 +0200
-@@ -420,7 +420,7 @@ void FAST_FUNC read_leases(const char *f
- 				continue;
- 			/* NB: add_lease takes "relative time", IOW,
- 			 * lease duration, not lease deadline. */
--			if (!(add_lease(lease.chaddr, lease.yiaddr, expires, lease.hostname))) {
-+			if (!(add_lease(lease.chaddr, lease.yiaddr, expires, NULL /* was lease.hostname. bug in add_lease, disabled */ ))) {
- 				bb_error_msg("too many leases while loading %s", file);
- 				break;
- 			}
diff --git a/main/clamsmtp/APKBUILD b/main/clamsmtp/APKBUILD
index 82442549..1049f271 100644
--- a/main/clamsmtp/APKBUILD
+++ b/main/clamsmtp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=clamsmtp
 pkgver=1.10
-pkgrel=3
+pkgrel=4
 pkgdesc="An SMTP Virus Filter"
 url="http://memberwebs.com/stef/software/clamsmtp/"
 license="as-is"
@@ -26,8 +26,8 @@ build() {
 	make DESTDIR="$pkgdir" install || return 1
 
 	install -Dm644 doc/clamsmtpd.conf "$pkgdir"/etc/clamsmtpd.conf
-	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+	install -Dm755 "$srcdir"/clamsmtpd.initd "$pkgdir"/etc/init.d/clamsmtpd
+	install -Dm644 "$srcdir"/clamsmtpd.confd "$pkgdir"/etc/conf.d/clamsmtpd
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index 0d45e287..b986f9c9 100644
--- a/main/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
@@ -1,6 +1,6 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 pkgname=ctags
-pkgver=5.7
+pkgver=5.8
 pkgrel=0
 pkgdesc="Generator of tags for all types of C/C++ languages"
 url="http://ctags.sourceforge.net/"
@@ -23,4 +23,4 @@ build() {
 	install -m755 -D $pkgname "$pkgdir"/usr/bin/$pkgname
 }
 
-md5sums="643cab63b39c8a24377dc4c781547d40  ctags-5.7.tar.gz"
+md5sums="c00f82ecdcc357434731913e5b48630d  ctags-5.8.tar.gz"
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 01bb25e9..284e15ee 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -2,14 +2,14 @@
 pkgname=dhcp
 pkgver=4.1.0_p1
 _realver=4.1.0p1
-pkgrel=0
+pkgrel=1
 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
 url="https://www.isc.org/"
 license="GPL"
 depends=
 makedepends=
-install="dhcp.pre-upgrade dhcp.post-upgrade"
-subpackages="$pkgname-doc $pkgname-dev"
+install="dhcp.pre-install dhcp.pre-upgrade dhcp.post-upgrade"
+subpackages="$pkgname-doc $pkgname-dev dhclient"
 source="http://ftp.isc.org/isc/dhcp/$pkgname-$_realver.tar.gz
 	$install
 	dhcpd.confd
@@ -19,7 +19,14 @@ build() {
 	cd "$srcdir/$pkgname-$_realver"
 
 	./configure --prefix=/usr \
-		--sysconfdir=/etc \
+		--sysconfdir=/etc/dhcp \
+		--with-cli-pid-file=/var/run/dhcp/dhclient.pid \
+		--with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
+		--with-srv-pid-file=/var/run/dhcp/dhcpd.pid \
+		--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+		--with-relay-pid-file=/var/run/dhcp/dhcrelay.pid \
+		--enable-dhcpv6 \
+		--enable-paranoia \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
@@ -27,10 +34,23 @@ build() {
 
 	install -m755 -D "$srcdir"/dhcpd.initd "$pkgdir"/etc/init.d/dhcpd
 	install -m644 -D "$srcdir"/dhcpd.confd "$pkgdir"/etc/conf.d/dhcpd
+	install -d "$pkgdir"/var/lib/dhcp
+	install -d "$pkgdir"/var/run/dhcp
+}
+
+dhclient() {
+	pkgdesc="ISC dhcp client"
+	install -d "$subpkgdir"/var/lib/dhcp
+	install -d "$subpkgdir"/var/run/dhcp
+	install -d "$subpkgdir"/usr/sbin
+	install -d "$subpkgdir"/etc/dhcp
+	mv "$pkgdir"/usr/sbin/dhclient "$subpkgdir"/usr/sbin/
+	mv "$pkgdir"/etc/dhcp/dhclient.conf "$subpkgdir"/etc/dhcp/
 }
 
 md5sums="325ff8338c5a21f89d5304ac13ffebdf  dhcp-4.1.0p1.tar.gz
+19b28380eaae7d26027c29b623aeee07  dhcp.pre-install
 6cc49497f3c30ccd37fc7c032f7810c6  dhcp.pre-upgrade
-a7b81948ceab73dd10de275ebc00e7eb  dhcp.post-upgrade
+36d562e5b0e55a36e4224fd7cb843f6a  dhcp.post-upgrade
 df32707f5bbe5363306420b5dc6e6b40  dhcpd.confd
-5df9a87539bedc98a1cbc7e38b290928  dhcpd.initd"
+6ed5ddba2b445ef60d27a8b7f5a0ee0b  dhcpd.initd"
diff --git a/main/dhcp/dhcp.post-install b/main/dhcp/dhcp.post-install
new file mode 100644
index 00000000..01195dbd
--- /dev/null
+++ b/main/dhcp/dhcp.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+chown dhcp:dhcp var/run/dhcp var/lib/dhcp
+exit 0
+
diff --git a/main/dhcp/dhcp.post-upgrade b/main/dhcp/dhcp.post-upgrade
index b16fea6b..19df74a4 100644
--- a/main/dhcp/dhcp.post-upgrade
+++ b/main/dhcp/dhcp.post-upgrade
@@ -5,7 +5,8 @@
 moved=
 for i in /etc/runlevel/*/dhcp; do
 	if [ -L "$i" ]; then
-		mv ${i} ${i}d
+                rm $i
+		ln -s /etc/init.d/clamsmtpd ${i}d
 		moved=1
 	fi
 done
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
new file mode 100644
index 00000000..9c623bfb
--- /dev/null
+++ b/main/dhcp/dhcp.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+adduser -h /var/lib/dhcp -s /bin/false -D dhcp 2>/dev/null
+exit 0
+
diff --git a/main/dhcp/dhcpd.initd b/main/dhcp/dhcpd.initd
index cc9727fc..82cb26e7 100644
--- a/main/dhcp/dhcpd.initd
+++ b/main/dhcp/dhcpd.initd
@@ -1,7 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-misc/dhcp/files/dhcpd.init,v 1.5 2007/04/02 12:34:01 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init2,v 1.1 2009/07/09 14:45:22 chainsaw Exp $
+
+opts="configtest"
 
 DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf}
 
@@ -15,6 +17,23 @@ get_var() {
 		"${DHCPD_CHROOT}/${DHCPD_CONF}"
 }
 
+checkconfig() {
+	/usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t 1>/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} has detected a syntax error in your configuration files:"
+		/usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t
+	fi
+
+	return $ret
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $?
+}
+
 start() {
 	# Work out our cffile if it's on our DHCPD_OPTS
 	case " ${DHCPD_OPTS} " in
@@ -32,6 +51,8 @@ start() {
 		return 1
 	fi
 
+	checkconfig || return 1
+
 	local leasefile="$(get_var lease-file-name)"
 	leasefile="${DHCPD_CHROOT}/${leasefile:-/var/lib/dhcp/dhcpd.leases}"
 	if [ ! -f "${leasefile}" ] ; then
@@ -63,10 +84,11 @@ start() {
 
 stop() {
 	local chroot="$(get_options chroot)"
+	
+	checkconfig || return 1
 
 	ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
 	start-stop-daemon --stop --exec /usr/sbin/dhcpd \
 	    --pidfile "${chroot}/$(get_options pidfile)"
 	eend $?
 }
-
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD
index 0596907a..297f99ac 100644
--- a/main/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=djbdns
 pkgver=1.05
-pkgrel=26
+pkgrel=27
 pkgdesc="Excellent high-performance DNS services"
 url="http://cr.yp.to/djbdns.html"
 license="public-domain"
@@ -82,5 +82,5 @@ c7be73fe2fb4ae02d5096fa2c1f55a68  1.05-errno.patch
 e8a84fc4ee5ff1525b4f74889422e93c  tinydns.initd
 7dcf6674c07d46c736b3c25d9c92384a  tinydns.confd
 e09c3a6ba6917e16f4736ab5c070dbe9  dnscache.pre-install
-e368a86ddc320937d663dd47684ba410  dnscache.initd
+1f6d29a29382e0bb7e865aede9e07c9d  dnscache.initd
 e2938593277d7a87806e70e145a90c3f  dnscache.confd"
diff --git a/main/djbdns/dnscache.initd b/main/djbdns/dnscache.initd
index 48102249..986094a1 100755
--- a/main/djbdns/dnscache.initd
+++ b/main/djbdns/dnscache.initd
@@ -3,17 +3,17 @@
 # written for alpine linux - NBA April 2007
 
 # -- Statrup variables 
-UID=$( grep dnscache /etc/passwd | cut -f3 -d: )
-GID=$( grep dnscache /etc/group | cut -f3 -d: )
 ROOT=/etc/dnscache
 DAEMON=/usr/bin/dnscache
-VARRUN=/var/run/dnscache
+PIDFILE=/var/run/dnscache.pid
 
 
 #-----------------------------------------------------------------
 # Main program
 
 start() {
+	UID=$( grep dnscache /etc/passwd | cut -f3 -d: )
+	GID=$( grep dnscache /etc/group | cut -f3 -d: )
 	
 	ebegin "Starting dnscache"
 	if [ -z "$UID" ] || [ -z "$GID" ]; then
@@ -21,39 +21,17 @@ start() {
 		return 1
 	fi
 	
-	# if its already running, just report it is
-	if [ -e ${VARRUN}.pid ] && [ -d /proc/$( cat ${VARRUN}.pid ) ]; then
-		eend 0
-		return 0
-	fi
-	
-	(
-		export UID GID ROOT
-		[ -n "$IPSEND" ] 	&& export IPSEND
-		[ -n "$IP" ] 		&& export IP
-		[ -n "$HIDETTL" ] 	&& export HIDETTL
-		[ -n "$IPSEND" ] 	&& export IPSEND
-		[ -n "$CACHESIZE" ] 	&& export CACHESIZE
-		[ -n "$FORWARDONLY" ] 	&& export FORWARDONLY
-
-		$DAEMON </dev/urandom >/dev/null 2>/dev/null &
-		pid=$!
-		sleep 1
-		# Check if its still running
-		if ! [ -d /proc/$pid ]; then
-			$DAEMON </dev/urandom
-			return 1
-		fi
-		echo $pid > ${VARRUN}.pid
-		eend $?
-		return 0
-	)
+	start-stop-daemon --start --env "UID=$UID" --env "GID=$GID" \
+		--env "ROOT=$ROOT" --env "IP=$IP" --env "IPSEND=$IPSEND" \
+		--env "HIDETTL=$HIDETTL" --env "CACHESIZE=$CACHESIZE" \
+		--env "FORWARDONLY=$FORWARDONLY" --pidfile $PIDFILE \
+		--background --make-pidfile --exec $DAEMON 
+	eend $?
 }
 
 stop() {
 	ebegin "Stopping dnscache"
-	start-stop-daemon --stop -m --pidfile ${VARRUN}.pid --oknodo \
-		--exec $DAEMON && rm ${VARRUN}.pid
-	eend $?
+        start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON
+        eend $?
 }
 
diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD
index 48642447..e881fd21 100644
--- a/main/dosfstools/APKBUILD
+++ b/main/dosfstools/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dosfstools
-pkgver=3.0.2
+pkgver=3.0.5
 pkgrel=0
 pkgdesc="DOS filesystem utilities"
 url="http://www.daniel-baumann.ch/software/dosfstools/"
@@ -18,4 +18,4 @@ build() {
 		DOCDIR="$pkgdir"/usr/share/doc \
 		install
 }
-md5sums="399a5c48df43ba73f334099dbf4820d3  dosfstools-3.0.2.tar.bz2"
+md5sums="0ac8c2119d2288958f4e2fd3dd942657  dosfstools-3.0.5.tar.bz2"
diff --git a/main/gawk/APKBUILD b/main/gawk/APKBUILD
index 5bcd518d..fbc2daaa 100644
--- a/main/gawk/APKBUILD
+++ b/main/gawk/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gawk
-pkgver=3.1.6
-pkgrel=1
+pkgver=3.1.7
+pkgrel=0
 pkgdesc="GNU awk pattern-matching language"
 url="http://www.gnu.org/software/gawk/gawk.html"
 license="GPL"
-depends="uclibc"
+depends=
 makedepends=""
 install="$pkgname.post-deinstall"
 subpackages="$pkgname-doc"
@@ -26,5 +26,5 @@ build() {
 
 }
 
-md5sums="b237751aef53c9ead9644e376bc53386  gawk-3.1.6.tar.gz
+md5sums="a38d5dec19320ace01f1d16c8beb1363  gawk-3.1.7.tar.gz
 b84506d253e04db3c5af9016fead45a3  gawk.post-deinstall"
diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
index bdb3c16c..9c085710 100644
--- a/main/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=irssi
-pkgver=0.8.13
-#_pkgver=0.8.13-rc1
+pkgver=0.8.14
+#_pkgver=0.8.14
 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 g++"
+makedepends="glib-dev openssl-dev ncurses-dev perl-dev pkgconfig"
 source="http://irssi.org/files/irssi-${pkgver}.tar.bz2"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-perl"
 
@@ -31,4 +31,4 @@ perl() {
 	mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/
 }
 
-md5sums="0d6fc2203832b514eff014fffd574664  irssi-0.8.13.tar.bz2"
+md5sums="00efe7638dd596d5930dfa2aeae87b3a  irssi-0.8.14.tar.bz2"
diff --git a/main/less/APKBUILD b/main/less/APKBUILD
index 0567914a..188a7b91 100644
--- a/main/less/APKBUILD
+++ b/main/less/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Cameron Banta <cbanta@gmail.com>
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=less
-pkgver=429
+pkgver=436
 pkgrel=0
 pkgdesc="File pager"
 url="http://www.greenwoodsoftware.com/less/"
@@ -24,5 +24,5 @@ build() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="206f2f13b9b0a35e45df660fcb6af31d  less-429.tar.gz
+md5sums="817bf051953ad2dea825a1cdf460caa4  less-436.tar.gz
 b84506d253e04db3c5af9016fead45a3  less.post-deinstall"
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD
index 239573c1..e1b4bc79 100644
--- a/main/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=lftp
-pkgver=3.7.14
-pkgrel=1
+pkgver=3.7.15
+pkgrel=0
 pkgdesc="LFTP is sophisticated ftp/http client"
 url="http://lftp.yar.ru/"
 license="GPL"
@@ -28,4 +28,4 @@ build() {
 
 }
 
-md5sums="723d372833d6a94c15cc78cc98565517  lftp-3.7.14.tar.bz2"
+md5sums="bb2e116d2fcf3544805efd4b6463316e  lftp-3.7.15.tar.bz2"
diff --git a/main/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD
index 7f3aee35..95fc12b0 100644
--- a/main/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnetfilter_conntrack
-pkgver=0.0.99
+pkgver=0.0.100
 pkgrel=0
 pkgdesc="programming interface (API) to the in-kernel connection tracking state table"
 url="http://www.netfilter.org/projects/libnetfilter_conntrack/"
@@ -23,4 +23,4 @@ build() {
 
 }
 
-md5sums="960c3d347d7f4e3fe7437aa198f36e6e  libnetfilter_conntrack-0.0.99.tar.bz2"
+md5sums="c047cea509621cf2abed0718cb210972  libnetfilter_conntrack-0.0.100.tar.bz2"
diff --git a/main/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index 63519aec..69f887b3 100644
--- a/main/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnfnetlink
-pkgver=0.0.41
+pkgver=1.0.0
 pkgrel=0
 pkgdesc="low-level library for netfilter related kernel/userspace communication"
 url="http://www.netfilter.org/projects/libnfnetlink/"
@@ -21,4 +21,4 @@ build() {
 	make || return 1
 	make DESTDIR="$pkgdir" install
 }
-md5sums="5d844ea1f557bad0364d5b85cd10c796  libnfnetlink-0.0.41.tar.bz2"
+md5sums="016fdec8389242615024c529acc1adb8  libnfnetlink-1.0.0.tar.bz2"
diff --git a/main/libpng/APKBUILD b/main/libpng/APKBUILD
index 3d97159e..2080730b 100644
--- a/main/libpng/APKBUILD
+++ b/main/libpng/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=libpng
-pkgver=1.2.37
+pkgver=1.2.38
 pkgrel=0
 pkgdesc="Portable Network Graphics library"
 url="http://www.libpng.org/"
@@ -24,4 +24,4 @@ build() {
 	install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE || return 1
 }
 
-md5sums="7480dbbf9f6c3297faf6fe52ec9b91ab  libpng-1.2.37.tar.gz"
+md5sums="99900634a47041607a031aa597d51e65  libpng-1.2.38.tar.gz"
diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD
index b47b21cb..77cafba2 100644
--- a/main/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=man-pages
-pkgver=3.21
+pkgver=3.22
 _posixver=2003-a
 pkgrel=0
 pkgdesc="Linux man pages"
@@ -24,5 +24,5 @@ build ()
 	done
 	make prefix="$pkgdir"/usr install || return 1
 }
-md5sums="05eb6e209375f24cd40c7b106323d1c3  man-pages-3.21.tar.gz
+md5sums="409e7325188d8734a63c823fd58c7dce  man-pages-3.22.tar.gz
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2"
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index d6dda347..6cd2f734 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
-pkgver=1.7
+pkgver=1.9
 pkgrel=0
 pkgdesc="Tool to generate initramfs images for Alpine"
 url=http://git.alpinelinux.org/cgit/mkinitfs
@@ -13,4 +13,4 @@ build() {
 	make
 	make install DESTDIR="$pkgdir" || return 1
 }
-md5sums="56ab75d5f094e75ef242394280d7ecd1  mkinitfs-1.7.tar.bz2"
+md5sums="73d4b39bb7d7ad61c609d1fb295897a3  mkinitfs-1.9.tar.bz2"
diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD
index 383b80ee..d394f103 100644
--- a/main/openssl/APKBUILD
+++ b/main/openssl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openssl
 pkgver=0.9.8k
-pkgrel=4
+pkgrel=5
 pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
 url=http://openssl.org
 depends=
@@ -44,4 +44,4 @@ md5sums="e555c6d58d276aec7fdc53363e338ab3  openssl-0.9.8k.tar.gz
 04a6a88c2ee4badd4f8649792b73eaf3  openssl-0.9.8g-fix_manpages-1.patch
 c6a9857a5dbd30cead0404aa7dd73977  openssl-bb-basename.patch
 c838eb8488896cfeb7de957a0cbe04ae  openssl-0.9.8k-quote-cc.patch
-1f506efd30e97b9a0f3fe16c53222b21  openssl-0.9.8k-padlock-sha.patch"
+86b7f1bf50e1f3ba407ec62001a51a0d  openssl-0.9.8k-padlock-sha.patch"
diff --git a/main/openssl/openssl-0.9.8k-padlock-sha.patch b/main/openssl/openssl-0.9.8k-padlock-sha.patch
index 7a89f434..b2e7e954 100644
--- a/main/openssl/openssl-0.9.8k-padlock-sha.patch
+++ b/main/openssl/openssl-0.9.8k-padlock-sha.patch
@@ -7,7 +7,7 @@
 Index: openssl-0.9.8k/crypto/engine/eng_padlock.c
 ===================================================================
 --- openssl-0.9.8k.orig/crypto/engine/eng_padlock.c	2009-07-27 16:18:20.000000000 +0300
-+++ openssl-0.9.8k/crypto/engine/eng_padlock.c	2009-07-27 16:18:50.000000000 +0300
++++ openssl-0.9.8k/crypto/engine/eng_padlock.c	2009-07-30 22:02:54.000000000 +0300
 @@ -1,10 +1,13 @@
 -/* 
 +/*
@@ -147,14 +147,14 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c
  #ifndef OPENSSL_NO_AES
 -	    (padlock_use_ace && !ENGINE_set_ciphers (e, padlock_ciphers)) ||
 +	    || (PADLOCK_HAVE_ACE && !ENGINE_set_ciphers (e, padlock_ciphers))
-+#endif
+ #endif
+-	    (padlock_use_rng && !ENGINE_set_RAND (e, &padlock_rand))) {
 +#ifndef OPENSSL_NO_SHA
 +	    || (PADLOCK_HAVE_PHE && !ENGINE_set_digests (e, padlock_digests))
 +#endif
 +#ifndef PADLOCK_NO_RNG
 +	    || (PADLOCK_HAVE_RNG && !ENGINE_set_RAND (e, &padlock_rand))
- #endif
--	    (padlock_use_rng && !ENGINE_set_RAND (e, &padlock_rand))) {
++#endif
 +	    ) {
  		return 0;
  	}
@@ -206,11 +206,11 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c
 +	padlock_flags |= ((edx & (0x3<<9)) ? PADLOCK_ACE2 : 0);
 +	padlock_flags |= ((edx & (0x3<<11)) ? PADLOCK_PHE : 0);
 +	padlock_flags |= ((edx & (0x3<<13)) ? PADLOCK_PMM : 0);
-+
-+	return padlock_flags;
-+}
  
 -	return padlock_use_ace + padlock_use_rng;
++	return padlock_flags;
++}
++
 +static inline void
 +padlock_htonl_block(uint32_t *data, size_t count)
 +{
@@ -287,7 +287,7 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c
     encryption function itself. This function is not AES-specific. */
  static int
  padlock_aes_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
-@@ -1157,6 +1214,511 @@
+@@ -1157,6 +1214,514 @@
  
  #endif /* OPENSSL_NO_AES */
  
@@ -296,7 +296,7 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c
 +#define DIGEST_DATA(ctx)	((struct padlock_digest_data *)(ctx->md_data))
 +#define PADLOCK_SHA_ALIGN(dd)	(uint32_t*)(((uintptr_t)(dd) + 15) & ~15)
 +#define PADLOCK_SHA_PAGES	14
-+#define PADLOCK_SHA_BUFFER	(1024 - sizeof(size_t) - 4*sizeof(void*))
++#define PADLOCK_SHA_BUFFER	(512 - sizeof(size_t) - 4*sizeof(void*))
 +#define PADLOCK_SHA_INITVECTOR_SIZE (8 * sizeof(uint32_t))
 +
 +struct padlock_digest_data {
@@ -648,12 +648,15 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c
 +	 * a "finalization copy", so we could do finalizing SHA here and
 +	 * store the result to *to precalculated. But there's no such
 +	 * flag as to is reset on copy. */
-+	if (dfrom->update == padlock_multi_update) {
++
++	if (dfrom->update != padlock_copy_update) {
 +		/* Recopy the context, as they might have different alignment */
 +		memcpy(PADLOCK_SHA_ALIGN(dto->padlockctx),
 +		       PADLOCK_SHA_ALIGN(dfrom->padlockctx),
 +		       PADLOCK_SHA_INITVECTOR_SIZE);
++	}
 +
++	if (dfrom->update == padlock_multi_update) {
 +		/* Update total, and copy the buffer */
 +		dto->total     = dfrom->total - dfrom->used;
 +		dto->buffer    = NULL;
@@ -799,7 +802,7 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c
  /* ===== Random Number Generator ===== */
  /*
   * This code is not engaged. The reason is that it does not comply
-@@ -1164,7 +1726,7 @@
+@@ -1164,7 +1729,7 @@
   * (posted at http://www.via.com.tw/en/viac3/c3.jsp) nor does it
   * provide meaningful error control...
   */
@@ -808,7 +811,7 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c
     the raw PadLock RNG */
  static int
  padlock_rand_bytes(unsigned char *output, int count)
-@@ -1212,6 +1774,7 @@
+@@ -1212,6 +1777,7 @@
  	padlock_rand_bytes,	/* pseudorand */
  	padlock_rand_status,	/* rand status */
  };
diff --git a/main/pciutils/APKBUILD b/main/pciutils/APKBUILD
index 1c41b6d0..22ea5c0b 100644
--- a/main/pciutils/APKBUILD
+++ b/main/pciutils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=pciutils
-pkgver=3.1.2
+pkgver=3.1.3
 pkgrel=0
 pkgdesc="PCI bus configuration space access library and tools"
 url="http://mj.ucw.cz/pciutils.html"
@@ -26,4 +26,4 @@ build() {
 
 }
 
-md5sums="b6cc13955ad769a25c475a87d2ef5596  pciutils-3.1.2.tar.gz"
+md5sums="965908d8d67222a9e1db24778c61bdf1  pciutils-3.1.3.tar.gz"
diff --git a/main/perl-uri/APKBUILD b/main/perl-uri/APKBUILD
index 599f455e..f6be01ba 100644
--- a/main/perl-uri/APKBUILD
+++ b/main/perl-uri/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-uri
-pkgver=1.37
+pkgver=1.38
 pkgrel=0
 pkgdesc="Perl Module: form Resource Identifiers (absolute and relative)"
 url="http://search.cpan.org/dist/URI/"
@@ -19,4 +19,4 @@ build ()
 	find "$pkgdir" -name perllocal.pod -delete
 	find "$pkgdir" -name .packlist -delete
 }
-md5sums="b81b3610b78654e11c099f74a5247860  URI-1.37.tar.gz"
+md5sums="35fba2715eb8ac56e8e30244ae69ff65  URI-1.38.tar.gz"
diff --git a/main/pinentry/APKBUILD b/main/pinentry/APKBUILD
index 5322ebe7..b211173f 100644
--- a/main/pinentry/APKBUILD
+++ b/main/pinentry/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pinentry
-pkgver=0.7.5
+pkgver=0.7.6
 _uiconv_ver=0.3
 pkgrel=0
 pkgdesc="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
@@ -38,5 +38,5 @@ build () {
 	make || return 1
 	make DESTDIR="$pkgdir" install
 }
-md5sums="ca492afbbb59cd19f1c875533f18b269  pinentry-0.7.5.tar.gz
+md5sums="5a4f676375fa882009da02013d77210f  pinentry-0.7.6.tar.gz
 5cd7f80085324d08cb976fec674cd98d  uiconv-0.3.tar.bz2"
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD
index aaa3fc64..51497f06 100644
--- a/main/quagga/APKBUILD
+++ b/main/quagga/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=quagga
 pkgver=0.99.13
-pkgrel=0
+pkgrel=1
 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
 url="http://quagga.net/"
 license="GPL-2"
@@ -73,7 +73,7 @@ cc109a746273bc0d6aee9d758e7524ab  bgpd.initd
 89b0cf4e70172bfcd195b2869cae28da  ospfd.initd
 39b8cb21b55de53af38c94c2f5d85917  ripd.initd
 120ab1b53975ec86e78266f31e935ab6  ripngd.initd
-3490a10510e416ab83d5b4d767136de8  zebra.initd
-c38e884372406e9e59616e436cd26388  zebra.confd
+6d51e9fca8d206a6d9d1d9fde793b48f  zebra.initd
+34e06a1d2bc602ce691abc9ed169dd15  zebra.confd
 44b4c3684e4c7300665bf90fa4520af9  quagga.pre-install
 d2181a6401280478b8700cfcee32794e  quagga.post-install"
diff --git a/main/quagga/zebra.confd b/main/quagga/zebra.confd
index a5256acd..d2deb114 100644
--- a/main/quagga/zebra.confd
+++ b/main/quagga/zebra.confd
@@ -1,7 +1,7 @@
 # Additional command-line parameters to run zebra with:
 #	-k, --keep_kernel     Don't delete old routes which installed by zebra.
-#	-l, --log_mode number Set verbose log mode flag
 #	-A, --vty_addr addr   Set vty's bind address
 #	-P, --vty_port port   Set vty's port number
 #	-r, --retain          When program terminates, retain added route by zebra.
-ZEBRA_OPTS="-l 255"
+#       -s, --nl-bufsize      Set netlink receive buffer size
+ZEBRA_OPTS=""
diff --git a/main/quagga/zebra.initd b/main/quagga/zebra.initd
index f0cc0084..5ca8ef58 100644
--- a/main/quagga/zebra.initd
+++ b/main/quagga/zebra.initd
@@ -17,7 +17,7 @@ checkconfig() {
 
 cleanup() {
 	ebegin "Cleaning up stale zebra routes..."
-	/usr/sbin/ip route flush proto zebra
+	ip route flush proto zebra
 	eend $?
 }
 
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index 3dee6bda..b4ecb2a1 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -3,7 +3,7 @@ pkgname=vim
 _srcver=7.2
 _patchver=234
 pkgver=$_srcver.$_patchver
-pkgrel=0
+pkgrel=1
 pkgdesc="advanced text editor"
 url="http://www.vim.org"
 license='GPL'
diff --git a/x11/libcroco/APKBUILD b/x11/libcroco/APKBUILD
new file mode 100644
index 00000000..47a28966
--- /dev/null
+++ b/x11/libcroco/APKBUILD
@@ -0,0 +1,23 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libcroco
+pkgver=0.6.2
+pkgrel=0
+pkgdesc="GNOME CSS2 parsing and manipulation toolkit"
+url="http://www.gnome.org"
+license="LGPL"
+subpackages="$pkgname-dev"
+depends=
+makedepends="glib-dev libxml2-dev pkgconfig"
+source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.bz2"
+
+depends_dev="glib-dev libxml2-dev pkgconfig"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--disable-static || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="1429c597aa4b75fc610ab3a542c99209  libcroco-0.6.2.tar.bz2"
diff --git a/x11/libgsf/APKBUILD b/x11/libgsf/APKBUILD
new file mode 100644
index 00000000..7e31e8b0
--- /dev/null
+++ b/x11/libgsf/APKBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libgsf
+pkgver=1.14.14
+pkgrel=0
+pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats."
+url="http://www.gnome.org/"
+license="GPL LGPL"
+subpackages="$pkgname-dev $pkgname-doc"
+depends=
+makedepends="libxml2-dev glib-dev bzip2-dev intltool python zlib-dev"
+source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.bz2"
+
+depends_dev="glib-dev libxml2-dev pkgconfig"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	sed -i -e 's/gsf-gnome//' -e 's/thumbnailer//' Makefile.* || return 1
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--mandir=/usr/share/man \
+		--disable-static \
+		--without-gnome-vfs \
+		--without-bonobo || return 1
+	make || return 1
+	make DESTDIR=""$pkgdir"" install || return 1
+	rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1
+}
+
+md5sums="69e9c57d48539782f72c55824a3c6859  libgsf-1.14.14.tar.bz2"
diff --git a/x11/librsvg/APKBUILD b/x11/librsvg/APKBUILD
new file mode 100644
index 00000000..ba930bf6
--- /dev/null
+++ b/x11/librsvg/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=librsvg
+pkgver=2.26.0
+pkgrel=0
+pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf"
+url="http://librsvg.sourceforge.net/"
+license="LGPL"
+subpackages="$pkgname-dev $pkgname-doc"
+depends=
+makedepends="gtk+-dev libcroco-dev libgsf-dev bzip2-dev"
+install="librsvg.post-install librsvg.post-upgrade librsvg.post-deinstall"
+source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.26/$pkgname-$pkgver.tar.bz2
+	$install"
+
+depends_dev="glib-dev gtk+-dev cairo-dev libcroco-dev libgsf-dev"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--libexecdir=/usr/lib/$pkgname \
+		--with-croco \
+		--disable-static \
+		--disable-mozilla-plugin \
+		--with-svgz || return 1
+	make || return 1
+	make DESTDIR=""$pkgdir"" install || return 1
+	rm -rf "$pkgdir"/usr/lib/mozilla
+}
+
+md5sums="65dbd726a514fe8b797d26254b8efc1e  librsvg-2.26.0.tar.bz2
+323a187b3a9bc1c506543c03a6f533ce  librsvg.post-install
+323a187b3a9bc1c506543c03a6f533ce  librsvg.post-upgrade
+323a187b3a9bc1c506543c03a6f533ce  librsvg.post-deinstall"
diff --git a/x11/librsvg/librsvg.post-deinstall b/x11/librsvg/librsvg.post-deinstall
new file mode 120000
index 00000000..4729c2e2
--- /dev/null
+++ b/x11/librsvg/librsvg.post-deinstall
@@ -0,0 +1 @@
+librsvg.post-install
\ No newline at end of file
diff --git a/x11/librsvg/librsvg.post-install b/x11/librsvg/librsvg.post-install
new file mode 100644
index 00000000..de5ca6c6
--- /dev/null
+++ b/x11/librsvg/librsvg.post-install
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#We need to update the pixbuf loaders to let GTK support SVG images
+gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
+
+exit 0
diff --git a/x11/librsvg/librsvg.post-upgrade b/x11/librsvg/librsvg.post-upgrade
new file mode 120000
index 00000000..4729c2e2
--- /dev/null
+++ b/x11/librsvg/librsvg.post-upgrade
@@ -0,0 +1 @@
+librsvg.post-install
\ No newline at end of file
diff --git a/x11/libsexy/APKBUILD b/x11/libsexy/APKBUILD
new file mode 100644
index 00000000..64488a0a
--- /dev/null
+++ b/x11/libsexy/APKBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libsexy
+pkgver=0.1.11
+pkgrel=0
+pkgdesc="Doing naughty things to good widgets."
+url="http://chipx86.com/wiki/Libsexy"
+license="GPL"
+subpackages="$pkgname-dev $pkgname-doc"
+makedepends="gtk+-dev libxml2-dev iso-codes"
+source="http://releases.chipx86.com/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--disable-static
+	make || return 1
+	make DESTDIR="$pkgdir" install
+	rm -f "$pkgdir"/usr/lib/libsexy.a
+}
+
+md5sums="33c079a253270ec8bfb9508e4bb30754  libsexy-0.1.11.tar.gz"
diff --git a/x11/midori/APKBUILD b/x11/midori/APKBUILD
index 81abc531..df2ce9d7 100644
--- a/x11/midori/APKBUILD
+++ b/x11/midori/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=midori
 pkgver=0.1.8
-pkgrel=0
+pkgrel=1
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
 license="GPL"
@@ -19,6 +19,7 @@ makedepends="
 	libxml2-dev
 	webkit-dev
 	sqlite-dev
+	paxctl
 	"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
 source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2
@@ -38,6 +39,8 @@ build ()
 		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
+	# PAX does not like the JIT
+	paxctl -c -m "$pkgdir"/usr/bin/midori
 }
 md5sums="06935203b20e9794121a2c354fc9dea5  midori-0.1.8.tar.bz2
 a373e86256d1cd179791e486d2862d44  midori.post-install
diff --git a/x11/sdl/APKBUILD b/x11/sdl/APKBUILD
new file mode 100644
index 00000000..421c8f9e
--- /dev/null
+++ b/x11/sdl/APKBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=sdl
+pkgver=1.2.13
+pkgrel=0
+pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
+url="http://www.libsdl.org"
+license="LGPL"
+subpackages="$pkgname-dev $pkgname-doc"
+depends=
+makedepends="libxext-dev libxrender-dev libx11-dev libice-dev libsm-dev 
+	libxrandr-dev mesa-dev alsa-lib-dev"
+source="http://www.libsdl.org/release/SDL-$pkgver.tar.gz"
+
+build ()
+{
+	cd "$srcdir"/SDL-$pkgver
+	./configure --prefix=/usr \
+		--disable-nasm \
+		--disable-esd \
+		--enable-alsa \
+		--with-x \
+		--disable-rpath \
+		--disable-nls 
+	make || return 1
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="c6660feea2a6834de10bc71b2f8e4d88  SDL-1.2.13.tar.gz"
diff --git a/x11/webkit/APKBUILD b/x11/webkit/APKBUILD
index 16f8930e..07738ed5 100644
--- a/x11/webkit/APKBUILD
+++ b/x11/webkit/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=webkit
-pkgver=1.1.11
+pkgver=1.1.12
 pkgrel=0
 pkgdesc="portable web rendering engine WebKit for GTK+"
 url="http://webkitgtk.org/"
@@ -39,4 +39,4 @@ gtklauncher() {
 		"$subpkgdir"/usr/bin/GtkLauncher
 }
 
-md5sums="022a72ba5b7fa9e29553c03bf027215f  webkit-1.1.11.tar.gz"
+md5sums="1a10c117a0dd3717c2bcaa7a115cf218  webkit-1.1.12.tar.gz"
diff --git a/x11/xfce4-battery-plugin/APKBUILD b/x11/xfce4-battery-plugin/APKBUILD
new file mode 100644
index 00000000..c0b271cf
--- /dev/null
+++ b/x11/xfce4-battery-plugin/APKBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xfce4-battery-plugin
+pkgver=0.5.1
+pkgrel=0
+pkgdesc="A battery monitor plugin for the Xfce panel"
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
+license="GPL-2"
+makedepends="xfce4-panel-dev libxfcegui4-dev perl-xml-parser intltool"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2
+	compile_x86_64.diff
+	$install"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	patch -Np1 -i "$srcdir"/compile_x86_64.diff || return 1
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--libexecdir=/usr/lib \
+		--localstatedir=/var \
+		--disable-static
+	make || return 1
+	make DESTDIR="$pkgdir" install
+}
+md5sums="d8a666d85bb3c1dd007b547de4dd7037  xfce4-battery-plugin-0.5.1.tar.bz2
+d9a927bca032e9b10a04046c154243a1  compile_x86_64.diff
+db51db79681eadc47be4932355a77c25  xfce4-battery-plugin.post-install
+db51db79681eadc47be4932355a77c25  xfce4-battery-plugin.post-upgrade
+db51db79681eadc47be4932355a77c25  xfce4-battery-plugin.post-deinstall"
diff --git a/x11/xfce4-battery-plugin/compile_x86_64.diff b/x11/xfce4-battery-plugin/compile_x86_64.diff
new file mode 100644
index 00000000..102db1d9
--- /dev/null
+++ b/x11/xfce4-battery-plugin/compile_x86_64.diff
@@ -0,0 +1,13 @@
+--- xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h.orig	2008-03-18 20:10:58.000000000 +0100
++++ xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h	2008-03-18 20:14:45.000000000 +0100
+@@ -17,8 +17,8 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/apm_bios.h>
+ #include <sys/types.h>
++#include <linux/apm_bios.h>
+ 
+ #define APM_PROC   "/proc/apm"
+ #define APM_DEVICE "/dev/apm_bios"
+
diff --git a/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-deinstall b/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-deinstall
new file mode 120000
index 00000000..ffd189d1
--- /dev/null
+++ b/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-deinstall
@@ -0,0 +1 @@
+xfce4-battery-plugin.post-install
\ No newline at end of file
diff --git a/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-install b/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-install
new file mode 100644
index 00000000..c523d78d
--- /dev/null
+++ b/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+
diff --git a/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-upgrade b/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-upgrade
new file mode 120000
index 00000000..ffd189d1
--- /dev/null
+++ b/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-upgrade
@@ -0,0 +1 @@
+xfce4-battery-plugin.post-install
\ No newline at end of file
diff --git a/x11/xfce4-notifyd/APKBUILD b/x11/xfce4-notifyd/APKBUILD
new file mode 100644
index 00000000..717b6847
--- /dev/null
+++ b/x11/xfce4-notifyd/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xfce4-notifyd
+pkgver=0.1.0
+pkgrel=0
+pkgdesc="notification daemon for the xfce desktop"
+url="http://spuriousinterrupt.org/projects/xfce4-notifyd"
+license="GPL2"
+depends="hicolor-icon-theme"
+makedepends="gtk+-dev libxfce4util libxfcegui4-dev libsexy-dev xfconf-dev
+	dbus-glib-dev libglade-dev intltool"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+source="http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2
+	$install"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 --localstatedir=/var --disable-static
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="659ecaf37f0f7ee9e31f7b25f9813778  xfce4-notifyd-0.1.0.tar.bz2
+db51db79681eadc47be4932355a77c25  xfce4-notifyd.post-install
+db51db79681eadc47be4932355a77c25  xfce4-notifyd.post-upgrade
+db51db79681eadc47be4932355a77c25  xfce4-notifyd.post-deinstall"
diff --git a/x11/xfce4-notifyd/xfce4-notifyd.post-deinstall b/x11/xfce4-notifyd/xfce4-notifyd.post-deinstall
new file mode 120000
index 00000000..2aa65d32
--- /dev/null
+++ b/x11/xfce4-notifyd/xfce4-notifyd.post-deinstall
@@ -0,0 +1 @@
+xfce4-notifyd.post-install
\ No newline at end of file
diff --git a/x11/xfce4-notifyd/xfce4-notifyd.post-install b/x11/xfce4-notifyd/xfce4-notifyd.post-install
new file mode 100644
index 00000000..c523d78d
--- /dev/null
+++ b/x11/xfce4-notifyd/xfce4-notifyd.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+
diff --git a/x11/xfce4-notifyd/xfce4-notifyd.post-upgrade b/x11/xfce4-notifyd/xfce4-notifyd.post-upgrade
new file mode 120000
index 00000000..2aa65d32
--- /dev/null
+++ b/x11/xfce4-notifyd/xfce4-notifyd.post-upgrade
@@ -0,0 +1 @@
+xfce4-notifyd.post-install
\ No newline at end of file
diff --git a/x11/xfce4-screenshooter/APKBUILD b/x11/xfce4-screenshooter/APKBUILD
new file mode 100644
index 00000000..cde73790
--- /dev/null
+++ b/x11/xfce4-screenshooter/APKBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xfce4-screenshooter
+pkgver=1.6.0
+pkgrel=0
+pkgdesc="screenshot application for Xfce4"
+url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
+license="GPL2"
+subpackages="$pkgname-doc"
+depends=
+makedepends="xfce4-panel-dev intltool hicolor-icon-theme libsm-dev
+	e2fsprogs-dev"
+install="xfce4-screenshooter.post-install xfce4-screenshooter.post-upgrade
+	xfce4-screenshooter.post-deinstall"
+source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
+	$install"
+
+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="331750879b966eec639eb3fe3045cb16  xfce4-screenshooter-1.6.0.tar.gz
+db51db79681eadc47be4932355a77c25  xfce4-screenshooter.post-install
+db51db79681eadc47be4932355a77c25  xfce4-screenshooter.post-upgrade
+db51db79681eadc47be4932355a77c25  xfce4-screenshooter.post-deinstall"
diff --git a/x11/xfce4-screenshooter/xfce4-screenshooter.post-deinstall b/x11/xfce4-screenshooter/xfce4-screenshooter.post-deinstall
new file mode 120000
index 00000000..735306e3
--- /dev/null
+++ b/x11/xfce4-screenshooter/xfce4-screenshooter.post-deinstall
@@ -0,0 +1 @@
+xfce4-screenshooter.post-install
\ No newline at end of file
diff --git a/x11/xfce4-screenshooter/xfce4-screenshooter.post-install b/x11/xfce4-screenshooter/xfce4-screenshooter.post-install
new file mode 100644
index 00000000..c523d78d
--- /dev/null
+++ b/x11/xfce4-screenshooter/xfce4-screenshooter.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+
diff --git a/x11/xfce4-screenshooter/xfce4-screenshooter.post-upgrade b/x11/xfce4-screenshooter/xfce4-screenshooter.post-upgrade
new file mode 120000
index 00000000..735306e3
--- /dev/null
+++ b/x11/xfce4-screenshooter/xfce4-screenshooter.post-upgrade
@@ -0,0 +1 @@
+xfce4-screenshooter.post-install
\ No newline at end of file
diff --git a/x11/xfce4-xkb-plugin/APKBUILD b/x11/xfce4-xkb-plugin/APKBUILD
new file mode 100644
index 00000000..25b56615
--- /dev/null
+++ b/x11/xfce4-xkb-plugin/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xfce4-xkb-plugin
+pkgver=0.5.3.3
+pkgrel=0
+pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel"
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
+license="custom"
+subpackages="$pkgname-doc"
+depends=
+makedepends="xfce4-panel-dev libxklavier-dev librsvg-dev intltool libwnck-dev
+	libxi-dev libxkbfile-dev libsm-dev libgsf-dev e2fsprogs-dev bzip2-dev"
+source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
+
+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
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+md5sums="b233cc9de1cbace075eaf6e2c9a8e685  xfce4-xkb-plugin-0.5.3.3.tar.gz"
diff --git a/x11/xfce4/APKBUILD b/x11/xfce4/APKBUILD
index 9ba27a3c..97db75c1 100644
--- a/x11/xfce4/APKBUILD
+++ b/x11/xfce4/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4
 pkgver=4.6
-pkgrel=0
+pkgrel=1
 pkgdesc="XFCE 4 meta package"
 url="http://www.xfce.org"
 license="GPL"
 depends="thunar xfce-utils xfce4-panel xfce4-session orage terminal mousepad
 	xfce4-settings xfdesktop xfwm4 xfce4-mixer xfce4-appfinder
-	tango-icon-theme ttf-dejavu"
+	tango-icon-theme ttf-dejavu gtk-xfce-engine"
 
 makedepends=
 install=