From 7a6b321d6e2c8a2fbc665b475bbdf037bc66ca02 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Sun, 26 Nov 2017 13:38:53 +0100
Subject: [PATCH] Add update information to AppImage and use KeePassXC PPA for
 YubiKey libs, resolves #1157

---
 AppImage-Recipe.sh | 15 ++++++++-------
 Dockerfile         | 37 +++++++------------------------------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/AppImage-Recipe.sh b/AppImage-Recipe.sh
index e29c056202..a5124a74b2 100755
--- a/AppImage-Recipe.sh
+++ b/AppImage-Recipe.sh
@@ -85,14 +85,15 @@ else
 fi
 EOF
 chmod +x ./usr/bin/keepassxc_env
-sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' org.${LOWERAPP}.desktop
-get_desktopintegration "org.${LOWERAPP}"
-
-GLIBC_NEEDED=$(glibc_needed)
+sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' org.${LOWERAPP}.${APP}.desktop
+get_desktopintegration "org.${LOWERAPP}.${APP}"
 
 cd ..
 
-generate_type2_appimage
+GLIBC_NEEDED=$(glibc_needed)
+NO_GLIBC_VERSION=true
+
+generate_type2_appimage -u "gh-releases-zsync|keepassxreboot|keepassxc|latest|KeePassXC-*-${ARCH}.AppImage.zsync"
 
-mv ../out/*.AppImage ../KeePassXC-${VERSION}-${ARCH}.AppImage
-rmdir ../out > /dev/null 2>&1
+mv ../out/*.AppImage* ../
+rm -rf ../out
diff --git a/Dockerfile b/Dockerfile
index ad9a2f4421..a5966be39e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,8 @@ RUN set -x \
     && apt-get -y install software-properties-common
 
 RUN set -x \
-    && add-apt-repository ppa:beineri/opt-qt${QT5_PPA_VERSION}-trusty
+    && add-apt-repository ppa:beineri/opt-qt${QT5_PPA_VERSION}-trusty \
+    && add-apt-repository ppa:phoerious/keepassxc
 
 RUN set -x \
     && apt-get update -y \
@@ -42,7 +43,9 @@ RUN set -x \
         zlib1g-dev \
         libxi-dev \
         libxtst-dev \
-        mesa-common-dev
+        mesa-common-dev \
+        libyubikey-dev \
+        libykpers-1-dev
 
 ENV CMAKE_PREFIX_PATH=/opt/qt${QT5_VERSION}/lib/cmake
 ENV LD_LIBRARY_PATH=/opt/qt${QT5_VERSION}/lib
@@ -52,34 +55,8 @@ RUN set -x \
 # AppImage dependencies
 RUN set -x \
     && apt-get install -y \
-        wget \
-        libfuse2
-
-# build libyubikey
-ENV YUBIKEY_VERSION=1.13
-RUN set -x \
-    && wget "https://developers.yubico.com/yubico-c/Releases/libyubikey-${YUBIKEY_VERSION}.tar.gz" \
-    && tar xf libyubikey-${YUBIKEY_VERSION}.tar.gz \
-    && cd libyubikey-${YUBIKEY_VERSION} \
-    && ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu \
-    && make \
-    && make install \
-    && cd .. \
-    && rm -Rf libyubikey-${YUBIKEY_VERSION}*
-
-# build libykpers-1
-ENV YKPERS_VERSION=1.18.0
-RUN set -x \
-    && apt-get install -y libusb-dev
-RUN set -x \
-    && wget "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${YKPERS_VERSION}.tar.gz" \
-    && tar xf ykpers-${YKPERS_VERSION}.tar.gz \
-    && cd ykpers-${YKPERS_VERSION} \
-    && ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu \
-    && make \
-    && make install \
-    && cd .. \
-    && rm -Rf ykpers-${YKPERS_VERSION}*
+        libfuse2 \
+        wget
 
 VOLUME /keepassxc/src
 VOLUME /keepassxc/out