* [gentoo-commits] repo/gentoo:master commit in: sys-block/open-isns/files/, sys-block/open-isns/
@ 2021-05-14 22:14 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2021-05-14 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 6f1bc27c7607e739ce9bd32c7a94c9ea0aea66ce
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 22:13:19 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 14 22:13:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1bc27c
sys-block/open-isns: drop 0.99, 0.100
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-block/open-isns/Manifest | 2 -
.../files/open-isns-0.100-no_Werror.patch | 41 ----------------
sys-block/open-isns/open-isns-0.100.ebuild | 55 ----------------------
sys-block/open-isns/open-isns-0.99.ebuild | 43 -----------------
4 files changed, 141 deletions(-)
diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest
index 0bf01cc956e..631c08d95e6 100644
--- a/sys-block/open-isns/Manifest
+++ b/sys-block/open-isns/Manifest
@@ -1,4 +1,2 @@
-DIST open-isns-0.100.tar.gz 300611 BLAKE2B a40e8d2bd6e5ac8ed8475d3d50ed6256871134547a044a6b51102ad47c66c335f06372b29e5585df4e59ecd7a817e5f2e48c5e944eea31333ab9f45d51040306 SHA512 ccf49ba1c60d46ae49b75424a966abc1f7e104c8ffa13013951a58a8f0ccaa1cf550f24fd2743fcaba1211a0ec8033c5df5249b7a108ae5974d4f1144dd3b169
DIST open-isns-0.101.tar.gz 301912 BLAKE2B 98c9c36640ee4d3796538a00e7ab2e4cfb057abc66a56d27ce2eb133d591ea87bcb0e4ffb31b6d72d8e8c806edffb65600c0ae7cd63c61058f36037e3db79214 SHA512 e5a392127b0d85f36e9e4aa963c0c502af8c5aea0aba6d12abb4425649969dcc20ba6e87a99083626d981438439b17b71a86320f816042d82ed5dbe7e7a63e77
DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed
-DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
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
deleted file mode 100644
index 2d966dd3a4f..00000000000
--- a/sys-block/open-isns/files/open-isns-0.100-no_Werror.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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/open-isns-0.100.ebuild b/sys-block/open-isns/open-isns-0.100.ebuild
deleted file mode 100644
index fa1351cf05c..00000000000
--- a/sys-block/open-isns/open-isns-0.100.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="iSNS server and client for Linux"
-HOMEPAGE="https://github.com/open-iscsi/open-isns"
-SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug ssl static"
-
-DEPEND="
- ssl? (
- dev-libs/openssl:0=
- )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.100-respect-AR.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
- 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.99.ebuild b/sys-block/open-isns/open-isns-0.99.ebuild
deleted file mode 100644
index e7290c1b77b..00000000000
--- a/sys-block/open-isns/open-isns-0.99.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="iSNS server and client for Linux"
-HOMEPAGE="https://github.com/open-iscsi/open-isns"
-SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug slp ssl static"
-
-DEPEND="
- ssl? (
- dev-libs/openssl:0=
- )
- slp? ( net-libs/openslp )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
- append-lfs-flags
- local myeconfargs=(
- $(use_with 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/open-isns/files/, sys-block/open-isns/
@ 2020-03-04 10:54 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2020-03-04 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 8e0eddb88cb1bfb38d6ff6e2ed7a33e681dc179a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 4 10:39:41 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Mar 4 10:54:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0eddb8
sys-block/open-isns: Removed old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-block/open-isns/Manifest | 1 -
.../open-isns/files/open-isns-0.97-musl.patch | 11 -----
.../open-isns/files/open-isns-0.97-ossl-1.1.patch | 47 ----------------------
sys-block/open-isns/open-isns-0.97.ebuild | 39 ------------------
4 files changed, 98 deletions(-)
diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest
index c5a7214517f..7aa31df83d2 100644
--- a/sys-block/open-isns/Manifest
+++ b/sys-block/open-isns/Manifest
@@ -1,4 +1,3 @@
DIST open-isns-0.100.tar.gz 300611 BLAKE2B a40e8d2bd6e5ac8ed8475d3d50ed6256871134547a044a6b51102ad47c66c335f06372b29e5585df4e59ecd7a817e5f2e48c5e944eea31333ab9f45d51040306 SHA512 ccf49ba1c60d46ae49b75424a966abc1f7e104c8ffa13013951a58a8f0ccaa1cf550f24fd2743fcaba1211a0ec8033c5df5249b7a108ae5974d4f1144dd3b169
-DIST open-isns-0.97.tar.gz 278317 BLAKE2B 7083b3ebef78a5afb35e8cc31e86674b407eb48224139745142238f559e95ceca8755e570031559bdf29ec691947693303e07b8f81b915a3b7f2396329bbd2b3 SHA512 78c934162d5a1d093bccd49449d4ef369b896d34309d76b4963d643a699640617c4fe064388c481c35b9be26e012f19713f3aad378af9ad88fa94c3d300e919d
DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed
DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
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 098ade40a21..00000000000
--- 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 ebb641af27d..00000000000
--- 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.97.ebuild
deleted file mode 100644
index 098784ba743..00000000000
--- a/sys-block/open-isns/open-isns-0.97.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="iSNS server and client for Linux"
-HOMEPAGE="https://github.com/open-iscsi/open-isns"
-SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug slp ssl static"
-
-DEPEND="
- ssl? ( dev-libs/openssl:= )
- slp? ( net-libs/openslp )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-musl.patch"
- "${FILESDIR}/${P}-ossl-1.1.patch"
-)
-
-src_configure() {
- use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
- append-lfs-flags
- econf $(use_with slp) \
- $(use_with ssl security) \
- $(use_enable !static shared)
-}
-
-src_install() {
- default
- emake DESTDIR="${D}" install_hdrs
- emake DESTDIR="${D}" install_lib
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/open-isns/files/, sys-block/open-isns/
@ 2020-03-04 10:54 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2020-03-04 10:54 UTC (permalink / raw
To: gentoo-commits
commit: ec8ef0d2ca1f65776491d39a3fa7213de18d2709
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 4 10:33:03 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Mar 4 10:54:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec8ef0d2
sys-block/open-isns: Bump to version 0.100
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-block/open-isns/Manifest | 1 +
.../files/open-isns-0.100-no_Werror.patch | 41 ++++++++++++++++
sys-block/open-isns/open-isns-0.100.ebuild | 56 ++++++++++++++++++++++
3 files changed, 98 insertions(+)
diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest
index 6914def7947..c5a7214517f 100644
--- a/sys-block/open-isns/Manifest
+++ b/sys-block/open-isns/Manifest
@@ -1,3 +1,4 @@
+DIST open-isns-0.100.tar.gz 300611 BLAKE2B a40e8d2bd6e5ac8ed8475d3d50ed6256871134547a044a6b51102ad47c66c335f06372b29e5585df4e59ecd7a817e5f2e48c5e944eea31333ab9f45d51040306 SHA512 ccf49ba1c60d46ae49b75424a966abc1f7e104c8ffa13013951a58a8f0ccaa1cf550f24fd2743fcaba1211a0ec8033c5df5249b7a108ae5974d4f1144dd3b169
DIST open-isns-0.97.tar.gz 278317 BLAKE2B 7083b3ebef78a5afb35e8cc31e86674b407eb48224139745142238f559e95ceca8755e570031559bdf29ec691947693303e07b8f81b915a3b7f2396329bbd2b3 SHA512 78c934162d5a1d093bccd49449d4ef369b896d34309d76b4963d643a699640617c4fe064388c481c35b9be26e012f19713f3aad378af9ad88fa94c3d300e919d
DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed
DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
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 00000000000..2d966dd3a4f
--- /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/open-isns-0.100.ebuild b/sys-block/open-isns/open-isns-0.100.ebuild
new file mode 100644
index 00000000000..878669c9073
--- /dev/null
+++ b/sys-block/open-isns/open-isns-0.100.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="iSNS server and client for Linux"
+HOMEPAGE="https://github.com/open-iscsi/open-isns"
+SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug libressl ssl static"
+
+DEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${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
+ 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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/open-isns/files/, sys-block/open-isns/
@ 2017-01-03 4:13 Matt Thode
0 siblings, 0 replies; 5+ messages in thread
From: Matt Thode @ 2017-01-03 4:13 UTC (permalink / raw
To: gentoo-commits
commit: 4b8605982b246ed5c6ff895fa32b4e603ca602ad
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 3 04:04:52 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 3 04:06:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b860598
sys-block/open-isns: fix builds on musl
This patch is in place as the code path it changes fixes is
only accessible on musl based systems and only fails to compile
on musl based systems.
Package-Manager: portage-2.3.0
sys-block/open-isns/files/open-isns-0.97-musl.patch | 11 +++++++++++
sys-block/open-isns/open-isns-0.97.ebuild | 2 ++
2 files changed, 13 insertions(+)
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
new file mode 100644
index 00000000..098ade4
--- /dev/null
+++ b/sys-block/open-isns/files/open-isns-0.97-musl.patch
@@ -0,0 +1,11 @@
+--- ./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/open-isns-0.97.ebuild b/sys-block/open-isns/open-isns-0.97.ebuild
index fd74686..c742bff 100644
--- a/sys-block/open-isns/open-isns-0.97.ebuild
+++ b/sys-block/open-isns/open-isns-0.97.ebuild
@@ -20,6 +20,8 @@ DEPEND="
slp? ( net-libs/openslp )"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-${PV}-musl.patch" )
+
src_configure() {
use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
append-lfs-flags
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/open-isns/files/, sys-block/open-isns/
@ 2017-01-03 4:13 Matt Thode
0 siblings, 0 replies; 5+ messages in thread
From: Matt Thode @ 2017-01-03 4:13 UTC (permalink / raw
To: gentoo-commits
commit: 51d7674ef7430f44a11ed4eb5af0d7af10c86169
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 3 04:13:11 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 3 04:13:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d7674e
sys-block/open-isns: fixing ossl-1.1 build issue bug 604454
Package-Manager: portage-2.3.0
.../open-isns/files/open-isns-0.97-ossl-1.1.patch | 47 ++++++++++++++++++++++
sys-block/open-isns/open-isns-0.97.ebuild | 5 ++-
2 files changed, 51 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000..ebb641a
--- /dev/null
+++ b/sys-block/open-isns/files/open-isns-0.97-ossl-1.1.patch
@@ -0,0 +1,47 @@
+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.97.ebuild
index c742bff..14701e2 100644
--- a/sys-block/open-isns/open-isns-0.97.ebuild
+++ b/sys-block/open-isns/open-isns-0.97.ebuild
@@ -20,7 +20,10 @@ DEPEND="
slp? ( net-libs/openslp )"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-${PV}-musl.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-musl.patch"
+ "${FILESDIR}/${P}-ossl-1.1.patch"
+)
src_configure() {
use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-14 22:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-14 22:14 [gentoo-commits] repo/gentoo:master commit in: sys-block/open-isns/files/, sys-block/open-isns/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2020-03-04 10:54 Lars Wendler
2020-03-04 10:54 Lars Wendler
2017-01-03 4:13 Matt Thode
2017-01-03 4:13 Matt Thode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox