patches and update for gcc 4.4.0 allmodconfig

* update gcc to 4.4.0
* update gnutls and ruby
* fix c++ issues for some packages

21 files changed, 253 insertions, 76 deletions

diff --git a/package/Config.in b/package/Config.in
index 2f2dad1ec..450ecaf00 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -340,7 +340,7 @@ source "package/aircrack-ng/Config.in"
 source "package/chillispot/Config.in"
 source "package/hostapd/Config.in"
 source "package/iw/Config.in"
-source "package/kismet/Config.in"
+#source "package/kismet/Config.in"
 source "package/nocatsplash/Config.in"
 source "package/olsrd/Config.in"
 source "package/snort-wireless/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
index 70650cccc..6d30f7320 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -100,12 +100,14 @@ libshout-compile: libvorbis-compile
 libtorrent-compile: openssl-compile libsigc++-compile
 libvorbis-compile: libogg-compile
 libfontenc-compile: xproto-compile zlib-compile
+libICE-compile: xtrans-compile
 libSM-compile: libICE-compile
 libXt-compile: libSM-compile
 libXmu-compile: libXt-compile
+libXext-compile: libX11-compile
 libXaw-compile: libXext-compile libXmu-compile libXpm-compile
 libX11-compile: xproto-compile xextproto-compile xtrans-compile libXdmcp-compile \
-	libXau-compile libXaw-compile xcmiscproto-compile bigreqsproto-compile kbproto-compile \
+	libXau-compile xcmiscproto-compile bigreqsproto-compile kbproto-compile \
 	inputproto-compile
 libXfont-compile: freetype-compile fontcacheproto-compile fontsproto-compile libfontenc-compile
 libxml2-compile: zlib-compile
@@ -132,7 +134,7 @@ endif
 mt-daapd-compile: libgdbm-compile libid3tag-compile
 mtr-compile: ncurses-compile
 mutt-compile: ncurses-compile openssl-compile
-mysql-compile: ncurses-compile zlib-compile
+mysql-compile: ncurses-compile zlib-compile readline-compile
 nano-compile: ncurses-compile
 neon-compile: libpthread-compile libxml2-compile openssl-compile zlib-compile
 net-snmp-compile: libelf-compile
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index cfc6ed4f0..ffe1125b0 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -82,6 +82,24 @@ config ADK_PACKAGE_LIBGNUTLSXX
 
 	  This packages contains the GnuTLS C++ shared library.
 
+choice
+prompt "C++ library to use"
+depends on ADK_PACKAGE_LIBGNUTLSXX
+default ADK_COMPILE_GNUTLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_GNUTLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
+
+config ADK_COMPILE_GNUTLS_WITH_STDCXX
+	bool "Standard C++ library"
+	select ADK_PACKAGE_LIBSTDCXX
+	help
+
+config ADK_COMPILE_GNUTLS_WITH_UCLIBCXX
+	bool "Embedded uClibc++ library"
+	select ADK_PACKAGE_UCLIBCXX
+	help
+
+endchoice
+
 config ADK_PACKAGE_GNUTLS_UTILS
 	prompt "gnutls-utils...................... The GNU TLS utilities"
 	tristate
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 1a46a3b3a..6e04ee823 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -6,9 +6,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gnutls
-PKG_VERSION:=		2.6.2
+PKG_VERSION:=		2.6.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f42e7342cf9c12755577d207fffa9713
+PKG_MD5SUM:=		ca2489e29f9dc313a79b9747bb1090e5
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 MASTER_SITES:=		${MASTER_SITE_GNU:=gnutls/}
 
