diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2017-02-24 17:25:35 +0200 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2017-02-24 17:25:35 +0200 |
| commit | 246fe63506169eec43814eb35489c026de134a76 (patch) | |
| tree | 3fdbcb7087e9d93f5e23e9ecdeca62e87bd771a4 /app-crypt/trousers/files | |
| parent | sys-kernel/ck-sources: CVE-2017-6074 (fixed by genpatches 4.9-14 / linux 4.10) (diff) | |
| download | gentoo-246fe63506169eec43814eb35489c026de134a76.tar.gz gentoo-246fe63506169eec43814eb35489c026de134a76.tar.bz2 gentoo-246fe63506169eec43814eb35489c026de134a76.zip | |
app-crypt/trousers: cleanup
Bug: 609090
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'app-crypt/trousers/files')
| -rw-r--r-- | app-crypt/trousers/files/trousers-0.3.13-build.patch | 77 | ||||
| -rw-r--r-- | app-crypt/trousers/files/trousers-0.3.5-nouseradd.patch | 11 |
2 files changed, 0 insertions, 88 deletions
diff --git a/app-crypt/trousers/files/trousers-0.3.13-build.patch b/app-crypt/trousers/files/trousers-0.3.13-build.patch deleted file mode 100644 index 4e0e60e97786..000000000000 --- a/app-crypt/trousers/files/trousers-0.3.13-build.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- a/src/include/tcsps.h -+++ b/src/include/tcsps.h -@@ -23,13 +23,8 @@ int get_file(); - 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 -+TSS_RESULT read_data(int, void *, UINT32); -+TSS_RESULT write_data(int, void *, UINT32); - 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 *); ---- a/src/include/tspps.h -+++ b/src/include/tspps.h -@@ -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 *); ---- a/src/tcs/ps/ps_utils.c -+++ b/src/tcs/ps/ps_utils.c -@@ -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 @@ read_data(int fd, void *data, UINT32 size) - } - - --#ifdef SOLARIS - TSS_RESULT --#else --inline TSS_RESULT --#endif - write_data(int fd, void *data, UINT32 size) - { - int rc; ---- a/src/tspi/ps/ps_utils.c -+++ b/src/tspi/ps/ps_utils.c -@@ -22,7 +22,7 @@ - #include "tspps.h" - #include "tsplog.h" - --inline TSS_RESULT -+TSS_RESULT - read_data(int fd, void *data, UINT32 size) - { - int rc; -@@ -39,7 +39,7 @@ read_data(int fd, void *data, UINT32 size) - return TSS_SUCCESS; - } - --inline TSS_RESULT -+TSS_RESULT - write_data(int fd, void *data, UINT32 size) - { - int rc; diff --git a/app-crypt/trousers/files/trousers-0.3.5-nouseradd.patch b/app-crypt/trousers/files/trousers-0.3.5-nouseradd.patch deleted file mode 100644 index 32114134daff..000000000000 --- a/app-crypt/trousers/files/trousers-0.3.5-nouseradd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dist/Makefile.am -+++ dist/Makefile.am -@@ -6,8 +6,6 @@ - /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf - - install-exec-hook: -- /usr/sbin/groupadd tss || true -- /usr/sbin/useradd -r tss -g tss || true - /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi' - /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true - /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm |