summaryrefslogtreecommitdiff
path: root/dev-libs/libfido2/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-05-14 22:02:07 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-05-14 22:02:07 +0100
commit78db24b58a7f75bf18548cbf5c3b210f2f33f2f4 (patch)
tree53f180d30387a94fd028e0c5a10635621ebeb98f /dev-libs/libfido2/files
parent153fd195574cc30040446316bb666af0e58d985f (diff)
gentoo auto-resync : 14:05:2023 - 22:02:07
Diffstat (limited to 'dev-libs/libfido2/files')
-rw-r--r--dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch81
-rw-r--r--dev-libs/libfido2/files/libfido2-1.7.0-cmakelists.patch30
2 files changed, 0 insertions, 111 deletions
diff --git a/dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch b/dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch
deleted file mode 100644
index 391aae014661..000000000000
--- a/dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://github.com/Yubico/libfido2/pull/579
-
-From c359e5dba24ae7b44cc0d61fb7c00e652465853b Mon Sep 17 00:00:00 2001
-From: Silke Hofstra <silke@slxh.eu>
-Date: Fri, 6 May 2022 15:36:02 +0200
-Subject: [PATCH 1/3] regress: link against chosen library
-
-Compile `regress` against `${_FIDO2_LIBRARY}` so it links against
-the shared library when building with `BUILD_STATIC_LIBS=OFF`.
---- a/regress/CMakeLists.txt
-+++ b/regress/CMakeLists.txt
-@@ -6,7 +6,7 @@ add_custom_target(regress)
-
- macro(add_regress_test NAME SOURCES)
- add_executable(${NAME} ${SOURCES})
-- target_link_libraries(${NAME} fido2)
-+ target_link_libraries(${NAME} ${_FIDO2_LIBRARY})
- add_test(${NAME} ${NAME})
- add_dependencies(regress ${NAME})
- endmacro()
-@@ -17,6 +17,7 @@ if(MSVC AND BUILD_SHARED_LIBS)
- "${CBOR_BIN_DIRS}/${CBOR_LIBRARIES}.dll"
- "${CRYPTO_BIN_DIRS}/${CRYPTO_LIBRARIES}.dll"
- "${ZLIB_BIN_DIRS}/${ZLIB_LIBRARIES}.dll"
-+ "$<TARGET_FILE:${_FIDO2_LIBRARY}>"
- "${CMAKE_CURRENT_BINARY_DIR}")
- endif()
-
-
-From a5413255cb0dd4579faf0dda0ce1b3e45db398e9 Mon Sep 17 00:00:00 2001
-From: Silke Hofstra <silke@slxh.eu>
-Date: Mon, 9 May 2022 10:56:29 +0200
-Subject: [PATCH 3/3] regress: run compression test against static lib only
-
---- a/regress/CMakeLists.txt
-+++ b/regress/CMakeLists.txt
-@@ -4,13 +4,22 @@
-
- add_custom_target(regress)
-
--macro(add_regress_test NAME SOURCES)
-+macro(add_regress_test_common NAME SOURCES)
- add_executable(${NAME} ${SOURCES})
-- target_link_libraries(${NAME} ${_FIDO2_LIBRARY})
- add_test(${NAME} ${NAME})
- add_dependencies(regress ${NAME})
- endmacro()
-
-+macro(add_regress_test NAME SOURCES)
-+ add_regress_test_common(${NAME} ${SOURCES})
-+ target_link_libraries(${NAME} ${_FIDO2_LIBRARY})
-+endmacro()
-+
-+macro(add_regress_static_test NAME SOURCES)
-+ add_regress_test_common(${NAME} ${SOURCES})
-+ target_link_libraries(${NAME} fido2)
-+endmacro()
-+
- if(MSVC AND BUILD_SHARED_LIBS)
- add_custom_command(TARGET regress POST_BUILD
- COMMAND "${CMAKE_COMMAND}" -E copy
-@@ -33,13 +42,17 @@ else()
- endif()
-
- add_regress_test(regress_assert assert.c)
--add_regress_test(regress_compress compress.c)
- add_regress_test(regress_cred cred.c)
- add_regress_test(regress_dev dev.c)
- add_regress_test(regress_eddsa eddsa.c)
- add_regress_test(regress_es256 es256.c)
- add_regress_test(regress_rs256 rs256.c)
-
-+# Run these tests only against the static library
-+if(BUILD_STATIC_LIBS)
-+ add_regress_static_test(regress_compress compress.c)
-+endif()
-+
- if(MINGW)
- # needed for nanosleep() in mingw
- target_link_libraries(regress_dev winpthread)
-
diff --git a/dev-libs/libfido2/files/libfido2-1.7.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.7.0-cmakelists.patch
deleted file mode 100644
index 2a1bfc1614db..000000000000
--- a/dev-libs/libfido2/files/libfido2-1.7.0-cmakelists.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- libfido2-1.7.0/CMakeLists.txt
-+++ libfido2-1.7.0/CMakeLists.txt
-@@ -246,14 +246,12 @@
-
- add_compile_options(-Wall)
- add_compile_options(-Wextra)
-- add_compile_options(-Werror)
- add_compile_options(-Wshadow)
- add_compile_options(-Wcast-qual)
- add_compile_options(-Wwrite-strings)
- add_compile_options(-Wmissing-prototypes)
- add_compile_options(-Wbad-function-cast)
- add_compile_options(-pedantic)
-- add_compile_options(-pedantic-errors)
-
- if(HAVE_SHORTEN_64_TO_32)
- add_compile_options(-Wshorten-64-to-32)
---- libfido2-1.7.0/man/CMakeLists.txt
-+++ libfido2-1.7.0/man/CMakeLists.txt
-@@ -3,10 +3,8 @@
- # license that can be found in the LICENSE file.
-
- find_program(MANDOC_PATH mandoc)
--find_program(GZIP_PATH gzip)
-
- message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
--message(STATUS "GZIP_PATH: ${GZIP_PATH}")
-
- list(APPEND MAN_SOURCES
- eddsa_pk_new.3