Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-27 16:29:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/2.3.0' into develop

Browse Source
This commit is contained in:
Janek Bevendorff 2018-02-22 14:26:24 +01:00
commit 70c13f919a
4 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,5 +1,5 @@
# KeePassXC Linux Release Build Dockerfile # KeePassXC Linux Release Build Dockerfile
# Copyright (C) 2017 KeePassXC team <https://keepassxc.org/> # Copyright (C) 2017-2018 KeePassXC team <https://keepassxc.org/>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -19,7 +19,7 @@ FROM ubuntu:14.04
ENV REBUILD_COUNTER=5 ENV REBUILD_COUNTER=5
ENV QT5_VERSION=59 ENV QT5_VERSION=59
ENV QT5_PPA_VERSION=${QT5_VERSION}2 ENV QT5_PPA_VERSION=${QT5_VERSION}4
RUN set -x \ RUN set -x \
&& apt-get update -y \ && apt-get update -y \

29
release-tool
View File

@ -645,37 +645,38 @@ build() {
if [ "" == "$DOCKER_IMAGE" ]; then if [ "" == "$DOCKER_IMAGE" ]; then
if [ "$(uname -s)" == "Darwin" ]; then if [ "$(uname -s)" == "Darwin" ]; then
# Building on OS X # Building on macOS
local qt_vers="$(ls /usr/local/Cellar/qt5 2> /dev/null | sort -r | head -n1)" local qt_vers="$(ls /usr/local/Cellar/qt 2> /dev/null | sort -r | head -n1)"
if [ "" == "$qt_vers" ]; then if [ "" == "$qt_vers" ]; then
exitError "Couldn't find Qt5! Please make sure it is available in '/usr/local/Cellar/qt5'." exitError "Couldn't find Qt5! Please make sure it is available in '/usr/local/Cellar/qt'."
fi fi
export MACOSX_DEPLOYMENT_TARGET=10.7
export MACOSX_DEPLOYMENT_TARGET=10.10
logInfo "Configuring build..." logInfo "Configuring build..."
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_OSX_ARCHITECTURES=x86_64 -DWITH_CXX11=OFF \ -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
-DCMAKE_PREFIX_PATH="/usr/local/Cellar/qt5/${qt_vers}/lib/cmake" \ -DCMAKE_PREFIX_PATH="/usr/local/Cellar/qt/${qt_vers}/lib/cmake" \
-DQT_BINARY_DIR="/usr/local/Cellar/qt5/${qt_vers}/bin" $CMAKE_OPTIONS "$SRC_DIR" ${CMAKE_OPTIONS} "$SRC_DIR"
logInfo "Compiling and packaging sources..." logInfo "Compiling and packaging sources..."
make $MAKE_OPTIONS package make ${MAKE_OPTIONS} package
mv "./${APP_NAME}-${RELEASE_NAME}.dmg" ../ mv "./${APP_NAME}-${RELEASE_NAME}.dmg" ../
elif [ "$(uname -o)" == "Msys" ]; then elif [ "$(uname -o)" == "Msys" ]; then
# Building on Windows with Msys # Building on Windows with Msys2
logInfo "Configuring build..." logInfo "Configuring build..."
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off -G"MSYS Makefiles" \ cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off -G"MSYS Makefiles" \
-DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" $CMAKE_OPTIONS "$SRC_DIR" -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" $CMAKE_OPTIONS "$SRC_DIR"
logInfo "Compiling and packaging sources..." logInfo "Compiling and packaging sources..."
mingw32-make $MAKE_OPTIONS preinstall mingw32-make ${MAKE_OPTIONS} preinstall
# Call cpack directly instead of calling make package. # Call cpack directly instead of calling make package.
# This is important because we want to build the MSI when making a # This is important because we want to build the MSI when making a
# release. # release.
cpack -G "NSIS;ZIP;${CPACK_GENERATORS}" cpack -G "NSIS;ZIP;${CPACK_GENERATORS}"
mv "./${APP_NAME}-${RELEASE_NAME}-"*.* ../ mv "./${APP_NAME}-"*.* ../
else else
mkdir -p "${OUTPUT_DIR}/bin-release" mkdir -p "${OUTPUT_DIR}/bin-release"

10
snapcraft.yaml
View File

@ -1,5 +1,5 @@
name: keepassxc name: keepassxc
version: 2.2.4 version: 2.3.0-beta1
grade: stable grade: stable
summary: Community-driven port of the Windows application “KeePass Password Safe” summary: Community-driven port of the Windows application “KeePass Password Safe”
description: | description: |
@ -16,6 +16,9 @@ apps:
cli: cli:
command: keepassxc-cli command: keepassxc-cli
plugs: [gsettings, home, removable-media, raw-usb] plugs: [gsettings, home, removable-media, raw-usb]
proxy:
command: keepassxc-proxy
plugs: [home]
parts: parts:
keepassxc: keepassxc:
@ -26,10 +29,7 @@ parts:
- -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_INSTALL_PREFIX=/usr
- -DKEEPASSXC_DIST_TYPE=Snap - -DKEEPASSXC_DIST_TYPE=Snap
- -DWITH_TESTS=OFF - -DWITH_TESTS=OFF
- -DWITH_XC_AUTOTYPE=ON - -DWITH_XC_ALL=ON
- -DWITH_XC_HTTP=ON
- -DWITH_XC_YUBIKEY=ON
- -DWITH_XC_BROWSER=ON
build-packages: build-packages:
- g++ - g++
- libgcrypt20-dev - libgcrypt20-dev

2
src/zxcvbn/zxcvbn.c
View File

@ -45,9 +45,11 @@
#endif #endif
/* For pre-compiled headers under windows */ /* For pre-compiled headers under windows */
#ifndef __MINGW32__
#ifdef _WIN32 #ifdef _WIN32
#include "stdafx.h" #include "stdafx.h"
#endif #endif
#endif
/* Minimum number of characters in a incrementing/decrementing sequence match */ /* Minimum number of characters in a incrementing/decrementing sequence match */
#define MIN_SEQUENCE_LEN 3 #define MIN_SEQUENCE_LEN 3