[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.2-15-gd7b28ca

by Andre Heinecke cvs at cvs.gnupg.org
Fri Jan 12 13:07:30 CET 2018


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, master has been updated
       via  d7b28ca4d64e5c5fa342eb6c318b3c2b9d7e6bf8 (commit)
       via  a2ed9d1803fced3cd9d0708af43a5bf1227d0fc0 (commit)
       via  28c5f22ad81a045198060c4ecc5ea637be3bcb8b (commit)
       via  d80fc0c3455749e4e755c67e9cd59fc98e838290 (commit)
       via  77c454a716473ff6c0911b129f91d54f597de7a8 (commit)
      from  4621700704c77be60e449f04e9391f74296fec6d (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 d7b28ca4d64e5c5fa342eb6c318b3c2b9d7e6bf8
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jan 12 13:07:17 2018 +0100

    Post release version bump
    
    --

diff --git a/NEWS b/NEWS
index 28c824b..240f5c3 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,19 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
+Noteworthy changes in Version 3.1.0 (unreleased)
+------------------------------------------------
+
+~~~~~~~~~~~~~~~
+GnuPG:          2.2.4
+Kleopatra:      3.0.2
+GPA:            0.9.10
+GpgOL:          2.0.6
+GpgEX:          1.0.5
+Kompendium DE:  4.0.0
+Compendium EN:  3.0.0
+~~~~~~~~~~~~~~~
+
 Noteworthy changes in Version 3.0.3 (2018-01-12)
 ------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 7c1b68b..b7271c1 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], [3.0.3])
+m4_define([my_version], [3.1.0])
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a

commit a2ed9d1803fced3cd9d0708af43a5bf1227d0fc0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jan 12 12:52:41 2018 +0100

    Update NEWS and READMEs
    
    --

diff --git a/NEWS b/NEWS
index 901e73e..28c824b 100644
--- a/NEWS
+++ b/NEWS
@@ -3,20 +3,94 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
-Noteworthy changes in Version 3.0.3 (unreleased)
+Noteworthy changes in Version 3.0.3 (2018-01-12)
 ------------------------------------------------
 
+(en) GnuPG: Updated to 2.2.4.
+
+(de) GnuPG: Auf Version 2.2.4 aktualisiert.
+
+(en) GpgOL: A bug that caused drafted mails not to encrypt the correct
+     content has been fixed. (T3419)
+
+(de) GpgOL: Ein Fehler der dazu führte das als Entwurf gespeicherte Mails
+     nicht mit dem korrekten Inhalt verschlüsselt wurden ist behoben. (T3419)
+
+(en) GpgOL: A bug that caused encrypted mails not to be displayed has been
+     fixed. (T3537)
+
+(de) GpgOL: Ein Fehler der dazu führen konnte das verschlüsselte Mails nicht
+     angezeigt wurden ist nun behoben. (T3537)
+
+(en) GpgOL: A bug that caused sending unencrypted mails when Outlooks internal
+     S/MIME code was activated has been fixed. (T3656)
+
+(de) GpgOL: Ein Fehler der dazu führen konnte das unverschlüsselte Mails
+     versendet wurden wenn Outlooks interner S/MIME code aktiviert wurde ist
+     behoben. (T3656)
+
+(en) GpgOL: PGP/Inline (no-mime) sending is now compatible with
+     Microsoft Exchange Online. (T3662)
+
+(de) GpgOL: PGP/Inline (no-mime) mailversand ist nun mit Microsoft
+     Exchange Online kompatibel. (T3662)
+
+(en) GpgOL: The recipient lookup for Exchange addresses has been
+     improved.
+
+(de) GpgOL: Die Suche nach Empfänger Mail Adressen in Exchange
+     Addressbüchern wurde verbessert.
+
+(en) GpgOL: Signatures of signed only mails with attachments have been
+     fixed. (T3735)
+
+(de) GpgOL: Signaturen von unverschlüsselten Mails mit Anhängen wurden
+     korrigiert. (T3735)
+
+(en) GpgEX: An internal error when trying to verify a non-signature file
+     has been fixed. (T3658)
+
+(de) GpgEX: Ein interner Fehler wenn man eine nicht Signaturdatei verifizierte,
+     wurde behoben. (T3658)
+
+(en) Kleopatra: Sorting in Keylist has been fixed. (T3603)
+
+(de) Kleopatra: Sortierung in der Schlüsselliste wurde korrigiert. (T3603)
+
+(en) Kleopatra: Certificate details for S/MIME certificates have been improved.
+     (T3611, T3727, T3726)
+
+(de) Kleopatra: Zertifikatsdetails für S/MIME Zertifikate wurden verbessert.
+     (T3611, T3727, T3726)
+
+(en) Kleopatra: Certificates can now be exported as text from the certificate
+     details. (T3605)
+
+(de) Kleopatra: Zertifikate können nun als Text aus den Zertifikatsdetails
+     exportiert werden. (T3605)
+
+(en) Kleopatra: The usage of the temp directory to buffer decrypted data is now
+     configurable. (T3602)
+
+(de) Kleopatra: Die Verwendung des temporären Verzeichnises beim entschlüsseln
+     von Daten ist nun konfigurierbar. (T3602)
+
+(en) Installer: The installer no longer reinstalls desktop shortcuts on
+     upgrade. (T3729)
+
+(de) Installer: Der installer legt nun keine neuen Desktopverknüpfungen
+     bei updates an. (T3729)
+
 ~~~~~~~~~~~~~~~
 GnuPG:          2.2.4
 Kleopatra:      3.0.2
-GPA:            0.9.9
-GpgOL:          2.0.5
+GPA:            0.9.10
+GpgOL:          2.0.6
 GpgEX:          1.0.5
 Kompendium DE:  4.0.0
 Compendium EN:  3.0.0
 ~~~~~~~~~~~~~~~
 
-
 Noteworthy changes in Version 3.0.2 (2017-12-08)
 ------------------------------------------------
 
diff --git a/doc/README.de.txt b/doc/README.de.txt
index c8a61bc..34cf039 100644
--- a/doc/README.de.txt
+++ b/doc/README.de.txt
@@ -64,61 +64,43 @@ Die integrierten Gpg4win-Komponenten in Version !VERSION! sind:
 Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
 -----------------------------------------
 
-- GnuPG: Zwei Probleme wurden behoben welche zu einer
-  Blockade des GnuPG Systems führen konnten. (T3378)
+- GnuPG: Auf Version 2.2.4 aktualisiert.
 
-- GpgOL: Weitere augenscheinlich zufällige Abstürze von Outlook
-  wurden beseitigt. (T3484)
+- GpgOL: Ein Fehler der dazu führte das als Entwurf gespeicherte Mails
+  nicht mit dem korrekten Inhalt verschlüsselt wurden ist behoben. (T3419)
 
-- GpgOL: Outlook wird nicht mehr blockiert wenn viele Mails
-  gleichzeitig ausgewählt werden. (T3433)
+- GpgOL: Ein Fehler der dazu führen konnte das verschlüsselte Mails nicht
+  angezeigt wurden ist nun behoben. (T3537)
 
-- GpgOL: Konten die mit dem G Suite Sync Plugin eingerichtet wurden
-  werden nun erkannt. Mit diesen Konten werden bisher nur
-  reine ("No-MIME") verschlüsselte PGP Textnachrichten, ohne
-  Anhänge, unterstützt.
-  Das senden von signierten Nachrichten wird nicht unterstützt.
-  Lesen von Krypto Mails ist vollständig unterstützt. (T3545)
+- GpgOL: Ein Fehler der dazu führen konnte das unverschlüsselte Mails
+  versendet wurden wenn Outlooks interner S/MIME code aktiviert wurde ist
+  behoben. (T3656)
 
-- GpgOL: Die Option "No-MIME" verschlüsselte,
-  unsignierte Textnachrichten, ohne Anhänge zu versenden funktioniert
-  wieder (T3514)
+- GpgOL: PGP/Inline (no-mime) mailversand ist nun mit Microsoft
+  Exchange Online kompatibel. (T3662)
 
-- GpgOL: Die Verarbeitung und Fehlerbehandlung von signierten,
-  unverschlüsselten Mails wurde verbessert.
+- GpgOL: Die Suche nach Empfänger Mail Adressen in Exchange
+  Addressbüchern wurde verbessert.
 
-- GpgOL: Verschiedene Geschwindigkeits- und
-  Leistungs-Verbesserungen.
+- GpgOL: Signaturen von unverschlüsselten Mails mit Anhängen wurden
+  korrigiert. (T3735)
 
-- GpgOL: Verbesserte Erkennung von großen PGP/MIME Nachrichten und
-  MS-TNEF Nachrichten. (T3419 , T3542)
+- GpgEX: Ein interner Fehler wenn man eine nicht Signaturdatei verifizierte,
+  wurde behoben. (T3658)
 
-- Kleopatra: Das Passwort Eingabefeld öffnet sich nicht mehr
-  teilweise im Hintergrund. (T3460)
+- Kleopatra: Sortierung in der Schlüsselliste wurde korrigiert. (T3603)
 
-- Kleopatra: Das entschlüsseln von Archiven über Partitionsgrenzen
-  hinweg funktioniert nun. (T3547)
+- Kleopatra: Zertifikatsdetails für S/MIME Zertifikate wurden verbessert.
+  (T3611, T3727, T3726)
 
-- Kleopatra: Ein möglicher Absturz in der GpgOL Zertifikatsauswahl
-  wurde behoben. (T3544)
+- Kleopatra: Zertifikate können nun als Text aus den Zertifikatsdetails
+  exportiert werden. (T3605)
 
-- Kleopatra: Die Vorauswahl von verschlüsseln / signieren mit GpgEX
-  funktioniert erneut. (T3543)
+- Kleopatra: Die Verwendung des temporären Verzeichnises beim entschlüsseln
+  von Daten ist nun konfigurierbar. (T3602)
 
-- Kleopatra: Web Key Directories werden nun bei der
-  Dateiverschlüsselung unterstützt. (T3548)
-
-- Kleopatra: Ein Absturz bei der Schlüsselsuche auf einem LDAP
-  Schlüsselserver wurde behoben. (T3550)
-
-- Kleopatra: Ein Absturz wenn die Schlüsselerstellung abgebrochen
-  wurde ist behoben. (T3577)
-
-- Kleopatra: Beglaubigungen können nun wieder aus den Zertifikatsdetails
-  heraus angezeigt werden. (T3579)
-
-- Kleopatra: Es ist nun möglich Zertifikate öffentlich zu beglaubigen
-  auch wenn dieses bereits lokal signiert wurde. (T1649)
+- Installer: Der installer legt nun keine neuen Desktopverknüpfungen
+  bei updates an. (T3729)
 
 
 3. Anmerkungen
diff --git a/doc/README.en.txt b/doc/README.en.txt
index 18460c4..5e9282a 100644
--- a/doc/README.en.txt
+++ b/doc/README.en.txt
@@ -63,55 +63,42 @@ Included Gpg4win components in version !VERSION! are:
 New in Gpg4win version !VERSION! (!BUILD_ISODATE!)
 -----------------------------------------
 
-- GnuPG: Two issues have been fixed that could block
-  the GnuPG system. (T3378)
+- GnuPG: Updated to 2.2.4.
 
-- GpgOL: More possible "random" crashes caused by
-  GpgOL have been fixed. (T3484)
+- GpgOL: A bug that caused drafted mails not to encrypt the correct
+  content has been fixed. (T3419)
 
-- GpgOL: Outlook is no longer blocked when selecting many mails.
-  (T3433)
+- GpgOL: A bug that caused encrypted mails not to be displayed has been
+  fixed. (T3537)
 
-- GpgOL: G Suite Sync plugin accounts are now detected. Only sending
-  No-MIME PGP/Messages (without attachments) and unsigned
-  messages are supported. Reading crypto mail is fully supported.
-  (T3545)
+- GpgOL: A bug that caused sending unencrypted mails when Outlooks internal
+  S/MIME code was activated has been fixed. (T3656)
 
-- GpgOL: The option to send "No-MIME" (inline) PGP encrypted,
-  unsigned text messages without attachments works again. (T3514)
+- GpgOL: PGP/Inline (no-mime) sending is now compatible with
+  Microsoft Exchange Online. (T3662)
 
-- GpgOL: Improved error handling for signed, unencrypted mails.
-  (T3538)
+- GpgOL: The recipient lookup for Exchange addresses has been
+  improved.
 
-- GpgOL: Several performance improvements.
+- GpgOL: Signatures of signed only mails with attachments have been
+  fixed. (T3735)
 
-- GpgOL: Improved detection of large PGP/MIME messages and
-  MS-TNEF crypto messages. (T3419 , T3542)
+- GpgEX: An internal error when trying to verify a non-signature file
+  has been fixed. (T3658)
 
-- Kleopatra: Passphrase entry is no longer opened behind Kleopatra
-  windows. (T3460)
+- Kleopatra: Sorting in Keylist has been fixed. (T3603)
 
-- Kleopatra: Decrypting archives across partitions has been fixed.
-  (T3547)
+- Kleopatra: Certificate details for S/MIME certificates have been improved.
+  (T3611, T3727, T3726)
 
-- Kleopatra: Fixed possible crash in GpgOL certificate selection.
-  (T3544)
+- Kleopatra: Certificates can now be exported as text from the certificate
+  details. (T3605)
 
-- Kleopatra: Preselection of encrypt / sign file actions from GpgEX
-  works again. (T3543)
+- Kleopatra: The usage of the temp directory to buffer decrypted data is now
+  configurable. (T3602)
 
-- Kleopatra: Added Web Key Directory lookup support in file
-  encryption dialog. (T3548)
-
-- Kleopatra: Fixed crash when searching in LDAP. (T3550)
-
-- Kleopatra: Fixed crash when aborting key generation. (T3577)
-
-- Kleopatra: Certifications are accessible again from the certificate
-  details view. (T3579)
-
-- Kleopatra: It is now possible to publicly certify an already locally
-  signed certificate. (T1649)
+- Installer: The installer no longer reinstalls desktop shortcuts on
+  upgrade. (T3729)
 
 
 3. Additional notes

commit 28c5f22ad81a045198060c4ecc5ea637be3bcb8b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jan 12 10:57:33 2018 +0100

    Update Kleopatra and GpgOL
    
    --

diff --git a/packages/packages.current b/packages/packages.current
index 62644de..d317f3e 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -235,16 +235,16 @@ chk  1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c
 #
 server http://files.gpg4win.org/src
 
-# last-changed: 2017-12-08
+# last-changed: 2018-01-12
 # by: ah
 # verified: Sig 5B80 C575 4298 F0CB  55D8 ED6A BCEF 7E29 4B09 2E28
-#file gpgol/gpgol-2.0.5.tar.bz2
-#chk  8fa5d4d13edfb344ec75a0e9dce3e633e6ce81e92cd388b73e2d34a14c78d46e
+file gpgol/gpgol-2.0.6.tar.bz2
+chk  6cb06f7c79f40d94c4b9da7123971e62767180a2f8d1ec99e7eacc3f241238a5
 
 # for beta
-server http://files.gpg4win.org/Beta/gpgol
-file 2.0.6-beta9/gpgol-2.0.6-beta9.tar.bz2
-chk 1e956632633a708da46bdd932d34f76350c001d3b857efd75ccc55a0b7a28fb7
+#server http://files.gpg4win.org/Beta/gpgol
+#file 2.0.6-beta9/gpgol-2.0.6-beta9.tar.bz2
+#chk 1e956632633a708da46bdd932d34f76350c001d3b857efd75ccc55a0b7a28fb7
 #
 # GpgEX
 #
@@ -547,5 +547,5 @@ chk 4e6993d5a28de4f4338d96de0edb5d7cb9243976d647162d0539b021a853bafb
 # last changed: see package date.
 # by: ah
 # verified: Tarball created by ah.
-file kleopatra/kleopatra-201801110728.tar.gz
-chk b0ce499479d058fe92d497d33e9908c55fe3721797e5218caacdfddd42a146b4
+file kleopatra/kleopatra-201801121054.tar.gz
+chk 5b82c0bbb87b558e6d66a729eca8a5170af2c9787a528fe187a64cacd1d180b1

commit d80fc0c3455749e4e755c67e9cd59fc98e838290
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Jan 12 10:55:51 2018 +0100

    Potential fixes for directory race conds
    
    * src/inst-gpg4win: Fix readme zh* install.
    SetOutPath after sha1sum again to work with repeated tries.
    * src/uninsg-gpg4win.nsi: Try delete bin and bin_64.

diff --git a/src/inst-gpg4win.nsi b/src/inst-gpg4win.nsi
index e7a8da9..fa10498 100644
--- a/src/inst-gpg4win.nsi
+++ b/src/inst-gpg4win.nsi
@@ -54,6 +54,7 @@ Section "-gpg4win" SEC_gpg4win
   StrCpy $is_update "1"
   Delete /REBOOTOK "$1\gpg4win-uninstall.exe"
   RmDir "$1"
+  SetOutPath "$INSTDIR\share\gpg4win"
 
 skip_uninst:
   SetOutPath "$INSTDIR\share\gpg4win"
@@ -68,8 +69,8 @@ skip_uninst:
   File /oname=README.no.txt "${BUILD_DIR}/README.en.txt"
   File /oname=README.pt.txt "${BUILD_DIR}/README.en.txt"
   File /oname=README.ru.txt "${BUILD_DIR}/README.en.txt"
-  File /oname=README.zh_CN.po "${BUILD_DIR}/README.en.txt"
-  File /oname=README.zh_TW.po "${BUILD_DIR}/README.en.txt"
+  File /oname=README.zh_CN.txt "${BUILD_DIR}/README.en.txt"
+  File /oname=README.zh_TW.txt "${BUILD_DIR}/README.en.txt"
 
   File "${BUILD_DIR}/HOWTO-SMIME.en.txt"
   File "${BUILD_DIR}/HOWTO-SMIME.de.txt"
@@ -109,6 +110,7 @@ skip_uninst:
   # Install gpg4win included tools
   SetOutPath "$INSTDIR\bin"
   File "${BUILD_DIR}/sha1sum.exe"
+  SetOutPath "$INSTDIR\bin"
   File "${BUILD_DIR}/sha256sum.exe"
   File "${BUILD_DIR}/md5sum.exe"
   File "${BUILD_DIR}/mkportable.exe"
diff --git a/src/uninst-gpg4win.nsi b/src/uninst-gpg4win.nsi
index 51ce89f..73636c0 100644
--- a/src/uninst-gpg4win.nsi
+++ b/src/uninst-gpg4win.nsi
@@ -136,6 +136,8 @@ Section "-un.gpg4win"
   RMDir "$INSTDIR\share"
   RMDir "$INSTDIR\pub"
   RMDir "$INSTDIR\etc"
+  RMDir "$INSTDIR\bin"
+  RMDir "$INSTDIR\bin_64"
   RMDir "$INSTDIR"
 
 !endif

commit 77c454a716473ff6c0911b129f91d54f597de7a8
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Jan 11 09:16:43 2018 +0100

    Delete obsolete gpgol patch
    
    --

diff --git a/Makefile.am b/Makefile.am
index 526fc67..548e0f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,8 +52,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch \
         patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch \
         patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
-        patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch \
-        patches/gpgol-2.0.5/0001-Fix-g-sync-account-warning.patch
+        patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch
 
 
 copy-news:
