Merge branch 'master' of git+ssh://openadk.org/git/openadk

38 files changed, 330 insertions, 88 deletions

diff --git a/package/Config.in b/package/Config.in
index 4a9c4ea38..b5523f8bc 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -375,6 +375,7 @@ source "package/lua/Config.in"
 source "package/m4/Config.in"
 source "package/make/Config.in"
 source "package/microperl/Config.in"
+source "package/perl/Config.in"
 source "package/php/Config.in"
 source "package/python/Config.in"
 source "package/ruby/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
index 02cf03427..96d25a34a 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -9,7 +9,7 @@ atftp-compile: readline-compile ncurses-compile
 avahi-compile: libdaemon-compile expat-compile gdbm-compile glib-compile
 bind-compile: openssl-compile
 bitlbee-compile: libiconv-compile openssl-compile glib-compile
-bluez-compile: libusb-compile dbus-compile
+bluez-compile: libusb-compile dbus-compile glib-compile
 bogofilter-compile: libiconv-compile libdb-compile
 ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y)
 cbtt-compile: uclibc++-compile
@@ -52,7 +52,7 @@ git-compile: openssl-compile curl-compile expat-compile
 gkrellmd-compile: glib-compile
 glib-compile: gettext-compile libiconv-compile
 gmediaserver-compile: id3lib-compile libupnp-compile
-gnutls-compile: libgcrypt-compile liblzo-compile libtasn1-compile opencdk-compile zlib-compile
+gnutls-compile: libgcrypt-compile liblzo-compile libtasn1-compile opencdk-compile zlib-compile ncurses-compile
 ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y)
 gpsd-compile: uclibc++-compile
 endif
@@ -105,7 +105,7 @@ libtirpc-compile: libgssglue-compile
 endif
 libtorrent-compile: openssl-compile libsigc++-compile
 libvorbis-compile: libogg-compile
-libvirt-compile: libxml2-compile gnutls-compile
+libvirt-compile: libxml2-compile gnutls-compile python-compile
 libfontenc-compile: xproto-compile zlib-compile
 libICE-compile: xtrans-compile
 libSM-compile: libICE-compile
diff --git a/package/Makefile b/package/Makefile
index c6c2d4114..424c7493b 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -200,7 +200,9 @@ package-$(ADK_PACKAGE_LIBPCAP) += libpcap
 package-$(ADK_PACKAGE_LIBPCIACCESS) += libpciaccess
 package-$(ADK_PACKAGE_LIBPNG) += libpng
 package-$(ADK_PACKAGE_LIBPRI) += libpri
+ifeq (${ADK_NATIVE},n)
 package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
+endif
 package-$(ADK_COMPILE_LIBSHOUT) += libshout
 package-$(ADK_PACKAGE_LIBSIGCXX) += libsigc++
 package-$(ADK_PACKAGE_LIBSTDCXX) += libstdcxx
@@ -305,6 +307,7 @@ package-$(ADK_PACKAGE_PARPROUTED) += parprouted
 package-$(ADK_PACKAGE_PATCH) += patch
 package-$(ADK_PACKAGE_PCIUTILS) += pciutils
 package-$(ADK_COMPILE_PCRE) += pcre
+package-$(ADK_PACKAGE_PERL) += perl
 package-$(ADK_COMPILE_PHP) += php
 package-$(ADK_PACKAGE_PICOCOM) += picocom
 package-$(ADK_PACKAGE_PIPACS) += pipacs
@@ -469,7 +472,7 @@ $(TARGET_DIR):
 
 %-compile:
 	$(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "
-	$(MAKE) -C $(patsubst %-compile,%,$@) fake build-all-ipkgs
+	$(MAKE) -C $(patsubst %-compile,%,$@) fake build-all-pkgs
 	$(CMD_TRACE) " done"
 	$(END_TRACE)
 
diff --git a/package/base-files/extra/etc/network/if-down.d/.empty b/package/base-files/extra/etc/network/if-down.d/.empty
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-down.d/.empty
diff --git a/package/base-files/extra/etc/network/if-post-down.d/.empty b/package/base-files/extra/etc/network/if-post-down.d/.empty
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-post-down.d/.empty
diff --git a/package/base-files/extra/etc/network/if-pre-up.d/.empty b/package/base-files/extra/etc/network/if-pre-up.d/.empty
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-pre-up.d/.empty
diff --git a/package/base-files/extra/etc/network/if-up.d/.empty b/package/base-files/extra/etc/network/if-up.d/.empty
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-up.d/.empty
diff --git a/package/bluez/Config.in b/package/bluez/Config.in
index 3bb4c4a37..10b5f87e1 100644
--- a/package/bluez/Config.in
+++ b/package/bluez/Config.in
@@ -3,6 +3,9 @@ config ADK_PACKAGE_BLUEZ
 	tristate
 	default n
 	select ADK_KPACKAGE_KMOD_BT
+	select ADK_PACKAGE_GLIB
+	select ADK_PACKAGE_DBUS
+	select ADK_PACKAGE_LIBUSB
 	help
 	  Bluez libs and apps. 
 	  
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 4c39c00b2..d0c652c7b 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
-PKG_VERSION:=		4.40
+PKG_VERSION:=		4.56
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a25fa37c97c309338649f6a5fd4cea76
+PKG_MD5SUM:=		92ea2e86a5489f0d16567920f2ec9b36
 PKG_DESCR:=		bluetooth libraries and applications
 PKG_SECTION:=		bluetooth
 PKG_DEPENDS:=		kmod-bluetooth
@@ -17,7 +17,13 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BLUEZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_STATIC),y)
+XAKE_FLAGS+=		V=1 CCLD="$(TARGET_CC) -all-static -pthread"
+else
+XAKE_FLAGS+=            V=1
+endif
 CONFIGURE_STYLE:=	gnu
+CONFIGURE_ENV+=		ac_cv_prog_cc_pie=no
 CONFIGURE_ARGS+=	--enable-tools \
 			--enable-alsa \
 			--enable-usb \
@@ -30,8 +36,10 @@ BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
+ifeq ($(ADK_STATIC),n)
 	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libbluetooth.so.* ${IDIR_BLUEZ}/usr/lib/
+endif
 	${INSTALL_DIR} $(IDIR_BLUEZ)/etc/dbus-1/system.d
 	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/bin
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_BLUEZ}/usr/bin/
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index dc0ab5fdb..697bec0ea 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -67,7 +67,7 @@ config BUSYBOX_CKSUM
 
 config BUSYBOX_COMM
 	bool "comm"
-	default n
+	default y
 	help
 	  comm is used to compare two files line by line and return
 	  a three-column output.
@@ -557,7 +557,7 @@ config BUSYBOX_FEATURE_SORT_BIG
 
 config BUSYBOX_SPLIT
 	bool "split"
-	default n
+	default y
 	help
 	  split a file into pieces.
 
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index e5c690ea7..62ac57e50 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -16,6 +16,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BZIP2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TCFLAGS+=		-fPIC
 XAKE_FLAGS+=		PREFIX=${WRKINST}/usr
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
diff --git a/package/curl/Config.in b/package/curl/Config.in
index b5d42ea1f..c9d34b5c8 100644
--- a/package/curl/Config.in
+++ b/package/curl/Config.in
@@ -11,16 +11,24 @@ config ADK_PACKAGE_LIBCURL
 	select ADK_PACKAGE_LIBOPENSSL
 	select ADK_PACKAGE_ZLIB
 	help
-	  A client-side URL transfer library.
+	  http://curl.haxx.se/
 
+config ADK_PACKAGE_LIBCURL_DEV
+	prompt "libcurl-dev....................... development files for libcurl"
+	tristate
+	default n
+	depends on ADK_PACKAGE_LIBCURL
+	select ADK_COMPILE_CURL
+	select ADK_PACKAGE_LIBOPENSSL
+	select ADK_PACKAGE_ZLIB
+	help
 	  http://curl.haxx.se/
 
+
 config ADK_PACKAGE_CURL
 	prompt   "curl............................ A client-side URL transfer tool"
 	tristate
 	default n
 	depends on ADK_PACKAGE_LIBCURL
 	help
