[git] GpgEX - branch, master, updated. gpgex-0.9.7-20-gc2448a3
by Werner Koch
cvs at cvs.gnupg.org
Mon Jun 24 10:12:43 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 "GnupG extension for the Windows Explorer".
The branch, master has been updated
via c2448a310fc9ce88b15602f6948b260d8271e529 (commit)
via e6b56c09baab19a3d79bf2a6a8e9ce6c15389d28 (commit)
via f4a8d23344d2e31060882db6a3c5ec46a4889ed2 (commit)
via 1ca3b35efdbbc5bb1559f381cf5007c9c832ea10 (commit)
via c824d55ede632a4953616ea14f8a04e7dc103a0a (commit)
from 17a42a21318ff5ade9648f216ac097a76aecb6b9 (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 c2448a310fc9ce88b15602f6948b260d8271e529
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jun 24 09:31:58 2013 +0200
Switched to use the GIT versioning system.
diff --git a/configure.ac b/configure.ac
index 266d068..c2f37a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# configure.ac - for GpgEX
-# Copyright (C) 2005, 2006, 2007 g10 Code GmbH
+# Copyright (C) 2005, 2006, 2007, 2013 g10 Code GmbH
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -10,30 +10,40 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
-min_automake_version="1.9.4"
+AC_PREREQ(2.61)
+min_automake_version="1.10"
+
+# To build a release you need to create a tag with the version number
+# (git tag -s gnupg-2.n.m) and run "./autogen.sh --force". Please
+# bump the version number immediately *after* the release and do
+# another commit and push so that the git magic is able to work.
+m4_define([mym4_version], [1.0.0])
+
+# Below is m4 magic to extract and compute the git revision number,
+# the decimalized short revision number, a beta version string and a
+# flag indicating a development version (mym4_isgit). Note that the
+# m4 processing is done by autoconf and not during the configure run.
+m4_define([mym4_revision],
+ m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
+m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+m4_define([mym4_betastring],
+ m4_esyscmd_s([git describe --match 'gpgex-[0-9].[0-9].*[0-9]' --long|\
+ awk -F- '$3!=0{print"-beta"$3}']))
+m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+AC_INIT([gpgex],[mym4_full_version], [http://bugs.gnupg.org])
-# Remember to change the version number immediately *after* a release.
-# Set my_issvn to "yes" for non-released code. Remember to run an
-# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [0.9.7])
-m4_define([my_issvn], [no])
+NEED_GPG_ERROR_VERSION=1.12
-m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
- || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
-AC_INIT([gpgex], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]),
- [http://bugs.gnupg.org])
+NEED_LIBASSUAN_API=2
+NEED_LIBASSUAN_VERSION=2.1.1
-SVN_REVISION=svn_revision
PACKAGE=$PACKAGE_NAME
PACKAGE_GT=${PACKAGE_NAME}
VERSION=$PACKAGE_VERSION
-NEED_GPG_ERROR_VERSION=1.12
-
-NEED_LIBASSUAN_API=2
-NEED_LIBASSUAN_VERSION=2.1.1
-
AC_CONFIG_SRCDIR(src/gpgex.def)
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_TARGET
@@ -55,17 +65,6 @@ AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",
[Bug report address])
-BUILD_TIMESTAMP=`date --iso-8601=minutes`
-AC_SUBST(BUILD_TIMESTAMP)
-changequote(,)dnl
-BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-changequote([,])dnl
-BUILD_FILEVERSION="${BUILD_FILEVERSION}${SVN_REVISION}"
-AC_SUBST(BUILD_FILEVERSION)
-BUILD_FILEVERSION_DOT=`echo "$BUILD_FILEVERSION" | tr ',' '.'`
-AC_SUBST(BUILD_FILEVERSION_DOT)
-
-
AH_BOTTOM([
/* Some global constants. */
@@ -222,6 +221,31 @@ AH_BOTTOM([
#define _ASSUAN_ONLY_GPG_ERRORS 1
])
+
+#
+# Provide information about the build.
+#
+BUILD_REVISION="mym4_revision"
+AC_SUBST(BUILD_REVISION)
+AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
+ [GIT commit id revision used to build this package])
+
+changequote(,)dnl
+BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
+changequote([,])dnl
+BUILD_FILEVERSION="${BUILD_FILEVERSION}mym4_revision_dec"
+AC_SUBST(BUILD_FILEVERSION)
+BUILD_FILEVERSION_DOT=`echo "$BUILD_FILEVERSION" | tr ',' '.'`
+AC_SUBST(BUILD_FILEVERSION_DOT)
+
+BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
+AC_SUBST(BUILD_TIMESTAMP)
+AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP",
+ [The time this package was configured for a build])
+BUILD_HOSTNAME="$ac_hostname"
+AC_SUBST(BUILD_HOSTNAME)
+
+
#
# Print errors here so that they are visible all
# together and the user can acquire them all together.
diff --git a/src/Makefile.am b/src/Makefile.am
index 2c238b9..f02d084 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@
bin_PROGRAMS = gpgex
EXTRA_DIST = versioninfo.rc.in gpgex.manifest.in \
- GNU.GnuPG.Gcc64Support.manifest
+ GNU.GnuPG.Gcc64Support.manifest gnupg.ico
EXEEXT = .dll
AM_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) -shared
commit e6b56c09baab19a3d79bf2a6a8e9ce6c15389d28
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jun 24 09:15:32 2013 +0200
Auto update the PO files.
--
diff --git a/po/ar.po b/po/ar.po
index 6f71705..daae4fd 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -30,6 +30,9 @@ msgstr ""
msgid "Help on GpgEX"
msgstr "‮مساعدة Øول ‪GpgEx‬"
+msgid "About GpgEX"
+msgstr ""
+
msgid "Decrypt and verify"
msgstr "ظهّÙر Ùˆ تØقق"
@@ -63,6 +66,9 @@ msgstr "‮مزيد من خيارات ‪GpgEx‬"
msgid "Invoke the GpgEX documentation."
msgstr "‮طالع وثائق ‪GpgEx‬"
+msgid "Show the version of GpgEX."
+msgstr ""
+
msgid "Decrypt and verify the marked files."
msgstr "ظهّÙر Ùˆ تØقق من الملÙات المؤشَّرة."
@@ -92,3 +98,11 @@ msgstr "اÙØص التلبيدات."
msgid "Show more GpgEX options."
msgstr "‮أظهر مزيدا من خيارات ‪GpgEx‬."
+
+#. TRANSLATORS: See the source for the full english text.
+msgid "-#GpgEXFullHelpText#-"
+msgstr ""
+
+#, c-format
+msgid "This is GpgEX version %s (%s)"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index f794aab..7036835 100644
--- a/po/es.po
+++ b/po/es.po
@@ -27,6 +27,9 @@ msgstr ""
msgid "Help on GpgEX"
msgstr "Ayuda de GpgEX"
+msgid "About GpgEX"
+msgstr ""
+
msgid "Decrypt and verify"
msgstr "Descifrar y verificar."
@@ -60,6 +63,9 @@ msgstr "Más opciones de GpgEX"
msgid "Invoke the GpgEX documentation."
msgstr "Invocar la documentación de GpgEX."
+msgid "Show the version of GpgEX."
+msgstr ""
+
msgid "Decrypt and verify the marked files."
msgstr "Descifrar y verificar los archivos marcados."
@@ -89,3 +95,11 @@ msgstr "Verificar sumas de comprobación."
msgid "Show more GpgEX options."
msgstr "Mostrar más opciones de GpgEX."
+
+#. TRANSLATORS: See the source for the full english text.
+msgid "-#GpgEXFullHelpText#-"
+msgstr ""
+
+#, c-format
+msgid "This is GpgEX version %s (%s)"
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
index a58b507..785d28f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -30,6 +30,9 @@ msgstr ""
msgid "Help on GpgEX"
msgstr "Ajuda de GpgEX"
+msgid "About GpgEX"
+msgstr ""
+
msgid "Decrypt and verify"
msgstr "Desencriptar e verificar"
@@ -63,6 +66,9 @@ msgstr "Mais op
msgid "Invoke the GpgEX documentation."
msgstr "Invocar a documentação do GpgEX."
+msgid "Show the version of GpgEX."
+msgstr ""
+
msgid "Decrypt and verify the marked files."
msgstr "Desencriptar e verificar os ficheiros marcados."
@@ -92,3 +98,11 @@ msgstr "Verificar checksums."
msgid "Show more GpgEX options."
msgstr "Mostrar mais opções do GpgEX."
+
+#. TRANSLATORS: See the source for the full english text.
+msgid "-#GpgEXFullHelpText#-"
+msgstr ""
+
+#, c-format
+msgid "This is GpgEX version %s (%s)"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index c5b1465..79a0120 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -28,6 +28,9 @@ msgstr ""
msgid "Help on GpgEX"
msgstr "Помощь по GpgEX"
+msgid "About GpgEX"
+msgstr ""
+
msgid "Decrypt and verify"
msgstr "РаÑшифровать и проверить"
@@ -61,6 +64,9 @@ msgstr "Другие параметры GpgEX"
msgid "Invoke the GpgEX documentation."
msgstr "Открыть документацию GpgEX."
+msgid "Show the version of GpgEX."
+msgstr ""
+
msgid "Decrypt and verify the marked files."
msgstr "РаÑшифровать и проверить отмеченные файлы."
@@ -90,3 +96,11 @@ msgstr "Проверить контрольные Ñуммы."
msgid "Show more GpgEX options."
msgstr "Другие параметры GpgEX."
+
+#. TRANSLATORS: See the source for the full english text.
+msgid "-#GpgEXFullHelpText#-"
+msgstr ""
+
+#, c-format
+msgid "This is GpgEX version %s (%s)"
+msgstr ""
commit f4a8d23344d2e31060882db6a3c5ec46a4889ed2
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jun 24 09:15:15 2013 +0200
Update the German translation.
diff --git a/po/de.po b/po/de.po
index 902dea8..5fe8dbe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpgex 0.0.0-svn10\n"
"Report-Msgid-Bugs-To: bug-gpgex at g10code.com\n"
-"PO-Revision-Date: 2009-01-22 16:11+0100\n"
+"PO-Revision-Date: 2013-06-24 09:14+0200\n"
"Last-Translator: Marcus Brinkmann <marcus at g10code.com>\n"
"Language-Team: German\n"
"Language: \n"
@@ -27,6 +27,9 @@ msgstr ""
msgid "Help on GpgEX"
msgstr "Hilfe zu GpgEX"
+msgid "About GpgEX"
+msgstr "Ãœber GpgEX"
+
msgid "Decrypt and verify"
msgstr "Entschlüsseln und prüfen"
@@ -60,6 +63,9 @@ msgstr "Mehr GpgEX Optionen"
msgid "Invoke the GpgEX documentation."
msgstr "Öffne die Dokumentation zu GpgEX"
+msgid "Show the version of GpgEX."
+msgstr "Anzeige der Version von GpgEX"
+
msgid "Decrypt and verify the marked files."
msgstr "Die markierten Dateien entschlüsseln und prüfen."
@@ -89,3 +95,30 @@ msgstr "Die Prüfsummen der markierten Dateien überprüfen."
msgid "Show more GpgEX options."
msgstr "Mehr GpgEX Optionen."
+
+#. TRANSLATORS: See the source for the full english text.
+msgid "-#GpgEXFullHelpText#-"
+msgstr ""
+"GpgEX ist eine Explorer Erweiterung, welches es ermöglicht\n"
+"Daten mittels der Internet-Standards PGP/MIME oder S/MIME\n"
+"zu verschlüsseln und digital zu signieren. Im Hintergrund wird\n"
+"dazu die GnuPG Software (<http://www.gnupg.org/>) benutzt.\n"
+"\n"
+"GpgEX ist freie Software. Sie können es unter den Bedingungen\n"
+"der GNU Lesser General Public License, wie von der Free Software\n"
+"Foundation veröffentlicht, weitergeben und/oder modifizieren;\n"
+"entweder gemäß Version 2.1 der Lizenz oder (nach Ihrer Wahl)\n"
+"jeder späteren Version.\n"
+"\n"
+"GpgEX wird in der Hoffnung veröffentlicht, daß es Ihnen von Nutzen\n"
+"sein wird, aber ohne irgendeine Garantie, sogar ohne die implizite\n"
+"Garantie der Marktreife oder der Verwendbarkeit für einen bestimmten\n"
+"Zweck. Details finden Sie in der GNU Lesser General Public License.\n"
+"\n"
+"Zusammen mit GpgEX sollten Sie eine Kopie der GNU Lesser General\n"
+"Public License erhalten haben. Falls nicht, finden Sie diese\n"
+"unter der Webadresse <http://www.gnu.org/licenses/>."
+
+#, c-format
+msgid "This is GpgEX version %s (%s)"
+msgstr "Dies ist GpgEX Version %s (%s)"
commit 1ca3b35efdbbc5bb1559f381cf5007c9c832ea10
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jun 24 09:12:32 2013 +0200
Add an About message box.
* src/gpgex.cc (ID_CMD_ABOUT): New.
(ID_CMD_STR_ABOUT): New.
(QueryContextMenu): Add About menu item.
(GetCommandString): Add tooltip for that.
(show_about): New.
(InvokeCommand): Display about menu.
diff --git a/src/gpgex.cc b/src/gpgex.cc
index 3125a25..45f63bc 100644
--- a/src/gpgex.cc
+++ b/src/gpgex.cc
@@ -53,9 +53,11 @@ using std::string;
#define ID_CMD_CREATE_CHECKSUMS 8
#define ID_CMD_VERIFY_CHECKSUMS 9
#define ID_CMD_POPUP 10
-#define ID_CMD_MAX 10
+#define ID_CMD_ABOUT 11
+#define ID_CMD_MAX 11
#define ID_CMD_STR_HELP _("Help on GpgEX")
+#define ID_CMD_STR_ABOUT _("About GpgEX")
#define ID_CMD_STR_DECRYPT_VERIFY _("Decrypt and verify")
#define ID_CMD_STR_DECRYPT _("Decrypt")
#define ID_CMD_STR_VERIFY _("Verify")
@@ -369,6 +371,9 @@ gpgex_t::QueryContextMenu (HMENU hMenu, UINT indexMenu, UINT idCmdFirst,
if (res)
res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
idCmdFirst + ID_CMD_HELP, ID_CMD_STR_HELP);
+ if (res)
+ res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
+ idCmdFirst + ID_CMD_ABOUT, ID_CMD_STR_ABOUT);
if (! res)
return TRACE_RES (HRESULT_FROM_WIN32 (GetLastError ()));
@@ -410,6 +415,10 @@ gpgex_t::GetCommandString (UINT_PTR idCommand, UINT uFlags, LPUINT lpReserved,
txt = _("Invoke the GpgEX documentation.");
break;
+ case ID_CMD_ABOUT:
+ txt = _("Show the version of GpgEX.");
+ break;
+
case ID_CMD_DECRYPT_VERIFY:
txt = _("Decrypt and verify the marked files.");
break;
@@ -554,6 +563,61 @@ start_help (HWND hwnd)
}
+/* Show the version informatione etc. */
+static void
+show_about (HWND hwnd)
+{
+ const char cpynotice[] = "Copyright (C) 2013 g10 Code GmbH";
+ const char en_notice[] =
+ "GpgEX is an Explorer plugin for data encryption and signing\n"
+ "It uses the GnuPG software (http://www.gnupg.org).\n"
+ "\n"
+ "GpgEX is free software; you can redistribute it and/or\n"
+ "modify it under the terms of the GNU Lesser General Public\n"
+ "License as published by the Free Software Foundation; either\n"
+ "version 2.1 of the License, or (at your option) any later version.\n"
+ "\n"
+ "GpgEX is distributed in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+ "GNU Lesser General Public License for more details.\n"
+ "\n"
+ "You should have received a copy of the GNU Lesser General Public "
+ "License\n"
+ "along with this program; if not, see <http://www.gnu.org/licenses/>.";
+
+ /* TRANSLATORS: See the source for the full english text. */
+ const char notice_key[] = N_("-#GpgEXFullHelpText#-");
+ const char *notice;
+ char header[300];
+ char *buffer;
+ size_t nbuffer;
+
+ snprintf (header, sizeof header, _("This is GpgEX version %s (%s)"),
+ PACKAGE_VERSION,
+#ifdef HAVE_W64_SYSTEM
+ "64 bit"
+#else
+ "32 bit"
+#endif
+ );
+ notice = _(notice_key);
+ if (!strcmp (notice, notice_key))
+ notice = en_notice;
+ nbuffer = strlen (header) + strlen (cpynotice) + strlen (notice) + 20;
+ buffer = (char*)malloc (nbuffer);
+ if (buffer)
+ {
+ snprintf (buffer, nbuffer, "%s\n%s\n\n%s\n",
+ header, cpynotice, notice);
+ MessageBox (hwnd, buffer, "GpgEx", MB_OK);
+ free (buffer);
+ }
+ else
+ MessageBox (hwnd, header, "GpgEx", MB_OK);
+}
+
+
STDMETHODIMP
gpgex_t::InvokeCommand (LPCMINVOKECOMMANDINFO lpcmi)
{
@@ -575,6 +639,10 @@ gpgex_t::InvokeCommand (LPCMINVOKECOMMANDINFO lpcmi)
start_help (lpcmi->hwnd);
break;
+ case ID_CMD_ABOUT:
+ show_about (lpcmi->hwnd);
+ break;
+
case ID_CMD_DECRYPT_VERIFY:
client.decrypt_verify (this->filenames);
break;
commit c824d55ede632a4953616ea14f8a04e7dc103a0a
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jun 24 09:06:05 2013 +0200
Require latest libgpg-erro and libassuan versions.
diff --git a/configure.ac b/configure.ac
index 2d1dc40..266d068 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,17 +22,17 @@ m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
|| echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
AC_INIT([gpgex], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]),
- [bug-gpgex at g10code.com])
+ [http://bugs.gnupg.org])
SVN_REVISION=svn_revision
PACKAGE=$PACKAGE_NAME
PACKAGE_GT=${PACKAGE_NAME}
VERSION=$PACKAGE_VERSION
-NEED_GPG_ERROR_VERSION=1.9
+NEED_GPG_ERROR_VERSION=1.12
NEED_LIBASSUAN_API=2
-NEED_LIBASSUAN_VERSION=2.0.0
+NEED_LIBASSUAN_VERSION=2.1.1
AC_CONFIG_SRCDIR(src/gpgex.def)
AM_CONFIG_HEADER(config.h)
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 84 +++++++++++++++++++++++++++++++++++-------------------
po/ar.po | 14 +++++++++
po/de.po | 35 ++++++++++++++++++++++-
po/es.po | 14 +++++++++
po/pt.po | 14 +++++++++
po/ru.po | 14 +++++++++
src/Makefile.am | 2 +-
src/gpgex.cc | 70 +++++++++++++++++++++++++++++++++++++++++++++-
8 files changed, 214 insertions(+), 33 deletions(-)
hooks/post-receive
--
GnupG extension for the Windows Explorer
http://git.gnupg.org
More information about the Gnupg-commits
mailing list