summaryrefslogtreecommitdiff
path: root/recipes/squid
diff options
context:
space:
mode:
authorRoman I Khimov <khimov@altell.ru>2010-08-25 22:17:41 +0400
committerRoman I Khimov <khimov@altell.ru>2010-08-26 09:57:04 +0400
commit7fd5df9fe826af4ad87e5e46a68269f72358fce5 (patch)
tree54498460f871ad15e82cc4fff11431c4f6afb30d /recipes/squid
parent47114ff3ffe111727ce32112bfb2c7172cfa2804 (diff)
squid: remove version 2.6.STABLE14
Very old, buggy, unsupported by upstream. Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/squid')
-rw-r--r--recipes/squid/squid.inc2
-rw-r--r--recipes/squid/squid_2.6.STABLE14.bb11
-rw-r--r--recipes/squid/squid_2.7.STABLE8.bb3
-rw-r--r--recipes/squid/squid_3.1.7.bb3
4 files changed, 1 insertions, 18 deletions
diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc
index 477335b152..daeeb55f98 100644
--- a/recipes/squid/squid.inc
+++ b/recipes/squid/squid.inc
@@ -1,5 +1,5 @@
DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
-LICENSE = "GPLv2"
+LICENSE = "GPL"
INC_PR = "r10"
DEPENDS = "openssl openssl-native openldap"
diff --git a/recipes/squid/squid_2.6.STABLE14.bb b/recipes/squid/squid_2.6.STABLE14.bb
deleted file mode 100644
index 9707ccc6bb..0000000000
--- a/recipes/squid/squid_2.6.STABLE14.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-PR = "${INC_PR}.0"
-
-include squid.inc
-
-EXTRA_OECONF += "--enable-storeio=null,ufs"
-
-SRC_URI += "file://fix_epoll_check.patch \
- file://squidv2-build-cf_gen.patch"
-
-SRC_URI[squid-2.6.STABLE14.md5sum] = "eadb138d48320df8b99349121159c6bf"
-SRC_URI[squid-2.6.STABLE14.sha256sum] = "dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a"
diff --git a/recipes/squid/squid_2.7.STABLE8.bb b/recipes/squid/squid_2.7.STABLE8.bb
index 039f986b5d..26e0d556c0 100644
--- a/recipes/squid/squid_2.7.STABLE8.bb
+++ b/recipes/squid/squid_2.7.STABLE8.bb
@@ -2,9 +2,6 @@ PR = "${INC_PR}.0"
include squid.inc
-# GPLv2+ since 2.6.STABLE18
-LICENSE = "GPL"
-
EXTRA_OECONF += "--enable-epoll --enable-storeio=null,ufs"
SRC_URI += "file://fix_epoll_check.patch \
diff --git a/recipes/squid/squid_3.1.7.bb b/recipes/squid/squid_3.1.7.bb
index de0ddcd0d6..3c831dfeae 100644
--- a/recipes/squid/squid_3.1.7.bb
+++ b/recipes/squid/squid_3.1.7.bb
@@ -2,9 +2,6 @@ PR = "${INC_PR}.0"
include squid.inc
-# GPLv2+ since 2.6.STABLE18
-LICENSE = "GPL"
-
EXTRA_OECONF += "--enable-epoll --enable-icap-client --with-dl --enable-linux-netfilter"
EXTRA_OEMAKE += "DEFAULT_STYLESHEET=${sysconfdir}/squid/errorpage.css DEFAULT_CONFIG_DIR=${sysconfdir}/squid"