diff --git a/patches/gpgol-2.0.5/0001-Fix-g-sync-account-warning.patch b/patches/gpgol-2.0.5/0001-Fix-g-sync-account-warning.patch
deleted file mode 100755
index 8082109..0000000
--- a/patches/gpgol-2.0.5/0001-Fix-g-sync-account-warning.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From c574893790b041dca19b8fe6fd45fe10b0b8b58e Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Fri, 8 Dec 2017 10:21:35 +0100
-Subject: [PATCH] Fix g sync account warning
-
-* src/mail.cpp (Mail::encrypt_sign): Handle encoding
-(Mail::Mail): Initialize check correctly.
----
- src/mail.cpp | 47 +++++++++++++++++++++++++++++++++--------------
- 1 file changed, 33 insertions(+), 14 deletions(-)
-
-diff --git a/src/mail.cpp b/src/mail.cpp
-index dd58f6d..be7be31 100644
---- a/src/mail.cpp
-+++ b/src/mail.cpp
-@@ -130,7 +130,9 @@ Mail::Mail (LPDISPATCH mailitem) :
-     m_needs_encrypt(false),
-     m_moss_position(0),
-     m_crypto_flags(0),
--    m_type(MSGTYPE_UNKNOWN)
-+    m_type(MSGTYPE_UNKNOWN),
-+    m_do_inline(false),
-+    m_is_gsuite(false)
- {
-   if (get_mail_for_item (mailitem))
-     {
-@@ -995,46 +997,63 @@ Mail::encrypt_sign ()
-       int n_att_usable = count_usable_attachments (att_table);
-       mapi_release_attach_table (att_table);
-       /* Check for attachments if we have some abort. */
-+
-+      wchar_t *w_title = utf8_to_wchar (_(
-+                              "GpgOL: Oops, G Suite Sync account detected"));
-       if (n_att_usable)
-         {
--          MessageBox (window,
-+          wchar_t *msg = utf8_to_wchar (
-                       _("G Suite Sync breaks outgoing crypto mails "
-                         "with attachments.\nUsing crypto and attachments "
-                         "with G Suite Sync is not supported.\n\n"
--                        "See: https://dev.gnupg.org/T3545 for details."),
--                      _("GpgOL: Oops, G Suite Sync account detected"),
--                      MB_ICONINFORMATION|MB_OK);
-+                        "See: https://dev.gnupg.org/T3545 for details."));
-+          MessageBoxW (window,
-+                       msg,
-+                       w_title,
-+                       MB_ICONINFORMATION|MB_OK);
-+          xfree (msg);
-+          xfree (w_title);
-           return -1;
-         }
-       if (flags == 2)
-         {
--          MessageBox (window,
--                      _("G Suite Sync breaks outgoing signed mails.\n"
-+          wchar_t *msg = utf8_to_wchar (
-+                       _("G Suite Sync breaks outgoing signed mails.\n"
-                         "Ensuring mail integrity (signing) with G Suite Sync "
-                         "is not supported.\n\n"
--                        "See: https://dev.gnupg.org/T3545 for details."),
--                      _("GpgOL: Oops, G Suite Sync account detected"),
--                      MB_ICONINFORMATION|MB_OK);
-+                        "See: https://dev.gnupg.org/T3545 for details."));
-+          MessageBoxW (window,
-+                       msg,
-+                       w_title,
-+                       MB_ICONINFORMATION|MB_OK);
-+          xfree (msg);
-+          xfree (w_title);
-           return -1;
-         }
-       if (flags == 3)
-         {
--          if(MessageBox (window,
-+          wchar_t *msg = utf8_to_wchar (
-                         _("G Suite Sync breaks outgoing signed mails.\n"
-                           "Ensuring mail integrity (signing) with G Suite Sync "
-                           "is not supported.\n\n"
-                           "See: https://dev.gnupg.org/T3545 for details.\n\n"
--                          "Do you want to only encrypt the message?"),
--                        _("GpgOL: Oops, G Suite Sync account detected"),
--                        MB_ICONINFORMATION|MB_YESNO) != IDYES)
-+                          "Do you want to only encrypt the message?"));
-+          if(MessageBoxW (window,
-+                          msg,
-+                          w_title,
-+                          MB_ICONINFORMATION|MB_YESNO) != IDYES)
-             {
-+              xfree (msg);
-+              xfree (w_title);
-               return -1;
-             }
-           else
-             {
-               flags = 1;
-             }
-+          xfree (msg);
-         }
-+      xfree (w_title);
-     }
-
-   m_do_inline = m_is_gsuite ? true : opt.inline_pgp;
---
-2.11.0

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                                        |   3 +-
 NEWS                                               |  93 +++++++++++++++++-
 configure.ac                                       |   2 +-
 doc/README.de.txt                                  |  68 +++++--------
 doc/README.en.txt                                  |  61 +++++-------
 packages/packages.current                          |  16 +--
 .../0001-Fix-g-sync-account-warning.patch          | 109 ---------------------
 src/inst-gpg4win.nsi                               |   6 +-
 src/uninst-gpg4win.nsi                             |   2 +
 9 files changed, 155 insertions(+), 205 deletions(-)
 delete mode 100755 patches/gpgol-2.0.5/0001-Fix-g-sync-account-warning.patch


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org



More information about the Gpg4win-commits mailing list