gentoo auto-resync : 06:10:2024 - 04:27:04

5 files changed, 20 insertions, 154 deletions

diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest
index 83573a95079c..76cde387f0ed 100644
--- a/sys-auth/oath-toolkit/Manifest
+++ b/sys-auth/oath-toolkit/Manifest
@@ -1,12 +1,9 @@
 AUX oath-toolkit-2.6.11-fix-musl-build.patch 639 BLAKE2B da20b1df13643d4c357b4825003e917c891d1c8c6821a00d6eb219e10013e863649a09847906df0cda539644b9d5436565e101aaf850b99921f13c1b7c0440d9 SHA512 00b2541211fcb38e770d27a1d226d759dfce11c5e65acd64175a5124dc197bfcee24094f222daa4bbe84c1c78b78eac5f26aef3930556dcd3072c5cb5e36d4ab
-AUX oath-toolkit-2.6.7-new-xmlsec-tests.patch 2925 BLAKE2B c3e2e52ef75f99276b449d0520a1546a8b492d1572c4d293b7b876cb64661086d195f79a420dd763d8aab06e286c46a542a345178218a5f82e43f7ac6cb92079 SHA512 b99f6601ea2d1072b815e2975ebf352a3b20a185d96686b4abb96036c983e256d51e171fbf3af9df1783261bf0051779655ac6838d720956220696c06abde108
 AUX oath-toolkit-2.6.9-Fix-build-failure-noticed-on-ArchLinux-xmlsec.patch 980 BLAKE2B 467733e2e8a26751ff3a165b734d6d9f2ae621d8e903d51d6811f2b247e8585645e0c9777f040ea4c80ce139877125b919fff40f43273b2300b93290bad73ad8 SHA512 9358b3b507af454943037b6749d4fa4e7f71037702d8dd26a4f85fbcb1a7908076739ce2abe1e04d49227e8626fa4fb72b7fcca33308553701a1efef47a6bf98
-DIST oath-toolkit-2.6.10.tar.gz 4710528 BLAKE2B 2fd3c890214089b47bc4eb5759735cc921ed73f9eb9fa52aa8cc9f329b9887a45dbc0118ca077aecebc38660388d1be29a94d8c87917361def86f3a9378f5d40 SHA512 b9a4447350593c206aabf4dce09273194d5ac499c4f2fca4e36ba77480793898e3011655451d9147748b56c2a8611e04640ba2aec5f4e96fcd9e967b93b1c1b7
 DIST oath-toolkit-2.6.11.tar.gz 4699215 BLAKE2B f3fa3ab1818f4f9bbf7c8c88432cd3432fbfb30dfcc660ab85f07e2d3d7e1616fc24579900bc55bbf72fb81b2eac4a6591553968872f07d8b3955ce4e6495afd SHA512 42df879bebccdde3d38558ba735e09db14d0c916b9f0d3a1842e0ecc80614b7d1ee44db39d3097970a2a7108446da6eefd09bdd32dd2fb81d6aed06dc19552fd
-DIST oath-toolkit-2.6.7.tar.gz 5625279 BLAKE2B 23f377c51eb633bf01d6085d33c7362cd91b6bed1cf4c2bbf32dc9433849e20c53f6896b16e5056b13f420f6a65a3c593fa1dafd7e184ed9e52666d94a7f75d1 SHA512 50edff75c8366887d69cf4740c4cc3bdfc3e43cbd4910ff40f735bca489f0953d7e5a21130f12782ac7a1f2fb00f0db313aff139085f23daba78a69bc7b2eb12
+DIST oath-toolkit-2.6.12.tar.gz 4706950 BLAKE2B 8bd184fa7166bc35af3bd632d0dd24ae00480f78a850e2ed4f058ec22711852757f01623ede16c8990daa366752578430be7c93a27d87c8ae92faf9a3aade1a1 SHA512 f82967e4b86bac57bec4b048fedd351ca7ae6f368f4b3a61135057c28c531a2c9845b51660dee2a6f5db66d5065619d22921b94229c672d1889077a710a0f0ce
 DIST oath-toolkit-2.6.9.tar.gz 4693524 BLAKE2B 572512311bbfa18d325c7b9b8d88ff85c05241c9a22942bc67edf531ed621e68b031dc4562bd8473ec1b1bfe264c8a4084c1c304ba0d24914acc5b21325b8601 SHA512 6e96b5a926f6e2448661fef267dcf9c99167b7bdfc71e319d2ab7ddc051a7be002043485547ad83744209c25ea0d87f8e28f25cccd6856281321f3d22e3cf160
-EBUILD oath-toolkit-2.6.10.ebuild 1450 BLAKE2B 82c661454e51ab8f31828f3cba3adb5d4eed3d30650bd8d0da1dfb2bdbafb4034f150456eb96dd01a1d0c990ff745e4174287c5a34d895f603f1ca77de55bb1b SHA512 c38ca273f4ba52742bfd80b15cd8636844f2ee607f76f77576d74e1205cd0767edb7cee69605e70c5b9f9b4e9965e35bdf2521cd3441f2542efe439ce8c98a06
-EBUILD oath-toolkit-2.6.11.ebuild 1899 BLAKE2B 24c1181bc7b1e3ccfd8054b0052f7691f6f57f7bd87c4d495b7001248f82f33f663319c89c3599a94fd2dda17e6d66222f7a45ba4b68de4f4aac1d967a73d33b SHA512 0efb6e89caa96fa75493c009e85a8abadb2f1a27efb3dc7bcf19f61791b01bb127c7058dc3a048c1810c529161fb63c045127f3a53bec82bbb03329d770de84e
-EBUILD oath-toolkit-2.6.7-r2.ebuild 1436 BLAKE2B 27390c345e0b42f7b42c0ef5866087945b59c5d0cb80a8d7d528aa70939ea470c4e4e1fef963dbd3c8a68a4f558b04f5f06189254c93b5586037fdce6ad8f39a SHA512 cadc1c5f8370d3124fbea92844255cdc01bec0f075d15cda0dfe7be7f18412b14f5329e30ddd894107e5396d718a170968ace6a67f30c7b716487298b2eeb995
+EBUILD oath-toolkit-2.6.11.ebuild 1895 BLAKE2B 8cae439af65e0e82670f0fda0cf312d91d6cb3637e8b62d72bc5e3c3bc9366da0e1887d1b2e31769e3a0847911cb07df905549fa372a4427c5fbf30c1e398206 SHA512 66414e86916e8e7dd65bfc3eb1dc3190a4b3db2f285e131c15d895b19604b3a0aa1c4148dae9405e67cc54a80fc01948c0cdcfba56da7addf1537dba91cc8da2
+EBUILD oath-toolkit-2.6.12.ebuild 1824 BLAKE2B d37c0252d797e77f9480df86f3b1261c91b29b6bfbd0acb9e57fadd44694c4b11cbf4aceb6338318f186e7336f3ba2dceaa2b708674653c1661d477b441cc20b SHA512 ea3be47f25e5e0f93962c9a041516f9d881f2c33626a88e40e02cf78ba835ef8da7e94d4f343f9cf6eb2244a370f79299a53bcd6f62f9cdb8bb4694b26ec7348
 EBUILD oath-toolkit-2.6.9.ebuild 1494 BLAKE2B 02ce27e6952f50a51a944d616520f447c89bcc219feaee3c75d30b64f7a525d081327378d2bd63d8c710fd8fee6bb29412d2c0cdb65fa00511e5d6b7c43f3572 SHA512 1a33a99b6dbc3d4d0dcd36e109f853ca7afa128bca7ba2e9ff84e78a5759da95b4f376d75159d650497f2736f30597ca3fd33fe7d2eb2dab4905901d48a89746
 MISC metadata.xml 592 BLAKE2B c5428eac278df13bc3cf23e1d5dce5ac4802a262d9f586574035a54af1e0b70547d9ce645636159e3f0cd8942bd77fb4e4f2253ba962d373189ea17f209dc824 SHA512 ed86f998c76cbe3bbcf2e1efa7c91cca0d3872530b6194f8534ff41da407bb8b642c6742fae5a65f2fc216144c977ca33c1b7f414872e5e23c3862b01c256a43
