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

29 files changed, 530 insertions, 424 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 6f52bb868..15d0e3b16 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -513,7 +513,7 @@ bulktoolchain:
 bulk:
 	for libc in uclibc eglibc glibc;do \
 	  while read arch; do \
-	      systems=$$(./scripts/getsystems $$arch|grep -v toolchain); \
+	      systems=$$(./scripts/getsystems $$arch|grep -v toolchain|grep -v qemu); \
 	      for system in $$systems;do \
 		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
 	    ( \
@@ -531,7 +531,7 @@ bulk:
 bulkall:
 	for libc in uclibc eglibc glibc;do \
 	  while read arch; do \
-	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
+	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
 	      for system in $$systems;do \
 		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
 	    ( \
@@ -549,14 +549,14 @@ bulkall:
 bulkallmod:
 	for libc in uclibc eglibc glibc;do \
 	  while read arch; do \
-	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
+	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
 	      for system in $$systems;do \
 		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
 		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \
-		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system >.exit; exit 1;fi; \
+		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \
 	      done; \
diff --git a/mk/vars.mk b/mk/vars.mk
index 89d78be83..e77726943 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -53,6 +53,12 @@ endif
 ifeq ($(CPU_ARCH),mipsel)
 QEMU:=			qemu-mipsel
 endif
+ifeq ($(CPU_ARCH),mips)
+QEMU:=			qemu-mips
+endif
+ifeq ($(CPU_ARCH),i486)
+QEMU:=			qemu-i386
+endif
 ifeq ($(CPU_ARCH),i586)
 QEMU:=			qemu-i386
 endif
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 28fb34348..4cc7e970a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -64,6 +64,9 @@ endif
 	    cat ./files/inittab.serial >> $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_CONSOLE_BOTH) || \
 	    cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab
+ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y)
+	$(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab
+endif
 	$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_HOSTNAME) || \
 	    echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \
