main/ldb: upgrade to 2.0.7

2 files changed, 4 insertions, 66 deletions

diff --git a/main/ldb/0002-ldb-Run-at-least-some-tests-on-32-bit-machines.patch b/main/ldb/0002-ldb-Run-at-least-some-tests-on-32-bit-machines.patch
deleted file mode 100644
index d0803fc712..0000000000
--- a/main/ldb/0002-ldb-Run-at-least-some-tests-on-32-bit-machines.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c161c5d4a3184c0ae9a33d977f061458337d4ca1 Mon Sep 17 00:00:00 2001
-From: Lukas Slebodnik <lslebodn@fedoraproject.org>
-Date: Wed, 30 May 2018 23:22:40 +0200
-Subject: [PATCH] ldb: Run at least some tests on 32 bit machines
-
-lmdb is supported only on 64 bit machines. But there also
-unit tests which pass just with tdb on 32 bit architectures.
-
-Signed-off-by: Lukas Slebodnik <lslebodn@fedoraproject.org>
----
- wscript | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/wscript b/wscript
-index ca0bf410f1029f33bab9b71514935011d57b1dbc..851344733645f51186d0b568f2741ac888a52660 100644
---- a/wscript
-+++ b/wscript
-@@ -540,10 +540,6 @@ def test(ctx):
-     env = samba_utils.LOAD_ENVIRONMENT()
-     ctx.env = env
- 
--    if not env.HAVE_LMDB:
--        raise Errors.WafError('make test called, but ldb was built '
--                             '--without-ldb-lmdb')
--
-     test_prefix = "%s/st" % (Context.g_module.out)
-     shutil.rmtree(test_prefix, ignore_errors=True)
-     os.makedirs(test_prefix)
-@@ -559,9 +555,13 @@ def test(ctx):
-     tmp_dir = os.path.join(test_prefix, 'tmp')
-     if not os.path.exists(tmp_dir):
-         os.mkdir(tmp_dir)
--    pyret = samba_utils.RUN_PYTHON_TESTS(
--        ['tests/python/api.py', 'tests/python/index.py'],
--        extra_env={'SELFTEST_PREFIX': test_prefix})
-+
-+    if env.HAVE_LMDB:
-+        pyret = samba_utils.RUN_PYTHON_TESTS(
-+            ['tests/python/api.py', 'tests/python/index.py'],
-+            extra_env={'SELFTEST_PREFIX': test_prefix})
-+    else:
-+        pyret = 0
-     print("Python testsuite returned %d" % pyret)
- 
-     cmocka_ret = 0
-@@ -572,7 +572,10 @@ def test(ctx):
-                  'ldb_tdb_guid_mod_op_test',
-                  'ldb_msg_test',
-                  'ldb_tdb_kv_ops_test',
--                 'ldb_tdb_test',
-+                 'ldb_tdb_test']
-+
-+    if env.HAVE_LMDB:
-+        test_exes += [
-                  'ldb_mdb_mod_op_test',
-                  'ldb_lmdb_test',
-                  # we don't want to run ldb_lmdb_size_test (which proves we can
--- 
-2.20.1
-
diff --git a/main/ldb/APKBUILD b/main/ldb/APKBUILD
index f7fce96f9e..72c0350fe4 100644
--- a/main/ldb/APKBUILD
+++ b/main/ldb/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ldb
-pkgver=1.5.5
+pkgver=2.0.7
 pkgrel=0
 pkgdesc="A schema-less, ldap like, API and database"
 url="https://ldb.samba.org/"
@@ -10,8 +10,7 @@ makedepends="libtirpc-dev tevent-dev py3-tevent tdb-dev py3-tdb talloc-dev
 	python3-dev popt-dev cmocka-dev docbook-xsl lmdb-dev"
 subpackages="$pkgname-dev py3-$pkgname:_py3 $pkgname-tools $pkgname-doc"
 source="https://www.samba.org/ftp/pub/ldb/$pkgname-$pkgver.tar.gz
-	disable-compile-error-test.patch
-	0002-ldb-Run-at-least-some-tests-on-32-bit-machines.patch"
+	disable-compile-error-test.patch"
 builddir="$srcdir/$pkgname-$pkgver"
 
 # secfixes:
@@ -57,6 +56,5 @@ tools() {
 	mv "$pkgdir"/usr/lib/ldb/libldb-cmdline.* "$subpkgdir"/usr/lib/ldb/
 }
 
-sha512sums="562e08b3d6564d08fed80dc43ca299c38fbd958dbe27ed1400e5eb5c3df0f4c7b7eaf502b13eec5544b168f26c5e6537615f65e28dcaeb6473d2ff3c3c7a4e4b  ldb-1.5.5.tar.gz
-ed55d5151bbcaf5c0a1b70a1f44b461a501ad94ce02ee97e3ea10c560ce3656a190510697bbd3c5b6f70a74519bf7c0a91210bcb415ffd97d9440045e10a02e8  disable-compile-error-test.patch
-619db1e1cbf991546b92cfa4fd2100a0b74f563d366981b552a9997152a98ee2c5e9029c77015ab57860d0ca48a98aa24b6e5bc1c330880cd85f39c1df811e55  0002-ldb-Run-at-least-some-tests-on-32-bit-machines.patch"
+sha512sums="0b1bd5970421c32bee1209179eac60682d7304aca597bca11dd477903f59b53a2fbc7d9e1717809e9a8e550564a9ca9139dd1127b9f4cefcc2437d7c8050985a  ldb-2.0.7.tar.gz
+ed55d5151bbcaf5c0a1b70a1f44b461a501ad94ce02ee97e3ea10c560ce3656a190510697bbd3c5b6f70a74519bf7c0a91210bcb415ffd97d9440045e10a02e8  disable-compile-error-test.patch"