diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-28 20:02:04 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-28 20:02:04 +0100 |
| commit | a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch) | |
| tree | 852c90a4bf354c30ea66504f70bfab5401fba18d /sys-block/open-isns | |
| parent | 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff) | |
gentoo resync : 28.04.2018
Diffstat (limited to 'sys-block/open-isns')
| -rw-r--r-- | sys-block/open-isns/Manifest | 3 | ||||
| -rw-r--r-- | sys-block/open-isns/files/open-isns-0.98-libressl-compatibility.patch | 11 | ||||
| -rw-r--r-- | sys-block/open-isns/open-isns-0.98.ebuild | 11 |
3 files changed, 20 insertions, 5 deletions
diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest index 2ca82dc3382f..87b2927107e6 100644 --- a/sys-block/open-isns/Manifest +++ b/sys-block/open-isns/Manifest @@ -1,7 +1,8 @@ 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.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.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed EBUILD open-isns-0.97.ebuild 891 BLAKE2B 4fc42c97068e57edc634ea5bcf40f561834d4d56d49f5c7b061cdf1a904271c169b0a63334f1c10d722b1a25a4b160a7b4e8be5c9a3c4224757709f4e4c7fad3 SHA512 098c8d16bbafa1168cf1f233fdfd787b47103b103a065939fb41e447a309f7943e54dde6b45c6569c2cf19508167df4b84c40c0b8f4edbb3bd622cc495c6d0cb -EBUILD open-isns-0.98.ebuild 819 BLAKE2B dea9a17a9e7ed2403ad285625b9b8909f0edeb481ea30ca201bec6d1807967004aba4698f767c7e3d3a3e2f1c228584d97b210a292069f3f50d3111e9de6261b SHA512 a4525af50f6bd41b182fa15012d9257ee660ddd8c1ead7e1c5f1e1b450a200943bb10483ac350b69ef989e566da7511f3300fa5e0c4f66abb0f6ba417fcb2408 +EBUILD open-isns-0.98.ebuild 932 BLAKE2B 3c3f0899b893697b850b1087b811faf8b1e8806c68a53a7f3d4736afd019eeee6e41caebc0ec9ebc0097a74507720e2cd9859cb0cae1917493f3257752cf6100 SHA512 ee768bb3d6232627d507ae796f34ae466eff4662e1c29b5dfe7f9531dff67aa9d4681ff1041e141d583ecd875abdcda1b9217b2e58bbb729180e1603a826eb64 MISC metadata.xml 342 BLAKE2B 428bf589c8161595c69d65533c0df938c71d69fa6d56b1e4ac2a14bf528d5b93645fc667d3f8b698d4e28ca874c1ffbffb7d4daef712ffc79f5e10e542bf53e7 SHA512 a056b81c2e162e8b13a54f463476fea5f203b9929aeef07629b600d8f11eda26fe0402aec5e56a411e544b39d6c38a5766f773d4a699c72680f11f8dffc4bced 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 000000000000..b4d5ae63786d --- /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 < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + #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 9d9c713a88a7..3b96e86c226d 100644 --- a/sys-block/open-isns/open-isns-0.98.ebuild +++ b/sys-block/open-isns/open-isns-0.98.ebuild @@ -11,15 +11,18 @@ 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" +KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc ~x86" +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 |