Merge branch 'master' of ssh://dev.alpinelinux.org/home/fcolista/cgit/aports-fcolista

author: Leonardo Arena <rnalrd@alpinelinux.org> 2012-01-02 10:06:42 +0000
committer: Leonardo Arena <rnalrd@alpinelinux.org> 2012-01-02 10:06:42 +0000
commit: dbee1f2c9e8313343fa945194cb0d230bad8892c (patch)
tree: f8da89f03be446f573089d95ae686e701082946f /main
parent: 431dfa4619c52a2fff537fb997dbe8b8e44f2f03 (diff)
parent: daafae5c7c194f4d3ba052691a043da06c294a46 (diff)
download: aports-dbee1f2c9e8313343fa945194cb0d230bad8892c.tar.bz2
aports-dbee1f2c9e8313343fa945194cb0d230bad8892c.tar.xz
305 files changed, 7210 insertions, 4068 deletions
diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index 6b6b03d6b..2d72758a9 100644
--- a/main/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
@@ -1,17 +1,17 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dnsmasq
-pkgver=0.3.0
+pkgver=0.3.1
 pkgrel=0
 pkgdesc="A web-based system administration interface for dnsmasq"
 url="http://git.alpinelinux.org/cgit/acf-dnsmasq"
 arch="noarch"
 license="GPL-2"
 depends="acf-core lua dnsmasq"
-source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
 
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="5c1843623c805fbf9be4dcde32049206  acf-dnsmasq-0.3.0.tar.bz2"
+md5sums="1f50aac0defc675ccc91135e46b08004  acf-dnsmasq-0.3.1.tar.bz2"
diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index 88dc98052..8832617b3 100644
--- a/main/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-skins
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=0
 pkgdesc="Skins for ACF"
 url="http://git.alpinelinux.org/cgit/acf-skins"
@@ -14,4 +14,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="cbfeab06f1b82d906ac459225d897dd2  acf-skins-0.4.1.tar.bz2"
+md5sums="507b98b802457910ea060638d1f08a76  acf-skins-0.4.2.tar.bz2"
diff --git a/main/alpine-mirrors/APKBUILD b/main/alpine-mirrors/APKBUILD
index 52055c088..7ac33776b 100644
--- a/main/alpine-mirrors/APKBUILD
+++ b/main/alpine-mirrors/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-mirrors
-pkgver=2.1.0_git20110122
+pkgver=2.1.0_git20111203
 pkgrel=0
 pkgdesc="List of Alpine Linux Mirrors"
 url="http://alpinelinux.org/"
@@ -11,7 +11,7 @@ depends=
 makedepends=
 install=
 subpackages=
-source="http://www.alpinelinux.org/alpine/MIRRORS.txt
+source="MIRRORS.txt
 	RELEASES.txt
 	"
 
@@ -26,5 +26,5 @@ package() {
 		"$pkgdir"/usr/share/alpine-mirrors/RELEASES.txt
 }
 
-md5sums="14a00f625a76ebe8e957d21abdf8b6c2  MIRRORS.txt
-4f1406540f5debe6805c14ebe8da8ca5  RELEASES.txt"
+md5sums="052304b2ce9186a89d6de05a41a0e274  MIRRORS.txt
+2d261c2947ccf35000ae3128d33da04a  RELEASES.txt"
diff --git a/main/alpine-mirrors/MIRRORS.txt b/main/alpine-mirrors/MIRRORS.txt
new file mode 100644
index 000000000..9f821dd12
--- /dev/null
+++ b/main/alpine-mirrors/MIRRORS.txt
@@ -0,0 +1,6 @@
+http://dl-2.alpinelinux.org/alpine/
+http://dl-3.alpinelinux.org/alpine/
+http://dl-4.alpinelinux.org/alpine/
+http://mirrors.gigenet.com/alpinelinux/
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/alpine/alpine/
+http://nl.alpinelinux.org/alpine/
diff --git a/main/alpine-mirrors/RELEASES.txt b/main/alpine-mirrors/RELEASES.txt
index 903fa336e..af59c903c 100644
--- a/main/alpine-mirrors/RELEASES.txt
+++ b/main/alpine-mirrors/RELEASES.txt
@@ -1,2 +1,2 @@
 edge
-v2.2
+v2.3
diff --git a/main/amavisd-new/APKBUILD b/main/amavisd-new/APKBUILD
index dae1e264c..419e4d934 100644
--- a/main/amavisd-new/APKBUILD
+++ b/main/amavisd-new/APKBUILD
@@ -1,11 +1,11 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=amavisd-new
-pkgver=2.6.4
-pkgrel=3
+pkgver=2.7.0
+pkgrel=0
 pkgdesc="High-performance interface between mailer (MTA) and content checkers"
 url="http://www.ijs.si/software/amavisd"
-arch="all"
+arch="noarch"
 license="GPL-2"
 depends="sed file perl perl-archive-zip perl-convert-tnef
 perl-convert-uulib perl-mime-tools perl-mail-tools perl-net-server
@@ -44,4 +44,4 @@ build() {
 	)
 }
 
-md5sums="03d31657f14cd64c1cb38786214234b4  amavisd-new-2.6.4.tar.gz"
+md5sums="7d85dce11e54598c0b4010aef323eefc  amavisd-new-2.7.0.tar.gz"
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 5a1918e74..d15c12e9e 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apache2
 pkgver=2.2.21
-pkgrel=0
+pkgrel=1
 pkgdesc="A high performance Unix-based HTTP server"
 url="http://httpd.apache.org/"
 arch="all"
@@ -32,7 +32,8 @@ source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2
 	httpd.conf
 	ssl.conf
 	ldap.conf
-	alpine.layout"
+	alpine.layout
+	CVE-2011-4317.patch"
 
 prepare() {
 	cd "$srcdir"/httpd-$pkgver
@@ -251,4 +252,5 @@ e322b5211e49511cac6e40c86af1b1da  apache2.confd
 749faf0b2916d85d1240bc34f700e5d9  httpd.conf
 5d0d024ca43571b863874ab871b2c109  ssl.conf
 b70fe826486043e3953cfe21f9e6fa16  ldap.conf
-c66ff5f70260d5266e6803a59b39bd7f  alpine.layout"
+c66ff5f70260d5266e6803a59b39bd7f  alpine.layout
+4c9b33458e4c8dea1be39f811da39be3  CVE-2011-4317.patch"
diff --git a/main/apache2/CVE-2011-4317.patch b/main/apache2/CVE-2011-4317.patch
new file mode 100644
index 000000000..698b2eb7a
--- /dev/null
+++ b/main/apache2/CVE-2011-4317.patch
@@ -0,0 +1,36 @@
+Index: modules/proxy/mod_proxy.c
+===================================================================
+--- httpd-2.2.21/modules/proxy/mod_proxy.c	(revision 1179633)
++++ httpd-2.2.21/modules/proxy/mod_proxy.c	(working copy)
+@@ -566,6 +566,13 @@
+         return OK;
+     }
+ 
++    /* Check that the URI is valid. */
++    if (!r->uri  || r->uri[0] != '/') {
++        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                     "Invalid URI in request %s", r->the_request);
++        return HTTP_BAD_REQUEST;
++    }
++
+     /* XXX: since r->uri has been manipulated already we're not really
+      * compliant with RFC1945 at this point.  But this probably isn't
+      * an issue because this is a hybrid proxy/origin server.
+Index: modules/mappers/mod_rewrite.c
+===================================================================
+--- httpd-2.2.21/modules/mappers/mod_rewrite.c	(revision 1179633)
++++ httpd-2.2.21/modules/mappers/mod_rewrite.c	(working copy)
+@@ -4266,6 +4266,13 @@
+         return DECLINED;
+     }
+ 
++    /* Check that the URI is valid. */
++    if (!r->uri || r->uri[0] != '/') {
++        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                     "Invalid URI in request %s", r->the_request);
++        return HTTP_BAD_REQUEST;
++    }
++    
+     /*
+      *  add the SCRIPT_URL variable to the env. this is a bit complicated
+      *  due to the fact that apache uses subrequests and internal redirects
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index b2b53e7f9..7f8b79912 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
-pkgver=2.2.1
+pkgver=2.2.2
 pkgrel=0
 pkgdesc="Alpine Package Keeper - package manager for alpine"
 subpackages="$pkgname-static lua-apk:luaapk"
@@ -54,4 +54,4 @@ luaapk() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
 }
 
-md5sums="36e6906c05cf55032f827a40c72970ec  apk-tools-2.2.1.tar.bz2"
+md5sums="1660ba53d447d2151371715d1225fdbf  apk-tools-2.2.2.tar.bz2"
diff --git a/main/argp-standalone/001-throw-in-funcdef.patch b/main/argp-standalone/001-throw-in-funcdef.patch
new file mode 100644
index 000000000..4a90751e1
--- /dev/null
+++ b/main/argp-standalone/001-throw-in-funcdef.patch
@@ -0,0 +1,79 @@
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
+# Copyright (C) 2006 The T2 SDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- T2-COPYRIGHT-NOTE-END ---
+
+
+No __THROW in function implementation.
+	--jsaw
+
+--- argp-standalone-1.4-test2/argp.h.orig	2006-01-06 02:29:59.000000000 +0100
++++ argp-standalone-1.4-test2/argp.h	2006-01-06 02:41:10.000000000 +0100
+@@ -560,17 +560,17 @@
+ # endif
+ 
+ # ifndef ARGP_EI
+-#  define ARGP_EI extern __inline__
++#  define ARGP_EI extern inline
+ # endif
+ 
+ ARGP_EI void
+-__argp_usage (__const struct argp_state *__state) __THROW
++__argp_usage (__const struct argp_state *__state)
+ {
+   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
+ }
+ 
+ ARGP_EI int
+-__option_is_short (__const struct argp_option *__opt) __THROW
++__option_is_short (__const struct argp_option *__opt)
+ {
+   if (__opt->flags & OPTION_DOC)
+     return 0;
+@@ -582,7 +582,7 @@
+ }
+ 
+ ARGP_EI int
+-__option_is_end (__const struct argp_option *__opt) __THROW
++__option_is_end (__const struct argp_option *__opt)
+ {
+   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
+ }
+--- argp-standalone-1.4-test2/argp-parse.c.orig	2006-01-06 02:47:48.000000000 +0100
++++ argp-standalone-1.4-test2/argp-parse.c	2006-01-06 02:48:16.000000000 +0100
+@@ -1290,13 +1290,13 @@
+ /* Defined here, in case a user is not inlining the definitions in
+  * argp.h */
+ void
+-__argp_usage (__const struct argp_state *__state) __THROW
++__argp_usage (__const struct argp_state *__state)
+ {
+   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
+ }
+ 
+ int
+-__option_is_short (__const struct argp_option *__opt) __THROW
++__option_is_short (__const struct argp_option *__opt) 
+ {
+   if (__opt->flags & OPTION_DOC)
+     return 0;
+@@ -1310,7 +1310,7 @@
+ }
+ 
+ int
+-__option_is_end (__const struct argp_option *__opt) __THROW
++__option_is_end (__const struct argp_option *__opt) 
+ {
+   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
+ }
diff --git a/main/argp-standalone/APKBUILD b/main/argp-standalone/APKBUILD
new file mode 100644
index 000000000..227823cd4
--- /dev/null
+++ b/main/argp-standalone/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Francesco Colista <francesco.colista@gmail.com>
+# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+pkgname=argp-standalone
+pkgver=1.3
+pkgrel=0
+pkgdesc="Hierarchial argument parsing library broken out from glibc"
+url="http://www.lysator.liu.se/~nisse/misc/"
+arch="all"
+license="GPL"
+depends=""
+depends_dev="libtool automake autoconf"
+makedepends="$depends_dev"
+install=""
+subpackages=""
+source="http://www.lysator.liu.se/~nisse/misc/$pkgname-$pkgver.tar.gz
+	001-throw-in-funcdef.patch"
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr
+	make || return 1
+}
+package() {
+	cd "$_builddir"
+	install -D -m644 argp.h "$pkgdir"/usr/include/argp.h
+	install -D -m755 libargp.a "$pkgdir"/usr/lib/libargp.a
+}
+
+md5sums="720704bac078d067111b32444e24ba69  argp-standalone-1.3.tar.gz
+05ba8faf86b1f320127119e9bfc76d1a  001-throw-in-funcdef.patch"
diff --git a/main/arpon/APKBUILD b/main/arpon/APKBUILD
index 57e8bfa59..169d51492 100644
--- a/main/arpon/APKBUILD
+++ b/main/arpon/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=arpon
-pkgver=2.1
+pkgver=2.7
 pkgrel=0
 pkgdesc="Arp handler inspectiON is a handler daemon with tools to handle all ARP aspects"
 url="http://arpon.sourceforge.net/"
@@ -37,6 +37,6 @@ package() {
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-md5sums="c5e958af0d7068a12cb1fea656a759bd  ArpON-2.1.tar.gz
+md5sums="3c3230f6852b9ffd5618a35c2f25221c  ArpON-2.7.tar.gz
 4bf2cb423936b1ca84773fe6b7baaa73  arpon.initd
 26986bed19b28cec66ed08447d22efaf  arpon.confd"
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index bd879610b..c0e2e5c64 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=1.8.8.0_rc4
-pkgrel=0
+pkgver=10.0.0
+pkgrel=3
 pkgdesc="Asterisk: A Module Open Source PBX System"
 url="http://www.asterisk.org/"
 arch="all"
@@ -11,7 +11,7 @@ depends=
 makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev
 	postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev tar
 	freetds-dev openssl-dev lua-dev alsa-lib-dev spandsp-dev tiff-dev
-	libresample sqlite-dev wget speex-dev"
+	libresample sqlite-dev wget speex-dev libogg-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
 	$pkgname-tds $pkgname-fax $pkgname-sample-config:sample $pkgname-sqlite
@@ -20,6 +20,13 @@ source="http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$
 	100-uclibc-daemon.patch
 	101-caps-uclibc.patch
 	400-bug-227.patch
+	ASTERISK-18976.patch
+	ASTERISK-18977.patch
+	ASTERISK-18994.patch
+	ASTERISK-18995.patch
+	ASTERISK-19106.patch
+	ASTERISK-19107.patch
+	ASTERISK-19109.patch
 	asterisk.initd
 	asterisk.confd
 	asterisk.logrotate"
@@ -28,7 +35,7 @@ _builddir="$srcdir/$pkgname-${pkgver/_/-}"
 
 prepare() {
 	cd "$_builddir"
-	for i in ../[1-9]*.patch; do
+	for i in ../[1-9A]*.patch; do
 		msg "Apply $i"
 		patch -p1 < $i || return 1
 	done
@@ -159,10 +166,17 @@ sound_en() {
 	_move_dir var/lib/asterisk/sounds/en
 }
 
-md5sums="5bd6239719370d491553a9a09f0d4dec  asterisk-1.8.8.0-rc4.tar.gz
+md5sums="6b52336b9dc01eeecb9de2eb2818e127  asterisk-10.0.0.tar.gz
 b00c9d98ce2ad445501248a197c6e436  100-uclibc-daemon.patch
 6e1129e30c4fd2c25c86c81685a485a9  101-caps-uclibc.patch
 79e9634b5054bceb3b8dc246654bb243  400-bug-227.patch
-0ce3219e05f55af884a7dc6b99c2b276  asterisk.initd
+da5a3c500192dee4275aae5235d25f97  ASTERISK-18976.patch
+1ddadef41aa7120e168738b6f3ed8917  ASTERISK-18977.patch
+0af5e797f0a99d0f81f95e3710baf5b6  ASTERISK-18994.patch
+bc6713f5434e07b79d3afdd155461d72  ASTERISK-18995.patch
+fee11ba2f6518462ea6dde4039f9d8fa  ASTERISK-19106.patch
+90e6c516b55245f4ff4a995b6f36a6b7  ASTERISK-19107.patch
+a59d61843a44d5a72da401218dcf6588  ASTERISK-19109.patch
+86c7589e906102869d67f7f8bc82ca4b  asterisk.initd
 ed31d7ba37bcf8b0346dcf8593c395f0  asterisk.confd
 3e65172275684373e1a25c8a11224411  asterisk.logrotate"
diff --git a/main/asterisk/ASTERISK-18976.patch b/main/asterisk/ASTERISK-18976.patch
new file mode 100644
index 000000000..36c613ff4
--- /dev/null
+++ b/main/asterisk/ASTERISK-18976.patch
@@ -0,0 +1,142 @@
+--- a/pbx/pbx_lua.c.orig	2011-12-08 08:28:31.000000000 +0200
++++ b/pbx/pbx_lua.c	2011-12-08 08:54:22.000000000 +0200
+@@ -94,7 +94,6 @@
+ static void lua_create_application_metatable(lua_State *L);
+ static void lua_create_autoservice_functions(lua_State *L);
+ static void lua_create_hangup_function(lua_State *L);
+-static void lua_detect_goto(lua_State *L);
+ static void lua_concat_args(lua_State *L, int start, int nargs);
+ 
+ static void lua_state_destroy(void *data);
+@@ -213,19 +212,10 @@
+ 	chan = lua_touserdata(L, -1);
+ 	lua_pop(L, 1);
+ 	
++	context = ast_strdupa(chan->context);
++	exten = ast_strdupa(chan->exten);
++	priority = chan->priority;
+ 	
+-	lua_getfield(L, LUA_REGISTRYINDEX, "context");
+-	context = ast_strdupa(lua_tostring(L, -1));
+-	lua_pop(L, 1);
+-	
+-	lua_getfield(L, LUA_REGISTRYINDEX, "exten");
+-	exten = ast_strdupa(lua_tostring(L, -1));
+-	lua_pop(L, 1);
+-	
+-	lua_getfield(L, LUA_REGISTRYINDEX, "priority");
+-	priority = lua_tointeger(L, -1);
+-	lua_pop(L, 1);
+-
+ 	lua_concat_args(L, 2, nargs);
+ 	data = lua_tostring(L, -1);
+ 
+@@ -256,75 +246,51 @@
+ 		return lua_error(L);
+ 	}
+ 
+-	lua_detect_goto(L);
+-
+-	return 0;
+-}
+-
+-/*!
+- * \brief Detect if a Goto or other dialplan jump has been executed and return
+- * control to the pbx engine.
+- */
+-static void lua_detect_goto(lua_State *L)
+-{
+-	struct ast_channel *chan;
+-
+-	lua_getfield(L, LUA_REGISTRYINDEX, "channel");
+-	chan = lua_touserdata(L, -1);
+-	lua_pop(L, 1);
+-
+-	/* check context */
+-	lua_getfield(L, LUA_REGISTRYINDEX, "context");
+-	lua_pushstring(L, chan->context);
+-	if (!lua_equal(L, -1, -2)) {
++	if (strcmp(context, chan->context)) {
++		lua_pushstring(L, context);
++		lua_pushstring(L, chan->context);
+ 		lua_pushliteral(L, "context");
+-		goto e_goto_detected;
+-	}
+-	lua_pop(L, 2);
+-
+-	/* check exten */
+-	lua_getfield(L, LUA_REGISTRYINDEX, "exten");
+-	lua_pushstring(L, chan->exten);
+-	if (!lua_equal(L, -1, -2)) {
++	} else if (strcmp(exten, chan->exten)) {
++		lua_pushstring(L, exten);
++		lua_pushstring(L, chan->exten);
+ 		lua_pushliteral(L, "exten");
+-		goto e_goto_detected;
+-	}
+-	lua_pop(L, 2);
+-
+-	/* check priority */
+-	lua_getfield(L, LUA_REGISTRYINDEX, "priority");
+-	lua_pushinteger(L, chan->priority);
+-	if (!lua_equal(L, -1, -2)) {
++	} else if (priority != chan->priority) {
++		lua_pushinteger(L, priority);
++		lua_pushinteger(L, chan->priority);
+ 		lua_pushliteral(L, "priority");
+-		goto e_goto_detected;
++	} else {
++		/* no goto - restore the original position back
++		 * to lua state, in case this was a recursive dialplan
++		 * call (a dialplan application re-entering dialplan) */
++		lua_update_registry(L, context, exten, priority);
++		return 0;
+ 	}
+-	lua_pop(L, 2);
+-	return;
+-
+-e_goto_detected:
+-	/* format our debug message */
+-	lua_insert(L, -3);
+ 
+-	lua_pushliteral(L, " changed from ");
++	/* goto detected - construct error message */
+ 	lua_insert(L, -3);
+-
+-	lua_pushliteral(L, " to ");
+-	lua_insert(L, -2);
+-
+-	lua_concat(L, 5);
+-
+-	ast_debug(2, "Goto detected: %s\n", lua_tostring(L, -1));
+-	lua_pop(L, 1);
+-
+-	/* let the lua engine know it needs to return control to the pbx */
+-	lua_pushinteger(L, LUA_GOTO_DETECTED);
++													
++	lua_pushliteral(L, " changed from ");							    
++	lua_insert(L, -3);									       
++													 
++	lua_pushliteral(L, " to ");								      
++	lua_insert(L, -2);									       
++													 
++	lua_concat(L, 5);										
++													 
++	ast_debug(2, "Goto detected: %s\n", lua_tostring(L, -1));					
++	lua_pop(L, 1);										   
++													 
++	/* let the lua engine know it needs to return control to the pbx */			      
++	lua_pushinteger(L, LUA_GOTO_DETECTED);							   
+ 	lua_error(L);
++
++	return 0;
+ }
+ 
+ /*!
+  * \brief [lua_CFunction] Used to get the value of a variable or dialplan
+  * function (for access from lua, don't call directly)
+- * 
++ *
+  * The value of the variable or function is returned.  This function is the
+  * 'get()' function in the following example as would be seen in
+  * extensions.lua.
diff --git a/main/asterisk/ASTERISK-18977.patch b/main/asterisk/ASTERISK-18977.patch
new file mode 100644
index 000000000..fffce032c
--- /dev/null
+++ b/main/asterisk/ASTERISK-18977.patch
@@ -0,0 +1,63 @@
+--- a/res/res_musiconhold.c.orig
++++ b/res/res_musiconhold.c
+@@ -158,6 +158,7 @@
+ 	char name[MAX_MUSICCLASS];
+ 	struct ast_format origwfmt;
+ 	struct ast_format mohwfmt;
++	int announcement;
+ 	int samples;
+ 	int sample_queue;
+ 	int pos;
+@@ -173,6 +174,7 @@
+ #define MOH_SORTALPHA		(1 << 4)
+ 
+ #define MOH_CACHERTCLASSES      (1 << 5)        /*!< Should we use a separate instance of MOH for each user or not */
++#define MOH_ANNOUNCEMENT	(1 << 6)
+ 
+ /* Custom astobj2 flag */
+ #define MOH_NOTDELETED          (1 << 30)       /*!< Find only records that aren't deleted? */
+@@ -183,6 +185,7 @@
+ 	char name[MAX_MUSICCLASS];
+ 	char dir[256];
+ 	char args[256];
++	char announcement[80];
+ 	char mode[80];
+ 	char digit;
+ 	/*! A dynamically sized array to hold the list of filenames in "files" mode */
+@@ -278,6 +281,7 @@
+ 	}
+ 
+ 	state->save_pos = state->pos;
++	state->announcement = 0;
+ 
+ 	state->class = mohclass_unref(state->class, "Unreffing channel's music class upon deactivation of generator");
+ }
+@@ -293,6 +297,16 @@
+ 		chan->stream = NULL;
+ 	}
+ 
++	if (ast_test_flag(state->class, MOH_ANNOUNCEMENT) && state->announcement == 0) {
++		state->announcement = 1;
++		if (ast_openstream_full(chan, state->class->announcement, chan->language, 1)) {
++			ast_debug(1, "%s Opened announcement '%s'\n", chan->name, state->class->announcement);
++			return 0;
++		}
++	} else {
++		state->announcement = 0;
++	}
++
+ 	if (!state->class->total_files) {
+ 		ast_log(LOG_WARNING, "No files available for class '%s'\n", state->class->name);
+ 		return -1;
+@@ -1731,7 +1745,10 @@
+ 				ast_copy_string(class->dir, var->value, sizeof(class->dir));
+ 			else if (!strcasecmp(var->name, "application"))
+ 				ast_copy_string(class->args, var->value, sizeof(class->args));
+-			else if (!strcasecmp(var->name, "digit") && (isdigit(*var->value) || strchr("*#", *var->value)))
++			else if (!strcasecmp(var->name, "announcement")) {
++				ast_copy_string(class->announcement, var->value, sizeof(class->announcement));
++				ast_set_flag(class, MOH_ANNOUNCEMENT);
++			} else if (!strcasecmp(var->name, "digit") && (isdigit(*var->value) || strchr("*#", *var->value)))
+ 				class->digit = *var->value;
+ 			else if (!strcasecmp(var->name, "random"))
+ 				ast_set2_flag(class, ast_true(var->value), MOH_RANDOMIZE);
diff --git a/main/asterisk/ASTERISK-18994.patch b/main/asterisk/ASTERISK-18994.patch
new file mode 100644
index 000000000..702e91375
--- /dev/null
+++ b/main/asterisk/ASTERISK-18994.patch
@@ -0,0 +1,28 @@
+--- a/main/file.c.orig	2011-12-09 11:32:05.000000000 +0200
++++ b/main/file.c	2011-12-09 11:35:22.000000000 +0200
+@@ -1005,6 +1005,7 @@
+ 	struct ast_filestream *fs;
+ 	struct ast_filestream *vfs=NULL;
+ 	char fmt[256];
++	off_t pos;
+ 	int seekattempt;
+ 	int res;
+ 
+@@ -1017,12 +1018,14 @@
+ 	/* check to see if there is any data present (not a zero length file),
+ 	 * done this way because there is no where for ast_openstream_full to
+ 	 * return the file had no data. */
+-	seekattempt = fseek(fs->f, -1, SEEK_END);
++	pos = ftello(fs->f);
++	seekattempt = fseeko(fs->f, -1, SEEK_END);
+ 	if (seekattempt && errno == EINVAL) {
+ 		/* Zero-length file, as opposed to a pipe */
+ 		return 0;
+-	} else {
+-		ast_seekstream(fs, 0, SEEK_SET);
++	}
++	if (seekattempt == 0) {
++		fseeko(fs->f, pos, SEEK_SET);
+ 	}
+ 
+ 	vfs = ast_openvstream(chan, filename, preflang);
diff --git a/main/asterisk/ASTERISK-18995.patch b/main/asterisk/ASTERISK-18995.patch
new file mode 100644
index 000000000..cd144847b
--- /dev/null
+++ b/main/asterisk/ASTERISK-18995.patch
@@ -0,0 +1,358 @@
+--- /dev/null	2011-11-29 09:02:40.279581283 +0200
++++ b/formats/format_ogg_speex.c	2011-12-08 15:57:12.000000000 +0200
+@@ -0,0 +1,355 @@
++/*
++ * Asterisk -- An open source telephony toolkit.
++ *
++ * Copyright (C) 2011, Timo Teräs
++ *
++ * See http://www.asterisk.org for more information about
++ * the Asterisk project. Please do not directly contact
++ * any of the maintainers of this project for assistance;
++ * the project provides a web site, mailing lists and IRC
++ * channels for your use.
++ *
++ * This program is free software, distributed under the terms of
++ * the GNU General Public License Version 2. See the LICENSE file
++ * at the top of the source tree.
++ */
++
++/*! \file
++ *
++ * \brief OGG/Speex streams.
++ * \arg File name extension: spx
++ * \ingroup formats
++ */
++
++/*** MODULEINFO
++	<depend>speex</depend>
++	<depend>ogg</depend>
++	<support_level>extended</support_level>
++ ***/
++
++#include "asterisk.h"
++
++ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
++
++#include "asterisk/mod_format.h"
++#include "asterisk/module.h"
++
++#include <speex/speex_header.h>
++#include <ogg/ogg.h>
++
++#define BLOCK_SIZE	4096		/* buffer size for feeding OGG routines */
++#define	BUF_SIZE	200
++
++struct speex_desc {	/* format specific parameters */
++	/* structures for handling the Ogg container */
++	ogg_sync_state oy;
++	ogg_stream_state os;
++	ogg_page og;
++	ogg_packet op;
++
++	int format_id;
++	int serialno;
++
++	/*! \brief Indicates whether an End of Stream condition has been detected. */
++	int eos;
++};
++
++static int read_packet(struct ast_filestream *fs)
++{
++	struct speex_desc *s = (struct speex_desc *)fs->_private;
++	char *buffer;
++	int result;
++	size_t bytes;
++
++	while (1) {
++		/* Get one packet */
++		result = ogg_stream_packetout(&s->os, &s->op);
++		if (result > 0) {
++			if (s->op.bytes>=5 && !memcmp(s->op.packet, "Speex", 5))
++				s->serialno = s->os.serialno;
++			if (s->serialno == -1 || s->os.serialno != s->serialno)
++				continue;
++			return 0;
++		}
++
++		if (result < 0)
++			ast_log(LOG_WARNING,
++				"Corrupt or missing data at this page position; continuing...\n");
++
++		/* No more packets left in the current page... */
++		if (s->eos) {
++			/* No more pages left in the stream */
++			return -1;
++		}
++
++		while (!s->eos) {
++			/* See if OGG has any pages in it's internal buffers */
++			result = ogg_sync_pageout(&s->oy, &s->og);
++			if (result > 0) {
++				/* Read all streams. */
++				if (ogg_page_serialno(&s->og) != s->os.serialno)
++					ogg_stream_reset_serialno(&s->os, ogg_page_serialno(&s->og));
++				/* Yes, OGG has more pages in it's internal buffers,
++				   add the page to the stream state */
++				result = ogg_stream_pagein(&s->os, &s->og);
++				if (result == 0) {
++					/* Yes, got a new,valid page */
++					if (ogg_page_eos(&s->og) &&
++					    ogg_page_serialno(&s->og) == s->serialno)
++						s->eos = 1;
++					break;
++				}
++				ast_log(LOG_WARNING,
++					"Invalid page in the bitstream; continuing...\n");
++			}
++
++			if (result < 0)
++				ast_log(LOG_WARNING,
++					"Corrupt or missing data in bitstream; continuing...\n");
++
++			/* No, we need to read more data from the file descrptor */
++			/* get a buffer from OGG to read the data into */
++			buffer = ogg_sync_buffer(&s->oy, BLOCK_SIZE);
++			bytes = fread(buffer, 1, BLOCK_SIZE, fs->f);
++			ogg_sync_wrote(&s->oy, bytes);
++			if (bytes == 0)
++				s->eos = 1;
++		}
++	}
++}
++
++/*!
++ * \brief Create a new OGG/Speex filestream and set it up for reading.
++ * \param fs File that points to on disk storage of the OGG/Speex data.
++ * \param expected_rate The expected Speex format (sampling rate).
++ * \return The new filestream.
++ */
++static int ogg_speex_open(struct ast_filestream *fs, int format_id, int expected_rate)
++{
++	char *buffer;
++	size_t bytes;
++	struct speex_desc *s = (struct speex_desc *)fs->_private;
++	SpeexHeader *hdr = NULL;
++	int i, result;
++
++	s->format_id = format_id;
++	s->serialno = -1;
++	ogg_sync_init(&s->oy);
++
++	buffer = ogg_sync_buffer(&s->oy, BLOCK_SIZE);
++	bytes = fread(buffer, 1, BLOCK_SIZE, fs->f);
++	ogg_sync_wrote(&s->oy, bytes);
++
++	result = ogg_sync_pageout(&s->oy, &s->og);
++	if (result != 1) {
++		if(bytes < BLOCK_SIZE) {
++			ast_log(LOG_ERROR, "Run out of data...\n");
++		} else {
++			ast_log(LOG_ERROR, "Input does not appear to be an Ogg bitstream.\n");
++		}
++		ogg_sync_clear(&s->oy);
++		return -1;
++	}
++
++	ogg_stream_init(&s->os, ogg_page_serialno(&s->og));
++	if (ogg_stream_pagein(&s->os, &s->og) < 0) { 
++		ast_log(LOG_ERROR, "Error reading first page of Ogg bitstream data.\n");
++		goto error;
++	}
++
++	if (read_packet(fs) < 0) {
++		ast_log(LOG_ERROR, "Error reading initial header packet.\n");
++		goto error;
++	}
++
++	hdr = speex_packet_to_header((char*)s->op.packet, s->op.bytes);
++	if (memcmp(hdr->speex_string, "Speex   ", 8)) {
++		ast_log(LOG_ERROR, "OGG container does not contain Speex audio!\n");
++		goto error;
++	}
++	if (hdr->frames_per_packet != 1) {
++		ast_log(LOG_ERROR, "Only one frame-per-packet OGG/Speex files are currently supported!\n");
++		goto error;
++	}
++	if (hdr->nb_channels != 1) {
++		ast_log(LOG_ERROR, "Only monophonic OGG/Speex files are currently supported!\n");
++		goto error;
++	}
++	if (hdr->rate != expected_rate) {
++		ast_log(LOG_ERROR, "Unexpected sampling rate (%d != %d)!\n",
++			hdr->rate, expected_rate);
++		goto error;
++	}
++
++	/* this packet is the comment */
++	if (read_packet(fs) < 0) {
++		ast_log(LOG_ERROR, "Error reading comment packet.\n");
++		goto error;
++	}
++	for (i = 0; i < hdr->extra_headers; i++) {
++		if (read_packet(fs) < 0) {
++			ast_log(LOG_ERROR, "Error reading extra header packet %d.\n", i+1);
++			goto error;
++		}
++	}
++	free(hdr);
++
++	return 0;
++error:
++	if (hdr)
++		free(hdr);
++	ogg_stream_clear(&s->os);
++	ogg_sync_clear(&s->oy);
++	return -1;
++}
++
++/*!
++ * \brief Close a OGG/Speex filestream.
++ * \param fs A OGG/Speex filestream.
++ */
++static void ogg_speex_close(struct ast_filestream *fs)
++{
++	struct speex_desc *s = (struct speex_desc *)fs->_private;
++
++	ogg_stream_clear(&s->os);
++	ogg_sync_clear(&s->oy);
++}
++
++/*!
++ * \brief Read a frame full of audio data from the filestream.
++ * \param fs The filestream.
++ * \param whennext Number of sample times to schedule the next call.
++ * \return A pointer to a frame containing audio data or NULL ifthere is no more audio data.
++ */
++static struct ast_frame *ogg_speex_read(struct ast_filestream *fs,
++					 int *whennext)
++{
++	struct speex_desc *s = (struct speex_desc *)fs->_private;
++
++	if (read_packet(fs) < 0)
++		return NULL;
++
++	fs->fr.frametype = AST_FRAME_VOICE;
++	ast_format_set(&fs->fr.subclass.format, s->format_id, 0);
++	fs->fr.mallocd = 0;
++	AST_FRAME_SET_BUFFER(&fs->fr, fs->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
++	memcpy(fs->fr.data.ptr, s->op.packet, s->op.bytes);
++	fs->fr.datalen = s->op.bytes;
++	fs->fr.samples = *whennext = ast_codec_get_samples(&fs->fr);
++
++	return &fs->fr;
++}
++
++/*!
++ * \brief Trucate an OGG/Speex filestream.
++ * \param s The filestream to truncate.
++ * \return 0 on success, -1 on failure.
++ */
++
++static int ogg_speex_trunc(struct ast_filestream *s)
++{
++	ast_log(LOG_WARNING, "Truncation is not supported on OGG/Speex streams!\n");
++	return -1;
++}
++
++/*!
++ * \brief Seek to a specific position in an OGG/Speex filestream.
++ * \param s The filestream to truncate.
++ * \param sample_offset New position for the filestream, measured in 8KHz samples.
++ * \param whence Location to measure 
++ * \return 0 on success, -1 on failure.
++ */
++static int ogg_speex_seek(struct ast_filestream *s, off_t sample_offset, int whence)
++{
++	ast_log(LOG_WARNING, "Seeking is not supported on OGG/Speex streams!\n");
++	return -1;
++}
++
++static off_t ogg_speex_tell(struct ast_filestream *s)
++{
++	ast_log(LOG_WARNING, "Telling is not supported on OGG/Speex streams!\n");
++	return -1;
++}
++
++static int ogg_speex_open_nb(struct ast_filestream *fs) 
++{
++	return ogg_speex_open(fs, AST_FORMAT_SPEEX, 8000);
++}
++
++static struct ast_format_def speex_f = {
++	.name = "ogg_speex",
++	.exts = "spx",
++	.open = ogg_speex_open_nb,
++	.seek = ogg_speex_seek,
++	.trunc = ogg_speex_trunc,
++	.tell = ogg_speex_tell,
++	.read = ogg_speex_read,
++	.close = ogg_speex_close,
++	.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
++	.desc_size = sizeof(struct speex_desc),
++};
++
++static int ogg_speex_open_wb(struct ast_filestream *fs) 
++{
++	return ogg_speex_open(fs, AST_FORMAT_SPEEX16, 16000);
++}
++
++static struct ast_format_def speex16_f = {
++	.name = "ogg_speex16",
++	.exts = "spx16",
++	.open = ogg_speex_open_wb,
++	.seek = ogg_speex_seek,
++	.trunc = ogg_speex_trunc,
++	.tell = ogg_speex_tell,
++	.read = ogg_speex_read,
++	.close = ogg_speex_close,
++	.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
++	.desc_size = sizeof(struct speex_desc),
++};
++
++static int ogg_speex_open_uwb(struct ast_filestream *fs) 
++{
++	return ogg_speex_open(fs, AST_FORMAT_SPEEX32, 32000);
++}
++
++static struct ast_format_def speex32_f = {
++	.name = "ogg_speex32",
++	.exts = "spx32",
++	.open = ogg_speex_open_uwb,
++	.seek = ogg_speex_seek,
++	.trunc = ogg_speex_trunc,
++	.tell = ogg_speex_tell,
++	.read = ogg_speex_read,
++	.close = ogg_speex_close,
++	.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
++	.desc_size = sizeof(struct speex_desc),
++};
++
++static int load_module(void)
++{
++	ast_format_set(&speex_f.format, AST_FORMAT_SPEEX, 0);
++	ast_format_set(&speex16_f.format, AST_FORMAT_SPEEX16, 0);
++	ast_format_set(&speex32_f.format, AST_FORMAT_SPEEX32, 0);
++
++	if (ast_format_def_register(&speex_f) ||
++	    ast_format_def_register(&speex16_f) ||
++	    ast_format_def_register(&speex32_f))
++		return AST_MODULE_LOAD_FAILURE;
++
++	return AST_MODULE_LOAD_SUCCESS;
++}
++
++static int unload_module(void)
++{
++	int res = 0;
++	res |= ast_format_def_unregister(speex_f.name);
++	res |= ast_format_def_unregister(speex16_f.name);
++	res |= ast_format_def_unregister(speex32_f.name);
++	return res;
++}
++
++AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "OGG/Speex audio",
++	.load = load_module,
++	.unload = unload_module,
++	.load_pri = AST_MODPRI_APP_DEPEND
++);
diff --git a/main/asterisk/ASTERISK-19106.patch b/main/asterisk/ASTERISK-19106.patch
new file mode 100644
index 000000000..d2f44c1d9
--- /dev/null
+++ b/main/asterisk/ASTERISK-19106.patch
@@ -0,0 +1,40 @@
+diff --git a/channels/chan_sip.c b/channels/chan_sip.c
+index e7b678b..f1e5578 100644
+--- a/channels/chan_sip.c
++++ b/channels/chan_sip.c
+@@ -13062,17 +13062,8 @@ static int sip_reg_timeout(const void *data)
+ 	}
+ 
+ 	if (r->dnsmgr) {
+-		struct sip_peer *peer;
+ 		/* If the registration has timed out, maybe the IP changed.  Force a refresh. */
+ 		ast_dnsmgr_refresh(r->dnsmgr);
+-		/* If we are resolving a peer, we have to make sure the refreshed address gets copied */
+-		if ((peer = sip_find_peer(r->hostname, NULL, TRUE, FINDPEERS, FALSE, 0))) {
+-			ast_sockaddr_copy(&peer->addr, &r->us);
+-			if (r->portno) {
+-				ast_sockaddr_set_port(&peer->addr, r->portno);
+-			}
+-			peer = sip_unref_peer(peer, "unref after sip_find_peer");
+-		}
+ 	}
+ 
+ 	/* If the initial tranmission failed, we may not have an existing dialog,
+@@ -13187,14 +13178,14 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char *
+ 		}
+ 
+ 		/* Use port number specified if no SRV record was found */
+-		if (!ast_sockaddr_port(&r->us) && r->portno) {
+-			ast_sockaddr_set_port(&r->us, r->portno);
++		if (!ast_sockaddr_port(&r->us)) {
++			ast_sockaddr_set_port(&r->us, r->portno ? r->portno : STANDARD_SIP_PORT);
+ 		}
+ 
+ 		/* It is possible that DNS is unavailable at the time the peer is created. Here, if
+ 		 * we've updated the address in the registry, we copy it to the peer so that
+ 		 * create_addr() can copy it to the dialog via create_addr_from_peer */
+-		if ((peer = sip_find_peer(r->hostname, NULL, TRUE, FINDPEERS, FALSE, 0))) {
++		if ((peer = sip_find_peer(S_OR(r->peername, r->hostname), NULL, TRUE, FINDPEERS, FALSE, 0))) {
+ 			if (ast_sockaddr_isnull(&peer->addr) && !(ast_sockaddr_isnull(&r->us))) {
+ 				ast_sockaddr_copy(&peer->addr, &r->us);
+ 			}
diff --git a/main/asterisk/ASTERISK-19107.patch b/main/asterisk/ASTERISK-19107.patch
new file mode 100644
index 000000000..cb43615b2
--- /dev/null
+++ b/main/asterisk/ASTERISK-19107.patch
@@ -0,0 +1,60 @@
+diff --git a/main/config.c b/main/config.c
+index 498ae99..0f5f0e2 100644
+--- a/main/config.c
++++ b/main/config.c
+@@ -1199,9 +1199,11 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
+ 		if (newcat)
+ 			ast_category_append(cfg, *cat);
+ 	} else if (cur[0] == '#') { /* A directive - #include or #exec */
++		struct ast_config *res;
+ 		char *cur2;
+ 		char real_inclusion_name[256];
+ 		int do_include = 0;	/* otherwise, it is exec */
++		int quiet = 0;
+ 
+ 		cur++;
+ 		c = cur;
+@@ -1221,6 +1223,9 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
+ 		}
+ 		if (!strcasecmp(cur, "include")) {
+ 			do_include = 1;
++		} else if (!strcasecmp(cur, "-include")) {
++			do_include = 1;
++			quiet = 1;
+ 		} else if (!strcasecmp(cur, "exec")) {
+ 			if (!ast_opt_exec_includes) {
+ 				ast_log(LOG_WARNING, "Cannot perform #exec unless execincludes option is enabled in asterisk.conf (options section)!\n");
+@@ -1233,7 +1238,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
+ 
+ 		if (c == NULL) {
+ 			ast_log(LOG_WARNING, "Directive '#%s' needs an argument (%s) at line %d of %s\n", 
+-					do_include ? "include" : "exec",
++					cur,
+ 					do_include ? "filename" : "/path/to/executable",
+ 					lineno,
+ 					configfile);
+@@ -1275,10 +1280,13 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
+ 		/* record this inclusion */
+ 		ast_include_new(cfg, cfg->include_level == 1 ? "" : configfile, cur, !do_include, cur2, lineno, real_inclusion_name, sizeof(real_inclusion_name));
+ 
+-		do_include = ast_config_internal_load(cur, cfg, flags, real_inclusion_name, who_asked) ? 1 : 0;
++		res = ast_config_internal_load(cur, cfg, flags, real_inclusion_name, who_asked);
+ 		if (!ast_strlen_zero(exec_file))
+ 			unlink(exec_file);
+-		if (!do_include) {
++		if (res == CONFIG_STATUS_FILEINVALID) {
++			ast_log(LOG_ERROR, "The file '%s' was listed as a #include but it failed to load.\n", cur);
++			return -1;
++		} else if (res == CONFIG_STATUS_FILEMISSING && !quiet) {
+ 			ast_log(LOG_ERROR, "The file '%s' was listed as a #include but it does not exist.\n", cur);
+ 			return -1;
+ 		}
+@@ -1643,7 +1651,7 @@ static struct ast_config *config_text_file_load(const char *database, const char
+ 	}
+ 	
+ 	if (count == 0)
+-		return NULL;
++		return CONFIG_STATUS_FILEMISSING;
+ 
+ 	return cfg;
+ }
diff --git a/main/asterisk/ASTERISK-19109.patch b/main/asterisk/ASTERISK-19109.patch
new file mode 100644
index 000000000..21fe3cb22
--- /dev/null
+++ b/main/asterisk/ASTERISK-19109.patch
@@ -0,0 +1,449 @@
+diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
+index 42c0a4c..ae26518 100644
+--- a/apps/app_confbridge.c
++++ b/apps/app_confbridge.c
+@@ -184,6 +184,31 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ 		<description>
+ 		</description>
+ 	</manager>
++	<manager name="ConfbridgeDeafen" language="en_US">
++		<synopsis>
++			Deafen a Confbridge user.
++		</synopsis>
++		<syntax>
++			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
++			<parameter name="Conference" required="true" />
++			<parameter name="Channel" required="true" />
++		</syntax>
++		<description>
++		</description>
++	</manager>
++	<manager name="ConfbridgeUndeafen" language="en_US">
++		<synopsis>
++			Un
++			Undefaen a Confbridge user.
++		</synopsis>
++		<syntax>
++			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
++			<parameter name="Conference" required="true" />
++			<parameter name="Channel" required="true" />
++		</syntax>
++		<description>
++		</description>
++	</manager>
+ 	<manager name="ConfbridgeKick" language="en_US">
+ 		<synopsis>
+ 			Kick a Confbridge user.
+@@ -310,6 +335,10 @@ const char *conf_get_sound(enum conf_sounds sound, struct bridge_profile_sounds
+ 		return S_OR(custom_sounds->muted, "conf-muted");
+ 	case CONF_SOUND_UNMUTED:
+ 		return S_OR(custom_sounds->unmuted, "conf-unmuted");
++	case CONF_SOUND_DEAFENED:
++		return S_OR(custom_sounds->deafened, "conf-deafened");
++	case CONF_SOUND_UNDEAFENED:
++		return S_OR(custom_sounds->undeafened, "conf-undeafened");
+ 	case CONF_SOUND_ONLY_ONE:
+ 		return S_OR(custom_sounds->onlyone, "conf-onlyone");
+ 	case CONF_SOUND_THERE_ARE:
+@@ -1416,10 +1445,13 @@ static int confbridge_exec(struct ast_channel *chan, const char *data)
+ 	volume_adjustments[0] = ast_audiohook_volume_get(chan, AST_AUDIOHOOK_DIRECTION_READ);
+ 	volume_adjustments[1] = ast_audiohook_volume_get(chan, AST_AUDIOHOOK_DIRECTION_WRITE);
+ 
+-	/* If the caller should be joined already muted, make it so */
++	/* If the caller should be joined already muted or deaf, make it so */
+ 	if (ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_STARTMUTED)) {
+ 		conference_bridge_user.features.mute = 1;
+ 	}
++	if (ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_STARTDEAF)) {
++		conference_bridge_user.features.deaf = 1;
++	}
+ 
+ 	if (ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_DROP_SILENCE)) {
+ 		conference_bridge_user.tech_args.drop_silence = 1;
+@@ -1548,6 +1580,19 @@ static int action_toggle_mute(struct conference_bridge *conference_bridge,
+ 		"");
+ }
+ 
++static int action_toggle_deaf(struct conference_bridge *conference_bridge,
++	struct conference_bridge_user *conference_bridge_user,
++	struct ast_channel *chan)
++{
++	/* Deafen or undeafen yourself */
++	conference_bridge_user->features.deaf = (!conference_bridge_user->features.deaf ? 1 : 0);
++
++	return ast_stream_and_wait(chan, (conference_bridge_user->features.deaf ?
++		conf_get_sound(CONF_SOUND_DEAFENED, conference_bridge_user->b_profile.sounds) :
++		conf_get_sound(CONF_SOUND_UNDEAFENED, conference_bridge_user->b_profile.sounds)),
++		"");
++}
++
+ static int action_playback(struct ast_bridge_channel *bridge_channel, const char *playback_file)
+ {
+ 	char *file_copy = ast_strdupa(playback_file);
+@@ -1727,6 +1772,11 @@ static int execute_menu_entry(struct conference_bridge *conference_bridge,
+ 				conference_bridge_user,
+ 				bridge_channel->chan);
+ 			break;
++		case MENU_ACTION_TOGGLE_DEAF:
++			res |= action_toggle_deaf(conference_bridge,
++				conference_bridge_user,
++				bridge_channel->chan);
++			break;
+ 		case MENU_ACTION_PLAYBACK:
+ 			if (!stop_prompts) {
+ 				res |= action_playback(bridge_channel, menu_action->data.playback_file);
+@@ -1988,13 +2038,13 @@ static int generic_lock_unlock_helper(int lock, const char *conference)
+ }
+ 
+ /* \internal
+- * \brief finds a conference user by channel name and mutes/unmutes them.
++ * \brief finds a conference user by channel name and mutes/unmutes and deafens/undeafens them.
+  *
+  * \retval 0 success
+  * \retval -1 conference not found
+  * \retval -2 user not found
+  */
+-static int generic_mute_unmute_helper(int mute, const char *conference, const char *user)
++static int generic_mute_deafen_helper(int mute, int deaf, const char *conference, const char *user)
+ {
+ 	struct conference_bridge *bridge = NULL;
+ 	struct conference_bridge tmp;
+@@ -2012,9 +2062,14 @@ static int generic_mute_unmute_helper(int mute, const char *conference, const ch
+ 		}
+ 	}
+ 	if (participant) {
+-		participant->features.mute = mute;
++		if (mute >= 0) {
++			participant->features.mute = mute;
++		}
++		if (deaf >= 0) {
++			participant->features.deaf = deaf;
++		}
+ 	} else {
+-		res = -2;;
++		res = -2;
+ 	}
+ 	ao2_unlock(bridge);
+ 	ao2_ref(bridge, -1);
+@@ -2022,9 +2077,10 @@ static int generic_mute_unmute_helper(int mute, const char *conference, const ch
+ 	return res;
+ }
+ 
+-static int cli_mute_unmute_helper(int mute, struct ast_cli_args *a)
++static int cli_mute_deafen_helper(int mute, int deaf, struct ast_cli_args *a)
+ {
+-	int res = generic_mute_unmute_helper(mute, a->argv[2], a->argv[3]);
++	const char *verb;
++	int res = generic_mute_deafen_helper(mute, deaf, a->argv[2], a->argv[3]);
+ 
+ 	if (res == -1) {
+ 		ast_cli(a->fd, "No conference bridge named '%s' found!\n", a->argv[2]);
+@@ -2033,7 +2089,16 @@ static int cli_mute_unmute_helper(int mute, struct ast_cli_args *a)
+ 		ast_cli(a->fd, "No channel named '%s' found in conference %s\n", a->argv[3], a->argv[2]);
+ 		return -1;
+ 	}
+-	ast_cli(a->fd, "%s %s from confbridge %s\n", mute ? "Muting" : "Unmuting", a->argv[3], a->argv[2]);
++	if (mute == 1) {
++		verb = "Muting";
++	} else if (mute == 0) {
++		verb = "Unmuting";
++	} else if (deaf == 1) {
++		verb = "Deafening";
++	} else {
++		verb = "Undeafening";
++	}
++	ast_cli(a->fd, "%s %s from confbridge %s\n", verb, a->argv[3], a->argv[2]);
+ 	return 0;
+ }
+ 
+@@ -2055,7 +2120,7 @@ static char *handle_cli_confbridge_mute(struct ast_cli_entry *e, int cmd, struct
+ 		return CLI_SHOWUSAGE;
+ 	}
+ 
+-	cli_mute_unmute_helper(1, a);
++	cli_mute_deafen_helper(1, -1, a);
+ 
+ 	return CLI_SUCCESS;
+ }
+@@ -2078,7 +2143,53 @@ static char *handle_cli_confbridge_unmute(struct ast_cli_entry *e, int cmd, stru
+ 		return CLI_SHOWUSAGE;
+ 	}
+ 
+-	cli_mute_unmute_helper(0, a);
++	cli_mute_deafen_helper(0, -1, a);
++
++	return CLI_SUCCESS;
++}
++
++static char *handle_cli_confbridge_deafen(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
++{
++	switch (cmd) {
++	case CLI_INIT:
++		e->command = "confbridge deafen";
++		e->usage =
++			"Usage: confbridge deafen <conference> <channel>\n";
++		return NULL;
++	case CLI_GENERATE:
++		if (a->pos == 2) {
++			return complete_confbridge_name(a->line, a->word, a->pos, a->n);
++		}
++		return NULL;
++	}
++	if (a->argc != 4) {
++		return CLI_SHOWUSAGE;
++	}
++
++	cli_mute_deafen_helper(-1, 1, a);
++
++	return CLI_SUCCESS;
++}
++
++static char *handle_cli_confbridge_undeafen(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
++{
++	switch (cmd) {
++	case CLI_INIT:
++		e->command = "confbridge undeafen";
++		e->usage =
++			"Usage: confbridge undeafen <conference> <channel>\n";
++		return NULL;
++	case CLI_GENERATE:
++		if (a->pos == 2) {
++			return complete_confbridge_name(a->line, a->word, a->pos, a->n);
++		}
++		return NULL;
++	}
++	if (a->argc != 4) {
++		return CLI_SHOWUSAGE;
++	}
++
++	cli_mute_deafen_helper(-1, 0, a);
+ 
+ 	return CLI_SUCCESS;
+ }
+@@ -2226,6 +2337,8 @@ static struct ast_cli_entry cli_confbridge[] = {
+ 	AST_CLI_DEFINE(handle_cli_confbridge_kick, "Kick participants out of conference bridges."),
+ 	AST_CLI_DEFINE(handle_cli_confbridge_mute, "Mute a participant."),
+ 	AST_CLI_DEFINE(handle_cli_confbridge_unmute, "Unmute a participant."),
++	AST_CLI_DEFINE(handle_cli_confbridge_deafen, "Deafen a participant."),
++	AST_CLI_DEFINE(handle_cli_confbridge_undeafen, "Undeafen a participant."),
+ 	AST_CLI_DEFINE(handle_cli_confbridge_lock, "Lock a conference."),
+ 	AST_CLI_DEFINE(handle_cli_confbridge_unlock, "Unlock a conference."),
+ 	AST_CLI_DEFINE(handle_cli_confbridge_start_record, "Start recording a conference"),
+@@ -2360,10 +2473,11 @@ static int action_confbridgelistrooms(struct mansession *s, const struct message
+ 	return 0;
+ }
+ 
+-static int action_mute_unmute_helper(struct mansession *s, const struct message *m, int mute)
++static int action_mute_deafen_helper(struct mansession *s, const struct message *m, int mute, int deaf)
+ {
+ 	const char *conference = astman_get_header(m, "Conference");
+ 	const char *channel = astman_get_header(m, "Channel");
++	char *verb;
+ 	int res = 0;
+ 
+ 	if (ast_strlen_zero(conference)) {
+@@ -2379,7 +2493,7 @@ static int action_mute_unmute_helper(struct mansession *s, const struct message
+ 		return 0;
+ 	}
+ 
+-	res = generic_mute_unmute_helper(mute, conference, channel);
++	res = generic_mute_deafen_helper(mute, deaf, conference, channel);
+ 
+ 	if (res == -1) {
+ 		astman_send_error(s, m, "No Conference by that name found.");
+@@ -2389,17 +2503,35 @@ static int action_mute_unmute_helper(struct mansession *s, const struct message
+ 		return 0;
+ 	}
+ 
+-	astman_send_ack(s, m, mute ? "User muted" : "User unmuted");
++	if (mute == 1) {
++		verb = "User muted";
++	} else if (mute == 0) {
++		verb = "User unmuted";
++	} else if (deaf == 1) {
++		verb = "User deafened";
++	} else {
++		verb = "User undeafened";
++	}
++
++	astman_send_ack(s, m, verb);
+ 	return 0;
+ }
+ 
+ static int action_confbridgeunmute(struct mansession *s, const struct message *m)
+ {
+-	return action_mute_unmute_helper(s, m, 0);
++	return action_mute_deafen_helper(s, m, 0, -1);
+ }
+ static int action_confbridgemute(struct mansession *s, const struct message *m)
+ {
+-	return action_mute_unmute_helper(s, m, 1);
++	return action_mute_deafen_helper(s, m, 1, -1);
++}
++static int action_confbridgeundeafen(struct mansession *s, const struct message *m)
++{
++	return action_mute_deafen_helper(s, m, -1, 0);
++}
++static int action_confbridgedeafen(struct mansession *s, const struct message *m)
++{
++	return action_mute_deafen_helper(s, m, -1, 1);
+ }
+ 
+ static int action_lock_unlock_helper(struct mansession *s, const struct message *m, int lock)
+@@ -2685,6 +2817,8 @@ static int unload_module(void)
+ 	res |= ast_manager_unregister("ConfbridgeListRooms");
+ 	res |= ast_manager_unregister("ConfbridgeMute");
+ 	res |= ast_manager_unregister("ConfbridgeUnmute");
++	res |= ast_manager_unregister("ConfbridgeDeafen");
++	res |= ast_manager_unregister("ConfbridgeUndeafen");
+ 	res |= ast_manager_unregister("ConfbridgeKick");
+ 	res |= ast_manager_unregister("ConfbridgeUnlock");
+ 	res |= ast_manager_unregister("ConfbridgeLock");
+@@ -2726,6 +2860,8 @@ static int load_module(void)
+ 	res |= ast_manager_register_xml("ConfbridgeListRooms", EVENT_FLAG_REPORTING, action_confbridgelistrooms);
+ 	res |= ast_manager_register_xml("ConfbridgeMute", EVENT_FLAG_CALL, action_confbridgemute);
+ 	res |= ast_manager_register_xml("ConfbridgeUnmute", EVENT_FLAG_CALL, action_confbridgeunmute);
++	res |= ast_manager_register_xml("ConfbridgeDeafen", EVENT_FLAG_CALL, action_confbridgedeafen);
++	res |= ast_manager_register_xml("ConfbridgeUndeafen", EVENT_FLAG_CALL, action_confbridgeundeafen);
+ 	res |= ast_manager_register_xml("ConfbridgeKick", EVENT_FLAG_CALL, action_confbridgekick);
+ 	res |= ast_manager_register_xml("ConfbridgeUnlock", EVENT_FLAG_CALL, action_confbridgeunlock);
+ 	res |= ast_manager_register_xml("ConfbridgeLock", EVENT_FLAG_CALL, action_confbridgelock);
+diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
+index d11b825..df1997a 100644
+--- a/apps/confbridge/conf_config_parser.c
++++ b/apps/confbridge/conf_config_parser.c
+@@ -153,6 +153,8 @@ static int set_user_option(const char *name, const char *value, struct user_prof
+ 		ast_set2_flag(u_profile, ast_true(value), USER_OPT_MARKEDUSER);
+ 	} else if (!strcasecmp(name, "startmuted")) {
+ 		ast_set2_flag(u_profile, ast_true(value), USER_OPT_STARTMUTED);
++	} else if (!strcasecmp(name, "startdeaf")) {
++		ast_set2_flag(u_profile, ast_true(value), USER_OPT_STARTDEAF);
+ 	} else if (!strcasecmp(name, "music_on_hold_when_empty")) {
+ 		ast_set2_flag(u_profile, ast_true(value), USER_OPT_MUSICONHOLD);
+ 	} else if (!strcasecmp(name, "quiet")) {
+@@ -229,6 +231,10 @@ static int set_sound(const char *sound_name, const char *sound_file, struct brid
+ 		ast_string_field_set(sounds, muted, sound_file);
+ 	} else if (!strcasecmp(sound_name, "sound_unmuted")) {
+ 		ast_string_field_set(sounds, unmuted, sound_file);
++	} else if (!strcasecmp(sound_name, "sound_deafened")) {
++		ast_string_field_set(sounds, deafened, sound_file);
++	} else if (!strcasecmp(sound_name, "sound_undeafened")) {
++		ast_string_field_set(sounds, undeafened, sound_file);
+ 	} else if (!strcasecmp(sound_name, "sound_there_are")) {
+ 		ast_string_field_set(sounds, thereare, sound_file);
+ 	} else if (!strcasecmp(sound_name, "sound_other_in_party")) {
+@@ -533,6 +539,7 @@ static int add_action_to_menu_entry(struct conf_menu_entry *menu_entry, enum con
+ 	switch (id) {
+ 	case MENU_ACTION_NOOP:
+ 	case MENU_ACTION_TOGGLE_MUTE:
++	case MENU_ACTION_TOGGLE_DEAF:
+ 	case MENU_ACTION_INCREASE_LISTENING:
+ 	case MENU_ACTION_DECREASE_LISTENING:
+ 	case MENU_ACTION_INCREASE_TALKING:
+@@ -1015,6 +1022,8 @@ static char *handle_cli_confbridge_show_bridge_profile(struct ast_cli_entry *e,
+ 	ast_cli(a->fd,"sound_kicked:         %s\n", conf_get_sound(CONF_SOUND_KICKED, b_profile.sounds));
+ 	ast_cli(a->fd,"sound_muted:          %s\n", conf_get_sound(CONF_SOUND_MUTED, b_profile.sounds));
+ 	ast_cli(a->fd,"sound_unmuted:        %s\n", conf_get_sound(CONF_SOUND_UNMUTED, b_profile.sounds));
++	ast_cli(a->fd,"sound_deafened:       %s\n", conf_get_sound(CONF_SOUND_DEAFENED, b_profile.sounds));
++	ast_cli(a->fd,"sound_undeafened:     %s\n", conf_get_sound(CONF_SOUND_UNDEAFENED, b_profile.sounds));
+ 	ast_cli(a->fd,"sound_there_are:      %s\n", conf_get_sound(CONF_SOUND_THERE_ARE, b_profile.sounds));
+ 	ast_cli(a->fd,"sound_other_in_party: %s\n", conf_get_sound(CONF_SOUND_OTHER_IN_PARTY, b_profile.sounds));
+ 	ast_cli(a->fd,"sound_place_into_conference: %s\n", conf_get_sound(CONF_SOUND_PLACE_IN_CONF, b_profile.sounds));
+@@ -1124,6 +1133,9 @@ static char *handle_cli_confbridge_show_menu(struct ast_cli_entry *e, int cmd, s
+ 			case MENU_ACTION_TOGGLE_MUTE:
+ 				ast_cli(a->fd, "toggle_mute");
+ 				break;
++			case MENU_ACTION_TOGGLE_DEAF:
++				ast_cli(a->fd, "toggle_deaf");
++				break;
+ 			case MENU_ACTION_NOOP:
+ 				ast_cli(a->fd, "no_op");
+ 				break;
+diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h
+index ab4a8c4..f733b49 100644
+--- a/apps/confbridge/include/confbridge.h
++++ b/apps/confbridge/include/confbridge.h
+@@ -57,6 +57,7 @@ enum user_profile_flags {
+ 	USER_OPT_DTMF_PASS    =  (1 << 13), /*!< Sets if dtmf should be passed into the conference or not */
+ 	USER_OPT_ANNOUNCEUSERCOUNTALL = (1 << 14), /*!< Sets if the number of users should be announced to everyone. */
+ 	USER_OPT_JITTERBUFFER =  (1 << 15), /*!< Places a jitterbuffer on the user. */
++	USER_OPT_STARTDEAF =     (1 << 16), /*!< Set if the caller should be initially set deaf */
+ };
+ 
+ enum bridge_profile_flags {
+@@ -68,6 +69,7 @@ enum bridge_profile_flags {
+ 
+ enum conf_menu_action_id {
+ 	MENU_ACTION_TOGGLE_MUTE = 1,
++	MENU_ACTION_TOGGLE_DEAF,
+ 	MENU_ACTION_PLAYBACK,
+ 	MENU_ACTION_PLAYBACK_AND_CONTINUE,
+ 	MENU_ACTION_INCREASE_LISTENING,
+@@ -141,6 +143,8 @@ enum conf_sounds {
+ 	CONF_SOUND_KICKED,
+ 	CONF_SOUND_MUTED,
+ 	CONF_SOUND_UNMUTED,
++	CONF_SOUND_DEAFENED,
++	CONF_SOUND_UNDEAFENED,
+ 	CONF_SOUND_ONLY_ONE,
+ 	CONF_SOUND_THERE_ARE,
+ 	CONF_SOUND_OTHER_IN_PARTY,
+@@ -165,6 +169,8 @@ struct bridge_profile_sounds {
+ 		AST_STRING_FIELD(kicked);
+ 		AST_STRING_FIELD(muted);
+ 		AST_STRING_FIELD(unmuted);
++		AST_STRING_FIELD(deafened);
++		AST_STRING_FIELD(undeafened);
+ 		AST_STRING_FIELD(onlyone);
+ 		AST_STRING_FIELD(thereare);
+ 		AST_STRING_FIELD(otherinparty);
+diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
+index 7632f36..103e3be 100644
+--- a/bridges/bridge_softmix.c
++++ b/bridges/bridge_softmix.c
+@@ -850,16 +850,23 @@ static int softmix_bridge_thread(struct ast_bridge *bridge)
+ 
+ 			ast_mutex_lock(&sc->lock);
+ 
+-			/* Make SLINEAR write frame from local buffer */
+-			if (sc->write_frame.subclass.format.id != cur_slin_id) {
+-				ast_format_set(&sc->write_frame.subclass.format, cur_slin_id, 0);
++			if (bridge->features.deaf ||
++			    (bridge_channel->features && bridge_channel->features->deaf)) {
++				/* For deaf channels post a null frame */
++				sc->write_frame.frametype = AST_FRAME_NULL;
++			} else {
++				/* Make SLINEAR write frame from local buffer */
++				sc->write_frame.frametype = AST_FRAME_VOICE;
++				if (sc->write_frame.subclass.format.id != cur_slin_id) {
++					ast_format_set(&sc->write_frame.subclass.format, cur_slin_id, 0);
++				}
++				sc->write_frame.datalen = softmix_datalen;
++				sc->write_frame.samples = softmix_samples;
++				memcpy(sc->final_buf, buf, softmix_datalen);
++
++				/* process the softmix channel's new write audio */
++				softmix_process_write_audio(&trans_helper, &bridge_channel->chan->rawwriteformat, sc);
+ 			}
+-			sc->write_frame.datalen = softmix_datalen;
+-			sc->write_frame.samples = softmix_samples;
+-			memcpy(sc->final_buf, buf, softmix_datalen);
+-
+-			/* process the softmix channel's new write audio */
+-			softmix_process_write_audio(&trans_helper, &bridge_channel->chan->rawwriteformat, sc);
+ 
+ 			/* The frame is now ready for use... */
+ 			sc->have_frame = 1;
+diff --git a/include/asterisk/bridging_features.h b/include/asterisk/bridging_features.h
+index e377ca6..5ce3d56 100644
+--- a/include/asterisk/bridging_features.h
++++ b/include/asterisk/bridging_features.h
+@@ -127,6 +127,8 @@ struct ast_bridge_features {
+ 	unsigned int usable:1;
+ 	/*! Bit to indicate whether the channel/bridge is muted or not */
+ 	unsigned int mute:1;
++	/*! Bit to indicate whether the channel/bridge is deaf or not */
++	unsigned int deaf:1;
+ 	/*! Bit to indicate whether DTMF should be passed into the bridge tech or not.  */
+ 	unsigned int dtmf_passthrough:1;
+ 
diff --git a/main/asterisk/asterisk.initd b/main/asterisk/asterisk.initd
index 284898ae2..b9806a750 100644
--- a/main/asterisk/asterisk.initd
+++ b/main/asterisk/asterisk.initd
@@ -242,8 +242,8 @@ stop() {
 
 reload() {
 	if is_running; then
-		ebegin "Forcing asterisk to reload configuration"
-		/usr/sbin/asterisk -r -x "modules reload" &>/dev/null
+		ebegin "Reloading asterisk configuration"
+		/usr/sbin/asterisk -r -x "core reload" &>/dev/null
 		eend $?
 	else
 		eerror "Asterisk is not running!"
diff --git a/main/audacious-plugins/APKBUILD b/main/audacious-plugins/APKBUILD
index 54ae18360..7eaf2765a 100644
--- a/main/audacious-plugins/APKBUILD
+++ b/main/audacious-plugins/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=audacious-plugins
-pkgver=3.1
+pkgver=3.1.1
 pkgrel=1
 pkgdesc="playlist-oriented media player with multiple interfaces (plugins)"
 url="http://audacious-media-player.org/"
@@ -86,4 +86,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="46606131a9fd11d190b9a0181cc4ffa2  audacious-plugins-3.1.tar.gz"
+md5sums="0491ff8561d556926f3080444735ce2f  audacious-plugins-3.1.1.tar.gz"
diff --git a/main/audacious/APKBUILD b/main/audacious/APKBUILD
index ca3bbfc4e..6b039d8fc 100644
--- a/main/audacious/APKBUILD
+++ b/main/audacious/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=audacious
-pkgver=3.1
+pkgver=3.1.1
 pkgrel=0
 pkgdesc="playlist-oriented media player with multiple interfaces"
 url="http://audacious-media-player.org/"
@@ -22,4 +22,4 @@ using plugin atheme-buildsys
 
 ac_enable_opt chardet
 
-md5sums="a20fdf5d0348235e0a5e22c5aca69629  audacious-3.1.tar.gz"
+md5sums="60e5452e8fdbe749529d8add07b0dbe8  audacious-3.1.1.tar.gz"
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index d535889ca..39b481211 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -1,21 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=augeas
-pkgver=0.8.0
-pkgrel=1
+pkgver=0.10.0
+pkgrel=0
 pkgdesc="a configuration editing tool"
 url="http://augeas.net"
 arch="all"
 license="LGPL"
 depends=
-makedepends="readline-dev"
+makedepends="readline-dev libxml2-dev"
 install=
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tests"
-source="http://augeas.net/download/augeas-$pkgver.tar.gz"
+source="http://augeas.net/download/augeas-$pkgver.tar.gz
+	regexp.c.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
-	# apply patches here
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
 }
 
 build() {
@@ -39,4 +44,5 @@ tests() {
 	mv "$pkgdir"/usr/share/augeas/lenses/dist/tests \
 		"$subpkgdir"/usr/share/augeas/lenses/dist/
 }
-md5sums="e425bcfc46fd5b18473a4ff47c2878d3  augeas-0.8.0.tar.gz"
+md5sums="fe1834e90a066c3208ac0214622c7352  augeas-0.10.0.tar.gz
+a9f0fe2cd7e6aebf916747207cc2b537  regexp.c.patch"
diff --git a/main/augeas/regexp.c.patch b/main/augeas/regexp.c.patch
new file mode 100644
index 000000000..87ba795ba
--- /dev/null
+++ b/main/augeas/regexp.c.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.fedorahosted.org/git?p=augeas.git;a=blobdiff_plain;f=src%2Fregexp.c;h=811087d8f2de1d7adc80b4d9308dc7c9f3827c99;hp=cf0ea5d37e21bed27295bd788fc474ba900a910d;hb=021ea39f8e400225e2d01b4c62eb9d56404f2ecd;hpb=1d5b19760d4d92153a8eb9279bf9709b7ead20c7
+
+diff --git a/src/regexp.c b/src/regexp.c
+index cf0ea5d..811087d 100644
+--- a/src/regexp.c
++++ b/src/regexp.c
+@@ -50,7 +50,7 @@ char *regexp_escape(const struct regexp *r) {
+     ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str),
+                                &nre, &nre_len, 2, 1);
+     if (ret == 0) {
+-        pat = escape(nre, nre_len);
++        pat = escape(nre, nre_len, RX_ESCAPES);
+         free(nre);
+     }
+ #endif
diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD
index 262d1caaa..7727bfe82 100644
--- a/main/automake/APKBUILD
+++ b/main/automake/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=automake
-pkgver=1.11.1
+pkgver=1.11.2
 pkgrel=0
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch="noarch"
@@ -22,4 +22,4 @@ package() {
         make DESTDIR=$pkgdir install
 }
 
-md5sums="4ee7f0ff5f0e467d58b6bd5da96b1c74  automake-1.11.1.tar.gz"
+md5sums="79ad64a9f6e83ea98d6964cef8d8a0bc  automake-1.11.2.tar.gz"
diff --git a/main/babl/APKBUILD b/main/babl/APKBUILD
index 358a89a98..9c82a2b2f 100644
--- a/main/babl/APKBUILD
+++ b/main/babl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=babl
-pkgver=0.1.4
-pkgrel=1
+pkgver=0.1.6
+pkgrel=0
 pkgdesc="Dynamic, any to any, pixel format conversion library"
 url="http://gegl.org/babl/"
 arch="all"
@@ -23,4 +23,4 @@ package() {
 	rm "$pkgdir"/usr/lib/babl*/*.la \
 		"$pkgdir"/usr/lib/*.la || return 1
 }
-md5sums="1deaf8188b200b10d98a343a7e712b2b  babl-0.1.4.tar.bz2"
+md5sums="dc960981a5ec5330fc1c177be9f59068  babl-0.1.6.tar.bz2"
diff --git a/main/backuppc/backuppc.initd b/main/backuppc/backuppc.initd
index eefdc92c7..850e6aeaa 100644
--- a/main/backuppc/backuppc.initd
+++ b/main/backuppc/backuppc.initd
@@ -14,7 +14,7 @@ configure () {
 start() {
 	ebegin "Starting $DAEMON"
 	start-stop-daemon --start --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \
-	  -c $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d
+	  --user $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d
 	eend $?
 }
 
@@ -29,7 +29,7 @@ restart () {
 	start-stop-daemon --stop --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \
 	  --retry 30 -x /usr/bin/perl
 	start-stop-daemon --start --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \
-	  -c $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d
+	  --user $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d
 }
 
 reload () {
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 6ff9b0a7c..edc974bdf 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname="bacula"
 pkgver=5.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Enterprise ready, network based backup program"
 url="http://www.bacula.org"
 arch="all"
@@ -89,7 +89,6 @@ package() {
 	done
 	install -Dm644 examples/sample-query.sql \
 	 "$pkgdir"/etc/bacula/scripts/query.sql
-	mkdir -p "$pkgdir"/var/run/bacula
 	# Fix correct log dir
 	sed -i -e 's%/var/bacula/log%/var/log/bacula%' \
 	 "$pkgdir"/etc/bacula/bacula-dir.conf
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 9e74d229d..e26b38640 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 pkgname=bash
-pkgver=4.2.010
+pkgver=4.2.020
 _patchlevel=${pkgver##*.}
 _myver=${pkgver%.*}
 _patchbase=${_myver%.*}${_myver#*.}
@@ -77,4 +77,14 @@ ce4e5c484993705b27daa151eca242c2  bash42-006
 88d1f96db29461767602e2546803bda7  bash42-007
 24c574bf6d6a581e300823d9c1276af6  bash42-008
 4c5835f2fbab36c4292bb334977e5b6d  bash42-009
-0a51602b535ef661ee707be6c8bdb373  bash42-010"
+0a51602b535ef661ee707be6c8bdb373  bash42-010
+58deacf3d57cbd75575444ff6a3b0806  bash42-011
+72d5059820015231483bb7415d09e9db  bash42-012
+608336ebe215984ef126e3c29d2d3409  bash42-013
+ed19da878e3f630834c62b9d9dcc6fce  bash42-014
+2d07daba0b8ca8f876d2aa052ff594b4  bash42-015
+53d246537e1fffd1aaa02ba5c056211c  bash42-016
+304fd129a58fee2d8a34f8b4704db0aa  bash42-017
+6921a0b4228fe89b6537a5c29f027c89  bash42-018
+1195d85447f3d048d2c9bcd075fa765c  bash42-019
+b09000bba08da6ac753124593850cdf7  bash42-020"
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 0b2717d62..401719963 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,18 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=binutils
 pkgver=2.22
-pkgrel=0
+pkgrel=1
 pkgdesc="Tools necessary to build programs"
 url="http://www.gnu.org/software/binutils/"
-source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2"
 depends=
 makedepends="bison flex texinfo zlib-dev"
 arch="all"
 license="GPL"
 subpackages="$pkgname-doc"
+source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
+	binutils-ld-fix-static-linking.patch"
+
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch|*.diff)
+			msg "Applying $i..."
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
+}
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--mandir /usr/share/man \
 		--build ${CHOST:-i486-alpine-linux-uclibc} \
@@ -35,4 +51,5 @@ package() {
 	fi
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
-md5sums="ee0f10756c84979622b992a4a61ea3f5  binutils-2.22.tar.bz2"
+md5sums="ee0f10756c84979622b992a4a61ea3f5  binutils-2.22.tar.bz2
+6b744d0574338cc69d3096a890a7b609  binutils-ld-fix-static-linking.patch"
diff --git a/main/binutils/binutils-ld-fix-static-linking.patch b/main/binutils/binutils-ld-fix-static-linking.patch
new file mode 100644
index 000000000..b192936af
--- /dev/null
+++ b/main/binutils/binutils-ld-fix-static-linking.patch
@@ -0,0 +1,37 @@
+Index: binutils-2.22/ld/scripttempl/elf.sc
+===================================================================
+--- binutils-2.22.orig/ld/scripttempl/elf.sc	2011-04-11 18:38:12.000000000 +0300
++++ binutils-2.22/ld/scripttempl/elf.sc	2011-12-09 09:11:24.000000000 +0200
+@@ -225,8 +225,8 @@
+ if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then
+   SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))"
+   SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))"
+-  CTORS_IN_INIT_ARRAY="KEEP (*(EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))"
+-  DTORS_IN_FINI_ARRAY="KEEP (*(EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))"
++  CTORS_IN_INIT_ARRAY="KEEP (*(EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .ctors))"
++  DTORS_IN_FINI_ARRAY="KEEP (*(EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .dtors))"
+ else
+   SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))"
+   SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))"
+@@ -262,8 +262,7 @@
+        doesn't matter which directory crtbegin.o
+        is in.  */
+ 
+-    KEEP (*crtbegin.o(.ctors))
+-    KEEP (*crtbegin?.o(.ctors))
++    KEEP (*crtbegin*.o(.ctors))
+ 
+     /* We don't want to include the .ctor section from
+        the crtend.o file until after the sorted ctors.
+@@ -278,9 +277,8 @@
+ DTOR=".dtors        ${CONSTRUCTING-0} :
+   {
+     ${CONSTRUCTING+${DTOR_START}}
+-    KEEP (*crtbegin.o(.dtors))
+-    KEEP (*crtbegin?.o(.dtors))
+-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))
++    KEEP (*crtbegin*.o(.dtors))
++    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
+     KEEP (*(SORT(.dtors.*)))
+     KEEP (*(.dtors))
+     ${CONSTRUCTING+${DTOR_END}}
diff --git a/main/bitlbee/APKBUILD b/main/bitlbee/APKBUILD
index e0b35bafd..b60ad5fa9 100644
--- a/main/bitlbee/APKBUILD
+++ b/main/bitlbee/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 pkgname=bitlbee
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=0
 pkgdesc="An IRC to other chat networks gateway"
 url="http://www.bitlbee.org/"
@@ -52,7 +52,7 @@ otr() {
     mv "$pkgdir"/usr/lib/bitlbee "$subpkgdir"/usr/lib
 }
 
-md5sums="4fe688e3a80efe011743f4c9265c0310  bitlbee-3.0.3.tar.gz
-6b3c70649ececec230d145b62778ad61  bitlbee.initd
+md5sums="3eb1e3e30c015885c641503eec4b05cb  bitlbee-3.0.4.tar.gz
+7c3f5a9c5b25b425e87ff38abc44282d  bitlbee.initd
 bf07d39a4b652c63415b411229c5e281  bitlbee.confd
 2d91f7ae46d69560d7f156f282dceaef  bitlbee.post-install"
diff --git a/main/bitlbee/bitlbee.initd b/main/bitlbee/bitlbee.initd
index 92bab34ab..c6e7ce764 100644
--- a/main/bitlbee/bitlbee.initd
+++ b/main/bitlbee/bitlbee.initd
@@ -14,7 +14,7 @@ start() {
 	ebegin "Starting ${name}"
 		start-stop-daemon --start --quiet \
 			--pidfile /var/run/${name}.pid \
-			--chuid nobody:nobody \
+			--user nobody:nobody \
 			--exec ${daemon} -- ${PORT} ${OPTS}
 	eend $?
 }
diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD
index 3560977b8..a8bb926bf 100644
--- a/main/boost/APKBUILD
+++ b/main/boost/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=boost
-pkgver=1.47.0
+pkgver=1.48.0
 
 _x=${pkgver%%.*}	# strip .y.z
 _y=${pkgver%.*}		# strip .z
@@ -133,4 +133,4 @@ wave() { _mvlib wave; }
 wserialization() { _mvlib wserialization; }
 
 
-md5sums="ff180a5276bec773a7625cac7e2288e8  boost_1_47_0.tar.gz"
+md5sums="313a11e97eb56eb7efd18325354631be  boost_1_48_0.tar.gz"
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 1e5045fc6..88c11a30c 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.19.3
-pkgrel=0
+pkgrel=1
 _bbsuidver=0.6
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
@@ -20,6 +20,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 
 	http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-getty.patch
 	http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-modinfo.patch
+	http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-wget.patch
 
 	busyboxconfig"
 
@@ -90,4 +91,5 @@ b5375210f13fd6e1ca61a565e8fabd35  busybox-uname-is-not-gnu.patch
 784383013b8f015fb0d214618c46b4b8  0001-loginutils-use-sha512.patch
 5ed72ca85b8fba4598d64a550210b31f  busybox-1.19.3-getty.patch
 41636628e481f22b8774b6bee1eebfb1  busybox-1.19.3-modinfo.patch
+cb48bffc0e1e3be527cd4ff67324a2a2  busybox-1.19.3-wget.patch
 453614d903ed3f39aa0a4b78f94bc7a5  busyboxconfig"
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index 6b345096d..2e651df86 100644
--- a/main/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ca-certificates
-pkgver=20111025
+pkgver=20111211
 
 _date=${pkgver%_p*}
 _nmu="+nmu${pkgver#*_p}"
 [ "$_nmu" = "+nmu${pkgver}" ] && _nmu=""
 _ver=${_date}${_nmu}
 
-pkgrel=1
+pkgrel=0
 pkgdesc="Common CA certificates PEM files"
 url="http://packages.debian.org/sid/ca-certificates"
 arch="noarch"
@@ -43,4 +43,4 @@ package() {
 	find . -name '*.crt' | sort | cut -b3-
 	) > "$pkgdir"/etc/ca-certificates.conf
 }
-md5sums="dfd593c9f89e64351aae78b9be588696  ca-certificates_20111025.tar.gz"
+md5sums="f99a90a91b23338b4df765c0d18eba73  ca-certificates_20111211.tar.gz"
diff --git a/main/cegui06/APKBUILD b/main/cegui06/APKBUILD
new file mode 100644
index 000000000..fc98778b9
--- /dev/null
+++ b/main/cegui06/APKBUILD
@@ -0,0 +1,55 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=cegui06
+pkgver=0.6.2b
+pkgrel=2
+pkgdesc="CEGUI library 0.6 for apps which need this specific version"
+url="http://www.cegui.org.uk"
+arch="all"
+license="MIT and LGPLv2+"
+depends=""
+makedepends="freetype-dev pcre-dev expat-dev libice-dev libsm-dev glew-dev
+	mesa-dev lua-dev"
+install=""
+subpackages="$pkgname-dev"
+source="http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz
+	cegui-0.6.2-gcc46.patch
+	cegui-0.6.0-release-as-so-ver.patch
+	cegui-0.6.0-userverso.patch
+	"
+
+_builddir="$srcdir"/CEGUI-0.6.2
+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 \
+		--disable-samples \
+		--with-pic \
+		--with-default-xml-parser=ExpatParser \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="4fbd95e5a2ac1c7acf2a8f5df3ac6b93  CEGUI-0.6.2b.tar.gz
+c313bbb6fea733ff904f7f3b48f6a3d0  cegui-0.6.2-gcc46.patch
+7a6c7f61d680344b4bfbf9766e3f2aad  cegui-0.6.0-release-as-so-ver.patch
+dd5a5d6be594960cd53934271514e351  cegui-0.6.0-userverso.patch"
diff --git a/main/cegui06/cegui-0.6.0-release-as-so-ver.patch b/main/cegui06/cegui-0.6.0-release-as-so-ver.patch
new file mode 100644
index 000000000..2c33ccfb7
--- /dev/null
+++ b/main/cegui06/cegui-0.6.0-release-as-so-ver.patch
@@ -0,0 +1,316 @@
+diff -up CEGUI-0.6.2/ImageCodecModules/CoronaImageCodec/Makefile.am.patch1 CEGUI-0.6.2/ImageCodecModules/CoronaImageCodec/Makefile.am
+--- CEGUI-0.6.2/ImageCodecModules/CoronaImageCodec/Makefile.am.patch1	2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.2/ImageCodecModules/CoronaImageCodec/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
+ if MINGW32_BUILD
+ libCEGUICoronaImageCodec_la_CPPFLAGS = -DCEGUICORONAIMAGECODEC_EXPORTS
+ libCEGUICoronaImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++else
++libCEGUICoronaImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+ endif
+ 
+ libCEGUICoronaImageCodec_la_LIBADD = $(Corona_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.am.patch1 CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.am
+--- CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.am.patch1	2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -5,6 +5,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
+ if MINGW32_BUILD
+ libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS
+ libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++else
++libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+ endif
+ 
+ libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.in.patch1 CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.in
+--- CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.in.patch1	2008-11-30 21:11:37.000000000 +0100
++++ CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -246,6 +246,7 @@ INCLUDES = -I$(top_srcdir)/include $(Dev
+ 
+ @MINGW32_BUILD_TRUE@libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS
+ @MINGW32_BUILD_TRUE@libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++@MINGW32_BUILD_FALSE@libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+ 
+ libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) $(top_builddir)/src/libCEGUIBase.la
+ 
+diff -up CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.am.patch1 CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.am
+--- CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.am.patch1	2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
+ if MINGW32_BUILD
+ libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS
+ libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++else
++libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+ endif
+ 
+ libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.in.patch1 CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.in
+--- CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.in.patch1	2008-11-30 21:11:37.000000000 +0100
++++ CEGUI-0.6.2/ImageCodecModules/FreeImageImageCodec/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -245,6 +245,7 @@ INCLUDES = -I$(top_srcdir)/include $(Fre
+ 
+ @MINGW32_BUILD_TRUE@libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS
+ @MINGW32_BUILD_TRUE@libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++@MINGW32_BUILD_FALSE@libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+ 
+ libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) $(top_builddir)/src/libCEGUIBase.la
+ 
+diff -up CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.am.patch1 CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.am
+--- CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.am.patch1	2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
+ if MINGW32_BUILD
+ libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS
+ libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++else
++libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+ endif
+ 
+ libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.in.patch1 CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.in
+--- CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.in.patch1	2008-11-30 21:11:37.000000000 +0100
++++ CEGUI-0.6.2/ImageCodecModules/SILLYImageCodec/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -245,6 +245,7 @@ INCLUDES = -I$(top_srcdir)/include $(SIL
+ 
+ @MINGW32_BUILD_TRUE@libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS
+ @MINGW32_BUILD_TRUE@libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++@MINGW32_BUILD_FALSE@libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+ 
+ libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) $(top_builddir)/src/libCEGUIBase.la
+ 
+diff -up CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.am.patch1 CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.am
+--- CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.am.patch1	2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
+ if MINGW32_BUILD
+ libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS
+ libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++else
++libCEGUITGAImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+ endif
+ 
+ lib_LTLIBRARIES=libCEGUITGAImageCodec.la
+diff -up CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.in.patch1 CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.in
+--- CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.in.patch1	2008-11-30 21:11:37.000000000 +0100
++++ CEGUI-0.6.2/ImageCodecModules/TGAImageCodec/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -245,6 +245,7 @@ INCLUDES = -I$(top_srcdir)/include 
+ 
+ @MINGW32_BUILD_TRUE@libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS
+ @MINGW32_BUILD_TRUE@libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++@MINGW32_BUILD_FALSE@libCEGUITGAImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+ 
+ lib_LTLIBRARIES = libCEGUITGAImageCodec.la
+ libCEGUITGAImageCodec_la_SOURCES = CEGUITGAImageCodec.cpp CEGUITGAImageCodecModule.cpp
+diff -up CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.am.patch1 CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.am
+--- CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.am.patch1	2008-07-21 12:45:32.000000000 +0200
++++ CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -23,7 +23,7 @@ endif
+ 
+ libCEGUIOpenGLRenderer_la_LIBADD = $(OpenGL_LIBS) $(top_builddir)/src/libCEGUIBase.la
+ 
+-libCEGUIOpenGLRenderer_la_LDFLAGS += -version-info @CEGUI_OPENGL_VERSION_INFO@
++libCEGUIOpenGLRenderer_la_LDFLAGS += -release @PACKAGE_VERSION@
+ 
+ lib_LTLIBRARIES=libCEGUIOpenGLRenderer.la
+ libCEGUIOpenGLRenderer_la_SOURCES = openglrenderer.cpp opengltexture.cpp
+diff -up CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.in.patch1 CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.in
+--- CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.in.patch1	2008-11-30 21:11:37.000000000 +0100
++++ CEGUI-0.6.2/RendererModules/OpenGLGUIRenderer/Makefile.in	2008-12-03 12:15:36.000000000 +0100
+@@ -250,7 +250,7 @@ xerces_LIBS = @xerces_LIBS@
+ INCLUDES = $(am__append_1) -I$(top_srcdir)/include -I$(top_srcdir) $(OpenGL_CFLAGS)
+ pkginclude_HEADERS = openglrenderer.h opengltexture.h
+ 
+-libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_OPENGL_VERSION_INFO@
++libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@
+ 
+ @MINGW32_BUILD_TRUE@libCEGUIOpenGLRenderer_la_CPPFLAGS = -DOPENGL_GUIRENDERER_EXPORTS $(am__append_3)
+ 
+diff -up CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am.patch1 CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
+--- CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am.patch1	2008-05-26 20:56:07.000000000 +0200
++++ CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -9,7 +9,7 @@ libCEGUILuaScriptModule_la_CPPFLAGS += -
+ libCEGUILuaScriptModule_la_LDFLAGS += -no-undefined -avoid-version
+ endif
+ 
+-libCEGUILuaScriptModule_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
++libCEGUILuaScriptModule_la_LDFLAGS += -release @PACKAGE_VERSION@
+ 
+ 
+ lib_LTLIBRARIES = libCEGUILuaScriptModule.la
+diff -up CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in.patch1 CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in
+--- CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in.patch1	2008-11-30 21:11:40.000000000 +0100
++++ CEGUI-0.6.2/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -251,7 +251,7 @@ INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include\
+ $(am__append_3) $(am__append_5)
+ 
+-libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_VERSION_INFO@
++libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@
+ libCEGUILuaScriptModule_la_CPPFLAGS = $(Lua_CFLAGS) $(am__append_1)
+ 
+ lib_LTLIBRARIES = libCEGUILuaScriptModule.la
+diff -up CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.am.patch1 CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.am
+--- CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.am.patch1	2008-03-15 17:51:39.000000000 +0100
++++ CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -7,7 +7,7 @@ libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EX
+ libCEGUItoluapp_la_LDFLAGS += -no-undefined
+ endif
+ 
+-libCEGUItoluapp_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
++libCEGUItoluapp_la_LDFLAGS += -release @PACKAGE_VERSION@
+ 
+ lib_LTLIBRARIES = libCEGUItoluapp.la
+ 
+diff -up CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.in.patch1 CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.in
+--- CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.in.patch1	2008-11-30 21:11:40.000000000 +0100
++++ CEGUI-0.6.2/ScriptingModules/CEGUILua/tolua++/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -244,7 +244,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
+ xerces_LIBS = @xerces_LIBS@
+ INCLUDES = $(Lua_CFLAGS) -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
+ 
+-libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
++libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
+ 
+ @MINGW32_BUILD_TRUE@libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EXPORTS
+ 
+diff -up CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.am.patch1 CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.am
+--- CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.am.patch1	2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -8,7 +8,7 @@ libCEGUIFalagardWRBase_la_CPPFLAGS = -DF
+ libCEGUIFalagardWRBase_la_LDFLAGS += -no-undefined -avoid-version
+ endif
+ 
+-libCEGUIFalagardWRBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
++libCEGUIFalagardWRBase_la_LDFLAGS += -release @PACKAGE_VERSION@
+ 
+ libCEGUIFalagardWRBase_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la
+ 
+diff -up CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.in.patch1 CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.in
+--- CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.in.patch1	2008-11-30 21:11:41.000000000 +0100
++++ CEGUI-0.6.2/WindowRendererSets/Falagard/src/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -246,7 +246,7 @@ INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/WindowRendererSets/Falagard/include
+ 
+ 
+-libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
++libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
+ 
+ @MINGW32_BUILD_TRUE@libCEGUIFalagardWRBase_la_CPPFLAGS = -DFALAGARDWRBASE_EXPORTS -DCEGUIWRMODULE_EXPORTS
+ 
+diff -up CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.am.patch1 CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.am
+--- CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.am.patch1	2008-05-26 20:56:07.000000000 +0200
++++ CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include
+ if MINGW32_BUILD
+ libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS
+ libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version
++else
++libCEGUITinyXMLParser_la_LDFLAGS = -release @PACKAGE_VERSION@
+ endif
+ 
+ lib_LTLIBRARIES=libCEGUITinyXMLParser.la
+diff -up CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.in.patch1 CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.in
+--- CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.in.patch1	2008-11-30 21:11:41.000000000 +0100
++++ CEGUI-0.6.2/XMLParserModules/TinyXMLParser/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -253,6 +253,7 @@ INCLUDES = -I$(top_srcdir)/include $(am_
+ 
+ @MINGW32_BUILD_TRUE@libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS
+ @MINGW32_BUILD_TRUE@libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version
++@MINGW32_BUILD_FALSE@libCEGUITinyXMLParser_la_LDFLAGS = -release @PACKAGE_VERSION@
+ 
+ lib_LTLIBRARIES = libCEGUITinyXMLParser.la
+ libCEGUITinyXMLParser_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la $(am__append_3)
+diff -up CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.am.patch1 CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.am
+--- CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.am.patch1	2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(xer
+ if MINGW32_BUILD
+ libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS
+ libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version
++else
++libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@
+ endif
+ 
+ libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.in.patch1 CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.in
+--- CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.in.patch1	2008-11-30 21:11:41.000000000 +0100
++++ CEGUI-0.6.2/XMLParserModules/XercesParser/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -245,6 +245,7 @@ INCLUDES = -I$(top_srcdir)/include $(xer
+ 
+ @MINGW32_BUILD_TRUE@libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS
+ @MINGW32_BUILD_TRUE@libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version
++@MINGW32_BUILD_FALSE@libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@
+ 
+ libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) $(top_builddir)/src/libCEGUIBase.la
+ 
+diff -up CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.am.patch1 CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.am
+--- CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.am.patch1	2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(exp
+ if MINGW32_BUILD
+ libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS
+ libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version
++else
++libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@
+ endif
+ 
+ libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.in.patch1 CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.in
+--- CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.in.patch1	2008-11-30 21:11:41.000000000 +0100
++++ CEGUI-0.6.2/XMLParserModules/expatParser/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -245,6 +245,7 @@ INCLUDES = -I$(top_srcdir)/include $(exp
+ 
+ @MINGW32_BUILD_TRUE@libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS
+ @MINGW32_BUILD_TRUE@libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version
++@MINGW32_BUILD_FALSE@libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@
+ 
+ libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) $(top_builddir)/src/libCEGUIBase.la
+ 
+diff -up CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.am.patch1 CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.am
+--- CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.am.patch1	2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(lib
+ if MINGW32_BUILD
+ libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS
+ libCEGUILibxmlParser_la_LDFLAGS = -no-undefined -avoid-version
++else
++libCEGUILibxmlParser_la_LDFLAGS = -release @PACKAGE_VERSION@
+ endif
+ 
+ libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.in.patch1 CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.in
+--- CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.in.patch1	2008-11-30 21:11:41.000000000 +0100
++++ CEGUI-0.6.2/XMLParserModules/libxmlParser/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -246,6 +246,7 @@ INCLUDES = -I$(top_srcdir)/include $(lib
+ 
+ @MINGW32_BUILD_TRUE@libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS
+ @MINGW32_BUILD_TRUE@libCEGUILibxmlParser_la_LDFLAGS = -no-undefined -avoid-version
++@MINGW32_BUILD_FALSE@libCEGUILibxmlParser_la_LDFLAGS = -release @PACKAGE_VERSION@
+ 
+ libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) $(top_builddir)/src/libCEGUIBase.la
+ 
+diff -up CEGUI-0.6.2/src/Makefile.am.patch1 CEGUI-0.6.2/src/Makefile.am
+--- CEGUI-0.6.2/src/Makefile.am.patch1	2008-06-24 21:01:53.000000000 +0200
++++ CEGUI-0.6.2/src/Makefile.am	2008-12-03 12:14:26.000000000 +0100
+@@ -9,7 +9,7 @@ libCEGUIBase_la_LDFLAGS += -shared -no-u
+ libCEGUIBase_la_LIBADD += -lwinmm
+ endif
+ 
+-libCEGUIBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
++libCEGUIBase_la_LDFLAGS += -release @PACKAGE_VERSION@
+ libCEGUIBase_la_LIBADD += $(freetype2_LIBS) $(pcre_LIBS)
+ 
+ lib_LTLIBRARIES=libCEGUIBase.la
+diff -up CEGUI-0.6.2/src/Makefile.in.patch1 CEGUI-0.6.2/src/Makefile.in
+--- CEGUI-0.6.2/src/Makefile.in.patch1	2008-11-30 21:11:42.000000000 +0100
++++ CEGUI-0.6.2/src/Makefile.in	2008-12-03 12:14:26.000000000 +0100
+@@ -247,7 +247,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
+ xerces_LIBS = @xerces_LIBS@
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) $(freetype2_CFLAGS) $(pcre_CFLAGS) $(am__append_3)
+ 
+-libCEGUIBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
++libCEGUIBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
+ libCEGUIBase_la_LIBADD = $(am__append_2) $(freetype2_LIBS) $(pcre_LIBS)
+ 
+ @MINGW32_BUILD_TRUE@libCEGUIBase_la_CPPFLAGS = -DCEGUIBASE_EXPORTS
diff --git a/main/cegui06/cegui-0.6.0-userverso.patch b/main/cegui06/cegui-0.6.0-userverso.patch
new file mode 100644
index 000000000..ea5a99cbe
--- /dev/null
+++ b/main/cegui06/cegui-0.6.0-userverso.patch
@@ -0,0 +1,21 @@
+--- CEGUI-0.6.0/src/CEGUIDynamicModule.cpp~	2008-05-21 22:11:55.000000000 +0200
++++ CEGUI-0.6.0/src/CEGUIDynamicModule.cpp	2008-05-21 22:11:55.000000000 +0200
+@@ -65,6 +65,18 @@ DynamicModule::DynamicModule(const Strin
+ 	} // if(name.empty())
+ 
+ #if defined(__linux__)
++    // check if we are being asked to open a CEGUI .so, if so postfix the name
++    // with our package version
++    if (d_moduleName.substr(0, 5) == "CEGUI" ||
++        d_moduleName.substr(0, 8) == "libCEGUI")
++    {
++        // strip .so extension before postfixing, will get added again below
++        if (d_moduleName.substr(d_moduleName.length() - 3, 3) == ".so")
++            d_moduleName = d_moduleName.substr(0, d_moduleName.length() - 3);
++        d_moduleName += "-";
++        d_moduleName += PACKAGE_VERSION;
++    }
++
+     // dlopen() does not add .so to the filename, like windows does for .dll
+     if (d_moduleName.substr(d_moduleName.length() - 3, 3) != ".so")
+         d_moduleName += ".so";
diff --git a/main/cegui06/cegui-0.6.2-gcc46.patch b/main/cegui06/cegui-0.6.2-gcc46.patch
new file mode 100644
index 000000000..27c817cff
--- /dev/null
+++ b/main/cegui06/cegui-0.6.2-gcc46.patch
@@ -0,0 +1,11 @@
+diff -up CEGUI-0.6.2/include/CEGUIBase.h~ CEGUI-0.6.2/include/CEGUIBase.h
+--- CEGUI-0.6.2/include/CEGUIBase.h~	2008-02-11 15:38:27.000000000 +0100
++++ CEGUI-0.6.2/include/CEGUIBase.h	2011-02-13 20:06:29.477851548 +0100
+@@ -33,6 +33,7 @@
+ #ifndef _CEGUIBase_h_
+ #define _CEGUIBase_h_
+ 
++#include <cstddef>
+ #include <cassert>
+ 
+ // bring in configuration options
diff --git a/main/celt051/APKBUILD b/main/celt051/APKBUILD
new file mode 100644
index 000000000..86e05c8f0
--- /dev/null
+++ b/main/celt051/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=celt051
+pkgver=0.5.1.3
+pkgrel=0
+pkgdesc="An audio codec for use in low-delay speech and audio communication"
+url="http://www.celt-codec.org/"
+arch="all"
+license="BSD"
+depends=""
+makedepends="libogg-dev"
+install=""
+subpackages="$pkgname-dev"
+source="http://downloads.us.xiph.org/releases/celt/celt-$pkgver.tar.gz"
+
+_builddir="$srcdir"/celt-$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 DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="67e7b5e45db57a6f1f0a6962f5ecb190  celt-0.5.1.3.tar.gz"
diff --git a/main/claws-mail/APKBUILD b/main/claws-mail/APKBUILD
index 7480590af..0fddbf46b 100644
--- a/main/claws-mail/APKBUILD
+++ b/main/claws-mail/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=claws-mail
-pkgver=3.7.10
+pkgver=3.8.0
 pkgrel=0
 pkgdesc="A GTK+ based e-mail client."
 url="http://www.claws-mail.org"
 arch="all"
 license="GPL3"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 makedepends="gtk+-dev openssl-dev startup-notification-dev enchant-dev
 	libsm-dev gnutls-dev curl-dev dbus-glib-dev libetpan-dev openldap-dev"
 depends=
@@ -56,5 +56,5 @@ package() {
 		install -D -m755 ${i} "$pkgdir"/usr/lib/claws-mail/tools/${i}
 	done
 }
-md5sums="fcf58dcff52f0908ff3bc368d820408b  claws-mail-3.7.10.tar.bz2
+md5sums="df9f1657d7f34959a2205344d952c2e3  claws-mail-3.8.0.tar.bz2
 f3416743b5d8ff97b5a3cc2f7efc2dc1  libc-version.patch"
diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 5d9c445e5..0d6d3d8b4 100644
--- a/main/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=conntrack-tools
-pkgver=0.9.13
-pkgrel=3
+pkgver=1.0.0
+pkgrel=0
 pkgdesc="Connection tracking userspace tools"
 url="http://conntrack-tools.netfilter.org"
 arch="all"
@@ -14,16 +14,21 @@ source="http://www.netfilter.org/projects/conntrack-tools/files/$pkgname-$pkgver
 	conntrackd.confd
 	"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure --prefix=/usr
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 
 	install -Dm755 ../conntrackd.initd "$pkgdir"/etc/init.d/conntrackd
 	install -Dm644 ../conntrackd.confd "$pkgdir"/etc/conf.d/conntrackd
 	install -Dm644 doc/stats/conntrackd.conf "$pkgdir"/etc/conntrackd
 }
-md5sums="bd0e2149a1626071db83c4f9714e0556  conntrack-tools-0.9.13.tar.bz2
+md5sums="5add24d4761baf17af630d5627a71752  conntrack-tools-1.0.0.tar.bz2
 a97e0b7f1339d93caf929fb4767141e1  conntrackd.initd
 8ebf3838b69d20e6bb4a173844502039  conntrackd.confd"
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index c93d5a860..f32af87da 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=coova-chilli
 pkgver=1.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
 url="http://www.coova.org/"
 arch="all"
@@ -37,7 +37,8 @@ build() {
 		--sysconfdir=/etc \
 		--with-openssl \
 		--enable-layer3 \
-		--enable-dhcpopt
+		--enable-dhcpopt \
+		--enable-largelimits 
 	make -j1  || return 1
 }
 
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index d807fe25c..a846d197b 100644
--- a/main/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
@@ -2,15 +2,15 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 
 _flavor=grsec
-_kver=3.0.10
+_kver=3.0.14
 _kpkgrel=0
 _mypkgrel=0
 
 # verify the kernel version before entering chroot
 if [ -f ../linux-${_flavor}/APKBUILD ]; then
 	. ../linux-${_flavor}/APKBUILD
-	[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-	[ "$_kpkgrel" != "$pkgrel" ] && die "please update _kpkgrel to $pkgrel"
+	[ "$_kver" != "$pkgver" ] && die "dahdi-linux-grsec: please update _kver to $pkgver"
+	[ "$_kpkgrel" != "$pkgrel" ] && die "dahdi-linuc-grsec: please update _kpkgrel to $pkgrel"
 fi
 
 _kpkgver="$_kver-r$_kpkgrel"
diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD
index a4691a081..ff010f92c 100644
--- a/main/dahdi-linux-vserver/APKBUILD
+++ b/main/dahdi-linux-vserver/APKBUILD
@@ -4,7 +4,7 @@
 _flavor=${FLAVOR:-vserver}
 _realname=dahdi-linux
 _name=$_realname-$_flavor
-_kver=3.0.10
+_kver=3.0.14
 _kpkgrel=0
 _myvsver=vs2.3.2.1
 
diff --git a/main/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD
index 2ca8b29e1..8dede7875 100644
--- a/main/dahdi-tools/APKBUILD
+++ b/main/dahdi-tools/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=dahdi-tools
 pkgver=2.5.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Digium Asterisk Hardware Device Interface management utilities"
 url="http://www.asterisk.org"
 arch="all"
 license="GPL"
-depends="dahdi-linux"
+depends=""
 depends_dev="dahdi-linux-dev newt-dev"
 makedepends="dahdi-linux-dev perl newt-dev"
 install=
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 06e8c827c..a5f26da7a 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcp
-pkgver=4.2.3
+pkgver=4.2.3_p1
 _realver=${pkgver/_p/-P}
 pkgrel=0
 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
@@ -11,7 +11,7 @@ depends=
 makedepends="perl"
 install="dhcp.pre-install dhcp.post-install dhcp.pre-upgrade dhcp.post-upgrade"
 subpackages="$pkgname-doc $pkgname-dev dhclient dhcrelay"
-source="http://ftp.isc.org/isc/dhcp/${pkgver}/$pkgname-$_realver.tar.gz
+source="http://ftp.isc.org/isc/dhcp/${_realver}/$pkgname-$_realver.tar.gz
 	linux_ipv6_discover.patch
 	dhcp-3.0-fix-perms.patch
 	dhcrelay.initd
@@ -75,7 +75,7 @@ dhcrelay() {
 		"$subpkgdir"/etc/conf.d/dhcrelay
 }
 
-md5sums="a06649ec5336d284fc86a0232c0edd63  dhcp-4.2.3.tar.gz
+md5sums="04599f1557a5cafd10d7745267a68c8b  dhcp-4.2.3-P1.tar.gz
 37abf1fb047a353e91b022fafdabf39a  linux_ipv6_discover.patch
 a9eaf182dae3984670da52f20ae10fba  dhcp-3.0-fix-perms.patch
 1597c012bb1a2c0828254c87f0a904ad  dhcrelay.initd
diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD
index 4c2eada09..a2c6609bb 100644
--- a/main/dosfstools/APKBUILD
+++ b/main/dosfstools/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dosfstools
-pkgver=3.0.11
+pkgver=3.0.12
 pkgrel=0
 pkgdesc="DOS filesystem utilities"
 url="http://www.daniel-baumann.ch/software/dosfstools/"
@@ -9,7 +9,7 @@ license="GPL-2"
 depends=
 makedepends=""
 subpackages="$pkgname-doc"
-source="http://www.daniel-baumann.ch/software/$pkgname/$pkgname-$pkgver.tar.bz2"
+source="http://www.daniel-baumann.ch/software/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -23,4 +23,4 @@ package() {
 		DOCDIR="$pkgdir"/usr/share/doc \
 		install
 }
-md5sums="8d2211d5bd813164e20740e7c852aa06  dosfstools-3.0.11.tar.bz2"
+md5sums="4c1f1e72b82371704f93ebdd3c7b6259  dosfstools-3.0.12.tar.gz"
diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD
index 3a5877ad9..405054911 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=doxygen
-pkgver=1.7.5.1
+pkgver=1.7.6.1
 pkgrel=0
 pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
 url="http://www.doxygen.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" MAN1DIR=share/man/man1 install
 }
 
-md5sums="f5355c442c5bc2481dbef7fdea8f0556  doxygen-1.7.5.1.src.tar.gz"
+md5sums="084f1db244b77b3abff335550ef8eec5  doxygen-1.7.6.1.src.tar.gz"
diff --git a/main/ebtables/0001-link-with-gcc.patch b/main/ebtables/0001-link-with-gcc.patch
deleted file mode 100644
index 88aba09f3..000000000
--- a/main/ebtables/0001-link-with-gcc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Makefile	Sun Jun 21 13:13:25 2009
-+++ b/Makefile	Wed Oct 28 02:42:43 2009
-@@ -85,7 +85,7 @@
- 
- .PHONY: libebtc
- libebtc: $(OBJECTS2)
--	$(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2)
-+	$(CC) -shared -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2)
- 
- ebtables: $(OBJECTS) ebtables-standalone.o libebtc
- 	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
-@@ -153,10 +153,13 @@
- tmp3:=$(shell printf $(PIPE) | sed 's/\//\\\//g')
- .PHONY: scripts
- scripts: ebtables-save ebtables.sysv ebtables-config
-+	mkdir -p $(DESTDIR)$(BINDIR)
- 	cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
- 	install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
-+	mkdir -p $(DESTDIR)$(INITDIR)
- 	cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
- 	install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
-+	mkdir -p $(DESTDIR)$(SYSCONFIGDIR)
- 	cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
- 	install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
- 	rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
diff --git a/main/ebtables/APKBUILD b/main/ebtables/APKBUILD
index c7ae555f2..184081cc7 100644
--- a/main/ebtables/APKBUILD
+++ b/main/ebtables/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Andrew Manison <amanison@anselsystems.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ebtables
-pkgver=2.0.9.1
-_realver=v2.0.9-1
-pkgrel=3
+pkgver=2.0.10.2
+_realver=v${pkgver%.[0-9]}-${pkgver##*.}
+pkgrel=0
 pkgdesc="Ethernet bridge tables - Linux Ethernet filter for the Linux bridge."
 url="http://ebtables.sourceforge.net/"
 arch="all"
@@ -13,27 +13,23 @@ makedepends=
 install=
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_realver.tar.gz
-	0001-link-with-gcc.patch
 	ebtables.initd
 	ebtables.confd"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$_realver
 	# patches
-	for i in ../*.patch; do
-		msg "Applying $i"
-		if ! patch --verbose -p1 -i $i; then
-			error "$i failed"
-			return 1
-		fi
+	for i in $source; do
+		case "$i" in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
 	done
-
 	sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
 		-e "s,^BINDIR:=.*,BINDIR:=/sbin," \
 		-e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/ebtables," \
 		-e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/ebtables,"\
 		-e "s,^LIBDIR:=.*,LIBDIR:=/usr/lib/\$(PROGNAME)," \
-		-e "s/^CFLAGS:=/CFLAGS+=/" \
+		-e "s/^CFLAGS:=/CFLAGS?=/" \
 		-e "s,^CC:=,CC?=," Makefile
 }
 
@@ -43,7 +39,7 @@ build() {
 	# This package uses _init functions to initialise extensions. With
 	# --as-needed this will not work.
 	export LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
-	make || return 1
+	make CFLAGS="$CFLAGS" || return 1
 }
 
 package() {
@@ -53,7 +49,6 @@ package() {
 	install -D -m644 ../ebtables.confd "$pkgdir"/etc/conf.d/ebtables
 }
 
-md5sums="0e0c20adf2bba6d91dbd0b74a1a38c33  ebtables-v2.0.9-1.tar.gz
-91a565a5906dc1fd4103f03c6a88e0e1  0001-link-with-gcc.patch
+md5sums="c5ae7fb75810fd936a5445239e853fd8  ebtables-v2.0.10-2.tar.gz
 92e13b3bc1d47d7c00636ebb78c905d5  ebtables.initd
 285089ba2d846e72e321a12e3da3cc96  ebtables.confd"
diff --git a/main/ez-ipupdate/APKBUILD b/main/ez-ipupdate/APKBUILD
index 352915039..2e81bc0f1 100644
--- a/main/ez-ipupdate/APKBUILD
+++ b/main/ez-ipupdate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
 pkgname=ez-ipupdate
 pkgver=3.0.10
-pkgrel=2
+pkgrel=3
 pkgdesc="utility for updating your host name for many of the dynamic DNS services (ez-ip.net, dyndns.org, etc)"
 url="http://ez-ipupdate.com/"
 arch="all"
@@ -45,5 +45,5 @@ package() {
 
 md5sums="6505c9d18ef6b5ce13fe2a668eb5724b  ez-ipupdate-3.0.10.tar.gz
 e6e06780b1896f2250132cc16cd10710  ez-ipupdate.confd
-6b9ce71b7b6b739794f003b2ebbf66ed  ez-ipupdate.initd
+6a8250dd9c7810c1968f80c90715b747  ez-ipupdate.initd
 1fede0dcb5d9ca108855df0a9d213413  errno.patch"
diff --git a/main/ez-ipupdate/ez-ipupdate.initd b/main/ez-ipupdate/ez-ipupdate.initd
index 4ec662694..89faa9e72 100644
--- a/main/ez-ipupdate/ez-ipupdate.initd
+++ b/main/ez-ipupdate/ez-ipupdate.initd
@@ -26,7 +26,7 @@ start() {
         ebegin "Starting ${NAME}"
                 start-stop-daemon --start --quiet \
                         --pidfile /var/run/${NAME}/${NAME}.pid \
-                        --chuid ${DAEMON_USER}:${DAEMON_GROUP} \
+                        --user ${DAEMON_USER}:${DAEMON_GROUP} \
                         --exec ${DAEMON} -- ${OPTS}
         eend $?
 }
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index 547bc5c91..8fb54da73 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fakeroot
-pkgver=1.18.1
+pkgver=1.18.2
 pkgrel=0
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 arch="all"
@@ -32,5 +32,5 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="8eedda3dcb71b6ab6f62297b82ae5ac6  fakeroot_1.18.1.orig.tar.bz2
+md5sums="79f32331358ad58499704ea5e19fd0ae  fakeroot_1.18.2.orig.tar.bz2
 bdbf1db14f2cfdff0f5b4c35da78b9fe  busybox-getopt.patch"
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index c784f2816..abf340c91 100644
--- a/main/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Michael Mason <ms13sp@gmail.com> 
+# Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fetchmail
 pkgver=6.3.21
-pkgrel=0
+pkgrel=1
 pkgdesc="A remote-mail retrieval and forwarding utility"
 url="http://fetchmail.berlios.de/"
 arch="all"
@@ -37,10 +37,10 @@ fetchmailconf() {
 	pkgdesc="A GUI for generating fetchmail configuration files"
 	install=
 	mkdir -p "$subpkgdir"/usr/bin
-	cd "$pkgdir" 
+	cd "$pkgdir"
 	mv usr/bin/fetchmailconf "$subpkgdir"/usr/bin/
 	mv usr/lib "$subpkgdir"/usr/
 }
 
 md5sums="0ad8eac47e85bd0ae63870daa09992af  fetchmail-6.3.21.tar.bz2
-b27fe01a7c25534d62d175c8ba22fc48  fetchmail.initd"
+20ad22948fd77cf24e2bb288af6fd266  fetchmail.initd"
diff --git a/main/fetchmail/fetchmail.initd b/main/fetchmail/fetchmail.initd
index 73286c4e7..0857d652f 100755
--- a/main/fetchmail/fetchmail.initd
+++ b/main/fetchmail/fetchmail.initd
@@ -20,7 +20,7 @@ start() {
 
         ebegin "Starting fetchmail"
         start-stop-daemon --start --quiet \
-		--chuid fetchmail --exec /usr/bin/fetchmail \
+		--user fetchmail --exec /usr/bin/fetchmail \
 		-- -d ${polling_period:-300} -f /etc/fetchmailrc \
 		--pidfile ${pidfile} -i /var/lib/fetchmail/.fetchids
         eend ${?}
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index 258971bff..fd82922a3 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ffmpeg
-pkgver=0.8.7
+pkgver=0.9
 pkgrel=0
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 url="http://ffmpeg.org/"
@@ -59,5 +59,5 @@ package() {
 	install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" || return 1
 #	strip --strip-debug "$pkgdir"/usr/lib/*.a || return 1
 }
-md5sums="31da4d5610d7138761e23fab8fe3a84d  ffmpeg-0.8.7.tar.bz2
+md5sums="795058de6fc432aa11271408273a0535  ffmpeg-0.9.tar.bz2
 2cdc11a99bf97c63c7cca27b073cb47c  configure-dlvsym.patch"
diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD
index 42f56d884..d15b2e27a 100644
--- a/main/firefox/APKBUILD
+++ b/main/firefox/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=firefox
-pkgver=7.0.1
+pkgver=8.0.1
 _pkgver=$pkgver
-_xulver=7.0.1
-pkgrel=4
+_xulver=8.0.1
+pkgrel=3
 pkgdesc="firefox web browser"
 url="http://www.firefox.com"
 arch="all"
@@ -111,8 +111,8 @@ __EOF__
 	chmod 755 "$pkgdir"/usr/bin/firefox
 }
 
-md5sums="5b212db48630ba93bb30ec63cca17f4d  firefox-7.0.1.source.tar.bz2
-90d21a0ca38d9da4e42f22982f8b8cc5  mozconfig
+md5sums="b7d09b082e88a74860a51a8e04e29333  firefox-8.0.1.source.tar.bz2
+3ba2cb7cda675e78eb0eeb0652ee3457  mozconfig
 2328df219e042f6aaec361cbf83cf9e9  firefox-5.0-asciidel.patch
 ba96924ece1d77453e462429037a2ce5  firefox.desktop
 6f38a5899034b7786cb1f75ad42032b8  firefox-safe.desktop"
diff --git a/main/firefox/mozconfig b/main/firefox/mozconfig
index add87aee8..f1b23fae9 100644
--- a/main/firefox/mozconfig
+++ b/main/firefox/mozconfig
@@ -33,6 +33,7 @@ ac_add_options --enable-url-classifier
 ac_add_options --enable-gio
 ac_add_options --disable-gnomevfs
 ac_add_options --disable-static
+ac_add_options --enable-official-branding
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/main/fts/APKBUILD b/main/fts/APKBUILD
deleted file mode 100644
index e6f2850ec..000000000
--- a/main/fts/APKBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=fts
-pkgver=0
-pkgrel=3
-pkgdesc="keith bostic's POSIX file tree stream operations library"
-url="http://bostic.com/"
-arch="all"
-license="BSD"
-depends=
-depends_dev=
-makedepends="$depends_dev wget"
-install=""
-subpackages="$pkgname-dev $pkgname-doc"
-replaces_doc="man-pages"
-source="saveas-https://sites.google.com/a/bostic.com/keithbostic/files/fts.tar.gz?attredirects=0/fts.tar.gz
-	fts-uclibc.patch
-	fts-header-correctness.patch
-	stdint.patch"
-
-_builddir="${srcdir}/${pkgname}"
-prepare() {
-	local i
-	cd "$_builddir"
-	chmod +w *.c
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	gcc -I. -fPIC -shared -o libfts.so -Wl,-soname,libfts.so.${pkgver} fts.c
-}
-
-package() {
-	cd "$_builddir"
-
-	install -d "$pkgdir"/usr/lib
-
-	install -m 755 libfts.so "$pkgdir"/usr/lib/libfts.so.${pkgver}
-	ln -sf libfts.so.${pkgver} "$pkgdir"/usr/lib/libfts.so
-
-	install -d "$pkgdir"/usr/include
-	install -m 644 fts.h "$pkgdir"/usr/include/fts.h
-
-	install -d "$pkgdir"/usr/share/man/man3
-	install -m 644 fts.3 "$pkgdir"/usr/share/man/man3/fts.3
-}
-
-md5sums="120c14715485ec6ced14f494d059d20a  fts.tar.gz
-588fead4044bf535ff97298651aaab8f  fts-uclibc.patch
-b197744ece4ef9a5fa52692acf9b6666  fts-header-correctness.patch
-a8a5a8e81e1c67738aef00f3f13a718b  stdint.patch"
diff --git a/main/fts/fts-header-correctness.patch b/main/fts/fts-header-correctness.patch
deleted file mode 100644
index 59061bfc9..000000000
--- a/main/fts/fts-header-correctness.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- fts.orig/fts.h
-+++ fts/fts.h
-@@ -38,6 +38,17 @@
- #ifndef	_FTS_H_
- #define	_FTS_H_
- 
-+#include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/stat.h>
-+
-+#include <dirent.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
- typedef struct {
- 	struct _ftsent *fts_cur;	/* current node */
- 	struct _ftsent *fts_child;	/* linked list of children */
diff --git a/main/fts/fts-uclibc.patch b/main/fts/fts-uclibc.patch
deleted file mode 100644
index 359353039..000000000
--- a/main/fts/fts-uclibc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- fts.orig/fts.c
-+++ fts/fts.c
-@@ -31,6 +31,10 @@
-  * SUCH DAMAGE.
-  */
- 
-+#define	alignof(TYPE)   ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
-+#define	ALIGNBYTES	(alignof(long double) - 1)
-+#define	ALIGN(p)	(((uintptr_t)(p) + ALIGNBYTES) & ~ALIGNBYTES) 
-+
- #if defined(LIBC_SCCS) && !defined(lint)
- static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
- #endif /* LIBC_SCCS and not lint */
-@@ -652,10 +656,10 @@
- 		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
- 			continue;
- 
--		if ((p = fts_alloc(sp, dp->d_name, (int)dp->d_namlen)) == NULL)
-+		if ((p = fts_alloc(sp, dp->d_name, (int)dp->d_reclen)) == NULL)
- 			goto mem1;
--		if (dp->d_namlen > maxlen) {
--			if (fts_palloc(sp, (size_t)dp->d_namlen)) {
-+		if (dp->d_reclen > maxlen) {
-+			if (fts_palloc(sp, (size_t)dp->d_reclen)) {
- 				/*
- 				 * No more memory for path or structures.  Save
- 				 * errno, free up the current structure and the
-@@ -675,7 +679,7 @@
- 			maxlen = sp->fts_pathlen - sp->fts_cur->fts_pathlen - 1;
- 		}
- 
--		p->fts_pathlen = len + dp->d_namlen + 1;
-+		p->fts_pathlen = len + dp->d_reclen + 1;
- 		p->fts_parent = sp->fts_cur;
- 		p->fts_level = level;
- 
-@@ -784,7 +788,7 @@
- 	/* If user needs stat info, stat buffer already allocated. */
- 	sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
- 
--#ifdef DT_WHT
-+#ifdef S_IFWHT
- 	/*
- 	 * Whited-out files don't really exist.  However, there's stat(2) file
- 	 * mask for them, so we set it so that programs (i.e., find) don't have
diff --git a/main/fts/stdint.patch b/main/fts/stdint.patch
deleted file mode 100644
index 1ad7157e5..000000000
--- a/main/fts/stdint.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./fts.c.orig
-+++ ./fts.c
-@@ -46,6 +46,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <fts.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
diff --git a/main/galculator/APKBUILD b/main/galculator/APKBUILD
index 1bfff07d4..529559c1b 100644
--- a/main/galculator/APKBUILD
+++ b/main/galculator/APKBUILD
@@ -1,18 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=galculator
 pkgver=1.3.4
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK+ based scientific calculator"
 url="http://galculator.sourceforge.net/"
 arch="all"
 license="GPL"
 depends=
-makedepends="intltool libglade-dev gtk+-dev"
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+makedepends="intltool libglade-dev gtk+-dev autoconf automake libtool flex bison"
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+	galculator-1.3.4-libm.patch"
+
+_builddir="$srcdir/galculator-$pkgver"
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	libtoolize --force && aclocal && autoconf && automake --add-missing
+}
 
 build() {
-	cd "$srcdir/galculator-$pkgver"
+	cd "$_builddir"
 	./configure --prefix=/usr || return 1
 	make || return 1
 }
@@ -21,4 +33,5 @@ package() {
 	cd "$srcdir/galculator-$pkgver"
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="d30e6fbf5947bb1c873bc9d5a21046f1  galculator-1.3.4.tar.bz2"
+md5sums="d30e6fbf5947bb1c873bc9d5a21046f1  galculator-1.3.4.tar.bz2
+467de62f8737c800eb1db93e501de3cb  galculator-1.3.4-libm.patch"
diff --git a/main/galculator/galculator-1.3.4-libm.patch b/main/galculator/galculator-1.3.4-libm.patch
new file mode 100644
index 000000000..e7472fe83
--- /dev/null
+++ b/main/galculator/galculator-1.3.4-libm.patch
@@ -0,0 +1,11 @@
+diff -up galculator-1.3.4/configure.in.libm galculator-1.3.4/configure.in
+--- galculator-1.3.4/configure.in.libm	2010-02-16 11:22:31.000000000 +0100
++++ galculator-1.3.4/configure.in	2010-02-16 11:22:12.000000000 +0100
+@@ -11,6 +11,7 @@ AC_PROG_INTLTOOL(, no-xml)
+ AC_ISC_POSIX
+ 
+ AC_HEADER_STDC
++AC_CHECK_LIB([m],[tan])
+ 
+ pkg_modules="gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
diff --git a/main/gamin/APKBUILD b/main/gamin/APKBUILD
index 5e790d605..4030bbe4d 100644
--- a/main/gamin/APKBUILD
+++ b/main/gamin/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gamin
 pkgver=0.1.10
-pkgrel=7
+pkgrel=8
 pkgdesc="Gamin is a file and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor) system."
 url="http://www.gnome.org/~veillard/gamin"
 arch="all"
@@ -9,23 +9,34 @@ license="GPL"
 subpackages="$pkgname-dev py-$pkgname:py"
 depends=
 makedepends="pkgconfig glib-dev python-dev"
-source="http://www.gnome.org/~veillard/$pkgname/sources/$pkgname-$pkgver.tar.gz"
+source="http://www.gnome.org/~veillard/$pkgname/sources/$pkgname-$pkgver.tar.gz
+	fix-deprecated-const.patch"
 
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	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 \
 		--with-threads \
 		--disable-debug-api \
 		--disable-debug \
 		--disable-dnotify \
-		--libexecdir=/usr/lib/gamin
+		--libexecdir=/usr/lib/gamin \
+		|| return 1
 	make || return 1
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	# some kinde of race in the make install which is not solved with -j || return 1
 	export MKDIRPROG="mkdir -p"
 	make DESTDIR="$pkgdir" install || return 1
@@ -39,4 +50,5 @@ py() {
 	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
 }
 
-md5sums="b4ec549e57da470c04edd5ec2876a028  gamin-0.1.10.tar.gz"
+md5sums="b4ec549e57da470c04edd5ec2876a028  gamin-0.1.10.tar.gz
+f679aeb48fe9dd376c8828cc9b6941ab  fix-deprecated-const.patch"
diff --git a/main/gamin/fix-deprecated-const.patch b/main/gamin/fix-deprecated-const.patch
new file mode 100644
index 000000000..3d5f6133f
--- /dev/null
+++ b/main/gamin/fix-deprecated-const.patch
@@ -0,0 +1,56 @@
+Description: Don't use deprecated G_CONST_RETURN. Fixes building with newer glib versions.
+Author: Matthias Klose <doko@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/829504
+
+Index: gamin/server/gam_node.c
+===================================================================
+--- gamin.orig/server/gam_node.c	2011-10-18 16:09:04.873780685 +0200
++++ gamin/server/gam_node.c	2011-10-18 16:09:01.965780543 +0200
+@@ -122,7 +122,7 @@
+  * it has finished with the string.  If it must keep it longer, it
+  * should makes its own copy.  The returned string must not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ gam_node_get_path(GamNode * node)
+ {
+     g_assert(node);
+Index: gamin/server/gam_node.h
+===================================================================
+--- gamin.orig/server/gam_node.h	2011-10-18 16:09:04.729780677 +0200
++++ gamin/server/gam_node.h	2011-10-18 16:09:01.961780544 +0200
+@@ -58,7 +58,7 @@
+ void                  gam_node_set_is_dir          (GamNode         *node,
+ 						   gboolean        is_dir);
+ 	
+-G_CONST_RETURN char  *gam_node_get_path            (GamNode         *node);
++const char  *gam_node_get_path            (GamNode         *node);
+ 
+ GList                *gam_node_get_subscriptions   (GamNode         *node);
+ 
+Index: gamin/server/gam_subscription.c
+===================================================================
+--- gamin.orig/server/gam_subscription.c	2011-10-18 16:09:04.817780682 +0200
++++ gamin/server/gam_subscription.c	2011-10-18 16:09:01.965780543 +0200
+@@ -141,7 +141,7 @@
+  * @param sub the GamSubscription
+  * @returns The path being monitored.  It should not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ gam_subscription_get_path(GamSubscription * sub)
+ {
+     if (sub == NULL)
+Index: gamin/server/gam_subscription.h
+===================================================================
+--- gamin.orig/server/gam_subscription.h	2011-10-18 16:09:04.929780687 +0200
++++ gamin/server/gam_subscription.h	2011-10-18 16:09:01.965780543 +0200
+@@ -21,7 +21,7 @@
+ 
+ int                  gam_subscription_get_reqno    (GamSubscription *sub);
+ 
+-G_CONST_RETURN char *gam_subscription_get_path     (GamSubscription *sub);
++const char *gam_subscription_get_path     (GamSubscription *sub);
+ 
+ GamListener         *gam_subscription_get_listener (GamSubscription *sub);
+ 
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index ae6af04ba..ce5094768 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -7,7 +7,7 @@ _specs_gcc_ver=4.4.3
 
 _uclibc_abiver=0.9.32
 
-pkgrel=1
+pkgrel=4
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 arch="all"
@@ -15,33 +15,40 @@ license="GPL LGPL"
 depends="binutils libgcc libgomp libobjc"
 makedepends="bison flex gmp-dev mpfr-dev texinfo libmpc-dev gawk zlib-dev zip
 	cloog-dev"
-subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp $pkgname-go
-	libgo"
+subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp"
 replaces="libstdc++"
 
 if [ -n "$BOOTSTRAP" ]; then
 	LANG_OBJC=off
 	LANG_JAVA=off
+	LANG_FORTRAN=off
 fi
 
+_languages=c,c++
 if [ "$LANG_OBJC" != "off" ]; then
 	subpackages="$subpackages libobjc"
+	_languages="$_languages,objc"
 fi
 if [ "$LANG_JAVA" != "off" ]; then
 	subpackages="$subpackages $pkgname-java libgcj"
 	makedepends="$makedepends paxctl"
+	_languages="$_languages,java"
 fi
 if [ "$LANG_GO" != "off" ]; then
+	subpackages="$subpackages $pkgname-go libgo"
 	_languages="$_languages,go"
-			        fi
-
-
+fi
+if [ "$LANG_FORTRAN" != "off" ]; then
+	subpackages="$subpackages gfortran libgfortran libquadmath"
+	_languages="$_languages,fortran"
+fi
 
 source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-java-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-go-$pkgver.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-fortran-$pkgver.tar.bz2
 	http://distfiles.gentoo.org/distfiles/gcc-4.6.1-piepatches-v${_piepatchver}.tar.bz2
 	http://distfiles.gentoo.org/distfiles/gcc-$_specs_gcc_ver-specs-$_specs_ver.tar.bz2
 	ftp://sourceware.org/pub/java/ecj-latest.jar
@@ -124,7 +131,7 @@ prepare() {
 }
 
 build() {
-	local _languages= _dynamic_linker=
+	local _dynamic_linker=
 	cd "$_gccdir"
 	export CFLAGS="-fno-stack-protector"
 	[ -z "$CBUILD" ] && CBUILD="$CHOST"
@@ -141,21 +148,6 @@ build() {
 			;;
 	esac
 
-	_languages=c,c++
-	# we can disable OBJC with LANG_OBJC=off
-	if [ "$LANG_OBJC" != "off" ]; then
-		_languages=$_languages,objc
-	fi
-
-	# and disable java with LANG_JAVA=off
-	if [ "$LANG_JAVA" != "off" ]; then
-		_languages="$_languages,java"
-	fi
-
-        if [ "$LANG_GO" != "off" ]; then
-		_languages="$_languages,go"
-	fi
-
 	# --enable-target-optspace is broken on powerpc
 	if [ "$CARCH" != "powerpc" ]; then
 		_target_optspace="--enable-target-optspace"
@@ -236,7 +228,8 @@ package() {
 		"$pkdir"/usr/lib/libgcj.spec
 
 	# remove ffi
-	rm "$pkgdir"/usr/lib/libffi*
+	rm "$pkgdir"/usr/lib/libffi* "$pkgdir"/usr/share/man/man3/ffi* \
+		|| return 1
 	find "$pkgdir" -name 'ffi*.h' | xargs rm -f
 
 	mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/lib
@@ -356,11 +349,47 @@ go() {
 		"$subpkgdir"/usr/lib/ || return 1
 }
 
+libgfortran() {
+	pkgdesc="Fortran runtime library for GCC"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/
+}
+
+libquadmath() {
+	replaces="gcc"
+	pkgdesc="128-bit math library for GCC"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libquadmath.so.* "$subpkgdir"/usr/lib/
+}
+
+gfortran() {
+	pkgdesc="GNU Fortran Compiler"
+	depends="$depends libgfortran libquadmath"
+	replaces="gcc"
+	local libexec=usr/libexec/gcc/${CHOST:-$_chost}/$pkgver
+	local gcclibs=usr/lib/gcc/${CHOST:-$_chost}/$pkgver
+	mkdir -p "$subpkgdir"/$libexec \
+		"$subpkgdir"/$gcclibs \
+		"$subpkgdir"/usr/lib \
+		"$subpkgdir"/usr/bin || return 1
+	mv "$pkgdir"/usr/bin/*gfortran "$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/lib/libgfortran.a \
+		"$pkgdir"/usr/lib/libgfortran.so \
+		"$pkgdir"/usr/lib/libquadmath.a \
+		"$pkgdir"/usr/lib/libquadmath.so \
+		"$subpkgdir"/usr/lib/ || return 1
+	mv "$pkgdir"/$libexec/f951 \
+		"$subpkgdir"/$libexec
+	mv "$pkgdir"/$gcclibs/libgfortranbegin.a \
+		"$subpkgdir"/$gcclibs
+}
+
 md5sums="780f614ab18c7a9066dec6387d7490b2  gcc-core-4.6.2.tar.bz2
 87ecd60431e41096419dd8a10f76e46b  gcc-g++-4.6.2.tar.bz2
 94043cc0d08394eddebed73f30ecad89  gcc-objc-4.6.2.tar.bz2
 52de580642d7092b7b2790d9a81ab7a6  gcc-java-4.6.2.tar.bz2
 0b7bdd9bd3096075f035fa9def33c314  gcc-go-4.6.2.tar.bz2
+216ecc8dbf99a562e837c48b5c4e7979  gcc-fortran-4.6.2.tar.bz2
 5dc7efd84b526801b94fed21462aea62  gcc-4.6.1-piepatches-v0.4.5.tar.bz2
 441c76504e1d97170117c294e65c7a72  gcc-4.4.3-specs-0.2.0.tar.bz2
 d7cd6a27c8801e66cbaa964a039ecfdb  ecj-latest.jar
diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD
index df9fce4ec..b82433650 100644
--- a/main/gd/APKBUILD
+++ b/main/gd/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=gd
 pkgver=2.0.36_rc1
 _myver=2.0.36RC1
-pkgrel=7
+pkgrel=8
 pkgdesc="Library for the dynamic creation of images by programmers"
 url="http://www.libgd.org/"
 arch="all"
@@ -34,13 +34,9 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-dev() {
-	default_dev
-	rm -r "$subpkgdir"/usr/lib/libgd.la
+	rm -r "$pkgdir"/usr/lib/libgd.la
 }
 
 md5sums="e876979ca3130623a4e7866d9579171a  gd-2.0.36RC1.tar.bz2"
diff --git a/main/gegl/APKBUILD b/main/gegl/APKBUILD
index b5f936069..7af93d697 100644
--- a/main/gegl/APKBUILD
+++ b/main/gegl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gegl
-pkgver=0.1.6
-pkgrel=1
+pkgver=0.1.8
+pkgrel=0
 pkgdesc="Graph based image processing framework"
 url="http://www.gegl.org/"
 arch="all"
@@ -36,4 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	find "$pkgdir" -name '*.la' -delete
 }
-md5sums="af5e5a7d3c7ddfaa2b3414de2a7e9113  gegl-0.1.6.tar.bz2"
+md5sums="c8279b86b3d584ee4f503839fc500425  gegl-0.1.8.tar.bz2"
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index c81f4e8b6..3e9ab632e 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
-pkgver=1.7.7.4
+pkgver=1.7.8.1
 pkgrel=0
 pkgdesc="GIT - the stupid content tracker"
 url="http://git.or.cz/"
@@ -52,7 +52,7 @@ perl() {
 }
 
 
-md5sums="2f3277475b8da2eb92cef54c4c641a2c  git-1.7.7.4.tar.gz
+md5sums="617fe0301390e98cfc5d665b2702254a  git-1.7.8.1.tar.gz
 e63a201556c4f089de790805c09a2e5b  bb-tar.patch
 3f0bdf6ca73bf4f015bc8565ab787969  git-daemon.initd
 2258e95d389ccc6de0b5111d53d9eed6  git-daemon.confd"
diff --git a/main/glibmm/APKBUILD b/main/glibmm/APKBUILD
index e8456a02e..b3f26b964 100644
--- a/main/glibmm/APKBUILD
+++ b/main/glibmm/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=glibmm
-pkgver=2.30.0
+pkgver=2.30.1
 pkgrel=0
 pkgdesc="C++ wrapper for the GLib toolkit"
 url="http://gtkmm.sourceforge.net/"
@@ -36,4 +36,4 @@ doc() {
 	mv "$pkgdir"/usr/share/devhelp "$subpkgdir"/usr/share/
 }
 
-md5sums="7d9740098cd46f058a351df3bc3670ce  glibmm-2.30.0.tar.bz2"
+md5sums="9b333de989287c563334faa88a11fc21  glibmm-2.30.1.tar.bz2"
diff --git a/main/gparted/APKBUILD b/main/gparted/APKBUILD
index 4044b7d2f..9cee1e6bd 100644
--- a/main/gparted/APKBUILD
+++ b/main/gparted/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gparted
-pkgver=0.10.0
+pkgver=0.11.0
 pkgrel=0
 pkgdesc="a graphical partition editor for creating, reorganizing, and deleting disk partitions"
 url="http://gparted.sourceforge.net/"
@@ -34,4 +34,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="d5b339eb5bef7a99ff73f750834b37b9  gparted-0.10.0.tar.bz2"
+md5sums="93db664bad4c5f0c9a1384b7eac7df5c  gparted-0.11.0.tar.bz2"
diff --git a/main/grep/APKBUILD b/main/grep/APKBUILD
index 011cccfa6..9b4c9261d 100644
--- a/main/grep/APKBUILD
+++ b/main/grep/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=grep
-pkgver=2.9
+pkgver=2.10
 pkgrel=0
 pkgdesc="Searches input files for lines containing a match to a specified pattern"
 url="http://www.gnu.org/software/grep/grep.html"
@@ -11,7 +11,7 @@ depends=
 makedepends="pcre-dev"
 install=
 subpackages="$pkgname-doc"
-source="http://mirrors.kernel.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+source="http://mirrors.kernel.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -29,4 +29,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="03e3451a38b0d615cb113cbeaf252dc0  grep-2.9.tar.gz"
+md5sums="709915434d09f5db655e5ebd7fd6bb7f  grep-2.10.tar.xz"
diff --git a/main/gst-ffmpeg/APKBUILD b/main/gst-ffmpeg/APKBUILD
index 090b03685..4fcce7a84 100644
--- a/main/gst-ffmpeg/APKBUILD
+++ b/main/gst-ffmpeg/APKBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gst-ffmpeg
-pkgver=0.10.11
-pkgrel=3
+pkgver=0.10.13
+pkgrel=0
 pkgdesc="Gstreamer FFMpeg Plugin"
 url="http://www.gstreamer.net"
 arch="all"
 license="GPL"
 makedepends="gstreamer-dev gst-plugins-base-dev liboil-dev coreutils orc-dev"
-source="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-$pkgver.tar.bz2
-	pic.patch"
+source="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-$pkgver.tar.bz2"
 
 _builddir="$srcdir"/gst-ffmpeg-$pkgver
 prepare() {
@@ -25,6 +24,7 @@ build() {
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
+		--enable-orc \
 		--with-ffmpeg-extra-configure="--enable-pic --disable-mmx --disable-mmx2" || return 1
 	make || return 1
 }
@@ -36,5 +36,4 @@ package() {
 		| xargs rm -f
 }
 
-md5sums="0d23197ba7ac06ea34fa66d38469ebe5  gst-ffmpeg-0.10.11.tar.bz2
-154fa474ee135ff709bc76a761477da4  pic.patch"
+md5sums="7f5beacaf1312db2db30a026b36888c4  gst-ffmpeg-0.10.13.tar.bz2"
diff --git a/main/gst-ffmpeg/pic.patch b/main/gst-ffmpeg/pic.patch
deleted file mode 100644
index 3a7268e61..000000000
--- a/main/gst-ffmpeg/pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./gst-libs/ext/ffmpeg/libswscale/rgb2rgb.c.orig
-+++ ./gst-libs/ext/ffmpeg/libswscale/rgb2rgb.c
-@@ -159,7 +159,7 @@
- #define RENAME(a) a ## _C
- #include "rgb2rgb_template.c"
- 
--#if ARCH_X86
-+#if ARCH_X86 && !defined(PIC)
- 
- //MMX versions
- #undef RENAME
diff --git a/main/gst-plugins-ugly/APKBUILD b/main/gst-plugins-ugly/APKBUILD
index 5f62c1b0e..3cfb90ed6 100644
--- a/main/gst-plugins-ugly/APKBUILD
+++ b/main/gst-plugins-ugly/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gst-plugins-ugly
 pkgver=0.10.18
-pkgrel=3
+pkgrel=4
 pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
 url="http://gstreamer.freedesktop.org/"
 arch="all"
@@ -11,6 +11,7 @@ makedepends="pkgconfig lame-dev libmpeg2-dev a52dec-dev libid3tag-dev
 	libmad-dev glib-dev liboil-dev gstreamer-dev gst-plugins-base-dev
 	x264-dev libcdio-dev libid3tag-dev orc-dev"
 source="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.bz2"
+subpackages="$pkgname-lang"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index e428a0c0e..4d2b7dba9 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk+3.0
-pkgver=3.2.2
+pkgver=3.2.3
 pkgrel=0
 pkgdesc="The GTK+ Toolkit (v3)"
 url="http://www.gtk.org/"
@@ -42,7 +42,7 @@ makedepends="pkgconfig
 	pango-dev
 	tiff-dev
 	zlib-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.bz2"
+source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz"
 
 depends_dev="atk-dev pango-dev cairo-dev glib-dev intltool gdk-pixbuf-dev"
 
@@ -67,4 +67,4 @@ package() {
 	find "$pkgdir" -name *.la -delete
 }
 
-md5sums="afc3a739d6ff39d3b81cf69119833c46  gtk+-3.2.2.tar.bz2"
+md5sums="b4edcc69e39159dd7be17828249afb46  gtk+-3.2.3.tar.xz"
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 15fd8b5f2..9966e4462 100644
--- a/main/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imagemagick
-pkgver=6.7.3.7
+pkgver=6.7.4.0
 _pkgver=${pkgver%.*}-${pkgver##*.}
 pkgrel=0
 pkgdesc="A collection of tools and libraries for many image formats"
@@ -57,4 +57,4 @@ _cxx() {
 	mv "$pkgdir"/usr/lib/libMagick++.so.* "$subpkgdir"/usr/lib/
 }
 
-md5sums="6dce502c11ff4a61ab08c4cd38a8ebe2  ImageMagick-6.7.3-7.tar.gz"
+md5sums="9fb18164dd136fafea08e7e4124690a3  ImageMagick-6.7.4-0.tar.gz"
diff --git a/main/inkscape/APKBUILD b/main/inkscape/APKBUILD
index f20dd4298..23ac796be 100644
--- a/main/inkscape/APKBUILD
+++ b/main/inkscape/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=inkscape
 pkgver=0.48.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A vector-based drawing program - svg compliant"
 url="http://inkscape.sourceforge.net/"
 arch="all"
diff --git a/main/ipsec-tools/90-dead-on-initial-contact.patch b/main/ipsec-tools/90-dead-on-initial-contact.patch
new file mode 100644
index 000000000..9554ae3d3
--- /dev/null
+++ b/main/ipsec-tools/90-dead-on-initial-contact.patch
@@ -0,0 +1,11 @@
+--- a/src/racoon/isakmp_inf.c        15 Mar 2011 13:20:14 -0000      1.47
++++ b/src/racoon/isakmp_inf.c        10 Aug 2011 08:42:20 -0000
+@@ -1248,6 +1248,8 @@
+ 	if (f_local)
+ 		return 0;
+ 
++	script_hook(iph1, SCRIPT_PHASE1_DEAD);
++
+ #if 0
+ 	loc = racoon_strdup(saddrwop2str(iph1->local));
+ 	rem = racoon_strdup(saddrwop2str(iph1->remote));
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
index 99804bce5..9076efd53 100644
--- a/main/ipsec-tools/APKBUILD
+++ b/main/ipsec-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ipsec-tools
 pkgver=0.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc="User-space IPsec tools for various IPsec implementations"
 url="http://ipsec-tools.sourceforge.net/"
 arch="all"
@@ -16,6 +16,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	50-reverse-connect.patch
 	70-defer-isakmp-ident-handling.patch
 	75-racoonctl-rcvbuf.patch
+	90-dead-on-initial-contact.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -62,4 +63,5 @@ md5sums="c9a318cdbc0946f4e51464866d529739  ipsec-tools-0.8.0.tar.gz
 79b919ab23080f54dc3e7686877ca6bd  20-grekey-support.patch
 f97205eea3dc68d2437a2ad8720f4520  50-reverse-connect.patch
 94773c94233e14cdce0fa02ff780a43e  70-defer-isakmp-ident-handling.patch
-2d5d24c4a3684a38584f88720f71c7d6  75-racoonctl-rcvbuf.patch"
+2d5d24c4a3684a38584f88720f71c7d6  75-racoonctl-rcvbuf.patch
+1d0d8ef21c65138d40f902502412da9c  90-dead-on-initial-contact.patch"
diff --git a/main/ircservices/APKBUILD b/main/ircservices/APKBUILD
index dce26a4f9..2e3738249 100644
--- a/main/ircservices/APKBUILD
+++ b/main/ircservices/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ircservices
 pkgver=5.1.24
-pkgrel=0
+pkgrel=1
 pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)"
 url="http://www.ircservices.za.net/"
 arch="all"
@@ -55,7 +55,7 @@ package() {
 	# try conform to FHS
 	cd "$pkgdir"
 	install -d etc/ircservices usr/share/ircservices var/log/ircservices
-	
+
 	mv var/lib/ircservices/convert-db usr/bin/ircservices-convert-db
 
 	mv var/lib/ircservices/example-ircservices.conf \
@@ -78,10 +78,10 @@ package() {
 
 	chown ircservices:ircservices var/lib/ircservices \
 		var/log/ircservices
-	
+
 	chown root:ircservices etc/ircservices/ircservices.conf \
 		etc/ircservices/modules.conf
 }
 
 md5sums="d4f531537aeed230026cf5560f221ecb  ircservices-5.1.24.tar.gz
-279ea42c5d97b47787b5959c9981fbaa  ircservices.initd"
+6168b69dbce72d5f09f2c7437f1a540d  ircservices.initd"
diff --git a/main/ircservices/ircservices.initd b/main/ircservices/ircservices.initd
index 8c2a11e8b..2b0e9ff81 100644
--- a/main/ircservices/ircservices.initd
+++ b/main/ircservices/ircservices.initd
@@ -12,7 +12,7 @@ depend() {
 start() {
 	ebegin "Starting IRC Services"
 	start-stop-daemon --start --quiet --exec /usr/bin/ircservices \
-		--chuid ircservices \
+		--user ircservices \
 		-- \
 		-dir=/var/lib/ircservices \
 		-log=/var/log/ircservices/ircservices.log \
diff --git a/main/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD
deleted file mode 100644
index 882f81735..000000000
--- a/main/iscsitarget-grsec/APKBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-
-_flavor=${FLAVOR:-grsec}
-_realname=iscsitarget
-# source the kernel version
-if [ -f ../linux-$_flavor/APKBUILD ]; then
-	. ../linux-$_flavor/APKBUILD
-fi
-_kver=$pkgver
-_kernelver=$pkgver-r$pkgrel
-_abi_release=$pkgver-${_flavor}
-_kpkgrel=$pkgrel
-
-_iscsiver=1.4.20.2
-
-pkgname=${_realname}-${_flavor}
-pkgver=$_kver
-_mypkgrel=0
-pkgrel=$(($_kpkgrel + $_mypkgrel))
-pkgdesc="$_flavor kernel modules for iscsitarget $_iscsiver"
-url="http://iscsitarget.sourceforge.net/"
-arch=""
-license="GPL-2"
-depends="linux-${_flavor}=${_kernelver}"
-install=
-makedepends="linux-${_flavor}-dev=${_kernelver}"
-subpackages=
-source="http://downloads.sourceforge.net/$_realname/$_realname-$_iscsiver.tar.gz
-	iscsitarget-2.6.36.patch
-	iscsitarget-2.6.37.patch
-	iscsitarget-2.6.38.patch
-	"
-_ksrc=/usr/src/linux-headers-${_abi_release}
-
-prepare() {
-	cd "$srcdir"/$_realname-$_iscsiver
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$srcdir"/$_realname-$_iscsiver
-	unset ARCH
-	export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
-	make -j1 KSRC="$_ksrc" kernel || return 1
-}
-
-package() {
-	cd "$srcdir"/$_realname-$_iscsiver
-	make KSRC="$_ksrc" DESTDIR="$pkgdir" install-kernel || return 1
-}
-
-md5sums="2f23c0bfe124d79f5c20e34ef2aaff82  iscsitarget-1.4.20.2.tar.gz
-19f311cf41aff5f13b371ff38aa543df  iscsitarget-2.6.36.patch
-f29a9701fd2ba3e6e3c0c411ff0e6327  iscsitarget-2.6.37.patch
-26c42eeb23f5afd5f62dcd5aa3a639bd  iscsitarget-2.6.38.patch"
diff --git a/main/iscsitarget-grsec/iscsitarget-2.6.36.patch b/main/iscsitarget-grsec/iscsitarget-2.6.36.patch
deleted file mode 100644
index 43feb8997..000000000
--- a/main/iscsitarget-grsec/iscsitarget-2.6.36.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iscsitarget-1.4.20.2/kernel/conn.c
-+++ iscsitarget-1.4.20.2.mod/kernel/conn.c
-@@ -44,7 +44,7 @@
- 		switch (sk->sk_family) {
- 		case AF_INET:
- 			snprintf(buf, sizeof(buf),
--				 "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->inet_daddr));
-+				 "%pI4",inet_sk(sk)->inet_daddr);
- 			break;
- 		case AF_INET6:
- 			snprintf(buf, sizeof(buf), "[%pI6]",
diff --git a/main/iscsitarget-grsec/iscsitarget-2.6.37.patch b/main/iscsitarget-grsec/iscsitarget-2.6.37.patch
deleted file mode 100644
index 42c2e7ec4..000000000
--- a/main/iscsitarget-grsec/iscsitarget-2.6.37.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-diff --git a/kernel/config.c b/kernel/config.c
-index 87fa44b..672a1e3 100644
---- a/kernel/config.c
-+++ b/kernel/config.c
-@@ -9,7 +9,7 @@
- #include "iscsi.h"
- #include "iscsi_dbg.h"
-
--static DECLARE_MUTEX(ioctl_sem);
-+static DEFINE_MUTEX(ioctl_mutex);
-
- struct proc_entries {
- 	const char *name;
-@@ -258,7 +258,7 @@ static long ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- 	long err;
- 	u32 id;
-
--	err = down_interruptible(&ioctl_sem);
-+	err = mutex_lock_interruptible(&ioctl_mutex);
- 	if (err < 0)
- 		return err;
-
-@@ -339,7 +339,7 @@ static long ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-
- 	target_unlock(target);
- done:
--	up(&ioctl_sem);
-+	mutex_unlock(&ioctl_mutex);
-
- 	return err;
- }
-@@ -347,9 +347,9 @@ done:
- static int release(struct inode *i __attribute__((unused)),
- 		   struct file *f __attribute__((unused)))
- {
--	down(&ioctl_sem);
-+	mutex_lock(&ioctl_mutex);
- 	target_del_all();
--	up(&ioctl_sem);
-+	mutex_unlock(&ioctl_mutex);
-
- 	return 0;
- }
-diff --git a/kernel/iscsi.h b/kernel/iscsi.h
-index 9ded23a..f9076f2 100644
---- a/kernel/iscsi.h
-+++ b/kernel/iscsi.h
-@@ -8,7 +8,6 @@
- #ifndef __ISCSI_H__
- #define __ISCSI_H__
-
--#include <linux/blkdev.h>
- #include <linux/completion.h>
- #include <linux/pagemap.h>
- #include <linux/seq_file.h>
-@@ -94,8 +93,6 @@ struct worker_thread_info {
- 	struct list_head work_queue;
-
- 	wait_queue_head_t wthread_sleep;
--
--	struct io_context *wthread_ioc;
- };
-
- struct iscsi_cmnd;
-@@ -130,7 +127,7 @@ struct iscsi_target {
- 	/* Points either to own list or global pool */
- 	struct worker_thread_info * wthread_info;
-
--	struct semaphore target_sem;
-+	struct mutex target_mutex;
- };
-
- struct iscsi_queue {
-diff --git a/kernel/target.c b/kernel/target.c
-index 43326dc..2df633b 100644
---- a/kernel/target.c
-+++ b/kernel/target.c
-@@ -4,6 +4,8 @@
-  * Released under the terms of the GNU GPL v2.0.
-  */
-
-+#include <linux/mutex.h>
-+
- #include "iscsi.h"
- #include "digest.h"
- #include "iscsi_dbg.h"
-@@ -11,7 +13,7 @@
- #define	MAX_NR_TARGETS	(1UL << 30)
-
- static LIST_HEAD(target_list);
--static DECLARE_MUTEX(target_list_sem);
-+static DEFINE_MUTEX(target_list_mutex);
- static u32 next_target_id;
- static u32 nr_targets;
-
-@@ -48,16 +50,16 @@ inline int target_lock(struct iscsi_target *target, int interruptible)
- 	int err = 0;
-
- 	if (interruptible)
--		err = down_interruptible(&target->target_sem);
-+		err = mutex_lock_interruptible(&target->target_mutex);
- 	else
--		down(&target->target_sem);
-+		mutex_lock(&target->target_mutex);
-
- 	return err;
- }
-
- inline void target_unlock(struct iscsi_target *target)
- {
--	up(&target->target_sem);
-+	mutex_unlock(&target->target_mutex);
- }
-
- static struct iscsi_target *__target_lookup_by_id(u32 id)
-@@ -86,9 +88,9 @@ struct iscsi_target *target_lookup_by_id(u32 id)
- {
- 	struct iscsi_target *target;
-
--	down(&target_list_sem);
-+	mutex_lock(&target_list_mutex);
- 	target = __target_lookup_by_id(id);
--	up(&target_list_sem);
-+	mutex_unlock(&target_list_mutex);
-
- 	return target;
- }
-@@ -157,7 +159,7 @@ static int iscsi_target_create(struct target_info *info, u32 tid)
-
- 	strncpy(target->name, name, sizeof(target->name) - 1);
-
--	init_MUTEX(&target->target_sem);
-+	mutex_init(&target->target_mutex);
- 	spin_lock_init(&target->session_list_lock);
-
- 	INIT_LIST_HEAD(&target->session_list);
-@@ -195,7 +197,7 @@ int target_add(struct target_info *info)
- 	u32 tid = info->tid;
- 	int err;
-
--	err = down_interruptible(&target_list_sem);
-+	err = mutex_lock_interruptible(&target_list_mutex);
- 	if (err < 0)
- 		return err;
-
-@@ -204,7 +206,7 @@ int target_add(struct target_info *info)
- 		goto out;
- 	}
-
--	if (__target_lookup_by_name(info->name) || 
-+	if (__target_lookup_by_name(info->name) ||
- 			(tid && __target_lookup_by_id(tid))) {
- 		err = -EEXIST;
- 		goto out;
-@@ -223,7 +225,7 @@ int target_add(struct target_info *info)
- 	if (!err)
- 		nr_targets++;
- out:
--	up(&target_list_sem);
-+	mutex_unlock(&target_list_mutex);
-
- 	return err;
- }
-@@ -248,7 +250,7 @@ static void target_destroy(struct iscsi_target *target)
- 	module_put(THIS_MODULE);
- }
-
--/* @locking: target_list_sem must be locked */
-+/* @locking: target_list_mutex must be locked */
- static int __target_del(struct iscsi_target *target)
- {
- 	int err;
-@@ -283,7 +285,7 @@ int target_del(u32 id)
- 	struct iscsi_target *target;
- 	int err;
-
--	err = down_interruptible(&target_list_sem);
-+	err = mutex_lock_interruptible(&target_list_mutex);
- 	if (err < 0)
- 		return err;
-
-@@ -295,7 +297,7 @@ int target_del(u32 id)
-
- 	err = __target_del(target);
- out:
--	up(&target_list_sem);
-+	mutex_unlock(&target_list_mutex);
-
- 	return err;
- }
-@@ -305,7 +307,7 @@ void target_del_all(void)
- 	struct iscsi_target *target, *tmp;
- 	int err;
-
--	down(&target_list_sem);
-+	mutex_lock(&target_list_mutex);
-
- 	if (!list_empty(&target_list))
- 		iprintk("Removing all connections, sessions and targets\n");
-@@ -319,7 +321,7 @@ void target_del_all(void)
-
- 	next_target_id = 0;
-
--	up(&target_list_sem);
-+	mutex_unlock(&target_list_mutex);
- }
-
- static void *iet_seq_start(struct seq_file *m, loff_t *pos)
-@@ -327,7 +329,7 @@ static void *iet_seq_start(struct seq_file *m, loff_t *pos)
- 	int err;
-
- 	/* are you sure this is to be interruptible? */
--	err = down_interruptible(&target_list_sem);
-+	err = mutex_lock_interruptible(&target_list_mutex);
- 	if (err < 0)
- 		return ERR_PTR(err);
-
-@@ -341,7 +343,7 @@ static void *iet_seq_next(struct seq_file *m, void *v, loff_t *pos)
-
- static void iet_seq_stop(struct seq_file *m, void *v)
- {
--	up(&target_list_sem);
-+	mutex_unlock(&target_list_mutex);
- }
-
- static int iet_seq_show(struct seq_file *m, void *p)
-diff --git a/kernel/volume.c b/kernel/volume.c
-index 2c9a698..ecffa21 100644
---- a/kernel/volume.c
-+++ b/kernel/volume.c
-@@ -6,6 +6,7 @@
-
- #include <linux/types.h>
- #include <linux/parser.h>
-+#include <linux/blkdev.h>
-
- #include "iscsi.h"
- #include "iscsi_dbg.h"
-diff --git a/kernel/wthread.c b/kernel/wthread.c
-index 997a3d6..884c03a 100644
---- a/kernel/wthread.c
-+++ b/kernel/wthread.c
-@@ -67,15 +67,6 @@ static int worker_thread(void *arg)
- 	struct iscsi_conn *conn;
- 	DECLARE_WAITQUEUE(wait, current);
-
--	get_io_context(GFP_KERNEL, -1);
--
--	if (!current->io_context)
--		eprintk("%s\n", "Failed to get IO context");
--	else if (info->wthread_ioc)
--		copy_io_context(&current->io_context, &info->wthread_ioc);
--	else
--		info->wthread_ioc = current->io_context;
--
- 	add_wait_queue(&info->wthread_sleep, &wait);
-
- 	__set_current_state(TASK_RUNNING);
-@@ -100,16 +91,6 @@ static int worker_thread(void *arg)
-
- 	remove_wait_queue(&info->wthread_sleep, &wait);
-
--	if (current->io_context) {
--		struct io_context *ioc = current->io_context;
--
--		task_lock(current);
--		current->io_context = NULL;
--		task_unlock(current);
--
--		put_io_context(ioc);
--	}
--
- 	return 0;
- }
-
-@@ -160,7 +141,6 @@ int wthread_init(struct worker_thread_info *info)
- 	spin_lock_init(&info->wthread_lock);
-
- 	info->nr_running_wthreads = 0;
--	info->wthread_ioc = NULL;
-
- 	INIT_LIST_HEAD(&info->work_queue);
- 	INIT_LIST_HEAD(&info->wthread_list);
diff --git a/main/iscsitarget-grsec/iscsitarget-2.6.38.patch b/main/iscsitarget-grsec/iscsitarget-2.6.38.patch
deleted file mode 100644
index 90a5e5644..000000000
--- a/main/iscsitarget-grsec/iscsitarget-2.6.38.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./kernel/block-io.c.orig
-+++ ./kernel/block-io.c
-@@ -155,14 +155,14 @@
- {
- 	struct blockio_data *bio_data = volume->private;
- 	struct block_device *bdev;
--	int flags = FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE);
-+	int flags = FMODE_EXCL | FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE);
- 	int err = 0;
- 
- 	bio_data->path = kstrdup(path, GFP_KERNEL);
- 	if (!bio_data->path)
- 		return -ENOMEM;
- 
--	bdev = open_bdev_exclusive(path, flags, THIS_MODULE);
-+	bdev = blkdev_get_by_path(path, flags, THIS_MODULE);
- 	if (IS_ERR(bdev)) {
- 		err = PTR_ERR(bdev);
- 		eprintk("Can't open device %s, error %d\n", path, err);
-@@ -250,10 +250,10 @@
- blockio_detach(struct iet_volume *volume)
- {
- 	struct blockio_data *bio_data = volume->private;
--	int flags = FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE);
-+	int flags = FMODE_EXCL | FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE);
- 
- 	if (bio_data->bdev)
--		close_bdev_exclusive(bio_data->bdev, flags);
-+		blkdev_put(bio_data->bdev, flags);
- 	kfree(bio_data->path);
- 
- 	kfree(volume->private);
diff --git a/main/iscsitarget/APKBUILD b/main/iscsitarget/APKBUILD
deleted file mode 100644
index 99528f3f5..000000000
--- a/main/iscsitarget/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-
-pkgname=iscsitarget
-pkgver=1.4.20.2
-pkgrel=3
-pkgdesc="Open Source iSCSI target with professional features - userspace utils"
-url="http://iscsitarget.sourceforge.net/"
-arch="all"
-license="GPL-2"
-depends=
-makedepends="openssl-dev"
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	ietd.initd
-	ietd.confd
-	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in ../*.patch; do
-		[ -r "$i" ] || continue
-		msg "Applying $i"
-		patch -p1 < $i || return 1
-	done
-}
-
-build() {
-	cd "$_builddir"
-	make usr || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install-usr install-doc
-
-	for i in etc/ietd.conf etc/initiators.*; do
-		install -Dm640 $i "$pkgdir"/$i || return 1
-	done
-	install -Dm755 ../ietd.initd "$pkgdir"/etc/init.d/ietd
-	install -Dm755 ../ietd.confd "$pkgdir"/etc/conf.d/ietd
-}
-
-md5sums="2f23c0bfe124d79f5c20e34ef2aaff82  iscsitarget-1.4.20.2.tar.gz
-840621ee01a5736474ef343b4eb0fa9d  ietd.initd
-06ba479d3533d557b8582abe6f182410  ietd.confd"
diff --git a/main/iscsitarget/ietd.confd b/main/iscsitarget/ietd.confd
deleted file mode 100644
index 3621326b1..000000000
--- a/main/iscsitarget/ietd.confd
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/files/ietd-conf.d,v 1.1 2006/02/20 08:33:40 robbat2 Exp $
-
-# Address and port to listen on for connections.
-#ADDRESS="" # set this to non-empty to listen somewhere specific
-PORT=3260
-
-# Address of your SNS server
-# if available
-#ISNS=""
-
-# User and group to run as
-# You must ensure that the UID/GID have access to the files/devices you
-# have provided in your configuration.
-USER="root"
-GROUP="root"
-
-# Debug level - see ietd(8) for the levels
-#DEBUGLEVEL=
-
-# This setting disables the memory configuration warnings.
-# Upstream takes the general policy of forcing all of the memory settings that
-# they want, but that doesn't mesh with users that have it set higher.
-# Gentoo by default ignores the settings that are higher, but issues warnings
-# on those that are lower.
-# Uncomment the next line to disable those warnings.
-#DISABLE_MEMORY_WARNINGS=1
-
-# vim: filetype=gentoo-conf-d tw=72:
diff --git a/main/iscsitarget/ietd.initd b/main/iscsitarget/ietd.initd
deleted file mode 100644
index ac315609e..000000000
--- a/main/iscsitarget/ietd.initd
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/files/ietd-init.d-2,v 1.1 2008/07/18 16:03:38 flameeyes Exp $
-
-MEM_SIZE=1048576
-DAEMON=/usr/sbin/ietd
-CONFIG_FILE=/etc/ietd.conf
-PID_FILE=/var/run/iscsi_trgt.pid
-NAME="iSCSI Enterprise Target"
-
-ARGS=""
-[ -n "$USER" ] && ARGS="${ARGS} --uid=${USER}"
-[ -n "$GROUP" ] && ARGS="${ARGS} --gid=${GROUP}"
-[ -n "$ISNS" ] && ARGS="${ARGS} --isns=${ISNS}"
-[ -n "$PORT" ] && ARGS="${ARGS} --port=${PORT}"
-[ -n "$ADDRESS" ] && ARGS="${ARGS} --address=${ADDRESS}"
-[ -n "$DEBUGLEVEL" ] && ARGS="${ARGS} --debug=${DEBUGLEVEL}"
-
-depend() {
-	use net
-	after firewall modules
-}
-
-checkconfig() {
-	if [ ! -f $CONFIG_FILE ]; then
-		eerror "Config file $CONFIG_FILE does not exist!"
-		return 1
-	fi
-	if [ -z "$DISABLE_MEMORY_WARNINGS" ]; then
-		check_memsize
-	fi
-}
-
-check_memsize() {
-	local wr md sysctl_key v k
-	for wr in r w; do
-		for md in max default; do
-			sysctl_key="net.core.${wr}mem_${md}"
-			v="$(sysctl -n ${sysctl_key})"
-			if [ "${v}" -lt "${MEM_SIZE}" ]; then
-				ewarn "$sysctl_key ($v) is lower than recommended ${MEM_SIZE}"
-			fi
-		done
-	done
-	for wr in "" r w; do
-		sysctl_key="net.ipv4.tcp_${wr}mem"
-		set -- $(sysctl -n ${sysctl_key})
-		for k in min default max ; do
-			if [ "${1}" -lt "${MEM_SIZE}" ]; then
-				ewarn "$sysctl_key:$k (${1}) is lower than recommended ${MEM_SIZE}"
-			fi
-			shift
-		done
-	done
-}
-
-do_modules() {
-	msg="$1"
-	shift
-	modules="$1"
-	shift
-	opts="$@"
-	for m in ${modules}; do
-		ebegin "${msg} - ${m}"
-		modprobe ${opts} $m
-		ret=$?
-		eend $ret
-		[ $ret -ne 0 ] && return $ret
-	done
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	do_modules 'Loading iSCSI-Target modules' 'iscsi_trgt'
-	ebegin "Starting ${NAME}"
-	start-stop-daemon --start --exec $DAEMON --quiet -- ${ARGS}
-	eend $?
-}
-
-stop() {
-	ebegin "Removing ${NAME} devices"
-	# ugly, but ietadm does not allways provides correct exit values
-	RETURN="$(ietadm --op delete 2>&1)"
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ] && [ "$RETURN" != "something wrong" ] ; then
-		eend 0
-	else
-		eend 1
-		eerror "ietadm failed - $RETURN"
-		return 1
-	fi
-
-	ebegin "Stopping ${NAME}"
-	start-stop-daemon --stop --quiet --exec $DAEMON --pidfile $PID_FILE
-	ret=$?
-	eend $ret
-	[ $ret -ne 0 ] && return 1
-
-	# ugly, but pid file is not removed by ietd
-	rm -f $PID_FILE
-	# do_modules 'Removing iSCSI-Target modules' 'iscsi_trgt' '-r'
-	return $?
-}
-
-# vim: tw=72:
diff --git a/main/jasper/APKBUILD b/main/jasper/APKBUILD
index ff083e756..915c9d608 100644
--- a/main/jasper/APKBUILD
+++ b/main/jasper/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=jasper
 pkgver=1.900.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
 url="http://www.ece.uvic.ca/~mdadams/jasper/"
 arch="all"
@@ -10,12 +10,21 @@ depends=  #"libjpeg>=8 freeglut libxi libxmu mesa"
 makedepends="jpeg-dev>=8"
 subpackages="$pkgname-dev $pkgname-doc libjasper"
 source="http://www.ece.uvic.ca/~mdadams/$pkgname/software/$pkgname-$pkgver.zip
-	jpc_dec.c.patch"
+	jpc_dec.c.patch
+	libjasper-stepsizes-overflow.patch
+	jasper-1.900.1-CVE-2008-3520.patch
+	jasper-1.900.1-CVE-2008-3522.patch
+	jasper-1.900.1-bnc725758.patch
+	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
-	patch -Np1 < "$srcdir"/jpc_dec.c.patch || return 1
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -Np1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
 	chmod +x configure
 }
 
@@ -43,4 +52,8 @@ libjasper() {
 }
 
 md5sums="a342b2b4495b3e1394e161eb5d85d754  jasper-1.900.1.zip
-36de7128eea6f701c1e2e13ce5bd8d37  jpc_dec.c.patch"
+36de7128eea6f701c1e2e13ce5bd8d37  jpc_dec.c.patch
+24785d8eb3eea19eec7e77d59f3e6a25  libjasper-stepsizes-overflow.patch
+911bb13529483c093d12c15eed4e9243  jasper-1.900.1-CVE-2008-3520.patch
+ed441f30c4231f319d9ff77d86db2ef9  jasper-1.900.1-CVE-2008-3522.patch
+eaf73536f989e629a8c06533e4e6fad5  jasper-1.900.1-bnc725758.patch"
diff --git a/main/jasper/jasper-1.900.1-CVE-2008-3520.patch b/main/jasper/jasper-1.900.1-CVE-2008-3520.patch
new file mode 100644
index 000000000..0f5e3b746
--- /dev/null
+++ b/main/jasper/jasper-1.900.1-CVE-2008-3520.patch
@@ -0,0 +1,928 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520
+
+OpenBSD jas_malloc hardening patches
+
+diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c
+--- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c	2007-01-19 22:43:05.000000000 +0100
++++ jasper-1.900.1/src/libjasper/base/jas_cm.c	2009-10-22 10:27:45.000000000 +0200
+@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm
+ {
+ 	jas_cmpxform_t **p;
+ 	assert(n >= pxformseq->numpxforms);
+-	p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) :
+-	  jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *));
++	p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *));
+ 	if (!p) {
+ 		return -1;
+ 	}
+@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh
+ 	jas_cmshapmatlut_cleanup(lut);
+ 	if (curv->numents == 0) {
+ 		lut->size = 2;
+-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
++		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
+ 			goto error;
+ 		lut->data[0] = 0.0;
+ 		lut->data[1] = 1.0;
+ 	} else if (curv->numents == 1) {
+ 		lut->size = 256;
+-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
++		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
+ 			goto error;
+ 		gamma = curv->ents[0] / 256.0;
+ 		for (i = 0; i < lut->size; ++i) {
+@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh
+ 		}
+ 	} else {
+ 		lut->size = curv->numents;
+-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
++		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
+ 			goto error;
+ 		for (i = 0; i < lut->size; ++i) {
+ 			lut->data[i] = curv->ents[i] / 65535.0;
+@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c
+ 			return -1;
+ 		}
+ 	}
+-	if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t))))
++	if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t))))
+ 		return -1;
+ 	invlut->size = n;
+ 	for (i = 0; i < invlut->size; ++i) {
+diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c
+--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c	2007-01-19 22:43:05.000000000 +0100
++++ jasper-1.900.1/src/libjasper/base/jas_icc.c	2009-10-22 10:27:45.000000000 +0200
+@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof
+ 	jas_icctagtab_t *tagtab;
+ 
+ 	tagtab = &prof->tagtab;
+-	if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs *
++	if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs,
+ 	  sizeof(jas_icctagtabent_t))))
+ 		goto error;
+ 	tagtab->numents = prof->attrtab->numattrs;
+@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str
+ 	}
+ 	if (jas_iccgetuint32(in, &tagtab->numents))
+ 		goto error;
+-	if (!(tagtab->ents = jas_malloc(tagtab->numents *
++	if (!(tagtab->ents = jas_alloc2(tagtab->numents,
+ 	  sizeof(jas_icctagtabent_t))))
+ 		goto error;
+ 	tagtabent = tagtab->ents;
+@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc
+ {
+ 	jas_iccattr_t *newattrs;
+ 	assert(maxents >= tab->numattrs);
+-	newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents *
+-	  sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t));
++	newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t));
+ 	if (!newattrs)
+ 		return -1;
+ 	tab->attrs = newattrs;
+@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr
+ 
+ 	if (jas_iccgetuint32(in, &curv->numents))
+ 		goto error;
+-	if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t))))
++	if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t))))
+ 		goto error;
+ 	for (i = 0; i < curv->numents; ++i) {
+ 		if (jas_iccgetuint16(in, &curv->ents[i]))
+@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca
+ 	if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
+ 	  jas_iccgetuint32(in, &txtdesc->uclen))
+ 		goto error;
+-	if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2)))
++	if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2)))
+ 		goto error;
+ 	if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
+ 	  JAS_CAST(int, txtdesc->uclen * 2))
+@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr
+ 	  jas_iccgetuint16(in, &lut8->numouttabents))
+ 		goto error;
+ 	clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
+-	if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) ||
+-	  !(lut8->intabsbuf = jas_malloc(lut8->numinchans *
+-	  lut8->numintabents * sizeof(jas_iccuint8_t))) ||
+-	  !(lut8->intabs = jas_malloc(lut8->numinchans *
++	if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) ||
++	  !(lut8->intabsbuf = jas_alloc3(lut8->numinchans,
++	  lut8->numintabents, sizeof(jas_iccuint8_t))) ||
++	  !(lut8->intabs = jas_alloc2(lut8->numinchans,
+ 	  sizeof(jas_iccuint8_t *))))
+ 		goto error;
+ 	for (i = 0; i < lut8->numinchans; ++i)
+ 		lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents];
+-	if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans *
+-	  lut8->numouttabents * sizeof(jas_iccuint8_t))) ||
+-	  !(lut8->outtabs = jas_malloc(lut8->numoutchans *
++	if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans,
++	  lut8->numouttabents, sizeof(jas_iccuint8_t))) ||
++	  !(lut8->outtabs = jas_alloc2(lut8->numoutchans,
+ 	  sizeof(jas_iccuint8_t *))))
+ 		goto error;
+ 	for (i = 0; i < lut8->numoutchans; ++i)
+@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt
+ 	  jas_iccgetuint16(in, &lut16->numouttabents))
+ 		goto error;
+ 	clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
+-	if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) ||
+-	  !(lut16->intabsbuf = jas_malloc(lut16->numinchans *
+-	  lut16->numintabents * sizeof(jas_iccuint16_t))) ||
+-	  !(lut16->intabs = jas_malloc(lut16->numinchans *
++	if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) ||
++	  !(lut16->intabsbuf = jas_alloc3(lut16->numinchans,
++	  lut16->numintabents, sizeof(jas_iccuint16_t))) ||
++	  !(lut16->intabs = jas_alloc2(lut16->numinchans,
+ 	  sizeof(jas_iccuint16_t *))))
+ 		goto error;
+ 	for (i = 0; i < lut16->numinchans; ++i)
+ 		lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents];
+-	if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans *
+-	  lut16->numouttabents * sizeof(jas_iccuint16_t))) ||
+-	  !(lut16->outtabs = jas_malloc(lut16->numoutchans *
++	if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans,
++	  lut16->numouttabents, sizeof(jas_iccuint16_t))) ||
++	  !(lut16->outtabs = jas_alloc2(lut16->numoutchans,
+ 	  sizeof(jas_iccuint16_t *))))
+ 		goto error;
+ 	for (i = 0; i < lut16->numoutchans; ++i)
+diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c
+--- jasper-1.900.1.orig/src/libjasper/base/jas_image.c	2007-01-19 22:43:05.000000000 +0100
++++ jasper-1.900.1/src/libjasper/base/jas_image.c	2009-10-22 10:27:45.000000000 +0200
+@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp
+ 	image->inmem_ = true;
+ 
+ 	/* Allocate memory for the per-component information. */
+-	if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
++	if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_,
+ 	  sizeof(jas_image_cmpt_t *)))) {
+ 		jas_image_destroy(image);
+ 		return 0;
+@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image
+ 	jas_image_cmpt_t **newcmpts;
+ 	int cmptno;
+ 
+-	newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
+-	  jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
++	newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *));
+ 	if (!newcmpts) {
+ 		return -1;
+ 	}
+diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c
+--- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c	2007-01-19 22:43:05.000000000 +0100
++++ jasper-1.900.1/src/libjasper/base/jas_malloc.c	2009-10-22 10:27:45.000000000 +0200
+@@ -76,6 +76,9 @@
+ 
+ /* We need the prototype for memset. */
+ #include <string.h>
++#include <limits.h>
++#include <errno.h>
++#include <stdint.h>
+ 
+ #include "jasper/jas_malloc.h"
+ 
+@@ -113,18 +116,50 @@ void jas_free(void *ptr)
+ 
+ void *jas_realloc(void *ptr, size_t size)
+ {
+-	return realloc(ptr, size);
++	return ptr ? realloc(ptr, size) : malloc(size);
+ }
+ 
+-void *jas_calloc(size_t nmemb, size_t size)
++void *jas_realloc2(void *ptr, size_t nmemb, size_t size)
++{
++	if (!ptr)
++		return jas_alloc2(nmemb, size);
++	if (nmemb && SIZE_MAX / nmemb < size) {
++		errno = ENOMEM;
++		return NULL;
++	}
++	return jas_realloc(ptr, nmemb * size);
++
++}
++
++void *jas_alloc2(size_t nmemb, size_t size)
++{
++	if (nmemb && SIZE_MAX / nmemb < size) {
++		errno = ENOMEM;
++		return NULL;
++	}
++
++	return jas_malloc(nmemb * size);
++}
++
++void *jas_alloc3(size_t a, size_t b, size_t c)
+ {
+-	void *ptr;
+ 	size_t n;
+-	n = nmemb * size;
+-	if (!(ptr = jas_malloc(n * sizeof(char)))) {
+-		return 0;
++
++	if (a && SIZE_MAX / a < b) {
++		errno = ENOMEM;
++		return NULL;
+ 	}
+-	memset(ptr, 0, n);
++
++	return jas_alloc2(a*b, c);
++}
++
++void *jas_calloc(size_t nmemb, size_t size)
++{
++	void *ptr;
++
++	ptr = jas_alloc2(nmemb, size);
++	if (ptr)
++		memset(ptr, 0, nmemb*size);
+ 	return ptr;
+ }
+ 
+diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c
+--- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c	2007-01-19 22:43:05.000000000 +0100
++++ jasper-1.900.1/src/libjasper/base/jas_seq.c	2009-10-22 10:27:45.000000000 +0200
+@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr
+ 	matrix->datasize_ = numrows * numcols;
+ 
+ 	if (matrix->maxrows_ > 0) {
+-		if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
++		if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_,
+ 		  sizeof(jas_seqent_t *)))) {
+ 			jas_matrix_destroy(matrix);
+ 			return 0;
+@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr
+ 	}
+ 
+ 	if (matrix->datasize_ > 0) {
+-		if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
++		if (!(matrix->data_ = jas_alloc2(matrix->datasize_,
+ 		  sizeof(jas_seqent_t)))) {
+ 			jas_matrix_destroy(matrix);
+ 			return 0;
+@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma
+ 	mat0->numrows_ = r1 - r0 + 1;
+ 	mat0->numcols_ = c1 - c0 + 1;
+ 	mat0->maxrows_ = mat0->numrows_;
+-	mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
++	mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *));
+ 	for (i = 0; i < mat0->numrows_; ++i) {
+ 		mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
+ 	}
+diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
+--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2007-01-19 22:43:05.000000000 +0100
++++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
+@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b
+ 	if (buf) {
+ 		obj->buf_ = (unsigned char *) buf;
+ 	} else {
+-		obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char));
++		obj->buf_ = jas_malloc(obj->bufsize_);
+ 		obj->myalloc_ = 1;
+ 	}
+ 	if (!obj->buf_) {
+@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_
+ 	unsigned char *buf;
+ 
+ 	assert(m->buf_);
+-	if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) {
++	if (!(buf = jas_realloc(m->buf_, bufsize))) {
+ 		return -1;
+ 	}
+ 	m->buf_ = buf;
+diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c
+--- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c	2009-10-22 10:27:45.000000000 +0200
+@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea
+ 	}
+ 
+ 	if (info->numcolors > 0) {
+-		if (!(info->palents = jas_malloc(info->numcolors *
++		if (!(info->palents = jas_alloc2(info->numcolors,
+ 		  sizeof(bmp_palent_t)))) {
+ 			bmp_info_destroy(info);
+ 			return 0;
+diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h
+--- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h	2007-01-19 22:43:04.000000000 +0100
++++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h	2009-10-22 10:27:45.000000000 +0200
+@@ -95,6 +95,9 @@ extern "C" {
+ #define	jas_free	MEMFREE
+ #define	jas_realloc	MEMREALLOC
+ #define	jas_calloc	MEMCALLOC
++#define jas_alloc2(a, b)	MEMALLOC((a)*(b))
++#define jas_alloc3(a, b, c)	MEMALLOC((a)*(b)*(c))
++#define jas_realloc2(p, a, b)	MEMREALLOC((p), (a)*(b))
+ #endif
+ 
+ /******************************************************************************\
+@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size
+ /* Allocate a block of memory and initialize the contents to zero. */
+ void *jas_calloc(size_t nmemb, size_t size);
+ 
++/* size-checked double allocation .*/
++void *jas_alloc2(size_t, size_t);
++
++void *jas_alloc3(size_t, size_t, size_t);
++
++void *jas_realloc2(void *, size_t, size_t);
+ #endif
+ 
+ #ifdef __cplusplus
+diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
+--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c	2007-01-19 22:43:05.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c	2009-10-22 10:30:24.000000000 +0200
+@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
+ 	box = 0;
+ 	tmpstream = 0;
+ 
+-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
++	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
+ 		goto error;
+ 	}
+ 	box->ops = &jp2_boxinfo_unk.ops;
+@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b
+ 	jp2_bpcc_t *bpcc = &box->data.bpcc;
+ 	unsigned int i;
+ 	bpcc->numcmpts = box->datalen;
+-	if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
++	if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
+ 		return -1;
+ 	}
+ 	for (i = 0; i < bpcc->numcmpts; ++i) {
+@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b
+ 		break;
+ 	case JP2_COLR_ICC:
+ 		colr->iccplen = box->datalen - 3;
+-		if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
++		if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) {
+ 			return -1;
+ 		}
+ 		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
+@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b
+ 	if (jp2_getuint16(in, &cdef->numchans)) {
+ 		return -1;
+ 	}
+-	if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
++	if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) {
+ 		return -1;
+ 	}
+ 	for (channo = 0; channo < cdef->numchans; ++channo) {
+@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b
+ 	unsigned int i;
+ 
+ 	cmap->numchans = (box->datalen) / 4;
+-	if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
++	if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
+ 		return -1;
+ 	}
+ 	for (i = 0; i < cmap->numchans; ++i) {
+@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b
+ 		return -1;
+ 	}
+ 	lutsize = pclr->numlutents * pclr->numchans;
+-	if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
++	if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) {
+ 		return -1;
+ 	}
+-	if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
++	if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) {
+ 		return -1;
+ 	}
+ 	for (i = 0; i < pclr->numchans; ++i) {
+diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
+--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2007-01-19 22:43:05.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2009-10-22 10:27:45.000000000 +0200
+@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
+ 	}
+ 
+ 	/* Allocate space for the channel-number to component-number LUT. */
+-	if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) {
++	if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) {
+ 		jas_eprintf("error: no memory\n");
+ 		goto error;
+ 	}
+@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
+ 			if (cmapent->map == JP2_CMAP_DIRECT) {
+ 				dec->chantocmptlut[channo] = channo;
+ 			} else if (cmapent->map == JP2_CMAP_PALETTE) {
+-				lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t));
++				lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t));
+ 				for (i = 0; i < pclrd->numlutents; ++i) {
+ 					lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
+ 				}
+diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c
+--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c	2007-01-19 22:43:05.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c	2009-10-22 10:27:45.000000000 +0200
+@@ -191,7 +191,7 @@ int sgnd;
+ 		}
+ 		bpcc = &box->data.bpcc;
+ 		bpcc->numcmpts = jas_image_numcmpts(image);
+-		if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
++		if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts,
+ 		  sizeof(uint_fast8_t)))) {
+ 			goto error;
+ 		}
+@@ -285,7 +285,7 @@ int sgnd;
+ 		}
+ 		cdef = &box->data.cdef;
+ 		cdef->numchans = jas_image_numcmpts(image);
+-		cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
++		cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t));
+ 		for (i = 0; i < jas_image_numcmpts(image); ++i) {
+ 			cdefchanent = &cdef->ents[i];
+ 			cdefchanent->channo = i;
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2009-10-22 09:58:16.000000000 +0200
++++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2009-10-22 10:27:45.000000000 +0200
+@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms
+ 	  !siz->tileheight || !siz->numcomps) {
+ 		return -1;
+ 	}
+-	if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) {
++	if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) {
+ 		return -1;
+ 	}
+ 	for (i = 0; i < siz->numcomps; ++i) {
+@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc
+ 		jpc_qcx_destroycompparms(compparms);
+                 return -1;
+         } else if (compparms->numstepsizes > 0) {
+-		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
++		compparms->stepsizes = jas_alloc2(compparms->numstepsizes,
+ 		  sizeof(uint_fast16_t));
+ 		assert(compparms->stepsizes);
+ 		for (i = 0; i < compparms->numstepsizes; ++i) {
+@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms
+ 
+ 	ppm->len = ms->len - 1;
+ 	if (ppm->len > 0) {
+-		if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) {
++		if (!(ppm->data = jas_malloc(ppm->len))) {
+ 			goto error;
+ 		}
+ 		if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
+@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms
+ 	}
+ 	ppt->len = ms->len - 1;
+ 	if (ppt->len > 0) {
+-		if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) {
++		if (!(ppt->data = jas_malloc(ppt->len))) {
+ 			goto error;
+ 		}
+ 		if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
+@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms
+ 	uint_fast8_t tmp;
+ 	poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
+ 	  (ms->len / 7);
+-	if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) {
++	if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) {
+ 		goto error;
+ 	}
+ 	for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
+@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
+ 	jpc_crgcomp_t *comp;
+ 	uint_fast16_t compno;
+ 	crg->numcomps = cstate->numcomps;
+-	if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) {
++	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
+ 		return -1;
+ 	}
+ 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
+@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms
+ 	cstate = 0;
+ 
+ 	if (ms->len > 0) {
+-		if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) {
++		if (!(unk->data = jas_malloc(ms->len))) {
+ 			return -1;
+ 		}
+ 		if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c	2009-10-22 09:58:16.000000000 +0200
++++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2009-10-22 10:30:50.000000000 +0200
+@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t
+ 
+ 	if (dec->state == JPC_MH) {
+ 
+-		compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t));
++		compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t));
+ 		assert(compinfos);
+ 		for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
+ 		  cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
+@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d
+ 			tile->realmode = 1;
+ 		}
+ 		tcomp->numrlvls = ccp->numrlvls;
+-		if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls *
++		if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls,
+ 		  sizeof(jpc_dec_rlvl_t)))) {
+ 			return -1;
+ 		}
+@@ -764,7 +764,7 @@ rlvl->bands = 0;
+ 			  rlvl->cbgheightexpn);
+ 
+ 			rlvl->numbands = (!rlvlno) ? 1 : 3;
+-			if (!(rlvl->bands = jas_malloc(rlvl->numbands *
++			if (!(rlvl->bands = jas_alloc2(rlvl->numbands,
+ 			  sizeof(jpc_dec_band_t)))) {
+ 				return -1;
+ 			}
+@@ -797,7 +797,7 @@ rlvl->bands = 0;
+ 
+ 				assert(rlvl->numprcs);
+ 
+-				if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) {
++				if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) {
+ 					return -1;
+ 				}
+ 
+@@ -834,7 +834,7 @@ rlvl->bands = 0;
+ 			if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
+ 				return -1;
+ 			}
+-			if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) {
++			if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) {
+ 				return -1;
+ 			}
+ 
+@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t
+ 		return -1;
+ 	}
+ 
+-	if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) {
++	if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) {
+ 		return -1;
+ 	}
+ 
+@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t
+ 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
+ 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
+ 	dec->numtiles = dec->numhtiles * dec->numvtiles;
+-	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
++	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
+ 		return -1;
+ 	}
+ 
+@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t
+ 		tile->pkthdrstreampos = 0;
+ 		tile->pptstab = 0;
+ 		tile->cp = 0;
+-		if (!(tile->tcomps = jas_malloc(dec->numcomps *
++		if (!(tile->tcomps = jas_calloc(dec->numcomps,
+ 		  sizeof(jpc_dec_tcomp_t)))) {
+ 			return -1;
+ 		}
+@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u
+ 	cp->numlyrs = 0;
+ 	cp->mctid = 0;
+ 	cp->csty = 0;
+-	if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) {
++	if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) {
+ 		return 0;
+ 	}
+ 	if (!(cp->pchglist = jpc_pchglist_create())) {
+@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create(
+ 	}
+ 	streamlist->numstreams = 0;
+ 	streamlist->maxstreams = 100;
+-	if (!(streamlist->streams = jas_malloc(streamlist->maxstreams *
++	if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams,
+ 	  sizeof(jas_stream_t *)))) {
+ 		jas_free(streamlist);
+ 		return 0;
+@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist
+ 	/* Grow the array of streams if necessary. */
+ 	if (streamlist->numstreams >= streamlist->maxstreams) {
+ 		newmaxstreams = streamlist->maxstreams + 1024;
+-		if (!(newstreams = jas_realloc(streamlist->streams,
+-		  (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) {
++		if (!(newstreams = jas_realloc2(streamlist->streams,
++		  (newmaxstreams + 1024), sizeof(jas_stream_t *)))) {
+ 			return -1;
+ 		}
+ 		for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
+@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab,
+ {
+ 	jpc_ppxstabent_t **newents;
+ 	if (tab->maxents < maxents) {
+-		newents = (tab->ents) ? jas_realloc(tab->ents, maxents *
+-		  sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *));
++		newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *));
+ 		if (!newents) {
+ 			return -1;
+ 		}
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c	2009-10-22 10:27:45.000000000 +0200
+@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt
+ 		vsteplcm *= jas_image_cmptvstep(image, cmptno);
+ 	}
+ 
+-	if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) {
++	if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) {
+ 		goto error;
+ 	}
+ 	for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
+@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt
+ 
+ 	if (ilyrrates && numilyrrates > 0) {
+ 		tcp->numlyrs = numilyrrates + 1;
+-		if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) *
++		if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1),
+ 		  sizeof(jpc_fix_t)))) {
+ 			goto error;
+ 		}
+@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou
+ 	siz->tilewidth = cp->tilewidth;
+ 	siz->tileheight = cp->tileheight;
+ 	siz->numcomps = cp->numcmpts;
+-	siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t));
++	siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t));
+ 	assert(siz->comps);
+ 	for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
+ 		siz->comps[i].prec = cp->ccps[i].prec;
+@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou
+ 		return -1;
+ 	}
+ 	crg = &enc->mrk->parms.crg;
+-	crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t));
++	crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t));
+ 	if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
+ 		jas_eprintf("cannot write CRG marker\n");
+ 		return -1;
+@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
+ 	tile->mctid = cp->tcp.mctid;
+ 
+ 	tile->numlyrs = cp->tcp.numlyrs;
+-	if (!(tile->lyrsizes = jas_malloc(tile->numlyrs *
++	if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs,
+ 	  sizeof(uint_fast32_t)))) {
+ 		goto error;
+ 	}
+@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
+ 	}
+ 
+ 	/* Allocate an array for the per-tile-component information. */
+-	if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) {
++	if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) {
+ 		goto error;
+ 	}
+ 	/* Initialize a few members critical for error recovery. */
+@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc
+ 	  jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
+ 	  jas_seq2d_yend(tcmpt->data), bandinfos);
+ 
+-	if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) {
++	if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) {
+ 		goto error;
+ 	}
+ 	for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
+@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e
+ 	rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
+ 	rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
+ 
+-	if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) {
++	if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) {
+ 		goto error;
+ 	}
+ 	for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
+@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend &
+ 	band->synweight = bandinfo->synenergywt;
+ 
+ if (band->data) {
+-	if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) {
++	if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) {
+ 		goto error;
+ 	}
+ 	for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
+@@ -2422,7 +2422,7 @@ if (!rlvlno) {
+ 			goto error;
+ 		}
+ 
+-		if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) {
++		if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) {
+ 			goto error;
+ 		}
+ 		for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c	2009-10-22 10:27:45.000000000 +0200
+@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx
+ 	mqdec->in = in;
+ 	mqdec->maxctxs = maxctxs;
+ 	/* Allocate memory for the per-context state information. */
+-	if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) {
++	if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) {
+ 		goto error;
+ 	}
+ 	/* Set the current context to the first context. */
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c	2009-10-22 10:27:45.000000000 +0200
+@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx
+ 	mqenc->maxctxs = maxctxs;
+ 
+ 	/* Allocate memory for the per-context state information. */
+-	if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) {
++	if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) {
+ 		goto error;
+ 	}
+ 
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c	2009-10-22 10:27:45.000000000 +0200
+@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
+ #if !defined(HAVE_VLA)
+ 	/* Get a buffer. */
+ 	if (bufsize > QMFB_SPLITBUFSIZE) {
+-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
++		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
+ 			/* We have no choice but to commit suicide in this case. */
+ 			abort();
+ 		}
+@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
+ #if !defined(HAVE_VLA)
+ 	/* Get a buffer. */
+ 	if (bufsize > QMFB_SPLITBUFSIZE) {
+-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
++		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
+ 			/* We have no choice but to commit suicide in this case. */
+ 			abort();
+ 		}
+@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
+ #if !defined(HAVE_VLA)
+ 	/* Get a buffer. */
+ 	if (bufsize > QMFB_SPLITBUFSIZE) {
+-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
++		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
+ 			/* We have no choice but to commit suicide in this case. */
+ 			abort();
+ 		}
+@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
+ #if !defined(HAVE_VLA)
+ 	/* Get a buffer. */
+ 	if (bufsize > QMFB_SPLITBUFSIZE) {
+-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
++		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
+ 			/* We have no choice but to commit suicide in this case. */
+ 			abort();
+ 		}
+@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
+ #if !defined(HAVE_VLA)
+ 	/* Allocate memory for the join buffer from the heap. */
+ 	if (bufsize > QMFB_JOINBUFSIZE) {
+-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
++		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
+ 			/* We have no choice but to commit suicide. */
+ 			abort();
+ 		}
+@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
+ #if !defined(HAVE_VLA)
+ 	/* Allocate memory for the join buffer from the heap. */
+ 	if (bufsize > QMFB_JOINBUFSIZE) {
+-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
++		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
+ 			/* We have no choice but to commit suicide. */
+ 			abort();
+ 		}
+@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, 
+ #if !defined(HAVE_VLA)
+ 	/* Allocate memory for the join buffer from the heap. */
+ 	if (bufsize > QMFB_JOINBUFSIZE) {
+-		if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
++		if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
+ 			/* We have no choice but to commit suicide. */
+ 			abort();
+ 		}
+@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, 
+ #if !defined(HAVE_VLA)
+ 	/* Allocate memory for the join buffer from the heap. */
+ 	if (bufsize > QMFB_JOINBUFSIZE) {
+-		if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
++		if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
+ 			/* We have no choice but to commit suicide. */
+ 			abort();
+ 		}
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c	2009-10-22 10:27:45.000000000 +0200
+@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_
+ 
+ 	cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
+ 	if (cblk->numpasses > 0) {
+-		cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t));
++		cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t));
+ 		assert(cblk->passes);
+ 	} else {
+ 		cblk->passes = 0;
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2009-10-22 10:27:45.000000000 +0200
+@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t *
+ 	}
+ 	if (pchglist->numpchgs >= pchglist->maxpchgs) {
+ 		newmaxpchgs = pchglist->maxpchgs + 128;
+-		if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) {
++		if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) {
+ 			return -1;
+ 		}
+ 		pchglist->maxpchgs = newmaxpchgs;
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c	2009-10-22 10:27:45.000000000 +0200
+@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
+ 		return 0;
+ 	}
+ 	pi->numcomps = dec->numcomps;
+-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
++	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
+ 		jpc_pi_destroy(pi);
+ 		return 0;
+ 	}
+@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
+ 	for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
+ 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
+ 		picomp->numrlvls = tcomp->numrlvls;
+-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
++		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
+ 		  sizeof(jpc_pirlvl_t)))) {
+ 			jpc_pi_destroy(pi);
+ 			return 0;
+@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
+ 		  rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
+ /* XXX sizeof(long) should be sizeof different type */
+ 			pirlvl->numprcs = rlvl->numprcs;
+-			if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
++			if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
+ 			  sizeof(long)))) {
+ 				jpc_pi_destroy(pi);
+ 				return 0;
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c	2009-10-22 10:27:45.000000000 +0200
+@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
+ 	}
+ 	pi->pktno = -1;
+ 	pi->numcomps = cp->numcmpts;
+-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
++	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
+ 		jpc_pi_destroy(pi);
+ 		return 0;
+ 	}
+@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
+ 	for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
+ 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
+ 		picomp->numrlvls = tcomp->numrlvls;
+-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
++		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
+ 		  sizeof(jpc_pirlvl_t)))) {
+ 			jpc_pi_destroy(pi);
+ 			return 0;
+@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
+ /* XXX sizeof(long) should be sizeof different type */
+ 			pirlvl->numprcs = rlvl->numprcs;
+ 			if (rlvl->numprcs) {
+-				if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
++				if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
+ 				  sizeof(long)))) {
+ 					jpc_pi_destroy(pi);
+ 					return 0;
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c	2009-10-22 10:27:45.000000000 +0200
+@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu
+ 		++numlvls;
+ 	} while (n > 1);
+ 
+-	if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) {
++	if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) {
+ 		return 0;
+ 	}
+ 
+diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c	2009-10-22 10:27:45.000000000 +0200
+@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d
+ 	}
+ 
+ 	if (n) {
+-		if (!(vs = jas_malloc(n * sizeof(double)))) {
++		if (!(vs = jas_alloc2(n, sizeof(double)))) {
+ 			return -1;
+ 		}
+ 
+diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c
+--- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c	2007-01-19 22:43:05.000000000 +0100
++++ jasper-1.900.1/src/libjasper/mif/mif_cod.c	2009-10-22 10:27:45.000000000 +0200
+@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t *
+ 	int cmptno;
+ 	mif_cmpt_t **newcmpts;
+ 	assert(maxcmpts >= hdr->numcmpts);
+-	newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) :
+-	  jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *));
++	newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *));
+ 	if (!newcmpts) {
+ 		return -1;
+ 	}
diff --git a/main/jasper/jasper-1.900.1-CVE-2008-3522.patch b/main/jasper/jasper-1.900.1-CVE-2008-3522.patch
new file mode 100644
index 000000000..4bf2e9b52
--- /dev/null
+++ b/main/jasper/jasper-1.900.1-CVE-2008-3522.patch
@@ -0,0 +1,14 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
+
+diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
+--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
++++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:35:53.000000000 +0200
+@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre
+ 	int ret;
+ 
+ 	va_start(ap, fmt);
+-	ret = vsprintf(buf, fmt, ap);
++	ret = vsnprintf(buf, sizeof buf, fmt, ap);
+ 	jas_stream_puts(stream, buf);
+ 	va_end(ap);
+ 	return ret;
diff --git a/main/jasper/jasper-1.900.1-bnc725758.patch b/main/jasper/jasper-1.900.1-bnc725758.patch
new file mode 100644
index 000000000..d2366dfad
--- /dev/null
+++ b/main/jasper/jasper-1.900.1-bnc725758.patch
@@ -0,0 +1,25 @@
+diff -up src/libjasper/jpc/jpc_cs.c.orig-725758 src/libjasper/jpc/jpc_cs.c
+--- ./src/libjasper/jpc/jpc_cs.c.orig-725758	2011-12-12 18:36:53.772117206 +0100
++++ ./src/libjasper/jpc/jpc_cs.c	2011-12-12 18:36:12.805999375 +0100
+@@ -744,6 +744,12 @@ static int jpc_cox_getcompparms(jpc_ms_t
+ 		return -1;
+ 	}
+ 	compparms->numrlvls = compparms->numdlvls + 1;
++	if (compparms->numrlvls > JPC_MAXRLVLS) {
++		compparms->numrlvls = 0;
++		jpc_cox_destroycompparms(compparms);
++		return -1;
++	}
++
+ 	if (prtflag) {
+ 		for (i = 0; i < compparms->numrlvls; ++i) {
+ 			if (jpc_getuint8(in, &tmp)) {
+@@ -1331,7 +1337,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
+ 	jpc_crgcomp_t *comp;
+ 	uint_fast16_t compno;
+ 	crg->numcomps = cstate->numcomps;
+-	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
++	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(jpc_crgcomp_t)))) {
+ 		return -1;
+ 	}
+ 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
diff --git a/main/jasper/libjasper-stepsizes-overflow.patch b/main/jasper/libjasper-stepsizes-overflow.patch
new file mode 100644
index 000000000..097559f68
--- /dev/null
+++ b/main/jasper/libjasper-stepsizes-overflow.patch
@@ -0,0 +1,14 @@
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2007-04-06 01:29:02.000000000 +0200
+@@ -982,7 +982,10 @@ static int jpc_qcx_getcompparms(jpc_qcxc
+ 		compparms->numstepsizes = (len - n) / 2;
+ 		break;
+ 	}
+-	if (compparms->numstepsizes > 0) {
++	if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) {
++		jpc_qcx_destroycompparms(compparms);
++                return -1;
++        } else if (compparms->numstepsizes > 0) {
+ 		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
+ 		  sizeof(uint_fast16_t));
+ 		assert(compparms->stepsizes);
diff --git a/main/java-gcj-compat/APKBUILD b/main/java-gcj-compat/APKBUILD
index e9a421c69..48d663da5 100644
--- a/main/java-gcj-compat/APKBUILD
+++ b/main/java-gcj-compat/APKBUILD
@@ -25,7 +25,7 @@ build() {
 	cd $_builddir
 	gcj -Wl,-Bsymbolic -findirect-dispatch -o ecj \
 		--main=org.eclipse.jdt.internal.compiler.batch.Main \
-		/usr/share/java/ecj.jar
+		/usr/share/java/ecj.jar -lgcj
 }
 
 package() {
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 9bd8e55a9..538e0d7f5 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
 pkgname=kamailio
-pkgver=3.2.0
-pkgrel=3
+pkgver=3.2.1
+pkgrel=0
 pkgdesc="Open Source SIP Proxy"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -29,7 +29,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 
 _default="carrierroute xmlrpc tm"
-_presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo pua_dialoginfo presence_reginfo"
+_presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_server xcap_client presence_dialoginfo pua_dialoginfo presence_reginfo"
 _pcre="dialplan lcr regex"
 _postgres="db_postgres"
 _mysql="db_mysql"
@@ -200,7 +200,7 @@ ldap() {
 	_mv_mod_s ldap
 }
 
-md5sums="d2b452e5ec4927b2ec8decdda5966bd9  kamailio-3.2.0_src.tar.gz
+md5sums="54747dc1cd84992619f61d23a40ad829  kamailio-3.2.1_src.tar.gz
 53cca39c47399eb2df20a1044d1e29eb  fix-sql-module-loading-order.patch
 3822db06b5226b5e2adc7ae7077dfaf2  kamailio-3.2-backslash.patch
 a3c959ec568c43a905710e7d25cd8c25  kamailio.cfg
diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD
index 55e5d18d2..5a718e742 100644
--- a/main/lame/APKBUILD
+++ b/main/lame/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lame
-pkgver=3.99.1
+pkgver=3.99.3
 _ver=${pkgver%.*}
 pkgrel=0
 pkgdesc="An MP3 encoder and graphical frame analyzer"
@@ -53,4 +53,4 @@ package() {
 	fi
 }
 
-md5sums="2576a7368b5c90a87adc9de6b9f0628c  lame-3.99.1.tar.gz"
+md5sums="5ad31e33e70455eb3a7b79a5dd934fce  lame-3.99.3.tar.gz"
diff --git a/main/libavc1394/APKBUILD b/main/libavc1394/APKBUILD
index 9310215de..e43a33356 100644
--- a/main/libavc1394/APKBUILD
+++ b/main/libavc1394/APKBUILD
@@ -1,18 +1,19 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libavc1394
-pkgver=0.5.3
-pkgrel=1
+pkgver=0.5.4
+pkgrel=0
 pkgdesc="Audio/Video Control library for IEEE-1394 devices"
 url="http://sourceforge.net/projects/libavc1394/"
 arch="all"
 license="GPLv2+ LGPLv2+"
 depends=
 depends_dev="libraw1394-dev"
-makedepends="$depends_dev"
+makedepends="$depends_dev libtool automake autoconf argp-standalone"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://downloads.sourceforge.net/libavc1394/libavc1394-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/libavc1394/libavc1394-$pkgver.tar.gz
+	argp.patch"
 
 _builddir="$srcdir"/libavc1394-$pkgver
 prepare() {
@@ -23,6 +24,7 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	libtoolize && aclocal && autoconf && automake
 }
 
 build() {
@@ -42,4 +44,5 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="09e30b1fb5ae455b6d8407e457a711a3  libavc1394-0.5.3.tar.gz"
+md5sums="caf0db059d8b8d35d6f08e6c0e1c7dfe  libavc1394-0.5.4.tar.gz
+c939fbdf47f9e5cd5511cd23acb6e835  argp.patch"
diff --git a/main/libavc1394/argp.patch b/main/libavc1394/argp.patch
new file mode 100644
index 000000000..9c86a625e
--- /dev/null
+++ b/main/libavc1394/argp.patch
@@ -0,0 +1,11 @@
+--- ./configure.in.orig
++++ ./configure.in
+@@ -11,6 +11,8 @@
+ 
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(sys/time.h sys/types.h unistd.h string.h netinet/in.h stdio.h)
++AC_SEARCH_LIBS([argp_usage], [argp], [],
++	[AC_MSG_ERROR([argp not found. Consider installing argp-standalone])])
+ PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.0.0)
+ 
+ #set the libtool shared library version numbers
diff --git a/main/libc0.9.32/compat-stack-guard.patch b/main/libc0.9.32/0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch
index c69a9c535..b60dd446e 100644
--- a/main/libc0.9.32/compat-stack-guard.patch
+++ b/main/libc0.9.32/0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch
@@ -1,5 +1,19 @@
+From 3fb4bfcafbcaff3522e7bab48ff03460fec99023 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 23 Dec 2011 14:06:09 +0100
+Subject: [PATCH] Compatible stack protector for non Thread Local storage
+
+Before we had thread local storage the __stack_chk_guard was a global
+variable that was referenced to by the older binaries.
+
+We since then have changed ABI so this patch can probably go away.
+---
+ ldso/ldso/ldso.c                    |    7 +------
+ libc/misc/internals/__uClibc_main.c |    8 +-------
+ 2 files changed, 2 insertions(+), 13 deletions(-)
+
 diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
-index 2857f7e..dce6fd8 100644
+index 7ee9257..3585cb7 100644
 --- a/ldso/ldso/ldso.c
 +++ b/ldso/ldso/ldso.c
 @@ -103,11 +103,7 @@ extern void _start(void);
@@ -14,7 +28,7 @@ index 2857f7e..dce6fd8 100644
  # ifdef __UCLIBC_HAS_SSP_COMPAT__
  uintptr_t __guard attribute_relro;
  # endif
-@@ -953,9 +949,8 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
+@@ -951,9 +947,8 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
  	stack_chk_guard = _dl_setup_stack_chk_guard ();
  # ifdef THREAD_SET_STACK_GUARD
  	THREAD_SET_STACK_GUARD (stack_chk_guard);
@@ -53,3 +67,6 @@ index 315365a..78cd058 100644
  #  ifdef __UCLIBC_HAS_SSP_COMPAT__
      __guard = stack_chk_guard;
  #  endif
+-- 
+1.7.8
+
diff --git a/main/libc0.9.32/0002-resolv-res_query-for-CNAMEs.patch b/main/libc0.9.32/0002-resolv-res_query-for-CNAMEs.patch
new file mode 100644
index 000000000..74cd37c50
--- /dev/null
+++ b/main/libc0.9.32/0002-resolv-res_query-for-CNAMEs.patch
@@ -0,0 +1,41 @@
+From 811e804c7a403783b0c4cc5eb75f24da809081d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Fri, 23 Dec 2011 14:15:16 +0100
+Subject: [PATCH] resolv: res_query for CNAMEs
+
+From: http://lists.busybox.net/pipermail/uclibc/2009-June/042583.html
+
+I had postfix failing for domains with MX->CNAME->A chain. In glibc it works.
+I tracked it to be a problem in uclibc res_query. It returns bogus data
+for CNAME entries, apparently intentionally, which is wrong.
+
+glibc return CNAME entries even for CNAME queries and most applications rely
+on this. So we should do the same in uclibc.
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ libc/inet/resolv.c |    8 +++-----
+ 1 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
+index 021d5bf..2371fb9 100644
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -3099,11 +3099,9 @@ int res_query(const char *dname, int class, int type,
+ 
+ 	free(a.dotted);
+ 
+-	if (a.atype == type) { /* CNAME */
+-		if (i > anslen)
+-			i = anslen;
+-		memcpy(answer, packet, i);
+-	}
++	i = MIN(anslen, i);
++	memcpy(answer, packet, i);
++
+ 	free(packet);
+ 	return i;
+ }
+-- 
+1.7.8
+
diff --git a/main/libc0.9.32/uclibc-resolv-fix-memory-leak.patch b/main/libc0.9.32/0003-resolv-fix-memory-leak.patch
index 8738ba774..88178e4e0 100644
--- a/main/libc0.9.32/uclibc-resolv-fix-memory-leak.patch
+++ b/main/libc0.9.32/0003-resolv-fix-memory-leak.patch
@@ -1,19 +1,23 @@
-From bb8d500a75a3050fe3198773ce7b07f669fe8f13 Mon Sep 17 00:00:00 2001
+From 41e8b28fc02fd966dd089a79dc509a5eff725319 Mon Sep 17 00:00:00 2001
 From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-Date: Fri, 14 Oct 2011 15:47:42 +0000
-Subject: resolv: fix memory leak
+Date: Fri, 14 Oct 2011 17:47:42 +0200
+Subject: [PATCH] resolv: fix memory leak
 
 Timothy Holdener writes:
 small memory leak in __dns_lookup() when the A record
 in the DNS answer is preceded by one or more CNAME records.
 
 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+(cherry picked from commit bb8d500a75a3050fe3198773ce7b07f669fe8f13)
 ---
+ libc/inet/resolv.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
 diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
-index 38254bd..e415d30 100644
+index 2371fb9..8781196 100644
 --- a/libc/inet/resolv.c
 +++ b/libc/inet/resolv.c
-@@ -1507,6 +1507,7 @@ int attribute_hidden __dns_lookup(const char *name,
+@@ -1503,6 +1503,7 @@ int attribute_hidden __dns_lookup(const char *name,
  		DPRINTF("Decoding answer at pos %d\n", pos);
  
  		first_answer = 1;
@@ -21,7 +25,7 @@ index 38254bd..e415d30 100644
  		for (j = 0; j < h.ancount; j++) {
  			i = __decode_answer(packet, pos, packet_len, &ma);
  			if (i < 0) {
-@@ -1523,6 +1524,7 @@ int attribute_hidden __dns_lookup(const char *name,
+@@ -1519,6 +1520,7 @@ int attribute_hidden __dns_lookup(const char *name,
  				ma.buf = a->buf;
  				ma.buflen = a->buflen;
  				ma.add_count = a->add_count;
@@ -29,5 +33,6 @@ index 38254bd..e415d30 100644
  				memcpy(a, &ma, sizeof(ma));
  				if (a->atype != T_SIG && (NULL == a->buf || (type != T_A && type != T_AAAA)))
  					break;
---
-cgit v0.9.0.1-2-gef13
+-- 
+1.7.8
+
diff --git a/main/libc0.9.32/0001-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch b/main/libc0.9.32/0004-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch
index 8d6af3deb..2978ee806 100644
--- a/main/libc0.9.32/0001-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch
+++ b/main/libc0.9.32/0004-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch
@@ -1,4 +1,4 @@
-From f32b4d27b352724f28c7409490338929fc7ba58f Mon Sep 17 00:00:00 2001
+From d7d9bf8f32235bfa781d632a0a3ba6b544062ce1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Thu, 7 Jul 2011 18:47:26 +0300
 Subject: [PATCH] resolv: fix resolver to return TRY_AGAIN on timeout
@@ -23,12 +23,13 @@ to TRY_AGAIN if upstream nameserver(s) timed out. Previously we
 would have returned NETDB_INTERNAL.
 
 Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
 ---
  libc/inet/resolv.c |   95 +++++++++++++++++++++++++++-------------------------
  1 files changed, 49 insertions(+), 46 deletions(-)
 
 diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
-index dc8a752..90ba31c 100644
+index 8781196..07dff18 100644
 --- a/libc/inet/resolv.c
 +++ b/libc/inet/resolv.c
 @@ -456,7 +456,8 @@ extern int __read_etc_hosts_r(parser_t *parser,
@@ -115,7 +116,7 @@ index dc8a752..90ba31c 100644
  			goto fail1;
  		}
  		pos = HFIXEDSZ;
-@@ -1562,8 +1572,7 @@ int attribute_hidden __dns_lookup(const char *name,
+@@ -1564,8 +1574,7 @@ int attribute_hidden __dns_lookup(const char *name,
  		variant = -1;
  	} while (retries_left > 0);
  
@@ -125,7 +126,7 @@ index dc8a752..90ba31c 100644
   fail1:
  	if (fd != -1)
  		close(fd);
-@@ -2104,9 +2113,8 @@ int gethostbyname_r(const char *name,
+@@ -2106,9 +2115,8 @@ int gethostbyname_r(const char *name,
  	 * we'll need space of one in_addr + two addr_list[] elems */
  	a.buflen = buflen - ((sizeof(addr_list[0]) * 2 + sizeof(struct in_addr)));
  	a.add_count = 0;
@@ -136,7 +137,7 @@ index dc8a752..90ba31c 100644
  		DPRINTF("__dns_lookup returned < 0\n");
  		return TRY_AGAIN;
  	}
-@@ -2290,9 +2298,8 @@ int gethostbyname2_r(const char *name,
+@@ -2292,9 +2300,8 @@ int gethostbyname2_r(const char *name,
  		int packet_len;
  
  /* Hmm why we memset(a) to zeros only once? */
@@ -147,7 +148,7 @@ index dc8a752..90ba31c 100644
  			return TRY_AGAIN;
  		}
  		strncpy(buf, a.dotted, buflen);
-@@ -2448,9 +2455,8 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen,
+@@ -2450,9 +2457,8 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen,
  	memset(&a, '\0', sizeof(a));
  	for (;;) {
  /* Hmm why we memset(a) to zeros only once? */
@@ -158,7 +159,7 @@ index dc8a752..90ba31c 100644
  			return TRY_AGAIN;
  		}
  
-@@ -3089,7 +3095,7 @@ int res_query(const char *dname, int class, int type,
+@@ -3091,7 +3097,7 @@ int res_query(const char *dname, int class, int type,
  	}
  
  	memset(&a, '\0', sizeof(a));
@@ -261,5 +262,5 @@ index dc8a752..90ba31c 100644
  /*
   * Perform a call on res_query on the concatenation of name and domain,
 -- 
-1.7.1
+1.7.8
 
diff --git a/main/libc0.9.32/0001-libm-x86_64-implement-some-fenv-functions.patch b/main/libc0.9.32/0005-libm-x86_64-implement-some-fenv-functions.patch
index 5d4241372..9a47267b8 100644
--- a/main/libc0.9.32/0001-libm-x86_64-implement-some-fenv-functions.patch
+++ b/main/libc0.9.32/0005-libm-x86_64-implement-some-fenv-functions.patch
@@ -1,9 +1,14 @@
-From 5db70d560df0ab36751045dcb364c3f9eebdc2d1 Mon Sep 17 00:00:00 2001
+From 6864dfeef979985f9f173b842034183476b95583 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <natanael.copa@gmail.com>
 Date: Sun, 28 Nov 2010 12:43:33 +0000
 Subject: [PATCH] libm/x86_64: implement some fenv functions
 
 from glibc
+
+Posted to uclibc:
+http://lists.busybox.net/pipermail/uclibc/2010-December/044523.html
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
 ---
  libm/x86_64/Makefile.arch  |   24 ++++++++++++++++++++
  libm/x86_64/fclrexcpt.c    |   52 ++++++++++++++++++++++++++++++++++++++++++++
@@ -279,5 +284,5 @@ index 0000000..091c251
 +  return (temp | mxscr) & excepts & FE_ALL_EXCEPT;
 +}
 -- 
-1.7.7
+1.7.8
 
diff --git a/main/libc0.9.32/0001-ldso-limited-support-for-ORIGIN-in-rpath.patch b/main/libc0.9.32/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch
index 73e0fab2b..633b7e4f5 100644
--- a/main/libc0.9.32/0001-ldso-limited-support-for-ORIGIN-in-rpath.patch
+++ b/main/libc0.9.32/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch
@@ -1,7 +1,7 @@
-From 0ba7ee452f26088f6b738c37e05c16c7c9eb1caf Mon Sep 17 00:00:00 2001
+From b1aea0b3872b246cf17f04d5442a94e39e45203e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Fri, 18 Mar 2011 10:53:56 +0200
-Subject: [PATCH 1/3] ldso: limited support for $ORIGIN in rpath
+Subject: [PATCH] ldso: limited support for $ORIGIN in rpath
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -9,14 +9,18 @@ Content-Transfer-Encoding: 8bit
 Handle it if it's in the beginning of the rpath entry as it
 should be.
 
+Posted to uclibc ml:
+http://old.nabble.com/-PATCH-1-3--ldso%3A-limited-support-for-$ORIGIN-in-rpath-td31181219.html
+
 Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
 ---
  ldso/ldso/dl-elf.c |   80 ++++++++++++++++++++++++++++-----------------------
  ldso/ldso/ldso.c   |   18 ++++++++++--
  2 files changed, 59 insertions(+), 39 deletions(-)
 
 diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
-index 505247e..2b2d429 100644
+index 09b3aaf..558176a 100644
 --- a/ldso/ldso/dl-elf.c
 +++ b/ldso/ldso/dl-elf.c
 @@ -133,53 +133,60 @@ _dl_protect_relro (struct elf_resolve *l)
@@ -158,10 +162,10 @@ index 505247e..2b2d429 100644
  		return tpnt1;
  
 diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
-index 7ee9257..9423670 100644
+index 3585cb7..df16b4f 100644
 --- a/ldso/ldso/ldso.c
 +++ b/ldso/ldso/ldso.c
-@@ -272,6 +272,20 @@ static void __attribute__ ((destructor)) __attribute_used__ _dl_fini(void)
+@@ -268,6 +268,20 @@ static void __attribute__ ((destructor)) __attribute_used__ _dl_fini(void)
  	}
  }
  
@@ -182,7 +186,7 @@ index 7ee9257..9423670 100644
  void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
  			  ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp,
  			  char **argv
-@@ -321,9 +335,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
+@@ -317,9 +331,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
  	 * been fixed up by now.  Still no function calls outside of this
  	 * library, since the dynamic resolver is not yet ready.
  	 */
@@ -194,5 +198,5 @@ index 7ee9257..9423670 100644
  	if (_start == (void *) auxvt[AT_ENTRY].a_un.a_val) {
  		_dl_dprintf(_dl_debug_file, "Standalone execution is not supported yet\n");
 -- 
-1.7.1
+1.7.8
 
diff --git a/main/libc0.9.32/0002-stdlib-fix-arc4random-return-type-to-u_int32_t.patch b/main/libc0.9.32/0007-stdlib-fix-arc4random-return-type-to-u_int32_t.patch
index 9d924655d..40c938065 100644
--- a/main/libc0.9.32/0002-stdlib-fix-arc4random-return-type-to-u_int32_t.patch
+++ b/main/libc0.9.32/0007-stdlib-fix-arc4random-return-type-to-u_int32_t.patch
@@ -1,7 +1,7 @@
-From 70debeff167858502d99e92a221fe14f5428a9b6 Mon Sep 17 00:00:00 2001
+From 8f71a37896be4ce64c009b369117b252eb4de366 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Fri, 18 Mar 2011 10:57:31 +0200
-Subject: [PATCH 2/3] stdlib: fix arc4random return type to u_int32_t
+Subject: [PATCH] stdlib: fix arc4random return type to u_int32_t
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,6 +15,7 @@ if stdlib.h is included before #define's for stdint.h we end up
 missing things and breaking builds (e.g. openjdk).
 
 Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
 ---
  include/stdlib.h         |    4 ++--
  libc/stdlib/arc4random.c |    3 ++-
@@ -57,5 +58,5 @@ index c7aed66..7b9b12d 100644
  {
  	if (!rs_initialized)
 -- 
-1.7.1
+1.7.8
 
diff --git a/main/libc0.9.32/0003-ldso-support-RTLD_NOLOAD.patch b/main/libc0.9.32/0008-ldso-support-RTLD_NOLOAD.patch
index f10d6f002..3902df31e 100644
--- a/main/libc0.9.32/0003-ldso-support-RTLD_NOLOAD.patch
+++ b/main/libc0.9.32/0008-ldso-support-RTLD_NOLOAD.patch
@@ -1,7 +1,7 @@
-From 4bb377585b95cb67c90ff4ffc21a6870a4e78a37 Mon Sep 17 00:00:00 2001
+From e6fa350aa23280795a912d0edd989d7c98c62710 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Fri, 18 Mar 2011 11:40:04 +0200
-Subject: [PATCH 3/3] ldso: support RTLD_NOLOAD
+Subject: [PATCH] ldso: support RTLD_NOLOAD
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -10,6 +10,7 @@ So application query if specified modile is loaded or not with
 dlopen.
 
 Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
 ---
  ldso/include/dl-elf.h                  |    6 ++++--
  ldso/ldso/dl-elf.c                     |   30 +++++++++++++++++-------------
@@ -19,7 +20,7 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi>
  5 files changed, 29 insertions(+), 20 deletions(-)
 
 diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h
-index 7fbb373..7102351 100644
+index e7203fd..753c346 100644
 --- a/ldso/include/dl-elf.h
 +++ b/ldso/include/dl-elf.h
 @@ -25,16 +25,18 @@ static __inline__ void _dl_map_cache(void) { }
@@ -44,7 +45,7 @@ index 7fbb373..7102351 100644
  extern struct elf_resolve *_dl_check_if_named_library_is_loaded(const char *full_libname,
  	int trace_loaded_objects);
 diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
-index 2b2d429..6d35bf2 100644
+index 558176a..e32591a 100644
 --- a/ldso/ldso/dl-elf.c
 +++ b/ldso/ldso/dl-elf.c
 @@ -132,7 +132,7 @@ _dl_protect_relro (struct elf_resolve *l)
@@ -145,7 +146,7 @@ index 2b2d429..6d35bf2 100644
  					UCLIBC_RUNTIME_PREFIX "lib:"
  					UCLIBC_RUNTIME_PREFIX "usr/lib"
  #ifndef __LDSO_CACHE_SUPPORT__
-@@ -329,7 +329,7 @@ goof:
+@@ -444,7 +444,7 @@ map_writeable (int infile, ElfW(Phdr) *ppnt, int piclib, int flags,
   * are required.
   */
  
@@ -154,7 +155,7 @@ index 2b2d429..6d35bf2 100644
  	struct dyn_elf **rpnt, char *libname)
  {
  	ElfW(Ehdr) *epnt;
-@@ -368,7 +368,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
+@@ -483,7 +483,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
  	}
  	/* If we are in secure mode (i.e. a setu/gid binary using LD_PRELOAD),
  	   we don't load the library if it isn't setuid. */
@@ -163,7 +164,7 @@ index 2b2d429..6d35bf2 100644
  		if (!(st.st_mode & S_ISUID)) {
  			_dl_close(infile);
  			return NULL;
-@@ -384,6 +384,10 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
+@@ -499,6 +499,10 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
  			return tpnt;
  		}
  	}
@@ -175,10 +176,10 @@ index 2b2d429..6d35bf2 100644
  			MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZE, -1, 0);
  	if (_dl_mmap_check_error(header)) {
 diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
-index 9423670..b71af34 100644
+index df16b4f..5cefc22 100644
 --- a/ldso/ldso/ldso.c
 +++ b/ldso/ldso/ldso.c
-@@ -646,7 +646,9 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
+@@ -642,7 +642,9 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
  			if (!_dl_secure || _dl_strchr(str, '/') == NULL) {
  				_dl_if_debug_dprint("\tfile='%s';  needed by '%s'\n", str, _dl_progname);
  
@@ -190,7 +191,7 @@ index 9423670..b71af34 100644
  #ifdef __LDSO_LDD_SUPPORT__
  					if (trace_loaded_objects)
 diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
-index 68cd579..edf38d2 100644
+index 52c77b0..49e90d0 100644
 --- a/ldso/libdl/libdl.c
 +++ b/ldso/libdl/libdl.c
 @@ -288,7 +288,7 @@ void *dlopen(const char *libname, int flag)
@@ -230,5 +231,5 @@ index 4bfbbff..47b42ad 100644
  #endif
  
 -- 
-1.7.1
+1.7.8
 
diff --git a/main/libc0.9.32/0001-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch b/main/libc0.9.32/0009-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch
index d406f030d..367db170f 100644
--- a/main/libc0.9.32/0001-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch
+++ b/main/libc0.9.32/0009-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch
@@ -1,6 +1,6 @@
-From 521807eb4d18c5e693f91ad53cb277c76aab8686 Mon Sep 17 00:00:00 2001
+From e3f3de389e28f2585d1a1e57989440ffea67e689 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 24 Mar 2011 13:24:32 +0200
+Date: Thu, 24 Mar 2011 13:27:36 +0200
 Subject: [PATCH] libdl: rudimentary locking for dlopen/dlsym/dlclose
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -12,6 +12,8 @@ we can use more fine grained locking or even RCU where appropriate.
 But at least we won't crash now.
 
 Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+(cherry picked from commit f69319d5a7d3a3ccb46b28ee2b0fd9053c6415ac)
 ---
  TODO               |    1 +
  ldso/libdl/libdl.c |   54 +++++++++++++++++++++++++++++++++++++++++++++++----
@@ -30,7 +32,7 @@ index ae305a5..95cabd5 100644
  
  
 diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
-index 68cd579..e007f54 100644
+index 49e90d0..8b243c6 100644
 --- a/ldso/libdl/libdl.c
 +++ b/ldso/libdl/libdl.c
 @@ -34,6 +34,7 @@
@@ -61,7 +63,7 @@ index 68cd579..e007f54 100644
  {
  	struct elf_resolve *tpnt, *tfrom;
  	struct dyn_elf *dyn_chain, *rpnt = NULL, *dyn_ptr, *relro_ptr, *handle;
-@@ -605,7 +610,18 @@ oops:
+@@ -606,7 +611,18 @@ oops:
  	return NULL;
  }
  
@@ -81,7 +83,7 @@ index 68cd579..e007f54 100644
  {
  	struct elf_resolve *tpnt, *tfrom;
  	struct dyn_elf *handle;
-@@ -653,7 +669,7 @@ void *dlsym(void *vhandle, const char *name)
+@@ -654,7 +670,7 @@ void *dlsym(void *vhandle, const char *name)
  		 * dynamic loader itself, as it doesn't know
  		 * how to properly treat it.
  		 */
@@ -90,7 +92,7 @@ index 68cd579..e007f54 100644
  
  		tfrom = NULL;
  		for (rpnt = _dl_symbol_tables; rpnt; rpnt = rpnt->next) {
-@@ -690,6 +706,17 @@ out:
+@@ -691,6 +707,17 @@ out:
  	return ret;
  }
  
@@ -108,7 +110,7 @@ index 68cd579..e007f54 100644
  #if 0
  void *dlvsym(void *vhandle, const char *name, const char *version)
  {
-@@ -957,7 +984,13 @@ static int do_dlclose(void *vhandle, int need_fini)
+@@ -958,7 +985,13 @@ static int do_dlclose(void *vhandle, int need_fini)
  
  int dlclose(void *vhandle)
  {
@@ -123,7 +125,7 @@ index 68cd579..e007f54 100644
  }
  
  char *dlerror(void)
-@@ -1004,7 +1037,7 @@ int dlinfo(void)
+@@ -1005,7 +1038,7 @@ int dlinfo(void)
  	return 0;
  }
  
@@ -132,7 +134,7 @@ index 68cd579..e007f54 100644
  {
  	struct elf_resolve *pelf;
  	struct elf_resolve *rpnt;
-@@ -1108,3 +1141,14 @@ int dladdr(const void *__address, Dl_info * __info)
+@@ -1117,3 +1150,14 @@ int dladdr(const void *__address, Dl_info * __info)
  	}
  }
  #endif
@@ -148,5 +150,5 @@ index 68cd579..e007f54 100644
 +	return ret;
 +}
 -- 
-1.7.1
+1.7.8
 
diff --git a/main/libc0.9.32/0001-malloc-standard-synchronize-on-fork.patch b/main/libc0.9.32/0010-malloc-standard-synchronize-on-fork.patch
index eb3bfbe04..688231f77 100644
--- a/main/libc0.9.32/0001-malloc-standard-synchronize-on-fork.patch
+++ b/main/libc0.9.32/0010-malloc-standard-synchronize-on-fork.patch
@@ -1,4 +1,4 @@
-From 168215f9c3ec4ec9a2fad9387038ced8b386ebaa Mon Sep 17 00:00:00 2001
+From 1bdf3d74afad552ff99182af70536f23549a434f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Sat, 26 Mar 2011 20:23:09 +0200
 Subject: [PATCH] malloc-standard: synchronize on fork
@@ -10,6 +10,7 @@ Otherwise other threads can leave malloc state locked, and the child
 will hang indefinitely if it tries to malloc something.
 
 Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
 ---
  libc/stdlib/malloc-standard/free.c |   17 +++++++++++++++++
  1 files changed, 17 insertions(+), 0 deletions(-)
@@ -50,5 +51,5 @@ index 39e54d6..df512cc 100644
  
  
 -- 
-1.7.1
+1.7.8
 
diff --git a/main/libc0.9.32/0001-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch b/main/libc0.9.32/0011-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch
index e47d89620..63ee369af 100644
--- a/main/libc0.9.32/0001-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch
+++ b/main/libc0.9.32/0011-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch
@@ -1,6 +1,5 @@
-From ef44545eb332eac26577ea2672e89b01b3aa5706 Mon Sep 17 00:00:00 2001
+From 0be0174259a3a35313fe1a0413630b919f910f5b Mon Sep 17 00:00:00 2001
 From: William Pitcock <nenolod@dereferenced.org>
-To: uclibc@uclibc.org
 Date: Thu, 28 Apr 2011 03:09:20 -0500
 Subject: [PATCH] time: fix parsing of tzdata files where off_t is 64-bit
 
@@ -10,6 +9,7 @@ gcc to pass the constant as off_t type always by casting the constant
 to off_t.
 
 Signed-off-by: William Pitcock <nenolod@dereferenced.org>
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
 ---
  libc/misc/time/time.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
@@ -28,5 +28,5 @@ index 19d68e1..1b21f9e 100644
  				goto ERROR;
  			}
 -- 
-1.7.4.5
+1.7.8
 
diff --git a/main/libc0.9.32/0001-getaddrinfo-allow-numeric-service-without-any-hints.patch b/main/libc0.9.32/0012-getaddrinfo-allow-numeric-service-without-any-hints.patch
index bdd3ce489..2cb303a94 100644
--- a/main/libc0.9.32/0001-getaddrinfo-allow-numeric-service-without-any-hints.patch
+++ b/main/libc0.9.32/0012-getaddrinfo-allow-numeric-service-without-any-hints.patch
@@ -1,6 +1,6 @@
-From 66cdddf50492b9b645200ef580ae957c388694ab Mon Sep 17 00:00:00 2001
+From eb5d129b641c644d82089c3ded3d36288c66123c Mon Sep 17 00:00:00 2001
 From: Natanael Copa <natanael.copa@gmail.com>
-Date: Wed, 8 Jun 2011 09:12:16 +0000
+Date: Sun, 12 Jun 2011 12:09:04 +0000
 Subject: [PATCH] getaddrinfo: allow numeric service without any hints
 
 This appears to correspond to what glibc does and this fixes an
@@ -10,6 +10,10 @@ issue with iptables-1.4.11 with udp and raw port numbers.
 
 This fixes #3841
 https://bugs.busybox.net/show_bug.cgi?id=3841
+
+Signed-off-by: Natanael Copa <natanael.copa@gmail.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+(cherry picked from commit bc3be18145e4d57e7268506f123c0f0f373a15e2)
 ---
  libc/inet/getaddrinfo.c |    7 -------
  1 files changed, 0 insertions(+), 7 deletions(-)
@@ -33,5 +37,5 @@ index 1a77c51..e7511f6 100644
  		pservice = &gaih_service;
  	} else
 -- 
-1.7.5.4
+1.7.8
 
diff --git a/main/libc0.9.32/0001-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch b/main/libc0.9.32/0013-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch
index 62c145694..d8961b2bc 100644
--- a/main/libc0.9.32/0001-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch
+++ b/main/libc0.9.32/0013-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch
@@ -1,7 +1,7 @@
-From 5f72f80e7ea0e3429c28ff5de7ca88cdd95e8904 Mon Sep 17 00:00:00 2001
+From 9d28002b230eb01a5db7aecab263d38bf0d6d6c7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Thu, 10 Nov 2011 09:36:44 +0200
-Subject: [PATCHv2] libc/x86: fix stack unwinding and backtrace information
+Subject: [PATCH] libc/x86: fix stack unwinding and backtrace information
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,6 +25,7 @@ if thread is cancelled and the cancellation handler fails to detect the
 signal return frame.
 
 Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
 ---
  libc/sysdeps/linux/i386/bits/syscalls.h |   82 +++----------------------------
  libc/sysdeps/linux/i386/clone.S         |   17 ++++++
@@ -246,5 +247,5 @@ index de0c75d..f9af3f7 100644
  	"	popl	%eax\n"				\
  	"	movl	$" #syscall ", %eax\n"		\
 -- 
-1.7.7
+1.7.8
 
diff --git a/main/libc0.9.32/libm-cabsf.patch b/main/libc0.9.32/0014-libm-add-cabsf-and-cabsl-functions.patch
index 5ffa11455..cb19a9f95 100644
--- a/main/libc0.9.32/libm-cabsf.patch
+++ b/main/libc0.9.32/0014-libm-add-cabsf-and-cabsl-functions.patch
@@ -1,9 +1,11 @@
-From 0c71b7626655c1023c5e10ebb3b1a294f8e41353 Mon Sep 17 00:00:00 2001
+From aee19ef04c6abf52f4fd646269fcf8a8609164f9 Mon Sep 17 00:00:00 2001
 From: William Pitcock <nenolod@dereferenced.org>
 Date: Tue, 1 Nov 2011 18:55:25 -0500
-Subject: [PATCH 2/2] libm: add cabsf() and cabsl() functions.
+Subject: [PATCH] libm: add cabsf() and cabsl() functions.
 
 Signed-off-by: William Pitcock <nenolod@dereferenced.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+(cherry picked from commit 2086015b9a223586c1a2b8d7f015ad3a38bdf8bc)
 ---
  libm/w_cabs.c |   16 ++++++++++++++++
  1 files changed, 16 insertions(+), 0 deletions(-)
@@ -33,5 +35,5 @@ index 4044f4b..b259248 100644
 +libm_hidden_def(cabsl)
 +#endif
 -- 
-1.7.7.1
+1.7.8
 
diff --git a/main/libc0.9.32/libm-cexp.patch b/main/libc0.9.32/0015-libm-implement-generic-cexp-cexpf-and-cexpl.patch
index 82f914fa9..1ac231658 100644
--- a/main/libc0.9.32/libm-cexp.patch
+++ b/main/libc0.9.32/0015-libm-implement-generic-cexp-cexpf-and-cexpl.patch
@@ -1,12 +1,14 @@
-From 8733cd43293bfa04b4334db7873c4de613f5cf75 Mon Sep 17 00:00:00 2001
+From bf95401faf3ec57b5f45ada41dc219f6d04770ae Mon Sep 17 00:00:00 2001
 From: William Pitcock <nenolod@dereferenced.org>
 Date: Tue, 1 Nov 2011 18:41:30 -0500
-Subject: [PATCH 1/2] libm: implement generic cexp(), cexpf() and cexpl().
+Subject: [PATCH] libm: implement generic cexp(), cexpf() and cexpl().
 
 The cexp*() family of functions is defined by the C99 math standard as
 implementing exponential functions for complex types.
 
 Signed-off-by: William Pitcock <nenolod@dereferenced.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+(cherry picked from commit 6471fc450b66dcb1ba16fe6568cd52221ca64cd1)
 ---
  libm/Makefile.in |    3 +-
  libm/cexp.c      |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -97,5 +99,5 @@ index 0000000..87512b7
 +libm_hidden_def(cexpl)
 +#endif
 -- 
-1.7.7.1
+1.7.8
 
diff --git a/main/libc0.9.32/0016-libubacktrace-use-.so.-ABI_VERSION.patch b/main/libc0.9.32/0016-libubacktrace-use-.so.-ABI_VERSION.patch
new file mode 100644
index 000000000..bf43e927a
--- /dev/null
+++ b/main/libc0.9.32/0016-libubacktrace-use-.so.-ABI_VERSION.patch
@@ -0,0 +1,29 @@
+From 5ca71ddc69ebb3696b63d260e15341653ddef4c0 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Fri, 18 Nov 2011 08:49:25 +0100
+Subject: [PATCH] libubacktrace: use .so.$(ABI_VERSION)
+
+Thanks to William Pitcock for noticing
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+(cherry picked from commit 69cba61dd27f2a9c4c34f596ed9d1b7cd0441f74)
+---
+ Rules.mak |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Rules.mak b/Rules.mak
+index fe06c24..96074e5 100644
+--- a/Rules.mak
++++ b/Rules.mak
+@@ -118,7 +118,7 @@ export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION ABI_VERSION LC_ALL
+ 
+ LIBC := libc
+ SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
+-UBACKTRACE_DSO := libubacktrace.so.$(MAJOR_VERSION)
++UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
+ ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
+ UCLIBC_LDSO_NAME := ld64-uClibc
+ ARCH_NATIVE_BIT := 64
+-- 
+1.7.8
+
diff --git a/main/libc0.9.32/0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch b/main/libc0.9.32/0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
new file mode 100644
index 000000000..2377bccbd
--- /dev/null
+++ b/main/libc0.9.32/0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
@@ -0,0 +1,44 @@
+From 08164f6a9e839918fa6bae05572916c2defabd94 Mon Sep 17 00:00:00 2001
+From: Phil Blundell <pb@pbcl.net>
+Date: Sat, 11 Jun 2011 01:10:46 -0400
+Subject: [PATCH] Fix __libc_epoll_pwait compile failure on x86
+
+This prevents "memory input 7 is not directly addressable" errors.
+
+| libc/sysdeps/linux/common/epoll.c: In function '__libc_epoll_pwait':
+| libc/sysdeps/linux/common/epoll.c:71:80: error: memory input 7 is not directly addressable
+| libc/sysdeps/linux/common/epoll.c:75:86: error: memory input 7 is not directly addressable
+| make: *** [libc/sysdeps/linux/common/epoll.o] Error 1
+| make: *** Waiting for unfinished jobs....
+
+Signed-off-by: Phil Blundell <pb@pbcl.net>
+Signed-off-by: Jason Woodward <jason.woodward@timesys.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+(cherry picked from commit 8245f3b4638fdff2011c2657af1bb211def704bc)
+---
+ libc/sysdeps/linux/common/epoll.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
+index 85b0cfd..ab3e73b 100644
+--- a/libc/sysdeps/linux/common/epoll.c
++++ b/libc/sysdeps/linux/common/epoll.c
+@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait;
+ int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
+ 						int timeout, const sigset_t *set)
+ {
++    int nsig = _NSIG / 8;
+ 	if (SINGLE_THREAD_P)
+-		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
+ # ifdef __UCLIBC_HAS_THREADS_NATIVE__
+ 	else {
+ 		int oldtype = LIBC_CANCEL_ASYNC ();
+-		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
+ 		LIBC_CANCEL_RESET (oldtype);
+ 		return result;
+ 	}
+-- 
+1.7.8
+
diff --git a/main/libc0.9.32/0018-libcrypt-do-not-cast-away-const-of-key-salt.patch b/main/libc0.9.32/0018-libcrypt-do-not-cast-away-const-of-key-salt.patch
new file mode 100644
index 000000000..d79671739
--- /dev/null
+++ b/main/libc0.9.32/0018-libcrypt-do-not-cast-away-const-of-key-salt.patch
@@ -0,0 +1,34 @@
+From c6363f33f5af361fea483dd6a7e0f42278f913bf Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 20 Nov 2011 02:34:49 -0500
+Subject: [PATCH] libcrypt: do not cast away const of key/salt
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+(cherry picked from commit 4a2b0641a3818ad14b886907368b6f6735615f6d)
+---
+ libcrypt/crypt.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c
+index 8b361d3..89a2614 100644
+--- a/libcrypt/crypt.c
++++ b/libcrypt/crypt.c
+@@ -12,10 +12,13 @@
+ 
+ char *crypt(const char *key, const char *salt)
+ {
++	const unsigned char *ukey = (const unsigned char *)key;
++	const unsigned char *usalt = (const unsigned char *)salt;
++
+ 	/* First, check if we are supposed to be using the MD5 replacement
+ 	 * instead of DES...  */
+ 	if (salt[0]=='$' && salt[1]=='1' && salt[2]=='$')
+-		return __md5_crypt((unsigned char*)key, (unsigned char*)salt);
++		return __md5_crypt(ukey, usalt);
+ 	else
+-		return __des_crypt((unsigned char*)key, (unsigned char*)salt);
++		return __des_crypt(ukey, usalt);
+ }
+-- 
+1.7.8
+
diff --git a/main/libc0.9.32/0019-libcrypt-make-crypt-itself-more-modular.patch b/main/libc0.9.32/0019-libcrypt-make-crypt-itself-more-modular.patch
new file mode 100644
index 000000000..9e8636f95
--- /dev/null
+++ b/main/libc0.9.32/0019-libcrypt-make-crypt-itself-more-modular.patch
@@ -0,0 +1,64 @@
+From 78f25c8abfc3358a46061772944d30027ceb8288 Mon Sep 17 00:00:00 2001
+From: William Pitcock <nenolod@dereferenced.org>
+Date: Mon, 19 Dec 2011 01:21:33 -0600
+Subject: [PATCH] libcrypt: make crypt() itself more modular
+
+By using a function table, we can more cleanly support new crypt
+implementations, such as SHA256 ($5$) and SHA512 ($6$).
+
+Signed-off-by: William Pitcock <nenolod@dereferenced.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+(cherry picked from commit 40c426ae8f032d794d15f4a7fca8dc17cdc9899d)
+---
+ libcrypt/crypt.c |   30 ++++++++++++++++++++++++------
+ 1 files changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c
+index 89a2614..33f98b6 100644
+--- a/libcrypt/crypt.c
++++ b/libcrypt/crypt.c
+@@ -8,17 +8,35 @@
+ #define __FORCE_GLIBC
+ #include <crypt.h>
+ #include <unistd.h>
++#include <string.h>
++#include <errno.h>
+ #include "libcrypt.h"
+ 
++typedef char *(*crypt_impl_f)(const unsigned char *pw, const unsigned char *salt);
++
++static const struct {
++	const char *salt_pfx;
++	const crypt_impl_f crypt_impl;
++} crypt_impl_tab[] = {
++	{ "$1$",        __md5_crypt },
++	{ NULL,         __des_crypt },
++};
++
+ char *crypt(const char *key, const char *salt)
+ {
+ 	const unsigned char *ukey = (const unsigned char *)key;
+ 	const unsigned char *usalt = (const unsigned char *)salt;
++	size_t i;
++
++	for (i = 0; i < ARRAY_SIZE(crypt_impl_tab); i++) {
++		if (crypt_impl_tab[i].salt_pfx != NULL &&
++		    strncmp(crypt_impl_tab[i].salt_pfx, salt, strlen(crypt_impl_tab[i].salt_pfx)))
++			continue;
++
++		return crypt_impl_tab[i].crypt_impl(ukey, usalt);
++	}
+ 
+-	/* First, check if we are supposed to be using the MD5 replacement
+-	 * instead of DES...  */
+-	if (salt[0]=='$' && salt[1]=='1' && salt[2]=='$')
+-		return __md5_crypt(ukey, usalt);
+-	else
+-		return __des_crypt(ukey, usalt);
++	/* no crypt implementation was found, set errno to ENOSYS and return NULL */
++	__set_errno(ENOSYS);
++	return NULL;
+ }
+-- 
+1.7.8
+
diff --git a/main/libc0.9.32/0020-libcrypt-add-support-for-SHA512-CRYPT-password-hashi.patch b/main/libc0.9.32/0020-libcrypt-add-support-for-SHA512-CRYPT-password-hashi.patch
new file mode 100644
index 000000000..cd6786977
--- /dev/null
+++ b/main/libc0.9.32/0020-libcrypt-add-support-for-SHA512-CRYPT-password-hashi.patch
@@ -0,0 +1,834 @@
+From 0b68c872deb676b0cb104bfb30a1f356072b5edf Mon Sep 17 00:00:00 2001
+From: William Pitcock <nenolod@dereferenced.org>
+Date: Mon, 19 Dec 2011 01:24:16 -0600
+Subject: [PATCH] libcrypt: add support for SHA512-CRYPT password hashing
+
+This is based on Ulrich Drepper's implementation in GLIBC, but hacked up to work
+in uClibc.  The differences from the GLIBC version are as follows:
+
+- b64_from_24bit() has been converted into a macro
+- Usage of GLIBC-isms (such as libc_freeres_ptr) have been removed
+
+It is enabled by the UCLIBC_HAS_SHA512_CRYPT_IMPL configuration symbol.  You must
+have UCLIBC_HAS_CRYPT_IMPL enabled as well.
+
+Signed-off-by: William Pitcock <nenolod@dereferenced.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+(cherry picked from commit 4c24dabb9cea4c8148d7a7efc7a1df694424c483)
+---
+ extra/Configs/Config.in |    7 +
+ libcrypt/Makefile.in    |    1 +
+ libcrypt/crypt.c        |    3 +
+ libcrypt/libcrypt.h     |    3 +
+ libcrypt/sha512-crypt.c |  339 +++++++++++++++++++++++++++++++++++++++++++++++
+ libcrypt/sha512.c       |  326 +++++++++++++++++++++++++++++++++++++++++++++
+ libcrypt/sha512.h       |   58 ++++++++
+ 7 files changed, 737 insertions(+), 0 deletions(-)
+ create mode 100644 libcrypt/sha512-crypt.c
+ create mode 100644 libcrypt/sha512.c
+ create mode 100644 libcrypt/sha512.h
+
+diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
+index e41adc4..eec3ee9 100644
+--- a/extra/Configs/Config.in
++++ b/extra/Configs/Config.in
+@@ -1137,6 +1137,13 @@ config UCLIBC_HAS_CRYPT_IMPL
+ 	help
+ 	  libcrypt contains crypt(), setkey() and encrypt()
+ 
++config UCLIBC_HAS_SHA512_CRYPT_IMPL
++	bool "libcrypt SHA512 support"
++	depends on UCLIBC_HAS_CRYPT_IMPL
++	help
++	  This adds support for SHA512 password hashing via the crypt() function.
++	  Say N here if you do not need SHA512 crypt support.
++
+ config UCLIBC_HAS_CRYPT_STUB
+ 	bool "libcrypt stubs"
+ 	default y
+diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in
+index 1d1fb55..2fceaed 100644
+--- a/libcrypt/Makefile.in
++++ b/libcrypt/Makefile.in
+@@ -21,6 +21,7 @@ libcrypt_OUT := $(top_builddir)libcrypt
+ 
+ libcrypt_SRC-y :=
+ libcrypt_SRC-$(UCLIBC_HAS_CRYPT_IMPL) += crypt.c des.c md5.c
++libcrypt_SRC-$(UCLIBC_HAS_SHA512_CRYPT_IMPL) += sha512.c sha512-crypt.c
+ libcrypt_SRC-$(UCLIBC_HAS_CRYPT_STUB) += crypt_stub.c
+ 
+ libcrypt_SRC := $(addprefix $(libcrypt_DIR)/,$(libcrypt_SRC-y))
+diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c
+index 33f98b6..b5bf9ee 100644
+--- a/libcrypt/crypt.c
++++ b/libcrypt/crypt.c
+@@ -19,6 +19,9 @@ static const struct {
+ 	const crypt_impl_f crypt_impl;
+ } crypt_impl_tab[] = {
+ 	{ "$1$",        __md5_crypt },
++#ifdef __UCLIBC_HAS_SHA512_CRYPT_IMPL__
++	{ "$6$",        __sha512_crypt },
++#endif
+ 	{ NULL,         __des_crypt },
+ };
+ 
+diff --git a/libcrypt/libcrypt.h b/libcrypt/libcrypt.h
+index 1186620..fcad6ae 100644
+--- a/libcrypt/libcrypt.h
++++ b/libcrypt/libcrypt.h
+@@ -9,8 +9,11 @@
+ #define __LIBCRYPT_H__
+ 
+ extern char *__md5_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
++extern char *__sha512_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
+ extern char *__des_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
+ 
++extern char *__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden;
++
+ /* shut up gcc-4.x signed warnings */
+ #define strcpy(dst,src) strcpy((char*)dst,(char*)src)
+ #define strlen(s) strlen((char*)s)
+diff --git a/libcrypt/sha512-crypt.c b/libcrypt/sha512-crypt.c
+new file mode 100644
+index 0000000..0321be0
+--- /dev/null
++++ b/libcrypt/sha512-crypt.c
+@@ -0,0 +1,339 @@
++/* One way encryption based on SHA512 sum.
++   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <assert.h>
++#include <errno.h>
++#include <stdbool.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/param.h>
++
++#include "sha512.h"
++#include "libcrypt.h"
++
++/* Define our magic string to mark salt for SHA512 "encryption"
++   replacement.  */
++static const char sha512_salt_prefix[] = "$6$";
++
++/* Prefix for optional rounds specification.  */
++static const char sha512_rounds_prefix[] = "rounds=";
++
++/* Maximum salt string length.  */
++#define SALT_LEN_MAX 16
++/* Default number of rounds if not explicitly specified.  */
++#define ROUNDS_DEFAULT 5000
++/* Minimum number of rounds.  */
++#define ROUNDS_MIN 1000
++/* Maximum number of rounds.  */
++#define ROUNDS_MAX 999999999
++
++/* Table with characters for base64 transformation.  */
++static const char b64t[64] =
++"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
++
++#define B64_FROM_24BIT(b2, b1, b0, steps) \
++	{ \
++		int n = (steps); \
++		unsigned int w = ((b2) << 16) | ((b1) << 8) | (b0); \
++		while (n-- > 0 && buflen > 0) \
++		{ \
++			*cp++ = b64t[w & 0x3f]; \
++			--buflen; \
++			w >>= 6; \
++		} \
++	}
++
++char *
++__sha512_crypt_r (const char *key,
++     const char *salt,
++     char *buffer,
++     int buflen)
++{
++  unsigned char alt_result[64]
++    __attribute__ ((__aligned__ (__alignof__ (uint64_t))));
++  unsigned char temp_result[64]
++    __attribute__ ((__aligned__ (__alignof__ (uint64_t))));
++  size_t salt_len;
++  size_t key_len;
++  size_t cnt;
++  char *cp;
++  char *copied_key = NULL;
++  char *copied_salt = NULL;
++  char *p_bytes;
++  char *s_bytes;
++  /* Default number of rounds.  */
++  size_t rounds = ROUNDS_DEFAULT;
++  bool rounds_custom = false;
++
++  /* Find beginning of salt string.  The prefix should normally always
++     be present.  Just in case it is not.  */
++  if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0)
++    /* Skip salt prefix.  */
++    salt += sizeof (sha512_salt_prefix) - 1;
++
++  if (strncmp (salt, sha512_rounds_prefix, sizeof (sha512_rounds_prefix) - 1)
++      == 0)
++    {
++      const char *num = salt + sizeof (sha512_rounds_prefix) - 1;
++      char *endp;
++      unsigned long int srounds = strtoul (num, &endp, 10);
++      if (*endp == '$')
++	{
++	  salt = endp + 1;
++	  rounds = MAX (ROUNDS_MIN, MIN (srounds, ROUNDS_MAX));
++	  rounds_custom = true;
++	}
++    }
++
++  salt_len = MIN (strcspn (salt, "$"), SALT_LEN_MAX);
++  key_len = strlen (key);
++
++  if ((key - (char *) 0) % __alignof__ (uint64_t) != 0)
++    {
++      char *tmp = (char *) alloca (key_len + __alignof__ (uint64_t));
++      key = copied_key =
++	memcpy (tmp + __alignof__ (uint64_t)
++		- (tmp - (char *) 0) % __alignof__ (uint64_t),
++		key, key_len);
++      assert ((key - (char *) 0) % __alignof__ (uint64_t) == 0);
++    }
++
++  if ((salt - (char *) 0) % __alignof__ (uint64_t) != 0)
++    {
++      char *tmp = (char *) alloca (salt_len + __alignof__ (uint64_t));
++      salt = copied_salt =
++	memcpy (tmp + __alignof__ (uint64_t)
++		- (tmp - (char *) 0) % __alignof__ (uint64_t),
++		salt, salt_len);
++      assert ((salt - (char *) 0) % __alignof__ (uint64_t) == 0);
++    }
++
++  struct sha512_ctx ctx;
++  struct sha512_ctx alt_ctx;
++
++  /* Prepare for the real work.  */
++  __sha512_init_ctx (&ctx);
++
++  /* Add the key string.  */
++  __sha512_process_bytes (key, key_len, &ctx);
++
++  /* The last part is the salt string.  This must be at most 16
++     characters and it ends at the first `$' character.  */
++  __sha512_process_bytes (salt, salt_len, &ctx);
++
++
++  /* Compute alternate SHA512 sum with input KEY, SALT, and KEY.  The
++     final result will be added to the first context.  */
++  __sha512_init_ctx (&alt_ctx);
++
++  /* Add key.  */
++  __sha512_process_bytes (key, key_len, &alt_ctx);
++
++  /* Add salt.  */
++  __sha512_process_bytes (salt, salt_len, &alt_ctx);
++
++  /* Add key again.  */
++  __sha512_process_bytes (key, key_len, &alt_ctx);
++
++  /* Now get result of this (64 bytes) and add it to the other
++     context.  */
++  __sha512_finish_ctx (&alt_ctx, alt_result);
++
++  /* Add for any character in the key one byte of the alternate sum.  */
++  for (cnt = key_len; cnt > 64; cnt -= 64)
++    __sha512_process_bytes (alt_result, 64, &ctx);
++
++  __sha512_process_bytes (alt_result, cnt, &ctx);
++
++  /* Take the binary representation of the length of the key and for every
++     1 add the alternate sum, for every 0 the key.  */
++  for (cnt = key_len; cnt > 0; cnt >>= 1)
++    if ((cnt & 1) != 0)
++      __sha512_process_bytes (alt_result, 64, &ctx);
++    else
++      __sha512_process_bytes (key, key_len, &ctx);
++
++  /* Create intermediate result.  */
++  __sha512_finish_ctx (&ctx, alt_result);
++
++  /* Start computation of P byte sequence.  */
++  __sha512_init_ctx (&alt_ctx);
++
++  /* For every character in the password add the entire password.  */
++  for (cnt = 0; cnt < key_len; ++cnt)
++    __sha512_process_bytes (key, key_len, &alt_ctx);
++
++  /* Finish the digest.  */
++  __sha512_finish_ctx (&alt_ctx, temp_result);
++
++  /* Create byte sequence P.  */
++  cp = p_bytes = alloca (key_len);
++  for (cnt = key_len; cnt >= 64; cnt -= 64)
++    cp = mempcpy (cp, temp_result, 64);
++  memcpy (cp, temp_result, cnt);
++
++  /* Start computation of S byte sequence.  */
++  __sha512_init_ctx (&alt_ctx);
++
++  /* For every character in the password add the entire password.  */
++  for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
++    __sha512_process_bytes (salt, salt_len, &alt_ctx);
++
++  /* Finish the digest.  */
++  __sha512_finish_ctx (&alt_ctx, temp_result);
++
++  /* Create byte sequence S.  */
++  cp = s_bytes = alloca (salt_len);
++  for (cnt = salt_len; cnt >= 64; cnt -= 64)
++    cp = mempcpy (cp, temp_result, 64);
++  memcpy (cp, temp_result, cnt);
++
++  /* Repeatedly run the collected hash value through SHA512 to burn
++     CPU cycles.  */
++  for (cnt = 0; cnt < rounds; ++cnt)
++    {
++      /* New context.  */
++      __sha512_init_ctx (&ctx);
++
++      /* Add key or last result.  */
++      if ((cnt & 1) != 0)
++	__sha512_process_bytes (p_bytes, key_len, &ctx);
++      else
++	__sha512_process_bytes (alt_result, 64, &ctx);
++
++      /* Add salt for numbers not divisible by 3.  */
++      if (cnt % 3 != 0)
++	__sha512_process_bytes (s_bytes, salt_len, &ctx);
++
++      /* Add key for numbers not divisible by 7.  */
++      if (cnt % 7 != 0)
++	__sha512_process_bytes (p_bytes, key_len, &ctx);
++
++      /* Add key or last result.  */
++      if ((cnt & 1) != 0)
++	__sha512_process_bytes (alt_result, 64, &ctx);
++      else
++	__sha512_process_bytes (p_bytes, key_len, &ctx);
++
++      /* Create intermediate result.  */
++      __sha512_finish_ctx (&ctx, alt_result);
++    }
++
++  /* Now we can construct the result string.  It consists of three
++     parts.  */
++  cp = stpncpy (buffer, sha512_salt_prefix, MAX (0, buflen));
++  buflen -= sizeof (sha512_salt_prefix) - 1;
++
++  if (rounds_custom)
++    {
++      int n = snprintf (cp, MAX (0, buflen), "%s%zu$",
++			sha512_rounds_prefix, rounds);
++      cp += n;
++      buflen -= n;
++    }
++
++  cp = stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len));
++  buflen -= MIN ((size_t) MAX (0, buflen), salt_len);
++
++  if (buflen > 0)
++    {
++      *cp++ = '$';
++      --buflen;
++    }
++
++  B64_FROM_24BIT (alt_result[0], alt_result[21], alt_result[42], 4);
++  B64_FROM_24BIT (alt_result[22], alt_result[43], alt_result[1], 4);
++  B64_FROM_24BIT (alt_result[44], alt_result[2], alt_result[23], 4);
++  B64_FROM_24BIT (alt_result[3], alt_result[24], alt_result[45], 4);
++  B64_FROM_24BIT (alt_result[25], alt_result[46], alt_result[4], 4);
++  B64_FROM_24BIT (alt_result[47], alt_result[5], alt_result[26], 4);
++  B64_FROM_24BIT (alt_result[6], alt_result[27], alt_result[48], 4);
++  B64_FROM_24BIT (alt_result[28], alt_result[49], alt_result[7], 4);
++  B64_FROM_24BIT (alt_result[50], alt_result[8], alt_result[29], 4);
++  B64_FROM_24BIT (alt_result[9], alt_result[30], alt_result[51], 4);
++  B64_FROM_24BIT (alt_result[31], alt_result[52], alt_result[10], 4);
++  B64_FROM_24BIT (alt_result[53], alt_result[11], alt_result[32], 4);
++  B64_FROM_24BIT (alt_result[12], alt_result[33], alt_result[54], 4);
++  B64_FROM_24BIT (alt_result[34], alt_result[55], alt_result[13], 4);
++  B64_FROM_24BIT (alt_result[56], alt_result[14], alt_result[35], 4);
++  B64_FROM_24BIT (alt_result[15], alt_result[36], alt_result[57], 4);
++  B64_FROM_24BIT (alt_result[37], alt_result[58], alt_result[16], 4);
++  B64_FROM_24BIT (alt_result[59], alt_result[17], alt_result[38], 4);
++  B64_FROM_24BIT (alt_result[18], alt_result[39], alt_result[60], 4);
++  B64_FROM_24BIT (alt_result[40], alt_result[61], alt_result[19], 4);
++  B64_FROM_24BIT (alt_result[62], alt_result[20], alt_result[41], 4);
++  B64_FROM_24BIT (0, 0, alt_result[63], 2);
++
++  if (buflen <= 0)
++    {
++      __set_errno (ERANGE);
++      buffer = NULL;
++    }
++  else
++    *cp = '\0';		/* Terminate the string.  */
++
++  /* Clear the buffer for the intermediate result so that people
++     attaching to processes or reading core dumps cannot get any
++     information.  We do it in this way to clear correct_words[]
++     inside the SHA512 implementation as well.  */
++  __sha512_init_ctx (&ctx);
++  __sha512_finish_ctx (&ctx, alt_result);
++  memset (&ctx, '\0', sizeof (ctx));
++  memset (&alt_ctx, '\0', sizeof (alt_ctx));
++
++  memset (temp_result, '\0', sizeof (temp_result));
++  memset (p_bytes, '\0', key_len);
++  memset (s_bytes, '\0', salt_len);
++  if (copied_key != NULL)
++    memset (copied_key, '\0', key_len);
++  if (copied_salt != NULL)
++    memset (copied_salt, '\0', salt_len);
++
++  return buffer;
++}
++
++static char *buffer;
++
++/* This entry point is equivalent to the `crypt' function in Unix
++   libcs.  */
++char *
++__sha512_crypt (const unsigned char *key, const unsigned char *salt)
++{
++  /* We don't want to have an arbitrary limit in the size of the
++     password.  We can compute an upper bound for the size of the
++     result in advance and so we can prepare the buffer we pass to
++     `sha512_crypt_r'.  */
++  static int buflen;
++  int needed = (sizeof (sha512_salt_prefix) - 1
++		+ sizeof (sha512_rounds_prefix) + 9 + 1
++		+ strlen (salt) + 1 + 86 + 1);
++
++  if (buflen < needed)
++    {
++      char *new_buffer = (char *) realloc (buffer, needed);
++      if (new_buffer == NULL)
++	return NULL;
++
++      buffer = new_buffer;
++      buflen = needed;
++    }
++
++  return __sha512_crypt_r ((const char *) key, (const char *) salt, buffer, buflen);
++}
+diff --git a/libcrypt/sha512.c b/libcrypt/sha512.c
+new file mode 100644
+index 0000000..04e0a06
+--- /dev/null
++++ b/libcrypt/sha512.c
+@@ -0,0 +1,326 @@
++/* Functions to compute SHA512 message digest of files or memory blocks.
++   according to the definition of SHA512 in FIPS 180-2.
++   Copyright (C) 2007 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++/* Written by Ulrich Drepper <drepper@redhat.com>, 2007.  */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include <endian.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
++
++#include "sha512.h"
++
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++# ifdef _LIBC
++#  include <byteswap.h>
++#  define SWAP(n) bswap_64 (n)
++# else
++#  define SWAP(n) \
++  (((n) << 56)					\
++   | (((n) & 0xff00) << 40)			\
++   | (((n) & 0xff0000) << 24)			\
++   | (((n) & 0xff000000) << 8)			\
++   | (((n) >> 8) & 0xff000000)			\
++   | (((n) >> 24) & 0xff0000)			\
++   | (((n) >> 40) & 0xff00)			\
++   | ((n) >> 56))
++# endif
++#else
++# define SWAP(n) (n)
++#endif
++
++
++/* This array contains the bytes used to pad the buffer to the next
++   64-byte boundary.  (FIPS 180-2:5.1.2)  */
++static const unsigned char fillbuf[128] = { 0x80, 0 /* , 0, 0, ...  */ };
++
++
++/* Constants for SHA512 from FIPS 180-2:4.2.3.  */
++static const uint64_t K[80] =
++  {
++    UINT64_C (0x428a2f98d728ae22), UINT64_C (0x7137449123ef65cd),
++    UINT64_C (0xb5c0fbcfec4d3b2f), UINT64_C (0xe9b5dba58189dbbc),
++    UINT64_C (0x3956c25bf348b538), UINT64_C (0x59f111f1b605d019),
++    UINT64_C (0x923f82a4af194f9b), UINT64_C (0xab1c5ed5da6d8118),
++    UINT64_C (0xd807aa98a3030242), UINT64_C (0x12835b0145706fbe),
++    UINT64_C (0x243185be4ee4b28c), UINT64_C (0x550c7dc3d5ffb4e2),
++    UINT64_C (0x72be5d74f27b896f), UINT64_C (0x80deb1fe3b1696b1),
++    UINT64_C (0x9bdc06a725c71235), UINT64_C (0xc19bf174cf692694),
++    UINT64_C (0xe49b69c19ef14ad2), UINT64_C (0xefbe4786384f25e3),
++    UINT64_C (0x0fc19dc68b8cd5b5), UINT64_C (0x240ca1cc77ac9c65),
++    UINT64_C (0x2de92c6f592b0275), UINT64_C (0x4a7484aa6ea6e483),
++    UINT64_C (0x5cb0a9dcbd41fbd4), UINT64_C (0x76f988da831153b5),
++    UINT64_C (0x983e5152ee66dfab), UINT64_C (0xa831c66d2db43210),
++    UINT64_C (0xb00327c898fb213f), UINT64_C (0xbf597fc7beef0ee4),
++    UINT64_C (0xc6e00bf33da88fc2), UINT64_C (0xd5a79147930aa725),
++    UINT64_C (0x06ca6351e003826f), UINT64_C (0x142929670a0e6e70),
++    UINT64_C (0x27b70a8546d22ffc), UINT64_C (0x2e1b21385c26c926),
++    UINT64_C (0x4d2c6dfc5ac42aed), UINT64_C (0x53380d139d95b3df),
++    UINT64_C (0x650a73548baf63de), UINT64_C (0x766a0abb3c77b2a8),
++    UINT64_C (0x81c2c92e47edaee6), UINT64_C (0x92722c851482353b),
++    UINT64_C (0xa2bfe8a14cf10364), UINT64_C (0xa81a664bbc423001),
++    UINT64_C (0xc24b8b70d0f89791), UINT64_C (0xc76c51a30654be30),
++    UINT64_C (0xd192e819d6ef5218), UINT64_C (0xd69906245565a910),
++    UINT64_C (0xf40e35855771202a), UINT64_C (0x106aa07032bbd1b8),
++    UINT64_C (0x19a4c116b8d2d0c8), UINT64_C (0x1e376c085141ab53),
++    UINT64_C (0x2748774cdf8eeb99), UINT64_C (0x34b0bcb5e19b48a8),
++    UINT64_C (0x391c0cb3c5c95a63), UINT64_C (0x4ed8aa4ae3418acb),
++    UINT64_C (0x5b9cca4f7763e373), UINT64_C (0x682e6ff3d6b2b8a3),
++    UINT64_C (0x748f82ee5defb2fc), UINT64_C (0x78a5636f43172f60),
++    UINT64_C (0x84c87814a1f0ab72), UINT64_C (0x8cc702081a6439ec),
++    UINT64_C (0x90befffa23631e28), UINT64_C (0xa4506cebde82bde9),
++    UINT64_C (0xbef9a3f7b2c67915), UINT64_C (0xc67178f2e372532b),
++    UINT64_C (0xca273eceea26619c), UINT64_C (0xd186b8c721c0c207),
++    UINT64_C (0xeada7dd6cde0eb1e), UINT64_C (0xf57d4f7fee6ed178),
++    UINT64_C (0x06f067aa72176fba), UINT64_C (0x0a637dc5a2c898a6),
++    UINT64_C (0x113f9804bef90dae), UINT64_C (0x1b710b35131c471b),
++    UINT64_C (0x28db77f523047d84), UINT64_C (0x32caab7b40c72493),
++    UINT64_C (0x3c9ebe0a15c9bebc), UINT64_C (0x431d67c49c100d4c),
++    UINT64_C (0x4cc5d4becb3e42b6), UINT64_C (0x597f299cfc657e2a),
++    UINT64_C (0x5fcb6fab3ad6faec), UINT64_C (0x6c44198c4a475817)
++  };
++
++
++/* Process LEN bytes of BUFFER, accumulating context into CTX.
++   It is assumed that LEN % 128 == 0.  */
++static void
++sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx)
++{
++  const uint64_t *words = buffer;
++  size_t nwords = len / sizeof (uint64_t);
++  uint64_t a = ctx->H[0];
++  uint64_t b = ctx->H[1];
++  uint64_t c = ctx->H[2];
++  uint64_t d = ctx->H[3];
++  uint64_t e = ctx->H[4];
++  uint64_t f = ctx->H[5];
++  uint64_t g = ctx->H[6];
++  uint64_t h = ctx->H[7];
++
++  /* First increment the byte count.  FIPS 180-2 specifies the possible
++     length of the file up to 2^128 bits.  Here we only compute the
++     number of bytes.  Do a double word increment.  */
++  ctx->total[0] += len;
++  if (ctx->total[0] < len)
++    ++ctx->total[1];
++
++  /* Process all bytes in the buffer with 128 bytes in each round of
++     the loop.  */
++  while (nwords > 0)
++    {
++      uint64_t W[80];
++      uint64_t a_save = a;
++      uint64_t b_save = b;
++      uint64_t c_save = c;
++      uint64_t d_save = d;
++      uint64_t e_save = e;
++      uint64_t f_save = f;
++      uint64_t g_save = g;
++      uint64_t h_save = h;
++
++      /* Operators defined in FIPS 180-2:4.1.2.  */
++#define Ch(x, y, z) ((x & y) ^ (~x & z))
++#define Maj(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
++#define S0(x) (CYCLIC (x, 28) ^ CYCLIC (x, 34) ^ CYCLIC (x, 39))
++#define S1(x) (CYCLIC (x, 14) ^ CYCLIC (x, 18) ^ CYCLIC (x, 41))
++#define R0(x) (CYCLIC (x, 1) ^ CYCLIC (x, 8) ^ (x >> 7))
++#define R1(x) (CYCLIC (x, 19) ^ CYCLIC (x, 61) ^ (x >> 6))
++
++      /* It is unfortunate that C does not provide an operator for
++	 cyclic rotation.  Hope the C compiler is smart enough.  */
++#define CYCLIC(w, s) ((w >> s) | (w << (64 - s)))
++
++      /* Compute the message schedule according to FIPS 180-2:6.3.2 step 2.  */
++      for (unsigned int t = 0; t < 16; ++t)
++	{
++	  W[t] = SWAP (*words);
++	  ++words;
++	}
++      for (unsigned int t = 16; t < 80; ++t)
++	W[t] = R1 (W[t - 2]) + W[t - 7] + R0 (W[t - 15]) + W[t - 16];
++
++      /* The actual computation according to FIPS 180-2:6.3.2 step 3.  */
++      for (unsigned int t = 0; t < 80; ++t)
++	{
++	  uint64_t T1 = h + S1 (e) + Ch (e, f, g) + K[t] + W[t];
++	  uint64_t T2 = S0 (a) + Maj (a, b, c);
++	  h = g;
++	  g = f;
++	  f = e;
++	  e = d + T1;
++	  d = c;
++	  c = b;
++	  b = a;
++	  a = T1 + T2;
++	}
++
++      /* Add the starting values of the context according to FIPS 180-2:6.3.2
++	 step 4.  */
++      a += a_save;
++      b += b_save;
++      c += c_save;
++      d += d_save;
++      e += e_save;
++      f += f_save;
++      g += g_save;
++      h += h_save;
++
++      /* Prepare for the next round.  */
++      nwords -= 16;
++    }
++
++  /* Put checksum in context given as argument.  */
++  ctx->H[0] = a;
++  ctx->H[1] = b;
++  ctx->H[2] = c;
++  ctx->H[3] = d;
++  ctx->H[4] = e;
++  ctx->H[5] = f;
++  ctx->H[6] = g;
++  ctx->H[7] = h;
++}
++
++
++/* Initialize structure containing state of computation.
++   (FIPS 180-2:5.3.3)  */
++void
++__sha512_init_ctx (struct sha512_ctx *ctx)
++{
++  ctx->H[0] = UINT64_C (0x6a09e667f3bcc908);
++  ctx->H[1] = UINT64_C (0xbb67ae8584caa73b);
++  ctx->H[2] = UINT64_C (0x3c6ef372fe94f82b);
++  ctx->H[3] = UINT64_C (0xa54ff53a5f1d36f1);
++  ctx->H[4] = UINT64_C (0x510e527fade682d1);
++  ctx->H[5] = UINT64_C (0x9b05688c2b3e6c1f);
++  ctx->H[6] = UINT64_C (0x1f83d9abfb41bd6b);
++  ctx->H[7] = UINT64_C (0x5be0cd19137e2179);
++
++  ctx->total[0] = ctx->total[1] = 0;
++  ctx->buflen = 0;
++}
++
++
++/* Process the remaining bytes in the internal buffer and the usual
++   prolog according to the standard and write the result to RESBUF.
++
++   IMPORTANT: On some systems it is required that RESBUF is correctly
++   aligned for a 32 bits value.  */
++void *
++__sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf)
++{
++  /* Take yet unprocessed bytes into account.  */
++  uint64_t bytes = ctx->buflen;
++  size_t pad;
++
++  /* Now count remaining bytes.  */
++  ctx->total[0] += bytes;
++  if (ctx->total[0] < bytes)
++    ++ctx->total[1];
++
++  pad = bytes >= 112 ? 128 + 112 - bytes : 112 - bytes;
++  memcpy (&ctx->buffer[bytes], fillbuf, pad);
++
++  /* Put the 128-bit file length in *bits* at the end of the buffer.  */
++  *(uint64_t *) &ctx->buffer[bytes + pad + 8] = SWAP (ctx->total[0] << 3);
++  *(uint64_t *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) |
++						  (ctx->total[0] >> 61));
++
++  /* Process last bytes.  */
++  sha512_process_block (ctx->buffer, bytes + pad + 16, ctx);
++
++  /* Put result from CTX in first 64 bytes following RESBUF.  */
++  for (unsigned int i = 0; i < 8; ++i)
++    ((uint64_t *) resbuf)[i] = SWAP (ctx->H[i]);
++
++  return resbuf;
++}
++
++
++void
++__sha512_process_bytes (const void *buffer, size_t len, struct sha512_ctx *ctx)
++{
++  /* When we already have some bits in our internal buffer concatenate
++     both inputs first.  */
++  if (ctx->buflen != 0)
++    {
++      size_t left_over = ctx->buflen;
++      size_t add = 256 - left_over > len ? len : 256 - left_over;
++
++      memcpy (&ctx->buffer[left_over], buffer, add);
++      ctx->buflen += add;
++
++      if (ctx->buflen > 128)
++	{
++	  sha512_process_block (ctx->buffer, ctx->buflen & ~127, ctx);
++
++	  ctx->buflen &= 127;
++	  /* The regions in the following copy operation cannot overlap.  */
++	  memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~127],
++		  ctx->buflen);
++	}
++
++      buffer = (const char *) buffer + add;
++      len -= add;
++    }
++
++  /* Process available complete blocks.  */
++  if (len >= 128)
++    {
++#if __GNUC__ >= 2
++# define UNALIGNED_P(p) (((uintptr_t) p) % __alignof__ (uint64_t) != 0)
++#else
++# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint64_t) != 0)
++#endif
++      if (UNALIGNED_P (buffer))
++	while (len > 128)
++	  {
++	    sha512_process_block (memcpy (ctx->buffer, buffer, 128), 128,
++				    ctx);
++	    buffer = (const char *) buffer + 128;
++	    len -= 128;
++	  }
++      else
++	{
++	  sha512_process_block (buffer, len & ~127, ctx);
++	  buffer = (const char *) buffer + (len & ~127);
++	  len &= 127;
++	}
++    }
++
++  /* Move remaining bytes into internal buffer.  */
++  if (len > 0)
++    {
++      size_t left_over = ctx->buflen;
++
++      memcpy (&ctx->buffer[left_over], buffer, len);
++      left_over += len;
++      if (left_over >= 128)
++	{
++	  sha512_process_block (ctx->buffer, 128, ctx);
++	  left_over -= 128;
++	  memcpy (ctx->buffer, &ctx->buffer[128], left_over);
++	}
++      ctx->buflen = left_over;
++    }
++}
+diff --git a/libcrypt/sha512.h b/libcrypt/sha512.h
+new file mode 100644
+index 0000000..5777827
+--- /dev/null
++++ b/libcrypt/sha512.h
+@@ -0,0 +1,58 @@
++/* Declaration of functions and data types used for SHA512 sum computing
++   library functions.
++   Copyright (C) 2007 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#ifndef _SHA512_H
++#define _SHA512_H 1
++
++#include <limits.h>
++#include <stdint.h>
++#include <stdio.h>
++
++
++/* Structure to save state of computation between the single steps.  */
++struct sha512_ctx
++{
++  uint64_t H[8];
++
++  uint64_t total[2];
++  uint64_t buflen;
++  char buffer[256] __attribute__ ((__aligned__ (__alignof__ (uint64_t))));
++};
++
++/* Initialize structure containing state of computation.
++   (FIPS 180-2: 5.3.3)  */
++extern void __sha512_init_ctx (struct sha512_ctx *ctx) attribute_hidden;
++
++/* Starting with the result of former calls of this function (or the
++   initialization function update the context for the next LEN bytes
++   starting at BUFFER.
++   It is NOT required that LEN is a multiple of 128.  */
++extern void __sha512_process_bytes (const void *buffer, size_t len,
++				    struct sha512_ctx *ctx) attribute_hidden;
++
++/* Process the remaining bytes in the buffer and put result from CTX
++   in first 64 bytes following RESBUF.
++
++   IMPORTANT: On some systems it is required that RESBUF is correctly
++   aligned for a 64 bits value.  */
++extern void *__sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf)
++  attribute_hidden;
++
++#endif /* sha512.h */
+-- 
+1.7.8
+
diff --git a/main/libc0.9.32/0021-libcrypt-add-support-for-SHA256-CRYPT-password-hashi.patch b/main/libc0.9.32/0021-libcrypt-add-support-for-SHA256-CRYPT-password-hashi.patch
new file mode 100644
index 000000000..b49e6da81
--- /dev/null
+++ b/main/libc0.9.32/0021-libcrypt-add-support-for-SHA256-CRYPT-password-hashi.patch
@@ -0,0 +1,789 @@
+From 243a437f9345fd7182bb4b2f60d892cc86794e8d Mon Sep 17 00:00:00 2001
+From: William Pitcock <nenolod@dereferenced.org>
+Date: Mon, 19 Dec 2011 01:25:09 -0600
+Subject: [PATCH] libcrypt: add support for SHA256-CRYPT password hashing
+
+This is based on Ulrich Drepper's implementation in GLIBC, but hacked up to work
+in uClibc.  The differences from the GLIBC version are as follows:
+
+- b64_from_24bit() has been converted into a macro
+- Usage of GLIBC-isms (such as libc_freeres_ptr) have been removed
+
+It is enabled by the UCLIBC_HAS_SHA256_CRYPT_IMPL configuration symbol.  You must
+have UCLIBC_HAS_CRYPT_IMPL enabled as well.
+
+Signed-off-by: William Pitcock <nenolod@dereferenced.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+(cherry picked from commit 3ac5fd7ecaeb6721d812c2b93e446bf9a31acdde)
+---
+ extra/Configs/Config.in |    7 +
+ libcrypt/Makefile.in    |    1 +
+ libcrypt/crypt.c        |    3 +
+ libcrypt/libcrypt.h     |    2 +
+ libcrypt/sha256-crypt.c |  326 +++++++++++++++++++++++++++++++++++++++++++++++
+ libcrypt/sha256.c       |  294 ++++++++++++++++++++++++++++++++++++++++++
+ libcrypt/sha256.h       |   58 +++++++++
+ 7 files changed, 691 insertions(+), 0 deletions(-)
+ create mode 100644 libcrypt/sha256-crypt.c
+ create mode 100644 libcrypt/sha256.c
+ create mode 100644 libcrypt/sha256.h
+
+diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
+index eec3ee9..66e4efb 100644
+--- a/extra/Configs/Config.in
++++ b/extra/Configs/Config.in
+@@ -1137,6 +1137,13 @@ config UCLIBC_HAS_CRYPT_IMPL
+ 	help
+ 	  libcrypt contains crypt(), setkey() and encrypt()
+ 
++config UCLIBC_HAS_SHA256_CRYPT_IMPL
++	bool "libcrypt SHA256 support"
++	depends on UCLIBC_HAS_CRYPT_IMPL
++	help
++	  This adds support for SHA256 password hashing via the crypt() function.
++	  Say N here if you do not need SHA256 crypt support.
++
+ config UCLIBC_HAS_SHA512_CRYPT_IMPL
+ 	bool "libcrypt SHA512 support"
+ 	depends on UCLIBC_HAS_CRYPT_IMPL
+diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in
+index 2fceaed..94753f4 100644
+--- a/libcrypt/Makefile.in
++++ b/libcrypt/Makefile.in
+@@ -21,6 +21,7 @@ libcrypt_OUT := $(top_builddir)libcrypt
+ 
+ libcrypt_SRC-y :=
+ libcrypt_SRC-$(UCLIBC_HAS_CRYPT_IMPL) += crypt.c des.c md5.c
++libcrypt_SRC-$(UCLIBC_HAS_SHA256_CRYPT_IMPL) += sha256.c sha256-crypt.c
+ libcrypt_SRC-$(UCLIBC_HAS_SHA512_CRYPT_IMPL) += sha512.c sha512-crypt.c
+ libcrypt_SRC-$(UCLIBC_HAS_CRYPT_STUB) += crypt_stub.c
+ 
+diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c
+index b5bf9ee..188a6a0 100644
+--- a/libcrypt/crypt.c
++++ b/libcrypt/crypt.c
+@@ -19,6 +19,9 @@ static const struct {
+ 	const crypt_impl_f crypt_impl;
+ } crypt_impl_tab[] = {
+ 	{ "$1$",        __md5_crypt },
++#ifdef __UCLIBC_HAS_SHA256_CRYPT_IMPL__
++	{ "$5$",        __sha256_crypt },
++#endif
+ #ifdef __UCLIBC_HAS_SHA512_CRYPT_IMPL__
+ 	{ "$6$",        __sha512_crypt },
+ #endif
+diff --git a/libcrypt/libcrypt.h b/libcrypt/libcrypt.h
+index fcad6ae..67733d1 100644
+--- a/libcrypt/libcrypt.h
++++ b/libcrypt/libcrypt.h
+@@ -9,9 +9,11 @@
+ #define __LIBCRYPT_H__
+ 
+ extern char *__md5_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
++extern char *__sha256_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
+ extern char *__sha512_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
+ extern char *__des_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
+ 
++extern char *__sha256_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden;
+ extern char *__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden;
+ 
+ /* shut up gcc-4.x signed warnings */
+diff --git a/libcrypt/sha256-crypt.c b/libcrypt/sha256-crypt.c
+new file mode 100644
+index 0000000..4422148
+--- /dev/null
++++ b/libcrypt/sha256-crypt.c
+@@ -0,0 +1,326 @@
++/* One way encryption based on SHA256 sum.
++   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <assert.h>
++#include <errno.h>
++#include <stdbool.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/param.h>
++
++#include "sha256.h"
++#include "libcrypt.h"
++
++/* Define our magic string to mark salt for SHA256 "encryption"
++   replacement.  */
++static const char sha256_salt_prefix[] = "$5$";
++
++/* Prefix for optional rounds specification.  */
++static const char sha256_rounds_prefix[] = "rounds=";
++
++/* Maximum salt string length.  */
++#define SALT_LEN_MAX 16
++/* Default number of rounds if not explicitly specified.  */
++#define ROUNDS_DEFAULT 5000
++/* Minimum number of rounds.  */
++#define ROUNDS_MIN 1000
++/* Maximum number of rounds.  */
++#define ROUNDS_MAX 999999999
++
++/* Table with characters for base64 transformation.  */
++static const char b64t[64] =
++"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
++
++#define B64_FROM_24BIT(b2, b1, b0, steps) \
++	{ \
++		int n = (steps); \
++		unsigned int w = ((b2) << 16) | ((b1) << 8) | (b0); \
++		while (n-- > 0 && buflen > 0) \
++		{ \
++			*cp++ = b64t[w & 0x3f]; \
++			--buflen; \
++			w >>= 6; \
++		} \
++	}
++
++char *
++__sha256_crypt_r (const char *key,
++     const char *salt,
++     char *buffer,
++     int buflen)
++{
++  unsigned char alt_result[32]
++    __attribute__ ((__aligned__ (__alignof__ (uint32_t))));
++  unsigned char temp_result[32]
++    __attribute__ ((__aligned__ (__alignof__ (uint32_t))));
++  size_t salt_len;
++  size_t key_len;
++  size_t cnt;
++  char *cp;
++  char *copied_key = NULL;
++  char *copied_salt = NULL;
++  char *p_bytes;
++  char *s_bytes;
++  /* Default number of rounds.  */
++  size_t rounds = ROUNDS_DEFAULT;
++  bool rounds_custom = false;
++
++  /* Find beginning of salt string.  The prefix should normally always
++     be present.  Just in case it is not.  */
++  if (strncmp (sha256_salt_prefix, salt, sizeof (sha256_salt_prefix) - 1) == 0)
++    /* Skip salt prefix.  */
++    salt += sizeof (sha256_salt_prefix) - 1;
++
++  if (strncmp (salt, sha256_rounds_prefix, sizeof (sha256_rounds_prefix) - 1)
++      == 0)
++    {
++      const char *num = salt + sizeof (sha256_rounds_prefix) - 1;
++      char *endp;
++      unsigned long int srounds = strtoul (num, &endp, 10);
++      if (*endp == '$')
++	{
++	  salt = endp + 1;
++	  rounds = MAX (ROUNDS_MIN, MIN (srounds, ROUNDS_MAX));
++	  rounds_custom = true;
++	}
++    }
++
++  salt_len = MIN (strcspn (salt, "$"), SALT_LEN_MAX);
++  key_len = strlen (key);
++
++  if ((key - (char *) 0) % __alignof__ (uint32_t) != 0)
++    {
++      char *tmp = (char *) alloca (key_len + __alignof__ (uint32_t));
++      key = copied_key =
++	memcpy (tmp + __alignof__ (uint32_t)
++		- (tmp - (char *) 0) % __alignof__ (uint32_t),
++		key, key_len);
++      assert ((key - (char *) 0) % __alignof__ (uint32_t) == 0);
++    }
++
++  if ((salt - (char *) 0) % __alignof__ (uint32_t) != 0)
++    {
++      char *tmp = (char *) alloca (salt_len + __alignof__ (uint32_t));
++      salt = copied_salt =
++	memcpy (tmp + __alignof__ (uint32_t)
++		- (tmp - (char *) 0) % __alignof__ (uint32_t),
++		salt, salt_len);
++      assert ((salt - (char *) 0) % __alignof__ (uint32_t) == 0);
++    }
++
++  struct sha256_ctx ctx;
++  struct sha256_ctx alt_ctx;
++
++  /* Prepare for the real work.  */
++  __sha256_init_ctx (&ctx);
++
++  /* Add the key string.  */
++  __sha256_process_bytes (key, key_len, &ctx);
++
++  /* The last part is the salt string.  This must be at most 16
++     characters and it ends at the first `$' character.  */
++  __sha256_process_bytes (salt, salt_len, &ctx);
++
++
++  /* Compute alternate SHA256 sum with input KEY, SALT, and KEY.  The
++     final result will be added to the first context.  */
++  __sha256_init_ctx (&alt_ctx);
++
++  /* Add key.  */
++  __sha256_process_bytes (key, key_len, &alt_ctx);
++
++  /* Add salt.  */
++  __sha256_process_bytes (salt, salt_len, &alt_ctx);
++
++  /* Add key again.  */
++  __sha256_process_bytes (key, key_len, &alt_ctx);
++
++  /* Now get result of this (32 bytes) and add it to the other
++     context.  */
++  __sha256_finish_ctx (&alt_ctx, alt_result);
++
++  /* Add for any character in the key one byte of the alternate sum.  */
++  for (cnt = key_len; cnt > 32; cnt -= 32)
++    __sha256_process_bytes (alt_result, 32, &ctx);
++  __sha256_process_bytes (alt_result, cnt, &ctx);
++
++  /* Take the binary representation of the length of the key and for every
++     1 add the alternate sum, for every 0 the key.  */
++  for (cnt = key_len; cnt > 0; cnt >>= 1)
++    if ((cnt & 1) != 0)
++      __sha256_process_bytes (alt_result, 32, &ctx);
++    else
++      __sha256_process_bytes (key, key_len, &ctx);
++
++  /* Create intermediate result.  */
++  __sha256_finish_ctx (&ctx, alt_result);
++
++  /* Start computation of P byte sequence.  */
++  __sha256_init_ctx (&alt_ctx);
++
++  /* For every character in the password add the entire password.  */
++  for (cnt = 0; cnt < key_len; ++cnt)
++    __sha256_process_bytes (key, key_len, &alt_ctx);
++
++  /* Finish the digest.  */
++  __sha256_finish_ctx (&alt_ctx, temp_result);
++
++  /* Create byte sequence P.  */
++  cp = p_bytes = alloca (key_len);
++  for (cnt = key_len; cnt >= 32; cnt -= 32)
++    cp = mempcpy (cp, temp_result, 32);
++  memcpy (cp, temp_result, cnt);
++
++  /* Start computation of S byte sequence.  */
++  __sha256_init_ctx (&alt_ctx);
++
++  /* For every character in the password add the entire password.  */
++  for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
++    __sha256_process_bytes (salt, salt_len, &alt_ctx);
++
++  /* Finish the digest.  */
++  __sha256_finish_ctx (&alt_ctx, temp_result);
++
++  /* Create byte sequence S.  */
++  cp = s_bytes = alloca (salt_len);
++  for (cnt = salt_len; cnt >= 32; cnt -= 32)
++    cp = mempcpy (cp, temp_result, 32);
++  memcpy (cp, temp_result, cnt);
++
++  /* Repeatedly run the collected hash value through SHA256 to burn
++     CPU cycles.  */
++  for (cnt = 0; cnt < rounds; ++cnt)
++    {
++      /* New context.  */
++      __sha256_init_ctx (&ctx);
++
++      /* Add key or last result.  */
++      if ((cnt & 1) != 0)
++	__sha256_process_bytes (p_bytes, key_len, &ctx);
++      else
++	__sha256_process_bytes (alt_result, 32, &ctx);
++
++      /* Add salt for numbers not divisible by 3.  */
++      if (cnt % 3 != 0)
++	__sha256_process_bytes (s_bytes, salt_len, &ctx);
++
++      /* Add key for numbers not divisible by 7.  */
++      if (cnt % 7 != 0)
++	__sha256_process_bytes (p_bytes, key_len, &ctx);
++
++      /* Add key or last result.  */
++      if ((cnt & 1) != 0)
++	__sha256_process_bytes (alt_result, 32, &ctx);
++      else
++	__sha256_process_bytes (p_bytes, key_len, &ctx);
++
++      /* Create intermediate result.  */
++      __sha256_finish_ctx (&ctx, alt_result);
++    }
++
++  /* Now we can construct the result string.  It consists of three
++     parts.  */
++  cp = stpncpy (buffer, sha256_salt_prefix, MAX (0, buflen));
++  buflen -= sizeof (sha256_salt_prefix) - 1;
++
++  if (rounds_custom)
++    {
++      int n = snprintf (cp, MAX (0, buflen), "%s%zu$",
++			sha256_rounds_prefix, rounds);
++      cp += n;
++      buflen -= n;
++    }
++
++  cp = stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len));
++  buflen -= MIN ((size_t) MAX (0, buflen), salt_len);
++
++  if (buflen > 0)
++    {
++      *cp++ = '$';
++      --buflen;
++    }
++
++  B64_FROM_24BIT (alt_result[0], alt_result[10], alt_result[20], 4);
++  B64_FROM_24BIT (alt_result[21], alt_result[1], alt_result[11], 4);
++  B64_FROM_24BIT (alt_result[12], alt_result[22], alt_result[2], 4);
++  B64_FROM_24BIT (alt_result[3], alt_result[13], alt_result[23], 4);
++  B64_FROM_24BIT (alt_result[24], alt_result[4], alt_result[14], 4);
++  B64_FROM_24BIT (alt_result[15], alt_result[25], alt_result[5], 4);
++  B64_FROM_24BIT (alt_result[6], alt_result[16], alt_result[26], 4);
++  B64_FROM_24BIT (alt_result[27], alt_result[7], alt_result[17], 4);
++  B64_FROM_24BIT (alt_result[18], alt_result[28], alt_result[8], 4);
++  B64_FROM_24BIT (alt_result[9], alt_result[19], alt_result[29], 4);
++  B64_FROM_24BIT (0, alt_result[31], alt_result[30], 3);
++  if (buflen <= 0)
++    {
++      __set_errno (ERANGE);
++      buffer = NULL;
++    }
++  else
++    *cp = '\0';		/* Terminate the string.  */
++
++  /* Clear the buffer for the intermediate result so that people
++     attaching to processes or reading core dumps cannot get any
++     information.  We do it in this way to clear correct_words[]
++     inside the SHA256 implementation as well.  */
++  __sha256_init_ctx (&ctx);
++  __sha256_finish_ctx (&ctx, alt_result);
++  memset (&ctx, '\0', sizeof (ctx));
++  memset (&alt_ctx, '\0', sizeof (alt_ctx));
++
++  memset (temp_result, '\0', sizeof (temp_result));
++  memset (p_bytes, '\0', key_len);
++  memset (s_bytes, '\0', salt_len);
++  if (copied_key != NULL)
++    memset (copied_key, '\0', key_len);
++  if (copied_salt != NULL)
++    memset (copied_salt, '\0', salt_len);
++
++  return buffer;
++}
++
++static char *buffer;
++
++/* This entry point is equivalent to the `crypt' function in Unix
++   libcs.  */
++char *
++__sha256_crypt (const unsigned char *key, const unsigned char *salt)
++{
++  /* We don't want to have an arbitrary limit in the size of the
++     password.  We can compute an upper bound for the size of the
++     result in advance and so we can prepare the buffer we pass to
++     `sha256_crypt_r'.  */
++  static int buflen;
++  int needed = (sizeof (sha256_salt_prefix) - 1
++		+ sizeof (sha256_rounds_prefix) + 9 + 1
++		+ strlen (salt) + 1 + 43 + 1);
++
++  if (buflen < needed)
++    {
++      char *new_buffer = (char *) realloc (buffer, needed);
++      if (new_buffer == NULL)
++	return NULL;
++
++      buffer = new_buffer;
++      buflen = needed;
++    }
++
++  return __sha256_crypt_r ((const char *) key, (const char *) salt, buffer, buflen);
++}
+diff --git a/libcrypt/sha256.c b/libcrypt/sha256.c
+new file mode 100644
+index 0000000..e652a67
+--- /dev/null
++++ b/libcrypt/sha256.c
+@@ -0,0 +1,294 @@
++/* Functions to compute SHA256 message digest of files or memory blocks.
++   according to the definition of SHA256 in FIPS 180-2.
++   Copyright (C) 2007 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++/* Written by Ulrich Drepper <drepper@redhat.com>, 2007.  */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include <endian.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
++
++#include "sha256.h"
++
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++# ifdef _LIBC
++#  include <byteswap.h>
++#  define SWAP(n) bswap_32 (n)
++# else
++#  define SWAP(n) \
++    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
++# endif
++#else
++# define SWAP(n) (n)
++#endif
++
++
++/* This array contains the bytes used to pad the buffer to the next
++   64-byte boundary.  (FIPS 180-2:5.1.1)  */
++static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
++
++
++/* Constants for SHA256 from FIPS 180-2:4.2.2.  */
++static const uint32_t K[64] =
++  {
++    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
++    0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
++    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
++    0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
++    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
++    0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
++    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
++    0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
++    0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
++    0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
++    0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
++    0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
++    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
++    0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
++    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
++    0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
++  };
++
++
++/* Process LEN bytes of BUFFER, accumulating context into CTX.
++   It is assumed that LEN % 64 == 0.  */
++static void
++sha256_process_block (const void *buffer, size_t len, struct sha256_ctx *ctx)
++{
++  const uint32_t *words = buffer;
++  size_t nwords = len / sizeof (uint32_t);
++  uint32_t a = ctx->H[0];
++  uint32_t b = ctx->H[1];
++  uint32_t c = ctx->H[2];
++  uint32_t d = ctx->H[3];
++  uint32_t e = ctx->H[4];
++  uint32_t f = ctx->H[5];
++  uint32_t g = ctx->H[6];
++  uint32_t h = ctx->H[7];
++
++  /* First increment the byte count.  FIPS 180-2 specifies the possible
++     length of the file up to 2^64 bits.  Here we only compute the
++     number of bytes.  Do a double word increment.  */
++  ctx->total[0] += len;
++  if (ctx->total[0] < len)
++    ++ctx->total[1];
++
++  /* Process all bytes in the buffer with 64 bytes in each round of
++     the loop.  */
++  while (nwords > 0)
++    {
++      uint32_t W[64];
++      uint32_t a_save = a;
++      uint32_t b_save = b;
++      uint32_t c_save = c;
++      uint32_t d_save = d;
++      uint32_t e_save = e;
++      uint32_t f_save = f;
++      uint32_t g_save = g;
++      uint32_t h_save = h;
++
++      /* Operators defined in FIPS 180-2:4.1.2.  */
++#define Ch(x, y, z) ((x & y) ^ (~x & z))
++#define Maj(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
++#define S0(x) (CYCLIC (x, 2) ^ CYCLIC (x, 13) ^ CYCLIC (x, 22))
++#define S1(x) (CYCLIC (x, 6) ^ CYCLIC (x, 11) ^ CYCLIC (x, 25))
++#define R0(x) (CYCLIC (x, 7) ^ CYCLIC (x, 18) ^ (x >> 3))
++#define R1(x) (CYCLIC (x, 17) ^ CYCLIC (x, 19) ^ (x >> 10))
++
++      /* It is unfortunate that C does not provide an operator for
++	 cyclic rotation.  Hope the C compiler is smart enough.  */
++#define CYCLIC(w, s) ((w >> s) | (w << (32 - s)))
++
++      /* Compute the message schedule according to FIPS 180-2:6.2.2 step 2.  */
++      for (unsigned int t = 0; t < 16; ++t)
++	{
++	  W[t] = SWAP (*words);
++	  ++words;
++	}
++      for (unsigned int t = 16; t < 64; ++t)
++	W[t] = R1 (W[t - 2]) + W[t - 7] + R0 (W[t - 15]) + W[t - 16];
++
++      /* The actual computation according to FIPS 180-2:6.2.2 step 3.  */
++      for (unsigned int t = 0; t < 64; ++t)
++	{
++	  uint32_t T1 = h + S1 (e) + Ch (e, f, g) + K[t] + W[t];
++	  uint32_t T2 = S0 (a) + Maj (a, b, c);
++	  h = g;
++	  g = f;
++	  f = e;
++	  e = d + T1;
++	  d = c;
++	  c = b;
++	  b = a;
++	  a = T1 + T2;
++	}
++
++      /* Add the starting values of the context according to FIPS 180-2:6.2.2
++	 step 4.  */
++      a += a_save;
++      b += b_save;
++      c += c_save;
++      d += d_save;
++      e += e_save;
++      f += f_save;
++      g += g_save;
++      h += h_save;
++
++      /* Prepare for the next round.  */
++      nwords -= 16;
++    }
++
++  /* Put checksum in context given as argument.  */
++  ctx->H[0] = a;
++  ctx->H[1] = b;
++  ctx->H[2] = c;
++  ctx->H[3] = d;
++  ctx->H[4] = e;
++  ctx->H[5] = f;
++  ctx->H[6] = g;
++  ctx->H[7] = h;
++}
++
++
++/* Initialize structure containing state of computation.
++   (FIPS 180-2:5.3.2)  */
++void
++__sha256_init_ctx (struct sha256_ctx *ctx)
++{
++  ctx->H[0] = 0x6a09e667;
++  ctx->H[1] = 0xbb67ae85;
++  ctx->H[2] = 0x3c6ef372;
++  ctx->H[3] = 0xa54ff53a;
++  ctx->H[4] = 0x510e527f;
++  ctx->H[5] = 0x9b05688c;
++  ctx->H[6] = 0x1f83d9ab;
++  ctx->H[7] = 0x5be0cd19;
++
++  ctx->total[0] = ctx->total[1] = 0;
++  ctx->buflen = 0;
++}
++
++
++/* Process the remaining bytes in the internal buffer and the usual
++   prolog according to the standard and write the result to RESBUF.
++
++   IMPORTANT: On some systems it is required that RESBUF is correctly
++   aligned for a 32 bits value.  */
++void *
++__sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf)
++{
++  /* Take yet unprocessed bytes into account.  */
++  uint32_t bytes = ctx->buflen;
++  size_t pad;
++
++  /* Now count remaining bytes.  */
++  ctx->total[0] += bytes;
++  if (ctx->total[0] < bytes)
++    ++ctx->total[1];
++
++  pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
++  memcpy (&ctx->buffer[bytes], fillbuf, pad);
++
++  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
++  *(uint32_t *) &ctx->buffer[bytes + pad + 4] = SWAP (ctx->total[0] << 3);
++  *(uint32_t *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) |
++						  (ctx->total[0] >> 29));
++
++  /* Process last bytes.  */
++  sha256_process_block (ctx->buffer, bytes + pad + 8, ctx);
++
++  /* Put result from CTX in first 32 bytes following RESBUF.  */
++  for (unsigned int i = 0; i < 8; ++i)
++    ((uint32_t *) resbuf)[i] = SWAP (ctx->H[i]);
++
++  return resbuf;
++}
++
++
++void
++__sha256_process_bytes (const void *buffer, size_t len, struct sha256_ctx *ctx)
++{
++  /* When we already have some bits in our internal buffer concatenate
++     both inputs first.  */
++  if (ctx->buflen != 0)
++    {
++      size_t left_over = ctx->buflen;
++      size_t add = 128 - left_over > len ? len : 128 - left_over;
++
++      memcpy (&ctx->buffer[left_over], buffer, add);
++      ctx->buflen += add;
++
++      if (ctx->buflen > 64)
++	{
++	  sha256_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
++
++	  ctx->buflen &= 63;
++	  /* The regions in the following copy operation cannot overlap.  */
++	  memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63],
++		  ctx->buflen);
++	}
++
++      buffer = (const char *) buffer + add;
++      len -= add;
++    }
++
++  /* Process available complete blocks.  */
++  if (len >= 64)
++    {
++#if __GNUC__ >= 2
++# define UNALIGNED_P(p) (((uintptr_t) p) % __alignof__ (uint32_t) != 0)
++#else
++# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint32_t) != 0)
++#endif
++      if (UNALIGNED_P (buffer))
++	while (len > 64)
++	  {
++	    sha256_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
++	    buffer = (const char *) buffer + 64;
++	    len -= 64;
++	  }
++      else
++	{
++	  sha256_process_block (buffer, len & ~63, ctx);
++	  buffer = (const char *) buffer + (len & ~63);
++	  len &= 63;
++	}
++    }
++
++  /* Move remaining bytes into internal buffer.  */
++  if (len > 0)
++    {
++      size_t left_over = ctx->buflen;
++
++      memcpy (&ctx->buffer[left_over], buffer, len);
++      left_over += len;
++      if (left_over >= 64)
++	{
++	  sha256_process_block (ctx->buffer, 64, ctx);
++	  left_over -= 64;
++	  memcpy (ctx->buffer, &ctx->buffer[64], left_over);
++	}
++      ctx->buflen = left_over;
++    }
++}
+diff --git a/libcrypt/sha256.h b/libcrypt/sha256.h
+new file mode 100644
+index 0000000..291674f
+--- /dev/null
++++ b/libcrypt/sha256.h
+@@ -0,0 +1,58 @@
++/* Declaration of functions and data types used for SHA256 sum computing
++   library functions.
++   Copyright (C) 2007 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#ifndef _SHA256_H
++#define _SHA256_H 1
++
++#include <limits.h>
++#include <stdint.h>
++#include <stdio.h>
++
++
++/* Structure to save state of computation between the single steps.  */
++struct sha256_ctx
++{
++  uint32_t H[8];
++
++  uint32_t total[2];
++  uint32_t buflen;
++  char buffer[128] __attribute__ ((__aligned__ (__alignof__ (uint32_t))));
++};
++
++/* Initialize structure containing state of computation.
++   (FIPS 180-2: 5.3.2)  */
++extern void __sha256_init_ctx (struct sha256_ctx *ctx) attribute_hidden;
++
++/* Starting with the result of former calls of this function (or the
++   initialization function update the context for the next LEN bytes
++   starting at BUFFER.
++   It is NOT required that LEN is a multiple of 64.  */
++extern void __sha256_process_bytes (const void *buffer, size_t len,
++				    struct sha256_ctx *ctx) attribute_hidden;
++
++/* Process the remaining bytes in the buffer and put result from CTX
++   in first 32 bytes following RESBUF.
++
++   IMPORTANT: On some systems it is required that RESBUF is correctly
++   aligned for a 32 bits value.  */
++extern void *__sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf)
++  attribute_hidden;
++
++#endif /* sha256.h */
+-- 
+1.7.8
+
diff --git a/main/libc0.9.32/uclibc-eventfd.patch b/main/libc0.9.32/0022-Add-eventfd-support.patch
index 1525366c3..d42da0120 100644
--- a/main/libc0.9.32/uclibc-eventfd.patch
+++ b/main/libc0.9.32/0022-Add-eventfd-support.patch
@@ -1,28 +1,7 @@
-From: jc@eclis.ch
-To: uclibc@uclibc.org
-Subject: [PATCH 1/1] Add eventfd support.
-Date: Mon, 24 Oct 2011 19:07:43 +0200
-Message-Id: <1319476064-32442-1-git-send-email-jc@eclis.ch>
-X-Mailer: git-send-email 1.7.2.5
-X-BeenThere: uclibc@uclibc.org
-X-Mailman-Version: 2.1.14
-Precedence: list
-List-Id: "Discussion and development of uClibc \(the embedded C library\)"
- <uclibc.uclibc.org>
-List-Unsubscribe: <http://lists.busybox.net/mailman/options/uclibc>,
- <mailto:uclibc-request@uclibc.org?subject=unsubscribe>
-List-Archive: <http://lists.busybox.net/pipermail/uclibc>
-List-Post: <mailto:uclibc@uclibc.org>
-List-Help: <mailto:uclibc-request@uclibc.org?subject=help>
-List-Subscribe: <http://lists.busybox.net/mailman/listinfo/uclibc>,
- <mailto:uclibc-request@uclibc.org?subject=subscribe>
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Errors-To: uclibc-bounces@uclibc.org
-Sender: uclibc-bounces@uclibc.org
-
+From 000e9aca3ee3f07c934a154fd375c5f3c7f9cc80 Mon Sep 17 00:00:00 2001
 From: Jean-Christian de Rivaz <jc@eclis.ch>
+Date: Mon, 24 Oct 2011 19:07:43 +0200
+Subject: [PATCH] Add eventfd support.
 
 Hello,
 
@@ -32,6 +11,8 @@ uClibc. Please review so it can be accepted to be merged.
 Jean-Christian
 
 Signed-off-by: Jean-Christian de Rivaz <jc@eclis.ch>
+Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
+(cherry picked from commit 9ed163dc0eaebe8734c35b356c406e9eb1c68d76)
 ---
  libc/sysdeps/linux/common/Makefile.in   |    3 +-
  libc/sysdeps/linux/common/eventfd.c     |   18 +++++++++++
@@ -133,9 +114,5 @@ index 0000000..311f803
 +
 +#endif /* sys/eventfd.h */
 -- 
-1.7.2.5
+1.7.8
 
-_______________________________________________
-uClibc mailing list
-uClibc@uclibc.org
-http://lists.busybox.net/mailman/listinfo/uclibc
diff --git a/main/libc0.9.32/0023-crypt-build-fix.-define-ARRAY_SIZE-macro.patch b/main/libc0.9.32/0023-crypt-build-fix.-define-ARRAY_SIZE-macro.patch
new file mode 100644
index 000000000..623f93a6b
--- /dev/null
+++ b/main/libc0.9.32/0023-crypt-build-fix.-define-ARRAY_SIZE-macro.patch
@@ -0,0 +1,26 @@
+From b7300840e0285239351e33fa613898fbb079efd7 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 23 Dec 2011 16:24:52 +0100
+Subject: [PATCH] crypt: build fix. define ARRAY_SIZE macro
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ libcrypt/crypt.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c
+index 188a6a0..19f14d9 100644
+--- a/libcrypt/crypt.c
++++ b/libcrypt/crypt.c
+@@ -12,6 +12,8 @@
+ #include <errno.h>
+ #include "libcrypt.h"
+ 
++#define ARRAY_SIZE(v) (sizeof(v) / sizeof((v)[0]))
++
+ typedef char *(*crypt_impl_f)(const unsigned char *pw, const unsigned char *salt);
+ 
+ static const struct {
+-- 
+1.7.8
+
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index 9d09101f5..6c6185ec7 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -4,7 +4,7 @@ pkgname=libc$_abiver
 _gitver=
 pkgver=0.9.32
 _ver=${pkgver/_/-}
-pkgrel=9
+pkgrel=15
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
 license="LGPL-2"
@@ -19,32 +19,41 @@ triggers="uclibc-utils.trigger=/lib:/usr/lib"
 
 _snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2"
 _snapfile="$pkgname-$pkgver.tar.bz2"
+
+# patches are tracked in http://git.alpinelinux.org/cgit/uClibc-alpine/
+# branch 0.9.32-alpine
+
 source="http://uclibc.org/downloads/uClibc-${_ver}.tar.bz2
-	compat-stack-guard.patch
-	uclibc-resolv-cname-fix.diff
-	uclibc-resolv-fix-memory-leak.patch
-	0001-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch
-	0001-libm-x86_64-implement-some-fenv-functions.patch
-	0001-ldso-limited-support-for-ORIGIN-in-rpath.patch
-	0002-stdlib-fix-arc4random-return-type-to-u_int32_t.patch
-	0003-ldso-support-RTLD_NOLOAD.patch
-	0001-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch
-	0001-malloc-standard-synchronize-on-fork.patch
-	0001-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch
-	0001-getaddrinfo-allow-numeric-service-without-any-hints.patch
-	0001-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch
-	libm-cabsf.patch
-	libm-cexp.patch
-	uclibc-ubacktrace-asneeded-fix.patch
-	uclibc-librt-asneeded-fix.patch
-	uclibc-epoll_pwait-hack.patch
+
+0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch
+0002-resolv-res_query-for-CNAMEs.patch
+0003-resolv-fix-memory-leak.patch
+0004-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch
+0005-libm-x86_64-implement-some-fenv-functions.patch
+0006-ldso-limited-support-for-ORIGIN-in-rpath.patch
+0007-stdlib-fix-arc4random-return-type-to-u_int32_t.patch
+0008-ldso-support-RTLD_NOLOAD.patch
+0009-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch
+0010-malloc-standard-synchronize-on-fork.patch
+0011-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch
+0012-getaddrinfo-allow-numeric-service-without-any-hints.patch
+0013-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch
+0014-libm-add-cabsf-and-cabsl-functions.patch
+0015-libm-implement-generic-cexp-cexpf-and-cexpl.patch
+0016-libubacktrace-use-.so.-ABI_VERSION.patch
+0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
+0018-libcrypt-do-not-cast-away-const-of-key-salt.patch
+0019-libcrypt-make-crypt-itself-more-modular.patch
+0020-libcrypt-add-support-for-SHA512-CRYPT-password-hashi.patch
+0021-libcrypt-add-support-for-SHA256-CRYPT-password-hashi.patch
+0022-Add-eventfd-support.patch
+0023-crypt-build-fix.-define-ARRAY_SIZE-macro.patch
+
 	uclibcconfig.x86
 	uclibcconfig.x86_64
 	uclibcconfig.i486
 	uclibcconfig.arm
 	uclibcconfig.powerpc
-	sha512-crypt.patch
-	uclibc-eventfd.patch
 	uclibc-utils.trigger
 	"
 
@@ -113,7 +122,7 @@ package() {
 
 dev() {
 	default_dev
-	replaces="uclibc linux-headers"
+	replaces="uclibc linux-headers fts-dev"
 	mkdir -p "$subpkgdir"/usr/lib 
 	mv "$pkgdir"/usr/lib/*.so "$subpkgdir"/usr/lib/
 }
@@ -133,29 +142,32 @@ libthread_db() {
 }
 
 md5sums="cfcb6c25d8ebe12817499d8749ee8ae1  uClibc-0.9.32.tar.bz2
-a9bfb77ea7dc5fb9abf4d4b19201c614  compat-stack-guard.patch
-5d6e3e382b66f59cfd7242a4fe453f98  uclibc-resolv-cname-fix.diff
-6bdb884bd00b053247e02b4024d33b39  uclibc-resolv-fix-memory-leak.patch
-08f31006426a0fca561f262f36bcfb01  0001-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch
-68913d6f096fd647e8bdb7ef182c05a4  0001-libm-x86_64-implement-some-fenv-functions.patch
-bc164e262c5feab55c800780704fa71c  0001-ldso-limited-support-for-ORIGIN-in-rpath.patch
-b4fb68ad3d0e8331b1b40c30eb21dfdc  0002-stdlib-fix-arc4random-return-type-to-u_int32_t.patch
-6147efd2eee5af5e734896823c2d1a3d  0003-ldso-support-RTLD_NOLOAD.patch
-3e151ae3d3613dff9296d166aca3a800  0001-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch
-30f27fe51fdc4d121166ad2af18dfb8d  0001-malloc-standard-synchronize-on-fork.patch
-2548d9f470c9a5b2c117ec3d6f35c105  0001-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch
-9e1ffc8dae55f4489c770f284734804f  0001-getaddrinfo-allow-numeric-service-without-any-hints.patch
-e814d39ab0adab58d69396ac0b9acdea  0001-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch
-40e9c7f017cc81ee5b19ead000b9b6b7  libm-cabsf.patch
-42416385763f7cd50775ed9bfaf2d59e  libm-cexp.patch
-7c47e9cb284b0da8df6ed2096b2c9c66  uclibc-ubacktrace-asneeded-fix.patch
-e5caf13c43ee8d48f22eded21b857d81  uclibc-librt-asneeded-fix.patch
-0ed588014227935fbb83b207282f3c15  uclibc-epoll_pwait-hack.patch
-b313290b2d700e82b7292c1dcd7d559e  uclibcconfig.x86
-8e49d9b5bb7b77a27beb53d5580367d5  uclibcconfig.x86_64
-b313290b2d700e82b7292c1dcd7d559e  uclibcconfig.i486
-0a0ec8a921773bf28ec8253f85166421  uclibcconfig.arm
-3b1dc51e9e887485c9e946e7def68fce  uclibcconfig.powerpc
-436bf7bea962b477bb93119514c90c9b  sha512-crypt.patch
-26dd7611fda4d29f3dc4a7cf24916931  uclibc-eventfd.patch
+11c206cd4be86514dd9abd811429ad06  0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch
+b905f5f0f27348cc91019275dcff51cb  0002-resolv-res_query-for-CNAMEs.patch
+208f6ea0a97f2940319456d32549bfc5  0003-resolv-fix-memory-leak.patch
+0f082e4b209bb83feb57a4a7dd8c2eb6  0004-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch
+8573d00e91395779c50af23c6aeb6fc5  0005-libm-x86_64-implement-some-fenv-functions.patch
+31da620ecb3894fa6d76ef624cd264bb  0006-ldso-limited-support-for-ORIGIN-in-rpath.patch
+afafe88bca1ffc1d4eb49de813c39c5b  0007-stdlib-fix-arc4random-return-type-to-u_int32_t.patch
+779dbc9f04ad0c005ec4ea6b6ffff8ff  0008-ldso-support-RTLD_NOLOAD.patch
+f0fc6dbeb1467812085b60a49654a955  0009-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch
+a1c5871c3b799cce8d1dfcf8ca0f3743  0010-malloc-standard-synchronize-on-fork.patch
+b2c09cdfc3116c6236dbe96697241a59  0011-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch
+ddd3073f1a2696c1a9b40bfa81bfa5bf  0012-getaddrinfo-allow-numeric-service-without-any-hints.patch
+78cdafafc99007da8cbdf8d2f841ea47  0013-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch
+63af22efb20d9dfd3cb10bc9900f1615  0014-libm-add-cabsf-and-cabsl-functions.patch
+7158d0ae15ca742cc1577b47735751df  0015-libm-implement-generic-cexp-cexpf-and-cexpl.patch
+ecca599d286ff18afa7f64ab614e88ff  0016-libubacktrace-use-.so.-ABI_VERSION.patch
+430b286df16f21cc4b46b6f1894cd834  0017-Fix-__libc_epoll_pwait-compile-failure-on-x86.patch
+57562e6688dcbcf708d574de81debf7e  0018-libcrypt-do-not-cast-away-const-of-key-salt.patch
+028d8279da6c44457a8a8de4e1e6de36  0019-libcrypt-make-crypt-itself-more-modular.patch
+ebf59b00af0a0c44a5992403255a6582  0020-libcrypt-add-support-for-SHA512-CRYPT-password-hashi.patch
+2744db828eb9a0e8a1e01b2ca9d083a5  0021-libcrypt-add-support-for-SHA256-CRYPT-password-hashi.patch
+e5bb17073c83dcdb972bf22657ca4cc7  0022-Add-eventfd-support.patch
+efafd82e78291171392d4706b80a2fb3  0023-crypt-build-fix.-define-ARRAY_SIZE-macro.patch
+0e40006f3c284a27313e0d54f91452e2  uclibcconfig.x86
+f6aee6bcbc43dcbfcaaba7be244ad368  uclibcconfig.x86_64
+0e40006f3c284a27313e0d54f91452e2  uclibcconfig.i486
+8ae78c9ab4bd7b1223c29c335c76a8c5  uclibcconfig.arm
+70fcde1955810a2369c023b293bae5c5  uclibcconfig.powerpc
 f3be4f2bc54d7561d252937e10abf0d2  uclibc-utils.trigger"
diff --git a/main/libc0.9.32/STATUS b/main/libc0.9.32/STATUS
index 10bea6532..fed3f3877 100644
--- a/main/libc0.9.32/STATUS
+++ b/main/libc0.9.32/STATUS
@@ -61,10 +61,6 @@ uclibc-eventfd.patch -
 	Origin: External
 	Patch with same effect is upstreamed.
 
-uclibc-librt-asneeded-fix.patch -
-	Origin: Alpine
-	Upstreaming in progress.  Not sure if upstream will take it.
-
 uclibc-resolv-fix-memory-leak.patch -
 	Origin: Upstream
 	Nothing for us to do here.
diff --git a/main/libc0.9.32/sha512-crypt.patch b/main/libc0.9.32/sha512-crypt.patch
deleted file mode 100644
index 6a4b1001b..000000000
--- a/main/libc0.9.32/sha512-crypt.patch
+++ /dev/null
@@ -1,1777 +0,0 @@
-From 71ad18ce94b15cd000a3e90a0a30ee81ac1b443a Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Wed, 16 Nov 2011 05:27:48 -0600
-Subject: [PATCH 1/2] libcrypt: make crypt() more modular
-To: uclibc@uclibc.org
-
-By using a function table, we can more cleanly support new crypt
-implementations, such as SHA256 ($5$) and SHA512 ($6$).
-
-Signed-off-by: William Pitcock <nenolod@dereferenced.org>
----
- libcrypt/crypt.c |   34 ++++++++++++++++++++++++++++------
- 1 files changed, 28 insertions(+), 6 deletions(-)
-
-diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c
-index 8b361d3..28cbc70 100644
---- a/libcrypt/crypt.c
-+++ b/libcrypt/crypt.c
-@@ -8,14 +8,36 @@
- #define __FORCE_GLIBC
- #include <crypt.h>
- #include <unistd.h>
-+#include <string.h>
-+#include <syscall.h>
- #include "libcrypt.h"
- 
-+#define ARRAY_SIZE(v) (sizeof(v) / sizeof((v)[0]))
-+
-+typedef char *(*crypt_impl_f)(const unsigned char *pw, const unsigned char *salt);
-+
-+static const struct {
-+        const char *salt_pfx;
-+        const crypt_impl_f crypt_impl;
-+} crypt_impl_tab[] = {
-+	{ "$1$",	__md5_crypt },
-+	{ NULL,		__des_crypt },
-+};
-+
- char *crypt(const char *key, const char *salt)
- {
--	/* First, check if we are supposed to be using the MD5 replacement
--	 * instead of DES...  */
--	if (salt[0]=='$' && salt[1]=='1' && salt[2]=='$')
--		return __md5_crypt((unsigned char*)key, (unsigned char*)salt);
--	else
--		return __des_crypt((unsigned char*)key, (unsigned char*)salt);
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(crypt_impl_tab); i++)
-+	{
-+		if (crypt_impl_tab[i].salt_pfx &&
-+			strncmp(crypt_impl_tab[i].salt_pfx, salt, strlen(crypt_impl_tab[i].salt_pfx)))
-+			continue;
-+
-+		return crypt_impl_tab[i].crypt_impl((unsigned char *) key, (unsigned char *) salt);
-+	}
-+
-+	/* this should never happen, but just incase... */
-+	__set_errno(ENOSYS);
-+	return NULL;
- }
--- 
-1.7.7.3
-
-From 3c0ca4dcbb38987bda7981f6c876a291d3051f12 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Wed, 16 Nov 2011 05:53:34 -0600
-Subject: [PATCH 2/2] libcrypt: add support for SHA512-crypt.
-To: uclibc@uclibc.org
-
-This is based on Ulrich Drepper's implementation in GLIBC, but hacked up to work
-in uClibc.  A previous version of this patch was rejected, this is the cleaned up
-version.
-
-Signed-off-by: William Pitcock <nenolod@dereferenced.org>
----
- extra/Configs/Config.in |    6 +
- libcrypt/Makefile.in    |    1 +
- libcrypt/crypt.c        |    3 +
- libcrypt/libcrypt.h     |    3 +
- libcrypt/sha512-crypt.c |  339 +++++++++++++++++++++++++++++++++++++++++++++++
- libcrypt/sha512.c       |  326 +++++++++++++++++++++++++++++++++++++++++++++
- libcrypt/sha512.h       |   58 ++++++++
- 7 files changed, 736 insertions(+), 0 deletions(-)
- create mode 100644 libcrypt/sha512-crypt.c
- create mode 100644 libcrypt/sha512.c
- create mode 100644 libcrypt/sha512.h
-
-diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
-index 0f0ccfe..1ec041d 100644
---- a/extra/Configs/Config.in
-+++ b/extra/Configs/Config.in
-@@ -1174,6 +1174,12 @@ config UCLIBC_HAS_CRYPT_IMPL
- 	help
- 	  libcrypt contains crypt(), setkey() and encrypt()
- 
-+config UCLIBC_HAS_SHA512_CRYPT_IMPL
-+	bool "libcrypt SHA512 support"
-+	default y
-+	help
-+	  Say N here if you do not need SHA512 crypt support.
-+
- config UCLIBC_HAS_CRYPT_STUB
- 	bool "libcrypt stubs"
- 	default y
-diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in
-index 1d1fb55..2fceaed 100644
---- a/libcrypt/Makefile.in
-+++ b/libcrypt/Makefile.in
-@@ -21,6 +21,7 @@ libcrypt_OUT := $(top_builddir)libcrypt
- 
- libcrypt_SRC-y :=
- libcrypt_SRC-$(UCLIBC_HAS_CRYPT_IMPL) += crypt.c des.c md5.c
-+libcrypt_SRC-$(UCLIBC_HAS_SHA512_CRYPT_IMPL) += sha512.c sha512-crypt.c
- libcrypt_SRC-$(UCLIBC_HAS_CRYPT_STUB) += crypt_stub.c
- 
- libcrypt_SRC := $(addprefix $(libcrypt_DIR)/,$(libcrypt_SRC-y))
-diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c
-index 28cbc70..2bb2c33 100644
---- a/libcrypt/crypt.c
-+++ b/libcrypt/crypt.c
-@@ -21,6 +21,9 @@ static const struct {
-         const crypt_impl_f crypt_impl;
- } crypt_impl_tab[] = {
- 	{ "$1$",	__md5_crypt },
-+#ifdef __UCLIBC_HAS_SHA512_CRYPT_IMPL__
-+	{ "$6$",	__sha512_crypt },
-+#endif
- 	{ NULL,		__des_crypt },
- };
- 
-diff --git a/libcrypt/libcrypt.h b/libcrypt/libcrypt.h
-index 1186620..fcad6ae 100644
---- a/libcrypt/libcrypt.h
-+++ b/libcrypt/libcrypt.h
-@@ -9,8 +9,11 @@
- #define __LIBCRYPT_H__
- 
- extern char *__md5_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
-+extern char *__sha512_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
- extern char *__des_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
- 
-+extern char *__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden;
-+
- /* shut up gcc-4.x signed warnings */
- #define strcpy(dst,src) strcpy((char*)dst,(char*)src)
- #define strlen(s) strlen((char*)s)
-diff --git a/libcrypt/sha512-crypt.c b/libcrypt/sha512-crypt.c
-new file mode 100644
-index 0000000..dece925
---- /dev/null
-+++ b/libcrypt/sha512-crypt.c
-@@ -0,0 +1,339 @@
-+/* One way encryption based on SHA512 sum.
-+   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <assert.h>
-+#include <errno.h>
-+#include <stdbool.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/param.h>
-+
-+#include "sha512.h"
-+#include "libcrypt.h"
-+
-+/* Define our magic string to mark salt for SHA512 "encryption"
-+   replacement.  */
-+static const char sha512_salt_prefix[] = "$6$";
-+
-+/* Prefix for optional rounds specification.  */
-+static const char sha512_rounds_prefix[] = "rounds=";
-+
-+/* Maximum salt string length.  */
-+#define SALT_LEN_MAX 16
-+/* Default number of rounds if not explicitly specified.  */
-+#define ROUNDS_DEFAULT 5000
-+/* Minimum number of rounds.  */
-+#define ROUNDS_MIN 1000
-+/* Maximum number of rounds.  */
-+#define ROUNDS_MAX 999999999
-+
-+/* Table with characters for base64 transformation.  */
-+static const char b64t[64] =
-+"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-+
-+char *
-+__sha512_crypt_r (const char *key,
-+     const char *salt,
-+     char *buffer,
-+     int buflen)
-+{
-+  unsigned char alt_result[64]
-+    __attribute__ ((__aligned__ (__alignof__ (uint64_t))));
-+  unsigned char temp_result[64]
-+    __attribute__ ((__aligned__ (__alignof__ (uint64_t))));
-+  size_t salt_len;
-+  size_t key_len;
-+  size_t cnt;
-+  char *cp;
-+  char *copied_key = NULL;
-+  char *copied_salt = NULL;
-+  char *p_bytes;
-+  char *s_bytes;
-+  /* Default number of rounds.  */
-+  size_t rounds = ROUNDS_DEFAULT;
-+  bool rounds_custom = false;
-+
-+  /* Find beginning of salt string.  The prefix should normally always
-+     be present.  Just in case it is not.  */
-+  if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0)
-+    /* Skip salt prefix.  */
-+    salt += sizeof (sha512_salt_prefix) - 1;
-+
-+  if (strncmp (salt, sha512_rounds_prefix, sizeof (sha512_rounds_prefix) - 1)
-+      == 0)
-+    {
-+      const char *num = salt + sizeof (sha512_rounds_prefix) - 1;
-+      char *endp;
-+      unsigned long int srounds = strtoul (num, &endp, 10);
-+      if (*endp == '$')
-+	{
-+	  salt = endp + 1;
-+	  rounds = MAX (ROUNDS_MIN, MIN (srounds, ROUNDS_MAX));
-+	  rounds_custom = true;
-+	}
-+    }
-+
-+  salt_len = MIN (strcspn (salt, "$"), SALT_LEN_MAX);
-+  key_len = strlen (key);
-+
-+  if ((key - (char *) 0) % __alignof__ (uint64_t) != 0)
-+    {
-+      char *tmp = (char *) alloca (key_len + __alignof__ (uint64_t));
-+      key = copied_key =
-+	memcpy (tmp + __alignof__ (uint64_t)
-+		- (tmp - (char *) 0) % __alignof__ (uint64_t),
-+		key, key_len);
-+      assert ((key - (char *) 0) % __alignof__ (uint64_t) == 0);
-+    }
-+
-+  if ((salt - (char *) 0) % __alignof__ (uint64_t) != 0)
-+    {
-+      char *tmp = (char *) alloca (salt_len + __alignof__ (uint64_t));
-+      salt = copied_salt =
-+	memcpy (tmp + __alignof__ (uint64_t)
-+		- (tmp - (char *) 0) % __alignof__ (uint64_t),
-+		salt, salt_len);
-+      assert ((salt - (char *) 0) % __alignof__ (uint64_t) == 0);
-+    }
-+
-+  struct sha512_ctx ctx;
-+  struct sha512_ctx alt_ctx;
-+
-+  /* Prepare for the real work.  */
-+  __sha512_init_ctx (&ctx);
-+
-+  /* Add the key string.  */
-+  __sha512_process_bytes (key, key_len, &ctx);
-+
-+  /* The last part is the salt string.  This must be at most 16
-+     characters and it ends at the first `$' character.  */
-+  __sha512_process_bytes (salt, salt_len, &ctx);
-+
-+
-+  /* Compute alternate SHA512 sum with input KEY, SALT, and KEY.  The
-+     final result will be added to the first context.  */
-+  __sha512_init_ctx (&alt_ctx);
-+
-+  /* Add key.  */
-+  __sha512_process_bytes (key, key_len, &alt_ctx);
-+
-+  /* Add salt.  */
-+  __sha512_process_bytes (salt, salt_len, &alt_ctx);
-+
-+  /* Add key again.  */
-+  __sha512_process_bytes (key, key_len, &alt_ctx);
-+
-+  /* Now get result of this (64 bytes) and add it to the other
-+     context.  */
-+  __sha512_finish_ctx (&alt_ctx, alt_result);
-+
-+  /* Add for any character in the key one byte of the alternate sum.  */
-+  for (cnt = key_len; cnt > 64; cnt -= 64)
-+    __sha512_process_bytes (alt_result, 64, &ctx);
-+
-+  __sha512_process_bytes (alt_result, cnt, &ctx);
-+
-+  /* Take the binary representation of the length of the key and for every
-+     1 add the alternate sum, for every 0 the key.  */
-+  for (cnt = key_len; cnt > 0; cnt >>= 1)
-+    if ((cnt & 1) != 0)
-+      __sha512_process_bytes (alt_result, 64, &ctx);
-+    else
-+      __sha512_process_bytes (key, key_len, &ctx);
-+
-+  /* Create intermediate result.  */
-+  __sha512_finish_ctx (&ctx, alt_result);
-+
-+  /* Start computation of P byte sequence.  */
-+  __sha512_init_ctx (&alt_ctx);
-+
-+  /* For every character in the password add the entire password.  */
-+  for (cnt = 0; cnt < key_len; ++cnt)
-+    __sha512_process_bytes (key, key_len, &alt_ctx);
-+
-+  /* Finish the digest.  */
-+  __sha512_finish_ctx (&alt_ctx, temp_result);
-+
-+  /* Create byte sequence P.  */
-+  cp = p_bytes = alloca (key_len);
-+  for (cnt = key_len; cnt >= 64; cnt -= 64)
-+    cp = mempcpy (cp, temp_result, 64);
-+  memcpy (cp, temp_result, cnt);
-+
-+  /* Start computation of S byte sequence.  */
-+  __sha512_init_ctx (&alt_ctx);
-+
-+  /* For every character in the password add the entire password.  */
-+  for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
-+    __sha512_process_bytes (salt, salt_len, &alt_ctx);
-+
-+  /* Finish the digest.  */
-+  __sha512_finish_ctx (&alt_ctx, temp_result);
-+
-+  /* Create byte sequence S.  */
-+  cp = s_bytes = alloca (salt_len);
-+  for (cnt = salt_len; cnt >= 64; cnt -= 64)
-+    cp = mempcpy (cp, temp_result, 64);
-+  memcpy (cp, temp_result, cnt);
-+
-+  /* Repeatedly run the collected hash value through SHA512 to burn
-+     CPU cycles.  */
-+  for (cnt = 0; cnt < rounds; ++cnt)
-+    {
-+      /* New context.  */
-+      __sha512_init_ctx (&ctx);
-+
-+      /* Add key or last result.  */
-+      if ((cnt & 1) != 0)
-+	__sha512_process_bytes (p_bytes, key_len, &ctx);
-+      else
-+	__sha512_process_bytes (alt_result, 64, &ctx);
-+
-+      /* Add salt for numbers not divisible by 3.  */
-+      if (cnt % 3 != 0)
-+	__sha512_process_bytes (s_bytes, salt_len, &ctx);
-+
-+      /* Add key for numbers not divisible by 7.  */
-+      if (cnt % 7 != 0)
-+	__sha512_process_bytes (p_bytes, key_len, &ctx);
-+
-+      /* Add key or last result.  */
-+      if ((cnt & 1) != 0)
-+	__sha512_process_bytes (alt_result, 64, &ctx);
-+      else
-+	__sha512_process_bytes (p_bytes, key_len, &ctx);
-+
-+      /* Create intermediate result.  */
-+      __sha512_finish_ctx (&ctx, alt_result);
-+    }
-+
-+  /* Now we can construct the result string.  It consists of three
-+     parts.  */
-+  cp = stpncpy (buffer, sha512_salt_prefix, MAX (0, buflen));
-+  buflen -= sizeof (sha512_salt_prefix) - 1;
-+
-+  if (rounds_custom)
-+    {
-+      int n = snprintf (cp, MAX (0, buflen), "%s%zu$",
-+			sha512_rounds_prefix, rounds);
-+      cp += n;
-+      buflen -= n;
-+    }
-+
-+  cp = stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len));
-+  buflen -= MIN ((size_t) MAX (0, buflen), salt_len);
-+
-+  if (buflen > 0)
-+    {
-+      *cp++ = '$';
-+      --buflen;
-+    }
-+
-+  void b64_from_24bit (unsigned int b2, unsigned int b1, unsigned int b0,
-+		       int n)
-+  {
-+    unsigned int w = (b2 << 16) | (b1 << 8) | b0;
-+    while (n-- > 0 && buflen > 0)
-+      {
-+	*cp++ = b64t[w & 0x3f];
-+	--buflen;
-+	w >>= 6;
-+      }
-+  }
-+
-+  b64_from_24bit (alt_result[0], alt_result[21], alt_result[42], 4);
-+  b64_from_24bit (alt_result[22], alt_result[43], alt_result[1], 4);
-+  b64_from_24bit (alt_result[44], alt_result[2], alt_result[23], 4);
-+  b64_from_24bit (alt_result[3], alt_result[24], alt_result[45], 4);
-+  b64_from_24bit (alt_result[25], alt_result[46], alt_result[4], 4);
-+  b64_from_24bit (alt_result[47], alt_result[5], alt_result[26], 4);
-+  b64_from_24bit (alt_result[6], alt_result[27], alt_result[48], 4);
-+  b64_from_24bit (alt_result[28], alt_result[49], alt_result[7], 4);
-+  b64_from_24bit (alt_result[50], alt_result[8], alt_result[29], 4);
-+  b64_from_24bit (alt_result[9], alt_result[30], alt_result[51], 4);
-+  b64_from_24bit (alt_result[31], alt_result[52], alt_result[10], 4);
-+  b64_from_24bit (alt_result[53], alt_result[11], alt_result[32], 4);
-+  b64_from_24bit (alt_result[12], alt_result[33], alt_result[54], 4);
-+  b64_from_24bit (alt_result[34], alt_result[55], alt_result[13], 4);
-+  b64_from_24bit (alt_result[56], alt_result[14], alt_result[35], 4);
-+  b64_from_24bit (alt_result[15], alt_result[36], alt_result[57], 4);
-+  b64_from_24bit (alt_result[37], alt_result[58], alt_result[16], 4);
-+  b64_from_24bit (alt_result[59], alt_result[17], alt_result[38], 4);
-+  b64_from_24bit (alt_result[18], alt_result[39], alt_result[60], 4);
-+  b64_from_24bit (alt_result[40], alt_result[61], alt_result[19], 4);
-+  b64_from_24bit (alt_result[62], alt_result[20], alt_result[41], 4);
-+  b64_from_24bit (0, 0, alt_result[63], 2);
-+
-+  if (buflen <= 0)
-+    {
-+      __set_errno (ERANGE);
-+      buffer = NULL;
-+    }
-+  else
-+    *cp = '\0';		/* Terminate the string.  */
-+
-+  /* Clear the buffer for the intermediate result so that people
-+     attaching to processes or reading core dumps cannot get any
-+     information.  We do it in this way to clear correct_words[]
-+     inside the SHA512 implementation as well.  */
-+  __sha512_init_ctx (&ctx);
-+  __sha512_finish_ctx (&ctx, alt_result);
-+  memset (&ctx, '\0', sizeof (ctx));
-+  memset (&alt_ctx, '\0', sizeof (alt_ctx));
-+
-+  memset (temp_result, '\0', sizeof (temp_result));
-+  memset (p_bytes, '\0', key_len);
-+  memset (s_bytes, '\0', salt_len);
-+  if (copied_key != NULL)
-+    memset (copied_key, '\0', key_len);
-+  if (copied_salt != NULL)
-+    memset (copied_salt, '\0', salt_len);
-+
-+  return buffer;
-+}
-+
-+static char *buffer;
-+
-+/* This entry point is equivalent to the `crypt' function in Unix
-+   libcs.  */
-+char *
-+__sha512_crypt (const unsigned char *key, const unsigned char *salt)
-+{
-+  /* We don't want to have an arbitrary limit in the size of the
-+     password.  We can compute an upper bound for the size of the
-+     result in advance and so we can prepare the buffer we pass to
-+     `sha512_crypt_r'.  */
-+  static int buflen;
-+  int needed = (sizeof (sha512_salt_prefix) - 1
-+		+ sizeof (sha512_rounds_prefix) + 9 + 1
-+		+ strlen (salt) + 1 + 86 + 1);
-+
-+  if (buflen < needed)
-+    {
-+      char *new_buffer = (char *) realloc (buffer, needed);
-+      if (new_buffer == NULL)
-+	return NULL;
-+
-+      buffer = new_buffer;
-+      buflen = needed;
-+    }
-+
-+  return __sha512_crypt_r ((const char *) key, (const char *) salt, buffer, buflen);
-+}
-diff --git a/libcrypt/sha512.c b/libcrypt/sha512.c
-new file mode 100644
-index 0000000..04e0a06
---- /dev/null
-+++ b/libcrypt/sha512.c
-@@ -0,0 +1,326 @@
-+/* Functions to compute SHA512 message digest of files or memory blocks.
-+   according to the definition of SHA512 in FIPS 180-2.
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* Written by Ulrich Drepper <drepper@redhat.com>, 2007.  */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include <endian.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+
-+#include "sha512.h"
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# ifdef _LIBC
-+#  include <byteswap.h>
-+#  define SWAP(n) bswap_64 (n)
-+# else
-+#  define SWAP(n) \
-+  (((n) << 56)					\
-+   | (((n) & 0xff00) << 40)			\
-+   | (((n) & 0xff0000) << 24)			\
-+   | (((n) & 0xff000000) << 8)			\
-+   | (((n) >> 8) & 0xff000000)			\
-+   | (((n) >> 24) & 0xff0000)			\
-+   | (((n) >> 40) & 0xff00)			\
-+   | ((n) >> 56))
-+# endif
-+#else
-+# define SWAP(n) (n)
-+#endif
-+
-+
-+/* This array contains the bytes used to pad the buffer to the next
-+   64-byte boundary.  (FIPS 180-2:5.1.2)  */
-+static const unsigned char fillbuf[128] = { 0x80, 0 /* , 0, 0, ...  */ };
-+
-+
-+/* Constants for SHA512 from FIPS 180-2:4.2.3.  */
-+static const uint64_t K[80] =
-+  {
-+    UINT64_C (0x428a2f98d728ae22), UINT64_C (0x7137449123ef65cd),
-+    UINT64_C (0xb5c0fbcfec4d3b2f), UINT64_C (0xe9b5dba58189dbbc),
-+    UINT64_C (0x3956c25bf348b538), UINT64_C (0x59f111f1b605d019),
-+    UINT64_C (0x923f82a4af194f9b), UINT64_C (0xab1c5ed5da6d8118),
-+    UINT64_C (0xd807aa98a3030242), UINT64_C (0x12835b0145706fbe),
-+    UINT64_C (0x243185be4ee4b28c), UINT64_C (0x550c7dc3d5ffb4e2),
-+    UINT64_C (0x72be5d74f27b896f), UINT64_C (0x80deb1fe3b1696b1),
-+    UINT64_C (0x9bdc06a725c71235), UINT64_C (0xc19bf174cf692694),
-+    UINT64_C (0xe49b69c19ef14ad2), UINT64_C (0xefbe4786384f25e3),
-+    UINT64_C (0x0fc19dc68b8cd5b5), UINT64_C (0x240ca1cc77ac9c65),
-+    UINT64_C (0x2de92c6f592b0275), UINT64_C (0x4a7484aa6ea6e483),
-+    UINT64_C (0x5cb0a9dcbd41fbd4), UINT64_C (0x76f988da831153b5),
-+    UINT64_C (0x983e5152ee66dfab), UINT64_C (0xa831c66d2db43210),
-+    UINT64_C (0xb00327c898fb213f), UINT64_C (0xbf597fc7beef0ee4),
-+    UINT64_C (0xc6e00bf33da88fc2), UINT64_C (0xd5a79147930aa725),
-+    UINT64_C (0x06ca6351e003826f), UINT64_C (0x142929670a0e6e70),
-+    UINT64_C (0x27b70a8546d22ffc), UINT64_C (0x2e1b21385c26c926),
-+    UINT64_C (0x4d2c6dfc5ac42aed), UINT64_C (0x53380d139d95b3df),
-+    UINT64_C (0x650a73548baf63de), UINT64_C (0x766a0abb3c77b2a8),
-+    UINT64_C (0x81c2c92e47edaee6), UINT64_C (0x92722c851482353b),
-+    UINT64_C (0xa2bfe8a14cf10364), UINT64_C (0xa81a664bbc423001),
-+    UINT64_C (0xc24b8b70d0f89791), UINT64_C (0xc76c51a30654be30),
-+    UINT64_C (0xd192e819d6ef5218), UINT64_C (0xd69906245565a910),
-+    UINT64_C (0xf40e35855771202a), UINT64_C (0x106aa07032bbd1b8),
-+    UINT64_C (0x19a4c116b8d2d0c8), UINT64_C (0x1e376c085141ab53),
-+    UINT64_C (0x2748774cdf8eeb99), UINT64_C (0x34b0bcb5e19b48a8),
-+    UINT64_C (0x391c0cb3c5c95a63), UINT64_C (0x4ed8aa4ae3418acb),
-+    UINT64_C (0x5b9cca4f7763e373), UINT64_C (0x682e6ff3d6b2b8a3),
-+    UINT64_C (0x748f82ee5defb2fc), UINT64_C (0x78a5636f43172f60),
-+    UINT64_C (0x84c87814a1f0ab72), UINT64_C (0x8cc702081a6439ec),
-+    UINT64_C (0x90befffa23631e28), UINT64_C (0xa4506cebde82bde9),
-+    UINT64_C (0xbef9a3f7b2c67915), UINT64_C (0xc67178f2e372532b),
-+    UINT64_C (0xca273eceea26619c), UINT64_C (0xd186b8c721c0c207),
-+    UINT64_C (0xeada7dd6cde0eb1e), UINT64_C (0xf57d4f7fee6ed178),
-+    UINT64_C (0x06f067aa72176fba), UINT64_C (0x0a637dc5a2c898a6),
-+    UINT64_C (0x113f9804bef90dae), UINT64_C (0x1b710b35131c471b),
-+    UINT64_C (0x28db77f523047d84), UINT64_C (0x32caab7b40c72493),
-+    UINT64_C (0x3c9ebe0a15c9bebc), UINT64_C (0x431d67c49c100d4c),
-+    UINT64_C (0x4cc5d4becb3e42b6), UINT64_C (0x597f299cfc657e2a),
-+    UINT64_C (0x5fcb6fab3ad6faec), UINT64_C (0x6c44198c4a475817)
-+  };
-+
-+
-+/* Process LEN bytes of BUFFER, accumulating context into CTX.
-+   It is assumed that LEN % 128 == 0.  */
-+static void
-+sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx)
-+{
-+  const uint64_t *words = buffer;
-+  size_t nwords = len / sizeof (uint64_t);
-+  uint64_t a = ctx->H[0];
-+  uint64_t b = ctx->H[1];
-+  uint64_t c = ctx->H[2];
-+  uint64_t d = ctx->H[3];
-+  uint64_t e = ctx->H[4];
-+  uint64_t f = ctx->H[5];
-+  uint64_t g = ctx->H[6];
-+  uint64_t h = ctx->H[7];
-+
-+  /* First increment the byte count.  FIPS 180-2 specifies the possible
-+     length of the file up to 2^128 bits.  Here we only compute the
-+     number of bytes.  Do a double word increment.  */
-+  ctx->total[0] += len;
-+  if (ctx->total[0] < len)
-+    ++ctx->total[1];
-+
-+  /* Process all bytes in the buffer with 128 bytes in each round of
-+     the loop.  */
-+  while (nwords > 0)
-+    {
-+      uint64_t W[80];
-+      uint64_t a_save = a;
-+      uint64_t b_save = b;
-+      uint64_t c_save = c;
-+      uint64_t d_save = d;
-+      uint64_t e_save = e;
-+      uint64_t f_save = f;
-+      uint64_t g_save = g;
-+      uint64_t h_save = h;
-+
-+      /* Operators defined in FIPS 180-2:4.1.2.  */
-+#define Ch(x, y, z) ((x & y) ^ (~x & z))
-+#define Maj(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
-+#define S0(x) (CYCLIC (x, 28) ^ CYCLIC (x, 34) ^ CYCLIC (x, 39))
-+#define S1(x) (CYCLIC (x, 14) ^ CYCLIC (x, 18) ^ CYCLIC (x, 41))
-+#define R0(x) (CYCLIC (x, 1) ^ CYCLIC (x, 8) ^ (x >> 7))
-+#define R1(x) (CYCLIC (x, 19) ^ CYCLIC (x, 61) ^ (x >> 6))
-+
-+      /* It is unfortunate that C does not provide an operator for
-+	 cyclic rotation.  Hope the C compiler is smart enough.  */
-+#define CYCLIC(w, s) ((w >> s) | (w << (64 - s)))
-+
-+      /* Compute the message schedule according to FIPS 180-2:6.3.2 step 2.  */
-+      for (unsigned int t = 0; t < 16; ++t)
-+	{
-+	  W[t] = SWAP (*words);
-+	  ++words;
-+	}
-+      for (unsigned int t = 16; t < 80; ++t)
-+	W[t] = R1 (W[t - 2]) + W[t - 7] + R0 (W[t - 15]) + W[t - 16];
-+
-+      /* The actual computation according to FIPS 180-2:6.3.2 step 3.  */
-+      for (unsigned int t = 0; t < 80; ++t)
-+	{
-+	  uint64_t T1 = h + S1 (e) + Ch (e, f, g) + K[t] + W[t];
-+	  uint64_t T2 = S0 (a) + Maj (a, b, c);
-+	  h = g;
-+	  g = f;
-+	  f = e;
-+	  e = d + T1;
-+	  d = c;
-+	  c = b;
-+	  b = a;
-+	  a = T1 + T2;
-+	}
-+
-+      /* Add the starting values of the context according to FIPS 180-2:6.3.2
-+	 step 4.  */
-+      a += a_save;
-+      b += b_save;
-+      c += c_save;
-+      d += d_save;
-+      e += e_save;
-+      f += f_save;
-+      g += g_save;
-+      h += h_save;
-+
-+      /* Prepare for the next round.  */
-+      nwords -= 16;
-+    }
-+
-+  /* Put checksum in context given as argument.  */
-+  ctx->H[0] = a;
-+  ctx->H[1] = b;
-+  ctx->H[2] = c;
-+  ctx->H[3] = d;
-+  ctx->H[4] = e;
-+  ctx->H[5] = f;
-+  ctx->H[6] = g;
-+  ctx->H[7] = h;
-+}
-+
-+
-+/* Initialize structure containing state of computation.
-+   (FIPS 180-2:5.3.3)  */
-+void
-+__sha512_init_ctx (struct sha512_ctx *ctx)
-+{
-+  ctx->H[0] = UINT64_C (0x6a09e667f3bcc908);
-+  ctx->H[1] = UINT64_C (0xbb67ae8584caa73b);
-+  ctx->H[2] = UINT64_C (0x3c6ef372fe94f82b);
-+  ctx->H[3] = UINT64_C (0xa54ff53a5f1d36f1);
-+  ctx->H[4] = UINT64_C (0x510e527fade682d1);
-+  ctx->H[5] = UINT64_C (0x9b05688c2b3e6c1f);
-+  ctx->H[6] = UINT64_C (0x1f83d9abfb41bd6b);
-+  ctx->H[7] = UINT64_C (0x5be0cd19137e2179);
-+
-+  ctx->total[0] = ctx->total[1] = 0;
-+  ctx->buflen = 0;
-+}
-+
-+
-+/* Process the remaining bytes in the internal buffer and the usual
-+   prolog according to the standard and write the result to RESBUF.
-+
-+   IMPORTANT: On some systems it is required that RESBUF is correctly
-+   aligned for a 32 bits value.  */
-+void *
-+__sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf)
-+{
-+  /* Take yet unprocessed bytes into account.  */
-+  uint64_t bytes = ctx->buflen;
-+  size_t pad;
-+
-+  /* Now count remaining bytes.  */
-+  ctx->total[0] += bytes;
-+  if (ctx->total[0] < bytes)
-+    ++ctx->total[1];
-+
-+  pad = bytes >= 112 ? 128 + 112 - bytes : 112 - bytes;
-+  memcpy (&ctx->buffer[bytes], fillbuf, pad);
-+
-+  /* Put the 128-bit file length in *bits* at the end of the buffer.  */
-+  *(uint64_t *) &ctx->buffer[bytes + pad + 8] = SWAP (ctx->total[0] << 3);
-+  *(uint64_t *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) |
-+						  (ctx->total[0] >> 61));
-+
-+  /* Process last bytes.  */
-+  sha512_process_block (ctx->buffer, bytes + pad + 16, ctx);
-+
-+  /* Put result from CTX in first 64 bytes following RESBUF.  */
-+  for (unsigned int i = 0; i < 8; ++i)
-+    ((uint64_t *) resbuf)[i] = SWAP (ctx->H[i]);
-+
-+  return resbuf;
-+}
-+
-+
-+void
-+__sha512_process_bytes (const void *buffer, size_t len, struct sha512_ctx *ctx)
-+{
-+  /* When we already have some bits in our internal buffer concatenate
-+     both inputs first.  */
-+  if (ctx->buflen != 0)
-+    {
-+      size_t left_over = ctx->buflen;
-+      size_t add = 256 - left_over > len ? len : 256 - left_over;
-+
-+      memcpy (&ctx->buffer[left_over], buffer, add);
-+      ctx->buflen += add;
-+
-+      if (ctx->buflen > 128)
-+	{
-+	  sha512_process_block (ctx->buffer, ctx->buflen & ~127, ctx);
-+
-+	  ctx->buflen &= 127;
-+	  /* The regions in the following copy operation cannot overlap.  */
-+	  memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~127],
-+		  ctx->buflen);
-+	}
-+
-+      buffer = (const char *) buffer + add;
-+      len -= add;
-+    }
-+
-+  /* Process available complete blocks.  */
-+  if (len >= 128)
-+    {
-+#if __GNUC__ >= 2
-+# define UNALIGNED_P(p) (((uintptr_t) p) % __alignof__ (uint64_t) != 0)
-+#else
-+# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint64_t) != 0)
-+#endif
-+      if (UNALIGNED_P (buffer))
-+	while (len > 128)
-+	  {
-+	    sha512_process_block (memcpy (ctx->buffer, buffer, 128), 128,
-+				    ctx);
-+	    buffer = (const char *) buffer + 128;
-+	    len -= 128;
-+	  }
-+      else
-+	{
-+	  sha512_process_block (buffer, len & ~127, ctx);
-+	  buffer = (const char *) buffer + (len & ~127);
-+	  len &= 127;
-+	}
-+    }
-+
-+  /* Move remaining bytes into internal buffer.  */
-+  if (len > 0)
-+    {
-+      size_t left_over = ctx->buflen;
-+
-+      memcpy (&ctx->buffer[left_over], buffer, len);
-+      left_over += len;
-+      if (left_over >= 128)
-+	{
-+	  sha512_process_block (ctx->buffer, 128, ctx);
-+	  left_over -= 128;
-+	  memcpy (ctx->buffer, &ctx->buffer[128], left_over);
-+	}
-+      ctx->buflen = left_over;
-+    }
-+}
-diff --git a/libcrypt/sha512.h b/libcrypt/sha512.h
-new file mode 100644
-index 0000000..5777827
---- /dev/null
-+++ b/libcrypt/sha512.h
-@@ -0,0 +1,58 @@
-+/* Declaration of functions and data types used for SHA512 sum computing
-+   library functions.
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef _SHA512_H
-+#define _SHA512_H 1
-+
-+#include <limits.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+
-+
-+/* Structure to save state of computation between the single steps.  */
-+struct sha512_ctx
-+{
-+  uint64_t H[8];
-+
-+  uint64_t total[2];
-+  uint64_t buflen;
-+  char buffer[256] __attribute__ ((__aligned__ (__alignof__ (uint64_t))));
-+};
-+
-+/* Initialize structure containing state of computation.
-+   (FIPS 180-2: 5.3.3)  */
-+extern void __sha512_init_ctx (struct sha512_ctx *ctx) attribute_hidden;
-+
-+/* Starting with the result of former calls of this function (or the
-+   initialization function update the context for the next LEN bytes
-+   starting at BUFFER.
-+   It is NOT required that LEN is a multiple of 128.  */
-+extern void __sha512_process_bytes (const void *buffer, size_t len,
-+				    struct sha512_ctx *ctx) attribute_hidden;
-+
-+/* Process the remaining bytes in the buffer and put result from CTX
-+   in first 64 bytes following RESBUF.
-+
-+   IMPORTANT: On some systems it is required that RESBUF is correctly
-+   aligned for a 64 bits value.  */
-+extern void *__sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf)
-+  attribute_hidden;
-+
-+#endif /* sha512.h */
--- 
-1.7.7.3
-
-From aad4fe2d08d930f3a63a5e31ec315cbedb1aa965 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Wed, 16 Nov 2011 06:05:07 -0600
-Subject: [PATCH] libcrypt/sha512-crypt: convert nested function
- b64_from_24bit() into a macro
-
-The glibc implementation of sha512-crypt used inline functions which should
-really be converted into a macro because otherwise a trampoline is potentially
-created.
-
-Signed-off-by: William Pitcock <nenolod@dereferenced.org>
----
- libcrypt/sha512-crypt.c |   68 +++++++++++++++++++++++-----------------------
- 1 files changed, 34 insertions(+), 34 deletions(-)
-
-diff --git a/libcrypt/sha512-crypt.c b/libcrypt/sha512-crypt.c
-index dece925..0321be0 100644
---- a/libcrypt/sha512-crypt.c
-+++ b/libcrypt/sha512-crypt.c
-@@ -48,6 +48,18 @@ static const char sha512_rounds_prefix[] = "rounds=";
- static const char b64t[64] =
- "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
- 
-+#define B64_FROM_24BIT(b2, b1, b0, steps) \
-+	{ \
-+		int n = (steps); \
-+		unsigned int w = ((b2) << 16) | ((b1) << 8) | (b0); \
-+		while (n-- > 0 && buflen > 0) \
-+		{ \
-+			*cp++ = b64t[w & 0x3f]; \
-+			--buflen; \
-+			w >>= 6; \
-+		} \
-+	}
-+
- char *
- __sha512_crypt_r (const char *key,
-      const char *salt,
-@@ -246,40 +258,28 @@ __sha512_crypt_r (const char *key,
-       --buflen;
-     }
- 
--  void b64_from_24bit (unsigned int b2, unsigned int b1, unsigned int b0,
--		       int n)
--  {
--    unsigned int w = (b2 << 16) | (b1 << 8) | b0;
--    while (n-- > 0 && buflen > 0)
--      {
--	*cp++ = b64t[w & 0x3f];
--	--buflen;
--	w >>= 6;
--      }
--  }
--
--  b64_from_24bit (alt_result[0], alt_result[21], alt_result[42], 4);
--  b64_from_24bit (alt_result[22], alt_result[43], alt_result[1], 4);
--  b64_from_24bit (alt_result[44], alt_result[2], alt_result[23], 4);
--  b64_from_24bit (alt_result[3], alt_result[24], alt_result[45], 4);
--  b64_from_24bit (alt_result[25], alt_result[46], alt_result[4], 4);
--  b64_from_24bit (alt_result[47], alt_result[5], alt_result[26], 4);
--  b64_from_24bit (alt_result[6], alt_result[27], alt_result[48], 4);
--  b64_from_24bit (alt_result[28], alt_result[49], alt_result[7], 4);
--  b64_from_24bit (alt_result[50], alt_result[8], alt_result[29], 4);
--  b64_from_24bit (alt_result[9], alt_result[30], alt_result[51], 4);
--  b64_from_24bit (alt_result[31], alt_result[52], alt_result[10], 4);
--  b64_from_24bit (alt_result[53], alt_result[11], alt_result[32], 4);
--  b64_from_24bit (alt_result[12], alt_result[33], alt_result[54], 4);
--  b64_from_24bit (alt_result[34], alt_result[55], alt_result[13], 4);
--  b64_from_24bit (alt_result[56], alt_result[14], alt_result[35], 4);
--  b64_from_24bit (alt_result[15], alt_result[36], alt_result[57], 4);
--  b64_from_24bit (alt_result[37], alt_result[58], alt_result[16], 4);
--  b64_from_24bit (alt_result[59], alt_result[17], alt_result[38], 4);
--  b64_from_24bit (alt_result[18], alt_result[39], alt_result[60], 4);
--  b64_from_24bit (alt_result[40], alt_result[61], alt_result[19], 4);
--  b64_from_24bit (alt_result[62], alt_result[20], alt_result[41], 4);
--  b64_from_24bit (0, 0, alt_result[63], 2);
-+  B64_FROM_24BIT (alt_result[0], alt_result[21], alt_result[42], 4);
-+  B64_FROM_24BIT (alt_result[22], alt_result[43], alt_result[1], 4);
-+  B64_FROM_24BIT (alt_result[44], alt_result[2], alt_result[23], 4);
-+  B64_FROM_24BIT (alt_result[3], alt_result[24], alt_result[45], 4);
-+  B64_FROM_24BIT (alt_result[25], alt_result[46], alt_result[4], 4);
-+  B64_FROM_24BIT (alt_result[47], alt_result[5], alt_result[26], 4);
-+  B64_FROM_24BIT (alt_result[6], alt_result[27], alt_result[48], 4);
-+  B64_FROM_24BIT (alt_result[28], alt_result[49], alt_result[7], 4);
-+  B64_FROM_24BIT (alt_result[50], alt_result[8], alt_result[29], 4);
-+  B64_FROM_24BIT (alt_result[9], alt_result[30], alt_result[51], 4);
-+  B64_FROM_24BIT (alt_result[31], alt_result[52], alt_result[10], 4);
-+  B64_FROM_24BIT (alt_result[53], alt_result[11], alt_result[32], 4);
-+  B64_FROM_24BIT (alt_result[12], alt_result[33], alt_result[54], 4);
-+  B64_FROM_24BIT (alt_result[34], alt_result[55], alt_result[13], 4);
-+  B64_FROM_24BIT (alt_result[56], alt_result[14], alt_result[35], 4);
-+  B64_FROM_24BIT (alt_result[15], alt_result[36], alt_result[57], 4);
-+  B64_FROM_24BIT (alt_result[37], alt_result[58], alt_result[16], 4);
-+  B64_FROM_24BIT (alt_result[59], alt_result[17], alt_result[38], 4);
-+  B64_FROM_24BIT (alt_result[18], alt_result[39], alt_result[60], 4);
-+  B64_FROM_24BIT (alt_result[40], alt_result[61], alt_result[19], 4);
-+  B64_FROM_24BIT (alt_result[62], alt_result[20], alt_result[41], 4);
-+  B64_FROM_24BIT (0, 0, alt_result[63], 2);
- 
-   if (buflen <= 0)
-     {
--- 
-1.7.7.3
-
-From 9b463f10d2b395c80533fa44876f6a387fc69289 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Wed, 16 Nov 2011 06:22:36 -0600
-Subject: [PATCH] libcrypt: add SHA256 crypt support.
-To: uclibc@uclibc.org
-
-This is based on Ulrich Drepper's SHA256 crypt implementation in GLIBC.
-I decided to add support for this as an option as there have been a few other
-SHA256 patches proposed recently.
-
-Signed-off-by: William Pitcock <nenolod@dereferenced.org>
----
- extra/Configs/Config.in |    6 +
- libcrypt/Makefile.in    |    1 +
- libcrypt/crypt.c        |    3 +
- libcrypt/libcrypt.h     |    2 +
- libcrypt/sha256-crypt.c |  326 +++++++++++++++++++++++++++++++++++++++++++++++
- libcrypt/sha256.c       |  294 ++++++++++++++++++++++++++++++++++++++++++
- libcrypt/sha256.h       |   58 +++++++++
- 7 files changed, 690 insertions(+), 0 deletions(-)
- create mode 100644 libcrypt/sha256-crypt.c
- create mode 100644 libcrypt/sha256.c
- create mode 100644 libcrypt/sha256.h
-
-diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
-index 1ec041d..56db0c4 100644
---- a/extra/Configs/Config.in
-+++ b/extra/Configs/Config.in
-@@ -1174,6 +1174,12 @@ config UCLIBC_HAS_CRYPT_IMPL
- 	help
- 	  libcrypt contains crypt(), setkey() and encrypt()
- 
-+config UCLIBC_HAS_SHA256_CRYPT_IMPL
-+	bool "libcrypt SHA256 support"
-+	default y
-+	help
-+	  Say N here if you do not need SHA256 crypt support.
-+
- config UCLIBC_HAS_SHA512_CRYPT_IMPL
- 	bool "libcrypt SHA512 support"
- 	default y
-diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in
-index 2fceaed..94753f4 100644
---- a/libcrypt/Makefile.in
-+++ b/libcrypt/Makefile.in
-@@ -21,6 +21,7 @@ libcrypt_OUT := $(top_builddir)libcrypt
- 
- libcrypt_SRC-y :=
- libcrypt_SRC-$(UCLIBC_HAS_CRYPT_IMPL) += crypt.c des.c md5.c
-+libcrypt_SRC-$(UCLIBC_HAS_SHA256_CRYPT_IMPL) += sha256.c sha256-crypt.c
- libcrypt_SRC-$(UCLIBC_HAS_SHA512_CRYPT_IMPL) += sha512.c sha512-crypt.c
- libcrypt_SRC-$(UCLIBC_HAS_CRYPT_STUB) += crypt_stub.c
- 
-diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c
-index 2bb2c33..15e3b29 100644
---- a/libcrypt/crypt.c
-+++ b/libcrypt/crypt.c
-@@ -21,6 +21,9 @@ static const struct {
-         const crypt_impl_f crypt_impl;
- } crypt_impl_tab[] = {
- 	{ "$1$",	__md5_crypt },
-+#ifdef __UCLIBC_HAS_SHA256_CRYPT_IMPL__
-+	{ "$5$",	__sha256_crypt },
-+#endif
- #ifdef __UCLIBC_HAS_SHA512_CRYPT_IMPL__
- 	{ "$6$",	__sha512_crypt },
- #endif
-diff --git a/libcrypt/libcrypt.h b/libcrypt/libcrypt.h
-index fcad6ae..67733d1 100644
---- a/libcrypt/libcrypt.h
-+++ b/libcrypt/libcrypt.h
-@@ -9,9 +9,11 @@
- #define __LIBCRYPT_H__
- 
- extern char *__md5_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
-+extern char *__sha256_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
- extern char *__sha512_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
- extern char *__des_crypt(const unsigned char *pw, const unsigned char *salt) attribute_hidden;
- 
-+extern char *__sha256_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden;
- extern char *__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) attribute_hidden;
- 
- /* shut up gcc-4.x signed warnings */
-diff --git a/libcrypt/sha256-crypt.c b/libcrypt/sha256-crypt.c
-new file mode 100644
-index 0000000..4422148
---- /dev/null
-+++ b/libcrypt/sha256-crypt.c
-@@ -0,0 +1,326 @@
-+/* One way encryption based on SHA256 sum.
-+   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <assert.h>
-+#include <errno.h>
-+#include <stdbool.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/param.h>
-+
-+#include "sha256.h"
-+#include "libcrypt.h"
-+
-+/* Define our magic string to mark salt for SHA256 "encryption"
-+   replacement.  */
-+static const char sha256_salt_prefix[] = "$5$";
-+
-+/* Prefix for optional rounds specification.  */
-+static const char sha256_rounds_prefix[] = "rounds=";
-+
-+/* Maximum salt string length.  */
-+#define SALT_LEN_MAX 16
-+/* Default number of rounds if not explicitly specified.  */
-+#define ROUNDS_DEFAULT 5000
-+/* Minimum number of rounds.  */
-+#define ROUNDS_MIN 1000
-+/* Maximum number of rounds.  */
-+#define ROUNDS_MAX 999999999
-+
-+/* Table with characters for base64 transformation.  */
-+static const char b64t[64] =
-+"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-+
-+#define B64_FROM_24BIT(b2, b1, b0, steps) \
-+	{ \
-+		int n = (steps); \
-+		unsigned int w = ((b2) << 16) | ((b1) << 8) | (b0); \
-+		while (n-- > 0 && buflen > 0) \
-+		{ \
-+			*cp++ = b64t[w & 0x3f]; \
-+			--buflen; \
-+			w >>= 6; \
-+		} \
-+	}
-+
-+char *
-+__sha256_crypt_r (const char *key,
-+     const char *salt,
-+     char *buffer,
-+     int buflen)
-+{
-+  unsigned char alt_result[32]
-+    __attribute__ ((__aligned__ (__alignof__ (uint32_t))));
-+  unsigned char temp_result[32]
-+    __attribute__ ((__aligned__ (__alignof__ (uint32_t))));
-+  size_t salt_len;
-+  size_t key_len;
-+  size_t cnt;
-+  char *cp;
-+  char *copied_key = NULL;
-+  char *copied_salt = NULL;
-+  char *p_bytes;
-+  char *s_bytes;
-+  /* Default number of rounds.  */
-+  size_t rounds = ROUNDS_DEFAULT;
-+  bool rounds_custom = false;
-+
-+  /* Find beginning of salt string.  The prefix should normally always
-+     be present.  Just in case it is not.  */
-+  if (strncmp (sha256_salt_prefix, salt, sizeof (sha256_salt_prefix) - 1) == 0)
-+    /* Skip salt prefix.  */
-+    salt += sizeof (sha256_salt_prefix) - 1;
-+
-+  if (strncmp (salt, sha256_rounds_prefix, sizeof (sha256_rounds_prefix) - 1)
-+      == 0)
-+    {
-+      const char *num = salt + sizeof (sha256_rounds_prefix) - 1;
-+      char *endp;
-+      unsigned long int srounds = strtoul (num, &endp, 10);
-+      if (*endp == '$')
-+	{
-+	  salt = endp + 1;
-+	  rounds = MAX (ROUNDS_MIN, MIN (srounds, ROUNDS_MAX));
-+	  rounds_custom = true;
-+	}
-+    }
-+
-+  salt_len = MIN (strcspn (salt, "$"), SALT_LEN_MAX);
-+  key_len = strlen (key);
-+
-+  if ((key - (char *) 0) % __alignof__ (uint32_t) != 0)
-+    {
-+      char *tmp = (char *) alloca (key_len + __alignof__ (uint32_t));
-+      key = copied_key =
-+	memcpy (tmp + __alignof__ (uint32_t)
-+		- (tmp - (char *) 0) % __alignof__ (uint32_t),
-+		key, key_len);
-+      assert ((key - (char *) 0) % __alignof__ (uint32_t) == 0);
-+    }
-+
-+  if ((salt - (char *) 0) % __alignof__ (uint32_t) != 0)
-+    {
-+      char *tmp = (char *) alloca (salt_len + __alignof__ (uint32_t));
-+      salt = copied_salt =
-+	memcpy (tmp + __alignof__ (uint32_t)
-+		- (tmp - (char *) 0) % __alignof__ (uint32_t),
-+		salt, salt_len);
-+      assert ((salt - (char *) 0) % __alignof__ (uint32_t) == 0);
-+    }
-+
-+  struct sha256_ctx ctx;
-+  struct sha256_ctx alt_ctx;
-+
-+  /* Prepare for the real work.  */
-+  __sha256_init_ctx (&ctx);
-+
-+  /* Add the key string.  */
-+  __sha256_process_bytes (key, key_len, &ctx);
-+
-+  /* The last part is the salt string.  This must be at most 16
-+     characters and it ends at the first `$' character.  */
-+  __sha256_process_bytes (salt, salt_len, &ctx);
-+
-+
-+  /* Compute alternate SHA256 sum with input KEY, SALT, and KEY.  The
-+     final result will be added to the first context.  */
-+  __sha256_init_ctx (&alt_ctx);
-+
-+  /* Add key.  */
-+  __sha256_process_bytes (key, key_len, &alt_ctx);
-+
-+  /* Add salt.  */
-+  __sha256_process_bytes (salt, salt_len, &alt_ctx);
-+
-+  /* Add key again.  */
-+  __sha256_process_bytes (key, key_len, &alt_ctx);
-+
-+  /* Now get result of this (32 bytes) and add it to the other
-+     context.  */
-+  __sha256_finish_ctx (&alt_ctx, alt_result);
-+
-+  /* Add for any character in the key one byte of the alternate sum.  */
-+  for (cnt = key_len; cnt > 32; cnt -= 32)
-+    __sha256_process_bytes (alt_result, 32, &ctx);
-+  __sha256_process_bytes (alt_result, cnt, &ctx);
-+
-+  /* Take the binary representation of the length of the key and for every
-+     1 add the alternate sum, for every 0 the key.  */
-+  for (cnt = key_len; cnt > 0; cnt >>= 1)
-+    if ((cnt & 1) != 0)
-+      __sha256_process_bytes (alt_result, 32, &ctx);
-+    else
-+      __sha256_process_bytes (key, key_len, &ctx);
-+
-+  /* Create intermediate result.  */
-+  __sha256_finish_ctx (&ctx, alt_result);
-+
-+  /* Start computation of P byte sequence.  */
-+  __sha256_init_ctx (&alt_ctx);
-+
-+  /* For every character in the password add the entire password.  */
-+  for (cnt = 0; cnt < key_len; ++cnt)
-+    __sha256_process_bytes (key, key_len, &alt_ctx);
-+
-+  /* Finish the digest.  */
-+  __sha256_finish_ctx (&alt_ctx, temp_result);
-+
-+  /* Create byte sequence P.  */
-+  cp = p_bytes = alloca (key_len);
-+  for (cnt = key_len; cnt >= 32; cnt -= 32)
-+    cp = mempcpy (cp, temp_result, 32);
-+  memcpy (cp, temp_result, cnt);
-+
-+  /* Start computation of S byte sequence.  */
-+  __sha256_init_ctx (&alt_ctx);
-+
-+  /* For every character in the password add the entire password.  */
-+  for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
-+    __sha256_process_bytes (salt, salt_len, &alt_ctx);
-+
-+  /* Finish the digest.  */
-+  __sha256_finish_ctx (&alt_ctx, temp_result);
-+
-+  /* Create byte sequence S.  */
-+  cp = s_bytes = alloca (salt_len);
-+  for (cnt = salt_len; cnt >= 32; cnt -= 32)
-+    cp = mempcpy (cp, temp_result, 32);
-+  memcpy (cp, temp_result, cnt);
-+
-+  /* Repeatedly run the collected hash value through SHA256 to burn
-+     CPU cycles.  */
-+  for (cnt = 0; cnt < rounds; ++cnt)
-+    {
-+      /* New context.  */
-+      __sha256_init_ctx (&ctx);
-+
-+      /* Add key or last result.  */
-+      if ((cnt & 1) != 0)
-+	__sha256_process_bytes (p_bytes, key_len, &ctx);
-+      else
-+	__sha256_process_bytes (alt_result, 32, &ctx);
-+
-+      /* Add salt for numbers not divisible by 3.  */
-+      if (cnt % 3 != 0)
-+	__sha256_process_bytes (s_bytes, salt_len, &ctx);
-+
-+      /* Add key for numbers not divisible by 7.  */
-+      if (cnt % 7 != 0)
-+	__sha256_process_bytes (p_bytes, key_len, &ctx);
-+
-+      /* Add key or last result.  */
-+      if ((cnt & 1) != 0)
-+	__sha256_process_bytes (alt_result, 32, &ctx);
-+      else
-+	__sha256_process_bytes (p_bytes, key_len, &ctx);
-+
-+      /* Create intermediate result.  */
-+      __sha256_finish_ctx (&ctx, alt_result);
-+    }
-+
-+  /* Now we can construct the result string.  It consists of three
-+     parts.  */
-+  cp = stpncpy (buffer, sha256_salt_prefix, MAX (0, buflen));
-+  buflen -= sizeof (sha256_salt_prefix) - 1;
-+
-+  if (rounds_custom)
-+    {
-+      int n = snprintf (cp, MAX (0, buflen), "%s%zu$",
-+			sha256_rounds_prefix, rounds);
-+      cp += n;
-+      buflen -= n;
-+    }
-+
-+  cp = stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len));
-+  buflen -= MIN ((size_t) MAX (0, buflen), salt_len);
-+
-+  if (buflen > 0)
-+    {
-+      *cp++ = '$';
-+      --buflen;
-+    }
-+
-+  B64_FROM_24BIT (alt_result[0], alt_result[10], alt_result[20], 4);
-+  B64_FROM_24BIT (alt_result[21], alt_result[1], alt_result[11], 4);
-+  B64_FROM_24BIT (alt_result[12], alt_result[22], alt_result[2], 4);
-+  B64_FROM_24BIT (alt_result[3], alt_result[13], alt_result[23], 4);
-+  B64_FROM_24BIT (alt_result[24], alt_result[4], alt_result[14], 4);
-+  B64_FROM_24BIT (alt_result[15], alt_result[25], alt_result[5], 4);
-+  B64_FROM_24BIT (alt_result[6], alt_result[16], alt_result[26], 4);
-+  B64_FROM_24BIT (alt_result[27], alt_result[7], alt_result[17], 4);
-+  B64_FROM_24BIT (alt_result[18], alt_result[28], alt_result[8], 4);
-+  B64_FROM_24BIT (alt_result[9], alt_result[19], alt_result[29], 4);
-+  B64_FROM_24BIT (0, alt_result[31], alt_result[30], 3);
-+  if (buflen <= 0)
-+    {
-+      __set_errno (ERANGE);
-+      buffer = NULL;
-+    }
-+  else
-+    *cp = '\0';		/* Terminate the string.  */
-+
-+  /* Clear the buffer for the intermediate result so that people
-+     attaching to processes or reading core dumps cannot get any
-+     information.  We do it in this way to clear correct_words[]
-+     inside the SHA256 implementation as well.  */
-+  __sha256_init_ctx (&ctx);
-+  __sha256_finish_ctx (&ctx, alt_result);
-+  memset (&ctx, '\0', sizeof (ctx));
-+  memset (&alt_ctx, '\0', sizeof (alt_ctx));
-+
-+  memset (temp_result, '\0', sizeof (temp_result));
-+  memset (p_bytes, '\0', key_len);
-+  memset (s_bytes, '\0', salt_len);
-+  if (copied_key != NULL)
-+    memset (copied_key, '\0', key_len);
-+  if (copied_salt != NULL)
-+    memset (copied_salt, '\0', salt_len);
-+
-+  return buffer;
-+}
-+
-+static char *buffer;
-+
-+/* This entry point is equivalent to the `crypt' function in Unix
-+   libcs.  */
-+char *
-+__sha256_crypt (const unsigned char *key, const unsigned char *salt)
-+{
-+  /* We don't want to have an arbitrary limit in the size of the
-+     password.  We can compute an upper bound for the size of the
-+     result in advance and so we can prepare the buffer we pass to
-+     `sha256_crypt_r'.  */
-+  static int buflen;
-+  int needed = (sizeof (sha256_salt_prefix) - 1
-+		+ sizeof (sha256_rounds_prefix) + 9 + 1
-+		+ strlen (salt) + 1 + 43 + 1);
-+
-+  if (buflen < needed)
-+    {
-+      char *new_buffer = (char *) realloc (buffer, needed);
-+      if (new_buffer == NULL)
-+	return NULL;
-+
-+      buffer = new_buffer;
-+      buflen = needed;
-+    }
-+
-+  return __sha256_crypt_r ((const char *) key, (const char *) salt, buffer, buflen);
-+}
-diff --git a/libcrypt/sha256.c b/libcrypt/sha256.c
-new file mode 100644
-index 0000000..e652a67
---- /dev/null
-+++ b/libcrypt/sha256.c
-@@ -0,0 +1,294 @@
-+/* Functions to compute SHA256 message digest of files or memory blocks.
-+   according to the definition of SHA256 in FIPS 180-2.
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* Written by Ulrich Drepper <drepper@redhat.com>, 2007.  */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include <endian.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+
-+#include "sha256.h"
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# ifdef _LIBC
-+#  include <byteswap.h>
-+#  define SWAP(n) bswap_32 (n)
-+# else
-+#  define SWAP(n) \
-+    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
-+# endif
-+#else
-+# define SWAP(n) (n)
-+#endif
-+
-+
-+/* This array contains the bytes used to pad the buffer to the next
-+   64-byte boundary.  (FIPS 180-2:5.1.1)  */
-+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
-+
-+
-+/* Constants for SHA256 from FIPS 180-2:4.2.2.  */
-+static const uint32_t K[64] =
-+  {
-+    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
-+    0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-+    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
-+    0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-+    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
-+    0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-+    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
-+    0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-+    0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
-+    0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-+    0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
-+    0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-+    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
-+    0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-+    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
-+    0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-+  };
-+
-+
-+/* Process LEN bytes of BUFFER, accumulating context into CTX.
-+   It is assumed that LEN % 64 == 0.  */
-+static void
-+sha256_process_block (const void *buffer, size_t len, struct sha256_ctx *ctx)
-+{
-+  const uint32_t *words = buffer;
-+  size_t nwords = len / sizeof (uint32_t);
-+  uint32_t a = ctx->H[0];
-+  uint32_t b = ctx->H[1];
-+  uint32_t c = ctx->H[2];
-+  uint32_t d = ctx->H[3];
-+  uint32_t e = ctx->H[4];
-+  uint32_t f = ctx->H[5];
-+  uint32_t g = ctx->H[6];
-+  uint32_t h = ctx->H[7];
-+
-+  /* First increment the byte count.  FIPS 180-2 specifies the possible
-+     length of the file up to 2^64 bits.  Here we only compute the
-+     number of bytes.  Do a double word increment.  */
-+  ctx->total[0] += len;
-+  if (ctx->total[0] < len)
-+    ++ctx->total[1];
-+
-+  /* Process all bytes in the buffer with 64 bytes in each round of
-+     the loop.  */
-+  while (nwords > 0)
-+    {
-+      uint32_t W[64];
-+      uint32_t a_save = a;
-+      uint32_t b_save = b;
-+      uint32_t c_save = c;
-+      uint32_t d_save = d;
-+      uint32_t e_save = e;
-+      uint32_t f_save = f;
-+      uint32_t g_save = g;
-+      uint32_t h_save = h;
-+
-+      /* Operators defined in FIPS 180-2:4.1.2.  */
-+#define Ch(x, y, z) ((x & y) ^ (~x & z))
-+#define Maj(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
-+#define S0(x) (CYCLIC (x, 2) ^ CYCLIC (x, 13) ^ CYCLIC (x, 22))
-+#define S1(x) (CYCLIC (x, 6) ^ CYCLIC (x, 11) ^ CYCLIC (x, 25))
-+#define R0(x) (CYCLIC (x, 7) ^ CYCLIC (x, 18) ^ (x >> 3))
-+#define R1(x) (CYCLIC (x, 17) ^ CYCLIC (x, 19) ^ (x >> 10))
-+
-+      /* It is unfortunate that C does not provide an operator for
-+	 cyclic rotation.  Hope the C compiler is smart enough.  */
-+#define CYCLIC(w, s) ((w >> s) | (w << (32 - s)))
-+
-+      /* Compute the message schedule according to FIPS 180-2:6.2.2 step 2.  */
-+      for (unsigned int t = 0; t < 16; ++t)
-+	{
-+	  W[t] = SWAP (*words);
-+	  ++words;
-+	}
-+      for (unsigned int t = 16; t < 64; ++t)
-+	W[t] = R1 (W[t - 2]) + W[t - 7] + R0 (W[t - 15]) + W[t - 16];
-+
-+      /* The actual computation according to FIPS 180-2:6.2.2 step 3.  */
-+      for (unsigned int t = 0; t < 64; ++t)
-+	{
-+	  uint32_t T1 = h + S1 (e) + Ch (e, f, g) + K[t] + W[t];
-+	  uint32_t T2 = S0 (a) + Maj (a, b, c);
-+	  h = g;
-+	  g = f;
-+	  f = e;
-+	  e = d + T1;
-+	  d = c;
-+	  c = b;
-+	  b = a;
-+	  a = T1 + T2;
-+	}
-+
-+      /* Add the starting values of the context according to FIPS 180-2:6.2.2
-+	 step 4.  */
-+      a += a_save;
-+      b += b_save;
-+      c += c_save;
-+      d += d_save;
-+      e += e_save;
-+      f += f_save;
-+      g += g_save;
-+      h += h_save;
-+
-+      /* Prepare for the next round.  */
-+      nwords -= 16;
-+    }
-+
-+  /* Put checksum in context given as argument.  */
-+  ctx->H[0] = a;
-+  ctx->H[1] = b;
-+  ctx->H[2] = c;
-+  ctx->H[3] = d;
-+  ctx->H[4] = e;
-+  ctx->H[5] = f;
-+  ctx->H[6] = g;
-+  ctx->H[7] = h;
-+}
-+
-+
-+/* Initialize structure containing state of computation.
-+   (FIPS 180-2:5.3.2)  */
-+void
-+__sha256_init_ctx (struct sha256_ctx *ctx)
-+{
-+  ctx->H[0] = 0x6a09e667;
-+  ctx->H[1] = 0xbb67ae85;
-+  ctx->H[2] = 0x3c6ef372;
-+  ctx->H[3] = 0xa54ff53a;
-+  ctx->H[4] = 0x510e527f;
-+  ctx->H[5] = 0x9b05688c;
-+  ctx->H[6] = 0x1f83d9ab;
-+  ctx->H[7] = 0x5be0cd19;
-+
-+  ctx->total[0] = ctx->total[1] = 0;
-+  ctx->buflen = 0;
-+}
-+
-+
-+/* Process the remaining bytes in the internal buffer and the usual
-+   prolog according to the standard and write the result to RESBUF.
-+
-+   IMPORTANT: On some systems it is required that RESBUF is correctly
-+   aligned for a 32 bits value.  */
-+void *
-+__sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf)
-+{
-+  /* Take yet unprocessed bytes into account.  */
-+  uint32_t bytes = ctx->buflen;
-+  size_t pad;
-+
-+  /* Now count remaining bytes.  */
-+  ctx->total[0] += bytes;
-+  if (ctx->total[0] < bytes)
-+    ++ctx->total[1];
-+
-+  pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
-+  memcpy (&ctx->buffer[bytes], fillbuf, pad);
-+
-+  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
-+  *(uint32_t *) &ctx->buffer[bytes + pad + 4] = SWAP (ctx->total[0] << 3);
-+  *(uint32_t *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) |
-+						  (ctx->total[0] >> 29));
-+
-+  /* Process last bytes.  */
-+  sha256_process_block (ctx->buffer, bytes + pad + 8, ctx);
-+
-+  /* Put result from CTX in first 32 bytes following RESBUF.  */
-+  for (unsigned int i = 0; i < 8; ++i)
-+    ((uint32_t *) resbuf)[i] = SWAP (ctx->H[i]);
-+
-+  return resbuf;
-+}
-+
-+
-+void
-+__sha256_process_bytes (const void *buffer, size_t len, struct sha256_ctx *ctx)
-+{
-+  /* When we already have some bits in our internal buffer concatenate
-+     both inputs first.  */
-+  if (ctx->buflen != 0)
-+    {
-+      size_t left_over = ctx->buflen;
-+      size_t add = 128 - left_over > len ? len : 128 - left_over;
-+
-+      memcpy (&ctx->buffer[left_over], buffer, add);
-+      ctx->buflen += add;
-+
-+      if (ctx->buflen > 64)
-+	{
-+	  sha256_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
-+
-+	  ctx->buflen &= 63;
-+	  /* The regions in the following copy operation cannot overlap.  */
-+	  memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63],
-+		  ctx->buflen);
-+	}
-+
-+      buffer = (const char *) buffer + add;
-+      len -= add;
-+    }
-+
-+  /* Process available complete blocks.  */
-+  if (len >= 64)
-+    {
-+#if __GNUC__ >= 2
-+# define UNALIGNED_P(p) (((uintptr_t) p) % __alignof__ (uint32_t) != 0)
-+#else
-+# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint32_t) != 0)
-+#endif
-+      if (UNALIGNED_P (buffer))
-+	while (len > 64)
-+	  {
-+	    sha256_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
-+	    buffer = (const char *) buffer + 64;
-+	    len -= 64;
-+	  }
-+      else
-+	{
-+	  sha256_process_block (buffer, len & ~63, ctx);
-+	  buffer = (const char *) buffer + (len & ~63);
-+	  len &= 63;
-+	}
-+    }
-+
-+  /* Move remaining bytes into internal buffer.  */
-+  if (len > 0)
-+    {
-+      size_t left_over = ctx->buflen;
-+
-+      memcpy (&ctx->buffer[left_over], buffer, len);
-+      left_over += len;
-+      if (left_over >= 64)
-+	{
-+	  sha256_process_block (ctx->buffer, 64, ctx);
-+	  left_over -= 64;
-+	  memcpy (ctx->buffer, &ctx->buffer[64], left_over);
-+	}
-+      ctx->buflen = left_over;
-+    }
-+}
-diff --git a/libcrypt/sha256.h b/libcrypt/sha256.h
-new file mode 100644
-index 0000000..291674f
---- /dev/null
-+++ b/libcrypt/sha256.h
-@@ -0,0 +1,58 @@
-+/* Declaration of functions and data types used for SHA256 sum computing
-+   library functions.
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef _SHA256_H
-+#define _SHA256_H 1
-+
-+#include <limits.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+
-+
-+/* Structure to save state of computation between the single steps.  */
-+struct sha256_ctx
-+{
-+  uint32_t H[8];
-+
-+  uint32_t total[2];
-+  uint32_t buflen;
-+  char buffer[128] __attribute__ ((__aligned__ (__alignof__ (uint32_t))));
-+};
-+
-+/* Initialize structure containing state of computation.
-+   (FIPS 180-2: 5.3.2)  */
-+extern void __sha256_init_ctx (struct sha256_ctx *ctx) attribute_hidden;
-+
-+/* Starting with the result of former calls of this function (or the
-+   initialization function update the context for the next LEN bytes
-+   starting at BUFFER.
-+   It is NOT required that LEN is a multiple of 64.  */
-+extern void __sha256_process_bytes (const void *buffer, size_t len,
-+				    struct sha256_ctx *ctx) attribute_hidden;
-+
-+/* Process the remaining bytes in the buffer and put result from CTX
-+   in first 32 bytes following RESBUF.
-+
-+   IMPORTANT: On some systems it is required that RESBUF is correctly
-+   aligned for a 32 bits value.  */
-+extern void *__sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf)
-+  attribute_hidden;
-+
-+#endif /* sha256.h */
--- 
-1.7.7.3
-
diff --git a/main/libc0.9.32/uclibc-epoll_pwait-hack.patch b/main/libc0.9.32/uclibc-epoll_pwait-hack.patch
deleted file mode 100644
index 7e2805684..000000000
--- a/main/libc0.9.32/uclibc-epoll_pwait-hack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
-index 85b0cfd..8fff9e6 100644
---- a/libc/sysdeps/linux/common/epoll.c
-+++ b/libc/sysdeps/linux/common/epoll.c
-@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait;
- int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
- 						int timeout, const sigset_t *set)
- {
-+	int n = _NSIG / 8;
- 	if (SINGLE_THREAD_P)
--		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
-+		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, n);
- # ifdef __UCLIBC_HAS_THREADS_NATIVE__
- 	else {
- 		int oldtype = LIBC_CANCEL_ASYNC ();
--		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
-+		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, n);
- 		LIBC_CANCEL_RESET (oldtype);
- 		return result;
- 	}
diff --git a/main/libc0.9.32/uclibc-librt-asneeded-fix.patch b/main/libc0.9.32/uclibc-librt-asneeded-fix.patch
deleted file mode 100644
index d85af19f2..000000000
--- a/main/libc0.9.32/uclibc-librt-asneeded-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- uClibc-0.9.32-rc3.orig/Makefile.in
-+++ uClibc-0.9.32-rc3/Makefile.in
-@@ -340,6 +340,12 @@
- 		echo "GROUP ( $(UBACKTRACE_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \
- 	fi
- endif
-+ifeq ($(UCLIBC_HAS_REALTIME),y)
-+# Add the AS_NEEDED entry for librt.so
-+	if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so ] ; then \
-+		echo "GROUP ( $(LIBRT_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \
-+	fi
-+endif
- ifeq ($(UCLIBC_HAS_THREADS),y)
- ifneq ($(LINUXTHREADS_OLD),y)
- ifeq ($(HARDWIRED_ABSPATH),y)
---- uClibc-0.9.32-rc3.orig/Rules.mak
-+++ uClibc-0.9.32-rc3/Rules.mak
-@@ -119,6 +119,7 @@
- LIBC := libc
- SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
- UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
-+LIBRT_DSO := librt.so.$(ABI_VERSION)
- ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
- UCLIBC_LDSO_NAME := ld64-uClibc
- ARCH_NATIVE_BIT := 64
-@@ -542,6 +543,13 @@
- export UBACKTRACE_ASNEEDED:=$(shell $(LD) --help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(UBACKTRACE_FULL_NAME) )" || echo "$(UBACKTRACE_FULL_NAME)")
- else
- export UBACKTRACE_ASNEEDED:=""
-+endif
-+ifeq ($(UCLIBC_HAS_REALTIME),y)
-+# Only used in installed libc.so linker script
-+LIBRT_FULL_NAME := $(RUNTIME_PREFIX)lib/$(LIBRT_DSO)
-+export LIBRT_ASNEEDED:=$(shell $(LD) --help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(LIBRT_FULL_NAME) )" || echo "$(LIBRT_FULL_NAME)")
-+else
-+export LIBRT_ASNEEDED:=""
- endif
- endif
- 
diff --git a/main/libc0.9.32/uclibc-resolv-cname-fix.diff b/main/libc0.9.32/uclibc-resolv-cname-fix.diff
deleted file mode 100644
index cf5e777f7..000000000
--- a/main/libc0.9.32/uclibc-resolv-cname-fix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
-index 1e394d4..03d68fe 100644
---- a/libc/inet/resolv.c
-+++ b/libc/inet/resolv.c
-@@ -3099,11 +3099,9 @@ int res_query(const char *dname, int class, int type,
- 
- 	free(a.dotted);
- 
--	if (a.atype == type) { /* CNAME */
--		if (i > anslen)
--			i = anslen;
--		memcpy(answer, packet, i);
--	}
-+	i = MIN(anslen, i);
-+	memcpy(answer, packet, i);
-+
- 	free(packet);
- 	return i;
- }
diff --git a/main/libc0.9.32/uclibc-ubacktrace-asneeded-fix.patch b/main/libc0.9.32/uclibc-ubacktrace-asneeded-fix.patch
deleted file mode 100644
index 8fc06508e..000000000
--- a/main/libc0.9.32/uclibc-ubacktrace-asneeded-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- uClibc-0.9.32-rc3.orig/Makefile.in
-+++ uClibc-0.9.32-rc3/Makefile.in
-@@ -336,7 +336,7 @@
- endif
- ifeq ($(UCLIBC_HAS_BACKTRACE),y)
- # Add the AS_NEEDED entry for libubacktrace.so
--	if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_LIBNAME) ] ; then \
-+	if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so ] ; then \
- 		echo "GROUP ( $(UBACKTRACE_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \
- 	fi
- endif
---- uClibc-0.9.32-rc3.orig/Rules.mak
-+++ uClibc-0.9.32-rc3/Rules.mak
-@@ -118,7 +118,7 @@
- 
- LIBC := libc
- SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
--UBACKTRACE_DSO := libubacktrace.so.$(MAJOR_VERSION)
-+UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
- ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
- UCLIBC_LDSO_NAME := ld64-uClibc
- ARCH_NATIVE_BIT := 64
diff --git a/main/libc0.9.32/uclibcconfig.arm b/main/libc0.9.32/uclibcconfig.arm
index 8f35012dd..01f5ee4d7 100644
--- a/main/libc0.9.32/uclibcconfig.arm
+++ b/main/libc0.9.32/uclibcconfig.arm
@@ -222,7 +222,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 UCLIBC_HAS_UTMPX=y
diff --git a/main/libc0.9.32/uclibcconfig.powerpc b/main/libc0.9.32/uclibcconfig.powerpc
index 37dc98f46..471423cd7 100644
--- a/main/libc0.9.32/uclibcconfig.powerpc
+++ b/main/libc0.9.32/uclibcconfig.powerpc
@@ -206,7 +206,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 UCLIBC_HAS_UTMPX=y
diff --git a/main/libc0.9.32/uclibcconfig.x86 b/main/libc0.9.32/uclibcconfig.x86
index 335117980..6698e446f 100644
--- a/main/libc0.9.32/uclibcconfig.x86
+++ b/main/libc0.9.32/uclibcconfig.x86
@@ -221,7 +221,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 UCLIBC_HAS_UTMPX=y
diff --git a/main/libc0.9.32/uclibcconfig.x86_64 b/main/libc0.9.32/uclibcconfig.x86_64
index e76bbc31c..513b1224d 100644
--- a/main/libc0.9.32/uclibcconfig.x86_64
+++ b/main/libc0.9.32/uclibcconfig.x86_64
@@ -204,7 +204,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 UCLIBC_HAS_UTMPX=y
diff --git a/main/libdrm/APKBUILD b/main/libdrm/APKBUILD
index a72332817..6b53b1a4b 100644
--- a/main/libdrm/APKBUILD
+++ b/main/libdrm/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libdrm
-pkgver=2.4.27
+pkgver=2.4.29
 pkgrel=0
 pkgdesc="Userspace interface to kernel DRM services"
 url="http://dri.freedesktop.org/"
@@ -25,4 +25,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
-md5sums="0fba4f42735cd3d24dd7a8cde0023fbd  libdrm-2.4.27.tar.bz2"
+md5sums="96d5e3e9edd55f4b016fe3b5dd0a1953  libdrm-2.4.29.tar.bz2"
diff --git a/main/libevent/APKBUILD b/main/libevent/APKBUILD
index f66546986..5260417bd 100644
--- a/main/libevent/APKBUILD
+++ b/main/libevent/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libevent
-pkgver=2.0.15
+pkgver=2.0.16
 pkgrel=0
 pkgdesc="An event notification library"
 url="http://www.monkey.org/~provos/libevent/"
@@ -24,4 +24,4 @@ package() {
 	make -j1 DESTDIR=$pkgdir install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
-md5sums="2643abe7ba242df15c08b2cc14ec8759  libevent-2.0.15-stable.tar.gz"
+md5sums="899efcffccdb3d5111419df76e7dc8df  libevent-2.0.16-stable.tar.gz"
diff --git a/main/libgsf/APKBUILD b/main/libgsf/APKBUILD
index 2310e91f9..fce0ab7bb 100644
--- a/main/libgsf/APKBUILD
+++ b/main/libgsf/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libgsf
-pkgver=1.14.21
-pkgrel=1
+pkgver=1.14.22
+pkgrel=0
 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats."
 url="http://www.gnome.org/"
 arch="all"
@@ -9,7 +9,7 @@ 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"
+source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz"
 
 depends_dev="glib-dev bzip2-dev libxml2-dev pkgconfig"
 
@@ -33,4 +33,4 @@ package() {
 	rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1
 }
 
-md5sums="2b702648b853402554c97d75405c60d3  libgsf-1.14.21.tar.bz2"
+md5sums="5d4d26767ca5de505435f5fabee2e4c1  libgsf-1.14.22.tar.xz"
diff --git a/main/libmicrohttpd/APKBUILD b/main/libmicrohttpd/APKBUILD
index 13ff29b1b..c12f70580 100644
--- a/main/libmicrohttpd/APKBUILD
+++ b/main/libmicrohttpd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libmicrohttpd
-pkgver=0.9.16
+pkgver=0.9.17
 pkgrel=0
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 url="http://www.gnu.org/software/libmicrohttpd/"
@@ -43,4 +43,4 @@ package() {
                 "$pkgdir"/usr/include/plibc.h
 }
 
-md5sums="e1240c6ae383b5be89431932f181898a  libmicrohttpd-0.9.16.tar.gz"
+md5sums="d6802049c806e903ef1fa9c5b847e555  libmicrohttpd-0.9.17.tar.gz"
diff --git a/main/libraw/APKBUILD b/main/libraw/APKBUILD
index d4745f8d7..d0cf200ce 100644
--- a/main/libraw/APKBUILD
+++ b/main/libraw/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libraw
-pkgver=0.14.3
+pkgver=0.14.4
 pkgrel=0
 pkgdesc="Library for reading RAW files obtained from digital photo cameras"
 url="http://www.libraw.org/"
@@ -35,4 +35,4 @@ package() {
 
 }
 
-md5sums="d8f81a52b0fada9d5bf7e659e21e3a57  LibRaw-0.14.3.tar.gz"
+md5sums="c198292e9997f056a8d1f8ac03401442  LibRaw-0.14.4.tar.gz"
diff --git a/main/librsvg/APKBUILD b/main/librsvg/APKBUILD
index c642a0a5b..1ccc52ec0 100644
--- a/main/librsvg/APKBUILD
+++ b/main/librsvg/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=librsvg
-pkgver=2.34.1
+pkgver=2.34.2
 pkgrel=0
 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf"
 url="http://librsvg.sourceforge.net/"
@@ -33,4 +33,4 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 }
 
-md5sums="e2eeca43fb725d028561834888071106  librsvg-2.34.1.tar.bz2"
+md5sums="4a7eda78019cb89d4e7ae7c841480399  librsvg-2.34.2.tar.bz2"
diff --git a/main/libssh/APKBUILD b/main/libssh/APKBUILD
index 8f15a4e98..20d86171b 100644
--- a/main/libssh/APKBUILD
+++ b/main/libssh/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libssh
 pkgver=0.5.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
 arch="all"
@@ -10,7 +10,8 @@ license="LGPL"
 depends=
 makedepends="openssl-dev cmake doxygen"
 subpackages="$pkgname-dev"
-source="http://www.libssh.org/files/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
+source="http://www.libssh.org/files/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz
+	link-pthread.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -41,4 +42,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="38b67c48af7a9204660a3e08f97ceba6  libssh-0.5.2.tar.gz"
+md5sums="38b67c48af7a9204660a3e08f97ceba6  libssh-0.5.2.tar.gz
+8d58b3391286de4dad3eb8a5b70171aa  link-pthread.patch"
diff --git a/main/libssh/link-pthread.patch b/main/libssh/link-pthread.patch
new file mode 100644
index 000000000..2e2c770f6
--- /dev/null
+++ b/main/libssh/link-pthread.patch
@@ -0,0 +1,63 @@
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index aeff201..0191d5d 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -13,36 +13,36 @@ include_directories(
+ 
+ if (LINUX)
+     add_executable(libssh_scp libssh_scp.c ${examples_SRCS})
+-    target_link_libraries(libssh_scp ${LIBSSH_SHARED_LIBRARY})
++    target_link_libraries(libssh_scp ${LIBSSH_SHARED_LIBRARY} pthread)
+ 
+     add_executable(scp_download scp_download.c ${examples_SRCS})
+-    target_link_libraries(scp_download ${LIBSSH_SHARED_LIBRARY})
++    target_link_libraries(scp_download ${LIBSSH_SHARED_LIBRARY} pthread)
+ 
+     add_executable(samplessh sample.c ${examples_SRCS})
+-    target_link_libraries(samplessh ${LIBSSH_SHARED_LIBRARY})
++    target_link_libraries(samplessh ${LIBSSH_SHARED_LIBRARY} pthread)
+ 
+     add_executable(sshnetcat sshnetcat.c ${examples_SRCS})
+-    target_link_libraries(sshnetcat ${LIBSSH_SHARED_LIBRARY})
++    target_link_libraries(sshnetcat ${LIBSSH_SHARED_LIBRARY} pthread)
+ 
+     if (WITH_SFTP)
+         add_executable(samplesftp samplesftp.c ${examples_SRCS})
+-        target_link_libraries(samplesftp ${LIBSSH_SHARED_LIBRARY})
++        target_link_libraries(samplesftp ${LIBSSH_SHARED_LIBRARY} pthread)
+     endif (WITH_SFTP)
+ 
+     if (WITH_SERVER)
+         add_executable(samplesshd samplesshd.c)
+-        target_link_libraries(samplesshd ${LIBSSH_SHARED_LIBRARY})
++        target_link_libraries(samplesshd ${LIBSSH_SHARED_LIBRARY} pthread)
+     endif (WITH_SERVER)
+ endif (LINUX)
+ 
+ add_executable(exec exec.c ${examples_SRCS})
+-target_link_libraries(exec ${LIBSSH_SHARED_LIBRARY})
++target_link_libraries(exec ${LIBSSH_SHARED_LIBRARY} pthread)
+ 
+ add_executable(senddata senddata.c ${examples_SRCS})
+-target_link_libraries(senddata ${LIBSSH_SHARED_LIBRARY})
++target_link_libraries(senddata ${LIBSSH_SHARED_LIBRARY} pthread)
+ 
+ add_executable(libsshpp libsshpp.cpp)
+-target_link_libraries(libsshpp ${LIBSSH_SHARED_LIBRARY})
++target_link_libraries(libsshpp ${LIBSSH_SHARED_LIBRARY} pthread)
+ 
+ add_executable(libsshpp_noexcept libsshpp_noexcept.cpp)
+-target_link_libraries(libsshpp_noexcept ${LIBSSH_SHARED_LIBRARY})
++target_link_libraries(libsshpp_noexcept ${LIBSSH_SHARED_LIBRARY} pthread)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e158665..ef2005d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -40,6 +40,7 @@ if (HAVE_LIBSOCKET)
+   set(LIBSSH_LINK_LIBRARIES
+     ${LIBSSH_LINK_LIBRARIES}
+     socket
++    pthread
+   )
+ endif (HAVE_LIBSOCKET)
+ 
diff --git a/main/libtxc_dxtn/APKBUILD b/main/libtxc_dxtn/APKBUILD
new file mode 100644
index 000000000..6a3c79ec0
--- /dev/null
+++ b/main/libtxc_dxtn/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=libtxc_dxtn
+pkgver=1.0.1
+pkgrel=0
+pkgdesc="S3TC texture decompression helper library"
+url="http://dri.freedesktop.org/wiki/S3TC"
+arch="all"
+license="BSD"
+depends=""
+depends_dev="mesa-dev"
+makedepends="$depends_dev automake autoconf libtool"
+install=""
+subpackages="$pkgname-dev"
+source="http://cgit.freedesktop.org/~mareko/libtxc_dxtn/snapshot/libtxc_dxtn-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/libtxc_dxtn-$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"
+
+	sh autogen.sh
+	./configure --prefix=/usr --sysconfdir=/etc || return 1
+	make -j4
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	rm "$pkgdir"/usr/lib/libtxc_dxtn.la
+}
+
+md5sums="63dc19246e1b8a5990be5ced66aff913  libtxc_dxtn-1.0.1.tar.bz2"
diff --git a/main/libusb/APKBUILD b/main/libusb/APKBUILD
index d9c58aa60..f97d5cf4f 100644
--- a/main/libusb/APKBUILD
+++ b/main/libusb/APKBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libusb
-pkgver=1.0.8
-pkgrel=3
+pkgver=1.0.9_rc1
+_ver=${pkgver/_/-}
+pkgrel=0
 pkgdesc="Library to enable user space application programs to communicate with USB devices"
 url="http://libusb.sourceforge.net/"
 arch="all"
@@ -9,17 +10,30 @@ license="LGPL"
 subpackages="$pkgname-dev"
 depends=""
 makedepends=""
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
 
+# This is a git snapshot of what will hopefully soon become 1.0.9, but
+# we need this now, to get things in place for usb over network
+# To regenerate do:
+# git clone git://git.libusb.org/libusb.git
+# cd libusb
+# git checkout 1.0.9-rc1
+# ./autogen.sh
+# 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"
+
+_builddir="$srcdir"/$pkgname-$_ver
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --disable-build-docs
+	cd "$_builddir"
+	./configure --prefix=/usr
 	make || return 1
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
-md5sums="37d34e6eaa69a4b645a19ff4ca63ceef  libusb-1.0.8.tar.bz2"
+md5sums="4d131792dd73cb8cf7156a88065e462f  libusb-1.0.9-rc1.tar.bz2"
diff --git a/main/libxfce4ui/APKBUILD b/main/libxfce4ui/APKBUILD
index 4ce21b8f6..02e3453ef 100644
--- a/main/libxfce4ui/APKBUILD
+++ b/main/libxfce4ui/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxfce4ui
-pkgver=4.8.0
-pkgrel=3
+pkgver=4.8.1
+pkgrel=0
 pkgdesc="Widgets library for the Xfce desktop environment"
 url="http://www.xfce.org/"
 arch="all"
 license="GPL2"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends=
 replaces="libxfcegui4"
 makedepends="gtk+-dev xfconf-dev libxfce4util-dev startup-notification-dev
@@ -40,4 +40,4 @@ dev() {
 	mv "$pkgdir"/usr/share/glade3 "$subpkgdir"/usr/share/ || return 1
 }
 
-md5sums="df9acb3328dff905bd0777b84532b69f  libxfce4ui-4.8.0.tar.bz2"
+md5sums="30bd432dd0f19305e846a122d4c7c6fe  libxfce4ui-4.8.1.tar.bz2"
diff --git a/main/libxi/APKBUILD b/main/libxi/APKBUILD
index 19b4b1905..c2c4ff10f 100644
--- a/main/libxi/APKBUILD
+++ b/main/libxi/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxi
-pkgver=1.4.3
+pkgver=1.4.5
 pkgrel=0
 pkgdesc="X11 Input extension library"
 url="http://xorg.freedesktop.org"
@@ -33,4 +33,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="792e8a7ddc7175911d69f823d38eaff6  libXi-1.4.3.tar.bz2"
+md5sums="82dcdc76388116800a2c3ad969f510a4  libXi-1.4.5.tar.bz2"
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index 623fde284..b4a4d5ac8 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lighttpd
-pkgver=1.4.29
+pkgver=1.4.30
 _streamver=2.2.0
-pkgrel=2
+pkgrel=0
 pkgdesc="a secure, fast, compliant and very flexible web-server"
 url="http://www.lighttpd.net/"
 arch="all"
@@ -126,7 +126,7 @@ mod_webdav() {
 }
 
 
-md5sums="e6e67b09986cb504db630b5a86b2dd76  lighttpd-1.4.29.tar.bz2
+md5sums="63f9df52dcae0ab5689a95c99c54e48a  lighttpd-1.4.30.tar.bz2
 ac37885c881a058194405232e7737a7a  lighttpd-1.4.18_mod_h264_streaming-2.2.0.tar.gz
 e37770e4eed20390806a2420a3970fcd  lighttpd.initd
 0dede109282bfe685bdec6b35f0e4b6b  lighttpd.confd
diff --git a/main/links/APKBUILD b/main/links/APKBUILD
index 8384dcbc8..1c3d33d7e 100644
--- a/main/links/APKBUILD
+++ b/main/links/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=links
-pkgver=2.3
+pkgver=2.5
 pkgrel=0
 pkgdesc="A text WWW browser, similar to Lynx"
 url="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/"
@@ -26,4 +26,4 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="1dc17862e766cec7c544166186e7167b  links-2.3.tar.bz2"
+md5sums="3a4d5bd3ced28255e05bffa0eea6afd6  links-2.5.tar.bz2"
diff --git a/main/linux-firmware/APKBUILD b/main/linux-firmware/APKBUILD
index c4b4d5a23..215861b06 100644
--- a/main/linux-firmware/APKBUILD
+++ b/main/linux-firmware/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=linux-firmware
-pkgver=20110826
+pkgver=20111208
 pkgrel=0
 pkgdesc="firmware files for linux"
 url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary"
@@ -45,4 +45,4 @@ package() {
 	mv "${_builddir}" ${pkgdir}/lib/firmware
 }
 
-md5sums="3d881871622eb8c957d244060cd7f4a2  linux-firmware-20110826.tar.bz2"
+md5sums="b8673160ebf2f7888c4044819efedf32  linux-firmware-20111208.tar.bz2"
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 7b0261f04..e16e6af24 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=grsec
 pkgname=linux-${_flavor}
-pkgver=3.0.10
+pkgver=3.0.14
 _kernver=3.0
 pkgrel=0
 pkgdesc="Linux kernel with grsecurity"
@@ -14,12 +14,16 @@ _config=${config:-kernelconfig.${CARCH}}
 install=
 source="ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$_kernver.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/kernel/v3.0/patch-$pkgver.bz2
-	grsecurity-2.2.2-3.0.10-unofficial.patch
+	grsecurity-2.2.2-$pkgver-unofficial.patch
 	grsec-timblogiw-noconst.patch
 	
 	0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch
 	0004-arp-flush-arp-cache-on-device-change.patch
 
+	x86-centaur-enable-cx8-for-via-eden-too.patch
+	linux-3.0.x-regression-with-ipv4-routes-having-mtu.patch
+	net-flow-remove-sleeping-and-deferral-mechanism-from-flow_cache_flush.patch
+
 	kernelconfig.x86
 	kernelconfig.x86_64
 	"
@@ -139,10 +143,13 @@ dev() {
 }
 
 md5sums="398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
-8e0391dd935d838ee3023ab9daa6b447  patch-3.0.10.bz2
-cb9aa7ec8c615a5c3ba730ac951da9d2  grsecurity-2.2.2-3.0.10-unofficial.patch
+f2745bd4dcb3267414713adff403b54c  patch-3.0.14.bz2
+3c0fcf923a27a963ae86a3e694cb6bbd  grsecurity-2.2.2-3.0.14-unofficial.patch
 c41cf0ee9794f393423c6b2093072260  grsec-timblogiw-noconst.patch
 ebb99ef6ad8cd2d9fd8f49d5c5849057  0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
-57c444f3e8bb60a7f5782330bc450efa  kernelconfig.x86
-f00f1c26ef7ddcdc4467bb883a71522b  kernelconfig.x86_64"
+f3eda7112ef074a4121ec6de943c63ee  x86-centaur-enable-cx8-for-via-eden-too.patch
+62cc7d7b5ba7ef05b72ff91c0411c189  linux-3.0.x-regression-with-ipv4-routes-having-mtu.patch
+b25335e8fcbf8c969230d55ac4e75cf8  net-flow-remove-sleeping-and-deferral-mechanism-from-flow_cache_flush.patch
+587b1fb2f6a5c9ba714900b856f57f09  kernelconfig.x86
+99836ffe918bbdef7da1a56a3d075c7a  kernelconfig.x86_64"
diff --git a/main/linux-grsec/grsecurity-2.2.2-3.0.10-unofficial.patch b/main/linux-grsec/grsecurity-2.2.2-3.0.14-unofficial.patch
index ad5496b8f..c4c0b6ef4 100644
--- a/main/linux-grsec/grsecurity-2.2.2-3.0.10-unofficial.patch
+++ b/main/linux-grsec/grsecurity-2.2.2-3.0.14-unofficial.patch
@@ -158,7 +158,7 @@ index aa47be7..1fbd18f 100644
  
  	pcd.		[PARIDE]
 diff --git a/Makefile b/Makefile
-index 36036d1..167a8c6 100644
+index f4f577b..9e9b120 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -708,7 +708,7 @@ index acca35a..f7debc1 100644
  
  EXPORT_SYMBOL(__get_user_1);
 diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
-index 5e1e541..6af2d90 100644
+index 74ae833..8749ecb 100644
 --- a/arch/arm/kernel/process.c
 +++ b/arch/arm/kernel/process.c
 @@ -28,7 +28,6 @@
@@ -719,7 +719,7 @@ index 5e1e541..6af2d90 100644
  #include <linux/hw_breakpoint.h>
  
  #include <asm/cacheflush.h>
-@@ -479,12 +478,6 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -482,12 +481,6 @@ unsigned long get_wchan(struct task_struct *p)
  	return 0;
  }
  
@@ -15913,7 +15913,7 @@ index 42eb330..139955c 100644
  
  	return ret;
 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index 9242436..753954d 100644
+index d4a705f..ef8f1a9 100644
 --- a/arch/x86/kernel/reboot.c
 +++ b/arch/x86/kernel/reboot.c
 @@ -35,7 +35,7 @@ void (*pm_power_off)(void);
@@ -15925,7 +15925,7 @@ index 9242436..753954d 100644
  enum reboot_type reboot_type = BOOT_ACPI;
  int reboot_force;
  
-@@ -315,13 +315,17 @@ core_initcall(reboot_init);
+@@ -324,13 +324,17 @@ core_initcall(reboot_init);
  extern const unsigned char machine_real_restart_asm[];
  extern const u64 machine_real_restart_gdt[3];
  
@@ -15945,7 +15945,7 @@ index 9242436..753954d 100644
  	local_irq_disable();
  
  	/* Write zero to CMOS register number 0x0f, which the BIOS POST
-@@ -347,14 +351,14 @@ void machine_real_restart(unsigned int type)
+@@ -356,14 +360,14 @@ void machine_real_restart(unsigned int type)
  	   boot)".  This seems like a fairly standard thing that gets set by
  	   REBOOT.COM programs, and the previous reset routine did this
  	   too. */
@@ -15962,7 +15962,7 @@ index 9242436..753954d 100644
  
  	/* GDT[0]: GDT self-pointer */
  	lowmem_gdt[0] =
-@@ -365,7 +369,33 @@ void machine_real_restart(unsigned int type)
+@@ -374,7 +378,33 @@ void machine_real_restart(unsigned int type)
  		GDT_ENTRY(0x009b, restart_pa, 0xffff);
  
  	/* Jump to the identity-mapped low memory code */
@@ -15996,7 +15996,7 @@ index 9242436..753954d 100644
  }
  #ifdef CONFIG_APM_MODULE
  EXPORT_SYMBOL(machine_real_restart);
-@@ -523,7 +553,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
+@@ -532,7 +562,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
   * try to force a triple fault and then cycle between hitting the keyboard
   * controller and doing that
   */
@@ -16005,7 +16005,7 @@ index 9242436..753954d 100644
  {
  	int i;
  	int attempt = 0;
-@@ -647,13 +677,13 @@ void native_machine_shutdown(void)
+@@ -656,13 +686,13 @@ void native_machine_shutdown(void)
  #endif
  }
  
@@ -16021,7 +16021,7 @@ index 9242436..753954d 100644
  {
  	printk("machine restart\n");
  
-@@ -662,7 +692,7 @@ static void native_machine_restart(char *__unused)
+@@ -671,7 +701,7 @@ static void native_machine_restart(char *__unused)
  	__machine_emergency_restart(0);
  }
  
@@ -16030,7 +16030,7 @@ index 9242436..753954d 100644
  {
  	/* stop other cpus and apics */
  	machine_shutdown();
-@@ -673,7 +703,7 @@ static void native_machine_halt(void)
+@@ -682,7 +712,7 @@ static void native_machine_halt(void)
  	stop_this_cpu(NULL);
  }
  
@@ -16039,7 +16039,7 @@ index 9242436..753954d 100644
  {
  	if (pm_power_off) {
  		if (!reboot_force)
-@@ -682,6 +712,7 @@ static void native_machine_power_off(void)
+@@ -691,6 +721,7 @@ static void native_machine_power_off(void)
  	}
  	/* a fallback in case there is no PM info available */
  	tboot_shutdown(TB_SHUTDOWN_HALT);
@@ -21096,10 +21096,10 @@ index 2dbf6bf..4a744ee 100644
 +	return ret ? -EFAULT : 0;
 +}
 diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
-index ea30585..b5e1508 100644
+index dd74e46..7d26398 100644
 --- a/arch/x86/mm/gup.c
 +++ b/arch/x86/mm/gup.c
-@@ -253,7 +253,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
+@@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
  	addr = start;
  	len = (unsigned long) nr_pages << PAGE_SHIFT;
  	end = start + len;
@@ -21109,10 +21109,10 @@ index ea30585..b5e1508 100644
  		return 0;
  
 diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
-index b499626..6fd1882 100644
+index f4f29b1..5cac4fb 100644
 --- a/arch/x86/mm/highmem_32.c
 +++ b/arch/x86/mm/highmem_32.c
-@@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
+@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
  	idx = type + KM_TYPE_NR*smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
  	BUG_ON(!pte_none(*(kmap_pte-idx)));
@@ -21120,9 +21120,10 @@ index b499626..6fd1882 100644
 +	pax_open_kernel();
  	set_pte(kmap_pte-idx, mk_pte(page, prot));
 +	pax_close_kernel();
++
+ 	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
- }
 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
 index f581a18..29efd37 100644
 --- a/arch/x86/mm/hugetlbpage.c
@@ -26871,7 +26872,7 @@ index a365be0..a629755 100644
  	return -EINVAL;
  }
 diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
-index 82db185..c935ce3 100644
+index 1367ced..f2ec98d 100644
 --- a/drivers/gpu/drm/drm_crtc.c
 +++ b/drivers/gpu/drm/drm_crtc.c
 @@ -1372,7 +1372,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
@@ -26921,7 +26922,7 @@ index 82db185..c935ce3 100644
  
  	if (!num_clips != !clips_ptr) {
  		ret = -EINVAL;
-@@ -2270,7 +2270,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
+@@ -2274,7 +2274,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
  	out_resp->flags = property->flags;
  
  	if ((out_resp->count_values >= value_count) && value_count) {
@@ -26930,7 +26931,7 @@ index 82db185..c935ce3 100644
  		for (i = 0; i < value_count; i++) {
  			if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
  				ret = -EFAULT;
-@@ -2283,7 +2283,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
+@@ -2287,7 +2287,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
  	if (property->flags & DRM_MODE_PROP_ENUM) {
  		if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
  			copied = 0;
@@ -26939,7 +26940,7 @@ index 82db185..c935ce3 100644
  			list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
  
  				if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
-@@ -2306,7 +2306,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
+@@ -2310,7 +2310,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
  		if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
  			copied = 0;
  			blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
@@ -26948,7 +26949,7 @@ index 82db185..c935ce3 100644
  
  			list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
  				if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
-@@ -2367,7 +2367,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
+@@ -2371,7 +2371,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
  	struct drm_mode_get_blob *out_resp = data;
  	struct drm_property_blob *blob;
  	int ret = 0;
@@ -26957,7 +26958,7 @@ index 82db185..c935ce3 100644
  
  	if (!drm_core_check_feature(dev, DRIVER_MODESET))
  		return -EINVAL;
-@@ -2381,7 +2381,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
+@@ -2385,7 +2385,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
  	blob = obj_to_blob(obj);
  
  	if (out_resp->length == blob->length) {
@@ -27302,7 +27303,7 @@ index 7eef6e1..f8b411e 100644
  	return can_switch;
  }
 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index ce7914c..2e5f051 100644
+index e0d0e27..f48e37e 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
 @@ -219,7 +219,7 @@ struct drm_i915_display_funcs {
@@ -27323,7 +27324,7 @@ index ce7914c..2e5f051 100644
  
  	/* protects the irq masks */
  	spinlock_t irq_lock;
-@@ -874,7 +874,7 @@ struct drm_i915_gem_object {
+@@ -875,7 +875,7 @@ struct drm_i915_gem_object {
  	 * will be page flipped away on the next vblank.  When it
  	 * reaches 0, dev_priv->pending_flip_queue will be woken up.
  	 */
@@ -27332,7 +27333,7 @@ index ce7914c..2e5f051 100644
  };
  
  #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
-@@ -1247,7 +1247,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
+@@ -1248,7 +1248,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
  extern void intel_teardown_gmbus(struct drm_device *dev);
  extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
  extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
@@ -27355,7 +27356,7 @@ index 4934cf8..52e8e83 100644
  	/* The actual obj->write_domain will be updated with
  	 * pending_write_domain after we emit the accumulated flush for all
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 9b1d669..d88e72c 100644
+index 3635647..1ad5700 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
 @@ -473,7 +473,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
@@ -27376,7 +27377,7 @@ index 9b1d669..d88e72c 100644
  
  	if (IS_GEN6(dev))
  		bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
-@@ -1226,7 +1226,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -1227,7 +1227,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
  	int ret = IRQ_NONE, pipe;
  	bool blc_event = false;
  
@@ -27385,7 +27386,7 @@ index 9b1d669..d88e72c 100644
  
  	iir = I915_READ(IIR);
  
-@@ -1735,7 +1735,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
+@@ -1736,7 +1736,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
  {
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  
@@ -27394,7 +27395,7 @@ index 9b1d669..d88e72c 100644
  
  	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
  	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
-@@ -1899,7 +1899,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev)
+@@ -1900,7 +1900,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev)
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  	int pipe;
  
@@ -27404,7 +27405,7 @@ index 9b1d669..d88e72c 100644
  	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
  	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index cbf4c4c..76e1edc 100644
+index fed87d6..f594763 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
 @@ -1961,7 +1961,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
@@ -27416,7 +27417,7 @@ index cbf4c4c..76e1edc 100644
  
  		/* Big Hammer, we also need to ensure that any pending
  		 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
-@@ -2548,7 +2548,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
+@@ -2550,7 +2550,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
  	obj = to_intel_framebuffer(crtc->fb)->obj;
  	dev_priv = crtc->dev->dev_private;
  	wait_event(dev_priv->pending_flip_queue,
@@ -27425,7 +27426,7 @@ index cbf4c4c..76e1edc 100644
  }
  
  static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
-@@ -6225,7 +6225,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
+@@ -6257,7 +6257,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
  
  	atomic_clear_mask(1 << intel_crtc->plane,
  			  &obj->pending_flip.counter);
@@ -27434,7 +27435,7 @@ index cbf4c4c..76e1edc 100644
  		wake_up(&dev_priv->pending_flip_queue);
  
  	schedule_work(&work->work);
-@@ -6514,7 +6514,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
+@@ -6546,7 +6546,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
  	/* Block clients from rendering to the new back buffer until
  	 * the flip occurs and the object is no longer visible.
  	 */
@@ -27443,7 +27444,7 @@ index cbf4c4c..76e1edc 100644
  
  	ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
  	if (ret)
-@@ -6527,7 +6527,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
+@@ -6559,7 +6559,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
  	return 0;
  
  cleanup_pending:
@@ -27777,10 +27778,10 @@ index 59d72d0..3621b94 100644
  /*
   * Asic structures
 diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
-index bf2b615..c821ec8 100644
+index 285acc4..f4d909f 100644
 --- a/drivers/gpu/drm/radeon/radeon_atombios.c
 +++ b/drivers/gpu/drm/radeon/radeon_atombios.c
-@@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
+@@ -569,6 +569,8 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
  	struct radeon_gpio_rec gpio;
  	struct radeon_hpd hpd;
  
@@ -28157,7 +28158,7 @@ index e92298a..f68f2d6 100644
  
  	for (;;) {
 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 4f81d20..4b5f337 100644
+index 763797d..67a9f78 100644
 --- a/drivers/hid/hid-core.c
 +++ b/drivers/hid/hid-core.c
 @@ -1940,7 +1940,7 @@ static bool hid_ignore(struct hid_device *hdev)
@@ -30609,7 +30610,7 @@ index 17cb6ab..f448b35 100644
  						 r10_bio->devs[sl].addr +
  						 sect,
 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index cbb50d3..6e20094 100644
+index 1f6c68d..c384765 100644
 --- a/drivers/md/raid5.c
 +++ b/drivers/md/raid5.c
 @@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
@@ -34062,7 +34063,7 @@ index dd87e86..bc0148c 100644
  	}
  
 diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
-index dccd863..8d35669 100644
+index f8c752e..28bf4fc 100644
 --- a/drivers/oprofile/oprof.c
 +++ b/drivers/oprofile/oprof.c
 @@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
@@ -34486,10 +34487,10 @@ index 8a0b330..b4286de 100644
  	if (dev->in_reset) {
  		dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
 diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index 3382475..9c8d000 100644
+index c7b6fed..4db0569 100644
 --- a/drivers/scsi/aacraid/linit.c
 +++ b/drivers/scsi/aacraid/linit.c
-@@ -92,7 +92,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
+@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
  #elif defined(__devinitconst)
  static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
  #else
@@ -34729,10 +34730,10 @@ index 351dc0b..951dc32 100644
  
  	/* These three are default values which can be overridden */
 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 6689d5d..9cbea58 100644
+index 56a9f3f..a51d0fb 100644
 --- a/drivers/scsi/hpsa.c
 +++ b/drivers/scsi/hpsa.c
-@@ -498,7 +498,7 @@ static inline u32 next_command(struct ctlr_info *h)
+@@ -499,7 +499,7 @@ static inline u32 next_command(struct ctlr_info *h)
  	u32 a;
  
  	if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
@@ -34741,7 +34742,7 @@ index 6689d5d..9cbea58 100644
  
  	if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
  		a = *(h->reply_pool_head); /* Next cmd in ring buffer */
-@@ -2955,7 +2955,7 @@ static void start_io(struct ctlr_info *h)
+@@ -2956,7 +2956,7 @@ static void start_io(struct ctlr_info *h)
  	while (!list_empty(&h->reqQ)) {
  		c = list_entry(h->reqQ.next, struct CommandList, list);
  		/* can't do anything if fifo is full */
@@ -34750,7 +34751,7 @@ index 6689d5d..9cbea58 100644
  			dev_warn(&h->pdev->dev, "fifo full\n");
  			break;
  		}
-@@ -2965,7 +2965,7 @@ static void start_io(struct ctlr_info *h)
+@@ -2966,7 +2966,7 @@ static void start_io(struct ctlr_info *h)
  		h->Qdepth--;
  
  		/* Tell the controller execute command */
@@ -34759,7 +34760,7 @@ index 6689d5d..9cbea58 100644
  
  		/* Put job onto the completed Q */
  		addQ(&h->cmpQ, c);
-@@ -2974,17 +2974,17 @@ static void start_io(struct ctlr_info *h)
+@@ -2975,17 +2975,17 @@ static void start_io(struct ctlr_info *h)
  
  static inline unsigned long get_next_completion(struct ctlr_info *h)
  {
@@ -34780,7 +34781,7 @@ index 6689d5d..9cbea58 100644
  		(h->interrupts_enabled == 0);
  }
  
-@@ -3881,7 +3881,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
+@@ -3882,7 +3882,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
  	if (prod_index < 0)
  		return -ENODEV;
  	h->product_name = products[prod_index].product_name;
@@ -34789,7 +34790,7 @@ index 6689d5d..9cbea58 100644
  
  	if (hpsa_board_disabled(h->pdev)) {
  		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
-@@ -4158,7 +4158,7 @@ reinit_after_soft_reset:
+@@ -4163,7 +4163,7 @@ reinit_after_soft_reset:
  	}
  
  	/* make sure the board interrupts are off */
@@ -34798,7 +34799,7 @@ index 6689d5d..9cbea58 100644
  
  	if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
  		goto clean2;
-@@ -4192,7 +4192,7 @@ reinit_after_soft_reset:
+@@ -4197,7 +4197,7 @@ reinit_after_soft_reset:
  		 * fake ones to scoop up any residual completions.
  		 */
  		spin_lock_irqsave(&h->lock, flags);
@@ -34807,7 +34808,7 @@ index 6689d5d..9cbea58 100644
  		spin_unlock_irqrestore(&h->lock, flags);
  		free_irq(h->intr[h->intr_mode], h);
  		rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
-@@ -4211,9 +4211,9 @@ reinit_after_soft_reset:
+@@ -4216,9 +4216,9 @@ reinit_after_soft_reset:
  		dev_info(&h->pdev->dev, "Board READY.\n");
  		dev_info(&h->pdev->dev,
  			"Waiting for stale completions to drain.\n");
@@ -34819,7 +34820,7 @@ index 6689d5d..9cbea58 100644
  
  		rc = controller_reset_failed(h->cfgtable);
  		if (rc)
-@@ -4234,7 +4234,7 @@ reinit_after_soft_reset:
+@@ -4239,7 +4239,7 @@ reinit_after_soft_reset:
  	}
  
  	/* Turn the interrupts on so we can service requests */
@@ -34828,7 +34829,7 @@ index 6689d5d..9cbea58 100644
  
  	hpsa_hba_inquiry(h);
  	hpsa_register_scsi(h);	/* hook ourselves into SCSI subsystem */
-@@ -4287,7 +4287,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
+@@ -4292,7 +4292,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
  	 * To write all data in the battery backed cache to disks
  	 */
  	hpsa_flush_cache(h);
@@ -34837,7 +34838,7 @@ index 6689d5d..9cbea58 100644
  	free_irq(h->intr[h->intr_mode], h);
  #ifdef CONFIG_PCI_MSI
  	if (h->msix_vector)
-@@ -4450,7 +4450,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
+@@ -4455,7 +4455,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
  		return;
  	}
  	/* Change the access methods to the performant access methods */
@@ -35444,10 +35445,10 @@ index 6888b2c..45befa1 100644
  		return errsts;
  	memset(arr, 0, sizeof(arr));
 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
-index f97acff..0c53d1f 100644
+index 72ab1e6..ad69062 100644
 --- a/drivers/scsi/scsi_lib.c
 +++ b/drivers/scsi/scsi_lib.c
-@@ -1412,7 +1412,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
+@@ -1414,7 +1414,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
  	shost = sdev->host;
  	scsi_init_cmd_errh(cmd);
  	cmd->result = DID_NO_CONNECT << 16;
@@ -35456,7 +35457,7 @@ index f97acff..0c53d1f 100644
  
  	/*
  	 * SCSI request completion path will do scsi_device_unbusy(),
-@@ -1438,9 +1438,9 @@ static void scsi_softirq_done(struct request *rq)
+@@ -1440,9 +1440,9 @@ static void scsi_softirq_done(struct request *rq)
  
  	INIT_LIST_HEAD(&cmd->eh_entry);
  
@@ -36155,10 +36156,10 @@ index 76d7485..ab8524a 100644
  
  	hcd->power_budget = 0; /* no limit */
 diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
-index e42ce9d..b3ee231 100644
+index 5c4b5d9..fdfc7bf1 100644
 --- a/drivers/staging/usbip/vhci_rx.c
 +++ b/drivers/staging/usbip/vhci_rx.c
-@@ -76,7 +76,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
+@@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
  	if (!urb) {
  		pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
  		pr_info("max seqnum %d\n",
@@ -36393,7 +36394,7 @@ index 179063d..7baed53 100644
  		core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
  
 diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
-index 4b9b716..ec411b3 100644
+index 1340ffd..610981a 100644
 --- a/drivers/target/target_core_transport.c
 +++ b/drivers/target/target_core_transport.c
 @@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_to_core_hba(
@@ -36435,7 +36436,7 @@ index 4b9b716..ec411b3 100644
  	    T_TASK(cmd)->t_task_cdbs)
  		atomic_set(&cmd->transport_sent, 1);
  
-@@ -5568,7 +5568,7 @@ static void transport_generic_wait_for_tasks(
+@@ -5573,7 +5573,7 @@ static void transport_generic_wait_for_tasks(
  		atomic_set(&T_TASK(cmd)->transport_lun_stop, 0);
  	}
  	if (!atomic_read(&T_TASK(cmd)->t_transport_active) ||
@@ -36444,7 +36445,7 @@ index 4b9b716..ec411b3 100644
  		goto remove;
  
  	atomic_set(&T_TASK(cmd)->t_transport_stop, 1);
-@@ -5797,7 +5797,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
+@@ -5802,7 +5802,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
  {
  	int ret = 0;
  
@@ -36453,7 +36454,7 @@ index 4b9b716..ec411b3 100644
  		if (!(send_status) ||
  		     (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
  			return 1;
-@@ -5825,7 +5825,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
+@@ -5830,7 +5830,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
  	 */
  	if (cmd->data_direction == DMA_TO_DEVICE) {
  		if (CMD_TFO(cmd)->write_pending_status(cmd) != 0) {
@@ -36462,7 +36463,7 @@ index 4b9b716..ec411b3 100644
  			smp_mb__after_atomic_inc();
  			cmd->scsi_status = SAM_STAT_TASK_ABORTED;
  			transport_new_cmd_failure(cmd);
-@@ -5949,7 +5949,7 @@ static void transport_processing_shutdown(struct se_device *dev)
+@@ -5954,7 +5954,7 @@ static void transport_processing_shutdown(struct se_device *dev)
  			CMD_TFO(cmd)->get_task_tag(cmd),
  			T_TASK(cmd)->t_task_cdbs,
  			atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
@@ -36913,10 +36914,10 @@ index b44aef0..c5ad11d 100644
  
  /*
 diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
-index ef925d5..6ddb00e 100644
+index a76c808..ecbc743 100644
 --- a/drivers/tty/tty_ldisc.c
 +++ b/drivers/tty/tty_ldisc.c
-@@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *ld)
+@@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *ld)
  	if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
  		struct tty_ldisc_ops *ldo = ld->ops;
  
@@ -36925,7 +36926,7 @@ index ef925d5..6ddb00e 100644
  		module_put(ldo->owner);
  		spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  
-@@ -109,7 +109,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
+@@ -110,7 +110,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
  	tty_ldiscs[disc] = new_ldisc;
  	new_ldisc->num = disc;
@@ -36934,7 +36935,7 @@ index ef925d5..6ddb00e 100644
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  
  	return ret;
-@@ -137,7 +137,7 @@ int tty_unregister_ldisc(int disc)
+@@ -138,7 +138,7 @@ int tty_unregister_ldisc(int disc)
  		return -EINVAL;
  
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
@@ -36943,7 +36944,7 @@ index ef925d5..6ddb00e 100644
  		ret = -EBUSY;
  	else
  		tty_ldiscs[disc] = NULL;
-@@ -158,7 +158,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
+@@ -159,7 +159,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
  	if (ldops) {
  		ret = ERR_PTR(-EAGAIN);
  		if (try_module_get(ldops->owner)) {
@@ -36952,7 +36953,7 @@ index ef925d5..6ddb00e 100644
  			ret = ldops;
  		}
  	}
-@@ -171,7 +171,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
+@@ -172,7 +172,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
  	unsigned long flags;
  
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
@@ -37318,10 +37319,10 @@ index 1fc8f12..20647c1 100644
  	return 0;
  }
 diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 104620b..af0338a 100644
+index ffeee57..22ca548 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -1690,6 +1690,8 @@ static int xhci_check_trb_in_td_math(struct xhci_hcd *xhci, gfp_t mem_flags)
+@@ -1685,6 +1685,8 @@ static int xhci_check_trb_in_td_math(struct xhci_hcd *xhci, gfp_t mem_flags)
  	unsigned int num_tests;
  	int i, ret;
  
@@ -42334,10 +42335,10 @@ index 9a37a9b..35792b6 100644
  				/*
  				 * We'll have a dentry and an inode for
 diff --git a/fs/dcache.c b/fs/dcache.c
-index fbdcbca..ab87fb6 100644
+index d2f8feb..f2a208a 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -3089,7 +3089,7 @@ void __init vfs_caches_init(unsigned long mempages)
+@@ -3106,7 +3106,7 @@ void __init vfs_caches_init(unsigned long mempages)
  	mempages -= reserve;
  
  	names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
@@ -44973,7 +44974,7 @@ index b6cca47..ec782c3 100644
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index 5cb8614..6865b11 100644
+index 2aaf3ea..8e50863 100644
 --- a/fs/fuse/dev.c
 +++ b/fs/fuse/dev.c
 @@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
@@ -45846,10 +45847,10 @@ index f7593c0..581e14f 100644
  out:
  	return len;
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 537dd96..672cd58 100644
+index edc1c4a..b208120 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1329,6 +1329,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
+@@ -1326,6 +1326,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
  		if (!(sb->s_flags & MS_RDONLY))
  			retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
  		up_write(&sb->s_umount);
@@ -45859,7 +45860,7 @@ index 537dd96..672cd58 100644
  		return retval;
  	}
  
-@@ -1348,6 +1351,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
+@@ -1345,6 +1348,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
  	br_write_unlock(vfsmount_lock);
  	up_write(&namespace_sem);
  	release_mounts(&umount_list);
@@ -45869,7 +45870,7 @@ index 537dd96..672cd58 100644
  	return retval;
  }
  
-@@ -2339,6 +2345,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
+@@ -2336,6 +2342,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
  		   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
  		   MS_STRICTATIME);
  
@@ -45886,7 +45887,7 @@ index 537dd96..672cd58 100644
  	if (flags & MS_REMOUNT)
  		retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
  				    data_page);
-@@ -2353,6 +2369,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
+@@ -2350,6 +2366,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
  				      dev_name, data_page);
  dput_out:
  	path_put(&path);
@@ -45896,7 +45897,7 @@ index 537dd96..672cd58 100644
  	return retval;
  }
  
-@@ -2576,6 +2595,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
+@@ -2573,6 +2592,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
  	if (error)
  		goto out2;
  
@@ -45971,7 +45972,7 @@ index 202f370..9d4565e 100644
  	server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
  	if (!server)
 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index 6f4850d..875435e 100644
+index c48f9f6..17c27ce 100644
 --- a/fs/nfs/inode.c
 +++ b/fs/nfs/inode.c
 @@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
@@ -47334,7 +47335,7 @@ index d245cb2..7e645bd 100644
  		return -EPERM;
  	if (kcore_need_update)
 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
-index ed257d1..dda1954 100644
+index a962827..2963d5b 100644
 --- a/fs/proc/meminfo.c
 +++ b/fs/proc/meminfo.c
 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
@@ -47346,7 +47347,7 @@ index ed257d1..dda1954 100644
  /*
   * display in kilobytes.
   */
-@@ -157,7 +159,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
+@@ -158,7 +160,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
  		vmi.used >> 10,
  		vmi.largest_chunk >> 10
  #ifdef CONFIG_MEMORY_FAILURE
@@ -47957,7 +47958,7 @@ index d33418f..f8e06bc 100644
  		return -EINVAL;
  
 diff --git a/fs/seq_file.c b/fs/seq_file.c
-index 05d6b0e..ee96362 100644
+index dba43c3..a99fb63 100644
 --- a/fs/seq_file.c
 +++ b/fs/seq_file.c
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, loff_t offset)
@@ -48414,10 +48415,10 @@ index 54e623b..5c3fd7a 100644
  	if (error)
  		return -error;
 diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
-index d44d92c..ef7ad2d 100644
+index f5b697b..a8de28d 100644
 --- a/fs/xfs/linux-2.6/xfs_iops.c
 +++ b/fs/xfs/linux-2.6/xfs_iops.c
-@@ -437,7 +437,7 @@ xfs_vn_put_link(
+@@ -445,7 +445,7 @@ xfs_vn_put_link(
  	struct nameidata *nd,
  	void		*p)
  {
@@ -48427,7 +48428,7 @@ index d44d92c..ef7ad2d 100644
  	if (!IS_ERR(s))
  		kfree(s);
 diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
-index e546a33..08583b8 100644
+index a175933..36cd8dd 100644
 --- a/fs/xfs/xfs_bmap.c
 +++ b/fs/xfs/xfs_bmap.c
 @@ -253,7 +253,7 @@ xfs_bmap_validate_ret(
@@ -59351,7 +59352,7 @@ index 5e6f427..953d4f8 100644
  };
  
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index b5b9792..caf64ce 100644
+index 7b17db7..f586116 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 @@ -109,6 +109,11 @@ struct inodes_stat_t {
@@ -64929,10 +64930,10 @@ index 9b22d03..6295b62 100644
  				prev->next = info->next;
  			else
 diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
-index a9205e3..1c6f5c0 100644
+index 2043c08..ec81a69 100644
 --- a/kernel/hrtimer.c
 +++ b/kernel/hrtimer.c
-@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
+@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
  	local_irq_restore(flags);
  }
  
@@ -64942,7 +64943,7 @@ index a9205e3..1c6f5c0 100644
  	hrtimer_peek_ahead_timers();
  }
 diff --git a/kernel/jump_label.c b/kernel/jump_label.c
-index a8ce450..5519bce 100644
+index e6f1f24..6c19597 100644
 --- a/kernel/jump_label.c
 +++ b/kernel/jump_label.c
 @@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
@@ -64955,7 +64956,7 @@ index a8ce450..5519bce 100644
  }
  
  static void jump_label_update(struct jump_label_key *key, int enable);
-@@ -297,10 +299,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
+@@ -298,10 +300,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
  	struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
  	struct jump_entry *iter;
  
@@ -67850,7 +67851,7 @@ index 4e4932a..be244da 100644
  			    (table->proc_handler == proc_dointvec_minmax) ||
  			    (table->proc_handler == proc_dointvec_jiffies) ||
 diff --git a/kernel/taskstats.c b/kernel/taskstats.c
-index fc0f220..c3b11a1 100644
+index 8d597b1..6eab856 100644
 --- a/kernel/taskstats.c
 +++ b/kernel/taskstats.c
 @@ -27,9 +27,12 @@
@@ -67893,7 +67894,7 @@ index d776062..fa8d186 100644
  		sys_tz = *tz;
  		update_vsyscall_tz();
 diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
-index ea5e1a9..8b8df07 100644
+index 8b70c76..923e9f5 100644
 --- a/kernel/time/alarmtimer.c
 +++ b/kernel/time/alarmtimer.c
 @@ -693,7 +693,7 @@ static int __init alarmtimer_init(void)
@@ -67906,7 +67907,7 @@ index ea5e1a9..8b8df07 100644
  		.clock_get	= alarm_clock_get,
  		.timer_create	= alarm_timer_create,
 diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
-index c7218d1..5f4ecc6 100644
+index 7a90d02..6d8585a 100644
 --- a/kernel/time/tick-broadcast.c
 +++ b/kernel/time/tick-broadcast.c
 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
@@ -67919,7 +67920,7 @@ index c7218d1..5f4ecc6 100644
  			cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
  			tick_broadcast_clear_oneshot(cpu);
 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index 342408c..18c3098 100644
+index 5f45831..a62c75e 100644
 --- a/kernel/time/timekeeping.c
 +++ b/kernel/time/timekeeping.c
 @@ -14,6 +14,7 @@
@@ -67930,7 +67931,7 @@ index 342408c..18c3098 100644
  #include <linux/syscore_ops.h>
  #include <linux/clocksource.h>
  #include <linux/jiffies.h>
-@@ -361,6 +362,8 @@ int do_settimeofday(const struct timespec *tv)
+@@ -365,6 +366,8 @@ int do_settimeofday(const struct timespec *tv)
  	if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
  		return -EINVAL;
  
@@ -68180,10 +68181,10 @@ index 0731e81a..91f8a79 100644
  	struct dentry *d_tracer;
  
 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index 3e2a7c9..665bb9a 100644
+index 2d04936..7d78f18 100644
 --- a/kernel/trace/trace_events.c
 +++ b/kernel/trace/trace_events.c
-@@ -1318,10 +1318,6 @@ static LIST_HEAD(ftrace_module_file_list);
+@@ -1317,10 +1317,6 @@ static LIST_HEAD(ftrace_module_file_list);
  struct ftrace_module_file_ops {
  	struct list_head		list;
  	struct module			*mod;
@@ -68194,7 +68195,7 @@ index 3e2a7c9..665bb9a 100644
  };
  
  static struct ftrace_module_file_ops *
-@@ -1342,17 +1338,12 @@ trace_create_file_ops(struct module *mod)
+@@ -1341,17 +1337,12 @@ trace_create_file_ops(struct module *mod)
  
  	file_ops->mod = mod;
  
@@ -68218,7 +68219,7 @@ index 3e2a7c9..665bb9a 100644
  
  	list_add(&file_ops->list, &ftrace_module_file_list);
  
-@@ -1376,8 +1367,8 @@ static void trace_module_add_events(struct module *mod)
+@@ -1375,8 +1366,8 @@ static void trace_module_add_events(struct module *mod)
  
  	for_each_event(call, start, end) {
  		__trace_add_event_call(*call, mod,
@@ -68738,10 +68739,10 @@ index cc5acf9..fd56cc0 100644
  	/* if an huge pmd materialized from under us just retry later */
  	if (unlikely(pmd_trans_huge(*pmd)))
 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
-index bfcf153..1eff489 100644
+index 80936a1..c060d53 100644
 --- a/mm/hugetlb.c
 +++ b/mm/hugetlb.c
-@@ -2339,6 +2339,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2340,6 +2340,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
  	return 1;
  }
  
@@ -68769,7 +68770,7 @@ index bfcf153..1eff489 100644
  /*
   * Hugetlb_cow() should be called with page lock of the original hugepage held.
   */
-@@ -2440,6 +2461,11 @@ retry_avoidcopy:
+@@ -2443,6 +2464,11 @@ retry_avoidcopy:
  				make_huge_pte(vma, new_page, 1));
  		page_remove_rmap(old_page);
  		hugepage_add_new_anon_rmap(new_page, vma, address);
@@ -68781,7 +68782,7 @@ index bfcf153..1eff489 100644
  		/* Make the old page be freed below */
  		new_page = old_page;
  		mmu_notifier_invalidate_range_end(mm,
-@@ -2591,6 +2617,10 @@ retry:
+@@ -2594,6 +2620,10 @@ retry:
  				&& (vma->vm_flags & VM_SHARED)));
  	set_huge_pte_at(mm, address, ptep, new_pte);
  
@@ -68792,7 +68793,7 @@ index bfcf153..1eff489 100644
  	if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
  		/* Optimization, do the COW without a second fault */
  		ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
-@@ -2620,6 +2650,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2623,6 +2653,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  	static DEFINE_MUTEX(hugetlb_instantiation_mutex);
  	struct hstate *h = hstate_vma(vma);
  
@@ -68803,7 +68804,7 @@ index bfcf153..1eff489 100644
  	ptep = huge_pte_offset(mm, address);
  	if (ptep) {
  		entry = huge_ptep_get(ptep);
-@@ -2631,6 +2665,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2634,6 +2668,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  			       VM_FAULT_SET_HINDEX(h - hstates);
  	}
  
@@ -71473,7 +71474,7 @@ index 9edc897..955be3d 100644
  	new->vm_region = region;
  
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 0f50cdb..df4b678 100644
+index 8439d2a..b5e8c8c 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
 @@ -340,7 +340,7 @@ out:
@@ -71544,11 +71545,11 @@ index 0f50cdb..df4b678 100644
  	}
  	return 0;
 diff --git a/mm/percpu.c b/mm/percpu.c
-index bf80e55..c7c3f9a 100644
+index 93b5a7c..28d642c 100644
 --- a/mm/percpu.c
 +++ b/mm/percpu.c
-@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu __read_mostly;
- static unsigned int pcpu_last_unit_cpu __read_mostly;
+@@ -121,7 +121,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
+ static unsigned int pcpu_high_unit_cpu __read_mostly;
  
  /* the address of the first chunk which starts with the kernel static area */
 -void *pcpu_base_addr __read_mostly;
@@ -72566,7 +72567,7 @@ index 88ea1bd..0f1dfdb 100644
  	mm->unmap_area = arch_unmap_area;
  }
 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index 65d5fd2..4f14696 100644
+index 43b44db..5361145 100644
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
@@ -72715,7 +72716,7 @@ index 65d5fd2..4f14696 100644
  	area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
  				  start, end, node, gfp_mask, caller);
  
-@@ -1686,6 +1748,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
+@@ -1688,6 +1750,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
  				gfp_mask, prot, node, caller);
  }
  
@@ -72723,7 +72724,7 @@ index 65d5fd2..4f14696 100644
  void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
  {
  	return __vmalloc_node(size, 1, gfp_mask, prot, -1,
-@@ -1709,6 +1772,7 @@ static inline void *__vmalloc_node_flags(unsigned long size,
+@@ -1711,6 +1774,7 @@ static inline void *__vmalloc_node_flags(unsigned long size,
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -72731,7 +72732,7 @@ index 65d5fd2..4f14696 100644
  void *vmalloc(unsigned long size)
  {
  	return __vmalloc_node_flags(size, -1, GFP_KERNEL | __GFP_HIGHMEM);
-@@ -1725,6 +1789,7 @@ EXPORT_SYMBOL(vmalloc);
+@@ -1727,6 +1791,7 @@ EXPORT_SYMBOL(vmalloc);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -72739,7 +72740,7 @@ index 65d5fd2..4f14696 100644
  void *vzalloc(unsigned long size)
  {
  	return __vmalloc_node_flags(size, -1,
-@@ -1739,6 +1804,7 @@ EXPORT_SYMBOL(vzalloc);
+@@ -1741,6 +1806,7 @@ EXPORT_SYMBOL(vzalloc);
   * The resulting memory area is zeroed so it can be mapped to userspace
   * without leaking data.
   */
@@ -72747,7 +72748,7 @@ index 65d5fd2..4f14696 100644
  void *vmalloc_user(unsigned long size)
  {
  	struct vm_struct *area;
-@@ -1766,6 +1832,7 @@ EXPORT_SYMBOL(vmalloc_user);
+@@ -1768,6 +1834,7 @@ EXPORT_SYMBOL(vmalloc_user);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -72755,7 +72756,7 @@ index 65d5fd2..4f14696 100644
  void *vmalloc_node(unsigned long size, int node)
  {
  	return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1785,6 +1852,7 @@ EXPORT_SYMBOL(vmalloc_node);
+@@ -1787,6 +1854,7 @@ EXPORT_SYMBOL(vmalloc_node);
   * For tight control over page level allocator and protection flags
   * use __vmalloc_node() instead.
   */
@@ -72763,7 +72764,7 @@ index 65d5fd2..4f14696 100644
  void *vzalloc_node(unsigned long size, int node)
  {
  	return __vmalloc_node_flags(size, node,
-@@ -1807,10 +1875,10 @@ EXPORT_SYMBOL(vzalloc_node);
+@@ -1809,10 +1877,10 @@ EXPORT_SYMBOL(vzalloc_node);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -72776,7 +72777,7 @@ index 65d5fd2..4f14696 100644
  			      -1, __builtin_return_address(0));
  }
  
-@@ -1829,6 +1897,7 @@ void *vmalloc_exec(unsigned long size)
+@@ -1831,6 +1899,7 @@ void *vmalloc_exec(unsigned long size)
   *	Allocate enough 32bit PA addressable pages to cover @size from the
   *	page level allocator and map them into contiguous kernel virtual space.
   */
@@ -72784,7 +72785,7 @@ index 65d5fd2..4f14696 100644
  void *vmalloc_32(unsigned long size)
  {
  	return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
-@@ -1843,6 +1912,7 @@ EXPORT_SYMBOL(vmalloc_32);
+@@ -1845,6 +1914,7 @@ EXPORT_SYMBOL(vmalloc_32);
   * The resulting memory area is 32bit addressable and zeroed so it can be
   * mapped to userspace without leaking data.
   */
@@ -72792,7 +72793,7 @@ index 65d5fd2..4f14696 100644
  void *vmalloc_32_user(unsigned long size)
  {
  	struct vm_struct *area;
-@@ -2105,6 +2175,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
+@@ -2107,6 +2177,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
  	unsigned long uaddr = vma->vm_start;
  	unsigned long usize = vma->vm_end - vma->vm_start;
  
@@ -75210,10 +75211,10 @@ index 4851e9e..d860e05 100644
  
  	return p;
 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
-index d3fe2d2..0affe0d 100644
+index 2124db8..8718fc2 100644
 --- a/net/mac80211/util.c
 +++ b/net/mac80211/util.c
-@@ -1147,7 +1147,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+@@ -1151,7 +1151,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
  #endif
  
  	/* restart hardware */
@@ -78679,7 +78680,7 @@ index c94c051..be0abd1 100644
  	chip->pci = pci;
  	chip->irq = -1;
 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index 59abd84..74a3744 100644
+index 493ae7c..c0f5892 100644
 --- a/sound/soc/soc-core.c
 +++ b/sound/soc/soc-core.c
 @@ -1021,7 +1021,7 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
@@ -78691,7 +78692,7 @@ index 59abd84..74a3744 100644
  	.open		= soc_pcm_open,
  	.close		= soc_codec_close,
  	.hw_params	= soc_pcm_hw_params,
-@@ -2128,6 +2128,7 @@ static int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
+@@ -2129,6 +2129,7 @@ static int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
  	rtd->pcm = pcm;
  	pcm->private_data = rtd;
  	if (platform->driver->ops) {
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index 9ce50ffb9..526d95676 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -80,7 +80,10 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64
index bb9066f94..44fb3e04b 100644
--- a/main/linux-grsec/kernelconfig.x86_64
+++ b/main/linux-grsec/kernelconfig.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 3.0.9 Kernel Configuration
+# Linux/x86_64 3.0.12 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -46,6 +46,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
 CONFIG_X86_HT=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
@@ -81,7 +82,10 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
@@ -320,7 +324,7 @@ CONFIG_GART_IOMMU=y
 # CONFIG_AMD_IOMMU is not set
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
-# CONFIG_IOMMU_API is not set
+CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=32
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -492,7 +496,9 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_CNB20LE_QUIRK=y
-# CONFIG_DMAR is not set
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_FLOPPY_WA=y
 # CONFIG_INTR_REMAP is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
@@ -5086,6 +5092,7 @@ CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_NETWORK is not set
 # CONFIG_SECURITY_PATH is not set
+# CONFIG_INTEL_TXT is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_IMA is not set
diff --git a/main/linux-grsec/linux-3.0.x-regression-with-ipv4-routes-having-mtu.patch b/main/linux-grsec/linux-3.0.x-regression-with-ipv4-routes-having-mtu.patch
new file mode 100644
index 000000000..7ca414782
--- /dev/null
+++ b/main/linux-grsec/linux-3.0.x-regression-with-ipv4-routes-having-mtu.patch
@@ -0,0 +1,53 @@
+diff --git a/net/ipv4/route.c b/net/ipv4/route.c
+index f30112f..26a6249 100644
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -1841,6 +1841,22 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst)
+ 	return mtu;
+ }
+ 
++static void __rt_init_metrics(struct rtable *rt, struct fib_info *fi,
++			      struct inet_peer *peer)
++{
++	if (peer && fi->fib_metrics == (u32 *) dst_default_metrics) {
++		dst_init_metrics(&rt->dst, peer->metrics, false);
++		return;
++	}
++
++	if (fi->fib_metrics != (u32 *) dst_default_metrics) {
++		rt->fi = fi;
++		atomic_inc(&fi->fib_clntref);
++	}
++
++	dst_init_metrics(&rt->dst, fi->fib_metrics, true);
++}
++
+ static void rt_init_metrics(struct rtable *rt, const struct flowi4 *fl4,
+ 			    struct fib_info *fi)
+ {
+@@ -1859,7 +1875,8 @@ static void rt_init_metrics(struct rtable *rt, const struct flowi4 *fl4,
+ 		if (inet_metrics_new(peer))
+ 			memcpy(peer->metrics, fi->fib_metrics,
+ 			       sizeof(u32) * RTAX_MAX);
+-		dst_init_metrics(&rt->dst, peer->metrics, false);
++
++		__rt_init_metrics(rt, fi, peer);
+ 
+ 		check_peer_pmtu(&rt->dst, peer);
+ 		if (peer->redirect_genid != redirect_genid)
+@@ -1869,13 +1886,8 @@ static void rt_init_metrics(struct rtable *rt, const struct flowi4 *fl4,
+ 			rt->rt_gateway = peer->redirect_learned.a4;
+ 			rt->rt_flags |= RTCF_REDIRECTED;
+ 		}
+-	} else {
+-		if (fi->fib_metrics != (u32 *) dst_default_metrics) {
+-			rt->fi = fi;
+-			atomic_inc(&fi->fib_clntref);
+-		}
+-		dst_init_metrics(&rt->dst, fi->fib_metrics, true);
+-	}
++	} else
++		__rt_init_metrics(rt, fi, NULL);
+ }
+ 
+ static void rt_set_nexthop(struct rtable *rt, const struct flowi4 *fl4,
diff --git a/main/linux-grsec/net-flow-remove-sleeping-and-deferral-mechanism-from-flow_cache_flush.patch b/main/linux-grsec/net-flow-remove-sleeping-and-deferral-mechanism-from-flow_cache_flush.patch
new file mode 100644
index 000000000..8eaadf942
--- /dev/null
+++ b/main/linux-grsec/net-flow-remove-sleeping-and-deferral-mechanism-from-flow_cache_flush.patch
@@ -0,0 +1,85 @@
+Based on http://patchwork.ozlabs.org/patch/132353/
+
+diff --git a/net/core/flow.c b/net/core/flow.c
+index 8ae42de..e318c7e 100644
+--- a/net/core/flow.c
++++ b/net/core/flow.c
+@@ -358,6 +358,18 @@ void flow_cache_flush(void)
+ 	put_online_cpus();
+ }
+ 
++static void flow_cache_flush_task(struct work_struct *work)
++{
++	flow_cache_flush();
++}
++
++static DECLARE_WORK(flow_cache_flush_work, flow_cache_flush_task);
++
++void flow_cache_flush_deferred(void)
++{
++	schedule_work(&flow_cache_flush_work);
++}
++
+ static int __cpuinit flow_cache_cpu_prepare(struct flow_cache *fc, int cpu)
+ {
+ 	struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, cpu);
+diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
+index 2118d64..9049a5c 100644
+--- a/net/xfrm/xfrm_policy.c
++++ b/net/xfrm/xfrm_policy.c
+@@ -2276,8 +2276,6 @@ static void __xfrm_garbage_collect(struct net *net)
+ {
+ 	struct dst_entry *head, *next;
+ 
+-	flow_cache_flush();
+-
+ 	spin_lock_bh(&xfrm_policy_sk_bundle_lock);
+ 	head = xfrm_policy_sk_bundles;
+ 	xfrm_policy_sk_bundles = NULL;
+@@ -2290,6 +2288,18 @@ static void __xfrm_garbage_collect(struct net *net)
+ 	}
+ }
+ 
++static void xfrm_garbage_collect(struct net *net)
++{
++	flow_cache_flush();
++	__xfrm_garbage_collect(net);
++}
++
++static void xfrm_garbage_collect_deferred(struct net *net)
++{
++	flow_cache_flush_deferred();
++	__xfrm_garbage_collect(net);
++}
++
+ static void xfrm_init_pmtu(struct dst_entry *dst)
+ {
+ 	do {
+@@ -2422,7 +2432,7 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
+ 		if (likely(dst_ops->neigh_lookup == NULL))
+ 			dst_ops->neigh_lookup = xfrm_neigh_lookup;
+ 		if (likely(afinfo->garbage_collect == NULL))
+-			afinfo->garbage_collect = __xfrm_garbage_collect;
++			afinfo->garbage_collect = xfrm_garbage_collect_deferred;
+ 		xfrm_policy_afinfo[afinfo->family] = afinfo;
+ 	}
+ 	write_unlock_bh(&xfrm_policy_afinfo_lock);
+@@ -2516,7 +2526,7 @@ static int xfrm_dev_event(struct notifier_block *this, unsigned long event, void
+ 
+ 	switch (event) {
+ 	case NETDEV_DOWN:
+-		__xfrm_garbage_collect(dev_net(dev));
++		xfrm_garbage_collect(dev_net(dev));
+ 	}
+ 	return NOTIFY_DONE;
+ }
+--- ./include/net/flow.h.orig
++++ ./include/net/flow.h
+@@ -207,6 +207,7 @@
+ 		u8 dir, flow_resolve_t resolver, void *ctx);
+ 
+ extern void flow_cache_flush(void);
++extern void flow_cache_flush_deferred(void);
+ extern atomic_unchecked_t flow_cache_genid;
+ 
+ #endif
diff --git a/main/linux-grsec/x86-centaur-enable-cx8-for-via-eden-too.patch b/main/linux-grsec/x86-centaur-enable-cx8-for-via-eden-too.patch
new file mode 100644
index 000000000..37e3e3bdb
--- /dev/null
+++ b/main/linux-grsec/x86-centaur-enable-cx8-for-via-eden-too.patch
@@ -0,0 +1,38 @@
+From: Timo Teräs <timo.teras@iki.fi>
+Date: Thu, 15 Dec 2011 15:11:28 +0000 (+0200)
+Subject: x86, centaur: Enable cx8 for VIA Eden too
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftip%2Ftip.git;a=commitdiff_plain;h=cb3f718de8301a969f8169d7d4160e73baff0b86
+
+x86, centaur: Enable cx8 for VIA Eden too
+
+My box with following cpuinfo needs the cx8 enabling still:
+
+vendor_id	: CentaurHauls
+cpu family	: 6
+model		: 13
+model name	: VIA Eden Processor 1200MHz
+stepping	: 0
+cpu MHz		: 1199.940
+cache size	: 128 KB
+
+This fixes valgrind to work on my box (it requires and checks
+cx8 from cpuinfo).
+
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Link: http://lkml.kernel.org/r/1323961888-10223-1-git-send-email-timo.teras@iki.fi
+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+---
+
+diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
+index e58d978..159103c 100644
+--- a/arch/x86/kernel/cpu/centaur.c
++++ b/arch/x86/kernel/cpu/centaur.c
+@@ -278,7 +278,7 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c)
+ 	}
+ #ifdef CONFIG_X86_32
+ 	/* Cyrix III family needs CX8 & PGE explicitly enabled. */
+-	if (c->x86_model >= 6 && c->x86_model <= 9) {
++	if (c->x86_model >= 6 && c->x86_model <= 13) {
+ 		rdmsr(MSR_VIA_FCR, lo, hi);
+ 		lo |= (1<<1 | 1<<7);
+ 		wrmsr(MSR_VIA_FCR, lo, hi);
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index c2b0e0bbf..a4d74c54d 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=3.0.10
+pkgver=3.0.14
 pkgrel=0
 _vsver=vs2.3.2.1
 
@@ -21,7 +21,7 @@ _config=${config:-kernelconfig.${CARCH}}
 install=
 source="http://www.kernel.org/pub/linux/kernel/v3.0/linux-$_kernver.tar.bz2
 	http://www.kernel.org/pub/linux/kernel/v3.0/patch-$pkgver.bz2
-	patch-3.0.10-vs2.3.2.1-unofficial.diff
+	patch-$pkgver-${_vsver}-unofficial.diff
 	kernelconfig.x86
 	kernelconfig.x86_64
 	"
@@ -132,7 +132,7 @@ dev() {
 }
 
 md5sums="398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
-8e0391dd935d838ee3023ab9daa6b447  patch-3.0.10.bz2
-6d2fd60b055272429dde5e4043280fcb  patch-3.0.10-vs2.3.2.1-unofficial.diff
-fdf2737ad7b77bcfe4290ef2b0112138  kernelconfig.x86
-f82d261dc117ced42e2a3dcd4b6850a5  kernelconfig.x86_64"
+f2745bd4dcb3267414713adff403b54c  patch-3.0.14.bz2
+7d49344644c0860707b9358bbb39768e  patch-3.0.14-vs2.3.2.1-unofficial.diff
+4baec73eeb0ddc1148d580a6d1e29b1f  kernelconfig.x86
+148b84ad28167290f2f7f0420945cb92  kernelconfig.x86_64"
diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86
index eb1d4bc28..849e86c41 100644
--- a/main/linux-vserver/kernelconfig.x86
+++ b/main/linux-vserver/kernelconfig.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 3.0.9-vs2.3.2.1 Kernel Configuration
+# Linux/i386 3.0.10-vs2.3.2.1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -81,7 +81,10 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
@@ -116,7 +119,9 @@ CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 # CONFIG_CPUSETS is not set
 CONFIG_CGROUP_CPUACCT=y
-# CONFIG_RESOURCE_COUNTERS is not set
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -129,6 +134,7 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -4915,7 +4921,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
@@ -4988,7 +4994,7 @@ CONFIG_VSERVER_PROC_SECURE=y
 CONFIG_TAGGING_ID24=y
 # CONFIG_TAGGING_INTERN is not set
 # CONFIG_TAG_NFSD is not set
-# CONFIG_VSERVER_PRIVACY is not set
+CONFIG_VSERVER_PRIVACY=y
 CONFIG_VSERVER_CONTEXTS=256
 CONFIG_VSERVER_WARN=y
 CONFIG_VSERVER_WARN_DEVPTS=y
diff --git a/main/linux-vserver/kernelconfig.x86_64 b/main/linux-vserver/kernelconfig.x86_64
index 3c6941e4c..eb4f6368a 100644
--- a/main/linux-vserver/kernelconfig.x86_64
+++ b/main/linux-vserver/kernelconfig.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 3.0.4-vs2.3.1-pre10.1 Kernel Configuration
+# Linux/x86_64 3.0.10-vs2.3.2.1 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -81,7 +81,10 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
@@ -118,7 +121,8 @@ CONFIG_CPUSETS=y
 # CONFIG_PROC_PID_CPUSET is not set
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -131,6 +135,7 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -226,7 +231,7 @@ CONFIG_BLOCK_COMPAT=y
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=m
 CONFIG_IOSCHED_CFQ=y
-# CONFIG_CFQ_GROUP_IOSCHED is not set
+CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -4883,7 +4888,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
@@ -4955,7 +4960,7 @@ CONFIG_VSERVER_PROC_SECURE=y
 CONFIG_TAGGING_ID24=y
 # CONFIG_TAGGING_INTERN is not set
 # CONFIG_TAG_NFSD is not set
-# CONFIG_VSERVER_PRIVACY is not set
+CONFIG_VSERVER_PRIVACY=y
 CONFIG_VSERVER_CONTEXTS=768
 CONFIG_VSERVER_WARN=y
 CONFIG_VSERVER_WARN_DEVPTS=y
diff --git a/main/linux-vserver/patch-3.0.10-vs2.3.2.1-unofficial.diff b/main/linux-vserver/patch-3.0.14-vs2.3.2.1-unofficial.diff
index 2c09d43ed..337cd011e 100644
--- a/main/linux-vserver/patch-3.0.10-vs2.3.2.1-unofficial.diff
+++ b/main/linux-vserver/patch-3.0.14-vs2.3.2.1-unofficial.diff
@@ -162,7 +162,7 @@ diff -NurpP --minimal linux-3.0.9/Makefile linux-3.0.9-vs2.3.2.1/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 0
- SUBLEVEL = 10
+ SUBLEVEL = 14
 -EXTRAVERSION =
 +EXTRAVERSION = -vs2.3.2.1
  NAME = Sneaky Weasel
@@ -3519,17 +3519,17 @@ diff -NurpP --minimal linux-3.0.9/fs/ext4/super.c linux-3.0.9-vs2.3.2.1/fs/ext4/
 --- linux-3.0.9/fs/ext4/super.c	2011-11-15 16:40:46.000000000 +0100
 +++ linux-3.0.9-vs2.3.2.1/fs/ext4/super.c	2011-08-31 19:37:44.000000000 +0200
 @@ -1293,6 +1293,7 @@ enum {
+	Opt_inode_readahead_blks, Opt_journal_ioprio,
  	Opt_dioread_nolock, Opt_dioread_lock,
- 	Opt_discard, Opt_nodiscard,
- 	Opt_init_inode_table, Opt_noinit_inode_table,
+ 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
 +	Opt_tag, Opt_notag, Opt_tagid
  };
  
  static const match_table_t tokens = {
 @@ -1368,6 +1369,9 @@ static const match_table_t tokens = {
- 	{Opt_init_inode_table, "init_itable=%u"},
- 	{Opt_init_inode_table, "init_itable"},
- 	{Opt_noinit_inode_table, "noinit_itable"},
+ 	{Opt_init_itable, "init_itable=%u"},
+ 	{Opt_init_itable, "init_itable"},
+ 	{Opt_noinit_itable, "noinit_itable"},
 +	{Opt_tag, "tag"},
 +	{Opt_notag, "notag"},
 +	{Opt_tagid, "tagid=%u"},
diff --git a/main/live-media/APKBUILD b/main/live-media/APKBUILD
index e1038f9bb..c554ebece 100644
--- a/main/live-media/APKBUILD
+++ b/main/live-media/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=live-media
-pkgver=2011.10.27
+pkgver=2011.12.20
 pkgrel=0
 pkgdesc="A set of C++ libraries for multimedia streaming"
 url="http://live555.com/liveMedia"
@@ -15,7 +15,7 @@ _builddir="$srcdir"/live
 
 prepare() { 
 	cd "$_builddir"
-	sed -e "/^COMPILE_OPTS/s/$/ $CFLAGS -fPIC -DPIC/" \
+	sed -e "/^COMPILE_OPTS/s/$/ $CFLAGS -fPIC -DPIC -DXLOCALE_NOT_USED=1/" \
 		-e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \
 		-e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \
 		-i config.linux
@@ -44,4 +44,4 @@ package() {
 	done
 }
 
-md5sums="fe776efc25fbb98c6279b97cb9c48006  live.2011.10.27.tar.gz"
+md5sums="1bcbd2e45149c0d918c63df8f6d7d0e0  live.2011.12.20.tar.gz"
diff --git a/main/lua-penlight/APKBUILD b/main/lua-penlight/APKBUILD
index d1cc12efb..f08fb6f1b 100644
--- a/main/lua-penlight/APKBUILD
+++ b/main/lua-penlight/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-penlight
-pkgver=0.9.6
+pkgver=0.9.8
 pkgrel=0
 pkgdesc="Lua libraries for extended operations on tables, lists and strings"
 url="http://penlight.luaforge.net/"
@@ -10,7 +10,7 @@ depends="lua-filesystem"
 makedepends="wget"
 install=
 subpackages="$pkgname-doc"
-source="http://stevedonovan.github.com/files/penlight-$pkgver.zip"
+source="http://stevedonovan.github.com/files/penlight-$pkgver-src.zip"
 
 _builddir="$srcdir"/penlight-$pkgver
 
@@ -27,4 +27,4 @@ package() {
 	cp -r examples "$pkgdir"/usr/share/doc/$pkgname/
 }
 
-md5sums="cfb747e425cd49603288a933fe2559ef  penlight-0.9.6.zip"
+md5sums="c9c8143787c9a32b6cd20369b41b3e9f  penlight-0.9.8-src.zip"
diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD
index 106b0a679..14c71e46c 100644
--- a/main/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=man-pages
-pkgver=3.32
+pkgver=3.35
 _posixver=2003-a
-pkgrel=2
+pkgrel=0
 pkgdesc="Linux man pages"
 url="http://www.kernel.org/doc/man-pages/"
 arch="noarch"
@@ -10,7 +10,7 @@ license="GPL"
 depends=
 makedepends=""
 options="!strip"
-source="http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-$pkgver.tar.gz
+source="http://man7.org/linux/download/man-pages/man-pages-$pkgver.tar.gz
 	http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-posix/$pkgname-posix-${_posixver}.tar.bz2"
 
 build() {
@@ -31,5 +31,5 @@ package() {
 	rm "$pkgdir"/usr/share/man/man3/iconv*
 
 }
-md5sums="cc6c2d4d4eb364fd8da718c412db09d4  man-pages-3.32.tar.gz
+md5sums="e41432ee35a49036bbaf8d4598506e9c  man-pages-3.35.tar.gz
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2"
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD
index 5a3b2e4a4..b68fb8b20 100644
--- a/main/mc/APKBUILD
+++ b/main/mc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mc
-pkgver=4.8.0
+pkgver=4.8.1
 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="592478c3edfa2ad64c8cd165b9bec446  mc-4.8.0.tar.bz2"
+md5sums="7d60c87d87b359831d976fa28034935e  mc-4.8.1.tar.bz2"
diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD
index e14332e9f..645d37404 100644
--- a/main/mercurial/APKBUILD
+++ b/main/mercurial/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mercurial
-pkgver=2.0
+pkgver=2.0.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="38f439a63bae1687d385758c8ad3d53e  mercurial-2.0.tar.gz"
+md5sums="16576b3089a88a84a35edc30e17a03a9  mercurial-2.0.1.tar.gz"
diff --git a/main/mesa-demos/APKBUILD b/main/mesa-demos/APKBUILD
index 61aa452d8..f522392e6 100644
--- a/main/mesa-demos/APKBUILD
+++ b/main/mesa-demos/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Natanael Copa
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa-demos
 pkgver=8.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Mesa demos and utils"
 url="http://mesa3d.sourceforge.net"
 arch="all"
@@ -14,7 +14,9 @@ install=""
 subpackages=
 source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgver/$pkgname-$pkgver.tar.bz2
 	sincos.patch
-	mesa-demos-gles.patch"
+	mesa-demos-gles.patch
+	link.patch
+	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
 
@@ -41,4 +43,5 @@ package() {
 
 md5sums="320c2a4b6edc6faba35d9cb1e2a30bf4  mesa-demos-8.0.1.tar.bz2
 75be22556a657f0a157028233832d167  sincos.patch
-dc89e44fed4a6c9d0ac3d8b88ddead91  mesa-demos-gles.patch"
+dc89e44fed4a6c9d0ac3d8b88ddead91  mesa-demos-gles.patch
+502885b11980be71712f6a33bfd1508d  link.patch"
diff --git a/main/mesa-demos/link.patch b/main/mesa-demos/link.patch
new file mode 100644
index 000000000..f19b6bbc9
--- /dev/null
+++ b/main/mesa-demos/link.patch
@@ -0,0 +1,15 @@
+--- ./src/egl/opengl/Makefile.in.orig
++++ ./src/egl/opengl/Makefile.in
+@@ -111,10 +111,10 @@
+ peglgears_LDADD = $(LDADD)
+ xeglgears_SOURCES = xeglgears.c
+ xeglgears_OBJECTS = xeglgears.$(OBJEXT)
+-xeglgears_LDADD = $(LDADD)
++xeglgears_LDADD = $(LDADD) $(X11_LIBS)
+ xeglthreads_SOURCES = xeglthreads.c
+ xeglthreads_OBJECTS = xeglthreads.$(OBJEXT)
+-xeglthreads_LDADD = $(LDADD)
++xeglthreads_LDADD = $(LDADD) $(X11_LIBS) -lpthread
+ DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index eb0458ca8..41d4518ac 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=7.11.1
+pkgver=7.11.2
 pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
 url="http://www.mesa3d.org"
@@ -143,7 +143,7 @@ nouveau() {	_mv_dri nouveau_dri nouveau_vieux_dri; }
 swrast() {	_mv_dri swrast_dri swrastg_dri; }
 vmwgfx() {	_mv_dri vmwgfx_dri; }
 
-md5sums="a77307102cee844ff6544ffa8fafeac1  MesaLib-7.11.1.tar.bz2
+md5sums="0837c52698fe3252369c3fdb5195afcc  MesaLib-7.11.2.tar.bz2
 9c8c161f954f0d08895cd9d45e63f498  mesa-7.10-uclibc.patch
 03e9685b0d714e915c35fd0fb5fde810  mesa-7.10-uclibc-glsl.patch
 90a2ea438ff328443a0436a91a74d518  mesa-7.10-uclibc-gallium.patch"
diff --git a/main/midori/APKBUILD b/main/midori/APKBUILD
index dd5a8ecf9..67ad24f8f 100644
--- a/main/midori/APKBUILD
+++ b/main/midori/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=midori
-pkgver=0.4.2
-pkgrel=1
+pkgver=0.4.3
+pkgrel=0
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
 arch="all"
@@ -48,4 +48,4 @@ package() {
 	# PAX does not like the JIT
 	paxctl -c -m -p "$pkgdir"/usr/bin/midori
 }
-md5sums="4ec9c3daa332ebe865cba6aa8256ef63  midori-0.4.2.tar.bz2"
+md5sums="900037557b82818d79d2dd1c5a7d7fd2  midori-0.4.3.tar.bz2"
diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD
index ebb6607f5..cb8a52d03 100644
--- a/main/mpd/APKBUILD
+++ b/main/mpd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Sebastian Wicki <gandro@gmx.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mpd
-pkgver=0.16.5
+pkgver=0.16.6
 pkgrel=0
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 url="http://musicpd.org"
@@ -12,7 +12,7 @@ license="GPL2"
 depends=
 makedepends="pkgconfig lame-dev glib-dev curl-dev libao-dev libmad-dev flac-dev
 	libogg-dev faad2-dev libid3tag-dev libvorbis-dev alsa-lib-dev
-	libsamplerate-dev libshout-dev"
+	libsamplerate-dev libshout-dev libmodplug-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/project/musicpd/mpd/${pkgver}/mpd-${pkgver}.tar.bz2
@@ -27,6 +27,7 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--enable-shout \
+		--enable-modplug \
 		|| return 1
 	make || return 1
 }
@@ -50,6 +51,6 @@ package() {
 		"$pkgdir"/var/lib/mpd/playlists \
 		"$pkgdir"/var/lib/mpd/music
 }
-md5sums="f7564cff12035f6a1112cce770655df7  mpd-0.16.5.tar.bz2
+md5sums="5489dd327fba12c67f01558d2cfa6d57  mpd-0.16.6.tar.bz2
 2ccbb38edc6dff5b5740760837f3005a  mpd.initd
 dbd301041953a5cf9c2b9de8f23eb6bb  mpd.confd"
diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD
index a6c296672..ce8b1a1fa 100644
--- a/main/mplayer/APKBUILD
+++ b/main/mplayer/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=mplayer
 pkgver=1.0_rc4
 _ver=${pkgver%_*}${pkgver#*_}
-pkgrel=6
+pkgrel=7
 pkgdesc="A movie player for linux"
 url="http://www.mplayerhq.hu/"
 arch="all"
@@ -17,6 +17,7 @@ makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev
 source="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$_ver.tar.bz2
 	mplayer-gcc-4.6-audio-fix.patch
 	mplayer-libpng-1.5.patch
+	x11-libs.patch
 	"
 _builddir="$srcdir"/MPlayer-$_ver
 prepare() {
@@ -77,4 +78,5 @@ package() {
 }
 md5sums="1699c94de39da9c4c5d34e8f58e418f0  MPlayer-1.0rc4.tar.bz2
 5f261813c5dfa70ba2378c2535428e5d  mplayer-gcc-4.6-audio-fix.patch
-f3f3bae09f6cee684ced1dbc7d7ed23c  mplayer-libpng-1.5.patch"
+f3f3bae09f6cee684ced1dbc7d7ed23c  mplayer-libpng-1.5.patch
+01bcc935a6b429347e8e77e1a70bf2b2  x11-libs.patch"
diff --git a/main/mplayer/x11-libs.patch b/main/mplayer/x11-libs.patch
new file mode 100644
index 000000000..4e6f8b5c1
--- /dev/null
+++ b/main/mplayer/x11-libs.patch
@@ -0,0 +1,10 @@
+--- ./configure.orig
++++ ./configure
+@@ -4394,6 +4394,7 @@
+ if test "$_x11" = yes ; then
+   def_x11='#define CONFIG_X11 1'
+   vomodules="x11 xover $vomodules"
++  libs_mplayer="$libs_mplayer -lX11 -lXext"
+ else
+   _x11=no
+   def_x11='#undef CONFIG_X11'
diff --git a/main/mpt-status/APKBUILD b/main/mpt-status/APKBUILD
new file mode 100644
index 000000000..a6e8a0b21
--- /dev/null
+++ b/main/mpt-status/APKBUILD
@@ -0,0 +1,55 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=mpt-status
+pkgver=1.2.0
+pkgrel=0
+pkgdesc="status inquiry tool for MPT devices"
+url="http://www.red-bean.com/~mab/mpt-status.html"
+arch="all"
+license="GPL"
+depends=""
+makedepends="pciutils-dev"
+install=""
+subpackages="$pkgname-doc"
+
+# XXX: main site seems to be down right now; we shadow the Debian patch anyway
+source="http://ftp.de.debian.org/debian/pool/main/m/mpt-status/mpt-status_${pkgver}.orig.tar.gz
+	http://ftp.de.debian.org/debian/pool/main/m/mpt-status/mpt-status_${pkgver}-7.debian.tar.gz"
+
+_builddir="${srcdir}/mpt-status-${pkgver}"
+prepare() {
+	local i
+	cd "$_builddir"
+	mv "${srcdir}/debian" "${_builddir}"
+
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+
+	# apply debian patches too...
+	for i in $(cat ${_builddir}/debian/patches/series); do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "${_builddir}/debian/patches/${i}" || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	make
+}
+
+package() {
+	cd "$_builddir"
+
+	mkdir -p "$pkgdir"/usr/sbin
+	make DESTDIR="$pkgdir" install
+
+	mkdir -p "$pkgdir"/usr/share/man/man8
+	cp man/mpt-status.8 "$pkgdir"/usr/share/man/man8
+}
+
+md5sums="e836a0dc05746b45ee1b77e475c2a76b  mpt-status_1.2.0.orig.tar.gz
+18897cdd77a3ecbea13ca13d53b40796  mpt-status_1.2.0-7.debian.tar.gz"
diff --git a/main/mr/APKBUILD b/main/mr/APKBUILD
index 347ae58f3..56b608f30 100644
--- a/main/mr/APKBUILD
+++ b/main/mr/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=mr
-pkgver=1.04
+pkgver=1.06
 pkgrel=0
 pkgdesc="A multiple repository management tool"
 url="http://kitenet.net/~joey/code/mr/"
@@ -13,7 +13,6 @@ makedepends=""
 install=""
 subpackages="$pkgname-doc"
 source="http://ftp.de.debian.org/debian/pool/main/m/mr/"$pkgname"_"$pkgver".tar.gz"
-
 _builddir="$srcdir"/$pkgname
 
 build() {
@@ -42,4 +41,4 @@ doc() {
 	done
 }
 
-md5sums="9ddd9e5b3a90bcb08ac773ddb1cea512  mr_1.04.tar.gz"
+md5sums="5dcadb4c100076b5332a76863e7128aa  mr_1.06.tar.gz"
diff --git a/main/msmtp/APKBUILD b/main/msmtp/APKBUILD
index 51acf6db2..671b4bbbd 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.25
+pkgver=1.4.26
 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="2d9603a7b5c1ebd83ea289ac2aa3a634  msmtp-1.4.25.tar.bz2"
+md5sums="35734268c883aa06388742f902d95676  msmtp-1.4.26.tar.bz2"
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD
index 0ce4b7095..c3b5e7c66 100644
--- a/main/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mysql
-pkgver=5.5.18
+pkgver=5.5.19
 pkgrel=0
 pkgdesc="A fast SQL database server"
 url="http://www.mysql.com/"
@@ -187,6 +187,6 @@ bench() {
 	mv "$pkgdir"/usr/share/sql-bench "$subpkgdir"/usr/share/
 }
 
-md5sums="38b65815249f3bcacf3b0ee85171c486  mysql-5.5.18.tar.gz
+md5sums="a78cf450974e9202bd43674860349b5a  mysql-5.5.19.tar.gz
 b2b038b1905fa5b80f6723d0ee2f811f  mysql-prefer-dynamic-library.patch
 d46df8ab94cb5686862ff90c0a6bf707  mysql.initd"
diff --git a/main/ncdu/APKBUILD b/main/ncdu/APKBUILD
new file mode 100644
index 000000000..a00cbe0b6
--- /dev/null
+++ b/main/ncdu/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=ncdu
+pkgver=1.7
+pkgrel=0
+pkgdesc="Text-based disk usage viewer"
+url="http://dev.yorhel.nl/ncdu"
+arch="all"
+license="MIT"
+depends=""
+depends_dev=""
+makedepends="ncurses-dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://dev.yorhel.nl/download/$pkgname-$pkgver.tar.gz"
+_builddir="$srcdir"/$pkgname-$pkgver
+
+build() {
+	cd "$_builddir"
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="172047c29d232724cc62e773e82e592a  ncdu-1.7.tar.gz"
diff --git a/main/nload/APKBUILD b/main/nload/APKBUILD
index 08642cb6d..d969b6830 100644
--- a/main/nload/APKBUILD
+++ b/main/nload/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Jeff Bilyk <jbilyk at gmail.com>
-# Maintainer:
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nload
-pkgver=0.7.2
-pkgrel=1
+pkgver=0.7.3
+pkgrel=0
 pkgdesc="Console network traffic and bandwidth monitor"
 url="http://www.roland-riegel.de/nload"
 arch="all"
@@ -11,7 +11,7 @@ depends=
 makedepends="ncurses-dev"
 install=
 subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+source="http://www.roland-riegel.de/nload/nload-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -29,4 +29,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="5b851ecf898edcd1f465946745e95eb6  nload-0.7.2.tar.gz"
+md5sums="9b97c37fe1474f1da42f265fead24081  nload-0.7.3.tar.gz"
diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index 34dc38a0c..0464a0e7a 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=nmap 
-pkgver=5.51.5
+pkgver=5.51.6
 pkgrel=0
 pkgdesc="A network exploration tool and security/port scanner"
 url="http:/nmap.org"
@@ -35,4 +35,4 @@ package() {
 	install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
  
-md5sums="534d4f42d73404267392584ba3170a29  nmap-5.51.5.tgz"
+md5sums="75492e55330bded27f6132f052adae7e  nmap-5.51.6.tgz"
diff --git a/main/nsd/APKBUILD b/main/nsd/APKBUILD
index a110b94a8..726180224 100644
--- a/main/nsd/APKBUILD
+++ b/main/nsd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=nsd
-pkgver=3.2.8
+pkgver=3.2.9
 pkgrel=0
 pkgdesc="NSD is an authoritative only, high performance, simple and open source name server."
 url="http://www.nlnetlabs.nl/projects/nsd/"
@@ -69,7 +69,7 @@ doc() {
 		"$subpkgdir"/usr/share/man || return 1
 }
 
-md5sums="963c2123853e7759ffb772da40c68838  nsd-3.2.8.tar.gz
+md5sums="248a5fbce6cd3642ad7a75aaaab88931  nsd-3.2.9.tar.gz
 cc592572846b978a6f52130a8e518ab3  0010-stop-unlink-pid-error.patch
 3aa94004a39319db89a329e9f24fb9da  nsdc
 4c0eef07caac9083aeeb9b15602d014d  nsd.initd
diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD
index f9bfce081..c1c133f7d 100644
--- a/main/open-iscsi-grsec/APKBUILD
+++ b/main/open-iscsi-grsec/APKBUILD
@@ -3,14 +3,14 @@
 _flavor=grsec
 _realname=open-iscsi
 _realver=2.0-872
-_kver=3.0.10
+_kver=3.0.14
 _kpkgrel=0
 
 # verify the kernel version before entering chroot
 if [ -f ../linux-${_flavor}/APKBUILD ]; then
 	. ../linux-${_flavor}/APKBUILD
-	[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-	[ "$_kpkgrel" != "$pkgrel" ] && die "please update _kpkgrel to $pkgrel"
+	[ "$_kver" != "$pkgver" ] && die "open-iscsi-$_flavor: please update _kver to $pkgver"
+	[ "$_kpkgrel" != "$pkgrel" ] && die "open-iscsi-$_flavor: please update _kpkgrel to $pkgrel"
 fi
 
 _kernelver="$_kver-r$_kpkgrel"
@@ -56,4 +56,4 @@ package() {
 }
 
 md5sums="b4df94f08c241352bb964043b3e44779  open-iscsi-2.0-872.tar.gz
-c28dfb108cec0399634d348132cee79a  Makefile-Alpine-kernels-support.patch"
+05cd4034bf4fbb3b77ee800c6bdda3d3  Makefile-Alpine-kernels-support.patch"
diff --git a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch b/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch
index 95e9c9573..7d48db534 100644
--- a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch
+++ b/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch
@@ -26,7 +26,7 @@
  
  linux_2_6_35: $(unpatch_code)
 +
-+linux_3_0_10: $(unpatch_code)
++linux_3_0_14: $(unpatch_code)
  
  do_unpatch_code:
  	echo "Un-patching source code for use with linux-2.6.14 and up ..."
diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD
index 133b3b783..245b00573 100644
--- a/main/open-vm-tools-grsec/APKBUILD
+++ b/main/open-vm-tools-grsec/APKBUILD
@@ -3,18 +3,19 @@
 _flavor=grsec
 _realname=open-vm-tools
 _mypkgrel=0
-_realver=2011.09.23
-_realsubver=491607
 
-_kver=3.0.10
+_realver=2011.11.20
+_realsubver=535097
+
+_kver=3.0.14
 _kpkgrel=0
 
 # source open-vm-tools version
 if [ -f ../main/$_realname/APKBUILD ]; then
 	. ../main/$_realname/APKBUILD
-	[ "$_realver" != "$pkgver" ] && die "please set _realver to $pkgver"
+	[ "$_realver" != "$pkgver" ] && die "$_realname-$_flavor: please set _realver to $pkgver"
 	[ "$_realsubver" != "$_pkgsubver" ] \
-		&& die "please set _realsubver to $_pkgsubver"
+		&& die "$_realname-$_flavor: please set _realsubver to $_pkgsubver"
 fi
 
 # source the kernel version
@@ -80,6 +81,6 @@ package() {
 	done
 }
 
-md5sums="599342eee8d531b35ca1cc948b61868f  open-vm-tools-2011.09.23-491607.tar.gz
+md5sums="428d803f6fe3424af88768fc2f88f9ae  open-vm-tools-2011.11.20-535097.tar.gz
 afba2c3487d0b12cee80eb2f04b05ba1  vmware-modules.initd
 993aac6dce319e41c1b922b9672c39bc  vmci_driver_c.patch"
diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD
index c5f3b5667..16d8e2885 100644
--- a/main/open-vm-tools-vserver/APKBUILD
+++ b/main/open-vm-tools-vserver/APKBUILD
@@ -3,13 +3,14 @@
 _flavor=vserver
 _realname=open-vm-tools
 _name=$_realname-$_flavor
-_kver=3.0.10
+_kver=3.0.14
 _kpkgrel=0
 _myvsver=vs2.3.2.1
 _mypkgrel=0
 
-_realver=2011.09.23
-_realsubver=491607
+_realver=2011.11.20
+_realsubver=535097
+
 
 # source open-vm-tools version
 if [ -f ../$_realname/APKBUILD ]; then
@@ -77,5 +78,5 @@ package() {
 	done
 }
 
-md5sums="599342eee8d531b35ca1cc948b61868f  open-vm-tools-2011.09.23-491607.tar.gz
+md5sums="428d803f6fe3424af88768fc2f88f9ae  open-vm-tools-2011.11.20-535097.tar.gz
 afba2c3487d0b12cee80eb2f04b05ba1  vmware-modules.initd"
diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD
index 6e31f2d0a..b5093e01e 100644
--- a/main/open-vm-tools/APKBUILD
+++ b/main/open-vm-tools/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=open-vm-tools
-pkgver=2011.09.23
-_pkgsubver=491607
-pkgrel=1
+pkgver=2011.11.20
+_pkgsubver=535097
+pkgrel=0
 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
 url="http://open-vm-tools.sourceforge.net/"
 arch="all"
@@ -12,25 +12,24 @@ install="$pkgname.pre-install"
 makedepends="procps-dev libdnet-dev icu-dev glib-dev pkgconfig bash
 	libtirpc-dev rpcgen icu-dev automake autoconf
 	gtk+-dev libxext-dev libxinerama-dev libxtst-dev gtkmm-dev
-	libnotify-dev libxrandr-dev
+	libnotify-dev libxrandr-dev libxcomposite-dev
 	"
 source="http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-$_pkgsubver.tar.gz
-	getloadavg-uclibc.patch
 	codeset-uclibc.patch
-	ecvt.patch
 	iconv-uclibc.patch
+	uclibc-stubs.patch
 	libm.patch
 	open-vm-tools.initd
-	procmgrposix.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver-$_pkgsubver
 
 prepare() {
 	cd "$_builddir"
-	for i in "$srcdir"/*.patch; do
-		[ -r "$i" ] || continue
-		patch -p1 -i "$i" || return 1
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
 	done
 
 	sed -i -e 's/__unused1/st_atim.tv_nsec/g' \
@@ -38,7 +37,7 @@ prepare() {
 		-e 's/__unused3/st_ctim.tv_nsec/g' \
 		lib/file/filePosix.c lib/hgfsServer/hgfsServerLinux.c \
 		|| return 1
-	
+
 	# workaround automake-1.10 issue
 	# http://ramblingfoo.blogspot.com/2007/07/required-file-configrpath-not-found.html
 	touch config/config.rpath
@@ -81,11 +80,9 @@ gtk() {
 		"$subpkgdir"/usr/lib/open-vm-tools/plugins/
 }
 
-md5sums="599342eee8d531b35ca1cc948b61868f  open-vm-tools-2011.09.23-491607.tar.gz
-49e2e394d0b567fa71fcd295e96bc1c8  getloadavg-uclibc.patch
+md5sums="428d803f6fe3424af88768fc2f88f9ae  open-vm-tools-2011.11.20-535097.tar.gz
 82840b6bed002284b9bd2358707ee826  codeset-uclibc.patch
-840e4d6ff3f53fc22bdedf4d64aabc91  ecvt.patch
 89c7449323ddac4666b73a8467baf95a  iconv-uclibc.patch
+30a4161baf6274ac9cceb879460cd894  uclibc-stubs.patch
 7d02fc25aba5c248f3d98dac238f175b  libm.patch
-c96644aa42d611fae853a3a2095efc47  open-vm-tools.initd
-7b833102a56009bdfc2fef2fb9ffa297  procmgrposix.patch"
+905ef6a3bac87c9ba2e5d3897ca230e7  open-vm-tools.initd"
diff --git a/main/open-vm-tools/ecvt.patch b/main/open-vm-tools/ecvt.patch
deleted file mode 100644
index 53e88e998..000000000
--- a/main/open-vm-tools/ecvt.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-commit e996e91ca5951c50769dcaa8e074daa973006849
-Author: Natanael Copa <ncopa@alpinelinux.org>
-Date:   Thu Jul 8 06:39:36 2010 +0000
-
-    add ecvt() implementation
-
-diff --git a/lib/string/Makefile.am b/lib/string/Makefile.am
-index 1edab81..5f2e7ab 100644
---- a/lib/string/Makefile.am
-+++ b/lib/string/Makefile.am
-@@ -23,6 +23,7 @@ libString_la_SOURCES += bsd_vsnprintf.c
- libString_la_SOURCES += bsd_vsnwprintf.c
- libString_la_SOURCES += convertutf.c
- libString_la_SOURCES += str.c
-+libString_la_SOURCES += ecvt.c
- 
- AM_CFLAGS = @LIB_STRING_CPPFLAGS@
- 
-diff --git a/lib/string/bsd_output_shared.c b/lib/string/bsd_output_shared.c
-index 3616947..321d6f1 100644
---- a/lib/string/bsd_output_shared.c
-+++ b/lib/string/bsd_output_shared.c
-@@ -64,6 +64,9 @@
- 
- #ifndef NO_FLOATING_POINT
- 
-+extern char* ecvt(double arg, int ndigits, int *decptp, int *signp);
-+extern char* fcvt(double arg, int ndigits, int *decptp, int *signp);
-+
- /*
-  *-----------------------------------------------------------------------------
-  *
-diff --git a/lib/string/ecvt.c b/lib/string/ecvt.c
-new file mode 100644
-index 0000000..1979c3d
---- /dev/null
-+++ b/lib/string/ecvt.c
-@@ -0,0 +1,167 @@
-+/*
-+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
-+ *
-+ * @APPLE_LICENSE_HEADER_START@
-+ * 
-+ * This file contains Original Code and/or Modifications of Original Code
-+ * as defined in and that are subject to the Apple Public Source License
-+ * Version 2.0 (the 'License'). You may not use this file except in
-+ * compliance with the License. Please obtain a copy of the License at
-+ * http://www.opensource.apple.com/apsl/ and read it before using this
-+ * file.
-+ * 
-+ * The Original Code and all software distributed under the License are
-+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
-+ * Please see the License for the specific language governing rights and
-+ * limitations under the License.
-+ * 
-+ * @APPLE_LICENSE_HEADER_END@
-+ */
-+/*
-+ *	ecvt converts to decimal
-+ *	the number of digits is specified by ndigit
-+ *	decptp is set to the position of the decimal point
-+ *	signp is set to 0 for positive, 1 for negative
-+ */
-+
-+
-+static double ecvt_rint(double x);
-+
-+static char *cvt();
-+
-+/* big enough to handle %.20f conversion of 1e308 */
-+#define	NDIG		350
-+
-+char*
-+ecvt(arg, ndigits, decptp, signp)
-+double arg;
-+int ndigits, *decptp, *signp;
-+{
-+	return(cvt(arg, ndigits, decptp, signp, 1));
-+}
-+
-+char*
-+fcvt(arg, ndigits, decptp, signp)
-+double arg;
-+int ndigits, *decptp, *signp;
-+{
-+	return(cvt(arg, ndigits, decptp, signp, 0));
-+}
-+
-+static char*
-+cvt(arg, ndigits, decptp, signp, eflag)
-+double arg;
-+int ndigits, *decptp, *signp;
-+int eflag;
-+{
-+	register int decpt;
-+	double fi, fj;
-+	register char *p, *p1;
-+	static char buf[NDIG] = { 0 };
-+	double modf();
-+
-+	if (ndigits < 0)
-+		ndigits = 0;
-+	if (ndigits >= NDIG-1)
-+		ndigits = NDIG-2;
-+
-+	decpt = 0;
-+	*signp = 0;
-+	p = &buf[0];
-+
-+	if (arg == 0) {
-+		*decptp = 0;
-+		while (p < &buf[ndigits])
-+			*p++ = '0';
-+		*p = '\0';
-+		return(buf);
-+	} else if (arg < 0) {
-+		*signp = 1;
-+		arg = -arg;
-+	}
-+
-+	arg = modf(arg, &fi);
-+	p1 = &buf[NDIG];
-+
-+	/*
-+	 * Do integer part
-+	 */
-+	if (fi != 0) {
-+		while (fi != 0) {
-+			fj = modf(fi/10, &fi);
-+			/**--p1 = (int)((fj+.03)*10) + '0';*/
-+			*--p1 = (int)ecvt_rint((fj)*10) + '0';
-+			decpt++;
-+		}
-+		while (p1 < &buf[NDIG])
-+			*p++ = *p1++;
-+	} else if (arg > 0) {
-+		while ((fj = arg*10) < 1) {
-+			arg = fj;
-+			decpt--;
-+		}
-+	}
-+	*decptp = decpt;
-+
-+	/*
-+	 * do fraction part
-+	 * p pts to where fraction should be concatenated
-+	 * p1 is how far conversion must go to
-+	 */
-+	p1 = &buf[ndigits];
-+	if (eflag==0) {
-+		/* fcvt must provide ndigits after decimal pt */
-+		p1 += decpt;
-+		/* if decpt was negative, we might done for fcvt */
-+		if (p1 < &buf[0]) {
-+			buf[0] = '\0';
-+			return(buf);
-+		}
-+	}
-+	while (p <= p1 && p < &buf[NDIG]) {
-+		arg *= 10;
-+		arg = modf(arg, &fj);
-+		*p++ = (int)fj + '0';
-+	}
-+	/*
-+	 * if we converted all the way to the end of the
-+	 * buf, don't mess with rounding since there's nothing
-+	 * significant out here anyway
-+	 */
-+	if (p1 >= &buf[NDIG]) {
-+		buf[NDIG-1] = '\0';
-+		return(buf);
-+	}
-+	/*
-+	 * round by adding 5 to last digit and propagating
-+	 * carries
-+	 */
-+	p = p1;
-+	*p1 += 5;
-+	while (*p1 > '9') {
-+		*p1 = '0';
-+		if (p1 > buf)
-+			++*--p1;
-+		else {
-+			*p1 = '1';
-+			(*decptp)++;
-+			if (eflag == 0) {
-+				if (p > buf)
-+					*p = '0';
-+				p++;
-+			}
-+		}
-+	}
-+	*p = '\0';
-+	return(buf);
-+}
-+
-+static double ecvt_rint(double x)
-+{
-+	asm("frndint" : "=t" (x) :  "0" (x));
-+	return(x);
-+}
-+
diff --git a/main/open-vm-tools/getloadavg-uclibc.patch b/main/open-vm-tools/getloadavg-uclibc.patch
deleted file mode 100644
index ccc4c388e..000000000
--- a/main/open-vm-tools/getloadavg-uclibc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/lib/misc/hostinfoPosix.c
-+++ b/lib/misc/hostinfoPosix.c
-@@ -1398,7 +1398,15 @@
-                        float *avg1,  // IN/OUT:
-                        float *avg2)  // IN/OUT:
- {
--#if defined(__linux__) || defined(__APPLE__)
-+#if defined(__UCLIBC__)
-+   FILE *f;
-+   if ((f = fopen("/proc/loadavg", "r")) == NULL)
-+      return FALSE;
-+   fscanf(f, "%f %f %f", avg0, avg1, avg2);
-+   fclose(f);
-+   return TRUE;
-+
-+#elif defined(GLIBC_VERSION_22) || defined(__APPLE__)
-    double avg[3];
-    int res;
- 
diff --git a/main/open-vm-tools/open-vm-tools.initd b/main/open-vm-tools/open-vm-tools.initd
index e54b84aaf..45a94a37e 100644
--- a/main/open-vm-tools/open-vm-tools.initd
+++ b/main/open-vm-tools/open-vm-tools.initd
@@ -39,15 +39,15 @@ start() {
 		mount -t vmblock none ${MOUNTPOINT}
 		eend $?
 	fi
-	
+
 	ebegin "Starting vmtoolsd"
-	start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --background --make-pidfile --pidfile "${PIDFILE}" --exec ${GUESTD_BIN}
+	start-stop-daemon --user "${USER_GROUP}" --start --quiet --background --make-pidfile --pidfile "${PIDFILE}" --exec ${GUESTD_BIN}
 	eend $?
 }
 
 stop() {
 	local ret
-	
+
 	if [ "${VM_DRAG_AND_DROP}" == "yes" ];
 	then
 		ebegin "Cleaning the contents of ${DND_TMPDIR}"
diff --git a/main/open-vm-tools/procmgrposix.patch b/main/open-vm-tools/procmgrposix.patch
deleted file mode 100644
index 510c48a72..000000000
--- a/main/open-vm-tools/procmgrposix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/procMgr/procMgrPosix.c
-+++ b/lib/procMgr/procMgrPosix.c
-@@ -114,7 +114,7 @@
- #define  SOLARIS_BASH_PATH "/usr/bin/bash"
- #endif
- 
--#if defined(linux) && !defined(GLIBC_VERSION_23)
-+#if defined(linux) && !defined(GLIBC_VERSION_23) && !defined(__UCLIBC__)
- /*
-  * Implements the system calls (they are not wrapped by glibc til 2.3.2).
-  *
diff --git a/main/open-vm-tools/uclibc-stubs.patch b/main/open-vm-tools/uclibc-stubs.patch
new file mode 100644
index 000000000..0aeec6c94
--- /dev/null
+++ b/main/open-vm-tools/uclibc-stubs.patch
@@ -0,0 +1,11 @@
+--- ./lib/stubs/Makefile.am.orig
++++ ./lib/stubs/Makefile.am
+@@ -32,7 +32,5 @@
+ libStubsCS_la_SOURCES += stub-user-msg.c
+ libStubsCS_la_SOURCES += stub-user-panic.c
+ 
+-if !LINUX
+-   libStubsCS_la_SOURCES += stub-msgfmt-fbsd.c
+-endif
++libStubsCS_la_SOURCES += stub-msgfmt-fbsd.c
+ 
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index cb50dd92e..6f84d48a9 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openldap
-pkgver=2.4.26
-pkgrel=3
+pkgver=2.4.28
+pkgrel=0
 pkgdesc="LDAP Server"
 url="http://www.openldap.org/"
 arch="all"
@@ -17,7 +17,6 @@ install="$pkgname.pre-install $pkgname.post-install"
 source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz
 	openldap-2.4-ppolicy.patch
 	openldap-2.4.11-libldap_r.patch
-	cve-2011-4079.patch
 	slapd.initd
 	slapd.confd
 	slurpd.initd
@@ -59,6 +58,7 @@ build () {
 		--enable-shell=mod \
 		--enable-sock=mod \
 		--enable-sql=mod \
+		--enable-overlays=mod \
 		--with-tls=openssl \
 		--with-cyrus-sasl \
 		|| return 1
@@ -111,10 +111,9 @@ meta() {	_backend meta; }
 monitor() {	_backend monitor; }
 
 
-md5sums="f36f3086031dd56ae94f722ffae8df5e  openldap-2.4.26.tgz
+md5sums="196023e552eeb259e048edcd61a9645b  openldap-2.4.28.tgz
 2524e490ba334a760fa57057c16da7a9  openldap-2.4-ppolicy.patch
 d19d0502f046078ecd737e29e7552fa8  openldap-2.4.11-libldap_r.patch
-967d86fbfdbf9054b722f23323751fc9  cve-2011-4079.patch
 a729bf553d12b4a9fbda0ff5202a0443  slapd.initd
 b672311fca605c398240cd37a2ae080a  slapd.confd
 fa5ce0005ef5f1160b6ff126f97aaa1a  slurpd.initd"
diff --git a/main/openldap/cve-2011-4079.patch b/main/openldap/cve-2011-4079.patch
deleted file mode 100644
index 94a453d9c..000000000
--- a/main/openldap/cve-2011-4079.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-one-byte buffer overflow in slapd
-
-Resolves: #749324 (CVE-2011-4079)
-Upstream ITS: #7059
-Upstream commits: d0dd861 5072387
-Author: Howard Chu <hyc@openldap.org>
-
-diff -u
---- a/servers/slapd/schema_init.c
-+++ b/servers/slapd/schema_init.c
-@@ -1852,12 +1852,12 @@ UTF8StringNormalize(
- 		}
- 		nvalue.bv_val[nvalue.bv_len] = '\0';
- 
--	} else {
-+	} else if ( tmp.bv_len )  {
- 		/* string of all spaces is treated as one space */
- 		nvalue.bv_val[0] = ' ';
- 		nvalue.bv_val[1] = '\0';
- 		nvalue.bv_len = 1;
--	}
-+	}	/* should never be entered with 0-length val */
- 
- 	*normalized = nvalue;
- 	return LDAP_SUCCESS;
-@@ -2331,13 +2331,18 @@ postalAddressNormalize(
- 	}
- 	lines[l].bv_len = &val->bv_val[c] - lines[l].bv_val;
- 
--	normalized->bv_len = l;
-+	normalized->bv_len = c = l;
- 
--	for ( l = 0; !BER_BVISNULL( &lines[l] ); l++ ) {
-+	for ( l = 0; l <= c; l++ ) {
- 		/* NOTE: we directly normalize each line,
- 		 * without unescaping the values, since the special
- 		 * values '\24' ('$') and '\5C' ('\') are not affected
- 		 * by normalization */
-+		if ( !lines[l].bv_len ) {
-+			nlines[l].bv_len = 0;
-+			nlines[l].bv_val = NULL;
-+			continue;
-+		}
- 		rc = UTF8StringNormalize( usage, NULL, xmr, &lines[l], &nlines[l], ctx );
- 		if ( rc != LDAP_SUCCESS ) {
- 			rc = LDAP_INVALID_SYNTAX;
-@@ -2350,7 +2355,7 @@ postalAddressNormalize(
- 	normalized->bv_val = slap_sl_malloc( normalized->bv_len + 1, ctx );
- 
- 	p = normalized->bv_val;
--	for ( l = 0; !BER_BVISNULL( &nlines[l] ); l++ ) {
-+	for ( l = 0; l <= c ; l++ ) {
- 		p = lutil_strbvcopy( p, &nlines[l] );
- 		*p++ = '$';
- 	}
diff --git a/main/opennhrp/0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch b/main/opennhrp/0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch
deleted file mode 100644
index da1e8ffef..000000000
--- a/main/opennhrp/0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3554acce7fec0ce6e7560444c5e3975affb78260 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Tue, 18 Oct 2011 10:56:16 -0400
-Subject: [PATCH] config: really fix holding-time to apply to shortcut-target
-
-commit 94d1a7d4884346a5ba830ac209e1b746d23ec0c1 was supposed to
-fix it, but it didn't fix resetting of the peer variable properly.
----
- nhrp/opennhrp.c |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/nhrp/opennhrp.c b/nhrp/opennhrp.c
-index f2ecd44..0ff34ea 100644
---- a/nhrp/opennhrp.c
-+++ b/nhrp/opennhrp.c
-@@ -243,15 +243,16 @@ static int load_config(const char *config_file)
- 			NEED_PEER();
- 			peer->flags |= NHRP_PEER_FLAG_CISCO;
- 		} else if (strcmp(word, "holding-time") == 0) {
--			peer = NULL;
- 			read_word(in, &lineno, sizeof(word), word);
- 			if (peer != NULL &&
--				 peer->type == NHRP_PEER_TYPE_LOCAL_ADDR)
-+			    peer->type == NHRP_PEER_TYPE_LOCAL_ADDR) {
- 				peer->holding_time = atoi(word);
--			else if (iface != NULL)
-+			} else if (iface != NULL) {
- 				iface->holding_time = atoi(word);
--			else
-+				peer = NULL;
-+			} else {
- 				rc = 7;
-+			}
- 		} else if (strcmp(word, "cisco-authentication") == 0) {
- 			struct nhrp_buffer *buf;
- 			struct nhrp_cisco_authentication_extension *auth;
--- 
-1.7.4.1
-
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index b2daec053..9d371354d 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=opennhrp
-pkgver=0.12.3
-pkgrel=1
+pkgver=0.13
+pkgrel=0
 pkgdesc="NBMA Next Hop Resolution Protocol daemon"
 url="http://sourceforge.net/projects/opennhrp"
 arch="all"
@@ -11,7 +11,6 @@ makedepends="c-ares-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 	opennhrp-0.9.3-peer-up-bgp.patch
-	0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch
 	$pkgname.initd
 	$pkgname.confd
 	"
@@ -33,8 +32,7 @@ package() {
 	install -Dm755 "$srcdir"/opennhrp.initd "$pkgdir"/etc/init.d/opennhrp
 	install -Dm644 "$srcdir"/opennhrp.confd "$pkgdir"/etc/conf.d/opennhrp
 }
-md5sums="4d0ec7c0282e181ecca4d78e52067da3  opennhrp-0.12.3.tar.bz2
+md5sums="1569a337c5c7dce2d8c117244e9c56a9  opennhrp-0.13.tar.bz2
 f81539fc92800bb79668dda119a97d1d  opennhrp-0.9.3-peer-up-bgp.patch
-884c085eedace7eab4d65ae3a47c4bde  0001-config-really-fix-holding-time-to-apply-to-shortcut-.patch
 ae65f88ccf849ef882669a8b4f0c7fc0  opennhrp.initd
 8eee86233728dc0d156bbfee6d98f338  opennhrp.confd"
diff --git a/main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch b/main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
index 86676e5ad..f79d62cfb 100644
--- a/main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
+++ b/main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
@@ -30,7 +30,7 @@ index de44ea8..3b55fbd 100644
 +		if ! _fsck_is_busybox; then
 +			fsck_opts="$fsck_opts -C0 -T"
 +		fi
- 		if [ -z "$fsck_passno" ]; then
+ 		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
  			fsck_args=${fsck_args--A -p}
  			if echo 2>/dev/null >/.test.$$; then
 -- 
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 9a91ef059..4b568d37b 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openrc
-pkgver=0.8.3
+pkgver=0.9.7
 _ver=${pkgver/_git*/}
-pkgrel=7
+pkgrel=0
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
 arch="all"
@@ -65,13 +65,13 @@ package() {
 	install -d "$pkgdir"/etc/local.d "$pkgdir"/run
 }
 
-md5sums="c2c964d29e91a32dec4df75cd6d79102  openrc-0.8.3.tar.bz2
+md5sums="b7b2690b9e011479c8f6ba12bfac1931  openrc-0.9.7.tar.bz2
 8c2c1c2ee0509b63966b7187a2079f4b  openrc-0.4.3-mkmntdirs.patch
 4fd036ff07ed9ad7fb76af6a3ffc0695  0001-Force-root-be-rw-before-localmount.patch
-fb8baeaf32f4d53491312675f28a9939  0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
+f66dbabe0859abbd4b996c5ba8976b41  0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
 bc4f9ccd4036f9c458b89afe877fa8c2  0001-sysctl-Use-dev-null-instead-of-q.patch
 2a1749ee829877d80c3696eade59be8a  remove-rc_sys-warning.patch
-95927c85beb1476bda46ab8933c5e780  hwclock-hctosys.patch
+ce6ccda132e579cd2464b8f72daa3d2e  hwclock-hctosys.patch
 ddb34ea87994df3126f5e6b7e8f9ac93  swap-umount-tmpfs.patch
 c32e15b0858eef708497e7ee6355a055  hostname.initd
 b1e64885f301166df30be3e3cf5338ff  hwdrivers.initd
diff --git a/main/openrc/hwclock-hctosys.patch b/main/openrc/hwclock-hctosys.patch
index 6616a9990..6302da3e8 100644
--- a/main/openrc/hwclock-hctosys.patch
+++ b/main/openrc/hwclock-hctosys.patch
@@ -10,6 +10,6 @@
 -			_hwclock --systz $utc_cmd $clock_args
 -		fi
 +		_hwclock --hctosys $utc_cmd $clock_args
- 		retval=$(($retval + $?))
+ 		: $(( retval += $? ))
  	fi
  
diff --git a/main/openresolv/APKBUILD b/main/openresolv/APKBUILD
index 604f830a9..df8257c4b 100644
--- a/main/openresolv/APKBUILD
+++ b/main/openresolv/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openresolv
-pkgver=3.4.4
+pkgver=3.4.5
 pkgrel=0
 pkgdesc="A framework for managing DNS information"
 url="http://roy.marples.name/projects/openresolv"
@@ -23,4 +23,4 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 }
-md5sums="41ccf4c5e519fc9a1c6ca9c77709f5f0  openresolv-3.4.4.tar.bz2"
+md5sums="47dec464cea8d1b3ec6819c7927de494  openresolv-3.4.5.tar.bz2"
diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD
index 466628b6d..7f96559a1 100644
--- a/main/openvpn/APKBUILD
+++ b/main/openvpn/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openvpn
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
 url="http://openvpn.sourceforge.net/"
 arch="all"
@@ -9,7 +9,7 @@ license="custom"
 subpackages="$pkgname-doc $pkgname-easy-rsa:easy_rsa"
 depends="iproute2"
 makedepends="openssl-dev lzo-dev"
-install=
+install="$pkgname.pre-install"
 source="http://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz
 	openvpn.initd
 	openvpn.confd
diff --git a/main/openvpn/openvpn.pre-install b/main/openvpn/openvpn.pre-install
new file mode 100644
index 000000000..e9c6a0d1e
--- /dev/null
+++ b/main/openvpn/openvpn.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+addgroup -S openvpn 2>/dev/null
+adduser -S -H -h /dev/null -s /bin/false -D -G openvpn openvpn 2>/dev/null
+exit 0
diff --git a/main/parole/APKBUILD b/main/parole/APKBUILD
index 13af68de7..b971dab86 100644
--- a/main/parole/APKBUILD
+++ b/main/parole/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=parole
 pkgver=0.2.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Media player for the Xfce desktop"
 url="http://goodies.xfce.org/projects/applications/parole/"
 arch="all"
@@ -12,10 +12,18 @@ makedepends="libxfcegui4-dev libxfce4util-dev intltool gstreamer-dev bash
 	gst-plugins-base-dev libsm-dev taglib-dev libnotify-dev"
 install=
 subpackages="$pkgname-dev $pkgname-lang"
-source="http://archive.xfce.org/src/apps/parole/0.2/parole-$pkgver.tar.bz2"
+# the libx11 is a hack. The real solution is filed in
+# https://bugzilla.xfce.org/show_bug.cgi?id=6244
+source="http://archive.xfce.org/src/apps/parole/0.2/parole-$pkgver.tar.bz2
+	libx11.patch"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
 }
 
 build() {
@@ -23,8 +31,8 @@ build() {
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--enable-browser-plugin \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
@@ -34,4 +42,5 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 }
 
-md5sums="5d7e5ab7535bdf89508a8d7e551f9187  parole-0.2.0.6.tar.bz2"
+md5sums="5d7e5ab7535bdf89508a8d7e551f9187  parole-0.2.0.6.tar.bz2
+97b18d6e09433458439f6c7325d839b1  libx11.patch"
diff --git a/main/parole/libx11.patch b/main/parole/libx11.patch
new file mode 100644
index 000000000..4575551a6
--- /dev/null
+++ b/main/parole/libx11.patch
@@ -0,0 +1,11 @@
+--- ./src/Makefile.in.orig
++++ ./src/Makefile.in
+@@ -412,7 +412,7 @@
+         $(LIBXFCE4GUI_LIBS)                     \
+ 	$(GST_VIDEO_LIBS)			\
+ 	$(GST_INTERFACES_LIBS)			\
+-	$(TAGLIBC_LIBS)
++	$(TAGLIBC_LIBS) -lX11
+ 
+ parole_glib_enum_headers = \
+ 	parole-conf.h				\
diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD
index ec9775979..caab86352 100644
--- a/main/pcre/APKBUILD
+++ b/main/pcre/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pcre
-pkgver=8.20
+pkgver=8.21
 pkgrel=0
 pkgdesc="Perl-compatible regular expression library"
 url="http://pcre.sourceforge.net"
@@ -46,4 +46,4 @@ libpcrecpp() {
 	mv "$pkgdir"/usr/lib/libpcrecpp.so* "$subpkgdir"/usr/lib/
 }
 
-md5sums="a1931c70e1273e3450d5036fe273d25c  pcre-8.20.tar.bz2"
+md5sums="0a7b592bea64b7aa7f4011fc7171a730  pcre-8.21.tar.bz2"
diff --git a/main/perl-datetime-timezone/APKBUILD b/main/perl-datetime-timezone/APKBUILD
index 89378d591..ccf85b558 100644
--- a/main/perl-datetime-timezone/APKBUILD
+++ b/main/perl-datetime-timezone/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-datetime-timezone
-pkgver=1.39
+pkgver=1.42
 pkgrel=0
 pkgdesc="DateTime::TimeZone perl module"
 url="http://search.cpan.org/dist/DateTime-TimeZone/"
@@ -36,4 +36,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="00d9fa7d1e5f9e71c66a339c6995ff4f  DateTime-TimeZone-1.39.tar.gz"
+md5sums="e11c4f93eb1a9fcbd2cfab364335aa72  DateTime-TimeZone-1.42.tar.gz"
diff --git a/main/perl-test-nowarnings/APKBUILD b/main/perl-test-nowarnings/APKBUILD
index 42b124bcf..8cd2cd7b9 100644
--- a/main/perl-test-nowarnings/APKBUILD
+++ b/main/perl-test-nowarnings/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-test-nowarnings
-pkgver=1.03
+pkgver=1.04
 pkgrel=0
 pkgdesc="Test::NoWarnings perl module"
 url="http://search.cpan.org/dist/Test-NoWarnings/"
@@ -36,4 +36,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="09d89f1eda863baf6253728a4efc4d48  Test-NoWarnings-1.03.tar.gz"
+md5sums="682ed043f7d3e38f3dfd8745fd21c49a  Test-NoWarnings-1.04.tar.gz"
diff --git a/main/perl-try-tiny/APKBUILD b/main/perl-try-tiny/APKBUILD
index 14e30fa9a..b861d0913 100644
--- a/main/perl-try-tiny/APKBUILD
+++ b/main/perl-try-tiny/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-try-tiny
-pkgver=0.09
+pkgver=0.11
 pkgrel=0
 pkgdesc="Try::Tiny perl module"
 url="http://search.cpan.org/dist/Try-Tiny/"
@@ -36,4 +36,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="e526aa7d80cbc690c4a20925a592c13c  Try-Tiny-0.09.tar.gz"
+md5sums="4d2c8ff385ac3513edf4c042dd0eacbe  Try-Tiny-0.11.tar.gz"
diff --git a/main/pidgin/APKBUILD b/main/pidgin/APKBUILD
index 7d2cfcd1a..0078fb446 100644
--- a/main/pidgin/APKBUILD
+++ b/main/pidgin/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pidgin
-pkgver=2.10.0
-pkgrel=4
+pkgver=2.10.1
+pkgrel=0
 pkgdesc="graphical multi-protocol instant messaging client for X"
 url="http://pidgin.im/"
 arch="all"
@@ -9,13 +9,22 @@ license="GPL"
 depends=
 makedepends="gtk+-dev intltool libsm-dev startup-notification-dev gtkspell-dev
 	libxml2-dev gstreamer-dev libidn-dev dbus-glib-dev gnutls-dev
-	cyrus-sasl-dev ncurses-dev nss-dev"
+	cyrus-sasl-dev ncurses-dev nss-dev autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc finch libpurple $pkgname-lang"
-source="http://downloads.sourceforge.net/pidgin/pidgin-$pkgver.tar.bz2"
+source="http://downloads.sourceforge.net/pidgin/pidgin-$pkgver.tar.bz2
+	pidgin-libm.patch
+	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	for i in $source; do
+		case "$i" in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	libtoolize || return 1
+	aclocal -I m4macros && autoconf && automake || return 1
 }
 
 build() { 
@@ -60,4 +69,5 @@ libpurple() {
 	mv "$pkgdir"/usr/share/purple "$pkgdir"/usr/share/sounds \
 		"$subpkgdir"/usr/share/
 }
-md5sums="e1453c9093c4f32beec19abd14069a3f  pidgin-2.10.0.tar.bz2"
+md5sums="eafb06b4083a201fe22d310e897a19dd  pidgin-2.10.1.tar.bz2
+3cf0c3a476007781f4b0d855817cf58a  pidgin-libm.patch"
diff --git a/main/pidgin/pidgin-libm.patch b/main/pidgin/pidgin-libm.patch
new file mode 100644
index 000000000..f86e80572
--- /dev/null
+++ b/main/pidgin/pidgin-libm.patch
@@ -0,0 +1,10 @@
+--- ./pidgin/Makefile.am.orig
++++ ./pidgin/Makefile.am
+@@ -148,6 +148,7 @@
+ pidgin_DEPENDENCIES = @LIBOBJS@
+ pidgin_LDFLAGS = -export-dynamic
+ pidgin_LDADD = \
++	-lm \
+ 	@LIBOBJS@ \
+ 	$(GLIB_LIBS) \
+ 	$(DBUS_LIBS) \
diff --git a/main/polkit/APKBUILD b/main/polkit/APKBUILD
index 155329ff2..f6183ec1b 100644
--- a/main/polkit/APKBUILD
+++ b/main/polkit/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=polkit
 _pkgname=PolicyKit
-pkgver=0.102
+pkgver=0.103
 pkgrel=0
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 url="http://www.freedesktop.org/wiki/Software/PolicyKit"
@@ -49,4 +49,4 @@ package() {
 		"$pkgdir"/usr/lib/polkit*/extensions/*.la
 }
 
-md5sums="a799b58f4e6ab334719dee031134c970  PolicyKit-0.102.tar.bz2"
+md5sums="67f1b5d563f9c78a6c51342dafa0b020  PolicyKit-0.103.tar.bz2"
diff --git a/main/poppler-gtk/APKBUILD b/main/poppler-gtk/APKBUILD
index 05b9984d2..8c2762c41 100644
--- a/main/poppler-gtk/APKBUILD
+++ b/main/poppler-gtk/APKBUILD
@@ -3,7 +3,7 @@
 # this aport only includes glib/gtk support in order to break the
 # circular make dependency: gtk <- cups <- poppler <- gtk
 
-_ver=0.18.1
+_ver=0.18.2
 # get the pkgver from poppler
 if [ -r ../poppler/APKBUILD ]; then
 	. ../poppler/APKBUILD
@@ -62,4 +62,4 @@ demo() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="d30e883a27423c936ef338ce1d967e2d  poppler-0.18.1.tar.gz"
+md5sums="38616927823ef01937aab26872e957e4  poppler-0.18.2.tar.gz"
diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD
index 4d781657a..a34a0cd8e 100644
--- a/main/poppler/APKBUILD
+++ b/main/poppler/APKBUILD
@@ -4,7 +4,7 @@
 # circular make dependency: gtk <- cups <- poppler <- gtk
 # So we build gtk support in poppler-gtk
 pkgname=poppler
-pkgver=0.18.1
+pkgver=0.18.2
 pkgrel=0
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="http://poppler.freedesktop.org/"
@@ -44,4 +44,4 @@ utils() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="d30e883a27423c936ef338ce1d967e2d  poppler-0.18.1.tar.gz"
+md5sums="38616927823ef01937aab26872e957e4  poppler-0.18.2.tar.gz"
diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD
index 844f76f3c..5a18e510c 100644
--- a/main/postgresql/APKBUILD
+++ b/main/postgresql/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postgresql
-pkgver=9.1.1
-pkgrel=2
+pkgver=9.1.2
+pkgrel=0
 pkgdesc="A sophisticated object-relational DBMS"
 url="http://www.postgresql.org/"
 arch="all"
@@ -57,7 +57,7 @@ client() {
 }
 
 
-md5sums="061a9f17323117c9358ed60f33ecff78  postgresql-9.1.1.tar.bz2
+md5sums="7dbff52221954c46595313eb7f92c3e0  postgresql-9.1.2.tar.bz2
 7d7b7815f2bf133830f65ed9830ce461  postgresql.initd
 b609795f715cefcc30b08e4ed01f4416  postgresql.confd
 5f6d10a6a3d71dcee856fa6671954ab4  pg-restore.initd
diff --git a/main/privoxy/APKBUILD b/main/privoxy/APKBUILD
index 61cff17d1..2395185bc 100644
--- a/main/privoxy/APKBUILD
+++ b/main/privoxy/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=privoxy
-pkgver=3.0.18
+pkgver=3.0.19
 pkgrel=0
 pkgdesc="A web proxy with advanced filtering capabilities"
 url="http://www.privoxy.org"
@@ -55,7 +55,7 @@ package() {
 		"$pkgdir"/etc/privoxy
 }
 
-md5sums="baf0b13bb591ec6e1ba15b720ddea65c  privoxy-3.0.18-stable-src.tar.gz
+md5sums="57acc79059565cc42eda67982842785d  privoxy-3.0.19-stable-src.tar.gz
 170d5679e4c3504f07ef1a4c9859e9b8  privoxy.initd
 f2b6a652dbfbc65e5b89024a8ea3da7e  privoxy.logrotate
 cb233d3e5b13027557a405f467ee307c  privoxy-alpine.patch"
diff --git a/main/psqlodbc/APKBUILD b/main/psqlodbc/APKBUILD
index e637231bb..e90b70824 100644
--- a/main/psqlodbc/APKBUILD
+++ b/main/psqlodbc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=psqlodbc
-pkgver=09.00.0300
+pkgver=09.00.0310
 pkgrel=0
 pkgdesc="PostgreSQL ODBC driver"
 url="http://www.postgresql.org"
@@ -25,4 +25,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
-md5sums="9b4897ac9ba63265fb4e149c94db8632  psqlodbc-09.00.0300.tar.gz"
+md5sums="78144d9ea6c40f0a0a0b92128e6b0e05  psqlodbc-09.00.0310.tar.gz"
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index 40796f7fe..99b60bf9c 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -1,18 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qemu
-pkgver=0.15.1
-pkgrel=0
+pkgver=1.0
+pkgrel=3
 pkgdesc="QEMU is a generic machine emulator and virtualizer"
 url="http://www.nongnu.org/qemu/"
 arch="all"
 license="GPL-2 LGPL-2"
 makedepends="zlib-dev sdl-dev alsa-lib-dev gnutls-dev ncurses-dev glib-dev
-	jpeg-dev libpng-dev vde2-dev"
+	jpeg-dev libpng-dev vde2-dev spice-dev paxctl"
 depends=
 install="qemu.pre-install"
 subpackages="
+$pkgname-alpha
 $pkgname-arm
 $pkgname-cris
+$pkgname-i386
 $pkgname-lm32
 $pkgname-m68k
 $pkgname-microblaze
@@ -30,11 +32,14 @@ $pkgname-sh4eb
 $pkgname-sparc
 $pkgname-sparc64
 $pkgname-x86_64
+$pkgname-xtensa
+$pkgname-xtensaeb
 $pkgname-img
 "
 source="http://wiki.qemu.org/download/qemu-$pkgver.tar.gz
 	80-kvm.rules
-	qemu-libm.patch
+	configure-libm.patch
+	librt.patch
 	"
 
 prepare() {
@@ -62,11 +67,13 @@ build() {
 		--audio-drv-list=oss,alsa,sdl \
 		--audio-card-list=ac97,sb16,es1370,adlib \
 		--enable-vde \
+		--enable-spice \
 		--disable-darwin-user \
 		--disable-bsd-user \
 		--disable-linux-user \
 		--disable-werror \
-		--cc="${CC:-gcc}"
+		--cc="${CC:-gcc}" \
+		|| return 1
 
 	make V=1 || return 1
 }
@@ -75,7 +82,8 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 "$srcdir"/80-kvm.rules \
-		"$pkgdir"/lib/udev/rules.d/80-kvm.rules
+		"$pkgdir"/lib/udev/rules.d/80-kvm.rules || return 1
+	paxctl -c -m "$pkgdir"/usr/bin/qemu-system-* || return 1
 }
 
 _subsys() {
@@ -85,8 +93,10 @@ _subsys() {
 	mv "$pkgdir"/usr/bin/qemu-system-$1 "$subpkgdir"/usr/bin/
 }
 
+alpha() { _subsys alpha; }
 arm() { _subsys arm; }
 cris() { _subsys cris; }
+i386() { _subsys i386; }
 lm32() { _subsys lm32; }
 m68k() { _subsys m68k; }
 microblaze() { _subsys microblaze; }
@@ -104,6 +114,8 @@ sh4eb() { _subsys sh4eb; }
 sparc() { _subsys sparc; }
 sparc64() { _subsys sparc64; }
 x86_64() { _subsys x86_64; }
+xtensa() { _subsys xtensa; }
+xtensaeb() { _subsys xtensaeb; }
 
 img() {
 	pkgdesc="QEMU command line tool for manipulating disk images"
@@ -112,8 +124,21 @@ img() {
 	mv "$pkgdir"/usr/bin/qemu-img \
 		"$pkgdir"/usr/bin/qemu-io \
 		"$subpkgdir"/usr/bin/
+
+	# we exploit the fact that -img subpackage are craeted last
+	# and check that we done have new systems that belongs in
+	# subpackage
+	local _bins= _ret=0
+	for i in "$pkgdir"/usr/bin/qemu-system-*; do
+		if [ -r "$i" ]; then
+			error "Please create a subpackage for ${i##*/}"
+			_ret=1
+		fi
+	done
+	return $_err
 }
 
-md5sums="34f17737baaf1b3495c89cd6d4a607ed  qemu-0.15.1.tar.gz
+md5sums="a64b36067a191451323b0d34ebb44954  qemu-1.0.tar.gz
 66660f143235201249dc0648b39b86ee  80-kvm.rules
-70a4336c31600ce00838b056f0d08452  qemu-libm.patch"
+a69fe6ff552b61606c5550cac4294abc  configure-libm.patch
+9f6c3143d61748eedc8cf8d0e53aee2c  librt.patch"
diff --git a/main/qemu/configure-libm.patch b/main/qemu/configure-libm.patch
new file mode 100644
index 000000000..e57216e53
--- /dev/null
+++ b/main/qemu/configure-libm.patch
@@ -0,0 +1,60 @@
+--- ./configure.orig
++++ ./configure
+@@ -1287,6 +1287,25 @@
+ fi
+ 
+ ##########################################
++# libm check
++cat > $TMPC << EOF
++#include <math.h>
++int main(void) { return isnan(0.0); }
++EOF
++    if compile_prog "" "" ; then
++        LIBM=
++    elif compile_prog "" "-lm" ; then
++    	LIBM="-lm"
++    else
++        echo
++        echo "Error: libm check failed"
++        echo
++        exit 1
++    fi
++
++
++
++##########################################
+ # zlib check
+ 
+ if test "$zlib" != "no" ; then
+--- ./configure.orig
++++ ./configure
+@@ -3283,6 +3283,7 @@
+ echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak
+ echo "EXESUF=$EXESUF" >> $config_host_mak
+ echo "LIBS_QGA+=$libs_qga" >> $config_host_mak
++echo "LIBM=$LIBM" >> $config_host_mak
+ 
+ # generate list of library paths for linker script
+ 
+--- ./Makefile.orig
++++ ./Makefile
+@@ -170,7 +170,7 @@
+ $(qapi-obj-y): $(GENERATED_HEADERS)
+ qapi-dir := $(BUILD_DIR)/qapi-generated
+ test-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)
+-qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
++qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) $(LIBM)
+ 
+ $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\
+ $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py
+--- ./Makefile.orig
++++ ./Makefile
+@@ -34,7 +34,7 @@
+ 
+ $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw)
+ 
+-LIBS+=-lz $(LIBS_TOOLS)
++LIBS+=-lz $(LIBS_TOOLS) $(LIBM)
+ 
+ ifdef BUILD_DOCS
+ DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
diff --git a/main/qemu/librt.patch b/main/qemu/librt.patch
new file mode 100644
index 000000000..d445d1b68
--- /dev/null
+++ b/main/qemu/librt.patch
@@ -0,0 +1,11 @@
+--- ./Makefile.target.orig
++++ ./Makefile.target
+@@ -34,7 +34,7 @@
+ STPFILES=
+ 
+ ifndef CONFIG_HAIKU
+-LIBS+=-lm
++LIBS+=-lm -lrt
+ endif
+ 
+ config-target.h: config-target.h-timestamp
diff --git a/main/qemu/qemu-libm.patch b/main/qemu/qemu-libm.patch
deleted file mode 100644
index c7f0db707..000000000
--- a/main/qemu/qemu-libm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.orig
-+++ ./Makefile
-@@ -29,7 +29,7 @@
- 
- $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw)
- 
--LIBS+=-lz $(LIBS_TOOLS)
-+LIBS+=-lm -lz $(LIBS_TOOLS)
- 
- ifdef BUILD_DOCS
- DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD
index 169b445d8..951463e15 100644
--- a/main/qt/APKBUILD
+++ b/main/qt/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qt
-pkgver=4.7.4
-pkgrel=1
+pkgver=4.8.0
+pkgrel=0
 pkgdesc="A cross-platform application and UI framework"
 url="http://qt.nokia.com/"
 arch="all"
@@ -229,7 +229,7 @@ x11() {
 		usr/lib/qt/plugins
 }
 
-md5sums="ddf7d83f912cf1283aa066368464fa22  qt-everywhere-opensource-src-4.7.4.tar.gz
+md5sums="e8a5fdbeba2927c948d9f477a6abe904  qt-everywhere-opensource-src-4.8.0.tar.gz
 a445c6917086d80f1cfc1e40cb6b0132  assistant.desktop
 d457f0a0ad68a3861c3cadefe3b42ded  designer.desktop
 668331d9798a0e2b94381efb7be4c513  linguist.desktop
diff --git a/main/rdiff-backup/APKBUILD b/main/rdiff-backup/APKBUILD
index 13d6dfd93..78d2ce853 100644
--- a/main/rdiff-backup/APKBUILD
+++ b/main/rdiff-backup/APKBUILD
@@ -1,17 +1,16 @@
 # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
 # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
 pkgname=rdiff-backup
-pkgver=1.2.8
+pkgver=1.3.3
 pkgrel=1
 pkgdesc="A backup utility that maintains extra reverse diffs so that files can be restored from previous backups."
 url="http://www.gnu.org/savannah-checkouts/non-gnu/rdiff-backup/"
 arch="all"
-license="GPL"
-depends="python"
+license="GPL2+"
+depends=""
 makedepends="librsync-dev python-dev"
 subpackages="$pkgname-doc"
 source="http://savannah.nongnu.org/download/rdiff-backup/$pkgname-$pkgver.tar.gz"
-
 _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
@@ -24,4 +23,4 @@ package() {
         python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="1a94dc537fcf74d6a3a80bd27808e77b  rdiff-backup-1.2.8.tar.gz"
+md5sums="e3ec506c01e12b693adb79751daa7c63  rdiff-backup-1.3.3.tar.gz"
diff --git a/main/readline/APKBUILD b/main/readline/APKBUILD
index 7061eecc1..5954f4f5f 100644
--- a/main/readline/APKBUILD
+++ b/main/readline/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=readline
-pkgver=6.2.001
+pkgver=6.2.002
 _myver=${pkgver%.*}
 _patchver=${pkgver##*.}
 _suff=${_myver%.*}${_myver#*.}
@@ -48,4 +48,5 @@ package() {
 	
 }
 md5sums="67948acb2ca081f23359d0256e9a271c  readline-6.2.tar.gz
-83287d52a482f790dfb30ec0a8746669  readline62-001"
+83287d52a482f790dfb30ec0a8746669  readline62-001
+0665020ea118e8434bd145fb71f452cc  readline62-002"
diff --git a/main/ristretto/APKBUILD b/main/ristretto/APKBUILD
index 49047de71..b310c5a3b 100644
--- a/main/ristretto/APKBUILD
+++ b/main/ristretto/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ristretto
-pkgver=0.2.3
+pkgver=0.3.0
 pkgrel=0
 pkgdesc="Ristretto is a image viewer for Xfce"
 url="http://goodies.xfce.org/projects/applications/ristretto"
@@ -36,4 +36,4 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="62924c8abf17a921262ea9987ff8f5db  ristretto-0.2.3.tar.bz2"
+md5sums="124c4e98f837e35c728b0ff1d9078b1a  ristretto-0.3.0.tar.bz2"
diff --git a/main/roundcubemail/APKBUILD b/main/roundcubemail/APKBUILD
index 908fe104f..eba839a88 100644
--- a/main/roundcubemail/APKBUILD
+++ b/main/roundcubemail/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=roundcubemail
-pkgver=0.6
+pkgver=0.7
 pkgrel=0
 pkgdesc="A PHP web-based mail client"
 url="http://www.roundcube.net"
@@ -63,5 +63,5 @@ installer() {
 		"$subpkgdir"/usr/share/webapps/roundcube
 }
 
-md5sums="bdb9039d6fb95614a609aa1cb6476cf9  roundcubemail-0.6.tar.gz
+md5sums="ff54d9b840f1c5a82859b7b97133f4fc  roundcubemail-0.7.tar.gz
 1a134edb94ff52e8a046725e485a381d  fix-dirs.patch"
diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
index dd32d5680..d300dbc76 100644
--- a/main/rrdtool/APKBUILD
+++ b/main/rrdtool/APKBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rrdtool
-pkgver=1.2.30
-pkgrel=8
+pkgver=1.4.5
+pkgrel=1
 pkgdesc="Data logging and graphing application"
 url="http://www.rrdtool.org"
 arch="all"
 license="GPL"
 depends=
-makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev"
-subpackages="$pkgname-dev $pkgname-doc perl-rrd:perl_rrd"
+makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev cairo-dev
+	pango-dev lua-dev man"
+subpackages="$pkgname-dev $pkgname-doc perl-rrd:perl_rrd lua-rrd:lua_rrd"
 source="http://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -20,6 +21,7 @@ build() {
 		--disable-ruby \
 		--enable-rrdcgi \
 		--enable-perl-site-install \
+		--enable-lua-site-install \
 		--with-perl-options="INSTALLDIRS=vendor" \
 		|| return 1
 
@@ -49,4 +51,11 @@ perl_rrd() {
 	mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/
 }
 
-md5sums="19b24f7184a8dbf7b48c1bbb565ad9fb  rrdtool-1.2.30.tar.gz"
+lua_rrd() {
+	pkgdesc="Lua interface for rrdtool"
+	mkdir -p "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/lua "$subpkgdir"/usr/lib/
+}
+
+
+md5sums="4d116dba9a0888d8aaac179e35d3980a  rrdtool-1.4.5.tar.gz"
diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD
index 2ae337618..ed226d7c3 100644
--- a/main/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rsync
 pkgver=3.0.9
-pkgrel=0
+pkgrel=1
 pkgdesc="A file transfer program to keep remote files in sync"
 url="http://samba.anu.edu.au/rsync/"
 arch="all"
 license="GPL3"
 depends=
-makedepends="perl"
+makedepends="perl acl-dev popt-dev"
 source="http://$pkgname.samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz
 	rsyncd.initd
 	rsyncd.confd
@@ -19,10 +19,7 @@ subpackages="$pkgname-doc"
 build() { 
 	cd "$srcdir/$pkgname-$pkgver"
 	./prepare-source || return 1
-	./configure --prefix=/usr \
-		--with-included-popt \
-		--disable-acl-support \
-		--disable-xattr-support || return 1
+	./configure --prefix=/usr || return 1
 	make || return 1
 }
 
diff --git a/main/shorewall-shell/APKBUILD b/main/shorewall-shell/APKBUILD
index c04a3c15a..c2e1eefa1 100644
--- a/main/shorewall-shell/APKBUILD
+++ b/main/shorewall-shell/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=shorewall-shell
 _v=4.2.11
 pkgver=4.2.11
-pkgrel=2
+pkgrel=3
 pkgdesc="Shoreline Firewall shell-based compiler."
 url="http://www.shorewall.net/"
 arch="noarch"
@@ -13,6 +13,7 @@ source="http://www.shorewall.net/pub/shorewall/${_v%.*}/shorewall-$_v/$pkgname-$
 	shorewall-policyrouting.patch
 	shorewall-shell-ipset.patch
 	shorewall-shell-providers-gateway-none.patch
+	shorewall-shell-rp_filter.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -33,4 +34,5 @@ build() {
 md5sums="518a7f389a6f606c109acb7dfbe18372  shorewall-shell-4.2.11.tar.bz2
 64c01bc4f57203fb877bb334994eac38  shorewall-policyrouting.patch
 79745ea284a08cb167b9a356ee0bff3b  shorewall-shell-ipset.patch
-66b7249c5c56d104f62676c175e222d3  shorewall-shell-providers-gateway-none.patch"
+66b7249c5c56d104f62676c175e222d3  shorewall-shell-providers-gateway-none.patch
+d5eadb6be45aa41f80669452baa853a6  shorewall-shell-rp_filter.patch"
diff --git a/main/shorewall-shell/shorewall-shell-rp_filter.patch b/main/shorewall-shell/shorewall-shell-rp_filter.patch
new file mode 100644
index 000000000..0e3174c92
--- /dev/null
+++ b/main/shorewall-shell/shorewall-shell-rp_filter.patch
@@ -0,0 +1,17 @@
+--- ./compiler.orig
++++ ./compiler
+@@ -3991,12 +3991,12 @@
+ __EOF__
+ 	done
+ 
+-	save_command "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter"
+-
+ 	if [ "$ROUTE_FILTER" = yes ]; then
+ 	    save_command "echo 1 > /proc/sys/net/ipv4/conf/default/rp_filter"
++	    save_command "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter"
+ 	elif [ "$ROUTE_FILTER" = no ]; then
+ 	    save_command "echo 0 > /proc/sys/net/ipv4/conf/default/rp_filter"
++	    save_command "echo 0 > /proc/sys/net/ipv4/conf/all/rp_filter"
+ 	fi
+ 
+ 	save_command "[ -n \"\$NOROUTES\" ] || ip route flush cache"
diff --git a/main/shotwell/APKBUILD b/main/shotwell/APKBUILD
index 0ff40dd09..2e53b34c1 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=0
+pkgrel=1
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 url="http://yorba.org/shotwell/"
 arch="all"
@@ -14,7 +14,8 @@ makedepends="intltool vala libgee-dev libunique-dev webkit-dev libexif-dev
 	libgexiv2-dev libraw-dev librsvg-dev gconf-dev json-glib-dev
 	gnome-vfs-dev m4 gst-plugins-base-dev bash"
 install=
-source="http://yorba.org/download/shotwell/${pkgver%.*}/shotwell-$pkgver.tar.bz2"
+source="http://yorba.org/download/shotwell/${pkgver%.*}/shotwell-$pkgver.tar.bz2
+	shotwell-libraw.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -43,4 +44,5 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="bbbf2843eb98b6f0ef1dfcfb934e15cf  shotwell-0.11.6.tar.bz2"
+md5sums="bbbf2843eb98b6f0ef1dfcfb934e15cf  shotwell-0.11.6.tar.bz2
+0dc92b9a74e6515c14ae35434ee3c568  shotwell-libraw.patch"
diff --git a/main/shotwell/shotwell-libraw.patch b/main/shotwell/shotwell-libraw.patch
new file mode 100644
index 000000000..5c2f9af75
--- /dev/null
+++ b/main/shotwell/shotwell-libraw.patch
@@ -0,0 +1,150 @@
+diff --git a/src/photos/GRaw.vala b/src/photos/GRaw.vala
+index cb32289..c2463a2 100644
+--- a/src/photos/GRaw.vala
++++ b/src/photos/GRaw.vala
+@@ -34,11 +34,11 @@ public errordomain Exception {
+     OUT_OF_ORDER_CALL,
+     NO_THUMBNAIL,
+     UNSUPPORTED_THUMBNAIL,
+-    CANNOT_ADDMASK,
+     OUT_OF_MEMORY,
+     DATA_ERROR,
+     IO_ERROR,
+     CANCELLED_BY_CALLBACK,
++    BAD_CROP,
+     SYSTEM_ERROR
+ }
+ 
+@@ -163,10 +163,6 @@ public class Processor {
+         proc = new LibRaw.Processor(options);
+     }
+     
+-    public void add_masked_borders_to_bitmap() {
+-        proc.add_masked_borders_to_bitmap();
+-    }
+-    
+     public void adjust_sizes_info_only() throws Exception {
+         throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
+     }
+@@ -215,10 +211,6 @@ public class Processor {
+         throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename));
+     }
+     
+-    public void rotate_fuji_raw() throws Exception {
+-        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
+-    }
+-    
+     public void thumb_writer(string filename) throws Exception {
+         throw_exception("thumb_writer", proc.thumb_writer(filename));
+     }
+@@ -262,7 +254,6 @@ public class Processor {
+         // camera_profile
+         // bad_pixels
+         // dark_frame
+-        output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
+         output_params->output_bps = 8;
+         // output_tiff
+         output_params->user_flip = GRaw.Flip.FROM_SOURCE;
+@@ -303,9 +294,6 @@ private void throw_exception(string caller, LibRaw.Result result) throws Excepti
+         case LibRaw.Result.UNSUPPORTED_THUMBNAIL:
+             throw new Exception.UNSUPPORTED_THUMBNAIL(msg);
+         
+-        case LibRaw.Result.CANNOT_ADDMASK:
+-            throw new Exception.CANNOT_ADDMASK(msg);
+-        
+         case LibRaw.Result.UNSUFFICIENT_MEMORY:
+             throw new Exception.OUT_OF_MEMORY(msg);
+         
+@@ -318,6 +306,9 @@ private void throw_exception(string caller, LibRaw.Result result) throws Excepti
+         case LibRaw.Result.CANCELLED_BY_CALLBACK:
+             throw new Exception.CANCELLED_BY_CALLBACK(msg);
+         
++        case LibRaw.Result.BAD_CROP:
++            throw new Exception.BAD_CROP(msg);
++        
+         default:
+             return;
+     }
+diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi
+index 55f35cf..a7af4af 100644
+--- a/vapi/libraw.vapi
++++ b/vapi/libraw.vapi
+@@ -14,17 +14,6 @@ public unowned string version();
+ 
+ public unowned string versionNumber();
+ 
+-[CCode (cname="enum libraw_Filtering", cprefix="LIBRAW_FILTERING_")]
+-public enum Filtering {
+-    DEFAULT,
+-    NOZEROES,
+-    NOBLACK,
+-    NORAWCURVE,
+-    NONE,
+-    LIBRAWOWN,
+-    AUTOMATIC
+-}
+-
+ [SimpleType]
+ [CCode (cname="libraw_imgother_t")]
+ public struct ImageOther {
+@@ -121,7 +110,6 @@ public struct OutputParams {
+     public bool use_camera_wb;
+     public bool use_camera_matrix;
+     public int output_color;
+-    public Filtering filtering_mode;
+     public int output_bps;
+     public bool output_tiff;
+     public int user_flip;
+@@ -132,6 +120,30 @@ public struct OutputParams {
+     public bool no_auto_bright;
+     public float auto_bright_thr;
+     public int use_fuji_rotate;
++    public int green_matching;
++
++    /* DCB parameters */
++    public int dcb_iterations;
++    public int dcb_enhance_fl;
++    public int fbdd_noiserd;
++
++    /* VCD parameters */
++    public int eeci_refine;
++    public int es_med_passes;
++    /* AMaZE*/
++    public int ca_correc;
++    public float cared;
++    public float cablue;
++    public int cfaline;
++    public float linenoise;
++    public int cfa_clean;
++    public float lclean;
++    public float cclean;
++    public int cfa_green;
++    public float green_thresh;
++    public int exp_correc;
++    public float exp_shift;
++    public float exp_preser;
+     
+     public void set_chromatic_aberrations(double red_multiplier, double green_multiplier) {
+         aber[0] = red_multiplier;
+@@ -171,7 +183,6 @@ public class Processor {
+     [CCode (cname="libraw_init")]
+     public Processor(Options flags = Options.NONE);
+     
+-    public void add_masked_borders_to_bitmap();
+     public Result adjust_sizes_info_only();
+     [CCode (cname="libraw_dcraw_document_mode_processing")]
+     public Result document_mode_processing();
+@@ -216,11 +227,11 @@ public enum Result {
+     OUT_OF_ORDER_CALL,
+     NO_THUMBNAIL,
+     UNSUPPORTED_THUMBNAIL,
+-    CANNOT_ADDMASK,
+     UNSUFFICIENT_MEMORY,
+     DATA_ERROR,
+     IO_ERROR,
+-    CANCELLED_BY_CALLBACK;
++    CANCELLED_BY_CALLBACK,
++    BAD_CROP;
+     
+     [CCode (cname="LIBRAW_FATAL_ERROR")]
+     public bool is_fatal_error();
diff --git a/main/smokeping/APKBUILD b/main/smokeping/APKBUILD
index 6190e305e..163b72fc5 100644
--- a/main/smokeping/APKBUILD
+++ b/main/smokeping/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=smokeping
 pkgver=2.6.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Smokeping network latency monitoring"
 pkgusers="smokeping"
 pkggroups="smokeping"
@@ -129,7 +129,7 @@ package() {
 }
 
 md5sums="f4a5437b71e02f982f08bf318bb9857d  smokeping-2.6.1.tar.gz
-550979e008f49299bf404aceeb81fe61  smokeping.initd
+38fe448bd14ebfb2a22dbd9fc98a59e7  smokeping.initd
 b3f3c968c582adb9e4e0fdcc9c7163e9  0001-fix-sysconfdir-in-etc.patch
 2bdafaade171bfb2241d1e6450fb094a  0002-fix-sysconfdir-in-doc.patch
 1942e4eceecb80b4bbe4cfc95e3e642f  0003-fix-sysconfdir-in-lib.patch
diff --git a/main/smokeping/smokeping.initd b/main/smokeping/smokeping.initd
index 068f33ff2..5a21fecd6 100644
--- a/main/smokeping/smokeping.initd
+++ b/main/smokeping/smokeping.initd
@@ -29,7 +29,7 @@ start() {
 	start-stop-daemon --start --name smokeping \
 		--pidfile /var/run/smokeping/smokeping.pid \
 		--exec /usr/bin/smokeping \
-		--chuid smokeping:smokeping
+		--user smokeping:smokeping
 	eend $?
 }
 
diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD
index e297e64d1..d041596ea 100644
--- a/main/snort/APKBUILD
+++ b/main/snort/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=snort
-pkgver=2.9.1.2
+pkgver=2.9.2
 pkgrel=0
 pkgdesc="An open source network intrusion prevention and detection system"
 url="http://www.snort.org/"
@@ -44,6 +44,6 @@ package() {
         install -D -m 644 ../snort.confd "$pkgdir"/etc/conf.d/snort
 }
 
-md5sums="9e94f20b934566469c239966e1b41eba  snort-2.9.1.2.tar.gz
+md5sums="22fa07ba915535b151329056439ae194  snort-2.9.2.tar.gz
 ffda56f7c20f5cea1c37c971e0f1d6c9  snort.initd
 446f8d2b3435b8a6be738da978670605  snort.confd"
diff --git a/main/socat/APKBUILD b/main/socat/APKBUILD
index 652bf808d..9ea9d6a51 100644
--- a/main/socat/APKBUILD
+++ b/main/socat/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=socat
-pkgver=1.7.1.3
-pkgrel=1
+pkgver=1.7.2.0
+pkgrel=0
 pkgdesc="Multipurpose relay for binary protocols"
 url="http://www.dest-unreach.org/socat/"
 arch="all"
@@ -30,4 +30,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="2081987fb0cb0290b8105574058cb329  socat-1.7.1.3.tar.bz2"
+md5sums="eb563dd00b9d39a49fb62a677fc941fe  socat-1.7.2.0.tar.bz2"
diff --git a/main/sox/APKBUILD b/main/sox/APKBUILD
index f6c3e8082..d2cf7daca 100644
--- a/main/sox/APKBUILD
+++ b/main/sox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sox
 pkgver=14.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Swiss Army knife of sound processing tools"
 url="http://sox.sourceforge.net/"
 arch="all"
@@ -40,8 +40,9 @@ package() {
 	ln -sf play "$pkgdir"/usr/bin/rec || return 1
 	ln -sf ../man1/sox.1.gz "$pkgdir"/usr/share/man/man7/soxeffect.7 || return 1
 	rm "$pkgdir"/usr/lib/*.la \
-		"$pkgdir"/usr/lib/sox/*.a \ 
-		"$pkgdir"/usr/lib/sox/*.la \ 
+		"$pkgdir"/usr/lib/sox/*.a \
+		"$pkgdir"/usr/lib/sox/*.la \
+		|| return 1
 }
 md5sums="e9d35cf3b0f8878596e0b7c49f9e8302  sox-14.3.2.tar.gz
 d8267f718ba6b4fb2f48c5104af31364  sox-uclibc.patch
diff --git a/main/spice-protocol/APKBUILD b/main/spice-protocol/APKBUILD
new file mode 100644
index 000000000..fa6f70233
--- /dev/null
+++ b/main/spice-protocol/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=spice-protocol
+pkgver=0.10.0
+pkgrel=0
+pkgdesc="Spice protocol header files"
+url="http://www.spice-space.org/"
+arch="noarch"
+license="BSD and LGPLv2+"
+depends=""
+depends_dev=""
+makedepends="$depends_dev"
+install=""
+subpackages=""
+source="http://www.spice-space.org/download/releases/spice-protocol-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/spice-protocol-$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 \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="888d8a50d36a09a1c479cadddce244ae  spice-protocol-0.10.0.tar.bz2"
diff --git a/main/spice/APKBUILD b/main/spice/APKBUILD
new file mode 100644
index 000000000..1fbad306c
--- /dev/null
+++ b/main/spice/APKBUILD
@@ -0,0 +1,63 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=spice
+pkgver=0.10.0
+pkgrel=2
+pkgdesc="Implements the SPICE protocol"
+url="http://www.spice-space.org/"
+arch="all"
+license="LGPLv2+"
+depends=""
+depends_dev="spice-protocol pixman-dev celt051-dev openssl-dev"
+makedepends="$depends_dev alsa-lib-dev jpeg-dev libxrandr-dev cyrus-sasl-dev
+	libxfixes-dev python-dev bash cegui06-dev"
+install=""
+subpackages="$pkgname-dev $pkgname-server $pkgname-client"
+source="http://www.spice-space.org/download/releases/spice-$pkgver.tar.bz2
+	cstdarg.patch"
+
+_builddir="$srcdir"/spice-$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 \
+		--enable-gui \
+		|| return 1
+	make -C common WARN_CFLAGS='' || return 1
+	make -C client WARN_CFLAGS='' || return 1
+	make WARN_CFLAGS='' || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+server() {
+	pkgdesc="Server library for SPICE"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/*server.so.* "$subpkgdir"/usr/lib/
+}
+
+client() {
+	pkgdesc="SPICE client"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/spicec "$subpkgdir"/usr/bin/
+}
+
+md5sums="d9f0b0280c9e2291623c9560e156be26  spice-0.10.0.tar.bz2
+3e61fdc18bf201a2b54b332fdbe2912e  cstdarg.patch"
diff --git a/main/spice/cstdarg.patch b/main/spice/cstdarg.patch
new file mode 100644
index 000000000..7a16dc579
--- /dev/null
+++ b/main/spice/cstdarg.patch
@@ -0,0 +1,10 @@
+--- ./client/common.h.orig
++++ ./client/common.h
+@@ -39,6 +39,7 @@
+ #include <exception>
+ #include <list>
+ #include <string.h>
++#include <cstdarg>
+ 
+ #ifdef WIN32
+ #ifdef __GNUC__
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index fa72022b9..7ec326f9f 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=squid
-pkgver=3.2.0.12
-pkgrel=2
+pkgver=3.2.0.13
+pkgrel=0
 pkgdesc="A full-featured Web proxy cache server."
 url="http://www.squid-cache.org"
 install="squid.pre-install squid.pre-upgrade squid.post-install"
@@ -20,6 +20,7 @@ langdir="/usr/share/squid/errors"
 
 source="http://www.squid-cache.org/Versions/v3/3.2/squid-$pkgver.tar.bz2
 	squid-3.2.0.12-loggable-urlgroup.patch
+	cf_gen-pthread.patch
 	squid.initd
 	squid.confd
 	$pkgname.logrotate
@@ -47,6 +48,7 @@ build() {
 		--sysconfdir=/etc/squid \
 		--libexecdir=/usr/lib/squid \
 		--localstatedir=/var \
+		--with-logdir=/var/log/squid \
 		--disable-strict-error-checking \
 		--enable-removal-policies="lru,heap" \
 		--enable-digest-auth-helpers="password" \
@@ -73,6 +75,7 @@ build() {
 		--enable-poll --with-maxfd=4096 \
 		--enable-follow-x-forwarded-for \
 		--with-large-files \
+		--with-default-user=squid \
 		|| return 1
 
 	make || return 1
@@ -100,8 +103,9 @@ squid_kerb_auth() {
 	mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/
 }
 
-md5sums="f11b71b7c58a2a20e87707d4ba441743  squid-3.2.0.12.tar.bz2
+md5sums="cef6d63729b34404a3e463f0bd81b1e3  squid-3.2.0.13.tar.bz2
 084f7b1af1ac0cb8fea35c7a0905a80e  squid-3.2.0.12-loggable-urlgroup.patch
-db05ed77b174271f26c41e7493a0d104  squid.initd
+c60237de253c02937f272d3b189d7679  cf_gen-pthread.patch
+905e57c6d41414f54a75a5c0f9f7fac7  squid.initd
 2897c725c201be53d3c9a7db0101bdf0  squid.confd
 58823e0b86bc2dc71d270208b7b284b4  squid.logrotate"
diff --git a/main/squid/cf_gen-pthread.patch b/main/squid/cf_gen-pthread.patch
new file mode 100644
index 000000000..67387a1a9
--- /dev/null
+++ b/main/squid/cf_gen-pthread.patch
@@ -0,0 +1,20 @@
+--- ./src/Makefile.in.orig
++++ ./src/Makefile.in
+@@ -1963,7 +1963,7 @@
+ noinst_LTLIBRARIES = libsquid.la
+ cf_gen_SOURCES = cf_gen.cc
+ nodist_cf_gen_HEADER = cf_gen_defines.cci
+-cf_gen_LDADD = 
++cf_gen_LDADD =  -lpthread
+ ACL_REGISTRATION_SOURCES = AclRegs.cc AuthReg.cc
+ DISKIO_SOURCE = \
+ 	DiskIO/DiskIOModule.cc \
+@@ -5796,7 +5796,7 @@
+ 
+ # cf_gen builds the configuration files.
+ cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
+-	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
++	$(HOSTCXX) $(cf_gen_LDADD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
+ 
+ # squid.conf.default is built by cf_gen when making cf_parser.cci
+ squid.conf.default squid.conf.documented: cf_parser.cci
diff --git a/main/squid/squid.initd b/main/squid/squid.initd
index e243ddd50..488a45b52 100644
--- a/main/squid/squid.initd
+++ b/main/squid/squid.initd
@@ -1,115 +1,130 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.10 2008/11/30 19:20:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.14 2011/10/23 18:45:39 polynomial-c Exp $
 
-opts="${opts} reload rotate"
-
-conf=/etc/squid/squid.conf
+extra_started_commands="reload rotate"
 
 depend() {
+	use dns
 	need net
 	after firewall
 }
 
+upprocval() {
+	[ -f $1 ] || return 0
+	if [ `cat $1` -lt $2 ]; then
+		echo $2 > $1
+	fi
+}
+
 # Try to increase the # of filedescriptors we can open.
 maxfds() {
 	[ -n "$SQUID_MAXFD" ] || return
-	[ -f /proc/sys/fs/file-max ] || return 0
 	[ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
-	local global_file_max=`cat /proc/sys/fs/file-max`
 	local minimal_file_max=$(($SQUID_MAXFD + 4096))
-	if [ "$global_file_max" -lt $minimal_file_max ]; then
-		echo $minimal_file_max > /proc/sys/fs/file-max
+	upprocval /proc/sys/fs/file-max $minimal_file_max
+	if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then
+		upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max
 	fi
 	ulimit -n $SQUID_MAXFD
 }
 
 checkconfig() {
+	if [ ! -f /etc/squid/${SVCNAME}.conf ]; then
+		eerror "You need to create /etc/squid/${SVCNAME}.conf first."
+		eerror "An example can be found in /etc/squid/squid.conf.default"
+		return 1
+	fi
+
+	local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf)
+	[ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid
+	if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then
+		eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to"
+		eerror "   /var/run/${SVCNAME}.pid"
+		eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
+		eerror "         in any other instance of squid."
+		return 1
+	fi
+
 	maxfds
-	
-	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < $conf)
+
+	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf)
 	[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
 	
 	local x
 	for x in $CACHE_SWAP ; do
 		if [ ! -e $x ] ; then
-			ebegin "Initializing cache directories"
+			ebegin "Initializing cache directory ${x%/*}"
 			local ORIG_UMASK=$(umask)
 			umask 027
-			local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N 2>&1)"
+
+			if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
+				eend 1
+				return 1
+			fi
+
+			local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)"
 			if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
 				umask $ORIG_UMASK
 				eend 1
 				echo "$INIT_CACHE_RESPONSE"
 				return 1
 			fi
+
 			umask $ORIG_UMASK
 			eend 0
 			break
 		fi
 	done
 	
-	squid -k parse
-}
-
-get_pidfile() {
-	PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ {print $2}' $conf)
-	[ -z "$PIDFILE" ] && PIDFILE=/var/run/squid/squid.pid
+	return 0
 }
 
 start() {
-	get_pidfile
 	checkconfig || return 1
-	ebegin "Starting squid"
-	start-stop-daemon --start --pidfile "$PIDFILE" \
-		--env KRB5_KTNAME="${SQUID_KEYTAB}" \
-		--exec /usr/sbin/squid -- ${SQUID_OPTS}
+	ebegin "Starting ${SVCNAME}"
+	KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
 	eend $? && sleep 1
 }
 
 stop() {
-	local rc=0 pid
-	ebegin "Stopping squid"
-	get_pidfile
-	/usr/sbin/squid -k shutdown
-
-	# Now we have to wait until squid has _really_ stopped.
-	if [ -f "$PIDFILE" ] ; then
-		pid=$(cat "$PIDFILE")
-		if [ -d /proc/$pid ]; then
+	ebegin "Stopping ${SVCNAME}"
+	if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
+		# Now we have to wait until squid has _really_ stopped.
+		sleep 1
+		if [ -f /var/run/${SVCNAME}.pid ] ; then
 			einfon "Waiting for squid to shutdown ."
-		else
-			rm -f "$PIDFILE"
+			cnt=0
+			while [ -f /var/run/${SVCNAME}.pid ] ; do
+				cnt=$(expr $cnt + 1)
+				if [ $cnt -gt 60 ] ; then
+					# Waited 120 seconds now. Fail.
+					echo
+					eend 1 "Failed."
+					break
+				fi
+				sleep 2
+				echo -n "."
+			done
+			echo
 		fi
-		cnt=0
-		while [ -f "$PIDFILE" ] ; do
-			cnt=$(expr $cnt + 1)
-			if [ $cnt -gt 60 ] ; then
-				# Waited 120 seconds now. Fail.
-				echo
-				rc=1
-				break
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
+	else
+		eerror "Squid shutdown failed, probably service is already down."
 	fi
-	eend $rc
+	eend 0
 }
 
 reload() {
 	checkconfig || return 1
-	ebegin "Reloading squid"
-	/usr/sbin/squid -k reconfigure
+	ebegin "Reloading ${SVCNAME}"
+	/usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf
 	eend $?
 }
 
 rotate() {
-	service_started squid || return 1
-	ebegin "Rotating logs"
-	/usr/sbin/squid -k rotate
+	service_started ${SVCNAME} || return 1
+	ebegin "Rotating ${SVCNAME} logs"
+	/usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf
 	eend $?
 }
-
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD
index 7e31aa125..2e4089656 100644
--- a/main/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=subversion
-pkgver=1.7.1
+pkgver=1.7.2
 pkgrel=0
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 url="http://subversion.tigris.org/"
@@ -38,7 +38,7 @@ build() {
 		--with-swig \
 		--disable-javahl \
 		--disable-static \
-		--without-jdk 
+		--without-jdk
 
 	make external-all || return 1
 	make local-all || return 1
@@ -76,7 +76,7 @@ pl() {
 	mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/
 }
 
-md5sums="8a4fa74385df85a9702141b6b68b8307  subversion-1.7.1.tar.bz2
+md5sums="1e5dfffd27be080672e5a042564368a8  subversion-1.7.2.tar.bz2
 e1127cb722daecb3c89adbaf9eed7adf  subversion-1.7.0-deplibs.patch
 d084a7558053784886bc858b94fa9186  svnserve.confd
-22c274fafb4817e31126f60f9d84039f  svnserve.initd"
+c0327ac3f55c335db799a2269078f986  svnserve.initd"
diff --git a/main/subversion/svnserve.initd b/main/subversion/svnserve.initd
index f539a4e2c..d76f6f374 100644
--- a/main/subversion/svnserve.initd
+++ b/main/subversion/svnserve.initd
@@ -17,7 +17,7 @@ start() {
 	cd /
 	start-stop-daemon --start --quiet --background --make-pidfile \
 		--pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \
-		--chuid ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \
+		--user ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \
 		--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}
 	eend $?
 }
@@ -35,7 +35,7 @@ setup() {
 		eend 1 "$root/repos already exist"
 		return 1
 	fi
-		
+
 	svnadmin create "$root"/repos
 	chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "$root/repos"
 	mkdir -p "$root/conf"
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD
index ba4b1e03d..1f6884b4b 100644
--- a/main/syslinux/APKBUILD
+++ b/main/syslinux/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=syslinux
-pkgver=4.04
-pkgrel=10
+pkgver=4.05
+pkgrel=0
 pkgdesc="Boot loader for the Linux operating system"
 url="http://syslinux.org"
 arch="x86 x86_64"
 license="GPL"
-makedepends="nasm perl"
+makedepends="nasm perl util-linux-dev"
 depends="mtools blkid mkinitfs"
 triggers="syslinux.trigger=/boot"
 install="syslinux.post-upgrade"
@@ -36,6 +36,6 @@ package() {
 	cp "$srcdir"/update-extlinux "$pkgdir"/sbin/
 }
 
-md5sums="a3936208767eb7ced65320abe2e33a10  syslinux-4.04.tar.bz2
+md5sums="82299242418385da1274c9479a778cb2  syslinux-4.05.tar.bz2
 7ef73a7a858b8aa1ac6635d6391ac8e5  update-extlinux.conf
 2414de8196826e20292825d69c75184b  update-extlinux"
diff --git a/main/sysstat/APKBUILD b/main/sysstat/APKBUILD
index e8a611316..76a29811e 100644
--- a/main/sysstat/APKBUILD
+++ b/main/sysstat/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sysstat
-pkgver=10.0.1
+pkgver=10.0.3
 pkgrel=0
 pkgdesc="Performance monitoring tools for Linux"
 url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -28,4 +28,4 @@ package() {
 
 }
 
-md5sums="a8b12230452dc0e0b6cae5fd5ec3c579  sysstat-10.0.1.tar.gz"
+md5sums="0e1ed5200f31f69a3b90ff1e81c07745  sysstat-10.0.3.tar.gz"
diff --git a/main/thunar-archive-plugin/APKBUILD b/main/thunar-archive-plugin/APKBUILD
index 7ad5fc5b3..fbc87aca4 100644
--- a/main/thunar-archive-plugin/APKBUILD
+++ b/main/thunar-archive-plugin/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=thunar-archive-plugin
 pkgver=0.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="create and deflate archives in thunar"
 url="http://foo-projects.org/~benny/projects/thunar-archive-plugin/"
 arch="all"
@@ -9,6 +9,7 @@ license="GPL2"
 depends=
 makedepends="gtk+-dev intltool thunar-dev exo-dev"
 install=
+subpackages="$pkgname-lang"
 source="http://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/${pkgver%.*}/thunar-archive-plugin-$pkgver.tar.bz2"
 
 build() {
@@ -25,6 +26,8 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	# dont want file-roller
-	rm -f "$pkgdir"/usr/lib/xfce4/thunar-archive-plugin/file-roller.tap
+	rm -f "$pkgdir"/usr/lib/xfce4/thunar-archive-plugin/file-roller.tap \
+		"$pkgdir"/usr/lib/thunarx-2/*.la
 }
+
 md5sums="afeb3f1c65a4529dbdadc6e7b349a712  thunar-archive-plugin-0.3.0.tar.bz2"
diff --git a/main/tinc/APKBUILD b/main/tinc/APKBUILD
index f2bf612ae..03194dc57 100644
--- a/main/tinc/APKBUILD
+++ b/main/tinc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tinc
-pkgver=1.0.13
-pkgrel=1
+pkgver=1.0.16
+pkgrel=0
 pkgdesc="tinc is a Virtual Private Network (VPN) daemon"
 url="http://www.tinc-vpn.org/"
 arch="all"
@@ -45,7 +45,7 @@ package() {
 		"$pkgdir"/etc/conf.d/tinc.networks
 }
 
-md5sums="86263994d38c750431efd17e9a91a248  tinc-1.0.13.tar.gz
+md5sums="f1c7ed94878725fb2cf4efb02bf160da  tinc-1.0.16.tar.gz
 89d104d38bab84d6f92d27464e48628d  tincd.initd
 96d8778284637fa7790a4c6239a72070  tincd.lo.initd
 475d64d9aa410ec7e91f5b079800abc9  tinc.networks"
diff --git a/main/trac/APKBUILD b/main/trac/APKBUILD
index c6cf392e4..b5ce2c6ce 100644
--- a/main/trac/APKBUILD
+++ b/main/trac/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=trac
 _realname=Trac
 pkgver=0.12.2
-pkgrel=1
+pkgrel=2
 pkgusers="tracd"
 pkggroups="tracd"
 pkgdesc="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system."
@@ -33,4 +33,4 @@ package() {
 
 md5sums="f70c7676601f2592bcb7871319e62dd7  Trac-0.12.2.tar.gz
 95b1311ca65e1ffcd51a191542f45ba4  tracd.confd
-e53761b1e84c5d68c8e6c4b837e57008  tracd.initd"
+fd3f1cd33a2819c43de82b92a839660d  tracd.initd"
diff --git a/main/trac/tracd.initd b/main/trac/tracd.initd
index 83f84052d..fc365e161 100755
--- a/main/trac/tracd.initd
+++ b/main/trac/tracd.initd
@@ -12,7 +12,7 @@ start() {
 	# tracd fails to create pidfile if started as non-root user, thus we are asking
 	# s-s-d to do that. To have correct pid we avoid -d option of tracd and use
 	# --background option of s-s-d.
-	start-stop-daemon --start --chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \
+	start-stop-daemon --start --user ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \
                 --pidfile /var/run/tracd.pid --make-pidfile --background \
 		--env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \
 		--exec /usr/bin/python -- /usr/bin/tracd \
diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD
index e71729f6a..47e1c0184 100644
--- a/main/transmission/APKBUILD
+++ b/main/transmission/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer:Carlo Landmeter
 pkgname=transmission
 pkgver=2.41
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight GTK BitTorrent client"
 url="http://www.tansmissionbt.com"
 install="$pkgname.pre-install"
@@ -67,5 +67,5 @@ cli() {
 }
 
 md5sums="799b7bb24e236dbbdc86275f89ea9e67  transmission-2.41.tar.bz2
-f65b8ae46f8ac89b35844109b3aa0c18  transmission-daemon.initd
+1ca57137d38c3429295a4699f535a240  transmission-daemon.initd
 89478a70fcd93463e1dd8d751da994da  transmission-daemon.confd"
diff --git a/main/transmission/transmission-daemon.initd b/main/transmission/transmission-daemon.initd
index ecf3bdafe..4f0acd24f 100644
--- a/main/transmission/transmission-daemon.initd
+++ b/main/transmission/transmission-daemon.initd
@@ -8,7 +8,7 @@ depend() {
 start() {
         ebegin "Starting transmission-daemon"
                 start-stop-daemon --start --quiet --background --make-pidfile \
-                --chuid transmission:transmission \
+                --user transmission:transmission \
                 --pidfile /var/run/transmission-daemon.pid \
                 --exec /usr/bin/transmission-daemon -- ${TD_OPTS}
         eend $?
diff --git a/main/tumbler/APKBUILD b/main/tumbler/APKBUILD
index e9f82bc8b..ee30430e3 100644
--- a/main/tumbler/APKBUILD
+++ b/main/tumbler/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tumbler
-pkgver=0.1.22
-pkgrel=1
+pkgver=0.1.23
+pkgrel=0
 pkgdesc="D-Bus service for applications to request thumbnails"
 url="http://git.xfce.org/apps/tumbler/"
 arch="all"
@@ -41,4 +41,4 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 }
 
-md5sums="e7ba3b8f21f8f7e736f1e214906b4ca9  tumbler-0.1.22.tar.bz2"
+md5sums="c6cf6821f5d884cbf2c26f45f2fecc74  tumbler-0.1.23.tar.bz2"
diff --git a/main/udev/APKBUILD b/main/udev/APKBUILD
index 591cede4a..e75345d6a 100644
--- a/main/udev/APKBUILD
+++ b/main/udev/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=udev
-pkgver=173
+pkgver=175
 pkgrel=1
 pkgdesc="The userspace dev tools (udev)"
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -34,6 +34,12 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 
+	# Upstream moved udevd to /lib/udev
+	ln -s "../lib/udev/udevd" "$pkgdir"/sbin/udevd
+
+	# multipath-tools expect scsi_id in /sbin
+	ln -s "../lib/udev/scsi_id" "$pkgdir"/sbin/scsi_id
+
 	mkdir -p "$pkgdir"/usr/lib/pkgconfig
 	chmod +x "$pkgdir"/lib/udev/write_*_rules
 	for _i in write_root_link_rule; do
@@ -66,7 +72,7 @@ libgudev() {
 		"$subpkgdir"/usr/lib/
 }
 
-md5sums="91a88a359b60bbd074b024883cc0dbde  udev-173.tar.bz2
+md5sums="2fc9c1efcbde98e3d73ffee7a77aea47  udev-175.tar.bz2
 c9de7581099cdfdcd105666cd98a0f0a  write_root_link_rule
 884d7faaaa149a323b14e907ea1934f4  udev-mount.initd
 e99c87e62e7cb5acc4c55bf065944a11  udev-postmount.initd
diff --git a/main/ulogd/APKBUILD b/main/ulogd/APKBUILD
index 4d829f79f..fc90caca9 100644
--- a/main/ulogd/APKBUILD
+++ b/main/ulogd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=ulogd
 pkgver=1.24
-pkgrel=4
+pkgrel=5
 pkgdesc="A userspace logging daemon for netfilter/iptables related logging"
 url="http://netfilter.org/projects/ulogd/index.html"
 arch="all"
@@ -56,4 +56,4 @@ pgsql() {
 md5sums="05b4ed2926b9a22aaeaf642917bbf8ff  ulogd-1.24.tar.bz2
 a9a4262961a9cf4b8dd34a91701dbb0a  ulogd.initd
 b9b2fa217ee02211debee5a5dffdcda7  ulogd.confd
-836332074f6cbc19d2d0553e2076dab7  ulogd.logrotate"
+77688e9c300750f5423ed2ad37ae8b32  ulogd.logrotate"
diff --git a/main/ulogd/ulogd.logrotate b/main/ulogd/ulogd.logrotate
index 6974d41b1..1daed4860 100644
--- a/main/ulogd/ulogd.logrotate
+++ b/main/ulogd/ulogd.logrotate
@@ -1,12 +1,5 @@
-/var/log/ulogd.log /var/log/ulog.syslogemu {
-	rotate 4
-	daily
+/var/log/ulogd.* {
 	missingok
-	notifempty
-	compress
+	copytruncate
 	delaycompress
-	sharedscripts
-	postrotate
-		/etc/init.d/ulogd reload &>/dev/null
-	endscript
 }
diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD
index a539f83a2..3f9081a82 100644
--- a/main/unbound/APKBUILD
+++ b/main/unbound/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=unbound
-pkgver=1.4.13
-pkgrel=2
+pkgver=1.4.14
+pkgrel=0
 pkgdesc="Unbound is a validating, recursive, and caching DNS resolver"
 pkgusers="unbound"
 pkggroups="unbound"
@@ -15,7 +15,9 @@ makedepends="$depends_dev python-dev swig"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs py-unbound:py"
 source="http://unbound.net/downloads/unbound-$pkgver.tar.gz
-	unbound-1.4.12-gentoo.patch
+	conf.patch
+	update-unbound-root-hints
+	root.hints
 	unbound.initd"
 
 _builddir="$srcdir"/unbound-$pkgver
@@ -61,7 +63,11 @@ package() {
 		|| return 1
         install -m755 -D "$srcdir"/unbound.initd \
                 "$pkgdir"/etc/init.d/unbound || return 1
-	install -d -o unbound -g unbound "$pkgdir"/var/run/unbound
+	install -d -o unbound -g unbound "$pkgdir"/var/run/unbound || return 1
+	install -m644 "$srcdir"/root.hints "$pkgdir"/etc/unbound/ || return 1
+	install -Dm755 "$srcdir"/update-unbound-root-hints \
+		"$pkgdir"/etc/periodic/monthly/update-unbound-root-hints \
+		|| return 1
 }
 
 libs() {
@@ -76,6 +82,8 @@ py() {
 	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
 }
 
-md5sums="7e3b27dee2b97640dd2e1783253317ab  unbound-1.4.13.tar.gz
-a6d84d596e40da79fcd52529b7fb5046  unbound-1.4.12-gentoo.patch
+md5sums="cd69fdaaa6af01ea0b6fbc59802f74ba  unbound-1.4.14.tar.gz
+32fe2914a2723142d3eae9ea556872d3  conf.patch
+c1c71cd0e7f9630536a2abf2513c675d  update-unbound-root-hints
+d7a1cb305b7b5b72df4e574777f76723  root.hints
 ebf2b5f8e1be2c4dbec9c5fad1e0e0de  unbound.initd"
diff --git a/main/unbound/unbound-1.4.12-gentoo.patch b/main/unbound/conf.patch
index 579206897..69e5be7e0 100644
--- a/main/unbound/unbound-1.4.12-gentoo.patch
+++ b/main/unbound/conf.patch
@@ -1,7 +1,14 @@
-diff -Naur unbound-1.4.12.orig/doc/example.conf.in unbound-1.4.12/doc/example.conf.in
---- unbound-1.4.12.orig/doc/example.conf.in	2011-07-14 17:33:37.000000000 +0900
-+++ unbound-1.4.12/doc/example.conf.in	2011-07-16 10:01:06.644402341 +0900
-@@ -334,7 +334,7 @@
+--- ./doc/example.conf.in.orig
++++ ./doc/example.conf.in
+@@ -226,6 +226,7 @@
+ 	# file to read root hints from.
+ 	# get one from ftp://FTP.INTERNIC.NET/domain/named.cache
+ 	# root-hints: ""
++	root-hints: /etc/unbound/root.hints
+ 
+ 	# enable to not answer id.server and hostname.bind queries.
+ 	# hide-identity: no
+@@ -338,7 +339,7 @@
  	# with several entries, one file per entry.
  	# Zone file format, with DS and DNSKEY entries.
  	# Note this gets out of date, use auto-trust-anchor-file please.
diff --git a/main/unbound/root.hints b/main/unbound/root.hints
new file mode 100644
index 000000000..8fbbb656b
--- /dev/null
+++ b/main/unbound/root.hints
@@ -0,0 +1,88 @@
+;       This file holds the information on root name servers needed to
+;       initialize cache of Internet domain name servers
+;       (e.g. reference this file in the "cache  .  <file>"
+;       configuration file of BIND domain name servers).
+;
+;       This file is made available by InterNIC 
+;       under anonymous FTP as
+;           file                /domain/named.cache
+;           on server           FTP.INTERNIC.NET
+;       -OR-                    RS.INTERNIC.NET
+;
+;       last update:    Jun 8, 2011
+;       related version of root zone:   2011060800
+;
+; formerly NS.INTERNIC.NET
+;
+.                        3600000  IN  NS    A.ROOT-SERVERS.NET.
+A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
+A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:BA3E::2:30
+;
+; FORMERLY NS1.ISI.EDU
+;
+.                        3600000      NS    B.ROOT-SERVERS.NET.
+B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
+;
+; FORMERLY C.PSI.NET
+;
+.                        3600000      NS    C.ROOT-SERVERS.NET.
+C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
+;
+; FORMERLY TERP.UMD.EDU
+;
+.                        3600000      NS    D.ROOT-SERVERS.NET.
+D.ROOT-SERVERS.NET.      3600000      A     128.8.10.90
+D.ROOT-SERVERS.NET.	 3600000      AAAA  2001:500:2D::D
+;
+; FORMERLY NS.NASA.GOV
+;
+.                        3600000      NS    E.ROOT-SERVERS.NET.
+E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
+;
+; FORMERLY NS.ISC.ORG
+;
+.                        3600000      NS    F.ROOT-SERVERS.NET.
+F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
+F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2F::F
+;
+; FORMERLY NS.NIC.DDN.MIL
+;
+.                        3600000      NS    G.ROOT-SERVERS.NET.
+G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
+;
+; FORMERLY AOS.ARL.ARMY.MIL
+;
+.                        3600000      NS    H.ROOT-SERVERS.NET.
+H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
+H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803F:235
+;
+; FORMERLY NIC.NORDU.NET
+;
+.                        3600000      NS    I.ROOT-SERVERS.NET.
+I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
+I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FE::53
+;
+; OPERATED BY VERISIGN, INC.
+;
+.                        3600000      NS    J.ROOT-SERVERS.NET.
+J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
+J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:C27::2:30
+;
+; OPERATED BY RIPE NCC
+;
+.                        3600000      NS    K.ROOT-SERVERS.NET.
+K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
+K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FD::1
+;
+; OPERATED BY ICANN
+;
+.                        3600000      NS    L.ROOT-SERVERS.NET.
+L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
+L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
+;
+; OPERATED BY WIDE
+;
+.                        3600000      NS    M.ROOT-SERVERS.NET.
+M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
+M.ROOT-SERVERS.NET.      3600000      AAAA  2001:DC3::35
+; End of File
diff --git a/main/unbound/update-unbound-root-hints b/main/unbound/update-unbound-root-hints
new file mode 100644
index 000000000..ee127ded3
--- /dev/null
+++ b/main/unbound/update-unbound-root-hints
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+check_format() {
+	# check that we have some ipv4 addresses and some '.' hints
+	egrep -q '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]' "$1" \
+		&& egrep -q '^\.[[:space:]]+' "$1"
+}
+
+ftphosts="FTP.INTERNIC.NET RS.INTERNIC.NET"
+roothints=domain/named.cache
+unbound_dir=/etc/unbound
+outfile=$unbound_dir/root.hints
+
+if [ "$1" = "--verify" ]; then
+	if check_format $outfile; then
+		echo "$outfile: ok"
+		exit 0
+	else
+		echo "$outfile: failed"
+		exit 1
+	fi
+fi
+
+for host in $ftphosts; do
+	url=ftp://$host/$roothints
+	if wget -q -O ${outfile}.new $url && check_format ${outfile}.new; then
+		mv ${outfile}.new $outfile && exit 0
+	fi
+done
+exit 1
diff --git a/main/unrar/APKBUILD b/main/unrar/APKBUILD
index d3bf22049..9a2b38851 100644
--- a/main/unrar/APKBUILD
+++ b/main/unrar/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=unrar
-pkgver=4.1.2
+pkgver=4.1.3
 pkgrel=0
 pkgdesc="The RAR uncompression program"
 url="http://www.rarlab.com"
@@ -24,4 +24,4 @@ package() {
 
 }
 
-md5sums="bd6761e8be6281b945db8e15564e412c  unrarsrc-4.1.2.tar.gz"
+md5sums="0cc7562737e7440f4fe611bdd5b56628  unrarsrc-4.1.3.tar.gz"
diff --git a/main/upower/APKBUILD b/main/upower/APKBUILD
index 97e1894d0..3e187509b 100644
--- a/main/upower/APKBUILD
+++ b/main/upower/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=upower
-pkgver=0.9.14
+pkgver=0.9.15
 pkgrel=0
 pkgdesc="Power Management Services"
 url="http://upower.freedesktop.org"
@@ -29,4 +29,4 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="18803f82102d56aac90949d1e4251645  upower-0.9.14.tar.xz"
+md5sums="9503a853e894630e023ee244d295fd27  upower-0.9.15.tar.xz"
diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD
index e4cfe4367..e1dbeec16 100644
--- a/main/util-vserver/APKBUILD
+++ b/main/util-vserver/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=util-vserver
 pkgver=0.30.216_pre2994
 _realver=${pkgver%_*}-${pkgver#*_}
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux-VServer admin utilities"
 url="http://www.nongnu.org/util-vserver/"
 arch="all"
@@ -18,6 +18,7 @@ source="http://people.linux-vserver.org/~dhozac/t/uv-testing/util-vserver-$_real
 	validate.patch
 	alpine.patch
 	bb-grep.patch
+	init-script.patch
 	setup-vs-template
 	setup-vs-guest
 	"
@@ -75,5 +76,6 @@ ff8f561f672524eb46fe633f584ef60e  ensc_pathprog.patch
 da8b70c4fd40e68894b3903ffd121397  validate.patch
 04000261fd990a3963b0e98260b481bd  alpine.patch
 3fc52e20d998f02995f21912738f5d36  bb-grep.patch
+6e574535409b3ab0361023f1a7f082eb  init-script.patch
 fae6626b724dec90a19924d68d355cd2  setup-vs-template
 ef35e154d1a221631a53f9c2cfbe9834  setup-vs-guest"
diff --git a/main/util-vserver/init-script.patch b/main/util-vserver/init-script.patch
new file mode 100644
index 000000000..2bfd40a9a
--- /dev/null
+++ b/main/util-vserver/init-script.patch
@@ -0,0 +1,11 @@
+--- util-vserver-0.30.216-pre2994.orig/gentoo/util-vserver
++++ util-vserver-0.30.216-pre2994/gentoo/util-vserver
+@@ -58,7 +58,7 @@
+ 	$__PKGLIBDIR/bash-wrapper 'hasCgroup'
+ 	if [ $? -eq 0 ]; then
+ 		ebegin "Mounting cgroup-hierarchy"
+-		$__PKGLIBDIR/bash-wrapper '_generateCgroupOptions; test -n "$CGROUP_MNT" || exit 0; $_MKDIR -p "$CGROUP_MNT"; $_MOUNT -t cgroup -o "$CGROUP_SUBSYS" vserver "$CGROUP_MNT"'
++		$__PKGLIBDIR/bash-wrapper '_generateCgroupOptions; test -n "$CGROUP_MNT" || exit 0; $_MKDIR -p "$CGROUP_MNT"; IFS=","; $_MOUNT -t cgroup -o "${CGROUP_SUBSYS[*]}" vserver "$CGROUP_MNT"'
+ 		eend $?
+ 	fi
+ }
diff --git a/main/v4l-utils/APKBUILD b/main/v4l-utils/APKBUILD
index 62ef1acb3..67db16a7f 100644
--- a/main/v4l-utils/APKBUILD
+++ b/main/v4l-utils/APKBUILD
@@ -2,31 +2,27 @@
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=v4l-utils
 pkgver=0.8.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 url="http://freshmeat.net/projects/libv4l"
 arch="all"
 license="LGPL"
 depends=""
-makedepends="qt-dev jpeg-dev"
+makedepends="qt-dev jpeg-dev argp-standalone"
 install=""
 subpackages="$pkgname-dev qv4l2"
 source="http://linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2
 	qv4l2.svg
-	qv4l2.desktop"
-
+	qv4l2.desktop
+	"
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
         cd "$_builddir"
         sed -i 's|CFLAGS :=|CFLAGS ?=|' Make.rules
-	# TODO: make a proper patch insted of this hugly hack
-	# uclibc does not have argp.h
-	# http://www.spinics.net/lists/linux-media/msg28619.html
-	rm -rf utils/decode_tm6000 utils/keytable
-	sed -i 's/decode_tm6000 //g' utils/Makefile
-	sed -i 's/keytable //g' utils/Makefile
-	sed -i 's/v4l2-sysfs-path //g' utils/Makefile
+	sed -ie 's/\$\^/$\^\ -largp/' utils/decode_tm6000/Makefile
+	sed -ie 's/\$\^/$\^\ -largp/' utils/keytable/Makefile
+	sed -ie 's/\$\^/$\^\ -largp/' utils/v4l2-sysfs-path/Makefile
 }
 
 build() {
diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD
index 1f1ec11a7..f1895dbe4 100644
--- a/main/valgrind/APKBUILD
+++ b/main/valgrind/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=valgrind
-pkgver=3.6.1
-pkgrel=1
+pkgver=3.7.0
+pkgrel=2
 pkgdesc="A tool to help find memory-management problems in programs"
 url="http://valgrind.org/"
 arch="all"
@@ -17,6 +17,7 @@ makedepends="sed paxctl pax-utils perl bash"
 options="!strip"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://$pkgname.org/downloads/$pkgname-$pkgver.tar.bz2
+	uclibc.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -34,6 +35,7 @@ build() {
 	cd "$_builddir"
 	# fails to build with ccache
 	export CC="gcc"
+	export CFLAGS="$CFLAGS -fno-stack-protector -fno-pie"
 	./configure --prefix=/usr \
 		 --without-mpicc \
 		--mandir=/usr/share/man || return 1
@@ -59,4 +61,5 @@ package() {
 	fi
 }
 
-md5sums="2c3aa122498baecc9d69194057ca88f5  valgrind-3.6.1.tar.bz2"
+md5sums="a855fda56edf05614f099dca316d1775  valgrind-3.7.0.tar.bz2
+c29b4572a070eb0d3a6a977be586c771  uclibc.patch"
diff --git a/main/valgrind/uclibc.patch b/main/valgrind/uclibc.patch
new file mode 100644
index 000000000..69281ab2c
--- /dev/null
+++ b/main/valgrind/uclibc.patch
@@ -0,0 +1,10 @@
+--- ./coregrind/vg_preloaded.c.orig
++++ ./coregrind/vg_preloaded.c
+@@ -42,6 +42,7 @@
+    originates from Valgrind.
+    ------------------------------------------------------------------ */
+ 
++#include <features.h>
+ #include "pub_core_basics.h"
+ #include "pub_core_clreq.h"
+ #include "pub_core_debuginfo.h"  // Needed for pub_core_redir.h
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index 733c160c5..011ec8899 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vim
-pkgver=7.3.333
+pkgver=7.3.364
 _srcver=${pkgver%.*}
 _patchver=${pkgver##*.}
 pkgrel=0
@@ -396,4 +396,35 @@ ed256a9ad43fc919ec816c8f79f28f5c  7.3.328
 b4c9c95eee16d19d2b9713bc1b60f696  7.3.330
 bb075b263860ed1b80b5bcbe5a57d423  7.3.331
 d7832ef5a54508dacc105e287874a00b  7.3.332
-accb06d73f1463893da2afb501f466fa  7.3.333"
+accb06d73f1463893da2afb501f466fa  7.3.333
+bdf932190d677b98362dae52cf6eadb1  7.3.334
+26766ba9ea0ab84233e2b29332f796fa  7.3.335
+1b57987b24935017dfdf6b2bb5b68373  7.3.336
+24691aeaec5277d0afb4106b40ae267e  7.3.337
+54ff1e2fea2a16965959a9f42b8b5fc9  7.3.338
+620d15666807ab219620954ea6fdca1f  7.3.339
+c3ab5f6227530ab9ca6af494cbf77fea  7.3.340
+8326d6b339724dfe5fc99fadc7c57bf0  7.3.341
+362087e621fe59f13f2ef1ef1cb74e50  7.3.342
+869bd67eb3f1e62fd9f5097fea9472d4  7.3.343
+e3d9a945f29f7ceba3e0330e2e510344  7.3.344
+22ed2d9938820b2c99129d8724849304  7.3.345
+ba18fbdc38d774c05ac02bb413f0bb3d  7.3.346
+07e51c946abcdf904cf6856548fa7145  7.3.347
+3b75c5e11e5ef2a62fd0b02e35b71ad8  7.3.348
+fd58c8ce31e087d9a81301addf816767  7.3.349
+8c8025ab73b595e112f8d32d9ac5ef3d  7.3.350
+4d1587f7394e609c5cfb3d3e506b4abe  7.3.351
+fb4251e16f07b76c2bc51b62aaa58735  7.3.352
+f7c88e37014346eeeaeb952b15100b2e  7.3.353
+5208450dac9cd0de8778a236fa72eb08  7.3.354
+d3f5578199874f3234395c33a1eb5461  7.3.355
+6050fae12e337fea78d14e54b4ba3370  7.3.356
+67c7d610d9d58f4c2105eb05dc1522cb  7.3.357
+455fbdbc0a1fefbf94614c829b544511  7.3.358
+1de4c717ec20d7ecded0f84c57cae132  7.3.359
+350dec5064be57bf8928d667a4d40fad  7.3.360
+6f13d2d8f231de47e7ba61072ccea891  7.3.361
+a471ecbbf370fc02b66fc1584c471691  7.3.362
+33fd36b5070c8b35f6cd9e7f22ea23a7  7.3.363
+14f3ec8d4b379eaf47ed1db484d978f7  7.3.364"
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 9c3615882..962cf725d 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vlc
-pkgver=1.1.12
-pkgrel=1
+pkgver=1.1.13
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 pkgusers="vlc"
 pkggroups="vlc"
@@ -11,16 +11,17 @@ arch="all"
 license="GPL-2"
 triggers="$pkgname.trigger=/usr/lib/vlc/plugins"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-xorg $pkgname-daemon"
-#depends="libnotify a52dec fluidsynth zvbi libdvbpsi lirc-utils libdca hal 
-#	libproxy sdl_image libdvdnav>=4.1.3 lua libxv libv4l libcddb smbclient
-#	libmatroska taglib sysfsutils libmpcdec ffmpeg>=0.5 libshout libmad
-#	qt fribidi libmpeg2 libmodplug avahi ttf-dejavu"
+#depends="fluidsynth zvbi lirc-utils libdca 
+#	libproxy libdvdnav>=4.1.3 libcddb smbclient
+#	libmatroska libmpcdec
+#	qt libmodplug ttf-dejavu"
 depends="ttf-dejavu"
 makedepends="
 	a52dec-dev
 	alsa-lib-dev
 	automake
 	autoconf
+	avahi-dev
 	libtool
 	dbus-dev
 	faad2-dev
@@ -183,9 +184,9 @@ daemon() {
 	install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc
 }
 
-md5sums="91de1ad308c947e35380f9d747ff5713  vlc-1.1.12.tar.bz2
+md5sums="9678fb7a04808b6e0de63746d35e4bb1  vlc-1.1.13.tar.bz2
 ba24152286d98f8a367c7fd0cb8949f4  uclibc3.patch
 402d28075ff672d4f273cf8b9b1b3137  uclibc-libcompat.patch
-c40a7df07af3b68a109b4d6bf04155d2  uclibc-inhibit-spawn.patch
+28349b8239fdd6987fbe0ca2c758517f  uclibc-inhibit-spawn.patch
 ddbd40bd72fedc1449be45588aea5d66  vlc.trigger
 e1ef2dec8e25f7ea6ba40e646c63e061  vlc-1.1.7-disable-cache-gen.patch"
diff --git a/main/vlc/uclibc-inhibit-spawn.patch b/main/vlc/uclibc-inhibit-spawn.patch
index 75cff1bb6..c34ebe0f7 100644
--- a/main/vlc/uclibc-inhibit-spawn.patch
+++ b/main/vlc/uclibc-inhibit-spawn.patch
@@ -1,11 +1,11 @@
 diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c
-index cfb3b2a..16a2ce9 100644
+index 3f297c6..e16a21e 100644
 --- a/modules/misc/inhibit/xdg.c
 +++ b/modules/misc/inhibit/xdg.c
-@@ -26,7 +26,11 @@
- #include <vlc_plugin.h>
+@@ -27,7 +27,11 @@
  #include <vlc_inhibit.h>
  #include <assert.h>
+ #include <signal.h>
 -#include <spawn.h>
 +#if !defined(_POSIX_SPAWN)
 +# define _POSIX_SPAWN -1
@@ -15,7 +15,7 @@ index cfb3b2a..16a2ce9 100644
  #include <sys/wait.h>
  
  static int Open (vlc_object_t *);
-@@ -46,7 +50,9 @@ struct vlc_inhibit_sys
+@@ -47,7 +51,9 @@ struct vlc_inhibit_sys
      vlc_thread_t thread;
      vlc_cond_t update, inactive;
      vlc_mutex_t lock;
@@ -25,13 +25,11 @@ index cfb3b2a..16a2ce9 100644
      bool suspend, suspended;
  };
  
-@@ -66,17 +72,21 @@ static int Open (vlc_object_t *obj)
+@@ -67,17 +73,19 @@ static int Open (vlc_object_t *obj)
      vlc_mutex_init (&p_sys->lock);
      vlc_cond_init (&p_sys->update);
      vlc_cond_init (&p_sys->inactive);
-+#if (_POSIX_SPAWN >= 0)
-     posix_spawnattr_init (&p_sys->attr);
-+#endif
+-    posix_spawnattr_init (&p_sys->attr);
      /* Reset signal handlers to default and clear mask in the child process */
      {
          sigset_t set;
@@ -40,6 +38,7 @@ index cfb3b2a..16a2ce9 100644
 -        posix_spawnattr_setsigmask (&p_sys->attr, &set);
          sigaddset (&set, SIGPIPE);
 +#if (_POSIX_SPAWN >= 0)
++        posix_spawnattr_init (&p_sys->attr);
 +        posix_spawnattr_setsigmask (&p_sys->attr, &set);
          posix_spawnattr_setsigdefault (&p_sys->attr, &set);
          posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF
@@ -48,7 +47,7 @@ index cfb3b2a..16a2ce9 100644
      }
      p_sys->suspend = false;
      p_sys->suspended = false;
-@@ -105,7 +115,9 @@ static void Close (vlc_object_t *obj)
+@@ -106,7 +114,9 @@ static void Close (vlc_object_t *obj)
  
      vlc_cancel (p_sys->thread);
      vlc_join (p_sys->thread, NULL);
@@ -58,7 +57,7 @@ index cfb3b2a..16a2ce9 100644
      vlc_cond_destroy (&p_sys->inactive);
      vlc_cond_destroy (&p_sys->update);
      vlc_mutex_destroy (&p_sys->lock);
-@@ -152,8 +164,16 @@ static void *Thread (void *data)
+@@ -153,8 +163,16 @@ static void *Thread (void *data)
          pid_t pid;
  
          vlc_mutex_unlock (&p_sys->lock);
diff --git a/main/vlc/vlc-daemon.pre-install b/main/vlc/vlc-daemon.pre-install
index 45f66bff6..72ee1b7ff 100644
--- a/main/vlc/vlc-daemon.pre-install
+++ b/main/vlc/vlc-daemon.pre-install
@@ -1,5 +1,13 @@
 #!/bin/sh
 
-addgroup -S vlc 2>/dev/null
-adduser -S -h /home/vlc -s /bin/sh -G vlc -G audio -G video -D vlc &>/dev/null
+groups="vlc audio video"
+for group in $groups; do
+	addgroup -S $group 2>/dev/null
+done
+adduser -S -h /home/vlc -s /bin/sh -G vlc -D vlc 2>/dev/null
+
+# make sure vlc are in all groups
+for group in $groups; do
+	addgroup vlc $group 2>/dev/null
+done
 exit 0
diff --git a/main/vlc/vlc.initd b/main/vlc/vlc.initd
index 361615860..11567dcd8 100755
--- a/main/vlc/vlc.initd
+++ b/main/vlc/vlc.initd
@@ -6,15 +6,17 @@ depend() {
 
 start() {
 	ebegin "Starting VLC"
-	start-stop-daemon --start --oknodo \
-		--pidfile /var/run/vlc.pid --user vlc \
+	start-stop-daemon --start \
+		--user vlc \
 		--exec /usr/bin/vlc -- ${VLC_OPTS}
 	eend $?
 }
 
 stop () {
 	ebegin "Stopping VLC"
-	start-stop-daemon --stop --oknodo --exec /usr/bin/vlc
+	start-stop-daemon --stop \
+		--signal KILL \
+		--exec /usr/bin/vlc
 	eend $?
 }
 
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index 4590bf0cd..0f64c8c18 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wine
-pkgver=1.3.32
+pkgver=1.3.35
 pkgrel=0
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
@@ -46,4 +46,4 @@ package() {
 		"$pkgdir"/usr/bin/wine
 }
 
-md5sums="2f8655434711b0ef11247f1bf7c28d13  wine-1.3.32.tar.bz2"
+md5sums="5833787fcd7fee5a2299fade10a2760d  wine-1.3.35.tar.bz2"
diff --git a/main/wine_gecko/APKBUILD b/main/wine_gecko/APKBUILD
new file mode 100644
index 000000000..be9aa1ecf
--- /dev/null
+++ b/main/wine_gecko/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=wine_gecko
+pkgver=1.4
+pkgrel=0
+pkgdesc="Wine's built-in replacement for Microsoft's Internet Explorer"
+url="http://wiki.winehq.org/Gecko"
+arch="x86"
+license="MPL"
+depends=""
+makedepends=""
+install=""
+subpackages=""
+source="http://downloads.sourceforge.net/wine/wine_gecko-$pkgver-$CARCH.msi"
+
+_builddir=
+prepare() {
+	mkdir -p "$srcdir"
+}
+
+build() {
+	return 0
+}
+
+package() {
+	mkdir -p "$pkgdir"/usr/share/wine/gecko/
+	cp "$srcdir"/wine_gecko-$pkgver-$CARCH.msi \
+		"$pkgdir"/usr/share/wine/gecko/
+}
+
+md5sums="700aaa08724be1992cffed7b87e79a44  wine_gecko-1.4-x86.msi"
diff --git a/main/x264/APKBUILD b/main/x264/APKBUILD
index 751e8b069..4020c8f38 100644
--- a/main/x264/APKBUILD
+++ b/main/x264/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=x264
-pkgver=20111001
+pkgver=20111129
 pkgrel=0
 pkgdesc="free library for encoding H264/AVC video streams"
 url="http://www.videolan.org/developers/x264.html"
@@ -25,4 +25,4 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install || return 1
 }
-md5sums="78a5a6fea4cafac6d9863b19bffc119f  x264-snapshot-20111001-2245-stable.tar.bz2"
+md5sums="7feed501de65e103e926fd64a0bba117  x264-snapshot-20111129-2245-stable.tar.bz2"
diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD
index a839df8e1..484b1a903 100644
--- a/main/xf86-video-intel/APKBUILD
+++ b/main/xf86-video-intel/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-intel
-pkgver=2.16.0
-pkgrel=2
+pkgver=2.17.0
+pkgrel=0
 pkgdesc="X.Org driver for Intel cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -29,4 +29,4 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="e0406c50a747c358654b93cb23bf7375  xf86-video-intel-2.16.0.tar.bz2"
+md5sums="6d7b1f199dba5820f250888b136186ff  xf86-video-intel-2.17.0.tar.bz2"
diff --git a/main/xfce4-screenshooter/APKBUILD b/main/xfce4-screenshooter/APKBUILD
index d43ff1732..d75aaaf9d 100644
--- a/main/xfce4-screenshooter/APKBUILD
+++ b/main/xfce4-screenshooter/APKBUILD
@@ -1,21 +1,32 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-screenshooter
 pkgver=1.8.0
-pkgrel=0
+pkgrel=1
 pkgdesc="screenshot application for Xfce4"
 url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
 arch="all"
 license="GPL2"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-lang"
 depends=
 makedepends="xfce4-panel-dev hicolor-icon-theme libsoup-dev libxfce4ui-dev
 	exo-dev libxext-dev"
-install="xfce4-screenshooter.post-install xfce4-screenshooter.post-upgrade
-	xfce4-screenshooter.post-deinstall"
-source="http://archive.xfce.org/src/apps/xfce4-screenshooter/${pkgver%.*}/xfce4-screenshooter-$pkgver.tar.bz2"
+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
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
 
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
@@ -25,8 +36,10 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="b51ab5725418e7258273c4a6402adb02  xfce4-screenshooter-1.8.0.tar.bz2"
+md5sums="b51ab5725418e7258273c4a6402adb02  xfce4-screenshooter-1.8.0.tar.bz2
+18042622c40c37a13da958aee216cafb  fs-25873-segfault-in-awesome-wm.patch
+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
new file mode 100644
index 000000000..47e067144
--- /dev/null
+++ b/main/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch
@@ -0,0 +1,21 @@
+--- 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-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch b/main/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch
new file mode 100644
index 000000000..c383b2e52
--- /dev/null
+++ b/main/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch
@@ -0,0 +1,13 @@
+Upstream: https://bugzilla.xfce.org/show_bug.cgi?id=7985
+
+--- xfce4-screenshooter-1.7.9.orig/Makefile.in	2010-02-07 14:45:15.000000000 +0100
++++ xfce4-screenshooter-1.7.9/Makefile.in	2010-02-16 23:57:31.000000000 +0100
+@@ -282,7 +282,7 @@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lm -lX11
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.install b/main/xfce4-screenshooter/xfce4-screenshooter.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/main/xfce4-screenshooter/xfce4-screenshooter.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.post-deinstall b/main/xfce4-screenshooter/xfce4-screenshooter.post-deinstall
deleted file mode 120000
index 735306e31..000000000
--- a/main/xfce4-screenshooter/xfce4-screenshooter.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-screenshooter.post-install
-\ No newline at end of file
diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.post-install b/main/xfce4-screenshooter/xfce4-screenshooter.post-install
deleted file mode 100644
index c523d78da..000000000
--- a/main/xfce4-screenshooter/xfce4-screenshooter.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.post-upgrade b/main/xfce4-screenshooter/xfce4-screenshooter.post-upgrade
deleted file mode 120000
index 735306e31..000000000
--- a/main/xfce4-screenshooter/xfce4-screenshooter.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-screenshooter.post-install
-\ No newline at end of file
diff --git a/main/xfconf/APKBUILD b/main/xfconf/APKBUILD
index e615a7477..68028173b 100644
--- a/main/xfconf/APKBUILD
+++ b/main/xfconf/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfconf
-pkgver=4.8.0
-pkgrel=1
+pkgver=4.8.1
+pkgrel=0
 pkgdesc="Hierarchical configuration system for Xfce"
 url="http://www.xfce.org/"
 arch="all"
 license="GPL-2"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends=
 makedepends="dbus-glib-dev libxfce4util-dev gettext-dev libiconv-dev
 	intltool"
@@ -30,4 +30,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
-md5sums="0f11ed1ec7789c5c4c3fcc7cdb3c2940  xfconf-4.8.0.tar.bz2"
+md5sums="70b4185aa7eed8a85f015f16c5c86d36  xfconf-4.8.1.tar.bz2"
diff --git a/main/xfwm4/APKBUILD b/main/xfwm4/APKBUILD
index 257f59904..6f7f1f018 100644
--- a/main/xfwm4/APKBUILD
+++ b/main/xfwm4/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfwm4
-pkgver=4.8.2
-pkgrel=1
+pkgver=4.8.3
+pkgrel=0
 pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3"
 url="http://www.xfce.org/"
 arch="all"
@@ -29,4 +29,4 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="41b730d5abf39a69fc3b221728ddaa75  xfwm4-4.8.2.tar.bz2"
+md5sums="66cb65797cea8a62563f69b833c7888b  xfwm4-4.8.3.tar.bz2"
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index 407608b30..74fe79bd2 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
-pkgver=1.11.2
+pkgver=1.11.3
 pkgrel=0
 pkgdesc="X.Org X servers"
 url="http://xorg.freedesktop.org"
@@ -149,5 +149,5 @@ xephyr() {
 	mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/
 }
 
-md5sums="8796fff441e5435ee36a72579008af24  xorg-server-1.11.2.tar.bz2
+md5sums="a7194c437963627e1db0dd2d6c1a1984  xorg-server-1.11.3.tar.bz2
 222de594206d1148a90eddfda4f7a11a  xorg-redhat-die-ugly-pattern-die-die-die.patch"
diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD
index 20738ab03..a03e80b27 100644
--- a/main/xtables-addons-grsec/APKBUILD
+++ b/main/xtables-addons-grsec/APKBUILD
@@ -3,7 +3,7 @@ _flavor=${FLAVOR:-grsec}
 _realname=xtables-addons
 _name=$_realname-$_flavor
 
-_kver=3.0.10
+_kver=3.0.14
 _kpkgrel=0
 
 # source the kernel version
diff --git a/main/xulrunner/0001-Use-C99-math-isfinite.patch b/main/xulrunner/0001-Use-C99-math-isfinite.patch
deleted file mode 100644
index b9ead9117..000000000
--- a/main/xulrunner/0001-Use-C99-math-isfinite.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f7c52ff6334ce158da23750e63655df41e73fc31 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 15 Aug 2011 07:57:16 +0000
-Subject: [PATCH] Use C99 math isfinite
-
----
- content/base/public/nsContentUtils.h |    2 +-
- js/src/ctypes/CTypes.cpp             |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
-index a69d4ef..b4d8e67 100644
---- a/content/base/public/nsContentUtils.h
-+++ b/content/base/public/nsContentUtils.h
-@@ -1994,7 +1994,7 @@ inline NS_HIDDEN_(PRBool) NS_FloatIsFinite(jsdouble f) {
- #ifdef WIN32
-   return _finite(f);
- #else
--  return finite(f);
-+  return isfinite(f);
- #endif
- }
- 
-diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
-index 0644817..5dbb906 100644
---- a/js/src/ctypes/CTypes.cpp
-+++ b/js/src/ctypes/CTypes.cpp
-@@ -467,7 +467,7 @@ static inline bool FloatIsFinite(jsdouble f) {
- #ifdef WIN32
-   return _finite(f) != 0;
- #else
--  return finite(f);
-+  return isfinite(f);
- #endif
- }
- 
--- 
-1.7.6
-
diff --git a/main/xulrunner/0001-mozilla-pkgconfig.patch.patch b/main/xulrunner/0001-mozilla-pkgconfig.patch.patch
new file mode 100644
index 000000000..b8beae40f
--- /dev/null
+++ b/main/xulrunner/0001-mozilla-pkgconfig.patch.patch
@@ -0,0 +1,83 @@
+From f00f666955c2e4053e0cff90f787dc5b980bcb18 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 25 Nov 2011 08:23:35 +0000
+Subject: [PATCH 1/4] mozilla-pkgconfig.patch
+
+---
+ xulrunner/installer/Makefile.in                    |    1 +
+ xulrunner/installer/libxul-embedding.pc.in         |    1 +
+ xulrunner/installer/libxul.pc.in                   |    1 +
+ .../installer/mozilla-gtkmozembed-embedding.pc.in  |    1 +
+ xulrunner/installer/mozilla-gtkmozembed.pc.in      |    1 +
+ xulrunner/installer/mozilla-js.pc.in               |    2 +-
+ 6 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
+index 35febf9..38d854d 100644
+--- a/xulrunner/installer/Makefile.in
++++ b/xulrunner/installer/Makefile.in
+@@ -110,6 +110,7 @@ endif
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%sdkdir%|$(sdkdir)|" \
++	-e "s|%libdir%|$(installdir)|" \
+ 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
+diff --git a/xulrunner/installer/libxul-embedding.pc.in b/xulrunner/installer/libxul-embedding.pc.in
+index 100e0a7..97b7cb4 100644
+--- a/xulrunner/installer/libxul-embedding.pc.in
++++ b/xulrunner/installer/libxul-embedding.pc.in
+@@ -6,5 +6,6 @@ idldir=%idldir%
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue -ldl
+ Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
+diff --git a/xulrunner/installer/libxul.pc.in b/xulrunner/installer/libxul.pc.in
+index ccce9aa..92e8502 100644
+--- a/xulrunner/installer/libxul.pc.in
++++ b/xulrunner/installer/libxul.pc.in
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+ idldir=%idldir%
+ 
+diff --git a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+index 03bd646..4d2b62d 100644
+--- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
++++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+ 
+ Name: mozilla-gtkembedmoz
+diff --git a/xulrunner/installer/mozilla-gtkmozembed.pc.in b/xulrunner/installer/mozilla-gtkmozembed.pc.in
+index a25c05e..cd0d600 100644
+--- a/xulrunner/installer/mozilla-gtkmozembed.pc.in
++++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+ 
+ Name: mozilla-gtkembedmoz
+diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in
+index c1428f1..a528ef1 100644
+--- a/xulrunner/installer/mozilla-js.pc.in
++++ b/xulrunner/installer/mozilla-js.pc.in
+@@ -7,4 +7,4 @@ Description: The Mozilla JavaScript Library
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
+-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
+-- 
+1.7.7.4
+
diff --git a/main/xulrunner/0002-Use-C99-math-isfinite.patch b/main/xulrunner/0002-Use-C99-math-isfinite.patch
new file mode 100644
index 000000000..3d85a6928
--- /dev/null
+++ b/main/xulrunner/0002-Use-C99-math-isfinite.patch
@@ -0,0 +1,43 @@
+From cdb9db4c1c593dbe22db4f389a62fce034f31f2d Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 25 Nov 2011 08:30:51 +0000
+Subject: [PATCH 2/4] Use C99 math isfinite
+
+---
+ js/src/ctypes/CTypes.cpp |    2 +-
+ xpcom/ds/nsMathUtils.h   |    6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
+index 5c0f886..a3b1ae6 100644
+--- a/js/src/ctypes/CTypes.cpp
++++ b/js/src/ctypes/CTypes.cpp
+@@ -467,7 +467,7 @@ static inline bool FloatIsFinite(jsdouble f) {
+ #ifdef WIN32
+   return _finite(f) != 0;
+ #else
+-  return finite(f);
++  return isfinite(f);
+ #endif
+ }
+ 
+diff --git a/xpcom/ds/nsMathUtils.h b/xpcom/ds/nsMathUtils.h
+index 21ffbec..2e80476 100644
+--- a/xpcom/ds/nsMathUtils.h
++++ b/xpcom/ds/nsMathUtils.h
+@@ -131,7 +131,11 @@ inline NS_HIDDEN_(bool) NS_finite(double d)
+     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
+     return !!_finite(d);
+ #else
+-    return finite(d);
++#ifdef _GLIBCXX_CMATH
++    return std::isfinite(d);
++#else
++    return isfinite(d);
++#endif
+ #endif
+ }
+ 
+-- 
+1.7.7.4
+
diff --git a/main/xulrunner/xulrunner-jemalloc-aslr.patch b/main/xulrunner/0003-xulrunner-jemalloc-aslr.patch
index 4a1579649..6784b13e7 100644
--- a/main/xulrunner/xulrunner-jemalloc-aslr.patch
+++ b/main/xulrunner/0003-xulrunner-jemalloc-aslr.patch
@@ -1,7 +1,17 @@
-diff -r 9259fdc3570c memory/jemalloc/jemalloc.c
---- a/memory/jemalloc/jemalloc.c	Wed Jan 27 16:20:05 2010 -0800
-+++ b/memory/jemalloc/jemalloc.c	Wed Jan 27 23:03:56 2010 -0600
-@@ -373,7 +373,7 @@
+From 88bb9f90ec1e4b43fb78596c8ff7577c92592eb4 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 25 Nov 2011 08:36:52 +0000
+Subject: [PATCH 3/4] xulrunner: jemalloc aslr
+
+---
+ memory/jemalloc/jemalloc.c |   33 ++++++++++++++++++++++-----------
+ 1 files changed, 22 insertions(+), 11 deletions(-)
+
+diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
+index ad7c450..91de92c 100644
+--- a/memory/jemalloc/jemalloc.c
++++ b/memory/jemalloc/jemalloc.c
+@@ -410,7 +410,7 @@ void *_mmap(void *addr, size_t length, int prot, int flags,
  static const bool __isthreaded = true;
  #endif
  
@@ -10,7 +20,7 @@ diff -r 9259fdc3570c memory/jemalloc/jemalloc.c
  #define JEMALLOC_USES_MAP_ALIGN	 /* Required on Solaris 10. Might improve performance elsewhere. */
  #endif
  
-@@ -2178,20 +2178,31 @@
+@@ -2181,20 +2181,31 @@ pages_map_align(size_t size, int pfd, size_t alignment)
  	 * We don't use MAP_FIXED here, because it can cause the *replacement*
  	 * of existing mappings, and we only want to create new mappings.
  	 */
@@ -52,3 +62,6 @@ diff -r 9259fdc3570c memory/jemalloc/jemalloc.c
  	return (ret);
  }
  #endif
+-- 
+1.7.7.4
+
diff --git a/main/xulrunner/0004-xulrunner-malloc_usable_size.patch b/main/xulrunner/0004-xulrunner-malloc_usable_size.patch
new file mode 100644
index 000000000..aae416c7d
--- /dev/null
+++ b/main/xulrunner/0004-xulrunner-malloc_usable_size.patch
@@ -0,0 +1,25 @@
+From a2a15c826a5e1743ba71288543b9e144603fba26 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 25 Nov 2011 08:40:53 +0000
+Subject: [PATCH 4/4] xulrunner: malloc_usable_size
+
+---
+ memory/mozalloc/mozalloc.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/memory/mozalloc/mozalloc.cpp b/memory/mozalloc/mozalloc.cpp
+index 58e5192..500c651 100644
+--- a/memory/mozalloc/mozalloc.cpp
++++ b/memory/mozalloc/mozalloc.cpp
+@@ -267,7 +267,7 @@ moz_malloc_usable_size(void *ptr)
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+ #elif defined(MOZ_MEMORY)
+-    return malloc_usable_size(ptr);
++    return 0;
+ #elif defined(XP_WIN)
+     return _msize(ptr);
+ #else
+-- 
+1.7.7.4
+
diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 1967187e5..24f95afa8 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xulrunner
-pkgver=7.0.1
-_ffoxver=7.0.1
-pkgrel=3
+pkgver=8.0.1
+_ffoxver=8.0.1
+pkgrel=1
 pkgdesc="runtime environment for xul-based applications"
 url="http://developer.mozilla.org/en/XULRunner"
 arch="all"
@@ -27,7 +27,6 @@ depends_dev="nspr-dev
 	     startup-notification-dev
 	     sqlite-dev
 	     libidl-dev
-	     fts-dev
 	     mesa-dev"
 makedepends="$depends_dev 
 
@@ -46,14 +45,10 @@ subpackages="$pkgname-dev"
 source="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2
 
 	mozconfig
-
-	mozilla-pkgconfig.patch
-
-	xulrunner-jemalloc-aslr.patch
-	xulrunner-mozalloc.patch
-
-	mozjs-c99math.patch
-	xpcom-c99math.patch
+	0001-mozilla-pkgconfig.patch.patch
+	0002-Use-C99-math-isfinite.patch
+	0003-xulrunner-jemalloc-aslr.patch
+	0004-xulrunner-malloc_usable_size.patch
 	"
 
 _builddir="${srcdir}/mozilla-release"
@@ -107,10 +102,9 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="5b212db48630ba93bb30ec63cca17f4d  firefox-7.0.1.source.tar.bz2
-cc43a2bd96bd2395aa72d0bbb88e5594  mozconfig
-02c23dc4ebd88e445533314716331818  mozilla-pkgconfig.patch
-30053b8b5811cc0676bfe7d7d7ffaa4a  xulrunner-jemalloc-aslr.patch
-d38ecbb7bb31032d3e1ced8939e26abd  xulrunner-mozalloc.patch
-abbef7f783ad5d99a9cdbf9e358fafcd  mozjs-c99math.patch
-68709c9aad5b7e46e63787fc648d7ae7  xpcom-c99math.patch"
+md5sums="b7d09b082e88a74860a51a8e04e29333  firefox-8.0.1.source.tar.bz2
+b0f7d491bc800b69ec718667a4b08acb  mozconfig
+731ec4084e57eb05e93000c971aad0d4  0001-mozilla-pkgconfig.patch.patch
+1867db217d10722675c88b655db8c2d7  0002-Use-C99-math-isfinite.patch
+7faa279d64c9ec2e7abc7c0497c7e07e  0003-xulrunner-jemalloc-aslr.patch
+7cf18be3ada3eed5856fbab24219126d  0004-xulrunner-malloc_usable_size.patch"
diff --git a/main/xulrunner/mozconfig b/main/xulrunner/mozconfig
index d0cf2c104..2cbb45b7a 100644
--- a/main/xulrunner/mozconfig
+++ b/main/xulrunner/mozconfig
@@ -30,7 +30,7 @@ ac_add_options --enable-extensions=default
 ac_add_options --enable-jemalloc
 ac_add_options --disable-elf-hack
 
-export LIBS="-lfts -lubacktrace"
+# export LIBS="-lubacktrace"
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 
diff --git a/main/xulrunner/mozilla-pkgconfig.patch b/main/xulrunner/mozilla-pkgconfig.patch
deleted file mode 100644
index 5c8bd0fd6..000000000
--- a/main/xulrunner/mozilla-pkgconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in
---- mozilla-1.9.2.orig/xulrunner/installer/libxul-embedding.pc.in	2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in	2010-01-21 22:27:17.000000000 +0200
-@@ -6,5 +6,6 @@
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
-+Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue -ldl
- Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in mozilla-1.9.2/xulrunner/installer/libxul.pc.in
---- mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in	2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/libxul.pc.in	2010-01-21 22:27:56.000000000 +0200
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- idldir=%idldir%
- 
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/Makefile.in mozilla-1.9.2/xulrunner/installer/Makefile.in
---- mozilla-1.9.2.orig/xulrunner/installer/Makefile.in	2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/Makefile.in	2010-01-21 22:25:04.000000000 +0200
-@@ -121,6 +121,7 @@
- 	-e "s|%includedir%|$(includedir)|" \
- 	-e "s|%idldir%|$(idldir)|" \
- 	-e "s|%sdkdir%|$(sdkdir)|" \
-+	-e "s|%libdir%|$(installdir)|" \
- 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2010-01-21 22:28:15.000000000 +0200
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- 
- Name: mozilla-gtkembedmoz
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in
---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in	2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in	2010-01-21 22:28:27.000000000 +0200
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- 
- Name: mozilla-gtkembedmoz
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-js.pc.in
---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in	2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/mozilla-js.pc.in	2010-01-21 22:29:30.000000000 +0200
-@@ -7,4 +7,4 @@
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
--Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
diff --git a/main/xulrunner/mozjs-c99math.patch b/main/xulrunner/mozjs-c99math.patch
deleted file mode 100644
index a4f81b62c..000000000
--- a/main/xulrunner/mozjs-c99math.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- mozilla-2.0.orig/js/src/ctypes/CTypes.cpp
-+++ mozilla-2.0/js/src/ctypes/CTypes.cpp
-@@ -464,7 +464,7 @@
- #ifdef WIN32
-   return _finite(f) != 0;
- #else
--  return finite(f);
-+  return isfinite(f);
- #endif
- }
- 
---- ./content/base/public/nsContentUtils.h.orig
-+++ ./content/base/public/nsContentUtils.h
-@@ -1994,7 +1994,11 @@
- #ifdef WIN32
-   return _finite(f);
- #else
--  return finite(f);
-+#ifdef _GLIBCXX_CMATH
-+  return std::isfinite(f);
-+#else
-+  return isfinite(f);
-+#endif
- #endif
- }
- 
diff --git a/main/xulrunner/xpcom-c99math.patch b/main/xulrunner/xpcom-c99math.patch
deleted file mode 100644
index 3222c7f20..000000000
--- a/main/xulrunner/xpcom-c99math.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./xpcom/ds/nsMathUtils.h.orig
-+++ ./xpcom/ds/nsMathUtils.h
-@@ -151,7 +151,11 @@
-     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
-     return !!_finite(d);
- #else
--    return finite(d);
-+#ifdef _GLIBCXX_CMATH
-+    return std::isfinite(d);
-+#else
-+    return isfinite(d);
-+#endif
- #endif
- }
- 
diff --git a/main/xulrunner/xulrunner-mozalloc.patch b/main/xulrunner/xulrunner-mozalloc.patch
deleted file mode 100644
index 31027a23e..000000000
--- a/main/xulrunner/xulrunner-mozalloc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/memory/mozalloc/mozalloc.cpp
-+++ mozilla-2.0/memory/mozalloc/mozalloc.cpp
-@@ -237,7 +237,7 @@
-         return 0;
- 
- #if defined(MOZ_MEMORY)
--    return malloc_usable_size(ptr);
-+    return 0;
- #elif defined(XP_MACOSX)
-     return malloc_size(ptr);
- #elif defined(XP_WIN)
diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD
index 53cb4fff7..75f886552 100644
--- a/main/zabbix/APKBUILD
+++ b/main/zabbix/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor: Jeff Bilyk <jbilyk at gmail> 
+# Contributor: Jeff Bilyk <jbilyk at gmail>
 # Maintainer: Natanael Copa <natanael.copa@gmail.com>
 pkgname=zabbix
-pkgver=1.8.8
+pkgver=1.8.9
 pkgrel=0
 pkgdesc="Enterprise-class open source distributed monitoring"
 url="www.zabbix.com"
@@ -151,13 +151,13 @@ agent() {
 
 }
 
-md5sums="8e38079640cf50c215f36dfd3125a6d3  zabbix-1.8.8.tar.gz
+md5sums="fc8c7fad2943dea73d4f2338cd216715  zabbix-1.8.9.tar.gz
 26b0401a83bdb1dce29338e5b2786620  zabbix_server.conf
 9832a81e134c8e2c11e2a06b7adbf88f  zabbix_trapper.conf
 0310b92afb3f35c1075fff53db737212  zabbix_proxy.conf
 721c18077fa739f956340afca9f067f4  zabbix_agentd.conf
 a55a4d0b2e13c97c280006ba4bee0afa  zabbix-dn_skipname.patch
 8d1d2e53479173aac0df0c38a4d6afda  zabbix-getloadavg.patch
-e42394e798ab98a8ff4babe68e04633a  zabbix-server.initd
-88374bba8a8fdfabfcfe9be6dd12095f  zabbix-agentd.initd
-32abde1cc00c2eeccddb7e038117d0ab  zabbix-proxy.initd"
+d823c2ab6c2bbdd0ebd3511fac4a83b4  zabbix-server.initd
+1a5c718bcf815fcf659e14fb0b576a1a  zabbix-agentd.initd
+a99978139481e69434f78fc3e8c53441  zabbix-proxy.initd"
diff --git a/main/zabbix/zabbix-agentd.initd b/main/zabbix/zabbix-agentd.initd
index b14b5fe74..745b35e06 100644
--- a/main/zabbix/zabbix-agentd.initd
+++ b/main/zabbix/zabbix-agentd.initd
@@ -11,12 +11,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
+	start-stop-daemon --start --user zabbix:zabbix --exec /usr/sbin/zabbix_agentd
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
+	start-stop-daemon  --stop --user zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
 	eend $?
 }
diff --git a/main/zabbix/zabbix-proxy.initd b/main/zabbix/zabbix-proxy.initd
index 8ac246ecc..a8b418a20 100644
--- a/main/zabbix/zabbix-proxy.initd
+++ b/main/zabbix/zabbix-proxy.initd
@@ -10,12 +10,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix proxy"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_proxy
+	start-stop-daemon --start --user zabbix:zabbix --exec /usr/sbin/zabbix_proxy
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix proxy"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_proxy.pid
+	start-stop-daemon --stop --user zabbix --pidfile /var/run/zabbix/zabbix_proxy.pid
 	eend $?
 }
diff --git a/main/zabbix/zabbix-server.initd b/main/zabbix/zabbix-server.initd
index a661cd233..5ccd01943 100644
--- a/main/zabbix/zabbix-server.initd
+++ b/main/zabbix/zabbix-server.initd
@@ -10,12 +10,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
+	start-stop-daemon --start --user zabbix:zabbix --exec /usr/sbin/zabbix_server
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
+	start-stop-daemon --stop --user zabbix --pidfile /var/run/zabbix/zabbix_server.pid
 	eend $?
 }
diff --git a/main/zeromq/APKBUILD b/main/zeromq/APKBUILD
index 6715f0af9..b05ae2a0c 100644
--- a/main/zeromq/APKBUILD
+++ b/main/zeromq/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zeromq
-pkgver=2.1.7
-pkgrel=2
+pkgver=2.1.11
+pkgrel=0
 pkgdesc="The ZeroMQ messaging library and tools"
 url="http://www.zeromq.org/"
 arch="all"
@@ -41,4 +41,4 @@ libzmq() {
 	mv "$pkgdir"/usr/lib/libzmq.so.* "$subpkgdir"/usr/lib/
 }
 
-md5sums="7d3120f8a8fb913a7e55c57c6eb024f3  zeromq-2.1.7.tar.gz"
+md5sums="f0f9fd62acb1f0869d7aa80379b1f6b7  zeromq-2.1.11.tar.gz"
diff --git a/main/zsh/APKBUILD b/main/zsh/APKBUILD
index f6acc2826..88a29ec08 100644
--- a/main/zsh/APKBUILD
+++ b/main/zsh/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: <kalonji@gmail.com>
 # Maintainer: <ncopa@alpinelinux.org>
 pkgname=zsh
-pkgver=4.3.12
+pkgver=4.3.15
 pkgrel=0
 pkgdesc="A very advanced and programmable command interpreter (shell) for UNIX"
 url="http://www.zsh.org/"
@@ -39,7 +39,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="46ae7be975779b9b0ea24e8b30479a8b  zsh-4.3.12.tar.gz
+md5sums="b2e2d0a431935b408ed8ea48226f9962  zsh-4.3.15.tar.gz
 aedff0460ef282937905223207ac702e  zsh.post-install
 aedff0460ef282937905223207ac702e  zsh.post-upgrade
 b48f79e2d4a29047f6152f5a9441f942  zsh.pre-deinstall"
author	Leonardo Arena <rnalrd@alpinelinux.org>	2012-01-02 10:06:42 +0000
committer	Leonardo Arena <rnalrd@alpinelinux.org>	2012-01-02 10:06:42 +0000
commit	dbee1f2c9e8313343fa945194cb0d230bad8892c (patch)
tree	f8da89f03be446f573089d95ae686e701082946f /main
parent	431dfa4619c52a2fff537fb997dbe8b8e44f2f03 (diff)
parent	daafae5c7c194f4d3ba052691a043da06c294a46 (diff)
download	aports-dbee1f2c9e8313343fa945194cb0d230bad8892c.tar.bz2 aports-dbee1f2c9e8313343fa945194cb0d230bad8892c.tar.xz