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

10 files changed, 66 insertions, 20 deletions

diff --git a/TODO b/TODO
index 21bfc790a..491805116 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+- check alsa on foxg20 target
+- add mkimage to tools build
 - fix ARM OABI support
 - fix watchdog for alix1c (mfgpt timers problem)
 - add support for brcm 2.6 (flash support)
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index c80be266a..310f45d81 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -63,7 +63,7 @@ do-install:
 		$(IDIR_DBCONVERT)/usr/bin/dropbearconvert
 	# ssh pubkey
 	test -z $(ADK_RUNTIME_SSH_PUBKEY) || ( \
-		mkdir -p $(IDIR_DROPBEAR)/etc/dropbear; \
+		$(INSTALL_DIR) $(IDIR_DROPBEAR)/etc/dropbear; \
 		echo $(ADK_RUNTIME_SSH_PUBKEY) \
 		>$(IDIR_DROPBEAR)/etc/dropbear/authorized_keys; \
         )
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index e807fda8f..49d8ed3ec 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,7 +4,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		3.6.8
+PKG_VERSION:=		3.6.10
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		0ee5f14fd8be07513d16131027ebcb61
 PKG_DESCR:=		graphical webbrowser
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 0aa427d55..f57192c27 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		hostapd
-PKG_VERSION:=		0.7.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		f47689c62ee8c1c59989b402d4f130c3
+PKG_VERSION:=		0.7.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		91a7c8d0f090b7104152d3455a84c112
 PKG_DESCR:=		an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator
 PKG_SECTION:=		wifi
 PKG_DEPENDS:=		libnl
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 967a951d4..f67360f10 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openswan
-PKG_VERSION:=		2.6.27
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		5177b7401bb89e84ca1c89029143441e
+PKG_VERSION:=		2.6.28
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		37f2ad2664dd89e6ad96ae82f6378166
 PKG_DESCR:=		IPsec software
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		ip libgmp libpthread kmod-net-key kmod-xfrm-user
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index f28543afe..774a63ea9 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -4,15 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		openvpn
-PKG_VERSION:=		2.1.1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		b273ed2b5ec8616fb9834cde8634bce7
+PKG_VERSION:=		2.1.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		7486d3e270ba4b033e311d3e022a0ad7
 PKG_DESCR:=		Open Source VPN solution using SSL
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		kmod-tun libopenssl
 PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://openvpn.net/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=openvpn/}
+PKG_SITES:=		http://openvpn.net/release/
 
 PKG_SUBPKGS:=		OPENVPN OPENVPN_EASY_RSA
 PKG_FLAVOURS:=		WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 834817160..23a27490f 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		ae7f305eb9388b187e8f07dee0cec55c
 PKG_DESCR:=		PostgreSQL database library
 PKG_SECTION:=		db
 PKG_BUILDDEP:=		zlib
-PKG_URL:=		http://www.postgresql.org
+PKG_URL:=		http://www.postgresql.org/
 PKG_SITES:=		ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/
 
 PKG_SUBPKGS:=		LIBPQ
@@ -21,9 +21,7 @@ $(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
-
-PKG_CONFIGURE_ARGS:=\
-			--disable-integer-datetimes \
+PKG_CONFIGURE_ARGS:=	--disable-integer-datetimes \
 			--without-krb5 \
 			--without-openssl \
 			--without-pam \
diff --git a/package/vim/Makefile b/package/vim/Makefile
index d9b2bfdfb..1eabf5555 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		vim
-PKG_VERSION:=		7.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		f0901284b338e448bfd79ccca0041254
+PKG_VERSION:=		7.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		5b9510a17074e2b37d8bb38ae09edbf2
 PKG_DESCR:=		The text editor
 PKG_SECTION:=		editor
 PKG_DEPENDS:=		libncurses
@@ -15,7 +15,7 @@ PKG_URL:=		http://www.vim.org/
 PKG_SITES:=		ftp://ftp.vim.org/pub/vim/unix/
 
 DISTFILES=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
-WRKDIST=		${WRKDIR}/vim72
+WRKDIST=		${WRKDIR}/vim73
 WRKSRC=			${WRKDIST}/src
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/vim/patches/patch-src_auto_configure b/package/vim/patches/patch-src_auto_configure
new file mode 100644
index 000000000..37544f63b
--- /dev/null
+++ b/package/vim/patches/patch-src_auto_configure
@@ -0,0 +1,42 @@
+--- vim73.orig/src/auto/configure	2010-08-13 16:17:15.000000000 +0200
++++ vim73/src/auto/configure	2010-09-20 02:59:14.017806852 +0200
+@@ -11639,39 +11639,6 @@ _ACEOF
+ 
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
+-$as_echo_n "checking uint32_t is 32 bits... " >&6; }
+-if test "$cross_compiling" = yes; then :
+-  as_fn_error "could not compile program using uint32_t." "$LINENO" 5
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#ifdef HAVE_STDINT_H
+-# include <stdint.h>
+-#endif
+-#ifdef HAVE_INTTYPES_H
+-# include <inttypes.h>
+-#endif
+-main() {
+-  uint32_t nr1 = (uint32_t)-1;
+-  uint32_t nr2 = (uint32_t)0xffffffffUL;
+-  if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1);
+-  exit(0);
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+-$as_echo "ok" >&6; }
+-else
+-  as_fn_error "WRONG!  uint32_t not defined correctly." "$LINENO" 5
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-
+-
+ bcopy_test_prog='
+ #include "confdefs.h"
+ #ifdef HAVE_STRING_H
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 7f1b1d584..ca71d554c 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -139,6 +139,10 @@ config ADK_MOD_KERNEL_LIB80211
 	tristate
 	default n
 
+config ADK_KERNEL_CFG80211_WEXT
+	boolean
+	default n
+
 config ADK_KERNEL_ATH_COMMON
 	tristate
 	default n