Skip to content

Commit edd6fcf

Browse files
committed
Release 0.6.1, add pivy-tool version cmd
1 parent bb4aa9d commit edd6fcf

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ libdir ?= $(prefix)/lib
2222
binowner ?= root
2323
bingroup ?= wheel
2424

25-
VERSION = 0.6.0
25+
VERSION = 0.6.1
2626

2727
SECURITY_CFLAGS = \
2828
-fstack-protector-all -fwrapv -fPIC \
@@ -194,7 +194,8 @@ PIVTOOL_CFLAGS= $(PCSC_CFLAGS) \
194194
$(ZLIB_CFLAGS) \
195195
$(SYSTEM_CFLAGS) \
196196
$(SECURITY_CFLAGS) \
197-
-O2 -g -D_GNU_SOURCE
197+
-O2 -g -D_GNU_SOURCE \
198+
-DPIVY_VERSION='"$(VERSION)"'
198199
PIVTOOL_LDFLAGS= $(SYSTEM_LDFLAGS)
199200
PIVTOOL_LIBS= $(PCSC_LIBS) \
200201
$(CRYPTO_LIBS) \

debian/changelog

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
pivy (0.6.1-1) UNRELEASED; urgency=medium
2+
3+
* pivy-agent: fix for parsing errors in pivy-agent -S arguments
4+
* pivy-box: performance improvements with large numbers of configs
5+
* pivy-agent: re-establish new PCSC context on some errors
6+
7+
-- Alex Wilson <[email protected]> Tue, 28 Jul 2020 07:34:33 +0000
8+
19
pivy (0.6.0-1) UNRELEASED; urgency=medium
210

311
* pivy-agent support for SSH_ASKPASS, connection confirm mode

pivy-tool.c

+3
Original file line numberDiff line numberDiff line change
@@ -2850,6 +2850,9 @@ main(int argc, char *argv[])
28502850
check_select_key();
28512851
err = cmd_import(slotid);
28522852

2853+
} else if (strcmp(op, "version") == 0) {
2854+
fprintf(stdout, "%s\n", PIVY_VERSION);
2855+
28532856
} else {
28542857
warnx("invalid operation '%s'", op);
28552858
usage();

0 commit comments

Comments
 (0)