From 875d6b82995f16eb5de38a25432321a0f400f7d0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 12 Feb 2024 06:11:29 +0100 Subject: open-iscsi: update to 2.1.9 --- package/open-iscsi/Makefile | 30 +++++++++++-------- package/open-iscsi/patches/patch-usr_Makefile | 19 ------------ package/open-iscsi/patches/patch-usr_idbm_c | 10 ------- package/open-iscsi/patches/patch-usr_iscsi_sysfs_c | 10 ------- package/open-iscsi/patches/patch-usr_log_h | 17 ----------- package/open-iscsi/patches/patch-usr_mgmt_ipc_c | 35 ---------------------- 6 files changed, 17 insertions(+), 104 deletions(-) delete mode 100644 package/open-iscsi/patches/patch-usr_Makefile delete mode 100644 package/open-iscsi/patches/patch-usr_idbm_c delete mode 100644 package/open-iscsi/patches/patch-usr_iscsi_sysfs_c delete mode 100644 package/open-iscsi/patches/patch-usr_log_h delete mode 100644 package/open-iscsi/patches/patch-usr_mgmt_ipc_c (limited to 'package/open-iscsi') diff --git a/package/open-iscsi/Makefile b/package/open-iscsi/Makefile index 5afb377bc..f33b52f1f 100644 --- a/package/open-iscsi/Makefile +++ b/package/open-iscsi/Makefile @@ -4,30 +4,34 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= open-iscsi -PKG_VERSION:= 2.0 -PKG_EXTRAVER:= 871 +PKG_VERSION:= 2.1.9 PKG_RELEASE:= 1 -PKG_HASH:= bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb +PKG_HASH:= 60e2a1e3058a8af7f702e86a5a0511b05b8754d29d3d2df4e0e301399b5cf70a PKG_DESCR:= iscsi utilities +PKG_DEPENDS:= libkmod libressl +PKG_BUILDDEP:= cmake-host kmod libressl PKG_SECTION:= sys/fs -PKG_URL:= http://www.open-iscsi.org/ -PKG_SITES:= http://www.open-iscsi.org/bits/ +PKG_SITES:= https://github.com/open-iscsi/open-iscsi/archive/refs/tags/ -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-$(PKG_EXTRAVER).tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER} +DISTFILES:= $(PKG_VERSION).tar.gz +#WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER} include $(ADK_TOPDIR)/mk/package.mk -ALL_TARGET:= user -INSTALL_TARGET:= install_user - $(eval $(call PKG_template,OPEN_ISCSI,open-iscsi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dno_systemd=true \ + -Disns=disabled open-iscsi-install: - $(INSTALL_DIR) $(IDIR_OPEN_ISCSI)/sbin $(IDIR_OPEN_ISCSI)/etc/iscsi - $(INSTALL_BIN) $(WRKINST)/sbin/* $(IDIR_OPEN_ISCSI)/sbin + $(INSTALL_DIR) $(IDIR_OPEN_ISCSI)/usr/sbin $(IDIR_OPEN_ISCSI)/etc/iscsi + $(INSTALL_BIN) $(WRKINST)/usr/sbin/* $(IDIR_OPEN_ISCSI)/usr/sbin $(CP) $(WRKINST)/etc/iscsi/* $(IDIR_OPEN_ISCSI)/etc/iscsi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/open-iscsi/patches/patch-usr_Makefile b/package/open-iscsi/patches/patch-usr_Makefile deleted file mode 100644 index af7106fd8..000000000 --- a/package/open-iscsi/patches/patch-usr_Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- open-iscsi-2.0-871.orig/usr/Makefile 2009-07-11 05:55:58.000000000 +0200 -+++ open-iscsi-2.0-871/usr/Makefile 2010-11-22 23:23:09.000000000 +0100 -@@ -1,6 +1,6 @@ - # This Makefile will work only with GNU make. - --OSNAME=$(shell uname -s) -+OSNAME=Linux - - # allow users to override these - # eg to compile for a kernel that you aren't currently running -@@ -55,7 +55,7 @@ iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) - - iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) -static $^ -o $@ -+ $(CC) $(CFLAGS) $^ -o $@ - clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) - diff --git a/package/open-iscsi/patches/patch-usr_idbm_c b/package/open-iscsi/patches/patch-usr_idbm_c deleted file mode 100644 index 38838c9a1..000000000 --- a/package/open-iscsi/patches/patch-usr_idbm_c +++ /dev/null @@ -1,10 +0,0 @@ ---- open-iscsi-2.0-871.orig/usr/idbm.c 2009-07-11 05:55:58.000000000 +0200 -+++ open-iscsi-2.0-871/usr/idbm.c 2014-01-03 12:44:20.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #include "idbm.h" - #include "idbm_fields.h" diff --git a/package/open-iscsi/patches/patch-usr_iscsi_sysfs_c b/package/open-iscsi/patches/patch-usr_iscsi_sysfs_c deleted file mode 100644 index 42f5d0330..000000000 --- a/package/open-iscsi/patches/patch-usr_iscsi_sysfs_c +++ /dev/null @@ -1,10 +0,0 @@ ---- open-iscsi-2.0-871.orig/usr/iscsi_sysfs.c 2009-07-11 05:55:58.000000000 +0200 -+++ open-iscsi-2.0-871/usr/iscsi_sysfs.c 2010-11-22 23:16:35.000000000 +0100 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include "log.h" - #include "initiator.h" diff --git a/package/open-iscsi/patches/patch-usr_log_h b/package/open-iscsi/patches/patch-usr_log_h deleted file mode 100644 index f4a5f9431..000000000 --- a/package/open-iscsi/patches/patch-usr_log_h +++ /dev/null @@ -1,17 +0,0 @@ ---- open-iscsi-2.0-871.orig/usr/log.h 2009-07-11 05:55:58.000000000 +0200 -+++ open-iscsi-2.0-871/usr/log.h 2010-11-22 22:45:22.000000000 +0100 -@@ -28,14 +28,12 @@ - - #include "iscsid.h" - --#if defined(Linux) - union semun { - int val; - struct semid_ds *buf; - unsigned short int *array; - struct seminfo *__buf; - }; --#endif - #include - - #define DEFAULT_AREA_SIZE 16384 diff --git a/package/open-iscsi/patches/patch-usr_mgmt_ipc_c b/package/open-iscsi/patches/patch-usr_mgmt_ipc_c deleted file mode 100644 index d1d936e0f..000000000 --- a/package/open-iscsi/patches/patch-usr_mgmt_ipc_c +++ /dev/null @@ -1,35 +0,0 @@ ---- open-iscsi-2.0-871.orig/usr/mgmt_ipc.c 2009-07-11 05:55:58.000000000 +0200 -+++ open-iscsi-2.0-871/usr/mgmt_ipc.c 2014-01-03 12:35:32.000000000 +0100 -@@ -341,31 +341,7 @@ mgmt_ipc_notify_del_portal(queue_task_t - static int - mgmt_peeruser(int sock, char *user) - { --#if defined(SO_PEERCRED) -- /* Linux style: use getsockopt(SO_PEERCRED) */ -- struct ucred peercred; -- socklen_t so_len = sizeof(peercred); -- struct passwd *pass; -- -- errno = 0; -- if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &peercred, -- &so_len) != 0 || so_len != sizeof(peercred)) { -- /* We didn't get a valid credentials struct. */ -- log_error("peeruser_unux: error receiving credentials: %m"); -- return 0; -- } -- -- pass = getpwuid(peercred.uid); -- if (pass == NULL) { -- log_error("peeruser_unix: unknown local user with uid %d", -- (int) peercred.uid); -- return 0; -- } -- -- strlcpy(user, pass->pw_name, PEERUSER_MAX); -- return 1; -- --#elif defined(SCM_CREDS) -+#if defined(SCM_CREDS) - struct msghdr msg; - typedef struct cmsgcred Cred; - #define cruid cmcred_uid -- cgit v1.2.3