* [gentoo-commits] repo/gentoo:master commit in: net-libs/serf/files/, net-libs/serf/
@ 2019-12-23 3:01 Benda XU
0 siblings, 0 replies; 6+ messages in thread
From: Benda XU @ 2019-12-23 3:01 UTC (permalink / raw
To: gentoo-commits
commit: c8f1ba80a5e0a61ea85a61c8ee69432dbaee20ba
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 2 14:54:23 2019 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 02:59:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8f1ba80
net-libs/serf: inherit python-any-r1 for scons, bump EAPI
The scons package depends on python, and in this case python-any-r1
is needed.
Reference: https://wiki.gentoo.org/wiki/Project:Python/scons-utils_integration
Closes: https://bugs.gentoo.org/701760
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
net-libs/serf/files/serf-1.3.9-python3.patch | 28 +++++++++
net-libs/serf/files/serf-1.3.9-python3_byte.patch | 28 +++++++++
net-libs/serf/serf-1.3.9-r1.ebuild | 74 +++++++++++++++++++++++
3 files changed, 130 insertions(+)
diff --git a/net-libs/serf/files/serf-1.3.9-python3.patch b/net-libs/serf/files/serf-1.3.9-python3.patch
new file mode 100644
index 00000000000..7ba43d91968
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.9-python3.patch
@@ -0,0 +1,28 @@
+From 1c0241847e845a8da265aa89f297d3db6ae483b1 Mon Sep 17 00:00:00 2001
+From: Bert Huijben <rhuijben@apache.org>
+Date: Wed, 4 Oct 2017 14:56:22 +0000
+Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building
+ with most recent scons version.
+
+* SConstruct
+ Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python 3.0
+ and 2.7.
+
+git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1811083 13f79535-47bb-0310-9956-ffa450edef68
+---
+ SConstruct | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index e5d407b..fab9828 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -199,7 +199,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
+
+ unknown = opts.UnknownVariables()
+ if unknown:
+- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++ print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
+
+ apr = str(env['APR'])
+ apu = str(env['APU'])
diff --git a/net-libs/serf/files/serf-1.3.9-python3_byte.patch b/net-libs/serf/files/serf-1.3.9-python3_byte.patch
new file mode 100644
index 00000000000..ab86af2082d
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.9-python3_byte.patch
@@ -0,0 +1,28 @@
+From 9d30108b630b77f732ef94d1642b159066ffd890 Mon Sep 17 00:00:00 2001
+From: Andreas Stieger <astieger@apache.org>
+Date: Wed, 8 Nov 2017 17:05:28 +0000
+Subject: [PATCH] Follow-up to r1811083, fix building with scons 3.0.0 and
+ Python3
+
+* SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid
+ TypeError: cannot use a string pattern on a bytes-like object
+
+
+git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1814604 13f79535-47bb-0310-9956-ffa450edef68
+---
+ SConstruct | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 5f5036b..71e5b0a 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -182,7 +182,7 @@ env.Append(BUILDERS = {
+ match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+ 'SERF_MINOR_VERSION ([0-9]+).*'
+ 'SERF_PATCH_VERSION ([0-9]+)',
+- env.File('serf.h').get_contents(),
++ env.File('serf.h').get_contents().decode('utf-8'),
+ re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+ env.Append(MAJOR=str(MAJOR))
diff --git a/net-libs/serf/serf-1.3.9-r1.ebuild b/net-libs/serf/serf-1.3.9-r1.ebuild
new file mode 100644
index 00000000000..f4165ca2e0d
--- /dev/null
+++ b/net-libs/serf/serf-1.3.9-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_6 )
+
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
+
+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 )
+
+src_prepare() {
+ default
+
+ # 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 "${myesconsargs[@]}"
+}
+
+src_test() {
+ escons check
+}
+
+src_install() {
+ escons install --install-sandbox="${D}"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/serf/files/, net-libs/serf/
@ 2020-05-28 9:37 Stefan Strogin
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Strogin @ 2020-05-28 9:37 UTC (permalink / raw
To: gentoo-commits
commit: b535d26d851e7fc8adfe1067016ac70359fd293a
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 09:28:08 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Thu May 28 09:37:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b535d26d
net-libs/serf: add patch for LibreSSL
Closes: https://bugs.gentoo.org/725776
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
net-libs/serf/files/serf-1.3.9-libressl.patch | 13 +++++
net-libs/serf/serf-1.3.9-r2.ebuild | 75 +++++++++++++++++++++++++++
2 files changed, 88 insertions(+)
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 00000000000..fe9319fffa8
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.9-libressl.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 00000000000..646928a7b05
--- /dev/null
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+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 ~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"
+
+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-libressl.patch )
+
+src_prepare() {
+ default
+
+ # 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 "${myesconsargs[@]}"
+}
+
+src_test() {
+ escons check
+}
+
+src_install() {
+ escons install --install-sandbox="${D}"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/serf/files/, net-libs/serf/
@ 2020-12-24 2:25 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2020-12-24 2:25 UTC (permalink / raw
To: gentoo-commits
commit: 342cce472571151b17ec2c2d4191ac74cb3b4cbb
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 02:21:02 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 02:21:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342cce47
net-libs/serf: backport python3 fixes in check.py
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-libs/serf/files/serf-1.3.9-python3-check.patch | 74 ++++++++++++++++++++++
net-libs/serf/serf-1.3.9-r2.ebuild | 1 +
2 files changed, 75 insertions(+)
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 00000000000..fbbfe36fefe
--- /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/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild
index e0703ec1591..be4abc15606 100644
--- a/net-libs/serf/serf-1.3.9-r2.ebuild
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild
@@ -29,6 +29,7 @@ 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-libressl.patch )
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/serf/files/, net-libs/serf/
@ 2022-05-06 5:43 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-05-06 5:43 UTC (permalink / raw
To: gentoo-commits
commit: a04177db02b3b1d7118251b5acd9cbbb69454ff8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 05:41:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 6 05:43:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04177db
net-libs/serf: fix build with OpenSSL 3
Closes: https://bugs.gentoo.org/805161
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch | 21 ++++++
.../files/serf-1.3.9-openssl-3-errgetfunc.patch | 15 ++++
net-libs/serf/serf-1.3.9-r3.ebuild | 80 ++++++++++++++++++++++
3 files changed, 116 insertions(+)
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..a10974f4fbdc
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch
@@ -0,0 +1,21 @@
+https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-bio-ctrl.patch
+https://bugs.gentoo.org/805161
+--- 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/serf-1.3.9-r3.ebuild b/net-libs/serf/serf-1.3.9-r3.ebuild
new file mode 100644
index 000000000000..adc74891f4d4
--- /dev/null
+++ b/net-libs/serf/serf-1.3.9-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~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
+)
+
+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}"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/serf/files/, net-libs/serf/
@ 2023-05-11 21:05 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-05-11 21:05 UTC (permalink / raw
To: gentoo-commits
commit: c91cafb9e46fa580f698a54eecf1752aab89ab2a
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu May 11 14:37:07 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 11 21:05:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c91cafb9
net-libs/serf: fix dev-vcs/subversion build fail
With the previous backported LibreSSL patch the build in
dev-vcs/subversion fails with an undefined reference to
CRYPTO_malloc_init() which should be used with LibreSSL
and not OpenSSL. To avoid this unintended issue the patch
is changed to check only for LIBRESSL_VERSION_NUMBER.
When the next serf release happens this patch can be removed
and the new upstream cmake build system may be preferable.
Closes: https://bugs.gentoo.org/906123
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30992
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/serf/files/serf-1.3.9-libressl.patch | 28 +++++-----------------
.../{serf-1.3.9-r3.ebuild => serf-1.3.9-r4.ebuild} | 2 +-
2 files changed, 7 insertions(+), 23 deletions(-)
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-r4.ebuild
similarity index 97%
rename from net-libs/serf/serf-1.3.9-r3.ebuild
rename to net-libs/serf/serf-1.3.9-r4.ebuild
index 7464e14dba6d..8ea7ea9652d6 100644
--- a/net-libs/serf/serf-1.3.9-r3.ebuild
+++ b/net-libs/serf/serf-1.3.9-r4.ebuild
@@ -34,7 +34,7 @@ PATCHES=(
"${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
+ "${FILESDIR}"/${PN}-1.3.9-libressl.patch #903001, 906123
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/serf/files/, net-libs/serf/
@ 2024-07-13 16:28 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-07-13 16:28 UTC (permalink / raw
To: gentoo-commits
commit: ebe7a2181098480760c9ee6783e8f8f5fc6363fa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 16:26:47 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 16:28:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe7a218
net-libs/serf: drop 1.3.9-r4
Bug: https://bugs.gentoo.org/933238
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/serf/Manifest | 1 -
net-libs/serf/files/serf-1.3.8-openssl.patch | 28 --------
net-libs/serf/files/serf-1.3.9-libressl.patch | 35 ----------
.../serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch | 22 ------
.../files/serf-1.3.9-openssl-3-errgetfunc.patch | 15 ----
net-libs/serf/files/serf-1.3.9-python3-check.patch | 74 --------------------
net-libs/serf/files/serf-1.3.9-python3.patch | 28 --------
net-libs/serf/files/serf-1.3.9-python3_byte.patch | 28 --------
net-libs/serf/serf-1.3.9-r4.ebuild | 81 ----------------------
9 files changed, 312 deletions(-)
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index f3a75d4ad4a3..92ca31ce3b73 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -1,2 +1 @@
DIST serf-1.3.10.tar.bz2 147744 BLAKE2B fed9ef4d5b16a5f1276a4a6f72ab938db18d4bd51c2a58311d2918f52f891bdb636f947cdc612b12a8978f75d27715b7695f21730d1b8a0545746281535369fc SHA512 19165274d35c694935cda33f99ef92a7663a5d9c540fb7fd6792aa0efe39941b2fa87ff8b61afd060c6676baec634fd33dc2e9d34ecbee45ed99dfaed077802c
-DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
diff --git a/net-libs/serf/files/serf-1.3.8-openssl.patch b/net-libs/serf/files/serf-1.3.8-openssl.patch
deleted file mode 100644
index 4cc3719303bb..000000000000
--- a/net-libs/serf/files/serf-1.3.8-openssl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-the build doesn't actually use the openssl var for anything useful.
-it blindly adds it to the -I/-L paths which causes problems when you
-cross-compile and when you link (it also adds it to -rpath). punt
-the setting and forget about it.
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -354,8 +354,6 @@ else:
- apr_libs = ''
- apu_libs = ''
-
-- env.Append(CPPPATH=['$OPENSSL/include'])
-- env.Append(LIBPATH=['$OPENSSL/lib'])
-
-
- # If build with gssapi, get its information and define SERF_HAVE_GSSAPI
-@@ -369,8 +369,9 @@ if sys.platform == 'win32':
- # On some systems, the -R values that APR describes never make it into actual
- # RPATH flags. We'll manually map all directories in LIBPATH into new
- # flags to set RPATH values.
--for d in env['LIBPATH']:
-- env.Append(RPATH=':'+d)
-+if env.get('LIBPATH', None):
-+ for d in env['LIBPATH']:
-+ env.Append(RPATH=':'+d)
-
- # Set up the construction of serf-*.pc
- pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
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 bfb07bd5a0ad..000000000000
--- a/net-libs/serf/files/serf-1.3.9-libressl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index 6bf3aba6de47..000000000000
--- a/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 2823ee88e17b..000000000000
--- a/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index fbbfe36fefe0..000000000000
--- a/net-libs/serf/files/serf-1.3.9-python3-check.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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/files/serf-1.3.9-python3.patch b/net-libs/serf/files/serf-1.3.9-python3.patch
deleted file mode 100644
index 7ba43d91968c..000000000000
--- a/net-libs/serf/files/serf-1.3.9-python3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1c0241847e845a8da265aa89f297d3db6ae483b1 Mon Sep 17 00:00:00 2001
-From: Bert Huijben <rhuijben@apache.org>
-Date: Wed, 4 Oct 2017 14:56:22 +0000
-Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building
- with most recent scons version.
-
-* SConstruct
- Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python 3.0
- and 2.7.
-
-git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1811083 13f79535-47bb-0310-9956-ffa450edef68
----
- SConstruct | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index e5d407b..fab9828 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -199,7 +199,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
-
- unknown = opts.UnknownVariables()
- if unknown:
-- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
-+ print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
-
- apr = str(env['APR'])
- apu = str(env['APU'])
diff --git a/net-libs/serf/files/serf-1.3.9-python3_byte.patch b/net-libs/serf/files/serf-1.3.9-python3_byte.patch
deleted file mode 100644
index ab86af2082d9..000000000000
--- a/net-libs/serf/files/serf-1.3.9-python3_byte.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9d30108b630b77f732ef94d1642b159066ffd890 Mon Sep 17 00:00:00 2001
-From: Andreas Stieger <astieger@apache.org>
-Date: Wed, 8 Nov 2017 17:05:28 +0000
-Subject: [PATCH] Follow-up to r1811083, fix building with scons 3.0.0 and
- Python3
-
-* SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid
- TypeError: cannot use a string pattern on a bytes-like object
-
-
-git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1814604 13f79535-47bb-0310-9956-ffa450edef68
----
- SConstruct | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index 5f5036b..71e5b0a 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -182,7 +182,7 @@ env.Append(BUILDERS = {
- match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
- 'SERF_MINOR_VERSION ([0-9]+).*'
- 'SERF_PATCH_VERSION ([0-9]+)',
-- env.File('serf.h').get_contents(),
-+ env.File('serf.h').get_contents().decode('utf-8'),
- re.DOTALL)
- MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
- env.Append(MAJOR=str(MAJOR))
diff --git a/net-libs/serf/serf-1.3.9-r4.ebuild b/net-libs/serf/serf-1.3.9-r4.ebuild
deleted file mode 100644
index 0d7c80cd62a3..000000000000
--- a/net-libs/serf/serf-1.3.9-r4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{10..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 ~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-build/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}"
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-13 16:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-06 5:43 [gentoo-commits] repo/gentoo:master commit in: net-libs/serf/files/, net-libs/serf/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-07-13 16:28 Andreas Sturmlechner
2023-05-11 21:05 Sam James
2020-12-24 2:25 Mike Gilbert
2020-05-28 9:37 Stefan Strogin
2019-12-23 3:01 Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox