[gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/files/, sys-auth/yubico-piv-tool/

[Marek Szuba]

commit:     49a886b5b1edaf072997429f3664695932e05381
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 00:58:36 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 01:01:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a886b5

sys-auth/yubico-piv-tool: drop 2.2.1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 sys-auth/yubico-piv-tool/Manifest                  |  1 -
 .../files/yubico-piv-tool-2.1.1-no-Werror.patch    | 11 -----
 .../files/yubico-piv-tool-2.2.1-openssl3.patch     | 32 -------------
 .../yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild   | 53 ----------------------
 4 files changed, 97 deletions(-)

diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index a255bd8c44b4..6ed18642fc2e 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,2 +1 @@
-DIST yubico-piv-tool-2.2.1.tar.gz 1310253 BLAKE2B f5e5d2c351200b2fc57aafdd02a604ee5f15cd8f1a0cb552133a367da2cbf7fe248ec9eba649427b30e8322126be1f9677fd471b38db1f00cda37ccb0ac413c9 SHA512 495a269194d8d9d8957542611959b3fc8e0ae54d1cab5c041f2604590cc740e89e0956b9d595f8a06f138e92b8804def52aae797f199479a81fc1fc3d57bfb96
 DIST yubico-piv-tool-2.3.0.tar.gz 1329085 BLAKE2B b084982139012b4993a023078fd8ce7c106cb5c1e71475f26398012b86fc65e985a7c51300b3b122884e35327293737ed48b31bfdc83326dda9c9c05f2eb984d SHA512 72125df922e32322563e95286e04d19e56db9c6e66ae9003ae7dfffac47425b8b2bc7c71ecfa603f96f3a24c985fca1f436580dc579ff44196dcde7aeceee7f3

diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-no-Werror.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-no-Werror.patch
deleted file mode 100644
index a177395bc751..000000000000
--- a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-no-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -97,7 +97,7 @@
-     find_package (PkgConfig REQUIRED)
- 
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") # -g -O2
--    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
-+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
-     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")

diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch
deleted file mode 100644
index 5ba807ea0c6c..000000000000
--- a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 81b063f53db8a3d74077522a6ff4f1640cc3fe70 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cal@××××××××.org>
-Date: Sun, 14 Nov 2021 18:21:28 +0100
-Subject: [PATCH] Avoid header include guard conflict with OpenSSL 3
-
-OpenSSL 3.x ships an openssl/types.h header that's protected with an
-OPENSSL_TYPES_H include guard macro. OpenSSL's headers fail to parse
-when ykcs11/openssl_types.h defines this symbol.
-
-Switch the include guard for the file to YKCS11_OPENSSL_TYPES_H to
-prevent this from happening.
-
-Signed-off-by: Clemens Lang <cal@××××××××.org>
----
- ykcs11/openssl_types.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ykcs11/openssl_types.h b/ykcs11/openssl_types.h
-index c526d815..f3e1a7c0 100644
---- a/ykcs11/openssl_types.h
-+++ b/ykcs11/openssl_types.h
-@@ -28,8 +28,8 @@
-  *
-  */
- 
--#ifndef OPENSSL_TYPES_H
--#define OPENSSL_TYPES_H
-+#ifndef YKCS11_OPENSSL_TYPES_H
-+#define YKCS11_OPENSSL_TYPES_H
- 
- #include <openssl/bn.h>
- #include <openssl/x509.h>

diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild
deleted file mode 100644
index c50d506fb8d8..000000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Command-line tool and p11-kit module for the YubiKey PIV application"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/2"
-KEYWORDS="amd64 ~riscv"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/pcsc-lite
-	dev-libs/openssl:=[-bindist(-)]"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-BDEPEND="dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.1-no-Werror.patch
-	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
-	"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
-	"${FILESDIR}"/${PN}-2.2.1-openssl3.patch
-)
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	# As of 2.2.0, man pages end up in /usr/usr/... without the MANDIR override
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIB=OFF
-		-DBUILD_TESTING=$(usex test)
-		-DCMAKE_INSTALL_MANDIR="share/man"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	echo "module: ${EPREFIX}/usr/$(get_libdir)/libykcs11.so" > ${PN}.module \
-		|| die "Failed to generate p11-kit module configuration"
-	insinto /usr/share/p11-kit/modules
-	doins ${PN}.module
-}