diff -Nru pinentry-x2go-0.7.5.7/assuan/assuan-buffer.c pinentry-x2go-0.7.5.6/assuan/assuan-buffer.c --- pinentry-x2go-0.7.5.7/assuan/assuan-buffer.c 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/assuan/assuan-buffer.c 2015-12-22 15:41:37.000000000 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #include diff -Nru pinentry-x2go-0.7.5.7/assuan/assuan-defs.h pinentry-x2go-0.7.5.6/assuan/assuan-defs.h --- pinentry-x2go-0.7.5.7/assuan/assuan-defs.h 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/assuan/assuan-defs.h 2015-12-22 15:41:37.000000000 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifndef ASSUAN_DEFS_H diff -Nru pinentry-x2go-0.7.5.7/assuan/assuan.h pinentry-x2go-0.7.5.6/assuan/assuan.h --- pinentry-x2go-0.7.5.7/assuan/assuan.h 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/assuan/assuan.h 2015-12-22 15:41:37.000000000 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifndef ASSUAN_H diff -Nru pinentry-x2go-0.7.5.7/assuan/assuan-handler.c pinentry-x2go-0.7.5.6/assuan/assuan-handler.c --- pinentry-x2go-0.7.5.7/assuan/assuan-handler.c 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/assuan/assuan-handler.c 2015-12-22 15:41:37.000000000 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #include diff -Nru pinentry-x2go-0.7.5.7/assuan/assuan-listen.c pinentry-x2go-0.7.5.6/assuan/assuan-listen.c --- pinentry-x2go-0.7.5.7/assuan/assuan-listen.c 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/assuan/assuan-listen.c 2015-12-22 15:41:37.000000000 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #include diff -Nru pinentry-x2go-0.7.5.7/assuan/assuan-pipe-server.c pinentry-x2go-0.7.5.6/assuan/assuan-pipe-server.c --- pinentry-x2go-0.7.5.7/assuan/assuan-pipe-server.c 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/assuan/assuan-pipe-server.c 2015-12-22 15:41:37.000000000 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #include diff -Nru pinentry-x2go-0.7.5.7/assuan/assuan-util.c pinentry-x2go-0.7.5.6/assuan/assuan-util.c --- pinentry-x2go-0.7.5.7/assuan/assuan-util.c 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/assuan/assuan-util.c 2015-12-22 15:41:37.000000000 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #include diff -Nru pinentry-x2go-0.7.5.7/ChangeLog pinentry-x2go-0.7.5.6/ChangeLog --- pinentry-x2go-0.7.5.7/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ pinentry-x2go-0.7.5.6/ChangeLog 2015-12-22 15:41:37.000000000 +0000 @@ -0,0 +1,96 @@ +pinentry-x2go (0.7.5.6-0~45~ubuntu15.04.1) vivid; urgency=low + + * Auto build. + + -- Mihai Moldovan Tue, 22 Dec 2015 15:41:37 +0000 + +pinentry-x2go (0.7.5.6-0~x2go1) unstable; urgency=low + + [ Mike Gabriel ] + * /debian/control: + + Maintainer change in package: X2Go Developers . + + Priority: optional. + + [ Reinhard Tartler ] + * /debian/rules: + + Disable dh_auto_test. + + -- Mike Gabriel Mon, 31 Dec 2012 17:07:04 +0100 + +pinentry-x2go (0.7.5.5-0~x2go2) unstable; urgency=low + + * Do not install the pinentry.info file anymore, it conflicts with the info + file from the default/original pinentry package. + * Add Conflicts/Replaces entries for pinentry-x2go-gtk. + * Bump Standards to 3.9.3. + + -- Mike Gabriel Mon, 20 Aug 2012 10:05:57 +0200 + +pinentry-x2go (0.7.5.5-0~x2go1) unstable; urgency=low + + [ Mike Gabriel ] + * New upstream version (0.7.5.5): + - Set version and project name in configure.ac template. + + [ Jan Engelhard ] + * New upstream version (0.7.5.5): + - The package does not use GNU mode. Mark it as such. Makefile.am: error: + required file './ChangeLog' not found. Also replace the totally ancient + AM_INIT_AUTOMAKE syntax. + - Avoid warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body. + - Provide several names for qmake-qt4, become more cross-distro tolerant. + - Provide CPPFLAGS for QMAKE_CFLAGS and QMAKE_CXXFLAGS. Provide CPPFLAGS + first. + + -- Mike Gabriel Sun, 15 Jul 2012 09:52:18 +0200 + +pinentry-x2go (0.7.5.4-0~x2go1) unstable; urgency=low + + * New upstream version (0.7.5.4): + - Drop mdate-sh and texinfo.tex from /doc folder (autotools build cruft). + + -- Mike Gabriel Thu, 14 Jun 2012 09:47:09 +0200 + +pinentry-x2go (0.7.5.3-0~x2go1) unstable; urgency=low + + * Update of copyright information in several file headers. + + -- Mike Gabriel Wed, 13 Jun 2012 17:11:48 +0200 + +pinentry-x2go (0.7.5.2-0~x2go1) unstable; urgency=low + + * New upstream version (0.7.5.2): + - Strip code project down to its essentials, remove a lot of unneeded + cruft. + - Make code tree fully build with autotools, see README file for further + info. + - Replace string pinentry-qt with pinentry-x2go. + * Make dh_clean remove all build cruft. + + -- Mike Gabriel Wed, 13 Jun 2012 15:11:19 +0200 + +pinentry-x2go (0.7.5.1-0~x2go1) unstable; urgency=low + + [ Oleksandr Shneyder ] + * Set font size in pinentry dialog to 14 + + -- Mike Gabriel Wed, 12 Oct 2011 10:42:21 +0200 + +pinentry-x2go (0.7.5.0-0~x2go1) unstable; urgency=low + + * Changed version numbering scheme. + + -- Mike Gabriel Mon, 21 Mar 2011 21:58:02 +0100 + +pinentry-x2go (0.7.5-2) unstable; urgency=low + + * merged with pinentry version 0.7.5 + + -- Oleksandr Shneyder Tue, 27 Jan 2009 07:55:15 +0100 + +pinentry-x2go (0.7.2-1) unstable; urgency=low + + * Initial release. + + -- Oleksandr Shneyder Fri, 3 Aug 2007 08:28:09 +0200 + diff -Nru pinentry-x2go-0.7.5.7/config.h.in pinentry-x2go-0.7.5.6/config.h.in --- pinentry-x2go-0.7.5.7/config.h.in 1970-01-01 00:00:00.000000000 +0000 +++ pinentry-x2go-0.7.5.6/config.h.in 2015-12-22 15:41:37.000000000 +0000 @@ -0,0 +1,145 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Defined if the mlock() call does not work */ +#undef HAVE_BROKEN_MLOCK + +/* Defined if a `byte' is typedef'd */ +#undef HAVE_BYTE_TYPEDEF + +/* Defined if we run on some of the PCDOS like systems (DOS, Windoze. OS/2) + with special properties like no file modes */ +#undef HAVE_DOSISH_SYSTEM + +/* defined if we must run on a stupid file system */ +#undef HAVE_DRIVE_LETTERS + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LANGINFO_H + +/* Define to 1 if you have the `rt' library (-lrt). */ +#undef HAVE_LIBRT + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Defined if the system supports an mlock() call */ +#undef HAVE_MLOCK + +/* Define to 1 if you have the `mmap' function. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the `plock' function. */ +#undef HAVE_PLOCK + +/* Define to 1 if you have the `seteuid' function. */ +#undef HAVE_SETEUID + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `stpcpy' function. */ +#undef HAVE_STPCPY + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MMAN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_TERMIO_H + +/* Defined if a `ulong' is typedef'd */ +#undef HAVE_ULONG_TYPEDEF + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIME_H + +/* Defined if we run on a W32 API based system */ +#undef HAVE_W32_SYSTEM + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* The capabilities support library is installed */ +#undef USE_CAPABILITIES + +/* set this to limit filenames to the 8.3 format */ +#undef USE_ONLY_8DOT3 + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + +/* Version number of package */ +#undef VERSION + +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE diff -Nru pinentry-x2go-0.7.5.7/configure.ac pinentry-x2go-0.7.5.6/configure.ac --- pinentry-x2go-0.7.5.7/configure.ac 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/configure.ac 2015-12-22 15:41:37.000000000 +0000 @@ -125,6 +125,19 @@ GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF) GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF) +dnl Check for libcap +AC_ARG_WITH([libcap], AC_HELP_STRING([--without-libcap], + [Disable support for capabilities library])) + +if test "x$with_libcap" != "xno"; then + AC_PATH_PROG(SETCAP, setcap, :, "$PATH:/sbin:/usr/sbin") + AC_CHECK_LIB(cap, cap_set_proc, [ + AC_DEFINE(USE_CAPABILITIES,1,[The capabilities support library is installed]) + LIBCAP=-lcap + ]) +fi +AC_SUBST(LIBCAP) + dnl dnl Check for curses pinentry program. dnl @@ -145,20 +158,13 @@ AC_OUTPUT -for lrelease in $(which lrelease-qt4 lrelease 2>/dev/null); do - break; -done; for qmake in $(which qmake-qt4 qmake 2>/dev/null); do break; done; -if test -z "$lrelease"; then - AC_MSG_ERROR([lrelease not found]) -fi; if test -z "$qmake"; then AC_MSG_ERROR([qmake not found]) fi; -( cd pinentry-x2go && "$lrelease" pinentry-x2go.pro; cd - 1>/dev/null;) -( cd pinentry-x2go && "$qmake" PREFIX="$prefix" QMAKE_CFLAGS="$CPPFLAGS $CFLAGS" QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CPPFLAGS $CXXFLAGS"; cd - 1>/dev/null;) +cd pinentry-x2go && "$qmake" PREFIX="$prefix" QMAKE_CFLAGS="$CPPFLAGS $CFLAGS" QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CPPFLAGS $CXXFLAGS" AC_MSG_NOTICE([ Pinentry-X2Go v${VERSION} has been configured. diff -Nru pinentry-x2go-0.7.5.7/COPYING pinentry-x2go-0.7.5.6/COPYING --- pinentry-x2go-0.7.5.7/COPYING 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/COPYING 2015-12-22 15:41:37.000000000 +0000 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + 675 Mass Ave, Cambridge, MA 02139, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff -Nru pinentry-x2go-0.7.5.7/debian/bzr-builder.manifest pinentry-x2go-0.7.5.6/debian/bzr-builder.manifest --- pinentry-x2go-0.7.5.7/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/bzr-builder.manifest 2015-12-22 15:41:37.000000000 +0000 @@ -0,0 +1,2 @@ +# bzr-builder format 0.3 deb-version {debupstream}-0~45 +lp:~x2go/x2go/pinentry-x2go_build-baikal revid:git-v1:6b339e1d0187725eb6af4a96e52f38e948712b44 diff -Nru pinentry-x2go-0.7.5.7/debian/changelog pinentry-x2go-0.7.5.6/debian/changelog --- pinentry-x2go-0.7.5.7/debian/changelog 2014-08-23 20:16:43.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/changelog 2015-12-22 15:41:37.000000000 +0000 @@ -1,35 +1,96 @@ -pinentry-x2go (0.7.5.7-1) unstable; urgency=medium +pinentry-x2go (0.7.5.6-0~45~ubuntu15.04.1) vivid; urgency=low - * New upstream release. - * debian/control: - + Fix typo in Vcs-Git: URL. - + Drop B-D: libcap-dev. Not required anymore since this upstream version. - * Update upstream changelog. + * Auto build. - -- Mike Gabriel Sat, 23 Aug 2014 22:00:29 +0200 + -- Mihai Moldovan Tue, 22 Dec 2015 15:41:37 +0000 -pinentry-x2go (0.7.5.6-3) unstable; urgency=medium +pinentry-x2go (0.7.5.6-0~x2go1) unstable; urgency=low - * debian/control: - + Alioth-canonicalize Vcs-*: fields. Don't use subfolder x2go/ on Alioth's - collab-maint anymore. - + Bump Standards: to 3.9.5. No changes needed. - + Update LONG_DESCRIPTION. + [ Mike Gabriel ] + * /debian/control: + + Maintainer change in package: X2Go Developers . + + Priority: optional. - -- Mike Gabriel Wed, 20 Aug 2014 16:02:37 +0200 + [ Reinhard Tartler ] + * /debian/rules: + + Disable dh_auto_test. -pinentry-x2go (0.7.5.6-2) unstable; urgency=low + -- Mike Gabriel Mon, 31 Dec 2012 17:07:04 +0100 - * debian/copyright: - + Fix mail address in one Copyright: field. - * debian/pinentry-x2go.info: - + Drop the info file as it is not about pinentry-x2go and as it conflicts - with a file in Debian package pinentry. +pinentry-x2go (0.7.5.5-0~x2go2) unstable; urgency=low - -- Mike Gabriel Mon, 25 Mar 2013 23:35:47 +0100 + * Do not install the pinentry.info file anymore, it conflicts with the info + file from the default/original pinentry package. + * Add Conflicts/Replaces entries for pinentry-x2go-gtk. + * Bump Standards to 3.9.3. -pinentry-x2go (0.7.5.6-1) unstable; urgency=low + -- Mike Gabriel Mon, 20 Aug 2012 10:05:57 +0200 - * Initial release (Closes: #677388). +pinentry-x2go (0.7.5.5-0~x2go1) unstable; urgency=low + + [ Mike Gabriel ] + * New upstream version (0.7.5.5): + - Set version and project name in configure.ac template. + + [ Jan Engelhard ] + * New upstream version (0.7.5.5): + - The package does not use GNU mode. Mark it as such. Makefile.am: error: + required file './ChangeLog' not found. Also replace the totally ancient + AM_INIT_AUTOMAKE syntax. + - Avoid warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body. + - Provide several names for qmake-qt4, become more cross-distro tolerant. + - Provide CPPFLAGS for QMAKE_CFLAGS and QMAKE_CXXFLAGS. Provide CPPFLAGS + first. + + -- Mike Gabriel Sun, 15 Jul 2012 09:52:18 +0200 + +pinentry-x2go (0.7.5.4-0~x2go1) unstable; urgency=low + + * New upstream version (0.7.5.4): + - Drop mdate-sh and texinfo.tex from /doc folder (autotools build cruft). + + -- Mike Gabriel Thu, 14 Jun 2012 09:47:09 +0200 + +pinentry-x2go (0.7.5.3-0~x2go1) unstable; urgency=low + + * Update of copyright information in several file headers. + + -- Mike Gabriel Wed, 13 Jun 2012 17:11:48 +0200 + +pinentry-x2go (0.7.5.2-0~x2go1) unstable; urgency=low + + * New upstream version (0.7.5.2): + - Strip code project down to its essentials, remove a lot of unneeded + cruft. + - Make code tree fully build with autotools, see README file for further + info. + - Replace string pinentry-qt with pinentry-x2go. + * Make dh_clean remove all build cruft. + + -- Mike Gabriel Wed, 13 Jun 2012 15:11:19 +0200 + +pinentry-x2go (0.7.5.1-0~x2go1) unstable; urgency=low + + [ Oleksandr Shneyder ] + * Set font size in pinentry dialog to 14 + + -- Mike Gabriel Wed, 12 Oct 2011 10:42:21 +0200 + +pinentry-x2go (0.7.5.0-0~x2go1) unstable; urgency=low + + * Changed version numbering scheme. + + -- Mike Gabriel Mon, 21 Mar 2011 21:58:02 +0100 + +pinentry-x2go (0.7.5-2) unstable; urgency=low + + * merged with pinentry version 0.7.5 + + -- Oleksandr Shneyder Tue, 27 Jan 2009 07:55:15 +0100 + +pinentry-x2go (0.7.2-1) unstable; urgency=low + + * Initial release. + + -- Oleksandr Shneyder Fri, 3 Aug 2007 08:28:09 +0200 - -- Mike Gabriel Fri, 22 Mar 2013 18:52:24 +0100 diff -Nru pinentry-x2go-0.7.5.7/debian/compat pinentry-x2go-0.7.5.6/debian/compat --- pinentry-x2go-0.7.5.7/debian/compat 2013-03-22 16:49:44.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/compat 2015-12-22 15:41:37.000000000 +0000 @@ -1 +1 @@ -7 +5 diff -Nru pinentry-x2go-0.7.5.7/debian/control pinentry-x2go-0.7.5.6/debian/control --- pinentry-x2go-0.7.5.7/debian/control 2014-08-23 19:59:26.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/control 2015-12-22 15:41:37.000000000 +0000 @@ -1,35 +1,27 @@ Source: pinentry-x2go Section: utils -Priority: extra -Maintainer: X2Go Packaging Team +Priority: optional +Maintainer: X2Go Developers Uploaders: - Mike Gabriel , -Build-Depends: - debhelper (>= 7.0.50~), - autotools-dev, - libglib2.0-dev (>= 2.15.5), - m4, - libqt4-dev, - dh-autoreconf, -Standards-Version: 3.9.5 -Homepage: http://wiki.x2go.org -Vcs-Git: git://anonscm.debian.org/collab-maint/pinentry-x2go.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/pinentry-x2go.git;a=summary + Oleksandr Shneyder , + Mike Gabriel , +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libqt4-gui, libcap-dev, libglib2.0-dev (>= 2.15.5), m4, qt4-qmake, libqt4-dev, dh-autoreconf +Standards-Version: 3.9.3 +Homepage: http://code.x2go.org/releases/source/pinentry-x2go +Vcs-Git: git://code.x2go.org/pinentry-x2go.git +Vcs-Browser: http://code.x2go.org/gitweb?p=pinentry-x2go.git;a=summary Package: pinentry-x2go Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends}, -Description: OpenPGP (smart)card authentication dialog window for X2Go Client - X2Go is a serverbased computing environment with - - session resuming - - low bandwidth support - - session brokerage support - - client-side mass storage mounting support - - client-side printing support - - audio support - - authentication by smartcard and USB stick - . - This package contains an X2Go Client add-on. The add-on provides a PIN or - passphrase dialog window for OpenPGP (smart)card authentication with X2Go. +Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-gui +Conflicts: + pinentry-x2go-gtk +Replaces: + pinentry-x2go-gtk +Description: Qt4-based PIN or pass-phrase entry dialog for x2goclient + This package contains a program that allows for entry of PINs or + pass phrases. + Based on original pinentry-qt software, modified for x2goclient. + Web site: + http://www.x2go.org/ + http://www.gnupg.org/aegypten/ diff -Nru pinentry-x2go-0.7.5.7/debian/copyright pinentry-x2go-0.7.5.6/debian/copyright --- pinentry-x2go-0.7.5.7/debian/copyright 2013-03-24 10:49:22.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/copyright 2015-12-22 15:41:37.000000000 +0000 @@ -1,118 +1,46 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: pinentry-x2go -Upstream-Contact: Oleksandr Shneyder -Source: http://code.x2go.org/releases/source/pinentry-x2go - -Files: assuan/* -Copyright: - 2001-2002,Free Software Foundation, Inc. -License: GPL-2+ - -Files: - doc/Makefile.am - doc/pinentry.texi -Copyright: - 2002-2005, Werner Koch, g10 Code GmbH -License: GPL-2+ - -Files: - m4/glib.m4 -Copyright: - 1997, Owen Taylor -License: GPL-2+ -Comment: - There is not much license information in mg/glib.m4, presuming the same - license as for the rest of the pinentry-x2go package. - -Files: - m4/iconv.m4 -Copyright: - 2000-2002, Bruno Haible, Free Software Foundation, Inc. -License: GPL-2 with Autoconf exception - -Files: - pinentry/* -Copyright: - 2002-2008, Werner Koch, g10 Code GmbH -License: GPL-2+ - -Files: - pinentry-x2go/main.cpp -Copyright: - 2002, Steffen Hansen, Klarälvdalens Datakonsult AB - 2003, Marcus Brinkmann, g10 Code GmbH - 2007-2012, Oleksandr Shneyder - 2007-2012, Mike Gabriel -License: GPL-2+ - -Files: - pinentry-x2go/pinentrydialog.cp - pinentry-x2go/pinentrydialog.h -Copyright: - 2002, Steffen Hansen, Klarälvdalens Datakonsult AB - 2007-2012, Oleksandr Shneyder, X2Go Project - 2007-2012, Mike Gabriel, X2Go Project -License: GPL-2+ - -Files: - secmem/* -Copyright: - 1998-2003, Marcus Brinkmann, Free Software Foundation Inc. - 1999-2000, Robert Bihlmeyer - 2003, Marcus Brinkmann, g10 Code GmbH -License: GPL-2+ - -Files: debian/* -Copyright: 2012-2013, Mike Gabriel -License: GPL-2+ - -License: GPL-2+ - 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 the Free Software Foundation; either - version 2 of the License, or (at your option) any later - version. - . - This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more - details. - . - You should have received a copy of the GNU General Public - License along with this package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. - -License: GPL-2 with Autoconf exception - 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 the Free Software Foundation; either - version 2 of the License. - . - This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more - details. - . - You should have received a copy of the GNU General Public - License along with this package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. -Comment: - Special License. Originally GPL-2 and: - . - This file is free software, distributed under the terms of the GNU - General Public License. As a special exception to the GNU General - Public License, this file may be distributed as part of a program - that contains a configuration script generated by Autoconf, under - the same distribution terms as the rest of that program. +This package was debianized by Oleksandr Shneyder on +Thu, 1 Feb 2007 14:11:03 +0100. + +It was downloaded from www.obviously-nice.de + +Upstream Author: Oleksandr Shneyder + +Copyright (C) 2007 obviously nice - http://www.obviouslynice.de + +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 +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the +Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +Copyright (C) 2007 Oleksandr Shneyder +oleksandr.shneyder@obviously-nice.de + +Copyright (C) 2007 Heinz-Markus Graesing +heinz-m.graesing@obviously-nice.de + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + +The Debian packaging is (C) 2007, Oleksandr Shneyder and +is licensed under the GPL, see above. + +Program: Pinentry +Bug reports: +Security related bug reports: + + +Robert Bihlmeyer +Werner Koch, g10 Code GmbH +Steffen Hansen, Klarälvdalens Datakonsult AB +Marcus Brinkmann, g10 Code GmbH diff -Nru pinentry-x2go-0.7.5.7/debian/pinentry-x2go.1 pinentry-x2go-0.7.5.6/debian/pinentry-x2go.1 --- pinentry-x2go-0.7.5.7/debian/pinentry-x2go.1 2012-08-07 10:54:50.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/pinentry-x2go.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -.TH X2Go 1 "13 June 2012" -.SH NAME -pinentry\-x2go \- PIN or pass-phrase add-on for X2Go Client -.PP -.SH SYNOPSIS -\fBpinentry\-x2go\fB [\fIOPTION\fR...] -.SH DESCRIPTION -\fBpinentry\-x2go\fR is an add-on for X2Go Client. It allows -for secure entry of PINs or pass phrases. -That means it tries to take care that the entered -information is not swapped to disk or temporarily stored anywhere. -.PP -\fBpinentry\-x2go\fR is typically used internally by \fBx2goclient\fR -evoked by \fBgpg-agent\fR. -Users don't normally have a reason to call it directly. -.SH OPTIONS -.TP -\fB\-\-version\fR -Print the program version and licensing information. -.TP -\fB\-\-help\fR -Print a usage message summarizing the most useful command-line options. -.TP -\fB\-\-debug\fR, \fB\-d\fR -Turn on some debugging. Mostly useful for the maintainers. Note -that this may reveal sensitive information like the entered pass phrase. -.TP -\fB\-\-enhanced\fR, \fB\-e\fR -Ask for timeouts and insurance, too. Note that this is currently -not fully supported. -.TP -\fB\-\-no\-global\-grab\fR, \fB\-g\fR -Grab the keyboard only when the window is focused. Use this -option if you are debugging software using \fBpinentry\-x2go\fR; -otherwise you may not be able to to access your X session anymore (unless -you have other means to connect to the machine to kill -\fBpinentry\-x2go\fR). -.TP -\fB\-\-parent\-wid\fR \fIN\fR -Use window ID \fIN\fR as the parent window for positioning the window. -Note, that this is not fully supported by all flavors of \fBpinentry\fR. -.TP -\fB--display\fR \fISTRING\fR, \fB--ttyname\fR \fISTRING\fR, \fB--ttytype\fR \fISTRING\fR, \fB--lc-type\fR \fISTRING\fR, \fB--lc-messages\fR \fISTRING\fR -These options are used to pass localization information to -\fBpinentry-qt\fR. They are required because -\fBpinentry-qt\fR is usually called by -some background process which does not have any information on the -locale and terminal to use. Assuan protocol options are an -alternative way to pass these information. -.SH "SEE ALSO" -.BR x2goclient (1), -.BR gpg (1), -.BR gpg-agent (1) -.PP -The full documentation for -.B pinentry\-x2go -is maintained as a Texinfo manual. -.IP -.B info pinentry -.PP -should give you access to the complete manual. -.SH AUTHOR -This manual page has been derived from the pinentry-qt man page by Mike Gabriel. The pinentry-qt man page originally was written by Peter Eisentraut for the Debian project. diff -Nru pinentry-x2go-0.7.5.7/debian/pinentry-x2go.dirs pinentry-x2go-0.7.5.6/debian/pinentry-x2go.dirs --- pinentry-x2go-0.7.5.7/debian/pinentry-x2go.dirs 1970-01-01 00:00:00.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/pinentry-x2go.dirs 2015-12-22 15:41:37.000000000 +0000 @@ -0,0 +1 @@ +usr/bin diff -Nru pinentry-x2go-0.7.5.7/debian/pinentry-x2go.docs pinentry-x2go-0.7.5.6/debian/pinentry-x2go.docs --- pinentry-x2go-0.7.5.7/debian/pinentry-x2go.docs 2012-08-07 10:54:50.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/pinentry-x2go.docs 2015-12-22 15:41:37.000000000 +0000 @@ -1,4 +1,2 @@ NEWS README -THANKS -debian/upstream/changelog diff -Nru pinentry-x2go-0.7.5.7/debian/pinentry-x2go.manpages pinentry-x2go-0.7.5.6/debian/pinentry-x2go.manpages --- pinentry-x2go-0.7.5.7/debian/pinentry-x2go.manpages 2012-08-07 10:54:50.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/pinentry-x2go.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/pinentry-x2go.1 diff -Nru pinentry-x2go-0.7.5.7/debian/README.source pinentry-x2go-0.7.5.6/debian/README.source --- pinentry-x2go-0.7.5.7/debian/README.source 2012-08-07 10:54:50.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -README.source for pinentry-x2go -=============================== - -The X2Go upstream team ,,abuses'' the /debian/changelog file (i.e. the -file found in their tarballs) as upstream changelog. - -After importing new upstream tarballs (normally with git-import-orig) -the /debian/changelog file (i.e. our package file) has to be fixed -and reverted to its purely Debianic state. - -Then /debian/upstream/changelog is copied manually from their upstream -tarball's /debian/changelog file. This file then is shipped with this -package as upstream's changelog.gz. - -light+love -Mike diff -Nru pinentry-x2go-0.7.5.7/debian/rules pinentry-x2go-0.7.5.6/debian/rules --- pinentry-x2go-0.7.5.7/debian/rules 2014-08-23 20:13:08.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/rules 2015-12-22 15:41:37.000000000 +0000 @@ -6,13 +6,10 @@ export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) %: - dh $@ --with autoreconf --parallel - -override_dh_autoreconf: - ln -s debian/upstream/changelog ChangeLog - dh_autoreconf + dh --with autoreconf $@ override_dh_auto_install: +override_dh_auto_test: override_dh_auto_clean: dh_auto_clean @@ -33,6 +30,3 @@ rm -f missing rm -f pinentry/Makefile.in rm -f secmem/Makefile.in - rm -f ChangeLog - rm -f doc/mdate-sh - rm -f doc/texinfo.tex diff -Nru pinentry-x2go-0.7.5.7/debian/source/format pinentry-x2go-0.7.5.6/debian/source/format --- pinentry-x2go-0.7.5.7/debian/source/format 2012-08-07 10:54:59.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt) \ No newline at end of file diff -Nru pinentry-x2go-0.7.5.7/debian/upstream/changelog pinentry-x2go-0.7.5.6/debian/upstream/changelog --- pinentry-x2go-0.7.5.7/debian/upstream/changelog 2014-08-23 20:14:01.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/upstream/changelog 2015-12-22 15:41:37.000000000 +0000 @@ -1,50 +1,8 @@ -pinentry-x2go (0.7.5.7-0x2go3) unstable; urgency=low +pinentry-x2go (0.7.5.6-0~45~ubuntu15.04.1) vivid; urgency=low - [ Mike Gabriel ] - * New upstream version (0.7.5.7): - - Set Pinentry title to X2Go Pinpad (was: X2GO ...). - - Drop config.h.in. - - Drop m4/glib.m4. - - Update German translation file. - - Run lrelease during autoreconf. - - Update .ts files. Add .ts files for all languages we - have translators for. - - Drop pinentry-x2go_.qm binary files from source - tree. - - Drop libcap check from configure.ac. This fork of pinentry - does not contain code that builds against libcap anymore. - - Drop -lcap from LIBS in pinentry-x2go.pro. - * debian/control: - + Bump Standards: to 3.9.5. No changes needed. - + Arrange B-Ds and Ds in multi-line fields. - + Beautify LONG_DESCRIPTION. - + Drop B-D: libcap-dev. - * debian/source/format: - + Add file, use format 1.0. - * debian/rules: - + Don't fail on dh_auto_clean. - + Remove more buildcruft. - * pinentry-x2go.spec: - + Add spec file for building RPM packages. Inspired by OpenSuSE spec file. - + Drop from BR: libcap-devel. + * Auto build. - [ Orion Poplawski ] - * New upstream version (0.7.5.7): - - Fix FSF address in license headers. (Fixes: #303). - - [ Martti Pitkänen ] - * New upstream version (0.7.5.7): - - Add Finnish translation file. - - [ Jos ] - * New upstream version (0.7.5.7): - - New translation file of PIN-Entry X2Go into Dutch. - - [ Ricardo Díaz Martín ] - * New upstream version (0.7.5.7): - - New translation of PIN-Entry X2Go into Spanish. - - -- Mike Gabriel Sat, 23 Aug 2014 17:43:26 +0200 + -- Mihai Moldovan Tue, 22 Dec 2015 15:41:37 +0000 pinentry-x2go (0.7.5.6-0~x2go1) unstable; urgency=low diff -Nru pinentry-x2go-0.7.5.7/debian/watch pinentry-x2go-0.7.5.6/debian/watch --- pinentry-x2go-0.7.5.7/debian/watch 2012-08-07 10:54:50.000000000 +0000 +++ pinentry-x2go-0.7.5.6/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -version=3 -http://code.x2go.org/releases/source/pinentry-x2go/pinentry-x2go-(.+)\.tar\.gz diff -Nru pinentry-x2go-0.7.5.7/m4/glib.m4 pinentry-x2go-0.7.5.6/m4/glib.m4 --- pinentry-x2go-0.7.5.7/m4/glib.m4 1970-01-01 00:00:00.000000000 +0000 +++ pinentry-x2go-0.7.5.6/m4/glib.m4 2015-12-22 15:41:37.000000000 +0000 @@ -0,0 +1,196 @@ +# Configure paths for GLIB +# Owen Taylor 97-11-3 + +dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or +dnl gthread is specified in MODULES, pass to glib-config +dnl +AC_DEFUN([AM_PATH_GLIB], +[dnl +dnl Get the cflags and libraries from the glib-config script +dnl +AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], + glib_config_prefix="$withval", glib_config_prefix="") +AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], + glib_config_exec_prefix="$withval", glib_config_exec_prefix="") +AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], + , enable_glibtest=yes) + + if test x$glib_config_exec_prefix != x ; then + glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config + fi + fi + if test x$glib_config_prefix != x ; then + glib_config_args="$glib_config_args --prefix=$glib_config_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_prefix/bin/glib-config + fi + fi + + for module in . $4 + do + case "$module" in + gmodule) + glib_config_args="$glib_config_args gmodule" + ;; + gthread) + glib_config_args="$glib_config_args gthread" + ;; + esac + done + + AC_PATH_PROG(GLIB_CONFIG, glib-config, no) + min_glib_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes + else + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of glib-config to some extent +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.glibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If glib-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); + printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the glib-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); + printf("*** correct copy of glib-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GLIB_CONFIG" = "no" ; then + echo "*** The glib-config script installed by GLIB could not be found" + echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GLIB_CONFIG environment variable to the" + echo "*** full path to glib-config." + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" + echo "*** came with the system with the command" + echo "***" + echo "*** rpm --erase --nodeps gtk gtk-devel" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB was incorrectly installed" + echo "*** or that you have moved GLIB since it was installed. In the latter case, you" + echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + rm -f conf.glibtest +]) diff -Nru pinentry-x2go-0.7.5.7/pinentry/pinentry-curses.c pinentry-x2go-0.7.5.6/pinentry/pinentry-curses.c --- pinentry-x2go-0.7.5.7/pinentry/pinentry-curses.c 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry/pinentry-curses.c 2015-12-22 15:41:37.000000000 +0000 @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA - 02110-1301, USA */ + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA */ #ifdef HAVE_CONFIG_H #include diff -Nru pinentry-x2go-0.7.5.7/pinentry/pinentry-curses.h pinentry-x2go-0.7.5.6/pinentry/pinentry-curses.h --- pinentry-x2go-0.7.5.7/pinentry/pinentry-curses.h 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry/pinentry-curses.h 2015-12-22 15:41:37.000000000 +0000 @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA - 02110-1301, USA */ + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA */ #ifndef PINENTRY_CURSES_H #define PINENTRY_CURSES_H diff -Nru pinentry-x2go-0.7.5.7/pinentry/pinentry.h pinentry-x2go-0.7.5.6/pinentry/pinentry.h --- pinentry-x2go-0.7.5.7/pinentry/pinentry.h 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry/pinentry.h 2015-12-22 15:41:37.000000000 +0000 @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA - 02110-1301, USA */ + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA */ #ifndef PINENTRY_H #define PINENTRY_H diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentrydialog.cpp pinentry-x2go-0.7.5.6/pinentry-x2go/pinentrydialog.cpp --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentrydialog.cpp 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentrydialog.cpp 2015-12-22 15:41:37.000000000 +0000 @@ -35,7 +35,7 @@ PinEntryDialog::PinEntryDialog( QWidget* parent, const char* , bool ) : QDialog( parent ), _grabbed( false ) { - setWindowTitle(tr("X2Go Pinpad")); + setWindowTitle(tr("X2GO Pinpad")); _icon = new QLabel( this ); _icon->setPixmap( QMessageBox::standardIcon( QMessageBox::Information ) ); diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentrydialog.h pinentry-x2go-0.7.5.6/pinentry-x2go/pinentrydialog.h --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentrydialog.h 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentrydialog.h 2015-12-22 15:41:37.000000000 +0000 @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA - 02110-1301, USA */ + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA */ #ifndef __PINENTRYDIALOG_H__ #define __PINENTRYDIALOG_H__ diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_da.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_da.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_da.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_da.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - PinEntryDialog - - - X2Go Pinpad - - - - - Please, enter your PIN - - - - - TemplateDialog - - - Dialog - - - - Binary files /tmp/tmpda_Pr0/r2q9s83IoD/pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_de.qm and /tmp/tmpda_Pr0/6lyi8SCRwp/pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_de.qm differ diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_de.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_de.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_de.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_de.ts 2015-12-22 15:41:37.000000000 +0000 @@ -1,17 +1,16 @@ - - + PinEntryDialog - - X2Go Pinpad - X2Go PIN-Pad + + X2GO Pinpad + - + Please, enter your PIN - Geben Sie bitte Ihre PIN ein + Geben Sie bitte Ihre PIN ein @@ -19,7 +18,7 @@ Dialog - Dialog + diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_es.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_es.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_es.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_es.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - PinEntryDialog - - - X2Go Pinpad - X2Go Pinpad - - - - Please, enter your PIN - Ingrese su PIN - - - - TemplateDialog - - - Dialog - Diálogo - - - diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_et.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_et.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_et.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_et.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - PinEntryDialog - - - X2Go Pinpad - - - - - Please, enter your PIN - - - - - TemplateDialog - - - Dialog - - - - diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_fi.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_fi.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_fi.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_fi.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - PinEntryDialog - - - X2Go Pinpad - X2Go Pinpad - - - - Please, enter your PIN - Tallenna PIN -koodi - - - - TemplateDialog - - - Dialog - Dialogi - - - diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_fr.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_fr.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_fr.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_fr.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - PinEntryDialog - - - X2Go Pinpad - - - - - Please, enter your PIN - - - - - TemplateDialog - - - Dialog - - - - diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_nb_no.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_nb_no.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_nb_no.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_nb_no.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - PinEntryDialog - - - X2Go Pinpad - - - - - Please, enter your PIN - - - - - TemplateDialog - - - Dialog - - - - diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_nl.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_nl.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_nl.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_nl.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - PinEntryDialog - - - X2Go Pinpad - X2Go pinpad - - - - Please, enter your PIN - Geef aub uw PIN code in - - - - TemplateDialog - - - Dialog - Dialoog - - - diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go.pro pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go.pro --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go.pro 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go.pro 2015-12-22 15:41:37.000000000 +0000 @@ -1,21 +1,9 @@ ###################################################################### # Automatically generated by qmake (2.01a) Fr Aug 3 07:44:35 2007 ###################################################################### - INSTALLS += target target.path = $${PREFIX}/bin -TRANSLATIONS += pinentry-x2go_da.ts \ - pinentry-x2go_de.ts \ - pinentry-x2go_es.ts \ - pinentry-x2go_et.ts \ - pinentry-x2go_fi.ts \ - pinentry-x2go_fr.ts \ - pinentry-x2go_nb_no.ts \ - pinentry-x2go_nl.ts \ - pinentry-x2go_pt.ts \ - pinentry-x2go_ru.ts \ - pinentry-x2go_sv.ts \ - pinentry-x2go_zh_tw.ts +TRANSLATIONS += pinentry-x2go_de.ts TEMPLATE = app TARGET = @@ -27,5 +15,5 @@ FORMS += templatedlg.ui SOURCES += main.cpp pinentrydialog.cpp pinlineedit.cpp INCLUDEPATH += . .. ../pinentry ../assuan -LIBS += ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a +LIBS += ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a -lcap RESOURCES += resources.rcc diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_pt.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_pt.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_pt.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_pt.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - PinEntryDialog - - - X2Go Pinpad - - - - - Please, enter your PIN - - - - - TemplateDialog - - - Dialog - - - - diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_ru.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_ru.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_ru.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_ru.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - PinEntryDialog - - - X2Go Pinpad - - - - - Please, enter your PIN - - - - - TemplateDialog - - - Dialog - - - - diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_sv.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_sv.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_sv.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_sv.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - PinEntryDialog - - - X2Go Pinpad - - - - - Please, enter your PIN - - - - - TemplateDialog - - - Dialog - - - - diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_zh_tw.ts pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_zh_tw.ts --- pinentry-x2go-0.7.5.7/pinentry-x2go/pinentry-x2go_zh_tw.ts 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/pinentry-x2go_zh_tw.ts 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ - - - - - PinEntryDialog - - - X2Go Pinpad - - - - - Please, enter your PIN - - - - - TemplateDialog - - - Dialog - - - - Binary files /tmp/tmpda_Pr0/r2q9s83IoD/pinentry-x2go-0.7.5.7/pinentry-x2go/qt_da.qm and /tmp/tmpda_Pr0/6lyi8SCRwp/pinentry-x2go-0.7.5.6/pinentry-x2go/qt_da.qm differ Binary files /tmp/tmpda_Pr0/r2q9s83IoD/pinentry-x2go-0.7.5.7/pinentry-x2go/qt_de.qm and /tmp/tmpda_Pr0/6lyi8SCRwp/pinentry-x2go-0.7.5.6/pinentry-x2go/qt_de.qm differ Binary files /tmp/tmpda_Pr0/r2q9s83IoD/pinentry-x2go-0.7.5.7/pinentry-x2go/qt_es.qm and /tmp/tmpda_Pr0/6lyi8SCRwp/pinentry-x2go-0.7.5.6/pinentry-x2go/qt_es.qm differ Binary files /tmp/tmpda_Pr0/r2q9s83IoD/pinentry-x2go-0.7.5.7/pinentry-x2go/qt_fr.qm and /tmp/tmpda_Pr0/6lyi8SCRwp/pinentry-x2go-0.7.5.6/pinentry-x2go/qt_fr.qm differ Binary files /tmp/tmpda_Pr0/r2q9s83IoD/pinentry-x2go-0.7.5.7/pinentry-x2go/qt_pt.qm and /tmp/tmpda_Pr0/6lyi8SCRwp/pinentry-x2go-0.7.5.6/pinentry-x2go/qt_pt.qm differ Binary files /tmp/tmpda_Pr0/r2q9s83IoD/pinentry-x2go-0.7.5.7/pinentry-x2go/qt_ru.qm and /tmp/tmpda_Pr0/6lyi8SCRwp/pinentry-x2go-0.7.5.6/pinentry-x2go/qt_ru.qm differ Binary files /tmp/tmpda_Pr0/r2q9s83IoD/pinentry-x2go-0.7.5.7/pinentry-x2go/qt_sv.qm and /tmp/tmpda_Pr0/6lyi8SCRwp/pinentry-x2go-0.7.5.6/pinentry-x2go/qt_sv.qm differ Binary files /tmp/tmpda_Pr0/r2q9s83IoD/pinentry-x2go-0.7.5.7/pinentry-x2go/qt_zh_tw.qm and /tmp/tmpda_Pr0/6lyi8SCRwp/pinentry-x2go-0.7.5.6/pinentry-x2go/qt_zh_tw.qm differ diff -Nru pinentry-x2go-0.7.5.7/pinentry-x2go/resources.rcc pinentry-x2go-0.7.5.6/pinentry-x2go/resources.rcc --- pinentry-x2go-0.7.5.7/pinentry-x2go/resources.rcc 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/pinentry-x2go/resources.rcc 2015-12-22 15:41:37.000000000 +0000 @@ -3,25 +3,6 @@ icons/button_ok.png icons/button_cancel.png pinentry-x2go_de.qm - pinentry-x2go_es.qm - pinentry-x2go_da.qm - pinentry-x2go_de.qm - pinentry-x2go_es.qm - pinentry-x2go_et.qm - pinentry-x2go_fi.qm - pinentry-x2go_fr.qm - pinentry-x2go_nb_no.qm - pinentry-x2go_nl.qm - pinentry-x2go_ru.qm - pinentry-x2go_sv.qm - pinentry-x2go_zh_tw.qm - qt_da.qm qt_de.qm - qt_es.qm - qt_fr.qm - qt_pt.qm - qt_ru.qm - qt_sv.qm - qt_zh_tw.qm \ No newline at end of file diff -Nru pinentry-x2go-0.7.5.7/secmem/memory.h pinentry-x2go-0.7.5.6/secmem/memory.h --- pinentry-x2go-0.7.5.7/secmem/memory.h 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/secmem/memory.h 2015-12-22 15:41:37.000000000 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301. + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef _MEMORY_H diff -Nru pinentry-x2go-0.7.5.7/secmem/secmem.c pinentry-x2go-0.7.5.6/secmem/secmem.c --- pinentry-x2go-0.7.5.7/secmem/secmem.c 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/secmem/secmem.c 2015-12-22 15:41:37.000000000 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #include diff -Nru pinentry-x2go-0.7.5.7/secmem/util.c pinentry-x2go-0.7.5.6/secmem/util.c --- pinentry-x2go-0.7.5.7/secmem/util.c 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/secmem/util.c 2015-12-22 15:41:37.000000000 +0000 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301. + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define _GNU_SOURCE 1 diff -Nru pinentry-x2go-0.7.5.7/secmem/util.h pinentry-x2go-0.7.5.6/secmem/util.h --- pinentry-x2go-0.7.5.7/secmem/util.h 2014-08-23 19:40:51.000000000 +0000 +++ pinentry-x2go-0.7.5.6/secmem/util.h 2015-12-22 15:41:37.000000000 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301. + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef _UTIL_H