Adding metadata

17 files changed, 303 insertions, 157 deletions

diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index 6926a590d3b4..1cbc9435b472 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -1,3 +1,2 @@
-DIST pam_mount-2.20.tar.xz 325328 BLAKE2B 2b8a419c8b8604a6546ee5ac2b554d3c90ad04dd58c54bf8904d7e0354a2aafe1ae97a817e67143a24fd8ed40e62008baff94723ced8c4ad2d977e14c3e762ad SHA512 8661dc5ec134c256825df28e53751d1e0e1e881008c3687a56009f4046b3d17c5b9ddd1b1971dff4e023e5d74e5059f486b08a6cab2861a4bee5ba57fbae3454
-DIST pam_mount-2.21.tar.zst 336103 BLAKE2B 3e4e300d28d4936e9b24ddb3a13855ced3e6db99c09b2d8237306becf883b837b7e8f56b9d9656f9ac1d961face006d03f8efd39c4f1f2ed51c1d57118ce9358 SHA512 f14cbd870e6a663ad9011905c3aaed7a8a223be7fad2ff650c292ea87299b65a2f43597c4481b57ce5c8db1b53d719e20b7ef7f8a82ce413e91926f4bfddd62a
+DIST pam_mount-2.21.tar.gz 112434 BLAKE2B faacb5986d1d418ece72f626a0aca3c0bda848791994cd17ce439c635587faeca3205806f9b119fa4fb964baa189b0fa9aaaabb9d61bc5d1a290d68324d5d7ce SHA512 8f73bfd74752dc2648f814bca44d486a49843574510daabd234f46aad34ccec98b4c877ad128135c1ae5c3f682ac12eb74bb0549209a4ef37ddd201dcc642f26
 DIST pam_mount-2.22.tar.zst 336109 BLAKE2B 4bb91a87bd3f74e44027cd8fd9d539576d9603f87892d0caa9e045b3fd6c6857e7297b90f1b54d841d4c33f060a0dbb74e3e62886e758c49ea54b9b39939552a SHA512 81a26737aa5c091df1a4775b25479400f9a873b053f904e9c66993aa83d7fd7af0762caf30b5bcb4878167acb48db95cd8ecf6872e08ba09eec4814eef071a8a
diff --git a/sys-auth/pam_mount/files/pam_mount-2.22-oldgcc.diff b/sys-auth/pam_mount/files/pam_mount-2.22-oldgcc.diff
deleted file mode 100644
index 5aa24227ac95..000000000000
--- a/sys-auth/pam_mount/files/pam_mount-2.22-oldgcc.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Compatibility with gcc 13 (pre-C23), see:
-https://codeberg.org/jengelh/pam_mount/commit/64dfcc87ccb6f7b0243b206524f7ea9aa9c59bc8
-
-diff --git a/src/pam_mount.h b/src/pam_mount.h
-index 61395f7..f547d8c 100644
---- a/src/pam_mount.h
-+++ b/src/pam_mount.h
-@@ -14,6 +14,9 @@
- #else
- #	define EXPORT_SYMBOL
- #endif
-+#if defined(__STDC_VERSION__) && __STDC_VERSION__ < 202300L
-+#	define nullptr NULL
-+#endif
- 
- #define sizeof_z(x) (sizeof(x) - 1)
- 
diff --git a/sys-auth/pam_mount/metadata.xml b/sys-auth/pam_mount/metadata.xml
index c6eb48b47eb8..1657fa192027 100644
--- a/sys-auth/pam_mount/metadata.xml
+++ b/sys-auth/pam_mount/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
   <maintainer type="person">
     <email>hanno@gentoo.org</email>
   </maintainer>
diff --git a/sys-auth/pam_mount/pam_mount-2.20.ebuild b/sys-auth/pam_mount/pam_mount-2.20.ebuild
deleted file mode 100644
index 9c0644d8165a..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.20.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="https://inai.de/projects/pam_mount/"
-SRC_URI="https://inai.de/files/pam_mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="crypt ssl selinux"
-
-DEPEND="
-	>=sys-libs/pam-0.99
-	>=sys-libs/libhx-3.12.1:=
-	>=sys-apps/util-linux-2.20:=
-	>=dev-libs/libxml2-2.6:=
-	dev-libs/libpcre2
-	crypt? ( >=sys-fs/cryptsetup-1.1.0:= )
-	ssl? ( dev-libs/openssl:0= )
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" \
-			$(use_with crypt cryptsetup) \
-			$(use_with ssl crypto) \
-			$(use_with selinux)
-}
-
-src_install() {
-	default
-	use selinux || rm -r "${D}"/etc/selinux
-	dodoc doc/*.txt
-
-	# Remove unused nonstandard run-dir, current version uses
-	# FHS-compatible /run, but has leftover mkdir from old version
-	# Upstream report: https://codeberg.org/jengelh/pam_mount/pulls/9
-	rm -r "${D}/var/lib"
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-auth/pam_mount/pam_mount-2.21.ebuild b/sys-auth/pam_mount/pam_mount-2.21.ebuild
index 10095be9765b..20b7f4c2d5a4 100644
--- a/sys-auth/pam_mount/pam_mount-2.21.ebuild
+++ b/sys-auth/pam_mount/pam_mount-2.21.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 2022-2025 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-inherit unpacker
+inherit autotools
 
 DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="https://inai.de/projects/pam_mount/"
-SRC_URI="https://inai.de/files/pam_mount/${P}.tar.zst"
+HOMEPAGE="https://sourceforge.net/projects/pam-mount/"
+SRC_URI="https://codeberg.org/jengelh/pam_mount/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -17,16 +16,25 @@ IUSE="crypt ssl selinux"
 
 DEPEND="
 	>=sys-libs/pam-0.99
-	>=sys-libs/libhx-5.0:=
+	>=sys-libs/libhx-4.28:=
 	>=sys-apps/util-linux-2.20:=
 	>=dev-libs/libxml2-2.6:=
-	dev-libs/libpcre2
+	>=dev-libs/libpcre-7:=
 	crypt? ( >=sys-fs/cryptsetup-1.1.0:= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? (
+		dev-libs/openssl:0=
+
+	)
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig
-	$(unpacker_src_uri_depends)"
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf --with-slibdir="/$(get_libdir)" \
@@ -40,5 +48,9 @@ src_install() {
 	use selinux || rm -r "${D}"/etc/selinux
 	dodoc doc/*.txt
 
+	# Remove unused nonstandard run-dir, current version uses
+	# FHS-compatible /run, but has leftover mkdir from old version
+	rm -r "${D}/var/lib"
+
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-auth/pam_mount/pam_mount-2.22.ebuild b/sys-auth/pam_mount/pam_mount-2.22.ebuild
index 3e1a9b910fea..b1a6782eb3a4 100644
--- a/sys-auth/pam_mount/pam_mount-2.22.ebuild
+++ b/sys-auth/pam_mount/pam_mount-2.22.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2022-2025 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
 inherit unpacker
 
 DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="https://inai.de/projects/pam_mount/"
-SRC_URI="https://inai.de/files/pam_mount/${P}.tar.zst"
-
-PATCHES=( "${FILESDIR}/pam_mount-2.22-oldgcc.diff" )
+HOMEPAGE="https://sourceforge.net/projects/pam-mount/"
+SRC_URI="https://codeberg.org/jengelh/pam_mount/archive/v${PV}.tar.zst -> ${P}.tar.zst"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="crypt ssl selinux"
 
@@ -22,13 +19,20 @@ DEPEND="
 	>=sys-libs/libhx-5.0:=
 	>=sys-apps/util-linux-2.20:=
 	>=dev-libs/libxml2-2.6:=
-	dev-libs/libpcre2
+	>=dev-libs/libpcre-7:=
 	crypt? ( >=sys-fs/cryptsetup-1.1.0:= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? (
+		dev-libs/openssl:0=
+
+	)
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig
-	$(unpacker_src_uri_depends)"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf --with-slibdir="/$(get_libdir)" \
@@ -42,5 +46,9 @@ src_install() {
 	use selinux || rm -r "${D}"/etc/selinux
 	dodoc doc/*.txt
 
+	# Remove unused nonstandard run-dir, current version uses
+	# FHS-compatible /run, but has leftover mkdir from old version
+	rm -r "${D}/var/lib"
+
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-auth/pam_u2f/Manifest b/sys-auth/pam_u2f/Manifest
index 43c0179c7b3f..fede49a9e720 100644
--- a/sys-auth/pam_u2f/Manifest
+++ b/sys-auth/pam_u2f/Manifest
@@ -1 +1,2 @@
+DIST pam_u2f-1.3.2.tar.gz 475593 BLAKE2B 5cc812c7471d2b7b70af85219a50b8fd146a0590cc2fb7ac5ab35b817bc93e0f173cda19658938615d4982bf39ca8a57817766b9bd8b30b507e047d579f9c7f3 SHA512 0233740c4712006d24e65a45c0eca59fc642c5c6b65fdaec66a8d898f926dbd1f770792e447da12b91d098bda4114957f7e10dd8cfbdfaf9e4c5524fadceb0e2
 DIST pam_u2f-1.4.0.tar.gz 486434 BLAKE2B 8814ffc1f56f1d280ce50f1ff13612c083133a43443b0bfdc18eb7351aeab3c3607d70bb39a5bfe4cd8d8961e9e0576a014627e7a33adb7ea07d0ddde71eb08c SHA512 6ee4c5538a3b290748fae3b8c285b20a784fe2c0fdeff3a0bf250ec9b03659c6ddda4ea2d668c93d606f810e4f68cf3fc4130584a8532db9c9833a684d78f51f
diff --git a/sys-auth/pam_u2f/metadata.xml b/sys-auth/pam_u2f/metadata.xml
index 061a9c454b3d..e65d267a5b6c 100644
--- a/sys-auth/pam_u2f/metadata.xml
+++ b/sys-auth/pam_u2f/metadata.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>henning@hennsch.de</email>
-    <name>Henning Schild</name>
+  <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>gokturk@gentoo.org</email>
+    <name>Göktürk Yüksek</name>
   </maintainer>
   <upstream>
+    <remote-id type="cpe">cpe:/a:yubico:pam-u2f</remote-id>
     <bugs-to>https://github.com/Yubico/pam-u2f/issues</bugs-to>
   </upstream>
+  <use>
+    <flag name="debug">Enable debug messages using the pam logging macros. (Note: these will be visible on stdout for terminal logins).</flag>
+    <flag name="debug">Enable debug messages using the pam logging macros.</flag>
+  </use>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/sys-auth/pam_u2f/pam_u2f-1.3.2.ebuild b/sys-auth/pam_u2f/pam_u2f-1.3.2.ebuild
new file mode 100644
index 000000000000..396e6655dccd
--- /dev/null
+++ b/sys-auth/pam_u2f/pam_u2f-1.3.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2025 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="PAM module for FIDO2 and U2F keys"
+HOMEPAGE="https://github.com/Yubico/pam-u2f"
+SRC_URI="https://developers.yubico.com/${PN/_/-}/Releases/${P}.tar.gz"
+
+LICENSE="BSD ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug "
+
+DEPEND="
+	dev-libs/libfido2:0=
+	dev-libs/openssl:0=
+
+	sys-libs/pam"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	use debug || append-cppflags -UDEBUG_PAM -UPAM_DEBUG
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-pam-dir=$(getpam_mod_dir)
+}
diff --git a/sys-auth/pam_u2f/pam_u2f-1.4.0.ebuild b/sys-auth/pam_u2f/pam_u2f-1.4.0.ebuild
index 5f4fec988386..396e6655dccd 100644
--- a/sys-auth/pam_u2f/pam_u2f-1.4.0.ebuild
+++ b/sys-auth/pam_u2f/pam_u2f-1.4.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 2021-2025 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-inherit cmake pam
+inherit autotools flag-o-matic pam
 
 DESCRIPTION="PAM module for FIDO2 and U2F keys"
 HOMEPAGE="https://github.com/Yubico/pam-u2f"
@@ -11,31 +10,23 @@ SRC_URI="https://developers.yubico.com/${PN/_/-}/Releases/${P}.tar.gz"
 
 LICENSE="BSD ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug "
 
 DEPEND="
-	dev-libs/libfido2:=
-	dev-libs/openssl:=
-	sys-libs/pam
-"
+	dev-libs/libfido2:0=
+	dev-libs/openssl:0=
+
+	sys-libs/pam"
 RDEPEND="${DEPEND}"
-BDEPEND="app-text/asciidoc"
+BDEPEND="virtual/pkgconfig"
 
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_DIR=$(getpam_mod_dir)
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DBUILD_TESTING=ON
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_TESTING=OFF
-		)
-	fi
+src_prepare() {
+	default
+	use debug || append-cppflags -UDEBUG_PAM -UPAM_DEBUG
+	eautoreconf
+}
 
-	cmake_src_configure
+src_configure() {
+	econf --with-pam-dir=$(getpam_mod_dir)
 }
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 4c9995bb5d12..bb755485c50a 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,4 +1,2 @@
 DIST yubico-piv-tool-2.7.2.tar.gz 1364476 BLAKE2B 2609b812937d3080e83b3800ce283038bb20d741965309228ae71e9100455341b3670bee9e004c3fbe0183d7b2389761f3619c4e3b78c5ca00ba5b6bae9ec3ad SHA512 8a809ac77a763e19bcc0ec983ca5aaa34077fd8d57522fe180596b4b36107cb361df8c590821d33b2f0693094001e17372934687e4446c366e475ef74c27e56c
-DIST yubico-piv-tool-2.7.2.tar.gz.sig 566 BLAKE2B 89fc09b126c662a4fa8a9a05a788d561f94ddf06a69dbe1d490cf671d6a0991ddddfeb1c8f3b88fc2d9d812b685dbe7b15e0f95a5518a4ecf697152262e6f6f6 SHA512 8f7c70d54a1289c5fb7569400adfec16833d6fa2f13c62fff9b342b19a72ce5d621e9e6a019f01c5753b4307b1f7026d438afd649ec547f91c53861b5292b947
 DIST yubico-piv-tool-2.7.3.tar.gz 2162834 BLAKE2B 3980c7df15190fef1002252a9133bda130216d4d7eafc4ca1f9515eb57355a27faafb868b984b16e89089fe63ed76b7155d9882635834974a14189222e711df4 SHA512 2bac8a875c7c5c3d1e5e8ec84fc70b37fc5b08985ef7ef96f6a9eaf5be882eeb9b1dbfb6cc0d6f5c00586f625cefa38c2d34d0e5aef5164be7274162af3554b8
-DIST yubico-piv-tool-2.7.3.tar.gz.sig 566 BLAKE2B 29822d6cafee3cd2ecc53c2552cf45ab6bf66e27194880bb7af4252975472a5c3f475ed6bd24da437504cea094c74f92d1ffab3d5ba2fcbba852b778e9b01c32 SHA512 3929526a0013aea2eedfcc8ff6d21d96a42ff2cac791daf03f4e7783b72a8a3934d78bca65caa29f266df00008b9652c9babd4b168ba5bbd04cdd2e20e0753ea
diff --git a/sys-auth/yubico-piv-tool/files/yubico-openssl-compat.patch b/sys-auth/yubico-piv-tool/files/yubico-openssl-compat.patch
new file mode 100644
index 000000000000..4cd817d5160c
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-openssl-compat.patch
@@ -0,0 +1,31 @@
+diff -urN yubico-piv-tool-yubico-piv-tool-2.3.0.orig/common/openssl-compat.c yubico-piv-tool-yubico-piv-tool-2.3.0/common/openssl-compat.c
+--- yubico-piv-tool-yubico-piv-tool-2.3.0.orig/common/openssl-compat.c	2022-03-31 00:01:41.006586972 +0200
++++ yubico-piv-tool-yubico-piv-tool-2.3.0/common/openssl-compat.c	2022-03-31 00:02:58.868585332 +0200
+@@ -16,15 +16,6 @@
+ #include <string.h>
+ #include <limits.h>
+ 
+-void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
+-                   ASN1_OCTET_STRING **pdigest)
+-{
+-    if (palg)
+-        *palg = sig->algor;
+-    if (pdigest)
+-        *pdigest = sig->digest;
+-}
+-
+ #if (LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ 
+ int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+diff -urN yubico-piv-tool-yubico-piv-tool-2.3.0.orig/common/openssl-compat.h yubico-piv-tool-yubico-piv-tool-2.3.0/common/openssl-compat.h
+--- yubico-piv-tool-yubico-piv-tool-2.3.0.orig/common/openssl-compat.h	2022-03-31 00:01:41.006586972 +0200
++++ yubico-piv-tool-yubico-piv-tool-2.3.0/common/openssl-compat.h	2022-03-31 00:03:46.155584335 +0200
+@@ -29,8 +29,6 @@
+ void RSA_get0_crt_params(const RSA *r,
+                          const BIGNUM **dmp1, const BIGNUM **dmq1,
+                          const BIGNUM **iqmp);
+-void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
+-                   ASN1_OCTET_STRING **pdigest);
+ int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s);
+ void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps);
+ 
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool.patch
new file mode 100644
index 000000000000..4d1774828644
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool.patch
@@ -0,0 +1,57 @@
+diff -urN yubico-piv-tool-yubico-piv-tool-2.3.0.orig/tool/yubico-piv-tool.c yubico-piv-tool-yubico-piv-tool-2.3.0/tool/yubico-piv-tool.c
+--- yubico-piv-tool-yubico-piv-tool-2.3.0.orig/tool/yubico-piv-tool.c	2022-03-30 23:28:23.673629049 +0200
++++ yubico-piv-tool-yubico-piv-tool-2.3.0/tool/yubico-piv-tool.c	2022-03-30 23:33:40.999622364 +0200
+@@ -133,7 +133,7 @@
+   return false;
+ }
+ 
+-#if !((OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER))
++#if !(OPENSSL_VERSION_NUMBER < 0x10100000L)
+ static int ec_key_ex_data_idx = -1;
+ 
+ struct internal_key {
+@@ -748,7 +748,7 @@
+   int key = 0;
+   size_t oid_len;
+   const unsigned char *oid;
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+   unsigned char digest[EVP_MAX_MD_SIZE + MAX_OID_LEN] = {0};
+   unsigned int md_len;
+   unsigned int digest_len;
+@@ -858,7 +858,7 @@
+     goto request_out;
+   }
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+   null_parameter.type = V_ASN1_NULL;
+   null_parameter.value.ptr = NULL;
+ 
+@@ -933,7 +933,7 @@
+     fclose(output_file);
+   }
+   EVP_PKEY_free(public_key);
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+   if(req) {
+     if(req->sig_alg->parameter) {
+       req->sig_alg->parameter = NULL;
+@@ -1159,7 +1159,7 @@
+     }
+   }
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+   unsigned char digest[EVP_MAX_MD_SIZE + MAX_OID_LEN] = {0};
+   unsigned char *signinput;
+   size_t len = 0;
+@@ -1237,7 +1237,7 @@
+   if(output_file && output_file != stdout) {
+     fclose(output_file);
+   }
+- #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++ #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+   if(x509) {
+    if(x509->sig_alg->parameter) {
+       x509->sig_alg->parameter = NULL;
diff --git a/sys-auth/yubico-piv-tool/files/yubico_piv_tool_c.patch b/sys-auth/yubico-piv-tool/files/yubico_piv_tool_c.patch
new file mode 100644
index 000000000000..3842615bc29d
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico_piv_tool_c.patch
@@ -0,0 +1,57 @@
+diff -urN yubico-piv-tool-2.5.0.orig/tool/yubico-piv-tool.c yubico-piv-tool-2.5.0/tool/yubico-piv-tool.c
+--- yubico-piv-tool-2.5.0.orig/tool/yubico-piv-tool.c	2024-02-01 18:08:40.503929969 +0100
++++ yubico-piv-tool-2.5.0/tool/yubico-piv-tool.c	2024-02-01 18:15:02.575940038 +0100
+@@ -153,7 +153,7 @@
+   return false;
+ }
+ 
+-#if !((OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER))
++#if !(OPENSSL_VERSION_NUMBER < 0x10100000L)
+ static int ec_key_ex_data_idx = -1;
+ 
+ struct internal_key {
+@@ -862,7 +862,7 @@
+   int key = 0;
+   size_t oid_len = 0;
+   const unsigned char *oid = NULL;
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+   unsigned char digest[EVP_MAX_MD_SIZE + MAX_OID_LEN] = {0};
+   unsigned int md_len;
+   unsigned int digest_len;
+@@ -973,7 +973,7 @@
+     goto request_out;
+   }
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+   null_parameter.type = V_ASN1_NULL;
+   null_parameter.value.ptr = NULL;
+ 
+@@ -1048,7 +1048,7 @@
+     fclose(output_file);
+   }
+   EVP_PKEY_free(public_key);
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+   if(req) {
+     if(req->sig_alg->parameter) {
+       req->sig_alg->parameter = NULL;
+@@ -1281,7 +1281,7 @@
+     }
+   }
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+   unsigned char digest[EVP_MAX_MD_SIZE + MAX_OID_LEN] = {0};
+   unsigned char *signinput;
+   size_t len = 0;
+@@ -1359,7 +1359,7 @@
+   if(output_file && output_file != stdout) {
+     fclose(output_file);
+   }
+- #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++ #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+   if(x509) {
+    if(x509->sig_alg->parameter) {
+       x509->sig_alg->parameter = NULL;
diff --git a/sys-auth/yubico-piv-tool/metadata.xml b/sys-auth/yubico-piv-tool/metadata.xml
index 5984318cfe25..68b0ae29aa4c 100644
--- a/sys-auth/yubico-piv-tool/metadata.xml
+++ b/sys-auth/yubico-piv-tool/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>mario.haustein@hrz.tu-chemnitz.de</email>
-    <name>Mario Haustein</name>
+  <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>marecki@gentoo.org</email>
+    <name>Marek Szuba</name>
   </maintainer>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.7.2.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.7.2.ebuild
index a4d139cdc49c..8a7b7632f427 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.7.2.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.7.2.ebuild
@@ -1,44 +1,51 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 2021-2025 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-inherit cmake verify-sig
+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://developers.yubico.com/${PN}/Releases/${P}.tar.gz
-	verify-sig? ( https://developers.yubico.com/${PN}/Releases/${P}.tar.gz.sig )"
+SRC_URI="https://developers.yubico.com/yubico-piv-tool/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm64 ~riscv"
-IUSE="test verify-sig"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
+KEYWORDS="amd64"
+IUSE=" test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="sys-apps/pcsc-lite
+RDEPEND="
+	sys-apps/pcsc-lite
 	dev-libs/openssl:=[-bindist(-)]
-	virtual/zlib:="
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-BDEPEND="dev-util/gengetopt
+
+	"
+DEPEND="
+	${RDEPEND}
+	dev-libs/check"
+BDEPEND="
+	dev-util/gengetopt
 	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-	verify-sig? ( >=sec-keys/openpgp-keys-yubico-20240628 )"
+	virtual/pkgconfig"
 
 PATCHES=(
+	${FILESDIR}/yubico_piv_tool_c.patch
+	${FILESDIR}/yubico-openssl-compat.patch
 	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
 	"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
 	"${FILESDIR}"/${PN}-2.3.0-no-Werror.patch
 )
 
+src_prepare() {
+	cmake_src_prepare
+}
+
 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
 }
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.7.3.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.7.3.ebuild
index 2f8f123aa833..f8f43a771909 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.7.3.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.7.3.ebuild
@@ -1,44 +1,51 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2021-2026 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-inherit cmake verify-sig
+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://developers.yubico.com/${PN}/Releases/${P}.tar.gz
-	verify-sig? ( https://developers.yubico.com/${PN}/Releases/${P}.tar.gz.sig )"
+SRC_URI="https://developers.yubico.com/yubico-piv-tool/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm64 ~riscv"
-IUSE="test verify-sig"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
+KEYWORDS="amd64"
+IUSE=" test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="sys-apps/pcsc-lite
+RDEPEND="
+	sys-apps/pcsc-lite
 	dev-libs/openssl:=[-bindist(-)]
-	virtual/zlib:="
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-BDEPEND="dev-util/gengetopt
+
+	"
+DEPEND="
+	${RDEPEND}
+	dev-libs/check"
+BDEPEND="
+	dev-util/gengetopt
 	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-	verify-sig? ( >=sec-keys/openpgp-keys-yubico-20240628 )"
+	virtual/pkgconfig"
 
 PATCHES=(
+	${FILESDIR}/yubico_piv_tool_c.patch
+	${FILESDIR}/yubico-openssl-compat.patch
 	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
 	"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
 	"${FILESDIR}"/${PN}-2.3.0-no-Werror.patch
 )
 
+src_prepare() {
+	cmake_src_prepare
+}
+
 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
 }