gentoo Easter resync : 12.04.2020

6 files changed, 73 insertions, 74 deletions

diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest
index 10c963fc0def..f13b4fda399b 100644
--- a/sys-block/open-isns/Manifest
+++ b/sys-block/open-isns/Manifest
@@ -1,10 +1,9 @@
-AUX open-isns-0.97-musl.patch 268 BLAKE2B f8532ce884afc0ee837bf2f56115d46bb1ed00fef02baa7ec9819579cff791c839efec6ad35588cfeea022b0c822e936d5c7a1cf89a14cbce096c2e1deda2274 SHA512 c75c031e04281dbc9bcb9c9db66e274346ff3d7b5c38faa64e7271943db842a740019b2fb61d0ed0b1850fb78c678d67dd864f3c77a7554efc03bcba5e7250a1
-AUX open-isns-0.97-ossl-1.1.patch 1133 BLAKE2B 0649413cd3a9f8684a0c7a2982d4afdeb3369a3e06d20581e3be3821cd3d435bd9dfba5adc14e573d00041d0c7f4cbd51ee384fc211d3c87ed7b31df44465e00 SHA512 334ed03ecd2876e31f8824ad5ff004732c31211a863244d5d5439e6f6b06b85e92b43d9026379e6b151d123f8b19e6054716776c9e9cb285f3fd51fd9dd150e6
+AUX open-isns-0.100-no_Werror.patch 1235 BLAKE2B 4ecc08979a1cd1bacc46608b98419fbc5ef6bb571dc55682e1dd39ac1434bdf6e7972fc6ebd42dd4256e1be929a28a0b5ab76fd66131ff72e8962c2b2a61e1f7 SHA512 4831f745b3c2853f2eb57bc3df84261853d6e20b82c05902a3dc295f234aa81d2e075f18041cbe894d7f855d0d8f8d62c188dd7a19809a7ed48bef091bbc68f1
 AUX open-isns-0.98-libressl-compatibility.patch 463 BLAKE2B ed542e70bbd96b78b2e339dd7eced0b4edf87af62b189fc02ae431946161bb6385ffd2f8d6cf0f60edcc2092e9b57e2272e7e2fa4da0eb8f80c2a19f7d02e75e SHA512 dfce1df2699e24085f4c88340d5fb7e3f878d182608301c79b0f5736b0e29f3c79b0d37650d925cc06d429b59e9697b634ab1d16706fabbdf4b443bdcf4c9bc3
-DIST open-isns-0.97.tar.gz 278317 BLAKE2B 7083b3ebef78a5afb35e8cc31e86674b407eb48224139745142238f559e95ceca8755e570031559bdf29ec691947693303e07b8f81b915a3b7f2396329bbd2b3 SHA512 78c934162d5a1d093bccd49449d4ef369b896d34309d76b4963d643a699640617c4fe064388c481c35b9be26e012f19713f3aad378af9ad88fa94c3d300e919d
+DIST open-isns-0.100.tar.gz 300611 BLAKE2B a40e8d2bd6e5ac8ed8475d3d50ed6256871134547a044a6b51102ad47c66c335f06372b29e5585df4e59ecd7a817e5f2e48c5e944eea31333ab9f45d51040306 SHA512 ccf49ba1c60d46ae49b75424a966abc1f7e104c8ffa13013951a58a8f0ccaa1cf550f24fd2743fcaba1211a0ec8033c5df5249b7a108ae5974d4f1144dd3b169
 DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed
 DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
