From d27a11cf9f2f8ca800658bee19608cbe6a3833ea Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 27 Dec 2009 19:31:43 +0100
Subject: readd firmware choice

---
 package/sangam-atm/Config.in.fw | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 package/sangam-atm/Config.in.fw

(limited to 'package')

diff --git a/package/sangam-atm/Config.in.fw b/package/sangam-atm/Config.in.fw
new file mode 100644
index 000000000..75bcd057b
--- /dev/null
+++ b/package/sangam-atm/Config.in.fw
@@ -0,0 +1,16 @@
+choice
+prompt "Firmware type"
+depends on ADK_PACKAGE_KMOD_SANGAM_ATM
+
+config ADK_PACKAGE_SANGAM_ATM_ANNEX_B
+       prompt "Annex B, ADSL over ISDN"
+       boolean
+       help
+
+config ADK_PACKAGE_SANGAM_ATM_ANNEX_A
+       prompt "Annex A, ADSL over POTS"
+       boolean
+       help
+
+endchoice
+
-- 
cgit v1.2.3


From dd163e09b582177ce54fae44b63b10579ee0746d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 27 Dec 2009 23:09:19 +0100
Subject: fix make allmodconfig

update several packages, remove snort-wireless.
---
 package/Config.in                                  |   7 +-
 package/Makefile                                   |   7 +-
 package/asterisk/Makefile                          |  17 +-
 package/base-files/Makefile                        |   2 +
 package/busybox/Makefile                           |   2 +
 package/ctorrent/Makefile                          |  10 +-
 package/cxxtools/Makefile                          |  15 +-
 package/eglibc/Config.in.manual                    |   4 +-
 package/freeradius-server/Makefile                 |   1 +
 package/freetype/Makefile                          |   4 +-
 package/grub-bin/Makefile                          |   2 +-
 package/grub/Makefile                              |   3 +
 package/libXv/Makefile                             |   2 +-
 package/libsigc++/Makefile                         |  22 +-
 package/libtorrent/Makefile                        |  28 +-
 package/lighttpd/Makefile                          |  18 +-
 package/mpd/Makefile                               |  85 +--
 package/mplayer/Makefile                           |   6 +-
 package/mysql/Makefile                             |  12 +-
 package/mysql/patches/patch-configure              | 662 ++++++++-------------
 package/mysql/patches/patch-include_my_global_h    |  59 --
 package/ncurses/Makefile                           |   5 +-
 package/ncurses/patches/patch-misc_run_tic_in      |  12 -
 package/nfs-utils/Config.in.kerberos               |  31 -
 package/nfs-utils/Makefile                         |  43 +-
 .../nfs-utils/patches/patch-aclocal_kerberos5_m4   | 138 -----
 .../patches/patch-support_nfs_nfs_mntent_c         |   5 +-
 package/nfs-utils/patches/patch-tools_Makefile_am  |  11 -
 package/nfs-utils/patches/patch-tools_Makefile_in  |  15 +-
 .../nfs-utils/patches/patch-utils_mount_error_c    |   5 +-
 .../nfs-utils/patches/patch-utils_mountd_cache_c   |  75 ---
 .../nfs-utils/patches/patch-utils_mountd_fsloc_c   |   5 +-
 package/nut/Makefile                               |  28 +-
 package/olsrd/Makefile                             |   1 +
 package/php/Makefile                               |   9 +-
 package/pkgmaker                                   |  21 +-
 package/ppp/Makefile                               |   1 +
 package/rtorrent/Makefile                          |  12 +-
 package/sane-backends/Makefile                     |   3 +-
 package/sangam-atm/Makefile                        |   2 +
 package/sispmctl/Makefile                          |   4 +-
 package/snort-wireless/Makefile                    |  48 --
 .../snort-wireless/files/snort-wireless.conffiles  |   2 -
 package/snort-wireless/files/snort-wireless.init   |  29 -
 .../snort-wireless/files/snort-wireless.postinst   |   4 -
 .../patches/500-no-config-search.patch             |  35 --
 .../patches/750-lightweight-config.patch           | 178 ------
 package/snort/Makefile                             |  20 +-
 package/snort/patches/patch-configure              |  83 +++
 package/snort/patches/patch-configure.orig         |  74 +++
 .../patch-src_detection-plugins_sp_ip_tos_check_c  |  26 +
 .../patch-src_detection-plugins_sp_pattern_match_c |  85 +++
 ...h-src_detection-plugins_sp_pattern_match_c.orig |  47 ++
 .../patch-src_detection-plugins_sp_replace_c       |  38 ++
 .../patch-src_detection-plugins_sp_replace_c.orig  |  11 +
 .../patch-src_detection-plugins_sp_session_c       |  13 +
 .../patch-src_detection-plugins_sp_tcp_win_check_c |  26 +
 .../patch-src_dynamic-preprocessors_dns_spp_dns_c  |  47 ++
 package/snort/patches/patch-src_inline_c           |  11 +
 package/snort/patches/patch-src_log_c              | 162 +++++
 package/snort/patches/patch-src_log_c.orig         |  38 ++
 package/snort/patches/patch-src_log_text_c         |  38 ++
 package/snort/patches/patch-src_mempool_c          |  11 +
 .../patch-src_output-plugins_spo_alert_unixsock_c  |  50 ++
 ...ch-src_output-plugins_spo_alert_unixsock_c.orig |  32 +
 .../patch-src_output-plugins_spo_database_c        |  11 +
 .../patch-src_output-plugins_spo_log_ascii_c       |  15 +
 .../patch-src_output-plugins_spo_log_tcpdump_c     |  11 +
 .../patches/patch-src_output-plugins_spo_unified_c |  47 ++
 package/snort/patches/patch-src_parser_IpAddrSet_c |  16 +
 package/snort/patches/patch-src_parser_c           |  40 ++
 ...h-src_preprocessors_Stream5_snort_stream5_tcp_c |  11 +
 package/snort/patches/patch-src_snort_c            |  20 +
 package/snort/patches/patch-src_util_c             |  20 +
 package/squid/Makefile                             |  26 +-
 package/tntnet/Makefile                            |  18 +-
 package/udev/Makefile                              |   4 +-
 package/ulogd/Makefile                             |  11 +-
 package/updatedd/Makefile                          |   1 +
 package/xorg-server/Makefile                       |   5 +-
 package/xz/Makefile                                |   4 +-
 81 files changed, 1482 insertions(+), 1280 deletions(-)
 delete mode 100644 package/mysql/patches/patch-include_my_global_h
 delete mode 100644 package/ncurses/patches/patch-misc_run_tic_in
 delete mode 100644 package/nfs-utils/Config.in.kerberos
 delete mode 100644 package/nfs-utils/patches/patch-aclocal_kerberos5_m4
 delete mode 100644 package/nfs-utils/patches/patch-tools_Makefile_am
 delete mode 100644 package/nfs-utils/patches/patch-utils_mountd_cache_c
 delete mode 100644 package/snort-wireless/Makefile
 delete mode 100644 package/snort-wireless/files/snort-wireless.conffiles
 delete mode 100644 package/snort-wireless/files/snort-wireless.init
 delete mode 100644 package/snort-wireless/files/snort-wireless.postinst
 delete mode 100644 package/snort-wireless/patches/500-no-config-search.patch
 delete mode 100644 package/snort-wireless/patches/750-lightweight-config.patch
 create mode 100644 package/snort/patches/patch-configure
 create mode 100644 package/snort/patches/patch-configure.orig
 create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c
 create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c
 create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c.orig
 create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_replace_c
 create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_replace_c.orig
 create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_session_c
 create mode 100644 package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c
 create mode 100644 package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c
 create mode 100644 package/snort/patches/patch-src_inline_c
 create mode 100644 package/snort/patches/patch-src_log_c
 create mode 100644 package/snort/patches/patch-src_log_c.orig
 create mode 100644 package/snort/patches/patch-src_log_text_c
 create mode 100644 package/snort/patches/patch-src_mempool_c
 create mode 100644 package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c
 create mode 100644 package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c.orig
 create mode 100644 package/snort/patches/patch-src_output-plugins_spo_database_c
 create mode 100644 package/snort/patches/patch-src_output-plugins_spo_log_ascii_c
 create mode 100644 package/snort/patches/patch-src_output-plugins_spo_log_tcpdump_c
 create mode 100644 package/snort/patches/patch-src_output-plugins_spo_unified_c
 create mode 100644 package/snort/patches/patch-src_parser_IpAddrSet_c
 create mode 100644 package/snort/patches/patch-src_parser_c
 create mode 100644 package/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
 create mode 100644 package/snort/patches/patch-src_snort_c
 create mode 100644 package/snort/patches/patch-src_util_c

(limited to 'package')

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/
 
-PKG_TARGET_DEPENDS:=	shuttle wrap alix1c alix2d
+PKG_TARGET_DEPENDS:=	shuttle wrap alix1c alix2d x86_qemu x86_64_qemu
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/grub/Makefile b/package/grub/Makefile
index c808d0bed..d4ef5f10d 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -12,6 +12,9 @@ PKG_SECTION:=		base
 PKG_URL:=		http://www.gnu.org/software/grub
 PKG_SITES:=		ftp://alpha.gnu.org/gnu/grub/
 
+PKG_HOST_DEPENDS:=	linux
+PKG_TARGET_DEPENDS:=    shuttle wrap alix1c alix2d x86_qemu x86_64_qemu
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GRUB,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index 9d51fbf1c..4165f8547 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libXv
 PKG_VERSION:=		1.0.5
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libX11 videoproto
+PKG_BUILDDEP+=		libX11 videoproto libXext
 PKG_MD5SUM:=		6ee98790de6b3cd470074e60057d5c5c
 PKG_DESCR:=		X11 Xvideo extensions
 PKG_SECTION:=		x11
diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile
index 724196bfc..a4a5fc825 100644
--- a/package/libsigc++/Makefile
+++ b/package/libsigc++/Makefile
@@ -11,28 +11,28 @@ PKG_DESCR:=		Callback framework for C++
 PKG_SECTION:=		libs
 PKG_URL:=		http://libsigc.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_GNOME:=libsigc++/2.2/}
-PKG_CXX:=		LIBSIGCXX
+#PKG_CXX:=		LIBSIGCXX
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSIGCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y)
-CONFIGURE_ENV+=		CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
-			-I${STAGING_DIR}/usr/include/uClibc++" \
-			LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
-endif
+#ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y)
+#CONFIGURE_ENV+=		CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
+#			-I${STAGING_DIR}/usr/include/uClibc++" \
+#			LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
+#endif
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
-ifeq (${ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX},y)
+#ifeq (${ADK_COMPILE_LIBSIGCXX_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_LIBSIGCXX}/usr/lib
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index 4d55aa87e..5f33fa97b 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -13,29 +13,29 @@ PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl libsigc++
 PKG_URL:=		http://libtorrent.rakshasa.no
 PKG_SITES:=		http://libtorrent.rakshasa.no/downloads/
