Merge git://dev.alpinelinux.org/aports

71 files changed, 885 insertions, 289 deletions

diff --git a/main/avfs/APKBUILD b/main/avfs/APKBUILD
new file mode 100644
index 0000000000..b86b468087
--- /dev/null
+++ b/main/avfs/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: V.Krishn <vkrishn4@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=avfs
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="A Virtual File System for looking into archives"
+url="http://avf.sourceforge.net/"
+arch="all"
+license="GPL"
+depends=""
+depends_dev=""
+makedepends="bash zlib-dev bzip2-dev fuse-dev"
+install=""
+subpackages="$pkgname-dev"
+source="http://space.dl.sourceforge.net/project/avf/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --enable-fuse --enable-library --prefix=/usr
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/*.la
+	rm "$pkgdir"/usr/lib/*.a
+}
+
+
+md5sums="c58421e4f294125895f2c6653a7366a7  avfs-1.0.0.tar.bz2"
diff --git a/main/bluez-hcidump/APKBUILD b/main/bluez-hcidump/APKBUILD
index 79ea0f77fb..dea82e7586 100644
--- a/main/bluez-hcidump/APKBUILD
+++ b/main/bluez-hcidump/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bluez-hcidump
-pkgver=2.2
+pkgver=2.4
 pkgrel=0
 pkgdesc="Bluetooth HCI package analyzer"
 url="http://www.bluez.org/"
@@ -34,4 +34,4 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="3c298a8be67099fe227f3e4d9de539d5  bluez-hcidump-2.2.tar.gz"
+md5sums="d39833de0ed26bddf784e9580b6f33c4  bluez-hcidump-2.4.tar.gz"
diff --git a/main/busybox/0001-ifupdown-support-metric-for-static-default-gw.patch b/main/busybox/0001-ifupdown-support-metric-for-static-default-gw.patch
new file mode 100644
index 0000000000..75e6ba7ce5
--- /dev/null
+++ b/main/busybox/0001-ifupdown-support-metric-for-static-default-gw.patch
@@ -0,0 +1,64 @@
+From cfcb1dac83c9e18a06a07f0b212f6701bb87c2ad Mon Sep 17 00:00:00 2001
+From: Natanael Copa <natanael.copa@gmail.com>
+Date: Fri, 17 Feb 2012 19:36:26 +0000
+Subject: [PATCH] ifupdown: support metric for static default gw
+
+This is useful when you have multiple ISPs with failover. It allows
+setting the priority of the static gateway and makes it possible
+to specify multiple static gateways.
+
+The ubuntu ifupdown supports it.
+
+function                                             old     new   delta
+.rodata                                           116725  116797     +72
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 1/0 up/down: 72/0)               Total: 72 bytes
+   text    data     bss     dec     hex filename
+ 953343    7313    8984  969640   ecba8 busybox_old
+ 953415    7313    8984  969712   ecbf0 busybox_unstripped
+
+Signed-off-by: Natanael Copa <natanael.copa@gmail.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ networking/ifupdown.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/networking/ifupdown.c b/networking/ifupdown.c
+index 73da260..dfda206 100644
+--- a/networking/ifupdown.c
++++ b/networking/ifupdown.c
+@@ -403,11 +403,11 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
+ 	result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec);
+ 	result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
+ 	/* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */
+-	result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec);
++	result += execute("[[ip route add ::/0 via %gateway%]][[ prio %metric%]]", ifd, exec);
+ # else
+ 	result = execute("ifconfig %iface%[[ media %media%]][[ hw %hwaddress%]][[ mtu %mtu%]] up", ifd, exec);
+ 	result += execute("ifconfig %iface% add %address%/%netmask%", ifd, exec);
+-	result += execute("[[route -A inet6 add ::/0 gw %gateway%]]", ifd, exec);
++	result += execute("[[route -A inet6 add ::/0 gw %gateway%[[ metric %metric%]]]]", ifd, exec);
+ # endif
+ 	return ((result == 3) ? 3 : 0);
+ }
+@@ -490,7 +490,7 @@ static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec)
+ 	result = execute("ip addr add %address%/%bnmask%[[ broadcast %broadcast%]] "
+ 			"dev %iface%[[ peer %pointopoint%]][[ label %label%]]", ifd, exec);
+ 	result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
+-	result += execute("[[ip route add default via %gateway% dev %iface%]]", ifd, exec);
++	result += execute("[[ip route add default via %gateway% dev %iface%[[ prio %metric%]]]]", ifd, exec);
+ 	return ((result == 3) ? 3 : 0);
+ # else
+ 	/* ifconfig said to set iface up before it processes hw %hwaddress%,
+@@ -500,7 +500,7 @@ static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec)
+ 	result += execute("ifconfig %iface% %address% netmask %netmask%"
+ 				"[[ broadcast %broadcast%]][[ pointopoint %pointopoint%]] ",
+ 				ifd, exec);
+-	result += execute("[[route add default gw %gateway% %iface%]]", ifd, exec);
++	result += execute("[[route add default gw %gateway%[[ metric %metric%]] %iface%]]", ifd, exec);
+ 	return ((result == 3) ? 3 : 0);
+ # endif
+ }
+-- 
+1.7.10.1
+
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 0cf32cb3bf..92f5d71e0e 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.19.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -24,6 +24,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	0001-grep-support-for-x-match-whole-line.patch
 	0001-tar-Implement-no-recursion.patch
 	0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch
+	0001-ifupdown-support-metric-for-static-default-gw.patch
 
 	busyboxconfig"
 
@@ -98,4 +99,5 @@ cfafb917f777437f428ea97da0a63915  0001-acpid-do-not-install-handlers-for-fatal-s
 699701047d05468a13e5c37b5ebc3824  0001-grep-support-for-x-match-whole-line.patch
 b0977368029587bab23067f0267ae309  0001-tar-Implement-no-recursion.patch
 d13491d62d8987f79c385f6fdd94836a  0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch
+ce7fcd5eee5b0e9bf67108b241c09ea2  0001-ifupdown-support-metric-for-static-default-gw.patch
 42e2f49483e650193c0e142ade7de142  busyboxconfig"
diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 32c4be86ec..3daf05e3d1 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=coreutils
-pkgver=8.15
+pkgver=8.16
 pkgrel=0
 pkgdesc="The basic file, shell and text manipulation utilities"
 url="http://www.gnu.org/software/coreutils/"
@@ -41,4 +41,4 @@ package() {
 	mv chroot "$pkgdir"/usr/sbin/
 }
 
-md5sums="094909fafa86110140b32e4948941545  coreutils-8.15.tar.xz"
+md5sums="89b06f91634208dceba7b36ad1f9e8b9  coreutils-8.16.tar.xz"
diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD
index 430557e1a6..cbbdd23834 100644
--- a/main/dconf/APKBUILD
+++ b/main/dconf/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dconf
-pkgver=0.10.0
-pkgrel=1
+pkgver=0.12.1
+pkgrel=0
 pkgdesc="A low-level configuration system."
 url="http://live.gnome.org/dconf"
 arch="all"
@@ -11,7 +11,7 @@ makedepends="vala gobject-introspection-dev gtk+3.0-dev glib-dev libxml2-dev
 	dbus-dev"
 install=
 subpackages="$pkgname-editor"
-source="http://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.bz2
+source="http://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz
 	"
 
 #	0001-Avoid-posix_fallocate-so-it-works-on-uClibc.patch
@@ -50,4 +50,4 @@ editor() {
 	mv "$pkgdir"/usr/share/applications/dconf-editor.desktop \
 		"$subpkgdir"/usr/share/applications/  || return 1
 }
-md5sums="58278e0d8053a26813e5ccc416f7fcfe  dconf-0.10.0.tar.bz2"
+md5sums="0ebbfa50ab69e5d679cf8a1c68e75bf3  dconf-0.12.1.tar.xz"
diff --git a/main/duplicity/APKBUILD b/main/duplicity/APKBUILD
index e12da493a3..a918037f7d 100644
--- a/main/duplicity/APKBUILD
+++ b/main/duplicity/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=duplicity
-pkgver=0.6.13
-pkgrel=1
+pkgver=0.6.18
+pkgrel=0
 pkgdesc="Encrypted bandwidth-efficient backup using the rsync algorithm"
 url="http://duplicity.nongnu.org/"
 arch="all"
@@ -30,4 +30,4 @@ package() {
 	python setup.py install --root "$pkgdir"
 }
 
-md5sums="b3d627f35fc527b00121925840d5cca7  duplicity-0.6.13.tar.gz"
+md5sums="66b5e64de43e09d3c3ff9890faf9de07  duplicity-0.6.18.tar.gz"
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index eb933bdc27..abf64cf17e 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fakeroot
-pkgver=1.18.2
-pkgrel=1
+pkgver=1.18.3
+pkgrel=0
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 arch="all"
 license='GPL'
@@ -34,7 +34,7 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="79f32331358ad58499704ea5e19fd0ae  fakeroot_1.18.2.orig.tar.bz2
+md5sums="99c6ba2eb0005086144ee9f1f6fd63f4  fakeroot_1.18.3.orig.tar.bz2
 bdbf1db14f2cfdff0f5b4c35da78b9fe  busybox-getopt.patch
 50a899380cfd5eae8ce3aaf878fb17b2  fakeroot-stdint.patch
 7a54ab51fdb90bc44e366e0a66811bfe  fakeroot-uclibc.patch"
diff --git a/main/fping/APKBUILD b/main/fping/APKBUILD
index ac87a34450..6ce447bb06 100644
--- a/main/fping/APKBUILD
+++ b/main/fping/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 pkgname=fping
-pkgver=3.0
+pkgver=3.1
 pkgrel=0
 pkgdesc="A utility to ping multiple hosts at once"
 url="http://fping.org/"
@@ -25,4 +25,4 @@ package() {
 	make install DESTDIR="$pkgdir" || return 1
 	chmod 4755 "$pkgdir"/usr/sbin/fping
 }
-md5sums="e937c9a2b1d65b6f5294fec57891645b  fping-3.0.tar.gz"
+md5sums="a2bbf3316da8c7b47a1a0ffe959d5d9e  fping-3.1.tar.gz"
diff --git a/main/fuse/APKBUILD b/main/fuse/APKBUILD
index f400e18659..c6d2c495ee 100644
--- a/main/fuse/APKBUILD
+++ b/main/fuse/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fuse
-pkgver=2.8.7
+pkgver=2.9.0
 pkgrel=0
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 url="http://fuse.sourceforge.net/"
@@ -58,5 +58,5 @@ _EOF_
 
 }
 
-md5sums="001a12d8f5b4db461265e9661c7a5de4  fuse-2.8.7.tar.gz
+md5sums="894ee11674f89a915ae87524aed55bc4  fuse-2.9.0.tar.gz
 5983726cfabf0830dffbbbf9a3abcddc  fuse.initd"
diff --git a/main/gdnsd/APKBUILD b/main/gdnsd/APKBUILD
index 6da9d6caad..b7646bfcf4 100644
--- a/main/gdnsd/APKBUILD
+++ b/main/gdnsd/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gdnsd
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.6.5
+pkgrel=0
 pkgdesc="Geographic Authoritative DNS server"
 url="http://code.google.com/p/gdnsd/"
 arch="all"
@@ -45,5 +45,5 @@ package() {
 		"$pkgdir"/usr/lib/gdnsd/*.la
 }
 
-md5sums="082f874d24cdc7073950ed6294f8d39b  gdnsd-1.6.2.tar.xz
-dad20779adfb4b85b57b45c7c903a636  gdnsd.initd"
+md5sums="8fb68b6e3d9d118b3ef0d3ad248a2219  gdnsd-1.6.5.tar.xz
+00f2838e0908effaaa2f6e6a1699f25b  gdnsd.initd"
diff --git a/main/gdnsd/gdnsd.initd b/main/gdnsd/gdnsd.initd
index e11a73d1d6..2dbb568974 100755
--- a/main/gdnsd/gdnsd.initd
+++ b/main/gdnsd/gdnsd.initd
@@ -1,18 +1,44 @@
 #!/sbin/runscript
 
+name="gdnsd daemon"
+extra_commands="configtest"
+extra_started_commands="reload"
+description_configtest="Run syntax tests for configuration files only."
+description_reload="Fast reload: check config, load files, kill old server, start new server (in this order)."
+
+if [ -z "${GDNSD_CONFFILE}" ]; then
+	if [ "${SVCNAME}" = "gdnsd" ]; then
+		GDNSD_CONFFILE=/etc/gdnsd/config
+	else
+		GDNSD_CONFFILE=/etc/gdnsd/${SVCNAME}.config
+	fi
+fi
+
 depend() {
 	need net
+	use logger
 	after firewall
+	provide auth-dns
 }
 
-start() {
-	ebegin "Starting dnsd"
-	start-stop-daemon --start --exec /usr/sbin/dnsd -- -d $DNSD_OPTS
+act() {
+	ebegin "$1 ${SVCNAME}"
+	/usr/sbin/gdnsd -c ${GDNSD_CONFFILE} ${GDNSD_OPTS} $2
 	eend $?
 }
 
+start() {
+	act "Starting" start
+}
+
 stop () {
-	ebegin "Stopping dnsd"
-	start-stop-daemon --stop --exec /usr/sbin/dnsd
-	eend $?
+	act "Stopping" stop
+}
+
+reload() {
+	act "Reloading" restart
+}
+
+configtest() {
+	act "Checking configuration" checkconf
 }
diff --git a/main/glade/APKBUILD b/main/glade/APKBUILD
index a0408782fb..928320f99c 100644
--- a/main/glade/APKBUILD
+++ b/main/glade/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=glade
-pkgver=3.12.0
+pkgver=3.12.1
 pkgrel=0
 pkgdesc="User Interface Designer for GTK+ and GNOME"
 url="http://glade.gnome.org/"
@@ -39,4 +39,4 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 }
 
-md5sums="bc743c2b94b674770b67cbc0c90fb3eb  glade-3.12.0.tar.xz"
+md5sums="7923b7127a387db3a053062cd76e8263  glade-3.12.1.tar.xz"
diff --git a/main/glib-networking/APKBUILD b/main/glib-networking/APKBUILD
index 52663034ba..ae06f69d79 100644
--- a/main/glib-networking/APKBUILD
+++ b/main/glib-networking/APKBUILD
@@ -6,14 +6,14 @@ _maj=${pkgver%%.*}
 _min=${pkgver#${_maj}.}
 _min=${_min%%.*}
 _ver=$_maj.$_min
-pkgrel=0
+pkgrel=1
 pkgdesc="Networking support for GLib"
 url="http://www.gnome.org"
 arch="all"
 license="LGPLv2+"
 depends="ca-certificates"
 depends_dev="glib-dev gnutls-dev libproxy-dev intltool libgcrypt-dev"
-makedepends="$depends_dev bash"
+makedepends="$depends_dev bash p11-kit-dev"
 install=
 subpackages="$pkgname-lang"
 source="http://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz"
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 8349cb5137..c501895fc1 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=glib
 pkgver=2.32.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Common C routines used by Gtk+ and other libs"
 url="http://www.gtk.org"
 arch="all"
diff --git a/main/gnome-doc-utils/APKBUILD b/main/gnome-doc-utils/APKBUILD
index 2f293f1d74..99d0625c38 100644
--- a/main/gnome-doc-utils/APKBUILD
+++ b/main/gnome-doc-utils/APKBUILD
@@ -1,21 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnome-doc-utils
-pkgver=0.20.6
-pkgrel=1
+pkgver=0.20.10
+pkgrel=0
 pkgdesc="Documentation utilities for Gnome"
 url="http://www.gnome.org"
-arch="all"
+arch="noarch"
 license="GPL LGPL"
 depends="python docbook-xml rarian py-libxml2 libxslt"
 makedepends="libxslt-dev libxml2-dev perl-xml-parser rarian-dev pkgconfig
 	gettext-dev intltool"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-	xslt.patch"
+subpackages="$pkgname-lang"
+source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
-	patch -p1 -i "$srcdir"/xslt.patch
 }
 
 build() {
@@ -33,5 +32,4 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="8f6e05071599bc073007830ea0a68391  gnome-doc-utils-0.20.6.tar.bz2
-6aa99cdd5dec2eb887f7ca4976ec840e  xslt.patch"
+md5sums="3c64ad7bacd617b04999e4a168afaac5  gnome-doc-utils-0.20.10.tar.xz"
diff --git a/main/gnome-doc-utils/xslt.patch b/main/gnome-doc-utils/xslt.patch
deleted file mode 100644
index bc9784fdf9..0000000000
--- a/main/gnome-doc-utils/xslt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gnome-doc-utils-0.18.1/doc/xslt/Makefile.in.orig
-+++ gnome-doc-utils-0.18.1/doc/xslt/Makefile.in
-@@ -947,11 +947,11 @@
- all: $(xsldoc_docs) $(xsldoc_xmls)
- 
- $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl
--	$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
--	| xsltproc -o "$@" \
-+	$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" > $@.tmp
-+	xsltproc -o "$@" \
- 	--stringparam basename "$(basename $(notdir $@))" \
- 	--stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
--	"$(srcdir)/xsldoc-fill.xsl" -
-+	"$(srcdir)/xsldoc-fill.xsl" $@.tmp && rm -f $@.tmp
- 
- $(xsldoc_xmls): xsldoc-docbook.xsl
- $(xsldoc_xmls): C/%.xml : C/%.xsldoc
diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD
index 33ebaf30c2..8225a8789d 100644
--- a/main/gobject-introspection/APKBUILD
+++ b/main/gobject-introspection/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gobject-introspection
 pkgver=1.32.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Introspection system for GObject-based libraries"
 url="http://live.gnome.org/GObjectInstrospection"
 arch="all"
diff --git a/main/gpicview/APKBUILD b/main/gpicview/APKBUILD
index ff42327193..5fb32d2bf4 100644
--- a/main/gpicview/APKBUILD
+++ b/main/gpicview/APKBUILD
@@ -1,17 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gpicview
-pkgver=0.2.2
-pkgrel=2
+pkgver=0.2.3
+pkgrel=0
 pkgdesc="Picture viewer of the LXDE Desktop"
 url="http://wiki.lxde.org/en/GPicView"
 arch="all"
 license="GPL-2"
 depends=
 subpackages="$pkgname-lang"
-makedepends="gtk+-dev intltool jpeg-dev autoconf automake libtool"
-source="http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz
-	libm-underlinking.patch"
-
+makedepends="gtk+-dev intltool jpeg-dev"
+source="http://ftp.de.debian.org/debian/pool/main/g/$pkgname/${pkgname}_${pkgver}.orig.tar.xz
+"
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
 	for i in $source; do
@@ -19,7 +18,6 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
-	libtoolize --force && aclocal && autoconf && automake
 }
 
 build() {
@@ -32,5 +30,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="943da9f4a23541accd5acdd4fb69966f  gpicview-0.2.2.tar.gz
-99fb803a293c88a37b606136f6a5c6ca  libm-underlinking.patch"
+md5sums="0f1275b5b0ca66e48963a7ccda8a5019  gpicview_0.2.3.orig.tar.xz"
diff --git a/main/gpicview/libm-underlinking.patch b/main/gpicview/libm-underlinking.patch
deleted file mode 100644
index a73e0705e8..0000000000
--- a/main/gpicview/libm-underlinking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 38cc56d08d243c886526d16bad3ee0b6571d6914 Mon Sep 17 00:00:00 2001
-From: Andrea Florio <andrea@opensuse.org>
-Date: Sun, 18 Sep 2011 08:49:36 +0200
-Subject: [PATCH] fixed link with latest ld
-
----
- src/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 4a750c5..0e2f058 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -27,7 +27,7 @@ gpicview_SOURCES = \
- 
- # the library search path.
- # use -nodefaultlibs to prevent linking libstdc++
--gpicview_LDADD = $(X11_LIBS) $(GTK_LIBS)
-+gpicview_LDADD = $(X11_LIBS) $(GTK_LIBS) -lm
- 
- noinst_HEADERS = \
- 	glib-mem.h \
--- 
-1.7.4.1
-
diff --git a/main/grep/APKBUILD b/main/grep/APKBUILD
index 0a5442c32d..a477bef891 100644
--- a/main/grep/APKBUILD
+++ b/main/grep/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=grep
-pkgver=2.10
-pkgrel=1
+pkgver=2.12
+pkgrel=0
 pkgdesc="Searches input files for lines containing a match to a specified pattern"
 url="http://www.gnu.org/software/grep/grep.html"
 arch="all"
@@ -29,4 +29,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="709915434d09f5db655e5ebd7fd6bb7f  grep-2.10.tar.xz"
+md5sums="8d2f0346d08b13c18afb81f0e8aa1e2f  grep-2.12.tar.xz"
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index 948c581ec9..fc3ce98ab5 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=icu
-pkgver=4.8.1.1
+pkgver=49.1.1
 
 # convert x.y.z to x_y_z
 _ver=${pkgver//./_}
 
-pkgrel=1
+pkgrel=0
 pkgdesc="International Components for Unicode library"
 url="http://www.icu-project.org/"
 arch="all"
@@ -14,7 +14,7 @@ subpackages="$pkgname-dev $pkgname-doc"
 depends=
 makedepends=
 source="http://download.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src.tgz
-	cve-2011-4599.patch
+	icu-timezone-uclibc.patch
 	"
 
 _builddir="$srcdir"/icu/source
@@ -53,5 +53,5 @@ package() {
 	install -Dm644 "$srcdir"/icu/license.html \
 		"$pkgdir"/usr/share/licenses/icu/license.html
 }
-md5sums="ea93970a0275be6b42f56953cd332c17  icu4c-4_8_1_1-src.tgz
-f6798a48ee00015e2d5351a3c7a3bafe  cve-2011-4599.patch"
+md5sums="7c53f83e0327343f4060c0eb83842daf  icu4c-49_1_1-src.tgz
+70aabd2c1e14477cfa261e729ffd7054  icu-timezone-uclibc.patch"
diff --git a/main/icu/cve-2011-4599.patch b/main/icu/cve-2011-4599.patch
deleted file mode 100644
index 4243370c9a..0000000000
--- a/main/icu/cve-2011-4599.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./common/uloc.c.orig
-+++ ./common/uloc.c
-@@ -1797,7 +1797,7 @@
-                 int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n);
-                 len -= variantLen;
-                 if (variantLen > 0) {
--                    if (name[len-1] == '_') { /* delete trailing '_' */
-+                    if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */
-                         --len;
-                     }
-                     addKeyword = VARIANT_MAP[j].keyword;
-@@ -1805,7 +1805,7 @@
-                     break;
-                 }
-             }
--            if (name[len-1] == '_') { /* delete trailing '_' */
-+            if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */
-                 --len;
-             }
-         }
diff --git a/main/icu/icu-timezone-uclibc.patch b/main/icu/icu-timezone-uclibc.patch
new file mode 100644
index 0000000000..c3ea0bd452
--- /dev/null
+++ b/main/icu/icu-timezone-uclibc.patch
@@ -0,0 +1,11 @@
+--- ./common/putil.cpp.orig
++++ ./common/putil.cpp
+@@ -633,7 +633,7 @@
+ U_CAPI int32_t U_EXPORT2
+ uprv_timezone()
+ {
+-#ifdef U_TIMEZONE
++#if defined(U_TIMEZONE) && !defined(__UCLIBC__)
+     return U_TIMEZONE;
+ #else
+     time_t t, t1, t2;
diff --git a/main/keyutils/APKBUILD b/main/keyutils/APKBUILD
index 8a004e38da..3e27447dfc 100644
--- a/main/keyutils/APKBUILD
+++ b/main/keyutils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=keyutils
-pkgver=1.5.2
+pkgver=1.5.5
 pkgrel=0
 pkgdesc="Linux Key Management Utilities"
 url="http://people.redhat.com/~dhowells/keyutils/"
@@ -11,8 +11,7 @@ depends=""
 makedepends=""
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="http://people.redhat.com/~dhowells/keyutils/keyutils-$pkgver.tar.bz2
-	keyutils-no-key.dns_resolver.patch"
+source="http://people.redhat.com/~dhowells/keyutils/keyutils-$pkgver.tar.bz2"
 
 _builddir="$srcdir"/keyutils-$pkgver
 prepare() {
@@ -54,5 +53,4 @@ libs() {
 	mv "$pkgdir"/lib "$subpkgdir"/
 }
 
-md5sums="19811ee31f683058a9aae3e6a3a23a7f  keyutils-1.5.2.tar.bz2
-5884b0e3fa9609d484ad6f073810b21a  keyutils-no-key.dns_resolver.patch"
+md5sums="d759680b2f23c99af95938f5026f25fb  keyutils-1.5.5.tar.bz2"
diff --git a/main/keyutils/keyutils-no-key.dns_resolver.patch b/main/keyutils/keyutils-no-key.dns_resolver.patch
deleted file mode 100644
index 512b04da67..0000000000
--- a/main/keyutils/keyutils-no-key.dns_resolver.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./Makefile.orig
-+++ ./Makefile
-@@ -84,7 +84,7 @@
- # Normal build rule
- #
- ###############################################################################
--all: $(DEVELLIB) keyctl request-key key.dns_resolver
-+all: $(DEVELLIB) keyctl request-key
- 
- ###############################################################################
- #
-@@ -150,7 +150,6 @@
- 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
- 	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
- 	$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
--	$(INSTALL) -D key.dns_resolver $(DESTDIR)$(SBINDIR)/key.dns_resolver
- 	$(INSTALL) -D -m 0644 request-key.conf $(DESTDIR)$(ETCDIR)/request-key.conf
- 	$(INSTALL) -D -m 0644 keyctl.1 $(DESTDIR)$(MAN1)/keyctl.1
- 	$(INSTALL) -D -m 0644 keyctl_chown.3 $(DESTDIR)$(MAN3)/keyctl_chown.3
-@@ -180,7 +179,6 @@
- 	$(LNS) recursive_key_scan.3 $(DESTDIR)$(MAN3)/recursive_session_key_scan.3
- 	$(INSTALL) -D -m 0644 request-key.conf.5 $(DESTDIR)$(MAN5)/request-key.conf.5
- 	$(INSTALL) -D -m 0644 request-key.8 $(DESTDIR)$(MAN8)/request-key.8
--	$(INSTALL) -D -m 0644 key.dns_resolver.8 $(DESTDIR)$(MAN8)/key.dns_resolver.8
- 	$(INSTALL) -D -m 0644 keyutils.h $(DESTDIR)$(INCLUDEDIR)/keyutils.h
- 
- ###############################################################################
diff --git a/main/libffi/APKBUILD b/main/libffi/APKBUILD
index 3327fbf662..ef0d5be4ca 100644
--- a/main/libffi/APKBUILD
+++ b/main/libffi/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libffi
-pkgver=3.0.10
+pkgver=3.0.11
 pkgrel=0
 pkgdesc="A portable, high level programming interface to various calling conventions."
 url="http://sourceware.org/libffi"
@@ -26,4 +26,4 @@ package() {
 	install -m755 -d ""$pkgdir"/usr/share/licenses/$pkgname"
 	install -m644 LICENSE ""$pkgdir"/usr/share/licenses/$pkgname/" || return 1
 }
-md5sums="79390673f5d07a8fb342bc09b5055b6f  libffi-3.0.10.tar.gz"
+md5sums="f69b9693227d976835b4857b1ba7d0e3  libffi-3.0.11.tar.gz"
diff --git a/main/libgexiv2/APKBUILD b/main/libgexiv2/APKBUILD
index 7dd96691c1..716e468549 100644
--- a/main/libgexiv2/APKBUILD
+++ b/main/libgexiv2/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libgexiv2
-pkgver=0.3.1
-pkgrel=1
+pkgver=0.4.1
+pkgrel=0
 pkgdesc="a GObject-based wrapper around the  Exiv2 library"
 url="http://trac.yorba.org/wiki/gexiv2"
 arch="all"
@@ -36,4 +36,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
-md5sums="066ec95994ae34d7bec39de13123f5a3  libgexiv2-0.3.1.tar.bz2"
+md5sums="055effe708652f0c7440a3def06047da  libgexiv2-0.4.1.tar.bz2"
diff --git a/main/libical/APKBUILD b/main/libical/APKBUILD
index f0cb1c2dfb..e38688f3c2 100644
--- a/main/libical/APKBUILD
+++ b/main/libical/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libical
-pkgver=0.46
-pkgrel=2
+pkgver=0.48
+pkgrel=0
 pkgdesc="An open source reference implementation of the icalendar data type and serialization format"
 url="http://sourceforge.net/projects/freeassociation/"
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="9c08f88945bfd5d0791d102e4aa4125c  libical-0.46.tar.gz"
+md5sums="e549f434d5fbf9cd156c60ed4943618f  libical-0.48.tar.gz"
diff --git a/main/libunique3/APKBUILD b/main/libunique3/APKBUILD
new file mode 100644
index 0000000000..2a1411e6f0
--- /dev/null
+++ b/main/libunique3/APKBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libunique3
+pkgver=3.0.2
+pkgrel=0
+pkgdesc="Library for writing single instance applications"
+url="http://live.gnome.org/LibUnique"
+arch="all"
+license="LGPL"
+depends=
+makedepends="gtk+3.0-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-$pkgver.tar.xz
+	"
+
+_builddir="$srcdir"/libunique-$pkgver
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+  	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-dbus \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" -name '*.la' -delete
+}
+md5sums="a52dfbd0fee80f645b74227ade4f01ee  libunique-3.0.2.tar.xz"
diff --git a/main/libusb/APKBUILD b/main/libusb/APKBUILD
index f97d5cf4fa..fc809759d9 100644
--- a/main/libusb/APKBUILD
+++ b/main/libusb/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libusb
-pkgver=1.0.9_rc1
+pkgver=1.0.9
 _ver=${pkgver/_/-}
 pkgrel=0
 pkgdesc="Library to enable user space application programs to communicate with USB devices"
@@ -21,8 +21,8 @@ makedepends=""
 # make dist
 # mv libusb-1.0.8.tar.bz2 libusb-1.0.9-rc1.tar.bz2
 
-#source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
-source="http://dev.alpinelinux.org/~ncopa/alpine/$pkgname-$_ver.tar.bz2"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+#source="http://dev.alpinelinux.org/~ncopa/alpine/$pkgname-$_ver.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$_ver
 build() {
@@ -36,4 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
-md5sums="4d131792dd73cb8cf7156a88065e462f  libusb-1.0.9-rc1.tar.bz2"
+md5sums="7f5a02375ad960d4e33a6dae7d63cfcb  libusb-1.0.9.tar.bz2"
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index d370f6f71d..db83b7d4de 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=3.3.4
+pkgver=3.3.5
 pkgrel=0
 _vsver=vs2.3.3.3
 
@@ -133,7 +133,7 @@ dev() {
 }
 
 md5sums="7133f5a2086a7d7ef97abac610c094f5  linux-3.3.tar.xz
-9c4cc16f10b645fbb90f6c05ad388883  patch-3.3.4.xz
-ef60f2dd311139ccac1848b1522fde90  patch-3.3.4-vs2.3.3.3.diff
+d346edca5d3de7052f49996b01cef401  patch-3.3.5.xz
+a82be36f04448c87d87c5b4880cc3c0f  patch-3.3.5-vs2.3.3.3.diff
 4b8d805a0eec790472432a39be02f453  kernelconfig.x86
 94555ed5003cd2fc61f7d0e8d6ceb558  kernelconfig.x86_64"
diff --git a/main/make/APKBUILD b/main/make/APKBUILD
index 96ba9e78db..9f4f452fb4 100644
--- a/main/make/APKBUILD
+++ b/main/make/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=make
 pkgver=3.82
-pkgrel=2
+pkgrel=4
 pkgdesc="GNU make utility to maintain groups of programs"
 url="http://www.gnu.org/software/make"
 arch="all"
@@ -9,7 +9,14 @@ license=GPL
 depends=
 subpackages="$pkgname-doc"
 source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
-	make-3.82-savannah-bugs-30612-30723.patch"
+	make-3.82-savannah-bugs-30612-30723.patch
+	make-3.82-copy-on-expand.patch
+	make-3.82-memory-corruption.patch
+	make-3.82-jobserver.patch
+	make-3.82-expensive_glob.patch
+	make-3.82-parallel-remake.patch
+	use-malloc.patch
+	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -36,4 +43,10 @@ package() {
 }
 
 md5sums="7f7c000e3b30c6840f2e9cf86b254fac  make-3.82.tar.gz
-74e598a2052f7d98e3495ea9d917ecf4  make-3.82-savannah-bugs-30612-30723.patch"
+74e598a2052f7d98e3495ea9d917ecf4  make-3.82-savannah-bugs-30612-30723.patch
+9545e667ab5eafdef5b658941290cc26  make-3.82-copy-on-expand.patch
+0436e740edbc81cf27fd598241b8dcf0  make-3.82-memory-corruption.patch
+923a06973f4bbc9f27c2ca88a6940d45  make-3.82-jobserver.patch
+f2ed48ea701e8ab6e5b870a3d125b71a  make-3.82-expensive_glob.patch
+89f8032d2f314eb6338739f024d8ecec  make-3.82-parallel-remake.patch
+44469128d5044e14ac48b3b991889ceb  use-malloc.patch"
diff --git a/main/make/make-3.82-copy-on-expand.patch b/main/make/make-3.82-copy-on-expand.patch
new file mode 100644
index 0000000000..bcefa763be
--- /dev/null
+++ b/main/make/make-3.82-copy-on-expand.patch
@@ -0,0 +1,58 @@
+fix from upstream cvs
+
+----------------------------
+revision 1.58
+date: 2011-08-29 12:20:19 -0400;  author: psmith;  state: Exp;  lines: +7 -13;  commitid: MdH0jSxpuIy7mqxv;
+Save strings we're expanding in case an embedded eval causes them
+to be freed (if they're the value of a variable that's reset for example).
+See Savannah patch #7534
+
+Index: expand.c
+===================================================================
+RCS file: /sources/make/make/expand.c,v
+retrieving revision 1.57
+retrieving revision 1.58
+diff -u -p -r1.57 -r1.58
+--- ./expand.c	7 May 2011 20:03:49 -0000	1.57
++++ ./expand.c	29 Aug 2011 16:20:19 -0000	1.58
+@@ -197,7 +197,7 @@ variable_expand_string (char *line, cons
+ {
+   struct variable *v;
+   const char *p, *p1;
+-  char *abuf = NULL;
++  char *save;
+   char *o;
+   unsigned int line_offset;
+ 
+@@ -212,16 +212,11 @@ variable_expand_string (char *line, cons
+       return (variable_buffer);
+     }
+ 
+-  /* If we want a subset of the string, allocate a temporary buffer for it.
+-     Most of the functions we use here don't work with length limits.  */
+-  if (length > 0 && string[length] != '\0')
+-    {
+-      abuf = xmalloc(length+1);
+-      memcpy(abuf, string, length);
+-      abuf[length] = '\0';
+-      string = abuf;
+-    }
+-  p = string;
++  /* We need a copy of STRING: due to eval, it's possible that it will get
++     freed as we process it (it might be the value of a variable that's reset
++     for example).  Also having a nil-terminated string is handy.  */
++  save = length < 0 ? xstrdup (string) : xstrndup (string, length);
++  p = save;
+ 
+   while (1)
+     {
+@@ -411,8 +406,7 @@ variable_expand_string (char *line, cons
+       ++p;
+     }
+ 
+-  if (abuf)
+-    free (abuf);
++  free (save);
+ 
+   variable_buffer_output (o, "", 1);
+   return (variable_buffer + line_offset);
diff --git a/main/make/make-3.82-expensive_glob.patch b/main/make/make-3.82-expensive_glob.patch
new file mode 100644
index 0000000000..65806fdf2b
--- /dev/null
+++ b/main/make/make-3.82-expensive_glob.patch
@@ -0,0 +1,116 @@
+Index: read.c
+===================================================================
+RCS file: /sources/make/make/read.c,v
+retrieving revision 1.198
+retrieving revision 1.200
+diff -u -r1.198 -r1.200
+--- ./read.c	29 Apr 2011 15:27:39 -0000	1.198
++++ ./read.c	7 May 2011 14:36:12 -0000	1.200
+@@ -2901,6 +2901,7 @@
+       const char *name;
+       const char **nlist = 0;
+       char *tildep = 0;
++      int globme = 1;
+ #ifndef NO_ARCHIVES
+       char *arname = 0;
+       char *memname = 0;
+@@ -3109,32 +3110,40 @@
+ 	}
+ #endif /* !NO_ARCHIVES */
+ 
+-      switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
+-	{
+-	case GLOB_NOSPACE:
+-	  fatal (NILF, _("virtual memory exhausted"));
+-
+-	case 0:
+-          /* Success.  */
+-          i = gl.gl_pathc;
+-          nlist = (const char **)gl.gl_pathv;
+-          break;
+-
+-        case GLOB_NOMATCH:
+-          /* If we want only existing items, skip this one.  */
+-          if (flags & PARSEFS_EXISTS)
+-            {
+-              i = 0;
+-              break;
+-            }
+-          /* FALLTHROUGH */
+-
+-	default:
+-          /* By default keep this name.  */
++      /* glob() is expensive: don't call it unless we need to.  */
++      if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
++        {
++          globme = 0;
+           i = 1;
+           nlist = &name;
+-          break;
+-	}
++        }
++      else
++        switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
++          {
++          case GLOB_NOSPACE:
++            fatal (NILF, _("virtual memory exhausted"));
++
++          case 0:
++            /* Success.  */
++            i = gl.gl_pathc;
++            nlist = (const char **)gl.gl_pathv;
++            break;
++
++          case GLOB_NOMATCH:
++            /* If we want only existing items, skip this one.  */
++            if (flags & PARSEFS_EXISTS)
++              {
++                i = 0;
++                break;
++              }
++            /* FALLTHROUGH */
++
++          default:
++            /* By default keep this name.  */
++            i = 1;
++            nlist = &name;
++            break;
++          }
+ 
+       /* For each matched element, add it to the list.  */
+       while (i-- > 0)
+@@ -3174,7 +3183,8 @@
+ #endif /* !NO_ARCHIVES */
+           NEWELT (concat (2, prefix, nlist[i]));
+ 
+-      globfree (&gl);
++      if (globme)
++        globfree (&gl);
+ 
+ #ifndef NO_ARCHIVES
+       if (arname)
+Index: tests/scripts/functions/wildcard
+===================================================================
+RCS file: /sources/make/make/tests/scripts/functions/wildcard,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- ./tests/scripts/functions/wildcard	13 Jun 2009 21:21:49 -0000	1.6
++++ ./tests/scripts/functions/wildcard	7 May 2011 14:36:11 -0000	1.7
+@@ -88,4 +88,16 @@
+ !,
+               '', "\n");
+ 
++# TEST #5: wildcard used to verify file existence
++
++touch('xxx.yyy');
++
++run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
++              '', "file=xxx.yyy\n");
++
++unlink('xxx.yyy');
++
++run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
++              '', "file=\n");
++
+ 1;
diff --git a/main/make/make-3.82-jobserver.patch b/main/make/make-3.82-jobserver.patch
new file mode 100644
index 0000000000..2a855031dd
--- /dev/null
+++ b/main/make/make-3.82-jobserver.patch
@@ -0,0 +1,19 @@
+diff -up make-3.82/main.c\~ make-3.82/main.c
+--- make-3.82/main.c~	2010-08-12 14:59:20.000000000 +0200
++++ make-3.82/main.c	2010-08-12 15:00:07.000000000 +0200
+@@ -1756,8 +1756,11 @@ main (int argc, char **argv, char **envp
+ 
+       if (job_slots > 0)
+         {
+-          close (job_fds[0]);
+-          close (job_fds[1]);
++	  if (restarts == 0)
++	    {
++	      close (job_fds[0]);
++	      close (job_fds[1]);
++	    }
+           job_fds[0] = job_fds[1] = -1;
+           free (jobserver_fds->list);
+           free (jobserver_fds);
+
+Diff finished.  Thu Aug 12 15:00:22 2010
diff --git a/main/make/make-3.82-memory-corruption.patch b/main/make/make-3.82-memory-corruption.patch
new file mode 100644
index 0000000000..b52dd6e0b9
--- /dev/null
+++ b/main/make/make-3.82-memory-corruption.patch
@@ -0,0 +1,37 @@
+--- ./function.c	2011/04/18 01:25:20	1.121
++++ ./function.c	2011/05/02 12:35:01	1.122
+@@ -706,7 +706,7 @@
+   const char *word_iterator = argv[0];
+   char buf[20];
+ 
+-  while (find_next_token (&word_iterator, (unsigned int *) 0) != 0)
++  while (find_next_token (&word_iterator, NULL) != 0)
+     ++i;
+ 
+   sprintf (buf, "%d", i);
+@@ -1133,21 +1133,14 @@
+ 
+   /* Find the maximum number of words we'll have.  */
+   t = argv[0];
+-  wordi = 1;
+-  while (*t != '\0')
++  wordi = 0;
++  while ((p = find_next_token (&t, NULL)) != 0)
+     {
+-      char c = *(t++);
+-
+-      if (! isspace ((unsigned char)c))
+-        continue;
+-
++      ++t;
+       ++wordi;
+-
+-      while (isspace ((unsigned char)*t))
+-        ++t;
+     }
+ 
+-  words = xmalloc (wordi * sizeof (char *));
++  words = xmalloc ((wordi == 0 ? 1 : wordi) * sizeof (char *));
+ 
+   /* Now assign pointers to each string in the array.  */
+   t = argv[0];
diff --git a/main/make/make-3.82-parallel-remake.patch b/main/make/make-3.82-parallel-remake.patch
new file mode 100644
index 0000000000..923e60ba24
--- /dev/null
+++ b/main/make/make-3.82-parallel-remake.patch
@@ -0,0 +1,39 @@
+fix from upstream cvs
+
+----------------------------
+revision 1.247
+date: 2011-09-18 19:39:26 -0400;  author: psmith;  state: Exp;  lines: +5 -3;  commitid: 07NxO4T5PiWC82Av;
+When we re-exec the master makefile in a jobserver environment, ensure
+that MAKEFLAGS is set properly so the re-exec'd make runs in parallel.
+See Savannah bug #33873.
+
+Index: main.c
+===================================================================
+RCS file: /sources/make/make/main.c,v
+retrieving revision 1.246
+retrieving revision 1.247
+diff -u -p -r1.246 -r1.247
+--- ./main.c	29 Aug 2010 23:05:27 -0000	1.246
++++ ./main.c	18 Sep 2011 23:39:26 -0000	1.247
+@@ -2089,6 +2089,11 @@ main (int argc, char **argv, char **envp
+ 
+           ++restarts;
+ 
++          /* If we're re-exec'ing the first make, put back the number of
++             job slots so define_makefiles() will get it right.  */
++          if (master_job_slots)
++            job_slots = master_job_slots;
++
+           /* Reset makeflags in case they were changed.  */
+           {
+             const char *pv = define_makeflags (1, 1);
+@@ -2825,9 +2830,6 @@ define_makeflags (int all, int makefile)
+ 		       && (*(unsigned int *) cs->value_ptr ==
+ 			   *(unsigned int *) cs->noarg_value))
+ 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
+-	      else if (cs->c == 'j')
+-		/* Special case for `-j'.  */
+-		ADD_FLAG ("1", 1);
+ 	      else
+ 		{
+ 		  char *buf = alloca (30);
diff --git a/main/make/make-3.82-weird-shell.patch b/main/make/make-3.82-weird-shell.patch
new file mode 100644
index 0000000000..dfdaf89c9e
--- /dev/null
+++ b/main/make/make-3.82-weird-shell.patch
@@ -0,0 +1,16 @@
+diff -up make-3.82/job.c\~ make-3.82/job.c
+--- make-3.82/job.c~	2010-08-11 16:13:33.000000000 +0200
++++ make-3.82/job.c	2010-08-12 14:20:08.000000000 +0200
+@@ -2442,7 +2442,11 @@ construct_command_argv_internal (char *l
+ 
+   /* See if it is safe to parse commands internally.  */
+   if (shell == 0)
+-    shell = default_shell;
++    {
++      shell = default_shell;
++      if (shellflags == 0)
++	shellflags = "-c";
++    }
+ #ifdef WINDOWS32
+   else if (strcmp (shell, default_shell))
+   {
diff --git a/main/make/use-malloc.patch b/main/make/use-malloc.patch
new file mode 100644
index 0000000000..8e3284c03e
--- /dev/null
+++ b/main/make/use-malloc.patch
@@ -0,0 +1,38 @@
+Use malloc when construction the command argv instead of stack space.
+This fixes overflowing the stack when building webkit on uclibc based
+systems.
+
+https://savannah.gnu.org/bugs/index.php?36451
+
+--- ./job.c.orig
++++ ./job.c
+@@ -2865,7 +2865,7 @@
+ 	return new_argv;
+       }
+ 
+-    new_line = alloca (shell_len + 1 + sflags_len + 1
++    new_line = xmalloc (shell_len + 1 + sflags_len + 1
+                              + (line_len*2) + 1);
+     ap = new_line;
+     memcpy (ap, shell, shell_len);
+@@ -2923,9 +2923,11 @@
+ #endif
+ 	*ap++ = *p;
+       }
+-    if (ap == new_line + shell_len + sflags_len + 2)
++    if (ap == new_line + shell_len + sflags_len + 2) {
+       /* Line was empty.  */
++      free (new_line);
+       return 0;
++    }
+     *ap = '\0';
+ 
+ #ifdef WINDOWS32
+@@ -3065,6 +3067,7 @@
+       fatal (NILF, _("%s (line %d) Bad shell context (!unixy && !batch_mode_shell)\n"),
+             __FILE__, __LINE__);
+ #endif
++    free (new_line);
+   }
+ #endif	/* ! AMIGA */
+ 
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD
index 34f8431283..1056fca866 100644
--- a/main/mc/APKBUILD
+++ b/main/mc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mc
-pkgver=4.8.2
+pkgver=4.8.3
 pkgrel=0
 pkgdesc="A filemanager/shell that emulates Norton Commander"
 url="http://www.ibiblio.org/mc/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="54eba7680f3e24fbdb8d83e2cde9eca3  mc-4.8.2.tar.bz2"
+md5sums="12d38ad4969df3f8bbf66c3967a191ee  mc-4.8.3.tar.bz2"
diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD
index 204ed1340b..3bce6d13cf 100644
--- a/main/mercurial/APKBUILD
+++ b/main/mercurial/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mercurial
-pkgver=2.1.2
+pkgver=2.2.1
 pkgrel=0
 pkgdesc="A scalable distributed SCM tool"
 url="http://www.selenic.com/mercurial"
@@ -30,4 +30,4 @@ package() {
 	install -Dm644 contrib/vim/HGAnnotate.vim \
 		"${vimpath}/syntax/HGAnnotate.vim" || return 1
 }
-md5sums="15354d739504ec46f68a0fee2ecfbf25  mercurial-2.1.2.tar.gz"
+md5sums="0ff7c7f7c50e506d494ff84baa10a77d  mercurial-2.2.1.tar.gz"
diff --git a/main/midori/APKBUILD b/main/midori/APKBUILD
index 2a0e82c7c2..582fa1ee3b 100644
--- a/main/midori/APKBUILD
+++ b/main/midori/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=midori
-pkgver=0.4.4
+pkgver=0.4.5
 pkgrel=1
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -17,7 +17,7 @@ makedepends="
 	libidn-dev
 	libnotify-dev
 	librsvg-dev
-	libunique-dev
+	libunique3-dev
 	libxml2-dev
 	paxctl
 	pkgconfig
@@ -38,6 +38,7 @@ build() {
 		--disable-hildon \
 		--enable-unique \
 		--enable-nls \
+		--enable-gtk3\
 		|| return 1
 	make
 }
@@ -48,4 +49,4 @@ package() {
 	# PAX does not like the JIT
 	paxctl -c -m -p "$pkgdir"/usr/bin/midori
 }
-md5sums="a6578ebfd237c0f22cce49113b95f70c  midori-0.4.4.tar.bz2"
+md5sums="14288197a1e2251b7c0803e1448daa0e  midori-0.4.5.tar.bz2"
diff --git a/main/mpg123/APKBUILD b/main/mpg123/APKBUILD
index 87692d5fad..f669814472 100644
--- a/main/mpg123/APKBUILD
+++ b/main/mpg123/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mpg123
-pkgver=1.13.8
+pkgver=1.14.1
 pkgrel=0
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 url="http://sourceforge.net/projects/mpg123"
@@ -29,4 +29,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="e82b09c5533c414d670339a717faebab  mpg123-1.13.8.tar.bz2"
+md5sums="f6ade36a7025ec4675144c6d13ddee9b  mpg123-1.14.1.tar.bz2"
diff --git a/main/msmtp/APKBUILD b/main/msmtp/APKBUILD
index 05dab9a9f3..35f11b567e 100644
--- a/main/msmtp/APKBUILD
+++ b/main/msmtp/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=msmtp
-pkgver=1.4.27
+pkgver=1.4.28
 pkgrel=0
 pkgdesc="SMTP client with a sendmail compatible interface"
 url="http://msmtp.sourceforge.net/"
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="2d6d10d9c59ed2b2635554ed35fb9226  msmtp-1.4.27.tar.bz2"
+md5sums="14740478dc9d1f52ec97a415e3373fc7  msmtp-1.4.28.tar.bz2"
diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD
index b306b3ef5a..13ef2eac3b 100644
--- a/main/open-vm-tools/APKBUILD
+++ b/main/open-vm-tools/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=open-vm-tools
 pkgver=2012.03.13
 _pkgsubver=651368
-pkgrel=1
+pkgrel=2
 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
 url="http://open-vm-tools.sourceforge.net/"
 arch="all"
diff --git a/main/pax-utils/APKBUILD b/main/pax-utils/APKBUILD
index 30267bd0a4..ef10104363 100644
--- a/main/pax-utils/APKBUILD
+++ b/main/pax-utils/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pax-utils
-pkgver=0.2.3
+pkgver=0.3.0
 pkgrel=0
 pkgdesc="ELF related utils for ELF 32/64 binaries"
 url="http://hardened.gentoo.org/pax-utils.xml"
@@ -21,4 +21,4 @@ package() {
 	make DESTDIR="$pkgdir/" install
 }
 
-md5sums="d2d27891742d14d81b205cf4e42de28a  pax-utils-0.2.3.tar.xz"
+md5sums="f0c6577977472a327aa39adf1012f150  pax-utils-0.3.0.tar.xz"
diff --git a/main/perl-image-exiftool/APKBUILD b/main/perl-image-exiftool/APKBUILD
index e3429cd3bb..f7dfd6c6f0 100644
--- a/main/perl-image-exiftool/APKBUILD
+++ b/main/perl-image-exiftool/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-image-exiftool
-pkgver=8.79
+pkgver=8.90
 pkgrel=0
 pkgdesc="Perl module for editing exif meta info in files"
 url="http://www.sno.phy.queensu.ca/~phil/exiftool/"
@@ -45,4 +45,4 @@ exiftool() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="72a9095587f3b69efa0b189428512326  Image-ExifTool-8.79.tar.gz"
+md5sums="c34f2138af14e7ab75bddb12d9e8e726  Image-ExifTool-8.90.tar.gz"
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 91d8d8ebf8..b434c9e628 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=php
 pkgver=5.3.12
 _suhosinver=5.3.9-0.9.10
-pkgrel=1
+pkgrel=2
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 arch="all"
diff --git a/main/pidgin/APKBUILD b/main/pidgin/APKBUILD
index 2dac6b8ecc..1600e2ba6d 100644
--- a/main/pidgin/APKBUILD
+++ b/main/pidgin/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pidgin
-pkgver=2.10.3
-pkgrel=1
+pkgver=2.10.4
+pkgrel=0
 pkgdesc="graphical multi-protocol instant messaging client for X"
 url="http://pidgin.im/"
 arch="all"
@@ -69,5 +69,5 @@ libpurple() {
 	mv "$pkgdir"/usr/share/purple "$pkgdir"/usr/share/sounds \
 		"$subpkgdir"/usr/share/
 }
-md5sums="c2f799d45a934a2f0075e32ce49906e6  pidgin-2.10.3.tar.bz2
+md5sums="264f9ae89742b8ee168306b85d2fb51e  pidgin-2.10.4.tar.bz2
 3cf0c3a476007781f4b0d855817cf58a  pidgin-libm.patch"
diff --git a/main/py-gobject/APKBUILD b/main/py-gobject/APKBUILD
index 408cd312da..0fe0d19b31 100644
--- a/main/py-gobject/APKBUILD
+++ b/main/py-gobject/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-gobject
 pkgver=2.28.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for the GObject library"
 url="http://www.pygtk.org/"
 arch="all"
diff --git a/main/rest/APKBUILD b/main/rest/APKBUILD
new file mode 100644
index 0000000000..5bd2e45e2d
--- /dev/null
+++ b/main/rest/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=rest
+pkgver=0.7.12
+pkgrel=0
+pkgdesc="A library for access to RESTful web services"
+url="http://www.gnome.org"
+arch="all"
+license="LGPLv2"
+depends=""
+depends_dev="libsoup-dev gobject-introspection-dev"
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://ftp.gnome.org/pub/gnome/sources/rest/0.7/rest-$pkgver.tar.xz"
+
+_builddir="$srcdir"/rest-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--disable-static \
+		--enable-introspection \
+		--without-gnome \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="dc14e0d89d38af5d8d544ce8f124d186  rest-0.7.12.tar.xz"
diff --git a/main/shotwell/APKBUILD b/main/shotwell/APKBUILD
index b3090bdcb2..916cdd1082 100644
--- a/main/shotwell/APKBUILD
+++ b/main/shotwell/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=shotwell
-pkgver=0.11.6
-pkgrel=2
+pkgver=0.12.3
+pkgrel=0
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 url="http://yorba.org/shotwell/"
 arch="all"
@@ -9,13 +9,12 @@ license="LGPL2.1"
 install="shotwell.post-upgrade shotwell.post-install shotwell.pre-deinstall"
 depends=""
 subpackages="$pkgname-lang"
-makedepends="intltool vala libgee-dev libunique-dev webkit-dev libexif-dev
+makedepends="intltool vala libgee-dev libunique3-dev webkit-dev libexif-dev
 	librsvg-dev sqlite-dev udev-dev dbus-glib-dev libgphoto2-dev
 	libgexiv2-dev libraw-dev librsvg-dev gconf-dev json-glib-dev
-	gnome-vfs-dev m4 gst-plugins-base-dev bash"
+	m4 gst-plugins-base-dev bash gtk+3.0-dev rest-dev"
 install=
-source="http://yorba.org/download/shotwell/${pkgver%.*}/shotwell-$pkgver.tar.bz2
-	shotwell-libraw.patch"
+source="http://yorba.org/download/shotwell/${pkgver%.*}/shotwell-$pkgver.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -44,5 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="bbbf2843eb98b6f0ef1dfcfb934e15cf  shotwell-0.11.6.tar.bz2
-0dc92b9a74e6515c14ae35434ee3c568  shotwell-libraw.patch"
+md5sums="de0e05350f8a7d557092489baf14d039  shotwell-0.12.3.tar.bz2"
diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD
index eff517edcb..657ef767fe 100644
--- a/main/strace/APKBUILD
+++ b/main/strace/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=strace
-pkgver=4.6
+pkgver=4.7
 pkgrel=0
 pkgdesc="A useful diagnositic, instructional, and debugging tool"
 url="http://sourceforge.net/projects/strace/"
@@ -26,4 +26,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make -j1 DESTDIR="$pkgdir" install
 }
-md5sums="e537b2b1afeec70c0e6e27a0d0fd671e  strace-4.6.tar.xz"
+md5sums="6054c3880a00c6703f83b57f15e04642  strace-4.7.tar.xz"
diff --git a/main/swig/APKBUILD b/main/swig/APKBUILD
index 0dfff98444..182da6f850 100644
--- a/main/swig/APKBUILD
+++ b/main/swig/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=swig
-pkgver=2.0.4
-pkgrel=1
+pkgver=2.0.6
+pkgrel=0
 pkgdesc="SWIG is a compiler that makes it easy to integrate C and C++ code with scripting languages"
 url="http://www.swig.org/"
 arch="all"
@@ -21,4 +21,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 	install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums="4319c503ee3a13d2a53be9d828c3adc0  swig-2.0.4.tar.gz"
+md5sums="86bc02218774ca75bdf7766db74a62c6  swig-2.0.6.tar.gz"
diff --git a/main/ttf-freefont/APKBUILD b/main/ttf-freefont/APKBUILD
index 6ec0683fbc..e335abed21 100644
--- a/main/ttf-freefont/APKBUILD
+++ b/main/ttf-freefont/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ttf-freefont
-pkgver=20100919
+pkgver=20120503
 pkgrel=0
 pkgdesc="A set of free high-quality TrueType fonts covering the UCS character set"
 url="http://www.nongnu.org/freefont/"
@@ -9,7 +9,7 @@ license="GPL"
 depends="fontconfig encodings mkfontdir mkfontscale"
 makedepends="pkgconfig font-util-dev"
 install=
-source="http://ftp.gnu.org/gnu/freefont/freefont-ttf-$pkgver.tar.gz"
+source="http://ftp.gnu.org/gnu/freefont/freefont-ttf-$pkgver.zip"
 
 _builddir="$srcdir/freefont-$pkgver"
 build() {
@@ -22,4 +22,4 @@ package() {
 	install -m644 *.ttf "$pkgdir/usr/share/fonts/TTF/"
 }
 
-md5sums="33d96c755d0a6f585bc917f08cbddf66  freefont-ttf-20100919.tar.gz"
+md5sums="879b76d2e3c8003d567b555743f39154  freefont-ttf-20120503.zip"
diff --git a/main/unionfs-fuse/APKBUILD b/main/unionfs-fuse/APKBUILD
new file mode 100644
index 0000000000..93e5c00bc7
--- /dev/null
+++ b/main/unionfs-fuse/APKBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Michael Zhou <zhoumichaely@gmail.com>
+pkgname=unionfs-fuse
+pkgver=0.24
+pkgrel=0
+pkgdesc="Union Filesystem in Userspace"
+url="http://podgorny.cz/moin/UnionFsFuse"
+arch="all"
+license="GPL"
+depends=""
+makedepends="fuse-dev libiconv-dev"
+subpackages="${pkgname}-doc"
+source="http://podgorny.cz/unionfs-fuse/releases/${pkgname}-${pkgver}.tar.bz2"
+
+_builddir="${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	mkdir -p "$pkgdir"/usr/share/man/man8/
+	make DESTDIR="$pkgdir" PREFIX=/usr install || return 1
+}
+md5sums="ab00f252c55a9a7252fca13a53260bf5  unionfs-fuse-0.24.tar.bz2"
diff --git a/main/vala/APKBUILD b/main/vala/APKBUILD
index 34c5d1f94c..c8359c25c6 100644
--- a/main/vala/APKBUILD
+++ b/main/vala/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vala
-pkgver=0.12.1
-pkgrel=2
+pkgver=0.16.0
+pkgrel=0
 pkgdesc="Compiler for the GObject type system"
 url="http://live.gnome.org/Vala"
 arch="all"
@@ -9,7 +9,7 @@ license="LGPL"
 subpackages="$pkgname-doc"
 depends="glib-dev"
 makedepends="libxslt-dev bash glib-dev flex bison"
-source="http://download.gnome.org/sources/vala/${pkgver%.*}/vala-$pkgver.tar.bz2
+source="http://download.gnome.org/sources/vala/${pkgver%.*}/vala-$pkgver.tar.xz
 	version.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -36,5 +36,5 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="bf35262cc611de447147d01cbac33767  vala-0.12.1.tar.bz2
+md5sums="84b742e9cca4c90fde3026c3793c03c1  vala-0.16.0.tar.xz
 99524c2de7df37c95f314709a041ac65  version.patch"
diff --git a/main/webkit/APKBUILD b/main/webkit/APKBUILD
index e5c12581ae..c367d1a3c3 100644
--- a/main/webkit/APKBUILD
+++ b/main/webkit/APKBUILD
@@ -1,28 +1,52 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=webkit
-pkgver=1.6.3
-pkgrel=1
+pkgver=1.8.1
+pkgrel=0
 pkgdesc="portable web rendering engine WebKit for GTK+"
 url="http://webkitgtk.org/"
 arch="all"
 license="LGPL BSD"
 depends=
-makedepends="
-	libsoup-dev pango-dev gtk+-dev jpeg-dev libpng-dev libxml2-dev
-	gperf pkgconfig bison flex 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 libxi-dev libxrandr-dev libxcursor-dev libxdamage-dev
-	libxcomposite-dev gstreamer-dev gst-plugins-base-dev
-	gobject-introspection-dev perl-switch
+depends_dev="gtk+3.0-dev libsoup-dev gstreamer-dev"
+makedepends="$depends_dev
+	autoconf automake libtool
+	bison
+	enchant-dev
+	expat-dev
+	flex
+	gnutls-dev
+	gobject-introspection-dev
+	gperf
+	gst-plugins-base-dev
+	gstreamer-dev
+	gtk-doc
+	icu-dev
+	jpeg-dev
+	libgcrypt-dev
+	libgpg-error-dev
+	libpng-dev
+	libsoup-dev
+	libxcomposite-dev
+	libxcursor-dev
+	libxdamage-dev
+	libxi-dev
+	libxml2-dev
+	libxrandr-dev
+	libxslt-dev
+	libxt-dev
+	mesa-dev
+	pango-dev
+	perl-switch
+	sqlite-dev
+	zlib-dev
 	"
 install=
 subpackages="$pkgname-dev gtklauncher $pkgname-lang"
-source="http://webkitgtk.org/$pkgname-$pkgver.tar.xz
-	webkit-1.6.1-alt-fix-TEXTREL.patch
+source="http://webkitgtk.org/releases/webkit-$pkgver.tar.xz
+	webkit-gtk-1.7.90-parallel-make-hack.patch
+	webkit-1.8-textrels.patch
 	"
 
-depends_dev="gtk+-dev libsoup-dev gstreamer-dev"
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
@@ -35,6 +59,7 @@ prepare() {
 			;;
 		esac
 	done
+	libtoolize --force && aclocal -I Source/autotools && autoconf && automake || return 1
 }
 
 build() {
@@ -43,9 +68,15 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-gtk=2.0 \
+		--disable-geolocation \
+		--with-gtk=3.0 \
 		|| return 1
-	make || return 1
+	# hack to work around parallel make problems,
+	# see https://bugs.webkit.org/show_bug.cgi?id=79498
+	make -j1 all-built-sources-local \
+		&& make all-ltlibraries-local \
+		&& make all-programs-local \
+		&& make || return 1
 }
 
 package() {
@@ -67,5 +98,6 @@ gtklauncher() {
 		"$subpkgdir"/usr/bin/GtkLauncher
 }
 
-md5sums="c476d9335419df061510d31e21175df1  webkit-1.6.3.tar.xz
-4e47996e3bb87ca27c0e49ce6a2abbc7  webkit-1.6.1-alt-fix-TEXTREL.patch"
+md5sums="f2f01b1fdc7262a2eede81ebed0970b2  webkit-1.8.1.tar.xz
+de77a3e7e61753e7f1cce3f4bd00a3f6  webkit-gtk-1.7.90-parallel-make-hack.patch
+8de7b9f904387a798e10ac4add61640c  webkit-1.8-textrels.patch"
diff --git a/main/webkit/webkit-1.6.1-alt-fix-TEXTREL.patch b/main/webkit/webkit-1.6.1-alt-fix-TEXTREL.patch
deleted file mode 100644
index 3757e719d3..0000000000
--- a/main/webkit/webkit-1.6.1-alt-fix-TEXTREL.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur webkit-1.6.1/Source/JavaScriptCore/jit/JITStubs.cpp webkit-1.6.1.new/Source/JavaScriptCore/jit/JITStubs.cpp
---- webkit-1.6.1/Source/JavaScriptCore/jit/JITStubs.cpp	2011-10-21 21:18:46.000000000 +0400
-+++ webkit-1.6.1.new/Source/JavaScriptCore/jit/JITStubs.cpp	2011-10-21 21:19:51.397529165 +0400
-@@ -80,7 +80,7 @@
- #define THUMB_FUNC_PARAM(name)
- #endif
- 
--#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
-+#if (OS(LINUX) || OS(FREEBSD)) && (CPU(X86) || CPU(X86_64))
- #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
- #elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
- #define SYMBOL_STRING_RELOCATION(name) "_" #name
-diff -ur webkit-1.6.1/Source/JavaScriptCore/jit/ThunkGenerators.cpp webkit-1.6.1.new/Source/JavaScriptCore/jit/ThunkGenerators.cpp
---- webkit-1.6.1/Source/JavaScriptCore/jit/ThunkGenerators.cpp	2011-10-21 21:18:46.000000000 +0400
-+++ webkit-1.6.1.new/Source/JavaScriptCore/jit/ThunkGenerators.cpp	2011-10-21 21:20:01.029529805 +0400
-@@ -108,7 +108,7 @@
- #define SYMBOL_STRING(name) #name
- #endif
-     
--#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
-+#if (OS(LINUX) || OS(FREEBSD)) && (CPU(X86) || CPU(X86_64))
- #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
- #elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
- #define SYMBOL_STRING_RELOCATION(name) "_" #name
diff --git a/main/webkit/webkit-1.8-textrels.patch b/main/webkit/webkit-1.8-textrels.patch
new file mode 100644
index 0000000000..77edc745d3
--- /dev/null
+++ b/main/webkit/webkit-1.8-textrels.patch
@@ -0,0 +1,11 @@
+--- ./Source/JavaScriptCore/wtf/InlineASM.h.orig
++++ ./Source/JavaScriptCore/wtf/InlineASM.h
+@@ -42,7 +42,7 @@
+ #define THUMB_FUNC_PARAM(name)
+ #endif
+ 
+-#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
++#if (OS(LINUX) || OS(FREEBSD)) && (CPU(X86_64) || CPU(X86))
+ #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
+ #elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
+ #define SYMBOL_STRING_RELOCATION(name) "_" #name
diff --git a/main/webkit/webkit-gtk-1.7.90-parallel-make-hack.patch b/main/webkit/webkit-gtk-1.7.90-parallel-make-hack.patch
new file mode 100644
index 0000000000..b632ca2791
--- /dev/null
+++ b/main/webkit/webkit-gtk-1.7.90-parallel-make-hack.patch
@@ -0,0 +1,21 @@
+Horrible failure of a hack to enable workaround for
+https://bugs.webkit.org/show_bug.cgi?id=79498
+
+--- a/GNUmakefile.am
++++ b/GNUmakefile.am
+@@ -285,6 +285,15 @@
+ all-local: stamp-po
+ 	$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
+ 
++# Horrible hack to enable workaround for parallel make failure
++all-built-sources-local: $(BUILT_SOURCES) autotoolsconfig.h
++
++all-ltlibraries-local: GNUmakefile $(LTLIBRARIES)
++
++all-programs-local: GNUmakefile $(PROGRAMS)
++
++all-data-local: GNUmakefile $(DATA)
++
+ # remove built sources and program directories
+ clean-local:
+ 	-rm -rf $(GENPROGRAMS)
diff --git a/main/xf86-input-synaptics/APKBUILD b/main/xf86-input-synaptics/APKBUILD
index af9163708b..41920cbcbc 100644
--- a/main/xf86-input-synaptics/APKBUILD
+++ b/main/xf86-input-synaptics/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-input-synaptics
-pkgver=1.5.99.903
+pkgver=1.5.99.904
 pkgrel=0
 pkgdesc="X.org synaptics input driver"
 url="http://xorg.freedesktop.org/"
@@ -25,4 +25,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/input/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="56f125403497c55e0c88130b90c1c7b2  xf86-input-synaptics-1.5.99.903.tar.bz2"
+md5sums="8c07650a79b160c8f04470219bf1bd84  xf86-input-synaptics-1.5.99.904.tar.bz2"
diff --git a/main/xf86-video-nouveau/APKBUILD b/main/xf86-video-nouveau/APKBUILD
index 625cbb4d52..ba52236b16 100644
--- a/main/xf86-video-nouveau/APKBUILD
+++ b/main/xf86-video-nouveau/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer:
 pkgname=xf86-video-nouveau
 _gitdate=20111010
-pkgver=0.0.16_git20120106
-pkgrel=1
+pkgver=0.0.16_git20120210
+pkgrel=0
 pkgdesc="Open-source X.org drivers for nVidia video cards"
 url="http://nouveau.freedesktop.org/"
 arch="all"
diff --git a/main/xfce4-battery-plugin/APKBUILD b/main/xfce4-battery-plugin/APKBUILD
index 00055fa2f4..45c4285b19 100644
--- a/main/xfce4-battery-plugin/APKBUILD
+++ b/main/xfce4-battery-plugin/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-battery-plugin
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=0
 pkgdesc="A battery monitor plugin for the Xfce panel"
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
@@ -36,4 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 	rm "$pkgdir"/usr/lib/xfce4/panel/plugins/*.la
 }
-md5sums="ad2a1f12ae3e2ea66948c89a1c8a287d  xfce4-battery-plugin-1.0.1.tar.bz2"
+md5sums="4fb65d12928d438273eebbe76bba5d6d  xfce4-battery-plugin-1.0.2.tar.bz2"
diff --git a/main/xfce4-clipman-plugin/APKBUILD b/main/xfce4-clipman-plugin/APKBUILD
new file mode 100644
index 0000000000..5a44ff0a61
--- /dev/null
+++ b/main/xfce4-clipman-plugin/APKBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xfce4-clipman-plugin
+pkgver=1.2.3
+pkgrel=0
+pkgdesc="Clipboard manager plugin for the Xfce panel"
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
+arch="all"
+license="GPLv2+"
+depends=""
+makedepends="libxfce4ui-dev xfce4-panel-dev libunique-dev libxtst-dev exo-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.2/xfce4-clipman-plugin-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/xfce4-clipman-plugin-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--disable-static \
+		--enable-unique \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/xfce4/panel/plugins/*.la
+}
+
+md5sums="61f3be97efa379cb358980c94e14692a  xfce4-clipman-plugin-1.2.3.tar.bz2"
diff --git a/main/xfce4-cpugraph-plugin/APKBUILD b/main/xfce4-cpugraph-plugin/APKBUILD
new file mode 100644
index 0000000000..068a130b0b
--- /dev/null
+++ b/main/xfce4-cpugraph-plugin/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xfce4-cpugraph-plugin
+pkgver=1.0.2
+pkgrel=0
+pkgdesc="CPU monitor for the Xfce panel"
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
+arch="all"
+license="GPLv2+"
+depends=""
+makedepends="libxfce4ui-dev xfce4-panel-dev"
+install=""
+subpackages="$pkgname-lang"
+source="http://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/${pkgver%.*}/xfce4-cpugraph-plugin-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/xfce4-cpugraph-plugin-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make -j1 DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/xfce4/panel/plugins/*.la
+}
+
+md5sums="93d7658d989ebf110875bc2deb76d7b3  xfce4-cpugraph-plugin-1.0.2.tar.bz2"
diff --git a/main/xfce4-screenshooter/APKBUILD b/main/xfce4-screenshooter/APKBUILD
index f792800b76..fd6a9af5b9 100644
--- a/main/xfce4-screenshooter/APKBUILD
+++ b/main/xfce4-screenshooter/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-screenshooter
-pkgver=1.8.0
-pkgrel=3
+pkgver=1.8.1
+pkgrel=0
 pkgdesc="screenshot application for Xfce4"
 url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
 arch="all"
@@ -12,7 +12,6 @@ makedepends="xfce4-panel-dev hicolor-icon-theme libsoup-dev libxfce4ui-dev
 	exo-dev libxext-dev"
 install=
 source="http://archive.xfce.org/src/apps/xfce4-screenshooter/${pkgver%.*}/xfce4-screenshooter-$pkgver.tar.bz2
-	fs-25873-segfault-in-awesome-wm.patch
 	xfce4-screenshooter-1.7.9-dsofix.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -38,8 +37,8 @@ build () {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/xfce4/panel/plugins/*.la
 }
 
-md5sums="b51ab5725418e7258273c4a6402adb02  xfce4-screenshooter-1.8.0.tar.bz2
-18042622c40c37a13da958aee216cafb  fs-25873-segfault-in-awesome-wm.patch
+md5sums="d0ffea2052a8e70154cf13789070711f  xfce4-screenshooter-1.8.1.tar.bz2
 a8a30afa060e0f65cbc8a0809f2d8c31  xfce4-screenshooter-1.7.9-dsofix.patch"
diff --git a/main/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch b/main/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch
deleted file mode 100644
index 47e0671446..0000000000
--- a/main/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/lib/screenshooter-capture.c	
-+++ a/lib/screenshooter-capture.c	
-@@ -381,6 +381,18 @@ static GdkPixbuf
-                   rec_height += rectangle.y;
-                 }
- 
-+              if (rec_x < 0)
-+                {
-+                  rec_width = rec_width + rec_x;
-+                  rec_x = 0;
-+                }
-+
-+              if (rec_y < 0)
-+                {
-+                  rec_height = rec_height + rec_y;
-+                  rec_y = 0;
-+                }
-+
-               if (x_orig + rec_x + rec_width > gdk_screen_width ())
-                 rec_width = gdk_screen_width () - x_orig - rec_x;
- 
diff --git a/main/xfce4-vala/APKBUILD b/main/xfce4-vala/APKBUILD
index 4bce4f60ed..52ffb67622 100644
--- a/main/xfce4-vala/APKBUILD
+++ b/main/xfce4-vala/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-vala
 pkgver=4.8.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Vala bindings for Xfce4"
 url="http://wiki.xfce.org/vala-bindings"
 arch="x86 x86_64"
@@ -23,6 +23,7 @@ prepare() {
 		*.patch) msg $_p; patch -p1 -i "$srcdir"/$_p || return 1;;
 		esac
 	done
+	sed -i -e '/libvala/s/0.12/0.16/g' configure || return 1
 }
 
 build() {
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD
index 8c2716113a..bdcd517c52 100644
--- a/main/zlib/APKBUILD
+++ b/main/zlib/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zlib
-pkgver=1.2.6
+pkgver=1.2.7
 pkgrel=0
 pkgdesc="A compression/decompression Library"
 arch="all"
@@ -37,4 +37,4 @@ dev() {
 	mv "$pkgdir"/lib/libz.a "$subpkgdir"/lib/libz.a
 }
 
-md5sums="618e944d7c7cd6521551e30b32322f4a  zlib-1.2.6.tar.gz"
+md5sums="60df6a37c56e7c1366cca812414f7b85  zlib-1.2.7.tar.gz"