diff --git a/.gitignore b/.gitignore index afea234..f5cc77d 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /ldb-1.5.3.tar.gz /ldb-1.5.4.tar.gz /ldb-1.5.5.tar.gz +/ldb-2.0.5.tar.gz diff --git a/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch b/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch new file mode 100644 index 0000000..3b81899 --- /dev/null +++ b/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch @@ -0,0 +1,195 @@ +From d4e0a07a24c16b38de58c14a38b418c63106ad09 Mon Sep 17 00:00:00 2001 +From: Lukas Slebodnik +Date: Sat, 24 Aug 2019 16:46:30 +0200 +Subject: [PATCH] [PATCH] wafsamba: Fix few SyntaxWarnings caused by regular + expressions + +./buildtools/wafsamba/samba_utils.py:258: SyntaxWarning: invalid escape sequence \$ + lst = re.split('(\$\{\w+\})', string) +./buildtools/wafsamba/samba_utils.py:261: SyntaxWarning: invalid escape sequence \$ + if re.match('\$\{\w+\}', v): +./buildtools/wafsamba/samba_cross.py:80: SyntaxWarning: invalid escape sequence \( + m = re.match('\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans) +./buildtools/wafsamba/samba_conftests.py:400: SyntaxWarning: invalid escape sequence \s + m = re.search('MAN%sEXT\s+=\s+(\w+)' % section, man) +./buildtools/wafsamba/samba_abi.py:24: SyntaxWarning: invalid escape sequence \$ + sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}$', r'\1', sig) +./buildtools/wafsamba/samba_abi.py:25: SyntaxWarning: invalid escape sequence \$ + sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}(\s0x[0-9a-f]+\s<\w+>)+$', r'\1', sig) +./buildtools/wafsamba/samba_abi.py:26: SyntaxWarning: invalid escape sequence \$ + sig = re.sub('^\$[0-9]+\s=\s(0x[0-9a-f]+)\s?(<\w+>)?$', r'\1', sig) +./buildtools/wafsamba/samba_abi.py:33: SyntaxWarning: invalid escape sequence \* + m = m.replace('*', '\*') +./buildtools/wafsamba/samba_abi.py:44: SyntaxWarning: invalid escape sequence \s + sig = re.sub(',\s\.\.\.', '', sig) +./buildtools/wafsamba/samba_headers.py:22: SyntaxWarning: invalid escape sequence \s + re_header = re.compile('^\s*#\s*include[ \t]*"([^"]+)"', re.I | re.M) +./buildtools/wafsamba/symbols.py:122: SyntaxWarning: invalid escape sequence \[ + re_sharedlib = re.compile(b'Shared library: \[(.*)\]') +./buildtools/wafsamba/symbols.py:124: SyntaxWarning: invalid escape sequence \[ + re_rpath = re.compile(b'Library (rpath|runpath): \[(.*)\]') +./buildtools/wafsamba/pkgconfig.py:12: SyntaxWarning: invalid escape sequence \w + a = re.split('(@\w+@)', s) +./buildtools/wafsamba/pkgconfig.py:17: SyntaxWarning: invalid escape sequence \w + if re.match('@\w+@', v): +./buildtools/wafsamba/configure_file.py:16: SyntaxWarning: invalid escape sequence \w + a = re.split('(@\w+@)', s) +./buildtools/wafsamba/configure_file.py:19: SyntaxWarning: invalid escape sequence \w + if re.match('@\w+@', v): +--- + buildtools/wafsamba/configure_file.py | 4 ++-- + buildtools/wafsamba/pkgconfig.py | 4 ++-- + buildtools/wafsamba/samba_abi.py | 12 ++++++------ + buildtools/wafsamba/samba_conftests.py | 2 +- + buildtools/wafsamba/samba_cross.py | 2 +- + buildtools/wafsamba/samba_headers.py | 2 +- + buildtools/wafsamba/samba_utils.py | 4 ++-- + buildtools/wafsamba/symbols.py | 4 ++-- + 8 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/buildtools/wafsamba/configure_file.py b/buildtools/wafsamba/configure_file.py +index 6ad43546249fba7b4c0a037035e8574e7a9d2753..98a58a4604513e3633317e73299c1c9280c250d2 100644 +--- a/buildtools/wafsamba/configure_file.py ++++ b/buildtools/wafsamba/configure_file.py +@@ -13,10 +13,10 @@ def subst_at_vars(task): + s = task.inputs[0].read() + + # split on the vars +- a = re.split('(@\w+@)', s) ++ a = re.split(r'(@\w+@)', s) + out = [] + for v in a: +- if re.match('@\w+@', v): ++ if re.match(r'@\w+@', v): + vname = v[1:-1] + if not vname in task.env and vname.upper() in task.env: + vname = vname.upper() +diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py +index b83d5f382a58352bb3318b594aa2b45fc02d87d5..b77bd618c8903789c7ba9e64a6972a4e080f1821 100644 +--- a/buildtools/wafsamba/pkgconfig.py ++++ b/buildtools/wafsamba/pkgconfig.py +@@ -9,12 +9,12 @@ def subst_at_vars(task): + + s = task.inputs[0].read() + # split on the vars +- a = re.split('(@\w+@)', s) ++ a = re.split(r'(@\w+@)', s) + out = [] + done_var = {} + back_sub = [ ('PREFIX', '${prefix}'), ('EXEC_PREFIX', '${exec_prefix}')] + for v in a: +- if re.match('@\w+@', v): ++ if re.match(r'@\w+@', v): + vname = v[1:-1] + if not vname in task.env and vname.upper() in task.env: + vname = vname.upper() +diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py +index 5e7686da3d68b1ebcd842b8a319a5997fa9cf600..761667fcfe1f3937be22c8261b45dcb3979ae4cd 100644 +--- a/buildtools/wafsamba/samba_abi.py ++++ b/buildtools/wafsamba/samba_abi.py +@@ -21,16 +21,16 @@ version_key = lambda x: list(map(int, x.split("."))) + def normalise_signature(sig): + '''normalise a signature from gdb''' + sig = sig.strip() +- sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}$', r'\1', sig) +- sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}(\s0x[0-9a-f]+\s<\w+>)+$', r'\1', sig) +- sig = re.sub('^\$[0-9]+\s=\s(0x[0-9a-f]+)\s?(<\w+>)?$', r'\1', sig) +- sig = re.sub('0x[0-9a-f]+', '0xXXXX', sig) ++ sig = re.sub(r'^\$[0-9]+\s=\s\{(.+)\}$', r'\1', sig) ++ sig = re.sub(r'^\$[0-9]+\s=\s\{(.+)\}(\s0x[0-9a-f]+\s<\w+>)+$', r'\1', sig) ++ sig = re.sub(r'^\$[0-9]+\s=\s(0x[0-9a-f]+)\s?(<\w+>)?$', r'\1', sig) ++ sig = re.sub(r'0x[0-9a-f]+', '0xXXXX', sig) + sig = re.sub('", ', r'\1"', sig) + + for t in abi_type_maps: + # we need to cope with non-word characters in mapped types + m = t +- m = m.replace('*', '\*') ++ m = m.replace('*', r'\*') + if m[-1].isalnum() or m[-1] == '_': + m += '\\b' + if m[0].isalnum() or m[0] == '_': +@@ -41,7 +41,7 @@ def normalise_signature(sig): + + def normalise_varargs(sig): + '''cope with older versions of gdb''' +- sig = re.sub(',\s\.\.\.', '', sig) ++ sig = re.sub(r',\s\.\.\.', '', sig) + return sig + + +diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py +index ef632ba903369e4211991f17a3b204bcd96c3a2f..63e50567860ff890b00b0ce6c7607c917b7329d1 100644 +--- a/buildtools/wafsamba/samba_conftests.py ++++ b/buildtools/wafsamba/samba_conftests.py +@@ -397,7 +397,7 @@ WriteMakefile( + + if section: + man = Utils.readf(os.path.join(bdir,'Makefile')) +- m = re.search('MAN%sEXT\s+=\s+(\w+)' % section, man) ++ m = re.search(r'MAN%sEXT\s+=\s+(\w+)' % section, man) + if not m: + conf.end_msg('not found', color='YELLOW') + return +diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py +index 8863c2c53e7d7dd9317c9233f0085ffd0eea6b2f..34793902fba884cf2d8358bf4315dc98027266b6 100644 +--- a/buildtools/wafsamba/samba_cross.py ++++ b/buildtools/wafsamba/samba_cross.py +@@ -77,7 +77,7 @@ def cross_answer(ca_file, msg): + f.close() + return (0, ans.strip("'")) + else: +- m = re.match('\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans) ++ m = re.match(r'\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans) + if m: + f.close() + return (int(m.group(1)), m.group(2)) +diff --git a/buildtools/wafsamba/samba_headers.py b/buildtools/wafsamba/samba_headers.py +index a268c011c5d8e406e0d763554c55668cfb5388bc..c8bee19010978a04460b0637fcc8fd484a699ea8 100644 +--- a/buildtools/wafsamba/samba_headers.py ++++ b/buildtools/wafsamba/samba_headers.py +@@ -19,7 +19,7 @@ def header_install_path(header, header_path): + return '' + + +-re_header = re.compile('^\s*#\s*include[ \t]*"([^"]+)"', re.I | re.M) ++re_header = re.compile(r'^\s*#\s*include[ \t]*"([^"]+)"', re.I | re.M) + + # a dictionary mapping source header paths to public header paths + header_map = {} +diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py +index ad97de1859ba24c4afd5106b4f9694b0dc855643..75c9794ec40f327ef8ccf9aa33fafd6ed6181e3b 100644 +--- a/buildtools/wafsamba/samba_utils.py ++++ b/buildtools/wafsamba/samba_utils.py +@@ -255,10 +255,10 @@ def TO_LIST(str, delimiter=None): + + def subst_vars_error(string, env): + '''substitute vars, throw an error if a variable is not defined''' +- lst = re.split('(\$\{\w+\})', string) ++ lst = re.split(r'(\$\{\w+\})', string) + out = [] + for v in lst: +- if re.match('\$\{\w+\}', v): ++ if re.match(r'\$\{\w+\}', v): + vname = v[2:-1] + if not vname in env: + raise KeyError("Failed to find variable %s in %s in env %s <%s>" % (vname, string, env.__class__, str(env))) +diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py +index 3eca3d46bd71cf0780b3c8e36a26b96bd3aa3b83..73e8ca8ce53ef5d956ac58e14a2403dd49f01109 100644 +--- a/buildtools/wafsamba/symbols.py ++++ b/buildtools/wafsamba/symbols.py +@@ -119,9 +119,9 @@ def find_ldd_path(bld, libname, binary): + + + # some regular expressions for parsing readelf output +-re_sharedlib = re.compile(b'Shared library: \[(.*)\]') ++re_sharedlib = re.compile(r'Shared library: \[(.*)\]') + # output from readelf could be `Library rpath` or `Libray runpath` +-re_rpath = re.compile(b'Library (rpath|runpath): \[(.*)\]') ++re_rpath = re.compile(r'Library (rpath|runpath): \[(.*)\]') + + def get_libs(bld, binname): + '''find the list of linked libraries for any binary or library +-- +2.23.0.rc2 + diff --git a/0002-ldb-Run-at-least-some-tests-on-32-bit-machines.patch b/0002-ldb-Run-at-least-some-tests-on-32-bit-machines.patch deleted file mode 100644 index d0803fc..0000000 --- a/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 -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 ---- - 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/0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch b/0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch deleted file mode 100644 index 4b6c91b..0000000 --- a/0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 87dfb0ce329447625050771fd83dae1841ece1b8 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Wed, 12 Jun 2019 13:38:17 +0200 -Subject: [PATCH] wafsamba: Fix few SyntaxWarnings caused by regular - expressions - -./buildtools/wafsamba/samba_utils.py:258: SyntaxWarning: invalid escape sequence \$ - lst = re.split('(\$\{\w+\})', string) -./buildtools/wafsamba/samba_utils.py:261: SyntaxWarning: invalid escape sequence \$ - if re.match('\$\{\w+\}', v): -./buildtools/wafsamba/samba_cross.py:80: SyntaxWarning: invalid escape sequence \( - m = re.match('\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans) -./buildtools/wafsamba/samba_conftests.py:400: SyntaxWarning: invalid escape sequence \s - m = re.search('MAN%sEXT\s+=\s+(\w+)' % section, man) -./buildtools/wafsamba/samba_abi.py:24: SyntaxWarning: invalid escape sequence \$ - sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}$', r'\1', sig) -./buildtools/wafsamba/samba_abi.py:25: SyntaxWarning: invalid escape sequence \$ - sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}(\s0x[0-9a-f]+\s<\w+>)+$', r'\1', sig) -./buildtools/wafsamba/samba_abi.py:26: SyntaxWarning: invalid escape sequence \$ - sig = re.sub('^\$[0-9]+\s=\s(0x[0-9a-f]+)\s?(<\w+>)?$', r'\1', sig) -./buildtools/wafsamba/samba_abi.py:33: SyntaxWarning: invalid escape sequence \* - m = m.replace('*', '\*') -./buildtools/wafsamba/samba_abi.py:44: SyntaxWarning: invalid escape sequence \s - sig = re.sub(',\s\.\.\.', '', sig) -./buildtools/wafsamba/samba_headers.py:22: SyntaxWarning: invalid escape sequence \s - re_header = re.compile('^\s*#\s*include[ \t]*"([^"]+)"', re.I | re.M) -./buildtools/wafsamba/symbols.py:122: SyntaxWarning: invalid escape sequence \[ - re_sharedlib = re.compile(b'Shared library: \[(.*)\]') -./buildtools/wafsamba/symbols.py:124: SyntaxWarning: invalid escape sequence \[ - re_rpath = re.compile(b'Library (rpath|runpath): \[(.*)\]') -./buildtools/wafsamba/pkgconfig.py:12: SyntaxWarning: invalid escape sequence \w - a = re.split('(@\w+@)', s) -./buildtools/wafsamba/pkgconfig.py:17: SyntaxWarning: invalid escape sequence \w - if re.match('@\w+@', v): -./buildtools/wafsamba/configure_file.py:16: SyntaxWarning: invalid escape sequence \w - a = re.split('(@\w+@)', s) -./buildtools/wafsamba/configure_file.py:19: SyntaxWarning: invalid escape sequence \w - if re.match('@\w+@', v): ---- - buildtools/wafsamba/configure_file.py | 4 ++-- - buildtools/wafsamba/pkgconfig.py | 4 ++-- - buildtools/wafsamba/samba_abi.py | 12 ++++++------ - buildtools/wafsamba/samba_conftests.py | 2 +- - buildtools/wafsamba/samba_cross.py | 2 +- - buildtools/wafsamba/samba_headers.py | 2 +- - buildtools/wafsamba/samba_utils.py | 4 ++-- - buildtools/wafsamba/symbols.py | 4 ++-- - 8 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/buildtools/wafsamba/configure_file.py b/buildtools/wafsamba/configure_file.py -index 6ad43546249fba7b4c0a037035e8574e7a9d2753..98a58a4604513e3633317e73299c1c9280c250d2 100644 ---- a/buildtools/wafsamba/configure_file.py -+++ b/buildtools/wafsamba/configure_file.py -@@ -13,10 +13,10 @@ def subst_at_vars(task): - s = task.inputs[0].read() - - # split on the vars -- a = re.split('(@\w+@)', s) -+ a = re.split(r'(@\w+@)', s) - out = [] - for v in a: -- if re.match('@\w+@', v): -+ if re.match(r'@\w+@', v): - vname = v[1:-1] - if not vname in task.env and vname.upper() in task.env: - vname = vname.upper() -diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py -index b83d5f382a58352bb3318b594aa2b45fc02d87d5..b77bd618c8903789c7ba9e64a6972a4e080f1821 100644 ---- a/buildtools/wafsamba/pkgconfig.py -+++ b/buildtools/wafsamba/pkgconfig.py -@@ -9,12 +9,12 @@ def subst_at_vars(task): - - s = task.inputs[0].read() - # split on the vars -- a = re.split('(@\w+@)', s) -+ a = re.split(r'(@\w+@)', s) - out = [] - done_var = {} - back_sub = [ ('PREFIX', '${prefix}'), ('EXEC_PREFIX', '${exec_prefix}')] - for v in a: -- if re.match('@\w+@', v): -+ if re.match(r'@\w+@', v): - vname = v[1:-1] - if not vname in task.env and vname.upper() in task.env: - vname = vname.upper() -diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py -index 5e7686da3d68b1ebcd842b8a319a5997fa9cf600..761667fcfe1f3937be22c8261b45dcb3979ae4cd 100644 ---- a/buildtools/wafsamba/samba_abi.py -+++ b/buildtools/wafsamba/samba_abi.py -@@ -21,16 +21,16 @@ version_key = lambda x: list(map(int, x.split("."))) - def normalise_signature(sig): - '''normalise a signature from gdb''' - sig = sig.strip() -- sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}$', r'\1', sig) -- sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}(\s0x[0-9a-f]+\s<\w+>)+$', r'\1', sig) -- sig = re.sub('^\$[0-9]+\s=\s(0x[0-9a-f]+)\s?(<\w+>)?$', r'\1', sig) -- sig = re.sub('0x[0-9a-f]+', '0xXXXX', sig) -+ sig = re.sub(r'^\$[0-9]+\s=\s\{(.+)\}$', r'\1', sig) -+ sig = re.sub(r'^\$[0-9]+\s=\s\{(.+)\}(\s0x[0-9a-f]+\s<\w+>)+$', r'\1', sig) -+ sig = re.sub(r'^\$[0-9]+\s=\s(0x[0-9a-f]+)\s?(<\w+>)?$', r'\1', sig) -+ sig = re.sub(r'0x[0-9a-f]+', '0xXXXX', sig) - sig = re.sub('", ', r'\1"', sig) - - for t in abi_type_maps: - # we need to cope with non-word characters in mapped types - m = t -- m = m.replace('*', '\*') -+ m = m.replace('*', r'\*') - if m[-1].isalnum() or m[-1] == '_': - m += '\\b' - if m[0].isalnum() or m[0] == '_': -@@ -41,7 +41,7 @@ def normalise_signature(sig): - - def normalise_varargs(sig): - '''cope with older versions of gdb''' -- sig = re.sub(',\s\.\.\.', '', sig) -+ sig = re.sub(r',\s\.\.\.', '', sig) - return sig - - -diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py -index ef632ba903369e4211991f17a3b204bcd96c3a2f..63e50567860ff890b00b0ce6c7607c917b7329d1 100644 ---- a/buildtools/wafsamba/samba_conftests.py -+++ b/buildtools/wafsamba/samba_conftests.py -@@ -397,7 +397,7 @@ WriteMakefile( - - if section: - man = Utils.readf(os.path.join(bdir,'Makefile')) -- m = re.search('MAN%sEXT\s+=\s+(\w+)' % section, man) -+ m = re.search(r'MAN%sEXT\s+=\s+(\w+)' % section, man) - if not m: - conf.end_msg('not found', color='YELLOW') - return -diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py -index 8863c2c53e7d7dd9317c9233f0085ffd0eea6b2f..34793902fba884cf2d8358bf4315dc98027266b6 100644 ---- a/buildtools/wafsamba/samba_cross.py -+++ b/buildtools/wafsamba/samba_cross.py -@@ -77,7 +77,7 @@ def cross_answer(ca_file, msg): - f.close() - return (0, ans.strip("'")) - else: -- m = re.match('\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans) -+ m = re.match(r'\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans) - if m: - f.close() - return (int(m.group(1)), m.group(2)) -diff --git a/buildtools/wafsamba/samba_headers.py b/buildtools/wafsamba/samba_headers.py -index a268c011c5d8e406e0d763554c55668cfb5388bc..c8bee19010978a04460b0637fcc8fd484a699ea8 100644 ---- a/buildtools/wafsamba/samba_headers.py -+++ b/buildtools/wafsamba/samba_headers.py -@@ -19,7 +19,7 @@ def header_install_path(header, header_path): - return '' - - --re_header = re.compile('^\s*#\s*include[ \t]*"([^"]+)"', re.I | re.M) -+re_header = re.compile(r'^\s*#\s*include[ \t]*"([^"]+)"', re.I | re.M) - - # a dictionary mapping source header paths to public header paths - header_map = {} -diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py -index ad97de1859ba24c4afd5106b4f9694b0dc855643..75c9794ec40f327ef8ccf9aa33fafd6ed6181e3b 100644 ---- a/buildtools/wafsamba/samba_utils.py -+++ b/buildtools/wafsamba/samba_utils.py -@@ -255,10 +255,10 @@ def TO_LIST(str, delimiter=None): - - def subst_vars_error(string, env): - '''substitute vars, throw an error if a variable is not defined''' -- lst = re.split('(\$\{\w+\})', string) -+ lst = re.split(r'(\$\{\w+\})', string) - out = [] - for v in lst: -- if re.match('\$\{\w+\}', v): -+ if re.match(r'\$\{\w+\}', v): - vname = v[2:-1] - if not vname in env: - raise KeyError("Failed to find variable %s in %s in env %s <%s>" % (vname, string, env.__class__, str(env))) -diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py -index 3eca3d46bd71cf0780b3c8e36a26b96bd3aa3b83..73e8ca8ce53ef5d956ac58e14a2403dd49f01109 100644 ---- a/buildtools/wafsamba/symbols.py -+++ b/buildtools/wafsamba/symbols.py -@@ -119,8 +119,8 @@ def find_ldd_path(bld, libname, binary): - - - # some regular expressions for parsing readelf output --re_sharedlib = re.compile(b'Shared library: \[(.*)\]') --re_rpath = re.compile(b'Library rpath: \[(.*)\]') -+re_sharedlib = re.compile(r'Shared library: \[(.*)\]') -+re_rpath = re.compile(r'Library rpath: \[(.*)\]') - - def get_libs(bld, binname): - '''find the list of linked libraries for any binary or library --- -2.22.0 - diff --git a/libldb.spec b/libldb.spec index 40881fa..425abef 100644 --- a/libldb.spec +++ b/libldb.spec @@ -9,13 +9,13 @@ %global with_python3 1 %endif -%global talloc_version 2.1.16 -%global tdb_version 1.3.18 -%global tevent_version 0.9.39 +%global talloc_version 2.2.0 +%global tdb_version 1.4.1 +%global tevent_version 0.10.0 Name: libldb -Version: 1.5.5 -Release: 2%{?dist} +Version: 2.0.5 +Release: 1%{?dist} Summary: A schema-less, ldap like, API and database Requires: libtalloc%{?_isa} >= %{talloc_version} Requires: libtdb%{?_isa} >= %{tdb_version} @@ -25,9 +25,7 @@ URL: http://ldb.samba.org/ Source: http://samba.org/ftp/ldb/ldb-%{version}.tar.gz # Patches -Patch0001: 0002-ldb-Run-at-least-some-tests-on-32-bit-machines.patch -Patch0002: waflib-python38-pyembed.diff -Patch0004: 0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch +Patch0001: 0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch BuildRequires: gcc BuildRequires: libtalloc-devel >= %{talloc_version} @@ -189,7 +187,7 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_* %if 0%{?with_python3} %files -n python3-ldb %{python3_sitearch}/ldb.cpython-*.so -%{_libdir}/libpyldb-util.cpython-*.so.1* +%{_libdir}/libpyldb-util.cpython-*.so.2* %{python3_sitearch}/_ldb_text.py %{python3_sitearch}/__pycache__/_ldb_text.cpython-*.py* @@ -201,6 +199,10 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_* %endif %changelog +* Mon Aug 26 2019 Guenther Deschner - 2.0.5-1 +- rhbz#1683147 - libldb-2.0.5 is available +- rhbz#1737644 - libldb, libtalloc, libtevent, libtdb: Remove Python 2 subpackages from Fedora 31+ + * Thu Jul 25 2019 Fedora Release Engineering - 1.5.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index fa4e0d5..0bd6603 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldb-1.5.5.tar.gz) = 562e08b3d6564d08fed80dc43ca299c38fbd958dbe27ed1400e5eb5c3df0f4c7b7eaf502b13eec5544b168f26c5e6537615f65e28dcaeb6473d2ff3c3c7a4e4b +SHA512 (ldb-2.0.5.tar.gz) = de9325f8bdd9ac782b3f8633444780f4aaa030e2c74c643220e845d9a779f8c8e174f0b9d9d8668de028cb832eb9d81965cb8e4471d90f9344dc48877a3abbe8 diff --git a/waflib-python38-pyembed.diff b/waflib-python38-pyembed.diff deleted file mode 100644 index 04e001b..0000000 --- a/waflib-python38-pyembed.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py -index 52a05c6..79836bb 100644 ---- a/third_party/waf/waflib/Tools/python.py -+++ b/third_party/waf/waflib/Tools/python.py -@@ -338,7 +338,11 @@ def check_python_headers(conf, features='pyembed pyext'): - - if 'pyembed' in features: - for flags in all_flags: -- conf.check_cfg(msg='Asking python-config for pyembed %r flags' % ' '.join(flags), path=env.PYTHON_CONFIG, package='', uselib_store='PYEMBED', args=flags) -+ embedflags = flags + ['--embed'] -+ try: -+ conf.check_cfg(msg='Asking python-config for pyembed %r flags' % ' '.join(embedflags), path=env.PYTHON_CONFIG, package='', uselib_store='PYEMBED', args=embedflags) -+ except conf.errors.ConfigurationError: -+ conf.check_cfg(msg='Asking python-config for pyembed %r flags' % ' '.join(flags), path=env.PYTHON_CONFIG, package='', uselib_store='PYEMBED', args=flags) - - try: - conf.test_pyembed(xx)