[packages/trousers] correct no_inline patch to make sure symbols are not exported; rel 4

atler atler at pld-linux.org
Tue Nov 22 23:19:36 CET 2016


commit 1d4f96d304808155320457ba8c4ca779fdd8c822
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Nov 22 23:16:03 2016 +0100

    correct no_inline patch to make sure symbols are not exported; rel 4
    
    read_data/write_data clash with symbols from samba causing aborts in
    applications linking to both of them (directly or indirectly)

 no_inline.patch | 4 ++--
 trousers.spec   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/trousers.spec b/trousers.spec
index 05f4ad7..9befb3e 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -7,7 +7,7 @@ Summary:	TrouSerS - The open-source TCG Software Stack
 Summary(pl.UTF-8):	TrouSerS - programowy stos TCG o otwartych źródłach
 Name:		trousers
 Version:	0.3.13
-Release:	3
+Release:	4
 License:	BSD
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz
diff --git a/no_inline.patch b/no_inline.patch
index cb4c1a9..4caeb51 100644
--- a/no_inline.patch
+++ b/no_inline.patch
@@ -24,8 +24,8 @@ diff -dur trousers-0.3.13.orig/src/include/tspps.h trousers-0.3.13/src/include/t
  int		   put_file(int);
 -inline TSS_RESULT  read_data(int, void *, UINT32);
 -inline TSS_RESULT  write_data(int, void *, UINT32);
-+TSS_RESULT  read_data(int, void *, UINT32);
-+TSS_RESULT  write_data(int, void *, UINT32);
++TSS_RESULT __attribute__ ((visibility ("hidden"))) read_data(int, void *, UINT32);
++TSS_RESULT __attribute__ ((visibility ("hidden"))) write_data(int, void *, UINT32);
  UINT32		   psfile_get_num_keys(int);
  TSS_RESULT	   psfile_get_parent_uuid_by_uuid(int, TSS_UUID *, TSS_UUID *);
  TSS_RESULT	   psfile_remove_key_by_uuid(int, TSS_UUID *);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/trousers.git/commitdiff/1d4f96d304808155320457ba8c4ca779fdd8c822



More information about the pld-cvs-commit mailing list