From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 91DD815802F for ; Sun, 5 Mar 2023 12:37:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC4F0E0876; Sun, 5 Mar 2023 12:37:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B8FBE0876 for ; Sun, 5 Mar 2023 12:37:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75B3B3413A7 for ; Sun, 5 Mar 2023 12:37:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCC25897 for ; Sun, 5 Mar 2023 12:37:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1678019842.93b66e313c8f85be009ac2c6ee3a70938ee49058.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/oath-toolkit/files/, sys-auth/oath-toolkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/oath-toolkit/Manifest sys-auth/oath-toolkit/files/oath-toolkit-2.6.7-new-xmlsec-tests.patch sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild X-VCS-Directories: sys-auth/oath-toolkit/files/ sys-auth/oath-toolkit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 93b66e313c8f85be009ac2c6ee3a70938ee49058 X-VCS-Branch: master Date: Sun, 5 Mar 2023 12:37:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6b5b5217-1b44-49b7-b660-d999d15dd69c X-Archives-Hash: 430afea107857f65e27175a512f5c2b2 commit: 93b66e313c8f85be009ac2c6ee3a70938ee49058 Author: Sam James gentoo org> AuthorDate: Sun Mar 5 12:35:32 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Mar 5 12:37:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93b66e31 sys-auth/oath-toolkit: add 2.6.7 Bug: https://bugs.gentoo.org/719314 Closes: https://bugs.gentoo.org/683864 Closes: https://bugs.gentoo.org/719310 Closes: https://bugs.gentoo.org/775278 Closes: https://bugs.gentoo.org/827887 Closes: https://bugs.gentoo.org/837791 Closes: https://bugs.gentoo.org/898740 Signed-off-by: Sam James gentoo.org> sys-auth/oath-toolkit/Manifest | 1 + .../oath-toolkit-2.6.7-new-xmlsec-tests.patch | 74 ++++++++++++++++++++++ sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild | 74 ++++++++++++++++++++++ 3 files changed, 149 insertions(+) diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest index 5869f860e046..e8a60334a808 100644 --- a/sys-auth/oath-toolkit/Manifest +++ b/sys-auth/oath-toolkit/Manifest @@ -1 +1,2 @@ DIST oath-toolkit-2.6.2.tar.gz 4295786 BLAKE2B 2b97ab73339647b560b46373922095f18655a167b613b15d4ee2fd507d430025628d20eb111ff1d8025e78646b1d61d9680a7082caba1c75d247bb1d8b9b99dd SHA512 201a702a05a2e9fb3a66d04750e1a34e293342126caf02c344954a0d9fd0daafe73ca7f1fe273be129ae555a29b82b72fa2b4770ea2ad10711924e1926ec2cfb +DIST oath-toolkit-2.6.7.tar.gz 5625279 BLAKE2B 23f377c51eb633bf01d6085d33c7362cd91b6bed1cf4c2bbf32dc9433849e20c53f6896b16e5056b13f420f6a65a3c593fa1dafd7e184ed9e52666d94a7f75d1 SHA512 50edff75c8366887d69cf4740c4cc3bdfc3e43cbd4910ff40f735bca489f0953d7e5a21130f12782ac7a1f2fb00f0db313aff139085f23daba78a69bc7b2eb12 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 new file mode 100644 index 000000000000..a2ad292e19fc --- /dev/null +++ b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.7-new-xmlsec-tests.patch @@ -0,0 +1,74 @@ +https://gitlab.com/oath-toolkit/oath-toolkit/-/commit/0ae59b9c72f69ee21044e736e292b73051df3272 + +From 0ae59b9c72f69ee21044e736e292b73051df3272 Mon Sep 17 00:00:00 2001 +From: Simon Josefsson +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 ++n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4 ++ + + + +--- 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 ++n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4 ++ + + + +--- 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 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 tmp-signed.xml + + diff -ur $pskc_all_signed tmp-signed.xml + +-- +GitLab diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild new file mode 100644 index 000000000000..f8cb28b09ce9 --- /dev/null +++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 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 pskc static-libs test" +REQUIRED_USE="test? ( pskc )" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/icu:= + pam? ( sys-libs/pam ) + pskc? ( + dev-libs/libxml2 + dev-libs/xmlsec + ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-util/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=( + $(use_enable test xmltest) + $(use_enable pam) + $(use_with pam pam-dir $(getpam_mod_dir)) + $(use_enable pskc) + $(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 + + if use pskc; then + doman pskctool/pskctool.1 + fi +}