1 |
commit: b535d26d851e7fc8adfe1067016ac70359fd293a |
2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 28 09:28:08 2020 +0000 |
4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 28 09:37:28 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b535d26d |
7 |
|
8 |
net-libs/serf: add patch for LibreSSL |
9 |
|
10 |
Closes: https://bugs.gentoo.org/725776 |
11 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
12 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
13 |
|
14 |
net-libs/serf/files/serf-1.3.9-libressl.patch | 13 +++++ |
15 |
net-libs/serf/serf-1.3.9-r2.ebuild | 75 +++++++++++++++++++++++++++ |
16 |
2 files changed, 88 insertions(+) |
17 |
|
18 |
diff --git a/net-libs/serf/files/serf-1.3.9-libressl.patch b/net-libs/serf/files/serf-1.3.9-libressl.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..fe9319fffa8 |
21 |
--- /dev/null |
22 |
+++ b/net-libs/serf/files/serf-1.3.9-libressl.patch |
23 |
@@ -0,0 +1,13 @@ |
24 |
+diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c |
25 |
+index b01e535..6fadb0c 100644 |
26 |
+--- a/buckets/ssl_buckets.c |
27 |
++++ b/buckets/ssl_buckets.c |
28 |
+@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void) |
29 |
+ } |
30 |
+ #endif |
31 |
+ |
32 |
+-#ifdef USE_OPENSSL_1_1_API |
33 |
++#if defined(USE_OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER) |
34 |
+ OPENSSL_malloc_init(); |
35 |
+ #else |
36 |
+ CRYPTO_malloc_init(); |
37 |
|
38 |
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild |
39 |
new file mode 100644 |
40 |
index 00000000000..646928a7b05 |
41 |
--- /dev/null |
42 |
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild |
43 |
@@ -0,0 +1,75 @@ |
44 |
+# Copyright 1999-2020 Gentoo Authors |
45 |
+# Distributed under the terms of the GNU General Public License v2 |
46 |
+ |
47 |
+EAPI="7" |
48 |
+ |
49 |
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) |
50 |
+ |
51 |
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic |
52 |
+ |
53 |
+DESCRIPTION="HTTP client library" |
54 |
+HOMEPAGE="https://serf.apache.org/" |
55 |
+SRC_URI="mirror://apache/${PN}/${P}.tar.bz2" |
56 |
+ |
57 |
+LICENSE="Apache-2.0" |
58 |
+SLOT="1" |
59 |
+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" |
60 |
+IUSE="kerberos static-libs libressl" |
61 |
+RESTRICT="test" |
62 |
+ |
63 |
+RDEPEND="dev-libs/apr:1= |
64 |
+ dev-libs/apr-util:1= |
65 |
+ !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) |
66 |
+ sys-libs/zlib:0= |
67 |
+ kerberos? ( virtual/krb5 )" |
68 |
+DEPEND="${RDEPEND} |
69 |
+ >=dev-util/scons-2.3.0" |
70 |
+ |
71 |
+PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch |
72 |
+ "${FILESDIR}"/${PN}-1.3.8-openssl.patch |
73 |
+ "${FILESDIR}"/${PN}-1.3.9-python3.patch |
74 |
+ "${FILESDIR}"/${PN}-1.3.9-python3_byte.patch |
75 |
+ "${FILESDIR}"/${PN}-1.3.9-libressl.patch ) |
76 |
+ |
77 |
+src_prepare() { |
78 |
+ default |
79 |
+ |
80 |
+ # https://code.google.com/p/serf/issues/detail?id=133 |
81 |
+ sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct |
82 |
+ |
83 |
+ # need limits.h for PATH_MAX (only when EXTENSIONS is enabled) |
84 |
+ [[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__ |
85 |
+} |
86 |
+ |
87 |
+src_compile() { |
88 |
+ myesconsargs=( |
89 |
+ PREFIX="${EPREFIX}/usr" |
90 |
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
91 |
+ # These config scripts are sent through a shell with an empty env |
92 |
+ # which breaks the SYSROOT usage in them. Set the vars inline to |
93 |
+ # avoid that. |
94 |
+ APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config" |
95 |
+ APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config" |
96 |
+ BUILD_STATIC=$(usex static-libs) |
97 |
+ AR="$(tc-getAR)" |
98 |
+ RANLIB="$(tc-getRANLIB)" |
99 |
+ CC="$(tc-getCC)" |
100 |
+ CPPFLAGS="${CPPFLAGS}" |
101 |
+ CFLAGS="${CFLAGS}" |
102 |
+ LINKFLAGS="${LDFLAGS}" |
103 |
+ ) |
104 |
+ |
105 |
+ if use kerberos; then |
106 |
+ myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" ) |
107 |
+ fi |
108 |
+ |
109 |
+ escons "${myesconsargs[@]}" |
110 |
+} |
111 |
+ |
112 |
+src_test() { |
113 |
+ escons check |
114 |
+} |
115 |
+ |
116 |
+src_install() { |
117 |
+ escons install --install-sandbox="${D}" |
118 |
+} |