flx/init-openvpn: Move patch here

Package-Manager: portage-2.2.28

4 files changed, 65 insertions, 3 deletions

diff --git a/flx/init-openvpn/Manifest b/flx/init-openvpn/Manifest
index 6715ed41..1f1f9654 100644
--- a/flx/init-openvpn/Manifest
+++ b/flx/init-openvpn/Manifest
@@ -1,2 +1,4 @@
-EBUILD init-openvpn-2.0.9.ebuild 333 SHA256 57aa8992c69b55971b03375cbacc150dc4481fa5a31163894a0ce7103b4f6255 WHIRLPOOL de37c1d1fdb863bf04cbda61b2514d1bd30be1c3d289a0d567c92a564ad710e4b0196f42f3a405d9786613699e3f7f862b118c06b978b8cd59b46feb91438c9d
+AUX 2.0.9-BASH4-Bash-4-array-prefixing-is-var-not-var.patch 1382 SHA256 d435bcbbbddb8a9d1a417ec62532c225b880d28f48e97d7cca2181209c523f7e WHIRLPOOL 174e0713ab3f0cf7628577f8f7f21ea6cc7866a15c141433f17ba5f04b351dbfb8257f598d7bf92dd86bf19b355dbab22652f3f0d5e0651ca37c64fbe55491fb
+AUX 2.0.9-CLEAN-Delete-leading-whitespaces.patch 1128 SHA256 78019beddaf21b1d285dc99ced70784f4c1a985f3fd6d2585d8282555b25092e WHIRLPOOL 9a501e7b9b0dde34edd780ae550d66d37801da8a930b373dda8bf017af7748dc4aab42d1fde974212d3f1bd90720c38d7615be9e5a60861c72ae89d43d0c646a
+EBUILD init-openvpn-2.0.9.ebuild 430 SHA256 b0c06d1bf2c583db31eaaba37a5b0d17de2bf705b8f3003652de012719be0ce6 WHIRLPOOL 42fce299c4b896d9a858db83af1466956de8879445048499092fdec4dc1102be052501bef4918b347591e5b39f58936acd8448a3fc0c2c61e7b01c2c4287140f
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-openvpn/files/2.0.9-BASH4-Bash-4-array-prefixing-is-var-not-var.patch b/flx/init-openvpn/files/2.0.9-BASH4-Bash-4-array-prefixing-is-var-not-var.patch
new file mode 100644
index 00000000..ab8aa0f7
--- /dev/null
+++ b/flx/init-openvpn/files/2.0.9-BASH4-Bash-4-array-prefixing-is-var-not-var.patch
@@ -0,0 +1,23 @@
+From 7e6b998a3f22eb5d3973cb74a67ca735e2374e41 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Sat, 26 Nov 2011 13:13:37 +0100
+Subject: [PATCH 2/2] [BASH4] Bash 4 array prefixing is ${var[@]/#/} not
+ ${var[@]//#/}
+
+---
+ add-ons/openvpn | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/add-ons/openvpn b/add-ons/openvpn
+index 4c75314..e849411 100644
+--- a/add-ons/openvpn
++++ b/add-ons/openvpn
+@@ -16,7 +16,7 @@ option  dev             standard_option
+ option  status          standard_option /var/state/openvpn.status
+ 
+ option	bin		reserved_option	/usr/sbin/openvpn
+-option	cmdline		reserved_option	'openvpn --config $opt_config --writepid $pidfile ${opt_remote[@]:+${opt_remote[@]//#/--remote }} ${opt_proto:+--proto $opt_proto} ${opt_port:+--port $opt_port} ${opt_ca:+--ca $opt_ca} ${opt_cert:+--cert $opt_cert} ${opt_key:+--key $opt_key} ${opt_status:+--status $opt_status} ${opt_dev:+--dev $opt_dev}'
++option	cmdline		reserved_option	'openvpn --config $opt_config --writepid $pidfile ${opt_remote[@]:+${opt_remote[@]/#/--remote }} ${opt_proto:+--proto $opt_proto} ${opt_port:+--port $opt_port} ${opt_ca:+--ca $opt_ca} ${opt_cert:+--cert $opt_cert} ${opt_key:+--key $opt_key} ${opt_status:+--status $opt_status} ${opt_dev:+--dev $opt_dev}'
+ 
+ # perform a forced synchronisation before starting the daemon
+ function fct_pre_start {
diff --git a/flx/init-openvpn/files/2.0.9-CLEAN-Delete-leading-whitespaces.patch b/flx/init-openvpn/files/2.0.9-CLEAN-Delete-leading-whitespaces.patch
new file mode 100644
index 00000000..c721cf9e
--- /dev/null
+++ b/flx/init-openvpn/files/2.0.9-CLEAN-Delete-leading-whitespaces.patch
@@ -0,0 +1,31 @@
+From 345ee1a36362ffd0515c5600a89f7812a281af11 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Sat, 26 Nov 2011 13:12:27 +0100
+Subject: [PATCH 1/2] [CLEAN] Delete leading whitespaces
+
+---
+ add-ons/openvpn | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/add-ons/openvpn b/add-ons/openvpn
+index 3276795..4c75314 100644
+--- a/add-ons/openvpn
++++ b/add-ons/openvpn
+@@ -6,7 +6,7 @@
+ 
+ option	config		standard_option	/etc/openvpn/openvpn.conf
+ option	pidfile		reserved_option	/var/run/openvpn.pid
+-option  remote          multiple_option 
++option  remote          multiple_option
+ option  proto           standard_option
+ option  port            standard_option
+ option  ca              standard_option
+@@ -22,7 +22,7 @@ option	cmdline		reserved_option	'openvpn --config $opt_config --writepid $pidfil
+ function fct_pre_start {
+     [ ! -d /dev/net ] && mkdir /dev/net
+     [ ! -c /dev/net/tun ] && rm -f /dev/net/tun && mknod /dev/net/tun c 10 200
+-    grep -qs "^200 net/tun$" /proc/misc || modprobe tun 
++    grep -qs "^200 net/tun$" /proc/misc || modprobe tun
+ }
+ 
+ load_config
diff --git a/flx/init-openvpn/init-openvpn-2.0.9.ebuild b/flx/init-openvpn/init-openvpn-2.0.9.ebuild
index eb4bfaae..9e8d35c7 100644
--- a/flx/init-openvpn/init-openvpn-2.0.9.ebuild
+++ b/flx/init-openvpn/init-openvpn-2.0.9.ebuild
@@ -5,9 +5,15 @@
 EAPI=6
 inherit flx-init-scripts
 
-EGIT_REPO_URI="http://master.formilux.org/git/people/beber/pkg/openvpn.git"
 EGIT_BRANCH="2.0-flx0"
-#EGIT_COMMIT="v${PV}-flx0.1"
+EGIT_COMMIT="v${PV}-flx0.1"
 
 KEYWORDS="amd64 x86"
 RDEPEND=">=net-misc/openvpn-${PV}"
+
+src_prepare() {
+	default
+
+	epatch "${FILESDIR}/${PV}-CLEAN-Delete-leading-whitespaces.patch"
+	epatch "${FILESDIR}/${PV}-BASH4-Bash-4-array-prefixing-is-var-not-var.patch"
+}