diff options
Diffstat (limited to 'package/squid/Makefile')
| -rw-r--r-- | package/squid/Makefile | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/package/squid/Makefile b/package/squid/Makefile index 665392d44..7a1199e69 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -4,18 +4,19 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= squid -PKG_VERSION:= 3.5.26 +PKG_VERSION:= 6.13 PKG_RELEASE:= 1 -PKG_HASH:= baa1eecb7d6e18881f4455060d80ee7cb95ae7e2695fdccf7e21ccc8f879a982 +PKG_HASH:= 9b33de09d733b5933f6c2b54ebe0be51a9fa4751f183f3aead90b3c5d930aa72 PKG_DESCR:= web and cache proxy PKG_SECTION:= net/proxy -PKG_DEPENDS:= libltdl +PKG_DEPENDS:= libltdl libxcrypt PKG_BUILDDEP:= libtool +PKG_BUILDDEP_GLIBC:= libxcrypt PKG_NEEDS:= threads c++ PKG_URL:= http://www.squid-cache.org/ -PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.5/ +PKG_SITES:= https://github.com/squid-cache/squid/releases/download/SQUID_6_13/ -PKG_SYSTEM_DEPENDS:= !mikrotik-rb532 +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz 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 +43,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 @@ -114,54 +113,37 @@ $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,ext_unix_group_ $(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 \ - ac_cv_sizeof_long=4 \ - ac_cv_sizeof_long_long=8 \ - ac_cv_sizeof___int64=0 \ - ac_cv_sizeof_int16_t=2 \ - ac_cv_sizeof_uint16_t=2 \ - ac_cv_sizeof_u_int16_t=2 \ - ac_cv_sizeof_int32_t=4 \ - ac_cv_sizeof_uint32_t=4 \ - ac_cv_sizeof_u_int32_t=4 \ - ac_cv_sizeof_int64_t=8 \ - ac_cv_sizeof_uint64_t=8 \ - ac_cv_sizeof_u_int64_t=8 \ - ac_cv_func_setresuid=no \ - ac_cv_func_va_copy=no \ - ac_cv_func___va_copy=no \ +HOST_CXXFLAGS+= -std=c++17 -static-libstdc++ + +CONFIGURE_ENV+= ac_cv_func_setresuid=yes \ + ac_cv_func_va_copy=yes \ + ac_cv_func___va_copy=yes \ ac_cv_epoll_works=yes \ - ac_cv_lib_nsl_main=no \ ac_cv_func_strnstr=no \ - squid_cv_pf_inet6=yes \ - squid_cv_gnu_atomics=yes \ ac_cv_have_squid=yes XAKE_FLAGS+= MKDIR_P="mkdir -p" CONFIGURE_ARGS+= --datadir=/usr/share/squid \ --libexecdir=/usr/lib/squid \ --sysconfdir=/etc/squid \ + --disable-arch-native \ --with-gnu-ld \ --enable-x-accelerator-vary \ --with-pthreads \ --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 \ @@ -183,8 +165,6 @@ squid-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${IDIR_SQUID}/etc/squid/ ${INSTALL_DATA} ./files/squid.conf ${IDIR_SQUID}/etc/squid/ ${INSTALL_DIR} ${IDIR_SQUID}/usr/share/squid/errors - ${CP} ${WRKINST}/usr/share/squid/errors/en \ - ${IDIR_SQUID}/usr/share/squid/errors ${CP} ${WRKINST}/usr/share/squid/errors/templates \ ${IDIR_SQUID}/usr/share/squid/errors ${CP} ${WRKINST}/usr/share/squid/icons ${IDIR_SQUID}/usr/share/squid/ |