From 6938cea87b030c90a7b82e9d64f360ff0e41b7b1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 11 Oct 2021 11:40:43 +0200 Subject: serf: add a openssl 3 compatibility fix (From OE-Core rev: 02a66905fa48402589e1799deed2a7f32896525a) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...ets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch | 28 ++++++++++++++++++++++ meta/recipes-support/serf/serf_1.3.9.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch 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 @@ +From 2f45711a66ff99886b6e4a5708e2db01a63e5af4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 10 Sep 2021 11:05:10 +0200 +Subject: [PATCH] buckets/ssl_buckets.c: do not use ERR_GET_FUNC + +Upstream removed it in +https://github.com/openssl/openssl/pull/16004 + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + buckets/ssl_buckets.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c +index b01e535..9801f87 100644 +--- a/buckets/ssl_buckets.c ++++ b/buckets/ssl_buckets.c +@@ -1325,8 +1325,7 @@ static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey) + return 0; + } + else { +- printf("OpenSSL cert error: %d %d %d\n", ERR_GET_LIB(err), +- ERR_GET_FUNC(err), ++ printf("OpenSSL cert error: %d %d\n", ERR_GET_LIB(err), + ERR_GET_REASON(err)); + PKCS12_free(p12); + 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 \ file://0003-gen_def.patch \ file://0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch \ file://SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch \ + file://0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch \ " SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57" -- cgit v1.2.3-54-g00ecf