diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /app-crypt/tpm-emulator/files | |
parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) |
gentoo resync : 22.01.2021
Diffstat (limited to 'app-crypt/tpm-emulator/files')
-rw-r--r-- | app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-fno-common.patch | 48 | ||||
-rw-r--r-- | app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-static-libs.patch | 26 |
2 files changed, 74 insertions, 0 deletions
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-fno-common.patch b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-fno-common.patch new file mode 100644 index 000000000000..88bfb33433c1 --- /dev/null +++ b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-fno-common.patch @@ -0,0 +1,48 @@ +https://bugs.gentoo.org/707256 +--- a/tpm/tpm_emulator_extern.h ++++ b/tpm/tpm_emulator_extern.h +@@ -29,7 +29,7 @@ enum { + TPM_LOG_ERROR + }; + +-void (*tpm_log)(int priority, const char *fmt, ...); ++extern void (*tpm_log)(int priority, const char *fmt, ...); + + #if defined(_WIN32) || defined(_WIN64) + #define __BFILE__ ((strrchr(__FILE__, '\\') ? : __FILE__ - 1) + 1) +@@ -44,27 +44,27 @@ void (*tpm_log)(int priority, const char *fmt, ...); + #define error(fmt, ...) tpm_log(TPM_LOG_ERROR, "%s:%d: Error: " fmt "\n", \ + __BFILE__, __LINE__, ## __VA_ARGS__) + /* initialization */ +-int (*tpm_extern_init)(void); +-void (*tpm_extern_release)(void); ++extern int (*tpm_extern_init)(void); ++extern void (*tpm_extern_release)(void); + + /* memory allocation */ + +-void* (*tpm_malloc)(size_t size); ++extern void* (*tpm_malloc)(size_t size); + +-void (*tpm_free)(/*const*/ void *ptr); ++extern void (*tpm_free)(/*const*/ void *ptr); + + /* random numbers */ + +-void (*tpm_get_extern_random_bytes)(void *buf, size_t nbytes); ++extern void (*tpm_get_extern_random_bytes)(void *buf, size_t nbytes); + + /* usec since last call */ + +-uint64_t (*tpm_get_ticks)(void); ++extern uint64_t (*tpm_get_ticks)(void); + + /* file handling */ + +-int (*tpm_write_to_storage)(uint8_t *data, size_t data_length); +-int (*tpm_read_from_storage)(uint8_t **data, size_t *data_length); ++extern int (*tpm_write_to_storage)(uint8_t *data, size_t data_length); ++extern int (*tpm_read_from_storage)(uint8_t **data, size_t *data_length); + + #endif /* _TPM_EMULATOR_EXTERN_H_ */ + diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-static-libs.patch b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-static-libs.patch new file mode 100644 index 000000000000..845229bd7670 --- /dev/null +++ b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-static-libs.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/726492 +--- a/tddl/CMakeLists.txt ++++ b/tddl/CMakeLists.txt +@@ -5,21 +5,18 @@ + + set(tddl-tpm-emulator_SRCS "tddl.c" "tddl-tpm-emulator.h") + add_library(tddl-tpm-emulator SHARED ${tddl-tpm-emulator_SRCS}) +-add_library(tddl-tpm-emulator_static STATIC ${tddl-tpm-emulator_SRCS}) + if(UNIX) + set_target_properties(tddl-tpm-emulator PROPERTIES SOVERSION "1.2" + VERSION "1.2.${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}") +- set_target_properties(tddl-tpm-emulator_static PROPERTIES OUTPUT_NAME tddl-tpm-emulator) + elseif(WIN32) + set_target_properties(tddl-tpm-emulator PROPERTIES OUTPUT_NAME ifxtpm) + set_target_properties(tddl-tpm-emulator PROPERTIES PREFIX "") + endif() + + install(TARGETS tddl-tpm-emulator DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-install(TARGETS tddl-tpm-emulator_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "tddl-tpm-emulator.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + add_executable(test_tddl test_tddl.c) +-target_link_libraries(test_tddl tddl-tpm-emulator_static) ++target_link_libraries(test_tddl tddl-tpm-emulator) + |