[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/
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/, sys-block/open-iscsi/
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/files/, sys-block/open-iscsi/
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/files/, sys-block/open-iscsi/
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/files/, sys-block/open-iscsi/
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/
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/files/, sys-block/open-iscsi/
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/files/, sys-block/open-iscsi/
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/, sys-block/open-iscsi/
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/files/, sys-block/open-iscsi/
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/files/, sys-block/open-iscsi/
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/
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/files/, sys-block/open-iscsi/
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