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

9 files changed, 1359 insertions, 90 deletions

diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index 9af18704c..3af5e0e5f 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -19,7 +19,7 @@ install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
 
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 	(cd $(WRKBUILD); \
-		wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-latest.jar; \
+		wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar; \
 		env ${GCJ_ENV} ./configure \
 			--prefix=/usr \
 			--enable-java-home \
diff --git a/jtools/openjdk7/Makefile b/jtools/openjdk7/Makefile
index 51590f10e..58db553fe 100644
--- a/jtools/openjdk7/Makefile
+++ b/jtools/openjdk7/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		icedtea
-PKG_VERSION:=		2.3.9
+PKG_VERSION:=		2.3.12
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e96e5e578d442d3ae56cd332e8dbc6b6
+PKG_MD5SUM:=		9b3afa162021e3fca6161ba8f9f7dc11
 PKG_DESCR:=		OpenJDK 7 Java VM
 PKG_SECTION:=		lang
 PKG_URL:=		http://openjdk.org/
@@ -30,6 +30,7 @@ CONFIGURE_ARGS+=\
 		--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
 		--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar \
 		--without-hotspot-build \
+                --disable-system-kerberos \
                 --disable-system-jpeg \
                 --disable-system-lcms \
                 --disable-system-zlib \
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index bbcada2f6..8ed439e70 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtorrent
-PKG_VERSION:=		0.13.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		d499178f72010d5067a77f41fa1a1505
+PKG_VERSION:=		0.13.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		96c0b81501357df402ab592f59ecaeab
 PKG_DESCR:=		A bittorrent library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl libsigc++
@@ -21,7 +21,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_ARGS+=	--enable-aligned
+CONFIGURE_ARGS+=	--enable-aligned \
+			--without-kqueue
 
 libtorrent-install:
 	${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 2787168bf..ed4fc21b4 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		openjdk7
-PKG_VERSION:=		2.3.9
+PKG_VERSION:=		2.3.12
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e96e5e578d442d3ae56cd332e8dbc6b6
+PKG_MD5SUM:=		9b3afa162021e3fca6161ba8f9f7dc11
 PKG_DESCR:=		OpenJDK 7 Java VM
 PKG_SECTION:=		lang
 PKG_BUILDDEP:=		gettext-tiny-host glib-host flex-host bison-host qemu-host
@@ -75,6 +75,7 @@ CONFIGURE_COMMON:=	--disable-docs \
 			--disable-system-jpeg \
 			--disable-system-lcms \
 			--disable-system-zlib \
+			--disable-system-kerberos \
 			--disable-system-png \
 			--disable-system-gif \
 			--disable-system-gtk \
diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch
index 25e979fce..effd32a92 100644
--- a/package/openjdk7/patches/openadk.patch
+++ b/package/openjdk7/patches/openadk.patch
@@ -1,16 +1,8 @@
-diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in
---- icedtea-2.3.9.orig/Makefile.in	2013-04-21 22:48:31.000000000 +0200
-+++ icedtea-2.3.9/Makefile.in	2013-11-15 12:28:32.000000000 +0100
-@@ -90,7 +90,6 @@
- @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/7089790-bsd_port.patch \
- @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/7098194-macosx_port.patch \
- @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/7116189-setnativethreadname.patch \
--@WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/6924259-string_offset.patch \
- @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/revert_arm_debug.patch
- 
- @WITH_RHINO_TRUE@am__append_9 = \
-@@ -657,7 +656,7 @@
- 	$(am__append_17) $(am__append_18) $(DISTRIBUTION_PATCHES)
+diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in
+--- icedtea-2.3.11.orig/Makefile.in	2013-07-25 02:39:55.000000000 +0200
++++ icedtea-2.3.11/Makefile.in	2013-12-08 15:43:27.000000000 +0100
+@@ -695,7 +695,7 @@
+ 	$(DISTRIBUTION_PATCHES)
  
  # Bootstrapping patches
 -ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
@@ -18,7 +10,7 @@ diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in
  	patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
  	patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
  	patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \
-@@ -2050,7 +2049,7 @@
+@@ -2090,7 +2090,7 @@
  # Optional native ecj
  stamps/native-ecj.stamp:
  	mkdir -p stamps 
@@ -27,13 +19,13 @@ diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in
  @BUILD_NATIVE_ECJ_TRUE@	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
  	touch $@
  
-diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk.patch
---- icedtea-2.3.9.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.3.9/patches/openadk.patch	2013-11-15 13:52:27.000000000 +0100
+diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/openadk.patch
+--- icedtea-2.3.11.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
++++ icedtea-2.3.11/patches/openadk.patch	2013-12-08 16:22:41.000000000 +0100
 @@ -0,0 +1,493 @@
 +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2013-03-15 17:33:37.000000000 +0100
-++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2013-07-17 20:14:46.000000000 +0200
+++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2013-12-08 15:44:03.000000000 +0100
 +@@ -115,7 +115,6 @@
 + # include <string.h>
 + # include <syscall.h>
@@ -42,7 +34,7 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + # include <sys/ipc.h>
 + # include <sys/shm.h>
 + # include <link.h>
-+@@ -644,9 +643,7 @@
++@@ -649,9 +648,7 @@
 +      os::Linux::set_glibc_version(str);
 +   } else {
 +      // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
@@ -53,7 +45,7 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +      os::Linux::set_glibc_version(_gnu_libc_version);
 +   }
 + 
-+@@ -2640,10 +2637,7 @@
++@@ -2648,10 +2645,7 @@
 + // If we are running with earlier version, which did not have symbol versions,
 + // we should use the base version.
 + void* os::Linux::libnuma_dlsym(void* handle, const char *name) {
@@ -65,7 +57,7 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +   return f;
 + }
 + 
-+@@ -4908,7 +4902,21 @@
++@@ -4916,7 +4910,21 @@
 + // Linux doesn't yet have a (official) notion of processor sets,
 + // so just return the system wide load average.
 + int os::loadavg(double loadavg[], int nelem) {
@@ -89,8 +81,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + 
 + void os::pause() {
 +diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
-+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-03-15 17:33:37.000000000 +0100
-++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-11-15 13:51:57.000000000 +0100
++--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-07-17 20:14:46.000000000 +0200
+++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2013-12-08 15:44:03.000000000 +0100
 +@@ -253,7 +253,7 @@
 + #elif defined(__APPLE__)
 + inline int g_isnan(double f) { return isnan(f); }
@@ -112,8 +104,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + 
 + // Wide characters
 +diff -Nur openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
-+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2013-12-08 15:44:03.000000000 +0100
 +@@ -80,7 +80,7 @@
 +     LDDFLAGS += $(ZIPOBJS)
 +   endif
@@ -124,8 +116,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + endif
 + 
 +diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
-+--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile	2013-12-08 15:44:03.000000000 +0100
 +@@ -64,7 +64,7 @@
 + COMPILER_WARNINGS_FATAL=true
 + endif
@@ -136,8 +128,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + ifeq ($(PLATFORM), solaris)
 + #LIBSCTP = -lsctp
 +diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk
-+--- openjdk.orig/jdk/make/common/Defs.gmk	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/common/Defs.gmk	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/common/Defs.gmk	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/common/Defs.gmk	2013-12-08 15:44:03.000000000 +0100
 +@@ -204,7 +204,7 @@
 +       ifeq ($(PLATFORM), macosx)
 +         FREETYPE_HEADERS_PATH = /usr/X11R6/include
@@ -148,8 +140,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +     endif
 +   endif
 +diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
-+--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/common/shared/Platform.gmk	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/common/shared/Platform.gmk	2013-12-08 15:44:03.000000000 +0100
 +@@ -160,9 +160,6 @@
 +   else
 +     mach := $(shell uname -m)
@@ -161,8 +153,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +                 i[3-9]86) \
 +                     echo i586 \
 +diff -Nur openjdk.orig/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile
-+--- openjdk.orig/jdk/make/java/instrument/Makefile	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/java/instrument/Makefile	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/java/instrument/Makefile	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/java/instrument/Makefile	2013-12-08 15:44:04.000000000 +0100
 +@@ -140,6 +140,8 @@
 + # We don't want to link against -ljava
 + JAVALIB=
@@ -173,8 +165,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + # Add to ambient vpath so we pick up the library files
 + #
 +diff -Nur openjdk.orig/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
-+--- openjdk.orig/jdk/make/java/net/Makefile	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/java/net/Makefile	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/java/net/Makefile	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/java/net/Makefile	2013-12-08 15:44:04.000000000 +0100
 +@@ -25,7 +25,7 @@
 + 
 + BUILDDIR = ../..
@@ -185,8 +177,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + include $(BUILDDIR)/common/Defs.gmk
 + 
 +diff -Nur openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
-+--- openjdk.orig/jdk/make/java/nio/Makefile	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/java/nio/Makefile	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/java/nio/Makefile	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/java/nio/Makefile	2013-12-08 15:44:04.000000000 +0100
 +@@ -369,7 +369,7 @@
 + endif
 + 
@@ -215,8 +207,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
 + $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java
 +diff -Nur openjdk.orig/jdk/make/java/npt/Makefile openjdk/jdk/make/java/npt/Makefile
-+--- openjdk.orig/jdk/make/java/npt/Makefile	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/java/npt/Makefile	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/java/npt/Makefile	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/java/npt/Makefile	2013-12-08 15:44:04.000000000 +0100
 +@@ -64,6 +64,8 @@
 + # We don't want to link against -ljava
 + JAVALIB=
@@ -227,8 +219,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + ifeq ($(PLATFORM), windows)
 +   OTHER_LCF += -export:nptInitialize -export:nptTerminate
 +diff -Nur openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
-+--- openjdk.orig/jdk/make/sun/awt/mawt.gmk	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/sun/awt/mawt.gmk	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/sun/awt/mawt.gmk	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/sun/awt/mawt.gmk	2013-12-08 15:44:04.000000000 +0100
 +@@ -151,22 +151,6 @@
 + #endif
 + 
@@ -286,8 +278,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + ifeq ($(PLATFORM), macosx))
 +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
 +diff -Nur openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
-+--- openjdk.orig/jdk/make/sun/splashscreen/Makefile	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/sun/splashscreen/Makefile	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/sun/splashscreen/Makefile	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/sun/splashscreen/Makefile	2013-12-08 15:44:04.000000000 +0100
 +@@ -55,6 +55,8 @@
 + 
 + JAVALIB=
@@ -298,8 +290,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + # C Flags
 + #
 +diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
-+--- openjdk.orig/jdk/make/sun/xawt/Makefile	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/make/sun/xawt/Makefile	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/make/sun/xawt/Makefile	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/make/sun/xawt/Makefile	2013-12-08 15:44:04.000000000 +0100
 +@@ -292,16 +292,10 @@
 + SIZERS = $(SIZER).32
 + SIZERS_C = $(SIZER_32_C)
@@ -340,8 +332,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + 	@if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
 + 	    $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
 +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
-+--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2013-12-08 15:44:04.000000000 +0100
 +@@ -69,7 +69,7 @@
 +      */
 +     static {
@@ -352,8 +344,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + 
 +     /**
 +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
-+--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2013-12-08 15:44:04.000000000 +0100
 +@@ -78,7 +78,7 @@
 +      */
 +     static {
@@ -364,8 +356,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + 
 +     /**
 +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
-+--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java	2013-12-08 15:44:04.000000000 +0100
 +@@ -47,7 +47,7 @@
 +      */
 +     static {
@@ -376,8 +368,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +     }
 + 
 +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
-+--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java	2013-12-08 15:44:04.000000000 +0100
 +@@ -260,7 +260,7 @@
 +     static {
 +         preferIPv6Address = java.security.AccessController.doPrivileged(
@@ -388,8 +380,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +     }
 + 
 +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
-+--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java	2013-12-08 15:44:04.000000000 +0100
 +@@ -53,7 +53,7 @@
 +     private static final int defaultIndex; /* index of defaultInterface */
 + 
@@ -400,8 +392,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +         defaultInterface = DefaultInterface.getDefault();
 +         if (defaultInterface != null) {
 +diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
-+--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java	2013-12-08 15:44:04.000000000 +0100
 +@@ -76,6 +76,6 @@
 + 
 +     static {
@@ -411,8 +403,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +     }
 + }
 +diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
-+--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2013-12-08 15:44:04.000000000 +0100
 +@@ -95,7 +95,7 @@
 +                 }});
 +         if (b != null && b.booleanValue()) {
@@ -423,8 +415,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +         }
 +     }
 +diff -Nur openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
