* [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/files/, sys-auth/yubico-piv-tool/
@ 2019-09-11 16:21 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2019-09-11 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 6161432c4f5c51e4b9b04cb4a3ceaed6eb5d469a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 11 11:27:09 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 11 16:20:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6161432c
sys-auth/yubico-piv-tool: Drop old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-auth/yubico-piv-tool/Manifest | 2 -
.../files/yubico-piv-tool-1.5.0-openssl110.patch | 170 ---------------------
.../yubico-piv-tool/yubico-piv-tool-1.4.4.ebuild | 29 ----
.../yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild | 50 ------
4 files changed, 251 deletions(-)
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 54e39443516..4b8764da767 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,3 +1 @@
-DIST yubico-piv-tool-1.4.4.tar.gz 109397 BLAKE2B ed1299508cd5f90c662a184527ae696e7cd463b0e8d327413c8acff47d41de7393570798b9582e845262afb1780e0c759246980051a62335d7033de913147bb9 SHA512 3edc341fdbeeacfbf541adc37d0bd2b1df9777ca04e13bc1825e99a151008213b816ff811e83e623f52eb1400a8146c36a5a874fc5e26a89c9398e79a0e234e1
-DIST yubico-piv-tool-1.5.0.tar.gz 179092 BLAKE2B d15eed89699989ff545f18cf54fd42349fc81862e7bb3e182fad59d0604cc9729dedcc4aaa40d3f28c1d40b78ddbb5ed073c107cb233d0fa66a17a2ef1e29d68 SHA512 10d7f7a2f163e5f61d6f7463f2124d06213506bff39f3fe0c5b361f90f8bc372de97ab1fa8d6bfcb77659f086d71f8ff536a064ee8f300a620b929ee76e8f8b9
DIST yubico-piv-tool-1.6.2.tar.gz 182957 BLAKE2B 0ca9bdcda68f7ee100078604854caccc5141ab01e40f894ae36c3175afa3989c1d0074ef0994e1e369d67499a9778e22f0c5a3cf930d1ba162b0ee0ddbc05f91 SHA512 fc72b9d381f10b63c8958b6c90c1ee97e3ef6b5fb283a9513e6f2ace972710c2872903f38350d9e4a3576b16cb0890b067dd55f5c125f443d353df3f628a9f96
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch
deleted file mode 100644
index 86b8bf9bedc..00000000000
--- a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From c8372f27d791aa445e879ded4efe4a267e3ff48e Mon Sep 17 00:00:00 2001
-From: quentin <quentin@minster.io>
-Date: Mon, 26 Feb 2018 02:43:41 +0100
-Subject: [PATCH] Improve compatibility with OpenSSL 1.1.0
-
-* add missing headers
-* stop using deprecated APIs
----
- tool/util.c | 1 +
- tool/yubico-piv-tool.c | 24 +++++++++++++++++++++++-
- ykcs11/openssl_types.h | 1 +
- ykcs11/openssl_utils.c | 11 +++++++++++
- 4 files changed, 36 insertions(+), 1 deletion(-)
-
-diff --git a/tool/util.c b/tool/util.c
-index de6b071..5b299ca 100644
---- a/tool/util.c
-+++ b/tool/util.c
-@@ -38,6 +38,7 @@
- #endif
-
- #include "openssl-compat.h"
-+#include <openssl/bn.h>
- #include <openssl/evp.h>
- #include <openssl/x509.h>
- #include <openssl/rsa.h>
-diff --git a/tool/yubico-piv-tool.c b/tool/yubico-piv-tool.c
-index c40b027..f8b72b1 100644
---- a/tool/yubico-piv-tool.c
-+++ b/tool/yubico-piv-tool.c
-@@ -43,10 +43,12 @@
- #endif
-
- #include "openssl-compat.h"
-+#include <openssl/bn.h>
- #include <openssl/des.h>
- #include <openssl/pem.h>
- #include <openssl/pkcs12.h>
- #include <openssl/rand.h>
-+#include <openssl/rsa.h>
-
- #include "cmdline.h"
- #include "util.h"
-@@ -868,11 +870,19 @@ static bool selfsign_certificate(ykpiv_state *state, enum enum_key_format key_fo
- fprintf(stderr, "Failed to set certificate serial.\n");
- goto selfsign_out;
- }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- if(!X509_gmtime_adj(X509_get_notBefore(x509), 0)) {
-+#else
-+ if(!X509_gmtime_adj(X509_getm_notBefore(x509), 0)) {
-+#endif
- fprintf(stderr, "Failed to set certificate notBefore.\n");
- goto selfsign_out;
- }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- if(!X509_gmtime_adj(X509_get_notAfter(x509), 60L * 60L * 24L * validDays)) {
-+#else
-+ if(!X509_gmtime_adj(X509_getm_notAfter(x509), 60L * 60L * 24L * validDays)) {
-+#endif
- fprintf(stderr, "Failed to set certificate notAfter.\n");
- goto selfsign_out;
- }
-@@ -1241,7 +1251,7 @@ static void print_cert_info(ykpiv_state *state, enum enum_slot slot, const EVP_M
-
- if(*ptr++ == 0x70) {
- unsigned int md_len = sizeof(data);
-- ASN1_TIME *not_before, *not_after;
-+ const ASN1_TIME *not_before, *not_after;
-
- ptr += get_length(ptr, &cert_len);
- x509 = X509_new();
-@@ -1299,13 +1309,21 @@ static void print_cert_info(ykpiv_state *state, enum enum_slot slot, const EVP_M
- dump_data(data, md_len, output, false, format_arg_hex);
-
- bio = BIO_new_fp(output, BIO_NOCLOSE | BIO_FP_TEXT);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- not_before = X509_get_notBefore(x509);
-+#else
-+ not_before = X509_get0_notBefore(x509);
-+#endif
- if(not_before) {
- fprintf(output, "\tNot Before:\t");
- ASN1_TIME_print(bio, not_before);
- fprintf(output, "\n");
- }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- not_after = X509_get_notAfter(x509);
-+#else
-+ not_after = X509_get0_notAfter(x509);
-+#endif
- if(not_after) {
- fprintf(output, "\tNot After:\t");
- ASN1_TIME_print(bio, not_after);
-@@ -1950,7 +1968,9 @@ int main(int argc, char *argv[]) {
-
-
- /* openssl setup.. */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- OpenSSL_add_all_algorithms();
-+#endif
-
-
- for(i = 0; i < args_info.action_given; i++) {
-@@ -2191,6 +2211,8 @@ int main(int argc, char *argv[]) {
- }
-
- ykpiv_done(state);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- EVP_cleanup();
-+#endif
- return ret;
- }
-diff --git a/ykcs11/openssl_types.h b/ykcs11/openssl_types.h
-index 307f746..08170fc 100644
---- a/ykcs11/openssl_types.h
-+++ b/ykcs11/openssl_types.h
-@@ -31,6 +31,7 @@
- #ifndef OPENSSL_TYPES_H
- #define OPENSSL_TYPES_H
-
-+#include <openssl/bn.h>
- #include <openssl/x509.h>
- #include <openssl/evp.h>
- #include <openssl/rsa.h>
-diff --git a/ykcs11/openssl_utils.c b/ykcs11/openssl_utils.c
-index 5a7f85d..edfe0ea 100644
---- a/ykcs11/openssl_utils.c
-+++ b/ykcs11/openssl_utils.c
-@@ -35,6 +35,11 @@
- #include "debug.h"
- #include <string.h>
-
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+# define X509_set_notBefore X509_set1_notBefore
-+# define X509_set_notAfter X509_set1_notAfter
-+#endif
-+
- CK_RV do_store_cert(CK_BYTE_PTR data, CK_ULONG len, X509 **cert) {
-
- const unsigned char *p = data; // Mandatory temp variable required by OpenSSL
-@@ -580,7 +585,9 @@ CK_RV do_pkcs_pss(ykcs11_rsa_key_t *key, CK_BYTE_PTR in, CK_ULONG in_len,
- int nid, CK_BYTE_PTR out, CK_ULONG_PTR out_len) {
- unsigned char em[RSA_size(key)];
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- OpenSSL_add_all_digests();
-+#endif
-
- DBG("Apply PSS padding to %lu bytes and get %d", in_len, RSA_size(key));
-
-@@ -590,14 +597,18 @@ CK_RV do_pkcs_pss(ykcs11_rsa_key_t *key, CK_BYTE_PTR in, CK_ULONG in_len,
-
- // In case of raw PSS (no hash) this function will fail because OpenSSL requires an MD
- if (RSA_padding_add_PKCS1_PSS(key, em, out, EVP_get_digestbynid(nid), -2) == 0) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- EVP_cleanup();
-+#endif
- return CKR_FUNCTION_FAILED;
- }
-
- memcpy(out, em, sizeof(em));
- *out_len = (CK_ULONG) sizeof(em);
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- EVP_cleanup();
-+#endif
-
- return CKR_OK;
- }
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.4.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.4.ebuild
deleted file mode 100644
index 689eca071a9..00000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Command line tool for the YubiKey PIV application"
-SRC_URI="https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-${PV}.tar.gz"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0=[-bindist]
- sys-apps/pcsc-lite"
-DEPEND="dev-util/gengetopt
- sys-apps/help2man
- virtual/pkgconfig
- ${RDEPEND}"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild
deleted file mode 100644
index 7a72c9087c3..00000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Command line tool for the YubiKey PIV application"
-SRC_URI="https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-${PV}.tar.gz"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
- dev-libs/openssl:0=[-bindist]
- sys-apps/pcsc-lite
-"
-DEPEND="${RDEPEND}
- dev-util/gengetopt
- sys-apps/help2man
- virtual/pkgconfig
- test? ( dev-libs/check )
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-PATCHES=( "${FILESDIR}/${P}-openssl110.patch" )
-
-src_prepare() {
- default
-
- if ! use test; then
- sed -i -e "/PKG_CHECK_MODULES(\[CHECK/d" configure.ac || die
- sed -i -e "s/@CHECK_CFLAGS@//" -e "s/@CHECK_LIBS@//" */*/Makefile.am || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- econf --disable-static
-}
-
-src_install() {
- default
- rm "${D}"/usr/$(get_libdir)/*.la || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/files/, sys-auth/yubico-piv-tool/
@ 2021-04-27 11:05 Marek Szuba
0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2021-04-27 11:05 UTC (permalink / raw
To: gentoo-commits
commit: 7d372f694e0537b2efe3211a7eb3fc801755b090
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 10:57:53 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 11:05:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d372f69
sys-auth/yubico-piv-tool: drop 2.1.1-r2
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-auth/yubico-piv-tool/Manifest | 1 -
.../yubico-piv-tool-2.1.1-install-man-page.patch | 29 ------------
.../yubico-piv-tool-2.1.1-r2.ebuild | 52 ----------------------
3 files changed, 82 deletions(-)
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index fc99860636e..5a4592f6754 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,2 +1 @@
-DIST yubico-piv-tool-2.1.1.tar.gz 1302573 BLAKE2B da4419b7074930f7d264f21a12973511d350e687d0487b93d25a528f4a79d5df44dbbdde34ef7cd0d14507ba1a00f776fcd7eaf503f2253d8ee8da3e9a68010f SHA512 14d880088f7624f600c6badb6504c4c71ef29ff82e9c29bd837013e62273c6b198ca581705cc7fb9f3c0c13334767ea7b340fb033ce99fb60fb0478281affc9f
DIST yubico-piv-tool-2.2.0.tar.gz 1309359 BLAKE2B a5be7a48549f864b9322b5bf53726007b593ce7d08cd06f2251aef98cb065d90586e0189e6f3da94d6d274d6998459afa4a55a0d4c1145395f55830f53d334e4 SHA512 b2f8cd73800e0e0778ce36148b962026479f5d3ada3e313acb5a780993c28c41b03e9aa9335ac5b79fed7a418a2d3d3697231adf2da0dd06cd8d22ea5a01aca5
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-install-man-page.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-install-man-page.patch
deleted file mode 100644
index 1d782767b3a..00000000000
--- a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-install-man-page.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e635608785ed374bfe5f1158ca4a4695f3ea2f08 Mon Sep 17 00:00:00 2001
-From: Dan Church <amphetamachine@gmail.com>
-Date: Fri, 5 Jun 2020 11:09:30 -0500
-Subject: [PATCH] Fix omission of man page
-
-It was omitting the man page upon first install, so in order to get the
-man page added to the installed set of files, one would have to run
-cmake, then run make, then run cmake again, then run make.
-
-Also clarify when the extra `install` step would be added.
----
- tool/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
-index c12a474..03efefe 100644
---- a/tool/CMakeLists.txt
-+++ b/tool/CMakeLists.txt
-@@ -66,8 +66,10 @@ if (GENERATE_MAN_PAGES)
- add_help2man_manpage (yubico-piv-tool.1 yubico-piv-tool)
-
- add_custom_target (yubico-piv-tool-man ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/yubico-piv-tool.1)
-+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/yubico-piv-tool.1" DESTINATION "${YKPIV_INSTALL_MAN_DIR}/man1")
- endif(GENERATE_MAN_PAGES)
-
-+# If somehow a manpage was generated before configure started, install that too
- find_file(MAN_PAGE yubico-piv-tool.1 PATHS ${CMAKE_CURRENT_SOURCE_DIR})
- if(MAN_PAGE)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/yubico-piv-tool.1" DESTINATION "${YKPIV_INSTALL_MAN_DIR}/man1")
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild
deleted file mode 100644
index 38068c17a3e..00000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Command-line tool and p11-kit module for the YubiKey PIV application"
-SRC_URI="https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-${PV}.tar.gz"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="amd64"
-IUSE="libressl test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/pcsc-lite
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0=[-bindist] )"
-DEPEND="${RDEPEND}
- test? ( dev-libs/check )"
-BDEPEND="dev-util/gengetopt
- sys-apps/help2man
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.1-install-man-page.patch
- "${FILESDIR}"/${PN}-2.1.1-no-Werror.patch
- "${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
- "${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
-)
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_STATIC_LIB=OFF
- -DBUILD_TESTING=$(usex test)
- )
- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/files/, sys-auth/yubico-piv-tool/
@ 2021-11-15 19:32 Marek Szuba
0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2021-11-15 19:32 UTC (permalink / raw
To: gentoo-commits
commit: 9fa3fb2c429652631b76f18ee3feec3b9c068b04
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 19:29:53 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 19:29:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa3fb2c
sys-auth/yubico-piv-tool-2.2.1: support openssl-3.0
Backported upstream fix, i.e. should no longer be needed come next
release.
Closes: https://bugs.gentoo.org/805914
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/yubico-piv-tool-2.2.1-openssl3.patch | 32 ++++++++++++++++++++++
.../yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild | 1 +
2 files changed, 33 insertions(+)
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
new file mode 100644
index 000000000000..5ba807ea0c6c
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.2.1-openssl3.patch
@@ -0,0 +1,32 @@
+From 81b063f53db8a3d74077522a6ff4f1640cc3fe70 Mon Sep 17 00:00:00 2001
+From: Clemens Lang <cal@macports.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@macports.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
index 8cea2321eafe..a8415ba3ce87 100644
--- 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
@@ -28,6 +28,7 @@ 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}"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/files/, sys-auth/yubico-piv-tool/
@ 2022-09-26 1:01 Marek Szuba
0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2022-09-26 1:01 UTC (permalink / raw
To: gentoo-commits
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@macports.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@macports.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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-26 1:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-11 16:21 [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/files/, sys-auth/yubico-piv-tool/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-04-27 11:05 Marek Szuba
2021-11-15 19:32 Marek Szuba
2022-09-26 1:01 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox