From 02930d1eb5af78d32b1597af6af24163895d9e0f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 May 2023 23:47:37 +0100 Subject: gentoo auto-resync : 11:05:2023 - 23:47:37 --- net-libs/Manifest.gz | Bin 32459 -> 32461 bytes net-libs/serf/Manifest | 4 +- net-libs/serf/files/serf-1.3.9-libressl.patch | 28 ++------- net-libs/serf/serf-1.3.9-r3.ebuild | 81 -------------------------- net-libs/serf/serf-1.3.9-r4.ebuild | 81 ++++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 105 deletions(-) delete mode 100644 net-libs/serf/serf-1.3.9-r3.ebuild create mode 100644 net-libs/serf/serf-1.3.9-r4.ebuild (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index c98eb9c4b14d..1c008be7d5a1 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest index 26502e6acee4..255b99e40248 100644 --- a/net-libs/serf/Manifest +++ b/net-libs/serf/Manifest @@ -1,11 +1,11 @@ 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 1732 BLAKE2B 94d8376dfb295f27ccc0441b6c7153d9abb3abbd3b92f9719bcb2076a2ba3e3a9b6b5f67c0b21ca924dc889d03fc58af9205e8d2cc8ecd3cbbd1fb8995341bb2 SHA512 9690155d83900f7a05666ff51bb82e771405577fdc98672928395398ab4458f3c4a65b70520e206aebdb21338271ec460aca45894e8736d582d05e1fb0bcd45f +AUX serf-1.3.9-libressl.patch 1220 BLAKE2B e1ef55dfd5e93b59dba6bf0dbd2378c241781f89b282691f9f7cb577430affdcfc933c4ef25da2fb2130f7af67ee003cdbe66c452a888b7c5b8cca0dc11a6fef SHA512 89957ae479cfb12b94c1e60c1dca832fef9ba3ca91f835226e035d0dbbd9ef7a8ac7e99abce879774bacc3800d0d3e7743c61fd3bd9f26d0a2632a010679ad99 AUX serf-1.3.9-openssl-3-bio-ctrl.patch 708 BLAKE2B 20c6116838461540a7040537ad40394f9ae7ae23bc972bc4f9d66f79d2d3167f6ccda54066ba6e921050b9fdda4aab6a6f86b098f2b71fc4086b6a4075b7a8d8 SHA512 b7631c6cfd76ca42e2f999bb328f147214d5f12546a26cd2ff90f774164db2458f0045c07fb0cbdc5b54c09f5c6f6b461365ab0d6326aa5e0151454c9a9a2495 AUX serf-1.3.9-openssl-3-errgetfunc.patch 402 BLAKE2B d142dc567dad42966ff7a9bf84e5354e8778df7d696c260b1c895718e01311e51f1141f58cb6d4827b4f9631f11da286ce0eaaedf60e8d6b0517fbeadd3ebf96 SHA512 2f8b8ee93255aae2633f73c16fdec498db6885d25c4d31a5623170a629b616ab4e56bfe6f8db13d8617cc994ec775b1d90777d5596452f14e97338648d5af10c 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-r3.ebuild 2189 BLAKE2B 4f7a33dbd00c2c6562b3a8414b219a1a8caf9ee0a0aad05b4c372cacdd6d1f95b19d555673f3d7e1607b60223fd41dd3079415e1e3c829e7ce0fd97df65b7144 SHA512 997d8cc0b3fd30f75cbe5f5a21a6e7b2411b43e21d07816d63a3449ba337adda4654a169874329267861a313ecb072e11ea58698243a694e8fe6b6e3ecfc8c36 +EBUILD serf-1.3.9-r4.ebuild 2197 BLAKE2B ad0050a3a01793b1fb418725a3a8b8c3d6d9c79ac41aca3b711cf4db4c945274a1822cb73a8c5a2beb41925b0ff06ad2093bf4fbf02b0c56d7e37d3e2867315b SHA512 65b1f3c5c1dcf5d8d467ea2aeaa59a0385936b484b0f0928d8c10b5e1c645b6d775e90d7c290e73f9c851143ba5f19c2f87a41932bf647f536b54deef1b223de MISC metadata.xml 242 BLAKE2B 9323724392947eec7347e9052aadab6d31da88b1fe94720fdd3993f37aeb74d00e43a34ec26642c79b0d471bd0146aaaf3489a3ab341445c6ddfcf305c581989 SHA512 c20cc4c38ff85c11dafe9981b45f20d2343d817cdfbb0c1e8cb77b0964e5d2b74762dfb8384c9fb47e8f0427b1f3f3e38a3a81f81c76ca30ade4a0994db14cea diff --git a/net-libs/serf/files/serf-1.3.9-libressl.patch b/net-libs/serf/files/serf-1.3.9-libressl.patch index 1c437e81bc05..bfb07bd5a0ad 100644 --- a/net-libs/serf/files/serf-1.3.9-libressl.patch +++ b/net-libs/serf/files/serf-1.3.9-libressl.patch @@ -1,3 +1,8 @@ +This backported patch avoids the upstream scons check to prevent unintended +issues and can be removed next release bump where it may be preferable to +use the newer cmake build system. + +https://bugs.gentoo.org/906123 https://bugs.gentoo.org/903001 https://github.com/apache/serf/commit/df0d2d0dbdf88576f26da9c71df3ab6249d351dc @@ -14,28 +19,7 @@ Subject: [PATCH] Fix another build problem with LibreSSL. of USE_LEGACY_OPENSSL. git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1775242 13f79535-47bb-0310-9956-ffa450edef68 ---- - SConstruct | 6 ++++++ - buckets/ssl_buckets.c | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) -diff --git a/SConstruct b/SConstruct -index 4358a23..115f409 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -373,6 +373,12 @@ else: - env.Append(CPPPATH=['$OPENSSL/include']) - env.Append(LIBPATH=['$OPENSSL/lib']) - -+ # Check for OpenSSL functions which are only available in some of -+ # the versions we support. Also handles forks like LibreSSL. -+ conf = Configure(env) -+ if conf.CheckFunc('OPENSSL_malloc_init'): -+ env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_MALLOC_INIT']) -+ env = conf.Finish() - - # If build with gssapi, get its information and define SERF_HAVE_GSSAPI - if gssapi and CALLOUT_OKAY: diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c index b01e535..27c84c7 100644 --- a/buckets/ssl_buckets.c @@ -45,7 +29,7 @@ index b01e535..27c84c7 100644 #endif -#ifdef USE_OPENSSL_1_1_API -+#ifdef SERF_HAVE_OPENSSL_MALLOC_INIT ++#ifndef LIBRESSL_VERSION_NUMBER OPENSSL_malloc_init(); #else CRYPTO_malloc_init(); diff --git a/net-libs/serf/serf-1.3.9-r3.ebuild b/net-libs/serf/serf-1.3.9-r3.ebuild deleted file mode 100644 index 7464e14dba6d..000000000000 --- a/net-libs/serf/serf-1.3.9-r3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic - -DESCRIPTION="HTTP client library" -HOMEPAGE="https://serf.apache.org/" -SRC_URI="mirror://apache/${PN}/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="kerberos" -# Many test failures. -RESTRICT="test" - -RDEPEND="dev-libs/apr:1= - dev-libs/apr-util:1= - dev-libs/openssl:0= - sys-libs/zlib:0= - kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/scons-2.3.0" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.8-static-lib.patch - "${FILESDIR}"/${PN}-1.3.8-openssl.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-openssl-3-bio-ctrl.patch - "${FILESDIR}"/${PN}-1.3.9-openssl-3-errgetfunc.patch - "${FILESDIR}"/${PN}-1.3.9-libressl.patch #903001 -) - -src_prepare() { - default - - # https://code.google.com/p/serf/issues/detail?id=133 - sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct || die - - # need limits.h for PATH_MAX (only when EXTENSIONS is enabled) - [[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__ -} - -src_compile() { - myesconsargs=( - BUILD_STATIC=no - PREFIX="${EPREFIX}/usr" - LIBDIR="${EPREFIX}/usr/$(get_libdir)" - # These config scripts are sent through a shell with an empty env - # which breaks the SYSROOT usage in them. Set the vars inline to - # avoid that. - APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config" - APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config" - AR="$(tc-getAR)" - RANLIB="$(tc-getRANLIB)" - CC="$(tc-getCC)" - CPPFLAGS="${CPPFLAGS}" - CFLAGS="${CFLAGS}" - LINKFLAGS="${LDFLAGS}" - ) - - if use kerberos; then - myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" ) - fi - - escons "${myesconsargs[@]}" -} - -src_test() { - escons check -} - -src_install() { - escons install --install-sandbox="${D}" -} diff --git a/net-libs/serf/serf-1.3.9-r4.ebuild b/net-libs/serf/serf-1.3.9-r4.ebuild new file mode 100644 index 000000000000..8ea7ea9652d6 --- /dev/null +++ b/net-libs/serf/serf-1.3.9-r4.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic + +DESCRIPTION="HTTP client library" +HOMEPAGE="https://serf.apache.org/" +SRC_URI="mirror://apache/${PN}/${P}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="1" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="kerberos" +# Many test failures. +RESTRICT="test" + +RDEPEND="dev-libs/apr:1= + dev-libs/apr-util:1= + dev-libs/openssl:0= + sys-libs/zlib:0= + kerberos? ( virtual/krb5 )" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/scons-2.3.0" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.8-static-lib.patch + "${FILESDIR}"/${PN}-1.3.8-openssl.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-openssl-3-bio-ctrl.patch + "${FILESDIR}"/${PN}-1.3.9-openssl-3-errgetfunc.patch + "${FILESDIR}"/${PN}-1.3.9-libressl.patch #903001, 906123 +) + +src_prepare() { + default + + # https://code.google.com/p/serf/issues/detail?id=133 + sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct || die + + # need limits.h for PATH_MAX (only when EXTENSIONS is enabled) + [[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__ +} + +src_compile() { + myesconsargs=( + BUILD_STATIC=no + PREFIX="${EPREFIX}/usr" + LIBDIR="${EPREFIX}/usr/$(get_libdir)" + # These config scripts are sent through a shell with an empty env + # which breaks the SYSROOT usage in them. Set the vars inline to + # avoid that. + APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config" + APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config" + AR="$(tc-getAR)" + RANLIB="$(tc-getRANLIB)" + CC="$(tc-getCC)" + CPPFLAGS="${CPPFLAGS}" + CFLAGS="${CFLAGS}" + LINKFLAGS="${LDFLAGS}" + ) + + if use kerberos; then + myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" ) + fi + + escons "${myesconsargs[@]}" +} + +src_test() { + escons check +} + +src_install() { + escons install --install-sandbox="${D}" +} -- cgit v1.2.3