Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2015-09-01 09:59:08 +02:00
158 changed files with 1947 additions and 1553 deletions

View File

@@ -1,3 +1,3 @@
# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.6.tar.xz.asc
md5 93e18bd257857e35bb634ddb8a348563 squid-3.5.6.tar.xz
sha1 c5f3ab47e61a08fa6a8767d45befeffd7d26fd9f squid-3.5.6.tar.xz
# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.7.tar.xz.asc
md5 e24943386555ca922130a7e034badba7 squid-3.5.7.tar.xz
sha1 e7dcc0cbcee6fd10a8c8bf3e9bff0dc6359ccc48 squid-3.5.7.tar.xz

View File

@@ -5,7 +5,7 @@
################################################################################
SQUID_VERSION_MAJOR = 3.5
SQUID_VERSION = $(SQUID_VERSION_MAJOR).6
SQUID_VERSION = $(SQUID_VERSION_MAJOR).7
SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR)
SQUID_LICENSE = GPLv2+