From 1d915b125a7a3e5e184ba9a33a1ca3ad8e46d5f2 Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Tue, 8 May 2018 01:45:41 +0300 Subject: testing/php7-mongodb: upgrade to 1.4.3 --- testing/php7-mongodb/APKBUILD | 10 ++++++---- testing/php7-mongodb/libressl-273.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 testing/php7-mongodb/libressl-273.patch diff --git a/testing/php7-mongodb/APKBUILD b/testing/php7-mongodb/APKBUILD index 20ec210d09..faf8cb8102 100644 --- a/testing/php7-mongodb/APKBUILD +++ b/testing/php7-mongodb/APKBUILD @@ -2,16 +2,17 @@ # Maintainer: Fabio Ribeiro pkgname=php7-mongodb _pkgreal=mongodb -pkgver=1.4.2 +pkgver=1.4.3 _pkgver=${pkgver/_rc/RC} -pkgrel=2 +pkgrel=0 pkgdesc="PHP7 MongoDB driver" url="http://pecl.php.net/package/mongodb" arch="x86_64 armhf" license="PHP" depends="php7-json" makedepends="libressl-dev pcre-dev php7-dev autoconf" -source="http://pecl.php.net/get/$_pkgreal-$_pkgver.tgz" +source="http://pecl.php.net/get/$_pkgreal-$_pkgver.tgz + libressl-273.patch" options="!check" # tests requires additional dependencies (vagrant) builddir="$srcdir"/$_pkgreal-$_pkgver @@ -30,4 +31,5 @@ package() { echo "extension=$_pkgreal.so" > "$pkgdir"/etc/php7/conf.d/$_pkgreal.ini } -sha512sums="ee40c76194ff47407eb14aa7677fe090fe71fed953afd36b68661f7ab67315cb105b485a49f6b1d00a97c1829afb9a4f605463d8d310f7f9263bf90f4bba1bb6 mongodb-1.4.2.tgz" +sha512sums="60a8c5ba76f200c0504126eeefb092061def3dd9add6fc002ebf762923edd09479da1413ee417c72da6f1a4317895608b4cfe431e5e6546292bedbfd5bdf990b mongodb-1.4.3.tgz +d1851a2fc4bd311e6286527038f677e4eb48f1b773470eb0a9f324a8fa5ffebdcfd0f2f2419eb13634045e1fa5f9669e2e64d4c976c0fa97ce870fd4de5cc735 libressl-273.patch" diff --git a/testing/php7-mongodb/libressl-273.patch b/testing/php7-mongodb/libressl-273.patch new file mode 100644 index 0000000000..2689f5aea7 --- /dev/null +++ b/testing/php7-mongodb/libressl-273.patch @@ -0,0 +1,26 @@ +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 053439b..3306236 100644 +--- a/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl-bio.c ++++ b/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 < 0x2070000fL) + + /* 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 fd1800b..0ccc4a1 100644 +--- a/src/libmongoc/src/mongoc/mongoc-stream-tls-openssl.c ++++ b/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 < 0x2070000fL) + static void + BIO_meth_free (BIO_METHOD *meth) + { -- cgit v1.2.3