From 56614dc0da2231faa907f3cbecb81641a007dab4 Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Wed, 7 Sep 2016 00:06:11 +0100
Subject: flx/init-havp: Refresh patch

Package-Manager: portage-2.2.28
---
 flx/init-havp/Manifest                             |  4 ++--
 ...se-deprecated-tail-call-POSIX-1003.2-1992.patch | 22 ++++++++++++++++++++++
 flx/init-havp/files/init-havp-BJA-tail.diff        | 13 -------------
 flx/init-havp/init-havp-0.85.ebuild                |  2 +-
 4 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 flx/init-havp/files/0.85-Don-t-use-deprecated-tail-call-POSIX-1003.2-1992.patch
 delete mode 100644 flx/init-havp/files/init-havp-BJA-tail.diff

(limited to 'flx')

diff --git a/flx/init-havp/Manifest b/flx/init-havp/Manifest
index cc4d68ae..f38fd3ee 100644
--- a/flx/init-havp/Manifest
+++ b/flx/init-havp/Manifest
@@ -1,3 +1,3 @@
-AUX init-havp-BJA-tail.diff 456 SHA256 7588b12094ad1c63c62dba1e987d5402ea128ca2cb36227d2296c26384d259c4 WHIRLPOOL 6527dbdb183f5bb1b8fd958e1c5ed21835b9032ae9e2e5d596d78781c3acb046e3ccb3e51d2e135c4659405b9f7f24e9aa46293e3fafa1705370ecc8782e15f5
-EBUILD init-havp-0.85.ebuild 322 SHA256 a7deeb45f2ed2568888360eecacb73e49814aac32e29d87f2d437cb74505a5d8 WHIRLPOOL ca37fc8a06e7455323a04139eff38e16f25cac2cac95751ca1236f60a7fd28f766f34a85a298bc703ff394432d4f97d2384866dc29396efbb4d742e5d682d723
+AUX 0.85-Don-t-use-deprecated-tail-call-POSIX-1003.2-1992.patch 765 SHA256 b7acf9255fa2f30618c0882c0d6b7c942c0834b6523c401d5af3dc4243fe4a80 WHIRLPOOL 6b9f66579b0c84e74fa97b46647bd18b7350e1dee37c4079f18f44512db7915fad5d37053816f7283f8beda4c66b18f1ba6236b57a1a193eae6650d59eec392f
+EBUILD init-havp-0.85.ebuild 363 SHA256 61edd20c5649a32cae2ba7963c3a959f86bf4eaeeeacd22dd113f27386b72210 WHIRLPOOL 14a5143014b82ac1f4cf91834ce45fb83ca8b6d18f8f8d41925f6e52f77db5875a5dac773e5cada9801cbfb28898f07acd139a671ab97dfee56e2306f05f16a7
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-havp/files/0.85-Don-t-use-deprecated-tail-call-POSIX-1003.2-1992.patch b/flx/init-havp/files/0.85-Don-t-use-deprecated-tail-call-POSIX-1003.2-1992.patch
new file mode 100644
index 00000000..aee690f6
--- /dev/null
+++ b/flx/init-havp/files/0.85-Don-t-use-deprecated-tail-call-POSIX-1003.2-1992.patch
@@ -0,0 +1,22 @@
+From b7d1535c8d760ed366eaf120e796f3929f88f1f3 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Thu, 6 Oct 2011 22:11:44 +0200
+Subject: [PATCH] Don't use deprecated tail call (POSIX 1003.2-1992)
+
+---
+ add-ons/initscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/add-ons/initscript b/add-ons/initscript
+index 6b440c3..be97a11 100644
+--- a/add-ons/initscript
++++ b/add-ons/initscript
+@@ -15,7 +15,7 @@ function fct_pre_start {
+         && chown havp:havp $dir
+     done
+ 
+-    set -- $(df /var/tmp/havp | tail -1) 
++    set -- $(df /var/tmp/havp | tail -n 1)
+     shift $[$#-1]
+     if ! grep -sq " $1 "'[^ ]* \(mand\|[ ]*,mand\)[, ]' /proc/mounts ; then
+       echo "remounting $1 with mandatory lock option" >&2
diff --git a/flx/init-havp/files/init-havp-BJA-tail.diff b/flx/init-havp/files/init-havp-BJA-tail.diff
deleted file mode 100644
index 9862c295..00000000
--- a/flx/init-havp/files/init-havp-BJA-tail.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git add-ons/initscript add-ons/initscript
-index 6b440c3..be97a11 100644
---- add-ons/initscript
-+++ add-ons/initscript
-@@ -15,7 +15,7 @@ function fct_pre_start {
-         && chown havp:havp $dir
-     done
- 
--    set -- $(df /var/tmp/havp | tail -1) 
-+    set -- $(df /var/tmp/havp | tail -n 1) 
-     shift $[$#-1]
-     if ! grep -sq " $1 "'[^ ]* \(mand\|[ ]*,mand\)[, ]' /proc/mounts ; then
-       echo "remounting $1 with mandatory lock option" >&2
diff --git a/flx/init-havp/init-havp-0.85.ebuild b/flx/init-havp/init-havp-0.85.ebuild
index 114bce4c..29f7f768 100644
--- a/flx/init-havp/init-havp-0.85.ebuild
+++ b/flx/init-havp/init-havp-0.85.ebuild
@@ -14,5 +14,5 @@ RDEPEND=">=net-proxy/havp-${PV}"
 src_prepare() {
 	default
 
-	epatch "${FILESDIR}/${PN}-BJA-tail.diff"
+	epatch "${FILESDIR}/${PV}-Don-t-use-deprecated-tail-call-POSIX-1003.2-1992.patch"
 }
-- 
cgit v1.2.3