Subject: [alpine-aports] [PATCH] Update to wiredtiger-2.8.1

From: Marc Vertes <[email-masked]>
Date: Wed, 5 Oct 2016 07:56:03 +0000

Wiredtiger-2.8.1 is still not offically relased, however it contains necessary
stuff for mongodb-3.2.x. Sticking to 2.8.0 leads to errors when dropping
collections. The source is now pulled from a release tag in github, rather
than wiredtiger private repository.
---
 testing/wiredtiger/APKBUILD                        | 32 ++++++++++++----------
 .../makemake-remove-libtool-version.patch          | 10 +++----
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/testing/wiredtiger/APKBUILD b/testing/wiredtiger/APKBUILD
index 0e2cadd..fd05696 100644
--- a/testing/wiredtiger/APKBUILD
+++ b/testing/wiredtiger/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Philipp Andronov <[email-masked]>
 # Maintainer: Philipp Andronov <[email-masked]>
+# Contributor: Marc Vertes <[email-masked]>
 
 pkgname=wiredtiger
-pkgver=2.8.0
+pkgver=2.8.1
 pkgrel=0
 pkgdesc="High performance, scalable, production quality, NoSQL, Open Source extensible platform for data management"
 url="http://www.wiredtiger.com"
@@ -10,18 +10,19 @@ arch="x86_64"
 license="(GPLv2 or GPLv3) and MIT and BSD"
 depends=""
 depends_dev="autoconf automake libtool linux-headers"
-makedepends="$depends_dev zlib-dev snappy-dev"
+makedepends="$depends_dev lz4-dev zlib-dev snappy-dev"
 
 options=""
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs"
+mongodb_version=mongodb-3.2.9
 
 install=""
-source="http://source.wiredtiger.com/releases/wiredtiger-$pkgver.tar.bz2
-	10-fix-code-generator.patch
+source="https://github.com/wiredtiger/wiredtiger/archive/$mongodb_version.tar.gz
 	makemake-remove-libtool-version.patch
+	10-fix-code-generator.patch
 	"
 
-_builddir="$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname-$mongodb_version
 prepare() {
 	local i
 
@@ -38,6 +39,7 @@ build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
 		--disable-static \
+		--enable-lz4 \
 		--with-builtins=zlib,snappy \
 		|| return 1
 	make || return 1
@@ -48,12 +50,12 @@ package() {
 	make DESTDIR="$pkgdir" install
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums="83162864b3ea7ec27982589830c4adf4  wiredtiger-2.8.0.tar.bz2
-a2d708fbb72b47aa94fb424e4b679484  10-fix-code-generator.patch
-6289c5d090f81f0573ee15783f492207  makemake-remove-libtool-version.patch"
-sha256sums="593e4858a21465db6f8360cc6281489f8a114fa301bd2753c0bde9a86ef107e2  wiredtiger-2.8.0.tar.bz2
-65fc3b0885ff2e2ed30b7eb9917671fd7acdbb63978d565e17d328c2da214326  10-fix-code-generator.patch
-dcb10f0ecd04c2d45ca0a271f268739b3718a34a5b87563e12855d6db13f3b9c  makemake-remove-libtool-version.patch"
-sha512sums="eb478331b7df1a87fe8885c41416b4b71e51fed6b0a73a163f85ddcb42932e2b411868fb917aa48ed48ddd3400243d1983b4d4c9d8c8d9d9fff8d184bbdadc14  wiredtiger-2.8.0.tar.bz2
-a24360c18a8dd677a1942fc66ecdfdb8bc514af6de3e19be822293fdc83c051c43f3270f91eaa4524f30b5bc82c6ecad5162ce5b3f5ff470bab4e1a5d9eb79ec  10-fix-code-generator.patch
-9412a227ca8c9ff47db6d460736cfaab4f38aaf7c6f07ddeaaad6a2b1e6080a6bde6ef6392d1be25e7f987ca153528583cc0c8544397162c09e495911a0e4f25  makemake-remove-libtool-version.patch"
+md5sums="23609d26ba30a334baebfe7015382181  mongodb-3.2.9.tar.gz
+42bfd2bd20c06750704e743e47bc8cfe  makemake-remove-libtool-version.patch
+a2d708fbb72b47aa94fb424e4b679484  10-fix-code-generator.patch"
+sha256sums="87c6ed3129a1c9aa09f6efe9ae36747045ae38792a948227a743191e2ccccb9f  mongodb-3.2.9.tar.gz
+645916bfa2d270f21cdc772a6de9e1a5b79e2c89f8b2d3050eb7e9f2a11cb8cf  makemake-remove-libtool-version.patch
+65fc3b0885ff2e2ed30b7eb9917671fd7acdbb63978d565e17d328c2da214326  10-fix-code-generator.patch"
+sha512sums="cca797106d870ba49211e402e13a6f0409ba7bd4f75580238bb8c9f8ad31d846d1ac8b6304a7c23a78a32ed46af596e80909564288fcf34a27ea6b375215c063  mongodb-3.2.9.tar.gz
+9eb56a81cbf0b8c695ab86d5c6aa319aee8e6ffc4d4ac94c5ecb17a639cab352f83fdf15db467d3f2961cd05fd00c2b96c3cc357daa32972dd07fb3dfa95852f  makemake-remove-libtool-version.patch
+a24360c18a8dd677a1942fc66ecdfdb8bc514af6de3e19be822293fdc83c051c43f3270f91eaa4524f30b5bc82c6ecad5162ce5b3f5ff470bab4e1a5d9eb79ec  10-fix-code-generator.patch"
diff --git a/testing/wiredtiger/makemake-remove-libtool-version.patch b/testing/wiredtiger/makemake-remove-libtool-version.patch
index 8a58129..f401e85 100644
--- a/testing/wiredtiger/makemake-remove-libtool-version.patch
+++ b/testing/wiredtiger/makemake-remove-libtool-version.patch
@@ -1,11 +1,11 @@
 --- ./build_posix/makemake.orig
 +++ ./build_posix/makemake
-@@ -24,7 +24,7 @@
- sed -n '/END SUBDIRS/,/BEGIN SOURCES/p' Make.base
+@@ -25,7 +25,7 @@
  
+ # Write the list of sources.
  echo
 -echo "libwiredtiger_la_LDFLAGS = -release @VERSION@"
 +echo "libwiredtiger_la_LDFLAGS ="
- echo "libwiredtiger_la_SOURCES=\\"
- sed -e '/^[a-z]/!d' \
-     -e 's/.*/	& \\/' \
+ echo "libwiredtiger_la_SOURCES ="
+ sed -e '/^[a-z]/!d' < ../dist/filelist | while read file cond; do
+ 	if test -n "$cond"; then
-- 
2.10.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---