* [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/
@ 2016-03-21 6:41 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2016-03-21 6:41 UTC (permalink / raw
To: gentoo-commits
commit: 021889cdf5ed7bc4ea3dd881887ce752820c75d3
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 06:41:11 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 06:41:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=021889cd
sys-block/open-iscsi: Fixed udev rule (bug #563800).
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-block/open-iscsi/files/99-iscsi.rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-block/open-iscsi/files/99-iscsi.rules b/sys-block/open-iscsi/files/99-iscsi.rules
index 74c8e14..3816126 100644
--- a/sys-block/open-iscsi/files/99-iscsi.rules
+++ b/sys-block/open-iscsi/files/99-iscsi.rules
@@ -1 +1 @@
-KERNEL=="sd*", SUBSYSTEMS=="block", RUN{program}="/etc/udev/scripts/iscsidev.sh"
+KERNEL=="sd*", SUBSYSTEMS=="block", RUN{program}+="/etc/udev/scripts/iscsidev.sh"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/
@ 2019-01-21 11:38 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2019-01-21 11:38 UTC (permalink / raw
To: gentoo-commits
commit: c7b256b6031ef57750155576dc1281d621bff44a
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jan 7 15:13:10 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 11:37:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b256b6
sys-block/open-iscsi: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../open-iscsi/files/open-iscsi-2.0.872-conf.d | 18 ---
.../open-iscsi-2.0.872-dont-call-configure.patch | 11 --
.../files/open-iscsi-2.0.872-glibc212.patch | 10 --
.../open-iscsi/files/open-iscsi-2.0.872-init.d-r1 | 130 ---------------------
.../files/open-iscsi-2.0.872-isns-slp.patch | 16 ---
.../files/open-iscsi-2.0.872-ldflags.patch | 11 --
...open-iscsi-2.0.872-makefile-cleanup-pass2.patch | 55 ---------
.../open-iscsi-2.0.872-makefile-cleanup.patch | 20 ----
8 files changed, 271 deletions(-)
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d b/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d
deleted file mode 100644
index 02e584fbce5..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d
+++ /dev/null
@@ -1,18 +0,0 @@
-# /etc/conf.d/iscsid
-
-# config file to use
-CONFIG_FILE=/etc/iscsi/iscsid.conf
-
-# you need to specify an initiatorname in the file
-INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi
-
-# options to pass to iscsid
-OPTS="-i ${INITIATORNAME_FILE}"
-
-# Start automatic targets when iscsid is started
-AUTOSTARTTARGETS="yes"
-
-# if set to "strict", iscsid will stop, if connecting the
-# autostart targets failed
-# AUTOSTART="strict"
-
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch
deleted file mode 100644
index 185f1acd837..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- open-iscsi-2.0-872.orig/Makefile
-+++ open-iscsi-2.0-872/Makefile
-@@ -27,7 +27,7 @@ IFACEFILES = etc/iface.example
- all: user kernel
-
- user: ;
-- cd utils/open-isns; ./configure; $(MAKE)
-+ cd utils/open-isns; $(MAKE)
- $(MAKE) -C utils/sysdeps
- $(MAKE) -C utils/fwparam_ibft
- $(MAKE) -C usr
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch
deleted file mode 100644
index 61717032940..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- usr/iscsid.c 2010-10-10 23:06:37.000000000 +0200
-+++ usr/iscsid.c 2010-10-10 23:07:55.000000000 +0200
-@@ -31,6 +31,7 @@
- #include <sys/utsname.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/stat.h>
-
- #include "iscsid.h"
- #include "mgmt_ipc.h"
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 b/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1
deleted file mode 100644
index 597d0804feb..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-opts="${opts} starttargets stoptargets restarttargets"
-
-depend() {
- after modules
- use net
-}
-
-PIDFILE=${PIDFILE:-/var/run/${SVCNAME}.pid}
-BINARY="/usr/sbin/iscsid"
-
-checkconfig() {
- if [ ! -e /etc/conf.d/${SVCNAME} ]; then
- eerror "Config file /etc/conf.d/${SVCNAME} does not exist!"
- return 1
- fi
- if [ ! -e "${CONFIG_FILE}" ]; then
- eerror "Config file ${CONFIG_FILE} does not exist!"
- return 1
- fi
- if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; then
- ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name."
- IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi
- IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g')
- ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}"
- echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}"
- eend $?
- fi
-}
-
-do_modules() {
- msg="$1"
- shift
- modules="${1}"
- shift
- modopts="$@"
- for m in ${modules}
- do
- if modprobe --show --quiet "${m}"
- then
- ebegin "${msg} ${m}"
- modprobe ${modopts} ${m}
- ret=$?
- eend ${ret}
- if [ ${ret} -ne 0 ]; then
- return ${ret}
- fi
- else
- ebegin "${msg} ${m}: not found"
- return 1
- fi
- done
- return 0
-}
-
-start() {
- ebegin "Checking open-iSCSI configuration"
- checkconfig
- ret=$?
- if [ $ret -ne 0 ]; then
- eend 1
- return 1
- fi
- ebegin "Loading iSCSI modules"
- do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp'
- ret=$?
- if [ $ret -ne 0 ]; then
- eend 1
- return 1
- fi
-
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --quiet --exec ${BINARY} -- ${OPTS}
- ret=$?
- if [ $ret -ne 0 ]; then
- eend $?
- return $?
- fi
-
- # Start automatic targets when iscsid is started
- if [ "${AUTOSTARTTARGETS}" = "yes" ]; then
- starttargets
- ret=$?
- if [ "${AUTOSTART}" = "strict" ] && [ $ret -ne 0 ]; then
- stop
- return $ret
- fi
- fi
- return 0
-}
-
-stop() {
- stoptargets
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --quiet --exec ${BINARY} --pidfile ${PIDFILE}
- eend $?
-
- do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r'
- eend $?
-}
-
-starttargets() {
- ebegin "Setting up iSCSI targets"
- /usr/sbin/iscsiadm -m node --loginall=automatic
- ret=$?
- eend $ret
- return $ret
-}
-
-stoptargets() {
- ebegin "Disconnecting iSCSI targets"
- sync
- /usr/sbin/iscsiadm -m node --logoutall=all
- ret=$?
- eend $ret
- return $ret
-}
-
-restarttargets() {
- stoptargets
- starttargets
-}
-
-status() {
- ebegin "Showing current active iSCSI sessions"
- /usr/sbin/iscsiadm -m session
-}
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch
deleted file mode 100644
index db280a3dd86..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nuar open-iscsi-2.0-872.orig/usr/Makefile open-iscsi-2.0-872/usr/Makefile
---- open-iscsi-2.0-872.orig/usr/Makefile 2012-02-09 08:25:13.656604152 +0000
-+++ open-iscsi-2.0-872/usr/Makefile 2012-02-09 08:26:28.960171260 +0000
-@@ -53,10 +53,10 @@
-
- iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
- iscsid.o session_mgmt.o discoveryd.o
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto
-
- iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto
-
- iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- iscsistart.o statics.o
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch
deleted file mode 100644
index fc02cbcc1ec..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/Makefile 2011-05-31 01:30:27.302609540 +0200
-+++ utils/Makefile 2011-05-31 01:32:50.229602790 +0200
-@@ -6,7 +6,7 @@
- all: $(PROGRAMS)
-
- iscsi-iname: md5.o iscsi-iname.o
-- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
-
- clean:
- rm -f *.o $(PROGRAMS) .depend
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch
deleted file mode 100644
index fb563d10e1b..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup-pass2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -NuarwbB open-iscsi-2.0-872/usr/Makefile open-iscsi-2.0-872.orig/usr/Makefile
---- open-iscsi-2.0-872.orig/usr/Makefile 2012-02-09 08:58:04.402623915 +0000
-+++ open-iscsi-2.0-872/usr/Makefile 2012-02-09 08:56:51.159070006 +0000
-@@ -65,6 +65,6 @@
- rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
-
- depend:
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend
-- gcc $(CFLAGS) -M `ls *.c` > .depend
-
- -include .depend
-diff -NuarwbB open-iscsi-2.0-872/utils/fwparam_ibft/Makefile open-iscsi-2.0-872.orig/utils/fwparam_ibft/Makefile
---- open-iscsi-2.0-872.orig/utils/fwparam_ibft/Makefile 2012-02-09 08:57:58.579273051 +0000
-+++ open-iscsi-2.0-872/utils/fwparam_ibft/Makefile 2010-08-11 15:27:07.000000000 +0000
-@@ -38,6 +38,6 @@
- $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
-
- depend:
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend
-- gcc $(CFLAGS) -M `ls *.c` > .depend
-
- -include .depend
-diff -NuarwbB open-iscsi-2.0-872/utils/Makefile open-iscsi-2.0-872.orig/utils/Makefile
---- open-iscsi-2.0-872.orig/utils/Makefile 2012-02-09 08:57:37.825877235 +0000
-+++ open-iscsi-2.0-872/utils/Makefile 2012-02-09 08:56:51.145736633 +0000
-@@ -12,6 +12,6 @@
- rm -f *.o $(PROGRAMS) .depend
-
- depend:
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend
-- gcc $(CFLAGS) -M `ls *.c` > .depend
-
- -include .depend
-diff -NuarwbB open-iscsi-2.0-872/utils/open-isns/Makefile.in open-iscsi-2.0-872.orig/utils/open-isns/Makefile.in
---- open-iscsi-2.0-872.orig/utils/open-isns/Makefile.in 2012-02-09 08:57:47.812573971 +0000
-+++ open-iscsi-2.0-872/utils/open-isns/Makefile.in 2010-08-11 15:27:07.000000000 +0000
-@@ -77,6 +77,6 @@
- ar cr $@ $(LIBOBJS)
-
- depend:
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend
-- gcc $(CFLAGS) -M `ls *.c` > .depend
-
- -include .depend
-diff -NuarwbB open-iscsi-2.0-872/utils/sysdeps/Makefile open-iscsi-2.0-872.orig/utils/sysdeps/Makefile
---- open-iscsi-2.0-872.orig/utils/sysdeps/Makefile 2012-02-09 08:57:43.459227530 +0000
-+++ open-iscsi-2.0-872/utils/sysdeps/Makefile 2010-08-11 15:27:07.000000000 +0000
-@@ -10,6 +10,6 @@
- rm -f *.o .depend
-
- depend:
-+ $(CC) $(CFLAGS) -M `ls *.c` > .depend
-- gcc $(CFLAGS) -M `ls *.c` > .depend
-
- -include .depend
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch
deleted file mode 100644
index b3e93f459fc..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- usr/Makefile 2010-10-10 22:48:04.000000000 +0200
-+++ usr/Makefile.ori 2010-10-10 22:48:34.000000000 +0200
-@@ -53,14 +53,14 @@
-
- iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
- iscsid.o session_mgmt.o discoveryd.o
-- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-
- iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o
-- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-
- iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- iscsistart.o statics.o
-- $(CC) $(CFLAGS) -static $^ -o $@
-+ $(CC) $(CFLAGS) -static $(LDFLAGS) $^ -o $@
- clean:
- rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/
@ 2019-05-09 15:58 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2019-05-09 15:58 UTC (permalink / raw
To: gentoo-commits
commit: f038d193d45f4637e7ecbb54a1624ba44d72175a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 9 15:57:10 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 9 15:57:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f038d193
sys-block/open-iscsi: Re-added accidentally removed patch file
Closes: https://bugs.gentoo.org/685464
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../open-iscsi-2.0.875-include-sysmacros.patch | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch
new file mode 100644
index 00000000000..7c19a1e6ba2
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.875-include-sysmacros.patch
@@ -0,0 +1,21 @@
+From 6d68ef5871c94c6ebbbe6e6b1fe0bc2dce711052 Mon Sep 17 00:00:00 2001
+From: Lee Duncan <lduncan@suse.com>
+Date: Sat, 2 Dec 2017 14:19:26 -0800
+Subject: [PATCH] Include <sys/sysmacros.h> to properly define minor()
+
+---
+ iscsiuio/src/unix/libs/qedi.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c
+index c6ff6e77..b81fecdf 100644
+--- a/iscsiuio/src/unix/libs/qedi.c
++++ b/iscsiuio/src/unix/libs/qedi.c
+@@ -58,6 +58,7 @@
+ #include <sys/user.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+
+ #include "config.h"
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/
@ 2019-11-08 2:44 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2019-11-08 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 7d4d8077fec0e0c72332ceeb76f869e057ec979d
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Sep 28 07:43:31 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 02:43:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d4d8077
sys-block/open-iscsi: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13067
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/open-iscsi-2.0.876-musl-fixes.patch | 92 ----------------------
.../open-iscsi-2.0.876-space_in_node-mode.patch | 28 -------
.../open-iscsi-2.0.876_p20180814-musl-fixes.patch | 85 --------------------
3 files changed, 205 deletions(-)
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch
deleted file mode 100644
index 7bb0c5d6e77..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/usr/idbm.c
-+++ b/usr/idbm.c
-@@ -27,2 +27,3 @@
- #include <errno.h>
-+#include <fcntl.h>
- #include <dirent.h>
---- a/usr/iscsiadm.c
-+++ b/usr/iscsiadm.c
-@@ -3269,2 +3269,3 @@
- int do_discover = 0, sub_mode = -1;
-+ int argerror = 0;
- int portal_type = -1;
-@@ -3458,2 +3459,5 @@
- usage(0);
-+ case '?':
-+ log_error("unrecognized character '%c'", optopt);
-+ argerror = 1;
- }
-@@ -3473,4 +3477,3 @@
-
-- if (optopt) {
-- log_error("unrecognized character '%c'", optopt);
-+ if (argerror) {
- rc = ISCSI_ERR_INVAL;
---- a/utils/fwparam_ibft/fwparam_ppc.c
-+++ b/utils/fwparam_ibft/fwparam_ppc.c
-@@ -358,3 +358,3 @@
- */
-- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp);
-+ qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const void *))nic_cmp);
-
---- a/iscsiuio/src/unix/libs/bnx2x.c
-+++ b/iscsiuio/src/unix/libs/bnx2x.c
-@@ -44,3 +44,3 @@
- #include <linux/sockios.h>
--#include <linux/ethtool.h>
-+#include "ethtool-compat.h"
- #include <sys/mman.h>
---- /dev/null
-+++ b/iscsiuio/src/unix/libs/ethtool-compat.h
-@@ -0,0 +1,51 @@
-+/*
-+ * ethtool-compat.h: adopted from
-+ # ethtool.h: Defines for Linux ethtool.
-+ *
-+ * Copyright (C) 1998 David S. Miller (davem@redhat.com)
-+ * Copyright 2001 Jeff Garzik <jgarzik@pobox.com>
-+ * Portions Copyright 2001 Sun Microsystems (thockin@sun.com)
-+ * Portions Copyright 2002 Intel (eli.kupermann@intel.com,
-+ * christopher.leech@intel.com,
-+ * scott.feldman@intel.com)
-+ * Portions Copyright (C) Sun Microsystems 2008
-+ */
-+
-+#include <linux/types.h>
-+#include <netinet/if_ether.h>
-+
-+#define ETHTOOL_FWVERS_LEN 32
-+#define ETHTOOL_BUSINFO_LEN 32
-+#define ETHTOOL_EROMVERS_LEN 32
-+
-+struct ethtool_drvinfo {
-+ __u32 cmd;
-+ char driver[32];
-+ char version[32];
-+ char fw_version[ETHTOOL_FWVERS_LEN];
-+ char bus_info[ETHTOOL_BUSINFO_LEN];
-+ char erom_version[ETHTOOL_EROMVERS_LEN];
-+ char reserved2[12];
-+ __u32 n_priv_flags;
-+ __u32 n_stats;
-+ __u32 testinfo_len;
-+ __u32 eedump_len;
-+ __u32 regdump_len;
-+};
-+
-+struct ethtool_tcpip4_spec {
-+ __be32 ip4src;
-+ __be32 ip4dst;
-+ __be16 psrc;
-+ __be16 pdst;
-+ __u8 tos;
-+};
-+
-+struct ethtool_ah_espip4_spec {
-+ __be32 ip4src;
-+ __be32 ip4dst;
-+ __be32 spi;
-+ __u8 tos;
-+};
-+
-+#define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch
deleted file mode 100644
index 1b72eec7945..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From baa0cb45cfcf10a81283c191b0b236cd1a2f66ee Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan@suse.com>
-Date: Fri, 12 Oct 2018 09:57:20 -0700
-Subject: [PATCH] Restore space in node-mode level 0 output
-
-As part of the libopeniscsiusr update, the output
-of "iscsiadm -m node" dropped a space that needs to
-be between the portal and the target, for proper
-parsing.
-
-Fixes: 87ea50a1c3a97
----
- usr/iscsiadm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
-index e3ba03c8..25c6cdc0 100644
---- a/usr/iscsiadm.c
-+++ b/usr/iscsiadm.c
-@@ -683,7 +683,7 @@ static int login_portals(struct node_rec *pattern_rec)
-
- static void print_node_flat(struct iscsi_node *node)
- {
-- printf("%s,%" PRIu16 "%s\n",
-+ printf("%s,%" PRIu16 " %s\n",
- iscsi_node_portal_get(node),
- iscsi_node_tpgt_get(node),
- iscsi_node_target_name_get(node));
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch
deleted file mode 100644
index 68b1bca7c7c..00000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- a/usr/idbm.c
-+++ b/usr/idbm.c
-@@ -27,2 +27,3 @@
- #include <errno.h>
-+#include <fcntl.h>
- #include <dirent.h>
---- a/usr/iscsiadm.c
-+++ b/usr/iscsiadm.c
-@@ -3269,2 +3269,3 @@
- int do_discover = 0, sub_mode = -1;
-+ int argerror = 0;
- int portal_type = -1;
-@@ -3458,2 +3459,5 @@
- usage(0);
-+ case '?':
-+ log_error("unrecognized character '%c'", optopt);
-+ argerror = 1;
- }
-@@ -3473,4 +3477,3 @@
-
-- if (optopt) {
-- log_error("unrecognized character '%c'", optopt);
-+ if (argerror) {
- rc = ISCSI_ERR_INVAL;
---- a/iscsiuio/src/unix/libs/bnx2x.c
-+++ b/iscsiuio/src/unix/libs/bnx2x.c
-@@ -44,3 +44,3 @@
- #include <linux/sockios.h>
--#include <linux/ethtool.h>
-+#include "ethtool-compat.h"
- #include <sys/mman.h>
---- /dev/null
-+++ b/iscsiuio/src/unix/libs/ethtool-compat.h
-@@ -0,0 +1,51 @@
-+/*
-+ * ethtool-compat.h: adopted from
-+ # ethtool.h: Defines for Linux ethtool.
-+ *
-+ * Copyright (C) 1998 David S. Miller (davem@redhat.com)
-+ * Copyright 2001 Jeff Garzik <jgarzik@pobox.com>
-+ * Portions Copyright 2001 Sun Microsystems (thockin@sun.com)
-+ * Portions Copyright 2002 Intel (eli.kupermann@intel.com,
-+ * christopher.leech@intel.com,
-+ * scott.feldman@intel.com)
-+ * Portions Copyright (C) Sun Microsystems 2008
-+ */
-+
-+#include <linux/types.h>
-+#include <netinet/if_ether.h>
-+
-+#define ETHTOOL_FWVERS_LEN 32
-+#define ETHTOOL_BUSINFO_LEN 32
-+#define ETHTOOL_EROMVERS_LEN 32
-+
-+struct ethtool_drvinfo {
-+ __u32 cmd;
-+ char driver[32];
-+ char version[32];
-+ char fw_version[ETHTOOL_FWVERS_LEN];
-+ char bus_info[ETHTOOL_BUSINFO_LEN];
-+ char erom_version[ETHTOOL_EROMVERS_LEN];
-+ char reserved2[12];
-+ __u32 n_priv_flags;
-+ __u32 n_stats;
-+ __u32 testinfo_len;
-+ __u32 eedump_len;
-+ __u32 regdump_len;
-+};
-+
-+struct ethtool_tcpip4_spec {
-+ __be32 ip4src;
-+ __be32 ip4dst;
-+ __be16 psrc;
-+ __be16 pdst;
-+ __u8 tos;
-+};
-+
-+struct ethtool_ah_espip4_spec {
-+ __be32 ip4src;
-+ __be32 ip4dst;
-+ __be32 spi;
-+ __u8 tos;
-+};
-+
-+#define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/
@ 2022-10-30 9:28 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-10-30 9:28 UTC (permalink / raw
To: gentoo-commits
commit: 493ad864ab7db07521b4e6e1bb71f3bcad707f8a
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Oct 30 07:57:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 09:27:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493ad864
sys-block/open-iscsi: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28028
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/open-iscsi-2.1.7-no_werror.patch | 26 ----------------------
1 file changed, 26 deletions(-)
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-no_werror.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.7-no_werror.patch
deleted file mode 100644
index a94caebafb13..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.1.7-no_werror.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
-index 52e453a..523518b 100644
---- a/libopeniscsiusr/Makefile
-+++ b/libopeniscsiusr/Makefile
-@@ -51,7 +51,7 @@ EXTRA_MAN_FILES = libopeniscsiusr.h.3
- 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)
- CFLAGS += -DSBINDIR=\"$(SBINDIR)\"
- CFLAGS += -DISCSI_DB_ROOT=\"$(DBROOT)\"
-diff --git a/usr/Makefile b/usr/Makefile
-index 3fc2248..c3580a3 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -44,7 +44,7 @@ HOMEDIR ?= $(etcdir)/iscsi
- 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)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/
@ 2023-12-22 8:46 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-12-22 8:46 UTC (permalink / raw
To: gentoo-commits
commit: 57f8ff49737f8e52ad48753e46fc14b47fd92676
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 08:46:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 08:46:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f8ff49
sys-block/open-iscsi: add upstream ref to patch
Bug: https://bugs.gentoo.org/908587
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch
index 0c4a2aa13ab7..13215dafbb69 100644
--- a/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch
+++ b/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch
@@ -1,3 +1,6 @@
+https://github.com/open-iscsi/open-iscsi/commit/11bdc17938ba648c81a853355a6bbddad69a9fc7
+https://bugs.gentoo.org/908587
+
From 11bdc17938ba648c81a853355a6bbddad69a9fc7 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed, 4 Oct 2023 23:18:20 +0200
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-22 8:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-09 15:58 [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2023-12-22 8:46 Sam James
2022-10-30 9:28 Sam James
2019-11-08 2:44 Aaron Bauman
2019-01-21 11:38 Lars Wendler
2016-03-21 6:41 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox