Accepting request 921816 from network:samba:STABLE

OBS-URL: https://build.opensuse.org/request/show/921816 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tdb?expand=0&rev=39
2021-10-04 16:39:15 +00:00 · 2021-10-04 16:39:15 +00:00 · 339d0bc2bb
commit 339d0bc2bb
parent 3d8c5dbc27 3c601addf3
8 changed files with 93 additions and 44 deletions
--- a/0001-tdb-Fix-invalid-syntax-in-tdb.h.patch
+++ b/0001-tdb-Fix-invalid-syntax-in-tdb.h.patch
@ -0,0 +1,50 @@
+From aacd3ecb45ab04cb2f8a38a385a45bdca6d88cd2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
+Date: Fri, 16 Jul 2021 17:29:40 +0200
+Subject: [PATCH] tdb: Fix invalid syntax in tdb.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Defining _PUBLIC_ in the same way as in talloc.h resolves an issue with
+a previous fix for Solaris Studio compiler 12.4 that prefixed all calls
+in tdb.h with _PUBLIC_.  Thanks to Lukas Slebodnik
+<lslebodn@redhat.com>.
+
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=14762
+
+Guenther
+
+Signed-off-by: Günther Deschner <gd@samba.org>
+Reviewed-by: Stefan Metzmacher <metze@samba.org>
+---
+ lib/tdb/include/tdb.h | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/include/tdb.h b/include/tdb.h
+index 696547c8cd9..884171c73d9 100644
+--- a/include/tdb.h
+++ b/include/tdb.h
+@@ -33,6 +33,19 @@ extern "C" {
+ #include <signal.h>
+ #include <stdbool.h>
+ 
+/* for old gcc releases that don't have the feature test macro __has_attribute */
+#ifndef __has_attribute
+#define __has_attribute(x) 0
+#endif
+
+#ifndef _PUBLIC_
+#if __has_attribute(visibility)
+#define _PUBLIC_ __attribute__((visibility("default")))
+#else
+#define _PUBLIC_
+#endif
+#endif
+
+ /**
+  * @defgroup tdb The tdb API
+  *
+-- 
+2.33.0
+
--- a/ignore-tdb1-run-transaction-expand.diff
+++ b/ignore-tdb1-run-transaction-expand.diff
@ -1,19 +0,0 @@
-Author: Debian tdb maintainers
-Bugzilla: 769268 - tdb: tdb1-run-transaction-expand test fails on ppc64
-
-Index: tdb-1.2.11/wscript
-===================================================================
--- tdb-1.2.11.orig/wscript
-+++ tdb-1.2.11/wscript
-@@ -238,8 +238,9 @@ def testonly(ctx):
-             if ret != 0:
-                 print("%s failed:" % f)
-                 samba_utils.RUN_COMMAND("cat " + os.path.join(testdir, 'test-output'))
-                ecode = ret
-                break
-+                if f != 'tdb1-run-transaction-expand':
-+                    ecode = ret;
-+                    break;
- 
-     if ecode == 0:
-         cmd = os.path.join(blddir, 'tdbtorture')
--- a/tdb-1.4.3.tar.asc
+++ b/tdb-1.4.3.tar.asc
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQFJBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAl33TsMVHHNhbWJhLWJ1
-Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAl3cIH/RPLmPXz+7p2g1AuzY9seqtNOlW2
-jRFHw1wnKkQZbto3B0VuxqG1xRnlbvjchUVensCJaiGJiS7Xu09OHcykN5/VFJMF
-Fyi7u0p8Ib1VTDBmAchTT2MVugV19iSXPxbe/enh3lvM567hEjGOEazXLm1GF4PF
-dbQG83FV2VOvz30yUlaZzfV+z443EUuPIS2uetxOdP8iLD3ZZUELpU93Ue4rpmmp
-sBzgfGSqwTTVo0hs5axz8vDDR/DJMOC3VGflCw/5TneL90sVvG37n33cUZj+GpHj
-JKudGRkmn2W1F8JjR/m3Pt6SZH9FJfOEqwEEG7/hcEeHsJEb8ZOvSx6epRY=
-=RkR3
-----END PGP SIGNATURE-----
--- a/tdb-1.4.3.tar.gz
+++ b/tdb-1.4.3.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b
-size 702836
--- a/tdb-1.4.4.tar.asc
+++ b/tdb-1.4.4.tar.asc
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmDv5EAACgkQR5ORYRMI
+QCUKIQf+IYu12bmcSAlHfxP9QBWpYBF+CGk4UNNsw6iNnuYlN4kf12kdNJtV2ZvJ
+umkbtSu76BRHp3zJoIsy1XlivbJUcAz88b5elG0w3VLXfS2HGGvdPW6QLra3MbK9
+8/LAyjSOSnOtYcOSLJM4o3Yacm/Xlv8M2Ydn/vCh/2A52lLw6W6xlsYXL95Jp8v0
+f5XHEOLP4kFFQHhHxLR1Z5AcQ0Y4c5q2qgBiTK/m2m8cXyQMy578Xle+BMGatUXX
+oBva7HSQAWTRfN9BwDFckS6jGDu45UGu39TCqptJhC9WWdI4xUaw9CMHYPhtmJfl
+kyaMmTAA+WkHc63mRy1T2/WgmM8Z0w==
+=4HbA
+-----END PGP SIGNATURE-----
--- a/tdb-1.4.4.tar.gz
+++ b/tdb-1.4.4.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59a16937de4b75e949405757f7b6bb0084d589cad98ae9001f9b7ec73b3c6380
+size 714367
--- a/tdb.changes
+++ b/tdb.changes
@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri Sep 17 08:46:03 UTC 2021 - Samuel Cabrero <scabrero@suse.de>
+
+- Update to version 1.4.4
+  + Fix a memory leak on error
+  + python: remove all 'from __future__ import print_function'
+  + Fix CID 1471761 String not null terminated
+  + Use hex_byte() in parse_hex()
+  + Use hex_byte() in read_data()
+  + fix studio compiler build
+  + Fix some signed/unsigned comparisons
+  + also use __has_attribute macro to check for attribute support
+  + Fix clang 9 missing-field-initializer warnings
+  + pytdb tests: add test for storev()
+  + pytdb: add python binding for storev()
+  + tdbtorture: Use ARRAY_DEL_ELEMENT()
+  + py3: Remove #define PyInt_FromLong PyLong_FromLong
+  + py3: Remove #define PyInt_AsLong PyLong_AsLong
+  + py3: Remove #define PyInt_Check PyLong_Check
+  + tdb: Align integer types
+- Drop obsolete patch ignore-tdb1-run-transaction-expand.diff
+- Fix header file using undefined function visibility macro;
+  Add patch 0001-tdb-Fix-invalid-syntax-in-tdb.h.patch; (bso#14762);
+
 -------------------------------------------------------------------
 Fri Mar  6 17:02:55 UTC 2020 - Noel Power <nopower@suse.com>

--- a/tdb.spec
+++ b/tdb.spec
@ -1,7 +1,7 @@
 #
 # spec file for package tdb
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -27,7 +27,7 @@ BuildRequires:  libxslt
 BuildRequires:  pkg-config
 BuildRequires:  python3-devel
 URL:            https://tdb.samba.org/
-Version:        1.4.3
+Version:        1.4.4
 Release:        0
 Summary:        Samba Trivial Database
 License:        LGPL-3.0-or-later
@ -36,8 +36,8 @@ Source:         https://download.samba.org/pub/tdb/tdb-%{version}.tar.gz
 Source1:        https://download.samba.org/pub/tdb/tdb-%{version}.tar.asc
 Source2:        tdb.keyring
 Source4:        baselibs.conf
-Patch0:         ignore-tdb1-run-transaction-expand.diff
-Patch1:         build_pie.patch
+Patch0:         build_pie.patch
+Patch1:         0001-tdb-Fix-invalid-syntax-in-tdb.h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
@ -56,7 +56,6 @@ internally to keep writers from trampling on each other.

 This package contains the tdb1 library.

-
 %package -n libtdb-devel
 Summary:        Libraries and Header Files to Develop Programs with tdb1 Support
 Group:          Development/Libraries/C and C++
@ -70,7 +69,6 @@ internally to keep writers from trampling on each other.

 This package contains libraries and header files need for development.

-
 %package -n tdb-tools
 Summary:        Tools to manipulate tdb files
 Group:          Development/Libraries/C and C++
@ -82,7 +80,6 @@ internally to keep writers from trampling on each other.

 This package contains tools to manage Tdb files.

-
 %package -n python3-tdb
 Summary:        Python3 bindings for the Tdb library
 Group:          Development/Libraries/Python
@ -94,10 +91,7 @@ This package contains the Python3 bindings for the Tdb library.

 %prep
 %setup -n tdb-%{version} -q
-%ifarch ppc ppc64 ppc64le
-%patch0 -p1
-%endif
-%patch1 -p1
+%autopatch -p1

 %build
 export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS"