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 /net-libs/serf | |
| parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) | |
gentoo resync : 04.05.2021
Diffstat (limited to 'net-libs/serf')
| -rw-r--r-- | net-libs/serf/Manifest | 3 | ||||
| -rw-r--r-- | net-libs/serf/files/serf-1.3.9-libressl.patch | 13 | ||||
| -rw-r--r-- | net-libs/serf/serf-1.3.9-r2.ebuild | 6 |
3 files changed, 4 insertions, 18 deletions
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest index dd9301df0542..3abcc9d40972 100644 --- a/net-libs/serf/Manifest +++ b/net-libs/serf/Manifest @@ -1,9 +1,8 @@ AUX serf-1.3.8-openssl.patch 960 BLAKE2B ba24959e39cafd03d041e349806b03feeca52fc1432fa96a39cf44fe392ad5e25bfc11e305d20b752f0469445f3a0932bd1d1de0646c3a95a9c24aec36560d81 SHA512 902f0b28a0166bb2c30127600eeacd8117ab9c8a21787aec7f6ee77b94554a613ec1bdcaef3bbbd730254c9c26a7c40b47906b296ca869af909ec18d9f2ad59b AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de4d82f82ba66b9c574a21720d7bad61ea2d575363426d297f1649d394cfac4fcd8b5f963dd307d60db2f08fa3e2a2f SHA512 c5d7cbc7ed7632e3ead1a1eec36106a4e50f89c42b7099d8e6bc2a3021b4b3058c16cb1aef1fedbb26e6bd5b4d0b12b34567d40c38c0f1c5cb6528e924db9e84 -AUX serf-1.3.9-libressl.patch 394 BLAKE2B aa1a15b09b64c55d52e87df9f9a069f0d8ae3be3dc399431d3429bf0a174e2df5151ba2f03eb47f8e8a6771a1c2581d29643f1a630efc385485a69aa937d33e8 SHA512 fc547b040a4e10243ab4dc7d8873e8197861c07b4442aeda939aa27ed963432402bd55d2895b86c5156638d9425dd6a5457b081e9d3c02283f9fc640579f181c AUX serf-1.3.9-python3-check.patch 2896 BLAKE2B b757a9d1d3c4d5f9928e70a0182b3c7a0756ddea3b081378a7180f334eca697cccc5fe637dc8226d72daafbe5440aa595def447f76a52ab9f11e8bc626be846b SHA512 2538c2c80f924fa823a28e00e40688af0a38cb94ae2302cee83070645017e8321a0647e947a98c9d541228054acb8e470a465e4f2d5782b99a9b782aac86dfc1 AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3518eb7257885a582ed50dd3119a6459a52f134d149729cfc967265d6b9c478ec5d6f08a8a589bb5db0893d7bf SHA512 cf6726b860b876503820d8a42ff821f932bd1bf9a6157c98ebcbe77ebe71835ab4d2395fb9463fa187ef457100ededa59f9a7c430f98735c59f878cff600ff07 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d -EBUILD serf-1.3.9-r2.ebuild 2124 BLAKE2B e0b90c21469379382894f4d3f5177f8e5d27a0e10b81d9a1d533d83738be26a89bbe7af4891fef99becf0e8baae294620793751716be58abcb59bf9d6ed28b17 SHA512 4bc62a8529a688ce3ec2f54d0f5153a437ab91e566883fd22ba7b872f279f031627f866cb23a6f9901287700218b4236d45f8f50cf5e55c00d6932eab9e1893d +EBUILD serf-1.3.9-r2.ebuild 2023 BLAKE2B 6d164ac46edea868e3bb06e4088e7512fbca14ef1cd2f5c962ad97329064d7c59e130b6da712aaeacbee87d143853de9e6b5f966a5a512948ab21d4d121a10b4 SHA512 e836af5a29d8678afb5b79b7071e414fac0ae89d7a6ddd1b99f246ade2c99bd9b4bfdc4b8f0cad091ee13c1adcdee75932698ab5acab14691d42040f52256168 MISC metadata.xml 359 BLAKE2B 2e0d3e108f50e8f7e36f5c49b73ed3618a6848be9cbc73eb213545a40ac2e959f63e215b1b23f13665ece13cf7c548d5126112efd5df8c8ec6b05bdc5893ac3a SHA512 89556255a93ee1ed2bb71c9f1404de6547db145371a062e7be6daff4e8ea8a418f0fad2223caada5d3b75d8d625d6cbf9be3440aad7bb9c69c11d6e09c96e139 diff --git a/net-libs/serf/files/serf-1.3.9-libressl.patch b/net-libs/serf/files/serf-1.3.9-libressl.patch deleted file mode 100644 index fe9319fffa86..000000000000 --- a/net-libs/serf/files/serf-1.3.9-libressl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c -index b01e535..6fadb0c 100644 ---- a/buckets/ssl_buckets.c -+++ b/buckets/ssl_buckets.c -@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void) - } - #endif - --#ifdef USE_OPENSSL_1_1_API -+#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER) - OPENSSL_malloc_init(); - #else - CRYPTO_malloc_init(); diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild index c196cc92be27..d8de28619b71 100644 --- a/net-libs/serf/serf-1.3.9-r2.ebuild +++ b/net-libs/serf/serf-1.3.9-r2.ebuild @@ -14,12 +14,12 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="1" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="kerberos static-libs libressl" +IUSE="kerberos static-libs" RESTRICT="test" RDEPEND="dev-libs/apr:1= dev-libs/apr-util:1= - !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )" DEPEND="${RDEPEND} @@ -30,7 +30,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch "${FILESDIR}"/${PN}-1.3.9-python3.patch "${FILESDIR}"/${PN}-1.3.9-python3_byte.patch "${FILESDIR}"/${PN}-1.3.9-python3-check.patch - "${FILESDIR}"/${PN}-1.3.9-libressl.patch ) +) src_prepare() { default |