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

17 files changed, 715 insertions, 54 deletions

diff --git a/main/busybox/0001-add-simple-beep-applet.patch b/main/busybox/0001-add-simple-beep-applet-second-version.patch
index 004d60791..834026fa3 100644
--- a/main/busybox/0001-add-simple-beep-applet.patch
+++ b/main/busybox/0001-add-simple-beep-applet-second-version.patch
@@ -1,16 +1,16 @@
-From 23c387cd9d1c833679bee898ef49738be8c64727 Mon Sep 17 00:00:00 2001
+From b36908b21def4916b10c62ae3e28cacb9073556e Mon Sep 17 00:00:00 2001
 From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
 Date: Tue, 18 Aug 2009 22:28:09 +0200
-Subject: [PATCH] add simple beep applet
+Subject: [PATCH] add simple beep applet, second version
 
 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
 ---
  include/applets.h   |    1 +
- include/usage.h     |    9 ++++++
- miscutils/Config.in |    6 ++++
+ include/usage.h     |    9 +++++
+ miscutils/Config.in |    6 +++
  miscutils/Kbuild    |    1 +
- miscutils/beep.c    |   70 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 87 insertions(+), 0 deletions(-)
+ miscutils/beep.c    |  101 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 118 insertions(+), 0 deletions(-)
  create mode 100644 miscutils/beep.c
 
 diff --git a/include/applets.h b/include/applets.h
@@ -76,10 +76,10 @@ index 23d7d8d..8cf3406 100644
  lib-$(CONFIG_CROND)       += crond.o
 diff --git a/miscutils/beep.c b/miscutils/beep.c
 new file mode 100644
-index 0000000..4c25454
+index 0000000..81755d8
 --- /dev/null
 +++ b/miscutils/beep.c
-@@ -0,0 +1,70 @@
+@@ -0,0 +1,101 @@
 +/* vi: set sw=4 ts=4: */
 +/*
 + * beep implementation for busybox
@@ -106,38 +106,67 @@ index 0000000..4c25454
 +#define LENGTH (50)
 +#define DELAY (0)
 +#define REPETITIONS (1)
++#if 0
++typedef struct beep {
++	struct beep *next;
++	unsigned freq, length, delay, rep;
++} beep_t;
++static beep_t* new_beep(void) {
++	beep_t *beep = (beep_t*)xzalloc(sizeof(beep_t));
++	beep->freq = FREQ;
++	beep->length = LENGTH;
++	beep->delay = DELAY;
++	beep->rep = REPETITIONS;
++	return beep;
++}
++#endif
++#define GET_ARG do { if (!*++opt) opt = *++argv; } 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();
-+	llist_t *_freq = NULL, *_length = NULL, *_delay = NULL, *_rep = NULL;
 +	unsigned freq, length, delay, rep;
 +	unsigned long ioctl_arg;
-+	unsigned opt;
 +
-+	opt_complementary = "f::l::d::r::";
-+	opt = getopt32(argv, "f:l:d:r:n", &_freq, &_length, &_delay, &_rep);
++	NEW_BEEP()
++	while (*++argv) {
++		char *opt = *argv;
 +
-+	do {
-+		if (opt & OPT_f && _freq)
-+			freq = xatoul((char*)(llist_pop(&_freq)));
-+		else
-+			freq = FREQ;
-+		if (opt & OPT_l && _length)
-+			length = xatoul((char*)(llist_pop(&_length)));
-+		else
-+			length = LENGTH;
-+		if (opt & OPT_d && _delay)
-+			delay = xatoul((char*)(llist_pop(&_delay)));
-+		else
-+			delay = DELAY;
-+		if (opt & OPT_r && _rep)
-+			rep = xatoul((char*)(llist_pop(&_rep)));
-+		else
-+			rep = REPETITIONS;
++		while (*opt == '-')
++			++opt;
 +
++		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;
++			freq = xatoul(opt);
++			continue;
++		case 'n':
++			break;
++		default:
++			bb_show_usage();
++			break;
++		}
 +		while (rep) {
-+//bb_info_msg("rep[%d] freq=%d, length=%d, delay=%d\n", rep, freq, length, delay);
++//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);
@@ -145,7 +174,9 @@ index 0000000..4c25454
 +			if (rep--)
 +				usleep(delay);
 +		}
-+	} while (_freq || _length || _delay || _rep);
++		if (opt && *opt == 'n')
++			NEW_BEEP()
++	}
 +	if (ENABLE_FEATURE_CLEAN_UP)
 +		close(speaker);
 +	return EXIT_SUCCESS;
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index dc3cee488..0bf896cc1 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.14.3
-pkgrel=5
+pkgrel=6
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 license="GPL-2"
@@ -11,7 +11,7 @@ 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
+	0001-add-simple-beep-applet-second-version.patch
 	bb-tar-numeric-owner.patch
 	busybox-sed-3.patch
 	busyboxconfig"
@@ -49,7 +49,7 @@ build() {
 md5sums="d170bf5f97a41aec3a505eab690d5699  busybox-1.14.3.tar.bz2
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
 73d39c57483084298c7e46bdbbbea8d1  0001-install-compat-fix-for-mode-of-created-files.patch
-ba66abc89c56df842c9b81759c78d890  0001-add-simple-beep-applet.patch
+3ba0529f64aadae6ce95c683e6182988  0001-add-simple-beep-applet-second-version.patch
 0b5b2d7db201f90cd08f4a3164ee29a1  bb-tar-numeric-owner.patch
 b75c3f419f8392dfdadd92aa24fdba8c  busybox-sed-3.patch
 3ece68eb92d97f3362dab7d838074d10  busyboxconfig"
diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index bb0407876..363c2d47c 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=nmap 
-pkgver=4.76
-pkgrel=2
+pkgver=5.00
+pkgrel=0
 pkgdesc="A network exploration tool and security/port scanner"
 url="http:/nmap.org"
 license="custom:GPL"
-depends="pcre libpcap uclibc++ openssl lua"
+depends=
 makedepends="uclibc++-dev libpcap-dev openssl-dev lua-dev"
 install=
 subpackages="$pkgname-doc $pkgname-nse"
@@ -22,7 +22,7 @@ build() {
 		patch -p1 < $i || return 1
 	done
 
-	export CXX=g++-uc
+	export CXX=${CXX_UC:-g++-uc}
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -36,12 +36,14 @@ build() {
 	# install custom GPL2 license
 	install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
-
+ 
 nse() {
+	pkgdesc="nmap scripting engine"
 	mkdir -p "$subpkgdir"/usr/share/$pkgname
-	mv "$pkgdir"/usr/share/$pkgname/nselib "$subpkgdir"/usr/share/$pkgname/
-	mv "$pkgdir"/usr/share/$pkgname/scripts "$subpkgdir"/usr/share/$pkgname/
+	mv "$pkgdir"/usr/share/$pkgname/nselib \
+		"$pkgdir"/usr/share/$pkgname/scripts \
+		"$subpkgdir"/usr/share/$pkgname/
 }
 
-md5sums="54b5c9e3f44c1adde17df68170eb7cfe  nmap-4.76.tgz
+md5sums="6b5b28f421cae71fd2710c1247c8db66  nmap-5.00.tgz
 507b0936aaafaeddebad309b0924de39  nmap-4.53-uclibc++-output.cc.patch"
diff --git a/main/perl-archive-zip/APKBUILD b/main/perl-archive-zip/APKBUILD
index 7e8d32019..6ec65c473 100644
--- a/main/perl-archive-zip/APKBUILD
+++ b/main/perl-archive-zip/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Leonardo Arena <rnalrd@gmail.com>
 pkgname=perl-archive-zip
 _realname=Archive-Zip
-pkgver=1.26
+pkgver=1.30
 pkgrel=0
 pkgdesc="Provide a perl interface to ZIP archive files."
 url="http://search.cpan.org/dist/Archive-Zip/"
@@ -23,4 +23,4 @@ build() {
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-md5sums="a2e1cc1d99dbaebc41421295c93f61b5  Archive-Zip-1.26.tar.gz"
+md5sums="40153666e7538b410e001aa8a810e702  Archive-Zip-1.30.tar.gz"
diff --git a/main/perl-html-parser/APKBUILD b/main/perl-html-parser/APKBUILD
index 5e374b94f..8a3c48f6e 100644
--- a/main/perl-html-parser/APKBUILD
+++ b/main/perl-html-parser/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Leonardo Arena <rnalrd@gmail.com>
 pkgname=perl-html-parser
 _realname=HTML-Parser
-pkgver=3.60
+pkgver=3.61
 pkgrel=0
 pkgdesc="Parse section of HTML documents"
 url="http://search.cpan.org/~gaas/HTML-Parser-3.60/"
@@ -23,4 +23,4 @@ build() {
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-md5sums="fb97ea7e5bd832b079d8660732f9d8d9  HTML-Parser-3.60.tar.gz"
+md5sums="098d9551721d29d55a0a4ad83a3ebef5  HTML-Parser-3.61.tar.gz"
diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD
index 75fd70f3c..4a4ad4176 100644
--- a/main/sudo/APKBUILD
+++ b/main/sudo/APKBUILD
@@ -1,16 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sudo
-pkgver=1.7.2
+pkgver=1.7.2_p1
+_realver=1.7.2p1
 pkgrel=0
 pkgdesc="Give certain users the ability to run some commands as root"
 url="http://www.sudo.ws/sudo/"
 license='custom ISC'
 depends=
-source="ftp://ftp.sudo.ws/pub/sudo/$pkgname-$pkgver.tar.gz"
+source="ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_realver.tar.gz"
 subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgname-$_realver"
 
 	./configure --prefix=/usr \
 		--with-env-editor \
@@ -22,4 +23,4 @@ build() {
 	make -j1 DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="9caba8719c3e0f163880a05f02a48249  sudo-1.7.2.tar.gz"
+md5sums="4449d466a774f5ce401c9c0e3866c026  sudo-1.7.2p1.tar.gz"
diff --git a/main/uclibc++/001-path_to_make.patch b/main/uclibc++/001-path_to_make.patch
new file mode 100644
index 000000000..840dac326
--- /dev/null
+++ b/main/uclibc++/001-path_to_make.patch
@@ -0,0 +1,30 @@
+diff -ur old/Makefile dev/Makefile
+--- old/Makefile	Sat Oct 14 17:49:55 2006
++++ dev/Makefile	Sat Oct 14 17:50:18 2006
+@@ -1,4 +1,3 @@
+-MAKE    = make
+ SUBDIRS = bin include src
+ 
+ # User defines:
+@@ -43,10 +42,10 @@
+ #Menu configuration system
+ 
+ extra/config/conf:
+-	make -C extra/config conf
++	$(MAKE) -C extra/config conf
+ 
+ extra/config/mconf:
+-	make -C extra/config ncurses mconf
++	$(MAKE) -C extra/config ncurses mconf
+ 
+ menuconfig: extra/config/mconf
+ 	@./extra/config/mconf extra/Configs/Config.in
+@@ -71,7 +70,7 @@
+ 
+ include/system_configuration.h: .config
+ 	@if [ ! -x ./extra/config/conf ] ; then \
+-		make -C extra/config conf; \
++		$(MAKE) -C extra/config conf; \
+ 	fi;
+ 	@./extra/config/conf -o extra/Configs/Config.in
+ 
diff --git a/main/uclibc++/002-no_bash.patch b/main/uclibc++/002-no_bash.patch
new file mode 100644
index 000000000..69b2275a5
--- /dev/null
+++ b/main/uclibc++/002-no_bash.patch
@@ -0,0 +1,12 @@
+diff -ur old/bin/Makefile dev/bin/Makefile
+--- old/bin/Makefile	Sat Oct 14 17:49:54 2006
++++ dev/bin/Makefile	Sat Oct 14 17:57:33 2006
+@@ -13,7 +13,7 @@
+ 	$(INSTALL) -m 755 $(WRAPPER) $(PREFIX)$(UCLIBCXX_RUNTIME_BINDIR)
+ 
+ $(WRAPPER):
+-	echo "#!/bin/bash" > $(WRAPPER)
++	echo "#!/bin/sh" > $(WRAPPER)
+ 	echo "" >> $(WRAPPER)
+ 	echo 'WRAPPER_INCLUDEDIR="$${WRAPPER_INCLUDEDIR:=-I$(UCLIBCXX_RUNTIME_INCLUDEDIR)}"' >> $(WRAPPER)
+ 	echo 'WRAPPER_LIBDIR="$${WRAPPER_LIBDIR:=-L$(UCLIBCXX_RUNTIME_LIBDIR)}"' >> $(WRAPPER)
diff --git a/main/uclibc++/003-cp_command.patch b/main/uclibc++/003-cp_command.patch
new file mode 100644
index 000000000..53d0ed7af
--- /dev/null
+++ b/main/uclibc++/003-cp_command.patch
@@ -0,0 +1,19 @@
+diff -ur old/src/Makefile dev/src/Makefile
+--- old/src/Makefile	Sat Oct 14 17:49:54 2006
++++ dev/src/Makefile	Sat Oct 14 18:02:30 2006
+@@ -25,12 +25,14 @@
+ 
+ all:	libgcc_eh libsupc $(EXOBJS) $(ALLBIN)
+ 
++CP = cp -fPR
++
+ install:
+ 	$(INSTALL) -d $(PREFIX)$(UCLIBCXX_RUNTIME_LIBDIR)
+ ifneq ($(BUILD_ONLY_STATIC_LIB),y)
+ 	$(INSTALL) -m 755 $(SHARED_FULLNAME) \
+ 		$(PREFIX)$(UCLIBCXX_RUNTIME_LIBDIR)
+-	cp -fa $(SHARED_MAJORNAME) $(LIBNAME).so $(PREFIX)$(UCLIBCXX_RUNTIME_LIBDIR)
++	$(CP) $(SHARED_MAJORNAME) $(LIBNAME).so $(PREFIX)$(UCLIBCXX_RUNTIME_LIBDIR)
+ endif
+ ifeq ($(BUILD_STATIC_LIB),y)
+ 	$(INSTALL) -m 644 $(LIBNAME).a $(PREFIX)$(UCLIBCXX_RUNTIME_LIBDIR)
diff --git a/main/uclibc++/004-ccache_fixes.patch b/main/uclibc++/004-ccache_fixes.patch
new file mode 100644
index 000000000..10ceb792b
--- /dev/null
+++ b/main/uclibc++/004-ccache_fixes.patch
@@ -0,0 +1,24 @@
+diff -ruN uClibc++-0.2.2-old/src/abi/libgcc_eh/Makefile uClibc++-0.2.2-new/src/abi/libgcc_eh/Makefile
+--- uClibc++-0.2.2-old/src/abi/libgcc_eh/Makefile	2007-06-04 00:51:13.000000000 +0200
++++ uClibc++-0.2.2-new/src/abi/libgcc_eh/Makefile	2007-09-03 21:51:07.000000000 +0200
+@@ -16,7 +16,7 @@
+ #
+ #else
+ #	echo Binary
+-	$(AR) x $(shell CC=$(CC) $(TOPDIR)/scripts/find_libgcc_eh.sh)
++	$(AR) x $(shell CC="$(CC)" $(TOPDIR)/scripts/find_libgcc_eh.sh)
+ #endif
+ #endif
+ 
+diff -ruN uClibc++-0.2.2-old/src/abi/libsupc/Makefile uClibc++-0.2.2-new/src/abi/libsupc/Makefile
+--- uClibc++-0.2.2-old/src/abi/libsupc/Makefile	2007-06-04 00:51:13.000000000 +0200
++++ uClibc++-0.2.2-new/src/abi/libsupc/Makefile	2007-09-03 21:51:17.000000000 +0200
+@@ -14,7 +14,7 @@
+ #
+ #else
+ #	echo Binary
+-	$(AR) x $(shell CC=$(CC) $(TOPDIR)/scripts/find_libsupc.sh)
++	$(AR) x $(shell CC="$(CC)" $(TOPDIR)/scripts/find_libsupc.sh)
+ 	$(RM) -f new_op*.o del_op*.o pure.o new_handler.o eh_alloc.o eh_globals.o
+ #
+ #endif
diff --git a/main/uclibc++/005-wrapper.patch b/main/uclibc++/005-wrapper.patch
new file mode 100644
index 000000000..b526a901f
--- /dev/null
+++ b/main/uclibc++/005-wrapper.patch
@@ -0,0 +1,12 @@
+diff -ruN uClibc++-0.2.2-old/bin/Makefile uClibc++-0.2.2-new/bin/Makefile
+--- uClibc++-0.2.2-old/bin/Makefile	2007-09-23 13:46:10.000000000 +0200
++++ uClibc++-0.2.2-new/bin/Makefile	2007-09-23 13:47:03.000000000 +0200
+@@ -25,7 +25,7 @@
+ 	echo 'while [ -n "$$1" ]' >> $(WRAPPER)
+ 	echo 'do' >> $(WRAPPER)
+ 	echo '	WRAPPER_OPTIONS="$$WRAPPER_OPTIONS $$1"' >> $(WRAPPER)
+-	echo '	if [ "$$1" = "-c" -o "$$1" = "-E" -o "$$1" = "-S" ]' >> $(WRAPPER)
++	echo '	if [ "$$1" = "-c" -o "$$1" = "-E" -o "$$1" = "-S" -o "$$1" = "-MF" ]' >> $(WRAPPER)
+ 	echo '	then' >> $(WRAPPER)
+ 	echo '		WRAPPER_INCLIB="N"' >> $(WRAPPER)
+ 	echo '	fi' >> $(WRAPPER)
diff --git a/main/uclibc++/006-eabi_fix.patch b/main/uclibc++/006-eabi_fix.patch
new file mode 100644
index 000000000..bc970a716
--- /dev/null
+++ b/main/uclibc++/006-eabi_fix.patch
@@ -0,0 +1,42 @@
+Index: uClibc++-0.2.2/include/typeinfo
+===================================================================
+--- uClibc++-0.2.2.orig/include/typeinfo	2008-02-13 00:37:04.000000000 +0100
++++ uClibc++-0.2.2/include/typeinfo	2008-02-13 00:37:34.000000000 +0100
+@@ -44,6 +44,7 @@
+   class __class_type_info;
+ } // namespace __cxxabiv1
+ 
++#ifndef __GXX_MERGED_TYPEINFO_NAMES
+ #if !__GXX_WEAK__
+   // If weak symbols are not supported, typeinfo names are not merged.
+   #define __GXX_MERGED_TYPEINFO_NAMES 0
+@@ -51,6 +52,7 @@
+   // On platforms that support weak symbols, typeinfo names are merged.
+   #define __GXX_MERGED_TYPEINFO_NAMES 1
+ #endif
++#endif
+ 
+ namespace std 
+ {
+Index: uClibc++-0.2.2/include/unwind-cxx.h
+===================================================================
+--- uClibc++-0.2.2.orig/include/unwind-cxx.h	2008-02-13 00:38:04.000000000 +0100
++++ uClibc++-0.2.2/include/unwind-cxx.h	2008-02-13 00:40:32.000000000 +0100
+@@ -135,6 +135,7 @@
+ 

+ // This is the exception class we report -- "GNUCC++\0".

+ const _Unwind_Exception_Class __gxx_exception_class

++#ifndef __ARM_EABI_UNWINDER__

+ = ((((((((_Unwind_Exception_Class) 'G' 

+ 	 << 8 | (_Unwind_Exception_Class) 'N')

+ 	<< 8 | (_Unwind_Exception_Class) 'U')

+@@ -143,6 +144,9 @@
+      << 8 | (_Unwind_Exception_Class) '+')

+     << 8 | (_Unwind_Exception_Class) '+')

+    << 8 | (_Unwind_Exception_Class) '\0');

++#else

++= "GNUC++";

++#endif

+ 

+ // GNU C++ personality routine, Version 0.

+ extern "C" _Unwind_Reason_Code __gxx_personality_v0

diff --git a/main/uclibc++/007-numeric_limits.patch b/main/uclibc++/007-numeric_limits.patch
new file mode 100644
index 000000000..1ed7d6c6e
--- /dev/null
+++ b/main/uclibc++/007-numeric_limits.patch
@@ -0,0 +1,66 @@
+Index: uClibc++-0.2.2/include/limits
+===================================================================
+--- uClibc++-0.2.2/include/limits	(revision 1877)
++++ uClibc++-0.2.2/include/limits	(revision 1878)
+@@ -143,6 +143,53 @@
+ 	static T signaling_NaN();
+ };
+ 
++template <> class numeric_limits<bool> {
++public:
++	typedef bool T;
++	// General -- meaningful for all specializations.
++	static const bool is_specialized = true;
++	static T min(){
++		return false;
++	}
++	static T max(){
++		return true;
++	}
++	static const int radix = 2;
++	static const int digits = 1;
++	static const int digits10 = 0;
++	static const bool is_signed = false;
++	static const bool is_integer = true;
++	static const bool is_exact = true;
++	static const bool traps = false;
++	static const bool is_modulo = false;
++	static const bool is_bounded = true;
++
++	// Floating point specific.
++
++	static T epsilon(){
++		return 0;
++	}
++	static T round_error(){
++		return 0;
++	}
++	static const int min_exponent10 = 0;
++	static const int max_exponent10 = 0;
++	static const int min_exponent = 0;
++
++	static const int max_exponent = 0;
++	static const bool has_infinity = false;
++	static const bool has_quiet_NaN = false;
++	static const bool has_signaling_NaN = false;
++	static const bool is_iec559 = false;
++	static const bool has_denorm = false;
++	static const bool tinyness_before = false;
++	static const float_round_style round_style = round_indeterminate;
++	static T denorm_min();
++	static T infinity();
++	static T quiet_NaN();
++	static T signaling_NaN();
++};
++
+ template <> class numeric_limits<unsigned char> {
+ public:
+ 	typedef unsigned char T;
+@@ -567,6 +614,7 @@
+ };
+ 
+ template <> class numeric_limits<double> {
++public:
+ 	typedef double numeric_type;
+ 
+ 	static const bool is_specialized = true;
diff --git a/main/uclibc++/008-integer_width.patch b/main/uclibc++/008-integer_width.patch
new file mode 100644
index 000000000..c467e6011
--- /dev/null
+++ b/main/uclibc++/008-integer_width.patch
@@ -0,0 +1,314 @@
+Index: uClibc++-0.2.2/include/ostream
+===================================================================
+--- uClibc++-0.2.2/include/ostream	(revision 708)
++++ uClibc++-0.2.2/include/ostream	(revision 709)
+@@ -129,6 +129,18 @@
+ 			return *this;
+ 		}
+ 
++		_UCXXEXPORT void printout(const char_type* s, streamsize n)
++                {
++                  int extra = ios::width() - n;
++                  if ((ios::flags()&ios::adjustfield) == ios::right)
++                    while (extra-- > 0)
++                      put(ios::fill());
++                  write(s, n);
++                  if ((ios::flags()&ios::adjustfield) == ios::left)
++                    while (extra-- > 0)
++                      put(ios::fill());
++                }
++
+ 	protected:
+ 		basic_ostream(const basic_ostream<charT,traits> &){ }
+ 		basic_ostream<charT,traits> & operator=(const basic_ostream<charT,traits> &){ return *this; }
+@@ -142,15 +154,15 @@
+ 		sentry s(*this);
+ 		if( basic_ios<charT,traits>::flags() & ios_base::boolalpha){
+ 			if(n){
+-				write("true", 4);
++				printout("true", 4);
+ 			}else{
+-				write("false", 5);
++				printout("false", 5);
+ 			}
+ 		}else{
+ 			if(n){
+-				write("1", 1);
++				printout("1", 1);
+ 			}else{
+-				write("0", 1);
++				printout("0", 1);
+ 			}
+ 		}
+ 		if(basic_ios<charT,traits>::flags() & ios_base::unitbuf){
+@@ -219,7 +231,7 @@
+ 	template <class charT, class traits> _UCXXEXPORT basic_ostream<charT,traits>& basic_ostream<charT, traits>::operator<<(void* p){
+ 		sentry s(*this);
+ 		char buffer[20];
+-		write(buffer, snprintf(buffer, 20, "%p", p) );
++		printout(buffer, snprintf(buffer, 20, "%p", p) );
+ 		if(basic_ios<charT,traits>::flags() & ios_base::unitbuf){
+ 			flush();
+ 		}
+@@ -356,7 +368,7 @@
+ 		operator<<(basic_ostream<charT,traits>& out, const charT* c)
+ 	{
+ 		typename basic_ostream<charT,traits>::sentry s(out);
+-		out.write(c, traits::length(c) );
++		out.printout(c, traits::length(c) );
+ 		return out;
+ 	}
+ 	
+@@ -364,7 +376,7 @@
+ 		operator<<(basic_ostream<charT,traits>& out, const char* c)
+ 	{
+ 		typename basic_ostream<charT,traits>::sentry s(out);
+-		out.write(c, char_traits<char>::length(c) );
++		out.printout(c, char_traits<char>::length(c) );
+ 		return out;
+ 	}
+ 
+@@ -373,7 +385,7 @@
+ 		operator<<(basic_ostream<char,traits>& out, const char* c)
+ 	{
+ 		typename basic_ostream<char,traits>::sentry s(out);
+-		out.write(c, traits::length(c));
++		out.printout(c, traits::length(c));
+ 		return out;
+ 	}
+ 
+@@ -389,7 +401,7 @@
+ 			temp[i] = out.widen(c[i]);
+ 		}
+ 
+-		out.write(temp, numChars);
++		out.printout(temp, numChars);
+ 		return out;
+ 	}
+ #endif
+@@ -399,7 +411,7 @@
+ 		operator<<(basic_ostream<char,traits>& out, const signed char* c)
+ 	{
+ 		typename basic_ostream<char,traits>::sentry s(out);
+-		out.write(reinterpret_cast<const char *>(c), traits::length( reinterpret_cast<const char *>(c)));
++		out.printout(reinterpret_cast<const char *>(c), traits::length( reinterpret_cast<const char *>(c)));
+ 		return out;
+ 	}
+ 	
+@@ -407,7 +419,7 @@
+ 		operator<<(basic_ostream<char,traits>& out, const unsigned char* c)
+ 	{
+ 		typename basic_ostream<char,traits>::sentry s(out);
+-		out.write(reinterpret_cast<const char *>(c), traits::length( reinterpret_cast<const char *>(c)));
++		out.printout(reinterpret_cast<const char *>(c), traits::length( reinterpret_cast<const char *>(c)));
+ 		return out;
+ 	}
+ 
+Index: uClibc++-0.2.2/include/ostream_helpers
+===================================================================
+--- uClibc++-0.2.2/include/ostream_helpers	(revision 708)
++++ uClibc++-0.2.2/include/ostream_helpers	(revision 709)
+@@ -88,7 +88,7 @@
+ 				}
+ 			}
+ 
+-			stream.write(buffer, snprintf(buffer, 20, formatString, n) );
++			stream.printout(buffer, snprintf(buffer, 20, formatString, n) );
+ 
+ 			if(stream.flags() & ios_base::unitbuf){
+ 				stream.flush();
+@@ -135,7 +135,7 @@
+ 				}
+ 			}
+ 
+-			stream.write(buffer, snprintf(buffer, 20, formatString, n));
++			stream.printout(buffer, snprintf(buffer, 20, formatString, n));
+ 			if(stream.flags() & ios_base::unitbuf){
+ 				stream.flush();
+ 			}
+@@ -182,7 +182,7 @@
+ 				}
+ 			}
+ 
+-			stream.write(buffer, snprintf(buffer, 27, formatString, n) );
++			stream.printout(buffer, snprintf(buffer, 27, formatString, n) );
+ 
+ 			if(stream.flags() & ios_base::unitbuf){
+ 				stream.flush();
+@@ -228,7 +228,7 @@
+ 				}
+ 			}
+ 
+-			stream.write(buffer, snprintf(buffer, 27, formatString, n) );
++			stream.printout(buffer, snprintf(buffer, 27, formatString, n) );
+ 
+ 			if(stream.flags() & ios_base::unitbuf){
+ 				stream.flush();
+@@ -256,7 +256,7 @@
+ 			} else {
+ 				length = snprintf(buffer, 32, "%*.*g",static_cast<int>(stream.width()),static_cast<int>(stream.precision()), f);
+ 			}
+-			stream.write(buffer, length);
++			stream.printout(buffer, length);
+ 			if(stream.flags() & ios_base::unitbuf){
+ 				stream.flush();
+ 			}
+@@ -280,7 +280,7 @@
+ 			} else {
+ 				length = snprintf(buffer, 32, "%*.*Lg", static_cast<int>(stream.width()), static_cast<int>(stream.precision()), f);
+ 			}
+-			stream.write(buffer, length);
++			stream.printout(buffer, length);
+ 			if(stream.flags() & ios_base::unitbuf){
+ 				stream.flush();
+ 			}
+@@ -295,25 +295,25 @@
+ 		{
+ 			wchar_t buffer[20];
+ 			if( stream.flags() & ios_base::dec){
+-				stream.write(buffer, swprintf(buffer, 20, L"%ld", n));
++				stream.printout(buffer, swprintf(buffer, 20, L"%ld", n));
+ 			}else if( stream.flags() & ios_base::oct){
+ 				if( stream.flags() & ios_base::showbase){
+-					stream.write(buffer, swprintf(buffer, 20, L"%#lo", n));
++					stream.printout(buffer, swprintf(buffer, 20, L"%#lo", n));
+ 				}else{
+-					stream.write(buffer, swprintf(buffer, 20, L"%lo", n) );
++					stream.printout(buffer, swprintf(buffer, 20, L"%lo", n) );
+ 				}
+ 			}else if (stream.flags() & ios_base::hex){
+ 				if(stream.flags() & ios_base::showbase){
+ 					if(stream.flags() & ios_base::uppercase){
+-						stream.write(buffer, swprintf(buffer, 20, L"%#lX", n) );
++						stream.printout(buffer, swprintf(buffer, 20, L"%#lX", n) );
+ 					}else{
+-						stream.write(buffer, swprintf(buffer, 20, L"%#lx", n) );
++						stream.printout(buffer, swprintf(buffer, 20, L"%#lx", n) );
+ 					}
+ 				}else{
+ 					if(stream.flags() & ios_base::uppercase){
+-						stream.write(buffer, swprintf(buffer, 20, L"%lX", n) );
++						stream.printout(buffer, swprintf(buffer, 20, L"%lX", n) );
+ 					}else{
+-						stream.write(buffer, swprintf(buffer, 20, L"%lx", n) );
++						stream.printout(buffer, swprintf(buffer, 20, L"%lx", n) );
+ 					}
+ 				}
+ 			}
+@@ -329,25 +329,25 @@
+ 		{
+ 			wchar_t buffer[20];
+ 			if( stream.flags() & ios_base::dec){
+-				stream.write(buffer, swprintf(buffer, 20, L"%lu", n));
++				stream.printout(buffer, swprintf(buffer, 20, L"%lu", n));
+ 			}else if( stream.flags() & ios_base::oct){
+ 				if( stream.flags() & ios_base::showbase){
+-					stream.write(buffer, swprintf(buffer, 20, L"%#lo", n));
++					stream.printout(buffer, swprintf(buffer, 20, L"%#lo", n));
+ 				}else{
+-					stream.write(buffer, swprintf(buffer, 20, L"%lo", n) );
++					stream.printout(buffer, swprintf(buffer, 20, L"%lo", n) );
+ 				}
+ 			}else if (stream.flags() & ios_base::hex){
+ 				if(stream.flags() & ios_base::showbase){
+ 					if(stream.flags() & ios_base::uppercase){
+-						stream.write(buffer, swprintf(buffer, 20, L"%#lX", n) );
++						stream.printout(buffer, swprintf(buffer, 20, L"%#lX", n) );
+ 					}else{
+-						stream.write(buffer, swprintf(buffer, 20, L"%#lx", n) );
++						stream.printout(buffer, swprintf(buffer, 20, L"%#lx", n) );
+ 					}
+ 				}else{
+ 					if(stream.flags() & ios_base::uppercase){
+-						stream.write(buffer, swprintf(buffer, 20, L"%lX", n) );
++						stream.printout(buffer, swprintf(buffer, 20, L"%lX", n) );
+ 					}else{
+-						stream.write(buffer, swprintf(buffer, 20, L"%lx", n) );
++						stream.printout(buffer, swprintf(buffer, 20, L"%lx", n) );
+ 					}
+ 				}
+ 			}
+@@ -365,25 +365,25 @@
+ 		{
+ 			wchar_t buffer[28];
+ 			if( stream.flags() & ios_base::dec){
+-				stream.write(buffer, swprintf(buffer, 27, L"%lld", n));
++				stream.printout(buffer, swprintf(buffer, 27, L"%lld", n));
+ 			}else if( stream.flags() & ios_base::oct){
+ 				if( stream.flags() & ios_base::showbase){
+-					stream.write(buffer, swprintf(buffer, 27, L"%#llo", n));
++					stream.printout(buffer, swprintf(buffer, 27, L"%#llo", n));
+ 				}else{
+-					stream.write(buffer, swprintf(buffer, 27, L"%llo", n) );
++					stream.printout(buffer, swprintf(buffer, 27, L"%llo", n) );
+ 				}
+ 			}else if (stream.flags() & ios_base::hex){
+ 				if(stream.flags() & ios_base::showbase){
+ 					if(stream.flags() & ios_base::uppercase){
+-						stream.write(buffer, swprintf(buffer, 27, L"%#llX", n) );
++						stream.printout(buffer, swprintf(buffer, 27, L"%#llX", n) );
+ 					}else{
+-						stream.write(buffer, swprintf(buffer, 27, L"%#llx", n) );
++						stream.printout(buffer, swprintf(buffer, 27, L"%#llx", n) );
+ 					}
+ 				}else{
+ 					if(stream.flags() & ios_base::uppercase){
+-						stream.write(buffer, swprintf(buffer, 27, L"%llX", n) );
++						stream.printout(buffer, swprintf(buffer, 27, L"%llX", n) );
+ 					}else{
+-						stream.write(buffer, swprintf(buffer, 27, L"%llx", n) );
++						stream.printout(buffer, swprintf(buffer, 27, L"%llx", n) );
+ 					}
+ 				}
+ 			}
+@@ -399,25 +399,25 @@
+ 		{
+ 			wchar_t buffer[28];
+ 			if( stream.flags() & ios_base::dec){
+-				stream.write(buffer, swprintf(buffer, 27, L"%llu", n));
++				stream.printout(buffer, swprintf(buffer, 27, L"%llu", n));
+ 			}else if( stream.flags() & ios_base::oct){
+ 				if( stream.flags() & ios_base::showbase){
+-					stream.write(buffer, swprintf(buffer, 27, L"%#llo", n));
++					stream.printout(buffer, swprintf(buffer, 27, L"%#llo", n));
+ 				}else{
+-					stream.write(buffer, swprintf(buffer, 27, L"%llo", n) );
++					stream.printout(buffer, swprintf(buffer, 27, L"%llo", n) );
+ 				}
+ 			}else if (stream.flags() & ios_base::hex){
+ 				if(stream.flags() & ios_base::showbase){
+ 					if(stream.flags() & ios_base::uppercase){
+-						stream.write(buffer, swprintf(buffer, 27, L"%#llX", n) );
++						stream.printout(buffer, swprintf(buffer, 27, L"%#llX", n) );
+ 					}else{
+-						stream.write(buffer, swprintf(buffer, 27, L"%#llx", n) );
++						stream.printout(buffer, swprintf(buffer, 27, L"%#llx", n) );
+ 					}
+ 				}else{
+ 					if(stream.flags() & ios_base::uppercase){
+-						stream.write(buffer, swprintf(buffer, 27, L"%llX", n) );
++						stream.printout(buffer, swprintf(buffer, 27, L"%llX", n) );
+ 					}else{
+-						stream.write(buffer, swprintf(buffer, 27, L"%llx", n) );
++						stream.printout(buffer, swprintf(buffer, 27, L"%llx", n) );
+ 					}
+ 				}
+ 			}
+@@ -447,7 +447,7 @@
+ 			} else {
+ 				swprintf(format_string, 32, L"%%%u.%ug", static_cast<int>(stream.width()), static_cast<unsigned int>(stream.precision()));
+ 			}
+-			stream.write(buffer, swprintf(buffer, 32, format_string, f) );
++			stream.printout(buffer, swprintf(buffer, 32, format_string, f) );
+ 			if(stream.flags() & ios_base::unitbuf){
+ 				stream.flush();
+ 			}
+@@ -471,7 +471,7 @@
+ 			} else {
+ 				swprintf(format_string, 32, L"%%%u.%uLg", static_cast<unsigned int>(stream.width()), static_cast<unsigned int>(stream.precision()));
+ 			}
+-			stream.write(buffer, swprintf(buffer, 32, format_string, f) );
++			stream.printout(buffer, swprintf(buffer, 32, format_string, f) );
+ 			if(stream.flags() & ios_base::unitbuf){
+ 				stream.flush();
+ 			}
diff --git a/main/uclibc++/900-dependent_exception.patch b/main/uclibc++/900-dependent_exception.patch
new file mode 100644
index 000000000..3a5cb7dbc
--- /dev/null
+++ b/main/uclibc++/900-dependent_exception.patch
@@ -0,0 +1,68 @@
+--- a/src/eh_alloc.cpp	2007-06-03 23:51:13.000000000 +0100
++++ b/src/eh_alloc.cpp	2009-07-13 09:42:39.000000000 +0100
+@@ -42,4 +42,21 @@
+ 	free( (char *)(vptr) - sizeof(__cxa_exception) );
+ }
+ 
++#if __GNUC__ * 100 + __GNUC_MINOR__ >= 404
++extern "C" __cxa_dependent_exception* __cxa_allocate_dependent_exception() throw(){
++	__cxa_dependent_exception *retval;
++
++	retval = static_cast<__cxa_dependent_exception*>(malloc(sizeof(__cxa_dependent_exception)));
++	if(0 == retval){
++		std::terminate();
++	}
++	memset (retval, 0, sizeof(__cxa_dependent_exception));
++	return retval ;
++}
++
++extern "C" void __cxa_free_dependent_exception(__cxa_dependent_exception *vptr) throw(){
++	free( vptr );
++}
++#endif
++
+ }
+--- a/include/unwind-cxx.h	2009-07-13 10:01:11.000000000 +0100
++++ b/include/unwind-cxx.h	2009-07-13 10:14:08.000000000 +0100
+@@ -79,6 +79,41 @@
+   _Unwind_Exception unwindHeader;

+ };

+ 

++#if __GNUC__ * 100 + __GNUC_MINOR__ >= 404

++// A dependent C++ exception object consists of a wrapper around an unwind

++// object header with additional C++ specific information, containing a pointer

++// to a primary exception object.

++

++struct __cxa_dependent_exception

++{

++  // The primary exception this thing depends on.

++  void *primaryException;

++

++  // The C++ standard has entertaining rules wrt calling set_terminate

++  // and set_unexpected in the middle of the exception cleanup process.

++  std::unexpected_handler unexpectedHandler;

++  std::terminate_handler terminateHandler;

++

++  // The caught exception stack threads through here.

++  __cxa_exception *nextException;

++

++  // How many nested handlers have caught this exception.  A negated

++  // value is a signal that this object has been rethrown.

++  int handlerCount;

++

++  // Cache parsed handler data from the personality routine Phase 1

++  // for Phase 2 and __cxa_call_unexpected.

++  int handlerSwitchValue;

++  const unsigned char *actionRecord;

++  const unsigned char *languageSpecificData;

++  _Unwind_Ptr catchTemp;

++  void *adjustedPtr;

++

++  // The generic exception header.  Must be last.

++  _Unwind_Exception unwindHeader;

++};

++

++#endif

+ // Each thread in a C++ program has access to a __cxa_eh_globals object.

+ struct __cxa_eh_globals

+ {

diff --git a/main/uclibc++/APKBUILD b/main/uclibc++/APKBUILD
index e6545e482..6a40ba549 100644
--- a/main/uclibc++/APKBUILD
+++ b/main/uclibc++/APKBUILD
@@ -1,14 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=uclibc++
 pkgver=0.2.2
-pkgrel=3
+pkgrel=5
 pkgdesc="Embedded C++ library"
 url="http://cxx.uclibc.org/"
 license='GPL-2'
 depends=
-makedepends=
+makedepends="bash"
 subpackages="$pkgname-dev"
 source="http://cxx.uclibc.org/src/uClibc++-$pkgver.tar.bz2
+	001-path_to_make.patch
+	002-no_bash.patch
+	003-cp_command.patch
+	004-ccache_fixes.patch
+	005-wrapper.patch
+	006-eabi_fix.patch
+	007-numeric_limits.patch
+	008-integer_width.patch
+	900-dependent_exception.patch
 	associative_base.patch
 	uclibc++-gcc-4.3.patch
 	uclibc++config
@@ -42,6 +51,15 @@ dev() {
 
 
 md5sums="1ceef3209cca88be8f1bd9de99735954  uClibc++-0.2.2.tar.bz2
+ce1016fb83c23c83486f35f4cd1b64ab  001-path_to_make.patch
+2a9bee5e88bf94d3870517891d5129d6  002-no_bash.patch
+8068b394de053ed94a742d1ed9657b99  003-cp_command.patch
+363dc1cd86052f44212c2f3ac15926da  004-ccache_fixes.patch
+3689f8d77984ca66554e14cacbeb796c  005-wrapper.patch
+99e625748c0e6d5fc7cef8484cbac587  006-eabi_fix.patch
+d335b8f1c9d4682a220a082a371277e4  007-numeric_limits.patch
+2c431d4ad46a244f2f50baf40b85f7d2  008-integer_width.patch
+4e9c416c2a107f7d814f938fa57901a5  900-dependent_exception.patch
 5689baa3f3bf8488c0a5d27a690d30fa  associative_base.patch
 4c7b499e4697225378acef25f6364e9b  uclibc++-gcc-4.3.patch
 2f573c1e2a0c7a320ea4685cc3ce9e2a  uclibc++config"
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index b4ecb2a1d..a6ce2f622 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vim
 _srcver=7.2
-_patchver=234
+_patchver=245
 pkgver=$_srcver.$_patchver
 pkgrel=1
 pkgdesc="advanced text editor"
@@ -249,6 +249,17 @@ source="ftp://ftp.vim.org/pub/vim/unix/vim-7.2.tar.bz2
 	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.232
 	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.233
 	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.234
+	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.235
+	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.236
+	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.237
+	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.238
+	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.239
+	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.240
+	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.241
+	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.242
+	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.243
+	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.244
+	ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.245
 	"
 
 # this generates the patches list
@@ -282,6 +293,7 @@ build() {
 
 md5sums="f0901284b338e448bfd79ccca0041254  vim-7.2.tar.bz2
 35e04482f07c57221c9a751aaa3b8dac  vim-7.2-extra.tar.gz
+97aecde2ab504e543a96bec84b3b5638  vimrc
 7c2dc4a956cf315e546e347bc349968c  7.2.001
 7f16f80814f1e071a689806c2056b39d  7.2.002
 0de916fdfd450a4a0d95bed44ae2c398  7.2.003
@@ -516,4 +528,14 @@ b97e5d33fa4fb8a1ea1308558bb33d41  7.2.228
 5e5cfa4e5ee34cbbdd01c27ece1b7398  7.2.232
 9fa12db95776e9174ca7c95172a48838  7.2.233
 a46776a6914ec2972ada91b33b0cfb39  7.2.234
-97aecde2ab504e543a96bec84b3b5638  vimrc"
+4121105bf052ebac02bd9891c232137a  7.2.235
+e9ca47c42d7de7b27910e3b35e533ecd  7.2.236
+f48f3e3f58a7a82a1c14fd61072c69f0  7.2.237
+5b9cc79b5448fb71ac1b2870a861119d  7.2.238
+28a8a33a3e2ceef51f838c2dc9fceac2  7.2.239
+212989ec4f90d697183c7cfb363cd453  7.2.240
+45f0effee324a20881e254c1b59dd5f8  7.2.241
+464fc788e592b19cd4d8a21d3d8b789e  7.2.242
+eb8132b8f89393e7f39734e607fc3925  7.2.243
+15c654c51220c2ad94b47d6013626aef  7.2.244
+d5ecb198dfea237e96b5ae12b9381383  7.2.245"