diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
commit | a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch) | |
tree | 8c764c1cc0576389ce22abd317bceba71ea5732d /dev-libs/libstrophe | |
parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) |
gentoo resync : 04.05.2021
Diffstat (limited to 'dev-libs/libstrophe')
-rw-r--r-- | dev-libs/libstrophe/Manifest | 9 | ||||
-rw-r--r-- | dev-libs/libstrophe/files/libstrophe-0.9.2-libressl.patch | 20 | ||||
-rw-r--r-- | dev-libs/libstrophe/libstrophe-0.10.0.ebuild | 7 | ||||
-rw-r--r-- | dev-libs/libstrophe/libstrophe-0.10.1.ebuild | 7 | ||||
-rw-r--r-- | dev-libs/libstrophe/libstrophe-0.9.2.ebuild | 8 | ||||
-rw-r--r-- | dev-libs/libstrophe/libstrophe-0.9.3.ebuild | 7 |
6 files changed, 16 insertions, 42 deletions
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest index 4c220caa8847..6a58384c9dcf 100644 --- a/dev-libs/libstrophe/Manifest +++ b/dev-libs/libstrophe/Manifest @@ -1,10 +1,9 @@ -AUX libstrophe-0.9.2-libressl.patch 843 BLAKE2B f979127225535d271dafdb379d9e07bdfd06cd5684c07fe2a8a466698109dd68c0626615d20636d230858e5a2868dd450b5fabcbb4482e6814a2b3d032bd89f8 SHA512 6a6321955805eb1b80a7dc6baa528a9594f2d37a640e4166839fa9db9d0e2113a64dd33f08682c03a1a840836c76a4e62e384c9cfdd798442ee024ff88c1d8e6 DIST libstrophe-0.10.0.tar.gz 520645 BLAKE2B 85998ffa7d2051bf3372842a0bc6d5404932c41853609943ae0420760e0434a74b711bd5f23657f061f1227647247b1989833c54c11a88490fe7617459687818 SHA512 9d2e8f95ab5f9611529e18b0130322a196d4b59aae69c931a6d7dc462d4a6a4fa395d6fbca56d9f329fc943e3de005b570ea34629a504175f3f2ec91f85bf40a DIST libstrophe-0.10.1.tar.gz 520649 BLAKE2B aa5cf0c972d7ae8731752f351dc3c1d6d230b8a1411417a81126543dd47e79e324a8c258cbc4c2e608c748d62211dcde3802cb92bb3612c6a33bcd2209182a90 SHA512 1ee3cb76cdc76711b4928d69fb8add974ab8359b729ec12003d73530c93492f4e8d208cacbd50f8db7509bc01f56a9f945348bc3a6fdd18a7080b751fff8a783 DIST libstrophe-0.9.2.tar.gz 500459 BLAKE2B 0b1f6f1daac1215bcdcbde0e54264b98f5a863de339500826f625f8c5e8143ce7200fb251d04248715e9a8b6621a4360e7ca2780bf4684d916ec13361b5f6fcc SHA512 a0129c49ca574afaefa77c412143571af2eb1100c7d737d497b65d44680d35e2404ee2d4d4e1378b06ac1bcc5c587f505f79fea9251af1cbb36afd990d48570d DIST libstrophe-0.9.3.tar.gz 502449 BLAKE2B 662b0c329b0bf7d7f34fc80bf0608b921fa1ad54c8277e88f23f3ed17d0892dc7e3d9bcaaa9707306801e9254bba4a127390025ab95e1d9d850c299a7b26d980 SHA512 9c8ba980f532c5576c2c5a9e3cdca9f833ec78debcb06b17e2f534de0e710ec416b997b0498be77a89fa7f57187456edb1d602993c695a5e738718ea593697a5 -EBUILD libstrophe-0.10.0.ebuild 1091 BLAKE2B 92e16fd9289e8273722995302d698793b8534750f4622b0cd603f4096133292bb2b7da6c99f1d5f27202349bbb74446f11f55db621eb8299f3da62e2806dafe1 SHA512 60c666e19088958b26149161ab4464b786659eaa2a219ab7b38be3f7eec73f97dc927f67ca6472726e79be0773391ee1f48844ad18db6658143688709eb50188 -EBUILD libstrophe-0.10.1.ebuild 1092 BLAKE2B 185281c223cd29f2d90dedfdfa18525be8ef017a170b8a78a3f151b4051bd2a8f00a452322b272c36f762efd99bab47da162ff33983ff1a59e5200fa5377534c SHA512 d4744a181fb65e52f7b3f2d549db4278a0dceb4e00723dd6590a02393df29e1740a468b5496cd7b7f6083f27201e08c06af3cdfc530625a98370b3df2df80035 -EBUILD libstrophe-0.9.2.ebuild 1150 BLAKE2B 307a9eb08191ad50f3c9c43d6b9ba6ad1f4ea695a9ca904355218f359a50cd4cb49d41c170b058d9aa898a2e9a37a00fa6b561928d522ee437e35ce2a15e93cf SHA512 00c14fb2236618196b874fc16ecaa8c58e12996f702c76db46ebaa179fc0920a989c3492657e85c0e54f4369acde9e1a3731df08d048bedc30dc390892a939f6 -EBUILD libstrophe-0.9.3.ebuild 1092 BLAKE2B 185281c223cd29f2d90dedfdfa18525be8ef017a170b8a78a3f151b4051bd2a8f00a452322b272c36f762efd99bab47da162ff33983ff1a59e5200fa5377534c SHA512 d4744a181fb65e52f7b3f2d549db4278a0dceb4e00723dd6590a02393df29e1740a468b5496cd7b7f6083f27201e08c06af3cdfc530625a98370b3df2df80035 +EBUILD libstrophe-0.10.0.ebuild 1031 BLAKE2B 30e399cb399c0de37a462b9cdce10ec4e19a9ebf81299d787e10d4b8ae468ecfbc39086ef156ce13b442cf5d0184fef0f64d8864df702beb967a459f1fc9b451 SHA512 946c25d4972f929288fbc62346283187bcec07d09c98eba02d634ff4fd9d04be72ce2d2053055e297d2695616c12333295a34b06ce194591228317f53dd5ad48 +EBUILD libstrophe-0.10.1.ebuild 1032 BLAKE2B 75137d8f5ef5dce445513860975fb1076ed6750498c4a4835d5a2823da6521641ef1b950f25087981c8d9ca8abfe69a6f018cb810a4d385424e578e25796dd73 SHA512 1cd63b40ea5fa34d9560ea0c099a139fb3f857551264c019fbb40459939328b04563c5de5632c263215cf4a304f5bf6eab31e693d5b12268e684866153d9d0ae +EBUILD libstrophe-0.9.2.ebuild 1032 BLAKE2B 75137d8f5ef5dce445513860975fb1076ed6750498c4a4835d5a2823da6521641ef1b950f25087981c8d9ca8abfe69a6f018cb810a4d385424e578e25796dd73 SHA512 1cd63b40ea5fa34d9560ea0c099a139fb3f857551264c019fbb40459939328b04563c5de5632c263215cf4a304f5bf6eab31e693d5b12268e684866153d9d0ae +EBUILD libstrophe-0.9.3.ebuild 1032 BLAKE2B 75137d8f5ef5dce445513860975fb1076ed6750498c4a4835d5a2823da6521641ef1b950f25087981c8d9ca8abfe69a6f018cb810a4d385424e578e25796dd73 SHA512 1cd63b40ea5fa34d9560ea0c099a139fb3f857551264c019fbb40459939328b04563c5de5632c263215cf4a304f5bf6eab31e693d5b12268e684866153d9d0ae MISC metadata.xml 591 BLAKE2B 0706dfaeb6ebcf44525e7ecfe772c8496020da59ed5b3024775e41a79ec0ac5861d118e136d45187f819e70ac7e2bf360bf210d159167aeb1eccaa75747353fd SHA512 d05b0612eae08214749144fdca408ae9b630cd9763762fec74b46639d7faed460c2c4cc07e278453c637376e78aa50eafdf137a6143f7ded355358ffb292fd60 diff --git a/dev-libs/libstrophe/files/libstrophe-0.9.2-libressl.patch b/dev-libs/libstrophe/files/libstrophe-0.9.2-libressl.patch deleted file mode 100644 index 1c0cf239cdfc..000000000000 --- a/dev-libs/libstrophe/files/libstrophe-0.9.2-libressl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/tls_openssl.c -+++ b/src/tls_openssl.c -@@ -51,7 +51,7 @@ - - void tls_initialize(void) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - SSL_library_init(); - SSL_load_error_strings(); - #else -@@ -120,7 +120,7 @@ - /* Trust server's certificate when user sets the flag explicitly. */ - mode = conn->tls_trust ? SSL_VERIFY_NONE : SSL_VERIFY_PEER; - SSL_set_verify(tls->ssl, mode, 0); --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL) - /* Hostname verification is supported in OpenSSL 1.0.2 and newer. */ - X509_VERIFY_PARAM *param = SSL_get0_param(tls->ssl); - diff --git a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild index b6501c3abcab..c7dd5320b926 100644 --- a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild +++ b/dev-libs/libstrophe/libstrophe-0.10.0.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 @@ -8,13 +8,12 @@ SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="|| ( MIT GPL-3 )" SLOT="0" KEYWORDS="amd64" -IUSE="doc expat libressl" +IUSE="doc expat" RDEPEND=" expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= " DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) diff --git a/dev-libs/libstrophe/libstrophe-0.10.1.ebuild b/dev-libs/libstrophe/libstrophe-0.10.1.ebuild index 5757ff621942..bae3fd596e3f 100644 --- a/dev-libs/libstrophe/libstrophe-0.10.1.ebuild +++ b/dev-libs/libstrophe/libstrophe-0.10.1.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 @@ -8,13 +8,12 @@ SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="|| ( MIT GPL-3 )" SLOT="0" KEYWORDS="~amd64" -IUSE="doc expat libressl" +IUSE="doc expat" RDEPEND=" expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= " DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) diff --git a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild b/dev-libs/libstrophe/libstrophe-0.9.2.ebuild index c312bb04fe2b..bae3fd596e3f 100644 --- a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild +++ b/dev-libs/libstrophe/libstrophe-0.9.2.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 @@ -8,20 +8,18 @@ SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="|| ( MIT GPL-3 )" SLOT="0" KEYWORDS="~amd64" -IUSE="doc expat libressl" +IUSE="doc expat" RDEPEND=" expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= " DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) " DOCS=( ChangeLog ) -PATCHES=( "${FILESDIR}/libstrophe-0.9.2-libressl.patch" ) src_configure() { # shellcheck disable=SC2207 diff --git a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild index 5757ff621942..bae3fd596e3f 100644 --- a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild +++ b/dev-libs/libstrophe/libstrophe-0.9.3.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 @@ -8,13 +8,12 @@ SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="|| ( MIT GPL-3 )" SLOT="0" KEYWORDS="~amd64" -IUSE="doc expat libressl" +IUSE="doc expat" RDEPEND=" expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= " DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) |