-+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java	2013-12-08 15:44:04.000000000 +0100
 +@@ -483,7 +483,7 @@
 +                 return;
 +             loaded = true;
@@ -435,8 +427,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +                 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
 +             // IOUtil must be initialized; Its native methods are called from
 +diff -Nur openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
-+--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-12-08 15:44:04.000000000 +0100
 +@@ -247,7 +247,7 @@
 + 
 +     static {
@@ -447,8 +439,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + 
 + }
 +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c
-+--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2013-12-08 15:44:04.000000000 +0100
 +@@ -246,7 +246,8 @@
 +     if (wcs == NULL)
 +         return NULL;
@@ -460,8 +452,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 +     mbs = (char *) malloc(n * sizeof(char));
 +     if (mbs == NULL) {
 +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
-+--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c	2013-12-08 15:44:04.000000000 +0100
 +@@ -27,9 +27,6 @@
 + #include <X11/Xutil.h>
 + #include <X11/Xos.h>
@@ -499,8 +491,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + Window get_xawt_root_shell(JNIEnv *env) {
 +   static jclass classXRootWindow = NULL;
 +diff -Nur openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
-+--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-04-16 00:41:13.000000000 +0200
-++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-06-23 17:54:05.000000000 +0200
+++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-12-08 15:44:04.000000000 +0100
 +@@ -159,7 +159,7 @@
 + 
 +     static {
@@ -511,8 +503,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk
 + 
 +         // start the address listener thread
 +diff -Nur openjdk.orig/Makefile openjdk/Makefile
-+--- openjdk.orig/Makefile	2013-03-08 17:04:19.000000000 +0100
-++++ openjdk/Makefile	2013-11-15 13:51:09.000000000 +0100
++--- openjdk.orig/Makefile	2013-06-23 17:53:43.000000000 +0200
+++++ openjdk/Makefile	2013-12-08 15:44:04.000000000 +0100
 +@@ -53,9 +53,7 @@
 + REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
 + REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index a0659476b..7daaa6443 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		rtorrent
-PKG_VERSION:=		0.9.0
+PKG_VERSION:=		0.9.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9bc258d7a63dd13e3348f310ae26a434
+PKG_MD5SUM:=		72c3e9ab859bda7cc8aa96c0b508b09f
 PKG_DESCR:=		console torrent application
 PKG_SECTION:=		p2p
 PKG_DEPENDS:=		libncurses libtorrent libcurl libstdcxx
-PKG_BUILDDEP:=		ncurses libtorrent curl
+PKG_BUILDDEP:=		autotool ncurses libtorrent curl
 PKG_URL:=		http://libtorrent.rakshasa.no/
 PKG_SITES:=		http://libtorrent.rakshasa.no/downloads/
 
@@ -18,7 +18,8 @@ PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk
 
-TARGET_LDFLAGS+=	-lpthread
+AUTOTOOL_STYLE:=	autoreconf
+TARGET_LDFLAGS+=	-lpthread -ltinfo
 
 $(eval $(call PKG_template,RTORRENT,rtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
diff --git a/package/rtorrent/patches/patch-configure b/package/rtorrent/patches/patch-configure
index 833360f24..497473f50 100644
--- a/package/rtorrent/patches/patch-configure
+++ b/package/rtorrent/patches/patch-configure
@@ -1,7 +1,1086 @@
---- rtorrent-0.9.0.orig/configure	2011-12-10 13:32:44.000000000 +0100
-+++ rtorrent-0.9.0/configure	2012-03-22 21:14:03.805634594 +0100
-@@ -15442,38 +15442,6 @@ fi
+--- rtorrent-0.9.2.orig/configure	2012-04-20 09:00:08.000000000 +0200
++++ rtorrent-0.9.2/configure	2014-01-13 12:54:25.000000000 +0100
+@@ -1,13 +1,11 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.68 for rtorrent 0.9.2.
++# Generated by GNU Autoconf 2.69 for rtorrent 0.9.2.
+ #
+ # Report bugs to <jaris@ifi.uio.no>.
+ #
+ #
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -136,6 +134,31 @@ export LANGUAGE
+ # CDPATH.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
++# Use a proper internal environment variable to ensure we don't fall
++  # into an infinite loop, continuously re-executing ourselves.
++  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
++    _as_can_reexec=no; export _as_can_reexec;
++    # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++as_fn_exit 255
++  fi
++  # We don't want this to propagate to other subprocesses.
++          { _as_can_reexec=; unset _as_can_reexec;}
+ if test "x$CONFIG_SHELL" = x; then
+   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test
+ else
+   exitcode=1; echo positional parameters were not saved.
+ fi
+-test x\$exitcode = x0 || exit 1"
++test x\$exitcode = x0 || exit 1
++test -x / || exit 1"
+   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+@@ -222,21 +246,25 @@ IFS=$as_save_IFS
+ 
+ 
+       if test "x$CONFIG_SHELL" != x; then :
+-  # We cannot yet assume a decent shell, so we have to provide a
+-	# neutralization value for shells without unset; and this also
+-	# works around shells that cannot unset nonexistent variables.
+-	# Preserve -v and -x to the replacement shell.
+-	BASH_ENV=/dev/null
+-	ENV=/dev/null
+-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+-	export CONFIG_SHELL
+-	case $- in # ((((
+-	  *v*x* | *x*v* ) as_opts=-vx ;;
+-	  *v* ) as_opts=-v ;;
+-	  *x* ) as_opts=-x ;;
+-	  * ) as_opts= ;;
+-	esac
+-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
++  export CONFIG_SHELL
++             # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++exit 255
+ fi
+ 
+     if test x$as_have_required = xno; then :
+@@ -339,6 +367,14 @@ $as_echo X"$as_dir" |
+ 
+ 
+ } # as_fn_mkdir_p
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++  test -f "$1" && test -x "$1"
++} # as_fn_executable_p
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
+   chmod +x "$as_me.lineno" ||
+     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ 
++  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
++  # already done that, so ensure we don't try to do so again and fall
++  # in an infinite loop.  This has already happened in practice.
++  _as_can_reexec=no; export _as_can_reexec
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensitive to this).
+@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -p'.
++    # In both cases, we have to default to `cp -pR'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -p'
++      as_ln_s='cp -pR'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
+-    as_ln_s='cp -p'
++    as_ln_s='cp -pR'
+   fi
+ else
+-  as_ln_s='cp -p'
++  as_ln_s='cp -pR'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -515,28 +555,8 @@ else
+   as_mkdir_p=false
+ fi
+ 
+-if test -x / >/dev/null 2>&1; then
+-  as_test_x='test -x'
+-else
+-  if ls -dL / >/dev/null 2>&1; then
+-    as_ls_L_option=L
+-  else
+-    as_ls_L_option=
+-  fi
+-  as_test_x='
+-    eval sh -c '\''
+-      if test -d "$1"; then
+-	test -d "$1/.";
+-      else
+-	case $1 in #(
+-	-*)set "./$1";;
+-	esac;
+-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+-	???[sx]*):;;*)false;;esac;fi
+-    '\'' sh
+-  '
+-fi
+-as_executable_p=$as_test_x
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -683,9 +703,6 @@ CPPFLAGS
+ LDFLAGS
+ CXXFLAGS
+ CXX
+-CPPUNIT_LIBS
+-CPPUNIT_CFLAGS
+-CPPUNIT_CONFIG
+ am__untar
+ am__tar
+ AMTAR
+@@ -750,8 +767,6 @@ SHELL'
+ ac_subst_files=''
+ ac_user_opts='
+ enable_option_checking
+-with_cppunit_prefix
+-with_cppunit_exec_prefix
+ enable_dependency_tracking
+ enable_shared
+ enable_static
+@@ -1253,8 +1268,6 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used" >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -1418,8 +1431,10 @@ Optional Features:
+   --disable-option-checking  ignore unrecognized --enable/--with options
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+-  --disable-dependency-tracking  speeds up one-time build
+-  --enable-dependency-tracking   do not reject slow dependency extractors
++  --enable-dependency-tracking
++                          do not reject slow dependency extractors
++  --disable-dependency-tracking
++                          speeds up one-time build
+   --enable-shared[=PKGS]  build shared libraries [default=yes]
+   --enable-static[=PKGS]  build static libraries [default=yes]
+   --enable-fast-install[=PKGS]
+@@ -1437,8 +1452,6 @@ Optional Features:
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)
+-  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)
+   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                           both]
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+@@ -1548,9 +1561,9 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ rtorrent configure 0.9.2
+-generated by GNU Autoconf 2.68
++generated by GNU Autoconf 2.69
+ 
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1664,7 +1677,7 @@ $as_echo "$ac_try_echo"; } >&5
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
++	 test -x conftest$ac_exeext
+        }; then :
+   ac_retval=0
+ else
+@@ -1924,7 +1937,7 @@ $as_echo "$ac_try_echo"; } >&5
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
++	 test -x conftest$ac_exeext
+        }; then :
+   ac_retval=0
+ else
+@@ -2038,7 +2051,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by rtorrent $as_me 0.9.2, which was
+-generated by GNU Autoconf 2.68.  Invocation command line was
++generated by GNU Autoconf 2.69.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2390,7 +2403,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ $as_echo "#define API_VERSION 6" >>confdefs.h
+ 
+ 
+-am__api_version='1.11'
++am__api_version='1.12'
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+@@ -2458,7 +2471,7 @@ case $as_dir/ in #((
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -2516,9 +2529,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane...