Adding upstream version 0.12.0.

Signed-off-by: Alf Gaida <agaida@siduction.org>

AUTHORS

@@ -4,7 +4,7 @@ Upstream Authors:
 
 Copyright:
     Copyright (c) 2010-2012 Razor team
-    Copyright (c) 2012-2014 LXQt team
+    Copyright (c) 2012-2017 LXQt team
 
-License: GPL-2 and LGPL-2.1+
+License: LGPL-2.1+
 The full text of the licenses can be found in the 'COPYING' file.

CHANGELOG

@@ -0,0 +1,93 @@
+
+lxqt-openssh-askpass-0.12.0 / 2017-10-21
+========================================
+
+  * Set patch version
+  * Don't export github templates
+  * Drops Qt5Core_VERSION_STRING
+  * set Qt::AA_UseHighDpiPixmaps to true
+  * Added QCommandLineParser and basic cli interface to lxqt-openssh-askpass
+  * Added default CMAKE_BUILD_TYPE and LXQT_ASKPASS_PATCH_VERSION
+  * Bump year
+
+0.11.1 / 2017-01-01
+===================
+
+  * Release 0.11.1: Update changelog
+  * Make CMakeLists.txt more uniform.
+  * Remove cpack (#21)
+
+0.11.0 / 2016-09-24
+===================
+
+  * Release 0.11.0: Add changelog
+  * Rework README.md
+  * build: Use external translations
+  * ts-files removal (#19)
+  * Fix typo in German translation (#18)
+  * Bump year Fix licenses, lxqt-openssh-askpass is LGPL only
+  * Italian translation update
+  * Fix target language in translation file template
+  * Remove ru_RU translation file
+  * new: lxqt-openssh-askpass_hu.ts
+
+0.10.0 / 2015-10-31
+===================
+
+  * Update translations
+  * Improve README
+  * Fix license file
+  * Fix typos in man page
+  * Add Greek (el) translation
+  * Rename LxQt to LXQt everywhere
+  * Fix typos
+  * Handles CMake policy CMP0063
+  * Use the LXQtCompilerSettings CMake module
+  * Adds Runtime COMPONENT
+  * Coding style changes
+  * Use GNUInstallDirs
+  * Use CMAKE_AUTOUIC, drop qt5_wrap_ui()
+  * Use CMAKE_AUTOMOC, drop qt5_wrap_cpp()
+  * Removes unneeded entries from include_directories()
+  * Updates the build system to use the Targets infrastructure
+  * Fix naming and links
+
+0.9.0 / 2015-01-25
+==================
+
+  * Added german translation.
+  * File name was ok but language name wasn´t. My mistake.
+  * Makes translation filename  match language="pt_PT"
+  * Portuguese update
+  * - Unify naming for a unique lxqt. No more suffixes
+  * CMakeLists.txt maintenance.
+  * Pass the UPDATE_TRANSLATIONS value to lxqt_translate_ts()
+  * Renames translations sources template from .ts.src to .ts
+  * Don't update (extract) translations by default.
+  * Handle translations
+  * Add Russian translation
+  * Clean up CMakeLists.txt and drop Qt 4
+
+0.8.0 / 2014-07-01
+==================
+
+  * Qt4/Qt5 switching fixed booth Qt4 and Qt5 build now without errors
+  * Add Qt5 support.
+  * Use new LXQt header files.
+
+0.7.0 / 2014-05-01
+==================
+
+  * Update AUTHORS and COPYING files
+  * Add CPack rules for creating tarball
+  * Fix renaming bugs, replacing lxqt-qt with lxde-qt
+  * Finish the crazy razor=>lxqt renaming tasks.
+  * Fix broken build and use liblxqt instead. * Rename binary to lxqt-openssh-askpass.
+  * Add COPYING and AUTHORS
+  * preliminary manpages primary for razorqt and usefully in venenux
+  * Remove stray code
+  * Generate translation files
+  * Fix components missing translations
+  * openssh-askpass: stay on top; don't hide under windows
+  * Small fixes (typo and a wrong parameter)
+  * new module "ssh-askpass helper"

CMakeLists.txt

@@ -1,25 +1,33 @@
 cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
+
 project(lxqt-openssh-askpass)
 
-option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+add_definitions(-Wall)
 
 include(GNUInstallDirs)
 
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Release)
-endif()
-
-add_definitions(-Wall)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-find_package(Qt5Widgets REQUIRED QUIET)
-find_package(Qt5LinguistTools REQUIRED QUIET)
+option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
 
-find_package(lxqt REQUIRED QUIET)
+find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+message(STATUS "Building with Qt${Qt5Core_VERSION}")
+
+find_package(lxqt REQUIRED)
+
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
+# Patch Version
+set(LXQT_ASKPASS_PATCH_VERSION 0)
+
+set(LXQT_ASKPASS_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_ADMIN_ASKPASS_VERSION})
+add_definitions("-DLXQT_ASKPASS_VERSION=\"${LXQT_ASKPASS_VERSION}\"")
 
 include(LXQtCompilerSettings NO_POLICY_SCOPE)
 
@@ -36,6 +44,10 @@ set(lxqt-openssh-askpass_UIS
     src/mainwindow.ui
 )
 
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
 # Translations **********************************
 include(LXQtTranslate)
 
@@ -48,6 +60,14 @@ lxqt_translate_ts(QM_FILES
         ${lxqt-openssh-askpass_UIS}
     INSTALL_DIR
         "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}"
+    PULL_TRANSLATIONS
+        ${PULL_TRANSLATIONS}
+    CLEAN_TRANSLATIONS
+        ${CLEAN_TRANSLATIONS}
+    TRANSLATIONS_REPO
+        ${TRANSLATIONS_REPO}
+    TRANSLATIONS_REFSPEC
+        ${TRANSLATIONS_REFSPEC}
 )
 
 lxqt_app_translation_loader(lxqt-openssh_QM_LOADER ${PROJECT_NAME})
@@ -69,14 +89,3 @@ INSTALL(TARGETS
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
     COMPONENT Runtime
 )
-
-
-# building tarball with CPack -------------------------------------------------
-include(InstallRequiredSystemLibraries)
-set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION})
-set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION})
-set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION})
-set(CPACK_GENERATOR TBZ2)
-set(CPACK_SOURCE_GENERATOR TBZ2)
-set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp)
-include(CPack)

LICENSE

@@ -1,9 +1,8 @@
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the
 Free Software Foundation and other authors who decide to use it.  You
 can use it too, but we suggest you first think carefully about whether
 this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
+strategy to use in any particular case, based on the explanations below.
 
   When we speak of free software, we are referring to freedom of use,
 not price.  Our General Public Licenses are designed to make sure that
@@ -89,9 +87,9 @@ libraries.  However, the Lesser license provides advantages in certain
 special circumstances.
 
   For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
 library does the same job as widely used non-free libraries.  In this
 case, there is little to gain by limiting the free library to free
 software only, so we use the Lesser General Public License.
@@ -138,8 +136,8 @@ included without limitation in the term "modification".)
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
 all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
 
   Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
@@ -305,10 +303,10 @@ of these things:
     the user installs one, as long as the modified version is
     interface-compatible with the version that the work was made with.
 
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
 
     d) If distribution of the work is made by offering access to copy
     from a designated place, offer equivalent access to copy the above
@@ -386,10 +384,9 @@ all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Library.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
 
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
@@ -407,11 +404,11 @@ be a consequence of the rest of this License.
 
   12. If the distribution and/or use of the Library is restricted in
 certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
 
   13. The Free Software Foundation may publish revised and/or new
 versions of the Lesser General Public License from time to time.

README

@@ -1,13 +0,0 @@
-This is a very small helper app for ssh-agent.
-
-Example setup:
-
-- run the lxqt-config-session.
-- add new item into the "Environment (Advanced)"
-   SSH_ASKPASS=lxqt-openssh-askpass
--if you want to register your keys on session startup add new item to "Autostart" tab. For example:
-   name: ssh-add
-   command: ssh-add
-   wait for system tray: false
-- logout/login/enjoy
-

README.md

@@ -0,0 +1,51 @@
+# lxqt-openssh-askpass
+
+## Overview
+
+`lxqt-openssh-askpass` is a GUI to query credentials on behalf of other programs. As indicated by its name it's primarily targeted at `ssh-agent`, the SSH agent of OpenSSH, but it works with other applications like e. g. EncFS as well.
+
+It was considered to abandon the tool in favour of KDE's `ksshaskpass` and lxqt-openssh-askpass had temporarily been declared deprecated for this reason. But it turned out the close bond of `ksshaskpass` to KWallet conflicts with LXQt's design goals so it's all but certain the replacement will happen. See https://github.com/lxde/lxqt/issues/362.
+
+## Installation
+
+### Compiling source code
+
+The only runtime dependency is [liblxqt](https://github.com/lxde/liblxqt).   
+Additional build dependencies are CMake and optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.   
+
+Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems.   
+
+To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual.   
+
+### Binary packages
+
+Official binary packages are provided by all major Linux distributions like Arch Linux, Debian (as of Debian stretch only), Fedora and openSUSE. Just use your package manager to search for string `lxqt-openssh-askpass`.
+
+## Configuration, Usage
+
+### ssh-agent
+
+First of all it must be ensured `ssh-agent` is running in LXQt sessions. This is basically beyond this document's scope but can e. g. be achieved by a user systemd unit
+```
+[Unit]
+Description=Some arbitrary description
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/ssh-agent -a /run/user/<ID>/ssh-agent
+
+[Install]
+WantedBy=default.target
+```
+where ID corresponds with the respective user's UID as displayed by `$ id <user>`.
+
+Environment variable `SSH_AUTH_SOCK` must point to the socket of `ssh-agent` as e. g. stated by option `-a` in the systemd unit depicted above. Environment variable `SSH_ASKPASS` must be set to `lxqt-openssh-askpass` to indicate this binary should be used.   
+Both variables can be set in section "Environment (Advanced)" of configuration dialogue [LXQt Session Settings](https://github.com/lxde/lxqt-session#lxqt-session-settings) of [lxqt-session](https://github.com/lxde/lxqt-session). Changes apply upon the next login only.
+
+Note binary `ssh-add` which is used to register keys with `ssh-agent` will use GUI tools like `lxqt-openssh-askpass` only when it is *not* attached to a terminal.   
+So `lxqt-openssh-askpass` will not be used when `ssh-add` is launched from a terminal emulator like QTerminal even when everything is configured as stated above. `lxqt-openssh-askpass` will be used when the invocation of `ssh-add` is handled by an autostart entry which can be configured in section "Autostart" of "LXQt Session Settings" or when a desktop entry file is used to invoke the tool from menus.
+
+### EncFS
+
+Simply hand `lxqt-openssh` to binary `encfs` by option `--extpass`, like in `encfs --extpass=lxqt-openssh-askpass <rootdir> <mount point>`.   
+In contrast to `ssh-{agent,add}` this works when `encfs` is launched from a terminal emulator, too.

man/lxqt-openssh-askpass.1

@@ -1,17 +1,17 @@
-.TH lxqt-openssh-askpass "1" "September 2012" "LXQt\ 0.5.0" "LxQt\ Module"
+.TH lxqt-openssh-askpass "1" "September 2012" "LXQt\ 0.5.0" "LXQt\ Module"
 .SH NAME
-lxqt-openssh-askpass \- Password access over ssh module of \fBLXQt\fR: the faster and lighter QT Desktop Environment
+lxqt-openssh-askpass \- Password access over ssh module of \fBLXQt\fR: the faster and lighter Qt Desktop Environment
 .SH SYNOPSIS
 .B lxqt-openssh-askpass
 [\fICurrently No command line arguments\fR]
 .br
 .SH DESCRIPTION
 This module handles openssh security password access for \fBLXQt\fR. The openssh askpass module, will perform 
-security tast over scale accesss privilegies.
+security tasks over scale access privileges.
 .P
 .P
 The \fBLXQt modules\fR are desktop independent tools, 
-and operate as daemons for the local user for desktop specific operations. 
+and operate as daemons for the local user for desktop-specific operations.
 .P
 \fBLXQt\fR is an advanced, easy-to-use, and fast desktop environment based on Qt
 technologies, ships several core desktop components, all of which are optional:
@@ -30,28 +30,28 @@ environments, and their names are self-descriptive.  They are usually not launch
 by hand but automatically, when choosing a \fBLXQt\fR session in the Display
 Manager.
 .SH BEHAVIOR
-The module detected on shares privilege accesss, and maintain a security dialog 
-that ask for the user's key need for access over another machine host.
+The module detected on shares privilege access, and maintains a security dialog
+that asks for the user's key needed for access over another machine host.
 .P
-This module are very early stage, and not enabled by default, so you must added a env 
+This module is very early stage, and not enabled by default, so you must added an env
 by the \fBlxqt\-settings\fR application as \fISSH_ASKPASS=\fR 
 with \fBlxqt\-openssh\-askpass\fR value, openssl and openssh-client packages must be required.
 .SH AUTOSTART
-The module only are showed on \fBLXQt\fR desktop, but u can create an autostart action 
-for you prefered desktop environment.
+The module is only showed on \fBLXQt\fR desktop, but you can create an autostart action
+for your preferred desktop environment.
 .SH "REPORTING BUGS"
 Report bugs to https://github.com/LXDE/LXQt/issues
 .SH "SEE ALSO"
-\fBLXQt\fR it has been tailored for users who value simplicity, speed, and
+\fBLXQt\fR has been tailored for users who value simplicity, speed, and
 an intuitive interface, also intended for less powerful machines. See also:
 .\" any module must refers to session app, for more info on start it
 .P
 \fBlxqt-session.1\fR  LXQt for manage LXQt complete environment
 .P
-\fBlxqt-policykit-agent.1\fR  LXQt plolicykit agent module for privilegie scalation.
+\fBlxqt-policykit-agent.1\fR  LXQt policykit agent module for privilege scalation
 .P
 \fBlxqt-config-session.1\fR  LXQt application for performing session autostart applications
 .P
 .SH AUTHOR
 This manual page was created by \fBPICCORO Lenz McKAY\fR \fI<mckaygerhard@gmail.com>\fR
-for  project and VENENUX GNU/Linux but can be used by others.
+for a project and VENENUX GNU/Linux but can be used by others.

src/main.cpp

@@ -26,12 +26,25 @@
  * END_COMMON_COPYRIGHT_HEADER */
 
 #include <LXQt/Application>
+#include <QCommandLineParser>
+
 #include "mainwindow.h"
 
 
 int main(int argc, char *argv[])
 {
-    LxQt::Application a(argc, argv);
+    LXQt::Application a(argc, argv);
+    a.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+
+    QCommandLineParser parser;
+    parser.setApplicationDescription(QStringLiteral("LXQt OpenSSH Askpass"));
+    const QString VERINFO = QStringLiteral(LXQT_ASKPASS_VERSION
+                                           "\nliblxqt   " LXQT_VERSION
+                                           "\nQt        " QT_VERSION_STR);
+    a.setApplicationVersion(VERINFO);
+    parser.addVersionOption();
+    parser.addHelpOption();
+    parser.process(a);
 
     // TODO/FIXME: maybe a better algorithm?
     QString prompt;

translations/lxqt-openssh-askpass.ts

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="en_US">
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>OpenSSH Authentication Passphrase request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your SSH passphrase for request:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>unknown request</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>

translations/lxqt-openssh-askpass_de.ts

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="de">
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>OpenSSH Authentication Passphrase request</source>
-        <translation>Abfrage der OpenSSH Authentisierungs-Passphrase</translation>
-    </message>
-    <message>
-        <source>Enter your SSH passphrase for request:</source>
-        <translation>SSH-Passphrase eingeben:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>unknown request</source>
-        <translation>Unbekannte Abfrage</translation>
-    </message>
-</context>
-</TS>

translations/lxqt-openssh-askpass_pt.ts

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pt">
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>OpenSSH Authentication Passphrase request</source>
-        <translation>Pedido de senha de autenticação OpenSSH</translation>
-    </message>
-    <message>
-        <source>Enter your SSH passphrase for request:</source>
-        <translation>Escreva a sua senha SSH para o pedido:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>unknown request</source>
-        <translation>pedido desconhecido</translation>
-    </message>
-</context>
-</TS>

translations/lxqt-openssh-askpass_ru.ts

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ru">
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>OpenSSH Authentication Passphrase request</source>
-        <translation>Запрос пароля для аутентификации по OpenSSH</translation>
-    </message>
-    <message>
-        <source>Enter your SSH passphrase for request:</source>
-        <translation>Введите ваш SSH-пароль для запроса:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>unknown request</source>
-        <translation>неизвестный запрос</translation>
-    </message>
-</context>
-</TS>

translations/lxqt-openssh-askpass_ru_RU.ts

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ru_RU">
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>OpenSSH Authentication Passphrase request</source>
-        <translation>Запрос пароля для аутентификации по OpenSSH</translation>
-    </message>
-    <message>
-        <source>Enter your SSH passphrase for request:</source>
-        <translation>Введите ваш SSH-пароль для запроса:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>unknown request</source>
-        <translation>неизвестный запрос</translation>
-    </message>
-</context>
-</TS>