diff --git a/.gitignore b/.gitignore index 2a769af..153ca47 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /talloc-2.1.15.tar.gz /talloc-2.1.16.tar.gz /talloc-2.2.0.tar.gz +/talloc-2.3.0.tar.gz diff --git a/0002-wafsamba-Use-native-waf-timer.patch b/0002-wafsamba-Use-native-waf-timer.patch deleted file mode 100644 index 7918acb..0000000 --- a/0002-wafsamba-Use-native-waf-timer.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 8970020e20689db9a93bfcc33e71c312d1488309 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Wed, 12 Jun 2019 12:27:04 +0200 -Subject: [PATCH] wafsamba: Use native waf timer - - __main__:1: DeprecationWarning: time.clock has been deprecated in Python 3.3 - and will be removed from Python 3.8: use time.perf_counter - or time.process_time instead - -Signed-off-by: Lukas Slebodnik ---- - buildtools/wafsamba/samba_deps.py | 25 ++++++++++++------------- - 1 file changed, 12 insertions(+), 13 deletions(-) - -diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py -index f8c38809bd2296288374cd66788cdd8fdb2c7538..03c37079a8c435628e058a6d00c0f942a06f3bd9 100644 ---- a/buildtools/wafsamba/samba_deps.py -+++ b/buildtools/wafsamba/samba_deps.py -@@ -1,6 +1,6 @@ - # Samba automatic dependency handling and project rules - --import os, sys, re, time -+import os, sys, re - - from waflib import Build, Options, Logs, Utils, Errors - from waflib.Logs import debug -@@ -1102,8 +1102,7 @@ def check_project_rules(bld): - if not force_project_rules and load_samba_deps(bld, tgt_list): - return - -- global tstart -- tstart = time.clock() -+ timer = Utils.Timer() - - bld.new_rules = True - Logs.info("Checking project rules ...") -@@ -1112,26 +1111,26 @@ def check_project_rules(bld): - - expand_subsystem_deps(bld) - -- debug("deps: expand_subsystem_deps: %f" % (time.clock() - tstart)) -+ debug("deps: expand_subsystem_deps: %s" % str(timer)) - - replace_grouping_libraries(bld, tgt_list) - -- debug("deps: replace_grouping_libraries: %f" % (time.clock() - tstart)) -+ debug("deps: replace_grouping_libraries: %s" % str(timer)) - - build_direct_deps(bld, tgt_list) - -- debug("deps: build_direct_deps: %f" % (time.clock() - tstart)) -+ debug("deps: build_direct_deps: %s" % str(timer)) - - break_dependency_loops(bld, tgt_list) - -- debug("deps: break_dependency_loops: %f" % (time.clock() - tstart)) -+ debug("deps: break_dependency_loops: %s" % str(timer)) - - if Options.options.SHOWDEPS: - show_dependencies(bld, Options.options.SHOWDEPS, set()) - - calculate_final_deps(bld, tgt_list, loops) - -- debug("deps: calculate_final_deps: %f" % (time.clock() - tstart)) -+ debug("deps: calculate_final_deps: %s" % str(timer)) - - if Options.options.SHOW_DUPLICATES: - show_object_duplicates(bld, tgt_list) -@@ -1140,7 +1139,7 @@ def check_project_rules(bld): - for f in [ build_dependencies, build_includes, add_init_functions ]: - debug('deps: project rules checking %s', f) - for t in tgt_list: f(t) -- debug("deps: %s: %f" % (f, time.clock() - tstart)) -+ debug("deps: %s: %s" % (f, str(timer))) - - debug('deps: project rules stage1 completed') - -@@ -1148,17 +1147,17 @@ def check_project_rules(bld): - Logs.error("Duplicate sources present - aborting") - sys.exit(1) - -- debug("deps: check_duplicate_sources: %f" % (time.clock() - tstart)) -+ debug("deps: check_duplicate_sources: %s" % str(timer)) - - if not bld.check_group_ordering(tgt_list): - Logs.error("Bad group ordering - aborting") - sys.exit(1) - -- debug("deps: check_group_ordering: %f" % (time.clock() - tstart)) -+ debug("deps: check_group_ordering: %s" % str(timer)) - - show_final_deps(bld, tgt_list) - -- debug("deps: show_final_deps: %f" % (time.clock() - tstart)) -+ debug("deps: show_final_deps: %s" % str(timer)) - - debug('deps: project rules checking completed - %u targets checked', - len(tgt_list)) -@@ -1166,7 +1165,7 @@ def check_project_rules(bld): - if not bld.is_install: - save_samba_deps(bld, tgt_list) - -- debug("deps: save_samba_deps: %f" % (time.clock() - tstart)) -+ debug("deps: save_samba_deps: %s" % str(timer)) - - Logs.info("Project rules pass") - --- -2.22.0 - diff --git a/libtalloc.spec b/libtalloc.spec index cc1e1dc..e6716c4 100644 --- a/libtalloc.spec +++ b/libtalloc.spec @@ -3,7 +3,7 @@ %endif Name: libtalloc -Version: 2.2.0 +Version: 2.3.0 Release: 1%{?dist} Summary: The talloc library License: LGPLv3+ @@ -11,10 +11,8 @@ URL: https://talloc.samba.org/ Source: https://www.samba.org/ftp/talloc/talloc-%{version}.tar.gz # Patches -Patch0001: waflib-python38-pyembed.diff -Patch0002: 0002-wafsamba-Use-native-waf-timer.patch -Patch0003: 0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch -Patch0004: talloc-test-leak.patches +Patch0001: 0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch +Patch0002: talloc-test-leak.patches BuildRequires: gcc BuildRequires: libxslt @@ -109,6 +107,9 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir} %endif %changelog +* Wed Sep 11 2019 Lukas Slebodnik - 2.3.0-1 +- rhbz#1748815 - libtalloc-2.3.0 is available + * Mon Aug 26 2019 Lukas Slebodnik - 2.2.0-1 - rhbz#1691297 - libtalloc-2.2.0 is available - rhbz#1737644 - libldb, libtalloc, libtevent, libtdb: Remove Python 2 subpackages from Fedora 31+ diff --git a/sources b/sources index c00ffe5..f0c05f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (talloc-2.2.0.tar.gz) = e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388 +SHA512 (talloc-2.3.0.tar.gz) = f0020d83520ea24711040c44600180fabae7b0e0668a961a66f5d4f77d89b09d799ddadf781ee2d044ad059b2d6a2e5232068fd77b300a8366592c0ce2289837 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)