php updates

.gitlab-ci.yml

@@ -39,8 +39,8 @@ before_script:
   tags:
     - autoscale
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli:7.2.29" -t "$CI_REGISTRY_IMAGE/cli:7.2" "dist/7.2/cli"
-    - docker push "$CI_REGISTRY_IMAGE/cli:7.2.29"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli:7.2.31" -t "$CI_REGISTRY_IMAGE/cli:7.2" "dist/7.2/cli"
+    - docker push "$CI_REGISTRY_IMAGE/cli:7.2.31"
     - docker push "$CI_REGISTRY_IMAGE/cli:7.2"
   when: manual
 
@@ -52,8 +52,8 @@ before_script:
     - autoscale
   when: manual
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.2.29" -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.2" "dist/7.2/cli-xdebug"
-    - docker push "$CI_REGISTRY_IMAGE/cli-xdebug:7.2.29"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.2.31" -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.2" "dist/7.2/cli-xdebug"
+    - docker push "$CI_REGISTRY_IMAGE/cli-xdebug:7.2.31"
     - docker push "$CI_REGISTRY_IMAGE/cli-xdebug:7.2"
 
 ##########################################
@@ -63,8 +63,8 @@ before_script:
   tags:
     - autoscale
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli:7.3.16" -t "$CI_REGISTRY_IMAGE/cli:7.3" "dist/7.3/cli"
-    - docker push "$CI_REGISTRY_IMAGE/cli:7.3.16"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli:7.3.19" -t "$CI_REGISTRY_IMAGE/cli:7.3" "dist/7.3/cli"
+    - docker push "$CI_REGISTRY_IMAGE/cli:7.3.19"
     - docker push "$CI_REGISTRY_IMAGE/cli:7.3"
   when: manual
 
@@ -76,8 +76,8 @@ before_script:
     - autoscale
   when: manual
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.3.16" -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.3" "dist/7.3/cli-xdebug"
-    - docker push "$CI_REGISTRY_IMAGE/cli-xdebug:7.3.16"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.3.19" -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.3" "dist/7.3/cli-xdebug"
+    - docker push "$CI_REGISTRY_IMAGE/cli-xdebug:7.3.19"
     - docker push "$CI_REGISTRY_IMAGE/cli-xdebug:7.3"
 
 ##########################################
@@ -87,8 +87,8 @@ before_script:
   tags:
     - autoscale
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli:7.4.4" -t "$CI_REGISTRY_IMAGE/cli:7.4" "dist/7.4/cli"
-    - docker push "$CI_REGISTRY_IMAGE/cli:7.4.4"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli:7.4.7" -t "$CI_REGISTRY_IMAGE/cli:7.4" "dist/7.4/cli"
+    - docker push "$CI_REGISTRY_IMAGE/cli:7.4.7"
     - docker push "$CI_REGISTRY_IMAGE/cli:7.4"
   when: manual
 
@@ -100,12 +100,24 @@ before_script:
     - autoscale
   when: manual
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.4.4" -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.4" "dist/7.4/cli-xdebug"
-    - docker push "$CI_REGISTRY_IMAGE/cli-xdebug:7.4.4"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.4.7" -t "$CI_REGISTRY_IMAGE/cli-xdebug:7.4" "dist/7.4/cli-xdebug"
+    - docker push "$CI_REGISTRY_IMAGE/cli-xdebug:7.4.7"
     - docker push "$CI_REGISTRY_IMAGE/cli-xdebug:7.4"
 
 ##########################################
 
+8.0-cli:
+  stage: build
+  tags:
+    - autoscale
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/cli:8.0.0alpha1" -t "$CI_REGISTRY_IMAGE/cli:8.0" "dist/8.0/cli"
+    - docker push "$CI_REGISTRY_IMAGE/cli:8.0.0alpha1"
+    - docker push "$CI_REGISTRY_IMAGE/cli:8.0"
+  when: manual
+
+##########################################
+
 7.1-fpm:
   stage: build
   tags:
