From edd6fcf05a845b2b1900b59bbd34205a18b27011 Mon Sep 17 00:00:00 2001
From: Alex Wilson <alex@uq.edu.au>
Date: Tue, 28 Jul 2020 17:37:16 +1000
Subject: [PATCH] Release 0.6.1, add pivy-tool version cmd

---
 Makefile         | 5 +++--
 debian/changelog | 8 ++++++++
 pivy-tool.c      | 3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1235235..615a6fb 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ libdir		?= $(prefix)/lib
 binowner	?= root
 bingroup	?= wheel
 
-VERSION		= 0.6.0
+VERSION		= 0.6.1
 
 SECURITY_CFLAGS	= \
 	-fstack-protector-all -fwrapv -fPIC \
@@ -194,7 +194,8 @@ PIVTOOL_CFLAGS=		$(PCSC_CFLAGS) \
 			$(ZLIB_CFLAGS) \
 			$(SYSTEM_CFLAGS) \
 			$(SECURITY_CFLAGS) \
-			-O2 -g -D_GNU_SOURCE
+			-O2 -g -D_GNU_SOURCE \
+			-DPIVY_VERSION='"$(VERSION)"'
 PIVTOOL_LDFLAGS=	$(SYSTEM_LDFLAGS)
 PIVTOOL_LIBS=		$(PCSC_LIBS) \
 			$(CRYPTO_LIBS) \
diff --git a/debian/changelog b/debian/changelog
index a9ebd31..ef02cfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pivy (0.6.1-1) UNRELEASED; urgency=medium
+
+  * pivy-agent: fix for parsing errors in pivy-agent -S arguments
+  * pivy-box: performance improvements with large numbers of configs
+  * pivy-agent: re-establish new PCSC context on some errors
+
+ -- Alex Wilson <alex@cooperi.net>  Tue, 28 Jul 2020 07:34:33 +0000
+
 pivy (0.6.0-1) UNRELEASED; urgency=medium
 
   * pivy-agent support for SSH_ASKPASS, connection confirm mode
diff --git a/pivy-tool.c b/pivy-tool.c
index 1664ede..31e9e8f 100644
--- a/pivy-tool.c
+++ b/pivy-tool.c
@@ -2850,6 +2850,9 @@ main(int argc, char *argv[])
 		check_select_key();
 		err = cmd_import(slotid);
 
+	} else if (strcmp(op, "version") == 0) {
+		fprintf(stdout, "%s\n", PIVY_VERSION);
+
 	} else {
 		warnx("invalid operation '%s'", op);
 		usage();