Browse Source

Merge pull request #7332 from sartura/squid_bump_version_to_4.4

net: squid: bump version to 4.4
lilik-openwrt-22.03
Marko Ratkaj 6 years ago
committed by GitHub
parent
commit
af91fd7033
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 10 deletions
  1. +2
    -2
      net/squid/Makefile
  2. +3
    -5
      net/squid/patches/001-cross_compile.patch
  3. +3
    -3
      net/squid/patches/002-glibc-compile.patch

+ 2
- 2
net/squid/Makefile View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=squid PKG_NAME:=squid
PKG_VERSION:=4.3
PKG_VERSION:=4.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
@ -18,7 +18,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www3.us.squid-cache.org/Versions/v4/ \ PKG_SOURCE_URL:=http://www3.us.squid-cache.org/Versions/v4/ \
http://www2.pl.squid-cache.org/Versions/v4/ \ http://www2.pl.squid-cache.org/Versions/v4/ \
http://www.squid-cache.org/Versions/v4/ http://www.squid-cache.org/Versions/v4/
PKG_HASH:=322612ef0544828f6c673a25124b32364fb41ef5e2847e21c89480b5546a4c7c
PKG_HASH:=4905e6da7f5574d2583ba36f398bb062a12d51e70d67035078b6e85b09e9ee82
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1


+ 3
- 5
net/squid/patches/001-cross_compile.patch View File

@ -8,11 +8,9 @@ Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
src/Makefile.in | 3 ++- src/Makefile.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
Index: squid-4.0.21/src/Makefile.in
===================================================================
--- squid-4.0.21.orig/src/Makefile.in
+++ squid-4.0.21/src/Makefile.in
@@ -7642,7 +7642,8 @@ cache_cf.o: cf_parser.cci
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -8383,7 +8383,8 @@
# 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


+ 3
- 3
net/squid/patches/002-glibc-compile.patch View File

@ -1,6 +1,6 @@
--- squid-4.0.21.orig/src/tools.cc
+++ squid-4.0.21/src/tools.cc
@@ -581,7 +581,8 @@
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -582,7 +582,8 @@
} }
#else #else


Loading…
Cancel
Save