gentoo resync : 25.04.2020

5 files changed, 60 insertions, 8 deletions

diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 380432d9185e..ae62e85d806e 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,7 +1,9 @@
 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
+AUX libfido2-1.3.1-no-werror.patch 736 BLAKE2B 5eecbff49108683d77ee284d67425ff846028067ec757916422aa9c833594fe5207fe398fbf61261d4b0554fce9442d368a83be7e52bbfbabb5ae0cff0906932 SHA512 5532e3ea9be09284582e3217c2567a35bdef8c0f8efa54b172cd21e91adb61770c42632f386b0adc70d75842bc570f6b55c041bd3ef7c538ddb88e51ff20891f
+AUX libfido2-1.4.0-cmakelists.patch 1247 BLAKE2B c290dfdb1f25b241b1a51725d568169210890c67d61ea314c84100f4c0810f84cad540361105ddd3c36e1b8130eaa4d1c8c72e11b9bdc1518349eb80356a5eaf SHA512 5272d57fd384b9454c8385362a833d99e78b2f09f5fa30521d8750191800514c6322d1b5edf5bc239ff59d136a4200dbe9450180e8a8738741db0c18457b6709
 DIST libfido2-1.3.1.tar.gz 1512676 BLAKE2B f69a04fc69c46b688d83afe9d72b2fb1860ac00a09665d55e25293595520e95d45486ecc5355c479bc8bc06dbe6ed4fd469c511f5bf5f341a0ec86cb099fce28 SHA512 fc56f7bcddd7ae0f950b4e94f08ad726f7de68b975c0bdcbca98c7932c2c3d2e2a51b30eaf41e8dba08e82af3926cbed44264244ae721902af46e47df9fcbe1b
-EBUILD libfido2-1.3.0-r1.ebuild 989 BLAKE2B 5894629d1c22d311bf27e5563f88a9ba4666f800a9c61dbf18cecb0042a18adf15a855a7965569e66695b5548f8704ea695467f72ef33cc71b6aa730a51eb635 SHA512 40e8ae45897fc44183b25414e2ed4de23ed80dd2b1553ddb145984f8130f45b0c25f145549b9e69b68072e7c7c247e2b9b20086d44ba52241c7b7f9569979a2d
-EBUILD libfido2-1.3.1.ebuild 880 BLAKE2B b415a97a5d3dea84b39ecffcd348f3cefea3b9dbe125e6b4227c333bfd3825cec2cf821d8039749db150321a47d0f02c4b835ad86d1f95ebe8b5a9b746674c3d SHA512 fbb26370067c121d13fc948212dcda35cf498368e20c17ea88e1abd51d1517d9b9e88c66288b6ba1595b80599a36cc67cb76b5e00f74fe8bb7cd7259e0f556b0
+DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B d45ff3e1a5605c5ea4c5bddbe423bb69e6237e7a359fcc58469a86c503c934ce4491b98fdd673130d419cabe09acab7e201592f923ffe3908568b2b0888ae32a SHA512 5cf2f2d70bdba893fd33bf3ca91940c7eded5ed1728b517ff3fc46cbde58bf64f16da4104138b20dcea1d9a1cec730e532bc4938cdcba4ad86343e51a1c3c513
+EBUILD libfido2-1.3.1.ebuild 926 BLAKE2B c5f312bba979b24d41a7c62efb6404974e1fffdce9f83dee419ced2afdc98c8039b477eba994c6205d4b25826eb7b048d2f6489bacae158d5261d20485eca663 SHA512 0d108575faaf6af6adb53812b72dc2479068f7be72bded5564dd2f54a6545e7ceed12bbe7fae70530e49c8fd7c5e4f346e6cc3eee1e2406cc580a49eff23e4c4
+EBUILD libfido2-1.4.0.ebuild 880 BLAKE2B 210c2bd35e4992afb558cca76c03319d29c848bb834e6a7e975d283b765c2880eb7652e24ff9a0b1833e9c51613fcf45b732abb69c758374c4700ec277454fef SHA512 1662eb32ef4fdbf12ae997b720caeb93b05a01d692390d37da7c0d032a739b2c71fe4c32c716d6c3b3598da8516b4f30484c1cfd6cef2b515c07e3667affc4f7
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch b/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch
new file mode 100644
index 000000000000..d2ebc1a54a1b
--- /dev/null
+++ b/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9481c46..b347fab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,13 +107,11 @@ else()
+ 
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+ 
diff --git a/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch
new file mode 100644
index 000000000000..df34a85dacc2
--- /dev/null
+++ b/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0bb2e87..4d0ed00 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,13 +128,11 @@ else()
+
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
+ 	check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
+ 	if(HAVE_STACK_PROTECTOR_ALL)
+ 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
+diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
+index 44e4a96..d04dacc 100644
+--- a/man/CMakeLists.txt
++++ b/man/CMakeLists.txt
+@@ -5,11 +5,6 @@
+ find_program(MANDOC_PATH mandoc)
+ message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
+
+-if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+-	find_program(GZIP_PATH gzip)
+-	message(STATUS "GZIP_PATH: ${GZIP_PATH}")
+-endif()
+-
+ list(APPEND MAN_SOURCES
+ 	eddsa_pk_new.3
+ 	es256_pk_new.3
diff --git a/dev-libs/libfido2/libfido2-1.3.1.ebuild b/dev-libs/libfido2/libfido2-1.3.1.ebuild
index bd76b0619811..eb279f392c54 100644
--- a/dev-libs/libfido2/libfido2-1.3.1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.3.1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/libfido2-1.3.0-cmakelists.patch"
+	"${FILESDIR}/libfido2-1.3.1-no-werror.patch"
 )
 
 pkg_pretend() {
diff --git a/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild b/dev-libs/libfido2/libfido2-1.4.0.ebuild
index ca7036d3d103..41493d5b2f7a 100644
--- a/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.4.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="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="libressl +static-libs"
 
 DEPEND="
@@ -23,10 +23,7 @@ DEPEND="
 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"
+	"${FILESDIR}/libfido2-1.4.0-cmakelists.patch"
 )
 
 pkg_pretend() {