summaryrefslogtreecommitdiff
path: root/package/squid
diff options
context:
space:
mode:
Diffstat (limited to 'package/squid')
-rw-r--r--package/squid/Config.in27
-rw-r--r--package/squid/Makefile91
-rw-r--r--package/squid/patches/patch-configure20
-rw-r--r--package/squid/patches/patch-include_config_h48
-rw-r--r--package/squid/patches/patch-lib_util_c22
-rw-r--r--package/squid/patches/patch-src_Makefile_in19
6 files changed, 31 insertions, 196 deletions
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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 13:19:30 +0000