diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2017-01-02 22:13:11 -0600 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2017-01-02 22:13:11 -0600 |
| commit | 51d7674ef7430f44a11ed4eb5af0d7af10c86169 (patch) | |
| tree | 711e9d3ccb8b008c6c51f03c9b0ffc3165894f81 /sys-block | |
| parent | sys-block/open-isns: fix builds on musl (diff) | |
| download | gentoo-51d7674ef7430f44a11ed4eb5af0d7af10c86169.tar.gz gentoo-51d7674ef7430f44a11ed4eb5af0d7af10c86169.tar.bz2 gentoo-51d7674ef7430f44a11ed4eb5af0d7af10c86169.zip | |
sys-block/open-isns: fixing ossl-1.1 build issue bug 604454
Package-Manager: portage-2.3.0
Diffstat (limited to 'sys-block')
| -rw-r--r-- | sys-block/open-isns/files/open-isns-0.97-ossl-1.1.patch | 47 | ||||
| -rw-r--r-- | sys-block/open-isns/open-isns-0.97.ebuild | 5 |
2 files changed, 51 insertions, 1 deletions
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 000000000000..ebb641af27d4 --- /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 c742bff295f3..14701e2398cc 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 |