-	  A client-side URL transfer tool.
-
 	  http://curl.haxx.se/
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 078a940bf..a0e27d77c 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
-PKG_VERSION:=		7.19.0
+PKG_VERSION:=		7.19.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		35f51ac7bcff689b2d2d6e38a3c4d1ae
+PKG_MD5SUM:=		6625de9d42d1b8d3af372d3241a576fd
 PKG_DESCR:=		a client-side URL transfer tool
 PKG_SECTION:=		net
 PKG_URL:=		http://curl.haxx.se
@@ -26,6 +26,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
@@ -54,7 +55,9 @@ INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib
+	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
 	${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/
 	${CP} ${WRKINST}/usr/lib/libcurl.so.* ${IDIR_LIBCURL}/usr/lib/
+	${CP} ${WRKINST}/usr/include/curl/*.h ${IDIR_LIBCURL_DEV}/usr/include/curl/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure
index d046721f0..3cb59e18e 100644
--- a/package/curl/patches/patch-configure
+++ b/package/curl/patches/patch-configure
@@ -1,21 +1,16 @@
-$Id$
-
-	Don't do *THAT* for cross-compiling.
-
---- curl-7.16.3.orig/configure	2007-06-25 11:18:41.000000000 +0200
-+++ curl-7.16.3/configure	2007-08-02 17:44:28.000000000 +0200
-@@ -25783,17 +25783,6 @@ fi
- 
+--- curl-7.19.6.orig/configure	2009-07-22 22:11:25.000000000 +0200
++++ curl-7.19.6/configure	2009-10-01 14:05:37.578930054 +0200
+@@ -25479,16 +25479,6 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    fi
--
+ 
 -  if test "$OPENSSL_ENABLED" = "1"; then
 -    if test -n "$LIB_OPENSSL"; then
 -
 -       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
 -       export LD_LIBRARY_PATH
--       { echo "$as_me:$LINENO: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
--echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;}
+-       { $as_echo "$as_me:$LINENO: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
+-$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;}
 -    fi
 -  fi
 -
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index a099da821..46739bfa2 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -12,10 +12,13 @@ PKG_SECTION:=		net
 PKG_DEPENDS:=		libexpat
 PKG_URL:=		http://dbus.freedesktop.org
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-tests \
@@ -31,13 +34,15 @@ CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
+pre-install:
+	${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus
+	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
+		$(STAGING_DIR)/usr/include/dbus-1.0/dbus/
+
 post-install:
 	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib ${IDIR_DBUS}/usr/bin
-	${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus
 	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/
 	${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/
-	$(CP) $(WRKINST)/usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h \
-		$(STAGING_DIR)/usr/include/dbus-1.0/dbus/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/
 
diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst
index 1e45f3924..b09c34147 100644
--- a/package/dropbear/files/dropbear.postinst
+++ b/package/dropbear/files/dropbear.postinst
@@ -1,3 +1,3 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf '"NO" to disable' dropbear_flags ""
+add_rcconf '"NO" to disable' dropbear_flags " "
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index d9c4cad1e..3333f85dc 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -44,19 +44,24 @@ do-extract:
 
 # do nothing, eglibc is already build in toolchain directory
 do-install:
-	${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc
+	${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc $(IDIR_EGLIBC)/usr/lib
 	# install /etc/localtime from host system (FIXME)
 	${CP} /etc/localtime $(IDIR_EGLIBC)/etc
 ifeq ($(ADK_SSP),y)
 	$(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib/
 endif
+	$(CP) $(STAGING_DIR)/lib/ld-* $(IDIR_EGLIBC)/lib/
 	$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/
-	-for file in libc ld libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
+	-for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
 		$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \
 		$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \
 	done
-	# create ld.so link for x86 linker and gcc
-	cd $(IDIR_EGLIBC)/lib && ln -sf ld-$(PKG_VERSION).so ld-linux.so.2
+	# install linker script
+	-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC)/usr/lib/libc.so
+	cd $(IDIR_EGLIBC)/lib && ln -sf libm.so.6 libm.so
+	cd $(IDIR_EGLIBC)/lib && ln -sf libutil.so.1 libutil.so
+	cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so
+	cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \
diff --git a/package/eglibc/files/libc.so.x86_64 b/package/eglibc/files/libc.so.x86_64
new file mode 100644
index 000000000..a2e2de87f
--- /dev/null
+++ b/package/eglibc/files/libc.so.x86_64
@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+      the static library, so try that secondarily.  */
+      OUTPUT_FORMAT(elf64-x86-64)
+      GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux-x86-64.so.2 ) )
diff --git a/package/expat/Makefile b/package/expat/Makefile
index 532e47068..0a3a93a3a 100644
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -7,18 +7,21 @@ PKG_NAME:=		expat
 PKG_VERSION:=		2.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		ee8b492592568805593f81f8cdf2a04c
