subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-block\/open\-iscsi\/"

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/

2023-12-22 Thread Sam James

commit: 57f8ff49737f8e52ad48753e46fc14b47fd92676
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 22 08:46:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 22 08:46:20 2023 +
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  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 
 Date: Wed, 4 Oct 2023 23:18:20 +0200

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/

2023-12-22 Thread Sam James

commit: a4679a1282ec6986ce6f603bc81ab25c29ce7d49
Author: Stijn Tintel  linux-ipv6  be>
AuthorDate: Fri Nov  3 01:09:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 22 08:46:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4679a12

sys-block/open-iscsi: fix build against musl

Add an upstream patch that fixes build on musl.

Closes: https://bugs.gentoo.org/908587
Signed-off-by: Stijn Tintel  linux-ipv6.be>
Closes: https://github.com/gentoo/gentoo/pull/33657
Signed-off-by: Sam James  gentoo.org>

 ...iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch | 40 ++
 sys-block/open-iscsi/open-iscsi-2.1.9.ebuild   |  1 +
 2 files changed, 41 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
new file mode 100644
index ..0c4a2aa13ab7
--- /dev/null
+++ 
b/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch
@@ -0,0 +1,40 @@
+From 11bdc17938ba648c81a853355a6bbddad69a9fc7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine 
+Date: Wed, 4 Oct 2023 23:18:20 +0200
+Subject: [PATCH] usr/idbm.c: fix musl build (#426)
+
+Fix the following musl build failure raised since version 2.1.9 and
+https://github.com/open-iscsi/open-iscsi/commit/7b571d76d6937a78c141630fc38c3c57c532466c:
+
+../usr/idbm.c: In function 'idbm_rec_write_old':
+../usr/idbm.c:2230:27: error: 'GLOB_ONLYDIR' undeclared (first use in this 
function)
+ 2230 | rc = glob(portal, GLOB_ONLYDIR, NULL, );
+  |   ^~~~
+
+Fixes:
+ - 
http://autobuild.buildroot.org/results/14fc1c139f055b5b1eaa6e04e327863c06176a7b
+
+Signed-off-by: Fabrice Fontaine 
+---
+ usr/idbm.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/usr/idbm.c b/usr/idbm.c
+index ca4a4ec..c39abb6 100644
+--- a/usr/idbm.c
 b/usr/idbm.c
+@@ -45,6 +45,11 @@
+ #include "fw_context.h"
+ #include "iscsi_err.h"
+ 
++// GLOB_ONLYDIR is not defined under musl
++#ifndef GLOB_ONLYDIR
++#define GLOB_ONLYDIR  0x100
++#endif
++
+ #define IDBM_HIDE 0/* Hide parameter when print. */
+ #define IDBM_SHOW 1/* Show parameter when print. */
+ #define IDBM_MASKED   2/* Show "stars" instead of real value when print */
+-- 
+2.41.0
+

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
index a64f3cc0f0b1..d5126eaad442 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
@@ -34,6 +34,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch
+   "${FILESDIR}"/${P}-usr-idbm.c-fix-musl-build-426.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2023-08-04 Thread Sam James

commit: 2c534f75ee7e7b2136639e0c46c44c2589b1865c
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug  5 00:32:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug  5 00:32:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c534f75

sys-block/open-iscsi: Stabilize 2.1.9 ppc, #911019

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
index e8f36d34fd8d..a64f3cc0f0b1 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ GPL-2+"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 # Tries to write to /run/lock/iscsi etc

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2023-06-15 Thread Sam James

commit: 91b6ebb8f564a04a9c2181d7de7c707e17d7a72c
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 22:02:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 22:02:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b6ebb8

sys-block/open-iscsi: add 2.1.9

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/Manifest|   1 +
 sys-block/open-iscsi/open-iscsi-2.1.9.ebuild | 119 +++
 2 files changed, 120 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 59917d9ecd72..5d97349b8462 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1 +1,2 @@
 DIST open-iscsi-2.1.8.tar.gz 638346 BLAKE2B 
1e85b6bd75ac31e5aaa65ea8869c2e6e13190786e28e473ab8bd1ea3edb0ef835624194e2ba53718fb2a49c25af53bff9035f5109e1a569155244f03a7dccdc0
 SHA512 
168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1
+DIST open-iscsi-2.1.9.tar.gz 641974 BLAKE2B 
87570329dd5902bf96f1c11786c7a814892c851eabb63148f35b85494242f7379db1770a93549dcb871bafa148d37b320b389a98eed2ac46b7252ed22187ecd1
 SHA512 
25c28da5918b775ca54d3e55591eca0b4f7b5be33d803cad28fce1e9b2334b43cee1423a4e1819497b322e0f420dcd8d74226f442ca432233d1753565b11a5bb

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
new file mode 100644
index ..2a2d0b3a0842
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd udev
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="https://www.open-iscsi.com/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+ GPL-2+"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug infiniband +tcp rdma systemd"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+# Tries to write to /run/lock/iscsi etc
+RESTRICT="test"
+
+DEPEND="
+   dev-libs/openssl:=
+   sys-apps/kmod
+   sys-block/open-isns:=
+   sys-kernel/linux-headers
+   infiniband? ( sys-cluster/rdma-core )
+   systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="
+   ${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"$
+   done
+   fi
+   fi
+}
+
+src_configure() {
+   use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+
+   # TODO: Make sys-block/open-isns optional if useful? There's an upstream
+   # build system option for this already as of 2.1.9.
+   local emesonargs=(
+   -Dsystemddir="$(systemd_get_utildir)"
+   -Drulesdir="$(get_udevdir)"/rules.d
+   $(meson_use !systemd no_systemd)
+   )
+
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+
+   # Upstream make is not deterministic, per bug #601514
+   rm -f "${ED}"/etc/initiatorname.iscsi
+
+   docinto

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2022-12-26 Thread Sam James

commit: 06fd89a76f9d2d95493bf782634b5c852cfde235
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 26 08:27:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 26 08:33:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06fd89a7

sys-block/open-iscsi: drop 2.1.4-r2

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/Manifest  |   1 -
 .../files/open-iscsi-2.1.1-Makefiles.patch |  78 
 sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild| 139 -
 3 files changed, 218 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index a7246276375b..59917d9ecd72 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,2 +1 @@
-DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 
043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91
 SHA512 
ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
 DIST open-iscsi-2.1.8.tar.gz 638346 BLAKE2B 
1e85b6bd75ac31e5aaa65ea8869c2e6e13190786e28e473ab8bd1ea3edb0ef835624194e2ba53718fb2a49c25af53bff9035f5109e1a569155244f03a7dccdc0
 SHA512 
168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch
deleted file mode 100644
index 02e651e27c21..
--- a/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch
+++ /dev/null
@@ -1,78 +0,0 @@
 a/libopeniscsiusr/Makefile
-+++ b/libopeniscsiusr/Makefile
-@@ -44,7 +44,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)
- 
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
 a/usr/Makefile
-+++ b/usr/Makefile
-@@ -35,7 +35,7 @@ endif
- 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)
-@@ -76,9 +76,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) 
$(FW_BOOT_SRCS) \
-   iscsistart.o statics.o
-   $(CC) $(CFLAGS) $^ -o $@ -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB)
- clean:
--  rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
-+  $(RM) *.o $(PROGRAMS) .depend $(LIBSYS)
- 
- depend:
--  gcc $(CFLAGS) -M `ls *.c` > .depend
-+  $(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
 a/utils/Makefile
-+++ b/utils/Makefile
-@@ -10,9 +10,9 @@ iscsi-iname: md5.o iscsi-iname.o
-   $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
- 
- clean:
--  rm -f *.o $(PROGRAMS) .depend
-+  $(RM) *.o $(PROGRAMS) .depend
- 
- depend:
--  gcc $(CFLAGS) -M `ls *.c` > .depend
-+  $(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
 a/utils/fwparam_ibft/Makefile
-+++ b/utils/fwparam_ibft/Makefile
-@@ -41,11 +41,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr
- all: $(OBJS)
- 
- clean:
--  rm -f *.o $(CLEANFILES) .depend
-+  $(RM) *.o $(CLEANFILES) .depend
- 
- $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
- 
- depend:
--  gcc $(CFLAGS) -M `ls *.c` > .depend
-+  $(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
 a/utils/sysdeps/Makefile
-+++ b/utils/sysdeps/Makefile
-@@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o
- all: $(SYSDEPS_OBJS)
- 
- clean:
--  rm -f *.o .depend
-+  $(RM) *.o .depend
- 
- depend:
--  gcc $(CFLAGS) -M `ls *.c` > .depend
-+  $(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
deleted file mode 100644
index a2d3cf4be973..
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
-
-DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
-HOMEPAGE="https://www.open-iscsi.com/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/0.2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug infiniband +tcp rdma systemd"
-
-DEPEND="
-   sys-apps/kmod
-   sys-block/open-isns:=
-

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/

2022-10-30 Thread Sam James

commit: 493ad864ab7db07521b4e6e1bb71f3bcad707f8a
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Oct 30 07:57:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 30 09:27:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493ad864

sys-block/open-iscsi: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28028
Signed-off-by: Sam James  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..
--- 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)

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-10-28 Thread Sam James

commit: e97607c3f92bb8df759cc9ce23efa974873c296b
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 21:02:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 21:02:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e97607c3

sys-block/open-iscsi: Stabilize 2.1.8 x86, #878563

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
index 1064d1fcb694..93b8afb21848 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 # Tries to write to /run/lock/iscsi etc

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-10-28 Thread Sam James

commit: 95af4ae3f0df56b3493829421e5e81e66ffde264
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:58:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:58:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95af4ae3

sys-block/open-iscsi: Stabilize 2.1.8 amd64, #878563

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
index 19bb51918fe7..1064d1fcb694 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
 IUSE="debug infiniband +tcp rdma systemd"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 # Tries to write to /run/lock/iscsi etc

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-10-28 Thread Sam James

commit: f9d99fae047e2a19f37ca5391c91d1da321a3e99
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:52:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:53:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d99fae

sys-block/open-iscsi: Stabilize 2.1.8 sparc, #878563

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
index f4c5d71e3784..19bb51918fe7 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
 IUSE="debug infiniband +tcp rdma systemd"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 # Tries to write to /run/lock/iscsi etc

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-10-28 Thread Sam James

commit: 9fdf5f0c53500d816d711956e77d7dbfe9676a3e
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:43:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:43:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fdf5f0c

sys-block/open-iscsi: Stabilize 2.1.8 arm, #878563

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
index 2e3a9841f0fa..f4c5d71e3784 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="debug infiniband +tcp rdma systemd"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 # Tries to write to /run/lock/iscsi etc

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-10-28 Thread Sam James

commit: 6cdb6dadfa657bed165f001e84803ceb406582cf
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:43:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:43:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdb6dad

sys-block/open-iscsi: Stabilize 2.1.8 arm64, #878563

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
index 10550f16059c..2e3a9841f0fa 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="debug infiniband +tcp rdma systemd"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 # Tries to write to /run/lock/iscsi etc

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-10-28 Thread Sam James

commit: 83e81243ff1836a591e2cbfe8f9304286fa7c83f
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:27:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:27:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e81243

sys-block/open-iscsi: Stabilize 2.1.8 ppc64, #878563

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
index ed3a2920250c..10550f16059c 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="debug infiniband +tcp rdma systemd"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 # Tries to write to /run/lock/iscsi etc

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-10-28 Thread Sam James

commit: f4efcf338b9e24232961179b3207eb3dc5b585f2
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 20:27:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:27:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4efcf33

sys-block/open-iscsi: Stabilize 2.1.8 ppc, #878563

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
index ef1cc614b680..ed3a2920250c 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug infiniband +tcp rdma systemd"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 # Tries to write to /run/lock/iscsi etc

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/

2022-10-28 Thread Sam James

commit: fdfdde7b9167fa1d8740b2d35947aa0c9d94025b
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 19:39:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 19:50:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfdde7b

sys-block/open-iscsi: drop 2.1.7

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/Manifest  |   1 -
 .../files/open-iscsi-2.1.7-fix_sed.patch   |  67 --
 sys-block/open-iscsi/open-iscsi-2.1.7.ebuild   | 145 -
 3 files changed, 213 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index cc797e94f30c..a7246276375b 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,3 +1,2 @@
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 
043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91
 SHA512 
ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
-DIST open-iscsi-2.1.7.tar.gz 627848 BLAKE2B 
c8b572dc71046b722b9455799b4360c17963f05ce2cac48f122d40fc61bef6f01b98287003fc222bdb0dd4706218add8c41d3eb40464023b9b240a8205069dd3
 SHA512 
619c57b988c6972da09428b3a84ca375ca46653fbfca9cb61389c70a95871b665f93b75b8e6ff2aa993bdb89e2a078a188c0a7b45c3bf9c15a16b496e9ebc892
 DIST open-iscsi-2.1.8.tar.gz 638346 BLAKE2B 
1e85b6bd75ac31e5aaa65ea8869c2e6e13190786e28e473ab8bd1ea3edb0ef835624194e2ba53718fb2a49c25af53bff9035f5109e1a569155244f03a7dccdc0
 SHA512 
168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch
deleted file mode 100644
index ad56b823b557..
--- a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 66d76978f2ffbe276e84b03a7fac1041a7c3b4c3 Mon Sep 17 00:00:00 2001
-From: Matthias Maier 
-Date: Thu, 2 Jun 2022 13:17:10 -0500
-Subject: [PATCH] Do not hardcode the path of sed
-

- doc/Makefile | 2 +-
- etc/Makefile | 2 +-
- libopeniscsiusr/Makefile | 2 +-
- utils/Makefile   | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/doc/Makefile b/doc/Makefile
-index 9ed025d..e121270 100644
 a/doc/Makefile
-+++ b/doc/Makefile
-@@ -7,7 +7,7 @@ ifeq ($(TOPDIR),)
-   TOPDIR = ..
- endif
- 
--SED = /usr/bin/sed
-+SED = sed
- INSTALL = install
- 
- DESTDIR ?=
-diff --git a/etc/Makefile b/etc/Makefile
-index d065319..2d98027 100644
 a/etc/Makefile
-+++ b/etc/Makefile
-@@ -19,7 +19,7 @@ initddir ?= $(etcdir)/init.d
- 
- HOMEDIR ?= $(etcdir)/iscsi
- 
--SED = /usr/bin/sed
-+SED = sed
- INSTALL = install
- 
- SYSTEMD_SOURCE_FILES  = iscsid.socket iscsiuio.socket
-diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
-index 523518b..90903dd 100644
 a/libopeniscsiusr/Makefile
-+++ b/libopeniscsiusr/Makefile
-@@ -29,7 +29,7 @@ PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig
- MAN_DIR = $(prefix)/share/man
- 
- PKG_CONFIG ?= /usr/bin/pkg-config
--SED ?= /usr/bin/sed
-+SED ?= sed
- 
- LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr
- 
-diff --git a/utils/Makefile b/utils/Makefile
-index a7eb352..15539eb 100644
 a/utils/Makefile
-+++ b/utils/Makefile
-@@ -7,7 +7,7 @@
- # from the top-level make file.
- #
- 
--SED = /usr/bin/sed
-+SED = sed
- INSTALL = install
- CHMOD = chmod
- 
--- 
-2.35.1
-

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
deleted file mode 100644
index 552d373862e7..
--- a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info flag-o-matic toolchain-funcs systemd udev
-
-DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
-HOMEPAGE="https://www.open-iscsi.com/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="debug infiniband +tcp rdma systemd"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-DEPEND="
-   sys-apps/kmod
-   sys-block/open-isns:=
-   sys-kernel/linux-headers
-   infiniband? ( sys-cluster/rdma-core )
-   dev-libs/openssl:0=
-   systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-   sys-fs/lsscsi
-   sys-apps/util-linux"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch
-   "${FILESDIR}"/${PN}-2.1.7-fix_sed.patch
-   "${FILESDIR}"/${PN}-2.1.7-no_werror.patch
-)
-
-pkg_setup() {
-   linux-info_pkg_setup
-
-

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-09-27 Thread Sam James

commit: 50b62021171914e655cfc638c8bf0b5a12a21d6a
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 27 21:33:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 27 21:36:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50b62021

sys-block/open-iscsi: add 2.1.8

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/Manifest|   1 +
 sys-block/open-iscsi/open-iscsi-2.1.8.ebuild | 117 +++
 2 files changed, 118 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 3b365fd44991..cc797e94f30c 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,2 +1,3 @@
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 
043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91
 SHA512 
ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
 DIST open-iscsi-2.1.7.tar.gz 627848 BLAKE2B 
c8b572dc71046b722b9455799b4360c17963f05ce2cac48f122d40fc61bef6f01b98287003fc222bdb0dd4706218add8c41d3eb40464023b9b240a8205069dd3
 SHA512 
619c57b988c6972da09428b3a84ca375ca46653fbfca9cb61389c70a95871b665f93b75b8e6ff2aa993bdb89e2a078a188c0a7b45c3bf9c15a16b496e9ebc892
+DIST open-iscsi-2.1.8.tar.gz 638346 BLAKE2B 
1e85b6bd75ac31e5aaa65ea8869c2e6e13190786e28e473ab8bd1ea3edb0ef835624194e2ba53718fb2a49c25af53bff9035f5109e1a569155244f03a7dccdc0
 SHA512 
168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
new file mode 100644
index ..ef1cc614b680
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd udev
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="https://www.open-iscsi.com/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug infiniband +tcp rdma systemd"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+# Tries to write to /run/lock/iscsi etc
+RESTRICT="test"
+
+DEPEND="
+   dev-libs/openssl:=
+   sys-apps/kmod
+   sys-block/open-isns:=
+   sys-kernel/linux-headers
+   infiniband? ( sys-cluster/rdma-core )
+   systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="
+   ${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"$
+   done
+   fi
+   fi
+}
+
+src_configure() {
+   use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+
+   local emesonargs=(
+   -Dsystemddir="$(systemd_get_utildir)"
+   -Drulesdir="$(get_udevdir)"/rules.d
+   $(meson_use !systemd no_systemd)
+   )
+
+   meson_src_configure
+}
+

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2022-06-21 Thread David Seifert

commit: 05fb607c58934cd70a25f6cbfa35438ba1fc091a
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jun 21 09:40:49 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jun 21 09:40:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05fb607c

sys-block/open-iscsi: drop 2.1.6-r1

Signed-off-by: David Seifert  gentoo.org>

 sys-block/open-iscsi/Manifest  |   1 -
 .../files/open-iscsi-2.1.6-Makefiles.patch |  81 -
 sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild| 132 -
 3 files changed, 214 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 4c6d1313583c..3b365fd44991 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,3 +1,2 @@
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 
043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91
 SHA512 
ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
-DIST open-iscsi-2.1.6.tar.gz 623721 BLAKE2B 
c7c09e38fd10bd5c2a5e8ad8030cf2338de3382fe4acae0e3c1bf3cacb6e244e411b7556403e0c43fd03035836f46cc4836683188e2f159cd7fc066aef78a868
 SHA512 
4a32a76c1c32d7d1a01fe3a0f88ce9616a54323ec043757be73051eb41ebae8de90ce057acce72fb6fe07aa47e814c9bc6ee88b13fa7d7769ca10c5175974f1d
 DIST open-iscsi-2.1.7.tar.gz 627848 BLAKE2B 
c8b572dc71046b722b9455799b4360c17963f05ce2cac48f122d40fc61bef6f01b98287003fc222bdb0dd4706218add8c41d3eb40464023b9b240a8205069dd3
 SHA512 
619c57b988c6972da09428b3a84ca375ca46653fbfca9cb61389c70a95871b665f93b75b8e6ff2aa993bdb89e2a078a188c0a7b45c3bf9c15a16b496e9ebc892

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch
deleted file mode 100644
index a25acc0c85db..
--- a/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://github.com/open-iscsi/open-iscsi/pull/333
-
-It's not the full series from that PR yet because
-our previous patch handles some of it (the most important bits)
-and some layout changed upstream pre-next release.
-
-From 96667e0e06a65c94fd875db048776aad29eea829 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Sun, 3 Apr 2022 03:22:32 +0100
-Subject: [PATCH] iscsiuio: don't clobber LDFLAGS in configure.ac
-
-The systemd check currently clobbers LDFLAGS from the environment
-rather than appending to it.
-
-But we actually want LIBS here anyway, rather than LDFLAGS.
-
-Signed-off-by: Sam James 
 a/iscsiuio/configure.ac
-+++ b/iscsiuio/configure.ac
-@@ -72,7 +72,7 @@ AC_ARG_WITH([systemd],
-  *)   AC_MSG_ERROR([bad value $withval for --with-systemd]) ;;
-  esac],[with_libsystemd=auto])
- AS_IF([test "$with_libsystemd" != no],[
--PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS=$LIBSYSTEMD_LIBS],[
-+PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LIBS="${LIBS} 
$LIBSYSTEMD_LIBS"],[
- if test "$with_libsystemd" = yes; then
- AC_MSG_ERROR([could not find libsystemd using pkg-config])
-   else
-From 9fbd6009cd917f1152a367fa7e5ae3993133c1e4 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Sun, 3 Apr 2022 03:23:28 +0100
-Subject: [PATCH] iscsiuio: respect LDFLAGS fully
-
-Use LIBS rather than LDFLAGS which ensures automake gets the ordering
-right (some LDFLAGS values won't work correctly if not placed exactly before
-libraries).
-
-This should functionally work the same as before, just improve compatibility
-with bits like -Wl,--as-needed.
-
-Signed-off-by: Sam James 
 a/iscsiuio/src/unix/Makefile.am
-+++ b/iscsiuio/src/unix/Makefile.am
-@@ -27,13 +27,14 @@ iscsiuio_CFLAGS =  $(AM_CFLAGS)\
-   $(LIBNL_CFLAGS) \
-   -DBYTE_ORDER=@ENDIAN@
- 
--iscsiuio_LDFLAGS= $(AM_LDADD) \
-+iscsiuio_LIBS =   $(AM_LIBS)  \
-   -ldl\
-   -rdynamic   \
-   $(LIBNL_LIBS)   \
-   -lpthread
- 
--iscsiuio_LDADD  = ${top_srcdir}/src/uip/lib_iscsi_uip.a   \
-+iscsiuio_LDADD  = $(AM_LDADD) \
-+  ${top_srcdir}/src/uip/lib_iscsi_uip.a   \
-   ${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a\
-   ${top_srcdir}/src/apps/brcm-iscsi/lib_apps_brcm_iscsi.a 
\
-   ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a
-From 980b1d36e1f5f38c6b33fe3b68a2cb89e4a77b90 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Sun, 3 Apr 2022 03:34:48 +0100
-Subject: [PATCH] libopeniscsiusr: fix version in installed pkgconfig (.pc)
- file
-
-Looks like a typo from libnvme. Previously, the installed
-.pc file had a blank Version field.
-
-Signed-off-by: Sam James 
 a/libopeniscsiusr/Makefile
-+++

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-06-02 Thread Matthias Maier

commit: 7f9a51764f45836dd4532ff899684c9a92390a91
Author: Matthias Maier  gentoo  org>
AuthorDate: Thu Jun  2 18:46:10 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Thu Jun  2 18:46:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9a5176

sys-block/open-iscsi: fix pkg_postinst

Signed-off-by: Matthias Maier  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.7.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
index 08efea3d8711..552d373862e7 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info flag-o-matic toolchain-funcs systemd
+inherit autotools linux-info flag-o-matic toolchain-funcs systemd udev
 
 DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="https://www.open-iscsi.com/;
@@ -140,4 +140,6 @@ pkg_postinst() {
  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" 
"${EROOT}${in}"
fi
+
+   udev_reload
 }

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-06-02 Thread Matthias Maier

commit: 3794bbcd4182d42047b849ee746d8a25beb9ea78
Author: Matthias Maier  gentoo  org>
AuthorDate: Thu Jun  2 18:42:27 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Thu Jun  2 18:42:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3794bbcd

sys-block/open-iscsi: fix installation

 - use -j1 to avoid a race condition during "make install"

 - move udev rules.d file into right place

 - let docompress handle compressing man pages

Signed-off-by: Matthias Maier  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.7.ebuild | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
index 3bf611eea398..08efea3d8711 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
@@ -95,7 +95,8 @@ src_compile() {
 }
 
 src_install() {
-   emake \
+   # Force serial install to avoid race conditions
+   emake -j1 \
DESTDIR="${ED}" \
sbindir="/usr/sbin" \
SED="${EPREFIX}/bin/sed" \
@@ -105,6 +106,15 @@ src_install() {
# Upstream make is not deterministic, per bug #601514
rm -f "${ED}"/etc/initiatorname.iscsi
 
+   # QA: install udev rule into right place
+   mkdir -p "${ED}"/lib/udev/rules.d
+   mv "${ED}"/etc/udev/rules.d/50-iscsi-firmware-login.rules \
+   "${ED}"/lib/udev/rules.d || die "mv failed"
+
+   # QA: let docompress compress man pages
+   gunzip -r "${ED}"/usr/share/man/man3/ || die "gunzip failed"
+   gunzip -r "${ED}"/usr/share/man/man8/ || die "gunzip failed"
+
dodoc README THANKS
 
docinto test/

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/

2022-06-02 Thread Matthias Maier

commit: 5536cd18a01bb593e72daa0dfe54297022cb5e7a
Author: Matthias Maier  gentoo  org>
AuthorDate: Thu Jun  2 18:18:56 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Thu Jun  2 18:20:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5536cd18

sys-block/open-iscsi: version bump to 2.1.7, various fixes

 - drop (parts of the) old patches for 2.1.6 as they have been upstreamed

 - remove -Werror from compiler command line

 - remove hardcoded sed path

 - use __bitwise instead of __bitwise__ macro. The latter seems to be a
   typo

Bug: https://bugs.gentoo.org/847418
Signed-off-by: Matthias Maier  gentoo.org>

 sys-block/open-iscsi/Manifest  |  1 +
 .../files/open-iscsi-2.1.7-fix_bitwise.patch   | 52 +
 .../files/open-iscsi-2.1.7-fix_sed.patch   | 67 ++
 .../files/open-iscsi-2.1.7-no_werror.patch | 26 +
 sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild|  2 +-
 ...csi-2.1.6-r1.ebuild => open-iscsi-2.1.7.ebuild} |  5 +-
 6 files changed, 150 insertions(+), 3 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 29d5b970a89c..4c6d1313583c 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,2 +1,3 @@
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 
043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91
 SHA512 
ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
 DIST open-iscsi-2.1.6.tar.gz 623721 BLAKE2B 
c7c09e38fd10bd5c2a5e8ad8030cf2338de3382fe4acae0e3c1bf3cacb6e244e411b7556403e0c43fd03035836f46cc4836683188e2f159cd7fc066aef78a868
 SHA512 
4a32a76c1c32d7d1a01fe3a0f88ce9616a54323ec043757be73051eb41ebae8de90ce057acce72fb6fe07aa47e814c9bc6ee88b13fa7d7769ca10c5175974f1d
+DIST open-iscsi-2.1.7.tar.gz 627848 BLAKE2B 
c8b572dc71046b722b9455799b4360c17963f05ce2cac48f122d40fc61bef6f01b98287003fc222bdb0dd4706218add8c41d3eb40464023b9b240a8205069dd3
 SHA512 
619c57b988c6972da09428b3a84ca375ca46653fbfca9cb61389c70a95871b665f93b75b8e6ff2aa993bdb89e2a078a188c0a7b45c3bf9c15a16b496e9ebc892

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_bitwise.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_bitwise.patch
new file mode 100644
index ..2ff094c83f0f
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_bitwise.patch
@@ -0,0 +1,52 @@
+From 0a6432de1a2186449d5e6557f75a9f30e487471d Mon Sep 17 00:00:00 2001
+From: Matthias Maier 
+Date: Thu, 2 Jun 2022 13:12:43 -0500
+Subject: [PATCH] Use __bitwise instead of __bitwise__
+
+The iscsi_proto.h header goes into great length ensuring that the
+__bitwise macro is defined:
+
+  #if !defined(__bitwise)
+  /*
+   * If running svn modules we may need to define these.
+   * This should not go upstream since this is already properly defined there
+   */
+  #ifdef __CHECKER__
+  #define __bitwise__ __attribute__((bitwise))
+  #else
+  #define __bitwise__
+  #endif
+  #ifdef __CHECK_ENDIAN__
+  #define __bitwise __bitwise__
+  #else
+  #define __bitwise
+  #endif
+  #endif
+
+But then uses the __bitwise__ macro instead:
+
+  typedef uint32_t __bitwise__ itt_t;
+
+(This is the only occurence where the __bitwise__ (or __bitwise) macro
+is actually used). This seems to be a typo, changing this to __bitwise
+fixes compilation with gcc-11 onwards.
+---
+ include/iscsi_proto.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/iscsi_proto.h b/include/iscsi_proto.h
+index 1d14b89..3fe9018 100644
+--- a/include/iscsi_proto.h
 b/include/iscsi_proto.h
+@@ -63,7 +63,7 @@
+ #endif
+ 
+ /* initiator tags; opaque for target */
+-typedef uint32_t __bitwise__ itt_t;
++typedef uint32_t __bitwise itt_t;
+ /* below makes sense only for initiator that created this tag */
+ #define build_itt(itt, age) ((__force itt_t)\
+   ((itt) | ((age) << ISCSI_AGE_SHIFT)))
+-- 
+2.35.1
+

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch
new file mode 100644
index ..ad56b823b557
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch
@@ -0,0 +1,67 @@
+From 66d76978f2ffbe276e84b03a7fac1041a7c3b4c3 Mon Sep 17 00:00:00 2001
+From: Matthias Maier 
+Date: Thu, 2 Jun 2022 13:17:10 -0500
+Subject: [PATCH] Do not hardcode the path of sed
+
+---
+ doc/Makefile | 2 +-
+ etc/Makefile | 2 +-
+ libopeniscsiusr/Makefile | 2 +-
+ utils/Makefile   | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index 9ed025d..e121270 100644
+--- a/doc/Makefile
 b/doc/Makefile
+@@ -7,7 +7,7 @@ ifeq ($(TOPDIR),)
+   TOPDIR = ..
+ endif
+ 
+-SED = /usr/bin/sed
++SED = sed
+ INSTALL = install
+ 
+ DESTDIR ?=
+diff --git

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-05-03 Thread Sam James

commit: fe6a8a1eaaf829a5246c3e101a5f47a9e2a1e96b
Author: Sam James  gentoo  org>
AuthorDate: Tue May  3 22:49:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  3 22:50:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe6a8a1e

sys-block/open-iscsi: use systemd_get_utildir

Bug: https://bugs.gentoo.org/842498
Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild
index 1c8341739a41..576fdc85f330 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info flag-o-matic toolchain-funcs
+inherit autotools linux-info flag-o-matic toolchain-funcs systemd
 
 DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="https://www.open-iscsi.com/;
@@ -98,7 +98,7 @@ src_install() {
DESTDIR="${ED}" \
sbindir="/usr/sbin" \
SED="${EPREFIX}/bin/sed" \
-   systemddir="${EPREFIX}/lib/systemd" \
+   systemddir="$(systemd_get_utildir)" \
install install_systemd
 
# Upstream make is not deterministic, per bug #601514

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-05-03 Thread Sam James

commit: 19bb7cb9303bb3f4e349eee23c0a38309d7bf9d6
Author: Alec Moskvin  gmx  com>
AuthorDate: Tue May  3 22:18:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  3 22:45:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19bb7cb9

sys-block/open-iscsi: Use placeholder susbstitution from Makefile

Closes: https://bugs.gentoo.org/842498
Signed-off-by: Alec Moskvin  gmx.com>
Closes: https://github.com/gentoo/gentoo/pull/25309
Signed-off-by: Sam James  gentoo.org>

 ...csi-2.1.6.ebuild => open-iscsi-2.1.6-r1.ebuild} | 23 +++---
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild
similarity index 87%
rename from sys-block/open-iscsi/open-iscsi-2.1.6.ebuild
rename to sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild
index 8dd972425a4e..1c8341739a41 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info flag-o-matic toolchain-funcs systemd
+inherit autotools linux-info flag-o-matic toolchain-funcs
 
 DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="https://www.open-iscsi.com/;
@@ -69,10 +69,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-   sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
-   -i etc/iscsid.conf || die
-   sed -e '/[^usr]\/sbin/s@\(/sbin/\)@/usr\1@' \
-   -i etc/systemd/iscsi* || die
default
 
pushd iscsiuio >/dev/null || die
@@ -98,7 +94,12 @@ src_compile() {
 }
 
 src_install() {
-   emake DESTDIR="${ED}" sbindir="/usr/sbin" SED="${EPREFIX}/bin/sed" 
install
+   emake \
+   DESTDIR="${ED}" \
+   sbindir="/usr/sbin" \
+   SED="${EPREFIX}/bin/sed" \
+   systemddir="${EPREFIX}/lib/systemd" \
+   install install_systemd
 
# Upstream make is not deterministic, per bug #601514
rm -f "${ED}"/etc/initiatorname.iscsi
@@ -114,16 +115,6 @@ src_install() {
newconfd "${FILESDIR}"/iscsid-conf.d iscsid
newinitd "${FILESDIR}"/iscsid-init.d iscsid
 
-   local unit
-   local units=(
-   iscsi{,-init}.service
-   iscsid.{service,socket}
-   iscsiuio.{service,socket}
-   )
-   for unit in ${units[@]} ; do
-   systemd_dounit etc/systemd/${unit}
-   done
-
keepdir /var/db/iscsi
fperms 700 /var/db/iscsi
fperms 600 /etc/iscsi/iscsid.conf

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-04-07 Thread Jakov Smolić

commit: 75915d30a1af3e6792fee8bd73fcb51a6d4e0966
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Apr  7 20:54:55 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Apr  7 20:57:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75915d30

sys-block/open-iscsi: Keyword 2.1.6 riscv, #837116

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild
index bcda02c039ab..8dd972425a4e 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug infiniband +tcp rdma systemd"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-04-05 Thread Sam James

commit: 222e8b8d24c831d0a5f4a1455433f5db30dcc8da
Author: kochera  google  com>
AuthorDate: Tue Apr  5 20:46:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  6 00:51:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=222e8b8d

sys-block/open-iscsi: Add cpe_uri for open-iscsi package.

Signed-off-by: Michael Kochera  google.com>
Closes: https://github.com/gentoo/gentoo/pull/24924
Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-block/open-iscsi/metadata.xml 
b/sys-block/open-iscsi/metadata.xml
index 31d1940bfd0b..bd71215179c8 100644
--- a/sys-block/open-iscsi/metadata.xml
+++ b/sys-block/open-iscsi/metadata.xml
@@ -11,5 +11,6 @@


open-iscsi/open-iscsi
+   cpe:/a:open-iscsi_project:open-iscsi

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-04-02 Thread Sam James

commit: ae2b1b2f4e05b5ce278cf23846605c48980a2bc9
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr  3 02:09:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr  3 02:09:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae2b1b2f

sys-block/open-iscsi: update HOMEPAGE (HTTPS)

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
index 3b00ebc379c0..a2d3cf4be973 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
 
 DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/;
+HOMEPAGE="https://www.open-iscsi.com/;
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2022-04-02 Thread Sam James

commit: abe6e227aa073188478e4ef0f767be978d94cc38
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr  3 02:38:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr  3 02:40:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe6e227

sys-block/open-iscsi: add 2.1.6

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/Manifest  |   1 +
 .../files/open-iscsi-2.1.6-Makefiles.patch |  81 
 sys-block/open-iscsi/open-iscsi-2.1.6.ebuild   | 141 +
 3 files changed, 223 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 27e0fa000d2b..29d5b970a89c 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1 +1,2 @@
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 
043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91
 SHA512 
ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
+DIST open-iscsi-2.1.6.tar.gz 623721 BLAKE2B 
c7c09e38fd10bd5c2a5e8ad8030cf2338de3382fe4acae0e3c1bf3cacb6e244e411b7556403e0c43fd03035836f46cc4836683188e2f159cd7fc066aef78a868
 SHA512 
4a32a76c1c32d7d1a01fe3a0f88ce9616a54323ec043757be73051eb41ebae8de90ce057acce72fb6fe07aa47e814c9bc6ee88b13fa7d7769ca10c5175974f1d

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch
new file mode 100644
index ..a25acc0c85db
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.1.6-Makefiles.patch
@@ -0,0 +1,81 @@
+https://github.com/open-iscsi/open-iscsi/pull/333
+
+It's not the full series from that PR yet because
+our previous patch handles some of it (the most important bits)
+and some layout changed upstream pre-next release.
+
+From 96667e0e06a65c94fd875db048776aad29eea829 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sun, 3 Apr 2022 03:22:32 +0100
+Subject: [PATCH] iscsiuio: don't clobber LDFLAGS in configure.ac
+
+The systemd check currently clobbers LDFLAGS from the environment
+rather than appending to it.
+
+But we actually want LIBS here anyway, rather than LDFLAGS.
+
+Signed-off-by: Sam James 
+--- a/iscsiuio/configure.ac
 b/iscsiuio/configure.ac
+@@ -72,7 +72,7 @@ AC_ARG_WITH([systemd],
+  *)   AC_MSG_ERROR([bad value $withval for --with-systemd]) ;;
+  esac],[with_libsystemd=auto])
+ AS_IF([test "$with_libsystemd" != no],[
+-PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS=$LIBSYSTEMD_LIBS],[
++PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LIBS="${LIBS} 
$LIBSYSTEMD_LIBS"],[
+ if test "$with_libsystemd" = yes; then
+ AC_MSG_ERROR([could not find libsystemd using pkg-config])
+   else
+From 9fbd6009cd917f1152a367fa7e5ae3993133c1e4 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sun, 3 Apr 2022 03:23:28 +0100
+Subject: [PATCH] iscsiuio: respect LDFLAGS fully
+
+Use LIBS rather than LDFLAGS which ensures automake gets the ordering
+right (some LDFLAGS values won't work correctly if not placed exactly before
+libraries).
+
+This should functionally work the same as before, just improve compatibility
+with bits like -Wl,--as-needed.
+
+Signed-off-by: Sam James 
+--- a/iscsiuio/src/unix/Makefile.am
 b/iscsiuio/src/unix/Makefile.am
+@@ -27,13 +27,14 @@ iscsiuio_CFLAGS =  $(AM_CFLAGS)\
+   $(LIBNL_CFLAGS) \
+   -DBYTE_ORDER=@ENDIAN@
+ 
+-iscsiuio_LDFLAGS= $(AM_LDADD) \
++iscsiuio_LIBS =   $(AM_LIBS)  \
+   -ldl\
+   -rdynamic   \
+   $(LIBNL_LIBS)   \
+   -lpthread
+ 
+-iscsiuio_LDADD  = ${top_srcdir}/src/uip/lib_iscsi_uip.a   \
++iscsiuio_LDADD  = $(AM_LDADD) \
++  ${top_srcdir}/src/uip/lib_iscsi_uip.a   \
+   ${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a\
+   ${top_srcdir}/src/apps/brcm-iscsi/lib_apps_brcm_iscsi.a 
\
+   ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a
+From 980b1d36e1f5f38c6b33fe3b68a2cb89e4a77b90 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sun, 3 Apr 2022 03:34:48 +0100
+Subject: [PATCH] libopeniscsiusr: fix version in installed pkgconfig (.pc)
+ file
+
+Looks like a typo from libnvme. Previously, the installed
+.pc file had a blank Version field.
+
+Signed-off-by: Sam James 
+--- a/libopeniscsiusr/Makefile
 b/libopeniscsiusr/Makefile
+@@ -89,7 +89,7 @@ install: $(LIBS) $(LIBS_MAJOR)
+   ln -sf $(LIBS) $(DESTDIR)/$(LIB_DIR)/$(LIBS_MAJOR)
+   $(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDE_DIR)/
+   $(INSTALL) -m 644 -D $(PKGFILE).in $(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE)
+-  perl -i -pe 's|__VERSION__|$(LIBNVME_VERSION)|g' \
++

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2022-01-14 Thread Jakov Smolić

commit: f3e5fac023bb5dd2149ae2e9f9b217ca876662f3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jan 14 13:30:37 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jan 14 17:36:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e5fac0

sys-block/open-iscsi: Switch to rdma-core for infiniband support

Closes: https://bugs.gentoo.org/831005
Signed-off-by: Jakov Smolić  gentoo.org>

 .../{open-iscsi-2.1.4-r1.ebuild => open-iscsi-2.1.4-r2.ebuild}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
similarity index 98%
rename from sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
rename to sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
index 23187db32401..3b00ebc379c0 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DEPEND="
sys-apps/kmod
sys-block/open-isns:=
sys-kernel/linux-headers
-   infiniband? ( sys-fabric/ofed )
+   infiniband? ( sys-cluster/rdma-core )
dev-libs/openssl:0=
systemd? ( sys-apps/systemd )
 "

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-09-04 Thread David Seifert

commit: 8f2d218d0b0e6d082b5d87169933e1f396d89443
Author: David Seifert  gentoo  org>
AuthorDate: Sat Sep  4 17:34:14 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep  4 17:34:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f2d218d

sys-block/open-iscsi: drop 2.1.3

Signed-off-by: David Seifert  gentoo.org>

 sys-block/open-iscsi/Manifest|   1 -
 sys-block/open-iscsi/open-iscsi-2.1.3.ebuild | 139 ---
 2 files changed, 140 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index b7cd9738e2e..27e0fa000d2 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,2 +1 @@
-DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 
884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6
 SHA512 
0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 
043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91
 SHA512 
ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
deleted file mode 100644
index 2d727f8645e..000
--- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
-
-DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/0.2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug infiniband +tcp rdma systemd"
-
-DEPEND="
-   sys-apps/kmod
-   sys-block/open-isns:=
-   sys-kernel/linux-headers
-   infiniband? ( sys-fabric/ofed )
-   dev-libs/openssl:0=
-   systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-   sys-fs/lsscsi
-   sys-apps/util-linux"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
-)
-
-pkg_setup() {
-   linux-info_pkg_setup
-
-   if kernel_is -lt 2 6 16; then
-   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-   fi
-
-   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
-   # support loaded as module. Kernel builtin options don't work. See this 
for
-   # more information:
-   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-   # If there's a new release, check whether this is still valid!
-   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-   RDMA_MODULES="INFINIBAND_ISER"
-   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
-   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
-   if linux_config_exists; then
-   if use tcp; then
-   for module in ${TCP_MODULES}; do
-   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
-   done
-   fi
-   if use infiniband; then
-   for module in ${INFINIBAND_MODULES}; do
-   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
-   done
-   fi
-   if use rdma; then
-   for module in ${RDMA_MODULES}; do
-   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"$
-   done
-   fi
-   fi
-}
-
-src_prepare() {
-   sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
-   -i etc/iscsid.conf || die
-   sed -e 's@\(/sbin/\)@/usr\1@' \
-   -i etc/systemd/iscsi* || die
-   default
-
-   pushd iscsiuio >/dev/null || die
-   eautoreconf
-   popd >/dev/null || die
-}
-
-src_configure() {
-   use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
-   append-lfs-flags
-}
-
-src_compile() {
-   # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
-   # is messed up already here, so it's not making it that much worse.
-   KSRC="${KV_DIR}" CFLAGS="" \
-   emake \
-

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-08-13 Thread Sam James

commit: f27a7ddca8ad9b4e1a72e91bcb47216509419ce9
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 13 21:53:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 13 21:53:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f27a7ddc

sys-block/open-iscsi: Stabilize 2.1.4-r1 arm64, #807505

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
index 20bcd363f97..23187db3240 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-08-10 Thread Sam James

commit: 39f14e109a9da536fbb619072c8fbd20bb1ca640
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 11 00:22:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 11 00:22:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f14e10

sys-block/open-iscsi: Stabilize 2.1.4-r1 sparc, #807505

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
index 30e4344f654..ca96a07af59 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-08-10 Thread Sam James

commit: 83ec9d4b1ad75043f98b16df3707a0237391c0f0
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 11 00:09:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 11 00:09:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ec9d4b

sys-block/open-iscsi: Stabilize 2.1.4-r1 ppc64, #807505

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
index 882bd82764f..30e4344f654 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-08-10 Thread Sam James

commit: f39ca3ddf495228f4e3f4434c716e1b4988dbdd5
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 11 00:00:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 11 00:02:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f39ca3dd

sys-block/open-iscsi: Stabilize 2.1.4-r1 x86, #807505

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
index 46fdbf4e90f..19cd1e91b53 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-08-10 Thread Agostino Sarubbo

commit: 22f9c4889670ef6538be219eef2cc031a532749e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 10 15:34:32 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 10 15:34:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f9c488

sys-block/open-iscsi: amd64 stable wrt bug #807505

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
index 32d4e406f51..46fdbf4e90f 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/

2021-05-23 Thread David Seifert

commit: e46fda46397b6ba1a2cc60ee000f626355d913bd
Author: David Seifert  gentoo  org>
AuthorDate: Sun May 23 12:14:08 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun May 23 12:14:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46fda46

sys-block/open-iscsi: drop 2.0.875

Signed-off-by: David Seifert  gentoo.org>

 sys-block/open-iscsi/Manifest  |   1 -
 sys-block/open-iscsi/files/99-iscsi.rules  |   1 -
 sys-block/open-iscsi/files/iscsidev.sh |  78 -
 .../files/open-iscsi-2.0.874-Makefiles.patch   | 116 ---
 .../open-iscsi-2.0.874-musl-ethtool-compat.patch   |  69 ---
 .../files/open-iscsi-2.0.874-musl-fixes.patch  |  51 -
 .../open-iscsi-2.0.875-include-sysmacros.patch |  21 
 sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 127 -
 8 files changed, 464 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 9d4de0cdd17..b7cd9738e2e 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,3 +1,2 @@
-DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 
884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6
 SHA512 
0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 
043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91
 SHA512 
ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3

diff --git a/sys-block/open-iscsi/files/99-iscsi.rules 
b/sys-block/open-iscsi/files/99-iscsi.rules
deleted file mode 100644
index 3816126264c..000
--- a/sys-block/open-iscsi/files/99-iscsi.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="sd*", SUBSYSTEMS=="block", 
RUN{program}+="/etc/udev/scripts/iscsidev.sh"

diff --git a/sys-block/open-iscsi/files/iscsidev.sh 
b/sys-block/open-iscsi/files/iscsidev.sh
deleted file mode 100644
index d045fae570f..000
--- a/sys-block/open-iscsi/files/iscsidev.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-# KERNEL=="sd*", SUBSYSTEMS=="block", 
RUN{program}="/etc/udev/scripts/iscsidev.sh"
-
-# we only care about iscsi devices
-[[ $ID_VENDOR = "IET" ]] || exit 1
-
-# don't care about partitions either
-echo $DEVNAME | egrep -q "[0-9]$"
-status=$?
-[[ $status != 0 ]] || exit 1
-
-#ID_MODEL=VIRTUAL-DISK
-#ID_MODEL_ENC=VIRTUAL-DISK
-#ID_REVISION=0001
-#DEVTYPE=disk
-#ID_BUS=scsi
-#SUBSYSTEM=block
-#ID_SERIAL=1IET_00010001
-#DEVPATH=/devices/platform/host74/session68/target74:0:0/74:0:0:1/block/sde
-#ID_VENDOR_ENC=IET\x20\x20\x20\x20\x20
-#MINOR=64
-#ID_SCSI=1
-#ACTION=add
-#PWD=/
-#ID_PART_TABLE_UUID=54f71c65-a5d5-45cd-8915-5ffd5ff4fea6
-#ID_FS_TYPE=
-#USEC_INITIALIZED=999037905
-#MAJOR=8
-#ID_SCSI_SERIAL=beaf11
-#DEVLINKS=/dev/disk/by-id/scsi-1IET_00010001
-#DEVNAME=/dev/sde
-#SHLVL=1
-#ID_TYPE=disk
-#ID_PART_TABLE_TYPE=gpt
-#ID_VENDOR=IET
-#ID_SERIAL_SHORT=IET_00010001
-#SEQNUM=25775
-
-# do the removal
-if [[ $ACTION = 'remove' ]]; then
-  # nohup needed so this isn't constantly run...
-  nohup find -L /dev/disk/by-path/ -type l -lname ${DEVNAME} -exec rm "{}" + 
2>/dev/null &
-  exit 0
-fi
-
-TARGET_NAME=$(lsscsi -t | grep "${DEVNAME}" | awk '{print $3}' | awk -F, 
'{print $1}')
-[[ $TARGET_NAME = '' ]] && exit 1
-
-# we don't know which host is correct
-declare -a POSSIBLE_HOSTS
-declare -a POSSIBLE_PORTS
-for item in $(cat /sys/class/iscsi_connection/connection*/address); do
-  POSSIBLE_HOSTS+=("${item}")
-done
-for item in $(cat /sys/class/iscsi_connection/connection*/port); do
-  POSSIBLE_PORTS+=("${item}")
-done
-
-#get correct ip and port
-for ((i=0;i<${#POSSIBLE_HOSTS[@]};++i)); do
-  printf "%s is in %s\n" "$POSSIBLE_HOSTS[i]}" "${POSSIBLE_PORTS[i]}"
-  iscsiadm --mode node --targetname "${TARGET_NAME}" -p 
"${POSSIBLE_HOSTS[i]}":"${POSSIBLE_PORTS[i]}"
-  status=$?
-  if [[ $status = 0 ]]; then
-TARGET_IP="${POSSIBLE_HOSTS[i]}"
-TARGET_PORT="${POSSIBLE_PORTS[i]}"
-break
-  fi
-done
-
-# exit if not found
-[[ -z $TARGET_IP ]] && exit 1
-[[ -z $TARGET_PORT ]] && exit 1
-
-# actually create the link
-mkdir -p /dev/disk/by-path/
-ln -s "${DEVNAME}" 
"/dev/disk/by-path/ip-${TARGET_IP}:${TARGET_PORT}-iscsi-${TARGET_NAME}-lun-1"

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.874-Makefiles.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.874-Makefiles.patch
deleted

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-05-16 Thread Sam James

commit: e12feff6b243965d0d99968884e85129584fefd6
Author: Sam James  gentoo  org>
AuthorDate: Mon May 17 01:26:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 17 01:26:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12feff6

sys-block/open-iscsi: Stabilize 2.1.3 arm64, #763954

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
index 01617d34606..2d727f8645e 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-05-16 Thread Sam James

commit: f1c8e2622e643f9a5ede346f694d01e18b00b42a
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 23:46:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 23:46:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c8e262

sys-block/open-iscsi: Stabilize 2.1.3 ppc, #763954

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
index d9066b86f98..01617d34606 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-05-16 Thread Sam James

commit: 9245055aeab19bca1dba7186565ea80cca488571
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 23:43:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 23:43:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9245055a

sys-block/open-iscsi: Stabilize 2.1.3 ppc64, #763954

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
index d5c48e80b61..d9066b86f98 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-05-16 Thread Sam James

commit: 664524bf0957bcddce7e2fc9326865d4bcb4011d
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 23:42:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 23:42:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664524bf

sys-block/open-iscsi: Stabilize 2.1.3 sparc, #763954

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
index 2a0b4518eb9..d5c48e80b61 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-05-16 Thread Sam James

commit: 1dcc9cc7bcd5d889a44825f308bdb6201137320b
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 23:40:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 23:40:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dcc9cc7

sys-block/open-iscsi: Stabilize 2.1.3 arm, #763954

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
index 923041df677..2a0b4518eb9 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-05-16 Thread Sam James

commit: 244f9045aa616e4283d4eba07fec441a80f2b526
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 19:53:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 19:53:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244f9045

sys-block/open-iscsi: Stabilize 2.0.875 x86, #643122

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
index e78173fe7c4..d92237185ef 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug infiniband +tcp rdma"
 
 DEPEND="sys-block/open-isns:=

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-05-16 Thread Sam James

commit: 30721c26b000b906b6276a994c7a4cf9fdaececa
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 19:41:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 19:41:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30721c26

sys-block/open-iscsi: add -fcommon to fix GCC 10 build

Bug: https://bugs.gentoo.org/643122
Acked-by: David Seifert  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
index a72a670d11f..e78173fe7c4 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -75,6 +75,10 @@ src_prepare() {
 
 src_configure() {
use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+
+   # bug #643122
+   append-flags -fcommon
+
append-lfs-flags
 }

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-05-02 Thread Mikle Kolyada

commit: fd7c33e7e13b9ca07a122a9b8d3dfd1565ebaf7a
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 16:09:44 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 16:12:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7c33e7

sys-block/open-iscsi: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.3.ebuild| 5 ++---
 sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
index 01e5e10c4e0..923041df677 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
@@ -12,15 +12,14 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/0.2"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="debug infiniband libressl +tcp rdma systemd"
+IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="
sys-apps/kmod
sys-block/open-isns:=
sys-kernel/linux-headers
infiniband? ( sys-fabric/ofed )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
systemd? ( sys-apps/systemd )
 "
 RDEPEND="${DEPEND}

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
index 48c3a385ff3..32d4e406f51 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -12,15 +12,14 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/0.2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband libressl +tcp rdma systemd"
+IUSE="debug infiniband +tcp rdma systemd"
 
 DEPEND="
sys-apps/kmod
sys-block/open-isns:=
sys-kernel/linux-headers
infiniband? ( sys-fabric/ofed )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
systemd? ( sys-apps/systemd )
 "
 RDEPEND="${DEPEND}

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2021-04-30 Thread Andreas Sturmlechner

commit: f1b6266f39d0eb515c5377f1352e251aafb67052
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 18 11:57:03 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 30 19:02:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b6266f

sys-block/open-iscsi: Drop 2.0.873-r1, EAPI5--

All arches have more up-to-date versions stable.

Bug: https://bugs.gentoo.org/643122
Bug: https://bugs.gentoo.org/763954
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sys-block/open-iscsi/Manifest  |   1 -
 .../files/open-iscsi-2.0.873-Makefiles.patch   | 161 -
 .../files/open-iscsi-2.0.873-memset.patch  |  24 ---
 sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild  |  96 
 4 files changed, 282 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 51f6539fffc..9d4de0cdd17 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,4 +1,3 @@
-DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061
 SHA512 
4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 
884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6
 SHA512 
0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 
043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91
 SHA512 
ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch
deleted file mode 100644
index db5d6d14ec5..000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.873-Makefiles.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c5d9700..4dbff18 100644
 a/Makefile
-+++ b/Makefile
-@@ -14,8 +14,8 @@ mandir = $(prefix)/share/man
- etcdir = /etc
- initddir = $(etcdir)/init.d
- 
--MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8
--PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname
-+MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 doc/iscsistart.8 
doc/iscsi-iname.8
-+PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname 
usr/iscsistart
- INSTALL = install
- ETCFILES = etc/iscsid.conf
- IFACEFILES = etc/iface.example
-@@ -84,11 +84,11 @@ install_programs:  $(PROGRAMS)
- # ugh, auto-detection is evil
- # Gentoo maintains their own init.d stuff
- install_initd:
--  if [ -f /etc/debian_version ]; then \
-+  if [ -f $(DESTDIR)$(etcdir)/debian_version ]; then \
-   $(MAKE) install_initd_debian ; \
--  elif [ -f /etc/redhat-release ]; then \
-+  elif [ -f $(DESTDIR)$(etcdir)/redhat-release ]; then \
-   $(MAKE) install_initd_redhat ; \
--  elif [ -f /etc/SuSE-release ]; then \
-+  elif [ -f $(DESTDIR)$(etcdir)/SuSE-release ]; then \
-   $(MAKE) install_initd_suse ; \
-   fi
- 
-@@ -115,7 +115,7 @@ install_iface: $(IFACEFILES)
-   $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces
- 
- install_etc: $(ETCFILES)
--  if [ ! -f /etc/iscsi/iscsid.conf ]; then \
-+  if [ ! -f $(DESTDIR)$(etcdir)/iscsi/iscsid.conf ]; then \
-   $(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \
-   $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \
-   fi
-@@ -128,11 +128,11 @@ install_kernel:
-   $(MAKE) -C kernel install_kernel
- 
- install_iname:
--  if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then \
--  echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > 
$(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \
-+  if [ ! -f $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ]; then \
-+  echo "InitiatorName=`$(DESTDIR)$(sbindir)/iscsi-iname`" > 
$(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ; \
-   echo "***" ; \
--  echo "Setting InitiatorName to `cat 
$(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \
--  echo "To override edit /etc/iscsi/initiatorname.iscsi" ; \

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-04-21 Thread Sam James

commit: 48ddc2f0136f3442bbe065a488a4f7adaf1cb381
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 14:02:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 21 19:01:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ddc2f0

sys-block/open-iscsi: eutils->epatch

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
index f69cf961660..18707375b85 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev
+inherit versionator linux-info epatch flag-o-matic toolchain-funcs udev
 
 MY_P="${PN}-$(replace_version_separator 2 "-")"

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-03-26 Thread Sam James

commit: 93900d38f0ef43adbf8885922166629e105a8ef5
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 26 18:35:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 26 18:35:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93900d38

sys-block/open-iscsi: Stabilize 2.1.3 x86, #763954

Signed-off-by: Sam James  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
index a94f34c374e..01e5e10c4e0 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="debug infiniband libressl +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-03-26 Thread Agostino Sarubbo

commit: 7138199638da4e3b49038f032923a0f78ef57b1c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar 26 15:19:04 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar 26 15:19:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71381996

sys-block/open-iscsi: amd64 stable wrt bug #763954

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.1.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
index d7ff6b52509..a94f34c374e 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug infiniband libressl +tcp rdma systemd"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-03-18 Thread Lars Wendler

commit: dbfe85b698bb1cb92d8e29ef3aa43b7d0fa9806a
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 18 09:41:52 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 18 09:41:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbfe85b6

sys-block/open-iscsi: Revbump to install iscsi-init.service as well

Closes: https://bugs.gentoo.org/776568
Signed-off-by: Lars Wendler  gentoo.org>

 .../{open-iscsi-2.1.4.ebuild => open-iscsi-2.1.4-r1.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
similarity index 98%
rename from sys-block/open-iscsi/open-iscsi-2.1.4.ebuild
rename to sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
index cfb0f79f457..48c3a385ff3 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -72,7 +72,7 @@ pkg_setup() {
 src_prepare() {
sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
-i etc/iscsid.conf || die
-   sed -e 's@\(/sbin/\)@/usr\1@' \
+   sed -e '/[^usr]\/sbin/s@\(/sbin/\)@/usr\1@' \
-i etc/systemd/iscsi* || die
default
 
@@ -115,7 +115,7 @@ src_install() {
 
local unit
local units=(
-   iscsi.service
+   iscsi{,-init}.service
iscsid.{service,socket}
iscsiuio.{service,socket}
)

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-03-15 Thread Lars Wendler

commit: f36b7a527ea2b23bad53637f38a9e80984c97ac0
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Mar 15 12:30:13 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Mar 15 12:31:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f36b7a52

sys-block/open-iscsi: Bump to version 2.1.4

Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/Manifest|   1 +
 sys-block/open-iscsi/open-iscsi-2.1.4.ebuild | 140 +++
 2 files changed, 141 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index db79f4c65f3..9bb82f2e9e4 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -3,3 +3,4 @@ DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b0
 DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 
7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672
 SHA512 
88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3
 DIST open-iscsi-2.1.2.tar.gz 617407 BLAKE2B 
13a8c70d8a4618262c746cce3f2c66c04b577b35918d993c29fff041d292ef9e60b4d39c6d6a308d306b8303d08e7aac81b9927157361eaf47e694e9ae1e365a
 SHA512 
a0b1fc4aa2acadbf3a69fa636a47fec527fff75748fccfa83c9540f3ac05c71835a406503b15480ed25fe4fb780e58e0dd217607f7ef07128d1aef8ee2e3
 DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 
884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6
 SHA512 
0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52
+DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 
043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91
 SHA512 
ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.4.ebuild
new file mode 100644
index 000..cfb0f79f457
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.com/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband libressl +tcp rdma systemd"
+
+DEPEND="
+   sys-apps/kmod
+   sys-block/open-isns:=
+   sys-kernel/linux-headers
+   infiniband? ( sys-fabric/ofed )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2021-03-15 Thread Lars Wendler

commit: f063d00ab0b7c54d44a9cc290393b75176d10bc8
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Mar 15 12:31:37 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Mar 15 12:31:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f063d00a

sys-block/open-iscsi: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/Manifest|   2 -
 sys-block/open-iscsi/open-iscsi-2.1.1.ebuild | 140 ---
 sys-block/open-iscsi/open-iscsi-2.1.2.ebuild | 140 ---
 3 files changed, 282 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 9bb82f2e9e4..51f6539fffc 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,6 +1,4 @@
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061
 SHA512 
4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
-DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 
7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672
 SHA512 
88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3
-DIST open-iscsi-2.1.2.tar.gz 617407 BLAKE2B 
13a8c70d8a4618262c746cce3f2c66c04b577b35918d993c29fff041d292ef9e60b4d39c6d6a308d306b8303d08e7aac81b9927157361eaf47e694e9ae1e365a
 SHA512 
a0b1fc4aa2acadbf3a69fa636a47fec527fff75748fccfa83c9540f3ac05c71835a406503b15480ed25fe4fb780e58e0dd217607f7ef07128d1aef8ee2e3
 DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 
884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6
 SHA512 
0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 
043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91
 SHA512 
ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
deleted file mode 100644
index d7ff6b52509..000
--- a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
-
-DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband libressl +tcp rdma systemd"
-
-DEPEND="
-   sys-apps/kmod
-   sys-block/open-isns:=
-   sys-kernel/linux-headers
-   infiniband? ( sys-fabric/ofed )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-   sys-fs/lsscsi
-   sys-apps/util-linux"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
-)
-
-pkg_setup() {
-   linux-info_pkg_setup
-
-   if kernel_is -lt 2 6 16; then
-   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-   fi
-
-   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
-   # support loaded as module. Kernel builtin options don't work. See this 
for
-   # more information:
-   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-   # If there's a new release, check whether this is still valid!
-   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-   RDMA_MODULES="INFINIBAND_ISER"
-   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
-   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
-   if linux_config_exists; then
-   if use tcp; then
-   for module in ${TCP_MODULES}; do
-

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2020-12-25 Thread Thomas Deutschmann

commit: b32418e5124f5cb7bc28a3d947e48b1095c1534e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec 25 12:53:20 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec 25 13:28:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b32418e5

sys-block/open-iscsi: bump to v2.1.3

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-block/open-iscsi/Manifest|   1 +
 sys-block/open-iscsi/open-iscsi-2.1.3.ebuild | 140 +++
 2 files changed, 141 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index c19643f4813..db79f4c65f3 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -2,3 +2,4 @@ DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d65895
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 
7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672
 SHA512 
88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3
 DIST open-iscsi-2.1.2.tar.gz 617407 BLAKE2B 
13a8c70d8a4618262c746cce3f2c66c04b577b35918d993c29fff041d292ef9e60b4d39c6d6a308d306b8303d08e7aac81b9927157361eaf47e694e9ae1e365a
 SHA512 
a0b1fc4aa2acadbf3a69fa636a47fec527fff75748fccfa83c9540f3ac05c71835a406503b15480ed25fe4fb780e58e0dd217607f7ef07128d1aef8ee2e3
+DIST open-iscsi-2.1.3.tar.gz 619746 BLAKE2B 
884e24ae6e16578f3cbd8ccea2557e820d4bf4d20c7f88890100ca93f48df88dc7284cc4eca19d93187516fd21a2c5b71eb53f0d8fe395d2ce42fd202dc355d6
 SHA512 
0de417dc45b765458c5a1f09029b5df9b5c18d45d7a8fb6b38d539b7013f512a3c8731d5046f554611eccc77b93fea0df30fe4932d79cea44776ac944c398a52

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
new file mode 100644
index 000..d7ff6b52509
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.com/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband libressl +tcp rdma systemd"
+
+DEPEND="
+   sys-apps/kmod
+   sys-block/open-isns:=
+   sys-kernel/linux-headers
+   infiniband? ( sys-fabric/ofed )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2020-08-12 Thread Matthew Thode

commit: ef1eecbdac787eb04c6c70333a62a55b5ded
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Aug 13 03:08:53 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Aug 13 03:09:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1eecbd

sys-block/open-iscsi: 2.0.875 stable arm64

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Matthew Thode  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
index dcb2eadf66a..a72a670d11f 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="debug infiniband +tcp rdma"
 
 DEPEND="sys-block/open-isns:=

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2020-07-30 Thread Lars Wendler

commit: 4f93f813166df157a0a6674d68ada00b0a72a14f
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jul 30 21:22:49 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Jul 30 21:41:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f93f813

sys-block/open-iscsi: Bump to version 2.1.2

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/Manifest|   1 +
 sys-block/open-iscsi/open-iscsi-2.1.2.ebuild | 140 +++
 2 files changed, 141 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 8d0851454c3..96afd5717d8 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -3,3 +3,4 @@ DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b0
 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B 
f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48
 SHA512 
2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
 DIST open-iscsi-2.1.0.tar.gz 604689 BLAKE2B 
1741f4ac5072e3e952ba8268b1f52c6d296156b4c2696efad9fd0ccfe54870f74ac54b21144e4e71eed03cf8674a6aff96eee4f72f8a608fde40dc463f962b6f
 SHA512 
bb1a4ff2bab0562bfd4281d757dd888e8f5d2d1ae16561cabf5598073c343e8c2dc9b35992c2bc51398faffceb9b70ea2eae214ab205a586bcb971d741d5f59d
 DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 
7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672
 SHA512 
88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3
+DIST open-iscsi-2.1.2.tar.gz 617407 BLAKE2B 
13a8c70d8a4618262c746cce3f2c66c04b577b35918d993c29fff041d292ef9e60b4d39c6d6a308d306b8303d08e7aac81b9927157361eaf47e694e9ae1e365a
 SHA512 
a0b1fc4aa2acadbf3a69fa636a47fec527fff75748fccfa83c9540f3ac05c71835a406503b15480ed25fe4fb780e58e0dd217607f7ef07128d1aef8ee2e3

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild
new file mode 100644
index 000..d7ff6b52509
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.com/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband libressl +tcp rdma systemd"
+
+DEPEND="
+   sys-apps/kmod
+   sys-block/open-isns:=
+   sys-kernel/linux-headers
+   infiniband? ( sys-fabric/ofed )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+   linux_chkconfig_module

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2020-07-30 Thread Lars Wendler

commit: 134f546a4d4d5151c82c518e051020f1d95afb43
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jul 30 21:25:27 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Jul 30 21:41:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134f546a

sys-block/open-iscsi: Removed old

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/Manifest  |   2 -
 .../files/open-iscsi-2.0.876-Makefiles.patch   |  61 -
 .../open-iscsi-2.0.878-gcc10-fno-common.patch  | 107 
 sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild  | 141 -
 sys-block/open-iscsi/open-iscsi-2.1.0.ebuild   | 140 
 5 files changed, 451 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 96afd5717d8..c19643f4813 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,6 +1,4 @@
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061
 SHA512 
4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
-DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B 
f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48
 SHA512 
2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
-DIST open-iscsi-2.1.0.tar.gz 604689 BLAKE2B 
1741f4ac5072e3e952ba8268b1f52c6d296156b4c2696efad9fd0ccfe54870f74ac54b21144e4e71eed03cf8674a6aff96eee4f72f8a608fde40dc463f962b6f
 SHA512 
bb1a4ff2bab0562bfd4281d757dd888e8f5d2d1ae16561cabf5598073c343e8c2dc9b35992c2bc51398faffceb9b70ea2eae214ab205a586bcb971d741d5f59d
 DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 
7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672
 SHA512 
88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3
 DIST open-iscsi-2.1.2.tar.gz 617407 BLAKE2B 
13a8c70d8a4618262c746cce3f2c66c04b577b35918d993c29fff041d292ef9e60b4d39c6d6a308d306b8303d08e7aac81b9927157361eaf47e694e9ae1e365a
 SHA512 
a0b1fc4aa2acadbf3a69fa636a47fec527fff75748fccfa83c9540f3ac05c71835a406503b15480ed25fe4fb780e58e0dd217607f7ef07128d1aef8ee2e3

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch
deleted file mode 100644
index 2cfa4362285..000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch
+++ /dev/null
@@ -1,61 +0,0 @@
 a/usr/Makefile
-+++ b/usr/Makefile
-@@ -69,9 +69,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) 
$(FW_BOOT_SRCS) \
-   iscsistart.o statics.o
-   $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB)
- clean:
--  rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
-+  $(RM) *.o $(PROGRAMS) .depend $(LIBSYS)
- 
- depend:
--  gcc $(CFLAGS) -M `ls *.c` > .depend
-+  $(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
 a/utils/Makefile
-+++ b/utils/Makefile
-@@ -10,9 +10,9 @@ iscsi-iname: md5.o iscsi-iname.o
-   $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
- 
- clean:
--  rm -f *.o $(PROGRAMS) .depend
-+  $(RM) *.o $(PROGRAMS) .depend
- 
- depend:
--  gcc $(CFLAGS) -M `ls *.c` > .depend
-+  $(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
 a/utils/fwparam_ibft/Makefile
-+++ b/utils/fwparam_ibft/Makefile
-@@ -41,11 +41,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr
- all: $(OBJS)
- 
- clean:
--  rm -f *.o $(CLEANFILES) .depend
-+  $(RM) *.o $(CLEANFILES) .depend
- 
- $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
- 
- depend:
--  gcc $(CFLAGS) -M `ls *.c` > .depend
-+  $(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
 a/utils/sysdeps/Makefile
-+++ b/utils/sysdeps/Makefile
-@@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o
- all: $(SYSDEPS_OBJS)
- 
- clean:
--  rm -f *.o .depend
-+  $(RM) *.o .depend
- 
- depend:
--  gcc $(CFLAGS) -M `ls *.c` > .depend
-+  $(CC) $(CFLAGS) -M `ls *.c` > .depend
- 
- -include .depend
--- 
-2.16.2
-

diff --git 
a/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch
deleted file mode 100644
index b61476555fb..000
---

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2020-06-14 Thread Thomas Deutschmann

commit: 870f9a5ad572bc624cde4f1cce690d6e98bac2fa
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jun 15 01:29:03 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jun 15 01:30:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=870f9a5a

sys-block/open-iscsi: fix building against gcc-10

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../open-iscsi-2.0.878-gcc10-fno-common.patch  | 107 +
 ...2.0.878.ebuild => open-iscsi-2.0.878-r1.ebuild} |   3 +-
 2 files changed, 109 insertions(+), 1 deletion(-)

diff --git 
a/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch
new file mode 100644
index 000..b61476555fb
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.878-gcc10-fno-common.patch
@@ -0,0 +1,107 @@
+From 499a006a7d6bb154f9e1ab430e4c9e231ba6096a Mon Sep 17 00:00:00 2001
+From: Lee Duncan 
+Date: Tue, 28 Jan 2020 16:36:56 -0800
+Subject: [PATCH] Updates to support gcc -fno-common option.
+
+This meant cleaning up the definition of some
+global variables, so that they were only defined
+in one place and refered to as external elsewhere.
+---
+ include/iscsi_err.h| 6 --
+ iscsiuio/configure.ac  | 2 +-
+ iscsiuio/src/uip/uip.h | 4 ++--
+ usr/iscsi_err.c| 2 ++
+ usr/log.c  | 1 +
+ usr/log.h  | 2 +-
+ 6 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/include/iscsi_err.h b/include/iscsi_err.h
+index ed000dd0..04a8723e 100644
+--- a/include/iscsi_err.h
 b/include/iscsi_err.h
+@@ -4,7 +4,7 @@
+ #ifndef _ISCSI_ERR_
+ #define _ISCSI_ERR_
+ 
+-enum {
++enum iscsi_error_list {
+   ISCSI_SUCCESS   = 0,
+   /* Generic error */
+   ISCSI_ERR   = 1,
+@@ -73,7 +73,9 @@ enum {
+ 
+   /* Always last. Indicates end of error code space */
+   ISCSI_MAX_ERR_VAL,
+-} iscsi_err;
++};
++
++extern enum iscsi_error_list iscsi_err;
+ 
+ extern void iscsi_err_print_msg(int err);
+ extern char *iscsi_err_to_str(int err);
+diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
+index b41df0ec..8099f09c 100644
+--- a/iscsiuio/configure.ac
 b/iscsiuio/configure.ac
+@@ -78,7 +78,7 @@ AC_CONFIG_COMMANDS([default],[[
+ else
+ echo 'char *build_date = "'`date`'";' > src/unix/build_date.c
+ fi
+-echo 'char *build_date;'> src/unix/build_date.h
++echo 'extern char *build_date;'> src/unix/build_date.h
+ ]],[[]])
+ 
+ AC_PREFIX_DEFAULT()
+diff --git a/iscsiuio/src/uip/uip.h b/iscsiuio/src/uip/uip.h
+index 1180ab50..9d9428a2 100644
+--- a/iscsiuio/src/uip/uip.h
 b/iscsiuio/src/uip/uip.h
+@@ -70,8 +70,8 @@ struct uip_stack;
+ typedef u16_t uip_ip4addr_t[2];
+ typedef u16_t uip_ip6addr_t[8];
+ 
+-const uip_ip6addr_t all_zeroes_addr6;
+-const uip_ip4addr_t all_zeroes_addr4;
++extern const uip_ip6addr_t all_zeroes_addr6;
++extern const uip_ip4addr_t all_zeroes_addr4;
+ 
+ #define ETH_BUF(buf) ((struct uip_eth_hdr *)buf)
+ #define VLAN_ETH_BUF(buf) ((struct uip_vlan_eth_hdr *)buf)
+diff --git a/usr/iscsi_err.c b/usr/iscsi_err.c
+index 23c61fc3..4a057d57 100644
+--- a/usr/iscsi_err.c
 b/usr/iscsi_err.c
+@@ -21,6 +21,8 @@
+ #include "iscsi_err.h"
+ #include "log.h"
+ 
++enum iscsi_error_list iscsi_err;
++
+ static char *iscsi_err_msgs[] = {
+   /* 0 */ "",
+   /* 1 */ "unknown error",
+diff --git a/usr/log.c b/usr/log.c
+index f29b54b3..6e16e7ce 100644
+--- a/usr/log.c
 b/usr/log.c
+@@ -33,6 +33,7 @@
+ 
+ char *log_name;
+ int log_level = 0;
++struct logarea *la = NULL;
+ 
+ static int log_stop_daemon = 0;
+ static void (*log_func)(int prio, void *priv, const char *fmt, va_list ap);
+diff --git a/usr/log.h b/usr/log.h
+index 486a08ea..c548791e 100644
+--- a/usr/log.h
 b/usr/log.h
+@@ -64,7 +64,7 @@ struct logarea {
+   union semun semarg;
+ };
+ 
+-struct logarea *la;
++extern struct logarea *la;
+ 
+ extern int log_init(char *program_name, int size,
+   void (*func)(int prio, void *priv, const char *fmt, va_list ap),

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild
similarity index 97%
rename from sys-block/open-iscsi/open-iscsi-2.0.878.ebuild
rename to sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild
index a1f80e0a347..a622e3b62f5 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.878-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,7 @@ REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 
 PATCHES=(
"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
+   "${FILESDIR}/${PN}-2.0.878-gcc10-fno-common.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/

2020-05-03 Thread Thomas Deutschmann

commit: 2b34abb755bf4dd2500e6a59d09a58ddee12842f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May  3 20:35:36 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May  3 20:35:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b34abb7

sys-block/open-iscsi: drop -Werror

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../files/open-iscsi-2.1.1-Makefiles.patch | 78 ++
 sys-block/open-iscsi/open-iscsi-2.1.1.ebuild   |  2 +-
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch
new file mode 100644
index 000..02e651e27c2
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch
@@ -0,0 +1,78 @@
+--- a/libopeniscsiusr/Makefile
 b/libopeniscsiusr/Makefile
+@@ -44,7 +44,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)
+ 
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
+--- a/usr/Makefile
 b/usr/Makefile
+@@ -35,7 +35,7 @@ endif
+ 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)
+@@ -76,9 +76,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) 
$(FW_BOOT_SRCS) \
+   iscsistart.o statics.o
+   $(CC) $(CFLAGS) $^ -o $@ -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB)
+ clean:
+-  rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
++  $(RM) *.o $(PROGRAMS) .depend $(LIBSYS)
+ 
+ depend:
+-  gcc $(CFLAGS) -M `ls *.c` > .depend
++  $(CC) $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
+--- a/utils/Makefile
 b/utils/Makefile
+@@ -10,9 +10,9 @@ iscsi-iname: md5.o iscsi-iname.o
+   $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
+ 
+ clean:
+-  rm -f *.o $(PROGRAMS) .depend
++  $(RM) *.o $(PROGRAMS) .depend
+ 
+ depend:
+-  gcc $(CFLAGS) -M `ls *.c` > .depend
++  $(CC) $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
+--- a/utils/fwparam_ibft/Makefile
 b/utils/fwparam_ibft/Makefile
+@@ -41,11 +41,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr
+ all: $(OBJS)
+ 
+ clean:
+-  rm -f *.o $(CLEANFILES) .depend
++  $(RM) *.o $(CLEANFILES) .depend
+ 
+ $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
+ 
+ depend:
+-  gcc $(CFLAGS) -M `ls *.c` > .depend
++  $(CC) $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
+--- a/utils/sysdeps/Makefile
 b/utils/sysdeps/Makefile
+@@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o
+ all: $(SYSDEPS_OBJS)
+ 
+ clean:
+-  rm -f *.o .depend
++  $(RM) *.o .depend
+ 
+ depend:
+-  gcc $(CFLAGS) -M `ls *.c` > .depend
++  $(CC) $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
index 43f3ee2b89f..d7ff6b52509 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
@@ -31,7 +31,7 @@ BDEPEND="virtual/pkgconfig"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 
 PATCHES=(
-   "${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
+   "${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2020-03-04 Thread Lars Wendler

commit: ddb5219f9d57c804e55e69521c3d0b0d86e7a053
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Mar  4 10:52:07 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Mar  4 10:54:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddb5219f

sys-block/open-iscsi: Bump to version 2.1.1

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/Manifest|   1 +
 sys-block/open-iscsi/open-iscsi-2.1.1.ebuild | 140 +++
 2 files changed, 141 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 064a1bebae5..c0adee972fc 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -3,3 +3,4 @@ DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b0
 DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 
85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef
 SHA512 
1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6
 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B 
f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48
 SHA512 
2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
 DIST open-iscsi-2.1.0.tar.gz 604689 BLAKE2B 
1741f4ac5072e3e952ba8268b1f52c6d296156b4c2696efad9fd0ccfe54870f74ac54b21144e4e71eed03cf8674a6aff96eee4f72f8a608fde40dc463f962b6f
 SHA512 
bb1a4ff2bab0562bfd4281d757dd888e8f5d2d1ae16561cabf5598073c343e8c2dc9b35992c2bc51398faffceb9b70ea2eae214ab205a586bcb971d741d5f59d
+DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 
7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672
 SHA512 
88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
new file mode 100644
index 000..43f3ee2b89f
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.com/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband libressl +tcp rdma systemd"
+
+DEPEND="
+   sys-apps/kmod
+   sys-block/open-isns:=
+   sys-kernel/linux-headers
+   infiniband? ( sys-fabric/ofed )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2020-03-04 Thread Lars Wendler

commit: e2d7edeaa92a6e386b57d8bc8a2f3bf7112e5a17
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Mar  4 10:53:55 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Mar  4 10:54:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d7edea

sys-block/open-iscsi: Removed old

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/Manifest  |   1 -
 .../open-iscsi-2.0.877-optional_systemd.patch  |  87 -
 .../files/open-iscsi-2.0.877-pkgconfig.patch   |  84 -
 sys-block/open-iscsi/open-iscsi-2.0.877.ebuild | 136 -
 4 files changed, 308 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index c0adee972fc..8d0851454c3 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,6 +1,5 @@
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061
 SHA512 
4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
-DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 
85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef
 SHA512 
1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6
 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B 
f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48
 SHA512 
2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
 DIST open-iscsi-2.1.0.tar.gz 604689 BLAKE2B 
1741f4ac5072e3e952ba8268b1f52c6d296156b4c2696efad9fd0ccfe54870f74ac54b21144e4e71eed03cf8674a6aff96eee4f72f8a608fde40dc463f962b6f
 SHA512 
bb1a4ff2bab0562bfd4281d757dd888e8f5d2d1ae16561cabf5598073c343e8c2dc9b35992c2bc51398faffceb9b70ea2eae214ab205a586bcb971d741d5f59d
 DIST open-iscsi-2.1.1.tar.gz 616859 BLAKE2B 
7004b0866e55837f06cfe9e45f49f6a482932fda8a2c21c55819d658fb96113f1913290d490f28baccea86ceb755c63b73bd010b201f974c9803d39fbf5d0672
 SHA512 
88dbea433fe5266714c5c73ce4b60dfb8ddeffcaad4ff77abbdda2a865d29d4307ca51b8f45376f54542b19baed30d5f2f1836a8c136eb0af840f489f47e4fb3

diff --git 
a/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch
deleted file mode 100644
index b1f1a8f1d07..000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From f66608aa9ce989c91f744bb2f3f34d2e01aedc87 Mon Sep 17 00:00:00 2001
-From: Lee Duncan 
-Date: Tue, 14 May 2019 13:11:34 -0700
-Subject: [PATCH] Make iscsid systemd usage optional
-
-You can compile without system now by using something
-like:
-
-   make OPTFLAGS="-DNO_SYSTEMD ..." NO_SYSTEMD=1
-
-This will skip systemd code for iscsid and iscsiuio.

- Makefile | 5 +
- usr/Makefile | 2 ++
- usr/iscsid.c | 6 ++
- 3 files changed, 13 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index c941740c..9a337741 100644
 a/Makefile
-+++ b/Makefile
-@@ -40,6 +40,11 @@ ifneq (,$(CFLAGS))
- export CFLAGS
- endif
- 
-+# export systemd disablement if set
-+ifneq ($(NO_SYSTEMD),)
-+export NO_SYSTEMD
-+endif
-+
- # Random comments:
- # using '$(MAKE)' instead of just 'make' allows make to run in parallel
- # over multiple makefile.
-diff --git a/usr/Makefile b/usr/Makefile
-index f1c35aa7..0203127c 100644
 a/usr/Makefile
-+++ b/usr/Makefile
-@@ -41,7 +41,9 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
- ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
-+ifeq ($(NO_SYSTEMD),)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd)
-+endif
- PROGRAMS = iscsid iscsiadm iscsistart
- 
- # libc compat files
-diff --git a/usr/iscsid.c b/usr/iscsid.c
-index 0c984409..37c13b39 100644
 a/usr/iscsid.c
-+++ b/usr/iscsid.c
-@@ -34,7 +34,9 @@
- #include 
- #include 
- #include 
-+#ifndef   NO_SYSTEMD
- #include 
-+#endif
- 
- #include "iscsid.h"
- #include "mgmt_ipc.h"
-@@ -339,6 +341,7 @@ static void missing_iname_warn(char *initiatorname_file)
- /* called right before we enter the event loop */
- static void set_state_to_ready(void)
- {
-+#ifndef   NO_SYSTEMD
-   if

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2019-11-15 Thread Lars Wendler

commit: 0fdcac3d972d148a6af20ba09eff24c52c943521
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Nov 15 10:27:31 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Nov 15 10:27:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fdcac3d

sys-block/open-iscsi: Bump to version 2.1.0

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/Manifest|   1 +
 sys-block/open-iscsi/open-iscsi-2.1.0.ebuild | 140 +++
 2 files changed, 141 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 95b2f1b9341..064a1bebae5 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -2,3 +2,4 @@ DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d65895
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 
85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef
 SHA512 
1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6
 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B 
f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48
 SHA512 
2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
+DIST open-iscsi-2.1.0.tar.gz 604689 BLAKE2B 
1741f4ac5072e3e952ba8268b1f52c6d296156b4c2696efad9fd0ccfe54870f74ac54b21144e4e71eed03cf8674a6aff96eee4f72f8a608fde40dc463f962b6f
 SHA512 
bb1a4ff2bab0562bfd4281d757dd888e8f5d2d1ae16561cabf5598073c343e8c2dc9b35992c2bc51398faffceb9b70ea2eae214ab205a586bcb971d741d5f59d

diff --git a/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild
new file mode 100644
index 000..a1f80e0a347
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.com/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband libressl +tcp rdma systemd"
+
+DEPEND="
+   sys-apps/kmod
+   sys-block/open-isns:=
+   sys-kernel/linux-headers
+   infiniband? ( sys-fabric/ofed )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/

2019-11-07 Thread Aaron Bauman

commit: 7d4d8077fec0e0c72332ceeb76f869e057ec979d
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Sep 28 07:43:31 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Nov  8 02:43:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d4d8077

sys-block/open-iscsi: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13067
Signed-off-by: Aaron Bauman  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..000
--- 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 
-+#include 
- #include 
 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 
--#include 
-+#include "ethtool-compat.h"
- #include 
 /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 (da...@redhat.com)
-+ * Copyright 2001 Jeff Garzik 
-+ * Portions Copyright 2001 Sun Microsystems (thoc...@sun.com)
-+ * Portions Copyright 2002 Intel (eli.kuperm...@intel.com,
-+ *christopher.le...@intel.com,
-+ *scott.feld...@intel.com)
-+ * Portions Copyright (C) Sun Microsystems 2008
-+ */
-+
-+#include 
-+#include 
-+
-+#define ETHTOOL_FWVERS_LEN32
-+#define ETHTOOL_BUSINFO_LEN   32
-+#define ETHTOOL_EROMVERS_LEN  32
-+
-+struct ethtool_drvinfo {
-+  __u32   cmd;
-+  chardriver[32];
-+  charversion[32];
-+  charfw_version[ETHTOOL_FWVERS_LEN];
-+  charbus_info[ETHTOOL_BUSINFO_LEN];
-+  charerom_version[ETHTOOL_EROMVERS_LEN];
-+  charreserved2[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;
-+  __u8tos;
-+};
-+
-+struct ethtool_ah_espip4_spec {
-+  __be32  ip4src;
-+  __be32  ip4dst;
-+  __be32  spi;
-+  __u8tos;
-+};
-+
-+#define ETHTOOL_GDRVINFO  0x0003 /* 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..000
--- 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 
-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

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2019-09-14 Thread Lars Wendler

commit: 6c7f21694acd195e7176f9680b3ddef1f0f5556f
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Sep 14 10:32:38 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Sep 14 10:32:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c7f2169

sys-block/open-iscsi: Bump to version 2.0.878

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/Manifest  |   1 +
 sys-block/open-iscsi/open-iscsi-2.0.878.ebuild | 140 +
 2 files changed, 141 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 15a53b3abe4..d768d940499 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -3,3 +3,4 @@ DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b0
 DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 
2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac
 SHA512 
f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422
 DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 
8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc
 SHA512 
d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf
 DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 
85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef
 SHA512 
1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6
+DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B 
f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48
 SHA512 
2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild
new file mode 100644
index 000..a1f80e0a347
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.878.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info flag-o-matic toolchain-funcs udev systemd
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.com/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband libressl +tcp rdma systemd"
+
+DEPEND="
+   sys-apps/kmod
+   sys-block/open-isns:=
+   sys-kernel/linux-headers
+   infiniband? ( sys-fabric/ofed )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2019-09-14 Thread Lars Wendler

commit: 2c20ea19377159043c752e8832dd27c7924a6565
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Sep 14 10:34:24 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Sep 14 10:34:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c20ea19

sys-block/open-iscsi: Removed old

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/Manifest  |   2 -
 sys-block/open-iscsi/open-iscsi-2.0.876.ebuild | 121 
 .../open-iscsi-2.0.876_p20180814-r1.ebuild | 126 -
 3 files changed, 249 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index d768d940499..95b2f1b9341 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,6 +1,4 @@
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061
 SHA512 
4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
-DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 
2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac
 SHA512 
f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422
-DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 
8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc
 SHA512 
d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf
 DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 
85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef
 SHA512 
1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6
 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B 
f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48
 SHA512 
2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild
deleted file mode 100644
index 2f34ac971b3..000
--- a/sys-block/open-iscsi/open-iscsi-2.0.876.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools versionator linux-info flag-o-matic toolchain-funcs udev 
systemd
-
-DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband +tcp rdma"
-
-DEPEND="sys-block/open-isns:=
-   infiniband? ( sys-fabric/ofed )
-   sys-kernel/linux-headers"
-RDEPEND="${DEPEND}
-   sys-fs/lsscsi
-   sys-apps/util-linux"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.0.876-musl-fixes.patch"
-   "${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
-)
-
-pkg_setup() {
-   linux-info_pkg_setup
-
-   if kernel_is -lt 2 6 16; then
-   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-   fi
-
-   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
-   # support loaded as module. Kernel builtin options don't work. See this 
for
-   # more information:
-   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-   # If there's a new release, check whether this is still valid!
-   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-   RDMA_MODULES="INFINIBAND_ISER"
-   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
-   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
-   if linux_config_exists; then
-   if use tcp; then
-   for module in ${TCP_MODULES}; do
-   linux_chkconfig_module ${module} || ewarn 
"${module} needs to

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2019-05-23 Thread Lars Wendler

commit: a5a3dfe9ab42181414c267e7ca25d613fb1ced75
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May 23 08:27:53 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 23 08:28:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a3dfe9

sys-block/open-iscsi: Fixed path in systemd unit files

Install all upstream provided systemd unit/socket files.

Closes: https://bugs.gentoo.org/672376
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.0.877.ebuild | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild
index a07c19fa6c3..3c166cfb0a4 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild
@@ -72,7 +72,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-   sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' 
etc/iscsid.conf || die
+   sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
+   -i etc/iscsid.conf || die
+   sed -e 's@\(/sbin/\)@/usr\1@' \
+   -i etc/systemd/iscsi* || die
default
 
pushd iscsiuio >/dev/null || die
@@ -112,7 +115,9 @@ src_install() {
newconfd "${FILESDIR}"/iscsid-conf.d iscsid
newinitd "${FILESDIR}"/iscsid-init.d iscsid
 
-   systemd_dounit "${S}"/etc/systemd/iscsid.service
+   systemd_dounit etc/systemd/iscsi.service
+   systemd_dounit etc/systemd/iscsid.service
+   systemd_dounit etc/systemd/iscsid.socket
 
keepdir /var/db/iscsi
fperms 700 /var/db/iscsi

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2019-05-23 Thread Lars Wendler

commit: 5d9ce8d35df50d2faea7a1a647ba4279031c9a12
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May 23 08:14:52 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 23 08:14:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9ce8d3

sys-block/open-iscsi: Added forgotten dependencies

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.0.877.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild
index 97f3cbc9886..a07c19fa6c3 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild
@@ -12,11 +12,15 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/0.2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug infiniband +tcp rdma systemd"
+IUSE="debug infiniband libressl +tcp rdma systemd"
 
-DEPEND="sys-block/open-isns:=
+DEPEND="
+   sys-apps/kmod
+   sys-block/open-isns:=
sys-kernel/linux-headers
infiniband? ( sys-fabric/ofed )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
systemd? ( sys-apps/systemd )
 "
 RDEPEND="${DEPEND}

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/

2019-05-23 Thread Lars Wendler

commit: cadef88193083edce8315d0cfd4b8c5e27e4dbc1
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May 23 08:09:44 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 23 08:09:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cadef881

sys-block/open-iscsi: Bump to version 2.0.877

Closes: https://bugs.gentoo.org/685190
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/Manifest  |   1 +
 .../open-iscsi-2.0.877-optional_systemd.patch  |  87 ++
 .../files/open-iscsi-2.0.877-pkgconfig.patch   |  84 ++
 sys-block/open-iscsi/open-iscsi-2.0.877.ebuild | 127 +
 4 files changed, 299 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index a76fa9eec9d..15a53b3abe4 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -2,3 +2,4 @@ DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d65895
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 
2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac
 SHA512 
f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422
 DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 
8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc
 SHA512 
d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf
+DIST open-iscsi-2.0.877.tar.gz 605075 BLAKE2B 
85106a7137b2a70a56418e2c76df81d5bf464268b5030fef2560addd8a96a0b6ba767c811f7c8a181a7b30a902d3973f0f7dad7cd3cc0796979a8a1b2f9164ef
 SHA512 
1e6a6772c59dd7a809938f1ef4c9fe0310d70bf0e0f7e80643bcfa22236af8a8027122cf9ff598ce70a3ff51ccb9d5ef99fc5b9c517379bf590b8da74bfeb9a6

diff --git 
a/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch
new file mode 100644
index 000..b1f1a8f1d07
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.877-optional_systemd.patch
@@ -0,0 +1,87 @@
+From f66608aa9ce989c91f744bb2f3f34d2e01aedc87 Mon Sep 17 00:00:00 2001
+From: Lee Duncan 
+Date: Tue, 14 May 2019 13:11:34 -0700
+Subject: [PATCH] Make iscsid systemd usage optional
+
+You can compile without system now by using something
+like:
+
+   make OPTFLAGS="-DNO_SYSTEMD ..." NO_SYSTEMD=1
+
+This will skip systemd code for iscsid and iscsiuio.
+---
+ Makefile | 5 +
+ usr/Makefile | 2 ++
+ usr/iscsid.c | 6 ++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index c941740c..9a337741 100644
+--- a/Makefile
 b/Makefile
+@@ -40,6 +40,11 @@ ifneq (,$(CFLAGS))
+ export CFLAGS
+ endif
+ 
++# export systemd disablement if set
++ifneq ($(NO_SYSTEMD),)
++export NO_SYSTEMD
++endif
++
+ # Random comments:
+ # using '$(MAKE)' instead of just 'make' allows make to run in parallel
+ # over multiple makefile.
+diff --git a/usr/Makefile b/usr/Makefile
+index f1c35aa7..0203127c 100644
+--- a/usr/Makefile
 b/usr/Makefile
+@@ -41,7 +41,9 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
+ ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
++ifeq ($(NO_SYSTEMD),)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd)
++endif
+ PROGRAMS = iscsid iscsiadm iscsistart
+ 
+ # libc compat files
+diff --git a/usr/iscsid.c b/usr/iscsid.c
+index 0c984409..37c13b39 100644
+--- a/usr/iscsid.c
 b/usr/iscsid.c
+@@ -34,7 +34,9 @@
+ #include 
+ #include 
+ #include 
++#ifndef   NO_SYSTEMD
+ #include 
++#endif
+ 
+ #include "iscsid.h"
+ #include "mgmt_ipc.h"
+@@ -339,6 +341,7 @@ static void missing_iname_warn(char *initiatorname_file)
+ /* called right before we enter the event loop */
+ static void set_state_to_ready(void)
+ {
++#ifndef   NO_SYSTEMD
+   if (sessions_to_recover)
+   sd_notify(0, "READY=1\n"
+   "RELOADING=1\n"
+@@ -346,14 +349,17 @@ static void set_state_to_ready(void)
+   else
+   sd_notify(0, "READY=1\n"
+   "STATUS=Ready to process requests\n");
++#endif
+ }
+ 
+ /* called when recovery process has been reaped */
+ static void set_state_done_reloading(void)
+ {
++#ifndef   NO_SYSTEMD
+   sessions_to_recover = 0;
+   sd_notifyf(0,

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/

2019-05-09 Thread Lars Wendler

commit: f038d193d45f4637e7ecbb54a1624ba44d72175a
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May  9 15:57:10 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May  9 15:57:57 2019 +
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  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 000..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 
+Date: Sat, 2 Dec 2017 14:19:26 -0800
+Subject: [PATCH] Include  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 
+ #include 
+ #include 
++#include 
+ 
+ #include "config.h"
+

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/

2019-05-06 Thread Lars Wendler

commit: 949d34bf3917ec5a5f27dc8fb297c5a8a95ce1c0
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May  6 12:50:48 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May  6 12:54:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949d34bf

sys-block/open-iscsi: Revbump to fix a space issue

Bug: https://bugs.gentoo.org/685190
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 .../open-iscsi-2.0.876-space_in_node-mode.patch| 28 ++
 ...uild => open-iscsi-2.0.876_p20180814-r1.ebuild} |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..1b72eec7945
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.876-space_in_node-mode.patch
@@ -0,0 +1,28 @@
+From baa0cb45cfcf10a81283c191b0b236cd1a2f66ee Mon Sep 17 00:00:00 2001
+From: Lee Duncan 
+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/open-iscsi-2.0.876_p20180814.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild
similarity index 97%
rename from sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild
rename to sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild
index b111b48a68e..8d18bfc1ed4 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,6 +27,7 @@ REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 PATCHES=(
"${FILESDIR}/${PN}-2.0.876_p20180814-musl-fixes.patch"
"${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
+   "${FILESDIR}/${PN}-2.0.876-space_in_node-mode.patch" #685190
 )
 
 S="${WORKDIR}/${PN}-${MY_COMMIT}"

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2019-05-06 Thread Lars Wendler

commit: 71d17c58c12ad5435a690dd5f72ed88bae364de8
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May  6 12:53:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May  6 12:54:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d17c58

sys-block/open-iscsi: Removed old.

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-block/open-iscsi/Manifest  |   1 -
 sys-block/open-iscsi/files/musl-fixes.patch|  64 ---
 .../open-iscsi-2.0.874-include-sysmacros.patch |  20 
 .../open-iscsi-2.0.875-include-sysmacros.patch |  21 
 sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild  | 111 ---
 sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild  | 114 ---
 sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild  | 122 -
 7 files changed, 453 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index cc864142805..a76fa9eec9d 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,5 +1,4 @@
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061
 SHA512 
4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
-DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 
39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df
 SHA512 
66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 
2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac
 SHA512 
f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422
 DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 
8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc
 SHA512 
d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf

diff --git a/sys-block/open-iscsi/files/musl-fixes.patch 
b/sys-block/open-iscsi/files/musl-fixes.patch
deleted file mode 100644
index f101eda6dde..000
--- a/sys-block/open-iscsi/files/musl-fixes.patch
+++ /dev/null
@@ -1,64 +0,0 @@
 ./utils/open-isns/isns.h.orig
-+++ ./utils/open-isns/isns.h
-@@ -13,6 +13,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include 
- #include "types.h"
 ./utils/fwparam_ibft/fwparam_ppc.c.orig
-+++ ./utils/fwparam_ibft/fwparam_ppc.c
-@@ -356,7 +356,7 @@
-* Sort the nics into "natural" order.  The proc fs
-* device-tree has them in somewhat random, or reversed order.
-*/
--  qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp);
-+  qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const 
void *))nic_cmp);
- 
-   snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases");
-   dev_count = 0;
 ./usr/idbm.c.orig
-+++ ./usr/idbm.c
-@@ -25,6 +25,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
 ./usr/iscsiadm.c.orig  2012-05-21 02:59:24.0 +0200
-+++ ./usr/iscsiadm.c   2016-07-20 22:00:54.430451701 +0200
-@@ -2403,6 +2403,7 @@ main(int argc, char **argv)
-   int tpgt = PORTAL_GROUP_TAG_UNKNOWN, killiscsid=-1, do_show=0;
-   int packet_size=32, ping_count=1, ping_interval=0;
-   int do_discover = 0, sub_mode = -1;
-+  int argerror = 0;
-   struct sigaction sa_old;
-   struct sigaction sa_new;
-   struct list_head ifaces;
-@@ -2553,7 +2554,11 @@ main(int argc, char **argv)
-   return 0;
-   case 'h':
-   usage(0);
--  }
-+
-+  case '?':
-+  log_error("unrecognized character '%c'", optopt);
-+  argerror = 1;
-+  }   
- 
-   if (name && value) {
-   param = idbm_alloc_user_param(name, value);
-@@ -2568,8 +2573,7 @@ main(int argc, char **argv)
-   }
-   }
- 
--  if (optopt) {
--  log_error("unrecognized character '%c'", optopt);
-+  if (argerror) {
-   rc = ISCSI_ERR_INVAL;
-   goto free_ifaces;
-

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/

2019-01-21 Thread Lars Wendler

commit: c7b256b6031ef57750155576dc1281d621bff44a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Jan  7 15:13:10 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan 21 11:37:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b256b6

sys-block/open-iscsi: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Lars Wendler  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..000
--- 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..000
--- 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..000
--- 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.0 +0200
-+++ usr/iscsid.c   2010-10-10 23:07:55.0 +0200
-@@ -31,6 +31,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #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..000
--- 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}
-

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2018-12-28 Thread Mikle Kolyada

commit: 9a792c1bc8045ad0a832926ead6f9a094d895067
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Dec 28 11:58:35 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Dec 28 11:58:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a792c1b

sys-block/open-iscsi: Drop old

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-block/open-iscsi/Manifest |   1 -
 sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild | 104 ---
 sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild | 112 
 sys-block/open-iscsi/open-iscsi-2.0.873.ebuild|  93 -
 sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild | 121 --
 sys-block/open-iscsi/open-iscsi-2.0.874.ebuild| 108 ---
 6 files changed, 539 deletions(-)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 069168c6adc..cc864142805 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,4 +1,3 @@
-DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 
6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c
 SHA512 
d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061
 SHA512 
4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 
39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df
 SHA512 
66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
deleted file mode 100644
index e56b51bec42..000
--- a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.com/;
-MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
-SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz;
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug slp"
-DEPEND="slp? ( net-libs/openslp )"
-RDEPEND="${DEPEND}
-   sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_PV}"
-
-pkg_setup() {
-   linux-info_pkg_setup
-
-   if kernel_is -lt 2 6 16; then
-   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-   fi
-
-   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
-   # support loaded as module. Kernel builtion options don't work. See 
this for
-   # more information:
-   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-   # If there's a new release, check whether this is still valid!
-   CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-   if linux_config_exists; then
-   for module in ${CONFIG_CHECK_MODULES}; do
-   linux_chkconfig_module ${module} || ewarn "${module} 
needs to be built as module (builtin doesn't work)"
-   done
-   fi
-}
-
-src_prepare() {
-   export EPATCH_OPTS="-d${S}"
-   epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
-   epatch "${FILESDIR}"/${P}-glibc212.patch
-   epatch "${FILESDIR}"/${P}-dont-call-configure.patch
-   epatch "${FILESDIR}"/${P}-ldflags.patch
-   epatch "${FILESDIR}"/${P}-isns-slp.patch
-   epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch
-}
-
-src_configure() {
-   cd utils/open-isns || die
-   econf $(use_with slp)
-}
-
-src_compile() {
-   use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
-   einfo "Building userspace"
-   local SLP_LIBS
-   use slp && SLP_LIBS="-lslp"
-   cd "${S}" && \
-   KSRC="${KV_DIR}" CFLAGS="" \
-   emake \
-   OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \
-   AR="$(tc-getAR)" CC="$(tc-getCC)" \
-

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2018-09-08 Thread Thomas Deutschmann

commit: f6b63795ab790ba89aecbe08c831be87b02ea780
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep  8 18:31:21 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep  8 18:39:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b63795

sys-block/open-iscsi: add snapshot version to allow building against gcc-8

Closes: https://bugs.gentoo.org/660970
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sys-block/open-iscsi/Manifest  |   1 +
 .../open-iscsi-2.0.876_p20180814-musl-fixes.patch  |  85 ++
 .../open-iscsi/open-iscsi-2.0.876_p20180814.ebuild | 125 +
 3 files changed, 211 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index e8a6d18310e..069168c6adc 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -3,3 +3,4 @@ DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d65895
 DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 
39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df
 SHA512 
66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 
2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac
 SHA512 
f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422
+DIST open-iscsi-2.0.876_p20180814.tar.gz 602779 BLAKE2B 
8403d69ef43c868a009e1b7bf6e67ea0ecc0d10113b842e1f853a759398f56bb447f6c6ce5474bb2f4e9dfe59d9effc5eea58a1e7da9bbfd81c370eba1759edc
 SHA512 
d79b3025888a8b6db944c86abb13940a6c75fe10166d79ab7e242fc108603e86a81c2ea3448318a45f0e51d89d45a21bda5ab43cf75ff759007e1949030ad0bf

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
new file mode 100644
index 000..68b1bca7c7c
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.876_p20180814-musl-fixes.patch
@@ -0,0 +1,85 @@
+--- a/usr/idbm.c
 b/usr/idbm.c
+@@ -27,2 +27,3 @@
+ #include 
++#include 
+ #include 
+--- 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 
+-#include 
++#include "ethtool-compat.h"
+ #include 
+--- /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 (da...@redhat.com)
++ * Copyright 2001 Jeff Garzik 
++ * Portions Copyright 2001 Sun Microsystems (thoc...@sun.com)
++ * Portions Copyright 2002 Intel (eli.kuperm...@intel.com,
++ *christopher.le...@intel.com,
++ *scott.feld...@intel.com)
++ * Portions Copyright (C) Sun Microsystems 2008
++ */
++
++#include 
++#include 
++
++#define ETHTOOL_FWVERS_LEN32
++#define ETHTOOL_BUSINFO_LEN   32
++#define ETHTOOL_EROMVERS_LEN  32
++
++struct ethtool_drvinfo {
++  __u32   cmd;
++  chardriver[32];
++  charversion[32];
++  charfw_version[ETHTOOL_FWVERS_LEN];
++  charbus_info[ETHTOOL_BUSINFO_LEN];
++  charerom_version[ETHTOOL_EROMVERS_LEN];
++  charreserved2[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;
++  __u8tos;
++};
++
++struct ethtool_ah_espip4_spec {
++  __be32  ip4src;
++  __be32  ip4dst;
++  __be32  spi;
++  __u8tos;
++};
++
++#define ETHTOOL_GDRVINFO  0x0003 /* Get driver info. */

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.876_p20180814.ebuild

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2018-04-22 Thread Aaron Bauman

commit: 7cd2cb3cf1d6aa01bd9cf27569f8de38dbd6a881
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Apr 23 00:23:57 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Apr 23 00:23:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd2cb3c

sys-block/open-iscsi: amd64 stable wrt bug #643122

Bug: https://bugs.gentoo.org/643122
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
index 23d6d5173cc..3ee56434ec4 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="debug infiniband +tcp rdma"
 
 DEPEND="sys-block/open-isns:=

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2018-04-04 Thread Sergei Trofimovich

commit: 69ca11666df58b4182bd00fd54689cd3a3aee348
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Apr  4 18:01:04 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Apr  4 22:25:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69ca1166

sys-block/open-iscsi: stable 2.0.875 for sparc

Bug: https://bugs.gentoo.org/643122
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
index ad34afa8e39..23d6d5173cc 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="debug infiniband +tcp rdma"
 
 DEPEND="sys-block/open-isns:=

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2018-03-22 Thread Sergei Trofimovich

commit: 78569aed5c897428d4ac7ba3cfcd2943ba28bf1e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Mar 23 00:01:47 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Mar 23 00:01:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78569aed

sys-block/open-iscsi: stable 2.0.875 for ppc64, bug #643122

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"

 sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
index bd0412e127e..e5ea7b969f7 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE="debug infiniband +tcp rdma"
 
 DEPEND="sys-block/open-isns:=

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2018-03-18 Thread Sergei Trofimovich

commit: e9c3156f696821885fa386359622c7df3d1c7eab
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 18 23:19:18 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 18 23:19:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c3156f

sys-block/open-iscsi: stable 2.0.875 for ppc, bug #643122

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
index 1b690bab83e..bd0412e127e 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sparc ~x86"
 IUSE="debug infiniband +tcp rdma"
 
 DEPEND="sys-block/open-isns:=

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2018-02-21 Thread Thomas Deutschmann

commit: 1e9e2ee79e046188ea7fd5e03499f8e37ed64972
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Feb 21 17:40:02 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Feb 21 17:42:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e9e2ee7

sys-block/open-iscsi: Bump to v2.0.876

Closes: https://bugs.gentoo.org/645910
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-block/open-iscsi/Manifest  |   1 +
 .../files/open-iscsi-2.0.876-Makefiles.patch   |  61 +++
 .../files/open-iscsi-2.0.876-musl-fixes.patch  |  92 
 sys-block/open-iscsi/open-iscsi-2.0.876.ebuild | 121 +
 4 files changed, 275 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index c32070244d8..e8a6d18310e 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -2,3 +2,4 @@ DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 
6a4911347c55c1c4906350247ae7d92c2a
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061
 SHA512 
4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 
39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df
 SHA512 
66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36
+DIST open-iscsi-2.0.876.tar.gz 576111 BLAKE2B 
2fbe4f37e91730d15bad77feeb9a418a8bbf709582598571a5905080eb60649f3ece6a52e9cf94a28128f2b0bc30093e67f6a47624545243b10bcebe318750ac
 SHA512 
f9319016bd6abf3bf675ad050b0489095a21db58c93f9baaca6adc239129ad08f8e18ed96c91c36406e5c42d35118e67dfde6d3c37e97027467c4472db3b2422

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch
new file mode 100644
index 000..2cfa4362285
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.876-Makefiles.patch
@@ -0,0 +1,61 @@
+--- a/usr/Makefile
 b/usr/Makefile
+@@ -69,9 +69,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) 
$(FW_BOOT_SRCS) \
+   iscsistart.o statics.o
+   $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB)
+ clean:
+-  rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
++  $(RM) *.o $(PROGRAMS) .depend $(LIBSYS)
+ 
+ depend:
+-  gcc $(CFLAGS) -M `ls *.c` > .depend
++  $(CC) $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
+--- a/utils/Makefile
 b/utils/Makefile
+@@ -10,9 +10,9 @@ iscsi-iname: md5.o iscsi-iname.o
+   $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
+ 
+ clean:
+-  rm -f *.o $(PROGRAMS) .depend
++  $(RM) *.o $(PROGRAMS) .depend
+ 
+ depend:
+-  gcc $(CFLAGS) -M `ls *.c` > .depend
++  $(CC) $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
+--- a/utils/fwparam_ibft/Makefile
 b/utils/fwparam_ibft/Makefile
+@@ -41,11 +41,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr
+ all: $(OBJS)
+ 
+ clean:
+-  rm -f *.o $(CLEANFILES) .depend
++  $(RM) *.o $(CLEANFILES) .depend
+ 
+ $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
+ 
+ depend:
+-  gcc $(CFLAGS) -M `ls *.c` > .depend
++  $(CC) $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
+--- a/utils/sysdeps/Makefile
 b/utils/sysdeps/Makefile
+@@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o
+ all: $(SYSDEPS_OBJS)
+ 
+ clean:
+-  rm -f *.o .depend
++  $(RM) *.o .depend
+ 
+ depend:
+-  gcc $(CFLAGS) -M `ls *.c` > .depend
++  $(CC) $(CFLAGS) -M `ls *.c` > .depend
+ 
+ -include .depend
+-- 
+2.16.2
+

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
new file mode 100644
index 000..7bb0c5d6e77
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.876-musl-fixes.patch
@@ -0,0 +1,92 @@
+--- a/usr/idbm.c
 b/usr/idbm.c
+@@ -27,2 +27,3 @@
+ #include 
++#include 
+ #include 
+--- 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) {
+-

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2018-02-20 Thread Sergei Trofimovich

commit: f0eb3cacba706923bd7c91f488ca5ab4e5d07aec
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Feb 20 08:18:07 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Feb 20 08:18:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0eb3cac

sys-block/open-iscsi: stable 2.0.875 for ia64, bug #643122

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
index 6aca7c297d4..1b690bab83e 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug infiniband +tcp rdma"
 
 DEPEND="sys-block/open-isns:=

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2018-01-18 Thread Matt Thode

commit: 06651b696aa98709fe6c8a0bafd4cf47052f
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jan 18 19:13:39 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Jan 18 19:13:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06651b69

sys-block/open-iscsi: need linux/types.h to build

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
index cb09a91bbcd..6aca7c297d4 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 
~sparc ~x86"
 IUSE="debug infiniband +tcp rdma"
 
 DEPEND="sys-block/open-isns:=
-   infiniband? ( sys-fabric/ofed )"
+   infiniband? ( sys-fabric/ofed )
+   sys-kernel/linux-headers"
 RDEPEND="${DEPEND}
sys-fs/lsscsi
sys-apps/util-linux"

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2018-01-02 Thread Thomas Deutschmann

commit: 8f8b158508c54c33a20832cafc637da709773f31
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jan  2 14:53:44 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jan  2 14:53:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8b1585

sys-block/open-iscsi: Bump to v2.0.875

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-block/open-iscsi/Manifest  |   1 +
 .../open-iscsi-2.0.875-include-sysmacros.patch |  21 
 sys-block/open-iscsi/open-iscsi-2.0.875.ebuild | 122 +
 3 files changed, 144 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 8a7aef4797d..c32070244d8 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,3 +1,4 @@
 DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 
6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c
 SHA512 
d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
 DIST open-iscsi-2.0-873.tar.gz 667069 BLAKE2B 
edb427f8483c31499cdde644bbf8d658952952fa8d52a232537e7e6ec71d2d237dcd4e8759de21b65cac757678c7d71c22bd2fe71ed1e7ac152ae8396f080061
 SHA512 
4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 DIST open-iscsi-2.0.874.tar.gz 625039 BLAKE2B 
39e4b818b1c977d43aa6490acd4d65e688c8cd03a7ae4c03d18d6b81aa76773b0a1227b3e8d975f2a14108075bb680434ded5337db296839bd5be012130df9df
 SHA512 
66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae
+DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 
34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e
 SHA512 
1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dca3d815015ed8696e1694aa19f3231132f90d1e5b36

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 000..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 
+Date: Sat, 2 Dec 2017 14:19:26 -0800
+Subject: [PATCH] Include  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 
+ #include 
+ #include 
++#include 
+ 
+ #include "config.h"
+ 

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
new file mode 100644
index 000..cb09a91bbcd
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.875.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools versionator linux-info flag-o-matic toolchain-funcs udev 
systemd
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.com/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband +tcp rdma"
+
+DEPEND="sys-block/open-isns:=
+   infiniband? ( sys-fabric/ofed )"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.0.874-Makefiles.patch"
+   "${FILESDIR}/${PN}-2.0.874-musl-fixes.patch"
+   "${FILESDIR}/${PN}-2.0.874-musl-ethtool-compat.patch"
+   "${FILESDIR}/${P}-include-sysmacros.patch"
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? (

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2018-01-02 Thread Thomas Deutschmann

commit: 9278a10daad10aaedff21f2ca630570a1c0dacbe
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jan  2 14:01:56 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jan  2 14:53:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9278a10d

sys-block/open-iscsi: Rev bump to fix multiple issues

Ebuild changes:
===
- Patch: Include sysmacros.h. [Bug 604442]

- Install systemd service. [Bug 640598]

- Remove deprecated iscsidev.sh udev rule in favor of udev native iSCSI
  support which is available since udev-143. [Bug 633574]

- Drop "slp" USE flag. [Bug 558366]

Bug: https://bugs.gentoo.org/558366
Closes: https://bugs.gentoo.org/604442
Closes: https://bugs.gentoo.org/640598
Closes: https://bugs.gentoo.org/633574
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../open-iscsi-2.0.874-include-sysmacros.patch |  20 
 sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild  | 122 +
 2 files changed, 142 insertions(+)

diff --git 
a/sys-block/open-iscsi/files/open-iscsi-2.0.874-include-sysmacros.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.874-include-sysmacros.patch
new file mode 100644
index 000..05d5d1239cb
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.874-include-sysmacros.patch
@@ -0,0 +1,20 @@
+--- a/iscsiuio/src/unix/libs/bnx2.c
 b/iscsiuio/src/unix/libs/bnx2.c
+@@ -46,6 +46,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "config.h"
+ 
+--- a/iscsiuio/src/unix/libs/bnx2x.c
 b/iscsiuio/src/unix/libs/bnx2x.c
+@@ -50,6 +50,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "config.h"
+ 

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild
new file mode 100644
index 000..24e8be24de1
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.874-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools versionator linux-info flag-o-matic toolchain-funcs udev 
systemd
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.com/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband +tcp rdma"
+
+DEPEND="sys-block/open-isns:=
+   infiniband? ( sys-fabric/ofed )"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+   "${FILESDIR}/${P}-Makefiles.patch"
+   "${FILESDIR}/${P}-musl-fixes.patch"
+   "${FILESDIR}/${P}-musl-ethtool-compat.patch"
+   "${FILESDIR}/${P}-include-sysmacros.patch"
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"$
+   done
+   fi
+   fi
+}
+
+src_prepare() {
+   sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' 
etc/iscsid.conf || die
+   default
+
+   pushd iscsiuio >/dev/null || die
+   eautoreconf
+   popd >/dev/null || die
+}
+
+src_configure() {
+   use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+   append-lfs-flags
+}
+
+src_compile() {
+   # Stuffing

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2017-12-01 Thread David Seifert

commit: 2502bb82208e015efbb407161a65fdd942ec28f9
Author: David Seifert  gentoo  org>
AuthorDate: Fri Dec  1 21:16:59 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Dec  1 22:17:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2502bb82

sys-block/open-iscsi: [QA] Fix DESCRIPTION.toolong

 sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild | 2 +-
 sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild | 2 +-
 sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild | 2 +-
 sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild | 2 +-
 sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild | 2 +-
 sys-block/open-iscsi/open-iscsi-2.0.873.ebuild| 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
index 33add91a2b4..e56b51bec42 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic toolchain-funcs
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/;
 MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
 SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz;

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
index fc5ff0ea891..4e5854c5f89 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic toolchain-funcs
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/;
 MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
 SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz;

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
index db8bd4e65fa..f69cf961660 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
@@ -7,7 +7,7 @@ inherit versionator linux-info eutils flag-o-matic 
toolchain-funcs udev
 
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/;
 SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz;
 

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
index d1b340ee2b7..4ea93fca337 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
@@ -7,7 +7,7 @@ inherit versionator linux-info eutils flag-o-matic 
toolchain-funcs udev
 
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/;
 SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz;
 

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
index 3902a002165..72734745c81 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
@@ -7,7 +7,7 @@ inherit versionator linux-info eutils flag-o-matic 
toolchain-funcs udev
 
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/;
 SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz;
 

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
index 7311e4328e6..9e1610b7395 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
@@ -7,7 +7,7 @@ inherit versionator linux-info eutils flag-o-matic 
toolchain-funcs
 
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/;

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2017-07-30 Thread Michał Górny

commit: 0156efb879d6fa26abe08a010d23e9487e690880
Author: David Hicks  hicks  id  au>
AuthorDate: Fri Jul 28 23:04:25 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul 30 08:35:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0156efb8

sys-block/open-iscsi: use HTTPS for GitHub, fix white space

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild | 6 +++---
 sys-block/open-iscsi/open-iscsi-2.0.874.ebuild| 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
index e82f5adaaf8..4f623960f7b 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
@@ -7,7 +7,7 @@ inherit versionator linux-info flag-o-matic toolchain-funcs udev
 
 DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/;
-SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -113,9 +113,9 @@ pkg_postinst() {
in='/etc/iscsi/initiatorname.iscsi'
if [ ! -f "${EROOT}${in}" -a -f "${EROOT}${in}.example" ]; then
{
- cat "${EROOT}${in}.example" 
+ cat "${EROOT}${in}.example"
  echo "# InitiatorName generated by ${CATEGORY}/${PF} at 
$(date -uR)"
- echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)" 
+ echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" 
"${EROOT}${in}"
fi
 }

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
index deb7e905b75..400251eb5d0 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
@@ -7,7 +7,7 @@ inherit versionator linux-info flag-o-matic toolchain-funcs udev
 
 DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/;
-SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2017-06-19 Thread Alexis Ballier

commit: 76d3d7e4be6dc9873123a7cb41d35598411c5218
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jun 19 18:04:52 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jun 19 18:12:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d3d7e4

sys-block/open-iscsi: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
index 19580580522..e82f5adaaf8 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug infiniband slp +tcp rdma"
 
 DEPEND="sys-block/open-isns:=

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2017-06-18 Thread Robin H. Johnson

commit: 5383d8bfd148b344ac2533e71f5bb5d0c014a7a3
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Jun 18 20:32:47 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Jun 18 20:33:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5383d8bf

sys-block/open-iscsi: update HOMEPAGE.

Package-Manager: portage-2.3.6
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild | 4 ++--
 sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild | 4 ++--
 sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild | 4 ++--
 sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild | 4 ++--
 sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild | 2 +-
 sys-block/open-iscsi/open-iscsi-2.0.873.ebuild| 4 ++--
 sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild | 2 +-
 sys-block/open-iscsi/open-iscsi-2.0.874.ebuild| 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
index 46534d9055e..33add91a2b4 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/;
+HOMEPAGE="http://www.open-iscsi.com/;
 MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
 SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz;
 LICENSE="GPL-2"

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
index a86432d0ac7..fc5ff0ea891 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/;
+HOMEPAGE="http://www.open-iscsi.com/;
 MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
 SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz;
 LICENSE="GPL-2"

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
index 8f6a2d13baf..db8bd4e65fa 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit versionator linux-info eutils flag-o-matic 
toolchain-funcs udev
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
 DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/;
+HOMEPAGE="http://www.open-iscsi.com/;
 SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
index 00de0c4fb54..d1b340ee2b7 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit versionator linux-info eutils flag-o-matic 
toolchain-funcs udev
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
 DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/;
+HOMEPAGE="http://www.open-iscsi.com/;
 SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
index e65204352cb..3902a002165 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
@@ -8,7 +8,7 @@ inherit versionator linux-info eutils flag-o-matic 
toolchain-funcs udev
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
 DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
-HOMEPAGE="http://www.open-iscsi.org/;
+HOMEPAGE="http://www.open-iscsi.com/;
 SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2017-06-17 Thread Robin H. Johnson

commit: 909dc831cc060ea52824596cf8ce32b418600c6f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Jun 18 03:28:05 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Jun 18 03:32:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909dc831

sys-block/open-iscsi: prevent endless changes of /etc/iscsi/initiatorname.iscsi.

Upstream now generates /etc/iscsi/initiatorname.iscsi during the install
phase, but it is NOT deterministic. The content of the file should be
generated ONCE and kept over upgrades & reinstalls.

The upstream Makefile assumes that DESTDIR is the rootfs, and generates
/etc/iscsi/initiatorname.iscsi anytime it does not exist.

Build /etc/iscsi/initiatorname.iscsi ourselves, as we used to do in
older versions.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=601514
Gentoo-Bug: 601514
Package-Manager: portage-2.3.6
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild | 121 ++
 1 file changed, 121 insertions(+)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
new file mode 100644
index 000..1f5180b364b
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.874-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator linux-info flag-o-matic toolchain-funcs udev
+
+DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
+HOMEPAGE="https://github.com/open-iscsi/open-iscsi; # 
http://www.open-iscsi.com is dead
+SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug infiniband slp +tcp rdma"
+
+DEPEND="sys-block/open-isns:=
+   slp? ( net-libs/openslp )
+   infiniband? ( sys-fabric/ofed )"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+
+PATCHES=(
+   "${FILESDIR}/${P}-Makefiles.patch"
+   "${FILESDIR}/${P}-musl-fixes.patch"
+   "${FILESDIR}/${P}-musl-ethtool-compat.patch"
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"$
+   done
+   fi
+   fi
+}
+
+src_prepare() {
+   sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' 
etc/iscsid.conf || die
+   default
+}
+
+src_configure() {
+   use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+   append-lfs-flags
+}
+
+src_compile() {
+   # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
+   # is messed up already here, so it's not making it that much worse.
+   KSRC="${KV_DIR}" CFLAGS="" \
+   emake \
+   OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
+   AR="$(tc-getAR)" CC="$(tc-getCC)" \
+   user
+}
+
+src_install() {
+   emake DESTDIR="${ED}" sbindir="/usr/sbin" install
+   # Upstream make is not deterministic, per bug #601514
+   rm -f "${ED}"/etc/initiatorname.iscsi
+
+   dodoc README THANKS
+
+   docinto test/
+   dodoc test/*
+
+   insinto /etc/iscsi
+   newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+
+   # udev pieces
+

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2017-01-03 Thread Matt Thode

commit: 58e097ea1b52aec579753740303ad9d88878a4a1
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jan  3 22:46:04 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue Jan  3 22:46:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58e097ea

sys-block/open-iscsi: cleanup the ebuild slightly for eapi6

Package-Manager: portage-2.3.0

 sys-block/open-iscsi/open-iscsi-2.0.874.ebuild | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
index 5aea512..fcebbca 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
@@ -23,6 +23,12 @@ RDEPEND="${DEPEND}
sys-apps/util-linux"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 
+PATCHES=(
+   "${FILESDIR}/${P}-Makefiles.patch"
+   "${FILESDIR}/${P}-musl-fixes.patch"
+   "${FILESDIR}/${P}-musl-ethtool-compat.patch"
+)
+
 pkg_setup() {
linux-info_pkg_setup
 
@@ -59,12 +65,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-   eapply "${FILESDIR}"/${P}-Makefiles.patch
-   eapply "${FILESDIR}"/${P}-musl-fixes.patch
-   eapply "${FILESDIR}"/${P}-musl-ethtool-compat.patch
-   eapply_user
-
sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' 
etc/iscsid.conf || die
+   default
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/

2017-01-03 Thread Anthony G. Basile

commit: da400dec15a2987751259860fea158bf252b3baa
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Jan  3 22:13:18 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Jan  3 22:13:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da400dec

sys-block/open-iscsi: use compat  to build on musl

Package-Manager: portage-2.3.0

 .../open-iscsi-2.0.874-musl-ethtool-compat.patch   | 69 ++
 sys-block/open-iscsi/open-iscsi-2.0.874.ebuild |  7 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)

diff --git 
a/sys-block/open-iscsi/files/open-iscsi-2.0.874-musl-ethtool-compat.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.874-musl-ethtool-compat.patch
new file mode 100644
index ..12b82c7
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.874-musl-ethtool-compat.patch
@@ -0,0 +1,69 @@
+From: Anthony G. Basiel 
+
+diff -Naur open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/bnx2x.c 
open-iscsi-2.0.874/iscsiuio/src/unix/libs/bnx2x.c
+--- open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/bnx2x.c 2016-09-29 
18:33:24.0 +
 open-iscsi-2.0.874/iscsiuio/src/unix/libs/bnx2x.c  2017-01-03 
21:45:47.504035833 +
+@@ -42,7 +42,7 @@
+ #include 
+ #include   /* Needed for linux/ethtool.h on RHEL 5.x */
+ #include 
+-#include 
++#include "ethtool-compat.h"
+ #include 
+ #include 
+ #include 
+diff -Naur open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/ethtool-compat.h 
open-iscsi-2.0.874/iscsiuio/src/unix/libs/ethtool-compat.h
+--- open-iscsi-2.0.874.orig/iscsiuio/src/unix/libs/ethtool-compat.h
1970-01-01 00:00:00.0 +
 open-iscsi-2.0.874/iscsiuio/src/unix/libs/ethtool-compat.h 2017-01-03 
21:45:23.016034980 +
+@@ -0,0 +1,51 @@
++/*
++ * ethtool-compat.h: adopted from
++ # ethtool.h: Defines for Linux ethtool.
++ *
++ * Copyright (C) 1998 David S. Miller (da...@redhat.com)
++ * Copyright 2001 Jeff Garzik 
++ * Portions Copyright 2001 Sun Microsystems (thoc...@sun.com)
++ * Portions Copyright 2002 Intel (eli.kuperm...@intel.com,
++ *christopher.le...@intel.com,
++ *scott.feld...@intel.com)
++ * Portions Copyright (C) Sun Microsystems 2008
++ */
++
++#include 
++#include 
++
++#define ETHTOOL_FWVERS_LEN32
++#define ETHTOOL_BUSINFO_LEN   32
++#define ETHTOOL_EROMVERS_LEN  32
++
++struct ethtool_drvinfo {
++  __u32   cmd;
++  chardriver[32];
++  charversion[32];
++  charfw_version[ETHTOOL_FWVERS_LEN];
++  charbus_info[ETHTOOL_BUSINFO_LEN];
++  charerom_version[ETHTOOL_EROMVERS_LEN];
++  charreserved2[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;
++  __u8tos;
++};
++
++struct ethtool_ah_espip4_spec {
++  __be32  ip4src;
++  __be32  ip4dst;
++  __be32  spi;
++  __u8tos;
++};
++
++#define ETHTOOL_GDRVINFO  0x0003 /* Get driver info. */

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
index 61e16f0..5aea512 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev
+inherit versionator linux-info flag-o-matic toolchain-funcs udev
 
 DESCRIPTION="A performant, transport independent, multi-platform 
implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.org/;
@@ -59,8 +59,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-Makefiles.patch
-   epatch "${FILESDIR}"/${P}-musl-fixes.patch
+   eapply "${FILESDIR}"/${P}-Makefiles.patch
+   eapply "${FILESDIR}"/${P}-musl-fixes.patch
+   eapply "${FILESDIR}"/${P}-musl-ethtool-compat.patch
eapply_user
 
sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' 
etc/iscsid.conf || die

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/

2017-01-02 Thread Matt Thode

commit: 8ccdb781a9296e090b48e0ab1c18f802a4461c8b
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Jan  2 18:48:15 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Mon Jan  2 18:49:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ccdb781

sys-block/open-iscsi: bup

Package-Manager: portage-2.3.0

 sys-block/open-iscsi/Manifest  |   1 +
 .../files/open-iscsi-2.0.874-Makefiles.patch   | 116 +
 .../files/open-iscsi-2.0.874-musl-fixes.patch  |  51 +
 sys-block/open-iscsi/open-iscsi-2.0.874.ebuild | 106 +++
 4 files changed, 274 insertions(+)

diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 10492fa..b9fdb58 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,2 +1,3 @@
 DIST open-iscsi-2.0-872.tar.gz 900081 SHA256 
37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f SHA512 
d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
 WHIRLPOOL 
4b04c8481c6c5f094ca6f7761828006a84eda7a22a6b3a4d65e7b3e4b39e73ef839ec710b491e7ca731b047fa8c74a9c03a17e85519a62dfbeb95222cfbdd935
 DIST open-iscsi-2.0-873.tar.gz 667069 SHA256 
7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9 SHA512 
4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b
 WHIRLPOOL 
05af106f11da9f9f02c10edd5412d0f99816349e06e192059700eb1ae24a36027c3f0d7ed423aa7bb1c0b9d8b3aa1b6aa72a2aadb00f27762edf16b7f7d08c09
+DIST open-iscsi-2.0.874.tar.gz 625039 SHA256 
d0071bf00fdf6591cd6ea5caf89fa57ada03d263da1f80f17deff76acf7419e1 SHA512 
66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae
 WHIRLPOOL 
488aea5551a299bbb15118efc52d7c228836e9cc7973a99ee4b8dfcfea4b7b14e86791e65230d25c244b6b5fe8ffaf1ae3df01f5a7b223b93c15aeb035a12852

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.874-Makefiles.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.874-Makefiles.patch
new file mode 100644
index ..33c5d8a
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.874-Makefiles.patch
@@ -0,0 +1,116 @@
+diff -dur a/Makefile b/Makefile
+--- a/Makefile 2016-09-29 13:33:24.0 -0500
 b/Makefile 2017-01-02 11:25:04.606549073 -0600
+@@ -14,8 +14,8 @@
+ etcdir = /etc
+ initddir = $(etcdir)/init.d
+ 
+-MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 
iscsiuio/docs/iscsiuio.8
+-PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname 
iscsiuio/src/unix/iscsiuio
++MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 doc/iscsistart.8 
doc/iscsi-iname.8
++PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname 
usr/iscsistart
+ INSTALL = install
+ ETCFILES = etc/iscsid.conf
+ IFACEFILES = etc/iface.example
+@@ -99,11 +99,11 @@
+ # ugh, auto-detection is evil
+ # Gentoo maintains their own init.d stuff
+ install_initd:
+-  if [ -f /etc/debian_version ]; then \
++  if [ -f $(DESTDIR)$(etcdir)/debian_version ]; then \
+   $(MAKE) install_initd_debian ; \
+-  elif [ -f /etc/redhat-release ]; then \
++  elif [ -f $(DESTDIR)$(etcdir)/redhat-release ]; then \
+   $(MAKE) install_initd_redhat ; \
+-  elif [ -f /etc/SuSE-release ]; then \
++  elif [ -f $(DESTDIR)$(etcdir)/SuSE-release ]; then \
+   $(MAKE) install_initd_suse ; \
+   fi
+ 
+@@ -130,7 +130,7 @@
+   $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces
+ 
+ install_etc: $(ETCFILES)
+-  if [ ! -f $(DESTDIR)/etc/iscsi/iscsid.conf ]; then \
++  if [ ! -f $(DESTDIR)$(etcdir)/iscsi/iscsid.conf ]; then \
+   $(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \
+   $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \
+   fi
+@@ -143,11 +143,11 @@
+   $(MAKE) -C kernel install_kernel
+ 
+ install_iname:
+-  if [ ! -f $(DESTDIR)/etc/iscsi/initiatorname.iscsi ]; then \
+-  echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > 
$(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \
++  if [ ! -f $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ]; then \
++  echo "InitiatorName=`$(DESTDIR)$(sbindir)/iscsi-iname`" > 
$(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ; \
+   echo "***" ; \
+-  echo "Setting InitiatorName to `cat 
$(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \
+-  echo "To override edit 
$(DESTDIR)/etc/iscsi/initiatorname.iscsi" ; \
++  echo "Setting InitiatorName to `cat 
$(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi`" ; \
++  echo "To override edit $(etcdir)/iscsi/initiatorname.iscsi" ; \
+   echo "***" ; \
+   fi
+ 
+diff -dur

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/

2017-01-02 Thread Matt Thode

commit: 47fd69ecdf0411ae786a83ed41e4dae74f9e4af4
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Jan  2 16:53:25 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Mon Jan  2 16:55:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47fd69ec

sys-block/open-iscsi: bup to fix musl breakage

Package-Manager: portage-2.3.0

 sys-block/open-iscsi/files/musl-fixes.patch   |  64 
 sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild | 115 ++
 2 files changed, 179 insertions(+)

diff --git a/sys-block/open-iscsi/files/musl-fixes.patch 
b/sys-block/open-iscsi/files/musl-fixes.patch
new file mode 100644
index ..f101eda
--- /dev/null
+++ b/sys-block/open-iscsi/files/musl-fixes.patch
@@ -0,0 +1,64 @@
+--- ./utils/open-isns/isns.h.orig
 ./utils/open-isns/isns.h
+@@ -13,6 +13,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include "types.h"
+--- ./utils/fwparam_ibft/fwparam_ppc.c.orig
 ./utils/fwparam_ibft/fwparam_ppc.c
+@@ -356,7 +356,7 @@
+* Sort the nics into "natural" order.  The proc fs
+* device-tree has them in somewhat random, or reversed order.
+*/
+-  qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp);
++  qsort(niclist, nic_count, sizeof(char *), (int (*)(const void *, const 
void *))nic_cmp);
+ 
+   snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases");
+   dev_count = 0;
+--- ./usr/idbm.c.orig
 ./usr/idbm.c
+@@ -25,6 +25,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+--- ./usr/iscsiadm.c.orig  2012-05-21 02:59:24.0 +0200
 ./usr/iscsiadm.c   2016-07-20 22:00:54.430451701 +0200
+@@ -2403,6 +2403,7 @@ main(int argc, char **argv)
+   int tpgt = PORTAL_GROUP_TAG_UNKNOWN, killiscsid=-1, do_show=0;
+   int packet_size=32, ping_count=1, ping_interval=0;
+   int do_discover = 0, sub_mode = -1;
++  int argerror = 0;
+   struct sigaction sa_old;
+   struct sigaction sa_new;
+   struct list_head ifaces;
+@@ -2553,7 +2554,11 @@ main(int argc, char **argv)
+   return 0;
+   case 'h':
+   usage(0);
+-  }
++
++  case '?':
++  log_error("unrecognized character '%c'", optopt);
++  argerror = 1;
++  }   
+ 
+   if (name && value) {
+   param = idbm_alloc_user_param(name, value);
+@@ -2568,8 +2573,7 @@ main(int argc, char **argv)
+   }
+   }
+ 
+-  if (optopt) {
+-  log_error("unrecognized character '%c'", optopt);
++  if (argerror) {
+   rc = ISCSI_ERR_INVAL;
+   goto free_ifaces;
+   

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
new file mode 100644
index ..9581963
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev
+
+MY_P="${PN}-$(replace_version_separator 2 "-")"
+
+DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.org/;
+SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug slp +tcp infiniband rdma"
+
+DEPEND="slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed )"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2016-06-29 Thread Alexey Shvetsov

commit: 414011e6a5b489c0760232100166a671ff6cdbec
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Wed Jun 29 14:29:28 2016 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Wed Jun 29 22:31:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=414011e6

sys-block/open-iscsi: adapt sys-infiniband to sys-fabric rename

Package-Manager: portage-2.3.0_rc1

 sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
index 8166a27..3cc19c5 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug slp +tcp infiniband rdma"
 
-DEPEND="slp? ( net-libs/openslp ) infiniband? ( sys-infiniband/ofed )"
+DEPEND="slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed )"
 RDEPEND="${DEPEND}
sys-fs/lsscsi
sys-apps/util-linux"

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2016-05-06 Thread Patrick Lauer

commit: 0eea737d97f74af8ca0f0dff743135ca1e54e851
Author: Patrick Lauer  gentoo  org>
AuthorDate: Fri May  6 07:46:42 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Fri May  6 07:49:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eea737d

sys-block/open-iscsi: Remove unneeded useflag descriptions from metadata.xml, 
whitespace

Package-Manager: portage-2.2.28

 sys-block/open-iscsi/metadata.xml |  1 -
 sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild | 18 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/sys-block/open-iscsi/metadata.xml 
b/sys-block/open-iscsi/metadata.xml
index 14b6b2e..1aa48d0 100644
--- a/sys-block/open-iscsi/metadata.xml
+++ b/sys-block/open-iscsi/metadata.xml
@@ -8,6 +8,5 @@

Support iSCSI over TCP
Support iSCSI over RDMA
-   Support iSCSI over Infiniband iSER

 

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
index a6a58cb..8166a27 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -46,15 +46,15 @@ pkg_setup() {
linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
done
fi
-if use infiniband; then
-for module in ${INFINIBAND_MODULES}; do
-linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
-done
+   if use infiniband; then
+   for module in ${INFINIBAND_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
fi
-if use rdma; then
-for module in ${RDMA_MODULES}; do
-linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"$
-done
+   if use rdma; then
+   for module in ${RDMA_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"$
+   done
fi
fi
 }

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2016-04-20 Thread Robin H. Johnson

commit: 60d26a2ac89857e39e9883a0bfbe8ab14f14b6fb
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Apr 20 20:50:25 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Wed Apr 20 20:50:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d26a2a

sys-block/open-iscsi: Bug #580380: improve checks for rmda/iser vs tcp.

Package-Manager: portage-2.2.28

 sys-block/open-iscsi/metadata.xml |   5 +
 sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild | 112 ++
 2 files changed, 117 insertions(+)

diff --git a/sys-block/open-iscsi/metadata.xml 
b/sys-block/open-iscsi/metadata.xml
index 56c1244..14b6b2e 100644
--- a/sys-block/open-iscsi/metadata.xml
+++ b/sys-block/open-iscsi/metadata.xml
@@ -5,4 +5,9 @@
base-sys...@gentoo.org
Gentoo Base System
 
+   
+   Support iSCSI over TCP
+   Support iSCSI over RDMA
+   Support iSCSI over Infiniband iSER
+   
 

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
new file mode 100644
index 000..a6a58cb
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev
+
+MY_P="${PN}-$(replace_version_separator 2 "-")"
+
+DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.org/;
+SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug slp +tcp infiniband rdma"
+
+DEPEND="slp? ( net-libs/openslp ) infiniband? ( sys-infiniband/ofed )"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtin options don't work. See this 
for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   RDMA_MODULES="INFINIBAND_ISER"
+   INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD 
INFINIBAND_USER_ACCESS"
+   CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) 
infiniband? ( ${INFINIBAND_MODULES} )"
+   if linux_config_exists; then
+   if use tcp; then
+   for module in ${TCP_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+   done
+   fi
+if use infiniband; then
+for module in ${INFINIBAND_MODULES}; do
+linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"
+done
+   fi
+if use rdma; then
+for module in ${RDMA_MODULES}; do
+linux_chkconfig_module ${module} || ewarn 
"${module} needs to be built as module (builtin doesn't work)"$
+done
+   fi
+   fi
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-Makefiles.patch
+   epatch "${FILESDIR}"/${P}-memset.patch
+
+   sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' 
etc/iscsid.conf || die
+}
+
+src_configure() {
+   use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+   append-lfs-flags
+
+   cd utils/open-isns || die
+
+   # SSL (--with-security) is broken
+   econf $(use_with slp) \
+   --without-security
+}
+
+src_compile() {
+   # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
+   # is messed up already here, so it's not making it that much worse.
+   KSRC="${KV_DIR}" CFLAGS="" \
+   emake \
+   OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
+   AR="$(tc-getAR)" CC="$(tc-getCC)" \
+   user
+}
+
+src_install() {
+   emake DESTDIR="${ED}" sbindir="/usr/sbin" install
+
+   dodoc README THANKS
+
+   docinto test/
+   dodoc test/*
+
+   insinto /etc/iscsi
+   newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+
+   # udev pieces
+   udev_dorules "${FILESDIR}"/99-iscsi.rules
+   exeinto /etc/udev/scripts
+

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/

2016-03-21 Thread Lars Wendler

commit: 021889cdf5ed7bc4ea3dd881887ce752820c75d3
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Mar 21 06:41:11 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Mar 21 06:41:11 2016 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2015-12-17 Thread Mike Frysinger

commit: 6bf1b23b0304124e45aee007a8f91d67a2d73b91
Author: Victor Dodon  chromium  org>
AuthorDate: Thu Dec 17 23:36:16 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Dec 18 00:00:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf1b23b

sys-block/open-iscsi: do not use ROOT in src_install

We do not want to use ROOT to control where sbin progs are installed.
Switch to EPREFIX instead.

 sys-block/open-iscsi/open-iscsi-2.0.873.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
index 53bf0ef..43baf52 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
@@ -69,7 +69,7 @@ src_compile() {
 }
 
 src_install() {
-   emake DESTDIR="${D}" sbindir="${ROOT}usr/sbin/" install
+   emake DESTDIR="${ED}" sbindir="/usr/sbin" install
 
dodoc README THANKS

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2015-12-17 Thread Mike Frysinger

commit: 8b462df9b928414beb7271fce8e52fb5bd9d5a08
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Dec 17 23:46:40 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Dec 18 00:00:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b462df9

sys-block/open-iscsi: fix mishandling of MY_PV

The code to set up MY_PV was based on MY_PV which mean successive env
loads would generate an incorrect value.  Drop the loading of it (as
the default PV is what we want) and rename the var to MY_P as that is
what it actually represents.

 sys-block/open-iscsi/open-iscsi-2.0.873.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
index 43baf52..e3e161b 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
@@ -6,11 +6,11 @@ EAPI=5
 
 inherit versionator linux-info eutils flag-o-matic toolchain-funcs
 
-MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
+MY_P="${PN}-$(replace_version_separator 2 "-")"
 
 DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.org/;
-SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz;
+SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,7 +22,7 @@ RDEPEND="${DEPEND}
sys-fs/lsscsi
sys-apps/util-linux"
 
-S="${WORKDIR}/${MY_PV}"
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
linux-info_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2015-12-17 Thread Mike Frysinger

commit: 8a3491de329b28c32c386326d06913758bea692a
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Dec 17 23:59:13 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Dec 18 00:00:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3491de

sys-block/open-iscsi: use the udev eclass to install rules

 sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
index 72a2081..76111ca 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit versionator linux-info eutils flag-o-matic toolchain-funcs
+inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev
 
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
@@ -84,8 +84,7 @@ src_install() {
newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
 
# udev pieces
-   insinto /lib/udev/rules.d
-   doins "${FILESDIR}"/99-iscsi.rules
+   udev_dorules "${FILESDIR}"/99-iscsi.rules
exeinto /etc/udev/scripts
doexe "${FILESDIR}"/iscsidev.sh

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2015-12-17 Thread Mike Frysinger

commit: 449cec71c892a45e0c43aa1019d5e08b6337d059
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Dec 17 23:56:48 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Dec 18 00:00:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=449cec71

sys-block/open-iscsi: fix handling of user CPPFLAGS

 sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
index 4392860..05d9790 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
@@ -52,6 +52,8 @@ src_prepare() {
 }
 
 src_configure() {
+   use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+
cd utils/open-isns || die
 
# SSL (--with-security) is broken
@@ -60,11 +62,11 @@ src_configure() {
 }
 
 src_compile() {
-   use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
+   # Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
+   # is messed up already here, so it's not making it that much worse.
KSRC="${KV_DIR}" CFLAGS="" \
emake \
-   OPTFLAGS="${CFLAGS}" \
+   OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
AR="$(tc-getAR)" CC="$(tc-getCC)" \
user
 }

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2015-12-17 Thread Mike Frysinger

commit: 121f3d2ea5401ced90b077374486d4c36bc33354
Author: Victor Dodon  chromium  org>
AuthorDate: Thu Dec 17 23:57:12 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Dec 18 00:00:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=121f3d2e

sys-block/open-iscsi: build with LFS flags

This package uses a bunch of filesystem calls, but they default to 32bit,
so for 32bit systems, we end up not being able to support large files.

 sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
index 05d9790..72a2081 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
@@ -53,6 +53,7 @@ src_prepare() {
 
 src_configure() {
use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+   append-lfs-flags
 
cd utils/open-isns || die

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/

2015-12-17 Thread Mike Frysinger

commit: 5eafff1506f58a1e7844b806f93dd9e93f9e271e
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Dec 17 23:55:29 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Dec 18 00:00:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eafff15

sys-block/open-iscsi: fix incorrect memset call

 .../files/open-iscsi-2.0.873-memset.patch  | 24 ++
 sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild  | 95 ++
 2 files changed, 119 insertions(+)

diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch 
b/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch
new file mode 100644
index 000..c566691
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.873-memset.patch
@@ -0,0 +1,24 @@
+clear the size of the storage, not the size of the pointer
+
+--- a/usr/md5.c
 b/usr/md5.c
+@@ -127,7 +127,7 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx)
+ 
+   byteSwap(ctx->buf, 4);
+   memcpy(digest, ctx->buf, 16);
+-  memset(ctx, 0, sizeof(ctx));/* In case it's sensitive */
++  memset(ctx, 0, sizeof(*ctx));   /* In case it's sensitive */
+ }
+ 
+ #ifndef ASM_MD5
+--- a/utils/md5.c
 b/utils/md5.c
+@@ -133,7 +133,7 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx)
+ 
+   byteSwap(ctx->buf, 4);
+   memcpy(digest, ctx->buf, 16);
+-  memset(ctx, 0, sizeof (ctx));   /* In case it's sensitive */
++  memset(ctx, 0, sizeof (*ctx));  /* In case it's sensitive */
+ }
+ 
+ #ifndef ASM_MD5

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
new file mode 100644
index 000..4392860
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator linux-info eutils flag-o-matic toolchain-funcs
+
+MY_P="${PN}-$(replace_version_separator 2 "-")"
+
+DESCRIPTION="Open-iSCSI is a high performance, transport independent, 
multi-platform implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.org/;
+SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug slp"
+
+DEPEND="slp? ( net-libs/openslp )"
+RDEPEND="${DEPEND}
+   sys-fs/lsscsi
+   sys-apps/util-linux"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if kernel_is -lt 2 6 16; then
+   die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+   fi
+
+   # Needs to be done, as iscsid currently only starts, when having the 
iSCSI
+   # support loaded as module. Kernel builtion options don't work. See 
this for
+   # more information:
+   # 
https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+   # If there's a new release, check whether this is still valid!
+   CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+   if linux_config_exists; then
+   for module in ${CONFIG_CHECK_MODULES}; do
+   linux_chkconfig_module ${module} || ewarn "${module} 
needs to be built as module (builtin doesn't work)"
+   done
+   fi
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-Makefiles.patch
+   epatch "${FILESDIR}"/${P}-memset.patch
+
+   sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' 
etc/iscsid.conf || die
+}
+
+src_configure() {
+   cd utils/open-isns || die
+
+   # SSL (--with-security) is broken
+   econf $(use_with slp) \
+   --without-security
+}
+
+src_compile() {
+   use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
+
+   KSRC="${KV_DIR}" CFLAGS="" \
+   emake \
+   OPTFLAGS="${CFLAGS}" \
+   AR="$(tc-getAR)" CC="$(tc-getCC)" \
+   user
+}
+
+src_install() {
+   emake DESTDIR="${ED}" sbindir="/usr/sbin" install
+
+   dodoc README THANKS
+
+   docinto test/
+   dodoc test/*
+
+   insinto /etc/iscsi
+   newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+
+   # udev pieces
+   insinto /lib/udev/rules.d
+   doins "${FILESDIR}"/99-iscsi.rules
+   exeinto /etc/udev/scripts
+   doexe "${FILESDIR}"/iscsidev.sh
+
+   newconfd "${FILESDIR}"/iscsid-conf.d iscsid
+   newinitd "${FILESDIR}"/iscsid-init.d iscsid
+
+   keepdir /var/db/iscsi
+   fperms 700 /var/db/iscsi
+   fperms 600 /etc/iscsi/iscsid.conf
+}

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2015-10-26 Thread Michał Górny

commit: 2812628c3f868f13ccb344bfa90e48ee84f356b3
Author: Jakub Jirutka  jirutka  cz>
AuthorDate: Mon Oct 26 19:40:18 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Oct 26 19:40:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2812628c

sys-block/open-iscsi: Use doexe instead of juggling with permissions

 sys-block/open-iscsi/open-iscsi-2.0.873.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
index 5280861..53bf0ef 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
@@ -82,10 +82,8 @@ src_install() {
# udev pieces
insinto /lib/udev/rules.d
doins "${FILESDIR}"/99-iscsi.rules
-   insopts -m0755
-   insinto /etc/udev/scripts
-   doins "${FILESDIR}"/iscsidev.sh
-   insopts -m0644
+   exeinto /etc/udev/scripts
+   doexe "${FILESDIR}"/iscsidev.sh
 
newconfd "${FILESDIR}"/iscsid-conf.d iscsid
newinitd "${FILESDIR}"/iscsid-init.d iscsid

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2015-10-26 Thread Michał Górny

commit: f2c1a8a62739b9cbbcb05c8af541383cdb1caa4f
Author: Jakub Jirutka  jirutka  cz>
AuthorDate: Wed Oct 14 22:12:37 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Oct 26 19:39:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2c1a8a6

sys-block/open-iscsi: Remove unnecessary dependency (bug #563082)

 sys-block/open-iscsi/open-iscsi-2.0.873.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
index 34b33e3..5280861 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
@@ -19,7 +19,6 @@ IUSE="debug slp"
 
 DEPEND="slp? ( net-libs/openslp )"
 RDEPEND="${DEPEND}
-   virtual/udev
sys-fs/lsscsi
sys-apps/util-linux"
 
@@ -79,6 +78,7 @@ src_install() {
 
insinto /etc/iscsi
newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+
# udev pieces
insinto /lib/udev/rules.d
doins "${FILESDIR}"/99-iscsi.rules

[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

2015-08-28 Thread Matt Thode

commit: a54d001241346dd7e673ea6b45260cd164dae1f6
Author: Matthew Thode prometheanfire AT gentoo DOT org
AuthorDate: Sat Aug 29 02:39:31 2015 +
Commit: Matt Thode prometheanfire AT gentoo DOT org
CommitDate: Sat Aug 29 02:39:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54d0012

sys-block/open-iscsi: fixing perms on an installed script to be exec

Package-Manager: portage-2.2.20.1

 sys-block/open-iscsi/open-iscsi-2.0.873.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
index 88f7dea..34b33e3 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
@@ -80,10 +80,12 @@ src_install() {
insinto /etc/iscsi
newins ${FILESDIR}/initiatorname.iscsi initiatorname.iscsi.example
# udev pieces
-   insinto /etc/udev/scripts
-   doins ${FILESDIR}/iscsidev.sh
insinto /lib/udev/rules.d
doins ${FILESDIR}/99-iscsi.rules
+   insopts -m0755
+   insinto /etc/udev/scripts
+   doins ${FILESDIR}/iscsidev.sh
+   insopts -m0644
 
newconfd ${FILESDIR}/iscsid-conf.d iscsid
newinitd ${FILESDIR}/iscsid-init.d iscsid

1 2 >

1 - 100 of 102 matches

Mail list logo