OpenWRT
/
packages
mirror of https://github.com/openwrt/packages.git
1
0
Fork 0
Code Issues Releases Wiki Activity

squid: update to 6.7 

- Switch URL to HTTPS
- Remove default/obsolete configure options
- Fix and refresh the patch

Signed-off-by: krant <aleksey.vasilenko@gmail.com>
pull/23333/head
krant 2024-02-08 15:01:10 +02:00 committed by Rosen Penev
parent 4dd0e03bdd
commit 4007a08529
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/squid/Makefile
View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=squid PKG_NAME:=squid
PKG_VERSION:=5.7 PKG_VERSION:=6.7
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www2.pl.squid-cache.org/Versions/v5/ \ PKG_SOURCE_URL:=http://www2.pl.squid-cache.org/Versions/v6/ \
http://www.squid-cache.org/Versions/v5/ http://www.squid-cache.org/Versions/v6/
PKG_HASH:=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81 PKG_HASH:=e14daa4eae41925d1ae3f08e64439a6aaa3011bdced686628b8de697d5ab8428
PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com> PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later
@ -30,7 +30,7 @@ define Package/squid/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Web Servers/Proxies SUBMENU:=Web Servers/Proxies
URL:=http://www.squid-cache.org/ URL:=https://www.squid-cache.org/
endef endef
define Package/squid define Package/squid
@ -69,30 +69,22 @@ endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
BUILDCXX=$(HOSTCXX_NOCACHE) \ BUILDCXX=$(HOSTCXX_NOCACHE) \
--config-cache \
--datadir=/usr/share/squid \ --datadir=/usr/share/squid \
--libexecdir=/usr/lib/squid \ --libexecdir=/usr/lib/squid \
--sysconfdir=/etc/squid \ --sysconfdir=/etc/squid \
--enable-shared \
--disable-static \ --disable-static \
--enable-delay-pools \ --enable-delay-pools \
--enable-kill-parent-hack \
--enable-ssl \
--enable-cache-digests \ --enable-cache-digests \
--enable-linux-netfilter \ --enable-linux-netfilter \
--disable-unlinkd \ --disable-unlinkd \
--enable-x-accelerator-vary \ --enable-x-accelerator-vary \
--disable-translation \
--disable-auto-locale \ --disable-auto-locale \
--with-dl \
--with-pthreads \
--enable-epoll \ --enable-epoll \
--with-maxfd=2048 \ --with-filedescriptors=2048 \
--disable-ecap \
--disable-external-acl-helpers \ --disable-external-acl-helpers \
--disable-arch-native \ --disable-arch-native \
--with-krb5-config=no \
--without-mit-krb5 \ --without-mit-krb5 \
--without-heimdal-krb5 \
--without-netfilter-conntrack \ --without-netfilter-conntrack \
--disable-ident-lookups \ --disable-ident-lookups \
$(if $(CONFIG_SQUID_auth-basic),--enable,--disable)-auth-basic \ $(if $(CONFIG_SQUID_auth-basic),--enable,--disable)-auth-basic \

4
net/squid/patches/010-no-buildcxxflags.patch
View File

@ -1,11 +1,11 @@
--- a/src/Makefile.am --- a/src/Makefile.am
+++ b/src/Makefile.am +++ b/src/Makefile.am
@@ -761,7 +761,7 @@ cache_cf.o: cf_parser.cci @@ -626,7 +626,7 @@ cache_cf.o: cf_parser.cci
# cf_gen builds the configuration files. # cf_gen builds the configuration files.
cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci 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 - $(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
+ $(BUILDCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src + $(BUILDCXX) -std=c++17 -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 is built by cf_gen when making cf_parser.cci
squid.conf.default squid.conf.documented: cf_parser.cci squid.conf.default squid.conf.documented: cf_parser.cci