Accepting request 235284 from network:samba:STABLE

- Update to version 1.3.0.
  + add TDB_MUTEX_LOCKING support
  + consolidate tdb allocation code - re-use dead records at hash top.
  + don't alter errno on success of tdb_open_ex()
  + introduce tdb->hdr_ofs
  + introduce TDB_SUPPORTED_FEATURE_FLAGS
  + return ENOSYS if the tdb was created with spinlocks.
  + use asprintf() to simplify tdb_summary()
  + test: add a "skip()" macro.
     add marklock deadlock test
     add mutex related tests
     add PING command to external-agent.c
     add shutdown_agent() helper function
     add UNMAP command to external-agent.c
     always call fflush() after [f]printf() in tap-interface.h
     avoid const warnings by using 'discard_const_p(uint8_t,' instead of
	   '(void *)'
     correctly use stderr, not stdout, in fail()
     remove "\n" in diag() arguments
  + tools: add -l option to tdbbackup
     add -l option to tdbtool
     add -m option to tdbtorture
     Allow tdbtool to r/o open mutexed tdbs
     avoid const warnings in tdbdump.c
     explicitly use TDB_NOLOCK in tdbdump
  + tdb_wrap: Remove tdb_wrap_open_ again
  + wscript: maintain a global list of unit tests
- Include stdbool.h in tdb.h; (bso#10625).
  + include_stdbool_bso10625.patch

- Don't require pkg-config from the libtdb package.

OBS-URL: https://build.opensuse.org/request/show/235284
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tdb?expand=0&rev=15
This commit is contained in:
Stephan Kulow 2014-05-26 12:40:12 +00:00 committed by Git OBS Bridge
commit 7418571c96
9 changed files with 84 additions and 22 deletions

View File

@ -7,7 +7,7 @@ Index: tdb-1.2.12/wscript
===================================================================
--- tdb-1.2.12.orig/wscript
+++ tdb-1.2.12/wscript
@@ -94,20 +94,27 @@ def build(bld):
@@ -149,20 +149,27 @@ def build(bld):
bld.SAMBA_BINARY('tdbrestore',
'tools/tdbrestore.c',

View File

@ -5,7 +5,7 @@ Index: tdb-1.2.11/wscript
===================================================================
--- tdb-1.2.11.orig/wscript
+++ tdb-1.2.11/wscript
@@ -196,8 +196,9 @@ def testonly(ctx):
@@ -213,8 +213,9 @@ def testonly(ctx):
if ret != 0:
print("%s failed:" % f)
samba_utils.RUN_COMMAND("cat " + os.path.join(testdir, 'test-output'))

View File

@ -0,0 +1,27 @@
From 4e14a437963ba54987cd58b4e0705d9a6d8aea6f Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 23 May 2014 10:08:14 -0700
Subject: [PATCH] tdb/include: include stdbool.h in tdb.h
Commit db5bda56bf08 (tdb: add TDB_MUTEX_LOCKING support) adds a bool, but does
not include stdbool.h. This causes any build including tdb.h to fail, at least
for me with GCC 4.9.0.
---
lib/tdb/include/tdb.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h
index 5ea5e60..03e429c 100644
--- a/lib/tdb/include/tdb.h
+++ b/lib/tdb/include/tdb.h
@@ -31,6 +31,7 @@ extern "C" {
#endif
#include <signal.h>
+#include <stdbool.h>
/**
* @defgroup tdb The tdb API
--
1.9.3

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQEcBAABAgAGBQJTKqyuAAoJEEeTkWETCEAlOVIIAJB0EOp8QCYLMfOvStWAU4Y8
pnENkWN9xWYk0a/Mb9iSM4tU4laPM4teWKe0qM57PmKiiIcExm9r+LmtRQe2tKNW
L1E/XxPwCyG0jEJs+VyvHiIbpHTIVRycUWORr01FKLmAYGKZ5UP8LYTvWjS/UWT6
rS++eSBZ1bpIsWBCUQ5QVN2hpL9jclwYGwNjZf3Sv3GIfzGmHtraBZ0f2eJAFio1
+JrzTAVsQ+lBvolflw0nHiMkVB73pbd9QHH0SSBbeAkfZ7JwJ8s1eO9cAfsMZG7s
9KZa42v2xkCcjpaIX8gMZyUt1ZcUASTlPp8IhQWSImKu53m5bbFaHad59traq1Y=
=pudk
-----END PGP SIGNATURE-----

View File

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

11
tdb-1.3.0.tar.asc Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQEcBAABAgAGBQJTfnrDAAoJEEeTkWETCEAlxLgH/06ZPQJZimsMW/9lXl+ycq0N
8AWrO+ZvudffAn5y5npZvzNv67wq9n3ActPFsaHXoc3mZk1x7qc2DdGqh+a4p8ri
Mt/iajOF0U/5fZ9qy707KxYtYg0W0Cb4eDhhhMHCUshvktKk99+mT2IQB3uDLeGR
3v1pO4UyiZ1tOD5jfDjWUDgXRp1jQfJUm4pgYmN2r1tihVGANWkwJaQtsf7fvlfO
F44J3J883g7yTsrR85VeILWYySvqBe2420Y2O1OJVeW+Ij55dPhfkyPrR1AuuDNE
lcUsDEOOJ+VndDmFTHU/LklM62IAND4lNcrdeFPooWNv3uidJO2zX6STRxWGiqE=
=wfTZ
-----END PGP SIGNATURE-----

3
tdb-1.3.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04bee48d405ab7815810575a6e0cb364cc0eea6187b54b18c84e9c18a768ba20
size 479096

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Fri May 23 20:48:25 UTC 2014 - lmuelle@suse.com
- Update to version 1.3.0.
+ add TDB_MUTEX_LOCKING support
+ consolidate tdb allocation code - re-use dead records at hash top.
+ don't alter errno on success of tdb_open_ex()
+ introduce tdb->hdr_ofs
+ introduce TDB_SUPPORTED_FEATURE_FLAGS
+ return ENOSYS if the tdb was created with spinlocks.
+ use asprintf() to simplify tdb_summary()
+ test: add a "skip()" macro.
add marklock deadlock test
add mutex related tests
add PING command to external-agent.c
add shutdown_agent() helper function
add UNMAP command to external-agent.c
always call fflush() after [f]printf() in tap-interface.h
avoid const warnings by using 'discard_const_p(uint8_t,' instead of
'(void *)'
correctly use stderr, not stdout, in fail()
remove "\n" in diag() arguments
+ tools: add -l option to tdbbackup
add -l option to tdbtool
add -m option to tdbtorture
Allow tdbtool to r/o open mutexed tdbs
avoid const warnings in tdbdump.c
explicitly use TDB_NOLOCK in tdbdump
+ tdb_wrap: Remove tdb_wrap_open_ again
+ wscript: maintain a global list of unit tests
- Include stdbool.h in tdb.h; (bso#10625).
+ include_stdbool_bso10625.patch
-------------------------------------------------------------------
Fri May 23 20:10:17 UTC 2014 - lmuelle@suse.com
- Don't require pkg-config from the libtdb package.
-------------------------------------------------------------------
Thu Mar 20 19:12:16 UTC 2014 - lmuelle@suse.com

View File

@ -37,7 +37,7 @@ BuildRequires: pkgconfig
%endif
BuildRequires: python-devel
Url: http://tdb.samba.org/
Version: 1.2.13
Version: 1.3.0
Release: 0
Summary: Samba Trivial Database
License: GPL-3.0+
@ -48,6 +48,7 @@ Source2: samba-library-distribution-pubkey_13084025.asc
Source4: baselibs.conf
Patch0: ignore-tdb1-run-transaction-expand.diff
Patch1: build_pie.patch
Patch2: include_stdbool_bso10625.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -61,11 +62,6 @@ small.
%package -n %{libtdb_name}
Summary: Libraries and Header Files to Develop Programs with tdb1 Support
Group: System/Libraries
%if 0%{?suse_version} > 1020
Requires: pkg-config
%else
Requires: pkgconfig
%endif
PreReq: /sbin/ldconfig
%description -n %{libtdb_name}
@ -130,6 +126,7 @@ rm ${RPM_SOURCE_DIR}/%{name}-%{version}.tar
%patch0 -p1
%endif
%patch1 -p1
%patch2 -p3
%build
%if 0%{?suse_version} && 0%{?suse_version} < 911