diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-07-20 00:35:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 00:35:45 -0700 |
| commit | 6fec82d068d64db2d18ab6291b75d0bf7c25d451 (patch) | |
| tree | 1dcd477b1f4dc4eea533e092887cfd9d9a55db37 | |
| parent | bcd914e6658aed571eae554dfb8bfaac87e3fa41 (diff) | |
| parent | 3401e29aa7643bfba29e80c23cf5c613a0160d73 (diff) | |
Merge pull request #12848 from BKPepe/squid
squid: update to version 4.12 (security update)
| -rw-r--r-- | net/squid/Makefile | 6 | ||||
| -rw-r--r-- | net/squid/patches/001-cross_compile.patch | 22 | ||||
| -rw-r--r-- | net/squid/patches/001-glibc-compile.patch (renamed from net/squid/patches/002-glibc-compile.patch) | 2 |
3 files changed, 4 insertions, 26 deletions
diff --git a/net/squid/Makefile b/net/squid/Makefile index c79021825..6f0e177dc 100644 --- a/net/squid/Makefile +++ b/net/squid/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=squid -PKG_VERSION:=4.6 -PKG_RELEASE:=5 +PKG_VERSION:=4.12 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www3.us.squid-cache.org/Versions/v4/ \ http://www2.pl.squid-cache.org/Versions/v4/ \ http://www.squid-cache.org/Versions/v4/ -PKG_HASH:=015bade5d3a4905142c4c605df5c4216471e3d8338079955e0e44b0ae0303d41 +PKG_HASH:=f42a03c8b3dc020722c88bf1a87da8cb0c087b2f66b41d8256c77ee1b527e317 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> PKG_LICENSE:=GPL-2.0-or-later diff --git a/net/squid/patches/001-cross_compile.patch b/net/squid/patches/001-cross_compile.patch deleted file mode 100644 index e392dba71..000000000 --- a/net/squid/patches/001-cross_compile.patch +++ /dev/null @@ -1,22 +0,0 @@ -From fac6f63a52a2f4cbb3748cd5687eca5409093904 Mon Sep 17 00:00:00 2001 -From: Marko Ratkaj <marko.ratkaj@sartura.hr> -Date: Thu, 20 Apr 2017 15:15:50 +0200 -Subject: [PATCH] foo - -Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr> ---- - src/Makefile.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -8385,7 +8385,8 @@ - - # 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 -+ g++ -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/002-glibc-compile.patch b/net/squid/patches/001-glibc-compile.patch index 24da83efc..fd11e85ce 100644 --- a/net/squid/patches/002-glibc-compile.patch +++ b/net/squid/patches/001-glibc-compile.patch @@ -1,6 +1,6 @@ --- a/src/tools.cc +++ b/src/tools.cc -@@ -582,7 +582,8 @@ +@@ -582,7 +582,8 @@ enter_suid(void) } #else |