Merge remote-tracking branch 'alpine/master'

47 files changed, 823 insertions, 484 deletions

diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index 6b6b03d6bb..2d72758a98 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/amavisd-new/APKBUILD b/main/amavisd-new/APKBUILD
index dae1e264cd..419e4d9344 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/asterisk/APKBUILD b/main/asterisk/APKBUILD
index db6362ac99..b6bb6e6b4b 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=1.8.8.0_rc5
+pkgver=10.0.0
 pkgrel=0
 pkgdesc="Asterisk: A Module Open Source PBX System"
 url="http://www.asterisk.org/"
@@ -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,10 @@ 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.initd
 	asterisk.confd
 	asterisk.logrotate"
@@ -28,7 +32,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 +163,14 @@ sound_en() {
 	_move_dir var/lib/asterisk/sounds/en
 }
 
-md5sums="737c309d970112b39c44ea246e4c9b21  asterisk-1.8.8.0-rc5.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
+da5a3c500192dee4275aae5235d25f97  ASTERISK-18976.patch
+1ddadef41aa7120e168738b6f3ed8917  ASTERISK-18977.patch
+0af5e797f0a99d0f81f95e3710baf5b6  ASTERISK-18994.patch
+bc6713f5434e07b79d3afdd155461d72  ASTERISK-18995.patch
 0ce3219e05f55af884a7dc6b99c2b276  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 0000000000..36c613ff4f
--- /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 0000000000..fffce032cd
--- /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 0000000000..702e91375d
--- /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 0000000000..cd144847be
--- /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/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index c93d5a860e..f32af87daf 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/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 06e8c827c8..a5f26da7ae 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/doxygen/APKBUILD b/main/doxygen/APKBUILD
index 54c97c61f5..4050549114 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=doxygen
-pkgver=1.7.6
+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="79f67eea3d43a5c9964194786d786f37  doxygen-1.7.6.src.tar.gz"
+md5sums="084f1db244b77b3abff335550ef8eec5  doxygen-1.7.6.1.src.tar.gz"
diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD
index ef7702e8fb..c0978fb092 100644
--- a/main/firefox/APKBUILD
+++ b/main/firefox/APKBUILD
@@ -4,7 +4,7 @@ pkgname=firefox
 pkgver=8.0.1
 _pkgver=$pkgver
 _xulver=8.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="firefox web browser"
 url="http://www.firefox.com"
 arch="all"
diff --git a/main/fts/APKBUILD b/main/fts/APKBUILD
deleted file mode 100644
index e6f2850ec7..0000000000
--- 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 59061bfc95..0000000000
--- 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 3593530396..0000000000
--- 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 1ad7157e58..0000000000
--- 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/gparted/APKBUILD b/main/gparted/APKBUILD
index 4044b7d2fc..9cee1e6bd2 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/ipsec-tools/90-dead-on-initial-contact.patch b/main/ipsec-tools/90-dead-on-initial-contact.patch
new file mode 100644
index 0000000000..9554ae3d32
--- /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 99804bce51..9076efd534 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/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index 398f6a3bde..019712353b 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=12
+pkgrel=14
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
 license="LGPL-2"
@@ -112,7 +112,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/
 }
@@ -149,11 +149,11 @@ e814d39ab0adab58d69396ac0b9acdea  0001-libc-x86-fix-stack-unwinding-and-backtrac
 42416385763f7cd50775ed9bfaf2d59e  libm-cexp.patch
 7c47e9cb284b0da8df6ed2096b2c9c66  uclibc-ubacktrace-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
+0e40006f3c284a27313e0d54f91452e2  uclibcconfig.x86
+f6aee6bcbc43dcbfcaaba7be244ad368  uclibcconfig.x86_64
+0e40006f3c284a27313e0d54f91452e2  uclibcconfig.i486
+8ae78c9ab4bd7b1223c29c335c76a8c5  uclibcconfig.arm
+70fcde1955810a2369c023b293bae5c5  uclibcconfig.powerpc
 436bf7bea962b477bb93119514c90c9b  sha512-crypt.patch
 26dd7611fda4d29f3dc4a7cf24916931  uclibc-eventfd.patch
 f3be4f2bc54d7561d252937e10abf0d2  uclibc-utils.trigger"
diff --git a/main/libc0.9.32/uclibcconfig.arm b/main/libc0.9.32/uclibcconfig.arm
index 8f35012dd2..01f5ee4d7f 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 37dc98f462..471423cd76 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 335117980c..6698e446f6 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 e76bbc31cd..513b1224df 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/libusb/APKBUILD b/main/libusb/APKBUILD
index d9c58aa60b..f97d5cf4fa 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/mpt-status/APKBUILD b/main/mpt-status/APKBUILD
new file mode 100644
index 0000000000..a6e8a0b211
--- /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/mysql/APKBUILD b/main/mysql/APKBUILD
index 0ce4b70953..c3b5e7c661 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/nmap/APKBUILD b/main/nmap/APKBUILD
index 34dc38a0c7..0464a0e7af 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/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD
index 9bad724447..a169d5c29f 100644
--- a/main/open-vm-tools-grsec/APKBUILD
+++ b/main/open-vm-tools-grsec/APKBUILD
@@ -2,9 +2,10 @@
 
 _flavor=grsec
 _realname=open-vm-tools
-_mypkgrel=0
-_realver=2011.09.23
-_realsubver=491607
+_mypkgrel=1
+
+_realver=2011.11.20
+_realsubver=535097
 
 _kver=3.0.12
 _kpkgrel=2
@@ -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 1644eaf9d1..f0367ea0af 100644
--- a/main/open-vm-tools-vserver/APKBUILD
+++ b/main/open-vm-tools-vserver/APKBUILD
@@ -6,10 +6,11 @@ _name=$_realname-$_flavor
 _kver=3.0.10
 _kpkgrel=1
 _myvsver=vs2.3.2.1
-_mypkgrel=0
+_mypkgrel=1
+
+_realver=2011.11.20
+_realsubver=535097
 
-_realver=2011.09.23
-_realsubver=491607
 
 # 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 866c3d5d68..b5093e01e6 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=2
+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' \
@@ -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
-905ef6a3bac87c9ba2e5d3897ca230e7  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 53e88e9989..0000000000
--- 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 ccc4c388ed..0000000000
--- 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/procmgrposix.patch b/main/open-vm-tools/procmgrposix.patch
deleted file mode 100644
index 510c48a722..0000000000
--- 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 0000000000..0aeec6c94f
--- /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/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 86676e5ad7..f79d62cfb4 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 9a91ef059f..4b568d37bb 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 6616a9990f..6302da3e87 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/pidgin/APKBUILD b/main/pidgin/APKBUILD
index 7d2cfcd1a9..0078fb4467 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 0000000000..f86e805723
--- /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/roundcubemail/APKBUILD b/main/roundcubemail/APKBUILD
index 908fe104fb..eba839a884 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/rsync/APKBUILD b/main/rsync/APKBUILD
index 2ae3376184..ed226d7c35 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/v4l-utils/APKBUILD b/main/v4l-utils/APKBUILD
index 62ef1acb3a..67db16a7ff 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 1f1ec11a70..f1895dbe4e 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 0000000000..69281ab2cb
--- /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/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 23c794b1c0..24f95afa8f 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=xulrunner
 pkgver=8.0.1
 _ffoxver=8.0.1
-pkgrel=0
+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 
 
@@ -52,7 +51,6 @@ source="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}
 	0004-xulrunner-malloc_usable_size.patch
 	"
 
-#	xulrunner-mozalloc.patch
 _builddir="${srcdir}/mozilla-release"
 prepare() {
 	local i
@@ -105,7 +103,7 @@ dev() {
 }
 
 md5sums="b7d09b082e88a74860a51a8e04e29333  firefox-8.0.1.source.tar.bz2
-cc43a2bd96bd2395aa72d0bbb88e5594  mozconfig
+b0f7d491bc800b69ec718667a4b08acb  mozconfig
 731ec4084e57eb05e93000c971aad0d4  0001-mozilla-pkgconfig.patch.patch
 1867db217d10722675c88b655db8c2d7  0002-Use-C99-math-isfinite.patch
 7faa279d64c9ec2e7abc7c0497c7e07e  0003-xulrunner-jemalloc-aslr.patch
diff --git a/main/xulrunner/mozconfig b/main/xulrunner/mozconfig
index d0cf2c1047..2cbb45b7ae 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/xulrunner-mozalloc.patch b/main/xulrunner/xulrunner-mozalloc.patch
deleted file mode 100644
index 31027a23e8..0000000000
--- 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)