From e44866c44b678ecd2cde559ece4800310f2ec419a6c813c10d9ce7f0d8580977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 23 May 2014 17:19:09 +0000 Subject: [PATCH 1/5] Don't BuildRequire pkg-config from the main and libtdb package. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/tdb?expand=0&rev=48 --- tdb.changes | 5 +++++ tdb.spec | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tdb.changes b/tdb.changes index 59605da..fcb66fe 100644 --- a/tdb.changes +++ b/tdb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 23 16:03:32 UTC 2014 - lmuelle@suse.com + +- Don't BuildRequire pkg-config from the main and libtdb package. + ------------------------------------------------------------------- Thu Mar 20 19:12:16 UTC 2014 - lmuelle@suse.com diff --git a/tdb.spec b/tdb.spec index 7e3b991..ea24c01 100644 --- a/tdb.spec +++ b/tdb.spec @@ -30,11 +30,6 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: gpg-offline %endif BuildRequires: libxslt -%if 0%{?suse_version} > 1020 -BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif BuildRequires: python-devel Url: http://tdb.samba.org/ Version: 1.2.13 @@ -61,11 +56,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} From edc43b224d516d3c79a7aa2e55a584a8a3aafd6f1963e4b0ddf19cbd11c939ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 23 May 2014 20:11:37 +0000 Subject: [PATCH 2/5] Don't require pkg-config from the main package. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/tdb?expand=0&rev=49 --- tdb.changes | 4 ++-- tdb.spec | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tdb.changes b/tdb.changes index fcb66fe..048a65e 100644 --- a/tdb.changes +++ b/tdb.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Fri May 23 16:03:32 UTC 2014 - lmuelle@suse.com +Fri May 23 20:10:17 UTC 2014 - lmuelle@suse.com -- Don't BuildRequire pkg-config from the main and libtdb package. +- Don't require pkg-config from the main package. ------------------------------------------------------------------- Thu Mar 20 19:12:16 UTC 2014 - lmuelle@suse.com diff --git a/tdb.spec b/tdb.spec index ea24c01..ef52c24 100644 --- a/tdb.spec +++ b/tdb.spec @@ -30,6 +30,11 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: gpg-offline %endif BuildRequires: libxslt +%if 0%{?suse_version} > 1020 +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif BuildRequires: python-devel Url: http://tdb.samba.org/ Version: 1.2.13 From 1b2c8329e779ec6b641928e9826fadb88c463e1ffa6b1ee6cf3963c78086631b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 23 May 2014 21:23:11 +0000 Subject: [PATCH 3/5] - 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 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/tdb?expand=0&rev=50 --- build_pie.patch | 2 +- ignore-tdb1-run-transaction-expand.diff | 2 +- include_stdbool_bso10625.patch | 27 ++++++++++++++++++++ tdb-1.2.13.tar.asc | 11 --------- tdb-1.2.13.tar.gz | 3 --- tdb-1.3.0.tar.asc | 11 +++++++++ tdb-1.3.0.tar.gz | 3 +++ tdb.changes | 33 +++++++++++++++++++++++++ tdb.spec | 4 ++- 9 files changed, 79 insertions(+), 17 deletions(-) create mode 100644 include_stdbool_bso10625.patch delete mode 100644 tdb-1.2.13.tar.asc delete mode 100644 tdb-1.2.13.tar.gz create mode 100644 tdb-1.3.0.tar.asc create mode 100644 tdb-1.3.0.tar.gz diff --git a/build_pie.patch b/build_pie.patch index 1f3ccf3..9396242 100644 --- a/build_pie.patch +++ b/build_pie.patch @@ -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', diff --git a/ignore-tdb1-run-transaction-expand.diff b/ignore-tdb1-run-transaction-expand.diff index 5fc8e0e..35acbd9 100644 --- a/ignore-tdb1-run-transaction-expand.diff +++ b/ignore-tdb1-run-transaction-expand.diff @@ -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')) diff --git a/include_stdbool_bso10625.patch b/include_stdbool_bso10625.patch new file mode 100644 index 0000000..9dc965e --- /dev/null +++ b/include_stdbool_bso10625.patch @@ -0,0 +1,27 @@ +From 4e14a437963ba54987cd58b4e0705d9a6d8aea6f Mon Sep 17 00:00:00 2001 +From: Adam Williamson +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 ++#include + + /** + * @defgroup tdb The tdb API +-- +1.9.3 + diff --git a/tdb-1.2.13.tar.asc b/tdb-1.2.13.tar.asc deleted file mode 100644 index b684a16..0000000 --- a/tdb-1.2.13.tar.asc +++ /dev/null @@ -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----- diff --git a/tdb-1.2.13.tar.gz b/tdb-1.2.13.tar.gz deleted file mode 100644 index f591758..0000000 --- a/tdb-1.2.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edc8f7dedd9928adc1bd48b33f95b08a222cf2c2867654a401c0ad66b10aadf6 -size 463129 diff --git a/tdb-1.3.0.tar.asc b/tdb-1.3.0.tar.asc new file mode 100644 index 0000000..c144705 --- /dev/null +++ b/tdb-1.3.0.tar.asc @@ -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----- diff --git a/tdb-1.3.0.tar.gz b/tdb-1.3.0.tar.gz new file mode 100644 index 0000000..fdc54f1 --- /dev/null +++ b/tdb-1.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04bee48d405ab7815810575a6e0cb364cc0eea6187b54b18c84e9c18a768ba20 +size 479096 diff --git a/tdb.changes b/tdb.changes index 048a65e..3357f03 100644 --- a/tdb.changes +++ b/tdb.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +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 diff --git a/tdb.spec b/tdb.spec index ef52c24..1672a51 100644 --- a/tdb.spec +++ b/tdb.spec @@ -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 @@ -125,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 From 2ddd81156972d1110c795ad47f789940b7fc55a2c654e64bd34dbf3358beac86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 23 May 2014 21:38:25 +0000 Subject: [PATCH 4/5] Reduce indention by one char. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/tdb?expand=0&rev=51 --- tdb.changes | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tdb.changes b/tdb.changes index 3357f03..a256285 100644 --- a/tdb.changes +++ b/tdb.changes @@ -10,22 +10,22 @@ Fri May 23 20:48:25 UTC 2014 - lmuelle@suse.com + 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 + 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 + 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). From 38e23e8fd56fc6c13b37c47e76361e6ddf18d76b671d151f3277c6812f7639b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 24 May 2014 12:41:00 +0000 Subject: [PATCH 5/5] Improve the 'Don't require pkg-config from' change message. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/tdb?expand=0&rev=52 --- tdb.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdb.changes b/tdb.changes index a256285..d441abe 100644 --- a/tdb.changes +++ b/tdb.changes @@ -34,7 +34,7 @@ Fri May 23 20:48:25 UTC 2014 - lmuelle@suse.com ------------------------------------------------------------------- Fri May 23 20:10:17 UTC 2014 - lmuelle@suse.com -- Don't require pkg-config from the main package. +- Don't require pkg-config from the libtdb package. ------------------------------------------------------------------- Thu Mar 20 19:12:16 UTC 2014 - lmuelle@suse.com