21 files changed, 337 insertions, 73 deletions
diff --git a/main/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index bb6083aeb2..98669a16d5 100644
--- a/main/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openssl
-pkgver=0.3.1
-pkgrel=2
+pkgver=0.3.2
+pkgrel=0
 pkgdesc="A web-based system administration interface for openssl"
 url="http://git.alpinelinux.org/cgit/acf-openssl"
 arch="noarch"
@@ -20,4 +20,4 @@ package() {
 
 }
 
-md5sums="6d832cc79c4a2c487371501cdbbc7d78  acf-openssl-0.3.1.tar.bz2"
+md5sums="9f073d837b27450e4ef6bd6478798d46  acf-openssl-0.3.2.tar.bz2"
diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD
index ca84ead0b4..3dd0136b88 100644
--- a/main/acf-provisioning/APKBUILD
+++ b/main/acf-provisioning/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-provisioning
-pkgver=0.0.7
-pkgrel=1
+pkgver=0.0.8
+pkgrel=0
 pkgdesc="ACF for provisioning templated configs to devices"
 url="http://git.alpinelinux.org/cgit/acf-provisioning"
 arch="noarch"
@@ -18,4 +18,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="1fb5f927e1a0302101c813eacd997307  acf-provisioning-0.0.7.tar.bz2"
+md5sums="9eaf2cda946429315020e0b69e54ba08  acf-provisioning-0.0.8.tar.bz2"
diff --git a/main/acf-provisioning/acf-provisioning.post-upgrade b/main/acf-provisioning/acf-provisioning.post-upgrade
index 035be21475..089c448acc 100644
--- a/main/acf-provisioning/acf-provisioning.post-upgrade
+++ b/main/acf-provisioning/acf-provisioning.post-upgrade
@@ -3,6 +3,27 @@
 new=$1
 old=$2
 
+# if current is not older than 0.0.8 we exit.
+if ! [ "$(apk version -t $old 0.0.8)" = "<" ]; then
+	exit 0
+fi
+
+psql -U postgres -c "ALTER TABLE provisioning_params ADD COLUMN validate text" provisioning
+
+psql -U postgres -c "UPDATE provisioning_params SET descr='Phone dial pattern based on section 2.1.5 of RFC 3435, plus a comma to turn dialtone back on', regexp='^[*#0-9xT|,.%[%]-]*\$' WHERE name='digitmap'" provisioning
+psql -U postgres -c "UPDATE provisioning_params SET descr='Timeout in seconds for each segment of digit map (separated by ''|'')', regexp='^[0-9|]*\$' WHERE name='digitmaptimeout'" provisioning
+
+psql -U postgres -c "UPDATE provisioning_params SET regexp='^%x%x%x%x%x%x%x%x%x%x%x%x\$', validate='local value, functions, params = ...\nvalue = string.upper(value)\nlocal others = functions.getselectresponse(\"SELECT count(*) FROM provisioning_values WHERE param_id=\\'\"..params.value.device.value.mac.param_id..\"\\' AND device_id!=\\'\"..params.value.device_id.value..\"\\' AND value=\\'\"..value..\"\\'\")\nif tonumber(others[1].count) > 0 then\n\treturn value, \"MAC Address must be unique\"\nend\nreturn value' WHERE name='mac'" provisioning
+
+psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'callwaitingenable', 'boolean', 'Call Waiting Enable', '', 'true', '205', '', null)" provisioning
+psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'speeddialenable', 'boolean', 'Speed Dial Enable', '', 'true', '206', '', null)" provisioning
+psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Standard Phone'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', false)" provisioning
+psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Standard Phone'), (SELECT param_id FROM provisioning_params WHERE name='speeddialenable'), 'true', false)" provisioning
+psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Public Phone'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', false)" provisioning
+psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Public Phone'), (SELECT param_id FROM provisioning_params WHERE name='speeddialenable'), 'false', false)" provisioning
+psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='callwaitingenable'), 'true', false)" provisioning
+psql -U postgres -c "INSERT INTO param_groups_to_params VALUES((SELECT group_id FROM provisioning_groups WHERE label='Hotline'), (SELECT param_id FROM provisioning_params WHERE name='speeddialenable'), 'false', false)" provisioning
+
 # if current is not older than 0.0.7-r1 we exit.
 if ! [ "$(apk version -t $old 0.0.7-r1)" = "<" ]; then
 	exit 0
diff --git a/main/debootstrap/APKBUILD b/main/debootstrap/APKBUILD
index c21a9831b0..246fc75074 100644
--- a/main/debootstrap/APKBUILD
+++ b/main/debootstrap/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=debootstrap
-pkgver=1.0.29
+pkgver=1.0.32
 pkgrel=0
 pkgdesc="Debian/Ubuntu bootstrap scripts"
 url="http://packages.qa.debian.org/d/debootstrap.html"
@@ -42,5 +42,5 @@ package() {
 	make DESTDIR="$pkgdir" install || return
 	install -Dm755 pkgdetails "$pkgdir"/usr/lib/debootstrap/pkgdetails
 }
-md5sums="84f6127ee1775dde48dca03994bd1e5c  debootstrap_1.0.29.tar.gz
+md5sums="3538ffa710f0d365dcbdc0dc18af2d4c  debootstrap_1.0.32.tar.gz
 cff11c88c5176c0ccb714e2d378f4d35  pkgdetails.c"
diff --git a/main/freeswitch/0001-mod_sofia-update-mod_sofia_globals.guess_ip-on-addre.patch b/main/freeswitch/0001-mod_sofia-update-mod_sofia_globals.guess_ip-on-addre.patch
new file mode 100644
index 0000000000..ccf4e5c6e9
--- /dev/null
+++ b/main/freeswitch/0001-mod_sofia-update-mod_sofia_globals.guess_ip-on-addre.patch
@@ -0,0 +1,27 @@
+From 67a60b5bf50fbfdf184dc4cb20a88d8d88ff59ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Fri, 10 Jun 2011 11:58:19 +0300
+Subject: [PATCH 1/2] mod_sofia: update mod_sofia_globals.guess_ip on address change
+
+So that we rebind to the new IP-address after reloading
+configuration. Fixes FS-3336.
+---
+ src/mod/endpoints/mod_sofia/mod_sofia.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
+index 86fa140..b06eacb 100644
+--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
++++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
+@@ -4889,6 +4889,8 @@ static void general_event_handler(switch_event_t *event)
+ 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "EVENT_TRAP: IP change detected\n");
+ 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "IP change detected [%s]->[%s] [%s]->[%s]\n", old_ip4, new_ip4, old_ip6, new_ip6);
+ 
++				strncpy(mod_sofia_globals.guess_ip, new_ip4, sizeof(mod_sofia_globals.guess_ip));
++
+ 				switch_mutex_lock(mod_sofia_globals.hash_mutex);
+ 				if (mod_sofia_globals.profile_hash) {
+ 					for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) {
+-- 
+1.7.1
+
diff --git a/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch b/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch
new file mode 100644
index 0000000000..c83cfd58be
--- /dev/null
+++ b/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch
@@ -0,0 +1,37 @@
+From ab10000fddd6735ff986d3b0f8092bc733bf5267 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Fri, 10 Jun 2011 13:06:35 +0300
+Subject: [PATCH 2/2] mod_lua: alpine module search path
+
+---
+ src/mod/languages/mod_lua/lua/luaconf.h |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/mod/languages/mod_lua/lua/luaconf.h b/src/mod/languages/mod_lua/lua/luaconf.h
+index ca2849b..bc8c17b 100644
+--- a/src/mod/languages/mod_lua/lua/luaconf.h
++++ b/src/mod/languages/mod_lua/lua/luaconf.h
+@@ -95,13 +95,18 @@
+ 
+ #else
+ #define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT2	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
++#define LUA_LDIR2	LUA_ROOT2 "share/lua/5.1/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
++#define LUA_CDIR2	LUA_ROOT2 "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT  \
+ 		"./?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+-		            LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
++		            LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
++		            LUA_LDIR2"?.lua;"  LUA_LDIR2"?/init.lua"
+ #define LUA_CPATH_DEFAULT \
+-	"./?.so;"  "./lib?51.so;"  LUA_CDIR"?.so;" LUA_CDIR"lib?51.so;" LUA_CDIR"loadall.so"
++	"./?.so;" LUA_CDIR"?.so;" LUA_CDIR2"?.so;" LUA_CDIR"loadall.so"
++
+ #endif
+ 
+ 
+-- 
+1.7.1
+
diff --git a/main/freeswitch/0003-mod_conference_no_hangup.patch b/main/freeswitch/0003-mod_conference_no_hangup.patch
new file mode 100644
index 0000000000..577ca8e1a4
--- /dev/null
+++ b/main/freeswitch/0003-mod_conference_no_hangup.patch
@@ -0,0 +1,27 @@
+diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
+index 572fdf0..d62d114 100644
+--- a/src/mod/applications/mod_conference/mod_conference.c
++++ b/src/mod/applications/mod_conference/mod_conference.c
+@@ -1482,13 +1482,15 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
+ 		if (!switch_test_flag(imember, MFLAG_NOCHANNEL)) {
+ 			channel = switch_core_session_get_channel(imember->session);
+ 
+-			/* add this little bit to preserve the bridge cause code in case of an early media call that */
+-			/* never answers */
+-			if (switch_test_flag(conference, CFLAG_ANSWERED)) {
+-				switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
+-			} else {
+-				/* put actual cause code from outbound channel hangup here */
+-				switch_channel_hangup(channel, conference->bridge_hangup_cause);
++			if (!switch_false(switch_channel_get_variable(channel, "hangup_after_conference"))) {
++				/* add this little bit to preserve the bridge cause code in case of an early media call that */
++				/* never answers */
++				if (switch_test_flag(conference, CFLAG_ANSWERED)) {
++					switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
++				} else {
++					/* put actual cause code from outbound channel hangup here */
++					switch_channel_hangup(channel, conference->bridge_hangup_cause);
++				}
+ 			}
+ 		}
+ 
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index a06711ec25..53d7828a8d 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -4,7 +4,7 @@ pkgname=freeswitch
 pkgver=1.0.7_p20110602
 _ver=${pkgver%_p*}
 _snapshot=${pkgver#*_p}
-pkgrel=0
+pkgrel=2
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
 arch="all"
@@ -18,6 +18,9 @@ install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-upgrade"
 subpackages="$pkgname-dev $pkgname-flite $pkgname-sample-config:conf $pkgname-freetdm"
 source="saveas-http://latest.freeswitch.org/freeswitch-$_ver.tar.gz/freeswitch-$pkgver.tar.gz
 	freeswitch-mod_shout-textrels.patch
+	0001-mod_sofia-update-mod_sofia_globals.guess_ip-on-addre.patch
+	0002-mod_lua-alpine-module-search-path.patch
+	0003-mod_conference_no_hangup.patch
 	modules.conf
 	freeswitch.confd
 	freeswitch.initd
@@ -42,6 +45,7 @@ build() {
 	# by specifying it here we save our selves from some CPU cycles
 	export lt_cv_sys_max_cmd_len=8192
 
+	sed -i -e 's#^dbdir="${prefix}/db"#dbdir="/var/lib/freeswitch"#' configure.in || return 1
 	./bootstrap.sh
 	
 	cp -f "$srcdir/modules.conf" modules.conf || return 1
@@ -129,6 +133,9 @@ conf() {
 
 md5sums="813edb2192d1cc0fe224d9ef0492de4f  freeswitch-1.0.7_p20110602.tar.gz
 11883affe0839a8e15fe680aeb11b86e  freeswitch-mod_shout-textrels.patch
+5aed9ec61d7ac1f3758a89db159328c4  0001-mod_sofia-update-mod_sofia_globals.guess_ip-on-addre.patch
+769eaa127d4dbae687dc4aa961a8cc70  0002-mod_lua-alpine-module-search-path.patch
+74c3cdd3ce8474e8d084f475fa4f92c1  0003-mod_conference_no_hangup.patch
 691fa3aca967203848bbb2a617545265  modules.conf
 c608cca8ad773acebf201f581438c7e7  freeswitch.confd
 aa358c9ca0d8b93fabb6a36a5ed4c469  freeswitch.initd"
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index a1ff9e4346..51a8f8eb74 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_rc3
 _ver=${pkgver/_/-}
-pkgrel=15
+pkgrel=16
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
 license="LGPL-2"
@@ -35,6 +35,7 @@ source="http://uclibc.org/downloads/uClibc-${_ver}.tar.bz2
 	0001-getaddrinfo-allow-numeric-service-without-any-hints.patch
 	uclibc-generic-backtrace.patch
 	uclibc-ubacktrace-asneeded-fix.patch
+	uclibc-librt-asneeded-fix.patch
 	uclibcconfig.x86
 	uclibcconfig.x86_64
 	uclibcconfig.i486
@@ -145,6 +146,7 @@ b4fb68ad3d0e8331b1b40c30eb21dfdc  0002-stdlib-fix-arc4random-return-type-to-u_in
 9e1ffc8dae55f4489c770f284734804f  0001-getaddrinfo-allow-numeric-service-without-any-hints.patch
 871956085df0bf90f4054e294a3770ce  uclibc-generic-backtrace.patch
 814ae23243116cf61690218b9b6019f6  uclibc-ubacktrace-asneeded-fix.patch
+e5caf13c43ee8d48f22eded21b857d81  uclibc-librt-asneeded-fix.patch
 35ef159d3c56ad67f520ab033e0f6930  uclibcconfig.x86
 a0b00fb82825f91671b76b1d8f979944  uclibcconfig.x86_64
 35ef159d3c56ad67f520ab033e0f6930  uclibcconfig.i486
diff --git a/main/libc0.9.32/uclibc-librt-asneeded-fix.patch b/main/libc0.9.32/uclibc-librt-asneeded-fix.patch
new file mode 100644
index 0000000000..d85af19f2a
--- /dev/null
+++ b/main/libc0.9.32/uclibc-librt-asneeded-fix.patch
@@ -0,0 +1,39 @@
+--- 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/libtool/APKBUILD b/main/libtool/APKBUILD
index 5d16729dcf..9bbdb3813b 100644
--- a/main/libtool/APKBUILD
+++ b/main/libtool/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libtool
 pkgver=2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A generic library support script"
 arch="all"
 license='GPL'
@@ -23,6 +23,7 @@ package() {
 
 libltdl() {
 	pkgdesc="Runtime libraries for GNU Libtool Dynamic Module Loade"
+	depends=
 	mkdir -p "$subpkgdir/usr/lib"
 	mv "$pkgdir/usr/lib/libltdl.so"* "$subpkgdir/usr/lib/"
 }
diff --git a/main/man/APKBUILD b/main/man/APKBUILD
index f6e8de8fc4..f1e8aa306a 100644
--- a/main/man/APKBUILD
+++ b/main/man/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=man
 pkgver=1.6f
-pkgrel=4
+pkgrel=5
 pkgdesc="A utility for reading man pages"
 url="http://primates.ximian.com/~flucifredi/man/"
 arch="all"
@@ -25,6 +25,7 @@ prepare() {
 build () {
 	cd "$_builddir"
 	./configure -confdir=/etc +sgid +fhs +lang none
+	sed -i "s/\\/usr\\/bin\\/awk/\\/usr\\/bin\\/gawk/" ./conf_script
 	make || return 1
 }
 
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD
index abaf424c84..f42a5dff7f 100644
--- a/main/syslinux/APKBUILD
+++ b/main/syslinux/APKBUILD
@@ -1,14 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=syslinux
 pkgver=4.04
-pkgrel=0
+pkgrel=2
 pkgdesc="a boot loader for the Linux operating system which operates off an MS-DOS/Windows FAT filesystem."
 url="http://syslinux.org"
 arch="x86 x86_64"
 license="GPL"
 makedepends="nasm perl"
-depends="mtools"
+depends="mtools blkid"
+triggers="syslinux.trigger:/boot"
 source="http://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgver%%.*}.xx/$pkgname-$pkgver.tar.bz2
+	extlinux.conf
+	update-extlinux
 	"
 subpackages="$pkgname-doc"
 
@@ -26,6 +29,12 @@ build() {
 package() {
 	cd "$_builddir"
 	make INSTALLROOT="$pkgdir" MANDIR=/usr/share/man local-install
+
+	mkdir -p "$pkgdir"/etc
+	cp "$srcdir"/extlinux.conf "$pkgdir"/etc/
+	cp "$srcdir"/update-extlinux "$pkgdir"/sbin/
 }
 
-md5sums="a3936208767eb7ced65320abe2e33a10  syslinux-4.04.tar.bz2"
+md5sums="a3936208767eb7ced65320abe2e33a10  syslinux-4.04.tar.bz2
+37f8ae1cbb41b68241d6027abd828318  extlinux.conf
+efe69677c78d8037f62a24267d598559  update-extlinux"
diff --git a/main/syslinux/extlinux.conf b/main/syslinux/extlinux.conf
new file mode 100644
index 0000000000..05bdcc935b
--- /dev/null
+++ b/main/syslinux/extlinux.conf
@@ -0,0 +1,26 @@
+# configuration for extlinux config builder
+
+# fancy_menu
+# use fancy vesa menu (vesamenu.c32) menus, won't work with serial
+fancy_menu=0
+
+# default_kernel_opts
+# default kernel options
+default_kernel_opts=quiet
+
+# modules
+# modules which should be loaded before pivot_root
+modules=sd-mod,usb-storage,ext3
+
+# root
+# root device - if not specified, will be guessed using
+# blkid -o export /dev/root
+root=
+
+# verbose
+# if set to non-zero, update-extlinux will be a lot more verbose.
+verbose=0
+
+# hidden
+# if set to non-zero, the boot menu will be hidden by default.
+hidden=1
diff --git a/main/syslinux/syslinux.trigger b/main/syslinux/syslinux.trigger
new file mode 100644
index 0000000000..1e463cddae
--- /dev/null
+++ b/main/syslinux/syslinux.trigger
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+update-extlinux
diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux
new file mode 100755
index 0000000000..8a5509b9e3
--- /dev/null
+++ b/main/syslinux/update-extlinux
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+default=0
+timeout=5
+verbose=0
+
+# read in extlinux settings
+source /etc/extlinux.conf
+
+everbose() {
+	if [ "$verbose" = "0" ]; then
+		return
+	fi
+
+	echo $*
+}
+
+everbose "Updating extlinux configuration."
+
+if [ "x$root" = "x" ]; then
+	everbose "WARNING: Root device not specified, determining automatically."
+	everbose -n "Root device is: "
+	export `blkid -o export /dev/root`
+	root=UUID=$UUID
+	everbose $root
+fi
+
+everbose "Installing mboot.c32 to /boot."
+cp /usr/share/syslinux/mboot.c32 /boot
+
+everbose "Installing menu.c32 to /boot."
+cp /usr/share/syslinux/menu.c32 /boot
+
+rtimeout=$((${timeout}\*10))
+# vesa menu has been requested?
+if [ "$fancy_menu" = "1" ]; then
+	everbose "Installing vesamenu.c32 to /boot."
+	cp /usr/share/syslinux/vesamenu.c32 /boot
+
+	echo "DEFAULT vesamenu.c32" > /boot/extlinux.conf.new
+	echo "PROMPT 0" >> /boot/extlinux.conf.new
+	echo "MENU TITLE Alpine/$(uname -s) Boot Menu" >> /boot/extlinux.conf.new
+	if [ "$hidden" = "1" ]; then
+		echo "MENU HIDDEN" >> /boot/extlinux.conf.new
+	fi
+	echo "MENU AUTOBOOT Alpine will be booted automatically in # seconds." >> /boot/extlinux.conf.new
+	echo "TIMEOUT $rtimeout" >> /boot/extlinux.conf.new
+else
+	echo "DEFAULT menu.c32" > /boot/extlinux.conf.new
+	echo "PROMPT 0" >> /boot/extlinux.conf.new
+	echo "MENU TITLE Alpine/$(uname -s) Boot Menu" >> /boot/extlinux.conf.new
+	if [ "$hidden" = "1" ]; then
+		echo "MENU HIDDEN" >> /boot/extlinux.conf.new
+	fi
+	echo "MENU AUTOBOOT Alpine will be booted automatically in # seconds." >> /boot/extlinux.conf.new
+	echo "TIMEOUT $rtimeout" >> /boot/extlinux.conf.new
+fi
+
+lst=0
+for kernel in $(find /boot -name vmlinuz-* -type f); do
+	tag=$(basename $kernel | cut -b9-)
+	everbose "Found kernel: $kernel"
+
+	if [ -f "/boot/initramfs-$tag" ]; then
+		everbose "Found initramfs: /boot/initramfs-$tag"
+		initramfs="initrd=initramfs-$tag"
+	fi
+
+	echo "LABEL $lst" >> /boot/extlinux.conf.new
+	if [ "$lst" = "$default" ]; then
+		echo "  MENU DEFAULT" >> /boot/extlinux.conf.new
+	fi
+	echo "  MENU LABEL Linux $tag" >> /boot/extlinux.conf.new
+	echo "  KERNEL $(basename $kernel)" >> /boot/extlinux.conf.new
+	echo "  APPEND $initramfs root=$root modules=$modules $default_kernel_opts" >> /boot/extlinux.conf.new
+	lst=$(($lst + 1))
+done
+
+if [ -f "/boot/memtest" ]; then
+	everbose "Found memtest86+: /boot/memtest"
+	echo "LABEL $lst" >> /boot/extlinux.conf.new
+	echo "  MENU LABEL Memtest86+" >> /boot/extlinux.conf.new
+        echo "  KERNEL memtest" >> /boot/extlinux.conf.new
+        lst=$(($lst + 1))
+fi
+
+everbose "$lst entries found."
+
+mv /boot/extlinux.conf.new /boot/extlinux.conf
diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux-ng/APKBUILD
index 5921a59476..7dcbc606c4 100644
--- a/main/util-linux-ng/APKBUILD
+++ b/main/util-linux-ng/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=util-linux-ng
 pkgver=2.19.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Random collection of Linux utilities"
 url="http://kernel.org/~kzak/util-linux/"
 arch="all"
@@ -13,7 +13,7 @@ makedepends="zlib-dev sed ncurses-dev"
 install=
 source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${pkgver%.*}/util-linux-$pkgver.tar.gz
 	program-invocation.patch"
-subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk mcookie"
+subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk mcookie blkid"
 replaces="e2fsprogs"
 
 _builddir="$srcdir/util-linux-$pkgver"
@@ -57,6 +57,14 @@ dev() {
 	replaces="e2fsprogs-dev"
 }
 
+blkid() {
+	pkgdesc="block device identificatio tool"
+	replaces="util-linux-ng"
+	depends=
+	mkdir -p "$subpkgdir"/sbin
+	mv "$pkgdir"/sbin/blkid "$subpkgdir"/sbin/
+}
+
 libuuid() {
 	pkgdesc="DCE compatible Universally Unique Identifier library"
 	depends=
@@ -92,5 +100,6 @@ mcookie() {
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/mcookie "$subpkgdir"/usr/bin/
 }
+
 md5sums="dd242eeb2ba76e4e55bf2237a50dd2b7  util-linux-2.19.1.tar.gz
 079dc713684e01ad48c7e0bb877dc51a  program-invocation.patch"
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index ca734eb16c..d8c86f8a48 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -1,21 +1,19 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xen
-pkgver=4.0.1
-pkgrel=3
+pkgver=4.1.0
+pkgrel=0
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org/"
 license="GPL"
 depends="coreutils python sed gawk"
-makedepends="libgcrypt-dev gnutls-dev pciutils-dev texinfo wget mesa-dev sdl-dev zlib-dev openssl-dev util-linux-ng-dev python-dev gettext-dev ncurses-dev"
+makedepends="libgcrypt-dev gnutls-dev pciutils-dev texinfo wget mesa-dev sdl-dev zlib-dev openssl-dev util-linux-ng-dev python-dev gettext-dev ncurses-dev perl"
 install=
 subpackages="$pkgname-doc"
 source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
 	xen-blktap-uclibc.patch
 	xen-blktap2-uclibc.patch
 	xen-disable-firmware.patch
-	xen-disable-fsback.patch
-	xen-disable-werror.patch
 	xen-dont-use-lib64.patch
 	xen-sed-is-broken-hack.patch
 	blktap-write.patch
@@ -28,6 +26,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
 
+	msg "Patching sources..."
 	for i in $source; do
 		case $i in
 		*.patch)
@@ -36,8 +35,11 @@ prepare() {
 			;;
 		esac
 	done
+	msg "Sources have been patched successfully."
+
 	# remove all -Werror
-	find -name '*.mk' -o -name 'Make*' | xargs sed 's/-Werror//g'
+	msg "Eradicating -Werror..."
+	find -name '*.mk' -o -name 'Make*' | xargs sed -i -e 's/-Werror//g'
 }
 
 build() {
@@ -51,8 +53,17 @@ build() {
 
 	# If we provide no parameters it tries to build a kernel image.  We
 	# definitely don't want that.
+	msg "Running preflight check..."
 	(cd tools/check; ./chk build) || return 1
-	make -j1 xen tools stubdom || return 1
+
+	msg "Building hypervisor..."
+	make -j1 xen || return 1
+
+	msg "Building tools..."
+	make -j1 tools || return 1
+
+	msg "Building stub domains..."
+	make -j1 stubdom || return 1
 }
 
 package() {
@@ -70,13 +81,11 @@ package() {
 	install -m755 -D "$srcdir"/xendomains.initd "$pkgdir"/etc/init.d/xendomains
 }
 
-md5sums="d197afad975ab2396a67323d57388c27  xen-4.0.1.tar.gz
+md5sums="db3e1542b7719f375593b2b32b01a177  xen-4.1.0.tar.gz
 edb5c3e7fba8214702fac709f0e53124  xen-blktap-uclibc.patch
 1f7f847ae0baa915c7b52d0ed5869fe6  xen-blktap2-uclibc.patch
 a569f16a7e3c832ba3fab6154f657244  xen-disable-firmware.patch
-03d1fff892e627b812bba4e6c56d696a  xen-disable-fsback.patch
-949d0d3bc1e8f300a849279b60760c6a  xen-disable-werror.patch
-b6599060e22b61dabee0fe460b4a0c9d  xen-dont-use-lib64.patch
+20ce621f3a2fc8ae78e74b9b72da775c  xen-dont-use-lib64.patch
 0cec6a97de9e4bc178f3e71190495cc3  xen-sed-is-broken-hack.patch
 56af00443c8d40944082e26304452a5e  blktap-write.patch
 1d81b04f8c8b919879a73f0e3d2fe80f  xend.initd
diff --git a/main/xen/xen-disable-fsback.patch b/main/xen/xen-disable-fsback.patch
deleted file mode 100644
index d0ae91b122..0000000000
--- a/main/xen/xen-disable-fsback.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xen-4.0.1/tools/Makefile
-+++ xen-4.0.1.mod/tools/Makefile
-@@ -29,7 +28,6 @@
- SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
- SUBDIRS-y += libfsimage
- SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
--SUBDIRS-$(CONFIG_Linux) += fs-back
- SUBDIRS-$(CONFIG_NetBSD) += fs-back
- SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
- SUBDIRS-y += xenpmd
diff --git a/main/xen/xen-disable-werror.patch b/main/xen/xen-disable-werror.patch
deleted file mode 100644
index c2c5512457..0000000000
--- a/main/xen/xen-disable-werror.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- xen-4.0.1/Config.mk
-+++ xen-4.0.1.mod/Config.mk
-@@ -14,7 +14,7 @@
- 
- # Tools to run on system hosting the build
- HOSTCC      = gcc
--HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS  = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
- HOSTCFLAGS += -fno-strict-aliasing
- 
- DISTDIR     ?= $(XEN_ROOT)/dist
---- xen-4.0.1/extras/mini-os/minios.mk
-+++ xen-4.0.1.mod/extras/mini-os/minios.mk
-@@ -6,7 +6,7 @@
- 
- # Define some default flags.
- # NB. '-Wcast-qual' is nasty, so I omitted it.
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
---- xen-4.0.1/tools/libxc/Makefile
-+++ xen-4.0.1.mod/tools/libxc/Makefile
-@@ -57,7 +57,7 @@
- 
- -include $(XEN_TARGET_ARCH)/Makefile
- 
--CFLAGS   += -Werror -Wmissing-prototypes
-+CFLAGS   += -Wmissing-prototypes
- CFLAGS   += $(INCLUDES) -I. -I../xenstore -I../include
- 
- # Needed for posix_fadvise64() in xc_linux.c
diff --git a/main/xen/xen-dont-use-lib64.patch b/main/xen/xen-dont-use-lib64.patch
index a22f139029..b14ff10164 100644
--- a/main/xen/xen-dont-use-lib64.patch
+++ b/main/xen/xen-dont-use-lib64.patch
@@ -4,8 +4,8 @@
  INCLUDEDIR = $(PREFIX)/include
  LIBLEAFDIR = lib
  LIBLEAFDIR_x86_32 = lib
--LIBLEAFDIR_x86_64 = lib64
-+LIBLEAFDIR_x86_64 = lib
+-LIBLEAFDIR_x86_64 ?= lib64
++LIBLEAFDIR_x86_64 ?= lib
  LIBDIR = $(PREFIX)/$(LIBLEAFDIR)
  LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32)
  LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64)