Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f3bc9f7bac2fbf8bd38a83c7629c15a697d17ed9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f3bc9f7bac2fbf8bd38a83c7629c15a697d17ed9)
  • Date: Sun, 14 Mar 2021 15:16:42 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

http/serf/DETAILS | 2 +-
http/serf/HISTORY | 7 +++++++
http/serf/PRE_BUILD | 2 +-
http/serf/badprint.patch | 13 -------------
http/serf/patches/0001-badprint.patch | 11 +++++++++++
http/serf/patches/0002-libressl.patch | 11 +++++++++++
6 files changed, 31 insertions(+), 15 deletions(-)

New commits:
commit f3bc9f7bac2fbf8bd38a83c7629c15a697d17ed9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

serf: Fix build against libressl; PATCHLEVEL++

Although it built, it ended up with undefined symbols; avoid using the
OpenSSL 1.1 API with LibreSSL.

commit 1735c341b06235040964e48ca9bc0f32162f049c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

serf: Replace badprint.patch with the proper fix

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

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 35b49f0..de9a259 100644
--- a/http/serf/HISTORY
+++ b/http/serf/HISTORY
@@ -1,3 +1,10 @@
+2021-03-14 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: switched to apply_patch_dir
+ * badprint.patch: removed, replaced
+ * patches/0001-badprint.patch: added the proper fix for print syntax
+ * patches/0002-libressl.patch: added fix for libressl
+ * DETAILS: PATCHLEVEL++
+
2020-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PRE_BUILD, sslbuild.patch: remove obsolete patch

diff --git a/http/serf/PRE_BUILD b/http/serf/PRE_BUILD
index f04844d..c230ad1 100755
--- a/http/serf/PRE_BUILD
+++ b/http/serf/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p0 < "$SCRIPT_DIRECTORY/badprint.patch"
+apply_patch_dir patches
diff --git a/http/serf/badprint.patch b/http/serf/badprint.patch
deleted file mode 100644
index 6ec25e2..0000000
--- a/http/serf/badprint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- SConstruct.orig 2017-09-25 11:49:27.703917934 +0200
-+++ SConstruct 2017-09-25 11:49:38.126918570 +0200
-@@ -182,8 +182,8 @@
- # HANDLING OF OPTION VARIABLES
-
- unknown = opts.UnknownVariables()
--if unknown:
-- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
-+#if unknown:
-+# print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
-
- apr = str(env['APR'])
- apu = str(env['APU'])
diff --git a/http/serf/patches/0001-badprint.patch
b/http/serf/patches/0001-badprint.patch
new file mode 100644
index 0000000..781ac8c
--- /dev/null
+++ b/http/serf/patches/0001-badprint.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..3ec8119
--- /dev/null
+++ b/http/serf/patches/0002-libressl.patch
@@ -0,0 +1,11 @@
+--- 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
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f3bc9f7bac2fbf8bd38a83c7629c15a697d17ed9), Ismael Luceno, 03/14/2021

Archive powered by MHonArc 2.6.24.

Top of Page