sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (1a53b8a6ddfd463df3fa36a031d3b1642a8dcc3f)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (1a53b8a6ddfd463df3fa36a031d3b1642a8dcc3f)
- Date: Sat, 7 Sep 2024 22:25:21 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
http/serf/DETAILS | 5 --
http/serf/HISTORY | 6 ++
http/serf/patches/0001-badprint.patch | 11 ----
http/serf/patches/0002-libressl.patch | 11 ----
http/serf/patches/0003-py3.patch | 83
----------------------------------
http/serf/patches/0004-openssl3.patch | 41 ----------------
6 files changed, 8 insertions(+), 149 deletions(-)
New commits:
commit 1a53b8a6ddfd463df3fa36a031d3b1642a8dcc3f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
serf 1.3.10
diff --git a/http/serf/DETAILS b/http/serf/DETAILS
old mode 100644
new mode 100755
index 884e27f..a8acad5
--- a/http/serf/DETAILS
+++ b/http/serf/DETAILS
@@ -1,8 +1,7 @@
# Watch: https://github.com/apache/serf/tags
SPELL=serf
- VERSION=1.3.9
- PATCHLEVEL=5
-
SOURCE_HASH=sha512:51cc5aa0e81e03fbb35fd24e00e0ed94afb5294a7eee32259da17bd240dbd7cd42cc6958626ce0ed9b2e475fdd4e1dcfc43adac12ab347f21f3b8fa0eb0270d4
+ VERSION=1.3.10
+
SOURCE_HASH=sha512:5617a29c10f48bae26103e521d0c69e812c624e0b70eeac9d01e6d9dedcfc3a92799c240ead09c645871d6e3218174201517d8cae7d5e390832785e582d54218
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://github.com/apache/serf/archive/$VERSION.tar.gz
diff --git a/http/serf/HISTORY b/http/serf/HISTORY
index 282dfe2..64d4c07 100644
--- a/http/serf/HISTORY
+++ b/http/serf/HISTORY
@@ -1,3 +1,9 @@
+2024-09-07 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.10
+ * patches/0001-badprint.patch, patches/0002-libressl.patch,
+ patches/0003-py3.patch, patches/0004-openssl3.patch:
+ removed, no longer needed
+
2022-03-25 Thomas Orgis <sobukus AT sourcemage.org>
* patches/0004-openssl3.patch: import patch to fix
linkage with serf and openssl 3
diff --git a/http/serf/patches/0001-badprint.patch
b/http/serf/patches/0001-badprint.patch
deleted file mode 100644
index 781ac8c..0000000
--- a/http/serf/patches/0001-badprint.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -183,7 +183,7 @@
-
- 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/http/serf/patches/0002-libressl.patch
b/http/serf/patches/0002-libressl.patch
deleted file mode 100644
index 3ec8119..0000000
--- a/http/serf/patches/0002-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/buckets/ssl_buckets.c
-+++ b/buckets/ssl_buckets.c
-@@ -52,7 +52,7 @@
- #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
- #endif
-
--#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >=
0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- #define USE_OPENSSL_1_1_API
- #endif
-
diff --git a/http/serf/patches/0003-py3.patch
b/http/serf/patches/0003-py3.patch
deleted file mode 100644
index 88fa200..0000000
--- a/http/serf/patches/0003-py3.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git i/SConstruct w/SConstruct
-index 4358a23..7f3cc94 100644
---- i/SConstruct
-+++ w/SConstruct
-@@ -20,6 +20,8 @@
- # ====================================================================
- #
-
-+from __future__ import print_function
-+
- import sys
- import os
- import re
-@@ -163,9 +165,9 @@ env.Append(BUILDERS = {
- suffix='.def', src_suffix='.h')
- })
-
--match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
-- 'SERF_MINOR_VERSION ([0-9]+).*'
-- 'SERF_PATCH_VERSION ([0-9]+)',
-+match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
-+ b'SERF_MINOR_VERSION ([0-9]+).*'
-+ b'SERF_PATCH_VERSION ([0-9]+)',
- env.File('serf.h').get_contents(),
- re.DOTALL)
- MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
-diff --git i/build/check.py w/build/check.py
-index 2dacb4c..76945af 100755
---- i/build/check.py
-+++ w/build/check.py
-@@ -22,6 +22,8 @@
- # ===================================================================
- #
-
-+from __future__ import print_function
-+
- import sys
- import glob
- import subprocess
-@@ -52,16 +54,16 @@ if __name__ == '__main__':
-
- # 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:
-- print "ERROR: test case %s failed" % (case)
-+ print("ERROR: test case %s failed" % (case))
- sys.exit(1)
-
-- print "== Running the unit tests =="
-+ print("== Running the unit tests ==")
- try:
- subprocess.check_call(TEST_ALL_EXE)
- except subprocess.CalledProcessError:
-- print "ERROR: test(s) failed in test_all"
-+ print("ERROR: test(s) failed in test_all")
- sys.exit(1)
-diff --git i/build/gen_def.py w/build/gen_def.py
-index a2222d0..1e006ee 100755
---- i/build/gen_def.py
-+++ w/build/gen_def.py
-@@ -52,12 +52,13 @@ _types = re.compile(r'^extern const serf_bucket_type_t
(serf_[a-z_]*);',
-
-
- def extract_exports(fname):
-- content = open(fname).read()
- exports = [ ]
-- for name in _funcs.findall(content):
-- exports.append(name)
-- for name in _types.findall(content):
-- exports.append(name)
-+ with open(fname) as fd:
-+ content = fd.read()
-+ for name in _funcs.findall(content):
-+ exports.append(name)
-+ for name in _types.findall(content):
-+ exports.append(name)
- return exports
-
- # Blacklist the serf v2 API for now
diff --git a/http/serf/patches/0004-openssl3.patch
b/http/serf/patches/0004-openssl3.patch
deleted file mode 100644
index 0a5c876..0000000
--- a/http/serf/patches/0004-openssl3.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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 Ismael Luceno (1a53b8a6ddfd463df3fa36a031d3b1642a8dcc3f), Ismael Luceno, 09/07/2024
Archive powered by MHonArc 2.6.24.