[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-194-geffafd1
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Nov 15 15:27:48 CET 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, master has been updated
via effafd1e20de79603371253a312cd0434725a68b (commit)
via 3dbf41334601800aa2878be3f16cd5ae326b448c (commit)
via fde838bcd19fad7450893cbe6c8d54297dd930a0 (commit)
via 842936131f703a1f0f901840c6954850f8af418a (commit)
from bc1c6d83d158860807a459a2fa5e8c999a386732 (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 effafd1e20de79603371253a312cd0434725a68b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Nov 15 15:27:28 2016 +0100
Update gpgme and gpgol to newer devel versions
--
diff --git a/packages/packages.current b/packages/packages.current
index 5543b21..aaa82a4 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -398,7 +398,7 @@ file 5.25/kconfig-5.25.0.tar.xz
chk 498332f1c3fbb5e0d681cf6807502c1fe0aef74e79b29cd1e60e4096924949c2
# ki18n
-# last changed: 2016-08-26
+# last changed: 2016-11-14
# by: ah
# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
file 5.25/ki18n-5.25.0.tar.xz
@@ -520,14 +520,14 @@ chk b85a1aa93375758e3a3c3b0f5938799fd6310a882cb1d6d027462dc2c9297a97
# ditto for gpgme.
# by: ah
# verified: tarball created by ah
-file gpgme/gpgme-1.7.2-beta36.tar.bz2
-chk 751816fe804ded00e3992bd8b5d8f7000f26a748c76dfb2f2099cf1206444e11
+file gpgme/gpgme-1.7.2-beta44.tar.bz2
+chk 27b8b1c9066f07d76cdec0b831c414642bafc86663c54fb332c79a81a3c2947a
# ditto for gpgol.
# by: ah
# verified: tarball created by ah
-file gpgol/gpgol-2.0.0-beta160.tar.bz2
-chk 3fc9a322efbba8543ffbafac797741b2091109c26024605a71ac6447d2ea1273
+file gpgol/gpgol-2.0.0-beta172.tar.bz2
+chk 9bed2920d1c4249c0a0ebdab68a82c1a43490d2fc1789b0a4c30759406a3523e
# Gpgmepp
# last changed: 2016-01-21
commit 3dbf41334601800aa2878be3f16cd5ae326b448c
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Nov 15 15:27:13 2016 +0100
Update libgpg-error to 1.25
--
diff --git a/packages/packages.current b/packages/packages.current
index 3cf9c1d..5543b21 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -277,10 +277,10 @@ chk c2a9b3aec1a38d34b66106116a39f64b01d84f475fef75c40ea0bda0ea67ed07
# D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
server ftp://ftp.gnupg.org/gcrypt
-# last-changed: 2016-07-22
+# last-changed: 2016-11-14
# by: ah
-file libgpg-error/libgpg-error-1.24.tar.bz2
-chk 9268e1cc487de5e6e4460fca612a06e4f383072ac43ae90603e5e46783d3e540
+file libgpg-error/libgpg-error-1.25.tar.bz2
+chk f628f75843433b38b05af248121beb7db5bd54bb2106f384edac39934261320c
# last-changed: 2016-07-22
# by: ah
commit fde838bcd19fad7450893cbe6c8d54297dd930a0
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Nov 15 15:26:04 2016 +0100
Enable cpp and qt bindings for gpgme
* src/Makefile.am: Update configuration variables.
* src/inst-gpgme.nsi: Install them.
* src/uninst-gpgme.nsi: Uninstall.
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c29d5a..1bbd1fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -120,7 +120,7 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
gpg4win_qtpkgs = qtbase qttools qtwinextras qtsvg
# Source packages following the KDE pattern
-gpg4win_kdepkgs = kconfig kwidgetsaddons gpgmepp ki18n extra-cmake-modules \
+gpg4win_kdepkgs = kconfig gpgmepp kwidgetsaddons ki18n extra-cmake-modules \
kcompletion kwindowsystem kcoreaddons libkleo kcodecs \
kmime kconfigwidgets kxmlgui kguiaddons kitemviews \
kiconthemes kleopatra breeze-icons kitemmodels karchive
@@ -245,13 +245,13 @@ gpg4win_pkg_gpgme_configure = --silent \
`test -n "@HAVE_PKG_GLIB@" && echo "--enable-w32-glib"` \
CFLAGS=-I$(idir)/include/glib-2.0/ \
LDFLAGS=-L$(idir)/lib \
- --enable-languages=no
+ --enable-languages=qt,cpp
gpg4win_pkg_gpgme_ex_configure = --silent \
--with-gpg-error-prefix=$(ex_idir) --enable-static \
--with-libassuan-prefix=$(ex_idir) \
LDFLAGS=-L$(ex_idir)/lib \
- --enable-languages=no
+ --enable-languages=cpp
gpg4win_pkg_gpa_configure = --silent \
--with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
diff --git a/src/inst-gpgme.nsi b/src/inst-gpgme.nsi
index 9233e5c..b0f72e0 100644
--- a/src/inst-gpgme.nsi
+++ b/src/inst-gpgme.nsi
@@ -36,6 +36,7 @@ Section "-gpgme" SEC_gpgme
ClearErrors
SetOverwrite try
File "${prefix}/bin/libgpgme-11.dll"
+ File "${prefix}/bin/libgpgme-11.dll"
SetOverwrite lastused
ifErrors 0 +3
@@ -50,6 +51,8 @@ Section "-gpgme" SEC_gpgme
File /oname=libgpgme-glib-11.dll.tmp "${prefix}/bin/libgpgme-glib-11.dll"
Rename /REBOOTOK libgpgme-glib-11.dll.tmp libgpgme-glib-11.dll
+ File "${prefix}/bin/libqgpgme-7.dll"
+ File "${prefix}/bin/libgpgmepp-6.dll"
File "${prefix}/libexec/gpgme-w32spawn.exe"
SetOutPath "$INSTDIR\lib"
diff --git a/src/uninst-gpgme.nsi b/src/uninst-gpgme.nsi
index fabcf9c..76bbaa4 100644
--- a/src/uninst-gpgme.nsi
+++ b/src/uninst-gpgme.nsi
@@ -32,7 +32,8 @@ Section "-un.gpgme"
!else
Delete /REBOOTOK "$INSTDIR\bin\libgpgme-11.dll"
Delete /REBOOTOK "$INSTDIR\bin\libgpgme-glib-11.dll"
- Delete /REBOOTOK "$INSTDIR\bin\libgpgme-qt-11.dll"
+ Delete /REBOOTOK "$INSTDIR\bin\libqgpgme-7.dll"
+ Delete /REBOOTOK "$INSTDIR\bin\libgpgmepp-6.dll"
Delete "$INSTDIR\bin\gpgme-w32spawn.exe"
Delete "$INSTDIR\lib\libgpgme.imp"
Delete "$INSTDIR\lib\libgpgme-glib.imp"
commit 842936131f703a1f0f901840c6954850f8af418a
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Nov 14 14:15:48 2016 +0100
Update packages of unreleased versions
* Makefile.am (EXTRA_DIST): Update accordingly.
* packages/packages.current: Update gpgol, gpgme
diff --git a/Makefile.am b/Makefile.am
index e4869f6..7873d4d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,9 +53,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for-Windows.patch \
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/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 \
- patches/gpgol-1.4.0/0003-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
copy-news:
diff --git a/packages/packages.current b/packages/packages.current
index 5c4757b..3cf9c1d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -233,8 +233,10 @@ server ftp://ftp.g10code.com/g10code/gpgol
# last-changed: 2016-03-30
# by: ah
# verified: Sig D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
-file gpgol-1.4.0.tar.bz2
-chk abebb06bcf64c11854b110830b148eada7e7d9046e565c407d7957594f09800f
+#
+# TODO switch back to released version
+#file gpgol-1.4.0.tar.bz2
+#chk abebb06bcf64c11854b110830b148eada7e7d9046e565c407d7957594f09800f
#
# GpgEX
@@ -518,8 +520,14 @@ chk b85a1aa93375758e3a3c3b0f5938799fd6310a882cb1d6d027462dc2c9297a97
# ditto for gpgme.
# by: ah
# verified: tarball created by ah
-file gpgme/gpgme-1.7.0-beta319.tar.bz2
-chk 39e6d9c3d479a73b62a7310b295cd3a6b5bac03bac82396645b43fa12329f74a
+file gpgme/gpgme-1.7.2-beta36.tar.bz2
+chk 751816fe804ded00e3992bd8b5d8f7000f26a748c76dfb2f2099cf1206444e11
+
+# ditto for gpgol.
+# by: ah
+# verified: tarball created by ah
+file gpgol/gpgol-2.0.0-beta160.tar.bz2
+chk 3fc9a322efbba8543ffbafac797741b2091109c26024605a71ac6447d2ea1273
# Gpgmepp
# last changed: 2016-01-21
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
deleted file mode 100755
index 20f91d8..0000000
--- a/patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /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
deleted file mode 100755
index 5b65c40..0000000
--- a/patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /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
diff --git a/patches/gpgol-1.4.0/0003-Fix-loop-logic-error-in-new-server-name-detection.patch b/patches/gpgol-1.4.0/0003-Fix-loop-logic-error-in-new-server-name-detection.patch
deleted file mode 100755
index 46cdb8d..0000000
--- a/patches/gpgol-1.4.0/0003-Fix-loop-logic-error-in-new-server-name-detection.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From c8cdb4c9a9bb590b8785b483cf71657e20e0b92d Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Thu, 11 Aug 2016 15:59:57 +0200
-Subject: [PATCH] Fix loop logic error in new server name detection
-
-* src/engine-assuan.c (get_uiserver_name): Fix name loop.
----
- src/engine-assuan.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/engine-assuan.c b/src/engine-assuan.c
-index 32dbae8..c60713b 100644
---- a/src/engine-assuan.c
-+++ b/src/engine-assuan.c
-@@ -353,7 +353,7 @@ get_uiserver_name (void)
- "gpa.exe",
- "bin\\gpa.exe",
- NULL};
-- const char *tmp = NULL;
-+ const char **tmp = NULL;
-
- dir = get_gpg4win_dir ();
- if (!dir)
-@@ -384,14 +384,14 @@ get_uiserver_name (void)
- return name;
- }
- /* Fallbacks */
-- for (tmp = *server_names; *tmp; tmp++)
-+ for (tmp = server_names; *tmp; tmp++)
- {
- if (name)
- {
- xfree (name);
- }
-- name = xmalloc (strlen (dir) + strlen (tmp) + extra_arglen + 2);
-- strcpy (stpcpy (stpcpy (name, dir), "\\"), tmp);
-+ name = xmalloc (strlen (dir) + strlen (*tmp) + extra_arglen + 2);
-+ strcpy (stpcpy (stpcpy (name, dir), "\\"), *tmp);
- for (p = name; *p; p++)
- if (*p == '/')
- *p = '\\';
---
-2.1.4
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 3 -
packages/packages.current | 24 +++++---
.../gpgol-1.4.0/0001-Fix-UI-Server-startup.patch | 71 ----------------------
...e-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch | 39 ------------
...-logic-error-in-new-server-name-detection.patch | 47 --------------
src/Makefile.am | 6 +-
src/inst-gpgme.nsi | 3 +
src/uninst-gpgme.nsi | 3 +-
8 files changed, 24 insertions(+), 172 deletions(-)
delete mode 100755 patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch
delete mode 100755 patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch
delete mode 100755 patches/gpgol-1.4.0/0003-Fix-loop-logic-error-in-new-server-name-detection.patch
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list