[git] Pinentry - branch, master, updated. pinentry-0.8.2-12-gcf1404d
by Werner Koch
cvs at cvs.gnupg.org
Fri Apr 26 18:06:20 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".
The branch, master has been updated
via cf1404d4e24d85c809434df9330c9e1817e7d4a6 (commit)
via ce7f2e69fa78d9afac96efc3009513b203668b4b (commit)
via a421efcb91b80a37f58ae35687dc33db08a04b3d (commit)
via 369e774ab835ecf23da267cf55f9ecf8ae8c5585 (commit)
via 18b0d8849e51b6203b3f1dbc1cc1cc71e52f78b6 (commit)
from c7c41b22c059c39916845061484999005c9483d1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cf1404d4e24d85c809434df9330c9e1817e7d4a6
Author: Werner Koch <wk at gnupg.org>
Date: Fri Apr 26 17:47:16 2013 +0200
Post release version number updates.
--
diff --git a/NEWS b/NEWS
index d06aee3..a9c0057 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Noteworthy changes in version 0.8.4 (unreleased)
+------------------------------------------------
+
+ *
+
+
Noteworthy changes in version 0.8.3 (2013-04-26)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index ab81283..0eb5e74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ min_automake_version="1.10"
# (git tag -s pinentry-n.m.k) and run "./autogen.sh --force". Please
# bump the version number immediately after the release, do another
# commit, and a push so that the git magic is able to work.
-m4_define(mym4_version, [0.8.3])
+m4_define(mym4_version, [0.8.4])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit ce7f2e69fa78d9afac96efc3009513b203668b4b
Author: Werner Koch <wk at gnupg.org>
Date: Fri Apr 26 15:09:59 2013 +0200
Release 0.8.3
diff --git a/NEWS b/NEWS
index 23b08c7..d06aee3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
-Noteworthy changes in version 0.8.2 (unreleased)
+Noteworthy changes in version 0.8.3 (2013-04-26)
------------------------------------------------
+ * Build fixes for newer mingw32 toolchains.
+
+ * Add SETTIMEOUT command for the gtk+-2 pinentry.
+
Noteworthy changes in version 0.8.2 (2012-08-08)
------------------------------------------------
commit a421efcb91b80a37f58ae35687dc33db08a04b3d
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 12:27:35 2013 +0200
Switch to i686-w64-mingw32 as default Windows toolchain.
* autogen.sh <build-w32>: Insert i686-w64-mingw32.
* configure.ac: Pretty print final info.
diff --git a/autogen.sh b/autogen.sh
index 0d23ad4..885e8fd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Run this to generate all the initial makefiles, etc.
+# Run this to generate all the initial makefiles, etc.
#
# Copyright (C) 2003 g10 Code GmbH
#
@@ -52,7 +52,7 @@ w32ce_toolprefixes=
w32ce_extraoptions=
amd64_toolprefixes=
# End list of optional variables sourced from ~/.gnupg-autogen.rc
-# What follows are variables which are sourced but default to
+# What follows are variables which are sourced but default to
# environment variables or lacking them hardcoded values.
#w32root=
#w32ce_root=
@@ -64,7 +64,7 @@ if [ -f "$HOME/.gnupg-autogen.rc" ]; then
fi
# Convenience option to use certain configure options for some hosts.
-myhost=""
+myhost=""
myhostsub=""
case "$1" in
--build-w32)
@@ -106,13 +106,13 @@ if [ "$myhost" = "w32" ]; then
;;
*)
[ -z "$w32root" ] && w32root="$HOME/w32root"
- toolprefixes="$w32_toolprefixes i586-mingw32msvc"
+ toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
extraoptions="$w32_extraoptions --enable-pinentry-gtk2"
;;
esac
echo "Using $w32root as standard install directory" >&2
-
+
# Locate the cross compiler
crossbindir=
@@ -125,14 +125,14 @@ if [ "$myhost" = "w32" ]; then
done
if [ -z "$crossbindir" ]; then
echo "Cross compiler kit not installed" >&2
- if [ -z "$sub" ]; then
+ if [ -z "$sub" ]; then
echo "Under Debian GNU/Linux, you may install it using" >&2
- echo " apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
+ echo " apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
fi
echo "Stop." >&2
exit 1
fi
-
+
if [ -f "$tsdir/config.log" ]; then
if ! head $tsdir/config.log | grep "$host" >/dev/null; then
echo "Pease run a 'make distclean' first" >&2
@@ -157,19 +157,19 @@ fi
# Grep the required versions from configure.ac
-autoconf_vers=`sed -n '/^AC_PREREQ(/ {
+autoconf_vers=`sed -n '/^AC_PREREQ(/ {
s/^.*(\(.*\))/\1/p
q
}' ${configure_ac}`
autoconf_vers_num=`echo "$autoconf_vers" | cvtver`
-automake_vers=`sed -n '/^min_automake_version=/ {
+automake_vers=`sed -n '/^min_automake_version=/ {
s/^.*="\(.*\)"/\1/p
q
}' ${configure_ac}`
automake_vers_num=`echo "$automake_vers" | cvtver`
-#gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
+#gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
#s/^.*(\(.*\))/\1/p
#q
#}' ${configure_ac}`
@@ -195,9 +195,9 @@ fi
if test "$DIE" = "yes"; then
cat <<EOF
-Note that you may use alternative versions of the tools by setting
+Note that you may use alternative versions of the tools by setting
the corresponding environment variables; see README.SVN for details.
-
+
EOF
exit 1
fi
diff --git a/configure.ac b/configure.ac
index 513626e..ab81283 100644
--- a/configure.ac
+++ b/configure.ac
@@ -511,19 +511,20 @@ Makefile
AC_OUTPUT
AC_MSG_NOTICE([
+
Pinentry v${VERSION} has been configured as follows:
- Revision: mym4_revision (mym4_revision_dec)
- Platform: $host
+ Revision: mym4_revision (mym4_revision_dec)
+ Platform: $host
- Curses Pinentry: $pinentry_curses
- GTK+ Pinentry: $pinentry_gtk
- GTK+-2 Pinentry: $pinentry_gtk_2
- Qt Pinentry: $pinentry_qt
- Qt4 Pinentry: $pinentry_qt4
- W32 Pinentry: $pinentry_w32
+ Curses Pinentry ..: $pinentry_curses
+ GTK+ Pinentry ....: $pinentry_gtk
+ GTK+-2 Pinentry ..: $pinentry_gtk_2
+ Qt Pinentry ......: $pinentry_qt
+ Qt4 Pinentry .....: $pinentry_qt4
+ W32 Pinentry .....: $pinentry_w32
Fallback to Curses: $fallback_curses
- Default Pinentry: $PINENTRY_DEFAULT
+ Default Pinentry .: $PINENTRY_DEFAULT
])
commit 369e774ab835ecf23da267cf55f9ecf8ae8c5585
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 12:17:52 2013 +0200
Fix declaration of lock_set_foreground_window for pinnetry-w32.
* w32/main.c (lock_set_foreground_window): Remove WINUSERAPI
qualifier.
--
WINUSERAPI is expanded to dllimport which is not what we want if we
load the symbol at runtime. This produces an error with mingw-w64
4.6.3-14+8
(backport from a gpg4win patch)
diff --git a/w32/main.c b/w32/main.c
index bd0191b..85bf2b1 100644
--- a/w32/main.c
+++ b/w32/main.c
@@ -1,16 +1,16 @@
/* main.c - Secure W32 dialog for PIN entry.
Copyright (C) 2004, 2007 g10 Code GmbH
-
+
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., 59 Temple Place - Suite 330, Boston, MA
@@ -46,7 +46,7 @@
/* This function pointer gets initialized in main. */
#ifndef HAVE_W32CE_SYSTEM
-static WINUSERAPI BOOL WINAPI (*lock_set_foreground_window)(UINT);
+static BOOL WINAPI (*lock_set_foreground_window)(UINT);
#endif
static int w32_cmd_handler (pinentry_t pe);
@@ -74,7 +74,7 @@ const char *
w32_strerror (int ec)
{
static char strerr[256];
-
+
if (ec == -1)
ec = (int)GetLastError ();
#ifdef HAVE_W32CE_SYSTEM
@@ -86,7 +86,7 @@ w32_strerror (int ec)
MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
strerr, sizeof strerr - 1, NULL);
#endif
- return strerr;
+ return strerr;
}
@@ -134,7 +134,7 @@ w32ce_finish_pipe (int rvid, int write_end)
/* char name[200]; */
/* int nname; */
/* char *pname; */
-
+
/* memset (buf, 0, sizeof (buf)); */
/* GetWindowText (child, buf, sizeof (buf)-1); */
/* nname = GetClassName (child, name, sizeof (name)-1); */
@@ -222,7 +222,7 @@ raise_sip (HWND dlg)
memset (&si, 0, sizeof si);
si.cbSize = sizeof si;
- if (SipGetInfo (&si))
+ if (SipGetInfo (&si))
{
si.fdwFlags |= SIPF_ON;
SipSetInfo (&si);
@@ -235,33 +235,33 @@ raise_sip (HWND dlg)
/* Center the window CHILDWND with the desktop as its parent
window. STYLE is passed as second arg to SetWindowPos.*/
static void
-center_window (HWND childwnd, HWND style)
-{
+center_window (HWND childwnd, HWND style)
+{
#ifndef HAVE_W32CE_SYSTEM
HWND parwnd;
- RECT rchild, rparent;
+ RECT rchild, rparent;
HDC hdc;
int wchild, hchild, wparent, hparent;
int wscreen, hscreen, xnew, ynew;
int flags = SWP_NOSIZE | SWP_NOZORDER;
-
+
parwnd = GetDesktopWindow ();
- GetWindowRect (childwnd, &rchild);
- wchild = rchild.right - rchild.left;
+ GetWindowRect (childwnd, &rchild);
+ wchild = rchild.right - rchild.left;
hchild = rchild.bottom - rchild.top;
-
- GetWindowRect (parwnd, &rparent);
- wparent = rparent.right - rparent.left;
- hparent = rparent.bottom - rparent.top;
-
- hdc = GetDC (childwnd);
- wscreen = GetDeviceCaps (hdc, HORZRES);
- hscreen = GetDeviceCaps (hdc, VERTRES);
- ReleaseDC (childwnd, hdc);
- xnew = rparent.left + ((wparent - wchild) / 2);
+
+ GetWindowRect (parwnd, &rparent);
+ wparent = rparent.right - rparent.left;
+ hparent = rparent.bottom - rparent.top;
+
+ hdc = GetDC (childwnd);
+ wscreen = GetDeviceCaps (hdc, HORZRES);
+ hscreen = GetDeviceCaps (hdc, VERTRES);
+ ReleaseDC (childwnd, hdc);
+ xnew = rparent.left + ((wparent - wchild) / 2);
if (xnew < 0)
xnew = 0;
- else if ((xnew+wchild) > wscreen)
+ else if ((xnew+wchild) > wscreen)
xnew = wscreen - wchild;
ynew = rparent.top + ((hparent - hchild) / 2);
if (ynew < 0)
@@ -285,14 +285,14 @@ move_mouse_and_click (HWND hwnd)
int wscreen, hscreen, x, y, normx, normy;
INPUT inp[3];
int idx;
-
- hdc = GetDC (hwnd);
- wscreen = GetDeviceCaps (hdc, HORZRES);
- hscreen = GetDeviceCaps (hdc, VERTRES);
- ReleaseDC (hwnd, hdc);
+
+ hdc = GetDC (hwnd);
+ wscreen = GetDeviceCaps (hdc, HORZRES);
+ hscreen = GetDeviceCaps (hdc, VERTRES);
+ ReleaseDC (hwnd, hdc);
if (wscreen < 10 || hscreen < 10)
return;
-
+
GetWindowRect (hwnd, &rect);
x = rect.left;
y = rect.bottom;
@@ -357,7 +357,7 @@ set_dlg_item_text (HWND dlg, int item, const char *string)
else
{
wchar_t *wbuf;
-
+
wbuf = utf8_to_wchar (string);
if (!wbuf)
SetDlgItemTextW (dlg, item, L"[out of core]");
@@ -418,7 +418,7 @@ dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
EnableWindow (GetDlgItem (dlg, IDC_PINENT_TEXT), FALSE);
SetWindowPos (GetDlgItem (dlg, IDC_PINENT_TEXT), NULL, 0, 0, 0, 0,
(SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER|SWP_HIDEWINDOW));
-
+
item = IDOK;
}
else
@@ -460,7 +460,7 @@ dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
}
break;
- case WM_KEYDOWN:
+ case WM_KEYDOWN:
if (wparam == VK_RETURN)
{
if (confirm_mode)
@@ -485,7 +485,7 @@ ok_button_clicked (HWND dlg, pinentry_t pe)
wchar_t *w_buffer;
size_t w_buffer_size = 255;
unsigned int nchar;
-
+
pe->locale_err = 1;
w_buffer = secmem_malloc ((w_buffer_size + 1) * sizeof *w_buffer);
if (!w_buffer)
@@ -577,7 +577,7 @@ parse_std_file_handles (int *argcp, char ***argvp)
s = *argv;
if (*s == '-' && s[1] == '&' && s[2] == 'S'
&& (s[3] == '0' || s[3] == '1' || s[3] == '2')
- && s[4] == '='
+ && s[4] == '='
&& (strchr ("-01234567890", s[5]) || !strcmp (s+5, "null")))
{
if (s[5] == 'n')
commit 18b0d8849e51b6203b3f1dbc1cc1cc71e52f78b6
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 12:06:02 2013 +0200
Fix ressource compilation of pinentry-w32
* w32/pinentry-w32.rc: Include windows.h
--
MSDN says that to use the Dialog Styles one should include windows.h
and this is also necessary with at least mingw-w64 4.6.3-14+8
otherwise there is a syntax error because the DS_* macros are not
defined
(backport from gpg4win patch)
diff --git a/w32/pinentry-w32.rc b/w32/pinentry-w32.rc
index a4816bc..efde843 100755
--- a/w32/pinentry-w32.rc
+++ b/w32/pinentry-w32.rc
@@ -1,16 +1,16 @@
/* dialog.rc - Resource definitions -*- c -*-
Copyright (C) 2004, 2010 g10 Code GmbH
-
+
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., 59 Temple Place - Suite 330, Boston, MA
@@ -18,10 +18,11 @@
#include <config.h>
#include <winuser.h>
+#include <windows.h>
#include "resource.h"
-/*
- * Main dialog
+/*
+ * Main dialog
*/
#ifdef HAVE_W32CE_SYSTEM
-----------------------------------------------------------------------
Summary of changes:
NEWS | 12 ++++++++-
autogen.sh | 26 +++++++++---------
configure.ac | 21 ++++++++-------
w32/main.c | 72 +++++++++++++++++++++++++-------------------------
w32/pinentry-w32.rc | 11 ++++---
5 files changed, 77 insertions(+), 65 deletions(-)
hooks/post-receive
--
The standard pinentry collection
http://git.gnupg.org
More information about the Gnupg-commits
mailing list