From ac5d8f6f63f38822fb0982eab70f616685ded19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 17 Oct 2020 18:49:05 +0700 Subject: [PATCH] yubico-piv-tool: rename from ykpivmgr Debian also uses this name. Let's stop inventing package name. --- srcpkgs/libykcs11 | 2 +- srcpkgs/libykcs11-devel | 2 +- srcpkgs/libykpiv | 2 +- srcpkgs/libykpiv-devel | 2 +- srcpkgs/ykpivmgr | 1 + srcpkgs/ykpivmgr/patches/ssl_obsolete.patch | 22 --------- .../{ykpivmgr => yubico-piv-tool}/template | 46 ++++++++++--------- srcpkgs/{ykpivmgr => yubico-piv-tool}/update | 0 8 files changed, 30 insertions(+), 47 deletions(-) create mode 120000 srcpkgs/ykpivmgr delete mode 100644 srcpkgs/ykpivmgr/patches/ssl_obsolete.patch rename srcpkgs/{ykpivmgr => yubico-piv-tool}/template (58%) rename srcpkgs/{ykpivmgr => yubico-piv-tool}/update (100%) diff --git a/srcpkgs/libykcs11 b/srcpkgs/libykcs11 index b1ee8840e41..16a792b7e47 120000 --- a/srcpkgs/libykcs11 +++ b/srcpkgs/libykcs11 @@ -1 +1 @@ -ykpivmgr \ No newline at end of file +yubico-piv-tool \ No newline at end of file diff --git a/srcpkgs/libykcs11-devel b/srcpkgs/libykcs11-devel index b1ee8840e41..16a792b7e47 120000 --- a/srcpkgs/libykcs11-devel +++ b/srcpkgs/libykcs11-devel @@ -1 +1 @@ -ykpivmgr \ No newline at end of file +yubico-piv-tool \ No newline at end of file diff --git a/srcpkgs/libykpiv b/srcpkgs/libykpiv index b1ee8840e41..16a792b7e47 120000 --- a/srcpkgs/libykpiv +++ b/srcpkgs/libykpiv @@ -1 +1 @@ -ykpivmgr \ No newline at end of file +yubico-piv-tool \ No newline at end of file diff --git a/srcpkgs/libykpiv-devel b/srcpkgs/libykpiv-devel index b1ee8840e41..16a792b7e47 120000 --- a/srcpkgs/libykpiv-devel +++ b/srcpkgs/libykpiv-devel @@ -1 +1 @@ -ykpivmgr \ No newline at end of file +yubico-piv-tool \ No newline at end of file diff --git a/srcpkgs/ykpivmgr b/srcpkgs/ykpivmgr new file mode 120000 index 00000000000..16a792b7e47 --- /dev/null +++ b/srcpkgs/ykpivmgr @@ -0,0 +1 @@ +yubico-piv-tool \ No newline at end of file diff --git a/srcpkgs/ykpivmgr/patches/ssl_obsolete.patch b/srcpkgs/ykpivmgr/patches/ssl_obsolete.patch deleted file mode 100644 index e842806e821..00000000000 --- a/srcpkgs/ykpivmgr/patches/ssl_obsolete.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/tool/yubico-piv-tool.c b/tool/yubico-piv-tool.c -index d7e11d5..7cd15e3 100644 ---- a/tool/yubico-piv-tool.c -+++ b/tool/yubico-piv-tool.c -@@ -751,7 +751,7 @@ static bool request_certificate(ykpiv_state *state, enum enum_key_format key_for - fprintf(stderr, "Failed signing request.\n"); - goto request_out; - } -- M_ASN1_BIT_STRING_set(req->signature, signature, sig_len); -+ ASN1_STRING_set(req->signature, signature, sig_len); - /* mark that all bits should be used. */ - req->signature->flags = ASN1_STRING_FLAG_BITS_LEFT; - } -@@ -1007,7 +1007,7 @@ static bool selfsign_certificate(ykpiv_state *state, enum enum_key_format key_fo - fprintf(stderr, "Failed signing certificate.\n"); - goto selfsign_out; - } -- M_ASN1_BIT_STRING_set(x509->signature, signature, sig_len); -+ ASN1_STRING_set(x509->signature, signature, sig_len); - /* setting flags to ASN1_STRING_FLAG_BITS_LEFT here marks that no bits - * should be subtracted from the bit string, thus making sure that the - * certificate can be validated. */ diff --git a/srcpkgs/ykpivmgr/template b/srcpkgs/yubico-piv-tool/template similarity index 58% rename from srcpkgs/ykpivmgr/template rename to srcpkgs/yubico-piv-tool/template index efef597ace5..cdb948f8b36 100644 --- a/srcpkgs/ykpivmgr/template +++ b/srcpkgs/yubico-piv-tool/template @@ -1,42 +1,40 @@ -# Template file for 'ykpivmgr' -_real_name="yubico-piv-tool" +# Template file for 'yubico-piv-tool' _libpiv_name="libykpiv" _libpiv_desc="Yubikey PIV management library" _libykcs_name="libykcs11" _libykcs_desc="Yubikey PIV pkcs11 library" -pkgname=ykpivmgr -version=1.7.0 -revision=2 -wrksrc="${_real_name}-${version}" -build_style=gnu-configure -configure_args="--enable-doxygen-man --program-transform-name='s/^yubico-piv-tool$/ykpivmgr/'" -hostmakedepends="automake libtool gengetopt pkg-config doxygen perl" +pkgname=yubico-piv-tool +version=2.1.1 +revision=1 +build_style=cmake +hostmakedepends="automake libtool gengetopt pkg-config help2man perl" makedepends="libressl-devel check-devel pcsclite-devel" short_desc="Yubikey PIV management tool" maintainer="Aloz1 " license="BSD-2-Clause" -homepage="https://developers.yubico.com/${_real_name}" -distfiles="https://developers.yubico.com/${_real_name}/Releases/${_real_name}-${version}.tar.gz" -checksum=b428527e4031453a637128077983e782e9fea25df98e95e0fc27819b2e82fd7f -patch_args="-Np1" +homepage="https://developers.yubico.com/yubico-piv-tool" +distfiles="https://developers.yubico.com/yubico-piv-tool/Releases/$pkgname-${version}.tar.gz" +checksum=733aee13c22bb86a2d31f59c2f4c1f446f0bca2791f866de46bf71ddd7ebc1b3 +replaces="ykpivmgr>=0" +provides="ykpivmgr-${version}_${revision}" -post_extract() { - sed -i '/^yubico-piv-tool.1/,$d' tool/Makefile.am -} - -pre_configure() { - autoreconf -fi -} +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" yubico-piv-tool" + configure_args="-DHELP2MAN_LOCATION=/usr/bin/true" +fi post_install() { - vlicense COPYING + if [ "$CROSS_BUILD" ]; then + vman /usr/share/man/man1/yubico-piv-tool.1 + fi } libykpiv_package() { short_desc="${_libpiv_desc}" pkg_install() { vmove "usr/lib/${_libpiv_name}.so.*" + vlicense COPYING } } @@ -67,3 +65,9 @@ libykcs11-devel_package() { vmove "usr/lib/pkgconfig/ykcs11.pc" } } + +ykpivmgr_package() { + short_desc+=" - transitional package" + depends="$sourcepkg" + build_style=meta +} diff --git a/srcpkgs/ykpivmgr/update b/srcpkgs/yubico-piv-tool/update similarity index 100% rename from srcpkgs/ykpivmgr/update rename to srcpkgs/yubico-piv-tool/update