From 5955ec0ef03f718aa9b1043eb67a169f219c84c5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Mar 2014 14:40:21 +0100 Subject: update to latest upstream version --- package/squid/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'package/squid/Makefile') diff --git a/package/squid/Makefile b/package/squid/Makefile index 84e8b30f1..890e64328 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= squid -PKG_VERSION:= 3.4.1 +PKG_VERSION:= 3.4.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= da9f30aeff856bc8348494da2730f94e +PKG_MD5SUM:= b36ab3696485a86b43d9194ac9b6b7fe PKG_DESCR:= squid web and cache proxy PKG_SECTION:= proxy PKG_DEPENDS:= libopenssl libpthread libstdcxx libltdl -PKG_BUILDDEP:= openssl libtool +PKG_BUILDDEP:= autotool openssl libtool PKG_URL:= http://www.squid-cache.org/ PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.4/ PKG_MULTI:= 1 @@ -95,6 +95,7 @@ $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth)) $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,ext_unix_group_acl)) $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,ntlm_fake_auth)) +AUTOTOOL_STYLE:= autoreconf TARGET_LDFLAGS+= -lpthread CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ ac_cv_sizeof_short=2 \ @@ -120,6 +121,7 @@ CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ squid_cv_pf_inet6=yes \ ac_cv_have_squid=yes XAKE_FLAGS+= MKDIR_P="mkdir -p" +XAKE_FLAGS+= GCC_HONOUR_COPTS=s CONFIGURE_ARGS+= --datadir=/usr/share/squid \ --libexecdir=/usr/lib/squid \ --sysconfdir=/etc/squid \ -- cgit v1.2.3 From 956b9e517b14cb6d86569f486ec7c9bdfcc8dffc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Mar 2014 15:13:17 +0100 Subject: hudson says: you forgot the patches --- package/squid/Makefile | 2 +- .../squid/patches/patch-acinclude_lib-checks_m4 | 72 ++++++++++++++++++++++ package/squid/patches/patch-src_Makefile_am | 11 ++++ 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 package/squid/patches/patch-acinclude_lib-checks_m4 create mode 100644 package/squid/patches/patch-src_Makefile_am (limited to 'package/squid/Makefile') diff --git a/package/squid/Makefile b/package/squid/Makefile index 890e64328..f8e6aaf72 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= squid PKG_VERSION:= 3.4.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b36ab3696485a86b43d9194ac9b6b7fe PKG_DESCR:= squid web and cache proxy PKG_SECTION:= proxy diff --git a/package/squid/patches/patch-acinclude_lib-checks_m4 b/package/squid/patches/patch-acinclude_lib-checks_m4 new file mode 100644 index 000000000..b44b4eb27 --- /dev/null +++ b/package/squid/patches/patch-acinclude_lib-checks_m4 @@ -0,0 +1,72 @@ +--- 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 +- #include +- ], +- [ +- 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 +- #include +- ], +- [ +- 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-src_Makefile_am b/package/squid/patches/patch-src_Makefile_am new file mode 100644 index 000000000..9aec4eca3 --- /dev/null +++ b/package/squid/patches/patch-src_Makefile_am @@ -0,0 +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 + + # 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 + + # squid.conf.default is built by cf_gen when making cf_parser.cci + squid.conf.default squid.conf.documented: cf_parser.cci -- cgit v1.2.3