diff options
Diffstat (limited to 'dev-libs/libfido2')
-rw-r--r-- | dev-libs/libfido2/Manifest | 6 | ||||
-rw-r--r-- | dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch | 81 | ||||
-rw-r--r-- | dev-libs/libfido2/files/libfido2-1.7.0-cmakelists.patch | 30 | ||||
-rw-r--r-- | dev-libs/libfido2/libfido2-1.13.0.ebuild (renamed from dev-libs/libfido2/libfido2-1.11.0.ebuild) | 30 |
4 files changed, 21 insertions, 126 deletions
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest index 78b5e4f74112..9b24a395cb7d 100644 --- a/dev-libs/libfido2/Manifest +++ b/dev-libs/libfido2/Manifest @@ -1,8 +1,6 @@ -AUX libfido2-1.11.0-regress-tests.patch 2545 BLAKE2B deed72f2a6237515200371b6f1b066fda27df6ce00325086adcb1065a3c9a70f4f1ce94640dc46b620db716c870f3fab8d6481df5c2a690f039a084665be3e8e SHA512 acca7ae882c4e3715c30161c1ebfdf02428b8749f4ef884f9b66d654b1b943d36edde5578e416d673eb3eae79dc15082526acf6f31c1ceb55fc84be4bc51229f AUX libfido2-1.12.0-cmakelists.patch 982 BLAKE2B 58787219654244cc0d45e7529835c36a5c08beadd5c062da35a17019eca845445a3f612831557dfa43afe9cce685b6eef78f3717a152460db5ed6bff318931d8 SHA512 ba8cda657d5665e4053c3e2ba41c5404dcbfb8af9f8c16ecb70e8d8017f5a904b057ecbdc044bcd2bc4145731c7c5af9a981d9461b3a5b4e9b6eae3fda238504 -AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be1e9c87e9b79dcfbf6fae3179ef618d0ed39a65c89f9d5b89f723bff87e72f2d1fdb1558aeb7946933ec35e6c2c99d247 SHA512 6c4338d82d51b66aa6d16ce6cf74f7101e1529ee6038517300e32c9f50965d029dcb8243f37643afeff9bdbc92032b80a4da24bf98d5bf2565a5c9ae95da1f41 -DIST libfido2-1.11.0.tar.gz 624148 BLAKE2B ac123145f22260922e1d83653ba5781c5f41b410760f2c26b7cab7cb0871079aed66a8d9747393843738e4c2ed7ba8ba0292075516ef0354fd4328df967b7a6d SHA512 d9644453d67b84ec8385dfb63796adb3eae2d7f7cb47fbb1bcf9ca7f5cce400623738cc3317d629c2f0af630424cb2788217f8c7f20d1b52b7369c729052d572 DIST libfido2-1.12.0.tar.gz 652326 BLAKE2B e206c9c76e27037c49d3b0e842487b0711559483eb9ae638590bb7175761251c6f60dae6c6dc6cc8b13e49b9f32432ce4368e709b4aacf71f43b760092e3b00d SHA512 ae8c716fe9b2fa52f191c4b3fe61442ba0b7a364a23c6c3a29afdba4f47c5eff89cb1d6c9fcacaefd7d4ebce641d35600527ee33934786c2096ac97f78e9418f -EBUILD libfido2-1.11.0.ebuild 1079 BLAKE2B 92af2b2246a9d3fd3f90d684cfd1f57f87b6c3ed8bc4262cf91dd88c39698f184d28a54e743280ddeb206971dcaf1acd9d2f222dd4767f96fa149c86c27dabf5 SHA512 575639ed512a85fd5354350e550d678b20aa981a1099dcdfaa87e281df83a7d143580b71e6d7ffba70046b2b5701300cc2b07e2b48980a76268c69c875d51bc7 +DIST libfido2-1.13.0.tar.gz 652777 BLAKE2B 506e0ecf89825e313fbcb0de59ef0b1a3aab483013f959b391448da0600979780ae76807639231ab8a60eead039471bba707073ec4e259b611d67031ac7713f1 SHA512 90f8452cee4c9cc72241478e697c5c692ccff5ab27752f2f296c3623ee297d1f80a85a359b4d0656c67790084c116aac921894e762eb52d3a79056e5014c03e7 EBUILD libfido2-1.12.0.ebuild 1074 BLAKE2B 015d5d3485e2b75e31a4e5857bcab69a14498d67c8c7cd548008d3d87afb7e953235bc9b7a95285b15bbc360e6569e2201580b89835e52f2afe9534bc8c16cf8 SHA512 56ad5e8620347e5ae3a7cd18e97e5ecd959462d0398b81ecfb83ac229cb36842aa7a047ab52c1f4ee8d44355c9ca78699deb1f7432e96cfa2096278398d144d7 +EBUILD libfido2-1.13.0.ebuild 1093 BLAKE2B c08350aca09469492261801020744c0708522d3b2893b77662fb9641a94d5d0d58749d4f24f47becce22734f5b38dd5fa8064e40cc00628c54a8106024e35865 SHA512 32d94e9df6bd04269cc522c6978fea11b2400718b017d563efb125a61e1224a398a1e331a9d31a033540d4b97d4b5316d7f0cde7704895c633cdb8e66ea7425a MISC metadata.xml 411 BLAKE2B 3b2e2850f194b8518267bb8125401bf7049f1b63158bdb28e63e63c03f1c50c918164911a7899790f12c2a207eee88970663a57ebdaf26fa601d77da299a0797 SHA512 dd6d40f9827d7dfb35548c201f90571cec364fe89e4b1811b37f34c1435d05c078585ed8254884370fe575a6fb58c4fb271b87007915c38dae8f945735c0b2ed 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 diff --git a/dev-libs/libfido2/libfido2-1.11.0.ebuild b/dev-libs/libfido2/libfido2-1.13.0.ebuild index 34f4ead4ef7b..f04ffce1179e 100644 --- a/dev-libs/libfido2/libfido2-1.11.0.ebuild +++ b/dev-libs/libfido2/libfido2-1.13.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake udev linux-info @@ -11,19 +11,23 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="nfc static-libs" -DEPEND="dev-libs/libcbor:= +DEPEND=" + dev-libs/libcbor:= dev-libs/openssl:= sys-libs/zlib:= - virtual/libudev:=" -RDEPEND="${DEPEND} - acct-group/plugdev" + virtual/libudev:= +" +RDEPEND=" + ${DEPEND} + acct-group/plugdev +" +BDEPEND="app-text/mandoc" PATCHES=( - "${FILESDIR}"/${PN}-1.7.0-cmakelists.patch - "${FILESDIR}"/${PN}-1.11.0-regress-tests.patch + "${FILESDIR}"/${PN}-1.12.0-cmakelists.patch ) pkg_pretend() { @@ -38,8 +42,8 @@ pkg_pretend() { src_configure() { local mycmakeargs=( -DBUILD_EXAMPLES=OFF - -DBUILD_STATIC_LIBS=$(usex static-libs ON OFF) - -DNFC_LINUX=$(usex nfc ON OFF) + -DBUILD_STATIC_LIBS=$(usex static-libs) + -DNFC_LINUX=$(usex nfc) ) cmake_src_configure @@ -54,3 +58,7 @@ src_install() { pkg_postinst() { udev_reload } + +pkg_postrm() { + udev_reload +} |