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

1 files changed, 27 insertions, 64 deletions

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