@@ -135,8 +147,8 @@ before_script:
   tags:
     - autoscale
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm:7.2.29" -t "$CI_REGISTRY_IMAGE/fpm:7.2" "dist/7.2/fpm"
-    - docker push "$CI_REGISTRY_IMAGE/fpm:7.2.29"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm:7.2.31" -t "$CI_REGISTRY_IMAGE/fpm:7.2" "dist/7.2/fpm"
+    - docker push "$CI_REGISTRY_IMAGE/fpm:7.2.31"
     - docker push "$CI_REGISTRY_IMAGE/fpm:7.2"
   when: manual
 
@@ -148,8 +160,8 @@ before_script:
     - autoscale
   when: manual
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.2.29" -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.2" "dist/7.2/fpm-xdebug"
-    - docker push "$CI_REGISTRY_IMAGE/fpm-xdebug:7.2.29"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.2.31" -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.2" "dist/7.2/fpm-xdebug"
+    - docker push "$CI_REGISTRY_IMAGE/fpm-xdebug:7.2.31"
     - docker push "$CI_REGISTRY_IMAGE/fpm-xdebug:7.2"
 
 ##########################################
@@ -159,8 +171,8 @@ before_script:
   tags:
     - autoscale
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm:7.3.16" -t "$CI_REGISTRY_IMAGE/fpm:7.3" "dist/7.3/fpm"
-    - docker push "$CI_REGISTRY_IMAGE/fpm:7.3.16"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm:7.3.19" -t "$CI_REGISTRY_IMAGE/fpm:7.3" "dist/7.3/fpm"
+    - docker push "$CI_REGISTRY_IMAGE/fpm:7.3.19"
     - docker push "$CI_REGISTRY_IMAGE/fpm:7.3"
   when: manual
 
@@ -172,8 +184,8 @@ before_script:
     - autoscale
   when: manual
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.3.16" -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.3" "dist/7.3/fpm-xdebug"
-    - docker push "$CI_REGISTRY_IMAGE/fpm-xdebug:7.3.16"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.3.19" -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.3" "dist/7.3/fpm-xdebug"
+    - docker push "$CI_REGISTRY_IMAGE/fpm-xdebug:7.3.19"
     - docker push "$CI_REGISTRY_IMAGE/fpm-xdebug:7.3"
 
 ##########################################
@@ -183,8 +195,8 @@ before_script:
   tags:
     - autoscale
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm:7.4.4" -t "$CI_REGISTRY_IMAGE/fpm:7.4" "dist/7.4/fpm"
-    - docker push "$CI_REGISTRY_IMAGE/fpm:7.4.4"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm:7.4.7" -t "$CI_REGISTRY_IMAGE/fpm:7.4" "dist/7.4/fpm"
+    - docker push "$CI_REGISTRY_IMAGE/fpm:7.4.7"
     - docker push "$CI_REGISTRY_IMAGE/fpm:7.4"
   when: manual
 
@@ -196,9 +208,21 @@ before_script:
     - autoscale
   when: manual
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.4.4" -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.4" "dist/7.4/fpm-xdebug"
-    - docker push "$CI_REGISTRY_IMAGE/fpm-xdebug:7.4.4"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.4.7" -t "$CI_REGISTRY_IMAGE/fpm-xdebug:7.4" "dist/7.4/fpm-xdebug"
+    - docker push "$CI_REGISTRY_IMAGE/fpm-xdebug:7.4.7"
     - docker push "$CI_REGISTRY_IMAGE/fpm-xdebug:7.4"
 
 ##########################################
 
+8.0-fpm:
+  stage: build
+  tags:
+    - autoscale
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/fpm:8.0.0alpha1" -t "$CI_REGISTRY_IMAGE/fpm:8.0" "dist/8.0/fpm"
+    - docker push "$CI_REGISTRY_IMAGE/fpm:8.0.0alpha1"
+    - docker push "$CI_REGISTRY_IMAGE/fpm:8.0"
+  when: manual
+
+##########################################
+

dist/7.2/cli/Dockerfile

-FROM php:7.2.29-alpine
+FROM php:7.2.31-alpine
 MAINTAINER Ludwig Ruderstaller "l.ruderstaller@cwd.at"
 
 ENV COMPOSER_ALLOW_SUPERUSER=1 \

dist/7.2/fpm/Dockerfile

-FROM php:7.2.29-fpm-alpine
+FROM php:7.2.31-fpm-alpine
 MAINTAINER Ludwig Ruderstaller "l.ruderstaller@cwd.at"
 
 ENV COMPOSER_ALLOW_SUPERUSER=1 \

dist/7.3/cli/Dockerfile

-FROM php:7.3.16-alpine
+FROM php:7.3.19-alpine
 MAINTAINER Ludwig Ruderstaller "l.ruderstaller@cwd.at"
 
 ENV COMPOSER_ALLOW_SUPERUSER=1 \

dist/7.3/fpm/Dockerfile

-FROM php:7.3.16-fpm-alpine
+FROM php:7.3.19-fpm-alpine
 MAINTAINER Ludwig Ruderstaller "l.ruderstaller@cwd.at"
 
 ENV COMPOSER_ALLOW_SUPERUSER=1 \

dist/7.4/cli/Dockerfile

-FROM php:7.4.4-alpine
+FROM php:7.4.7-alpine
 MAINTAINER Ludwig Ruderstaller "l.ruderstaller@cwd.at"
 
 ENV COMPOSER_ALLOW_SUPERUSER=1 \

dist/7.4/fpm/Dockerfile

-FROM php:7.4.4-fpm-alpine
+FROM php:7.4.7-fpm-alpine
 MAINTAINER Ludwig Ruderstaller "l.ruderstaller@cwd.at"
 
 ENV COMPOSER_ALLOW_SUPERUSER=1 \

dist/8.0/cli/Dockerfile

