network/open-iscsi: Updated for version 2.1.10.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 36 insertions, 82 deletions

diff --git a/network/open-iscsi/doinst.sh b/network/open-iscsi/doinst.sh
index a4797f0184..d4177d0258 100644
--- a/network/open-iscsi/doinst.sh
+++ b/network/open-iscsi/doinst.sh
@@ -1,6 +1,3 @@
-# 20230620 bkw: reverted this to the config() function from SBo
-# template. Please leave this as-is. It works, and it won't confuse
-# us (we have over 8000 scripts to look after...)
 
 config() {
   NEW="$1"
@@ -15,5 +12,8 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/iscsi/iscsid.conf.new
 config etc/iscsi/initiatorname.iscsi.new
+config etc/iscsi/iscsid.conf.new
+config etc/udev/rules.d/50-iscsi-firmware-login.rules.new
+config etc/logrotate.d/iscsiuiolog.new
+config etc/rc.d/rc.open-iscsi.new
diff --git a/network/open-iscsi/include_sysmacros.patch b/network/open-iscsi/include_sysmacros.patch
deleted file mode 100644
index 6e357faef3..0000000000
--- a/network/open-iscsi/include_sysmacros.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 --git a/network/open-iscsi/open-iscsi.SlackBuild b/network/open-iscsi/open-iscsi.SlackBuild
index fe0c9a4274..e4ffa84949 100644
--- a/network/open-iscsi/open-iscsi.SlackBuild
+++ b/network/open-iscsi/open-iscsi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for open-iscsi
 
-# Copyright 2019 Wayne Cuddy USA
+# Copyright 2024 Wayne Cuddy USA
 # Copyright 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
@@ -23,19 +23,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20230620 bkw: Modified by SlackBuilds.org, BUILD=2:
-# - Fix doinst.sh (conf files were missing .new suffix).
-# - Do not install /usr/include headers with +x permission.
-
-#
-# 2019/09/08 - add patch to support building on Slackware "current"
-#
-
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=open-iscsi
-VERSION=${VERSION:-2.1.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.1.10}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -65,6 +57,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -79,11 +74,6 @@ 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
-
-patch -p1 <$CWD/remove_werror.patch
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -91,16 +81,24 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-make OPTFLAGS="-DNO_SYSTEMD" NO_SYSTEMD=1
-make install DESTDIR=$PKG
-
-chmod -x $PKG/usr/include/*.h
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true \
+    -Dno_systemd=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
-mv $PKG/usr/share/man $PKG/usr
-rmdir $PKG/usr/share
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
@@ -117,8 +115,10 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # These may be renamed back by doinst.sh.
 for cf in \
+    etc/iscsi/initiatorname.iscsi \
     etc/iscsi/iscsid.conf \
-    etc/iscsi/initiatorname.iscsi
+    etc/udev/rules.d/50-iscsi-firmware-login.rules \
+    etc/logrotate.d/iscsiuiolog
 do
     mv $PKG/$cf $PKG/$cf.new
 done
@@ -128,7 +128,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM
+cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/open-iscsi/open-iscsi.info b/network/open-iscsi/open-iscsi.info
index ea87d3944b..b6dd41245a 100644
--- a/network/open-iscsi/open-iscsi.info
+++ b/network/open-iscsi/open-iscsi.info
@@ -1,8 +1,8 @@
 PRGNAM="open-iscsi"
-VERSION="2.1.5"
+VERSION="2.1.10"
 HOMEPAGE="https://github.com/open-iscsi/open-iscsi"
-DOWNLOAD="https://github.com/open-iscsi/open-iscsi/archive/2.1.5/open-iscsi-2.1.5.tar.gz"
-MD5SUM="fcde2e39f3bec7b668751035987fdc35"
+DOWNLOAD="https://github.com/open-iscsi/open-iscsi/archive/2.1.10/open-iscsi-2.1.10.tar.gz"
+MD5SUM="f06396d90cd7b3c6a38ffcfec1eaaf73"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="open-isns"
diff --git a/network/open-iscsi/rc.open-iscsi b/network/open-iscsi/rc.open-iscsi
index 5b18f60d2d..f984107a69 100644
--- a/network/open-iscsi/rc.open-iscsi
+++ b/network/open-iscsi/rc.open-iscsi
@@ -3,8 +3,8 @@
 # Slackware rc.open-iscsi script, derived from init.debian in the
 # open-iscsi source package.
 
-DAEMON=/sbin/iscsid
-ADM=/sbin/iscsiadm
+DAEMON=/usr/sbin/iscsid
+ADM=/usr/sbin/iscsiadm
 PIDFILE=/var/run/iscsid.pid
 
 [ -e /etc/default/open-iscsi ] && . /etc/default/open-iscsi 
diff --git a/network/open-iscsi/remove_werror.patch b/network/open-iscsi/remove_werror.patch
deleted file mode 100644
index 03164c9a59..0000000000
--- a/network/open-iscsi/remove_werror.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- open-iscsi-2.1.1/libopeniscsiusr/Makefile.orig	2020-02-26 20:07:13.000000000 +0100
-+++ open-iscsi-2.1.1/libopeniscsiusr/Makefile	2020-07-14 18:13:07.144477155 +0200
-@@ -44,7 +44,7 @@
- OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o
- 
- CFLAGS ?= -O2 -g
--CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC
-+CFLAGS += -Wall -Wextra -fvisibility=hidden -fPIC
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
- 
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
-
---- open-iscsi-2.1.1/usr/Makefile	2020-02-26 20:07:13.000000000 +0100
-+++ open-iscsi-2.1.1/usr/Makefile	2020-07-14 17:56:48.298477155 +0200
-@@ -35,7 +35,7 @@
- PKG_CONFIG = /usr/bin/pkg-config
- 
- CFLAGS ?= -O2 -g
--WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
-+WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common
- CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
- 	  -I$(TOPDIR)/libopeniscsiusr
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
-