Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (47a0f9a324a070f4fe1a611f2cd8af35425e9a57)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (47a0f9a324a070f4fe1a611f2cd8af35425e9a57)
  • Date: Fri, 25 Mar 2022 13:06:46 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

http/serf/DETAILS | 2 -
http/serf/HISTORY | 7 ++++-
http/serf/patches/0004-openssl3.patch | 41
++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 2 deletions(-)

New commits:
commit 47a0f9a324a070f4fe1a611f2cd8af35425e9a57
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

serf: fix build with openssl 3

diff --git a/http/serf/DETAILS b/http/serf/DETAILS
index b594c9c..aa13e25 100755
--- a/http/serf/DETAILS
+++ b/http/serf/DETAILS
@@ -1,6 +1,6 @@
SPELL=serf
VERSION=1.3.9
- PATCHLEVEL=4
+ PATCHLEVEL=5

SOURCE_HASH=sha512:51cc5aa0e81e03fbb35fd24e00e0ed94afb5294a7eee32259da17bd240dbd7cd42cc6958626ce0ed9b2e475fdd4e1dcfc43adac12ab347f21f3b8fa0eb0270d4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/serf/HISTORY b/http/serf/HISTORY
index acd6c65..282dfe2 100644
--- a/http/serf/HISTORY
+++ b/http/serf/HISTORY
@@ -1,4 +1,9 @@
-2021-08-20 Thomas Orgis
+2022-03-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * patches/0004-openssl3.patch: import patch to fix
+ linkage with serf and openssl 3
+ * DETAILS: ++PATCHLEVEL
+
+2021-08-20 Thomas Orgis <sobukus AT sourcemage.org>
* patches/0003-py3.patch: import pyton3 build fix from Debian

2021-03-14 Ismael Luceno <ismael AT sourcemage.org>
diff --git a/http/serf/patches/0004-openssl3.patch
b/http/serf/patches/0004-openssl3.patch
new file mode 100644
index 0000000..0a5c876
--- /dev/null
+++ b/http/serf/patches/0004-openssl3.patch
@@ -0,0 +1,41 @@
+Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org>
+Date: 2021-12-30
+Initial Package Version: 1.3.9
+Origin: Fedora Rawhide
(https://src.fedoraproject.org/rpms/libserf/tree/rawhide)
+Upstream Status: Merge Request
+Description: Fixes a build error in Subversion caused by serf
using
+ internal OpenSSL API functions for it's own use.
Also
+ fixes a crash bug that happens due to a return value
+ being invalid.
+
+diff -Naurp serf-1.3.9.orig/buckets/ssl_buckets.c
serf-1.3.9/buckets/ssl_buckets.c
+--- serf-1.3.9.orig/buckets/ssl_buckets.c 2016-06-30 10:45:07.000000000
-0500
++++ serf-1.3.9/buckets/ssl_buckets.c 2021-12-30 10:56:53.101158440 -0600
+@@ -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, in
+ 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:
+@@ -1204,6 +1205,10 @@ static void init_ssl_libraries(void)
+ }
+ }
+
++#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);



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (47a0f9a324a070f4fe1a611f2cd8af35425e9a57), Thomas Orgis, 03/25/2022

Archive powered by MHonArc 2.6.24.

Top of Page