Accepting request 921746 from home:scabrero:branches:network:samba:STABLE

- Fix header file using undefined function visibility macro;
  Add patch 0001-tdb-Fix-invalid-syntax-in-tdb.h.patch; (bso#14762);

OBS-URL: https://build.opensuse.org/request/show/921746
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/tdb?expand=0&rev=109
This commit is contained in:
David Mulder 2021-09-27 14:27:06 +00:00 committed by Git OBS Bridge
parent 8c58a1e2e9
commit 3c601addf3
3 changed files with 54 additions and 1 deletions

View File

@ -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

View File

@ -18,7 +18,9 @@ Fri Sep 17 08:46:03 UTC 2021 - Samuel Cabrero <scabrero@suse.de>
+ 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
- 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>

View File

@ -37,6 +37,7 @@ Source1: https://download.samba.org/pub/tdb/tdb-%{version}.tar.asc
Source2: tdb.keyring
Source4: baselibs.conf
Patch0: build_pie.patch
Patch1: 0001-tdb-Fix-invalid-syntax-in-tdb.h.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description