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)

diff --git a/no_inline.patch b/no_inline.patch
index cb4c1a9f8f77bce694cc47dac33a38130c761ae4..4caeb51481bdac753daf0e2d987048e045c04575 100644 (file)
--- 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 *);

diff --git a/trousers.spec b/trousers.spec
index 05f4ad7e244d6855f4cba7de3cc8363ad30e6d89..9befb3ec26939eefe6a78da666a65d6c5c9d1b78 100644 (file)
--- 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