[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.0-33-ge8a53a7
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Nov 20 09:38:58 CET 2017
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 e8a53a79585f25fb490a4bbab93082e139dd3f3a (commit)
via ef71d659f9653901add344c1b62046239aef7bed (commit)
from 23e16f6f5d1478d1ebfb2a5a718e5359d8809730 (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 e8a53a79585f25fb490a4bbab93082e139dd3f3a
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Nov 20 09:38:35 2017 +0100
Unbump Version
--
3.0.1 was not released so revert the version bump.
diff --git a/NEWS b/NEWS
index c2576c1..98e5e8b 100644
--- a/NEWS
+++ b/NEWS
@@ -3,20 +3,7 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
-Noteworthy changes in Version 3.0.2 (unreleased)
-------------------------------------------------
-
-~~~~~~~~~~~~~~~
-GnuPG: 2.2.2
-Kleopatra: 3.0.0
-GPA: 0.9.9
-GpgOL: 2.0.2
-GpgEX: 1.0.5
-Kompendium DE: 4.0.0
-Kompendium EN: 3.0.0
-~~~~~~~~~~~~~~~
-
-Noteworthy changes in Version 3.0.1 (2017-11-17)
+Noteworthy changes in Version 3.0.1 (unreleased)
------------------------------------------------
(en) GpgOL: A cause for seemingly random crashes in Outlook has been
@@ -66,9 +53,9 @@ Noteworthy changes in Version 3.0.1 (2017-11-17)
~~~~~~~~~~~~~~~
GnuPG: 2.2.2
-Kleopatra: 3.0.0
+Kleopatra: 3.0.1
GPA: 0.9.9
-GpgOL: 2.0.2
+GpgOL: 2.0.3
GpgEX: 1.0.5
Kompendium DE: 4.0.0
Compendium EN: 3.0.0
diff --git a/configure.ac b/configure.ac
index bfa9332..00af33d 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.2])
+m4_define([my_version], [3.0.1])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit ef71d659f9653901add344c1b62046239aef7bed
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Nov 20 09:36:25 2017 +0100
Update GpgOL and GnuPG
* Makefile.am (EXTRA_DIST): Remove gpgol patch
* packages/packages.current (gpgol, gnupg): Update
* patches/gpgol/
0001-Use-table-view-reading-pane-for-OL-2013.patch: Removed
--
GnuPG is patched additionally with upstrem rev:
2aa106d6a4e2b09c257e8d769895d93ebb7f7edf
diff --git a/Makefile.am b/Makefile.am
index 53afa5d..2e18138 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/0001-Use-table-view-reading-pane-for-OL-2013.patch
+ patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch
copy-news:
cp NEWS doc/website/NEWS.last
diff --git a/packages/packages.current b/packages/packages.current
index a6d45d5..0ff72ce 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -235,11 +235,11 @@ chk 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c
#
server http://files.gpg4win.org/src
-# last-changed: 2017-09-12
+# last-changed: 2017-11-20
# by: ah
# verified: Sig 5B80 C575 4298 F0CB 55D8 ED6A BCEF 7E29 4B09 2E28
-file gpgol/gpgol-2.0.2.tar.bz2
-chk 4f378e4e18523bb378ac0d627a59415085fd4394793b6fed11c684f20ef1fba6
+file gpgol/gpgol-2.0.3.tar.bz2
+chk 6c92084127878623eb831966ff4a15eef53f01cb9b0309e2a45c89d7fe8e6f10
#
# GpgEX
@@ -522,13 +522,14 @@ chk 8ce467c5f72543a025197b8aeac9b6476db14b70401302491af9ccb1e0bf48d2
# 5ecef193bc2144e6d51a6bd5727bfd08a0d28b66 (kbx corruption)
# 878b8bfdcc3a8becfc46b9287a2d14cd3c875f28 (gpgtar file names)
# 4f5afaf1fdb5cb13859aca390ccb5a1ba1dba00c (registry access)
-name gnupg-w32-2.2.2-20171116-bin.exe
-file gnupg/gnupg-w32-2.2.2_20171116.exe
-chk 1e900099346919944e9c0c29a275f2fdaa9c544ea81ef12731e19bffef7a6d8e
-
-name gnupg-w32-2.2.2-20171116-src.tar.xz
-file gnupg/gnupg-w32-2.2.2_20171116.tar.xz
-chk b87c67f07b5dd2dc375adf9d6026add22c0703efcc0b4640d379fc02180b68fc
+# 2aa106d6a4e2b09c257e8d769895d93ebb7f7edf (dirmngr crash)
+name gnupg-w32-2.2.2-20171120-bin.exe
+file gnupg/gnupg-w32-2.2.2_20171120.exe
+chk ea8b46d8948b4156048534be354170e76d4df26bd5d47e416d5be0b5c130f0af
+
+name gnupg-w32-2.2.2-20171120-src.tar.xz
+file gnupg/gnupg-w32-2.2.2_20171120.tar.xz
+chk 5c9a0d5b4a12d387c184cdc96404dc6ea77ac225497fb777505df07d728e002e
# Libkleo
# last changed: see package date.
diff --git a/patches/gpgol/0001-Use-table-view-reading-pane-for-OL-2013.patch b/patches/gpgol/0001-Use-table-view-reading-pane-for-OL-2013.patch
deleted file mode 100755
index cfef04d..0000000
--- a/patches/gpgol/0001-Use-table-view-reading-pane-for-OL-2013.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 4f9c720433aabc37484bc4f365efc5949f8fa3f0 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Thu, 16 Nov 2017 12:43:38 +0100
-Subject: [PATCH] Use table view reading pane for OL <= 2013
-
-* src/explorer-events.cpp (EVENT_SINK_INVOKE),
-src/ribbon-callbacks.cpp (get_mail_from_control): Check
-version to determine codepath.
-
---
-The crash only appeared on Outlook 2016. Older Versions
-don't have the previewPane object. So we need to have
-a fallback.
----
- src/explorer-events.cpp | 42 +++++++++++++++++++++++-------------------
- src/ribbon-callbacks.cpp | 26 +++++++++++++++++++++++++-
- 2 files changed, 48 insertions(+), 20 deletions(-)
-
-diff --git a/src/explorer-events.cpp b/src/explorer-events.cpp
-index 1529a88..8ed0784 100644
---- a/src/explorer-events.cpp
-+++ b/src/explorer-events.cpp
-@@ -82,34 +82,38 @@ EVENT_SINK_INVOKE(ExplorerEvents)
- {
- log_oom_extra ("%s:%s: Selection change in explorer: %p",
- SRCNAME, __func__, this);
--#if 0
-- Somehow latest Outlook 2016 crashes when accessing the current view
-+ /* Somehow latest Outlook 2016 crashes when accessing the current view
- of the Explorer. This is even reproducible with
- GpgOL disabled and only with Outlook Spy active. If you select
- the explorer of an Outlook.com resource and then access
- the CurrentView and close the CurrentView again in Outlook Spy
-- outlook crashes.
-+ outlook crashes. */
-
-- LPDISPATCH tableView = get_oom_object (m_object, "CurrentView");
-- if (!tableView)
-- {
-- TRACEPOINT;
-- break;
-- }
-- int hasReadingPane = get_oom_bool (tableView, "ShowReadingPane");
-- gpgol_release (tableView);
-- if (!hasReadingPane)
-+ if (g_ol_version_major <= 15)
- {
-- break;
-+ LPDISPATCH tableView = get_oom_object (m_object, "CurrentView");
-+ if (!tableView)
-+ {
-+ TRACEPOINT;
-+ break;
-+ }
-+ int hasReadingPane = get_oom_bool (tableView, "ShowReadingPane");
-+ gpgol_release (tableView);
-+ if (!hasReadingPane)
-+ {
-+ break;
-+ }
- }
--#else
-- LPDISPATCH prevEdit = get_oom_object (m_object, "PreviewPane.WordEditor");
-- gpgol_release (prevEdit);
-- if (!prevEdit)
-+ else
- {
-- break;
-+ LPDISPATCH prevEdit = get_oom_object (m_object, "PreviewPane.WordEditor");
-+ gpgol_release (prevEdit);
-+ if (!prevEdit)
-+ {
-+ break;
-+ }
- }
--#endif
-+
- HANDLE thread = CreateThread (NULL, 0, invalidate_ui, (LPVOID) this, 0,
- NULL);
-
-diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
-index c2a78d1..f787622 100644
---- a/src/ribbon-callbacks.cpp
-+++ b/src/ribbon-callbacks.cpp
-@@ -1463,7 +1463,7 @@ get_mail_from_control (LPDISPATCH ctrl, bool *none_selected)
- {
- *none_selected = true;
- }
-- else
-+ else if (g_ol_version_major >= 16)
- {
- // Avoid showing wrong crypto state if we don't have a reading
- // pane. In that case the parser will finish for a mail which is gone
-@@ -1477,6 +1477,30 @@ get_mail_from_control (LPDISPATCH ctrl, bool *none_selected)
- mailitem = nullptr;
- }
- }
-+ else
-+ {
-+ // Preview Pane is not available in older outlooks
-+ LPDISPATCH tableView = get_oom_object (context, "CurrentView");
-+ if (!tableView)
-+ {
-+ // Woops, should not happen.
-+ TRACEPOINT;
-+ *none_selected = true;
-+ gpgol_release (mailitem);
-+ mailitem = nullptr;
-+ }
-+ else
-+ {
-+ int hasReadingPane = get_oom_bool (tableView, "ShowReadingPane");
-+ gpgol_release (tableView);
-+ if (!hasReadingPane)
-+ {
-+ *none_selected = true;
-+ gpgol_release (mailitem);
-+ mailitem = nullptr;
-+ }
-+ }
-+ }
- }
-
- gpgol_release (context);
---
-2.11.0
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 3 +-
NEWS | 19 +--
configure.ac | 2 +-
packages/packages.current | 21 ++--
...1-Use-table-view-reading-pane-for-OL-2013.patch | 130 ---------------------
5 files changed, 16 insertions(+), 159 deletions(-)
delete mode 100755 patches/gpgol/0001-Use-table-view-reading-pane-for-OL-2013.patch
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list