summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2013-06-09 02:49:53 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-06-09 19:02:24 (GMT)
commitdbf426da06e034d1109897f557445b192cb6a128 (patch)
tree13ff443a906a90341f52459ad01d6f5ca636bce8
parentf0deded91247e079d84542a89a9b2a2280827181 (diff)
downloadbuildroot-dbf426da06e034d1109897f557445b192cb6a128.tar.gz
buildroot-dbf426da06e034d1109897f557445b192cb6a128.tar.bz2
squid: bump to version 3.3.5
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/squid/squid-01-assume-get-certificate-ok.patch16
-rw-r--r--package/squid/squid.mk3
2 files changed, 18 insertions, 1 deletions
diff --git a/package/squid/squid-01-assume-get-certificate-ok.patch b/package/squid/squid-01-assume-get-certificate-ok.patch
new file mode 100644
index 0000000..e7d4515
--- /dev/null
+++ b/package/squid/squid-01-assume-get-certificate-ok.patch
@@ -0,0 +1,16 @@
+The openssl get_certificate working test isn't cross compile friendly.
+Just assume it works ok since we're using a modern OpenSSL version.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura squid-3.3.5.orig/configure.ac squid-3.3.5/configure.ac
+--- squid-3.3.5.orig/configure.ac 2013-06-03 09:37:44.016398185 -0300
++++ squid-3.3.5/configure.ac 2013-06-03 09:37:55.926784556 -0300
+@@ -1261,7 +1261,6 @@
+ AC_SUBST(SSLLIB)
+
+ if test "x$with_openssl" = "xyes"; then
+-SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS
+ SQUID_CHECK_OPENSSL_TXTDB
+ fi
+
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 934277e..4dd1404 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,10 +4,11 @@
#
################################################################################
-SQUID_VERSION = 3.3.4
+SQUID_VERSION = 3.3.5
SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.3
SQUID_LICENSE = GPLv2+
SQUID_LICENSE_FILES = COPYING
+SQUID_AUTORECONF = YES
SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \
$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
SQUID_CONF_ENV = ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \