[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-181-gc6b6451
by Andre Heinecke
cvs at cvs.gnupg.org
Thu Aug 11 16:08:52 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, master has been updated
via c6b64516a71a3f57a226bb15909e605b31c0747d (commit)
via 153f313cb7d3c9fd206e0d91b91ed7481794a375 (commit)
via f9eadf04b3d7652243531925d4fce6c4c7e5e669 (commit)
from edc88cbf8aa03ed150119a6cbfb964464c03e9be (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 c6b64516a71a3f57a226bb15909e605b31c0747d
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Aug 11 16:07:51 2016 +0200
Update Kleopatra
--
diff --git a/packages/packages.current b/packages/packages.current
index 676912b..30c1d9b 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -558,5 +558,5 @@ chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file kleopatra/kleopatra-201608101800.tar.gz
-chk f341c557b08f6bbd426d45eb857105d20f8da4e4d6d227c7ef9400e97dc1e2c7
+file kleopatra/kleopatra-201608111605.tar.gz
+chk c095e7a551a8923291def9da497dc0cedb04300d30cc475eecb9cb0db81e492d
commit 153f313cb7d3c9fd206e0d91b91ed7481794a375
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Aug 11 15:51:45 2016 +0200
Add patches to fix Gpg(Ex/Ol) UiServer start
* Makefile.am (EXTRA_DIST): Add patches.
* patches/gpgex-1.0.4/
0002-Fix-loop-logic-error-in-new-server-name-detection.patch: New.
* patches/gpgol-1.4.0/
0003-Fix-loop-logic-error-in-new-server-name-detection.patch: New.
diff --git a/Makefile.am b/Makefile.am
index 63c16ed..3c55fe4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,8 +53,10 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/kleopatra/fix-paperkey.patch \
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/patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch b/patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch
new file mode 100755
index 0000000..66d2484
--- /dev/null
+++ b/patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch
@@ -0,0 +1,50 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From 3dddfb2546b839e104286767f504e456ae91df45 Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke at intevation.de>
+Date: Thu, 11 Aug 2016 15:45:49 +0200
+Subject: [PATCH] Fix loop logic error in new server name detection
+
+* src/client.cc (default_uiserver_cmdline): Iterate over server_names
+array and not over the first server name itself.
+---
+ src/client.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/client.cc b/src/client.cc
+index 6f27175..ccfa0ac 100644
+--- a/src/client.cc
++++ b/src/client.cc
+@@ -108,7 +108,7 @@ default_uiserver_cmdline (void)
+ }
+ #else /*!ENABLE_GPA_ONLY*/
+ {
+- const char *dir, *tmp;
++ const char *dir, **tmp;
+ char *uiserver, *p;
+ int extra_arglen = 9;
+ const char * server_names[] = {"kleopatra.exe",
+@@ -163,16 +163,16 @@ default_uiserver_cmdline (void)
+ return name;
+ }
+ /* Fallbacks */
+- for (tmp = *server_names; *tmp; tmp++)
++ for (tmp = server_names; *tmp; tmp++)
+ {
+ if (name)
+ {
+ free (name);
+ }
+- name = (char*) malloc (strlen (dir) + strlen (tmp) + extra_arglen + 2);
++ name = (char*) malloc (strlen (dir) + strlen (*tmp) + extra_arglen + 2);
+ if (!name)
+ return NULL;
+- strcpy (stpcpy (stpcpy (name, dir), "\\"), tmp);
++ strcpy (stpcpy (stpcpy (name, dir), "\\"), *tmp);
+ for (p = name; *p; p++)
+ if (*p == '/')
+ *p = '\\';
+--
+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
new file mode 100755
index 0000000..46cdb8d
--- /dev/null
+++ b/patches/gpgol-1.4.0/0003-Fix-loop-logic-error-in-new-server-name-detection.patch
@@ -0,0 +1,47 @@
+#! /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
commit f9eadf04b3d7652243531925d4fce6c4c7e5e669
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Aug 11 10:04:29 2016 +0200
Install emblem icons for new file enc dialog
* src/inst-breeze-icons.nsi, src/uninst-breeze-icons.nsi: Install
emblems.
diff --git a/src/inst-breeze-icons.nsi b/src/inst-breeze-icons.nsi
index fe981c3..5f1e4d2 100644
--- a/src/inst-breeze-icons.nsi
+++ b/src/inst-breeze-icons.nsi
@@ -540,5 +540,12 @@ Section "-breeze-icons" SEC_breeze_icons
File ${prefix}/share/icons/breeze/status/64/security-low.svg
File ${prefix}/share/icons/breeze/status/64/security-medium.svg
+ SetOutPath "$INSTDIR\share\icons\breeze\emblems\8"
+ File ${prefix}/share/icons/breeze/emblems/8/emblem-information.svg
+ File ${prefix}/share/icons/breeze/emblems/8/emblem-warning.svg
+ File ${prefix}/share/icons/breeze/emblems/8/emblem-success.svg
+ File ${prefix}/share/icons/breeze/emblems/8/emblem-error.svg
+ File ${prefix}/share/icons/breeze/emblems/8/emblem-question.svg
+
!endif
SectionEnd
diff --git a/src/uninst-breeze-icons.nsi b/src/uninst-breeze-icons.nsi
index 886d3cb..53eb618 100644
--- a/src/uninst-breeze-icons.nsi
+++ b/src/uninst-breeze-icons.nsi
@@ -235,6 +235,11 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze\actions\16\application-exit.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\visibility.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\hint.svg"
+ Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-information.svg"
+ Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-warning.svg"
+ Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-success.svg"
+ Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-error.svg"
+ Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-question.svg"
Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-medium.svg"
Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-low.svg"
Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-high.svg"
@@ -441,6 +446,8 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\visibility.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\hint.svg"
+ RMDir "$INSTDIR\share\icons\breeze\emblems\8"
+ RMDir "$INSTDIR\share\icons\breeze\emblems"
RMDir "$INSTDIR\share\icons\breeze\status\64"
RMDir "$INSTDIR\share\icons\breeze\status\24"
RMDir "$INSTDIR\share\icons\breeze\status\22"
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +
packages/packages.current | 4 +-
...-logic-error-in-new-server-name-detection.patch | 50 ++++++++++++++++++++++
...-logic-error-in-new-server-name-detection.patch | 47 ++++++++++++++++++++
src/inst-breeze-icons.nsi | 7 +++
src/uninst-breeze-icons.nsi | 7 +++
6 files changed, 115 insertions(+), 2 deletions(-)
create mode 100755 patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch
create 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