-PKG_CXX:=		LIBTORRENT
+#PKG_CXX:=		LIBTORRENT
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y)
-CONFIGURE_ENV+=		CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ -fno-strict-aliasing -fno-inline \
-			-I${STAGING_DIR}/usr/include/uClibc++" \
-			LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
-endif
+#ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y)
+#CONFIGURE_ENV+=		CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ -fno-strict-aliasing -fno-inline \
+#			-I${STAGING_DIR}/usr/include/uClibc++" \
+#			LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
+#endif
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-aligned
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
-ifeq (${ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX},y)
+#ifeq (${ADK_COMPILE_LIBTORRENT_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_LIBTORRENT}/usr/lib
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 3ed986070..648d6cfd8 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -6,23 +6,21 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		lighttpd
 PKG_VERSION:=		1.4.25
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		pcre libxml2 sqlite
-ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
-PKG_BUILDDEP+=		openssl
-endif
 PKG_MD5SUM:=		87e936ec272ddaba8a2fdfecd8c6b704
 PKG_DESCR:=		a flexible and lightweight web server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libxml2 libsqlite pcre
+PKG_BUILDDEP+=		pcre libxml2 sqlite
+ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
+PKG_DEPENDS+= 		libopenssl
+PKG_BUILDDEP+=		openssl
+endif
 PKG_URL:=		http://www.lighttpd.net
 PKG_SITES:=		http://download.lighttpd.net/lighttpd/releases-1.4.x/
+PKG_MULTI:=		1
 
 include $(TOPDIR)/mk/package.mk
 
-ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
-PKG_DEPENDS+= 		libopenssl
-endif
-
 define PKG_mod_template
 
 INSTALL_MODS_$${ADK_PACKAGE_${1}}+=	${2}-install
@@ -71,7 +69,7 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav))
 TCPPFLAGS+=		-I$(STAGING_DIR)/usr/include/libxml2
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		PCRE_LIB="-lpcre"
-CONFIGURE_ARGS+=	--without-openssl \
+CONFIGURE_ARGS+=	\
 			--libdir=/usr/lib/lighttpd \
 			--sysconfdir=/etc/lighttpd \
 			--without-attr \
@@ -89,6 +87,8 @@ BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
 CONFIGURE_ARGS+=	--with-openssl='${STAGING_DIR}/usr'
+else
+CONFIGURE_ARGS+=	--without-openssl
 endif
 
 post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 150391af3..f4ccc4be5 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -7,86 +7,99 @@ PKG_NAME:=		mpd
 PKG_VERSION:=		0.15.6
 PKG_RELEASE:=		1
 PKG_BUILDDEP+=		alsa-lib glib
-ifneq ($(ADK_COMPILE_MPD_WITH_MP3),)
+PKG_MD5SUM:=		c78b8933e4902c5dc407d59925f8b10e
+PKG_DESCR:=		A music player daemon
+PKG_SECTION:=		net
+PKG_DEPENDS:=		glib
+ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),)
 PKG_BUILDDEP+=		libid3tag libmad
 endif
-ifneq ($(ADK_COMPILE_MPD_WITH_MP4),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_MP4),)
 PKG_BUILDDEP+=		faad2
 endif
-ifneq ($(ADK_COMPILE_MPD_WITH_OGG),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_OGG),)
 PKG_BUILDDEP+=		libvorbis
 endif
-ifneq ($(ADK_COMPILE_MPD_WITH_TREMOR),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_TREMOR),)
 PKG_BUILDDEP+=		libvorbisidec
 endif
-ifneq ($(ADK_COMPILE_MPD_WITH_FLAC),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_FLAC),)
 PKG_BUILDDEP+=		flac
 endif
-ifneq ($(ADK_COMPILE_MPD_WITH_WAV),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),)
 PKG_BUILDDEP+=		libaudiofile
 endif
-ifneq ($(ADK_COMPILE_MPD_WITH_SHOUT),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),)
 PKG_BUILDDEP+=		lame
 endif
-ifneq ($(ADK_COMPILE_MPD_WITH_CURL),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),)
 PKG_BUILDDEP+=		curl
 endif
-ifneq ($(ADK_COMPILE_MPD_WITH_MMS),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_MMS),)
 PKG_BUILDDEP+=		libmms
 endif
-ifneq ($(ADK_COMPILE_MPD_WITH_FFMPEG),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),)
 PKG_BUILDDEP+=		ffmpeg
 endif
-PKG_MD5SUM:=		c78b8933e4902c5dc407d59925f8b10e
-PKG_DESCR:=		A music player daemon
-PKG_SECTION:=		net
-PKG_DEPENDS:=		glib
 PKG_URL:=		http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
+PKG_FLAVOURS:=		WITH_ALSA WITH_MP3 WITH_MP4 WITH_TREMOR WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG WITH_SHOUT WITH_CURL
+PKGFD_WITH_ALSA:=	enable ALSA output
+PKGFD_WITH_MP3:=	enable MP3 support
+PKGFD_WITH_MP4:=	enable MP4 support
+PKGFD_WITH_OGG:=	enable OGG support
+PKGFD_WITH_TREMOR:=	enable fixpoint Vorbis/OGG support
+PKGFD_WITH_FLAC:=	enable FLAC support
+PKGFD_WITH_WAV:=	enable WAVE support
+PKGFD_WITH_MMS:=	enable MMS support
+PKGFD_WITH_FFMPEG:=	enable FFMPEG support
+PKGFD_WITH_SHOUT:=	enable Shoutcast output support
+PKGFD_WITH_CURL:=	enable CURL support
+
 include ${TOPDIR}/mk/package.mk
 
-ifneq (${ADK_COMPILE_MPD_WITH_ALSA},)
+ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},)
 PKG_DEPENDS+=		alsa-lib
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_MP3},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MP3},)
 PKG_DEPENDS+=		libid3tag libmad
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_MP4},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MP4},)
 PKG_DEPENDS+=		libfaad2
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_OGG},)
+ifneq (${ADK_PACKAGE_MPD_WITH_OGG},)
 PKG_DEPENDS+=		libvorbis libogg
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},)
+ifneq (${ADK_PACKAGE_MPD_WITH_TREMOR},)
 PKG_DEPENDS+=		libvorbisidec
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_FLAC},)
+ifneq (${ADK_PACKAGE_MPD_WITH_FLAC},)
 PKG_DEPENDS+=		libflac
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_WAV},)
+ifneq (${ADK_PACKAGE_MPD_WITH_WAV},)
 PKG_DEPENDS+=		libaudiofile
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},)
+ifneq (${ADK_PACKAGE_MPD_WITH_SHOUT},)
 PKG_DEPENDS+=		libshout liblame
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_CURL},)
+ifneq (${ADK_PACKAGE_MPD_WITH_CURL},)
 PKG_DEPENDS+=		libcurl
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_MMS},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MMS},)
 PKG_DEPENDS+=		libmms
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_FFMPEG},)
+ifneq (${ADK_PACKAGE_MPD_WITH_FFMPEG},)
 PKG_DEPENDS+=		ffmpeg
 endif
 
@@ -110,31 +123,31 @@ CONFIGURE_ARGS+=	\
 			--disable-sqlite \
 			--with-zeroconf=no
 
-ifneq (${ADK_COMPILE_MPD_WITH_ALSA},)
+ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},)
 CONFIGURE_ARGS+=	--enable-alsa
 else
 CONFIGURE_ARGS+=	--disable-alsa
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_MP3},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MP3},)
 CONFIGURE_ARGS+=	--enable-id3 --enable-mad
 else
 CONFIGURE_ARGS+=	--disable-id3 --disable-mad
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_MP4},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MP4},)
 CONFIGURE_ARGS+=	--enable-aac
 else
 CONFIGURE_ARGS+=	--disable-aac
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_OGG},)
+ifneq (${ADK_PACKAGE_MPD_WITH_OGG},)
 CONFIGURE_ARGS+=	--enable-vorbis 
 else
 CONFIGURE_ARGS+=	--disable-vorbis 
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},)
+ifneq (${ADK_PACKAGE_MPD_WITH_TREMOR},)
 CONFIGURE_ARGS+=	\
 			--disable-vorbis \
 			--with-tremor \
@@ -142,19 +155,19 @@ CONFIGURE_ARGS+=	\
 			--with-tremor-libraries=${STAGING_DIR}/usr/lib
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_FLAC},)
+ifneq (${ADK_PACKAGE_MPD_WITH_FLAC},)
 CONFIGURE_ARGS+=	--enable-flac
 else
 CONFIGURE_ARGS+=	--disable-flac
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_WAV},)
+ifneq (${ADK_PACKAGE_MPD_WITH_WAV},)
 CONFIGURE_ARGS+=	--enable-audiofile
 else
 CONFIGURE_ARGS+=	--disable-audiofile
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},)
+ifneq (${ADK_PACKAGE_MPD_WITH_SHOUT},)
 CONFIGURE_ARGS+=	--enable-shout \
 			--enable-lame-encoder \
 			--enable-vorbis-encoder \
@@ -166,19 +179,19 @@ CONFIGURE_ARGS+=	--disable-shout \
 			--disable-vorbis-encoder
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_CURL},)
+ifneq (${ADK_PACKAGE_MPD_WITH_CURL},)
 CONFIGURE_ARGS+=	--enable-curl
 else
 CONFIGURE_ARGS+=	--disable-curl
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_MMS},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MMS},)
 CONFIGURE_ARGS+=	--enable-mms
 else
 CONFIGURE_ARGS+=	--disable-mms
 endif
 
-ifneq (${ADK_COMPILE_MPD_WITH_FFMPEG},)
+ifneq (${ADK_PACKAGE_MPD_WITH_FFMPEG},)
 CONFIGURE_ARGS+=	--enable-ffmpeg
 else
 CONFIGURE_ARGS+=	--disable-ffmpeg
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 89127b715..a938466e9 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mplayer
 PKG_VERSION:=		1.0-29987
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		alsa-lib libmad libvorbis faad2 ncurses zlib
 PKG_MD5SUM:=		416fa6a247987305d74572d03dc6dde7
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		video
-PKG_DEPENDS:=		zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg
+PKG_DEPENDS:=		zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg libx11 libxv
+PKG_BUILDDEP+=		alsa-lib libmad libvorbis faad2 ncurses zlib libX11 libXv libpng
 PKG_URL:=		http://www.mplayerhq.hu
 PKG_SITES:=		http://openadk.org/distfiles/
 
@@ -93,6 +93,8 @@ pre-configure:
 		--disable-pnm \
 		--disable-md5sum \
 		--disable-liblzo \
+		--disable-xinerama \
+		--disable-vidix \
 		${CONFIGURE_CPU_OPTS} \
 		${CONFIGURE_DEBUG} \
 	);
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index db20a04af..e8334bd1f 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -4,15 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
-PKG_VERSION:=		5.0.85
+PKG_VERSION:=		5.1.41
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses zlib readline
-PKG_MD5SUM:=		f672ec5154f8ea3db87fec5e0b227f4c
+PKG_MD5SUM:=		b5d39e8789174753f3c782959729e68c
 PKG_DESCR:=		MySQL client library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libncurses zlib
+PKG_BUILDDEP+=		ncurses zlib readline
 PKG_URL:=		http://www.mysql.com
-PKG_SITES=		${MASTER_SITE_MYSQL:=Downloads/MySQL-5.0/}
+PKG_SITES=		${MASTER_SITE_MYSQL:=Downloads/MySQL-5.1/}
 
 include ${TOPDIR}/mk/package.mk
 
@@ -28,10 +28,12 @@ CONFIGURE_ENV+=		OPTIMIZE_CFLAGS="${TARGET_CFLAGS}" \
 			mysql_cv_compress=yes \
 			ac_cv_sys_restartable_syscalls=no \
 			ac_cv_conv_longlong_to_float=yes \
+			mysql_cv_gcc_atomic_builtins=yes \
 			mysql_cv_gethostname_style=glibc2
 CONFIGURE_ARGS+=	--disable-assembler \
 			--with-pthread \
 			--without-raid \
+			--with-atomic-ops=rwlocks \
 			--with-unix-socket-path=/tmp/.mysql.sock \
 			--with-named-thread-libs=-lpthread \
 			--without-libwrap \
@@ -42,7 +44,7 @@ CONFIGURE_ARGS+=	--disable-assembler \
 			--without-query-cache \
 			--without-mysqlfs \
 			--without-vio \
-			--without-openssl \
+			--without-ssl \
 			--without-docs \
 			--without-bench \
 			--without-innodb \
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index 4fe4d413c..cf3239b22 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,496 +1,302 @@
---- mysql-5.0.85.orig/configure	2009-08-11 12:56:42.000000000 +0200
-+++ mysql-5.0.85/configure	2009-08-27 22:35:38.879725240 +0200
-@@ -835,8 +835,6 @@ MYSQLD_EXTRA_LIBS
- CLIENT_EXTRA_LDFLAGS
- MYSQLD_EXTRA_LDFLAGS
- LIBDL
--COMPILE_PSTACK_FALSE
--COMPILE_PSTACK_TRUE
- pstack_libs
- pstack_dirs
- WRAPLIBS
-@@ -16480,89 +16478,10 @@ else
- $as_echo "no" >&6; }
- fi
+--- mysql-5.1.41.orig/configure	2009-11-04 19:37:28.000000000 +0100
++++ mysql-5.1.41/configure	2009-12-25 12:18:01.000000000 +0100
+@@ -46976,197 +46976,14 @@ $as_echo "$as_me: error: unknown endiann
+   esac
  
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"return type of sprintf\"" >&5
--$as_echo_n "checking \"return type of sprintf\"... " >&6; }
--
--#check the return type of sprintf
--case $SYSTEM_TYPE in
--  *netware*)
--    $as_echo "#define SPRINTF_RETURNS_INT 1" >>confdefs.h
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"int\"" >&5
--$as_echo "\"int\"" >&6; }
--    ;;
--  *)
--if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether GCC atomic builtins are available" >&5
+-$as_echo_n "checking whether GCC atomic builtins are available... " >&6; }
+-  # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
+-  if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
 -else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--  int main()
--    {
--      char* s = "hello";
--      char buf[6];
--      if((int)sprintf(buf, s) == strlen(s))
--	return 0;
--
--      return -1;
--     }
+-      int main()
+-      {
+-	long	x;
+-	long	y;
+-	long	res;
+-	char	c;
+-
+-	x = 10;
+-	y = 123;
+-	res = __sync_bool_compare_and_swap(&x, x, y);
+-	if (!res || x != y) {
+-          return(1);
+-        }
+-
+-	x = 10;
+-	y = 123;
+-	res = __sync_bool_compare_and_swap(&x, x + 1, y);
+-	if (res || x != 10) {
+-          return(1);
+-        }
+-
+-	x = 10;
+-	y = 123;
+-	res = __sync_add_and_fetch(&x, y);
+-	if (res != 123 + 10 || x != 123 + 10) {
+-	  return(1);
+-	}
+-
+-	c = 10;
+-	res = __sync_lock_test_and_set(&c, 123);
+-	if (res != 10 || c != 123) {
+-	  return(1);
+-	}
+-
+-	return(0);
+-      }
 -
 -_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--$as_echo "#define SPRINTF_RETURNS_INT 1" >>confdefs.h
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 -
--   { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"int\"" >&5
--$as_echo "\"int\"" >&6; }
--else
--  if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
 -
-- int main()
--   {
--     char* s = "hello";
--     char buf[6];
--     if((char*)sprintf(buf,s) == buf + strlen(s))
--       return 0;
--     return -1;
--   }
-+# return type of sprintf is int for Linux glibc/uClibc
-+cat >>confdefs.h <<\_ACEOF
-+#define SPRINTF_RETURNS_INT 1
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_IB_GCC_ATOMIC_BUILTINS 1
  _ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--$as_echo "#define SPRINTF_RETURNS_PTR 1" >>confdefs.h
+ 
+-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 -
--                { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"ptr\"" >&5
--$as_echo "\"ptr\"" >&6; }
 -else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
--$as_echo "#define SPRINTF_RETURNS_GARBAGE 1" >>confdefs.h
+-( exit $ac_status )
 -
--                { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"garbage\"" >&5
--$as_echo "\"garbage\"" >&6; }
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 -
 -
 -fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
 -
--    ;;
--esac
- 
- # Extract the first word of "uname", so it can be a program name with args.
- set dummy uname; ac_word=$2
-@@ -17587,97 +17506,7 @@ $as_echo "no" >&6; }
-   rm -f conftest.ic conftest.h
- fi
- 
 -
--# Look for PS usage.  We use double dollar-signs in FIND_PROC because this
--# value is written to a makefile, which interprets away one level of
--# dollar-signs.  So, interpretation stages are  m4 and then shell in autoconf,
--# then Make, then shell.  The autoconf substitution uses single quotes, so
--# no unprotected single quotes should appear in the expression.
--# Extract the first word of "ps", so it can be a program name with args.
--set dummy ps; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PS+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $PS in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PS="$PS" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PS="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_PS" && ac_cv_path_PS="ps"
--  ;;
--esac
--fi
--PS=$ac_cv_path_PS
--if test -n "$PS"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS" >&5
--$as_echo "$PS" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
 -
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"how to check if pid exists\"" >&5
--$as_echo_n "checking \"how to check if pid exists\"... " >&6; }
--PS=$ac_cv_path_PS
--# Linux style
--if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
--then
--  FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
--# Solaris
--elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
--then
--  FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
--# BSD style
--elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
--then
--  FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
--# SysV style
--elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
--then
--  FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
--# Do anybody use this?
--elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
--then
--  FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-  { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by GCC atomic builtins" >&5
+-$as_echo_n "checking whether pthread_t can be used by GCC atomic builtins... " >&6; }
+-  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
+-  if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
 -else
--  case $SYSTEM_TYPE in
--    *freebsd*|*dragonfly*)
--      FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
--      ;;
--    *darwin*)
--      FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
--      ;;
--    *cygwin*)
--      FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
--      ;;
--    *netware*)
--      FIND_PROC=
--      ;;
--    *)
--      as_fn_error "Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual." "$LINENO" 5
--  esac
--fi
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$FIND_PROC\"" >&5
--$as_echo "\"$FIND_PROC\"" >&6; }
-+FIND_PROC="/bin/ps wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
- 
- # Check if a pid is valid
- # Extract the first word of "kill", so it can be a program name with args.
-@@ -19842,218 +19671,9 @@ fi
- fi
- 
- 
--
--if test "$TARGET_LINUX" = "true"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atomic operations" >&5
--$as_echo_n "checking for atomic operations... " >&6; }
--
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -
--  ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-      #include <pthread.h>
+-      #include <string.h>
 -
+-      int main(int argc, char** argv) {
+-        pthread_t       x1;
+-        pthread_t       x2;
+-        pthread_t       x3;
 -
--  atom_ops=
--  if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
+-	memset(&x1, 0x0, sizeof(x1));
+-	memset(&x2, 0x0, sizeof(x2));
+-	memset(&x3, 0x0, sizeof(x3));
 -
--#include <asm/atomic.h>
--int main()
--{
--  atomic_t v;
+-        __sync_bool_compare_and_swap(&x1, x2, x3);
 -
--  atomic_set(&v, 23);
--  atomic_add(5, &v);
--  return atomic_read(&v) == 28 ? 0 : -1;
--}
+-        return(0);
+-      }
 -
 -_ACEOF
--if ac_fn_cxx_try_run "$LINENO"; then :
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 -
--$as_echo "#define HAVE_ATOMIC_ADD 1" >>confdefs.h
 -
--   atom_ops="${atom_ops}atomic_add "
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_IB_ATOMIC_PTHREAD_T_GCC 1
+ _ACEOF
+ 
+-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 -
--  if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
 -else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--#include <asm/atomic.h>
--int main()
--{
--  atomic_t v;
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
--  atomic_set(&v, 23);
--  atomic_sub(5, &v);
--  return atomic_read(&v) == 18 ? 0 : -1;
--}
+-( exit $ac_status )
 -
--_ACEOF
--if ac_fn_cxx_try_run "$LINENO"; then :
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 -
--$as_echo "#define HAVE_ATOMIC_SUB 1" >>confdefs.h
 -
--   atom_ops="${atom_ops}atomic_sub "
 -fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
 -
 -
--  if test -z "$atom_ops"; then atom_ops="no"; fi
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $atom_ops" >&5
--$as_echo "$atom_ops" >&6; }
--
--  ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--
--# Check whether --with-pstack was given.
--if test "${with_pstack+set}" = set; then :
--  withval=$with_pstack;  USE_PSTACK=$withval
--else
--   USE_PSTACK=no
--fi
--
--  pstack_libs=
--  pstack_dirs=
--  if test "$USE_PSTACK" = yes -a "$TARGET_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386"
--  then
--    have_libiberty= have_libbfd=
--    my_save_LIBS="$LIBS"
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdmatch in -liberty" >&5
--$as_echo_n "checking for fdmatch in -liberty... " >&6; }
--if test "${ac_cv_lib_iberty_fdmatch+set}" = set; then :
--  $as_echo_n "(cached) " >&6
+ 
+   { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
+ $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
+@@ -47284,101 +47101,6 @@ fi
+ done
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5
+-$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; }
+-  # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
+-  if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
 -else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-liberty  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char fdmatch ();
--int
--main ()
--{
--return fdmatch ();
--  ;
--  return 0;
--}
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
 -_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_iberty_fdmatch=yes
--else
--  ac_cv_lib_iberty_fdmatch=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iberty_fdmatch" >&5
--$as_echo "$ac_cv_lib_iberty_fdmatch" >&6; }
--if test "x$ac_cv_lib_iberty_fdmatch" = x""yes; then :
--  have_libiberty=yes
--       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
--$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
--if test "${ac_cv_lib_bfd_bfd_openr+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lbfd -liberty $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bfd_openr ();
--int
--main ()
--{
--return bfd_openr ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_bfd_bfd_openr=yes
--else
--  ac_cv_lib_bfd_bfd_openr=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
--$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
--if test "x$ac_cv_lib_bfd_bfd_openr" = x""yes; then :
--  have_libbfd=yes
--fi
--
--fi
+-      #include <pthread.h>
+-      #include <string.h>
 -
--    LIBS="$my_save_LIBS"
+-      int main(int argc, char** argv) {
+-        pthread_t       x1;
+-        pthread_t       x2;
+-        pthread_t       x3;
 -
--    if test x"$have_libiberty" = xyes -a x"$have_libbfd" = xyes
--    then
--      pstack_dirs='$(top_srcdir)'/pstack
--      pstack_libs="../pstack/libpstack.a -lbfd -liberty"
--      # We must link staticly when using pstack
--      with_mysqld_ldflags="-all-static"
+-        memset(&x1, 0x0, sizeof(x1));
+-        memset(&x2, 0x0, sizeof(x2));
+-        memset(&x3, 0x0, sizeof(x3));
 -
+-        if (sizeof(pthread_t) == 4) {
 -
+-          atomic_cas_32(&x1, x2, x3);
 -
--$as_echo "#define USE_PSTACK 1" >>confdefs.h
+-        } else if (sizeof(pthread_t) == 8) {
 -
--    else
--      USE_PSTACK="no"
--    fi
--  else
--    USE_PSTACK="no"
--  fi
--fi
-- if test "$USE_PSTACK" = "yes"; then
--  COMPILE_PSTACK_TRUE=
--  COMPILE_PSTACK_FALSE='#'
--else
--  COMPILE_PSTACK_TRUE='#'
--  COMPILE_PSTACK_FALSE=
--fi
+-          atomic_cas_64(&x1, x2, x3);
 -
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should use pstack" >&5
--$as_echo_n "checking if we should use pstack... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_PSTACK" >&5
--$as_echo "$USE_PSTACK" >&6; }
-+$as_echo "#define HAVE_ATOMIC_ADD 0" >>confdefs.h
-+$as_echo "#define HAVE_ATOMIC_SUB 0" >>confdefs.h
-+$as_echo "#define USE_PSTACK 0" >>confdefs.h
- 
- # Check for gtty if termio.h doesn't exists
- if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no"
-@@ -20116,59 +19736,6 @@ fi
- # Later in this script LIBS will be augmented with a threads library.
- NON_THREADED_LIBS="$LIBS"
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int8" >&5
--$as_echo_n "checking for int8... " >&6; }
--case $SYSTEM_TYPE in
--  *netware)
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--    ;;
--  *)
--if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
+-        } else {
 -
--#ifdef HAVE_STDLIB_H
--#include <stdlib.h>
--#endif
+-          return(1);
+-        }
 -
--#ifdef HAVE_STDDEF_H
--#include <stddef.h>
--#endif
+-	return(0);
+-      }
 -
--#ifdef HAVE_SYS_TYPES_H
--#include <sys/types.h>
--#endif
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 -
--int main()
--{
--  int8 i;
--  return 0;
--}
 -
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS 1
 -_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--$as_echo "#define HAVE_INT_8_16_32 1" >>confdefs.h
 -
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-      { $as_echo "$as_me:$LINENO: result: yes" >&5
 -$as_echo "yes" >&6; }
+-
 -else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
 -
+-
 -fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
 -
--    ;;
--esac
  
- #
- # Some system specific hacks
-@@ -27705,10 +27272,6 @@ if test -z "${ASSEMBLER_TRUE}" && test -
-   as_fn_error "conditional \"ASSEMBLER\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
--if test -z "${COMPILE_PSTACK_TRUE}" && test -z "${COMPILE_PSTACK_FALSE}"; then
--  as_fn_error "conditional \"COMPILE_PSTACK\" was never defined.
--Usually this means the macro was only invoked conditionally." "$LINENO" 5
--fi
  
- if test -z "${HAVE_YASSL_TRUE}" && test -z "${HAVE_YASSL_FALSE}"; then
-   as_fn_error "conditional \"HAVE_YASSL\" was never defined.
+   # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
deleted file mode 100644
index 0513e1ca4..000000000
--- a/package/mysql/patches/patch-include_my_global_h
+++ /dev/null
@@ -1,59 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mysql-5.0.85.orig/include/my_global.h	2009-08-11 12:50:17.000000000 +0200
-+++ mysql-5.0.85/include/my_global.h	2009-08-27 22:21:39.363259500 +0200
-@@ -350,29 +350,32 @@ C_MODE_END
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+
- #if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)
- #undef HAVE_ALLOCA
- #undef HAVE_ALLOCA_H
- #endif
--#ifdef HAVE_ALLOCA_H
--#include <alloca.h>
-+
-+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
-+#ifndef BSD
-+#define BSD
- #endif
--#ifdef HAVE_ATOMIC_ADD
--#define new my_arg_new
--#define need_to_restore_new 1
--C_MODE_START
--#include <asm/atomic.h>
--C_MODE_END
--#ifdef need_to_restore_new /* probably safer than #ifdef new */
--#undef new
--#undef need_to_restore_new
- #endif
-+
-+#if defined(HAVE_ALLOCA_H) && !defined(BSD)
-+#include <alloca.h>
- #endif
-+
- #include <errno.h>				/* Recommended by debian */
- /* We need the following to go around a problem with openssl on solaris */
-+#ifdef BSD
-+#include <pwd.h>
-+#include <unistd.h>
-+#else
- #if defined(HAVE_CRYPT_H)
- #include <crypt.h>
- #endif
-+#endif
- 
- /*
-   A lot of our programs uses asserts, so better to always include it
-@@ -791,9 +794,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
- #define finite(x) (1.0 / fabs(x) > 0.0)
- #endif
- 
-+/*
- #ifndef HAVE_ISNAN
- #define isnan(x) ((x) != (x))
- #endif
-+*/
- 
- #ifdef HAVE_ISINF
- /* Check if C compiler is affected by GCC bug #39228 */
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index c3997b060..9e9ddf9b5 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -43,12 +43,15 @@ INSTALL_STYLE=		auto
 ALL_TARGET:=		libs
 INSTALL_TARGET:=	install.libs install.data
 
+ifeq (${ADK_HOST_CYGWIN},y)
+CONFOPT:=		--with-shared
+endif
 
 pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
 		./configure \
+		${CONFOPT} \
 		--with-build-cc=${HOSTCC} \
-		--with-shared \
 		--with-progs \
 	);
 	${MAKE} -C ${WRKBUILD}/include
diff --git a/package/ncurses/patches/patch-misc_run_tic_in b/package/ncurses/patches/patch-misc_run_tic_in
deleted file mode 100644
index c2d76c4f7..000000000
--- a/package/ncurses/patches/patch-misc_run_tic_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ncurses-5.7.orig/misc/run_tic.in	2006-10-28 21:43:30.000000000 +0200
-+++ ncurses-5.7/misc/run_tic.in	2009-05-07 18:43:38.156250000 +0200
-@@ -61,7 +61,7 @@ test -z "${DESTDIR}" && DESTDIR=
- # Allow tic to run either from the install-path, or from the build-directory.
- # Do not do this if we appear to be cross-compiling.  In that case, we rely
- # on the host's copy of tic to compile the terminfo database.
--if test "$THAT_CC" = "$THIS_CC" ; then
-+if test "$THAT_CC" != "$THIS_CC" ; then
- case "$PATH" in
- :*) PATH=../progs:../lib:${DESTDIR}$bindir$PATH ;;
- *) PATH=../progs:../lib:${DESTDIR}$bindir:$PATH ;;
diff --git a/package/nfs-utils/Config.in.kerberos b/package/nfs-utils/Config.in.kerberos
deleted file mode 100644
index 7c82d55ca..000000000
--- a/package/nfs-utils/Config.in.kerberos
+++ /dev/null
@@ -1,31 +0,0 @@
-config ADK_COMPILE_NFS_UTILS_WITH_KERBEROS
-       prompt "Enable Kerberos and NFSv4"
-       bool
-       select ADK_PACKAGE_LIBEVENT
-       select ADK_PACKAGE_LIBNFSIDMAP
-       select ADK_PACKAGE_LIBRPCSECGSS
-       select ADK_PACKAGE_LIBCOM_ERR
-       select ADK_KERNEL_NFSD_V4
-       default n
-       depends on ADK_PACKAGE_NFS_UTILS
-
-choice
-prompt "Kerberos implementation"
-depends on ADK_COMPILE_NFS_UTILS_WITH_KERBEROS
-config ADK_COMPILE_NFS_UTILS_WITH_KRB5
-       prompt "MIT"
-       bool
-       select ADK_COMPILE_KRB5
-       select ADK_PACKAGE_KRB5_LIBS
-       select ADK_PACKAGE_LIBGSSGLUE
-       help
-         use MIT kerberos libraries
-
-config ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL
-       prompt "Heimdal"
-       bool
-       select ADK_PACKAGE_HEIMDAL_LIBS
-       help 
-         Use heimdal kerberos libraries (experimental)
-
-endchoice
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index c2cb0d806..b2c2c216f 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -4,53 +4,40 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
-PKG_VERSION:=		1.2.0
+PKG_VERSION:=		1.2.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libtirpc
-ifeq (${ADK_COMPILE_NFS_UTILS_WITH_KRB5},y)
-PKG_BUILDDEP+=		libnfsidmap krb5 libevent libgssglue librpcsecgss
-endif
-ifeq (${ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL},y)
-PKG_BUILDDEP+=		libnfsidmap heimdal libevent librpcsecgss
-endif
-PKG_MD5SUM:=		779cf81044e92cb51ad590960e7b3671
+PKG_MD5SUM:=		c3ccd16c147befd49fe4541a506dd177
 PKG_DESCR:= 		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net
 PKG_DEPENDS:=		portmap libtirpc
+PKG_BUILDDEP+=		libtirpc
+ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
+PKG_BUILDDEP+=		libnfsidmap krb5 libevent libgssglue librpcsecgss
+endif
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include ${TOPDIR}/mk/package.mk
+PKG_FLAVOURS:=		WITH_KERBEROS
+PKGFD_WITH_KERBEROS:=	enable Kerberos support (MIT)
 
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y)
-PKG_DEPENDS+=		krb5-libs libevent libnfsidmap librpcsecgss libcom_err libgssglue
-endif
+include ${TOPDIR}/mk/package.mk
 
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y)
-PKG_DEPENDS+=		heimdal-libs libevent libnfsidmap librpcsecgss libcom_err
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
+PKG_DEPENDS+=		krb5-libs libevent libnfsidmap librpcsecgss libcom-err libgssglue
 endif
 
 $(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCPPFLAGS+=		-I${LINUX_DIR}/include
 
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y)
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
 CONFIGURE_ARGS+=	--enable-nfsv4 \
 			--with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \
 			--enable-gss
 CONFIGURE_ENV+=		LIBS="-lrpcsecgss"
-endif
-
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y)
-CONFIGURE_ARGS+=	--enable-nfsv4 \
-			--with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \
-			--enable-gss
-CONFIGURE_ENV+=		LIBS="-lrpcsecgss"
-endif
-
-ifneq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y)
+else
 CONFIGURE_ARGS+=	--disable-nfsv4 \
 			--disable-gss
 endif
@@ -62,7 +49,7 @@ CONFIGURE_ARGS+=	--without-tcp-wrappers \
 			--with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc \
 			--disable-uuid
 
-CONFIGURE_STYLE:=	autotool gnu
+CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
@@ -76,7 +63,7 @@ post-install:
 	${INSTALL_BIN} ${WRKBUILD}/utils/statd/statd ${IDIR_NFS_UTILS}/usr/sbin/
 	${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd ${IDIR_NFS_UTILS}/usr/sbin/
 	${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd ${IDIR_NFS_UTILS}/usr/sbin/
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y)
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
 	${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc
 	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd ${IDIR_NFS_UTILS}/usr/sbin/
 	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd ${IDIR_NFS_UTILS}/usr/sbin/
diff --git a/package/nfs-utils/patches/patch-aclocal_kerberos5_m4 b/package/nfs-utils/patches/patch-aclocal_kerberos5_m4
deleted file mode 100644
index 1a5ca00ba..000000000
--- a/package/nfs-utils/patches/patch-aclocal_kerberos5_m4
+++ /dev/null
@@ -1,138 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.4.orig/aclocal/kerberos5.m4	2008-10-17 16:20:09.000000000 +0200
-+++ nfs-utils-1.1.4/aclocal/kerberos5.m4	2009-01-30 16:24:45.000000000 +0100
-@@ -1,112 +1,48 @@
--dnl Checks for Kerberos
--dnl NOTE: while we intend to do generic gss-api, currently we
--dnl have a requirement to get an initial Kerberos machine
--dnl credenti