[gentoo-commits] repo/gentoo:master commit in: sys-block/open-isns/, sys-block/open-isns/files/
commit: 8556ea8399e782d2c13a15719c58a153c645b3c6
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Dec 25 13:03:18 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Dec 25 13:28:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8556ea83
sys-block/open-isns: respect AR
Closes: https://bugs.gentoo.org/721492
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
.../files/open-isns-0.100-respect-AR.patch | 30 ++
sys-block/open-isns/open-isns-0.100.ebuild | 2 ++
2 files changed, 32 insertions(+)
diff --git a/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch
b/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch
new file mode 100644
index 000..66e52e54812
--- /dev/null
+++ b/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch
@@ -0,0 +1,30 @@
+--- a/Makefile.in
b/Makefile.in
+@@ -33,6 +33,7 @@ else
+ SOLIB_VERSION_OPTS =
+ endif
+
++AR= @AR@
+ CC= @CC@
+ CPPFLAGS= @CPPFLAGS@
+ CFLAGS= @CFLAGS@ -I. -Iinclude -I$(srcdir) -I$(srcdir)/include
+@@ -161,7 +162,7 @@ solib-message.o: message.c
+
+ ifeq ($(BUILD_STATIC),1)
+ $(LIB): $(LIBOBJS)
+- ar cr $@ $(LIBOBJS)
++ $(AR) cr $@ $(LIBOBJS)
+ else
+ $(LIB):
+ endif
+--- a/configure.ac
b/configure.ac
+@@ -4,6 +4,7 @@ AC_CONFIG_AUX_DIR([aclocal])
+
+ AC_CONFIG_HEADER(config.h)
+
++AM_PROG_AR
+ AC_PROG_CC
+ AC_CANONICAL_HOST
+ AC_C_BIGENDIAN
+
diff --git a/sys-block/open-isns/open-isns-0.100.ebuild
b/sys-block/open-isns/open-isns-0.100.ebuild
index 878669c9073..63213dbfd79 100644
--- a/sys-block/open-isns/open-isns-0.100.ebuild
+++ b/sys-block/open-isns/open-isns-0.100.ebuild
@@ -25,6 +25,8 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-0.98-libressl-compatibility.patch"
+ "${FILESDIR}/${PN}-0.100-respect-AR.patch"
+
# Upstream patches (can usually be removed with next version bump)
"${FILESDIR}"/${P}-no_Werror.patch
)
[gentoo-commits] repo/gentoo:master commit in: sys-block/open-isns/, sys-block/open-isns/files/
commit: f86a8d85eb397e678ade2974fb1c62c6de7dafa0
Author: Aaron Bauman gentoo org>
AuthorDate: Tue Apr 24 21:47:02 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Tue Apr 24 21:47:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f86a8d85
sys-block/open-isns: add LibreSSL support
This patch was slightly modified from the original reporter as the
LibreSSL 2.7.x API does not need it. As such, the appropriate version
checks were added for LibreSSL. Additionally, add slot/subslot
operators to openssl.
Closes: https://bugs.gentoo.org/645684
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../files/open-isns-0.98-libressl-compatibility.patch | 11 +++
sys-block/open-isns/open-isns-0.98.ebuild | 9 ++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git
a/sys-block/open-isns/files/open-isns-0.98-libressl-compatibility.patch
b/sys-block/open-isns/files/open-isns-0.98-libressl-compatibility.patch
new file mode 100644
index 000..b4d5ae63786
--- /dev/null
+++ b/sys-block/open-isns/files/open-isns-0.98-libressl-compatibility.patch
@@ -0,0 +1,11 @@
+--- a/pki.c.orig
b/pki.c
+@@ -30,7 +30,7 @@
+ #endif
+ /* OpenSSL 1.1 made a lot of structures opaque, so we need to
+ * define the 1.1 wrappers in previous versions. */
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || (defined(LIBRESSL_VERSION_NUMBER)
&& LIBRESSL_VERSION_NUMBER < 0x207fL)
+ #define EVP_PKEY_base_id(o) ((o)->type)
+ #define EVP_PKEY_get0_DSA(o) ((o)->pkey.dsa)
+ static EVP_MD_CTX *EVP_MD_CTX_new(void)
diff --git a/sys-block/open-isns/open-isns-0.98.ebuild
b/sys-block/open-isns/open-isns-0.98.ebuild
index 32abc8f1081..3b96e86c226 100644
--- a/sys-block/open-isns/open-isns-0.98.ebuild
+++ b/sys-block/open-isns/open-isns-0.98.ebuild
@@ -12,14 +12,17 @@
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 slp ssl static"
DEPEND="
- ssl? ( dev-libs/openssl:= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
slp? ( net-libs/openslp )"
RDEPEND="${DEPEND}"
-PATCHES=()
+PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" )
src_configure() {
use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
