rpm/talloc
SHA256
1
0
Fork 0
forked from pool/talloc
Code Pull Requests Activity

Accepting request 751143 from home:mcepl:branches:network:samba:STABLE

Browse Source 
- Upgrade to 2.3.0.
- Patches waf_upgrade.patch and waf_use_native_waf_timer.patch
  are no needed anymore. They are subsumed by the upstream
  tarball.

OBS-URL: https://build.opensuse.org/request/show/751143
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/talloc?expand=0&rev=115
This commit is contained in:
Noel Power 2020-01-03 14:02:03 +00:00 committed by Git OBS Bridge
parent d4f189d68a
commit e380cfc6d1
10 changed files with 31 additions and 3440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
talloc-2.2.0.tar.asc
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQFJBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAlyTY9cVHHNhbWJhLWJ1
Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAlMyMIAJ0m0i1iA6uQQZV9XFR00AWNHeyU
dRdy3MbC1uUo1j/y4cMIKbdLJSzPcGIDE+dw90XdrVwpuSwFuEO4p3aWToRV/RVn
tUb/zDLUv05qFfv72xnQPIdoCq8iCRkne0T/igRqb/2ZwqgsNgXjHknfGBId7Yi4
vC60bEwg4nypKQagnRH8IlDzHhD04S5e9qykZZdMyGp5PADBWI8uwRELhmneCX0q
31KFGl3cjJNgRjA8RDkTGXiU9CyKRKfI/HXHL9FfCtSMSmYLgG9hck7xcWlHCk/k
hfs7Sy50wMb54BQBJDVBSdJ2PpA10y1rO8nqdRdo0WBrQSHH76nSHxRGgD0=
=grsl
-----END PGP SIGNATURE-----

3
talloc-2.2.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c6f6a45ef96b3fd0b28942673a68d0c6af5dcca9d676a2e4d57ce7e86c22ebc
size 633467

11
talloc-2.3.0.tar.asc Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQFJBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAl1vd6YVHHNhbWJhLWJ1
Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAlOb4H/RfYzST1jGfeMdATnAIci9UI5RZ+
1p4TAejyr4yQ+svHyh/PWHieuORZ86fRgJv9OQqRvsyn+dt5wDDp/wikeQ/bTTI+
QspzSIDFzO4v9iwx/rEZQddjTBjVLjO9ltH01CPP7Wxxps5Ym/4xMaXwzo+FhNsh
0ypfV9oEAeL3k1A/znwUwX33UpxUJoYrJoodj53aF8m+e5T7sfZMVnLAfimEtC3T
jNhSuyViMc0c/CqgcckLCCvDrQh38bDO7UOEaOQx8LPc9OvFTg765p0WDeAUx4HG
8gLxGtPYEd0j/Z/EYpHPRcOFvbppZ/kXXeIUpEiM/IGjcLheqOi04phBWQA=
=IdXA
-----END PGP SIGNATURE-----

3
talloc-2.3.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75d5bcb34482545a82ffb06da8f6c797f963a0da450d0830c669267b14992fc6
size 642364

8
talloc-man.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package talloc-man # spec file for package talloc-man
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -34,8 +34,8 @@ BuildRequires: python3-base
BuildRequires: python3-devel BuildRequires: python3-devel
#!BuildIgnore: python #!BuildIgnore: python
%endif # build_man %endif # build_man
Url: http://talloc.samba.org/ URL: http://talloc.samba.org/
Version: 2.2.0 Version: 2.3.0
Release: 0 Release: 0
Summary: Samba talloc Library Summary: Samba talloc Library
License: LGPL-3.0-or-later License: LGPL-3.0-or-later
@ -45,8 +45,6 @@ Source1: https://download.samba.org/pub/talloc/talloc-%{version}.tar.asc
Source4: baselibs.conf Source4: baselibs.conf
Patch0: talloc-python3.5-fix-soabi_name.patch Patch0: talloc-python3.5-fix-soabi_name.patch
# Originally from https://git.samba.org/samba.git/?p=samba.git;a=patch;h=aabdcc91513e242c4f191e1bbbb70c890416d213 # Originally from https://git.samba.org/samba.git/?p=samba.git;a=patch;h=aabdcc91513e242c4f191e1bbbb70c890416d213
Patch1: waf_upgrade.patch
Patch2: waf_use_native_waf_timer.patch
Source50: talloc.keyring Source50: talloc.keyring
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build

6
talloc-python3.5-fix-soabi_name.patch
View File

@ -1,6 +1,6 @@
--- a/buildtools/wafsamba/wafsamba.py 2015-11-06 08:28:25.000000000 -0500 --- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py 2016-03-07 14:28:58.412124485 -0500 +++ b/buildtools/wafsamba/wafsamba.py
@@ -115,7 +115,7 @@ @@ -108,7 +108,7 @@ def SAMBA_LIBRARY(bld, libname, source,
ldflags='', ldflags='',
external_library=False, external_library=False,
realname=None, realname=None,

8
talloc.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Nov 26 17:24:56 CET 2019 - Matej Cepl <mcepl@suse.com>
- Upgrade to 2.3.0.
- Patches waf_upgrade.patch and waf_use_native_waf_timer.patch
are no needed anymore. They are subsumed by the upstream
tarball.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 21 14:36:01 CEST 2019 - Matej Cepl <mcepl@suse.com> Mon Oct 21 14:36:01 CEST 2019 - Matej Cepl <mcepl@suse.com>

8
talloc.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package talloc-man # spec file for package talloc-man
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -34,8 +34,8 @@ BuildRequires: python3-base
BuildRequires: python3-devel BuildRequires: python3-devel
#!BuildIgnore: python #!BuildIgnore: python
%endif # build_man %endif # build_man
Url: http://talloc.samba.org/ URL: http://talloc.samba.org/
Version: 2.2.0 Version: 2.3.0
Release: 0 Release: 0
Summary: Samba talloc Library Summary: Samba talloc Library
License: LGPL-3.0-or-later License: LGPL-3.0-or-later
@ -44,8 +44,6 @@ Source: https://download.samba.org/pub/talloc/talloc-%{version}.tar.gz
Source1: https://download.samba.org/pub/talloc/talloc-%{version}.tar.asc Source1: https://download.samba.org/pub/talloc/talloc-%{version}.tar.asc
Source4: baselibs.conf Source4: baselibs.conf
Patch0: talloc-python3.5-fix-soabi_name.patch Patch0: talloc-python3.5-fix-soabi_name.patch
Patch1: waf_upgrade.patch
Patch2: waf_use_native_waf_timer.patch
Source50: talloc.keyring Source50: talloc.keyring
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build

3299
waf_upgrade.patch
View File

File diff suppressed because it is too large Load Diff

114
waf_use_native_waf_timer.patch
View File

@ -1,114 +0,0 @@
From dc27ff44de578b0b429a24b0e42e243d8bf481a8 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@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 <lslebodn@fedoraproject.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@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.23.0