From 53cba99042fa967e2a93da9f8db806fe2d035543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 17 Feb 2020 01:16:38 +0000 Subject: gentoo resync : 17.02.2020 --- dev-libs/libfido2/Manifest | 5 +++ .../libfido2/files/libfido2-1.3.0-cmakelists.patch | 38 ++++++++++++++++++ .../libfido2-1.3.0-remove-openssh-middleware.patch | 45 ++++++++++++++++++++++ dev-libs/libfido2/libfido2-1.3.0.ebuild | 38 ++++++++++++++++++ dev-libs/libfido2/metadata.xml | 8 ++++ 5 files changed, 134 insertions(+) create mode 100644 dev-libs/libfido2/Manifest create mode 100644 dev-libs/libfido2/files/libfido2-1.3.0-cmakelists.patch create mode 100644 dev-libs/libfido2/files/libfido2-1.3.0-remove-openssh-middleware.patch create mode 100644 dev-libs/libfido2/libfido2-1.3.0.ebuild create mode 100644 dev-libs/libfido2/metadata.xml (limited to 'dev-libs/libfido2') diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest new file mode 100644 index 000000000000..2ba15557e7b5 --- /dev/null +++ b/dev-libs/libfido2/Manifest @@ -0,0 +1,5 @@ +AUX libfido2-1.3.0-cmakelists.patch 1210 BLAKE2B a7b90def3763bc5c07511103c05917009532219dbd5fc2c2ee90e0a8c68251c938d23977449998ea98afa35900813e38b16b230379e5add15fa4ad18851134b9 SHA512 4559b85525247b1e625a4aba404f85e15802a6f75ada0d1b1a3e1c817d434d6e119fb4549147b0aa9c9af9e176f93d176c3f8ae71e4c8fdf7c0cde66ae18445e +AUX libfido2-1.3.0-remove-openssh-middleware.patch 1606 BLAKE2B ad02fe91523187bb7107b22bfb8b140f9ff0f3ec78f1047655e06fe29b5c2fb0e5b0a1d5671e7dc1a770499c2baefeac635024d506432a9c7dcef445ed1a3cfc SHA512 35b916fb6cf937389df05396f3491b5f7326305994585e290c9fdc8b9ff01455c1895ab32e4223ae1be60c0df38f16150c9d3e8799d9b84c16d560cc8a04eef7 +DIST libfido2-1.3.0.tar.gz 1516842 BLAKE2B 18a0036127a9f643ef7ca917dab909bfa344caecdfdef3f1f0881bd7c84b73ea8273a57a2daccc95cc448d7777c389a8f573f663895abd78c48b3340a45f7764 SHA512 9cfb872b898fb6659e0c5e377b5f80738c22dadc4768be02b8cb5e4f4932cb4edde360cd84aac78eb3e3a57d3bc10b4147740a4830d16adcdefe7c48fa460d36 +EBUILD libfido2-1.3.0.ebuild 837 BLAKE2B 87abad59913961b368df1c04eba384cfd6664c30ed9a610fb16865adfe5b67bd6e159d76cf29d4068df373ba890bc0c2baf97ab8abf82af92cfc7524606c6037 SHA512 7d6f4fd58cca39abd52be36bf332c9b659d851b8d51f06cd38030c6a2c149f15655293379d7a7c161b0adbec5a680b9277843e78d035dd3499aae62df16d6f50 +MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 diff --git a/dev-libs/libfido2/files/libfido2-1.3.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.3.0-cmakelists.patch new file mode 100644 index 000000000000..a5a4b721ed0d --- /dev/null +++ b/dev-libs/libfido2/files/libfido2-1.3.0-cmakelists.patch @@ -0,0 +1,38 @@ +diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt +index 71bc502..ac424d2 100644 +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -2,11 +2,12 @@ + # Use of this source code is governed by a BSD-style + # license that can be found in the LICENSE file. + ++include(GNUInstallDirs) ++ + find_program(MANDOC_PATH mandoc) + message(STATUS "MANDOC_PATH: ${MANDOC_PATH}") + + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +- find_program(GZIP_PATH gzip) + message(STATUS "GZIP_PATH: ${GZIP_PATH}") + endif() + +@@ -301,16 +302,16 @@ elseif(NOT MSVC) + foreach(f ${MAN_SOURCES}) + if (${f} MATCHES ".1$") + install(FILES ${CMAKE_BINARY_DIR}/man/${f} +- DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1") ++ DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") + elseif(${f} MATCHES ".3$") + install(FILES ${CMAKE_BINARY_DIR}/man/${f} +- DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man3") ++ DESTINATION "${CMAKE_INSTALL_MANDIR}/man3") + endif() + endforeach() + foreach(i RANGE 0 ${MAN_ALIAS_MAX} 2) + math(EXPR j "${i} + 1") + list(GET MAN_ALIAS ${j} DST) + install(FILES ${CMAKE_BINARY_DIR}/man/${DST}.3 +- DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man3) ++ DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) + endforeach() + endif() diff --git a/dev-libs/libfido2/files/libfido2-1.3.0-remove-openssh-middleware.patch b/dev-libs/libfido2/files/libfido2-1.3.0-remove-openssh-middleware.patch new file mode 100644 index 000000000000..7dec27b861f9 --- /dev/null +++ b/dev-libs/libfido2/files/libfido2-1.3.0-remove-openssh-middleware.patch @@ -0,0 +1,45 @@ +diff --git a/README.adoc b/README.adoc +index 8693417..023f2e9 100644 +--- a/README.adoc ++++ b/README.adoc +@@ -71,18 +71,3 @@ KERNEL=="hidraw*", SUBSYSTEM=="hidraw", \ + On Windows 1903 and newer versions, access to FIDO devices has been restricted + to applications using the operating system's native API. Use of *libfido2* + is still possible in privileged applications. +- +-=== OpenSSH Integration +- +-*libfido2* includes middleware allowing https://www.openssh.com[OpenSSH] to +-talk to U2F/FIDO2 devices. Note that server support is required for +-authentication. In a nutshell: +- +-==== Key Generation +- +- $ ssh-keygen -t [ecdsa-sk|ed25519-sk] -w /path/to/libsk-libfido2.so +- +-==== Authentication +- +- $ ssh-agent -P /path/to/libsk-libfido2.so +- $ ssh-add -S /path/to/libsk-libfido2.so +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index 5f27e88..c44d1df 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -49,17 +49,9 @@ add_executable(fido2-token + ${COMPAT_SOURCES} + ) + +-add_library(sk-libfido2 MODULE sk-libfido2.c) +-set_target_properties(sk-libfido2 PROPERTIES +- COMPILE_FLAGS "-DSK_STANDALONE -DWITH_OPENSSL" +- OUTPUT_NAME sk-libfido2 +-) +- + target_link_libraries(fido2-cred ${CRYPTO_LIBRARIES} fido2_shared) + target_link_libraries(fido2-assert ${CRYPTO_LIBRARIES} fido2_shared) + target_link_libraries(fido2-token ${CRYPTO_LIBRARIES} fido2_shared) +-target_link_libraries(sk-libfido2 ${CRYPTO_LIBRARIES} fido2_shared) + + install(TARGETS fido2-cred fido2-assert fido2-token + DESTINATION ${CMAKE_INSTALL_BINDIR}) +-install(TARGETS sk-libfido2 DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/dev-libs/libfido2/libfido2-1.3.0.ebuild b/dev-libs/libfido2/libfido2-1.3.0.ebuild new file mode 100644 index 000000000000..80fc8d24e085 --- /dev/null +++ b/dev-libs/libfido2/libfido2-1.3.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +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="~amd64 ~ppc64 ~x86" +IUSE="libressl +static-libs" + +DEPEND=" + dev-libs/libcbor:= + virtual/libudev:= + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/libfido2-1.3.0-cmakelists.patch" + + # from upstream git, no longer needed with openssh-8.2 + "${FILESDIR}/libfido2-1.3.0-remove-openssh-middleware.patch" +) + +src_install() { + cmake-utils_src_install + + if ! use static-libs; then + rm -f "${D}/$(get_libdir)"/*.a || die + fi +} diff --git a/dev-libs/libfido2/metadata.xml b/dev-libs/libfido2/metadata.xml new file mode 100644 index 000000000000..4eb20a048df2 --- /dev/null +++ b/dev-libs/libfido2/metadata.xml @@ -0,0 +1,8 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + -- cgit v1.2.3