diff --git a/0001-Revert-waf-disable-python-align-talloc-s-wscript.patch b/0001-Revert-waf-disable-python-align-talloc-s-wscript.patch deleted file mode 100644 index 49304ea..0000000 --- a/0001-Revert-waf-disable-python-align-talloc-s-wscript.patch +++ /dev/null @@ -1,66 +0,0 @@ -From f9d6bc97b003249a9e0ebb222ba3ee6a7bea1caa Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 3 Jun 2017 11:50:26 +0200 -Subject: [PATCH 1/2] Revert "waf: disable-python - align talloc's wscript" - -This reverts commit dcba0b19757b64164577722976b3da7622ff3955. ---- - lib/talloc/wscript | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/lib/talloc/wscript b/lib/talloc/wscript -index df7e6be55939a1aa9004e2decb65768387fb4b60..af939104a173208a0e9206b721a514d5b752a655 100644 ---- a/lib/talloc/wscript -+++ b/lib/talloc/wscript -@@ -32,6 +32,9 @@ def set_options(opt): - opt.add_option('--enable-talloc-compat1', - help=("Build talloc 1.x.x compat library [False]"), - action="store_true", dest='TALLOC_COMPAT1', default=False) -+ opt.add_option('--disable-python', -+ help=("disable the pytalloc module"), -+ action="store_true", dest='disable_python', default=False) - - - def configure(conf): -@@ -43,6 +46,8 @@ def configure(conf): - conf.define('TALLOC_BUILD_VERSION_MINOR', int(VERSION.split('.')[1])) - conf.define('TALLOC_BUILD_VERSION_RELEASE', int(VERSION.split('.')[2])) - -+ conf.env.disable_python = getattr(Options.options, 'disable_python', False) -+ - conf.env.TALLOC_COMPAT1 = False - if conf.env.standalone_talloc: - conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 -@@ -137,7 +142,7 @@ def build(bld): - private_library=private_library, - manpages='man/talloc.3') - -- if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL'): -+ if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python: - for env in bld.gen_python_environments(['PKGCONFIGDIR']): - name = bld.pyembed_libname('pytalloc-util') - -@@ -151,19 +156,16 @@ def build(bld): - abi_match='pytalloc_* _pytalloc_*', - private_library=private_library, - public_headers=('' if private_library else 'pytalloc.h'), -- pc_files='pytalloc-util.pc', -- enabled=bld.PYTHON_BUILD_IS_ENABLED() -+ pc_files='pytalloc-util.pc' - ) - bld.SAMBA_PYTHON('pytalloc', - 'pytalloc.c', - deps='talloc ' + name, -- enabled=bld.PYTHON_BUILD_IS_ENABLED(), - realname='talloc.so') - - bld.SAMBA_PYTHON('test_pytalloc', - 'test_pytalloc.c', - deps='pytalloc', -- enabled=bld.PYTHON_BUILD_IS_ENABLED(), - realname='_test_pytalloc.so', - install=False) - --- -2.13.0 - diff --git a/0001-ldb-Fix-index-out-of-bound-in-ldb_msg_find_common_va.patch b/0001-ldb-Fix-index-out-of-bound-in-ldb_msg_find_common_va.patch deleted file mode 100644 index 2035831..0000000 --- a/0001-ldb-Fix-index-out-of-bound-in-ldb_msg_find_common_va.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a155daaa65c8727cc387360b0e9a91bf5d8ecf5d Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Tue, 4 Jul 2017 15:46:49 +0200 -Subject: [PATCH] ldb: Fix index out of bound in ldb_msg_find_common_values - -cmocka unit test failed on i386 -[==========] Running 2 test(s). -[ RUN ] test_ldb_msg_find_duplicate_val -[ OK ] test_ldb_msg_find_duplicate_val -[ RUN ] test_ldb_msg_find_common_values -[ FAILED ] test_ldb_msg_find_common_values -[==========] 2 test(s) run. -[ ERROR ] --- 0x14 != 0 -[ LINE ] --- ../tests/ldb_msg.c:266: error: Failure! -[ PASSED ] 1 test(s). -[ FAILED ] 1 test(s), listed below: -[ FAILED ] test_ldb_msg_find_common_values - 1 FAILED TEST(S) - -But we were just lucky on other platforms because there is -index out of bound according to valgrind error. - -==3298== Invalid read of size 4 -==3298== at 0x486FCF6: ldb_val_cmp (ldb_msg.c:95) -==3298== by 0x486FCF6: ldb_msg_find_common_values (ldb_msg.c:266) -==3298== by 0x109A3D: test_ldb_msg_find_common_values (ldb_msg.c:265) -==3298== by 0x48E7490: ??? (in /usr/lib/libcmocka.so.0.4.1) -==3298== by 0x48E7EB0: _cmocka_run_group_tests (in /usr/lib/libcmocka.so.0.4.1) -==3298== by 0x1089B7: main (ldb_msg.c:352) -==3298== Address 0x4b07734 is 4 bytes after a block of size 48 alloc'd -==3298== at 0x483223E: malloc (vg_replace_malloc.c:299) -==3298== by 0x4907AA7: _talloc_array (in /usr/lib/libtalloc.so.2.1.9) -==3298== by 0x486FBF8: ldb_msg_find_common_values (ldb_msg.c:245) -==3298== by 0x109A3D: test_ldb_msg_find_common_values (ldb_msg.c:265) -==3298== by 0x48E7490: ??? (in /usr/lib/libcmocka.so.0.4.1) -==3298== by 0x48E7EB0: _cmocka_run_group_tests (in /usr/lib/libcmocka.so.0.4.1) -==3298== by 0x1089B7: main (ldb_msg.c:352) ---- - lib/ldb/common/ldb_msg.c | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/lib/ldb/common/ldb_msg.c b/lib/ldb/common/ldb_msg.c -index abad5a8320551c09e64539b993b8c5408ccdd32a..8e4047b41beebcadeab9631bc820941f0eadc490 100644 ---- a/lib/ldb/common/ldb_msg.c -+++ b/lib/ldb/common/ldb_msg.c -@@ -262,20 +262,12 @@ int ldb_msg_find_common_values(struct ldb_context *ldb, - n_values = el->num_values; - i = 0; - j = 0; -- while (i != n_values) { -+ while (i != n_values && j < el2->num_values) { - int ret = ldb_val_cmp(&values[i], &values2[j]); - if (ret < 0) { - i++; - } else if (ret > 0) { - j++; -- if (j == el2->num_values) { -- /* -- We have walked past the end of the second -- list, meaning the remainder of the first -- list cannot collide and we're done. -- */ -- break; -- } - } else { - /* we have a collision */ - if (! remove_duplicates) { --- -2.13.0 - diff --git a/0001-ldb-Use-libraries-from-build-dir-for-testsuite.patch b/0001-ldb-Use-libraries-from-build-dir-for-testsuite.patch deleted file mode 100644 index 5149a30..0000000 --- a/0001-ldb-Use-libraries-from-build-dir-for-testsuite.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 5dd52177724f6546ffef09b9a8d07abde2adac15 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Tue, 4 Jul 2017 00:32:31 +0200 -Subject: [PATCH] ldb: Use libraries from build dir for testsuite - -There was a failure when tests were executed after after extracting -ldb tarball. - - sh$ make -j8 check - WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$PATH waf test - ldbadd: error while loading shared libraries: libldb.so.1: cannot open shared object file: No such file or directory - cat: write error: Broken pipe - Traceback (most recent call last): - File "tests/python/api.py", line 10, in - import ldb - ImportError: libldb.so.1: cannot open shared object file: No such file or directory - Traceback (most recent call last): - File "tests/python/api.py", line 10, in - import ldb - ImportError: libpyldb-util.so.1: cannot open shared object file: No such file or directory - bin/ldb_tdb_mod_op_test: error while loading shared libraries: libldb.so.1: cannot open shared object file: No such file or directory - testsuite returned 1 - -Signed-off-by: Lukas Slebodnik ---- - lib/ldb/wscript | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/lib/ldb/wscript b/lib/ldb/wscript -index 58e4d4fea1021478242155e8e71c786563819abc..5189ea43fa77d732f606c06738c9ecacd9eb61fc 100644 ---- a/lib/ldb/wscript -+++ b/lib/ldb/wscript -@@ -358,7 +358,10 @@ def test(ctx): - shutil.rmtree(test_prefix, ignore_errors=True) - os.makedirs(test_prefix) - os.environ['TEST_DATA_PREFIX'] = test_prefix -- os.environ['LD_LIBRARY_PATH'] = Utils.g_module.blddir + '/bin/default/lib/ldb' -+ os.environ['LDB_MODULES_PATH'] = Utils.g_module.blddir + "/modules/ldb" -+ samba_utils.ADD_LD_LIBRARY_PATH('bin/shared') -+ samba_utils.ADD_LD_LIBRARY_PATH('bin/shared/private') -+ - cmd = 'tests/test-tdb.sh %s' % Utils.g_module.blddir - ret = samba_utils.RUN_COMMAND(cmd) - print("testsuite returned %d" % ret) -@@ -371,8 +374,6 @@ def test(ctx): - extra_env={'SELFTEST_PREFIX': test_prefix}) - print("Python testsuite returned %d" % pyret) - -- os.environ['LDB_MODULES_PATH'] = Utils.g_module.blddir + '/modules/ldb' -- os.environ['LD_LIBRARY_PATH'] = Utils.g_module.blddir + '/bin/default/lib/ldb' - cmocka_ret = 0 - for test_exe in ['ldb_tdb_mod_op_test', - 'ldb_msg_test']: --- -2.13.0 - diff --git a/0002-Revert-talloc-use-the-system-pytalloc-util-for-pytho.patch b/0002-Revert-talloc-use-the-system-pytalloc-util-for-pytho.patch deleted file mode 100644 index 8993911..0000000 --- a/0002-Revert-talloc-use-the-system-pytalloc-util-for-pytho.patch +++ /dev/null @@ -1,107 +0,0 @@ -From c8f013a451cb3ed1917dc9183833978a39f25c05 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 3 Jun 2017 11:50:48 +0200 -Subject: [PATCH 2/2] Revert "talloc: use the system pytalloc-util for python3 - as well" - -This reverts commit f5cafee0c7a96396798d2b229ff3f9dced1d74f3. ---- - lib/talloc/pytalloc-util.pc.in | 4 ++-- - lib/talloc/wscript | 44 ++++++++++++++---------------------------- - 2 files changed, 16 insertions(+), 32 deletions(-) - -diff --git a/lib/talloc/pytalloc-util.pc.in b/lib/talloc/pytalloc-util.pc.in -index 06f83e26aa43b3eafd0364c1603673742c2de63b..b87c94edf20c5325d3cde598bfa914bd478ed815 100644 ---- a/lib/talloc/pytalloc-util.pc.in -+++ b/lib/talloc/pytalloc-util.pc.in -@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ - --Name: pytalloc-util@PYTHON_SO_ABI_FLAG@ -+Name: pytalloc-util - Description: Utility functions for using talloc objects with Python - Version: @TALLOC_VERSION@ --Libs: @LIB_RPATH@ -L${libdir} -lpytalloc-util@PYTHON_LIBNAME_SO_ABI_FLAG@ -+Libs: @LIB_RPATH@ -L${libdir} -lpytalloc-util@PYTHON_SO_ABI_FLAG@ - Cflags: -I${includedir} - URL: http://talloc.samba.org/ -diff --git a/lib/talloc/wscript b/lib/talloc/wscript -index af939104a173208a0e9206b721a514d5b752a655..7f9bad743555b442be30a91bf50cb361bfa0de18 100644 ---- a/lib/talloc/wscript -+++ b/lib/talloc/wscript -@@ -48,24 +48,20 @@ def configure(conf): - - conf.env.disable_python = getattr(Options.options, 'disable_python', False) - -+ if not conf.env.standalone_talloc: -+ if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION, -+ implied_deps='replace'): -+ conf.define('USING_SYSTEM_TALLOC', 1) -+ if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, -+ implied_deps='talloc replace'): -+ conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) -+ - conf.env.TALLOC_COMPAT1 = False - if conf.env.standalone_talloc: - conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 -- conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' -- conf.env.TALLOC_VERSION = VERSION - - conf.CHECK_XSLTPROC_MANPAGES() - -- conf.CHECK_HEADERS('sys/auxv.h') -- conf.CHECK_FUNCS('getauxval') -- -- conf.SAMBA_CONFIG_H() -- -- conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() -- -- # We need to set everything non-python up before here, because -- # SAMBA_CHECK_PYTHON makes a copy of conf and we need it set up correctly -- - if not conf.env.disable_python: - # also disable if we don't have the python libs installed - conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2)) -@@ -74,32 +70,20 @@ def configure(conf): - Logs.warn('Disabling pytalloc-util as python devel libs not found') - conf.env.disable_python = True - -- if not conf.env.standalone_talloc: -- if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION, -- implied_deps='replace'): -- conf.define('USING_SYSTEM_TALLOC', 1) -+ conf.CHECK_HEADERS('sys/auxv.h') -+ conf.CHECK_FUNCS('getauxval') - -- using_system_pytalloc_util = True -- if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, -- implied_deps='talloc replace'): -- using_system_pytalloc_util = False -+ conf.SAMBA_CONFIG_H() - -- # We need to get a pytalloc-util for all the python versions -- # we are building for -- if conf.env['EXTRA_PYTHON']: -- name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] -- if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, -- implied_deps='talloc replace'): -- using_system_pytalloc_util = False -- -- if using_system_pytalloc_util: -- conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) -+ conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() - - - def build(bld): - bld.RECURSE('lib/replace') - - if bld.env.standalone_talloc: -+ bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' -+ bld.env.TALLOC_VERSION = VERSION - private_library = False - - # should we also install the symlink to libtalloc1.so here? --- -2.13.0 -