diff options
Diffstat (limited to 'net-libs/serf')
| -rw-r--r-- | net-libs/serf/Manifest | 1 | ||||
| -rw-r--r-- | net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch | 13 | ||||
| -rw-r--r-- | net-libs/serf/files/serf-1.3.8-scons_variables.patch | 110 | ||||
| -rw-r--r-- | net-libs/serf/files/serf-1.3.8-tests.patch | 95 | ||||
| -rw-r--r-- | net-libs/serf/files/serf-1.3.9-libressl.patch | 35 | ||||
| -rw-r--r-- | net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch | 22 | ||||
| -rw-r--r-- | net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch | 15 | ||||
| -rw-r--r-- | net-libs/serf/files/serf-1.3.9-python3-check.patch | 74 | ||||
| -rw-r--r-- | net-libs/serf/metadata.xml | 14 | ||||
| -rw-r--r-- | net-libs/serf/serf-1.3.8-r1.ebuild | 71 | ||||
| -rw-r--r-- | net-libs/serf/serf-1.3.8.ebuild | 61 | ||||
| -rw-r--r-- | net-libs/serf/serf-1.3.9-r4.ebuild (renamed from net-libs/serf/serf-1.3.9-r1.ebuild) | 29 | ||||
| -rw-r--r-- | net-libs/serf/serf-1.3.9.ebuild | 71 |
13 files changed, 169 insertions, 442 deletions
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest index 6be53a8dc67f..28e866e100e2 100644 --- a/net-libs/serf/Manifest +++ b/net-libs/serf/Manifest @@ -1,2 +1 @@ -DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7ced5a017ca121ecbc091de49a963e69beeee592f39dfab23ff30d4bda3378192ea24f2ec07a5569ee19dc062 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d diff --git a/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch b/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch deleted file mode 100644 index f86646a28d89..000000000000 --- a/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- SConstruct -+++ SConstruct -@@ -345,8 +345,8 @@ - ### there is probably a better way to run/capture output. - ### env.ParseConfig() may be handy for getting this stuff into the build - if CALLOUT_OKAY: -- apr_libs = os.popen(env.subst('$APR --link-libtool --libs')).read().strip() -- apu_libs = os.popen(env.subst('$APU --link-libtool --libs')).read().strip() -+ apr_libs = os.popen(env.subst('$APR --link-ld')).read().strip() -+ apu_libs = os.popen(env.subst('$APU --link-ld')).read().strip() - else: - apr_libs = '' - apu_libs = '' diff --git a/net-libs/serf/files/serf-1.3.8-scons_variables.patch b/net-libs/serf/files/serf-1.3.8-scons_variables.patch deleted file mode 100644 index b51e846d8932..000000000000 --- a/net-libs/serf/files/serf-1.3.8-scons_variables.patch +++ /dev/null @@ -1,110 +0,0 @@ -https://code.google.com/p/serf/issues/detail?id=151 -https://code.google.com/p/serf/source/detail?r=2413 - ---- SConstruct -+++ SConstruct -@@ -223,12 +223,12 @@ - - if sys.platform == 'darwin': - # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) -- env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)) -+ env.Append(LINKFLAGS=['-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)]) - - if sys.platform != 'win32': - ### gcc only. figure out appropriate test / better way to check these - ### flags, and check for gcc. -- env.Append(CFLAGS='-std=c89') -+ env.Append(CFLAGS=['-std=c89']) - - ### These warnings are not available on Solaris - if sys.platform != 'sunos5': -@@ -237,17 +237,17 @@ - '-Wall']) - - if debug: -- env.Append(CCFLAGS='-g') -+ env.Append(CCFLAGS=['-g']) - env.Append(CPPDEFINES=['DEBUG', '_DEBUG']) - else: -- env.Append(CCFLAGS='-O2') -- env.Append(CPPDEFINES='NDEBUG') -+ env.Append(CCFLAGS=['-O2']) -+ env.Append(CPPDEFINES=['NDEBUG']) - - ### works for Mac OS. probably needs to change - env.Append(LIBS=['ssl', 'crypto', 'z', ]) - - if sys.platform == 'sunos5': -- env.Append(LIBS='m') -+ env.Append(LIBS=['m']) - else: - # Warning level 4, no unused argument warnings - env.Append(CCFLAGS=['/W4', '/wd4100']) -@@ -260,8 +260,8 @@ - else: - # Optimize for speed, use DLL runtime - env.Append(CCFLAGS=['/O2', '/MD']) -- env.Append(CPPDEFINES='NDEBUG') -- env.Append(LINKFLAGS='/RELEASE') -+ env.Append(CPPDEFINES=['NDEBUG']) -+ env.Append(LINKFLAGS=['/RELEASE']) - - # PLAN THE BUILD - SHARED_SOURCES = [] -@@ -307,25 +307,25 @@ - CPPPATH=['$APR/include', '$APU/include']) - - # zlib -- env.Append(LIBS='zlib.lib') -+ env.Append(LIBS=['zlib.lib']) - if not env.get('SOURCE_LAYOUT', None): -- env.Append(CPPPATH='$ZLIB/include', -- LIBPATH='$ZLIB/lib') -+ env.Append(CPPPATH=['$ZLIB/include'], -+ LIBPATH=['$ZLIB/lib']) - else: -- env.Append(CPPPATH='$ZLIB', -- LIBPATH='$ZLIB') -+ env.Append(CPPPATH=['$ZLIB'], -+ LIBPATH=['$ZLIB']) - - # openssl - env.Append(LIBS=['libeay32.lib', 'ssleay32.lib']) - if not env.get('SOURCE_LAYOUT', None): -- env.Append(CPPPATH='$OPENSSL/include/openssl', -- LIBPATH='$OPENSSL/lib') -+ env.Append(CPPPATH=['$OPENSSL/include/openssl'], -+ LIBPATH=['$OPENSSL/lib']) - elif 0: # opensslstatic: -- env.Append(CPPPATH='$OPENSSL/inc32', -- LIBPATH='$OPENSSL/out32') -+ env.Append(CPPPATH=['$OPENSSL/inc32'], -+ LIBPATH=['$OPENSSL/out32']) - else: -- env.Append(CPPPATH='$OPENSSL/inc32', -- LIBPATH='$OPENSSL/out32dll') -+ env.Append(CPPPATH=['$OPENSSL/inc32'], -+ LIBPATH=['$OPENSSL/out32dll']) - else: - if os.path.isdir(apr): - apr = os.path.join(apr, 'bin', 'apr-1-config') -@@ -351,8 +351,8 @@ - apr_libs = '' - apu_libs = '' - -- env.Append(CPPPATH='$OPENSSL/include') -- env.Append(LIBPATH='$OPENSSL/lib') -+ env.Append(CPPPATH=['$OPENSSL/include']) -+ env.Append(LIBPATH=['$OPENSSL/lib']) - - - # If build with gssapi, get its information and define SERF_HAVE_GSSAPI -@@ -362,7 +362,7 @@ - env['GSSAPI_LIBS'] = cmd.strip() - return env.MergeFlags(cmd, unique) - env.ParseConfig('$GSSAPI --libs gssapi', parse_libs) -- env.Append(CPPDEFINES='SERF_HAVE_GSSAPI') -+ env.Append(CPPDEFINES=['SERF_HAVE_GSSAPI']) - if sys.platform == 'win32': - env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) - diff --git a/net-libs/serf/files/serf-1.3.8-tests.patch b/net-libs/serf/files/serf-1.3.8-tests.patch deleted file mode 100644 index 65b9962f2529..000000000000 --- a/net-libs/serf/files/serf-1.3.8-tests.patch +++ /dev/null @@ -1,95 +0,0 @@ -https://code.google.com/p/serf/source/detail?r=2443 -https://code.google.com/p/serf/source/detail?r=2444 -https://code.google.com/p/serf/source/detail?r=2445 - ---- test/test_buckets.c -+++ test/test_buckets.c -@@ -1232,9 +1232,9 @@ - - /* The largest buffer we should need is 0.1% larger than the - uncompressed data, + 12 bytes. This info comes from zlib.h. -+ buf_size = orig_len + (orig_len / 1000) + 12; - Note: This isn't sufficient when using Z_NO_FLUSH and extremely compressed - data. Use a buffer bigger than what we need. */ --// buf_size = orig_len + (orig_len / 1000) + 12; - buf_size = 100000; - - write_buf = apr_palloc(pool, buf_size); -@@ -1309,12 +1309,12 @@ - expected_len); - } - --static void deflate_buckets(CuTest *tc, int nr_of_loops) -+static void deflate_buckets(CuTest *tc, int nr_of_loops, apr_pool_t *pool) - { - const char *msg = "12345678901234567890123456789012345678901234567890"; - - test_baton_t *tb = tc->testBaton; -- serf_bucket_alloc_t *alloc = serf_bucket_allocator_create(tb->pool, NULL, -+ serf_bucket_alloc_t *alloc = serf_bucket_allocator_create(pool, NULL, - NULL); - z_stream zdestr; - int i; -@@ -1333,8 +1333,8 @@ - { - serf_config_t *config; - -- serf_context_t *ctx = serf_context_create(tb->pool); -- /* status = */ serf__config_store_get_config(ctx, NULL, &config, tb->pool); -+ serf_context_t *ctx = serf_context_create(pool); -+ /* status = */ serf__config_store_get_config(ctx, NULL, &config, pool); - - serf_bucket_set_config(defbkt, config); - } -@@ -1356,11 +1356,11 @@ - if (i == nr_of_loops - 1) { - CuAssertIntEquals(tc, APR_SUCCESS, - deflate_compress(&data, &len, &zdestr, msg, -- strlen(msg), 1, tb->pool)); -+ strlen(msg), 1, pool)); - } else { - CuAssertIntEquals(tc, APR_SUCCESS, - deflate_compress(&data, &len, &zdestr, msg, -- strlen(msg), 0, tb->pool)); -+ strlen(msg), 0, pool)); - } - - if (len == 0) -@@ -1378,10 +1378,15 @@ - static void test_deflate_buckets(CuTest *tc) - { - int i; -+ apr_pool_t *iterpool; -+ test_baton_t *tb = tc->testBaton; - -+ apr_pool_create(&iterpool, tb->pool); - for (i = 1; i < 1000; i++) { -- deflate_buckets(tc, i); -+ apr_pool_clear(iterpool); -+ deflate_buckets(tc, i, iterpool); - } -+ apr_pool_destroy(iterpool); - } - - static apr_status_t discard_data(serf_bucket_t *bkt, ---- test/test_util.c -+++ test/test_util.c -@@ -363,10 +363,18 @@ - return status; - } - -+static int pool_abort_func(int retcode) -+{ -+ fprintf(stderr, "Out of memory\n"); -+ abort(); -+ return 0; -+} -+ - void *test_setup(void *dummy) - { - apr_pool_t *test_pool; - apr_pool_create(&test_pool, NULL); -+ apr_pool_abort_set(pool_abort_func, test_pool); - return test_pool; - } - diff --git a/net-libs/serf/files/serf-1.3.9-libressl.patch b/net-libs/serf/files/serf-1.3.9-libressl.patch new file mode 100644 index 000000000000..bfb07bd5a0ad --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-libressl.patch @@ -0,0 +1,35 @@ +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 + +From df0d2d0dbdf88576f26da9c71df3ab6249d351dc Mon Sep 17 00:00:00 2001 +From: Stefan Sperling <stsp@apache.org> +Date: Tue, 20 Dec 2016 09:57:08 +0000 +Subject: [PATCH] Fix another build problem with LibreSSL. + +* SConstruct: Check for OpenSSL_malloc_init() and provide the + SERF_HAVE_OPENSSL_MALLOC_INIT feature flag. + +* buckets/ssl_buckets.c + (init_ssl_libraries): Use SERF_HAVE_OPENSSL_MALLOC_INIT instead + of USE_LEGACY_OPENSSL. + +git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1775242 13f79535-47bb-0310-9956-ffa450edef68 + +diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c +index b01e535..27c84c7 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 ++#ifndef LIBRESSL_VERSION_NUMBER + OPENSSL_malloc_init(); + #else + CRYPTO_malloc_init(); diff --git a/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch b/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch new file mode 100644 index 000000000000..6bf3aba6de47 --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch @@ -0,0 +1,22 @@ +https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-bio-ctrl.patch +https://bugs.gentoo.org/805161 +https://issues.apache.org/jira/projects/SERF/issues/SERF-198 +--- a/buckets/ssl_buckets.c ++++ b/buckets/ssl_buckets.c +@@ -407,7 +407,7 @@ static int bio_bucket_destroy(BIO *bio) + + static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr) + { +- long ret = 1; ++ long ret = 0; + + switch (cmd) { + default: +@@ -415,6 +415,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr) + break; + case BIO_CTRL_FLUSH: + /* At this point we can't force a flush. */ ++ ret = 1; + break; + case BIO_CTRL_PUSH: + case BIO_CTRL_POP: diff --git a/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch b/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch new file mode 100644 index 000000000000..2823ee88e17b --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch @@ -0,0 +1,15 @@ +https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch +https://bugs.gentoo.org/805161 +--- a/buckets/ssl_buckets.c ++++ b/buckets/ssl_buckets.c +@@ -1204,6 +1204,10 @@ + } + } + ++#ifndef ERR_GET_FUNC ++#define ERR_GET_FUNC(ec) (0) ++#endif ++ + static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey) + { + serf_ssl_context_t *ctx = SSL_get_app_data(ssl); diff --git a/net-libs/serf/files/serf-1.3.9-python3-check.patch b/net-libs/serf/files/serf-1.3.9-python3-check.patch new file mode 100644 index 000000000000..fbbfe36fefe0 --- /dev/null +++ b/net-libs/serf/files/serf-1.3.9-python3-check.patch @@ -0,0 +1,74 @@ +From 05eae144c6b3ed85f0829de6278a8f89505506f0 Mon Sep 17 00:00:00 2001 +From: Bert Huijben <rhuijben@apache.org> +Date: Mon, 2 Nov 2015 17:50:29 +0000 +Subject: [PATCH] * build/check.py Print a bit more information about the + failed test. The returncode might be interesting to track down signal + problems. + +git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1712098 13f79535-47bb-0310-9956-ffa450edef68 +--- + build/check.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/build/check.py b/build/check.py +index fc49d336..75287016 100755 +--- a/build/check.py ++++ b/build/check.py +@@ -55,13 +55,13 @@ + print "== Testing %s ==" % (case) + try: + subprocess.check_call([SERF_RESPONSE_EXE, case]) +- except subprocess.CalledProcessError: +- print "ERROR: test case %s failed" % (case) ++ except subprocess.CalledProcessError, x: ++ print "ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode) + sys.exit(1) + + print "== Running the unit tests ==" + try: + subprocess.check_call(TEST_ALL_EXE) +- except subprocess.CalledProcessError: +- print "ERROR: test(s) failed in test_all" ++ except subprocess.CalledProcessError, x: ++ print "ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode) + sys.exit(1) +From 773a2ee2ca7a48dd8356707fa6774afcf5b85470 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Branko=20=C4=8Cibej?= <brane@apache.org> +Date: Sat, 9 Jun 2018 08:10:10 +0000 +Subject: [PATCH] Make the tests run with Python 3.x. + +* build/check.py: Add parentheses around 'print' statement arguments + so that they work when 'print' is a function. + +git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1833223 13f79535-47bb-0310-9956-ffa450edef68 +--- + build/check.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/build/check.py b/build/check.py +index 75287016..e05760f9 100755 +--- a/build/check.py ++++ b/build/check.py +@@ -52,16 +52,16 @@ + + # Find test responses and run them one by one + for case in glob.glob(testdir + "/testcases/*.response"): +- print "== Testing %s ==" % (case) ++ print("== Testing %s ==" % (case)) + try: + subprocess.check_call([SERF_RESPONSE_EXE, case]) +- except subprocess.CalledProcessError, x: +- print "ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode) ++ except subprocess.CalledProcessError as x: ++ print("ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode)) + sys.exit(1) + +- print "== Running the unit tests ==" ++ print("== Running the unit tests ==") + try: + subprocess.check_call(TEST_ALL_EXE) +- except subprocess.CalledProcessError, x: +- print "ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode) ++ except subprocess.CalledProcessError as x: ++ print("ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode)) + sys.exit(1) diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml index ca82cfff518d..bc9fee8abdf6 100644 --- a/net-libs/serf/metadata.xml +++ b/net-libs/serf/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>arfrever.fta@gmail.com</email> - </maintainer> - <maintainer type="person"> - <email>floppym@gentoo.org</email> - <name>Mike Gilbert</name> - <description>Proxy</description> - </maintainer> + <!--maintainer-needed--> + <upstream> + <remote-id type="github">apache/serf</remote-id> + </upstream> </pkgmetadata> diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild deleted file mode 100644 index f951a44343b0..000000000000 --- a/net-libs/serf/serf-1.3.8-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2008-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils 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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="kerberos static-libs libressl" -RESTRICT="test" - -RDEPEND="dev-libs/apr:1= - dev-libs/apr-util:1= - !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib:0= - kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND} - >=dev-util/scons-2.3.0" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch" - epatch "${FILESDIR}/${PN}-1.3.8-scons_variables.patch" - epatch "${FILESDIR}/${PN}-1.3.8-tests.patch" - epatch "${FILESDIR}/${PN}-1.3.8-static-lib.patch" - epatch "${FILESDIR}/${PN}-1.3.8-openssl.patch" - - # https://code.google.com/p/serf/issues/detail?id=133 - sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct - - # need limits.h for PATH_MAX (only when EXTENSIONS is enabled) - [[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__ -} - -src_compile() { - myesconsargs=( - 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" - BUILD_STATIC=$(usex static-libs) - 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 -} - -src_test() { - escons check -} - -src_install() { - escons install --install-sandbox="${D}" -} diff --git a/net-libs/serf/serf-1.3.8.ebuild b/net-libs/serf/serf-1.3.8.ebuild deleted file mode 100644 index 5fca0dc8af95..000000000000 --- a/net-libs/serf/serf-1.3.8.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2008-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils scons-utils toolchain-funcs - -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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="kerberos" -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} - >=dev-util/scons-2.3.0" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch" - epatch "${FILESDIR}/${PN}-1.3.8-scons_variables.patch" - epatch "${FILESDIR}/${PN}-1.3.8-tests.patch" - - # https://code.google.com/p/serf/issues/detail?id=133 - sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct -} - -src_compile() { - local myesconsargs=( - PREFIX="${EPREFIX}/usr" - LIBDIR="${EPREFIX}/usr/$(get_libdir)" - APR="${EPREFIX}/usr/bin/apr-1-config" - APU="${EPREFIX}/usr/bin/apu-1-config" - OPENSSL="${EPREFIX}/usr" - CC="$(tc-getCC)" - CPPFLAGS="${CPPFLAGS}" - CFLAGS="${CFLAGS}" - LINKFLAGS="${LDFLAGS}" - ) - - if use kerberos; then - myesconsargs+=(GSSAPI="${EPREFIX}/usr/bin/krb5-config") - fi - - escons -} - -src_test() { - escons check -} - -src_install() { - escons install --install-sandbox="${D}" -} diff --git a/net-libs/serf/serf-1.3.9-r1.ebuild b/net-libs/serf/serf-1.3.9-r4.ebuild index 94fa59dfda68..0d7c80cd62a3 100644 --- a/net-libs/serf/serf-1.3.9-r1.ebuild +++ b/net-libs/serf/serf-1.3.9-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) +PYTHON_COMPAT=( python3_{10..11} ) inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic @@ -13,28 +13,35 @@ 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="kerberos static-libs libressl" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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= - !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND} - >=dev-util/scons-2.3.0" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-build/scons-2.3.0" -PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch +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_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 + 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__ @@ -42,6 +49,7 @@ src_prepare() { 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 @@ -49,7 +57,6 @@ src_compile() { # avoid that. APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config" APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config" - BUILD_STATIC=$(usex static-libs) AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" CC="$(tc-getCC)" diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild deleted file mode 100644 index 4b06dc39a97c..000000000000 --- a/net-libs/serf/serf-1.3.9.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2008-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils 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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="kerberos static-libs libressl" -RESTRICT="test" - -RDEPEND="dev-libs/apr:1= - dev-libs/apr-util:1= - !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib:0= - kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND} - >=dev-util/scons-2.3.0" - -src_prepare() { - #epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch" - #epatch "${FILESDIR}/${PN}-1.3.8-scons_variables.patch" - #epatch "${FILESDIR}/${PN}-1.3.8-tests.patch" - epatch "${FILESDIR}/${PN}-1.3.8-static-lib.patch" - epatch "${FILESDIR}/${PN}-1.3.8-openssl.patch" - - # https://code.google.com/p/serf/issues/detail?id=133 - sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct - - # need limits.h for PATH_MAX (only when EXTENSIONS is enabled) - [[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__ -} - -src_compile() { - myesconsargs=( - 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" - BUILD_STATIC=$(usex static-libs) - 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 -} - -src_test() { - escons check -} - -src_install() { - escons install --install-sandbox="${D}" -} |