-EBUILD open-isns-0.97.ebuild 891 BLAKE2B 4fc42c97068e57edc634ea5bcf40f561834d4d56d49f5c7b061cdf1a904271c169b0a63334f1c10d722b1a25a4b160a7b4e8be5c9a3c4224757709f4e4c7fad3 SHA512 098c8d16bbafa1168cf1f233fdfd787b47103b103a065939fb41e447a309f7943e54dde6b45c6569c2cf19508167df4b84c40c0b8f4edbb3bd622cc495c6d0cb
-EBUILD open-isns-0.98.ebuild 932 BLAKE2B 3c3f0899b893697b850b1087b811faf8b1e8806c68a53a7f3d4736afd019eeee6e41caebc0ec9ebc0097a74507720e2cd9859cb0cae1917493f3257752cf6100 SHA512 ee768bb3d6232627d507ae796f34ae466eff4662e1c29b5dfe7f9531dff67aa9d4681ff1041e141d583ecd875abdcda1b9217b2e58bbb729180e1603a826eb64
+EBUILD open-isns-0.100.ebuild 1216 BLAKE2B 84ab563aa4ad102480c2121d5d75137eb8dec956861aff8ebfa96f08317b349731984cf0c500a012dcf0200ab307863cf49fdd8583ab97a4969890732f45a0c4 SHA512 68ab4dd9f65241dbb65658b5ef1035ce4310d77028200c701d466900a0e11af8ca39b4e75da88c1cf11e19483fcbfd4b146bcca97a5b2d96ffc6d3a3543a8ed3
+EBUILD open-isns-0.98.ebuild 933 BLAKE2B afbb1d965a2eb63dc54ee059c9d3ebf952fccc181fb1d7fd347dafcaeed95758de94ede2b4703f48707cca85e418ec29401f8ccfe4e78d69b7e9476eec83aaed SHA512 11ee36e60e8679c572c99ec36422a55c214fcad6de02911fc525b4c4630005335c7cf14bf9798998beccbdc16e0e3fb8646c593a65546de7d4b5c2ba1d448ab1
 EBUILD open-isns-0.99.ebuild 1092 BLAKE2B 1e0ce4502ab428063bae59b56a2f6df6353fcbaf839e37c4fb5a6602be2e70c3f41bc8a8fbd98c680a84a70452fd46043b3f90a2e9e6d650fb8beff287ca6e70 SHA512 56a48b518e7d8316cc77c92cf8160fe792920a781f4e0f30f861e3803a0e228f913f579eaeb92d41df38d94af966687d72e12dc84fcec9892c227d64f236f914
 MISC metadata.xml 342 BLAKE2B 428bf589c8161595c69d65533c0df938c71d69fa6d56b1e4ac2a14bf528d5b93645fc667d3f8b698d4e28ca874c1ffbffb7d4daef712ffc79f5e10e542bf53e7 SHA512 a056b81c2e162e8b13a54f463476fea5f203b9929aeef07629b600d8f11eda26fe0402aec5e56a411e544b39d6c38a5766f773d4a699c72680f11f8dffc4bced