diff --git a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.7-new-xmlsec-tests.patch b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.7-new-xmlsec-tests.patch
deleted file mode 100644
index a2ad292e19fc..000000000000
--- a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.7-new-xmlsec-tests.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://gitlab.com/oath-toolkit/oath-toolkit/-/commit/0ae59b9c72f69ee21044e736e292b73051df3272
-
-From 0ae59b9c72f69ee21044e736e292b73051df3272 Mon Sep 17 00:00:00 2001
-From: Simon Josefsson <simon@josefsson.org>
-Date: Sat, 12 Nov 2022 21:42:17 +0100
-Subject: [PATCH] Handle new libxmlsec on ArchLinux.
-
---- a/libpskc/examples/pskc-hotp-signed.xml
-+++ b/libpskc/examples/pskc-hotp-signed.xml
-@@ -38,7 +38,8 @@ rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dLNsi76TNGDqsjTKgEcSIYI6Vd
- rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
- CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
- TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
--n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4</X509Certificate>
-+n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
-+</X509Certificate>
- </X509Data>
- </KeyInfo>
- </Signature></KeyContainer>
---- a/pskctool/tests/pskc-all-signed.xml
-+++ b/pskctool/tests/pskc-all-signed.xml
-@@ -38,7 +38,8 @@ rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dLNsi76TNGDqsjTKgEcSIYI6Vd
- rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
- CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
- TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
--n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4</X509Certificate>
-+n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
-+</X509Certificate>
- </X509Data>
- </KeyInfo>
- </Signature></KeyContainer>
---- a/pskctool/tests/tst_libexamples.sh
-+++ b/pskctool/tests/tst_libexamples.sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
- # tst_libexamples.sh - keep pskctool output in GTK-DOC manual up to date
--# Copyright (C) 2012-2021 Simon Josefsson
-+# Copyright (C) 2012-2022 Simon Josefsson
- 
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -45,7 +45,8 @@ fi
- 
- $PSKCTOOL --sign --sign-key $srcdir/pskc-ee-key.pem \
-     --sign-crt $srcdir/pskc-ee-crt.pem \
--    $srcdir/../../libpskc/examples/pskc-hotp.xml > foo
-+    $srcdir/../../libpskc/examples/pskc-hotp.xml \
-+    | sed 's,4</X509Cert,4\n</X509Cert,' > foo
- if ! diff -ur $srcdir/../../libpskc/examples/pskc-hotp-signed.xml foo; then
-     echo "FAIL: pskctool --sign output change, commit updated file."
-     exit 1
---- a/pskctool/tests/tst_sign.sh
-+++ b/pskctool/tests/tst_sign.sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
- # tst_sign.sh - test that pskctool can sign and verify
--# Copyright (C) 2012-2021 Simon Josefsson
-+# Copyright (C) 2012-2022 Simon Josefsson
- 
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -32,7 +32,7 @@ $PSKCTOOL --info --strict --debug $pskc_all > tmp-pre-human.txt
- $PSKCTOOL --sign \
-     --sign-key $pskc_ee_key \
-     --sign-crt $pskc_ee_crt \
--    $pskc_all > tmp-signed.xml
-+    $pskc_all | sed 's,4</X509Cert,4\n</X509Cert,' > tmp-signed.xml
- 
- diff -ur $pskc_all_signed tmp-signed.xml
- 
--- 
-GitLab
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild
index b82f773e2a74..97c809055a1a 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc64 ~riscv x86"
 IUSE="pam static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.10.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.12.ebuild
index 03d2801fa64c..6cd540afa540 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.10.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc64 ~riscv x86"
 IUSE="pam static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -27,13 +27,25 @@ BDEPEND="
 	test? ( dev-libs/libxml2 )
 "
 
+# fpurge is from gnulib, and unused as of 2.6.11
 QA_CONFIG_IMPL_DECL_SKIP=(
 	MIN # glibc fp
-	unreachable
 	alignof
+	fpurge
 	static_assert
+	unreachable
 )
 
+src_prepare() {
+	default
+
+	# After patching, we have to fix the mtime on libpskc/global.c so
+	# that it doesn't cause Makefile.gdoc to be rebuilt so that it
+	# doesn't cause Makefile.in to be rebuilt so that it doesn't try to
+	# run automake-1.16.5 for no reason. Bug 936309.
+	touch --reference=libpskc/errors.c libpskc/global.c || die
+}
+
 src_configure() {
 	local myeconfargs=(
 		--cache-file="${S}"/config.cache
@@ -48,9 +60,9 @@ src_configure() {
 }
 
 src_test() {
-	# Without keep-going, it will bail out after the first testsuite failure,
+	# Without -k, it will bail out after the first testsuite failure,
 	# skipping the other testsuites. as they are mostly independent, this sucks.
-	emake --keep-going check
+	emake -k check
 
 	# Avoid errant QA notice for no tests run on these
 	rm -f libpskc/gtk-doc/test-suite.log liboath/gtk-doc/test-suite.log || die
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.7-r2.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.7-r2.ebuild
deleted file mode 100644
index 58b88b4c38a6..000000000000
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.7-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pam
-
-DESCRIPTION="Toolkit for using one-time password authentication with HOTP/TOTP algorithms"
-HOMEPAGE="https://www.nongnu.org/oath-toolkit/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="pam static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/icu:=
-	dev-libs/libxml2
-	<dev-libs/xmlsec-1.3.0:=
-	pam? ( sys-libs/pam )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-build/gtk-doc-am
-	test? ( dev-libs/libxml2 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-new-xmlsec-tests.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	MIN # glibc fp
-)
-
-src_configure() {
-	local myeconfargs=(
-		--enable-pskc
-		$(use_enable test xmltest)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Without keep-going, it will bail out after the first testsuite failure,
-	# skipping the other testsuites. as they are mostly independent, this sucks.
-	emake --keep-going check
-
-	# Avoid errant QA notice for no tests run on these
-	rm -f libpskc/gtk-doc/test-suite.log liboath/gtk-doc/test-suite.log || die
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	if use pam; then
-		newdoc pam_oath/README README.pam
-	fi
-
-	doman pskctool/pskctool.1
-}