Date: Friday, November 1, 2019 @ 13:58:05 Author: felixonmars Revision: 366380
archrelease: copy trunk to staging-x86_64 Added: talloc/repos/staging-x86_64/PKGBUILD (from rev 366379, talloc/trunk/PKGBUILD) talloc/repos/staging-x86_64/wafsamba-use-native-waf-timer.patch (from rev 366379, talloc/trunk/wafsamba-use-native-waf-timer.patch) Deleted: talloc/repos/staging-x86_64/PKGBUILD talloc/repos/staging-x86_64/wafsamba-use-native-waf-timer.patch -------------------------------------+ PKGBUILD | 104 +++++++-------- wafsamba-use-native-waf-timer.patch | 228 +++++++++++++++++----------------- 2 files changed, 166 insertions(+), 166 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-11-01 13:57:49 UTC (rev 366379) +++ PKGBUILD 2019-11-01 13:58:05 UTC (rev 366380) @@ -1,52 +0,0 @@ -# Maintainer: -# Contributor: Tobias Powalowski <tp...@archlinux.org> - -pkgname=talloc -pkgver=2.2.0 -pkgrel=2 -pkgdesc="Hierarchical pool based memory allocator with destructors" -arch=('x86_64') -license=('GPL3') -url="https://talloc.samba.org/" -depends=('glibc') -makedepends=('python' 'docbook-xsl') -optdepends=('python: for python bindings') -source=(https://www.samba.org/ftp/talloc/talloc-$pkgver.tar.{gz,asc} - samba-update-waf-for-py38.patch::https://gitlab.com/samba-team/samba/commit/aabdcc9151.patch - wafsamba-use-native-waf-timer.patch) -sha1sums=('d806e2e4e9b973e8ab6521d1dd20a03abae32c99' - 'SKIP' - 'ab8f8bd63c722e2e3b709e89fa3c1e222daac988' - '2e688ce37d2f5027ba6e4eb52503353d9707fdae') -validpgpkeys=(9147A339719518EE9011BCB54793916113084025) # samba-b...@samba.org - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # https://bugzilla.samba.org/show_bug.cgi?id=13960 - patch -Np1 -i ../samba-update-waf-for-py38.patch - - # https://bugzilla.samba.org/show_bug.cgi?id=13998 - patch -Np1 -i ../wafsamba-use-native-waf-timer.patch -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc/samba \ - --localstatedir=/var \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --enable-talloc-compat1 - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: talloc/repos/staging-x86_64/PKGBUILD (from rev 366379, talloc/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-11-01 13:58:05 UTC (rev 366380) @@ -0,0 +1,52 @@ +# Maintainer: +# Contributor: Tobias Powalowski <tp...@archlinux.org> + +pkgname=talloc +pkgver=2.2.0 +pkgrel=3 +pkgdesc="Hierarchical pool based memory allocator with destructors" +arch=('x86_64') +license=('GPL3') +url="https://talloc.samba.org/" +depends=('glibc') +makedepends=('python' 'docbook-xsl') +optdepends=('python: for python bindings') +source=(https://www.samba.org/ftp/talloc/talloc-$pkgver.tar.{gz,asc} + samba-update-waf-for-py38.patch::https://gitlab.com/samba-team/samba/commit/aabdcc9151.patch + wafsamba-use-native-waf-timer.patch) +sha1sums=('d806e2e4e9b973e8ab6521d1dd20a03abae32c99' + 'SKIP' + 'ab8f8bd63c722e2e3b709e89fa3c1e222daac988' + '2e688ce37d2f5027ba6e4eb52503353d9707fdae') +validpgpkeys=(9147A339719518EE9011BCB54793916113084025) # samba-b...@samba.org + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # https://bugzilla.samba.org/show_bug.cgi?id=13960 + patch -Np1 -i ../samba-update-waf-for-py38.patch + + # https://bugzilla.samba.org/show_bug.cgi?id=13998 + patch -Np1 -i ../wafsamba-use-native-waf-timer.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc/samba \ + --localstatedir=/var \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --enable-talloc-compat1 + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: wafsamba-use-native-waf-timer.patch =================================================================== --- wafsamba-use-native-waf-timer.patch 2019-11-01 13:57:49 UTC (rev 366379) +++ wafsamba-use-native-waf-timer.patch 2019-11-01 13:58:05 UTC (rev 366380) @@ -1,114 +0,0 @@ -From dc27ff44de578b0b429a24b0e42e243d8bf481a8 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik <lsleb...@fedoraproject.org> -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 - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=13998 - -Signed-off-by: Lukas Slebodnik <lsleb...@fedoraproject.org> -Reviewed-by: Andreas Schneider <a...@samba.org> -Reviewed-by: Alexander Bokovoy <a...@samba.org> ---- - 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 f8c38809bd2..03c37079a8c 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 - Copied: talloc/repos/staging-x86_64/wafsamba-use-native-waf-timer.patch (from rev 366379, talloc/trunk/wafsamba-use-native-waf-timer.patch) =================================================================== --- wafsamba-use-native-waf-timer.patch (rev 0) +++ wafsamba-use-native-waf-timer.patch 2019-11-01 13:58:05 UTC (rev 366380) @@ -0,0 +1,114 @@ +From dc27ff44de578b0b429a24b0e42e243d8bf481a8 Mon Sep 17 00:00:00 2001 +From: Lukas Slebodnik <lsleb...@fedoraproject.org> +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 + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=13998 + +Signed-off-by: Lukas Slebodnik <lsleb...@fedoraproject.org> +Reviewed-by: Andreas Schneider <a...@samba.org> +Reviewed-by: Alexander Bokovoy <a...@samba.org> +--- + 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 f8c38809bd2..03c37079a8c 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 +