* [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/, sys-auth/yubico-piv-tool/files/
@ 2016-11-14 11:19 Manuel Rüger
0 siblings, 0 replies; 7+ messages in thread
From: Manuel Rüger @ 2016-11-14 11:19 UTC (permalink / raw
To: gentoo-commits
commit: e13b5501105ae03e2a258bd1d6f1b0e172da124c
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 11:17:49 2016 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 11:18:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13b5501
sys-auth/yubico-piv-tool: Initial version
Package-Manager: portage-2.3.0
sys-auth/yubico-piv-tool/Manifest | 1 +
.../files/yubico-piv-tool-1.4.2-help2man-fix.patch | 23 ++++++++++++++++
sys-auth/yubico-piv-tool/metadata.xml | 11 ++++++++
.../yubico-piv-tool/yubico-piv-tool-1.4.2.ebuild | 32 ++++++++++++++++++++++
4 files changed, 67 insertions(+)
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
new file mode 100644
index 00000000..b2ec4cb
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -0,0 +1 @@
+DIST yubico-piv-tool-1.4.2.tar.gz 113783 SHA256 814609e0ee2cc3be6f1908e1a62c6f6e280c8e15991ecea1c0afce70b48b6a8a SHA512 f2fd80a8d6faddf750d648c4777fb4d7f484a243e6d74c18fa0effc56469ded8e03f9c3437494c3e2d2cfba6397b6bcdec5d1286900b2908f21e1f0ccaeb59eb WHIRLPOOL 12516ac66fbe74202a76bb1dee4630792372974cea57f83c188167643acd4abf9855794b769fe7c9878f8d964cf5d17f98e7906d09101679133379a1e3bde7a5
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.4.2-help2man-fix.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.4.2-help2man-fix.patch
new file mode 100644
index 00000000..4651331
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.4.2-help2man-fix.patch
@@ -0,0 +1,23 @@
+From 8bdf7378d6ada57204f93684a488368bbae11858 Mon Sep 17 00:00:00 2001
+From: Klas Lindfors <klas@yubico.com>
+Date: Mon, 12 Sep 2016 09:54:04 +0200
+Subject: [PATCH] fixup dependencies for yubico-piv-tool.1
+
+should now support parallel builds
+---
+ tool/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tool/Makefile.am b/tool/Makefile.am
+index 6100da7..4a1657b 100644
+--- a/tool/Makefile.am
++++ b/tool/Makefile.am
+@@ -54,7 +54,7 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+ dist_man_MANS = yubico-piv-tool.1
+ MAINTAINERCLEANFILES += $(dist_man_MANS)
+
+-yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) $(libpiv_cmd_la_SOURCES)
++yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) $(libpiv_cmd_la_SOURCES) $(top_srcdir)/configure.ac | $(builddir)/yubico-piv-tool$(EXEEXT)
+ $(HELP2MAN) --no-info \
+ --name="Yubico PIV tool" \
+ --include=$(srcdir)/yubico-piv-tool.h2m \
diff --git a/sys-auth/yubico-piv-tool/metadata.xml b/sys-auth/yubico-piv-tool/metadata.xml
new file mode 100644
index 00000000..1b855a9
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Yubico/yubico-piv-tool</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.2.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.2.ebuild
new file mode 100644
index 00000000..eef3429
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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=
+ sys-apps/pcsc-lite"
+DEPEND="dev-util/gengetopt
+ sys-apps/help2man
+ virtual/pkgconfig
+ ${RDEPEND}"
+
+S=${WORKDIR}/${PN}-${P}
+
+PATCHES=( "${FILESDIR}"/${P}-help2man-fix.patch )
+
+src_prepare() {
+ default
+ eautoreconf
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/, sys-auth/yubico-piv-tool/files/
@ 2017-04-28 14:41 Alexys Jacob
0 siblings, 0 replies; 7+ messages in thread
From: Alexys Jacob @ 2017-04-28 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 272c18805c55eacd87442b9aa7448aecefb35098
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 14:40:24 2017 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 14:40:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=272c1880
sys-auth/yubico-piv-tool: version bump, drop old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sys-auth/yubico-piv-tool/Manifest | 2 +-
.../files/yubico-piv-tool-1.4.2-help2man-fix.patch | 23 ----------------------
...l-1.4.2.ebuild => yubico-piv-tool-1.4.3.ebuild} | 4 +---
3 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index b2ec4cb9c21..43e7e1b4ef4 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1 +1 @@
-DIST yubico-piv-tool-1.4.2.tar.gz 113783 SHA256 814609e0ee2cc3be6f1908e1a62c6f6e280c8e15991ecea1c0afce70b48b6a8a SHA512 f2fd80a8d6faddf750d648c4777fb4d7f484a243e6d74c18fa0effc56469ded8e03f9c3437494c3e2d2cfba6397b6bcdec5d1286900b2908f21e1f0ccaeb59eb WHIRLPOOL 12516ac66fbe74202a76bb1dee4630792372974cea57f83c188167643acd4abf9855794b769fe7c9878f8d964cf5d17f98e7906d09101679133379a1e3bde7a5
+DIST yubico-piv-tool-1.4.3.tar.gz 108262 SHA256 e2e46681716cde14be84f68a8b455bde0a6bef2c1703fd043763050c4e65fe5f SHA512 86b2564fe96a8b4dbcf3f122316c4e258628c97bf6917953d93c6e0265df866c6b3ef5a6c7572177d26ef74265ef39db8e15348a08e6eb0be1e145978affd16b WHIRLPOOL 19ad5e09db318d72dca9c63af85e5b6e7a196c4fa6a591faed91702051284ede40f04d3ad7ee8eeff695a040c4cb2e5479f2620e4bcc0e3f67e2f47d58db0684
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.4.2-help2man-fix.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.4.2-help2man-fix.patch
deleted file mode 100644
index 46513315219..00000000000
--- a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.4.2-help2man-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8bdf7378d6ada57204f93684a488368bbae11858 Mon Sep 17 00:00:00 2001
-From: Klas Lindfors <klas@yubico.com>
-Date: Mon, 12 Sep 2016 09:54:04 +0200
-Subject: [PATCH] fixup dependencies for yubico-piv-tool.1
-
-should now support parallel builds
----
- tool/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tool/Makefile.am b/tool/Makefile.am
-index 6100da7..4a1657b 100644
---- a/tool/Makefile.am
-+++ b/tool/Makefile.am
-@@ -54,7 +54,7 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
- dist_man_MANS = yubico-piv-tool.1
- MAINTAINERCLEANFILES += $(dist_man_MANS)
-
--yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) $(libpiv_cmd_la_SOURCES)
-+yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) $(libpiv_cmd_la_SOURCES) $(top_srcdir)/configure.ac | $(builddir)/yubico-piv-tool$(EXEEXT)
- $(HELP2MAN) --no-info \
- --name="Yubico PIV tool" \
- --include=$(srcdir)/yubico-piv-tool.h2m \
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.2.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.3.ebuild
similarity index 86%
rename from sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.2.ebuild
rename to sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.3.ebuild
index eb3d97e73c1..9d5c1a2d880 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.2.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,8 +23,6 @@ DEPEND="dev-util/gengetopt
S=${WORKDIR}/${PN}-${P}
-PATCHES=( "${FILESDIR}"/${P}-help2man-fix.patch )
-
src_prepare() {
default
eautoreconf
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/, sys-auth/yubico-piv-tool/files/
@ 2018-03-06 11:23 Michael Palimaka
0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2018-03-06 11:23 UTC (permalink / raw
To: gentoo-commits
commit: bce09dab8931afbb372738f1d2c3eca91a727c4f
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 6 11:22:22 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Mar 6 11:22:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bce09dab
sys-auth/yubico-piv-tool: version bump 1.5.0
Includes a backported patch from upstream solving build failure with openssl-1.1.
Closes: https://bugs.gentoo.org/648796
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-auth/yubico-piv-tool/Manifest | 1 +
.../files/yubico-piv-tool-1.5.0-openssl110.patch | 170 +++++++++++++++++++++
.../yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild | 50 ++++++
3 files changed, 221 insertions(+)
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 13ceea8d7a2..f56afecfd6f 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1 +1,2 @@
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
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
new file mode 100644
index 00000000000..86b8bf9bedc
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch
@@ -0,0 +1,170 @@
+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.5.0.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild
new file mode 100644
index 00000000000..7a72c9087c3
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild
@@ -0,0 +1,50 @@
+# 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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/, sys-auth/yubico-piv-tool/files/
@ 2020-08-24 14:39 Joonas Niilola
0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2020-08-24 14:39 UTC (permalink / raw
To: gentoo-commits
commit: 0338258449e3bd125f50ea3244c043efc3801dec
Author: Sebastian Hamann <code <AT> ares-macrotechnology <DOT> com>
AuthorDate: Mon Aug 10 18:05:50 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 14:38:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03382584
sys-auth/yubico-piv-tool: Bump to version 2.1.1
Closes: https://bugs.gentoo.org/732000
Signed-off-by: Sebastian Hamann <code <AT> ares-macrotechnology.com>
Closes: https://github.com/gentoo/gentoo/pull/17072
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-auth/yubico-piv-tool/Manifest | 1 +
.../yubico-piv-tool-2.1.1-install-man-page.patch | 29 +++++++++++++++++
.../yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild | 38 ++++++++++++++++++++++
3 files changed, 68 insertions(+)
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 4b8764da767..ab6a0967e1c 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1 +1,2 @@
DIST yubico-piv-tool-1.6.2.tar.gz 182957 BLAKE2B 0ca9bdcda68f7ee100078604854caccc5141ab01e40f894ae36c3175afa3989c1d0074ef0994e1e369d67499a9778e22f0c5a3cf930d1ba162b0ee0ddbc05f91 SHA512 fc72b9d381f10b63c8958b6c90c1ee97e3ef6b5fb283a9513e6f2ace972710c2872903f38350d9e4a3576b16cb0890b067dd55f5c125f443d353df3f628a9f96
+DIST yubico-piv-tool-2.1.1.tar.gz 1302573 BLAKE2B da4419b7074930f7d264f21a12973511d350e687d0487b93d25a528f4a79d5df44dbbdde34ef7cd0d14507ba1a00f776fcd7eaf503f2253d8ee8da3e9a68010f SHA512 14d880088f7624f600c6badb6504c4c71ef29ff82e9c29bd837013e62273c6b198ca581705cc7fb9f3c0c13334767ea7b340fb033ce99fb60fb0478281affc9f
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
new file mode 100644
index 00000000000..1d782767b3a
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-install-man-page.patch
@@ -0,0 +1,29 @@
+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.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild
new file mode 100644
index 00000000000..e61b928b9a3
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+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"
+RESTRICT="!test? ( 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 )
+"
+
+PATCHES=("${FILESDIR}/${P}-install-man-page.patch")
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_STATIC_LIB=OFF
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/, sys-auth/yubico-piv-tool/files/
@ 2020-09-06 20:27 Marek Szuba
0 siblings, 0 replies; 7+ messages in thread
From: Marek Szuba @ 2020-09-06 20:27 UTC (permalink / raw
To: gentoo-commits
commit: 022da5ba99be2b208ba8ae6ba60c15b118bbac5f
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 6 20:23:13 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 20:27:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022da5ba
sys-auth/yubico-piv-tool: only build tests when FEATURES=test is set
This means we no longer need dev-libs/check present even when one does
not wish to run the test suite.
Closes: https://bugs.gentoo.org/739040
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../yubico-piv-tool-2.1.1-tests-optional.patch | 39 ++++++++++++++++++++++
.../yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild | 6 +++-
2 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-tests-optional.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-tests-optional.patch
new file mode 100644
index 00000000000..6653ef2949c
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-tests-optional.patch
@@ -0,0 +1,39 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -125,7 +125,9 @@
+ find_libcrypto()
+ include_directories(${LIBCRYPTO_INCLUDE_DIRS})
+
++if (BUILD_TESTING)
+ enable_testing()
++endif()
+ find_package(codecov)
+
+ add_subdirectory (lib)
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -92,4 +92,6 @@
+
+ install(FILES ykpiv.pc DESTINATION ${YKPIV_INSTALL_PKGCONFIG_DIR})
+
++if (BUILD_TESTING)
+ add_subdirectory(tests)
++endif ()
+--- a/tool/CMakeLists.txt
++++ b/tool/CMakeLists.txt
+@@ -78,4 +78,6 @@
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/yubico-piv-tool.1" DESTINATION "${YKPIV_INSTALL_MAN_DIR}/man1")
+ endif(MAN_PAGE)
+
++if (BUILD_TESTING)
+ add_subdirectory(tests)
++endif ()
+--- a/ykcs11/CMakeLists.txt
++++ b/ykcs11/CMakeLists.txt
+@@ -102,4 +102,6 @@
+
+ install(FILES ykcs11.pc DESTINATION ${YKPIV_INSTALL_PKGCONFIG_DIR})
+
++if (BUILD_TESTING)
+ add_subdirectory(tests)
++endif ()
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild
index e61b928b9a3..e250affc1b8 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1.ebuild
@@ -26,13 +26,17 @@ DEPEND="${RDEPEND}
test? ( dev-libs/check )
"
-PATCHES=("${FILESDIR}/${P}-install-man-page.patch")
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.1-install-man-page.patch
+ "${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
+)
S="${WORKDIR}/${PN}-${P}"
src_configure() {
local mycmakeargs=(
-DBUILD_STATIC_LIB=OFF
+ -DBUILD_TESTING=$(usex test)
)
cmake_src_configure
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/, sys-auth/yubico-piv-tool/files/
@ 2020-09-12 19:56 Marek Szuba
0 siblings, 0 replies; 7+ messages in thread
From: Marek Szuba @ 2020-09-12 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 51d539606ca3bdf81ca3fa041ff17d8844db7c69
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 12 19:51:06 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 19:56:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d53960
sys-auth/yubico-piv-tool: explicitly set thread flags for ykcs11
Part of the library explicitly calls the pthread API.
Closes: https://bugs.gentoo.org/741957
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../yubico-piv-tool-2.1.1-ykcs11-threads.patch | 29 ++++++++++++++++++++++
.../yubico-piv-tool-2.1.1-r1.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-ykcs11-threads.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-ykcs11-threads.patch
new file mode 100644
index 00000000000..cd85616b5e6
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-ykcs11-threads.patch
@@ -0,0 +1,29 @@
+--- a/ykcs11/CMakeLists.txt
++++ b/ykcs11/CMakeLists.txt
+@@ -30,7 +30,7 @@
+ link_directories(${PCSC_LIBRARY_DIRS})
+ add_definitions(-DCRYPTOKI_EXPORTS)
+ if(NOT WIN32)
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -pthread")
+ endif(NOT WIN32)
+
+ set(
+@@ -63,7 +63,7 @@
+ # static library
+ if(BUILD_STATIC_LIB)
+ add_library(ykcs11 STATIC ${SOURCE})
+- target_link_libraries(ykcs11 ${LIBCRYPTO_LDFLAGS} ykpiv_static)
++ target_link_libraries(ykcs11 ${LIBCRYPTO_LDFLAGS} -pthread ykpiv_static)
+ set_target_properties (ykcs11 PROPERTIES COMPILE_FLAGS "-DSTATIC ")
+ if(WIN32)
+ set_target_properties(ykcs11 PROPERTIES OUTPUT_NAME ykcs11_static)
+@@ -73,7 +73,7 @@
+
+ # dynamic library
+ add_library(ykcs11_shared SHARED ${SOURCE})
+-target_link_libraries(ykcs11_shared ${LIBCRYPTO_LDFLAGS} ykpiv_shared)
++target_link_libraries(ykcs11_shared ${LIBCRYPTO_LDFLAGS} -pthread ykpiv_shared)
+ set_target_properties(ykcs11_shared PROPERTIES SOVERSION ${SO_VERSION} VERSION ${VERSION})
+ set_target_properties(ykcs11_shared PROPERTIES INSTALL_RPATH "${YKPIV_INSTALL_LIB_DIR}")
+ if(WIN32)
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r1.ebuild
index 8065e7bafa7..07beb0c0d0d 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r1.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r1.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-2.1.1-install-man-page.patch
"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
+ "${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
)
S="${WORKDIR}/${PN}-${P}"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/, sys-auth/yubico-piv-tool/files/
@ 2020-10-15 14:27 Marek Szuba
0 siblings, 0 replies; 7+ messages in thread
From: Marek Szuba @ 2020-10-15 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 2cbe4d3d2f240b4d74b518b3137684d8b2b599f6
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 14:19:31 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 14:19:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cbe4d3d
sys-auth/yubico-piv-tool: remove -Werror from compiler flags
Closes: https://bugs.gentoo.org/749165
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/yubico-piv-tool-2.1.1-no-Werror.patch | 11 +++++++++++
sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild | 1 +
2 files changed, 12 insertions(+)
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
new file mode 100644
index 00000000000..a177395bc75
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-no-Werror.patch
@@ -0,0 +1,11 @@
+--- 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/yubico-piv-tool-2.1.1-r2.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r2.ebuild
index 1d8e72cde90..38068c17a3e 100644
--- 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
@@ -27,6 +27,7 @@ BDEPEND="dev-util/gengetopt
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
)
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-10-15 14:27 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-14 11:19 [gentoo-commits] repo/gentoo:master commit in: sys-auth/yubico-piv-tool/, sys-auth/yubico-piv-tool/files/ Manuel Rüger
-- strict thread matches above, loose matches on Subject: below --
2017-04-28 14:41 Alexys Jacob
2018-03-06 11:23 Michael Palimaka
2020-08-24 14:39 Joonas Niilola
2020-09-06 20:27 Marek Szuba
2020-09-12 19:56 Marek Szuba
2020-10-15 14:27 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox