[git] GpgOL - branch, master, updated. gpgol-2.0.1-5-g3cadd0e

[by Andre Heinecke]

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 MS Outlook".

The branch, master has been updated
       via  3cadd0e929e4e30db0b604d096c91c11e44c9925 (commit)
       via  1815757181ff8ea6364f5a82771c6f09d3c4a660 (commit)
       via  c3780cfaaf3112d3ba5d8e6e9251466fd5d1fb0e (commit)
      from  6a54171276524e2e39f3d9f2ad88683d0c0036c2 (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 3cadd0e929e4e30db0b604d096c91c11e44c9925
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Nov 10 17:48:26 2017 +0100

    Fix build example by adding --enable-static
    
    --
    Dependencies are needed as static libs so this must
    be enabled.

diff --git a/INSTALL b/INSTALL
index e09dc59..23ed737 100644
--- a/INSTALL
+++ b/INSTALL
@@ -35,7 +35,7 @@ for proj in $PROJECTS; do
     ./autogen.sh
     mkdir build-w32
     cd build-w32
-    ../autogen.sh --build-w32
+    ../autogen.sh --build-w32 --enable-static
     make -j`nproc`
     make install
 done

commit 1815757181ff8ea6364f5a82771c6f09d3c4a660
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Nov 10 17:47:04 2017 +0100

    Remove obsolete info from README
    
    --

diff --git a/README b/README
index 3876d9c..4690af3 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
                        =======================
           Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010,
                         2011 g10 Code GmbH
-                        2013, 2015, 2016 Intevation GmbH
+                        2013, 2015, 2016, 2017 Intevation GmbH
 
 GpgOL is a GnuPG plugin for MS Outlook.
 
@@ -14,14 +14,10 @@ for additional features and sending encrypted mail.
 
 src/       Code to build the actual core of the plugin.  The resulting
            DLL will be named "gpgol.dll".  It is to be build using
-           the Mingw toolchain.
-
-To install this plugin, copy "gpgol.dll" to some directory (e.g. where
-gpg lives), make sure that the libgpg-error.dll and gpgme.dll are
-available in a directory where Windows searches for DLLs
-(e.g. c:\winnt\system32), stop Outlook, run the command "regsvr32
-gpgol.dll" and start Outlook. You should then find a new tab named
-"GnuPG" in Outlook's option menu.
+           the Mingw toolchain see INSTALL for details.
+
+To install this plugin, install Gpg4win and replace the
+installed gpgol.dll with the compiled binary.
 
 You will need an UiServer (either GPA or Kleopatra) in a location
 pointed to by the standard gpg4win registry keys. It is suggested

commit c3780cfaaf3112d3ba5d8e6e9251466fd5d1fb0e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Nov 10 17:09:53 2017 +0100

    Improve debug output in parsecontroller
    
    * src/parsecontroller.cpp: Debug detected type.

diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index 25cdc5e..c93c173 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -80,7 +80,7 @@ ParseController::ParseController(LPSTREAM instream, msgtype_t type):
     m_type (type)
 {
   log_mime_parser ("%s:%s: Creating parser for stream: %p of type %i"
-                   " expect headers: %i expect no mime: %i",
+                   " expect no headers: %i expect no mime: %i",
                    SRCNAME, __func__, instream, type,
                    expect_no_headers (type), expect_no_mime (type));
 }
@@ -276,12 +276,12 @@ ParseController::parse()
     }
 
   Data output (m_outputprovider);
-  log_debug ("%s:%s:%p decrypt: %i verify: %i with protocol: %s sender: %s",
+  log_debug ("%s:%s:%p decrypt: %i verify: %i with protocol: %s sender: %s type: %i",
              SRCNAME, __func__, this,
              decrypt, verify,
              protocol == OpenPGP ? "OpenPGP" :
              protocol == CMS ? "CMS" : "Unknown",
-             m_sender.empty() ? "none" : m_sender.c_str());
+             m_sender.empty() ? "none" : m_sender.c_str(), input.type ());
   if (decrypt)
     {
       input.seek (0, SEEK_SET);

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

Summary of changes:
 INSTALL                 |  2 +-
 README                  | 14 +++++---------
 src/parsecontroller.cpp |  6 +++---
 3 files changed, 9 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org