From a4fc482c223b4cf61a9361fca9ca113d6ca46b4b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 16 Nov 2021 15:48:00 +0100 Subject: squid: update to 5.2 --- package/squid/Makefile | 14 +++++--------- package/squid/patches/patch-configure_ac | 11 ----------- package/squid/patches/patch-include_SquidNew_h | 26 -------------------------- package/squid/patches/patch-libltdl_aclocal_m4 | 14 -------------- package/squid/patches/patch-src_Makefile_am | 11 ----------- package/squid/patches/patch-src_Makefile_in | 11 +++++++++++ 6 files changed, 16 insertions(+), 71 deletions(-) delete mode 100644 package/squid/patches/patch-configure_ac delete mode 100644 package/squid/patches/patch-include_SquidNew_h delete mode 100644 package/squid/patches/patch-libltdl_aclocal_m4 delete mode 100644 package/squid/patches/patch-src_Makefile_am create mode 100644 package/squid/patches/patch-src_Makefile_in diff --git a/package/squid/Makefile b/package/squid/Makefile index 665392d44..3a57eb39d 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -4,18 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= squid -PKG_VERSION:= 3.5.26 +PKG_VERSION:= 5.2 PKG_RELEASE:= 1 -PKG_HASH:= baa1eecb7d6e18881f4455060d80ee7cb95ae7e2695fdccf7e21ccc8f879a982 +PKG_HASH:= ea921f055c6cc4b3c6542d995f5a7c5980f2f91adaaa10fe8260d0f1527aaf80 PKG_DESCR:= web and cache proxy PKG_SECTION:= net/proxy PKG_DEPENDS:= libltdl PKG_BUILDDEP:= libtool PKG_NEEDS:= threads c++ PKG_URL:= http://www.squid-cache.org/ -PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.5/ - -PKG_SYSTEM_DEPENDS:= !mikrotik-rb532 +PKG_SITES:= http://www.squid-cache.org/Versions/v5/ 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 @@ -42,8 +40,6 @@ PKGSN_SQUID_MOD_BASIC_AUTH_LDAP:= squid PKGSS_SQUID_MOD_BASIC_AUTH_LDAP:= libopenldap PKGSB_SQUID_MOD_BASIC_AUTH_LDAP:= openldap -PKG_HOST_DEPENDS:= !netbsd !cygwin - ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},) BASIC_AUTH_HELPERS+= getpwnam endif @@ -116,7 +112,6 @@ $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,ntlm_fake_auth)) TARGET_LDFLAGS+= -lpthread HOST_CXXFLAGS+= -static-libstdc++ -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ ac_cv_sizeof_short=2 \ ac_cv_sizeof_int=4 \ @@ -151,17 +146,18 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \ --with-dl \ --disable-debug-cbdata \ --disable-strict-error-checking \ + --enable-dependency-tracking \ --enable-kill-parent-hack \ --enable-arp-acl \ --enable-err-languages=English \ --enable-default-err-language=English \ --enable-linux-netfilter \ - --enable-icmp \ --enable-underscores \ --enable-cache-digests \ --enable-referer-log \ --enable-delay-pools \ --without-libcap \ + --enable-icmp \ --disable-snmp \ --disable-esi \ --disable-ssl \ diff --git a/package/squid/patches/patch-configure_ac b/package/squid/patches/patch-configure_ac deleted file mode 100644 index 26d1ceac1..000000000 --- a/package/squid/patches/patch-configure_ac +++ /dev/null @@ -1,11 +0,0 @@ ---- squid-3.5.26.orig/configure.ac 2017-06-01 15:55:25.000000000 +0200 -+++ squid-3.5.26/configure.ac 2017-06-13 02:16:52.536880342 +0200 -@@ -1368,7 +1368,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-include_SquidNew_h b/package/squid/patches/patch-include_SquidNew_h deleted file mode 100644 index 8223c3cb1..000000000 --- a/package/squid/patches/patch-include_SquidNew_h +++ /dev/null @@ -1,26 +0,0 @@ ---- squid-3.5.26.orig/include/SquidNew.h 2017-06-01 15:49:00.000000000 +0200 -+++ squid-3.5.26/include/SquidNew.h 2017-06-13 03:13:51.928727436 +0200 -@@ -18,19 +18,19 @@ - */ - #include - --_SQUID_EXTERNNEW_ void *operator new(size_t size) throw (std::bad_alloc) -+_SQUID_EXTERNNEW_ void *operator new(size_t size) noexcept(false) - { - return xmalloc(size); - } --_SQUID_EXTERNNEW_ void operator delete (void *address) throw() -+_SQUID_EXTERNNEW_ void operator delete (void *address) noexcept(true) - { - xfree(address); - } --_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc) -+_SQUID_EXTERNNEW_ void *operator new[] (size_t size) noexcept(false) - { - return xmalloc(size); - } --_SQUID_EXTERNNEW_ void operator delete[] (void *address) throw() -+_SQUID_EXTERNNEW_ void operator delete[] (void *address) noexcept(true) - { - xfree(address); - } diff --git a/package/squid/patches/patch-libltdl_aclocal_m4 b/package/squid/patches/patch-libltdl_aclocal_m4 deleted file mode 100644 index 45b9c7e64..000000000 --- a/package/squid/patches/patch-libltdl_aclocal_m4 +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 deleted file mode 100644 index 17c26aea6..000000000 --- a/package/squid/patches/patch-src_Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- squid-3.5.26.orig/src/Makefile.am 2017-06-01 15:49:00.000000000 +0200 -+++ squid-3.5.26/src/Makefile.am 2017-06-13 02:16:52.592883945 +0200 -@@ -968,7 +968,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 -- $(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 diff --git a/package/squid/patches/patch-src_Makefile_in b/package/squid/patches/patch-src_Makefile_in new file mode 100644 index 000000000..b355e75b2 --- /dev/null +++ b/package/squid/patches/patch-src_Makefile_in @@ -0,0 +1,11 @@ +--- squid-5.2.orig/src/Makefile.in 2021-10-03 17:04:37.000000000 +0200 ++++ squid-5.2/src/Makefile.in 2021-11-16 13:09:30.751245296 +0100 +@@ -8142,7 +8142,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 +- $(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 -- cgit v1.2.3