diff --git a/package/boost/Makefile b/package/boost/Makefile
new file mode 100644
index 000000000..45c18e08e
--- /dev/null
+++ b/package/boost/Makefile
@@ -0,0 +1,162 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		boost
+PKG_VERSION:=		1_47_0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ff180a5276bec773a7625cac7e2288e8
+PKG_DESCR:=		boost C++ library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.boost.org/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
+DISTFILES:=		boost_1_47_0.tar.gz
+WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
+
+PKG_SUBPKGS:=		BOOST BOOST_DEV
+PKGSD_BOOST_DEV:=	boost header files
+PKGSC_BOOST_DEV:=	devel
+
+PKG_CHOICES_BOOST:=	STATIC SHARED BOTH
+PKGCD_STATIC:=		install static libs
+PKGCD_SHARED:=		install shared libs
+PKGCD_BOTH:=		install static and shared libs
+
+PKG_FLAVOURS_BOOST:=	date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave
+
+PKGFD_date_time:=	with date-time
+PKGFD_python:=	with Python
+PKGFB_python:=	python
+PKGFS_python:=	python
+PKGFD_iostreams:=	with iostreams
+PKGFD_graph:=	with graph
+PKGFD_graph_parallel:=	with graph_parallel
+PKGFD_math:=	with math
+PKGFD_program_options:=	with program_options
+PKGFD_regex:=	with regex
+PKGFD_serialization:=	with serialization
+PKGFD_signals:=	with signals
+PKGFD_system:=	with system
+PKGFD_test:=	with test
+PKGFD_thread:=	with thread
+PKGFD_wave:=	with wave
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,BOOST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BOOST_DEV,boost-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BOOST_DEV},${PKGSC_BOOST_DEV}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+CONFIGURE_ARGS += \
+	--target=$(GNU_TARGET_NAME) \
+	--host=$(GNU_TARGET_NAME) \
+	--build=$(GNU_HOST_NAME) \
+	--prefix=${WRKINST}/usr \
+
+ifneq (${ADK_PACKAGE_BOOST_IOSTREAMS},)
+	CONFIGURE_ARGS += -sNO_BZIP2=1 -sZLIB_INCLUDE=${STAGING_DIR}/usr/include -sZLIB_LIBPATH=${STAGING_DIR}/usr/lib
+else
+	CONFIGURE_ARGS += --without-iostreams
+endif
+ifeq (${ADK_PACKAGE_BOOST_DATE_TIME},)
+	CONFIGURE_ARGS+=--without-date_time
+endif
+ifeq (${ADK_PACKAGE_BOOST_PYTHON},)
+	CONFIGURE_ARGS+=--without-python
+endif
+ifeq (${ADK_PACKAGE_BOOST_GRAPH},)
+	CONFIGURE_ARGS+=--without-graph
+endif
+ifeq (${ADK_PACKAGE_BOOST_math},)
+	CONFIGURE_ARGS+=--without-math
+endif
+ifeq (${ADK_PACKAGE_BOOST_PROGRAM_OPTIONS},)
+	CONFIGURE_ARGS+=--without-program_options
+endif
+ifeq (${ADK_PACKAGE_BOOST_REGEX},)
+	CONFIGURE_ARGS+=--without-regex
+endif
+ifeq (${ADK_PACKAGE_BOOST_SERIALIZATION},)
+	CONFIGURE_ARGS+=--without-serialization
+endif
+ifeq (${ADK_PACKAGE_BOOST_SIGNALS},)
+	CONFIGURE_ARGS+=--without-signals
+endif
+ifeq (${ADK_PACKAGE_BOOST_SYSTEM},)
+	CONFIGURE_ARGS+=--without-system
+endif
+ifeq (${ADK_PACKAGE_BOOST_TEST},)
+	CONFIGURE_ARGS+=--without-test
+endif
+ifeq (${ADK_PACKAGE_BOOST_THREAD},)
+	CONFIGURE_ARGS+=--without-thread
+endif
+ifeq (${ADK_PACKAGE_BOOST_WAVE},)
+	CONFIGURE_ARGS+=--without-wave
+endif
+
+# some variables for build
+GPP_PATH:=	${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++
+GPP_VERSION:=	"`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`"
+BJAM_PATH:=	"`find ${WRKBUILD} -type f -name "bjam"`"
+PYTHON_PATH:=	${STAGING_TARGET_DIR}/usr/bin/python
+PYTHON_INCLUDE:=	"`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`"
+PYTHON_LIB:=	"`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`"
+USER_JAM:=	${WRKBUILD}/tools/build/v2/user-config.jam
+
+pre-build:
+	@echo "build bjam..."
+	cd $(WRKBUILD)/tools/build/v2/engine; ./build.sh gcc
+
+do-build:
+	@echo "build boost library..."
+# remove exisiting using gcc line from user.jam
+	${SED} "/^using gcc/d" ${USER_JAM}
+# add using gcc line with determined options to user.jam
+	echo "using gcc : ${GPP_VERSION} : ${GPP_PATH} ;" >> ${USER_JAM};
+
+# remove exisiting using python line from user.jam
+	${SED} "/^using python/d" ${USER_JAM}
+ifneq (${ADK_PACKAGE_BOOST_PYTHON},)
+# add using python line with determined options to user.jam
+	echo "using python : ${PYTHON_VERSION} : ${PYTHON_PATH} : ${PYTHON_INCLUDE} : ${PYTHON_LIB} ;" >> ${USER_JAM};
+endif
+
+# run bjam to build boost
+	( cd ${WRKBUILD}; \
+		${BJAM_PATH} \
+			-sBUILD=release \
+			--toolset=gcc-${GPP_VERSION} \
+			--build-type=minimal \
+			--layout=versioned \
+			--disable-long-double \
+			--without-mpi \
+			${CONFIGURE_ARGS} \
+			install \
+	)
+
+
+boost-install:
+	${INSTALL_DIR} ${IDIR_BOOST}/usr/lib
+ifneq (${ADK_PACKAGE_BOOST_SHARED},)
+	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
+endif
+ifneq (${ADK_PACKAGE_BOOST_STATIC},)
+	${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib
+endif
+ifneq (${ADK_PACKAGE_BOOST_BOTH},)
+	${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib
+	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
+endif
+
+
+boost-dev-install:
+	${INSTALL_DIR} ${IDIR_BOOST_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_BOOST_DEV}/usr/include
+
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile
index 0e889194f..140526ebc 100644
--- a/package/cluster-glue/Makefile
+++ b/package/cluster-glue/Makefile
@@ -15,6 +15,7 @@ PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_CFLINE_CLUSTER_GLUE:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 PKG_HOST_DEPENDS:=	!darwin
+PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/cutter/patches/patch-cutter_c b/package/cutter/patches/patch-cutter_c
index 781c17401..03129f87e 100644
--- a/package/cutter/patches/patch-cutter_c
+++ b/package/cutter/patches/patch-cutter_c
@@ -1,7 +1,18 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- cutter-1.03.orig/cutter.c	2005-04-30 09:01:03.000000000 +0200
-+++ cutter-1.03/cutter.c	2008-10-09 11:32:40.000000000 +0200
-@@ -297,7 +297,7 @@ int send_rst(
++++ cutter-1.03/cutter.c	2011-08-24 18:49:58.830478484 +0200
+@@ -35,6 +35,10 @@
+  * 		improvment.
+  */
+ 
++#ifndef __packed
++#define __packed __attribute__((packed))
++#endif
++
+ #include <string.h>
+ #include <stdio.h>
+ #include <unistd.h>
+@@ -297,7 +301,7 @@ int send_rst(
  	pheader.placeholder=0;
  	pheader.protocol=IPPROTO_TCP;
  	pheader.tcp_length=htons(TCPHDR);
@@ -10,7 +21,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	tpack.tcp.check=in_cksum((unsigned short *)&pheader,TCPHDR+12);
  
  	/*
-@@ -419,7 +419,7 @@ int send_rst(
+@@ -419,7 +423,7 @@ int send_rst(
  			pheader.placeholder=0;
  			pheader.protocol=IPPROTO_TCP;
  			pheader.tcp_length=htons(TCPHDR);
diff --git a/package/ipsec-tools/patches/patch-src_racoon_isakmp_c b/package/ipsec-tools/patches/patch-src_racoon_isakmp_c
new file mode 100644
index 000000000..fdf5356fc
--- /dev/null
+++ b/package/ipsec-tools/patches/patch-src_racoon_isakmp_c
@@ -0,0 +1,21 @@
+--- ipsec-tools-0.8.0.orig/src/racoon/isakmp.c	2011-03-15 14:20:14.000000000 +0100
++++ ipsec-tools-0.8.0/src/racoon/isakmp.c	2011-08-24 18:48:47.887978959 +0200
+@@ -33,6 +33,10 @@
+ 
+ #include "config.h"
+ 
++#ifndef __packed
++#define __packed __attribute__((packed))
++#endif
++
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+@@ -130,6 +134,7 @@
+ #  define SOL_UDP IPPROTO_UDP
+ # endif /* __NetBSD__ / __FreeBSD__ */
+ 
++
+ static int nostate1 __P((struct ph1handle *, vchar_t *));
+ static int nostate2 __P((struct ph2handle *, vchar_t *));
+ 
diff --git a/package/jack/Makefile b/package/jack/Makefile
index 65776fd7f..1c5c0268e 100644
--- a/package/jack/Makefile
+++ b/package/jack/Makefile
@@ -3,7 +3,6 @@
 
 include $(TOPDIR)/rules.mk
 
-# always use tab spaces as separator, no spaces
 PKG_NAME:=		jack
 PKG_VERSION:=		1.9.7
 PKG_RELEASE:=		1
@@ -15,6 +14,8 @@ PKG_BUILDDEP:=		python2 alsa-lib
 PKG_URL:=		http://jackaudio.org
 PKG_SITES:=		http://www.grame.fr/~letz/
 
+PKG_HOST_DEPENDS:=	!darwin
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
new file mode 100644
index 000000000..38b949326
--- /dev/null
+++ b/package/kexec-tools/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		kexec-tools
+PKG_VERSION:=		2.0.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		bc401cf3262b25ff7c9a51fc76c8ab91
+PKG_DESCR:=		kexec tools
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		zlib
+PKG_BUILDEP:=		zlib
+PKG_URL:=		http://kernel.org/pub/linux/utils/kernel/kexec/
+PKG_SITES:=		http://kernel.org/pub/linux/utils/kernel/kexec/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,KEXEC_TOOLS,kexec-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+kexec-tools-install:
+	$(INSTALL_DIR) $(IDIR_KEXEC_TOOLS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/kexec \
+		$(IDIR_KEXEC_TOOLS)/usr/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile
index 11d8cc9a4..7541c3128 100644
--- a/package/libhugetlbfs/Makefile
+++ b/package/libhugetlbfs/Makefile
@@ -13,7 +13,7 @@ PKG_URL:=		http://libhugetlbfs.ozlabs.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libhugetlbfs/}
 
 PKG_CFLINE_LIBHUGETLBFS:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-PKG_ARCH_DEPENDS:=	x86 x86_64 arm
+PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/llvm/Makefile b/package/llvm/Makefile
index 0dfd2d3ec..1ac7c3a10 100644
--- a/package/llvm/Makefile
+++ b/package/llvm/Makefile
@@ -14,6 +14,7 @@ PKG_SITES:=		http://llvm.org/releases/2.9/
 
 PKG_CFLINE_LLVM:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 PKG_HOST_DEPENDS:=	!darwin
+PKG_ARCH_DEPENDS:=	mips x86 x86_64
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tgz
 
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index ddc34cacb..2c953c0fe 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -26,7 +26,7 @@ PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 
 PKG_HOST_DEPENDS:=	!darwin !cygwin !openbsd !netbsd !freebsd
 PKG_ARCH_DEPENDS:=	arm mips x86 x86_64
-PKG_SYSTEM_DEPENDS:=	!lemote-yeelong !linksys-ag241 !fon-fon2100
+PKG_SYSTEM_DEPENDS:=	!lemote-yeelong !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx
 
 # autotools infrastructure for OpenJDK
 ICEDTEA_NAME:=		icedtea6
diff --git a/package/openjdk/patches/rename-libnet.patch b/package/openjdk/patches/rename-libnet.patch
new file mode 100644
index 000000000..671c80dcc
--- /dev/null
+++ b/package/openjdk/patches/rename-libnet.patch
@@ -0,0 +1,127 @@
+https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/icedtea-libnet-renaming.patch?revision=864&view=markup&pathrev=867
+--- w-openjdk-6.orig/openjdk-6/jdk/make/java/net/Makefile	2011-02-28 17:06:10.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/java/net/Makefile	2011-09-02 16:20:55.597991415 +0200
+@@ -25,7 +25,7 @@
+ 
+ BUILDDIR = ../..
+ PACKAGE = java.net
+-LIBRARY = net
++LIBRARY = javanet
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+--- w-openjdk-6.orig/openjdk-6/jdk/make/java/nio/Makefile	2011-02-28 17:06:11.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/java/nio/Makefile	2011-09-02 16:21:37.817990454 +0200
+@@ -135,11 +135,11 @@
+ endif
+ ifeq ($(PLATFORM), linux)
+ COMPILER_WARNINGS_FATAL=true
+-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl
+ endif
+ ifeq ($(PLATFORM), solaris)
+ OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
+-		-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
++		-L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
+ endif # PLATFORM
+ 
+ #
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2011-09-02 16:22:26.507995127 +0200
+@@ -59,7 +59,7 @@
+      */
+     static {
+         java.security.AccessController.doPrivileged(
+-                  new sun.security.action.LoadLibraryAction("net"));
++                  new sun.security.action.LoadLibraryAction("javanet"));
+     }
+ 
+     /**
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2011-09-02 16:22:58.041740544 +0200
+@@ -79,7 +79,7 @@
+      */
+     static {
+         java.security.AccessController.doPrivileged(
+-                  new sun.security.action.LoadLibraryAction("net"));
++                  new sun.security.action.LoadLibraryAction("javanet"));
+     }
+ 
+     /**
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java	2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java	2011-09-02 16:23:20.197991292 +0200
+@@ -47,7 +47,7 @@
+      */
+     static {
+         java.security.AccessController.doPrivileged(
+-                  new sun.security.action.LoadLibraryAction("net"));
++                  new sun.security.action.LoadLibraryAction("javanet"));
+         init();
+     }
+ 
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java	2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java	2011-09-02 16:23:57.670490341 +0200
+@@ -231,7 +231,7 @@
+     static {
+         preferIPv6Address = java.security.AccessController.doPrivileged(
+             new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
+-        AccessController.doPrivileged(new LoadLibraryAction("net"));
++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
+         init();
+     }
+ 
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java	2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java	2011-09-02 16:24:13.879239438 +0200
+@@ -52,7 +52,7 @@
+     private boolean virtual = false;
+ 
+     static {
+-        AccessController.doPrivileged(new LoadLibraryAction("net"));
++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
+         init();
+     }
+ 
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2011-02-28 17:06:34.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2011-09-02 16:24:50.877990409 +0200
+@@ -89,7 +89,7 @@
+                 }});
+         if (b != null && b.booleanValue()) {
+             java.security.AccessController.doPrivileged(
+-                      new sun.security.action.LoadLibraryAction("net"));
++                      new sun.security.action.LoadLibraryAction("javanet"));
+             hasSystemProxies = init();
+         }
+     }
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java	2011-02-28 17:06:35.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java	2011-09-02 16:25:45.749240462 +0200
+@@ -354,7 +354,7 @@
+                 return;
+             loaded = true;
+             java.security.AccessController
+-                .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
++                .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
+             java.security.AccessController
+                 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
+             // IOUtil must be initialized; Its native methods are called from
+--- w-openjdk-6.orig/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-02-28 17:06:48.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-09-02 16:26:36.017990742 +0200
+@@ -244,7 +244,7 @@
+ 
+     static {
+         java.security.AccessController.doPrivileged(
+-            new sun.security.action.LoadLibraryAction("net"));
++            new sun.security.action.LoadLibraryAction("javanet"));
+     }
+ 
+ }
+--- w-openjdk-6.orig/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-02-28 17:06:51.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-09-02 16:27:07.069240501 +0200
+@@ -160,7 +160,7 @@
+ 
+     static {
+         java.security.AccessController.doPrivileged(
+-            new sun.security.action.LoadLibraryAction("net"));
++            new sun.security.action.LoadLibraryAction("javanet"));
+         init0();
+ 
+         // start the address listener thread
diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile
index 8f0b6bbe2..82b217f17 100644
--- a/package/pacemaker/Makefile
+++ b/package/pacemaker/Makefile
@@ -15,6 +15,7 @@ PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_CFLINE_PACEMAKER:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 PKG_HOST_DEPENDS:=	!darwin
+PKG_ARCH_DEPENDS:=	x86
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/python/Makefile b/package/python/Makefile
index 4c6cc4428..993dcb034 100644
--- a/package/python/Makefile
+++ b/package/python/Makefile
@@ -4,11 +4,12 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		python
-PKG_VERSION:=		3.2
+PKG_VERSION:=		3.2.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f1317dbb2398374d6691edd5bff1b91d
+PKG_MD5SUM:=		3c63a6d97333f4da35976b6a0755eb67
 PKG_DESCR:=		Python scripting language (Version 3)
 PKG_SECTION:=		lang
+PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
 
@@ -21,13 +22,16 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PYTHON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+# disable honour cflags stuff
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
+
 MAKE_ENV+=		OPT="$(TARGET_CFLAGS)" \
 			HOSTPYTHON=./hostpython \
 			HOSTPGEN=./Parser/hostpgen
-CONFIGURE_ENV+=		OPT="$(TARGET_CFLAGS)"
 CONFIGURE_ARGS:=	--with-threads \
 			--with-system-ffi \
 			--without-cxx-main
+CONFIGURE_ENV+=		ac_cv_have_long_long_format=yes
 
 post-extract:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
@@ -49,9 +53,11 @@ pre-configure:
 post-install:
 	${INSTALL_DIR} ${IDIR_PYTHON}/usr/bin ${IDIR_PYTHON}/usr/lib
 	${INSTALL_DIR} ${IDIR_PYTHON}/usr/lib/python3.2
+	${INSTALL_DIR} ${IDIR_PYTHON}/usr/include/python3.2m
 	${INSTALL_BIN} ${WRKINST}/usr/bin/python3 ${IDIR_PYTHON}/usr/bin
 	${CP} ${WRKINST}/usr/lib/libpython*.so* ${IDIR_PYTHON}/usr/lib
 	cd ${IDIR_PYTHON}/usr/bin && ln -s python3 python
 	${CP} ${WRKINST}/usr/lib/python3.2/* ${IDIR_PYTHON}/usr/lib/python3.2
+	${CP} ${WRKINST}/usr/include/python3.2m/* ${IDIR_PYTHON}/usr/include/python3.2m
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/python/patches/patch-Makefile_pre_in b/package/python/patches/patch-Makefile_pre_in
index 00504cb16..a2f7d96dc 100644
--- a/package/python/patches/patch-Makefile_pre_in
+++ b/package/python/patches/patch-Makefile_pre_in
@@ -1,6 +1,7 @@
---- Python-3.1.1.orig/Makefile.pre.in	2009-06-12 00:54:11.000000000 +0200
-+++ Python-3.1.1/Makefile.pre.in	2009-09-28 19:01:13.167748736 +0200
-@@ -52,7 +52,7 @@ INSTALL_DATA=	@INSTALL_DATA@
+diff -Nur Python-3.2.2.orig/Makefile.pre.in Python-3.2.2/Makefile.pre.in
+--- Python-3.2.2.orig/Makefile.pre.in	2011-09-03 18:16:45.000000000 +0200
++++ Python-3.2.2/Makefile.pre.in	2011-09-05 11:58:25.000000000 +0200
+@@ -57,7 +57,7 @@
  # Shared libraries must be installed with executable mode on some systems;
  # rather than figuring out exactly which, we always give them executable mode.
  # Also, making them read-only seems to be a good idea...
@@ -9,7 +10,7 @@
  
  MAKESETUP=      $(srcdir)/Modules/makesetup
  
-@@ -177,6 +177,7 @@ LIBOBJS=	@LIBOBJS@
+@@ -191,6 +191,7 @@
  
  PYTHON=		python$(EXE)
  BUILDPYTHON=	python$(BUILDEXE)
@@ -17,7 +18,7 @@
  
  # The task to run while instrument when building the profile-opt target
  PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
-@@ -217,6 +218,7 @@ GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar
+@@ -233,6 +234,7 @@
  ##########################################################################
  # Parser
  PGEN=		Parser/pgen$(EXE)
@@ -25,7 +26,7 @@
  
  POBJS=		\
  		Parser/acceler.o \
-@@ -393,7 +395,7 @@ build_all_generate_profile:
+@@ -413,7 +415,7 @@
  	$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
  
  run_profile_task:
@@ -34,12 +35,12 @@
  
  build_all_use_profile:
  	$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
-@@ -411,14 +413,14 @@ $(BUILDPYTHON):	Modules/python.o $(LIBRA
- 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+@@ -429,14 +431,14 @@
+ 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
  platform: $(BUILDPYTHON)
--	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
-+	$(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
+-	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
++	$(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
  
  
  # Build the shared modules
@@ -52,43 +53,43 @@
  	esac
  
  # Build static library
-@@ -542,7 +544,7 @@ $(IO_OBJS): $(IO_H)
- 
- $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+@@ -587,7 +589,7 @@
+ $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
+ Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
  		-@$(INSTALL) -d Include
--		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+-		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
 +		-$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ 		-touch Parser/pgen.stamp
  
  $(PGEN):	$(PGENOBJS)
- 		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
-@@ -705,7 +707,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
+@@ -758,7 +760,7 @@
  
  TESTOPTS=	-l $(EXTRATESTOPTS)
  TESTPROG=	$(srcdir)/Lib/test/regrtest.py
--TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -E -bb
-+TESTPYTHON=	$(RUNSHARED) $(HOSTPYTHON) -E -bb
+-TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -Wd -E -bb $(TESTPYTHONOPTS)
++TESTPYTHON=	$(RUNSHARED) $(HOSTPYTHON) -Wd -E -bb $(TESTPYTHONOPTS)
  test:		all platform
  		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
  		-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
-@@ -1018,7 +1020,7 @@ libainstall:	all
+@@ -1102,7 +1104,7 @@
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
- sharedinstall:
+ sharedinstall: sharedmods
 -	$(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
 +	$(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
  	   	--prefix=$(prefix) \
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
-@@ -1056,7 +1058,7 @@ frameworkinstallstructure:	$(LDLIBRARY)
+@@ -1140,7 +1142,7 @@
  		fi; \
  	done
- 	$(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
+ 	$(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
 -	sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
 +	sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
  	$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
  	$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
  	$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
-@@ -1098,7 +1100,7 @@ frameworkinstallextras:
+@@ -1174,7 +1176,7 @@
  # This installs a few of the useful scripts in Tools/scripts
  scriptsinstall:
  	SRCDIR=$(srcdir) $(RUNSHARED) \
@@ -96,8 +97,8 @@
 +	$(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \
  	--prefix=$(prefix) \
  	--install-scripts=$(BINDIR) \
- 	--root=/$(DESTDIR)
-@@ -1120,7 +1122,7 @@ config.status:	$(srcdir)/configure
+ 	--root=$(DESTDIR)/
+@@ -1196,7 +1198,7 @@
  
  # Run reindent on the library
  reindent:
@@ -106,7 +107,7 @@
  
  # Rerun configure with the same options as it was run last time,
  # provided the config.status script exists
-@@ -1234,7 +1236,7 @@ funny:
+@@ -1317,7 +1319,7 @@
  
  # Perform some verification checks on any modified files.
  patchcheck:
diff --git a/package/python/patches/patch-configure b/package/python/patches/patch-configure
index b76afc821..b24d4c24f 100644
--- a/package/python/patches/patch-configure
+++ b/package/python/patches/patch-configure
@@ -1,12 +1,13 @@
---- Python-3.1.1.orig/configure	2009-06-08 23:22:57.000000000 +0200
-+++ Python-3.1.1/configure	2010-11-07 20:52:09.000000000 +0100
-@@ -2051,12 +2051,12 @@ fi
- echo $ECHO_N "checking MACHDEP... $ECHO_C" >&6; }
+diff -Nur Python-3.2.2.orig/configure Python-3.2.2/configure
+--- Python-3.2.2.orig/configure	2011-09-03 18:16:50