| 1 |
commit: eac77dc802a4a8311341930300e0583f1929c827 |
| 2 |
Author: Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Apr 7 15:10:16 2022 +0000 |
| 4 |
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> |
| 5 |
CommitDate: Thu Apr 7 15:10:16 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eac77dc8 |
| 7 |
|
| 8 |
sys-cluster/pcs : remove bashism |
| 9 |
|
| 10 |
Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com> |
| 11 |
|
| 12 |
sys-cluster/pcs/files/remove_bashism.patch | 41 ++++++++++++++++++++++++++++++ |
| 13 |
sys-cluster/pcs/pcs-0.11.2.ebuild | 3 ++- |
| 14 |
2 files changed, 43 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/sys-cluster/pcs/files/remove_bashism.patch b/sys-cluster/pcs/files/remove_bashism.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000..a54d612f0 |
| 19 |
--- /dev/null |
| 20 |
+++ b/sys-cluster/pcs/files/remove_bashism.patch |
| 21 |
@@ -0,0 +1,41 @@ |
| 22 |
+From 73e90ae7f31600ff9c0edf0aed3cace9cd8c8a35 Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Alessandro Barbieri <lssndrbarbieri@×××××.com> |
| 24 |
+Date: Thu, 7 Apr 2022 17:02:55 +0200 |
| 25 |
+Subject: [PATCH] remove bashisms |
| 26 |
+ |
| 27 |
+`==` is not POSIX |
| 28 |
+--- |
| 29 |
+ m4/ac_compare_versions.m4 | 6 +++--- |
| 30 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
| 31 |
+ |
| 32 |
+diff --git a/m4/ac_compare_versions.m4 b/m4/ac_compare_versions.m4 |
| 33 |
+index 77d03330a..74846704e 100644 |
| 34 |
+--- a/m4/ac_compare_versions.m4 |
| 35 |
++++ b/m4/ac_compare_versions.m4 |
| 36 |
+@@ -6,7 +6,7 @@ dnl op can be: |
| 37 |
+ dnl |
| 38 |
+ dnl lt or < |
| 39 |
+ dnl le or <= |
| 40 |
+-dnl eq or == |
| 41 |
++dnl eq or = |
| 42 |
+ dnl ge or >= |
| 43 |
+ dnl gt or > |
| 44 |
+ dnl |
| 45 |
+@@ -20,7 +20,7 @@ AC_DEFUN([AC_COMPARE_VERSIONS],[ |
| 46 |
+ verA="$1" |
| 47 |
+ op="$2" |
| 48 |
+ verB="$3" |
| 49 |
+- if test "x$verA" == "x" || test "x$verB" == "x" || test "x$op" == x; then |
| 50 |
++ if test "x$verA" = "x" || test "x$verB" = "x" || test "x$op" = x; then |
| 51 |
+ AC_MSG_ERROR([ac_compare_versions: Missing parameters]) |
| 52 |
+ fi |
| 53 |
+ case "$op" in |
| 54 |
+@@ -36,7 +36,7 @@ AC_DEFUN([AC_COMPARE_VERSIONS],[ |
| 55 |
+ result=true |
| 56 |
+ fi |
| 57 |
+ ;; |
| 58 |
+- "eq"|"==") |
| 59 |
++ "eq"|"=") |
| 60 |
+ if test "$verB" = "$verA"; then |
| 61 |
+ result=true |
| 62 |
+ fi |
| 63 |
|
| 64 |
diff --git a/sys-cluster/pcs/pcs-0.11.2.ebuild b/sys-cluster/pcs/pcs-0.11.2.ebuild |
| 65 |
index b9fc87951..40733de60 100644 |
| 66 |
--- a/sys-cluster/pcs/pcs-0.11.2.ebuild |
| 67 |
+++ b/sys-cluster/pcs/pcs-0.11.2.ebuild |
| 68 |
@@ -65,7 +65,8 @@ ruby_add_rdepend " |
| 69 |
www-servers/thin" |
| 70 |
|
| 71 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 72 |
-PATCHES="${FILESDIR}/pcs-0.11-gentoo-support.patch" |
| 73 |
+PATCHES="${FILESDIR}/pcs-0.11-gentoo-support.patch |
| 74 |
+ ${FILESDIR}/remove_bashism.patch" |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
default |
Archives