@@ -18,7 +18,15 @@ $(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${A
 $(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 $(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPENDS}))
+
+ifeq (${ADK_COMPILE_GNUTLS_WITH_UCLIBCXX},y)
+TCXXFLAGS+=		-fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
+TLDFLAGS+=		-nodefaultlibs -luClibc++
+PKG_DEPENDS:=		uclibc++
+else
+PKG_DEPENDS:=		libstdcxx
+endif
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--without-libopencdk-prefix \
@@ -26,6 +34,13 @@ CONFIGURE_ARGS+=	--without-libopencdk-prefix \
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
+ifeq (${ADK_COMPILE_GNUTLS_WITH_UCLIBCXX},y)
+# add workaround because libtool tries to link libstdc++
+post-configure:
+	${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \
+	    ${WRKBUILD}/libtool
+endif
+
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgnutls.so.* ${IDIR_LIBGNUTLS}/usr/lib
diff --git a/package/iperf/Config.in b/package/iperf/Config.in
index c498a5b16..bdfee6913 100644
--- a/package/iperf/Config.in
+++ b/package/iperf/Config.in
@@ -11,3 +11,20 @@ config ADK_PACKAGE_IPERF
 	  
 	  http://dast.nlanr.net/Projects/Iperf/
 
+choice
+prompt "C++ library to use"
+depends on ADK_PACKAGE_IPERF
+default ADK_COMPILE_IPERF_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_IPERF_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
+
+config ADK_COMPILE_IPERF_WITH_STDCXX
+	bool "Standard C++ library"
+	select ADK_PACKAGE_LIBSTDCXX
+	help
+
+config ADK_COMPILE_IPERF_WITH_UCLIBCXX
+	bool "Embedded uClibc++ library"
+	select ADK_PACKAGE_UCLIBCXX
+	help
+
+endchoice
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 358e54724..411614d41 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -16,14 +16,15 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes \
-			LIBS="-lc -lm -lgcc_s -lpthread"
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
-ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
+
+ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y)
 TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++
 TLDFLAGS+=		-nodefaultlibs
 CONFIGURE_ENV+=		LIBS="-luClibc++ -lc -lm -lgcc_s -lpthread"
+else
+CONFIGURE_ENV+=		LIBS="-lc -lm -lgcc_s -lpthread"
 endif
 
 post-install:
diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile
index 3ee0796a8..10d90f097 100644
--- a/package/iptraf/Makefile
+++ b/package/iptraf/Makefile
@@ -21,7 +21,7 @@ do-build:
 		${TARGET_CONFIGURE_OPTS} \
 		CFLAGS="${TARGET_CFLAGS}" \
 		DEBUG="" \
-		INCLUDEDIR="-I../support -I${STAGING_DIR}/usr/include -I${STAGING_DIR}/include" \
+		INCLUDEDIR="-I../support -I${STAGING_DIR}/usr/include" \
 		LDOPTS="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib" \
 		PLATFORM="-DPLATFORM=\\\"Linux/${ARCH}\\\"" \
 		TARGET="/usr/bin" \
diff --git a/package/iptraf/patches/patch-src_landesc_c b/package/iptraf/patches/patch-src_landesc_c
index 8cbdd6be0..3af440685 100644
--- a/package/iptraf/patches/patch-src_landesc_c
+++ b/package/iptraf/patches/patch-src_landesc_c
@@ -1,7 +1,12 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/landesc.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/landesc.c	2008-10-09 17:34:11.000000000 +0200
-@@ -83,8 +83,6 @@ void loaddesclist(struct desclist *list,
++++ iptraf-3.0.0/src/landesc.c	2009-05-21 23:01:53.000000000 +0200
+@@ -79,12 +79,10 @@ void loaddesclist(struct desclist *list,
+     char etherline[140];
+     int i, j;                   /* counters used when parsing /etc/ethers */
+ 
+-    bzero(list, sizeof(struct desclist));
++    memset(list, 0, sizeof(struct desclist));
  
      if (linktype == LINK_ETHERNET)
          fd = fopen(ETHFILE, "r");
@@ -10,6 +15,30 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
      if (fd == NULL) {
          return;
+@@ -95,8 +93,8 @@ void loaddesclist(struct desclist *list,
+             printnomem();
+             return;
+         }
+-        bzero(ptmp, sizeof(struct desclistent));
+-        bzero(descline, 140);
++        memset(ptmp, 0, sizeof(struct desclistent));
++        memset(descline, 0, 140);
+         fgets(descline, 140, fd);
+ 
+         if (strcmp(descline, "") == 0) {
+@@ -145,9 +143,9 @@ void loaddesclist(struct desclist *list,
+             printnomem();
+             return;
+         }
+-        bzero(ptmp, sizeof(struct desclistent));
+-        bzero(descline, 140);
+-        bzero(etherline, 140);
++        memset(ptmp, 0, sizeof(struct desclistent));
++        memset(descline, 0, 140);
++        memset(etherline, 0, 140);
+         fgets(etherline, 140, fd);
+ 
+         /* 
 @@ -205,8 +203,6 @@ void savedesclist(struct desclist *list,
  
      if (linktype == LINK_ETHERNET)
diff --git a/package/iptraf/patches/patch-src_log_c b/package/iptraf/patches/patch-src_log_c
index 59786fcee..87e454f07 100644
--- a/package/iptraf/patches/patch-src_log_c
+++ b/package/iptraf/patches/patch-src_log_c
@@ -1,6 +1,24 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/log.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/log.c	2008-10-09 17:34:11.000000000 +0200
++++ iptraf-3.0.0/src/log.c	2009-05-21 23:02:34.000000000 +0200
+@@ -125,7 +125,7 @@ void opentlog(FILE ** fd, char *logfilen
+ 
+ void genatime(time_t now, char *atime)
+ {
+-    bzero(atime, TIME_TARGET_MAX);
++    memset(atime, 0, TIME_TARGET_MAX);
+     strncpy(atime, ctime(&now), 26);
+     atime[strlen(atime) - 1] = '\0';
+ }
+@@ -204,7 +204,7 @@ void writeothplog(int logging, FILE * fd
+     char scratchpad[MSGSTRING_MAX];
+ 
+     if (logging) {
+-        bzero(msgbuffer, MSGSTRING_MAX);
++        memset(msgbuffer, 0, MSGSTRING_MAX);
+ 
+         strcpy(msgbuffer, protname);
+         strcat(msgbuffer, "; ");
 @@ -491,8 +491,6 @@ void writeethlog(struct ethtabent *list,
                          ptmp->un.desc.ascaddr);
              else if (ptmp->un.desc.linktype == LINK_PLIP)
diff --git a/package/iptraf/patches/patch-src_othptab_c b/package/iptraf/patches/patch-src_othptab_c
index 5474c21c1..e6b0a9829 100644
--- a/package/iptraf/patches/patch-src_othptab_c
+++ b/package/iptraf/patches/patch-src_othptab_c
@@ -1,14 +1,31 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/othptab.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/othptab.c	2008-10-09 17:34:11.000000000 +0200
-@@ -19,7 +19,6 @@ details.
++++ iptraf-3.0.0/src/othptab.c	2009-05-21 23:02:50.000000000 +0200
+@@ -17,13 +17,12 @@ details.
+ ***/
+ 
  #include <asm/types.h>
++#include "options.h"
++#include "tcptable.h"
  #include <linux/if_ether.h>
  #include <linux/if_tr.h>
 -#include <linux/if_fddi.h>
  #include <winops.h>
  #include "arphdr.h"
- #include "options.h"
+-#include "options.h"
+-#include "tcptable.h"
+ #include "othptab.h"
+ #include "deskman.h"
+ #include "attrs.h"
+@@ -128,7 +127,7 @@ struct othptabent *add_othp_entry(struct
+         *nomem = 1;
+         return NULL;
+     }
+-    bzero(new_entry, sizeof(struct othptabent));
++    memset(new_entry, 0, sizeof(struct othptabent));
+ 
+     new_entry->is_ip = is_ip;
+     new_entry->fragment = fragment;
 @@ -139,11 +138,6 @@ struct othptabent *add_othp_entry(struct
                          new_entry->smacaddr);
              convmacaddr(((struct ethhdr *) packet)->h_dest,
diff --git a/package/iptraf/patches/patch-src_packet_c b/package/iptraf/patches/patch-src_packet_c
index c5669deca..1bc9b5964 100644
--- a/package/iptraf/patches/patch-src_packet_c
+++ b/package/iptraf/patches/patch-src_packet_c
@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/packet.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/packet.c	2008-10-09 17:34:11.000000000 +0200
++++ iptraf-3.0.0/src/packet.c	2009-05-21 23:03:57.000000000 +0200
 @@ -35,7 +35,6 @@ details.
  #include <sys/ioctl.h>
  #include <linux/if_packet.h>
@@ -48,3 +48,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
      case LINK_TR:
          /*
           * Token Ring patch supplied by Tomas Dvorak 
+@@ -337,7 +318,7 @@ int processpacket(char *tpacket, char **
+      * Prepare ISDN reference descriptor and table.
+      */
+ 
+-    bzero(&isdntable, sizeof(struct isdntab));
++    memset(&isdntable, 0, sizeof(struct isdntab));
+     isdn_iface_check(&isdnfd, ifname);
+ 
+     /*
diff --git a/package/iptraf/patches/patch-src_tcptable_c b/package/iptraf/patches/patch-src_tcptable_c
index 83ba44ff3..6ac96e6d1 100644
--- a/package/iptraf/patches/patch-src_tcptable_c
+++ b/package/iptraf/patches/patch-src_tcptable_c
@@ -1,7 +1,40 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/tcptable.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/tcptable.c	2008-10-09 17:34:11.000000000 +0200
-@@ -600,8 +600,6 @@ void updateentry(struct tcptable *table,
++++ iptraf-3.0.0/src/tcptable.c	2009-05-21 23:07:02.000000000 +0200
+@@ -17,6 +17,7 @@ details.
+    
+ ***/
+ 
++#include <stdlib.h>
+ #include <winops.h>
+ #include "options.h"
+ #include "tcptable.h"
+@@ -143,7 +144,7 @@ int add_tcp_hash_entry(struct tcptable *
+                   entry->daddr.s_addr, entry->dport, entry->ifname);
+ 
+     ptmp = malloc(sizeof(struct tcp_hashentry));
+-    bzero(ptmp, sizeof(struct tcp_hashentry));
++    memset(ptmp, 0, sizeof(struct tcp_hashentry));
+ 
+     if (ptmp == NULL)
+         return 1;
+@@ -337,8 +338,8 @@ struct tcptableent *addentry(struct tcpt
+      * Zero out MAC address fields
+      */
+ 
+-    bzero(new_entry->smacaddr, 15);
+-    bzero(new_entry->oth_connection->smacaddr, 15);
++    memset(new_entry->smacaddr, 0, 15);
++    memset(new_entry->oth_connection->smacaddr, 0, 15);
+ 
+     /*
+      * Set raw port numbers
+@@ -596,12 +597,10 @@ void updateentry(struct tcptable *table,
+     tableentry->spanbr += bcount;
+ 
+     if (opts->mac) {
+-        bzero(newmacaddr, 15);
++        memset(newmacaddr, 0, 15);
  
          if ((linkproto == LINK_ETHERNET) || (linkproto == LINK_PLIP)) {
              convmacaddr(((struct ethhdr *) packet)->h_source, newmacaddr);
diff --git a/package/iptraf/patches/patch-src_tcptable_h b/package/iptraf/patches/patch-src_tcptable_h
index fa3d66618..a20d69969 100644
--- a/package/iptraf/patches/patch-src_tcptable_h
+++ b/package/iptraf/patches/patch-src_tcptable_h
@@ -1,8 +1,24 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/tcptable.h	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/tcptable.h	2008-10-09 17:34:11.000000000 +0200
-@@ -22,7 +22,6 @@
- #include <asm/types.h>
++++ iptraf-3.0.0/src/tcptable.h	2009-05-21 22:49:05.000000000 +0200
+@@ -6,7 +6,6 @@
+    
+ ***/
+ 
+-#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+@@ -14,15 +13,12 @@
+ #include <panel.h>
+ #include <netdb.h>
+ #include <time.h>
+-#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <net/if_arp.h>
+-#include <asm/types.h>
  #include <linux/if_packet.h>
  #include <linux/if_ether.h>
 -#include <linux/if_fddi.h>
diff --git a/package/iw/Makefile b/package/iw/Makefile
index 997abebfc..1aaa7d156 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -6,9 +6,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		iw
-PKG_VERSION:=		0.9.13
+PKG_VERSION:=		0.9.14
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		cf9121abb4ffe6dce1691e2ec97d5b2b
+PKG_MD5SUM:=		b5059cfe86bc7664511b79c159635a8f
 MASTER_SITES:=		http://wireless.kernel.org/download/iw/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
@@ -17,6 +17,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IW,iw,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 
+XAKE_FLAGS:=		V=1
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
diff --git a/package/libnids/patches/no_asm_for_i386.patch b/package/libnids/patches/no_asm_for_i386.patch
deleted file mode 100644
index ff6fde7b1..000000000
--- a/package/libnids/patches/no_asm_for_i386.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libnids-1.18-orig/src/checksum.c libnids-1.18/src/checksum.c
---- libnids-1.18-orig/src/checksum.c	2003-09-20 22:40:44.000000000 +0200
-+++ libnids-1.18/src/checksum.c	2005-08-09 23:55:00.000000000 +0200
-@@ -4,7 +4,7 @@
- #include <netinet/tcp.h>
- #include <netinet/udp.h>
- 
--#if ( __i386__ || __i386 )
-+#if 0
- // all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels
- 
- /*
diff --git a/package/mrd6/Config.in b/package/mrd6/Config.in
index 62a3e3585..5a5a948d7 100644
--- a/package/mrd6/Config.in
+++ b/package/mrd6/Config.in
@@ -13,3 +13,21 @@ config ADK_PACKAGE_MRD6
 		and provides MLDv2 (as well as MLDv1), PIM-SM and MBGP support.
 
 		http://artemis.av.it.pt/mrd6/
+
+choice
+prompt "C++ library to use"
+depends on ADK_PACKAGE_MRD6
+default ADK_COMPILE_MRD6_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_MRD6_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
+
+config ADK_COMPILE_MRD6_WITH_STDCXX
+	bool "Standard C++ library"
+	select ADK_PACKAGE_LIBSTDCXX
+	help
+
+config ADK_COMPILE_MRD6_WITH_UCLIBCXX
+	bool "Embedded uClibc++ library"
+	select ADK_PACKAGE_UCLIBCXX
+	help
+
+endchoice
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 009f36516..53ee70a73 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -9,13 +9,21 @@ PKG_NAME:=		mrd6
 PKG_VERSION:=		0.9.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		93ada53bb414b9d622f80a717bc2694b
-MASTER_SITES:=		http://fivebits.net/files/mrd6/
+MASTER_SITES:=		http://www.openadk.org/distfiles/
 
 WRKBUILD=		${WRKSRC}/src
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
+TCXXFLAGS+=		-fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
+TLDFLAGS+=		-nodefaultlibs -luClibc++ -shared
+PKG_DEPENDS:=		uclibc++
+else
+PKG_DEPENDS:=		libstdcxx
+endif
+
+$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPENDS}))
 
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
diff --git a/package/mrd6/patches/patch-src_Makefile b/package/mrd6/patches/patch-src_Makefile
index 521673933..abe83bf1b 100644
--- a/package/mrd6/patches/patch-src_Makefile
+++ b/package/mrd6/patches/patch-src_Makefile
@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- mrd6-0.9.6.orig/src/Makefile	2007-06-25 01:58:28.000000000 +0200
-+++ mrd6-0.9.6/src/Makefile	2008-10-21 11:27:38.000000000 +0200
++++ mrd6-0.9.6/src/Makefile	2009-05-22 00:43:30.000000000 +0200
 @@ -26,7 +26,7 @@ ifeq ($(SUPPORT_MODULES),yes)
  	MODULES ?= BGP
  	LDCMD = -rdynamic
@@ -19,7 +19,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  ifeq ($(OPTIMIZE),yes)
  	ifeq ($(SPACE_OPTIMIZE),yes)
-@@ -101,11 +101,8 @@ ifeq ($(OPTIMIZE),yes)
+@@ -101,22 +101,13 @@ ifeq ($(OPTIMIZE),yes)
  		CXXFLAGS += -O3
  	endif
  else
@@ -31,7 +31,18 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	endif
  endif
  
-@@ -151,7 +148,7 @@ $(foreach test,$(TESTS),$(eval $(call un
+ LDFLAGS += -lm
+ 
+-ifeq ($(STATIC_STDCXX),no)
+-	LDFLAGS += -lstdc++
+-else
+-	LDFLAGS += `$(CXX) -print-file-name=libstdc++.a`
+-endif
+-
+ TEST_OBJECTS = $(addprefix $(OBJ_DIR)/,$(TEST_SOURCES:.cpp=.o))
+ MRD_OBJECTS = $(addprefix $(OBJ_DIR)/,$(MRD_SOURCES:.cpp=.o))
+ 
+@@ -151,7 +142,7 @@ $(foreach test,$(TESTS),$(eval $(call un
  
  $(TARGET): $(MRD_OBJECTS)
  	@echo "Linking $(TARGET)"
@@ -40,7 +51,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  install: $(TARGET) $(EXTERNAL_MODULES)
  	install -D $(TARGET) $(DEST_PREFIX)/sbin/$(TARGET)
-@@ -162,12 +159,12 @@ ifneq (,$(EXTERNAL_MODULES))
+@@ -162,12 +153,12 @@ ifneq (,$(EXTERNAL_MODULES))
  endif
  
  $(MRD_VERSION_CPP): $(SOURCES) Makefile Makefile.options
@@ -55,7 +66,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  		echo "Generating modules.cpp"; \
  		scripts/generate-modules-cpp.pl $(STATIC_MODULES) > $(MODULES_CPP)
  
-@@ -181,7 +178,7 @@ $(OPTIONS):
+@@ -181,7 +172,7 @@ $(OPTIONS):
  
  $(DEPS_DIR)/%.d: %.cpp $(OPTIONS)
  	@echo "Deps $<"
@@ -64,7 +75,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  		$(CXX) -MM -MT $@ -MT $(addprefix $(OBJ_DIR)/,$(<:.cpp=.o)) \
  		       $(CXXFLAGS) $< > $@
  
-@@ -195,7 +192,7 @@ endif
+@@ -195,7 +186,7 @@ endif
  
  $(OBJ_DIR)/%.o: %.cpp $(OPTIONS)
  	@echo "C++ $<"
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index f3dcde488..69756e8e5 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -3,36 +3,35 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-# == Doc
-# * http://wiki.rubygarden.org/Ruby/page/show/RubyOnUCLinux
-
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ruby
-PKG_VERSION:=		1.8.7
+PKG_VERSION:=		1.9.1-p129
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		de906850f9a012c12ffc6e9f56fb1b66
-MASTER_SITES:=		http://ftp.ruby-lang.org/pub/ruby/stable/
+PKG_MD5SUM:=		c71f413514ee6341c627be2957023a5c
+MASTER_SITES:=		ftp://ftp.ruby-lang.org/pub/ruby/1.9/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 
+MAKE_FILE:=		GNUmakefile
+XAKE_FLAGS+=		optflags='' debugflags=''
 CONFIGURE_STYLE:=	gnu
+CONFIGURE_ARGS+=	--enable-wide-getaddrinfo
 CONFIGURE_ENV+=         ac_cv_func_setpgrp_void=yes
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
+INSTALL_TARGET:=	install-nodoc
 
 # Enable some ruby extension / options
 post-configure:
-	echo "option nodynamic" >> ${WRKBUILD}/ext/Setup
+	#echo "option nodynamic" >> ${WRKBUILD}/ext/Setup
 	echo "socket" >> ${WRKBUILD}/ext/Setup
 
-# Remove the /usr/lib/libruby.so and keep the static (~1M) ?
 post-install:
 	rm -rf ${WRKINST}/usr/lib/site_ruby
 	find ${WRKINST}/usr -name "*.h" -delete
 	cp -a ${WRKINST}/usr ${IDIR_RUBY}
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-
diff --git a/package/ruby/patches/100-makefile-in.patch b/package/ruby/patches/100-makefile-in.patch
deleted file mode 100644
index ecfb49ed8..000000000
--- a/package/ruby/patches/100-makefile-in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ruby-1.8.6.orig/Makefile.in	2007-02-13 00:01:19.000000000 +0100
-+++ ruby-1.8.6/Makefile.in	2007-05-21 22:12:54.000000000 +0200
-@@ -131,7 +131,7 @@ fake.rb:	Makefile
- 		if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
- 		  class File; \
- 		    remove_const :ALT_SEPARATOR; \
--		    ALT_SEPARATOR = "\\"; \
-+		    ALT_SEPARATOR = "\\\\"; \
- 		  end; \
- 		end; \
- 		' > $@
diff --git a/package/ruby/patches/patch-lib_fileutils_rb b/package/ruby/patches/patch-lib_fileutils_rb
deleted file mode 100644
index 767a389d9..000000000
--- a/package/ruby/patches/patch-lib_fileutils_rb
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- ruby-1.8.6.orig/lib/fileutils.rb	2007-03-04 16:03:11.000000000 +0100
-+++ ruby-1.8.6/lib/fileutils.rb	2007-05-21 22:14:04.000000000 +0200
-@@ -1026,7 +1026,7 @@ module FileUtils
-     list.each do |path|
-       created = nocreate
-       begin
--        File.utime(t, t, path)
-+        #File.utime(t, t, path)
-       rescue Errno::ENOENT
-         raise if created
-         File.open(path, 'a') {