commit 4b0ed7624096ca3e7853df27d7055e64f8f17b98
Author: Jacek Konieczny <[email protected]>
Date: Tue Sep 27 14:33:43 2016 +0200
fix compilation with current gcc
patch from https://sourceforge.net/p/trousers/mailman/message/31184534/
no_inline.patch | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
trousers.spec | 3 +++
2 files changed, 62 insertions(+)
---
diff --git a/trousers.spec b/trousers.spec
index bd94184..fa6557f 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -12,6 +12,7 @@ License: BSD
Group: Applications/System
Source0:
http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz
# Source0-md5: ad508f97b406f6e48cd90e85d78e7ca8
+Patch0: no_inline.patch
URL: http://trousers.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake >= 1.6
@@ -84,6 +85,8 @@ Statyczna biblioteka TrouSerS.
%prep
%setup -q
+%patch0 -p1
+
# there is some unused variable causing warning
sed -i -e 's/-Werror //' configure.in
diff --git a/no_inline.patch b/no_inline.patch
new file mode 100644
index 0000000..cb4c1a9
--- /dev/null
+++ b/no_inline.patch
@@ -0,0 +1,59 @@
+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 @@
+
+ TSS_RESULT get_file(int *);
+ 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);
+ 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~
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/trousers.git/commitdiff/09c623f7593a2cf2f97c19487a0298bd7dcd90a0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
