commit: 5536cd18a01bb593e72daa0dfe54297022cb5e7a Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Thu Jun 2 18:18:56 2022 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Thu Jun 2 18:20:46 2022 +0000 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 <tamiko <AT> 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 000000000000..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 <[email protected]> +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 000000000000..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 <[email protected]> +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/files/open-iscsi-2.1.7-no_werror.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.7-no_werror.patch new file mode 100644 index 000000000000..a94caebafb13 --- /dev/null +++ b/sys-block/open-iscsi/files/open-iscsi-2.1.7-no_werror.patch @@ -0,0 +1,26 @@ +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) 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 576fdc85f330..2f006231aaa2 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 @@ -29,7 +29,7 @@ RDEPEND="${DEPEND} BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-2.1.1-Makefiles.patch + "${FILESDIR}"/${PN}-2.1.7-NoWError.patch "${FILESDIR}"/open-iscsi-2.1.6-Makefiles.patch ) diff --git a/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild similarity index 96% copy from sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild copy to sys-block/open-iscsi/open-iscsi-2.1.7.ebuild index 576fdc85f330..3bf611eea398 100644 --- a/sys-block/open-iscsi/open-iscsi-2.1.6-r1.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild @@ -29,8 +29,9 @@ RDEPEND="${DEPEND} BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-2.1.1-Makefiles.patch - "${FILESDIR}"/open-iscsi-2.1.6-Makefiles.patch + "${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() {
