Marc Vertes: 1 testing/mongodb-tools: upgrade to 3.2.10 2 files changed, 6 insertions(+), 39 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/aports/patches/2242/mbox | git am -3Learn more about email & git
--- testing/mongodb-tools/APKBUILD | 17 ++++++----------- testing/mongodb-tools/libressl.patch | 28 ---------------------------- 2 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 testing/mongodb-tools/libressl.patch diff --git a/testing/mongodb-tools/APKBUILD b/testing/mongodb-tools/APKBUILD index 72e7552..ffb0a51 100644 --- a/testing/mongodb-tools/APKBUILD +++ b/testing/mongodb-tools/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Marc Vertes <marc.vertes@ugrid.net> # Maintainer: Marc Vertes <marc.vertes@ugrid.net> pkgname=mongodb-tools -pkgver=r3.2.4 -pkgrel=1 +pkgver=r3.2.10 +pkgrel=0 pkgdesc="The MongoDB tools provide import, export, and diagnostic capabilities." url="https://github.com/mongodb/mongo-tools" arch="all !aarch64" @@ -12,9 +12,7 @@ depends_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 - libressl.patch - " +source="https://github.com/mongodb/mongo-tools/archive/$pkgver/$pkgname-$pkgver.tar.gz" _builddir="$srcdir"/mongo-tools-$pkgver prepare() { @@ -47,9 +45,6 @@ package() { cp bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog "$bindir" || return 1 } -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" +md5sums="89e0ba263281ad31d0e475d3a3e3845b mongodb-tools-r3.2.10.tar.gz" +sha256sums="98a5ff97c2744a3a20e5c88b88cfa02d5b98cf6f7701d6ce9214c178f90af4c4 mongodb-tools-r3.2.10.tar.gz" +sha512sums="8e325257e434b58dbc6ff1d5749a774f9163a01bc83ef5b58bea2444f1a24bed7ea14d6d02796a0d4a6530afa378206d65dc9f18e20c2b05abd5acf3cf637f21 mongodb-tools-r3.2.10.tar.gz" diff --git a/testing/mongodb-tools/libressl.patch b/testing/mongodb-tools/libressl.patch deleted file mode 100644 index 9cbcf2e..0000000 --- a/testing/mongodb-tools/libressl.patch @@ -1,28 +0,0 @@ -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) -- 2.10.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
Timo Teras <timo.teras@iki.fi>> --- > testing/mongodb-tools/APKBUILD | 17 ++++++----------- > testing/mongodb-tools/libressl.patch | 28 > ---------------------------- 2 files changed, 6 insertions(+), 39 > deletions(-) delete mode 100644 testing/mongodb-tools/libressl.patch Fails for me with: > >> mongodb-tools: > >> Unpacking /var/cache/distfiles/mongodb-tools-r3.2.10.tar.gz... Building bsondump # github.com/spacemonkeygo/openssl could not determine kind of name for C.EVP_sha Building mongostat # github.com/spacemonkeygo/openssl could not determine kind of name for C.EVP_sha Building mongofiles # github.com/spacemonkeygo/openssl could not determine kind of name for C.EVP_sha Building mongoexport # github.com/spacemonkeygo/openssl could not determine kind of name for C.EVP_sha Building mongoimport # github.com/spacemonkeygo/openssl could not determine kind of name for C.EVP_sha Building mongorestore # github.com/spacemonkeygo/openssl could not determine kind of name for C.EVP_sha Building mongodump # github.com/spacemonkeygo/openssl could not determine kind of name for C.EVP_sha Building mongotop # github.com/spacemonkeygo/openssl could not determine kind of name for C.EVP_sha Building mongooplog # github.com/spacemonkeygo/openssl could not determine kind of name for C.EVP_sha > >> ERROR: mongodb-tools: all failed Any ideas? --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---