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

86 files changed, 1506 insertions, 1287 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 2fb5bb3bf..6397d78bb 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -15,6 +15,7 @@ DEFCONFIG= 		ADK_DEVELSYSTEM=n \
 			ADK_STATIC=n \
 			ADK_FORCE_PARALLEL=n \
 			ADK_PACKAGE_GRUB=n \
+			ADK_PACKAGE_BASE_FILES=y \
 			BUSYBOX_SELINUX=n \
 			BUSYBOX_MODPROBE_SMALL=n \
 			BUSYBOX_EJECT=n \
@@ -81,7 +82,7 @@ include ${TOPDIR}/mk/split-cfg.mk
 all: world
 
 allcopy: all
-	$(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${d}/
+	$(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${targetdir}/
 
 ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config
 	mksh ${TOPDIR}/package/depmaker
@@ -375,9 +376,9 @@ bulk:
 				defconfig; \
 		fi && \
 		$(MAKE) VERBOSE=1 -f mk/build.mk allcopy \
-		    d=$$target-$$libc-$$fs && \
+		    targetdir=$$target-$$libc-$$fs; \
 		$(MAKE) cleantarget; \
-		rm .*config; \
+		rm .config; \
 	    ) 2>&1 | tee $(TOPDIR)/bulkdir/$$target-$$libc-$$fs/log; \
 	done <${TOPDIR}/target/bulk.lst
 
diff --git a/mk/modules.mk b/mk/modules.mk
index b923b8e34..c36bdb21e 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -934,7 +934,6 @@ $(eval $(call KMOD_template,SND,sound-alsa,\
 	$(MODULES_DIR)/kernel/sound/core/snd \
 	$(MODULES_DIR)/kernel/sound/core/snd-timer \
 	$(MODULES_DIR)/kernel/sound/core/snd-pcm \
-	$(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
 ,40))
 
 $(eval $(call KMOD_template,SND_OSSEMUL,sound-alsa-oss-emul,\
diff --git a/package/Config.in b/package/Config.in
index f982e342d..e4c5288c3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -162,7 +162,7 @@ source "package/procps/Config.in"
 source "package/sispmctl/Config.in"
 source "package/stress/Config.in"
 source "package/sysstat/Config.in"
-source "package/udev/Config.in"
+#source "package/udev/Config.in"
 source "package/watchdog/Config.in"
 endmenu
 
@@ -289,7 +289,6 @@ menu "Network Filesystems"
 source "package/davfs2/Config.in"
 source "package/davfs2/Config.in.kernel"
 source "package/nfs-utils/Config.in"
-source "package/nfs-utils/Config.in.kerberos"
 source "package/samba/Config.in"
 endmenu
 
@@ -359,7 +358,6 @@ source "package/hostapd/Config.in"
 source "package/iw/Config.in"
 #source "package/kismet/Config.in"
 source "package/olsrd/Config.in"
-source "package/snort-wireless/Config.in"
 source "package/wifidog/Config.in"
 source "package/wireless-firmware/Config.in"
 source "package/wpa_supplicant/Config.in"
@@ -483,6 +481,7 @@ source "package/speex/Config.in"
 source "package/sqlite/Config.in.lib"
 source "package/librpcsecgss/Config.in"
 source "package/libshout/Config.in"
+source "package/libshout/Config.in.lib"
 source "package/libsigc++/Config.in"
 source "package/libstdcxx/Config.in"
 source "package/libtasn1/Config.in"
@@ -499,7 +498,7 @@ source "package/tcp_wrappers/Config.in"
 source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
 source "package/lua/Config.in.lib"
-source "package/uclibc++/Config.in"
+source "package/uclibc++/Config.in.manual"
 source "package/ustl/Config.in"
 source "package/zlib/Config.in"
 endmenu
diff --git a/package/Makefile b/package/Makefile
index 1b3943f36..2e83a0799 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -18,6 +18,7 @@ endif
 ifneq (${ADK_NATIVE},y)
 package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
 endif
+
 ifneq (${ADK_TARGET_LIB_GLIBC},y)
 ifneq (${ADK_NATIVE},y)
 package-$(ADK_PACKAGE_UCLIBC) += uclibc
@@ -30,6 +31,7 @@ COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
 INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 
 all: compile
+download: $(DOWNLOAD)
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m) base-files)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
 compile: $(COMPILE_PACKAGES)
@@ -38,10 +40,9 @@ else
 compile: base-files-compile $(COMPILE_PACKAGES)
 install: base-files-install $(INSTALL_PACKAGES)
 endif
-download: $(DOWNLOAD)
 
-$(COMPILE_PACKAGES): base-files-compile
-$(INSTALL_PACKAGES): base-files-install
+#$(COMPILE_PACKAGES): base-files-compile
+#$(INSTALL_PACKAGES): base-files-install
 
 $(TARGET_DIR):
 	mkdir -p $(TARGET_DIR)
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 7dd463cac..c66f4c7e5 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,8 +4,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.27.1
+PKG_VERSION:=		1.4.28
 PKG_RELEASE:=		1
+PKG_MD5SUM:=		e8006ce319e18ce07ce1335ad583330a
+PKG_DESCR:=		Open Source PBX
+PKG_SECTION:=		net
+PKG_MULTI:=		1
+PKG_NOPARALLEL:=	1
+PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
 PKG_BUILDDEP+=		ncurses openssl zlib curl popt
 ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),)
 PKG_BUILDDEP+=		speex
