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

10 files changed, 47 insertions, 497 deletions

diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 82be2b4592..8ed13b5d02 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=2.0_rc8
+pkgver=2.0_rc9
 pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
@@ -18,4 +18,4 @@ build() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="c84957f015989ed806aa393c398ce901  alpine-conf-2.0_rc8.tar.bz2"
+md5sums="2eec332e42c5573b89d1f165dac2796f  alpine-conf-2.0_rc9.tar.bz2"
diff --git a/main/busybox/0001-add-simple-beep-applet.patch b/main/busybox/0001-add-simple-beep-applet.patch
deleted file mode 100644
index 050f229bbd..0000000000
--- a/main/busybox/0001-add-simple-beep-applet.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-From f1ca52c6dacbec39246fca696a597f5dbeca321f Mon Sep 17 00:00:00 2001
-From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-Date: Fri, 21 Aug 2009 13:18:31 +0200
-Subject: [PATCH 1/2] add simple beep applet
-
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
----
- include/applets.h   |    1 +
- include/usage.h     |   10 ++++
- miscutils/Config.in |    6 +++
- miscutils/Kbuild    |    1 +
- miscutils/beep.c    |  119 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 137 insertions(+), 0 deletions(-)
- create mode 100644 miscutils/beep.c
-
-diff --git a/include/applets.h b/include/applets.h
-index 32c596d..5ddbfe4 100644
---- a/include/applets.h
-+++ b/include/applets.h
-@@ -80,6 +80,7 @@ USE_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER, awk))
- USE_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER, basename))
- USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
-+USE_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
- //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_BLKID(APPLET(blkid, _BB_DIR_SBIN, _BB_SUID_NEVER))
- USE_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
-diff --git a/include/usage.h b/include/usage.h
-index bfacc56..f51b848 100644
---- a/include/usage.h
-+++ b/include/usage.h
-@@ -142,6 +142,16 @@
-        "$ basename /foo/bar.txt .txt\n" \
-        "bar"
- 
-+#define beep_trivial_usage \
-+       "-f freq -l length -d delay -r repetitions -n"
-+#define beep_full_usage "\n\n" \
-+	"Options:\n" \
-+     "\n	-f	Frequency in Hz" \
-+     "\n	-l	Length in ms" \
-+     "\n	-d	Delay in ms" \
-+     "\n	-r	Repetitions" \
-+     "\n	-n	Start new tone" \
-+
- #define fbsplash_trivial_usage \
-        "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]"
- #define fbsplash_full_usage "\n\n" \
-diff --git a/miscutils/Config.in b/miscutils/Config.in
-index 7feaf4a..e56a3fc 100644
---- a/miscutils/Config.in
-+++ b/miscutils/Config.in
-@@ -19,6 +19,12 @@ config BBCONFIG
- 	  The bbconfig applet will print the config file with which
- 	  busybox was built.
- 
-+config BEEP
-+	bool "beep"
-+	default n
-+	help
-+	  The beep applets beeps in a given freq/Hz.
-+
- config CHAT
- 	bool "chat"
- 	default n
-diff --git a/miscutils/Kbuild b/miscutils/Kbuild
-index 23d7d8d..8cf3406 100644
---- a/miscutils/Kbuild
-+++ b/miscutils/Kbuild
-@@ -7,6 +7,7 @@
- lib-y:=
- lib-$(CONFIG_ADJTIMEX)    += adjtimex.o
- lib-$(CONFIG_BBCONFIG)    += bbconfig.o
-+lib-$(CONFIG_BEEP)        += beep.o
- lib-$(CONFIG_CHAT)        += chat.o
- lib-$(CONFIG_CHRT)        += chrt.o
- lib-$(CONFIG_CROND)       += crond.o
-diff --git a/miscutils/beep.c b/miscutils/beep.c
-new file mode 100644
-index 0000000..d5c3531
---- /dev/null
-+++ b/miscutils/beep.c
-@@ -0,0 +1,119 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * beep implementation for busybox
-+ *
-+ * Copyright (C) 2009 Bernhard Reutner-Fischer
-+ *
-+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
-+ *
-+ */
-+#include "libbb.h"
-+
-+#include <linux/kd.h>
-+#ifndef CLOCK_TICK_RATE
-+#define CLOCK_TICK_RATE 1193180
-+#endif
-+
-+#define OPT_f (1<<0)
-+#define OPT_l (1<<1)
-+#define OPT_d (1<<2)
-+#define OPT_r (1<<3)
-+/* defaults */
-+#define FREQ (4440)
-+#define LENGTH (50)
-+#define DELAY (0)
-+#define REPETITIONS (1)
-+
-+#define GET_ARG do { if (!*++opt) opt = *++argv; if (opt == NULL) bb_show_usage();} while (0)
-+#define NEW_BEEP() { \
-+	freq = FREQ; \
-+	length = LENGTH; \
-+	delay = DELAY; \
-+	rep = REPETITIONS; \
-+	}
-+
-+int beep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-+int beep_main(int argc UNUSED_PARAM, char **argv)
-+{
-+	int speaker = get_console_fd_or_die();
-+	unsigned freq, length, delay, rep;
-+	unsigned long ioctl_arg;
-+	char *opt = NULL;
-+	bool do_parse = true;
-+
-+	NEW_BEEP()
-+	while (*argv && *++argv) {
-+		opt = *argv;
-+
-+		while (*opt == '-')
-+			++opt;
-+		if (do_parse)
-+			switch (*opt) {
-+			case 'f':
-+				GET_ARG;
-+				freq = xatoul(opt);
-+				continue;
-+			case 'l':
-+				GET_ARG;
-+				length = xatoul(opt);
-+				continue;
-+			case 'd':
-+				GET_ARG;
-+				delay = xatoul(opt);
-+				continue;
-+			case 'r':
-+				GET_ARG;
-+				rep = xatoul(opt);
-+				continue;
-+			case 'n':
-+				break;
-+			default:
-+				bb_show_usage();
-+				break;
-+			}
-+ again:
-+		while (rep) {
-+//bb_info_msg("rep[%d] freq=%d, length=%d, delay=%d", rep, freq, length, delay);
-+			ioctl_arg = (int)(CLOCK_TICK_RATE/freq);
-+			xioctl(speaker, KIOCSOUND, (void*)ioctl_arg);
-+			usleep(1000 * length);
-+			ioctl(speaker, KIOCSOUND, 0);
-+			if (rep--)
-+				usleep(delay);
-+		}
-+		if (opt && *opt == 'n')
-+				NEW_BEEP()
-+		if (!do_parse && *argv == NULL)
-+			goto out;
-+	}
-+	do_parse = false;
-+	goto again;
-+ out:
-+	if (ENABLE_FEATURE_CLEAN_UP)
-+		close(speaker);
-+	return EXIT_SUCCESS;
-+}
-+/*
-+ * so, e.g. Beethoven's 9th symphony "Ode an die Freude" would be
-+ * something like:
-+a=$((220*3))
-+b=$((247*3))
-+c=$((262*3))
-+d=$((294*3))
-+e=$((329*3))
-+f=$((349*3))
-+g=$((392*3))
-+#./beep -f$d -l200 -r2 -n -f$e -l100 -d 10 -n -f$c -l400 -f$g -l200
-+./beep -f$e -l200 -r2 \
-+        -n -d 100 -f$f -l200 \
-+        -n -f$g -l200 -r2 \
-+        -n -f$f -l200 \
-+        -n -f$e -l200 \
-+        -n -f$d -l200  \
-+        -n -f$c -l200 -r2  \
-+        -n -f$d -l200  \
-+        -n -f$e -l200  \
-+        -n -f$e -l400  \
-+        -n -f$d -l100 \
-+        -n -f$d -l200 \
-+*/
--- 
-1.6.4
-
diff --git a/main/busybox/0001-install-compat-fix-for-mode-of-created-files.patch b/main/busybox/0001-install-compat-fix-for-mode-of-created-files.patch
deleted file mode 100644
index a17ca23556..0000000000
--- a/main/busybox/0001-install-compat-fix-for-mode-of-created-files.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1f363a086779152ab04067e81484b8bb69e4af72 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Mon, 15 Jun 2009 18:13:51 +0200
-Subject: [PATCH] install: compat fix for mode of created files.
-
-By Mat Hostetter (mhostetter AT tilera.com)
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- coreutils/install.c |    7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/coreutils/install.c b/coreutils/install.c
-index 24fb402..2e604be 100644
---- a/coreutils/install.c
-+++ b/coreutils/install.c
-@@ -129,7 +129,7 @@ int install_main(int argc, char **argv)
- 	if (opts & OPT_PRESERVE_TIME) {
- 		copy_flags |= FILEUTILS_PRESERVE_STATUS;
- 	}
--	mode = 0666;
-+	mode = 0755; /* GNU coreutils 6.10 compat */
- 	if (opts & OPT_MODE)
- 		bb_parse_mode(mode_str, &mode);
- 	uid = (opts & OPT_OWNER) ? get_ug_id(uid_str, xuname2uid) : getuid();
-@@ -175,8 +175,9 @@ int install_main(int argc, char **argv)
- 			}
- 		}
- 
--		/* Set the file mode */
--		if ((opts & OPT_MODE) && chmod(dest, mode) == -1) {
-+		/* Set the file mode (always, not only with -m).
-+		 * GNU coreutils 6.10 is not affected by umask. */
-+		if (chmod(dest, mode) == -1) {
- 			bb_perror_msg("can't change %s of %s", "permissions", dest);
- 			ret = EXIT_FAILURE;
- 		}
--- 
-1.6.3.3
-
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 32e8fef54c..4b69c827d7 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
-pkgver=1.14.4
+pkgver=1.15.2
 pkgrel=0
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
@@ -10,16 +10,10 @@ install="$pkgname.post-install $pkgname.post-upgrade"
 triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*"
 source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	$pkgname-1.11.1-bb.patch
-	0001-install-compat-fix-for-mode-of-created-files.patch
-	0001-add-simple-beep-applet.patch
-	0002-add-config-knob-for-default-freq-and-length.patch
 	0001-mount-move-resolve_mount_spec-to-volume_id.patch
 	0002-swaponoff-add-uuid-label-support.patch
-	bb-tar-numeric-owner.patch
-	busybox-sed-3.patch
 	busyboxconfig"
 
-
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
@@ -50,13 +44,8 @@ build() {
 	ln -s /bin/busybox "$pkgdir"/bin/sh
 }
 
-md5sums="ad6d0b271e60783a3c767c4ccbc7f98e  busybox-1.14.4.tar.bz2
+md5sums="d5653e5b74b17dbb1eeecda8b8f22c0a  busybox-1.15.2.tar.bz2
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
-73d39c57483084298c7e46bdbbbea8d1  0001-install-compat-fix-for-mode-of-created-files.patch
-aa6869db437e11af86b5bf6c7d44b0a5  0001-add-simple-beep-applet.patch
-e55b64d4510aebb83661dac3271e12d3  0002-add-config-knob-for-default-freq-and-length.patch
 f928cadef10307c2f14202cfaf3c038c  0001-mount-move-resolve_mount_spec-to-volume_id.patch
 82310729ab41d703f3584bc9920dd712  0002-swaponoff-add-uuid-label-support.patch
-0b5b2d7db201f90cd08f4a3164ee29a1  bb-tar-numeric-owner.patch
-b75c3f419f8392dfdadd92aa24fdba8c  busybox-sed-3.patch
-59d9b2e920505abce869de7a3abac050  busyboxconfig"
+18c1ae8997b2a609f0633a01472060ed  busyboxconfig"
diff --git a/main/busybox/bb-tar-numeric-owner.patch b/main/busybox/bb-tar-numeric-owner.patch
deleted file mode 100644
index ad6481ffe4..0000000000
--- a/main/busybox/bb-tar-numeric-owner.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: archival/tar.c
-===================================================================
---- a/archival/tar.c	(revision 26114)
-+++ b/archival/tar.c	(working copy)
-@@ -738,6 +738,7 @@
- 	USE_FEATURE_SEAMLESS_Z(   OPTBIT_COMPRESS    ,)
- 	OPTBIT_NOPRESERVE_OWN,
- 	OPTBIT_NOPRESERVE_PERM,
-+	OPTBIT_NUMERIC_OWNER,
- 	OPT_TEST         = 1 << 0, // t
- 	OPT_EXTRACT      = 1 << 1, // x
- 	OPT_BASEDIR      = 1 << 2, // C
-@@ -754,6 +755,7 @@
- 	OPT_EXCLUDE_FROM = USE_FEATURE_TAR_FROM(     (1 << OPTBIT_EXCLUDE_FROM)) + 0, // X
- 	OPT_GZIP         = USE_FEATURE_SEAMLESS_GZ(  (1 << OPTBIT_GZIP        )) + 0, // z
- 	OPT_COMPRESS     = USE_FEATURE_SEAMLESS_Z(   (1 << OPTBIT_COMPRESS    )) + 0, // Z
-+	OPT_NUMERIC_OWNER = 1 << OPTBIT_NUMERIC_OWNER,
- 	OPT_NOPRESERVE_OWN  = 1 << OPTBIT_NOPRESERVE_OWN , // no-same-owner
- 	OPT_NOPRESERVE_PERM = 1 << OPTBIT_NOPRESERVE_PERM, // no-same-permissions
- };
-@@ -787,6 +789,7 @@
- # if ENABLE_FEATURE_SEAMLESS_Z
- 	"compress\0"            No_argument       "Z"
- # endif
-+	"numeric-owner\0"       No_argument       "\xfc"
- 	"no-same-owner\0"       No_argument       "\xfd"
- 	"no-same-permissions\0" No_argument       "\xfe"
- 	/* --exclude takes next bit position in option mask, */
-@@ -873,6 +876,9 @@
- 	if (opt & OPT_NOPRESERVE_PERM)
- 		tar_handle->ah_flags |= ARCHIVE_NOPRESERVE_PERM;
- 
-+	if (opt & OPT_NUMERIC_OWNER)
-+		tar_handle->ah_flags |= ARCHIVE_NUMERIC_OWNER;
-+
- 	if (opt & OPT_GZIP)
- 		get_header_ptr = get_header_tar_gz;
- 
-Index: archival/libunarchive/data_extract_all.c
-===================================================================
---- a/archival/libunarchive/data_extract_all.c	(revision 26114)
-+++ b/archival/libunarchive/data_extract_all.c	(working copy)
-@@ -114,22 +114,23 @@
- 	}
- 
- 	if (!(archive_handle->ah_flags & ARCHIVE_NOPRESERVE_OWN)) {
--#if ENABLE_FEATURE_TAR_UNAME_GNAME
--		uid_t uid = file_header->uid;
--		gid_t gid = file_header->gid;
-+		if (ENABLE_FEATURE_TAR_UNAME_GNAME && 
-+		    !(archive_handle->ah_flags & ARCHIVE_NUMERIC_OWNER)) {
-+			uid_t uid = file_header->uid;
-+			gid_t gid = file_header->gid;
- 
--		if (file_header->uname) {
--			struct passwd *pwd = getpwnam(file_header->uname);
--			if (pwd) uid = pwd->pw_uid;
-+			if (file_header->uname) {
-+				struct passwd *pwd = getpwnam(file_header->uname);
-+				if (pwd) uid = pwd->pw_uid;
-+			}
-+			if (file_header->gname) {
-+				struct group *grp = getgrnam(file_header->gname);
-+				if (grp) gid = grp->gr_gid;
-+			}
-+			lchown(file_header->name, uid, gid);
-+		} else {
-+			lchown(file_header->name, file_header->uid, file_header->gid);
- 		}
--		if (file_header->gname) {
--			struct group *grp = getgrnam(file_header->gname);
--			if (grp) gid = grp->gr_gid;
--		}
--		lchown(file_header->name, uid, gid);
--#else
--		lchown(file_header->name, file_header->uid, file_header->gid);
--#endif
- 	}
- 	if ((file_header->mode & S_IFMT) != S_IFLNK) {
- 		/* uclibc has no lchmod, glibc is even stranger -
-Index: include/unarchive.h
-===================================================================
---- a/include/unarchive.h	(revision 26114)
-+++ b/include/unarchive.h	(working copy)
-@@ -11,6 +11,7 @@
- #define ARCHIVE_EXTRACT_NEWER           16
- #define ARCHIVE_NOPRESERVE_OWN          32
- #define ARCHIVE_NOPRESERVE_PERM         64
-+#define ARCHIVE_NUMERIC_OWNER           128
- 
- typedef struct file_header_t {
- 	char *name;
diff --git a/main/busybox/busybox-sed-3.patch b/main/busybox/busybox-sed-3.patch
deleted file mode 100644
index f916ce2911..0000000000
--- a/main/busybox/busybox-sed-3.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -d -urpN busybox.2/editors/sed.c busybox.3/editors/sed.c
---- busybox.2/editors/sed.c	2009-08-08 01:40:42.000000000 +0200
-+++ busybox.3/editors/sed.c	2009-08-17 01:32:00.000000000 +0200
-@@ -589,7 +589,7 @@ static void pipe_putc(char c)
- 
- static void do_subst_w_backrefs(char *line, char *replace)
- {
--	int i,j;
-+	int i, j;
- 
- 	/* go through the replacement string */
- 	for (i = 0; replace[i]; i++) {
-@@ -624,23 +624,24 @@ static void do_subst_w_backrefs(char *li
- 	}
- }
- 
--static int do_subst_command(sed_cmd_t *sed_cmd, char **line)
-+static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
- {
--	char *oldline = *line;
-+	char *line = *line_p;
- 	int altered = 0;
- 	unsigned match_count = 0;
- 	regex_t *current_regex;
- 
-+	current_regex = sed_cmd->sub_match;
- 	/* Handle empty regex. */
--	if (sed_cmd->sub_match == NULL) {
-+	if (!current_regex) {
- 		current_regex = G.previous_regex_ptr;
- 		if (!current_regex)
- 			bb_error_msg_and_die("no previous regexp");
--	} else
--		G.previous_regex_ptr = current_regex = sed_cmd->sub_match;
-+	}
-+	G.previous_regex_ptr = current_regex;
- 
- 	/* Find the first match */
--	if (REG_NOMATCH == regexec(current_regex, oldline, 10, G.regmatch, 0))
-+	if (REG_NOMATCH == regexec(current_regex, line, 10, G.regmatch, 0))
- 		return 0;
- 
- 	/* Initialize temporary output buffer. */
-@@ -657,7 +658,7 @@ static int do_subst_command(sed_cmd_t *s
- 		   The match_count check is so not to break
- 		   echo "hi" | busybox sed 's/^/!/g' */
- 		if (!G.regmatch[0].rm_so && !G.regmatch[0].rm_eo && match_count) {
--			pipe_putc(*oldline++);
-+			pipe_putc(*line++);
- 			continue;
- 		}
- 
-@@ -669,35 +670,41 @@ static int do_subst_command(sed_cmd_t *s
- 		 && (sed_cmd->which_match != match_count)
- 		) {
- 			for (i = 0; i < G.regmatch[0].rm_eo; i++)
--				pipe_putc(*oldline++);
-+				pipe_putc(*line++);
- 			continue;
- 		}
- 
- 		/* print everything before the match */
- 		for (i = 0; i < G.regmatch[0].rm_so; i++)
--			pipe_putc(oldline[i]);
-+			pipe_putc(line[i]);
- 
- 		/* then print the substitution string */
--		do_subst_w_backrefs(oldline, sed_cmd->string);
-+		do_subst_w_backrefs(line, sed_cmd->string);
- 
- 		/* advance past the match */
--		oldline += G.regmatch[0].rm_eo;
-+		line += G.regmatch[0].rm_eo;
- 		/* flag that something has changed */
- 		altered++;
- 
- 		/* if we're not doing this globally, get out now */
- 		if (sed_cmd->which_match)
- 			break;
--	} while (*oldline && (regexec(current_regex, oldline, 10, G.regmatch, 0) != REG_NOMATCH));
- 
--	/* Copy rest of string into output pipeline */
-+		if (*line == '\0')
-+			break;
-+//maybe (G.regmatch[0].rm_eo ? REG_NOTBOL : 0) instead of unconditional REG_NOTBOL?
-+	} while (regexec(current_regex, line, 10, G.regmatch, REG_NOTBOL) != REG_NOMATCH);
- 
--	while (*oldline)
--		pipe_putc(*oldline++);
--	pipe_putc(0);
-+	/* Copy rest of string into output pipeline */
-+	while (1) {
-+		char c = *line++;
-+		pipe_putc(c);
-+		if (c == '\0')
-+			break;
-+	}
- 
--	free(*line);
--	*line = G.pipeline.buf;
-+	free(*line_p);
-+	*line_p = G.pipeline.buf;
- 	return altered;
- }
- 
-diff -d -urpN busybox.2/testsuite/sed.tests busybox.3/testsuite/sed.tests
---- busybox.2/testsuite/sed.tests	2009-08-08 01:40:44.000000000 +0200
-+++ busybox.3/testsuite/sed.tests	2009-08-17 01:29:01.000000000 +0200
-@@ -241,4 +241,11 @@ testing "sed 2d;2,1p (gnu compat)" \
- 	"third\n" "" \
- 	"first\nsecond\nthird\nfourth\n"
- 
-+# Regex means: "match / at BOL or nothing, then one or more not-slashes".
-+# The bug was that second slash in /usr/lib was treated as "at BOL" too.
-+testing "sed beginning (^) matches only once" \
-+	"sed 's,\(^/\|\)[^/][^/]*,>\0<,g'" \
-+	">/usr</>lib<\n" "" \
-+	"/usr/lib\n"
-+
- exit $FAILCOUNT
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 4c250ac7d4..86ecbe1dda 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.14.3
-# Fri Aug 21 13:55:23 2009
+# Busybox version: 1.15.2
+# Mon Oct 12 12:19:43 2009
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -14,7 +14,6 @@ CONFIG_HAVE_DOT_CONFIG=y
 #
 CONFIG_DESKTOP=y
 CONFIG_EXTRA_COMPAT=y
-CONFIG_FEATURE_ASSUME_UNICODE=y
 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -23,7 +22,9 @@ CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_FEATURE_INSTALLER=y
 # CONFIG_LOCALE_SUPPORT is not set
-CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_ASSUME_UNICODE=y
+CONFIG_FEATURE_CHECK_UNICODE_IN_ENV=y
+CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
 CONFIG_FEATURE_PIDFILE=y
@@ -88,6 +89,8 @@ CONFIG_FEATURE_EDITING_SAVEHISTORY=y
 CONFIG_FEATURE_TAB_COMPLETION=y
 CONFIG_FEATURE_USERNAME_COMPLETION=y
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_EDITING_ASK_TERMINAL=y
+CONFIG_FEATURE_NON_POSIX_CP=y
 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
 CONFIG_FEATURE_COPYBUF_KB=16
 CONFIG_MONOTONIC_SYSCALL=y
@@ -117,6 +120,8 @@ CONFIG_FEATURE_CPIO_P=y
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
 CONFIG_GUNZIP=y
 CONFIG_GZIP=y
+CONFIG_LZOP=y
+# CONFIG_LZOP_COMPR_HIGH is not set
 CONFIG_RPM2CPIO=y
 # CONFIG_RPM is not set
 CONFIG_TAR=y
@@ -170,6 +175,7 @@ CONFIG_EXPR=y
 CONFIG_EXPR_MATH_SUPPORT_64=y
 CONFIG_FALSE=y
 CONFIG_FOLD=y
+CONFIG_FSYNC=y
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 CONFIG_HOSTID=y
@@ -381,6 +387,8 @@ CONFIG_FEATURE_EXTRA_QUIET=y
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 CONFIG_FEATURE_INITRD=y
 CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
 CONFIG_MESG=y
 
 #
@@ -392,12 +400,15 @@ CONFIG_USE_BB_SHADOW=y
 # CONFIG_USE_BB_CRYPT is not set
 # CONFIG_USE_BB_CRYPT_SHA is not set
 CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
 CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_DELGROUP=y
 CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
 CONFIG_FEATURE_CHECK_NAMES=y
 CONFIG_ADDUSER=y
 # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
 CONFIG_DELUSER=y
 CONFIG_GETTY=y
 CONFIG_FEATURE_UTMP=y
@@ -481,6 +492,7 @@ CONFIG_FINDFS=y
 # CONFIG_FEATURE_MINIX2 is not set
 CONFIG_MKFS_VFAT=y
 CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
 CONFIG_HEXDUMP=y
 CONFIG_FEATURE_HEXDUMP_REVERSE=y
 CONFIG_HD=y
@@ -497,7 +509,7 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
 CONFIG_MKSWAP=y
-# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_FEATURE_MKSWAP_UUID=y
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_VOLUMEID=y
@@ -532,6 +544,7 @@ CONFIG_RDEV=y
 CONFIG_READPROFILE=y
 # CONFIG_RTCWAKE is not set
 # CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
 CONFIG_SETARCH=y
 CONFIG_SWAPONOFF=y
 CONFIG_FEATURE_SWAPON_PRI=y
@@ -552,7 +565,7 @@ CONFIG_ADJTIMEX=y
 CONFIG_BBCONFIG=y
 CONFIG_BEEP=y
 CONFIG_FEATURE_BEEP_FREQ=440
-CONFIG_FEATURE_BEEP_LENGTH=200
+CONFIG_FEATURE_BEEP_LENGTH_MS=30
 # CONFIG_CHAT is not set
 # CONFIG_FEATURE_CHAT_NOFAIL is not set
 # CONFIG_FEATURE_CHAT_TTY_HIFI is not set
@@ -578,6 +591,8 @@ CONFIG_FEATURE_DC_LIBM=y
 CONFIG_EJECT=y
 CONFIG_FEATURE_EJECT_SCSI=y
 CONFIG_FBSPLASH=y
+CONFIG_FLASH_LOCK=y
+CONFIG_FLASH_UNLOCK=y
 # CONFIG_FLASH_ERASEALL is not set
 CONFIG_IONICE=y
 CONFIG_INOTIFYD=y
@@ -618,12 +633,14 @@ CONFIG_STRINGS=y
 CONFIG_TIME=y
 CONFIG_TIMEOUT=y
 CONFIG_TTYSIZE=y
+CONFIG_VOLNAME=y
 CONFIG_WATCHDOG=y
 
 #
 # Networking Utilities
 #
 CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_UNIX_LOCAL is not set
 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 CONFIG_VERBOSE_RESOLUTION_ERRORS=y
 CONFIG_ARP=y
@@ -659,6 +676,7 @@ CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
 CONFIG_FEATURE_IFCONFIG_HW=y
 CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
 CONFIG_IFENSLAVE=y
+# CONFIG_IFPLUGD is not set
 CONFIG_IFUPDOWN=y
 CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
 CONFIG_FEATURE_IFUPDOWN_IP=y
@@ -729,7 +747,7 @@ CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
 CONFIG_APP_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 # CONFIG_FEATURE_UDHCP_PORT is not set
-# CONFIG_UDHCP_DEBUG is not set
+CONFIG_UDHCP_DEBUG=0
 CONFIG_FEATURE_UDHCP_RFC3397=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -755,7 +773,7 @@ CONFIG_FEATURE_TUNCTL_UG=y
 #
 # Mail Utilities
 #
-# CONFIG_MAKEMIME is not set
+CONFIG_MAKEMIME=y
 CONFIG_FEATURE_MIME_CHARSET="us-ascii"
 # CONFIG_POPMAILDIR is not set
 # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
@@ -780,6 +798,7 @@ CONFIG_PKILL=y
 CONFIG_PS=y
 CONFIG_FEATURE_PS_WIDE=y
 CONFIG_FEATURE_PS_TIME=y
+CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 CONFIG_RENICE=y
 CONFIG_BB_SYSCTL=y
@@ -828,13 +847,8 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 #
 CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
 # CONFIG_FEATURE_SH_IS_NONE is not set
 CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
 CONFIG_ASH_BASH_COMPAT=y
 CONFIG_ASH_JOB_CONTROL=y
 CONFIG_ASH_READ_NCHARS=y
@@ -850,6 +864,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_ASH_EXPAND_PRMT=y
 # CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
 # CONFIG_HUSH_HELP is not set
 # CONFIG_HUSH_INTERACTIVE is not set
 # CONFIG_HUSH_JOB is not set
@@ -858,13 +873,10 @@ CONFIG_ASH_EXPAND_PRMT=y
 # CONFIG_HUSH_LOOPS is not set
 # CONFIG_HUSH_CASE is not set
 # CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
 # CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
 CONFIG_SH_MATH_SUPPORT=y
 # CONFIG_SH_MATH_SUPPORT_64 is not set
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index d414f8e14a..292d1942e4 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
 pkgver=1.5.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -13,7 +13,7 @@ makedepends="bison flex expat-dev postgresql-dev mysql-dev pcre-dev
 	libxml2-dev curl-dev"
 install=
 subpackages="$pkgname-doc $pkgname-mysql $pkgname-postgres $pkgname-pcre
-	$pkgname-presence"
+	$pkgname-presence $pkgname-mediaproxy"
 source="http://www.kamailio.org/pub/kamailio/$pkgver/src/$pkgname-$pkgver-notls_src.tar.gz
 	kamailio.cfg
 	kamailio.initd
@@ -41,7 +41,7 @@ build() {
 		MODS_PRESENCE=yes \
 		MODS_RADIUS= \
 		TLS= \
-		include_modules=db_postgres \
+		include_modules="db_postgres mediaproxy" \
 		all || return 1
 	make prefix=/usr \
 		cfg-dir=/etc/kamailio/ \
@@ -50,7 +50,7 @@ build() {
 		MODS_PRESENCE=yes \
 		MODS_RADIUS= \
 		TLS= \
-		include_modules=db_postgres \
+		include_modules="db_postgres mediaproxy" \
 		basedir="$pkgdir" install || return 1
 
 	# move default config to -doc package and use our own default config
@@ -102,6 +102,12 @@ presence() {
 		pua_dialoginfo
 }
 
+mediaproxy() {
+	pkgdesc="Mediaproxy support for kamailio"
+	depends="kamailio"
+	_mv_mod mediaproxy
+}
+
 md5sums="6c6f4ed6fbcb4d008b8ac3de5b99ce99  kamailio-1.5.2-notls_src.tar.gz
 eb665248ee39cf755a247286affc5cbb  kamailio.cfg
 81100c479890a2a8c2628db22fdd1a0c  kamailio.initd
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index dc776b5ca3..e481bca318 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=opennhrp
 pkgver=0.11.2
-pkgrel=1
+pkgrel=2
 pkgdesc="NBMA Next Hop Resolution Protocol daemon"
 url="http://sourceforge.net/projects/opennhrp"
 license="GPL-3"
@@ -29,5 +29,5 @@ build() {
 }
 md5sums="3aace509ac79acbde3bb3e44e88798d5  opennhrp-0.11.2.tar.bz2
 f81539fc92800bb79668dda119a97d1d  opennhrp-0.9.3-peer-up-bgp.patch
-a68a5a27a9a21b9078ec97a3afdbd3d3  opennhrp.initd
+ae65f88ccf849ef882669a8b4f0c7fc0  opennhrp.initd
 8eee86233728dc0d156bbfee6d98f338  opennhrp.confd"
diff --git a/main/opennhrp/opennhrp.initd b/main/opennhrp/opennhrp.initd
index adc90f64f6..6ddb9eca20 100755
--- a/main/opennhrp/opennhrp.initd
+++ b/main/opennhrp/opennhrp.initd
@@ -6,7 +6,7 @@
 PIDFILE=/var/run/opennhrp.pid
 
 depend() {
-	use logger
+	use logger dns
 	need net
 	after firewall ipsec
 }