-PKG_DESCR:=		a fast, non-validating, stream-oriented XML parsing library
+PKG_DESCR:=		a XML parsing library
 PKG_SECTION:=		libs
 PKG_URL:=		http://expat.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=expat/}
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBEXPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBEXPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 813a8241f..6c28e0f4c 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -46,6 +46,7 @@ ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 	${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib
 else
 	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib
+	${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GCC}/usr/lib
 endif
 	rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools
 
diff --git a/package/gettext/Makefile b/package/gettext/Makefile
index 04e1bf06c..6d1349a0c 100644
--- a/package/gettext/Makefile
+++ b/package/gettext/Makefile
@@ -11,15 +11,18 @@ PKG_DESCR:=		internationalisation library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libiconv libpthread
 PKG_URL:=		http://www.gnu.org/software/gettext/
-PKG_SITES=		${MASTER_SITE_GNU:=gettext/}
+PKG_SITES:=		${MASTER_SITE_GNU:=gettext/}
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,GETTEXT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GETTEXT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-java \
 			--disable-native-java \
 			--disable-csharp \
@@ -33,8 +36,8 @@ CONFIGURE_ARGS+=	--disable-java \
 CONFIGURE_ENV+=		nls_cv_use_gnu_gettext=yes \
 			ac_cv_gnu_library_2=no \
 			gt_use_preinstalled_gnugettext=no
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GETTEXT}/usr/lib
diff --git a/package/git/Makefile b/package/git/Makefile
index db4082797..e02c9e669 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
 PKG_VERSION:=		1.6.4.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		d7732d13a227d89f05122d230c5c8048
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		misc
@@ -17,7 +17,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-DNO_NSEC -DNO_TCLTK -DNO_PERL
+MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1
+XAKE_FLAGS+=		V=1
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
 			ac_cv_fread_reads_directories=no \
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
index c0e2e28ce..172f4c882 100644
--- a/package/git/patches/patch-Makefile
+++ b/package/git/patches/patch-Makefile
@@ -1,24 +1,35 @@
---- git-1.6.4.1.orig/Makefile	2009-08-22 06:54:01.000000000 +0200
-+++ git-1.6.4.1/Makefile	2009-08-23 12:11:07.755226105 +0200
-@@ -1345,7 +1345,6 @@ builtin-help.o: builtin-help.c common-cm
+--- git-1.6.4.2.orig/Makefile	2009-08-29 23:58:52.000000000 +0200
++++ git-1.6.4.2/Makefile	2009-10-01 15:36:20.567802008 +0200
+@@ -212,8 +212,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de
+ 
+ # CFLAGS and LDFLAGS are for the users to override from the command line.
+ 
+-CFLAGS = -g -O2 -Wall
+-LDFLAGS =
++CFLAGS ?= -g -O2 -Wall
++LDFLAGS ?=
+ ALL_CFLAGS = $(CFLAGS)
+ ALL_LDFLAGS = $(LDFLAGS)
+ STRIP ?= strip
+@@ -1345,8 +1345,6 @@ builtin-help.o: builtin-help.c common-cm
  
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
 -	ln git$X $@ 2>/dev/null || \
- 	ln -s git$X $@ 2>/dev/null || \
+-	ln -s git$X $@ 2>/dev/null || \
  	cp git$X $@
  
-@@ -1663,11 +1662,11 @@ endif
+ common-cmds.h: ./generate-cmdlist.sh command-list.txt
+@@ -1663,12 +1661,9 @@ endif
  	{ test "$$bindir/" = "$$execdir/" || \
  		{ $(RM) "$$execdir/git$X" && \
  		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
 -		ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
-+		ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
  		cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
  	{ for p in $(BUILT_INS); do \
  		$(RM) "$$execdir/$$p" && \
 -		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
-+		ln -s "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
- 		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
+-		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
  	  done; } && \
+ 	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 66e3329c8..4d555f7bf 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,25 +4,28 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
-PKG_VERSION:=		2.18.1
+PKG_VERSION:=		2.22.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d53836f7fdd9970d03e255e9d712bd83
+PKG_MD5SUM:=		00eb873975e2ef9361b8177131c7c943
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		gettext libiconv libpthread
 PKG_URL:=		http://www.gtk.org/
-PKG_SITES:=		ftp://ftp.gtk.org/pub/glib/2.18/
+PKG_SITES:=		ftp://ftp.gtk.org/pub/glib/2.22/
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TCPPFLAGS+=		-I'${STAGING_DIR}/usr/include'
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-debug=no \
 			--disable-mem-pools \
 			--disable-rebuilds \
 			--with-libiconv=gnu \
+			--disable-fam \
 			--with-threads=posix
 CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			glib_cv_stack_grows=no \
@@ -30,8 +33,8 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			glib_cv_uscore=no \
 			ac_cv_func_posix_getpwuid_r=yes \
 			ac_cv_func_posix_getgrgid_r=yes
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GLIB}/usr/lib
diff --git a/package/glib/patches/patch-gio_Makefile_in b/package/glib/patches/patch-gio_Makefile_in
new file mode 100644
index 000000000..5eaa2eef1
--- /dev/null
+++ b/package/glib/patches/patch-gio_Makefile_in
@@ -0,0 +1,20 @@
+--- glib-2.22.2.orig/gio/Makefile.in	2009-10-07 15:56:29.000000000 +0200
++++ glib-2.22.2/gio/Makefile.in	2009-10-11 11:04:35.126154998 +0200
+@@ -242,7 +242,7 @@ ETAGS = etags
+ CTAGS = ctags
+ am__tty_colors = \
+ red=; grn=; lgn=; blu=; std=
+-DIST_SUBDIRS = libasyncns xdgmime inotify fen win32 . fam tests
++DIST_SUBDIRS = libasyncns xdgmime inotify fen win32 . fam
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ am__relativize = \
+   dir0=`pwd`; \
+@@ -489,7 +489,7 @@ EXTRA_DIST = gio-marshal.list gio.symbol
+ TEST_PROGS = 
+ NULL = 
+ SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_6) \
+-	$(am__append_9) . $(am__append_12) tests
++	$(am__append_9) . $(am__append_12)
+ @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
+ @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
+ @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
diff --git a/package/libiconv/Config.in b/package/libiconv/Config.in
index e834bb3d1..6ed1f162c 100644
--- a/package/libiconv/Config.in
+++ b/package/libiconv/Config.in
@@ -3,7 +3,6 @@ config ADK_PACKAGE_LIBICONV
 	tristate
 	default n
 	help
-
 	  This package contains a _very_ stripped down version of GNU Libiconv,
 	  all charsets have been removed, except ASCII, various unicode charsets
 	  and iso8896-1.
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
index 4f3063aad..7c6c70682 100644
--- a/package/libiconv/Makefile
+++ b/package/libiconv/Makefile
@@ -4,29 +4,29 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libiconv
-PKG_VERSION:=		1.13
+PKG_VERSION:=		1.13.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		048032a3032ebd182150bdee30a5d533
+PKG_MD5SUM:=		7ab33ebd26687c744a37264a330bbe9a
 PKG_DESCR:=		character set conversion library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.gnu.org/software/libiconv
 PKG_SITES:=		${MASTER_SITE_GNU:=libiconv/}
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TCFLAGS+=		-fPIC
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 FAKE_FLAGS+=		libdir="${WRKINST}/usr/lib" \
 			includedir="${WRKINST}/usr/include" \
 INSTALL_TARGET=		install-lib
 
-post-extract:
-	@find ${WRKBUILD} -name *.rej -delete
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBICONV}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libiconv.so.* ${IDIR_LIBICONV}/usr/lib/
diff --git a/package/libiconv/patches/patch-preload_Makefile_in b/package/libiconv/patches/patch-preload_Makefile_in
new file mode 100644
index 000000000..5aa7e91e0
--- /dev/null
+++ b/package/libiconv/patches/patch-preload_Make