Hello community,
here is the log from the commit of package yubikey-piv-manager for
openSUSE:Factory checked in at 2015-11-26 17:04:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yubikey-piv-manager (Old)
and /work/SRC/openSUSE:Factory/.yubikey-piv-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yubikey-piv-manager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yubikey-piv-manager/yubikey-piv-manager.changes
2015-11-16 18:51:27.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yubikey-piv-manager.new/yubikey-piv-manager.changes
2015-11-26 17:04:34.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 18 21:32:27 UTC 2015 - [email protected]
+
+- Version 1.1.1 (released 2015-11-16)
+ - Better handling of intermittent device disconnects.
+
+-------------------------------------------------------------------
Old:
----
yubikey-piv-manager-1.1.0.tar.gz
yubikey-piv-manager-1.1.0.tar.gz.sig
New:
----
yubikey-piv-manager-1.1.1.tar.gz
yubikey-piv-manager-1.1.1.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yubikey-piv-manager.spec ++++++
--- /var/tmp/diff_new_pack.QpHVca/_old 2015-11-26 17:04:35.000000000 +0100
+++ /var/tmp/diff_new_pack.QpHVca/_new 2015-11-26 17:04:35.000000000 +0100
@@ -18,7 +18,7 @@
%define bname pivman
Name: yubikey-piv-manager
-Version: 1.1.0
+Version: 1.1.1
Release: 0
Summary: YubiKey PIV Manager GUI
License: GPL-3.0+
++++++ yubikey-piv-manager-1.1.0.tar.gz -> yubikey-piv-manager-1.1.1.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-piv-manager-1.1.0/ChangeLog
new/yubikey-piv-manager-1.1.1/ChangeLog
--- old/yubikey-piv-manager-1.1.0/ChangeLog 2015-11-12 10:39:59.000000000
+0100
+++ new/yubikey-piv-manager-1.1.1/ChangeLog 2015-11-16 09:17:54.000000000
+0100
@@ -1,3 +1,31 @@
+2015-11-16 Dain Nilsson <[email protected]>
+
+ * NEWS, pivman/__init__.py: Update version and NEWS for release.
+
+2015-11-13 Dain Nilsson <[email protected]>
+
+ * NEWS: Updated NEWS.
+
+2015-11-13 Dain Nilsson <[email protected]>
+
+ * pivman/controller.py, pivman/piv.py, pivman/view/cert.py,
+ pivman/view/generate_dialog.py, pivman/view/init_dialog.py,
+ pivman/view/set_key_dialog.py, pivman/view/set_pin_dialog.py:
+ Attempt to reconnect to device if lost before using.
+
+2015-11-12 Dain Nilsson <[email protected]>
+
+ * README: Updated executable build instructions in README.
+
+2015-11-12 Dain Nilsson <[email protected]>
+
+ * resources/osx-installer.pkgproj, resources/win-installer.nsi:
+ Updated Win/OSX installers.
+
+2015-11-12 Dain Nilsson <[email protected]>
+
+ * NEWS, pivman/__init__.py: Bumped version post release.
+
2015-11-12 Dain Nilsson <[email protected]>
* NEWS, pivman/__init__.py: Prepare release.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-piv-manager-1.1.0/NEWS
new/yubikey-piv-manager-1.1.1/NEWS
--- old/yubikey-piv-manager-1.1.0/NEWS 2015-11-12 10:32:19.000000000 +0100
+++ new/yubikey-piv-manager-1.1.1/NEWS 2015-11-16 09:17:48.000000000 +0100
@@ -1,3 +1,6 @@
+* Version 1.1.1 (released 2015-11-16)
+ ** Better handling of intermittent device disconnects.
+
* Version 1.1.0 (released 2015-11-12)
** Added support for ECC P-384 when supported by the device.
** Added usage policy when supported by the device.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-piv-manager-1.1.0/PKG-INFO
new/yubikey-piv-manager-1.1.1/PKG-INFO
--- old/yubikey-piv-manager-1.1.0/PKG-INFO 2015-11-12 10:39:59.000000000
+0100
+++ new/yubikey-piv-manager-1.1.1/PKG-INFO 2015-11-16 09:17:55.000000000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: yubikey-piv-manager
-Version: 1.1.0
+Version: 1.1.1
Summary: Tool for configuring your PIV-enabled YubiKey.
Home-page: https://github.com/Yubico/yubikey-piv-manager
Author: Yubico Open Source Maintainers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-piv-manager-1.1.0/README
new/yubikey-piv-manager-1.1.1/README
--- old/yubikey-piv-manager-1.1.0/README 2015-09-22 13:17:09.000000000
+0200
+++ new/yubikey-piv-manager-1.1.1/README 2015-11-12 16:41:03.000000000
+0100
@@ -39,11 +39,11 @@
installed (32 or 64-bit versions depending on the architecture of the binary
your are building).
-To sign the executable, copy the pfx file to pivman.pfx and place it in the
-root of the release directory. You will need signtool.exe (from the Windows
-SDK) either copied into the root as well or in a location in your PATH.
+To sign the executable you will need signtool.exe (from the Windows SDK) either
+copied into the root as well or in a location in your PATH, as well as a
+certificate in the Windows certificate store that you wish to sign with.
-Run "pyinstaller.exe resources/pivman.spec" from the main release directory.
+Run "python setup.py executable" from the main release directory.
With NSIS installed, a Windows installer will be built as well.
@@ -59,7 +59,7 @@
NOTE: Homebrew will build backwards-incompatible binaries, so the resulting
build will not run on an older version of OSX.
-Run "pyinstaller resources/pivman.spec" from the main release directory. This
+Run "python setup.py executable" from the main release directory. This
will create an .app in the dist directory.
Sign the code using codesign:
@@ -72,6 +72,6 @@
This can be used to create an installer for distribution, which you should sign
prior to distribution:
- packagesbuild resources/pivman.pkgproj
+ packagesbuild resources/osx-installer.pkgproj
productsign --sign 'Developer ID Installer' dist/YubiKey\ PIV\ Manager.pkg
dist/yubikey-piv-manager-mac.pkg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-piv-manager-1.1.0/pivman/__init__.py
new/yubikey-piv-manager-1.1.1/pivman/__init__.py
--- old/yubikey-piv-manager-1.1.0/pivman/__init__.py 2015-11-12
10:31:34.000000000 +0100
+++ new/yubikey-piv-manager-1.1.1/pivman/__init__.py 2015-11-16
09:16:55.000000000 +0100
@@ -24,4 +24,4 @@
# non-source form of such a combination shall include the source code
# for the parts of OpenSSL used as well as that of the covered work.
-__version__ = "1.1.0"
+__version__ = "1.1.1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-piv-manager-1.1.0/pivman/controller.py
new/yubikey-piv-manager-1.1.1/pivman/controller.py
--- old/yubikey-piv-manager-1.1.0/pivman/controller.py 2015-11-11
15:12:25.000000000 +0100
+++ new/yubikey-piv-manager-1.1.1/pivman/controller.py 2015-11-13
14:11:17.000000000 +0100
@@ -112,6 +112,9 @@
def poll(self):
return test(self._key._read_version)
+ def reconnect(self):
+ self._key.reconnect()
+
def _save_data(self):
raw_data = serialize_pivtool_data(self._data)
if raw_data != self._raw_data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-piv-manager-1.1.0/pivman/piv.py
new/yubikey-piv-manager-1.1.1/pivman/piv.py
--- old/yubikey-piv-manager-1.1.0/pivman/piv.py 2015-11-12 10:38:50.000000000
+0100
+++ new/yubikey-piv-manager-1.1.1/pivman/piv.py 2015-11-13 14:12:26.000000000
+0100
@@ -128,6 +128,10 @@
except ValueError:
pass # Not autheniticated, perhaps?
+ def reconnect(self):
+ check(ykpiv_disconnect(self._state))
+ self._reset()
+
def _connect(self):
check(ykpiv_connect(self._state, self._reader))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-piv-manager-1.1.0/pivman/qt_resources.py
new/yubikey-piv-manager-1.1.1/pivman/qt_resources.py
--- old/yubikey-piv-manager-1.1.0/pivman/qt_resources.py 2015-11-12
10:39:59.000000000 +0100
+++ new/yubikey-piv-manager-1.1.1/pivman/qt_resources.py 2015-11-16
09:17:54.000000000 +0100
@@ -2,7 +2,7 @@
# Resource object code
#
-# Created: Thu Nov 12 10:39:59 2015
+# Created: Mon Nov 16 09:17:54 2015
# by: The Resource Compiler for PySide (Qt v4.8.4)
#
# WARNING! All changes made in this file will be lost!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-piv-manager-1.1.0/pivman/view/cert.py
new/yubikey-piv-manager-1.1.1/pivman/view/cert.py
--- old/yubikey-piv-manager-1.1.0/pivman/view/cert.py 2015-11-10
14:37:14.000000000 +0100
+++ new/yubikey-piv-manager-1.1.1/pivman/view/cert.py 2015-11-13
14:36:47.000000000 +0100
@@ -273,6 +273,9 @@
func = partial(func, password=password)
try:
+ if not controller.poll():
+ controller.reconnect()
+
controller.ensure_authenticated()
worker = QtCore.QCoreApplication.instance().worker
worker.post(m.importing_file, func, partial(
@@ -305,10 +308,10 @@
self._complex = settings[SETTINGS.COMPLEX_PINS]
self._controller = controller
- controller.use(self._build_ui)
controller.on_lost(self.accept)
+ self._build_ui()
- def _build_ui(self, controller):
+ def _build_ui(self):
layout = QtGui.QVBoxLayout(self)
# This unfortunately causes the window to resize when switching tabs.
# layout.setSizeConstraint(QtGui.QLayout.SetFixedSize)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-piv-manager-1.1.0/pivman/view/generate_dialog.py
new/yubikey-piv-manager-1.1.1/pivman/view/generate_dialog.py
--- old/yubikey-piv-manager-1.1.0/pivman/view/generate_dialog.py
2015-11-10 14:34:16.000000000 +0100
+++ new/yubikey-piv-manager-1.1.1/pivman/view/generate_dialog.py
2015-11-13 14:30:32.000000000 +0100
@@ -28,6 +28,7 @@
from pivman import messages as m
from pivman.utils import has_ca, request_cert_from_ca
from pivman.storage import settings, SETTINGS
+from pivman.piv import DeviceGoneError
from pivman.view.usage_policy_dialog import UsagePolicyDialog
from pivman.view.utils import SUBJECT_VALIDATOR
@@ -189,6 +190,9 @@
out_fn = None
try:
+ if not self._controller.poll():
+ self._controller.reconnect()
+
if self.out_format != 'pk':
pin = self._controller.ensure_pin()
else:
@@ -196,7 +200,8 @@
self._controller.ensure_authenticated(pin)
except Exception as e:
QtGui.QMessageBox.warning(self, m.error, str(e))
- self.accept()
+ if not isinstance(e, DeviceGoneError):
+ self.accept()
return
worker = QtCore.QCoreApplication.instance().worker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yubikey-piv-manager-1.1.0/pivman/view/init_dialog.py
new/yubikey-piv-manager-1.1.1/pivman/view/init_dialog.py
--- old/yubikey-piv-manager-1.1.0/pivman/view/init_dialog.py 2015-11-10
15:20:06.000000000 +0100
+++ new/yubikey-piv-manager-1.1.1/pivman/view/init_dialog.py 2015-11-13
14:12:39.000000000 +0100
@@ -241,6 +241,9 @@
if res != QtGui.QMessageBox.Ok:
return
+ if not self._controller.poll():
+ self._controller.reconnect()
+
self._controller.ensure_authenticated()
worker = QtCore.QCoreApplication.instance().worker
worker.post(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-piv-manager-1.1.0/pivman/view/set_key_dialog.py
new/yubikey-piv-manager-1.1.1/pivman/view/set_key_dialog.py
--- old/yubikey-piv-manager-1.1.0/pivman/view/set_key_dialog.py 2015-11-10
15:18:26.000000000 +0100
+++ new/yubikey-piv-manager-1.1.1/pivman/view/set_key_dialog.py 2015-11-13
14:25:32.000000000 +0100
@@ -137,6 +137,9 @@
return
try:
+ if not self._controller.poll():
+ self._controller.reconnect()
+
if self._controller.pin_is_key or self.use_pin:
pin = self._controller.ensure_pin()
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-piv-manager-1.1.0/pivman/view/set_pin_dialog.py
new/yubikey-piv-manager-1.1.1/pivman/view/set_pin_dialog.py
--- old/yubikey-piv-manager-1.1.0/pivman/view/set_pin_dialog.py 2015-11-10
15:18:50.000000000 +0100
+++ new/yubikey-piv-manager-1.1.1/pivman/view/set_pin_dialog.py 2015-11-13
14:28:47.000000000 +0100
@@ -114,6 +114,8 @@
self._invalid_pin(self.warn_not_complex, m.pin_complexity_desc)
else:
try:
+ if not self._controller.poll():
+ self._controller.reconnect()
fn = self._prepare_fn(old_pin, new_pin)
worker = QtCore.QCoreApplication.instance().worker
worker.post(self.busy, fn, self._change_pin_callback, True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-piv-manager-1.1.0/resources/osx-installer.pkgproj
new/yubikey-piv-manager-1.1.1/resources/osx-installer.pkgproj
--- old/yubikey-piv-manager-1.1.0/resources/osx-installer.pkgproj
2015-04-24 16:57:02.000000000 +0200
+++ new/yubikey-piv-manager-1.1.1/resources/osx-installer.pkgproj
2015-11-12 16:10:44.000000000 +0100
@@ -487,32 +487,8 @@
</dict>
<key>PACKAGE_SCRIPTS</key>
<dict>
- <key>POSTINSTALL_PATH</key>
- <dict>
- <key>PATH</key>
- <string>osx-patch-ccid</string>
- <key>PATH_TYPE</key>
- <integer>1</integer>
- </dict>
<key>RESOURCES</key>
- <array>
- <dict>
- <key>CHILDREN</key>
- <array/>
- <key>GID</key>
- <integer>0</integer>
- <key>PATH</key>
- <string>osx-patch-ccid</string>
- <key>PATH_TYPE</key>
- <integer>1</integer>
- <key>PERMISSIONS</key>
- <integer>493</integer>
- <key>TYPE</key>
- <integer>3</integer>
- <key>UID</key>
- <integer>0</integer>
- </dict>
- </array>
+ <array/>
</dict>
<key>PACKAGE_SETTINGS</key>
<dict>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-piv-manager-1.1.0/resources/win-installer.nsi
new/yubikey-piv-manager-1.1.1/resources/win-installer.nsi
--- old/yubikey-piv-manager-1.1.0/resources/win-installer.nsi 2015-05-08
14:59:10.000000000 +0200
+++ new/yubikey-piv-manager-1.1.1/resources/win-installer.nsi 2015-11-12
16:27:46.000000000 +0100
@@ -1,12 +1,12 @@
!include "MUI2.nsh"
-!define MUI_ICON "pivman.ico"
+!define MUI_ICON "yubikey-piv-manager.ico"
; The name of the installer
Name "YubiKey PIV Manager"
; The file to write
-OutFile "../dist/yubikey-piv-manager-${PIVMAN_VERSION}-win.exe"
+OutFile "../dist/yubikey-piv-manager-${VERSION}-win.exe"
; The default installation directory
InstallDir "$PROGRAMFILES\Yubico\YubiKey PIV Manager"
@@ -48,6 +48,9 @@
;--------------------------------
Section "YubiKey PIV Manager"
+ ; Remove all
+ DELETE "$INSTDIR\*"
+
SectionIn RO
SetOutPath $INSTDIR
FILE "..\dist\YubiKey PIV Manager\*"
@@ -67,7 +70,7 @@
WriteRegStr HKLM $MYTMP "DisplayName" "YubiKey PIV Manager"
WriteRegExpandStr HKLM $MYTMP "UninstallString" '"$INSTDIR\uninstall.exe"'
WriteRegExpandStr HKLM $MYTMP "InstallLocation" "$INSTDIR"
- WriteRegStr HKLM $MYTMP "DisplayVersion" "${PIVMAN_VERSION}"
+ WriteRegStr HKLM $MYTMP "DisplayVersion" "${VERSION}"
WriteRegStr HKLM $MYTMP "Publisher" "Yubico AB"
WriteRegStr HKLM $MYTMP "URLInfoAbout" "http://www.yubico.com";
WriteRegDWORD HKLM $MYTMP "NoModify" "1"
@@ -78,11 +81,11 @@
;Create shortcuts
SetShellVarContext all
SetOutPath "$SMPROGRAMS\$STARTMENU_FOLDER"
- CreateShortCut "YubiKey PIV Manager.lnk" "$INSTDIR\YubiKey PIV Manager.exe"
"" "$INSTDIR\YubiKey PIV Manager.exe" 0
+ CreateShortCut "YubiKey PIV Manager.lnk" "$INSTDIR\pivman.exe" ""
"$INSTDIR\pivman.exe" 0
CreateShortCut "Uninstall.lnk" "$INSTDIR\uninstall.exe" ""
"$INSTDIR\uninstall.exe" 1
!insertmacro MUI_STARTMENU_WRITE_END
- CreateShortCut "$SMSTARTUP\YubiKey PIV Manager PIN-check.lnk"
"$INSTDIR\YubiKey PIV Manager.exe" "-c"
+ CreateShortCut "$SMSTARTUP\YubiKey PIV Manager PIN-check.lnk"
"$INSTDIR\pivman.exe" "-c"
SectionEnd
; Uninstaller
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yubikey-piv-manager-1.1.0/yubikey_piv_manager.egg-info/PKG-INFO
new/yubikey-piv-manager-1.1.1/yubikey_piv_manager.egg-info/PKG-INFO
--- old/yubikey-piv-manager-1.1.0/yubikey_piv_manager.egg-info/PKG-INFO
2015-11-12 10:39:59.000000000 +0100
+++ new/yubikey-piv-manager-1.1.1/yubikey_piv_manager.egg-info/PKG-INFO
2015-11-16 09:17:54.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: yubikey-piv-manager
-Version: 1.1.0
+Version: 1.1.1
Summary: Tool for configuring your PIV-enabled YubiKey.
Home-page: https://github.com/Yubico/yubikey-piv-manager
Author: Yubico Open Source Maintainers
