Release 4.3.1

Bug fixes:

- Removed references to QML Array prototype methods added in Qt 5.9
  (unavailable in Ubuntu Zesty and earlier)

Author: emlun

NEWS

@@ -1,3 +1,6 @@
+* Version 4.3.1
+ ** Bugfix: Removed references to QML Array prototype methods added in Qt 5.9 (unavailable in Ubuntu Zesty and earlier)
+
 * Version 4.3.0
  ** Now requires ykman version >= 0.5.0
  ** Feature: Remembered passwords are now shared with ykman.

debian/changelog

@@ -1,5 +1,5 @@
-yubioath-desktop (4.3.0) xenial; urgency=low
+yubioath-desktop (4.3.1-1) xenial; urgency=low
 
   * Build for ppa
 
- -- Emil Lundberg <emil@yubico.com>  Fri, 15 Dec 2017 16:00:51 +0100
+ -- Emil Lundberg <emil@yubico.com>  Sun, 17 Dec 2017 00:42:45 +0100

debian/control

@@ -19,14 +19,16 @@ Build-Depends: debhelper (>= 9),
                qml-module-io-thp-pyotherside,
                qml-module-qt-labs-settings,
                libqt5svg5-dev,
-               yubikey-manager (>= 0.5.0~pre1)
+               yubikey-manager (>= 0.5.0~),
+               yubikey-manager (< 0.6.0)
 Homepage: https://developers.yubico.com/yubioath-desktop/
 
 Package: yubioath-desktop
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         python3-yubikey-manager,
+         python3-yubikey-manager (>= 0.5.0~),
+         python3-yubikey-manager (< 0.6.0),
          qml-module-io-thp-pyotherside,
          qml-module-qtquick-controls,
          qml-module-qtquick-dialogs,

debian/source/options

@@ -0,0 +1,2 @@
+tar-ignore = ".git"
+tar-ignore = ".vagrant"

doc/development.adoc

@@ -60,11 +60,13 @@ Modify the provision.sh script to set up a USB filter to capture the device with
 First of all, set up the environment as described in the
 link:../vagrant/windows/README.md[Vagrant VM README].
 
-To build the project:
+To build the project, run in command prompt (skip the `git checkout` step to build the latest commit):
 
-    $ git clone --recurse-submodules https://github.com/Yubico/yubioath-desktop.git
-    $ cd yubioath-desktop
-    $ vagrant\windows\build.bat
+    > git clone --recurse-submodules https://github.com/Yubico/yubioath-desktop.git
+    > cd yubioath-desktop
+    > git checkout yubioath-desktop-<VERSION>
+    > git show --show-signature
+    > vagrant\windows\build.bat
 
 The `build.bat` script will output the build version number near the beginning.
 Use that as the `<VERSION>` in the next series of commands. If you missed it,
@@ -75,3 +77,24 @@ To build the installer, plug in the code signing YubiKey and run:
 
     $ cd yubioath-desktop
     $ vagrant\windows\release.bat <VERSION>
+
+
+== Publishing to Ubuntu PPA
+
+ 1. Update version number and signoff in `debian/changelog`.
+ 2. Build and upload package.
+
+For (2) you can use the Vagrant VM in `vagrant/ppa`. You'll need to set up the
+VM to capture the YubiKey containing your signing key. If you use VirtualBox,
+you can do this by uncommenting the USB filter included in the `Vagrantfile`.
+Then:
+
+    alice@work $ cd yubioath-desktop/vagrant/ppa
+    alice@work $ vagrant up
+    alice@work $ vagrant ssh
+    ubuntu@ubuntu-xenial $ gpg --recv-keys ABCDEF78
+    ubuntu@ubuntu-xenial $ gpg2 --recv-keys ABCDEF78
+    ubuntu@ubuntu-xenial $ gpg2 --card-status
+    ubuntu@ubuntu-xenial $ cd yubioath-desktop
+    ubuntu@ubuntu-xenial $ python3 compute-version.py yubioath-desktop- > VERSION
+    ubuntu@ubuntu-xenial $ ~/scripts/make-ppa -k ABCDEF78 -p gpg2

qml/ArrowKeysSelecter.qml

@@ -16,27 +16,30 @@ Item {
     Keys.onUpPressed: goUp()
 
     function findSelectedIndex() {
-        return credentials.findIndex(function(entry) {
+        return util.findIndex(credentials, function(entry) {
             return entry.credential.key === selectedKey
         }) || null
     }
 
     onGoDown: {
-        if (nothingSelected) {
-            selectedKey = firstCred.credential.key
-        } else if (!lastCredSelected) {
-            flickable.flick(0, -300)
-            selectedKey = credentials[findSelectedIndex() + 1].credential.key
+        if (nCreds > 0) {
+            if (nothingSelected) {
+                selectedKey = firstCred.credential.key
+            } else if (!lastCredSelected) {
+                flickable.flick(0, -300)
+                selectedKey = credentials[findSelectedIndex() + 1].credential.key
+            }
         }
-
     }
 
     onGoUp: {
-        if (nothingSelected) {
-            selectedKey = lastCred.credential.key
-        } else if (!firstCredSeleced) {
-            flickable.flick(0, 300)
-            selectedKey = credentials[findSelectedIndex() - 1].credential.key
+        if (nCreds > 0) {
+            if (nothingSelected) {
+                selectedKey = lastCred.credential.key
+            } else if (!firstCredSeleced) {
+                flickable.flick(0, 300)
+                selectedKey = credentials[findSelectedIndex() - 1].credential.key
+            }
         }
     }
 

qml/Util.qml

@@ -0,0 +1,44 @@
+import QtQuick 2.5
+
+Item {
+    visible: false
+
+    /*
+     * Quick and dirty shim for Array.find added in Qt 5.9
+     *
+     * @param items: array
+     * @param predicate: function(any) => Boolean
+     * @return The first `item` in `arr` that matches the `predicate`, or
+     *          `undefined` if none matches
+     */
+    function find(items, predicate) {
+        if (items) {
+            for (var i = 0; i < items.length; ++i) {
+                if (predicate(items[i])) {
+                    return items[i]
+                }
+            }
+        }
+        return undefined
+    }
+
+    /*
+     * Quick and dirty shim for Array.findIndex added in Qt 5.9
+     *
+     * @param items: array
+     * @param predicate: function(any) => Boolean
+     * @return The index of the first `item` in `arr` that matches the
+     *          `predicate`, or `undefined` if none matches
+     */
+    function findIndex(items, predicate) {
+        if (items) {
+            for (var i = 0; i < items.length; ++i) {
+                if (predicate(items[i])) {
+                    return i
+                }
+            }
+        }
+        return undefined
+    }
+
+}

qml/main.qml

@@ -371,6 +371,10 @@ ApplicationWindow {
         id: noQr
     }
 
+    Util {
+        id: util
+    }
+
     function selectCredential(entry) {
         selectedKey = entry.credential.key
     }
@@ -380,7 +384,7 @@ ApplicationWindow {
     }
 
     function getSelected() {
-        return credentials.find(function(entry) {
+        return util.find(credentials, function(entry) {
             return isSelected(entry.credential)
         }) || null
     }

vagrant/ppa/Vagrantfile

@@ -26,8 +26,8 @@ Vagrant.configure("2") do |config|
   # PRODUCT="Yubikey 4 OTP+U2F+CCID"
 
    config.vm.provider "virtualbox" do |vb|
-    vb.name = "yubioath-desktop:ppa"
-  #  vb.customize ['modifyvm', :id, '--usb', 'on']
+     vb.name = "yubioath-desktop:ppa"
+     vb.customize ['modifyvm', :id, '--usb', 'on']
   #  vb.customize ['usbfilter', 'add', '0', 
   #    '--target', :id, 
   #    '--name', FILTER_NAME, 

vagrant/ppa/provision.sh

@@ -32,9 +32,11 @@ sudo apt-get install -qq \
     python-enum34 \
     libykpers-1-1 \
     libu2f-host0 \
-    pcscd \
     debhelper \
     devscripts \
-    dh-make
+    dh-make \
+    gnupg2 \
+    gnupg-agent \
+    scdaemon
 
-git clone https://github.com/dainnilsson/scripts
+sudo -u ubuntu git clone https://github.com/dainnilsson/scripts