diff options
Diffstat (limited to 'sys-block/open-isns')
-rw-r--r-- | sys-block/open-isns/Manifest | 9 | ||||
-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.100.ebuild | 9 | ||||
-rw-r--r-- | sys-block/open-isns/open-isns-0.101.ebuild | 7 | ||||
-rw-r--r-- | sys-block/open-isns/open-isns-0.98.ebuild | 7 | ||||
-rw-r--r-- | sys-block/open-isns/open-isns-0.99.ebuild | 9 |
6 files changed, 14 insertions, 38 deletions
diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest index ba8fda7a2637..53366b3ed731 100644 --- a/sys-block/open-isns/Manifest +++ b/sys-block/open-isns/Manifest @@ -1,12 +1,11 @@ AUX open-isns-0.100-no_Werror.patch 1235 BLAKE2B 4ecc08979a1cd1bacc46608b98419fbc5ef6bb571dc55682e1dd39ac1434bdf6e7972fc6ebd42dd4256e1be929a28a0b5ab76fd66131ff72e8962c2b2a61e1f7 SHA512 4831f745b3c2853f2eb57bc3df84261853d6e20b82c05902a3dc295f234aa81d2e075f18041cbe894d7f855d0d8f8d62c188dd7a19809a7ed48bef091bbc68f1 AUX open-isns-0.100-respect-AR.patch 539 BLAKE2B f343794fe2bdec792654c9a0ee18bf7b8890a2f05bd80f43140f4bed8d260a3fb1c6a00725b285e17f46d8fedce310aa48f404a56a6a77ae60a530355f47a7bb SHA512 a88ecd07ae28528cc5e9a1bdca1dcc8a5999abb9742c6f0c712fa8eae5fd1f76b01dff9d6f8041a4188eafb8acd376a0054335c66028893e431fe041e0694cf4 -AUX open-isns-0.98-libressl-compatibility.patch 463 BLAKE2B ed542e70bbd96b78b2e339dd7eced0b4edf87af62b189fc02ae431946161bb6385ffd2f8d6cf0f60edcc2092e9b57e2272e7e2fa4da0eb8f80c2a19f7d02e75e SHA512 dfce1df2699e24085f4c88340d5fb7e3f878d182608301c79b0f5736b0e29f3c79b0d37650d925cc06d429b59e9697b634ab1d16706fabbdf4b443bdcf4c9bc3 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 -EBUILD open-isns-0.100.ebuild 1261 BLAKE2B e3506bb9111cbca5e33a53d03213361687f572181971bd9760b3f0416e39ae748fe0b4288b45e1c4ec7feb2338365b31c80a8e7ca950fbc2d666cb9d45624c33 SHA512 19ec911eebf9c99572334c8fb71a67f6db12e951d9cc6c10023dc1e96186d65df8882075ac6ad3302c9a69a93a543e34dcf8911ae8468506391b77110ccbe98f -EBUILD open-isns-0.101.ebuild 1193 BLAKE2B 7ddcc9de1b8ad65734b9a34668ac6f2fa901b03c073a7f2e6a861ebbdf6a938e805c8d7ce2e325ef1083f1d053d6da8a82a82d347d23bff51e80e8bfac8d5152 SHA512 25465d2f691b14506b5f92c42cb2a5bdc23eb6a85824008b13c089e778f1382e3bf91a344c6f0daa1c2fe5c6e31c817cdde013dab1283addd6ceb463feb49770 -EBUILD open-isns-0.98.ebuild 928 BLAKE2B 8d53b62dba7fb03ae459ab22359357963792eb9c9946bd552cf5ea013ea0edfe81c5e0d90d92d87005d5799a2c93e0623b33d12d2696e6ae7962f1f5b58c6f6c SHA512 d7a56dd39dd319172e58a10900a556695033e7314a80c1bae6e6796d80c088a82ee0ff22e7cd77251f07b1f47b828673d55dab15b741af91f0a396fe784d7f9b -EBUILD open-isns-0.99.ebuild 1092 BLAKE2B 1e0ce4502ab428063bae59b56a2f6df6353fcbaf839e37c4fb5a6602be2e70c3f41bc8a8fbd98c680a84a70452fd46043b3f90a2e9e6d650fb8beff287ca6e70 SHA512 56a48b518e7d8316cc77c92cf8160fe792920a781f4e0f30f861e3803a0e228f913f579eaeb92d41df38d94af966687d72e12dc84fcec9892c227d64f236f914 +EBUILD open-isns-0.100.ebuild 1144 BLAKE2B c8592e1f6d767fae9756f51473d5966d0988002b3f5fa22f46b053452e031de749d7467c4b9f320aae24146363b9cd0e814f54114f52eba4596e1f4ea5f69d17 SHA512 955e10101807666d194151e3ba2147f531c6d1b474093d489e44334e4cfbda93ba5dbb7829f616290544dc61c3438307fafe3afcd52831edb9f2b686cc12fd39 +EBUILD open-isns-0.101.ebuild 1076 BLAKE2B a6af812d00e2918c214246b14891d4d85edb2a0d7626a235489391a1e369c68413ebb2dde028e13b01680d91556a9d80a58fb4bca5302aef44805b0c51dde69d SHA512 e9e5f7237b2b24480f1f60f77ec1516c577ed88cd66b1fdbdfb258c8d5d97e38285b9ab6bd49453bf1198576e8d064f240ce48c0b69c38270da56637f69136c4 +EBUILD open-isns-0.98.ebuild 806 BLAKE2B 24c75b271c6604021020d671a5df0ce0767339757a74e8ecd60115b79c06fd0678dd81722a0b17cb987896d5c3766b5ead98e84b69c4f533c734b91c9df26dbe SHA512 aaa566ef607a1bf689e990d2809d70a9600497ae81f0781949ffd98c36999896d8b1e5a27adcc51e46e38ab2c5df01d3d95c259378ee5ad44c17958e1dbdb8ee +EBUILD open-isns-0.99.ebuild 964 BLAKE2B a04c57b02cca53049460f7c2158fbd291b84dbff31303d4a65d6430eced23330e144414c8368ad99b5369c895d8729ae7d3031743910d33e7867d6de6f9f3f28 SHA512 b7d05a8e14c5bd1164c03845f4094afa98f01897d600d8a5c65ef70548bcc3da06732f1d3e4159823fc1ebe47108d85455c9861b95bfe8d8103b69e081580ac8 MISC metadata.xml 342 BLAKE2B 3ecae5f098564e59660a3e1de7a3b6ee2dcb7cd2d7ad2acc37e61680910e1fbd5edd2540e20783ca642440bc947cdb40feb6a84e434aba123346f48c6ee48265 SHA512 02d015cd6497b76f48eea880b745556f1a433db2893b91ef8254cf40a1bda2209feb42c01ff29dd6e4a3fdf588a8905076952e838b89a29ab99ccfc39927940a 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 deleted file mode 100644 index b4d5ae63786d..000000000000 --- a/sys-block/open-isns/files/open-isns-0.98-libressl-compatibility.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.100.ebuild b/sys-block/open-isns/open-isns-0.100.ebuild index 63213dbfd792..fa1351cf05c8 100644 --- a/sys-block/open-isns/open-isns-0.100.ebuild +++ b/sys-block/open-isns/open-isns-0.100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,19 +12,16 @@ 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 libressl ssl static" +IUSE="debug ssl static" DEPEND=" ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) " 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) diff --git a/sys-block/open-isns/open-isns-0.101.ebuild b/sys-block/open-isns/open-isns-0.101.ebuild index 5f7c4bb83ec7..395977907a5d 100644 --- a/sys-block/open-isns/open-isns-0.101.ebuild +++ b/sys-block/open-isns/open-isns-0.101.ebuild @@ -12,19 +12,16 @@ 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 libressl ssl static" +IUSE="debug ssl static" DEPEND=" ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) " RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch" - "${FILESDIR}/${PN}-0.100-respect-AR.patch" ) diff --git a/sys-block/open-isns/open-isns-0.98.ebuild b/sys-block/open-isns/open-isns-0.98.ebuild index 6cf8f4626f76..98e5c2e8a451 100644 --- a/sys-block/open-isns/open-isns-0.98.ebuild +++ b/sys-block/open-isns/open-isns-0.98.ebuild @@ -12,18 +12,15 @@ 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 libressl slp ssl static" +IUSE="debug slp ssl static" DEPEND=" ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) slp? ( net-libs/openslp )" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" ) - src_configure() { use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI append-lfs-flags diff --git a/sys-block/open-isns/open-isns-0.99.ebuild b/sys-block/open-isns/open-isns-0.99.ebuild index e9c2b890b984..e7290c1b77b5 100644 --- a/sys-block/open-isns/open-isns-0.99.ebuild +++ b/sys-block/open-isns/open-isns-0.99.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,18 +12,15 @@ 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 libressl slp ssl static" +IUSE="debug slp ssl static" DEPEND=" ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) slp? ( net-libs/openslp )" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch" ) - src_configure() { use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI append-lfs-flags |