summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/serf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/serf')
-rw-r--r--meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch28
-rw-r--r--meta/recipes-support/serf/serf_1.3.9.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
new file mode 100644
index 0000000000..e6172ef5aa
--- /dev/null
+++ b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
@@ -0,0 +1,28 @@
1From 2f45711a66ff99886b6e4a5708e2db01a63e5af4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Fri, 10 Sep 2021 11:05:10 +0200
4Subject: [PATCH] buckets/ssl_buckets.c: do not use ERR_GET_FUNC
5
6Upstream removed it in
7https://github.com/openssl/openssl/pull/16004
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11---
12 buckets/ssl_buckets.c | 3 +--
13 1 file changed, 1 insertion(+), 2 deletions(-)
14
15diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
16index b01e535..9801f87 100644
17--- a/buckets/ssl_buckets.c
18+++ b/buckets/ssl_buckets.c
19@@ -1325,8 +1325,7 @@ static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey)
20 return 0;
21 }
22 else {
23- printf("OpenSSL cert error: %d %d %d\n", ERR_GET_LIB(err),
24- ERR_GET_FUNC(err),
25+ printf("OpenSSL cert error: %d %d\n", ERR_GET_LIB(err),
26 ERR_GET_REASON(err));
27 PKCS12_free(p12);
28 bio_meth_free(biom);
diff --git a/meta/recipes-support/serf/serf_1.3.9.bb b/meta/recipes-support/serf/serf_1.3.9.bb
index 21515866a9..669f42b8e7 100644
--- a/meta/recipes-support/serf/serf_1.3.9.bb
+++ b/meta/recipes-support/serf/serf_1.3.9.bb
@@ -12,6 +12,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
12 file://0003-gen_def.patch \ 12 file://0003-gen_def.patch \
13 file://0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch \ 13 file://0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch \
14 file://SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch \ 14 file://SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch \
15 file://0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch \
15 " 16 "
16 17
17SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57" 18SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57"