From 9d5524d3da7eeaa0d33ea0e3b86eec19ebc27954 Mon Sep 17 00:00:00 2001
From: Roman I Khimov <khimov@altell.ru>
Date: Fri, 19 Mar 2010 13:02:51 +0300
Subject: squid: introduce version 2.7.STABLE8

Enable epoll for this version, it's available on all 2.6 kernels, so
disabling it is a bit strange for 2010.

Signed-off-by: Roman I Khimov <khimov@altell.ru>
---
 recipes/squid/squid-native.inc            |  2 +-
 recipes/squid/squid-native_2.7.STABLE8.bb |  6 ++++++
 recipes/squid/squid.inc                   |  2 +-
 recipes/squid/squid_2.7.STABLE8.bb        | 16 ++++++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 recipes/squid/squid-native_2.7.STABLE8.bb
 create mode 100644 recipes/squid/squid_2.7.STABLE8.bb

(limited to 'recipes/squid')

diff --git a/recipes/squid/squid-native.inc b/recipes/squid/squid-native.inc
index 0f48805ba1..1077b98461 100644
--- a/recipes/squid/squid-native.inc
+++ b/recipes/squid/squid-native.inc
@@ -1,6 +1,6 @@
 inherit native autotools
 
-SRC_URI = "http://www.squid-cache.org/Versions/v2/${SQUID_MAJOR}/squid-${PV}.tar.bz2"
+SRC_URI = "http://www.squid-cache.org/Versions/v2/${SQUID_MAJOR}/squid-${PV}.tar.bz2;name=squid-${PV}"
 S = "${WORKDIR}/squid-${PV}"
 
 do_stage() {
diff --git a/recipes/squid/squid-native_2.7.STABLE8.bb b/recipes/squid/squid-native_2.7.STABLE8.bb
new file mode 100644
index 0000000000..3c9fa2ae44
--- /dev/null
+++ b/recipes/squid/squid-native_2.7.STABLE8.bb
@@ -0,0 +1,6 @@
+SQUID_MAJOR = "2.7"
+
+include squid-native.inc
+
+SRC_URI[squid-2.7.STABLE8.md5sum] = "c061ba1c9ae39d0aaa8eca137f7dd18b"
+SRC_URI[squid-2.7.STABLE8.sha256sum] = "9409b02fc53518e334395df803a1ae30f4ed385b0f041fb310b4c75e2a49138c"
\ No newline at end of file
diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc
index b5878c3deb..7b173b4410 100644
--- a/recipes/squid/squid.inc
+++ b/recipes/squid/squid.inc
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 INC_PR = "r2"
 DEPENDS = "squid-native-${PV}"
 
-SRC_URI = "http://www.squid-cache.org/Versions/v2/${SQUID_MAJOR}/squid-${PV}.tar.bz2 \
+SRC_URI = "http://www.squid-cache.org/Versions/v2/${SQUID_MAJOR}/squid-${PV}.tar.bz2;name=squid-${PV} \
            file://fix_epoll_check.patch;patch=1 \
            file://squid.init"
 
diff --git a/recipes/squid/squid_2.7.STABLE8.bb b/recipes/squid/squid_2.7.STABLE8.bb
new file mode 100644
index 0000000000..b237fe3919
--- /dev/null
+++ b/recipes/squid/squid_2.7.STABLE8.bb
@@ -0,0 +1,16 @@
+PR = "${INC_PR}.0"
+SQUID_MAJOR = "2.7"
+
+include squid.inc
+
+# GPLv2+ since 2.6.STABLE18
+LICENSE = "GPL"
+
+EXTRA_OECONF += "--enable-epoll"
+
+SRC_URI[squid-2.7.STABLE8.md5sum] = "c061ba1c9ae39d0aaa8eca137f7dd18b"
+SRC_URI[squid-2.7.STABLE8.sha256sum] = "9409b02fc53518e334395df803a1ae30f4ed385b0f041fb310b4c75e2a49138c"
+
+do_configure_prepend() {
+	export ac_cv_epoll_ctl=yes
+}
\ No newline at end of file
-- 
cgit 1.2.3-korg