gentoo resync : 29.12.2022

6 files changed, 96 insertions, 117 deletions

diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 5624459f9d26..e7041fedd4a6 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,8 +1,5 @@
+AUX libfido2-1.11.0-regress-tests.patch 2545 BLAKE2B deed72f2a6237515200371b6f1b066fda27df6ce00325086adcb1065a3c9a70f4f1ce94640dc46b620db716c870f3fab8d6481df5c2a690f039a084665be3e8e SHA512 acca7ae882c4e3715c30161c1ebfdf02428b8749f4ef884f9b66d654b1b943d36edde5578e416d673eb3eae79dc15082526acf6f31c1ceb55fc84be4bc51229f
 AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be1e9c87e9b79dcfbf6fae3179ef618d0ed39a65c89f9d5b89f723bff87e72f2d1fdb1558aeb7946933ec35e6c2c99d247 SHA512 6c4338d82d51b66aa6d16ce6cf74f7101e1529ee6038517300e32c9f50965d029dcb8243f37643afeff9bdbc92032b80a4da24bf98d5bf2565a5c9ae95da1f41
-DIST libfido2-1.10.0.tar.gz 591372 BLAKE2B a4144ede774b90700f4cb1371b2acdba9d3ca8e6e0d68c5670986a1825635ebeb75f03c930da14a4539a9e075bcc5f7cfde7fbcc05e1fa383902ac6739225789 SHA512 ba03e25d3f42f11cec74dee48c853ae35d03600f24ca06d2b751840408a132290fe22461372ae42ae31419061a63d9908c20a2c0cf3c0c9c8dbc46c34916784f
-DIST libfido2-1.8.0.tar.gz 535947 BLAKE2B 48ca29fc1b582b4c915ce3dac2b3c24b1c71b144681f77f13059a599eb5e38b263442abecacad495e28a6fea63fc98c142a32939bb49a521b6a6a8d4ad0f1ff0 SHA512 dbea52a80068323e9945ef7a6e93ab1438bc4347390fc91694a94669900d4ce4abe95e1b6df90fe8b6b2dde6b5d28d9dc0c6b022c24ccb661f28c30c33417999
-DIST libfido2-1.9.0.tar.gz 576088 BLAKE2B 19d2933178011aebf11b44e12550518937b204a40b781ade565bd2852de6d1bbb88dda90f612e852e4561b7a9db6927df9d0a9f0b4c511208f3ab648b2cf1a9f SHA512 99edf9c52a871ed5dc3ab41ac07ca8a22670e7527c48ed69c096f001651e1e714bc3f1f55e22003cb66670fa4e851095834c2acd0e5b31887fad46bfb9f4b089
-EBUILD libfido2-1.10.0.ebuild 1007 BLAKE2B 785a20506432e84e5a868327ce7b9953556fc6a96efdcf17609c513fb5676b3b45a81dd1efb05a66a9a42346178ae70c92eee11163855e6bac545b906127abfd SHA512 7d1be3650c7b09ef3d888022664eff9c2610bf767338529eed6ff48344e42a80c4abb4d79908761c9520985b0935fa55035359753554455b3308195f1b99d5cc
-EBUILD libfido2-1.8.0.ebuild 995 BLAKE2B f072b7bb688f75979af0fab6e848c8e6c654e87112a2cd899663eb06bcce7ed9df8ca902fe534300ad8e111c1f1c49c3612cc6eb44fc34ffb5b4f51e6e648e4d SHA512 85a8f6da7d4c485a1d8495f97866aedb9c5f2b63f2f91c8eb13801bb4b233a8038b6f78af05123d890187c2d2c182e3a1807f8e6c8a7eba8c5be025134a4281a
-EBUILD libfido2-1.9.0.ebuild 1008 BLAKE2B 72b7acb5728033a9254856404e7f6b34e0c61a57a4b88e90297c9a92b9fbf1aa7e66aa9d4b3a1d011f7cd4c4b4aa42898ab4b8fe526da42852710246c799ae66 SHA512 a74fa35fb706e77e353a94c73242db6f733e62a8d98fdbab428a173e8f36cf5685133308b165aa91cd3690559e8085c90ca9326d2eadf51fbb8abab955382dc4
-MISC metadata.xml 331 BLAKE2B dbe587eb713db674febdaa58494979a44bee5a40345ef37ce67fad22e629e73948fd7e66c3109e010a7f2a51c769f5079f70ee3812098b4673eb9a5b7e70e6fe SHA512 355fd46051ca69fa79ea4953a361f8981cc75c0eb77d1e4b9315ffb3de75662660e7072211967d452dbf2ed3d3ba31baa355cafd8dae1c13e245620b0c1e7f86
+DIST libfido2-1.11.0.tar.gz 624148 BLAKE2B ac123145f22260922e1d83653ba5781c5f41b410760f2c26b7cab7cb0871079aed66a8d9747393843738e4c2ed7ba8ba0292075516ef0354fd4328df967b7a6d SHA512 d9644453d67b84ec8385dfb63796adb3eae2d7f7cb47fbb1bcf9ca7f5cce400623738cc3317d629c2f0af630424cb2788217f8c7f20d1b52b7369c729052d572
+EBUILD libfido2-1.11.0.ebuild 1079 BLAKE2B 92af2b2246a9d3fd3f90d684cfd1f57f87b6c3ed8bc4262cf91dd88c39698f184d28a54e743280ddeb206971dcaf1acd9d2f222dd4767f96fa149c86c27dabf5 SHA512 575639ed512a85fd5354350e550d678b20aa981a1099dcdfaa87e281df83a7d143580b71e6d7ffba70046b2b5701300cc2b07e2b48980a76268c69c875d51bc7
+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
new file mode 100644
index 000000000000..391aae014661
--- /dev/null
+++ b/dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch
@@ -0,0 +1,81 @@
+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/libfido2-1.10.0.ebuild b/dev-libs/libfido2/libfido2-1.11.0.ebuild
index 97e040b99ca4..34f4ead4ef7b 100644
--- a/dev-libs/libfido2/libfido2-1.10.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.11.0.ebuild
@@ -11,7 +11,7 @@ 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:=
@@ -22,7 +22,8 @@ RDEPEND="${DEPEND}
 	acct-group/plugdev"
 
 PATCHES=(
-	"${FILESDIR}"/libfido2-1.7.0-cmakelists.patch
+	"${FILESDIR}"/${PN}-1.7.0-cmakelists.patch
+	"${FILESDIR}"/${PN}-1.11.0-regress-tests.patch
 )
 
 pkg_pretend() {
@@ -46,5 +47,10 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
+
 	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
 }
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/dev-libs/libfido2/libfido2-1.8.0.ebuild b/dev-libs/libfido2/libfido2-1.8.0.ebuild
deleted file mode 100644
index c736e0198436..000000000000
--- a/dev-libs/libfido2/libfido2-1.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2021 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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="nfc static-libs"
-
-DEPEND="
-	dev-libs/libcbor:=
-	dev-libs/openssl:0=
-	sys-libs/zlib:0=
-	virtual/libudev:=
-"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/plugdev
-"
-
-PATCHES=(
-	"${FILESDIR}/libfido2-1.7.0-cmakelists.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
-}
diff --git a/dev-libs/libfido2/libfido2-1.9.0.ebuild b/dev-libs/libfido2/libfido2-1.9.0.ebuild
deleted file mode 100644
index 3ff00061a391..000000000000
--- a/dev-libs/libfido2/libfido2-1.9.0.ebuild
+++ /dev/null
@@ -1,54 +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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="nfc static-libs"
-
-DEPEND="
-	dev-libs/libcbor:=
-	dev-libs/openssl:0=
-	sys-libs/zlib:0=
-	virtual/libudev:=
-"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/plugdev
-"
-
-PATCHES=(
-	"${FILESDIR}/libfido2-1.7.0-cmakelists.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
-}
diff --git a/dev-libs/libfido2/metadata.xml b/dev-libs/libfido2/metadata.xml
index db083c992c6a..df607fde9962 100644
--- a/dev-libs/libfido2/metadata.xml
+++ b/dev-libs/libfido2/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="nfc">Enable experimental NFC support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Yubico/libfido2</remote-id>
+	</upstream>
 </pkgmetadata>