X-Original-To: alpine-aports@lists.alpinelinux.org Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by lists.alpinelinux.org (Postfix) with ESMTP id B6FA95C5B7C for ; Mon, 19 Nov 2018 12:39:27 +0000 (GMT) Received: from alpine.my.domain (unknown [90.63.241.33]) (Authenticated sender: mvertes@free.fr) by smtp6-g21.free.fr (Postfix) with ESMTPSA id 5A9D5780333; Mon, 19 Nov 2018 12:39:23 +0000 (UTC) From: Marc Vertes To: alpine-aports@lists.alpinelinux.org Cc: Marc Vertes Subject: [alpine-aports] [PATCH] community/mongodb-tools: Upgrade to 4.04, switch to openssl, update contact Date: Mon, 19 Nov 2018 13:36:11 +0100 Message-Id: <20181119123611.4170-1-mvertes@free.fr> X-Mailer: git-send-email 2.19.1 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit --- community/mongodb-tools/APKBUILD | 14 +++---- community/mongodb-tools/fix-libressl.patch | 43 ---------------------- 2 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 community/mongodb-tools/fix-libressl.patch diff --git a/community/mongodb-tools/APKBUILD b/community/mongodb-tools/APKBUILD index aba6fe9282..7b11ffc442 100644 --- a/community/mongodb-tools/APKBUILD +++ b/community/mongodb-tools/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Marc Vertes -# Maintainer: Marc Vertes +# Contributor: Marc Vertes +# Maintainer: Marc Vertes pkgname=mongodb-tools -pkgver=4.0.3 -pkgrel=1 +pkgver=4.0.4 +pkgrel=0 pkgdesc="The MongoDB tools provide import, export, and diagnostic capabilities." url="https://github.com/mongodb/mongo-tools" arch="all !s390x !aarch64" @@ -11,7 +11,6 @@ makedepends="$depends_dev go cyrus-sasl-dev openssl-dev libpcap-dev bash" options="!check" source="$pkgname-$pkgver.tar.gz::https://github.com/mongodb/mongo-tools/archive/r$pkgver.tar.gz fix-build.patch - fix-libressl.patch " builddir="$srcdir"/mongo-tools-r$pkgver @@ -29,6 +28,5 @@ package() { "$bindir" } -sha512sums="cbe74b3fdebd0d4f6be6e3acf7f55f5f1a551b0ad1a23d82782643d2a9eb9ea4b7e0133985485b8c5a88c1fea26595e3ed9c759f1f63b578b6472d850154d67b mongodb-tools-4.0.3.tar.gz -74e432b354fd75209b87461e54f79a173ba0d647a2e45a48d520ee9342236b6a50ef1c634312f4804402578b8534d59ebf10973ce90cae2bbe76407102f2b404 fix-build.patch -8f91429dc451bd0c13738415c28c853d979cc59417f8b44a2d8e3bbea588c6c0a051019f4b7db09a6dd23e1e8fa4624c6ce7737d0eff99332e37453fa4c616b8 fix-libressl.patch" +sha512sums="d7900dbbd1e1e63d5518494c85559a7eab34f53ffa38880628f3dda0a71ee1211f67cf7dfaac66498b0359eca32abb9c89410e5cc56415a1594acf38ebfa226b mongodb-tools-4.0.4.tar.gz +74e432b354fd75209b87461e54f79a173ba0d647a2e45a48d520ee9342236b6a50ef1c634312f4804402578b8534d59ebf10973ce90cae2bbe76407102f2b404 fix-build.patch" diff --git a/community/mongodb-tools/fix-libressl.patch b/community/mongodb-tools/fix-libressl.patch deleted file mode 100644 index 18ad5c7ac7..0000000000 --- a/community/mongodb-tools/fix-libressl.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- mongo-tools-r4.0.0/vendor/src/github.com/10gen/openssl/cert.go.orig -+++ mongo-tools-r4.0.0/vendor/src/github.com/10gen/openssl/cert.go -@@ -277,8 +277,8 @@ - md = C.X_EVP_md_null() - case EVP_MD5: - md = C.X_EVP_md5() -- case EVP_SHA: -- md = C.X_EVP_sha() -+ //case EVP_SHA: -+ // md = C.X_EVP_sha() - case EVP_SHA1: - md = C.X_EVP_sha1() - case EVP_DSS: ---- mongo-tools-r4.0.0/vendor/src/github.com/10gen/openssl/shim.c.orig -+++ mongo-tools-r4.0.0/vendor/src/github.com/10gen/openssl/shim.c -@@ -47,7 +47,7 @@ - * v1.1.X and later implementation - ************************************************ - */ --#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER) - - void X_BIO_set_data(BIO* bio, void* data) { - BIO_set_data(bio, data); -@@ -174,7 +174,7 @@ - * v1.0.X implementation - ************************************************ - */ --#if OPENSSL_VERSION_NUMBER < 0x1010000fL -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) - - static int x_bio_create(BIO *b) { - b->shutdown = 1; -@@ -260,7 +260,8 @@ - } - - const EVP_MD *X_EVP_sha() { -- return EVP_sha(); -+ //return EVP_sha(); -+ return NULL; - } - - int X_EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx) { -- 2.19.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---