diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2019-04-08 13:19:00 +0200 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-04-08 13:02:31 +0000 |
| commit | bfaf11c3a8db01efce9b665762b30e4ab2815402 (patch) | |
| tree | cf5ddef7fbf53da183056b1fda48b91f455b185f /main/ldb | |
| parent | 0453a3d033ee3f5fa274c846b26cfd233a0a0e5c (diff) | |
| download | aports-bfaf11c3a8db01efce9b665762b30e4ab2815402.tar.bz2 aports-bfaf11c3a8db01efce9b665762b30e4ab2815402.tar.xz | |
main/ldb: upgrade to 1.3.8
Diffstat (limited to 'main/ldb')
| -rw-r--r-- | main/ldb/APKBUILD | 11 | ||||
| -rw-r--r-- | main/ldb/disable-compile-error-test.patch | 21 | ||||
| -rw-r--r-- | main/ldb/disable-python-tests.patch | 27 |
3 files changed, 26 insertions, 33 deletions
diff --git a/main/ldb/APKBUILD b/main/ldb/APKBUILD index 6c72695f02..edbe679309 100644 --- a/main/ldb/APKBUILD +++ b/main/ldb/APKBUILD @@ -1,17 +1,16 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ldb -pkgver=1.3.6 +pkgver=1.3.8 pkgrel=0 pkgdesc="A schema-less, ldap like, API and database" -url="http://ldb.samba.org/" +url="https://ldb.samba.org/" arch="all" license="LGPL-3.0-or-later" makedepends="libtirpc-dev tevent-dev py2-tevent tdb-dev py2-tdb talloc-dev python2-dev python3-dev popt-dev cmocka-dev" subpackages="$pkgname-dev py2-$pkgname:_py2 py3-$pkgname:_py3 $pkgname-tools" source="https://www.samba.org/ftp/pub/ldb/$pkgname-$pkgver.tar.gz - disable-python-tests.patch - " + disable-compile-error-test.patch" builddir="$srcdir/$pkgname-$pkgver" # secfixes: @@ -68,5 +67,5 @@ tools() { mv "$pkgdir"/usr/lib/ldb/libldb-cmdline.* "$subpkgdir"/usr/lib/ldb/ } -sha512sums="8fcd72598e948c55adaa832d6ebcbc03b979281032cb900af4304c1c68ce9cc94a1e1d4729d0c2a0b83a618cab716749d851160005a0093cf8a178e6dbea298d ldb-1.3.6.tar.gz -4b65362539ad169997b437b4b3444693ff318892931a827e220583e6c5114472a2029e90681be942c3a3ec76db82dedc23300d82e094c8fa8e9f24814756f8f9 disable-python-tests.patch" +sha512sums="06d1b4c2badbf0c27733a64f979c48af8b599747cef7cd7f5417cd55a76447e8f8987bd061694c5af63261fdb35433e3844122c14103d5cc8b4eaab1f4752541 ldb-1.3.8.tar.gz +ed55d5151bbcaf5c0a1b70a1f44b461a501ad94ce02ee97e3ea10c560ce3656a190510697bbd3c5b6f70a74519bf7c0a91210bcb415ffd97d9440045e10a02e8 disable-compile-error-test.patch" diff --git a/main/ldb/disable-compile-error-test.patch b/main/ldb/disable-compile-error-test.patch new file mode 100644 index 0000000000..16849ee549 --- /dev/null +++ b/main/ldb/disable-compile-error-test.patch @@ -0,0 +1,21 @@ +--- a/tests/ldb_match_test.c ++++ b/tests/ldb_match_test.c +@@ -32,6 +32,8 @@ + * This allows test applications to use custom definitions of C standard + * library functions and types. + */ ++// disabled on alpine ++#if 0 + #include <stdarg.h> + #include <stddef.h> + #include <stdint.h> +@@ -189,3 +191,9 @@ + + return cmocka_run_group_tests(tests, NULL, NULL); + } ++#else ++int main(int argc, const char **argv) ++{ ++ return 0; ++} ++#endif diff --git a/main/ldb/disable-python-tests.patch b/main/ldb/disable-python-tests.patch deleted file mode 100644 index 2025ab806c..0000000000 --- a/main/ldb/disable-python-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -Do not run python tests, they take eternity to finish. - ---- a/wscript -+++ b/wscript -@@ -370,21 +370,13 @@ - ret = samba_utils.RUN_COMMAND(cmd) - print("testsuite returned %d" % ret) - -- 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}) -- print("Python testsuite returned %d" % pyret) -- - cmocka_ret = 0 - for test_exe in ['ldb_tdb_mod_op_test', - 'ldb_msg_test']: - cmd = os.path.join(Utils.g_module.blddir, test_exe) - cmocka_ret = cmocka_ret or samba_utils.RUN_COMMAND(cmd) - -- sys.exit(ret or pyret or cmocka_ret) -+ sys.exit(ret or cmocka_ret) - - def dist(): - '''makes a tarball for distribution''' |