diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-09 18:30:52 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-10 12:04:50 +0000 |
| commit | 508506f65257395f44bc2cb20e6bbad06cc09c78 (patch) | |
| tree | 3a2d548e360f51ad8289937440de34abbcb6e685 | |
| parent | ac4e11149e4c542daabb4447a27b96d264142eb4 (diff) | |
| download | aports-508506f65257395f44bc2cb20e6bbad06cc09c78.tar.bz2 aports-508506f65257395f44bc2cb20e6bbad06cc09c78.tar.xz | |
testing/mongodb-tools: rebuild against libressl
| -rw-r--r-- | testing/mongodb-tools/APKBUILD | 17 | ||||
| -rw-r--r-- | testing/mongodb-tools/libressl.patch | 28 |
2 files changed, 39 insertions, 6 deletions
diff --git a/testing/mongodb-tools/APKBUILD b/testing/mongodb-tools/APKBUILD index dada056dfe..72e7552998 100644 --- a/testing/mongodb-tools/APKBUILD +++ b/testing/mongodb-tools/APKBUILD @@ -2,17 +2,19 @@ # Maintainer: Marc Vertes <marc.vertes@ugrid.net> pkgname=mongodb-tools pkgver=r3.2.4 -pkgrel=0 +pkgrel=1 pkgdesc="The MongoDB tools provide import, export, and diagnostic capabilities." url="https://github.com/mongodb/mongo-tools" arch="all !aarch64" license="apache" depends="libsasl" depends_dev="" -makedepends="$depends_dev go cyrus-sasl-dev openssl-dev" +makedepends="$depends_dev go cyrus-sasl-dev libressl-dev" install="" subpackages="" -source="https://github.com/mongodb/mongo-tools/archive/$pkgver/$pkgname-$pkgver.tar.gz" +source="https://github.com/mongodb/mongo-tools/archive/$pkgver/$pkgname-$pkgver.tar.gz + libressl.patch + " _builddir="$srcdir"/mongo-tools-$pkgver prepare() { @@ -45,6 +47,9 @@ package() { cp bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog "$bindir" || return 1 } -md5sums="d4ac35044dd2bf91979f25a78c69612a mongodb-tools-r3.2.4.tar.gz" -sha256sums="9d52028fb2be6a6e0a779aa73587c52ccd5fa59b258e26e5c2c3fce167599138 mongodb-tools-r3.2.4.tar.gz" -sha512sums="d34ad87bb2a53c9df0124c26a4c200236aa889c7a5bd09a3b535acd4b18c5757018e78813fa04b48b359004eb9097853b49fd359617e71f66e41ef71da01c222 mongodb-tools-r3.2.4.tar.gz" +md5sums="d4ac35044dd2bf91979f25a78c69612a mongodb-tools-r3.2.4.tar.gz +8740979d526a5eb5dedb91484d36ccbd libressl.patch" +sha256sums="9d52028fb2be6a6e0a779aa73587c52ccd5fa59b258e26e5c2c3fce167599138 mongodb-tools-r3.2.4.tar.gz +09ee19045940ec86f66618e8b13769c61d83f94ca5057ecec24d171f44649b4b libressl.patch" +sha512sums="d34ad87bb2a53c9df0124c26a4c200236aa889c7a5bd09a3b535acd4b18c5757018e78813fa04b48b359004eb9097853b49fd359617e71f66e41ef71da01c222 mongodb-tools-r3.2.4.tar.gz +069c303bc52b6020d7dd5250851bca85d7cef0e6294d3dc8b7d6a45033b2f4beae1c23935fe84cfb39b75de082e2621b2f45f1501944d09a0942edc024eb2f3e libressl.patch" diff --git a/testing/mongodb-tools/libressl.patch b/testing/mongodb-tools/libressl.patch new file mode 100644 index 0000000000..9cbcf2ee04 --- /dev/null +++ b/testing/mongodb-tools/libressl.patch @@ -0,0 +1,28 @@ +diff --git a/vendor/src/github.com/spacemonkeygo/openssl/ctx.go b/vendor/src/github.com/spacemonkeygo/openssl/ctx.go +index 22d6dd1..894fecd 100644 +--- a/vendor/src/github.com/spacemonkeygo/openssl/ctx.go ++++ b/vendor/src/github.com/spacemonkeygo/openssl/ctx.go +@@ -140,8 +140,8 @@ const ( + func NewCtxWithVersion(version SSLVersion) (*Ctx, error) { + var method *C.SSL_METHOD + switch version { +- case SSLv3: +- method = C.SSLv3_method() ++// case SSLv3: ++// method = C.SSLv3_method() + case TLSv1: + method = C.TLSv1_method() + case TLSv1_1: +diff --git a/vendor/src/github.com/spacemonkeygo/openssl/hostname.c b/vendor/src/github.com/spacemonkeygo/openssl/hostname.c +index 7ebea17..41c5951 100644 +--- a/vendor/src/github.com/spacemonkeygo/openssl/hostname.c ++++ b/vendor/src/github.com/spacemonkeygo/openssl/hostname.c +@@ -346,7 +346,7 @@ static int do_x509_check(X509 *x, const unsigned char *chk, size_t chklen, + return 0; + } + +-#if OPENSSL_VERSION_NUMBER < 0x1000200fL ++#if OPENSSL_VERSION_NUMBER < 0x1000200fL || defined(LIBRESSL_VERSION_NUMBER) + + int X509_check_host(X509 *x, const unsigned char *chk, size_t chklen, + unsigned int flags) |