commit: d5ab7fdfe25e524d9e6fc0aa3de584e68c6b74eb Author: Henning Schild <henning <AT> hennsch <DOT> de> AuthorDate: Sun May 14 19:46:40 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun May 14 19:46:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5ab7fdf
dev-libs/libfido2: drop 1.11.0 Closes: https://github.com/gentoo/gentoo/pull/30445 Closes: https://bugs.gentoo.org/855878 Signed-off-by: Henning Schild <henning <AT> hennsch.de> Signed-off-by: David Seifert <soap <AT> gentoo.org> dev-libs/libfido2/Manifest | 1 - .../files/libfido2-1.11.0-regress-tests.patch | 81 ---------------------- .../libfido2/files/libfido2-1.7.0-cmakelists.patch | 30 -------- dev-libs/libfido2/libfido2-1.11.0.ebuild | 56 --------------- 4 files changed, 168 deletions(-) diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest index d1cd71eea9a5..31a3d15898e3 100644 --- a/dev-libs/libfido2/Manifest +++ b/dev-libs/libfido2/Manifest @@ -1,3 +1,2 @@ -DIST libfido2-1.11.0.tar.gz 624148 BLAKE2B ac123145f22260922e1d83653ba5781c5f41b410760f2c26b7cab7cb0871079aed66a8d9747393843738e4c2ed7ba8ba0292075516ef0354fd4328df967b7a6d SHA512 d9644453d67b84ec8385dfb63796adb3eae2d7f7cb47fbb1bcf9ca7f5cce400623738cc3317d629c2f0af630424cb2788217f8c7f20d1b52b7369c729052d572 DIST libfido2-1.12.0.tar.gz 652326 BLAKE2B e206c9c76e27037c49d3b0e842487b0711559483eb9ae638590bb7175761251c6f60dae6c6dc6cc8b13e49b9f32432ce4368e709b4aacf71f43b760092e3b00d SHA512 ae8c716fe9b2fa52f191c4b3fe61442ba0b7a364a23c6c3a29afdba4f47c5eff89cb1d6c9fcacaefd7d4ebce641d35600527ee33934786c2096ac97f78e9418f DIST libfido2-1.13.0.tar.gz 652777 BLAKE2B 506e0ecf89825e313fbcb0de59ef0b1a3aab483013f959b391448da0600979780ae76807639231ab8a60eead039471bba707073ec4e259b611d67031ac7713f1 SHA512 90f8452cee4c9cc72241478e697c5c692ccff5ab27752f2f296c3623ee297d1f80a85a359b4d0656c67790084c116aac921894e762eb52d3a79056e5014c03e7 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 <[email protected]> -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 <[email protected]> -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.11.0.ebuild deleted file mode 100644 index 34f4ead4ef7b..000000000000 --- a/dev-libs/libfido2/libfido2-1.11.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake udev linux-info - -DESCRIPTION="Provides library functionality for FIDO 2.0" -HOMEPAGE="https://github.com/Yubico/libfido2"; -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" -IUSE="nfc static-libs" - -DEPEND="dev-libs/libcbor:= - dev-libs/openssl:= - sys-libs/zlib:= - virtual/libudev:=" -RDEPEND="${DEPEND} - acct-group/plugdev" - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.0-cmakelists.patch - "${FILESDIR}"/${PN}-1.11.0-regress-tests.patch -) - -pkg_pretend() { - CONFIG_CHECK=" - ~USB_HID - ~HIDRAW - " - - check_extra_config -} - -src_configure() { - local mycmakeargs=( - -DBUILD_EXAMPLES=OFF - -DBUILD_STATIC_LIBS=$(usex static-libs ON OFF) - -DNFC_LINUX=$(usex nfc ON OFF) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules -} - -pkg_postinst() { - udev_reload -}
