rebuild with openssl 3.0.0

[packages/trousers.git] / no_inline.patch

diff --git a/no_inline.patch b/no_inline.patch
index cb4c1a9f8f77bce694cc47dac33a38130c761ae4..2aedfa9827f73fdde18777730001a49384d10e36 100644 (file)
--- a/no_inline.patch
+++ b/no_inline.patch
@@ -1,21 +1,3 @@
-diff -dur trousers-0.3.13.orig/src/include/tcsps.h trousers-0.3.13/src/include/tcsps.h
---- trousers-0.3.13.orig/src/include/tcsps.h   2014-04-24 20:05:44.000000000 +0200
-+++ trousers-0.3.13/src/include/tcsps.h        2016-09-27 14:38:43.000000000 +0200
-@@ -23,13 +23,6 @@
- int              put_file(int);
- void             close_file(int);
- void             ps_destroy();
--#ifdef SOLARIS
--TSS_RESULT  read_data(int, void *, UINT32);
--TSS_RESULT  write_data(int, void *, UINT32);
--#else
--inline TSS_RESULT  read_data(int, void *, UINT32);
--inline TSS_RESULT  write_data(int, void *, UINT32);
--#endif
- int              write_key_init(int, UINT32, UINT32, UINT32);
- TSS_RESULT       cache_key(UINT32, UINT16, TSS_UUID *, TSS_UUID *, UINT16, UINT32, UINT32);
- TSS_RESULT       UnloadBlob_KEY_PS(UINT16 *, BYTE *, TSS_KEY *);
-diff -dur trousers-0.3.13.orig/src/include/tspps.h trousers-0.3.13/src/include/tspps.h
 --- trousers-0.3.13.orig/src/include/tspps.h   2014-04-24 20:05:44.000000000 +0200
 +++ trousers-0.3.13/src/include/tspps.h        2016-09-27 14:38:43.000000000 +0200
 @@ -18,8 +18,8 @@
@@ -24,36 +6,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 -dur trousers-0.3.13.orig/src/tcs/ps/ps_utils.c trousers-0.3.13/src/tcs/ps/ps_utils.c
---- trousers-0.3.13.orig/src/tcs/ps/ps_utils.c 2014-04-24 20:05:44.000000000 +0200
-+++ trousers-0.3.13/src/tcs/ps/ps_utils.c      2016-09-27 14:39:40.000000000 +0200
-@@ -42,11 +42,7 @@
- struct key_disk_cache *key_disk_cache_head = NULL;
- 
- 
--#ifdef SOLARIS
- TSS_RESULT
--#else
--inline TSS_RESULT
--#endif
- read_data(int fd, void *data, UINT32 size)
- {
-       int rc;
-@@ -64,11 +60,7 @@
- }
- 
- 
--#ifdef SOLARIS
- TSS_RESULT
--#else
--inline TSS_RESULT
--#endif
- write_data(int fd, void *data, UINT32 size)
- {
-       int rc;
-Only in trousers-0.3.13/src/tcs/ps: ps_utils.c~