+FROM 8.0.0alpha1-alpine
+MAINTAINER Ludwig Ruderstaller "l.ruderstaller@cwd.at"
+
+ENV COMPOSER_ALLOW_SUPERUSER=1 \
+    COMPOSER_DISABLE_XDEBUG_WARN=1 \
+    PHPREDIS_VERSION=5.1.1 
+ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
+
+RUN set -xe \
+ && apk add --no-cache --virtual .build-deps \            
+            tzdata \
+	    $PHPIZE_DEPS \
+ && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \
+ && cp /usr/share/zoneinfo/UTC /etc/localtime \
+ && echo 'UTC' > /etc/localtime \
+
+ && apk add --no-cache \
+	openssl-dev \
+        bash \
+        freetype-dev \
+        libpng-dev \
+        libjpeg-turbo-dev \
+        sqlite-dev \
+        curl \
+	curl-dev \
+        libsodium-dev \
+        icu-dev \
+        libxml2-dev \
+        recode-dev \
+        libxslt-dev \
+        git \
+        postgresql-client \
+        postgresql-dev \
+        openssh-client \
+            libmcrypt-dev \
+        libmcrypt \
+                libzip-dev \
+                libgcrypt-dev \
+        oniguruma-dev \
+     && apk --update --no-cache add grep \
+ && mkdir -p /usr/src/php/ext/redis \
+ && curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
+ && echo 'redis' >> /usr/src/php-available-exts \
+
+   && docker-php-ext-configure gd \
+      --with-freetype=/usr/include/ \
+ 
+ && docker-php-ext-install -j$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)\
+    	gd \
+        bcmath \
+        opcache \
+        iconv \
+        mysqli \
+        pdo \
+        pdo_mysql \
+        pdo_sqlite \
+        pdo_pgsql \
+        zip \
+        xml \
+        xsl \
+        intl \
+        json \
+        mbstring \
+                curl \
+        simplexml \
+        soap \
+        bcmath \
+        redis \
+    
+ && docker-php-ext-install sodium \
+
+ && apk del .build-deps \
+ && rm -rf /tmp/* /var/cache/apk/* 
+
+ RUN echo "memory_limit = -1" > /usr/local/etc/php/conf.d/custom.ini \
+ && echo "max_execution_time = -1" >> /usr/local/etc/php/conf.d/custom.ini \
+ && echo "error_reporting=E_ALL" >> /usr/local/etc/php/conf.d/custom.ini \
+ && echo "log_errors=On" >> /usr/local/etc/php/conf.d/custom.ini
+
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN composer global require hirak/prestissimo --no-plugins --no-scripts
+
+
+

dist/8.0/cli/mongodb.patch

+From 7f1f2f9688d6ca75d99235ccfac3693f281fe2c9 Mon Sep 17 00:00:00 2001
+From: Jeroen <jeroenooms@gmail.com>
+Date: Thu, 9 Aug 2018 17:34:30 +0200
+Subject: [PATCH] Fix for LibreSSL 2.7 LibreSSL version 2.7.0 and up use the
+ OpenSSL 1.1 API See also: https://wiki.freebsd.org/LibreSSL
+
+---
+ src/libmongoc/src/mongoc/mongoc-crypto-openssl.c         | 2 +-
+ src/libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c | 2 +-
+ src/libmongoc/src/mongoc/mongoc-stream-tls-openssl.c     | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/libmongoc/src/mongoc/mongoc-crypto-openssl.c b/src/libmongoc/src/mongoc/mongoc-crypto-openssl.c
+index 6e4f7587e..476f0b6ce 100644
+--- a/src/libmongoc/src/libmongoc/src/mongoc/mongoc-crypto-openssl.c
++++ b/src/libmongoc/src/libmongoc/src/mongoc/mongoc-crypto-openssl.c
+@@ -38,7 +38,7 @@ mongoc_crypto_openssl_hmac_sha1 (mongoc_crypto_t *crypto,
+    HMAC (EVP_sha1 (), key, key_len, data, data_len, hmac_out, NULL);
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ EVP_MD_CTX *
+ EVP_MD_CTX_new (void)
+ {
+diff --git a/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c b/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c
+index 59aa4f02a..f79232a16 100644
+--- a/src/libmongoc/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c
++++ b/src/libmongoc/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c
+@@ -39,7 +39,7 @@
+ #define MONGOC_LOG_DOMAIN "stream-tls-openssl-bio"
+ 
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 
+ /* Magic vtable to make our BIO shim */
+ static BIO_METHOD gMongocStreamTlsOpenSslRawMethods = {
+diff --git a/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl.c b/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl.c
+index ecfcfa306..9e2694dd4 100644
+--- a/src/libmongoc/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl.c
++++ b/src/libmongoc/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl.c
+@@ -45,7 +45,7 @@
+ 
+ #define MONGOC_STREAM_TLS_OPENSSL_BUFFER_SIZE 4096
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ static void
+ BIO_meth_free (BIO_METHOD *meth)
+ {

dist/8.0/fpm/Dockerfile

+FROM 8.0.0alpha1-fpm-alpine
+MAINTAINER Ludwig Ruderstaller "l.ruderstaller@cwd.at"
+
+ENV COMPOSER_ALLOW_SUPERUSER=1 \
+    COMPOSER_DISABLE_XDEBUG_WARN=1 \
+    PHPREDIS_VERSION=5.1.1 
+ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
+
+RUN set -xe \
+ && apk add --no-cache --virtual .build-deps \            
+            tzdata \
+	    $PHPIZE_DEPS \
+ && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \
+ && cp /usr/share/zoneinfo/UTC /etc/localtime \
+ && echo 'UTC' > /etc/localtime \
+
+ && apk add --no-cache \
+	openssl-dev \
+        bash \
+        freetype-dev \
+        libpng-dev \
+        libjpeg-turbo-dev \
+        sqlite-dev \
+        curl \
+	curl-dev \
+        libsodium-dev \
+        icu-dev \
+        libxml2-dev \
+        recode-dev \
+        libxslt-dev \
+        git \
+        postgresql-client \
+        postgresql-dev \
+        openssh-client \
+            libmcrypt-dev \
+        libmcrypt \
+                libzip-dev \
+                libgcrypt-dev \
+        oniguruma-dev \
+     && apk --update --no-cache add grep \
+ && mkdir -p /usr/src/php/ext/redis \
+ && curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
+ && echo 'redis' >> /usr/src/php-available-exts \
+
+   && docker-php-ext-configure gd \
+      --with-freetype=/usr/include/ \
+ 
+ && docker-php-ext-install -j$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)\
+    	gd \
+        bcmath \
+        opcache \
+        iconv \
+        mysqli \
+        pdo \
+        pdo_mysql \
+        pdo_sqlite \
+        pdo_pgsql \
+        zip \
+        xml \
+        xsl \
+        intl \
+        json \
+        mbstring \
+                curl \
+        simplexml \
+        soap \
+        bcmath \
+        redis \
+    
+ && docker-php-ext-install sodium \
+
+ && apk del .build-deps \
+ && rm -rf /tmp/* /var/cache/apk/* 
+
+    RUN echo "memory_limit = 128M" > /usr/local/etc/php/conf.d/custom.ini \
+    && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/custom.ini \
+    && echo "error_reporting=E_ALL" >> /usr/local/etc/php/conf.d/custom.ini \
+    && echo "log_errors=On" >> /usr/local/etc/php/conf.d/custom.ini \
+    && echo "error_log = /proc/self/fd/2" >> /usr/local/etc/php/conf.d/custom.ini \
+    && echo "expose_php = Off" >> /usr/local/etc/php/conf.d/custom.ini \
+    && echo "pm.status_path = /status" >> /usr/local/etc/php-fpm.d/zz-docker.conf \
+    && echo "ping.path = /ping" >> /usr/local/etc/php-fpm.d/zz-docker.conf \
+    && echo "catch_workers_output = yes" >> /usr/local/etc/php-fpm.d/zz-docker.conf 
+
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN composer global require hirak/prestissimo --no-plugins --no-scripts
+
+RUN addgroup -S sudo \
+    && adduser -h /home/web -u 1000 -S -s /bin/bash -G sudo web \
+    && echo "%sudo ALL=NOPASSWD:ALL" > /etc/sudoers
+

dist/8.0/fpm/mongodb.patch

+From 7f1f2f9688d6ca75d99235ccfac3693f281fe2c9 Mon Sep 17 00:00:00 2001
+From: Jeroen <jeroenooms@gmail.com>
+Date: Thu, 9 Aug 2018 17:34:30 +0200
+Subject: [PATCH] Fix for LibreSSL 2.7 LibreSSL version 2.7.0 and up use the
+ OpenSSL 1.1 API See also: https://wiki.freebsd.org/LibreSSL
+
+---
+ src/libmongoc/src/mongoc/mongoc-crypto-openssl.c         | 2 +-
+ src/libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c | 2 +-
+ src/libmongoc/src/mongoc/mongoc-stream-tls-openssl.c     | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/libmongoc/src/mongoc/mongoc-crypto-openssl.c b/src/libmongoc/src/mongoc/mongoc-crypto-openssl.c
+index 6e4f7587e..476f0b6ce 100644
+--- a/src/libmongoc/src/libmongoc/src/mongoc/mongoc-crypto-openssl.c
++++ b/src/libmongoc/src/libmongoc/src/mongoc/mongoc-crypto-openssl.c
+@@ -38,7 +38,7 @@ mongoc_crypto_openssl_hmac_sha1 (mongoc_crypto_t *crypto,
+    HMAC (EVP_sha1 (), key, key_len, data, data_len, hmac_out, NULL);
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ EVP_MD_CTX *
+ EVP_MD_CTX_new (void)
+ {
+diff --git a/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c b/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c
+index 59aa4f02a..f79232a16 100644
+--- a/src/libmongoc/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c
++++ b/src/libmongoc/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c
+@@ -39,7 +39,7 @@
+ #define MONGOC_LOG_DOMAIN "stream-tls-openssl-bio"
+ 
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 
+ /* Magic vtable to make our BIO shim */
+ static BIO_METHOD gMongocStreamTlsOpenSslRawMethods = {
+diff --git a/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl.c b/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl.c
+index ecfcfa306..9e2694dd4 100644
+--- a/src/libmongoc/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl.c
++++ b/src/libmongoc/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl.c
+@@ -45,7 +45,7 @@
+ 
+ #define MONGOC_STREAM_TLS_OPENSSL_BUFFER_SIZE 4096
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ static void
+ BIO_meth_free (BIO_METHOD *meth)
+ {