aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2023-06-25 18:57:54 +0000
committerpsykose <alice@ayaya.dev>2023-06-25 20:57:54 +0200
commit0d2cba0f23bee11fb79bed62974fb53530b279fb (patch)
treef73559324483ad55a83e2d08942396eb62dfd423
parent16f9574e566184d61dbc4083ce8ac4b01347a305 (diff)
main/open-iscsi: set scripts as sh
they won't run without bash otherwise, but they are already written in regular sh
-rw-r--r--main/open-iscsi/APKBUILD4
-rw-r--r--main/open-iscsi/bash.patch79
2 files changed, 82 insertions, 1 deletions
diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD
index 21a9afca03c..4e3f9ad1990 100644
--- a/main/open-iscsi/APKBUILD
+++ b/main/open-iscsi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=open-iscsi
pkgver=2.1.9
-pkgrel=0
+pkgrel=1
pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
url="https://www.open-iscsi.com"
arch="all"
@@ -14,6 +14,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-iscsi/archiv
iscsid.initd
iscsid.confd
iscsid.conf
+ bash.patch
musl-fixes.patch
add-missing-headers.patch
dont-use-lib64.patch
@@ -47,6 +48,7 @@ sha512sums="
52e273d20d3c95c943409d3b6251f0447e19a822d32ff33d3c8dc1e9b8c6065ab72b823fe9cb72f5d92256d3a219417a3847dc59815d29f727fc59c4e49716a8 iscsid.initd
3ba1825ee8b39ce2c58d70b59d6c2d6a954a8c65ce9adf920fb44d046cfe0f7f54bcc70f3f3c24754f0e866abdc92b4a1716fb516c45278b217532b97a6d948a iscsid.confd
4cc7c1923047616d908806aab96d468cb7b99ff9f8a9e02a039866b66db4ae856bd9f414854712d8a57c21614674f4468736bce26a4199c2ff054a165bca26e0 iscsid.conf
+89e44837a1d7fcd3b7de88ae7f25a3c2d3ff24cf01bbe752882e56d25e9ee41ef57dac9d21257057b9a4fcd6fe18650b7f4926f934d348fdb6080e6b42e43ac1 bash.patch
1b89ffd6de0dc7bb63fc2702a97e49df4369158c66ee609acfc041b1677c07fbd964b7a709f1f324fa51a9842d4d3e11611d9783e18d526372d468163c0ac8db musl-fixes.patch
104b559eb368459a7151657fbca63927b6b1032bda272e903a1633c8b9d3ed199f2c5cca0e6741bcd5fa6e860d1ff2d111caf58d60d9f0a736ad767e8ae0427b add-missing-headers.patch
86a9c4be4abd34821f156f9df586c530dc2b0efc96e961cb15fd22846856cc1e76aae85806e8d0eb9f3d3e3acd7f73fe8d2a1de8944903b503e256e6a99bb2dd dont-use-lib64.patch
diff --git a/main/open-iscsi/bash.patch b/main/open-iscsi/bash.patch
new file mode 100644
index 00000000000..d4fd7d52072
--- /dev/null
+++ b/main/open-iscsi/bash.patch
@@ -0,0 +1,79 @@
+diff --git a/etc/systemd/ibft-rule-generator b/etc/systemd/ibft-rule-generator
+index a464fd6..f0fcd32 100644
+--- a/etc/systemd/ibft-rule-generator
++++ b/etc/systemd/ibft-rule-generator
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Systemd rule generator for ibft interfaces
+ #
+diff --git a/iscsiuio/src/unix/build_date.sh b/iscsiuio/src/unix/build_date.sh
+index 65888fe..be999c8 100755
+--- a/iscsiuio/src/unix/build_date.sh
++++ b/iscsiuio/src/unix/build_date.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # build the build_date.c and build_date.h files
+ #
+diff --git a/libopeniscsiusr/docs/list-man-pages.sh b/libopeniscsiusr/docs/list-man-pages.sh
+index dda8277..044eb71 100755
+--- a/libopeniscsiusr/docs/list-man-pages.sh
++++ b/libopeniscsiusr/docs/list-man-pages.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # list man pages found given one or more ??? passed in
+ #
+diff --git a/utils/iscsi-gen-initiatorname.sh.template b/utils/iscsi-gen-initiatorname.sh.template
+index 5c2bfdf..86148f0 100644
+--- a/utils/iscsi-gen-initiatorname.sh.template
++++ b/utils/iscsi-gen-initiatorname.sh.template
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # iscsi-gen-initiatorname
+ #
+diff --git a/utils/iscsi_discovery.sh b/utils/iscsi_discovery.sh
+index be2f390..fbe066b 100755
+--- a/utils/iscsi_discovery.sh
++++ b/utils/iscsi_discovery.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright (C) Voltaire Ltd. 2006. ALL RIGHTS RESERVED.
+ #
+diff --git a/utils/iscsi_fw_login.sh.template b/utils/iscsi_fw_login.sh.template
+index aae9e4c..6758da2 100644
+--- a/utils/iscsi_fw_login.sh.template
++++ b/utils/iscsi_fw_login.sh.template
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # iscsi_fw_login -- login to iscsi firmware targets, if any
+ #
+diff --git a/utils/iscsi_offload.sh b/utils/iscsi_offload.sh
+index 1869fe1..5de465a 100755
+--- a/utils/iscsi_offload.sh
++++ b/utils/iscsi_offload.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # iscsi_offload
+ #
+@@ -239,7 +239,7 @@ if iscsiadm -m iface -I $ioe_iface > /dev/null 2>&1 ; then
+ ioe_mac=$(iscsiadm -m iface -I $ioe_iface 2> /dev/null| sed -n "s/iface\.hwaddress = \(.*\)/\1/p")
+ ioe_mod=$(iscsiadm -m iface -I $ioe_iface 2> /dev/null| sed -n "s/iface\.transport_name = \(.*\)/\1/p")
+ ipaddr=$(iscsiadm -m iface -I $ioe_iface 2> /dev/null| sed -n "s/iface\.ipaddress = \(.*\)/\1/p")
+- if [ "$ipaddr" == "<empty>" ] ; then
++ if [ "$ipaddr" = "<empty>" ] ; then
+ ipaddr=
+ fi
+ elif [ "$mod" = "be2iscsi" ] ; then