Merge branch 'release/1.5.3'

.clang-format

@@ -5,7 +5,7 @@ AccessModifierOffset: -4
 AlignAfterOpenBracket: DontAlign
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: false
+AlignEscapedNewlines: Right
 AlignOperands:   false
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: true
@@ -29,35 +29,50 @@ BraceWrapping:
   AfterObjCDeclaration: false
   AfterStruct:     false
   AfterUnion:      false
+  AfterExternBlock: false
   BeforeCatch:     false
   BeforeElse:      false
   IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
 BreakBeforeBinaryOperators: All
 BreakBeforeBraces: WebKit
+BreakBeforeInheritanceComma: false
 BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeComma
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
 ColumnLimit:     0
 CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: false
 DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+FixNamespaceComments: false
+ForEachMacros:   
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
 IncludeCategories: 
   - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
     Priority:        2
-  - Regex:           '^(<|"(gtest|isl|json)/)'
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
     Priority:        3
   - Regex:           '.*'
     Priority:        1
+IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
+IndentPPDirectives: None
 IndentWidth:     4
 IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
@@ -66,16 +81,23 @@ NamespaceIndentation: Inner
 ObjCBlockIndentWidth: 4
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Left
+RawStringFormats: 
+  - Delimiter:       pb
+    Language:        TextProto
+    BasedOnStyle:    google
 ReflowComments:  true
 SortIncludes:    true
+SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false
@@ -85,9 +107,8 @@ SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Cpp03
-TabWidth:        8
+Standard:        Cpp11
+TabWidth:        4
 UseTab:          Never
-JavaScriptQuotes: Leave
 ...
 

.github/ISSUE_TEMPLATE.md

@@ -37,4 +37,10 @@ possible. Thank you!
 <!--- What actually happend -->
 
 ### Other Information
-<!--- Feel free to include any other info, such as screenshots, log files etc -->
+<!--- Feel free to include any other info, such as screenshots, log files etc.
+
+If you paste any text into your issue, make sure to wrap it with a text fence so it renders correctly:
+```text
+# output goes here
+```
+-->

.gitignore

@@ -13,3 +13,4 @@ build-release*/
 # temporary...
 _xxx/
 *.zip
+*.exe

AUTHORS

@@ -0,0 +1,4 @@
+Nikos Mavrogiannopoulos (author)
+Ľubomír Carik (current maintainer)
+
+Thanks to all Contributors

CHANGELOG.md

@@ -1,8 +1,22 @@
 History of user-visible changes.
 
-## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased)
+## [v1.5.4](https://github.com/openconnect/openconnect-gui/tree/v1.5.4) (unreleased)
 - TBD
 
