summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/squid/Makefile13
-rw-r--r--package/squid/patches/patch-acinclude_lib-checks_m472
-rw-r--r--package/squid/patches/patch-configure_ac11
-rw-r--r--package/squid/patches/patch-lib_rfcnb_rfcnb-io_c14
-rw-r--r--package/squid/patches/patch-libltdl_aclocal_m414
-rw-r--r--package/squid/patches/patch-src_Makefile_am10
6 files changed, 43 insertions, 91 deletions
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 5edc3057b..9d6f70d49 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -4,15 +4,15 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= squid
-PKG_VERSION:= 3.4.6
+PKG_VERSION:= 3.5.2
PKG_RELEASE:= 1
-PKG_HASH:= 9ef26cd638c65afa750637b3669057c052890f10c686eb0218eb0d39b4199bc0
+PKG_HASH:= 5af2e16f279466f9fb89c2fef6c09b6824a7e3e7996c9f1c2bc16e7daddd751f
PKG_DESCR:= web and cache proxy
PKG_SECTION:= net/proxy
-PKG_DEPENDS:= libopenssl libpthread libstdcxx libltdl
-PKG_BUILDDEP:= openssl libtool
+PKG_DEPENDS:= libpthread libstdcxx libltdl
+PKG_BUILDDEP:= libtool
PKG_URL:= http://www.squid-cache.org/
-PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.4/
+PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.5/
PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA
PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_FILE
@@ -147,7 +147,6 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \
--disable-debug-cbdata \
--enable-kill-parent-hack \
--enable-arp-acl \
- --enable-ssl \
--enable-err-languages=English \
--enable-default-err-language=English \
--enable-linux-netfilter \
@@ -159,11 +158,11 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \
--without-libcap \
--disable-snmp \
--disable-esi \
+ --disable-ssl \
--disable-htcp \
--disable-wccp \
--disable-wccpv2 \
--enable-useragent-log \
- --with-openssl=${STAGING_TARGET_DIR}/usr \
--without-krb5-config \
--enable-negotiate-auth-helpers=no \
--enable-auth \
diff --git a/package/squid/patches/patch-acinclude_lib-checks_m4 b/package/squid/patches/patch-acinclude_lib-checks_m4
deleted file mode 100644
index b44b4eb27..000000000
--- a/package/squid/patches/patch-acinclude_lib-checks_m4
+++ /dev/null
@@ -1,72 +0,0 @@
---- squid-3.4.4.orig/acinclude/lib-checks.m4 2014-03-09 10:40:56.000000000 +0100
-+++ squid-3.4.4/acinclude/lib-checks.m4 2014-03-11 19:44:28.088928982 +0100
-@@ -95,69 +95,6 @@ AC_DEFUN([SQUID_CHECK_LIBIPHLPAPI],[
- SQUID_STATE_ROLLBACK(iphlpapi)
- ])
-
--dnl Checks whether the OpenSSL SSL_get_certificate crashes squid and if a
--dnl workaround can be used instead of using the SSL_get_certificate
--AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[
-- AH_TEMPLATE(SQUID_SSLGETCERTIFICATE_BUGGY, "Define to 1 if the SSL_get_certificate crashes squid")
-- AH_TEMPLATE(SQUID_USE_SSLGETCERTIFICATE_HACK, "Define to 1 to use squid workaround for SSL_get_certificate")
-- SQUID_STATE_SAVE(check_SSL_get_certificate)
-- LIBS="$SSLLIB $LIBS"
-- if test "x$SSLLIBDIR" != "x"; then
-- LIBS="$LIBS -Wl,-rpath -Wl,$SSLLIBDIR"
-- fi
--
-- AC_MSG_CHECKING(whether the SSL_get_certificate is buggy)
-- AC_RUN_IFELSE([
-- AC_LANG_PROGRAM(
-- [
-- #include <openssl/ssl.h>
-- #include <openssl/err.h>
-- ],
-- [
-- SSLeay_add_ssl_algorithms();
-- SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method());
-- SSL *ssl = SSL_new(sslContext);
-- X509* cert = SSL_get_certificate(ssl);
-- return 0;
-- ])
-- ],
-- [
-- AC_MSG_RESULT([no])
-- ],
-- [
-- AC_DEFINE(SQUID_SSLGETCERTIFICATE_BUGGY, 1)
-- AC_MSG_RESULT([yes])
-- ],
-- [])
--
-- AC_MSG_CHECKING(whether the workaround for SSL_get_certificate works)
-- AC_RUN_IFELSE([
-- AC_LANG_PROGRAM(
-- [
-- #include <openssl/ssl.h>
-- #include <openssl/err.h>
-- ],
-- [
-- SSLeay_add_ssl_algorithms();
-- SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method());
-- X509 ***pCert = (X509 ***)sslContext->cert;
-- X509 *sslCtxCert = pCert && *pCert ? **pCert : (X509 *)0x1;
-- if (sslCtxCert != NULL)
-- return 1;
-- return 0;
-- ])
-- ],
-- [
-- AC_MSG_RESULT([yes])
-- AC_DEFINE(SQUID_USE_SSLGETCERTIFICATE_HACK, 1)
-- ],
-- [
-- AC_MSG_RESULT([no])
-- ],
--[])
--
--SQUID_STATE_ROLLBACK(check_SSL_get_certificate)
--])
-
- dnl Checks whether the SSL_CTX_new and similar functions require
- dnl a const 'SSL_METHOD *' argument
diff --git a/package/squid/patches/patch-configure_ac b/package/squid/patches/patch-configure_ac
new file mode 100644
index 000000000..0aae95639
--- /dev/null
+++ b/package/squid/patches/patch-configure_ac
@@ -0,0 +1,11 @@
+--- squid-3.5.2.orig/configure.ac 2015-02-18 06:18:57.000000000 -0600
++++ squid-3.5.2/configure.ac 2015-02-20 13:01:31.755039271 -0600
+@@ -1343,7 +1343,7 @@ if test "x$with_openssl" = "xyes"; then
+ AC_DEFINE(USE_OPENSSL,1,[OpenSSL support is available])
+
+ # check for other specific broken implementations
+- SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS
++ #SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS
+ SQUID_CHECK_OPENSSL_CONST_SSL_METHOD
+ SQUID_CHECK_OPENSSL_TXTDB
+ SQUID_CHECK_OPENSSL_HELLO_OVERWRITE_HACK
diff --git a/package/squid/patches/patch-lib_rfcnb_rfcnb-io_c b/package/squid/patches/patch-lib_rfcnb_rfcnb-io_c
index 32faad55f..17fd993a7 100644
--- a/package/squid/patches/patch-lib_rfcnb_rfcnb-io_c
+++ b/package/squid/patches/patch-lib_rfcnb_rfcnb-io_c
@@ -1,11 +1,11 @@
---- squid-3.4.4.orig/lib/rfcnb/rfcnb-io.c 2014-03-09 10:40:56.000000000 +0100
-+++ squid-3.4.4/lib/rfcnb/rfcnb-io.c 2014-03-27 09:28:30.000000000 +0100
-@@ -30,7 +30,7 @@
- #include "rfcnb/rfcnb-util.h"
- #include "rfcnb/std-includes.h"
+--- squid-3.5.2.orig/lib/rfcnb/rfcnb-io.c 2015-02-18 06:17:02.000000000 -0600
++++ squid-3.5.2/lib/rfcnb/rfcnb-io.c 2015-02-20 00:33:21.015450265 -0600
+@@ -40,7 +40,7 @@
+ #include <string.h>
+ #endif
#include <sys/uio.h>
-#include <sys/signal.h>
+#include <signal.h>
- #if HAVE_STRING_H
- #include <string.h>
+ int RFCNB_Timeout = 0; /* Timeout in seconds ... */
+
diff --git a/package/squid/patches/patch-libltdl_aclocal_m4 b/package/squid/patches/patch-libltdl_aclocal_m4
new file mode 100644
index 000000000..45b9c7e64
--- /dev/null
+++ b/package/squid/patches/patch-libltdl_aclocal_m4
@@ -0,0 +1,14 @@
+--- squid-3.5.2.orig/libltdl/aclocal.m4 2015-02-18 06:17:49.000000000 -0600
++++ squid-3.5.2/libltdl/aclocal.m4 2015-02-23 15:31:16.264583929 -0600
+@@ -486,9 +486,9 @@ _AM_IF_OPTION([no-define],,
+ # Some tools Automake needs.
+ AC_REQUIRE([AM_SANITY_CHECK])dnl
+ AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
++AM_MISSING_PROG([ACLOCAL], [aclocal])
+ AM_MISSING_PROG([AUTOCONF], [autoconf])
+-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
++AM_MISSING_PROG([AUTOMAKE], [automake])
+ AM_MISSING_PROG([AUTOHEADER], [autoheader])
+ AM_MISSING_PROG([MAKEINFO], [makeinfo])
+ AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
diff --git a/package/squid/patches/patch-src_Makefile_am b/package/squid/patches/patch-src_Makefile_am
index 9aec4eca3..049ff3a1d 100644
--- a/package/squid/patches/patch-src_Makefile_am
+++ b/package/squid/patches/patch-src_Makefile_am
@@ -1,11 +1,11 @@
---- squid-3.4.4.orig/src/Makefile.am 2014-03-09 10:40:56.000000000 +0100
-+++ squid-3.4.4/src/Makefile.am 2014-03-12 09:46:23.001434141 +0100
-@@ -981,7 +981,7 @@ cache_cf.o: cf_parser.cci
+--- squid-3.5.2.orig/src/Makefile.am 2015-02-18 06:17:02.000000000 -0600
++++ squid-3.5.2/src/Makefile.am 2015-02-23 15:32:32.084583233 -0600
+@@ -970,7 +970,7 @@ cache_cf.o: cf_parser.cci
# cf_gen builds the configuration files.
cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
-- $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
-+ $(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
+- $(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
# squid.conf.default is built by cf_gen when making cf_parser.cci
squid.conf.default squid.conf.documented: cf_parser.cci
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 22:55:41 +0000