diff --git a/sys-block/open-isns/files/open-isns-0.100-no_Werror.patch b/sys-block/open-isns/files/open-isns-0.100-no_Werror.patch
new file mode 100644
index 000000000000..2d966dd3a4fd
--- /dev/null
+++ b/sys-block/open-isns/files/open-isns-0.100-no_Werror.patch
@@ -0,0 +1,41 @@
+From 40eb9ce75518817762a0eac4a93016ab817add89 Mon Sep 17 00:00:00 2001
+From: Lee Duncan <lduncan@suse.com>
+Date: Sat, 1 Feb 2020 10:23:04 -0800
+Subject: [PATCH] Fix 586 compile issue and remove -Werror
+
+Using -Werror causes any issue to break the build, whereas
+I'd rather let the build continue and address the issue.
+
+Also, fixed one signed-vs-unsigned compare for time_t, which
+shows up only on 586 (32-bit).
+---
+ configure.ac | 2 +-
+ isnsdd.c     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e4f3995..d956e58 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ AC_PATH_PROG(SH, sh)
+ dnl C Compiler features
+ AC_C_INLINE
+ if test "$GCC" = "yes"; then
+-        CFLAGS="-Wall -Werror -Wextra $CFLAGS"
++        CFLAGS="-Wall -Wextra $CFLAGS"
+ 	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ fi
+ 
+diff --git a/isnsdd.c b/isnsdd.c
+index 58825cc..9cedb9f 100644
+--- a/isnsdd.c
++++ b/isnsdd.c
+@@ -401,7 +401,7 @@ check_portal_registration(__attribute__((unused))void *ptr)
+ 			continue;
+ 
+ 		last_modified = isns_object_last_modified(obj);
+-		if (last_modified + 2 * interval > now) {
++		if ((time_t)(last_modified + 2 * interval) > now) {
+ 			good_portals++;
+ 			continue;
+ 		}
diff --git a/sys-block/open-isns/files/open-isns-0.97-musl.patch b/sys-block/open-isns/files/open-isns-0.97-musl.patch
deleted file mode 100644
index 098ade40a213..000000000000
--- a/sys-block/open-isns/files/open-isns-0.97-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/libisns/util.h.orig
-+++ ./include/libisns/util.h
-@@ -114,6 +114,6 @@
- #   define ntohll(x)	__bswap_64(x)
- #  endif
- # else
--#  include <sys/endian.h>
-+#  include <endian.h>
- #  define htonll(x)     htobe64(x)
- #  define ntohll(x)     be64toh(x)
- # endif
diff --git a/sys-block/open-isns/files/open-isns-0.97-ossl-1.1.patch b/sys-block/open-isns/files/open-isns-0.97-ossl-1.1.patch
deleted file mode 100644
index ebb641af27d4..000000000000
--- a/sys-block/open-isns/files/open-isns-0.97-ossl-1.1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 70b11a0f9c4056dc6891c2d5550c28993905f18a Mon Sep 17 00:00:00 2001
-From: eroen <open-isns@occam.eroen.eu>
-Date: Mon, 2 Jan 2017 23:15:08 +0100
-Subject: [PATCH] Disable deprecated initializations for openssl-1.1.0
-
-This fixes several undefined reference errors when linking with
-openssl-1.1.0c.
-
-X-Gentoo-Bug: 604454
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604454
----
- pki.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/pki.c b/pki.c
-index f69ddca..5fdf9f2 100644
---- a/pki.c
-+++ b/pki.c
-@@ -67,7 +67,9 @@ void BN_GENCB_free(BN_GENCB *cb)
- #endif
- 
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- static int	isns_openssl_init = 0;
-+#endif
- 
- static int	isns_dsasig_verify(isns_security_t *ctx,
- 				isns_principal_t *peer,
-@@ -92,6 +94,7 @@ isns_create_dsa_context(void)
- {
- 	isns_security_t	*ctx;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	if (!isns_openssl_init) {
- 		ERR_load_crypto_strings();
- 		OpenSSL_add_all_algorithms();
-@@ -99,6 +102,7 @@ isns_create_dsa_context(void)
- 		OpenSSL_add_all_digests();
- 		isns_openssl_init = 1;
- 	}
-+#endif
- 
- 	ctx = isns_calloc(1, sizeof(*ctx));
- 
--- 
-2.11.0
-
diff --git a/sys-block/open-isns/open-isns-0.97.ebuild b/sys-block/open-isns/open-isns-0.100.ebuild
index 098784ba743c..878669c9073a 100644
--- a/sys-block/open-isns/open-isns-0.97.ebuild
+++ b/sys-block/open-isns/open-isns-0.100.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="iSNS server and client for Linux"
 HOMEPAGE="https://github.com/open-iscsi/open-isns"
@@ -12,28 +12,45 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug slp ssl static"
+IUSE="debug libressl ssl static"
 
 DEPEND="
-	ssl? ( dev-libs/openssl:= )
-	slp? ( net-libs/openslp )"
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-musl.patch"
-	"${FILESDIR}/${P}-ossl-1.1.patch"
+	"${FILESDIR}/${PN}-0.98-libressl-compatibility.patch"
+
+	# Upstream patches (can usually be removed with next version bump)
+	"${FILESDIR}"/${P}-no_Werror.patch
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
 	append-lfs-flags
-	econf $(use_with slp) \
-		$(use_with ssl security) \
+	local myeconfargs=(
+		--without-slp
+		$(use_with ssl security)
 		$(use_enable !static shared)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
 	emake DESTDIR="${D}" install_hdrs
 	emake DESTDIR="${D}" install_lib
+	keepdir /var/lib/${PN/open-}
+	if ! use static ; then
+		find "${ED}" -type f -name "*.a" -delete || die
+	fi
 }
diff --git a/sys-block/open-isns/open-isns-0.98.ebuild b/sys-block/open-isns/open-isns-0.98.ebuild
index 3b96e86c226d..98810887454e 100644
--- a/sys-block/open-isns/open-isns-0.98.ebuild
+++ b/sys-block/open-isns/open-isns-0.98.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 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 libressl slp ssl static"
 
 DEPEND="