+[Full Changelog](https://github.com/openconnect/openconnect-gui/compare/v1.5.3...develop)
+
+
+## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (2018-03-25)
+- Don't lose password in batch mode and keys from storage (resolve #220, #142, #144)
+- No disconnection triggered before quit (#202)
+- Don't use system wide defined proxy when disabled in profile (#208)
+- Unable to use socks5 proxy built by ssh tunneling (#187)
+- Invalid routes (#190)
+- macOS tray icons improved for dark/light dock panel (#192)
+
+- update Qt(5.10.1), spdlog(0.16.3)
+- update (msys2): GnuTLS(3.6.1), p11-kit(0.23.9), stoken(0.92), libproxy(0.4.15), nettle(3.4), lz4(1.8.1.2), libxml2(2.9.7), libidn2(2.0.4)
+
 [Full Changelog](https://github.com/openconnect/openconnect-gui/compare/v1.5.2...v1.5.3)
 
 

CMake/Includes/CMakeLists_qt-solutions.cmake.in

@@ -11,7 +11,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(Qt5 5.6 REQUIRED COMPONENTS Core Gui Widgets Network)
+find_package(Qt5 5.10 REQUIRED COMPONENTS Core Gui Widgets Network)
 
 add_definitions(-DUNICODE)
 add_library(qtsingleapplication STATIC
@@ -39,4 +39,4 @@ install(
         qtsingleapplication/src/QtLockedFile
         qtsingleapplication/src/QtSingleApplication
     DESTINATION include
-)
+)

CMake/Includes/ProjectDependencies.cmake

@@ -3,12 +3,18 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(Qt5 5.6 REQUIRED COMPONENTS Core Gui Widgets Network)
+find_package(Qt5 5.10 REQUIRED COMPONENTS Core Gui Widgets Network)
 if(MINGW)
     get_target_property(_qwindows_dll Qt5::QWindowsIntegrationPlugin LOCATION)
+    if(NOT Qt5Core_VERSION STRLESS "5.10")
+        get_target_property(_qwinstyle_dylib Qt5::QWindowsVistaStylePlugin LOCATION)
+    endif()
 endif()
 if(APPLE)
     get_target_property(_qcocoa_dylib Qt5::QCocoaIntegrationPlugin LOCATION)
+    if(NOT Qt5Core_VERSION STRLESS "5.10")
+        get_target_property(_qmacstyle_dylib Qt5::QMacStylePlugin LOCATION)
+    endif()
 endif()
 
 # macOS & GNU/Linux dependencies

CMake/Includes/ProjectExternals.cmake

@@ -1,6 +1,6 @@
 set(openconnect-TAG v7.08)
 set(vpnc-scripts-TAG master)
-set(spdlog-TAG v0.13.0)
+set(spdlog-TAG v0.16.3)
 set(qt-solutions-TAG master)
 set(tap-driver-TAG 9.21.2)
 

CMake/Includes/ProjectExternals_openconnect.cmake

@@ -1,10 +1,16 @@
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(MINGW_VARIANT mingw64)
+else()
+    set(MINGW_VARIANT mingw32)
+endif()
+
 # --------------------------------------------------------------------------------------------------
 # openconnect (libs, headers, etc.)
 # --------------------------------------------------------------------------------------------------
-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/external/openconnect-devel-${openconnect-TAG}_mingw32.zip)
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/external/openconnect-devel-${openconnect-TAG}_${MINGW_VARIANT}.zip)
     set(OPENCONNECT_DEV_URL https://github.com/horar/openconnect/releases/download/${openconnect-TAG})
 else()
-    message(STATUS "Using local openconnect-devel packages...")
+    message(STATUS "Using local openconnect-devel packages... (${MINGW_VARIANT})")
     set(OPENCONNECT_DEV_URL ${CMAKE_SOURCE_DIR}/external)
 endif()
 
@@ -14,7 +20,7 @@ ExternalProject_Add(openconnect-devel-${openconnect-TAG}
 
     DOWNLOAD_NO_PROGRESS 1
 
-    URL ${OPENCONNECT_DEV_URL}/openconnect-devel-${openconnect-TAG}_mingw32.zip
+    URL ${OPENCONNECT_DEV_URL}/openconnect-devel-${openconnect-TAG}_${MINGW_VARIANT}.zip
 
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
@@ -37,10 +43,10 @@ ExternalProject_Add_Step(openconnect-devel-${openconnect-TAG} deploy_libraries
 # --------------------------------------------------------------------------------------------------
 # openconnect (util & libs)
 # --------------------------------------------------------------------------------------------------
-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/external/openconnect-${openconnect-TAG}_mingw32.zip)
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/external/openconnect-${openconnect-TAG}_${MINGW_VARIANT}.zip)
     set(OPENCONNECT_URL https://github.com/horar/openconnect/releases/download/${openconnect-TAG})
 else()
-    message(STATUS "Using local openconnect-devel packages...")
+    message(STATUS "Using local openconnect packages... ${MINGW_VARIANT}")
     set(OPENCONNECT_URL ${CMAKE_SOURCE_DIR}/external)
 endif()
 
@@ -50,7 +56,7 @@ ExternalProject_Add(openconnect-${openconnect-TAG}
 
     DOWNLOAD_NO_PROGRESS 1
 
-    URL ${OPENCONNECT_URL}/openconnect-${openconnect-TAG}_mingw32.zip
+    URL ${OPENCONNECT_URL}/openconnect-${openconnect-TAG}_${MINGW_VARIANT}.zip
 
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
@@ -99,7 +105,10 @@ set_property(TARGET openconnect::xml2 PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_
 set_property(TARGET openconnect::xml2 PROPERTY IMPORTED_IMPLIB ${CMAKE_BINARY_DIR}/external/lib/libxml2.dll.a)
 
 
-install(FILES  ${CMAKE_BINARY_DIR}/external/lib/openconnect.exe
+install(
+    FILES
+        ${CMAKE_BINARY_DIR}/external/lib/openconnect.exe
+        ${CMAKE_BINARY_DIR}/external/lib/vpnc-script-win.js
     DESTINATION .
     COMPONENT App_Console
 )

CMake/Includes/ProjectExternals_qt-solutions.cmake

@@ -19,10 +19,17 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
         ${CMAKE_SOURCE_DIR}/CMake/Includes/CMakeLists_qt-solutions.cmake.in
         ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master/CMakeLists.txt
         CMAKE_COMMAND ${CMAKE_CROSS_COMMAND} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
+
+    # Note: ninja-1.8.2 & cmake-3.10.2 failed in find/install this dependency wo next 2 lines :(
+    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a
+    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
 )
 
 add_library(qt-solutions::qtsingleapplication STATIC IMPORTED)
 set_target_properties(qt-solutions::qtsingleapplication PROPERTIES
     INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/include"
     IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a
 )
+set_property(TARGET qt-solutions::qtsingleapplication PROPERTY
+    DEPENDS qt-solutions-${qt-solutions-TAG}
+)

CMake/Includes/ProjectExternals_spdlog.cmake

@@ -13,11 +13,12 @@ ExternalProject_Add(spdlog-${spdlog-TAG}
     GIT_TAG ${spdlog-TAG}
     GIT_SHALLOW 1
 
-    CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DBUILD_TESTING=off -DSPDLOG_BUILD_TESTING=off
+    CMAKE_ARGS "${CMAKE_ARGS};-DCMAKE_BUILD_TYPE=Release;-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>;-DBUILD_TESTING=off;-DSPDLOG_BUILD_TESTING=off"
     CMAKE_COMMAND ${CMAKE_CROSS_COMMAND}
 )
 
 add_library(spdlog::spdlog INTERFACE IMPORTED)
 set_target_properties(spdlog::spdlog PROPERTIES
     INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/include"
 )
+add_dependencies(spdlog::spdlog DEPENDS spdlog-${spdlog-TAG})

CMake/Includes/ProjectPackage.cmake

@@ -13,6 +13,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PRODUCT_NAME_SHORT}")
 if(APPLE)
     set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/mono_lock.icns)
 endif()
+set(CPACK_PACKAGE_CHECKSUM SHA512)
 set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt)
 #set(CPACK_RESOURCE_FILE_README ...)
 #set(CPACK_RESOURCE_FILE_WELCOME ...)
@@ -51,7 +52,7 @@ if(WIN32 AND MINGW)
     set(CPACK_COMPONENTS_ALL App App_Console vpnc_script TAP_drivers VcRedist_libs)
 
     set(CPACK_COMPONENT_APP_REQUIRED on)
-    set(CPACK_COMPONENT_APP_DISPLAY_NAME "${PRODUCT_NAME_SHORT}")
+    set(CPACK_COMPONENT_APP_DISPLAY_NAME "GUI")
     set(CPACK_COMPONENT_APP_DESCRIPTION "${PRODUCT_NAME_LONG} GUI")
     set(CPACK_COMPONENT_APP_GROUP "Application")
     set(CPACK_COMPONENT_APP_INSTALL_TYPES Full AppOnly Standard)
@@ -77,7 +78,7 @@ if(WIN32 AND MINGW)
 
     set(CPACK_COMPONENT_APP_CONSOLE_DISABLED on)
     set(CPACK_COMPONENT_APP_CONSOLE_REQUIRED off)
-    set(CPACK_COMPONENT_APP_CONSOLE_DISPLAY_NAME "${PRODUCT_NAME_SHORT}")
+    set(CPACK_COMPONENT_APP_CONSOLE_DISPLAY_NAME "console")
     set(CPACK_COMPONENT_APP_CONSOLE_DESCRIPTION "${PRODUCT_NAME_LONG} (console)")
     set(CPACK_COMPONENT_APP_CONSOLE_GROUP "Application")
     set(CPACK_COMPONENT_APP_CONSOLE_INSTALL_TYPES Full)

CMake/Includes/ProjectSettings.cmake

@@ -11,6 +11,8 @@ endif()
 option(PROJ_PKCS11 "Enable PKCS11" ON)
 option(PROJ_INI_SETTINGS "Store the settings in INI files." OFF)
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 

CMakeLists.txt

@@ -1,17 +1,17 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 
 if(APPLE)
     if(NOT CMAKE_OSX_SYSROOT)
-        set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" CACHE STRING "" FORCE)
+        set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk" CACHE STRING "" FORCE)
     endif()
 
      if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "" FORCE)
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "" FORCE)
     endif()
 endif()
 
 project(openconnect-gui
-    VERSION 1.5.2
+    VERSION 1.5.3
     LANGUAGES CXX
 )
 
@@ -21,8 +21,8 @@ set(PRODUCT_NAME_SHORT "OpenConnect-GUI")
 set(PRODUCT_NAME_LONG "OpenConnect-GUI VPN client")
 set(PRODUCT_NAME_COMPANY "OpenConnect-GUI Team")
 set(PRODUCT_NAME_COMPANY_DOMAIN "openconnect.github.io")
-set(PRODUCT_NAME_COPYRIGHT_SHORT "Copyright (C) 2016-2017 OpenConnect-GUI Team")
-set(PRODUCT_NAME_COPYRIGHT_FULL "Copyright (C) 2014-2015 Red Hat Inc.<br>Copyright (C) 2016-2017 OpenConnect-GUI Team")
+set(PRODUCT_NAME_COPYRIGHT_SHORT "Copyright (C) 2016-2018 OpenConnect-GUI Team")
+set(PRODUCT_NAME_COPYRIGHT_FULL "Copyright (C) 2014-2015 Red Hat Inc.<br>${PRODUCT_NAME_COPYRIGHT_SHORT}")
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake/Modules/")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake/Includes/")

README.md

@@ -1,9 +1,10 @@
 # OpenConnect GUI
 
 [![Last Release:](https://img.shields.io/github/release/openconnect/openconnect-gui.svg)](https://github.com/openconnect/openconnect-gui/releases)
+[![Downloades](https://img.shields.io/github/downloads/openconnect/openconnect-gui/latest/total.svg)](https://github.com/openconnect/openconnect-gui/releases)
 [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://img.shields.io/badge/License-GPL%20v2-blue.svg)
 [![Join the chat at https://gitter.im/openconnect-gui/Lobby](https://badges.gitter.im/openconnect-gui/Lobby.svg)](https://gitter.im/openconnect-gui/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) 
-[![Build Status](https://travis-ci.org/openconnect/openconnect-gui.svg?branch=master)](https://travis-ci.org/openconnect/openconnect-gui)
+[![Build status](https://ci.appveyor.com/api/projects/status/hueumkrrgut9r3d7?svg=true)](https://ci.appveyor.com/project/horar/openconnect-gui)
 
 This is the GUI client for openconnect VPN.
 This client is in beta testing phase. It cannot be assumed to provide
@@ -21,6 +22,10 @@ Look to [OpenConnect-GUI](http://openconnect.github.io/openconnect-gui/) project
 - [OpenConnect library compilation and dependencies](docs/openconnect.md)
 - [Web page maintenance](docs/webpage.md)
 
+If you are brave and you would like to try [upcoming development snapshots](https://goo.gl/P88mTi) of OpenConnect-GUI or [OpenConnect](https://www.infradead.org/openconnect/) for Windows. (I'm not developer on second mentioned project, but this GUI is based on this great project).
+
+These are unofficial builds, without warranty, please don't complain... ;-)
+
 # License
 The content of this project itself is licensed under the [GNU General Public License v2](LICENSE.txt)