[Gpg4win-commits] [git] Gpg4win - branch, gpg4win-2, updated. gpg4win-2.3.1-8-g8d8fd21
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Jul 4 15:24:41 CEST 2016
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 for Windows".
The branch, gpg4win-2 has been updated
via 8d8fd21ebb9242b1505dc5d36c1fcb71696a0018 (commit)
via 03e35b28ccef1df07830dae539709b68adb0e218 (commit)
via d24ee07991a48124c2502d244f7dcb53620d421d (commit)
via f0496ae849e3dc7c82965ba671fdd00f1f29fd9b (commit)
via feae40c5ae88de491a3ba99fc8f5b31b779d9988 (commit)
via 481217aa820e7ff7a0b44830340fa4f275158c38 (commit)
via 827fb6e5172f11b333c38782150cbf6b4733d5e4 (commit)
from 36817b29c9cbf835cca02779fb0f50d21a2969c2 (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 8d8fd21ebb9242b1505dc5d36c1fcb71696a0018
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 4 15:23:54 2016 +0200
Prepare NEWS for 2.3.2
* NEWS: Prepare 2.3.2
* doc/README.de.txt, doc/README.en.txt: Update accordingly.
diff --git a/NEWS b/NEWS
index c47f160..b9a2be6 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,34 @@
#
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
+Noteworthy changes in version 2.3.2 (unreleased)
+------------------------------------------------
+(en) When S/MIME is disabled in GpgOL it now also ignores sent mails.
+
+(de) Wenn S/MIME unterstützung in GpgOL deaktiviert ist werden nun auch
+ versendete Nachrrichten nicht mehr von GpgOL behandelt.
+
+(en) Problems causing the start of Kleopatra and GPA from GpgEX and
+ GpgOL have been fixed.
+
+(de) Probleme beim starten von Kleopatra und GPA durch GpgOL und GpgEX
+ wurden behoben.
+
+(en) Various regressions in 2.3.1 are now again fixed.
+
+(de) Verschiede bereits behobene Probleme die in 2.3.1 wieder aufgetreten sind
+ sind wieder korrigiert.
+
+~~~~~~~~~~~~~~~
+GnuPG: 2.0.30
+Kleopatra: 2.2.0-gitfb4ae3d
+GPA: 0.9.9
+GpgOL: 1.4.0
+GpgEX: 1.0.4
+Kompendium DE: 3.0.0
+Kompendium EN: 3.0.0
+~~~~~~~~~~~~~~~
+
Noteworthy changes in version 2.3.1 (2016-04-05)
------------------------------------------------
diff --git a/doc/README.de.txt b/doc/README.de.txt
index 6bd71fe..7813672 100644
--- a/doc/README.de.txt
+++ b/doc/README.de.txt
@@ -50,18 +50,14 @@ Die integrierten Gpg4win-Komponenten in Version !VERSION! sind:
Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
-----------------------------------------
-- GpgOL enthält nun einen Optionsdialog in dem S/MIME deaktiviert werden kann.
+- Wenn S/MIME unterstützung in GpgOL deaktiviert ist werden nun auch
+ versendete Nachrrichten nicht mehr von GpgOL behandelt.
-- Die 64 Bit Version von Microsoft Outlook wird nun von GpgOL unterstützt.
+- Probleme beim starten von Kleopatra und GPA durch GpgOL und GpgEX
+ wurden behoben.
-- GpgOL kann im Optionsdialog nun auf die neue, experimentelle, volle MIME
- unterstützung umgestellt werden.
-
-- GpgOL macht änderungen an MIME Mails nun Rückgängig so das diese auch
- weiterhin von anderen Anwendungen verarbeitet werden können.
-
-- GpgEX blockiert den Windows Explorer nun nicht mehr während GPA oder
- Kleopatra gestartet werden.
+- Verschiede bereits behobene Probleme die in 2.3.1 wieder aufgetreten sind
+ sind wieder korrigiert.
3. Bekannte Probleme (und Abhilfen)
===================================
diff --git a/doc/README.en.txt b/doc/README.en.txt
index 56ce3cc..23b9206 100644
--- a/doc/README.en.txt
+++ b/doc/README.en.txt
@@ -48,17 +48,12 @@ Included Gpg4win components in Version !VERSION! are:
New in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
-----------------------------------------
-- GpgOL now has an option dialog where S/MIME can be disabled.
+- When S/MIME is disabled in GpgOL it now also ignores sent mails.
-- GpgOL now supports the 64 Bit version of Microsoft Outlook.
+- Problems causing the start of Kleopatra and GPA from GpgEX and
+ GpgOL have been fixed.
-- GpgOL can be switched to the new, experimental, MIME aware behavior in the
- Options Dialog.
-
-- GpgOL now reverts temporary changes made to MIME mails. So that they an be
- opened with other clients again.
-
-- GpgEX no longer blocks the Windows Explorer while it starts GPA or Kleopatra.
+- Various regressions in 2.3.1 are now again fixed.
3. Known Bugs (and Workarounds)
===============================
commit 03e35b28ccef1df07830dae539709b68adb0e218
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 4 15:11:27 2016 +0200
Auto update translations
--
diff --git a/po/pt.po b/po/pt.po
index 793dc14..4eb6488 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -294,8 +294,8 @@ msgid ""
"\n"
"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-"Uma versão antiga do Claws Mail foi encontrada na tua directoria de "
-"instalação.\n"
+"Uma versão antiga do Claws Mail foi encontrada na tua directoria de instalaçã"
+"o.\n"
"Por favor, nota que o Claws Mail já não é distribuído com o Gpg4win e está "
"agora disponível como um pacote independente.\n"
"Deves desinstalar o Claws Mail agora e, se quiseres continuar a usá-lo, "
@@ -304,11 +304,8 @@ msgstr ""
"\n"
"Desinstalar o Claws Mail do Gpg4win agora?"
-msgctxt "T_Installing_GnuPG"
-msgid "Installing GnuPG"
-msgstr "Instalar o GnuPG"
-
-msgctxt "DESC_SEC_gnupg_w32"
+#, fuzzy
+msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard"
@@ -388,6 +385,10 @@ msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr "Mostrar o Compêndio Gpg4win (pdf, Inglês)"
+#~ msgctxt "T_Installing_GnuPG"
+#~ msgid "Installing GnuPG"
+#~ msgstr "Instalar o GnuPG"
+
#~ msgctxt "T_ShuttingDownDirMngr"
#~ msgid "Trying to shutdown a possible running instance of DirMngr."
#~ msgstr "A tentar encerrar uma possível instância do DirMngr em execução."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5c44721..c11fb4d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: Gpg4Win Installer\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
"PO-Revision-Date: 2015-08-09 21:10+0800\n"
+"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 at gmail.com>\n"
"Language-Team: \n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=gbk\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.4\n"
-"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 at gmail.com>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: zh_CN\n"
msgctxt "T_AlreadyRunning"
msgid "An instance of this installer is already running."
@@ -263,27 +263,18 @@ msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "³¢ÊÔÍ£Ö¹Ò»¸ö¿ÉÄÜÔËÐÐ×ÅµÄ WinPT ʵÀý¡£"
-msgctxt "T_ShuttingDownDirMngr"
-msgid "Trying to shutdown a possible running instance of DirMngr."
-msgstr "³¢ÊÔÍ£Ö¹Ò»¸ö¿ÉÄÜÔËÐÐ×ÅµÄ DirMngr ʵÀý¡£"
-
-msgctxt "T_SetDefaultClient"
-msgid "Do you want to make Claws Mail your default mail client?"
-msgstr "ÄãÏë°Ñ Claws Mail ÉèÖÃΪÄãµÄĬÈÏÓʼþ¿Í»§¶ËÂð£¿"
-
-# Better if as-is.
-msgctxt "DESC_SEC_claws_mail"
-msgid "Claws Mail-User-Agent"
+msgctxt "T_FoundOldClaws"
+msgid ""
+"An old version of Claws Mail was found in your Installation directory.\n"
+"Please note that Claws Mail is no longer bundled with Gpg4win and is now "
+"available as a standalone package.\n"
+"You should uninstall Claws Mail now, and if you wish to continue to use it, "
+"install an up-to-date version from:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-msgctxt "DESC_Menu_claws_mail"
-msgid "Run the Claws mailprogram."
-msgstr "ÔËÐÐ Claws Mail ³ÌÐò¡£"
-
-msgctxt "DESC_Menu_claws_mail_pdf"
-msgid "Show the online manual of Claws Mail"
-msgstr "ÏÔʾ Claws Mail ÔÚÏßÊֲᡣ"
-
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard"
msgstr "GNU Òþ˽ÎÀÊ¿"
@@ -364,3 +355,19 @@ msgstr "
msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr "ÏÔʾ Gpg4win ʹÓøÙÒª£¨PDF£¬Ó¢Ó"
+
+#~ msgctxt "T_ShuttingDownDirMngr"
+#~ msgid "Trying to shutdown a possible running instance of DirMngr."
+#~ msgstr "³¢ÊÔÍ£Ö¹Ò»¸ö¿ÉÄÜÔËÐÐ×ÅµÄ DirMngr ʵÀý¡£"
+
+#~ msgctxt "T_SetDefaultClient"
+#~ msgid "Do you want to make Claws Mail your default mail client?"
+#~ msgstr "ÄãÏë°Ñ Claws Mail ÉèÖÃΪÄãµÄĬÈÏÓʼþ¿Í»§¶ËÂð£¿"
+
+#~ msgctxt "DESC_Menu_claws_mail"
+#~ msgid "Run the Claws mailprogram."
+#~ msgstr "ÔËÐÐ Claws Mail ³ÌÐò¡£"
+
+#~ msgctxt "DESC_Menu_claws_mail_pdf"
+#~ msgid "Show the online manual of Claws Mail"
+#~ msgstr "ÏÔʾ Claws Mail ÔÚÏßÊֲᡣ"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e660aed..0411fed 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: Gpg4Win Installer\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
"PO-Revision-Date: 2015-08-09 21:10+0800\n"
+"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 at gmail.com>\n"
"Language-Team: \n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=Big5\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.4\n"
-"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 at gmail.com>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: zh_TW\n"
msgctxt "T_AlreadyRunning"
msgid "An instance of this installer is already running."
@@ -263,27 +263,18 @@ msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "¹Á¸Õ°±¤î¤@Ó¥i¯à°õ¦æµÛªº WinPT ¨Ò¶µ¡C"
-msgctxt "T_ShuttingDownDirMngr"
-msgid "Trying to shutdown a possible running instance of DirMngr."
-msgstr "¹Á¸Õ°±¤î¤@Ó¥i¯à°õ¦æµÛªº DirMngr ¨Ò¶µ¡C"
-
-msgctxt "T_SetDefaultClient"
-msgid "Do you want to make Claws Mail your default mail client?"
-msgstr "§A·Q§â Claws Mail ³]©w¬°§Aªº¹w³]¶l¥ó«È¤áºÝ¶Ü¡H"
-
-# Better if as-is.
-msgctxt "DESC_SEC_claws_mail"
-msgid "Claws Mail-User-Agent"
+msgctxt "T_FoundOldClaws"
+msgid ""
+"An old version of Claws Mail was found in your Installation directory.\n"
+"Please note that Claws Mail is no longer bundled with Gpg4win and is now "
+"available as a standalone package.\n"
+"You should uninstall Claws Mail now, and if you wish to continue to use it, "
+"install an up-to-date version from:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-msgctxt "DESC_Menu_claws_mail"
-msgid "Run the Claws mailprogram."
-msgstr "°õ¦æ Claws Mail µ{¦¡¡C"
-
-msgctxt "DESC_Menu_claws_mail_pdf"
-msgid "Show the online manual of Claws Mail"
-msgstr "Åã¥Ü Claws Mail ½u¤W¤â¥U¡C"
-
msgctxt "DESC_SEC_gnupg2"
msgid "GNU Privacy Guard"
msgstr "GNU Áô¨p½Ã¤h"
@@ -364,3 +355,19 @@ msgstr "
msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr "Åã¥Ü Gpg4win ¨Ï¥Îºõn¡]PDF¡A^»y¡^"
+
+#~ msgctxt "T_ShuttingDownDirMngr"
+#~ msgid "Trying to shutdown a possible running instance of DirMngr."
+#~ msgstr "¹Á¸Õ°±¤î¤@Ó¥i¯à°õ¦æµÛªº DirMngr ¨Ò¶µ¡C"
+
+#~ msgctxt "T_SetDefaultClient"
+#~ msgid "Do you want to make Claws Mail your default mail client?"
+#~ msgstr "§A·Q§â Claws Mail ³]©w¬°§Aªº¹w³]¶l¥ó«È¤áºÝ¶Ü¡H"
+
+#~ msgctxt "DESC_Menu_claws_mail"
+#~ msgid "Run the Claws mailprogram."
+#~ msgstr "°õ¦æ Claws Mail µ{¦¡¡C"
+
+#~ msgctxt "DESC_Menu_claws_mail_pdf"
+#~ msgid "Show the online manual of Claws Mail"
+#~ msgstr "Åã¥Ü Claws Mail ½u¤W¤â¥U¡C"
commit d24ee07991a48124c2502d244f7dcb53620d421d
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 4 15:07:31 2016 +0200
Add patches for gpgol and gpgex
* patches/gpgex-1.0.4/
0001-Prefer-kleowrapped-gpgwrapped-binaries.patch,
patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch,
patches/gpgol-1.4.0/
0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch: New.
* Makefile.am (EXTRA_DIST): Update accordingly.
--
Patches are already applied in master of gpgol and gpgex
and fix regressions in the UI-Server startup and one small
S/MIME related bug in GpgOL.
diff --git a/Makefile.am b/Makefile.am
index 85a75c5..c23de0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,10 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/scute-1.4.0/workaround-broken-libtool.patch \
- patches/libassuan-2.4.0/0001-Fix-windows-build-with-mingw-w64-2.0.x.patch
+ patches/libassuan-2.4.0/0001-Fix-windows-build-with-mingw-w64-2.0.x.patch \
+ patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch \
+ patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch \
+ patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch
copy-news:
cp NEWS doc/website/NEWS.last
diff --git a/patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch b/patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch
new file mode 100755
index 0000000..9052ed3
--- /dev/null
+++ b/patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch
@@ -0,0 +1,43 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From 5c19ffe9d71d6e6763d6e47a67f1ca0a1651e39f Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke at intevation.de>
+Date: Tue, 28 Jun 2016 11:00:53 +0200
+Subject: [PATCH] Prefer kleowrapped / gpgwrapped binaries
+
+* src/client.cc (default_uiserver_cmdline): Prefer non "bin" prefixed
+paths.
+
+--
+With Gpg4win-2.x we need to start the "wrapped" binaries if they
+don't exist we are probably in gpg4win-3.x and can fall back to
+the binaries in the bin subdirectory.
+---
+ src/client.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/client.cc b/src/client.cc
+index ebf82a8..6f27175 100644
+--- a/src/client.cc
++++ b/src/client.cc
+@@ -111,12 +111,12 @@ default_uiserver_cmdline (void)
+ const char *dir, *tmp;
+ char *uiserver, *p;
+ int extra_arglen = 9;
+- const char * server_names[] = {"bin\\kleopatra.exe",
+- "kleopatra.exe",
+- "bin\\launch-gpa.exe",
++ const char * server_names[] = {"kleopatra.exe",
++ "bin\\kleopatra.exe",
+ "launch-gpa.exe",
+- "bin\\gpa.exe",
++ "bin\\launch-gpa.exe",
+ "gpa.exe",
++ "bin\\gpa.exe",
+ NULL};
+
+ dir = gpgex_server::root_dir;
+--
+2.1.4
diff --git a/patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch b/patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch
new file mode 100755
index 0000000..20f91d8
--- /dev/null
+++ b/patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch
@@ -0,0 +1,71 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From a10532b6cf3527391bdb14470fbebf0205b9253a Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke at intevation.de>
+Date: Tue, 28 Jun 2016 10:47:38 +0200
+Subject: [PATCH 1/2] Fix UI Server startup
+
+* src/common.c (get_gpg4win_dir): Fix stupid logic error in loop.
+Fix mem leak on error.
+* src/engine-assuan.c (get_uiserver_name): Prefer 2.3.x names to
+prefer the kleowrapped / gpgwrapped exectuables.
+
+--
+Thanks to rpr who reported this on the gpg4win message board.
+---
+ src/common.c | 11 ++++++++---
+ src/engine-assuan.c | 6 +++---
+ 2 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/src/common.c b/src/common.c
+index b7b48b0..9b554b2 100644
+--- a/src/common.c
++++ b/src/common.c
+@@ -1245,10 +1245,10 @@ get_gpg4win_dir()
+ const char *g4win_keys[] = {GPG4WIN_REGKEY_3,
+ GPG4WIN_REGKEY_2,
+ NULL};
+- const char *key;
+- for (key = *g4win_keys; *key; key++)
++ const char **key;
++ for (key = g4win_keys; *key; key++)
+ {
+- char *tmp = read_w32_registry_string (NULL, key, "Install Directory");
++ char *tmp = read_w32_registry_string (NULL, *key, "Install Directory");
+ if (!tmp)
+ {
+ continue;
+@@ -1257,6 +1257,11 @@ get_gpg4win_dir()
+ {
+ return tmp;
+ }
++ else
++ {
++ log_debug ("Failed to access: %s\n", tmp);
++ xfree (tmp);
++ }
+ }
+ return NULL;
+ }
+diff --git a/src/engine-assuan.c b/src/engine-assuan.c
+index f2e0b09..32dbae8 100644
+--- a/src/engine-assuan.c
++++ b/src/engine-assuan.c
+@@ -348,10 +348,10 @@ get_uiserver_name (void)
+ char *dir, *uiserver, *p;
+ int extra_arglen = 9;
+
+- const char * server_names[] = {"bin\\kleopatra.exe",
+- "kleopatra.exe",
+- "bin\\gpa.exe",
++ const char * server_names[] = {"kleopatra.exe",
++ "bin\\kleopatra.exe",
+ "gpa.exe",
++ "bin\\gpa.exe",
+ NULL};
+ const char *tmp = NULL;
+
+--
+2.1.4
diff --git a/patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch b/patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch
new file mode 100755
index 0000000..5b65c40
--- /dev/null
+++ b/patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch
@@ -0,0 +1,39 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From 643575f38f545456afc456e1045b914d3d06bbb8 Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke at intevation.de>
+Date: Wed, 29 Jun 2016 17:17:48 +0200
+Subject: [PATCH 2/2] Ignore sent S/MIME Mails if S/MIME is disabled
+
+* src/mapihelp.cpp (mapi_change_message_class): Add check for
+S/MIME disabled.
+
+--
+Outlook sets sent Mails to IPM.Note.SMIME (without suffix). When
+S/MIME is disabled we need to ignore these messages. Our own
+messages that are marked as S/MIME messages on send even if they
+are PGP Messages have the override message class set so they are not
+affected by this.
+
+GnuPG-Bug-Id: 2319
+---
+ src/mapihelp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mapihelp.cpp b/src/mapihelp.cpp
+index 7d11364..e916209 100644
+--- a/src/mapihelp.cpp
++++ b/src/mapihelp.cpp
+@@ -1226,7 +1226,7 @@ mapi_change_message_class (LPMESSAGE message, int sync_override)
+ {
+ newvalue = change_message_class_ipm_note (message);
+ }
+- else if (!strcmp (s, "IPM.Note.SMIME"))
++ else if (opt.enable_smime && !strcmp (s, "IPM.Note.SMIME"))
+ {
+ newvalue = change_message_class_ipm_note_smime (message);
+ }
+--
+2.1.4
commit f0496ae849e3dc7c82965ba671fdd00f1f29fd9b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 4 15:05:31 2016 +0200
Add Norwegian Bokmål translation
* po/LINGUAS: Add no.
* po/no.po: New.
--
Thanks to Asbjørn Stokka <asstokka at online.no> who provided
this translation on gpg4win-devel at wald.intevation.org.
Slightly modified by Andre Heincke <aheinecke at intevation.de>
diff --git a/po/LINGUAS b/po/LINGUAS
index ab691e6..49a7c6d 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
# Set of available languages.
-de ar es fr ru pt cz it zh_CN zh_TW
+de ar es fr ru pt cz it zh_CN zh_TW no
diff --git a/po/no.po b/po/no.po
new file mode 100644
index 0000000..3bd45c3
--- /dev/null
+++ b/po/no.po
@@ -0,0 +1,398 @@
+# Portuguese translations for Gpg4win package.
+# Copyright (C) 2010 g10 Code GmbH
+# This file is distributed under the same license as the gpg4win package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gpg4win 1.1.1-svn417\n"
+"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
+"PO-Revision-Date: 2016-06-26 20:57+0200\n"
+"Last-Translator: Asbjørn Stokka <asstokka at online.no>\n"
+"Language-Team: Norsk <asstokka at online.no>\n"
+"Language: nb_NO\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=windows-1252\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.8\n"
+
+msgctxt "T_AlreadyRunning"
+msgid "An instance of this installer is already running."
+msgstr "En forekomst av denne installasjonen kjører allerede."
+
+msgctxt "T_WelcomeTitleGpg4win"
+msgid "Welcome to the installation of Gpg4win"
+msgstr "Velkommen til installasjon av Gpg4win"
+
+msgctxt "T_AboutGpg4win"
+msgid ""
+"Gpg4win is a installer package for Windows for EMail and file encryption "
+"using the core component GnuPG for Windows. Both relevant cryptography "
+"standards are supported, OpenPGP and S/MIME. Gpg4win and the software "
+"included with Gpg4win are Free Software."
+msgstr ""
+"Gpg4win er en installasjonspakke for Windows for Epost og filkryptering med "
+"bruk av GnuPG for Windows. Begge de to vanlige krypteringsstandardene er stø"
+"ttet, OpenPGP og S/MIME. Gpg4win og programvaren inkludert i Gpg4win er fri "
+"programvare."
+
+msgctxt "T_AboutGpg4winVersion"
+msgid "This is Gpg4win version ${VERSION}"
+msgstr "Dette er Gpg4win versjon ${VERSION}"
+
+msgctxt "T_AboutGpg4winFileVersion"
+msgid "file version ${PROD_VERSION}"
+msgstr "filversjon ${PROD_VERSION}"
+
+msgctxt "T_AboutGpg4winReleaseDate"
+msgid "release date ${_BUILD_ISODATE}"
+msgstr "utgivelsesdato ${_BUILD_ISODATE}"
+
+msgctxt "T_WelcomeTitleGpg4winSrc"
+msgid "Welcome to the installation of the Gpg4win sources"
+msgstr "Velkommen til installasjonen av Gpg4win kildekode"
+
+msgctxt "T_AboutGpg4winSrc"
+msgid ""
+"Gpg4win is a installer package for Windows for EMail and file encryption "
+"using the core component GnuPG for Windows. Both relevant cryptography "
+"standards are supported, OpenPGP and S/MIME. Gpg4win and the software "
+"included with Gpg4win are Free Software."
+msgstr ""
+"Gpg4win er en installasjonspakke for Windows for Epost og filkryptering med "
+"bruk av GnuPG for Windows. Begge de to vanlige krypteringsstandardene er stø"
+"ttet, OpenPGP og S/MIME. Gpg4win og programvaren inkludert i Gpg4win er fri "
+"programvare."
+
+msgctxt "T_AboutGpg4winSrcVersion"
+msgid "This is Gpg4win version ${VERSION}"
+msgstr "Dette er Gpg4win versjon ${VERSION}"
+
+msgctxt "T_AboutGpg4winSrcFileVersion"
+msgid "file version ${PROD_VERSION}"
+msgstr "filversjon ${PROD_VERSION}"
+
+msgctxt "T_AboutGpg4winSrcReleaseDate"
+msgid "release date ${_BUILD_ISODATE}"
+msgstr "utgivelsesdato ${_BUILD_ISODATE}"
+
+msgctxt "T_LangCode"
+msgid "en"
+msgstr "no"
+
+msgctxt "T_GPLHeader"
+msgid ""
+"This software is licensed under the terms of the GNU General Public License "
+"(GPL)."
+msgstr ""
+"Denne programvaren er lisensiert under vilkårene i GNU General Public "
+"License (GPL)"
+
+msgctxt "T_GPLShort"
+msgid ""
+"In short: You are allowed to run this software for any purpose. You may "
+"distribute it as long as you give the recipients the same rights you have "
+"received."
+msgstr ""
+"Kort fortalt: Du kan kjøre denne programvaren for all type bruk. Du kan dele "
+"den videre så lenge mottakerne får same rettighetene til den som du har fått."
+
+#, fuzzy
+msgctxt "T_RunKeyManager"
+msgid "Run the key manager"
+msgstr "Kjør Kleopatra nøkkelhåndteringsverktøy."
+
+msgctxt "T_MoreInfo"
+msgid "Click here for the project's homepage"
+msgstr "Trykk her for prosjektets hjemmeside"
+
+msgctxt "T_MoreInfoURL"
+msgid "http://www.gpg4win.org"
+msgstr "http://www.gpg4win.org"
+
+msgctxt "T_ShowReadme"
+msgid "Show the README file"
+msgstr "Vis README filen"
+
+msgctxt "T_NoKeyManager"
+msgid "No key manager has been installed, thus we can't run one now."
+msgstr ""
+"Ingen nøkkelhåndterer er installert, det er derfor ikkje mulig å kjøre en nå."
+
+msgctxt "DESC_Menu_manuals"
+msgid "Documentation"
+msgstr "Dokumentasjon"
+
+msgctxt "DESC_Menu_uninstall"
+msgid "Uninstall"
+msgstr "Avinstaller"
+
+msgctxt "DESC_Desktop_manuals"
+msgid "Gpg4win Documentation"
+msgstr "Gpg4win dokumentasjon"
+
+msgctxt "T_InstallOptions"
+msgid "Install Options"
+msgstr "Installasjonsvalg"
+
+msgctxt "T_InstallOptLinks"
+msgid "Start links"
+msgstr "Snarveier"
+
+msgctxt "T_InstOptLabelA"
+msgid "Please select where Gpg4win shall install links:"
+msgstr "Velg hvor Gpg4win skal lage snarveier"
+
+msgctxt "T_InstOptLabelB"
+msgid "(Only programs will be linked into the quick launch bar.)"
+msgstr "(Kun program vil få snarveier i hurtigstartslinjen)"
+
+msgctxt "T_InstOptFieldA"
+msgid "Start Menu"
+msgstr "Startmeny"
+
+msgctxt "T_InstOptFieldB"
+msgid "Desktop"
+msgstr "Skrivebord"
+
+msgctxt "T_InstOptFieldC"
+msgid "Quick Launch Bar"
+msgstr "Hurtigstartslinje"
+
+msgctxt "T_FoundExistingVersion"
+msgid ""
+"Version $R1 has already been installed.\n"
+"Do you want to overwrite it with version ${VERSION}?"
+msgstr ""
+"Versjon $R1 er allerede installert.\n"
+"Vil du overskrive med versjon ${VERSION}?"
+
+msgctxt "T_FoundExistingOldVersion"
+msgid ""
+"An old version $R1 has already been installed. It is strongly recommended "
+"to deinstall previous versions on major upgrades.\n"
+"Do you want to continue installing Gpg4win ${VERSION} anyway?"
+msgstr ""
+"En gammel versjon $R1 er allerede installert. Det er anbefalt å fjerne den fø"
+"r oppgradering til en vesentlig nyere versjon.\n"
+"Vil du installere Gpg4win ${VERSION} likevel?"
+
+#, fuzzy
+msgctxt "T_FoundExistingVersionB"
+msgid ""
+"A version of Gpg4Win has already been installed on the system. There will be "
+"no problem installing and thus overwriting this Version.\n"
+"\n"
+"Do you want to continue installing Gpg4win?"
+msgstr ""
+"En installasjon av GnuPT har blitt oppdaget. Dette kan forårsake problemer "
+"når det brukes sammen med Gpg4win.\n"
+"\n"
+"Vil du fortsette installasjonen av Gpg4win?"
+
+msgctxt "T_FoundOldSeeManual"
+msgid ""
+"Please see the Gpg4win user manual to learn how to migrate existing keys "
+"from other GnuPG based installations to Gpg4win."
+msgstr ""
+"Les Gpg4win brukerhåndboken for å lære hvordan en tar med eksisterende nø"
+"kler fra en annen GnuPG-basert installasjon til Gpg4win."
+
+msgctxt "T_FoundOldGnuPP"
+msgid ""
+"An old installation of GnuPP (GNU Privacy Project) has been been detected. "
+"That software is not maintained anymore and thus should be removed.\n"
+"\n"
+"Do you want to continue installing Gpg4win and take care of the old "
+"installation later?"
+msgstr ""
+"En gammel GnuPP (GNU Privacy prosjekt)-installasjon har blitt oppdaget. Den "
+"programvaren blir ikke lenger vedlikeholdt og bør derfor fjernes.\n"
+"\n"
+"Vil du fortsette installasjonen av Gpg4win og håndtere den gamle "
+"installasjonen senere?"
+
+msgctxt "T_FoundOldGnuPT"
+msgid ""
+"An installation of GnuPT has been been detected. This may cause problems "
+"when used along with Gpg4win.\n"
+"\n"
+"Do you want to continue installing Gpg4win?"
+msgstr ""
+"En installasjon av GnuPT har blitt oppdaget. Dette kan forårsake problemer "
+"når det brukes sammen med Gpg4win.\n"
+"\n"
+"Vil du fortsette installasjonen av Gpg4win?"
+
+msgctxt "T_FoundOldWinPTSF"
+msgid ""
+"An old installation of the Sourceforge hosted WinPT has been been detected. "
+"That software is not maintained anymore and should be removed.\n"
+"\n"
+"Do you want to continue installing Gpg4win and take care of the old "
+"installation later?"
+msgstr ""
+"En gammel installasjon av WinPT (fra Sourceforge) har blitt oppdaget. "
+"Programvaren blir ikke lenger vedlikeholdt og bør derfor fjernes.\n"
+"\n"
+"Vil du fortsette å installere Gpg4win og håndtere den gamle installasjonen "
+"senere?"
+
+msgctxt "T_FoundOldGnuPack"
+msgid ""
+"An installation of GnuPG-Pack has been been detected. You need to uninstall "
+"it before you can continue with Gpg4win installation.\n"
+"\n"
+"The installation will be aborted now!"
+msgstr ""
+"En installasjon av GnuPG-Pack har blitt oppdaget. Du må avinstallere denne fø"
+"r du kan fortsette med installasjonen av Gpg4win.\n"
+"\n"
+"Installasjonen avbrytes."
+
+msgctxt "T_BetaWarning"
+msgid ""
+"Note: This is a BETA version of Gpg4win.\n"
+"\n"
+"Beta versions are only intended for testing and shall not be used in a "
+"production environment."
+msgstr ""
+"NB: Dette er en BETA-versjon av Gpg4win.\n"
+"\n"
+"Beta versjons er beregnet på testmiljø og bør ikke brukes i produksjonsmiljø"
+"er."
+
+msgctxt "T_AdminNeeded"
+msgid ""
+"Warning: Administrator permissions required for a successful installation"
+msgstr ""
+"Advarsel: Administratorrettigheter kreves for å fullføre installasjonen"
+
+msgctxt "T_CloseOtherApps"
+msgid ""
+"Please make sure that other applications are not running. In particular you "
+"should close Outlook and all Explorer windows. Gpg4win will try to install "
+"anyway but a reboot will be required then."
+msgstr ""
+"Kontroller at det ikke kjøres andre programmer. Viktig at du lukker Outlook "
+"og alle Explorer-vinduer. Gpg4win vil prøve å installere uansett men en "
+"omstart vil da være nødvendig."
+
+msgctxt "T_ShuttingDownWinPT"
+msgid "Trying to shutdown a possible running instance of WinPT."
+msgstr "Avslutter mulig kjørende utgaver av WinPT"
+
+msgctxt "T_FoundOldClaws"
+msgid ""
+"An old version of Claws Mail was found in your Installation directory.\n"
+"Please note that Claws Mail is no longer bundled with Gpg4win and is now "
+"available as a standalone package.\n"
+"You should uninstall Claws Mail now, and if you wish to continue to use it, "
+"install an up-to-date version from:\n"
+"http://www.claws-mail.org/win32\n"
+"\n"
+"Uninstall Claws Mail from Gpg4win now?"
+msgstr ""
+"En gammel versjon av 'Claws Mail' ble funnet i installasjonsmappen.\n"
+"Merk at 'Claws Mail' ikke lenger er sammen med Gpg4win og nå er tilgjengelig "
+"som en frittstående pakke.\n"
+"Du bør avinstallere 'Claws Mail' nå, og hvis du vil fortsette å bruke det, "
+"installere en oppdatert versjon fra: http://www.claws-mail.org/win32 Vil du "
+"avinstallere 'Claws Mail' fra Gpg4win nå?"
+
+#, fuzzy
+msgctxt "DESC_SEC_gnupg2"
+msgid "GNU Privacy Guard"
+msgstr "GNU Privacy Guard"
+
+msgctxt "DESC_SEC_gpa"
+msgid "GNU Privacy Assistant"
+msgstr "GNU Privacy Assistant"
+
+msgctxt "DESC_Menu_gpa"
+msgid "Run the GNU Privacy Assistant key management tool."
+msgstr "Kjør GNU Privacy Assistant nøkkelhåndteringsverktøyet"
+
+msgctxt "DESC_Menu_gpg4win_readme"
+msgid "General information on Gpg4win"
+msgstr "Generell informasjon om Gpg4win"
+
+msgctxt "DESC_Menu_gpg4win_howtosmime"
+msgid "Instruction to configure S/MIME"
+msgstr "Instruksjoner for å sette oppp S/MIME"
+
+msgctxt "DESC_Menu_gnupg_faq"
+msgid "Show the Frequently Asked Questions document for GnuPG"
+msgstr "Vis dokument med vanlige spørsmål om GnuPG"
+
+msgctxt "T_GpgEX_RegFailed"
+msgid "Warning: Registration of the GpgEX plugin failed."
+msgstr "Advarsel: Registrering av GpgEX tillegg feilet."
+
+msgctxt "DESC_SEC_gpgex"
+msgid "GnuPG Shell Extension"
+msgstr "GnuPG skallutvidelse"
+
+msgctxt "T_GpgOL_RegFailed"
+msgid "Warning: Registration of the GpgOL Outlook pluginfailed."
+msgstr "Advarsel: Registrering av GpgOL Outlook tillegg feilet."
+
+msgctxt "DESC_SEC_gpgol"
+msgid "GnuPG for Outlook"
+msgstr "GnuPG for Outlook"
+
+msgctxt "DESC_SEC_kleopatra"
+msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
+msgstr "Nøkkelhåndterer for OpenPGP og X.509 og vanlige krypto dialoger."
+
+msgctxt "DESC_Menu_kleopatra"
+msgid "Run the Kleopatra key management tool."
+msgstr "Kjør Kleopatra nøkkelhåndteringsverktøy."
+
+msgctxt "DESC_Name_compendium"
+msgid "Gpg4win Compendium"
+msgstr "Gpg4win Compendium"
+
+msgctxt "DESC_SEC_compendium"
+msgid "The Gpg4win documentation (English and German)"
+msgstr "Gpg4win dokumentasjon (Engelsk og Tysk)"
+
+msgctxt "DESC_Name_compendium_de_pdf"
+msgid "Gpg4win Compendium (pdf, German)"
+msgstr "Gpg4win Compendium (pdf, Tysk)"
+
+msgctxt "DESC_Name_compendium_en_pdf"
+msgid "Gpg4win Compendium (pdf, English)"
+msgstr "Gpg4win Compendium (pdf, Engelsk)"
+
+msgctxt "DESC_Name_compendium_de_html"
+msgid "Gpg4win Compendium (html, German)"
+msgstr "Gpg4win Compendium (html, Tysk)"
+
+msgctxt "DESC_Name_compendium_en_html"
+msgid "Gpg4win Compendium (html, English)"
+msgstr "Gpg4win Compendium (html, Engelsk)"
+
+msgctxt "DESC_Menu_compendium_de_pdf"
+msgid "Show the Gpg4win Compendium (pdf, German)"
+msgstr "Vis Gpg4win Compendium (pdf, Tysk)"
+
+msgctxt "DESC_Menu_compendium_en_pdf"
+msgid "Show the Gpg4win Compendium (pdf, English)"
+msgstr "Vis Gpg4win Compendium (pdf, Engelsk)"
+
+#~ msgctxt "T_RunKleopatra"
+#~ msgid "Run Kleopatra"
+#~ msgstr "Kjør Kleopatra"
+
+#~ msgctxt "T_RunGPA"
+#~ msgid "Run GPA"
+#~ msgstr "Kjør GPA"
+
+#~ msgctxt "T_UninstallingOldVersion"
+#~ msgid "Uninstalling Gpg4win-"
+#~ msgstr "Avinstallerer Gpg4win-"
+
+#~ msgctxt "T_Installing_GnuPG"
+#~ msgid "Installing GnuPG"
+#~ msgstr "Installerer GnuPG"
commit feae40c5ae88de491a3ba99fc8f5b31b779d9988
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 4 14:48:21 2016 +0200
Bump version
* configure.ac: Bump version to 2.3.2
--
Should have been done after the last release.
diff --git a/configure.ac b/configure.ac
index 015be8d..5955b93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ min_automake_version="1.9.3"
# (git tag -s gpg4win-2.x.y) 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([my_version], [2.3.1])
+m4_define([my_version], [2.3.2])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit 481217aa820e7ff7a0b44830340fa4f275158c38
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 4 13:44:41 2016 +0200
Make gnupg-2.0.x patches version independent
* patches/gnupg2-2.0.29: Move to gnupg2 patches.
* Makfile.am (EXTRA_DIST): Update accordingly.
--
Forgetting to update the patches directory led to regressions
with gpg4win 2.3.1 and it is unlikely that the patches
will be applied to a gnupg-2.0.x release. They are upstream
in 2.1.x.
diff --git a/Makefile.am b/Makefile.am
index 741f0ec..85a75c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,10 +29,10 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
build-aux/git-log-footer build-aux/git-log-fix \
patches/dirmngr-1.1.1/dirmngr-pth.patch \
patches/glib-2.41.5/01-socket.patch \
- patches/gnupg2-2.0.29/0001-Enable-wildcard-expansion-with-mingw-w64.patch \
- patches/gnupg2-2.0.29/0002-Let-wchar_to_native-convert-to-console-codepage.patch \
- patches/gnupg2-2.0.29/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch \
- patches/gnupg2-2.0.29/0006-gpgsm-Add-command-option-offline.patch \
+ patches/gnupg2/0001-Enable-wildcard-expansion-with-mingw-w64.patch \
+ patches/gnupg2/0002-Let-wchar_to_native-convert-to-console-codepage.patch \
+ patches/gnupg2/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch \
+ patches/gnupg2/0006-gpgsm-Add-command-option-offline.patch \
patches/gnupg2/01-version.patch \
patches/gnupg2/01-version.patch.in \
patches/gnutls-2.12.23/01-openssl-wincrypt.patch \
diff --git a/patches/gnupg2-2.0.29/0001-Enable-wildcard-expansion-with-mingw-w64.patch b/patches/gnupg2/0001-Enable-wildcard-expansion-with-mingw-w64.patch
similarity index 100%
rename from patches/gnupg2-2.0.29/0001-Enable-wildcard-expansion-with-mingw-w64.patch
rename to patches/gnupg2/0001-Enable-wildcard-expansion-with-mingw-w64.patch
diff --git a/patches/gnupg2-2.0.29/0002-Let-wchar_to_native-convert-to-console-codepage.patch b/patches/gnupg2/0002-Let-wchar_to_native-convert-to-console-codepage.patch
similarity index 100%
rename from patches/gnupg2-2.0.29/0002-Let-wchar_to_native-convert-to-console-codepage.patch
rename to patches/gnupg2/0002-Let-wchar_to_native-convert-to-console-codepage.patch
diff --git a/patches/gnupg2-2.0.29/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch b/patches/gnupg2/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch
similarity index 100%
rename from patches/gnupg2-2.0.29/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch
rename to patches/gnupg2/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch
diff --git a/patches/gnupg2-2.0.29/0006-gpgsm-Add-command-option-offline.patch b/patches/gnupg2/0006-gpgsm-Add-command-option-offline.patch
similarity index 100%
rename from patches/gnupg2-2.0.29/0006-gpgsm-Add-command-option-offline.patch
rename to patches/gnupg2/0006-gpgsm-Add-command-option-offline.patch
commit 827fb6e5172f11b333c38782150cbf6b4733d5e4
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Jul 4 13:40:54 2016 +0200
Update libksba and gpg-error
* packages/packages.current (libksba, libgpg-error): Update.
diff --git a/packages/packages.current b/packages/packages.current
index 4159798..3e3e8a0 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -46,7 +46,7 @@ chk bc2936cd20267859278145e563427c274d27aaae30ecdf50a04cdd4ec0153d54
server ftp://ftp.gnutls.org/gcrypt
-# checked: 2014-06-20 ah
+# checked: 2016-07-04 ah
# verified with key 1F42 4189 05D8 206A A754 CCDC 29EE 58B9 9686 5171
file gnutls/v2.12/gnutls-2.12.23.tar.bz2
chk dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2
@@ -303,20 +303,20 @@ chk c2a9b3aec1a38d34b66106116a39f64b01d84f475fef75c40ea0bda0ea67ed07
# D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
server ftp://ftp.gnupg.org/gcrypt
-# last-changed: 2016-03-31
-# by: jochen
-file libgpg-error/libgpg-error-1.20.tar.bz2
-chk 3266895ce3419a7fb093e63e95e2ee3056c481a9bc0d6df694cfd26f74e72522
+# last-changed: 2016-07-04
+# by: ah
+file libgpg-error/libgpg-error-1.23.tar.bz2
+chk 7f0c7f65b98c4048f649bfeebfa4d4c1559707492962504592b985634c939eaa
# last changed: 2016-03-30
# by: ah
file libgcrypt/libgcrypt-1.6.5.tar.bz2
chk f49ebc5842d455ae7019def33eb5a014a0f07a2a8353dc3aa50a76fd1dafa924
-# last-changed: 2015-06-05
+# last-changed: 2016-07-04
# by: ah
-file libksba/libksba-1.3.3.tar.bz2
-chk 0c7f5ffe34d0414f6951d9880a46fcc2985c487f7c36369b9f11ad41131c7786
+file libksba/libksba-1.3.4.tar.bz2
+chk f6c2883cebec5608692d8730843d87f237c0964d923bbe7aa89c05f20558ad4f
# last-changed: 2015-12-11
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 13 +-
NEWS | 28 +++
configure.ac | 2 +-
doc/README.de.txt | 16 +-
doc/README.en.txt | 13 +-
packages/packages.current | 16 +-
...-Enable-wildcard-expansion-with-mingw-w64.patch | 0
...har_to_native-convert-to-console-codepage.patch | 0
...x-gpgtar-8-bit-encoding-handling-on-Win32.patch | 0
.../0006-gpgsm-Add-command-option-offline.patch | 0
...01-Prefer-kleowrapped-gpgwrapped-binaries.patch | 43 ++++
.../gpgol-1.4.0/0001-Fix-UI-Server-startup.patch | 71 ++++++
...e-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch | 39 ++++
po/LINGUAS | 2 +-
po/{zh_TW.po => no.po} | 246 ++++++++++++---------
po/pt.po | 15 +-
po/zh_CN.po | 49 ++--
po/zh_TW.po | 49 ++--
18 files changed, 412 insertions(+), 190 deletions(-)
rename patches/{gnupg2-2.0.29 => gnupg2}/0001-Enable-wildcard-expansion-with-mingw-w64.patch (100%)
rename patches/{gnupg2-2.0.29 => gnupg2}/0002-Let-wchar_to_native-convert-to-console-codepage.patch (100%)
rename patches/{gnupg2-2.0.29 => gnupg2}/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch (100%)
rename patches/{gnupg2-2.0.29 => gnupg2}/0006-gpgsm-Add-command-option-offline.patch (100%)
create mode 100755 patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch
create mode 100755 patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch
create mode 100755 patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch
copy po/{zh_TW.po => no.po} (53%)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list