Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-06 22:19:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add update information to AppImage and use KeePassXC PPA for YubiKey libs, resolves #1157

Browse source
This commit is contained in:
Janek Bevendorff 2017-11-26 13:38:53 +01:00
parent 8905fe5a54
commit b20918b60e
2 changed files with 15 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

15
AppImage-Recipe.sh
View file

@ -85,14 +85,15 @@ else
fi fi
EOF EOF
chmod +x ./usr/bin/keepassxc_env chmod +x ./usr/bin/keepassxc_env
sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' org.${LOWERAPP}.desktop sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' org.${LOWERAPP}.${APP}.desktop
get_desktopintegration "org.${LOWERAPP}" get_desktopintegration "org.${LOWERAPP}.${APP}"
GLIBC_NEEDED=$(glibc_needed)
cd .. cd ..
generate_type2_appimage GLIBC_NEEDED=$(glibc_needed)
NO_GLIBC_VERSION=true
mv ../out/*.AppImage ../KeePassXC-${VERSION}-${ARCH}.AppImage generate_type2_appimage -u "gh-releases-zsync|keepassxreboot|keepassxc|latest|KeePassXC-*-${ARCH}.AppImage.zsync"
rmdir ../out > /dev/null 2>&1
mv ../out/*.AppImage* ../
rm -rf ../out

37
Dockerfile
View file

@ -24,7 +24,8 @@ RUN set -x \
&& apt-get -y install software-properties-common && apt-get -y install software-properties-common
RUN set -x \ 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 \ RUN set -x \
&& apt-get update -y \ && apt-get update -y \
@ -42,7 +43,9 @@ RUN set -x \
zlib1g-dev \ zlib1g-dev \
libxi-dev \ libxi-dev \
libxtst-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 CMAKE_PREFIX_PATH=/opt/qt${QT5_VERSION}/lib/cmake
ENV LD_LIBRARY_PATH=/opt/qt${QT5_VERSION}/lib ENV LD_LIBRARY_PATH=/opt/qt${QT5_VERSION}/lib
@ -52,34 +55,8 @@ RUN set -x \
# AppImage dependencies # AppImage dependencies
RUN set -x \ RUN set -x \
&& apt-get install -y \ && apt-get install -y \
wget \ libfuse2 \
libfuse2 wget
# 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}*
VOLUME /keepassxc/src VOLUME /keepassxc/src
VOLUME /keepassxc/out VOLUME /keepassxc/out