package updates and rescue-x86_64 fix

- merge device-mapper and lvm package, because of upstream merge
- update squid to latest stable version
- add no64-lib patch for gcc, which fixes cross-build from x86 to
  x86_64

17 files changed, 84 insertions, 288 deletions

diff --git a/package/Config.in b/package/Config.in
index 24aa8a510..d080a2d3c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -45,7 +45,6 @@ source "package/vim/Config.in"
 endmenu
 
 menu "Filesystem utilities"
-source "package/device-mapper/Config.in"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/fuse/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
index 2d63052e3..21fdc5db2 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -16,7 +16,7 @@ cbtt-compile: uclibc++-compile
 endif
 cbtt-compile: mysql-compile zlib-compile
 collectd-compile: libpthread-compile
-cryptsetup-compile: libgcrypt-compile popt-compile e2fsprogs-compile device-mapper-compile
+cryptsetup-compile: libgcrypt-compile popt-compile e2fsprogs-compile lvm-compile
 ifeq (${ADK_COMPILE_CTORRENT_WITH_UCLIBCXX},y)
 ctorrent-compile: uclibc++-compile
 endif
diff --git a/package/Makefile b/package/Makefile
index 968357339..9ec5a3f18 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -61,7 +61,6 @@ package-$(ADK_PACKAGE_DAMAGEPROTO) += damageproto
 package-$(ADK_PACKAGE_DAVFS2) += davfs2
 package-$(ADK_PACKAGE_DBUS) += dbus
 package-$(ADK_PACKAGE_DECO) += deco
-package-$(ADK_PACKAGE_DEVICE_MAPPER) += device-mapper
 package-$(ADK_COMPILE_DHCP) += dhcp
 package-$(ADK_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
 package-$(ADK_PACKAGE_DIGITEMP) += digitemp
diff --git a/package/device-mapper/Config.in b/package/device-mapper/Config.in
deleted file mode 100644
index 162b07794..000000000
--- a/package/device-mapper/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_DEVICE_MAPPER
-	prompt "device-mapper..................... device mapper tool and lib"
-	tristate
-	default n
-	help
-         device mapper tool and libdevice mapper tool and lib
diff --git a/package/device-mapper/Makefile b/package/device-mapper/Makefile
deleted file mode 100644
index 8bf21fe33..000000000
--- a/package/device-mapper/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		device-mapper
-PKG_VERSION:=		1.02.28
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		c9ae0776994a419f9e1ba842164bb626
-PKG_DESCR:=		device mapper tools and libraries
-PKG_SECTION:=		utils
-PKG_URL:=		http://sources.redhat.com/dm
-PKG_SITES:=		ftp://sources.redhat.com/pub/dm/
-
-DISTFILES:=		${PKG_NAME}.${PKG_VERSION}.tgz
-WRKDIST=		${WRKDIR}/${PKG_NAME}.${PKG_VERSION}
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,DEVICE_MAPPER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ARGS+=	--with-user="" --with-group="" \
-			--with-optimisation="" \
-			--with-kernel-dir=${LINUX_DIR}
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-INSTALL_TARGET+=	install_static_lib
-
-post-install:
-	${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${IDIR_DEVICE_MAPPER}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
-		${IDIR_DEVICE_MAPPER}/usr/lib
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \
-		${IDIR_DEVICE_MAPPER}/usr/sbin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/device-mapper/patches/patch-lib_Makefile_in b/package/device-mapper/patches/patch-lib_Makefile_in
deleted file mode 100644
index d20b9d5c9..000000000
--- a/package/device-mapper/patches/patch-lib_Makefile_in
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- device-mapper.1.02.28.orig/lib/Makefile.in	2008-06-06 22:44:35.000000000 +0200
-+++ device-mapper.1.02.28/lib/Makefile.in	2008-11-11 12:18:25.000000000 +0100
-@@ -76,7 +76,7 @@ install_static: install_@interface@_stat
- 	$(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a
- 
- install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+	$(INSTALL) -D $(OWNER) $(GROUP) -m 755 $(STRIP) $< \
- 		$(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
- 
- install_pkgconfig:
-@@ -84,7 +84,7 @@ install_pkgconfig:
- 		$(usrlibdir)/pkgconfig/devmapper.pc
- 
- install_ioctl_static: ioctl/libdevmapper.a
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+	$(INSTALL) -D $(OWNER) $(GROUP) -m 755 $(STRIP) $< \
- 		$(libdir)/libdevmapper.a.$(LIB_VERSION)
- 
- $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION): $(interface)/%.$(LIB_SUFFIX)
diff --git a/package/device-mapper/patches/patch-make_tmpl_in b/package/device-mapper/patches/patch-make_tmpl_in
deleted file mode 100644
index 69285fbe5..000000000
--- a/package/device-mapper/patches/patch-make_tmpl_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- device-mapper.1.02.28.orig/make.tmpl.in	2008-06-06 22:44:35.000000000 +0200
-+++ device-mapper.1.02.28/make.tmpl.in	2009-01-04 14:47:10.000000000 +0100
-@@ -25,10 +25,10 @@ MSGFMT = @MSGFMT@
- LN_S = @LN_S@
- LIBS = @LIBS@
- DEFS += @DEFS@
--CFLAGS += @CFLAGS@
-+CFLAGS ?= @CFLAGS@
- CLDFLAGS += @CLDFLAGS@
- LDDEPS += @LDDEPS@
--LDFLAGS += @LDFLAGS@
-+LDFLAGS ?= @LDFLAGS@
- LIB_SUFFIX = @LIB_SUFFIX@
- 
- # Setup directory variables
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 98d97041a..6a9aa81a7 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -8,7 +8,8 @@ PKG_VERSION:=		2.02.45
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		440daa01b8f2ec4fe97b1cc621108220
 PKG_DESCR:=		logical volume management
-PKG_SECTION:=		utils
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		device-mapper
 PKG_URL:=		http://sourceware.org/lvm2/
 PKG_SITES:=		ftp://sources.redhat.com/pub/lvm2/
 
@@ -18,18 +19,25 @@ WRKDIST=		${WRKDIR}/LVM2.${PKG_VERSION}
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},${PKG_SECTION},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-user="" --with-group="" \
 			--with-optimisation="" \
-			--with-lvm1=none \
-			--enable-static_link \
-			--with-kernel-dir=${LINUX_DIR}
+			--with-lvm1=none
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
+	# lvm
 	${INSTALL_DIR} ${IDIR_LVM}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm.static ${IDIR_LVM}/usr/sbin/lvm
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm ${IDIR_LVM}/usr/sbin/lvm
+	# device-mapper
+	${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${IDIR_DEVICE_MAPPER}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
+		${IDIR_DEVICE_MAPPER}/usr/lib
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \
+		${IDIR_DEVICE_MAPPER}/usr/sbin
+	chmod u+w ${IDIR_DEVICE_MAPPER}/usr/lib/*.so*
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/squid/Config.in b/package/squid/Config.in
index 47c1250b4..bdace2a49 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -1,9 +1,9 @@
-#menu "squid............................. proxy and web cache"
 
 config ADK_PACKAGE_SQUID
 	prompt "squid............................. full-featured Web proxy cache"
 	tristate
 	default n
+	depends ADK_CXX
 	select ADK_PACKAGE_LIBOPENSSL
 	help
 	  Squid is a high-performance proxy caching server for web clients, 
@@ -13,6 +13,8 @@ config ADK_PACKAGE_SQUID
 
 	  http://www.squid-cache.org
 
+menu "squid............................. proxy and web cache modules"
+
 config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM
 	prompt "  squid-mod-basic-auth-getpwnam....... getpwnam basic authentication helper"
 	tristate
@@ -34,13 +36,6 @@ config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB
 	help
 	  Samba basic authentication helper
 
-config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_WINBIND
-	prompt "  squid-mod-basic-auth-winbind........ Winbind basic authentication helper"
-	tristate
-	depends ADK_PACKAGE_SQUID
-	help
-	  Winbind basic authentication helper
-
 config ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD
 	prompt "  squid-mod-digest-auth-password...... Password digest authentication ehlper"
 	tristate
@@ -62,13 +57,6 @@ config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP
 	help
 	  Unix group external ACL helper
 
-config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP
-	prompt "  squid-mod-external-acl-winbind-group Winbind group external ACL helper"
-	tristate
-	depends ADK_PACKAGE_SQUID
-	help
-	  Winbind group external ACL helper
-
 config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH
 	prompt "  squid-mod-ntlm-auth-fakeauth........ Fakeauth NTLM authentication helper"
 	tristate
@@ -83,11 +71,4 @@ config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_SMB_AUTH
 	help
 	  Samba NTLM authentication helper
 
-config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_WINBIND_AUTH
-	prompt "  squid-mod-ntlm-auth-winbind-auth.... Winbind NTLM authentication helper"
-	tristate
-	depends ADK_PACKAGE_SQUID
-	help
-	  Winbind NTLM authentication helper
-
-#endmenu
+endmenu
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 9224f5845..2a63e19f8 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -4,18 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		squid
-PKG_VERSION:=		2.5.STABLE13
+PKG_VERSION:=		3.0.STABLE15
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3e64468e123be1246d17486dab6bee87
+PKG_MD5SUM:=		4c41585af1d90ccbcf1d23ec0dda6f8d
 PKG_DESCR:=		squid web and cache proxy
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl libpthread
 PKG_URL:=		http://www.squid-cache.org
-PKG_SITES:=		http://www.squid-cache.org/Versions/v2/2.5/
+PKG_SITES:=		http://www.squid-cache.org/Versions/v3/3.0/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
-AUTH_MODULES:=basic digest ntlm
+AUTH_MODULES:=		basic digest ntlm
 ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},)
 BASIC_AUTH_HELPERS+=	getpwnam
 endif
@@ -25,80 +23,56 @@ endif
 ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB},)
 BASIC_AUTH_HELPERS+=	SMB
 endif
-ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_WINBIND},)
-BASIC_AUTH_HELPERS+=	winbind
-endif
-
 ifneq (${ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD},)
 DIGEST_AUTH_HELPERS:=	password
 endif
-
 ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER},)
 EXTERNAL_ACL_HELPERS+=	ip_user
 endif
 ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP},)
 EXTERNAL_ACL_HELPERS+=	unix_group
 endif
-ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP},)
-EXTERNAL_ACL_HELPERS+=	winbind_group
-endif
-
 ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH},)
 NTLM_AUTH_HELPERS+=	fakeauth
 endif
 ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_SMB_AUTH},)
 NTLM_AUTH_HELPERS+=	SMB
 endif
-ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_WINBIND_AUTH},)
-NTLM_AUTH_HELPERS+=	winbind
-endif
 
 include ${TOPDIR}/mk/package.mk
 
 define PKG_mod_template
-if [ -e ${WRKINST}/usr/lib/squid/${2} ]; then \
-	${INSTALL_DIR} ${IDIR_${1}}/usr/lib/squid/ ; \
-	${INSTALL_BIN} ${WRKINST}/usr/lib/squid/${2} ${IDIR_${1}}/usr/lib/squid/ ; \
-fi
-endef
 
-#$${IPKG_${1}}:
-#	install -d -m0755 $${IDIR_${1}}/usr/lib/squid
-#	if [ -e ${WRKINST}/usr/lib/squid/${2} ]; then \
-#		${CP} ${WRKINST}/usr/lib/squid/${2} $${IDIR_${1}}/usr/lib/squid/ ; \
-#	fi
-#	${RSTRIP} $${IDIR_${1}}
-#	${IPKG_BUILD} $${IDIR_${1}} ${PACKAGE_DIR}
-#
-#endef
+INSTALL_MODS_$${ADK_PACKAGE_${1}}+=	${2}-install
 
+${2}-install:
+	if [ -e ${WRKINST}/usr/lib/squid/${2} ]; then \
+		${INSTALL_DIR} ${IDIR_${1}}/usr/lib/squid/ ; \
+		${INSTALL_BIN} ${WRKINST}/usr/lib/squid/${2} ${IDIR_${1}}/usr/lib/squid/ ; \
+		
+	fi
+endef
 
 $(eval $(call PKG_template,SQUID,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-auth-getpwnam,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_WINBIND,${PKG_NAME}-mod-basic-auth-winbind,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,${PKG_NAME}-mod-digest-auth-password,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,${PKG_NAME}-mod-external-acl-winbind-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,${PKG_NAME}-mod-ntlm-auth-fakeauth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,${PKG_NAME}-mod-ntlm-auth-smb-auth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,${PKG_NAME}-mod-ntlm-auth-winbind-auth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth}}
-#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap}}
-#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,ncsa_auth}}
-#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,smb_auth}}
-#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_WINBIND,wb_auth}}
-#${eval ${call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,digest_pw_auth}}
-#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,ip_user_check}}
-#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth}}
-#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group}}
-#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,wb_group}}
-#${eval ${call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth}}
-#${eval ${call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth}}
-#${eval ${call PKG_mod_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,wb_ntlmauth}}
+$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth))
+$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap))
+$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,ncsa_auth))
+$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,smb_auth))
+$(eval $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,digest_pw_auth))
+$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,ip_user_check))
+$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth))
+$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group))
+$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth))
+$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_sizeof_void_p=4 \
@@ -118,11 +92,12 @@ CONFIGURE_ENV+=		ac_cv_sizeof_void_p=4 \
 			ac_cv_sizeof_u_int64_t=8 \
 			ac_cv_func_setresuid=no \
 			ac_cv_func_va_copy=no \
-			ac_cv_func___va_copy=no
+			ac_cv_func___va_copy=no \
+			ac_cv_epoll_works=yes \
+			ac_cv_func_strnstr=no
 CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 			--libexecdir=/usr/lib/squid \
 			--sysconfdir=/etc/squid \
-			--enable-static \
 			--with-gnu-ld \
 			--enable-x-accelerator-vary \
 			--with-pthreads \
@@ -132,6 +107,7 @@ CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 			--enable-arp-acl \
 			--enable-ssl \
 			--enable-htcp \
+			--disable-esi \
 			--enable-err-languages=English \
 			--enable-default-err-language=English \
 			--enable-linux-netfilter \
@@ -151,7 +127,7 @@ CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
-post-install:
+post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} ${IDIR_SQUID}/etc/squid
 	${INSTALL_DATA} ${WRKINST}/etc/squid/mime.conf \
 			${WRKINST}/etc/squid/squid.conf ${IDIR_SQUID}/etc/squid/
@@ -159,18 +135,5 @@ post-install:
 	${CP} ${WRKINST}/usr/share/squid/* ${IDIR_SQUID}/usr/share/squid/
 	${INSTALL_DIR} ${IDIR_SQUID}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/squid ${IDIR_SQUID}/usr/sbin/
-	$(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth)
-	$(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap)
-	$(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,ncsa_auth)
-	$(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,smb_auth)
-	$(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_WINBIND,wb_auth)
-	$(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,digest_pw_auth)
-	$(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,ip_user_check)
-	$(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth)
-	$(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group)
-	$(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,wb_group)
-	$(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth)
-	$(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth)
-	$(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,wb_ntlmauth)
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/squid/patches/patch-configure b/package/squid/patches/patch-configure
deleted file mode 100644
index 5ea663655..000000000
--- a/package/squid/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
-$Id$
---- squid-2.5.STABLE13.orig/configure	2006-03-12 12:29:22.000000000 +0100
-+++ squid-2.5.STABLE13/configure	2006-10-02 20:00:32.000000000 +0200
-@@ -1538,6 +1538,7 @@ CRYPTLIB=''
- REGEXLIB=''	# -lregex
- LIBREGEX=''	# libregex.a
- 
-+if false; then
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-@@ -1573,7 +1574,7 @@ if test -n "$PKGCONFIG"; then
- else
-   echo "$ac_t""no" 1>&6
- fi
--
-+fi
- 
- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
- echo "configure:1580: checking for Cygwin environment" >&5
diff --git a/package/squid/patches/patch-include_config_h b/package/squid/patches/patch-include_config_h
deleted file mode 100644
index 1c8b1dc23..000000000
--- a/package/squid/patches/patch-include_config_h
+++ /dev/null
@@ -1,48 +0,0 @@
-$Id$
-
-	evil kludge because configure only checks the host system,
-	not the build system, yet builds a tool to run on it (cf_gen)
-
-	the real way to do this is probably to enhance configure.in
-	the way gcc uses it if doing a build with build!=(host==target),
-	but this should be enough for now; contact tg@ (PR#71) if it isn't
-
---- squid-2.5.STABLE13.orig/include/config.h	2005-04-23 03:32:27.000000000 +0200
-+++ squid-2.5.STABLE13/include/config.h	2006-09-18 19:21:26.000000000 +0200
-@@ -34,7 +34,36 @@
- #ifndef SQUID_CONFIG_H
- #define SQUID_CONFIG_H
- 
-+#ifndef BUILD_HOST_TOOL
- #include "autoconf.h"		/* For GNU autoconf variables */
-+#else
-+/* we just hope our host systems can cope */
-+#define STDC_HEADERS 1
-+#define HAVE_MEMCPY 1
-+#define HAVE_MEMMOVE 1
-+#define HAVE_MEMSET 1
-+#define HAVE_MKSTEMP 1
-+#define HAVE_MKTIME 1
-+#define HAVE_ASSERT_H 1
-+#define HAVE_CTYPE_H 1
-+#define HAVE_DIRENT_H 1
-+#define HAVE_ERRNO_H 1
-+#define HAVE_FCNTL_H 1
-+#define HAVE_GETOPT_H 1
-+#define HAVE_INTTYPES_H 1
-+#define HAVE_LIMITS_H 1
-+#define HAVE_SIGNAL_H 1
-+#define HAVE_STDARG_H 1
-+#define HAVE_STDDEF_H 1
-+#define HAVE_STDIO_H 1
-+#define HAVE_STDLIB_H 1
-+#define HAVE_STRING_H 1
-+#define HAVE_SYS_PARAM_H 1
-+#define HAVE_SYS_STAT_H 1
-+#define HAVE_SYS_TIME_H 1
-+#define HAVE_TIME_H 1
-+#define HAVE_UNISTD_H 1
-+#endif
- #include "version.h"
- 
- /****************************************************************************
diff --git a/package/squid/patches/patch-lib_util_c b/package/squid/patches/patch-lib_util_c
deleted file mode 100644
index 622df36d6..000000000
--- a/package/squid/patches/patch-lib_util_c
+++ /dev/null
@@ -1,22 +0,0 @@
-$Id$
-
-	the host tools don't need libm
-
---- squid-2.5.STABLE13.orig/lib/util.c	2005-06-30 20:50:56.000000000 +0200
-+++ squid-2.5.STABLE13/lib/util.c	2006-09-18 19:23:46.000000000 +0200
-@@ -704,6 +704,7 @@ xpercent(double part, double whole)
-     return xdiv(100 * part, whole);
- }
- 
-+#ifndef BUILD_HOST_TOOL
- int
- xpercentInt(double part, double whole)
- {
-@@ -714,6 +715,7 @@ xpercentInt(double part, double whole)
-     return (int) floor(xpercent(part, whole) + 0.5);
- #endif
- }
-+#endif
- 
- /* somewhat safer division */
- double
diff --git a/package/squid/patches/patch-src_Makefile_in b/package/squid/patches/patch-src_Makefile_in
deleted file mode 100644
index c77f4d6fb..000000000
--- a/package/squid/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,19 +0,0 @@
-$Id$
-
-	cross-configure kludge
-
---- squid-2.5.STABLE13.orig/src/Makefile.in	2005-09-28 22:57:21.000000000 +0200
-+++ squid-2.5.STABLE13/src/Makefile.in	2006-09-18 19:24:05.000000000 +0200
-@@ -702,7 +702,12 @@ cachemgr$(CGIEXT)$(EXEEXT): $(cachemgr__
- 	$(LINK) $(cachemgr__CGIEXT__LDFLAGS) $(cachemgr__CGIEXT__OBJECTS) $(cachemgr__CGIEXT__LDADD) $(LIBS)
- cf_gen$(EXEEXT): $(cf_gen_OBJECTS) $(cf_gen_DEPENDENCIES) 
- 	@rm -f cf_gen$(EXEEXT)
-+ifneq (${HOSTCC},)
-+	${HOSTCC} ${INCLUDES} -DNDEBUG -DBUILD_HOST_TOOL -o cf_gen$(EXEEXT) \
-+	    $(srcdir)/cf_gen.c $(top_srcdir)/lib/util.c
-+else
- 	$(LINK) $(cf_gen_LDFLAGS) $(cf_gen_OBJECTS) $(cf_gen_LDADD) $(LIBS)
-+endif
- dnsserver$(EXEEXT): $(dnsserver_OBJECTS) $(dnsserver_DEPENDENCIES) 
- 	@rm -f dnsserver$(EXEEXT)
- 	$(LINK) $(dnsserver_LDFLAGS) $(dnsserver_OBJECTS) $(dnsserver_LDADD) $(LIBS)
diff --git a/scripts/create-image.sh b/scripts/create-image.sh
index 44d78c01c..fda269990 100755
--- a/scripts/create-image.sh
+++ b/scripts/create-image.sh
@@ -76,11 +76,11 @@ fi
 
 
 printf "Generate qemu image\n"
-$qimg create -f raw $1 200M
+$qimg create -f raw $1 300M
 
 printf "Create partition and filesystem\n"
 $parted -s $1 mklabel msdos
-$parted -s $1 mkpart primary ext2 0 200
+$parted -s $1 mkpart primary ext2 0 300
 $parted -s $1 set 1 boot on
 $parted -s $1 mkfs 1 ext2
 
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 8aaaeb808..e573d922e 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -89,7 +89,6 @@ $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR2)/.configured
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install
-	echo $(GCC_VERSION) > $(STAGING_TOOLS)/gcc_version
 	# Set up the symlinks to enable lying about target name.
 	set -e; \
 	(cd $(STAGING_TOOLS); \
diff --git a/toolchain/gcc/patches/no-lib64.patch b/toolchain/gcc/patches/no-lib64.patch
index efa4099ee..a46e0aa67 100644
--- a/toolchain/gcc/patches/no-lib64.patch
+++ b/toolchain/gcc/patches/no-lib64.patch
@@ -1,6 +1,42 @@
+diff -Nur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux64.h	2009-04-10 01:23:07.000000000 +0200
++++ gcc-4.4.0/gcc/config/i386/linux64.h	2009-06-02 22:38:29.054028385 +0200
+@@ -59,7 +59,7 @@
+    done.  */
+ 
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
+ 
+ #undef ASM_SPEC
+ #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
+diff -Nur gcc-4.4.0.orig/gcc/config/i386/t-linux64 gcc-4.4.0/gcc/config/i386/t-linux64
+--- gcc-4.4.0.orig/gcc/config/i386/t-linux64	2008-07-02 17:59:19.000000000 +0200
++++ gcc-4.4.0/gcc/config/i386/t-linux64	2009-06-02 22:40:00.800873792 +0200
+@@ -7,7 +7,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
+diff -Nur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux64.h	2009-02-20 16:20:38.000000000 +0100
++++ gcc-4.4.0/gcc/config/mips/linux64.h	2009-06-02 22:40:46.756972667 +0200
+@@ -36,7 +36,7 @@
+   %{profile:-lc_p} %{!profile:-lc}}"
+ 
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
+ #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+ #define LINUX_DYNAMIC_LINKERN32 \
 diff -Nur gcc-4.4.0.orig/gcc/config/mips/t-linux64 gcc-4.4.0/gcc/config/mips/t-linux64
 --- gcc-4.4.0.orig/gcc/config/mips/t-linux64	2006-06-06 14:51:24.000000000 +0200
-+++ gcc-4.4.0/gcc/config/mips/t-linux64	2009-05-28 18:13:45.000000000 +0200
++++ gcc-4.4.0/gcc/config/mips/t-linux64	2009-06-02 22:35:11.634464615 +0200
 @@ -1,6 +1,6 @@
  MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
  MULTILIB_DIRNAMES = n32 32 64