Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 database/sqlite/DETAILS                               |    4 
 database/sqlite/HISTORY                               |    3 
 http/firefox/DETAILS                                  |    1 
 http/firefox/HISTORY                                  |    4 
 http/firefox/patches/firefox-72.0.2-sqlite-3.31.patch |  173 +++++++++++
 http/serf/DETAILS                                     |    2 
 http/serf/HISTORY                                     |    3 
 http/serf/PRE_BUILD                                   |    1 
 http/serf/sslbuild.patch                              |  263 
------------------
 9 files changed, 187 insertions(+), 267 deletions(-)

New commits:
commit c9e8e42861823aa98ba499482083a3b63ec13573
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/sqlite: version 3.31.0

commit f2c05d9df275488a837d640dbc65a099310de47c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/firefox: fix crash with sqlite 3.31

commit 1e68f0f94ceedc10f3bf04796287b93efcde3d4b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/serf: remove obsolete patch

diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 238e118..274e8fe 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,6 +1,6 @@
            SPELL=sqlite
-         VERSION=3.30.1
-     
SOURCE_HASH="sha1:8383f29d53fa1d4383e4c8eb3e087f2ed940a9e0:UPSTREAM_HASH"
+         VERSION=3.31.0
+     
SOURCE_HASH=sha512:cfb618d4eedd8da19d106cbea473f3f7a332f2d794d0c089968573a83f8c2e38474f28b3ae2bda6567c4ac22aac29431154bef315192a16788cd065d35273ee3
   SECURITY_PATCH=1
         VERSIONX=autoconf-$(awk -vFS=. '{printf 
"%d%02d%02d%02d",$1,$2,$3,$4}'\
                <<<"$VERSION")
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 00a3fc8..c82a192 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2020-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 3.31.0
+
 2019-10-11 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 3.30.1
 
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index b989fe2..e7f9e0c 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,5 +1,6 @@
            SPELL=firefox
          VERSION=72.0.2
+       ATCHLEVEL=1
   SECURITY_PATCH=138
           SOURCE="${SPELL}-${VERSION}.source.tar.xz"
    
SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}";
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index d235454..59f05d2 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2020-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS, patches/firefox-72.0.2-sqlite-3.31.patch: fix crash with
+         sqlite 3.31, patch from mandriva
+
 2020-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 72.0.2
 
diff --git a/http/firefox/patches/firefox-72.0.2-sqlite-3.31.patch 
b/http/firefox/patches/firefox-72.0.2-sqlite-3.31.patch
new file mode 100644
index 0000000..27693a8
--- /dev/null
+++ b/http/firefox/patches/firefox-72.0.2-sqlite-3.31.patch
@@ -0,0 +1,173 @@
+diff -up firefox-72.0.2/storage/TelemetryVFS.cpp.omv~ 
firefox-72.0.2/storage/TelemetryVFS.cpp
+--- firefox-72.0.2/storage/TelemetryVFS.cpp.omv~       2020-01-23 
23:39:53.926584589 +0100
++++ firefox-72.0.2/storage/TelemetryVFS.cpp    2020-01-23 23:40:01.604584216 
+0100
+@@ -167,140 +167,12 @@ struct telemetry_file {
+   sqlite3_file pReal[1];
+ };
+ 
+-const char* DatabasePathFromWALPath(const char* zWALName) {
+-  /**
+-   * Do some sketchy pointer arithmetic to find the parameter key. The WAL
+-   * filename is in the middle of a big allocated block that contains:
+-   *
+-   *   - Random Values
+-   *   - Main Database Path
+-   *   - \0
+-   *   - Multiple URI components consisting of:
+-   *     - Key
+-   *     - \0
+-   *     - Value
+-   *     - \0
+-   *   - \0
+-   *   - Journal Path
+-   *   - \0
+-   *   - WAL Path (zWALName)
+-   *   - \0
+-   *
+-   * Because the main database path is preceded by a random value we have 
to be
+-   * careful when trying to figure out when we should terminate this loop.
+-   */
+-  MOZ_ASSERT(zWALName);
+-
+-  nsDependentCSubstring dbPath(zWALName, strlen(zWALName));
+-
+-  // Chop off the "-wal" suffix.
+-  NS_NAMED_LITERAL_CSTRING(kWALSuffix, "-wal");
+-  MOZ_ASSERT(StringEndsWith(dbPath, kWALSuffix));
+-
+-  dbPath.Rebind(zWALName, dbPath.Length() - kWALSuffix.Length());
+-  MOZ_ASSERT(!dbPath.IsEmpty());
+-
+-  // We want to scan to the end of the key/value URI pairs. Skip the 
preceding
+-  // null and go to the last char of the journal path.
+-  const char* cursor = zWALName - 2;
+-
+-  // Make sure we just skipped a null.
+-  MOZ_ASSERT(!*(cursor + 1));
+-
+-  // Walk backwards over the journal path.
+-  while (*cursor) {
+-    cursor--;
+-  }
+-
+-  // There should be another null here.
+-  cursor--;
+-  MOZ_ASSERT(!*cursor);
+-
+-  // Back up one more char to the last char of the previous string. It may 
be
+-  // the database path or it may be a key/value URI pair.
+-  cursor--;
+-
+-#ifdef DEBUG
+-  {
+-    // Verify that we just walked over the journal path. Account for the two
+-    // nulls we just skipped.
+-    const char* journalStart = cursor + 3;
+-
+-    nsDependentCSubstring journalPath(journalStart, strlen(journalStart));
+-
+-    // Chop off the "-journal" suffix.
+-    NS_NAMED_LITERAL_CSTRING(kJournalSuffix, "-journal");
+-    MOZ_ASSERT(StringEndsWith(journalPath, kJournalSuffix));
+-
+-    journalPath.Rebind(journalStart,
+-                       journalPath.Length() - kJournalSuffix.Length());
+-    MOZ_ASSERT(!journalPath.IsEmpty());
+-
+-    // Make sure that the database name is a substring of the journal name.
+-    MOZ_ASSERT(journalPath == dbPath);
+-  }
+-#endif
+-
+-  // Now we're either at the end of the key/value URI pairs or we're at the
+-  // end of the database path. Carefully walk backwards one character at a
+-  // time to do this safely without running past the beginning of the 
database
+-  // path.
+-  const char* const dbPathStart = dbPath.BeginReading();
+-  const char* dbPathCursor = dbPath.EndReading() - 1;
+-  bool isDBPath = true;
+-
+-  while (true) {
+-    MOZ_ASSERT(*dbPathCursor, "dbPathCursor should never see a null char!");
+-
+-    if (isDBPath) {
+-      isDBPath =
+-          dbPathStart <= dbPathCursor && *dbPathCursor == *cursor && 
*cursor;
+-    }
+-
+-    if (!isDBPath) {
+-      // This isn't the database path so it must be a value. Scan past it 
and
+-      // the key also.
+-      for (size_t stringCount = 0; stringCount < 2; stringCount++) {
+-        // Scan past the string to the preceding null character.
+-        while (*cursor) {
+-          cursor--;
+-        }
+-
+-        // Back up one more char to the last char of preceding string.
+-        cursor--;
+-      }
+-
+-      // Reset and start again.
+-      dbPathCursor = dbPath.EndReading() - 1;
+-      isDBPath = true;
+-
+-      continue;
+-    }
+-
+-    MOZ_ASSERT(isDBPath);
+-    MOZ_ASSERT(*cursor);
+-
+-    if (dbPathStart == dbPathCursor) {
+-      // Found the full database path, we're all done.
+-      MOZ_ASSERT(nsDependentCString(cursor) == dbPath);
+-      return cursor;
+-    }
+-
+-    // Change the cursors and go through the loop again.
+-    cursor--;
+-    dbPathCursor--;
+-  }
+-
+-  MOZ_CRASH("Should never get here!");
+-}
+-
+ already_AddRefed<QuotaObject> GetQuotaObjectFromNameAndParameters(
+-    const char* zName, const char* zURIParameterKey) {
++    const char* zName) {
+   MOZ_ASSERT(zName);
+-  MOZ_ASSERT(zURIParameterKey);
+ 
+   const char* directoryLockIdParam =
+-      sqlite3_uri_parameter(zURIParameterKey, "directoryLockId");
++      sqlite3_uri_parameter(zName, "directoryLockId");
+   if (!directoryLockIdParam) {
+     return nullptr;
+   }
+@@ -328,13 +200,7 @@ void MaybeEstablishQuotaControl(const ch
+ 
+   MOZ_ASSERT(zName);
+ 
+-  const char* zURIParameterKey =
+-      (flags & SQLITE_OPEN_WAL) ? DatabasePathFromWALPath(zName) : zName;
+-
+-  MOZ_ASSERT(zURIParameterKey);
+-
+-  pFile->quotaObject =
+-      GetQuotaObjectFromNameAndParameters(zName, zURIParameterKey);
++  pFile->quotaObject = GetQuotaObjectFromNameAndParameters(zName);
+ }
+ 
+ /*
+@@ -687,10 +553,7 @@ int xDelete(sqlite3_vfs* vfs, const char
+   RefPtr<QuotaObject> quotaObject;
+ 
+   if (StringEndsWith(nsDependentCString(zName), 
NS_LITERAL_CSTRING("-wal"))) {
+-    const char* zURIParameterKey = DatabasePathFromWALPath(zName);
+-    MOZ_ASSERT(zURIParameterKey);
+-
+-    quotaObject = GetQuotaObjectFromNameAndParameters(zName, 
zURIParameterKey);
++    quotaObject = GetQuotaObjectFromNameAndParameters(zName);
+   }
+ 
+   rc = orig_vfs->xDelete(orig_vfs, zName, syncDir);
diff --git a/http/serf/DETAILS b/http/serf/DETAILS
index 04f9bd2..602820f 100755
--- a/http/serf/DETAILS
+++ b/http/serf/DETAILS
@@ -1,6 +1,6 @@
            SPELL=serf
          VERSION=1.3.9
-      PATCHLEVEL=2
+      PATCHLEVEL=3
      
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 6d1d5e0..35b49f0 100644
--- a/http/serf/HISTORY
+++ b/http/serf/HISTORY
@@ -1,3 +1,6 @@
+2020-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS, PRE_BUILD, sslbuild.patch: remove obsolete patch
+
 2019-04-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * INSTALL: install to /usr instead of to /usr/local
        * DETAILS: PATCHLEVEL++
diff --git a/http/serf/PRE_BUILD b/http/serf/PRE_BUILD
index e7b24a1..f04844d 100755
--- a/http/serf/PRE_BUILD
+++ b/http/serf/PRE_BUILD
@@ -1,4 +1,3 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 patch -p0 < "$SCRIPT_DIRECTORY/badprint.patch"
-patch -fp1 < "$SCRIPT_DIRECTORY/sslbuild.patch"
diff --git a/http/serf/sslbuild.patch b/http/serf/sslbuild.patch
deleted file mode 100644
index 7faef1e..0000000
--- a/http/serf/sslbuild.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-From c56528a3770ca51571c5d9372ec1c6e8cfe954c1 Mon Sep 17 00:00:00 2001
-From: stsp <stsp@13f79535-47bb-0310-9956-ffa450edef68>
-Date: Fri, 3 Feb 2017 11:44:40 +0000
-Subject: [PATCH] Create a 1.3.x branch which backports SSL build fixes from
- r1775239-r1781240.
-
-git-svn-id: 
https://svn.apache.org/repos/asf/serf/branches/1.3.x-sslbuild@1781542 
13f79535-47bb-0310-9956-ffa450edef68
----
- SConstruct            | 15 +++++++++++++++
- buckets/ssl_buckets.c | 43 ++++++++++++++++++++++---------------------
- 2 files changed, 37 insertions(+), 21 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 4358a23..4d0202f 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -374,6 +374,21 @@ else:
-   env.Append(LIBPATH=['$OPENSSL/lib'])
- 
- 
-+# Check for OpenSSL functions which are only available in some of
-+# the versions we support. Also handles forks like LibreSSL.
-+conf = Configure(env)
-+if not conf.CheckFunc('BIO_set_init'):
-+  env.Append(CPPDEFINES=['SERF_NO_SSL_BIO_WRAPPERS'])
-+if not conf.CheckFunc('X509_STORE_get0_param'):
-+  env.Append(CPPDEFINES=['SERF_NO_SSL_X509_STORE_WRAPPERS'])
-+if conf.CheckFunc('CRYPTO_set_locking_callback'):
-+  env.Append(CPPDEFINES=['SERF_HAVE_SSL_LOCKING_CALLBACKS'])
-+if conf.CheckFunc('OPENSSL_malloc_init'):
-+  env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_MALLOC_INIT'])
-+if conf.CheckFunc('SSL_set_alpn_protos'):
-+  env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_ALPN'])
-+env = conf.Finish()
-+
- # If build with gssapi, get its information and define SERF_HAVE_GSSAPI
- if gssapi and CALLOUT_OKAY:
-     env.ParseConfig('$GSSAPI --cflags gssapi')
-diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
-index b01e535..6a9d8fd 100644
---- a/buckets/ssl_buckets.c
-+++ b/buckets/ssl_buckets.c
-@@ -52,8 +52,8 @@
- #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
- #endif
- 
--#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
--#define USE_OPENSSL_1_1_API
-+#ifdef SERF_NO_SSL_X509_STORE_WRAPPERS
-+#define X509_STORE_get0_param(store) ((store)->param)
- #endif
- 
- 
-@@ -239,7 +239,7 @@ apps_ssl_info_callback(const SSL *s, int where, int ret)
- 
- static void bio_set_data(BIO *bio, void *data)
- {
--#ifdef USE_OPENSSL_1_1_API
-+#ifndef SERF_NO_SSL_BIO_WRAPPERS
-     BIO_set_data(bio, data);
- #else
-     bio->ptr = data;
-@@ -248,7 +248,7 @@ static void bio_set_data(BIO *bio, void *data)
- 
- static void *bio_get_data(BIO *bio)
- {
--#ifdef USE_OPENSSL_1_1_API
-+#ifndef SERF_NO_SSL_BIO_WRAPPERS
-     return BIO_get_data(bio);
- #else
-     return bio->ptr;
-@@ -381,7 +381,7 @@ static int bio_file_gets(BIO *bio, char *in, int inlen)
- 
- static int bio_bucket_create(BIO *bio)
- {
--#ifdef USE_OPENSSL_1_1_API
-+#ifndef SERF_NO_SSL_BIO_WRAPPERS
-     BIO_set_shutdown(bio, 1);
-     BIO_set_init(bio, 1);
-     BIO_set_data(bio, NULL);
-@@ -424,7 +424,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long num, 
void *ptr)
-     return ret;
- }
- 
--#ifndef USE_OPENSSL_1_1_API
-+#ifdef SERF_NO_SSL_BIO_WRAPPERS
- static BIO_METHOD bio_bucket_method = {
-     BIO_TYPE_MEM,
-     "Serf SSL encryption and decryption buckets",
-@@ -460,7 +460,7 @@ static BIO_METHOD *bio_meth_bucket_new(void)
- {
-     BIO_METHOD *biom = NULL;
- 
--#ifdef USE_OPENSSL_1_1_API
-+#ifndef SERF_NO_SSL_BIO_WRAPPERS
-     biom = BIO_meth_new(BIO_TYPE_MEM,
-                         "Serf SSL encryption and decryption buckets");
-     if (biom) {
-@@ -481,15 +481,16 @@ static BIO_METHOD *bio_meth_file_new(void)
- {
-     BIO_METHOD *biom = NULL;
- 
--#ifdef USE_OPENSSL_1_1_API
--    biom = BIO_meth_new(BIO_TYPE_FILE,
--                        "Wrapper around APR file structures");
--    BIO_meth_set_write(biom, bio_file_write);
--    BIO_meth_set_read(biom, bio_file_read);
--    BIO_meth_set_gets(biom, bio_file_gets);
--    BIO_meth_set_ctrl(biom, bio_bucket_ctrl);
--    BIO_meth_set_create(biom, bio_bucket_create);
--    BIO_meth_set_destroy(biom, bio_bucket_destroy);
-+#ifndef SERF_NO_SSL_BIO_WRAPPERS
-+    biom = BIO_meth_new(BIO_TYPE_FILE, "Wrapper around APR file 
structures");
-+    if (biom) {
-+        BIO_meth_set_write(biom, bio_file_write);
-+        BIO_meth_set_read(biom, bio_file_read);
-+        BIO_meth_set_gets(biom, bio_file_gets);
-+        BIO_meth_set_ctrl(biom, bio_bucket_ctrl);
-+        BIO_meth_set_create(biom, bio_bucket_create);
-+        BIO_meth_set_destroy(biom, bio_bucket_destroy);
-+    }
- #else
-     biom = &bio_file_method;
- #endif
-@@ -499,7 +500,7 @@ static BIO_METHOD *bio_meth_file_new(void)
- 
- static void bio_meth_free(BIO_METHOD *biom)
- {
--#ifdef USE_OPENSSL_1_1_API
-+#ifndef SERF_NO_SSL_BIO_WRAPPERS
-     BIO_meth_free(biom);
- #endif
- }
-@@ -1052,7 +1053,7 @@ static apr_status_t ssl_encrypt(void *baton, 
apr_size_t bufsize,
-     return status;
- }
- 
--#if APR_HAS_THREADS && !defined(USE_OPENSSL_1_1_API)
-+#if APR_HAS_THREADS && defined(SERF_HAVE_SSL_LOCKING_CALLBACKS)
- static apr_pool_t *ssl_pool;
- static apr_thread_mutex_t **ssl_locks;
- 
-@@ -1139,7 +1140,7 @@ static void init_ssl_libraries(void)
-     val = apr_atomic_cas32(&have_init_ssl, INIT_BUSY, INIT_UNINITIALIZED);
- 
-     if (!val) {
--#if APR_HAS_THREADS && !defined(USE_OPENSSL_1_1_API)
-+#if APR_HAS_THREADS && defined(SERF_HAVE_SSL_LOCKING_CALLBACKS)
-         int i, numlocks;
- #endif
- 
-@@ -1156,7 +1157,7 @@ static void init_ssl_libraries(void)
-         }
- #endif
- 
--#ifdef USE_OPENSSL_1_1_API
-+#ifdef SERF_HAVE_OPENSSL_MALLOC_INIT
-         OPENSSL_malloc_init();
- #else
-         CRYPTO_malloc_init();
-@@ -1166,7 +1167,7 @@ static void init_ssl_libraries(void)
-         SSL_library_init();
-         OpenSSL_add_all_algorithms();
- 
--#if APR_HAS_THREADS && !defined(USE_OPENSSL_1_1_API)
-+#if APR_HAS_THREADS && defined(SERF_HAVE_SSL_LOCKING_CALLBACKS)
-         numlocks = CRYPTO_num_locks();
-         apr_pool_create(&ssl_pool, NULL);
-         ssl_locks = apr_palloc(ssl_pool, 
sizeof(apr_thread_mutex_t*)*numlocks);
--- 
-2.14.2
-
-From d40c383884df4d9c4425e9ae51baf1159e439da0 Mon Sep 17 00:00:00 2001
-From: stsp <stsp@13f79535-47bb-0310-9956-ffa450edef68>
-Date: Sat, 4 Feb 2017 12:06:38 +0000
-Subject: [PATCH] On the 1.3.x-sslbuild branch, fix 'scons check' build with
- LibreSSL.
-
-* test/server/test_sslserver.c
-  (USE_OPENSSL_1_1_API): Remove this definition.
-  (bio_set_data, bio_get_data, bio_apr_socket_create,
-   bio_meth_apr_socket_new, cleanup_https_server): Use 
SERF_NO_SSL_BIO_WRAPPERS
-    instead of USE_OPENSSL_1_1_API.
-  (init_ssl_context): Use SERF_HAVE_OPENSSL_MALLOC_INIT instead.
-
-
-git-svn-id: 
https://svn.apache.org/repos/asf/serf/branches/1.3.x-sslbuild@1781660 
13f79535-47bb-0310-9956-ffa450edef68
----
- test/server/test_sslserver.c | 16 ++++++----------
- 1 file changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/test/server/test_sslserver.c b/test/server/test_sslserver.c
-index 6c1a028..f73bea3 100644
---- a/test/server/test_sslserver.c
-+++ b/test/server/test_sslserver.c
-@@ -27,10 +27,6 @@
- #include <openssl/ssl.h>
- #include <openssl/err.h>
- 
--#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
--#define USE_OPENSSL_1_1_API
--#endif
--
- static int init_done = 0;
- 
- typedef struct ssl_context_t {
-@@ -52,7 +48,7 @@ static int pem_passwd_cb(char *buf, int size, int rwflag, 
void *userdata)
- 
- static void bio_set_data(BIO *bio, void *data)
- {
--#ifdef USE_OPENSSL_1_1_API
-+#ifndef SERF_NO_SSL_BIO_WRAPPERS
-     BIO_set_data(bio, data);
- #else
-     bio->ptr = data;
-@@ -61,7 +57,7 @@ static void bio_set_data(BIO *bio, void *data)
- 
- static void *bio_get_data(BIO *bio)
- {
--#ifdef USE_OPENSSL_1_1_API
-+#ifndef SERF_NO_SSL_BIO_WRAPPERS
-     return BIO_get_data(bio);
- #else
-     return bio->ptr;
-@@ -70,7 +66,7 @@ static void *bio_get_data(BIO *bio)
- 
- static int bio_apr_socket_create(BIO *bio)
- {
--#ifdef USE_OPENSSL_1_1_API
-+#ifndef SERF_NO_SSL_BIO_WRAPPERS
-     BIO_set_shutdown(bio, 1);
-     BIO_set_init(bio, 1);
-     BIO_set_data(bio, NULL);
-@@ -179,7 +175,7 @@ static BIO_METHOD *bio_meth_apr_socket_new(void)
- {
-     BIO_METHOD *biom = NULL;
- 
--#ifdef USE_OPENSSL_1_1_API
-+#ifndef SERF_NO_SSL_BIO_WRAPPERS
-     biom = BIO_meth_new(BIO_TYPE_SOCKET, "APR sockets");
-     if (biom) {
-         BIO_meth_set_write(biom, bio_apr_socket_write);
-@@ -228,7 +224,7 @@ init_ssl_context(serv_ctx_t *serv_ctx,
-     /* Init OpenSSL globally */
-     if (!init_done)
-     {
--#ifdef USE_OPENSSL_1_1_API
-+#ifdef SERF_HAVE_OPENSSL_MALLOC_INIT
-         OPENSSL_malloc_init();
- #else
-         CRYPTO_malloc_init();
-@@ -446,7 +442,7 @@ static apr_status_t cleanup_https_server(void *baton)
-     if (ssl_ctx) {
-         if (ssl_ctx->ssl) {
-           SSL_clear(ssl_ctx->ssl);
--#ifdef USE_OPENSSL_1_1_API
-+#ifndef SERF_NO_SSL_BIO_WRAPPERS
-           BIO_meth_free(ssl_ctx->biom);
- #endif
-         }
--- 
-2.14.2
-