diff options
| -rw-r--r-- | sys-auth/oath-toolkit/Manifest | 1 | ||||
| -rw-r--r-- | sys-auth/oath-toolkit/files/oath-toolkit-2.6.7-new-xmlsec-tests.patch | 74 | ||||
| -rw-r--r-- | sys-auth/oath-toolkit/oath-toolkit-2.6.7-r2.ebuild | 69 |
3 files changed, 0 insertions, 144 deletions
diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest index 86f913426be4..9d2a329e23af 100644 --- a/sys-auth/oath-toolkit/Manifest +++ b/sys-auth/oath-toolkit/Manifest @@ -1,4 +1,3 @@ DIST oath-toolkit-2.6.11.tar.gz 4699215 BLAKE2B f3fa3ab1818f4f9bbf7c8c88432cd3432fbfb30dfcc660ab85f07e2d3d7e1616fc24579900bc55bbf72fb81b2eac4a6591553968872f07d8b3955ce4e6495afd SHA512 42df879bebccdde3d38558ba735e09db14d0c916b9f0d3a1842e0ecc80614b7d1ee44db39d3097970a2a7108446da6eefd09bdd32dd2fb81d6aed06dc19552fd DIST oath-toolkit-2.6.12.tar.gz 4706950 BLAKE2B 8bd184fa7166bc35af3bd632d0dd24ae00480f78a850e2ed4f058ec22711852757f01623ede16c8990daa366752578430be7c93a27d87c8ae92faf9a3aade1a1 SHA512 f82967e4b86bac57bec4b048fedd351ca7ae6f368f4b3a61135057c28c531a2c9845b51660dee2a6f5db66d5065619d22921b94229c672d1889077a710a0f0ce -DIST oath-toolkit-2.6.7.tar.gz 5625279 BLAKE2B 23f377c51eb633bf01d6085d33c7362cd91b6bed1cf4c2bbf32dc9433849e20c53f6896b16e5056b13f420f6a65a3c593fa1dafd7e184ed9e52666d94a7f75d1 SHA512 50edff75c8366887d69cf4740c4cc3bdfc3e43cbd4910ff40f735bca489f0953d7e5a21130f12782ac7a1f2fb00f0db313aff139085f23daba78a69bc7b2eb12 DIST oath-toolkit-2.6.9.tar.gz 4693524 BLAKE2B 572512311bbfa18d325c7b9b8d88ff85c05241c9a22942bc67edf531ed621e68b031dc4562bd8473ec1b1bfe264c8a4084c1c304ba0d24914acc5b21325b8601 SHA512 6e96b5a926f6e2448661fef267dcf9c99167b7bdfc71e319d2ab7ddc051a7be002043485547ad83744209c25ea0d87f8e28f25cccd6856281321f3d22e3cf160 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.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 -} |