@@ -13,17 +19,12 @@ endif
 ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),)
 PKG_BUILDDEP+=		postgresql
 endif
-PKG_MD5SUM:=		e09ca163a6e90018c92c65a50b9ec398
-PKG_DESCR:=		Open Source PBX
-PKG_SECTION:=		net
-PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
-PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.asterisk.org
 PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
 PKG_TARGET_DEPENDS:=	!foxboard
 
-PKG_DEPENDS_MAIN:=		asterisk
+#PKG_DEPENDS_MAIN:=		asterisk
 PKG_DESCR_CHAN_MGCP:=		Media Gateway Control Protocol implementation
 PKG_DESCR_CHAN_SKINNY:=		Skinny Client Control Protocol implementation
 PKG_DESCR_CHAN_IAX2:=		Support for the Inter Asterisk Protocol
@@ -38,7 +39,7 @@ $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_
 $(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_MGCP},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_SKINNY},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_IAX2},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_SPEEX},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CODEC_SPEEX},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index bff93bd38..82541e6f4 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -18,6 +18,8 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 PKGDFLT_BASE_FILES=	y if !ADK_TOOLCHAIN_ONLY
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 do-install:
 	$(CP) ./extra/* $(IDIR_BASE_FILES)
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 78b741ca3..2a9ef5e14 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		495e320537f0772125f2db3c098e437c
 PKG_DESCR:=		Core utilities for embedded Linux systems
 PKG_SECTION:=		base
+PKG_DEPENDS:=		base-files
+PKG_BUILDDEP+=		base-files
 PKG_URL:=		http://www.busybox.net
 PKG_SITES:=		http://www.busybox.net/downloads/
 
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index fb51b1090..6cc8878fa 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		ctorrent
 PKG_VERSION:=		dnh3.3.2
 PKG_RELEASE:=		1
 PKG_BUILDDEP+=		openssl
-PKG_CXX:=		CTORRENT
+#PKG_CXX:=		CTORRENT
 PKG_MD5SUM:=		59b23dd05ff70791cd6449effa7fc3b6
 PKG_DESCR:=		console-based BitTorrent client
 PKG_SECTION:=		net
@@ -18,10 +18,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
-TCXXFLAGS+=		-fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++
-TLDFLAGS+=		-lgcc_s -luClibc++ -lc -lm -nodefaultlibs
-endif
+#ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
+#TCXXFLAGS+=		-fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++
+#TLDFLAGS+=		-lgcc_s -luClibc++ -lc -lm -nodefaultlibs
+#endif
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 0de136708..326bed156 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -6,14 +6,15 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		cxxtools
 PKG_VERSION:=		1.4.8
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libiconv
-PKG_CXX:=		CXXTOOLS
 PKG_MD5SUM:=		16ce92a83beb925fa5138fc9a52d55af
 PKG_DESCR:=		a collection of general-purpose C++ classes
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libiconv
+PKG_BUILDDEP+=		libiconv
 PKG_URL:=		http://www.tntnet.org
 PKG_SITES:=		http://www.tntnet.org/download/
+#PKG_CXX:=		CXXTOOLS
+
 
 include ${TOPDIR}/mk/package.mk
 
@@ -34,12 +35,12 @@ CONFIGURE_ARGS+=	--with-libiconv-prefix='${STAGING_DIR}/usr'
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto confprog
 
-ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
+#ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
 # add workaround because libtool tries to link libstdc++
-post-configure:
-	${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
-		${WRKBUILD}/libtool
-endif
+#post-configure:
+#	${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
+#		${WRKBUILD}/libtool
+#endif
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib
diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual
index 6e1daf463..e7acac9dc 100644
--- a/package/eglibc/Config.in.manual
+++ b/package/eglibc/Config.in.manual
@@ -1,5 +1,5 @@
 config ADK_PACKAGE_EGLIBC
-	prompt "eglibc............................... embedded GNU C library"
+	prompt "eglibc............................ embedded GNU C library"
 	bool
 	default y if ADK_TARGET_LIB_EGLIBC && !ADK_TOOLCHAIN_ONLY
 	default n
@@ -8,7 +8,7 @@ config ADK_PACKAGE_EGLIBC
 	  embedded GNU C library.
 
 config ADK_PACKAGE_EGLIBC_DEV
-	prompt "eglibc-dev........................... development files"
+	prompt "eglibc-dev........................ development files"
 	tristate
 	default n
 	depends on ADK_TARGET_LIB_EGLIBC
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index f8f769da5..6d58d3f85 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b1f77c5e3116bcb0ac0aa9080a06ebf1
 PKG_DESCR:=		a flexible RADIUS server
 PKG_SECTION:=		net
+PKG_MULTI:=		1
 PKG_DEPENDS:=		libltdl libopenssl libpthread
 PKG_BUILDDEP+=		libtool openssl
 ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),)
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index e902954c7..6acb8c2da 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		freetype
 PKG_VERSION:=		2.3.11
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		zlib
-PKG_MD5SUM:=		519c7cbf5cbd72ffa822c66844d3114c
+PKG_MD5SUM:=		a693c9a4b0121890ca71e39364ffea4a
 PKG_DESCR:=		A free, high-quality and portable font engine
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
+PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.freetype.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freetype/}
 
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index 30a956818..1c48a0b06 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -13,7 +13,7 @@ PKG_DESCR:=		GRUB bootloader
 PKG_SECTION:=		sys
 PKG_SITES:=		http://openadk.org/distfiles/