yubico-piv-tool: rename from ykpivmgr

Debian also uses this name.
Let's stop inventing package name.
This commit is contained in:
Đoàn Trần Công Danh 2020-10-17 18:49:05 +07:00
parent 3c2a37e95c
commit 75331b34ff
8 changed files with 30 additions and 47 deletions

View file

@ -1 +1 @@
ykpivmgr
yubico-piv-tool

View file

@ -1 +1 @@
ykpivmgr
yubico-piv-tool

View file

@ -1 +1 @@
ykpivmgr
yubico-piv-tool

View file

@ -1 +1 @@
ykpivmgr
yubico-piv-tool

1
srcpkgs/ykpivmgr Symbolic link
View file

@ -0,0 +1 @@
yubico-piv-tool

View file

@ -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. */

View file

@ -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 <kno0001@gmail.com>"
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
}