From 98660f636d16924506ceb084e2ffc31a06577ae1 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 2 Dec 2017 15:46:02 +0100
Subject: testing/pipexec: replace patch

I forgot to commit the patch before.
---
 testing/pipexec/APKBUILD                |  4 +-
 testing/pipexec/dont-require-bash.patch | 68 +++++++++++++++++++++++++++------
 2 files changed, 58 insertions(+), 14 deletions(-)

(limited to 'testing/pipexec')

diff --git a/testing/pipexec/APKBUILD b/testing/pipexec/APKBUILD
index 2da7b8293e..85c38c773b 100644
--- a/testing/pipexec/APKBUILD
+++ b/testing/pipexec/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=pipexec
 pkgver=2.5.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Handling pipe of commands like a single command"
 url="https://github.com/flonatel/pipexec"
 arch="all"
@@ -44,4 +44,4 @@ package() {
 }
 
 sha512sums="5f33f42ffec1e16090491895fb7403de6c0fcdf99e0fef7a49db19684b261a355ab0e0364891d1dfdaf47ff32671f2725d5e236df29e3f3feb5484cd8ffca0ca  pipexec-2.5.5.tar.xz
-b0959c98aea9f3b6580101cfaf65480c3460eebadf377cbdf70f33ff431b731e5e3128efe848dd9678bcfcfd8f8f01dedee520614cd754a617c09b1a2e82c705  dont-require-bash.patch"
+9838e8c45f6ded0e3207be4f225e751cec892ff110e8d18daaae514ea88b0f7a96381b31d425c1178c78f87ee86da4ddf18483fccd5308b9d7daa85c287df3ea  dont-require-bash.patch"
diff --git a/testing/pipexec/dont-require-bash.patch b/testing/pipexec/dont-require-bash.patch
index 035d49cb95..ce8eb8f773 100644
--- a/testing/pipexec/dont-require-bash.patch
+++ b/testing/pipexec/dont-require-bash.patch
@@ -1,16 +1,49 @@
-diff --git a/Makefile.in b/Makefile.in
-index 1a10a34..faa57ee 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1354,7 +1354,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
- 
- @USE_VERSION_FILE_FALSE@.FORCE: src/app_version.c
- @USE_VERSION_FILE_FALSE@src/app_version.c:
--@USE_VERSION_FILE_FALSE@	 bash $(top_srcdir)/build/version-gen.sh ${top_srcdir}
-+@USE_VERSION_FILE_FALSE@	 sh $(top_srcdir)/build/version-gen.sh ${top_srcdir}
+From 5aa236515f385befc3062b61d098082ab43e6f5a Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Fri, 1 Dec 2017 01:50:44 +0100
+Subject: [PATCH] Replace /bin/bash with /bin/sh
+
+1. Not every system provides bash by default.
+2. Many systems don't install bash into /bin (but /usr/bin,
+   /usr/local/bin, ...)
+3. Your shell scripts are already POSIX-sh compatible, so it's not
+   needed to require one particular shell implementation.
+
+Upstream-Issue: https://github.com/flonatel/pipexec/pull/14
+
+diff --git a/build/create_tar.sh b/build/create_tar.sh
+index 7bf286f..4223014 100644
+--- a/build/create_tar.sh
++++ b/build/create_tar.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Create release tarball
+ #
+diff --git a/build/init_autotools.sh b/build/init_autotools.sh
+index 1ad160d..3a42399 100755
+--- a/build/init_autotools.sh
++++ b/build/init_autotools.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # This must be called from within the top source dir.
+ #
+diff --git a/src/Makefile.inc b/src/Makefile.inc
+index 7792bd7..bc3614d 100644
+--- a/src/Makefile.inc
++++ b/src/Makefile.inc
+@@ -2,7 +2,7 @@
+ if !USE_VERSION_FILE
+ .FORCE: src/app_version.c
+ src/app_version.c:
+-	 bash $(top_srcdir)/build/version-gen.sh ${top_srcdir}
++	 /bin/sh $(top_srcdir)/build/version-gen.sh ${top_srcdir}
+ endif
  
- # Local Variables:
- # mode: makefile
+ # pipexec itself
 diff --git a/version.sh b/version.sh
 index 9f5ae2a..1150c91 100755
 --- a/version.sh
@@ -21,3 +54,14 @@ index 9f5ae2a..1150c91 100755
  set -e
  
  TOPSRCDIR=""
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1354,7 +1354,7 @@
+ 
+ @USE_VERSION_FILE_FALSE@.FORCE: src/app_version.c
+ @USE_VERSION_FILE_FALSE@src/app_version.c:
+-@USE_VERSION_FILE_FALSE@	 bash $(top_srcdir)/build/version-gen.sh ${top_srcdir}
++@USE_VERSION_FILE_FALSE@	 /bin/sh $(top_srcdir)/build/version-gen.sh ${top_srcdir}
+ 
+ # Local Variables:
+ # mode: makefile
-- 
cgit v1.2.3