squid: update to 6.10

Remove one patch - instead of messing with BUILDCXXFLAGS there we
properly define it via CONFIGURE_ARGS inside Makefile of the package.

Refresh remaining patch.

Signed-off-by: Aleksey Vasilenko <aleksey.vasilenko@gmail.com>

diff --git a/net/squid/Makefile b/net/squid/Makefile
index 45e1e49172ccd36987ae581176c1b9879f5e1f7e..6b5f5ca5e15734d1741a16c151e5825d8e83b56a 100644 (file)
--- a/net/squid/Makefile
+++ b/net/squid/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=squid
-PKG_VERSION:=6.9
+PKG_VERSION:=6.10
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www2.pl.squid-cache.org/Versions/v6/ \
        http://www.squid-cache.org/Versions/v6/
-PKG_HASH:=1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882
+PKG_HASH:=0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7
 
 PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
@@ -69,6 +69,7 @@ endef
 
 CONFIGURE_ARGS += \
        BUILDCXX=$(HOSTCXX_NOCACHE) \
+       BUILDCXXFLAGS="$(HOST_CXXFLAGS) $(HOST_CPPFLAGS) -std=c++17" \
        --datadir=/usr/share/squid \
        --libexecdir=/usr/lib/squid \
        --sysconfdir=/etc/squid \

diff --git a/net/squid/patches/010-no-buildcxxflags.patch b/net/squid/patches/010-no-buildcxxflags.patch
deleted file mode 100644 (file)
index f552538..0000000
--- a/net/squid/patches/010-no-buildcxxflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -626,7 +626,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
-+      $(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 squid.conf.documented: cf_parser.cci

diff --git a/net/squid/patches/020-fix-nettle-configure.patch b/net/squid/patches/020-fix-nettle-configure.patch
index 222994a049a72379ec6aa5603ecbf7b18e54ba37..4ba5f48eb03ad1c1a6bb98a63684a8c3d3f05038 100644 (file)
--- a/net/squid/patches/020-fix-nettle-configure.patch
+++ b/net/squid/patches/020-fix-nettle-configure.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1043,7 +1043,7 @@ AC_MSG_NOTICE([HTCP support enabled: $en
+@@ -1033,7 +1033,7 @@ AC_MSG_NOTICE([HTCP support enabled: $en
  
  # Cryptograhic libraries
  SQUID_AUTO_LIB(nettle,[Nettle crypto],[LIBNETTLE])