aboutsummaryrefslogtreecommitdiff
path: root/network/open-iscsi
diff options
context:
space:
mode:
authorWayne Cuddy <wcuddy@gmail.com>2019-09-13 23:21:22 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-09-13 23:21:22 +0700
commit964cd46baa4a5bec7cf3e54f911686112b6cc799 (patch)
treef572bdc5e4c9b294895befb709f6e82f637f3eec /network/open-iscsi
parentae6abf4f7eaa20d73a957e0f9ffa70c4b40cc071 (diff)
network/open-iscsi: Patched to build on current.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network/open-iscsi')
-rw-r--r--network/open-iscsi/include_sysmacros.patch33
-rw-r--r--network/open-iscsi/open-iscsi.SlackBuild10
2 files changed, 42 insertions, 1 deletions
diff --git a/network/open-iscsi/include_sysmacros.patch b/network/open-iscsi/include_sysmacros.patch
new file mode 100644
index 0000000000000..75a7231321158
--- /dev/null
+++ b/network/open-iscsi/include_sysmacros.patch
@@ -0,0 +1,33 @@
+diff -Naur open-iscsi-2.0.875.orig/iscsiuio/src/unix/libs/bnx2.c open-iscsi-2.0.875/iscsiuio/src/unix/libs/bnx2.c
+--- open-iscsi-2.0.875.orig/iscsiuio/src/unix/libs/bnx2.c 2017-09-01 20:05:23.000000000 +0200
++++ open-iscsi-2.0.875/iscsiuio/src/unix/libs/bnx2.c 2019-09-06 14:24:47.943039000 +0200
+@@ -47,6 +47,7 @@
+ #include <sys/user.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+
+ #include "config.h"
+
+diff -Naur open-iscsi-2.0.875.orig/iscsiuio/src/unix/libs/bnx2x.c open-iscsi-2.0.875/iscsiuio/src/unix/libs/bnx2x.c
+--- open-iscsi-2.0.875.orig/iscsiuio/src/unix/libs/bnx2x.c 2017-09-01 20:05:23.000000000 +0200
++++ open-iscsi-2.0.875/iscsiuio/src/unix/libs/bnx2x.c 2019-09-06 14:24:23.527039000 +0200
+@@ -51,6 +51,7 @@
+ #include <sys/user.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+
+ #include "config.h"
+
+diff -Naur open-iscsi-2.0.875.orig/iscsiuio/src/unix/libs/qedi.c open-iscsi-2.0.875/iscsiuio/src/unix/libs/qedi.c
+--- open-iscsi-2.0.875.orig/iscsiuio/src/unix/libs/qedi.c 2017-09-01 20:05:23.000000000 +0200
++++ open-iscsi-2.0.875/iscsiuio/src/unix/libs/qedi.c 2019-09-06 14:29:00.780039000 +0200
+@@ -58,6 +58,7 @@
+ #include <sys/user.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+
+ #include "config.h"
+
diff --git a/network/open-iscsi/open-iscsi.SlackBuild b/network/open-iscsi/open-iscsi.SlackBuild
index 00883e1321070..54dda75cd6ed8 100644
--- a/network/open-iscsi/open-iscsi.SlackBuild
+++ b/network/open-iscsi/open-iscsi.SlackBuild
@@ -22,9 +22,13 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# 2019/09/08 - add patch to support building on Slackware "current"
+#
+
PRGNAM=open-iscsi
VERSION=${VERSION:-2.0.875}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -62,6 +66,10 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
+
+# Allow this SB to work on "current", benign on 14.2.
+patch -p1 <$CWD/include_sysmacros.patch
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \