Add formilux tools/init-scripts

4 files changed, 77 insertions, 0 deletions

diff --git a/flx/init-squid/Manifest b/flx/init-squid/Manifest
new file mode 100644
index 00000000..26c3d4aa
--- /dev/null
+++ b/flx/init-squid/Manifest
@@ -0,0 +1,3 @@
+AUX init-squid-BJA-obsolete-opt.diff 1205 RMD160 b3e3f21a7389f709e8f9add40c92b12eaba9b174 SHA1 aeb60e8236b1705f67e5e500fbccf3d660672c40 SHA256 383586abc3c993b3dc10a3214d02bf077dbc3eb57ab56346b34f34793e9deeeb
+AUX init-squid-BJA-path.diff 621 RMD160 6aa8aba26980cbe6f54828a6342c91d8f42d1693 SHA1 062654ed423f2cd66662dc92da47dc1ee6b6b979 SHA256 be4f7e173562665ae2140908c02fdbf9512ecd804a9b02f0112d0d9c5fea9710
+EBUILD init-squid-2.6.ebuild 552 RMD160 c0c83b23b5c7aeb55d1207b9b7a165d303a27e34 SHA1 dde1742630e780792fc4ed4e2429077989fa4eeb SHA256 e8e829a40e06810c05a23e723427cac58090f9cc63e2a6a3bddc771b96d93fa1
diff --git a/flx/init-squid/files/init-squid-BJA-obsolete-opt.diff b/flx/init-squid/files/init-squid-BJA-obsolete-opt.diff
new file mode 100644
index 00000000..794ccf32
--- /dev/null
+++ b/flx/init-squid/files/init-squid-BJA-obsolete-opt.diff
@@ -0,0 +1,29 @@
+diff --git add-ons/squid.init add-ons/squid.init
+index ad4aebc..e67f992 100644
+--- add-ons/squid.init
++++ add-ons/squid.init
+@@ -10,7 +10,6 @@ option  whitelist	standard_option
+ option	usesyslog	boolean_option 0
+ option	createswap	boolean_option 0
+ option	catchsignals	boolean_option 1
+-option	dnstest		boolean_option 1
+ option	waitrebuild	boolean_option 0
+ option	reuseaddr	boolean_option 1
+ option	doublecheck	boolean_option 0
+@@ -19,7 +18,7 @@ option	vhostaccel	boolean_option 0
+ option	bin		reserved_option	/usr/sbin/squid
+ option	gbin		reserved_option	/usr/bin/squidGuard
+ option  pidfile         reserved_option /var/run/squid.pid
+-option  cmdline		reserved_option '$bin -D'
++option  cmdline		reserved_option '$bin'
+ 
+ function fct_pre_start {
+ 
+@@ -82,7 +81,6 @@ function fct_end_section {
+     [ "$opt_usesyslog" = "1" ] && cmdline="$cmdline -s"
+     [ "$opt_createswap" = "1" ] && cmdline="$cmdline -z"
+     [ "$opt_catchsignals" != "1" ] && cmdline="$cmdline -C"
+-    [ "$opt_dnstest" != "1" ] && cmdline="$cmdline -D"
+     [ "$opt_reuseaddr" != "1" ] && cmdline="$cmdline -R"
+     [ "$opt_waitrebuild" = "1" ] && cmdline="$cmdline -F"
+     [ "$opt_doublecheck" = "1" ] && cmdline="$cmdline -S"
diff --git a/flx/init-squid/files/init-squid-BJA-path.diff b/flx/init-squid/files/init-squid-BJA-path.diff
new file mode 100644
index 00000000..f4c63457
--- /dev/null
+++ b/flx/init-squid/files/init-squid-BJA-path.diff
@@ -0,0 +1,20 @@
+diff --git add-ons/squid.init add-ons/squid.init
+index 6702aea..ad4aebc 100644
+--- add-ons/squid.init
++++ add-ons/squid.init
+@@ -16,8 +16,8 @@ option	reuseaddr	boolean_option 1
+ option	doublecheck	boolean_option 0
+ option	vhostaccel	boolean_option 0
+ 
+-option	bin		reserved_option	/opt/sbin/squid
+-option	gbin		reserved_option	/opt/squid/bin/squidguard
++option	bin		reserved_option	/usr/sbin/squid
++option	gbin		reserved_option	/usr/bin/squidGuard
+ option  pidfile         reserved_option /var/run/squid.pid
+ option  cmdline		reserved_option '$bin -D'
+ 
+@@ -107,4 +107,3 @@ function do_refresh_lists {
+ 
+ 
+ load_config
+-
diff --git a/flx/init-squid/init-squid-2.6.ebuild b/flx/init-squid/init-squid-2.6.ebuild
new file mode 100644
index 00000000..5176cdd7
--- /dev/null
+++ b/flx/init-squid/init-squid-2.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit git-2 flx eutils
+
+HOMEPAGE="http://master.formilux.org/git/dist/pkg/squid.git"
+EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git"
+EGIT_BRANCH="2.6-flx0"
+EGIT_COMMIT="v2.6.STABLE13-flx0.1"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=net-proxy/squid-${PV}"
+
+src_prepare ()
+{
+	epatch "${FILESDIR}"/${PN}-BJA-path.diff
+	epatch "${FILESDIR}"/${PN}-BJA-obsolete-opt.diff
+
+	flx_src_prepare
+}