[oe-commits] Roman I Khimov : squid: fix obsolete "-D" cli option warning for squid version 3

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 7e76202b53e756c560180b73bad64eb2426c64ae
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7e76202b53e756c560180b73bad64eb2426c64ae

Author: Roman I Khimov <khimov at altell.ru>
Date:   Wed Jul 28 13:13:24 2010 +0400

squid: fix obsolete "-D" cli option warning for squid version 3

Signed-off-by: Roman I Khimov <khimov at altell.ru>

---

 recipes/squid/squid.inc        |    2 +-
 recipes/squid/squid/squid.init |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc
index 3355c28..477335b 100644
--- a/recipes/squid/squid.inc
+++ b/recipes/squid/squid.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
 LICENSE = "GPLv2"
-INC_PR = "r9"
+INC_PR = "r10"
 DEPENDS = "openssl openssl-native openldap"
 
 SQ_MAJ = "${@bb.data.getVar('PV',d,1).split('.')[0]}"
diff --git a/recipes/squid/squid/squid.init b/recipes/squid/squid/squid.init
index 4364f48..21ccf22 100644
--- a/recipes/squid/squid/squid.init
+++ b/recipes/squid/squid/squid.init
@@ -3,7 +3,13 @@ DAEMON=/usr/sbin/squid
 NAME=squid
 DESC="Squid HTTP proxy"
 PIDFILE=/var/run/squid.pid
-SQUID_ARGS="-D -sY"
+
+# -D option is obsolete in squid version 3, so avoid warning
+if $DAEMON -v | grep -q Version\ 3; then
+	SQUID_ARGS="-sY"
+else
+	SQUID_ARGS="-D -sY"
+fi
 
 test -f $DAEMON || exit 0