[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-230-g0e6fcd3
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Apr 24 18:06:56 CEST 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 0e6fcd37a2a7f5f5f2bbb7da098daafeaaa0b978 (commit)
via bdcf1ffab7d4c7805a8e2eb6d3a67eb561a94d07 (commit)
via 80776aadfaa045fbb94109a3dd463a722778d139 (commit)
from 7f808d27de248edf77ada9daf1038646258cc57c (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 0e6fcd37a2a7f5f5f2bbb7da098daafeaaa0b978
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Apr 24 18:06:05 2017 +0200
Install VS-NFD and Automatic profiles
* src/inst-kleopatra.nsi: Install VSNFD / Automatic profiles.
* src/uninst-kleopatra.nsi: Uninstall them.
diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
index 777006a..9f00743 100644
--- a/src/inst-kleopatra.nsi
+++ b/src/inst-kleopatra.nsi
@@ -223,6 +223,46 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
FileClose $1
pop $1
+ SetOutPath "$INSTDIR\..\GnuPG\share\doc\gnupg\examples"
+ # Install profiles
+ push $1
+ FileOpen $1 "$INSTDIR\..\GnuPG\share\doc\gnupg\examples\VS-NFD.prf" "w"
+ FileWrite $1 '# VS-NFD.prf - Configure options for the VS-NfD mode -*- conf -*-$\r$\n'
+ FileWrite $1 '$\r$\n'
+ FileWrite $1 '[gpg]$\r$\n'
+ FileWrite $1 'compliance de-vs$\r$\n'
+ FileWrite $1 'default-new-key-algo brainpoolP256r1+brainpoolP256r1$\r$\n'
+ FileWrite $1 '$\r$\n'
+ FileWrite $1 '[gpgsm]$\r$\n'
+ FileWrite $1 'enable-crl-checks$\r$\n'
+ FileWrite $1 '$\r$\n'
+ FileWrite $1 '[gpg-agent]$\r$\n'
+ FileWrite $1 'enable-extended-key-format$\r$\n'
+ FileWrite $1 'default-cache-ttl 900$\r$\n'
+ FileWrite $1 'max-cache-ttl [] 3600$\r$\n'
+ FileWrite $1 'no-allow-mark-trusted$\r$\n'
+ FileWrite $1 'no-allow-external-cache$\r$\n'
+ FileWrite $1 'enforce-passphrase-constraints$\r$\n'
+ FileWrite $1 'min-passphrase-len 9$\r$\n'
+ FileWrite $1 'min-passphrase-nonalpha 0$\r$\n'
+ FileWrite $1 '$\r$\n'
+ FileWrite $1 '[dirmngr]$\r$\n'
+ FileWrite $1 'allow-ocsp$\r$\n'
+ FileClose $1
+ pop $1
+
+ push $1
+ FileOpen $1 "$INSTDIR\..\GnuPG\share\doc\gnupg\examples\Automatic.prf" "w"
+ FileWrite $1 '# Automatic.prf - Configure options for a more automatic mode -*- conf -*-$\r$\n'
+ FileWrite $1 '$\r$\n'
+ FileWrite $1 '[gpg]$\r$\n'
+ FileWrite $1 'auto-key-locate local,wkd,dane$\r$\n'
+ FileWrite $1 'auto-key-retrieve$\r$\n'
+ FileWrite $1 'trust-model tofu+pgp$\r$\n'
+ FileWrite $1 '$\r$\n'
+ FileClose $1
+ pop $1
+
WriteRegStr HKLM "Software\Gpg4win\kleopatra\Capabilities" "ApplicationDescription" "$(DESC_SEC_kleopatra)"
WriteRegStr HKLM "Software\Gpg4win\kleopatra\Capabilities" "ApplicationIcon" "$INSTDIR\bin\kleopatra.exe,0"
WriteRegStr HKLM "Software\Gpg4win\kleopatra\Capabilities" "ApplicationName" "Kleopatra"
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index 410f2eb..abebacb 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -189,6 +189,9 @@ Section "-un.kleopatra"
Delete "$INSTDIR\bin\libkleopatraclientcore.dll"
Delete "$INSTDIR\bin\libkleopatraclientgui.dll"
+ Delete "$INSTDIR\..\GnuPG\share\doc\gnupg\examples\VS-NFD.prf"
+ Delete "$INSTDIR\..\GnuPG\share\doc\gnupg\examples\Automatic.prf"
+
# RMDir "$INSTDIR\share\doc\HTML\en\kleopatra"
# RMDir "$INSTDIR\share\doc\HTML\en"
# RMDir "$INSTDIR\share\doc\HTML\common"
@@ -196,6 +199,10 @@ Section "-un.kleopatra"
# RMDir "$INSTDIR\share\doc\HTML\de"
# RMDir "$INSTDIR\share\doc\HTML"
# RMDir "$INSTDIR\share\doc"
+ RMDir "$INSTDIR\..\GnuPG\share\doc\gnupg\examples"
+ RMDir "$INSTDIR\..\GnuPG\share\doc\gnupg"
+ RMDir "$INSTDIR\..\GnuPG\share\doc"
+ RMDir "$INSTDIR\..\GnuPG"
RMDir "$INSTDIR\share\QtProject"
RMDir "$INSTDIR\share\kleopatra\pics"
RMDir "$INSTDIR\share\kleopatra"
commit bdcf1ffab7d4c7805a8e2eb6d3a67eb561a94d07
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Apr 18 12:19:23 2017 +0200
Add patch for gpgme conf string splitting
* patches/gpgme-1.9.0/
0001-core-Don-t-split-gpgconf-strings-on-comma.patch: New.
* Makefile.am (EXTRA_DIST): Update accordingly.
--
Patch is pending upstream review.
diff --git a/Makefile.am b/Makefile.am
index f097f29..91f3d97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/qttools/disable-most-tools.patch \
patches/ki18n/no-tests.patch \
+ patches/gpgme-1.9.0/0001-core-Don-t-split-gpgconf-strings-on-comma.patch \
patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
diff --git a/patches/gpgme-1.9.0/0001-core-Don-t-split-gpgconf-strings-on-comma.patch b/patches/gpgme-1.9.0/0001-core-Don-t-split-gpgconf-strings-on-comma.patch
new file mode 100755
index 0000000..2520ddd
--- /dev/null
+++ b/patches/gpgme-1.9.0/0001-core-Don-t-split-gpgconf-strings-on-comma.patch
@@ -0,0 +1,46 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+
+From d86b8b46b4f484f5bc26652f01c9332ce401d1eb Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke at intevation.de>
+Date: Wed, 5 Apr 2017 18:23:48 +0200
+Subject: [PATCH] core: Don't split gpgconf strings on comma
+
+* src/engine-gpgconf.c (gpgconf_parse_option): Don't split
+strings on comma.
+
+--
+This only affects values where the main type is string. Values
+with the alt_type string but another main type are still split
+to keep lists (e.g. groups) working.
+---
+ src/engine-gpgconf.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
+index 6f7c8ac..af5f110 100644
+--- a/src/engine-gpgconf.c
++++ b/src/engine-gpgconf.c
+@@ -399,7 +399,7 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
+ gpgme_conf_arg_t *arg_p, char *line)
+ {
+ gpgme_error_t err;
+- char *mark;
++ char *mark = NULL;
+
+ if (!line[0])
+ return 0;
+@@ -408,7 +408,8 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
+ {
+ gpgme_conf_arg_t arg;
+
+- mark = strchr (line, ',');
++ if (opt->type != GPGME_CONF_STRING)
++ mark = strchr (line, ',');
+ if (mark)
+ *mark = '\0';
+
+--
+2.1.4
commit 80776aadfaa045fbb94109a3dd463a722778d139
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Apr 18 12:16:17 2017 +0200
Remove obsolete gpgme patches
* patches/gpgme-1.6.0: Delete upstreamed patches.
* Makefile.am (EXTRA_DIST): Update accordingly.
diff --git a/Makefile.am b/Makefile.am
index 59f71a6..f097f29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,8 +38,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/qttools/disable-most-tools.patch \
patches/ki18n/no-tests.patch \
- patches/gpgme-1.6.0/0001-w32-Fallback-to-2.1-reg-key-for-gpgconf-search.patch \
- patches/gpgme-1.6.0/0001-Add-gpgme_pubkey_algo_string.patch \
patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
diff --git a/patches/gpgme-1.6.0/0001-Add-gpgme_pubkey_algo_string.patch b/patches/gpgme-1.6.0/0001-Add-gpgme_pubkey_algo_string.patch
deleted file mode 100755
index 0367e4b..0000000
--- a/patches/gpgme-1.6.0/0001-Add-gpgme_pubkey_algo_string.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From c4b6b35bfa98e478f1d13f4ce3e664771f2604c2 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk at gnupg.org>
-Date: Sun, 30 Aug 2015 19:04:44 +0200
-Subject: [PATCH] Add gpgme_pubkey_algo_string
-
-* src/gpgme.h.in (GPGME_PK_EDDSA): New.
-(gpgme_pubkey_algo_string): New.
-* src/conversion.c (_gpgme_map_pk_algo): Add new algo.
-* src/gpgme.c (gpgme_pubkey_algo_string): New.
-(gpgme_pubkey_algo_name): Reformat.
-
-Signed-off-by: Werner Koch <wk at gnupg.org>
----
- NEWS | 7 +++++
- doc/gpgme.texi | 21 ++++++++++++---
- src/conversion.c | 1 +
- src/data-mem.c | 3 ++-
- src/gpgme.c | 81 +++++++++++++++++++++++++++++++++++++------------------
- src/gpgme.def | 2 ++
- src/gpgme.h.in | 10 +++++--
- src/libgpgme.vers | 2 ++
- 8 files changed, 94 insertions(+), 33 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 7bf140b..85c084f 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,6 +1,13 @@
- Noteworthy changes in version 1.6.1 (unreleased) [C25/A14/R_]
- ------------------------------------------------
-
-+ * New function to format a GnuPG style public key algorithm string.
-+
-+ * Interface changes relative to the 1.6.0 release:
-+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+ gpgme_pubkey_algo_string NEW.
-+ GPGME_PK_EDDSA NEW.
-+
-
- Noteworthy changes in version 1.6.0 (2015-08-26) [C25/A14/R0]
- ------------------------------------------------
-diff --git a/doc/gpgme.texi b/doc/gpgme.texi
-index c02a30f..a764ce4 100644
---- a/doc/gpgme.texi
-+++ b/doc/gpgme.texi
-@@ -1161,6 +1161,9 @@ Algorithm as defined by FIPS 186-2 and RFC-6637.
- This value indicates ECDH, the Eliptic Curve Diffie-Hellmann
- encryption algorithm as defined by RFC-6637.
-
-+ at item GPGME_PK_EDDSA
-+This value indicates the EdDSA algorithm.
-+
- @end table
- @end deftp
-
-@@ -1174,6 +1177,14 @@ If @var{algo} is not a valid public key algorithm, @code{NULL} is
- returned.
- @end deftypefun
-
-+ at deftypefun {char *} gpgme_pubkey_algo_string (@w{gpgme_subkey_t @var{key}})
-+The function @code{gpgme_pubkey_algo_string} is a convenience function
-+to build and return an algorithm string in the same way GnuPG does
-+(e.g. ``rsa2048'' or ``ed25519''). The caller must free the result
-+using @code{gpgme_free}. On error (e.g. invalid argument or memory
-+exhausted), the function returns NULL and sets @code{ERRNO}.
-+ at end deftypefun
-+
-
- @node Hash Algorithms
- @section Hash Algorithms
-@@ -1954,9 +1965,11 @@ case, the data object @var{dh} is destroyed.
-
- @deftypefun void gpgme_free (@w{void *@var{buffer}})
- The function @code{gpgme_free} releases the memory returned by
-- at code{gpgme_data_release_and_get_mem}. It should be used instead of
--the system libraries @code{free} function in case different allocators
--are used in a single program.
-+ at code{gpgme_data_release_and_get_mem} and
-+ at code{gpgme_pubkey_algo_string}. It should be used instead of the
-+system libraries @code{free} function in case different allocators are
-+used by a program. This is often the case if gpgme is used under
-+Windows as a DLL.
- @end deftypefun
-
-
-@@ -2838,7 +2851,7 @@ True if the secret key is stored on a smart card.
- The serial number of a smart card holding this key or @code{NULL}.
-
- @item char *curve
--For ECC algoritms the name of the curve.
-+For ECC algorithms the name of the curve.
-
- @end table
- @end deftp
-diff --git a/src/conversion.c b/src/conversion.c
-index d04a6be..0992225 100644
---- a/src/conversion.c
-+++ b/src/conversion.c
-@@ -427,6 +427,7 @@ _gpgme_map_pk_algo (int algo, gpgme_protocol_t protocol)
- case 18: algo = GPGME_PK_ECDH; break;
- case 19: algo = GPGME_PK_ECDSA; break;
- case 20: break;
-+ case 22: algo = GPGME_PK_EDDSA; break;
- default: algo = 0; break; /* Unknown. */
- }
- }
-diff --git a/src/data-mem.c b/src/data-mem.c
-index e06a920..a498b82 100644
---- a/src/data-mem.c
-+++ b/src/data-mem.c
-@@ -271,7 +271,8 @@ gpgme_data_release_and_get_mem (gpgme_data_t dh, size_t *r_len)
- }
-
-
--/* Release the memory returned by gpgme_data_release_and_get_mem(). */
-+/* Release the memory returned by gpgme_data_release_and_get_mem() and
-+ some other functions. */
- void
- gpgme_free (void *buffer)
- {
-diff --git a/src/gpgme.c b/src/gpgme.c
-index 0cf999a..343e775 100644
---- a/src/gpgme.c
-+++ b/src/gpgme.c
-@@ -1,7 +1,7 @@
- /* gpgme.c - GnuPG Made Easy.
- Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2012,
-- 2014 g10 Code GmbH
-+ 2014, 2015 g10 Code GmbH
-
- This file is part of GPGME.
-
-@@ -994,41 +994,70 @@ gpgme_sig_notation_get (gpgme_ctx_t ctx)
- return ctx->sig_notations;
- }
-
-+
-
--const char *
--gpgme_pubkey_algo_name (gpgme_pubkey_algo_t algo)
-+/* Return a public key algorithm string made of the algorithm and size
-+ or the curve name. May return NULL on error. Caller must free the
-+ result using gpgme_free. */
-+char *
-+gpgme_pubkey_algo_string (gpgme_subkey_t subkey)
- {
-- switch (algo)
-+ const char *prefix = NULL;
-+ char *result;
-+
-+ if (!subkey)
- {
-- case GPGME_PK_RSA:
-- return "RSA";
-+ gpg_err_set_errno (EINVAL);
-+ return NULL;
-+ }
-
-+ switch (subkey->pubkey_algo)
-+ {
-+ case GPGME_PK_RSA:
- case GPGME_PK_RSA_E:
-- return "RSA-E";
--
-- case GPGME_PK_RSA_S:
-- return "RSA-S";
--
-- case GPGME_PK_ELG_E:
-- return "ELG-E";
--
-- case GPGME_PK_DSA:
-- return "DSA";
--
-+ case GPGME_PK_RSA_S: prefix = "rsa"; break;
-+ case GPGME_PK_ELG_E: prefix = "elg"; break;
-+ case GPGME_PK_DSA: prefix = "dsa"; break;
-+ case GPGME_PK_ELG: prefix = "xxx"; break;
- case GPGME_PK_ECC:
-- return "ECC";
-+ case GPGME_PK_ECDH:
-+ case GPGME_PK_ECDSA:
-+ case GPGME_PK_EDDSA: prefix = ""; break;
-+ }
-
-- case GPGME_PK_ELG:
-- return "ELG";
-+ if (prefix && *prefix)
-+ {
-+ char buffer[40];
-+ snprintf (buffer, sizeof buffer, "%s%u", prefix, subkey->length);
-+ result = strdup (buffer);
-+ }
-+ else if (prefix && subkey->curve && *subkey->curve)
-+ result = strdup (subkey->curve);
-+ else if (prefix)
-+ result = strdup ("E_error");
-+ else
-+ result = strdup ("unknown");
-
-- case GPGME_PK_ECDSA:
-- return "ECDSA";
-+ return result;
-+}
-
-- case GPGME_PK_ECDH:
-- return "ECDH";
-
-- default:
-- return NULL;
-+const char *
-+gpgme_pubkey_algo_name (gpgme_pubkey_algo_t algo)
-+{
-+ switch (algo)
-+ {
-+ case GPGME_PK_RSA: return "RSA";
-+ case GPGME_PK_RSA_E: return "RSA-E";
-+ case GPGME_PK_RSA_S: return "RSA-S";
-+ case GPGME_PK_ELG_E: return "ELG-E";
-+ case GPGME_PK_DSA: return "DSA";
-+ case GPGME_PK_ECC: return "ECC";
-+ case GPGME_PK_ELG: return "ELG";
-+ case GPGME_PK_ECDSA: return "ECDSA";
-+ case GPGME_PK_ECDH: return "ECDH";
-+ case GPGME_PK_EDDSA: return "EdDSA";
-+ default: return NULL;
- }
- }
-
-diff --git a/src/gpgme.def b/src/gpgme.def
-index a3f5fb4..3b56aaa 100644
---- a/src/gpgme.def
-+++ b/src/gpgme.def
-@@ -223,5 +223,7 @@ EXPORTS
-
- gpgme_set_status_cb @167
- gpgme_get_status_cb @168
-+
-+ gpgme_pubkey_algo_string @169
- ; END
-
-diff --git a/src/gpgme.h.in b/src/gpgme.h.in
-index 6cea2c7..e7216cb 100644
---- a/src/gpgme.h.in
-+++ b/src/gpgme.h.in
-@@ -261,7 +261,8 @@ typedef enum
- GPGME_PK_ECC = 18,
- GPGME_PK_ELG = 20,
- GPGME_PK_ECDSA = 301,
-- GPGME_PK_ECDH = 302
-+ GPGME_PK_ECDH = 302,
-+ GPGME_PK_EDDSA = 303
- }
- gpgme_pubkey_algo_t;
-
-@@ -1218,7 +1219,8 @@ gpgme_error_t gpgme_data_new_from_mem (gpgme_data_t *r_dh,
- size is returned in R_LEN. */
- char *gpgme_data_release_and_get_mem (gpgme_data_t dh, size_t *r_len);
-
--/* Release the memory returned by gpgme_data_release_and_get_mem(). */
-+/* Release the memory returned by gpgme_data_release_and_get_mem() and
-+ some other functions. */
- void gpgme_free (void *buffer);
-
- gpgme_error_t gpgme_data_new_from_cbs (gpgme_data_t *dh,
-@@ -2232,6 +2234,10 @@ gpgme_error_t gpgme_engine_check_version (gpgme_protocol_t proto);
- void gpgme_result_ref (void *result);
- void gpgme_result_unref (void *result);
-
-+/* Return a public key algorithm string (e.g. "rsa2048"). Caller must
-+ free using gpgme_free. */
-+char *gpgme_pubkey_algo_string (gpgme_subkey_t subkey);
-+
- /* Return a statically allocated string with the name of the public
- key algorithm ALGO, or NULL if that name is not known. */
- const char *gpgme_pubkey_algo_name (gpgme_pubkey_algo_t algo);
-diff --git a/src/libgpgme.vers b/src/libgpgme.vers
-index 6687571..c677190 100644
---- a/src/libgpgme.vers
-+++ b/src/libgpgme.vers
-@@ -98,6 +98,8 @@ GPGME_1.1 {
-
- gpgme_set_status_cb;
- gpgme_get_status_cb;
-+
-+ gpgme_pubkey_algo_string;
- };
-
-
---
-2.1.4
diff --git a/patches/gpgme-1.6.0/0001-w32-Fallback-to-2.1-reg-key-for-gpgconf-search.patch b/patches/gpgme-1.6.0/0001-w32-Fallback-to-2.1-reg-key-for-gpgconf-search.patch
deleted file mode 100755
index 52a5cf0..0000000
--- a/patches/gpgme-1.6.0/0001-w32-Fallback-to-2.1-reg-key-for-gpgconf-search.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From bd8d559f2c0cc76d32c3668f70da5d9f1831cbc1 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Tue, 1 Mar 2016 13:11:13 +0100
-Subject: [PATCH] w32: Fallback to 2.1 reg key for gpgconf search
-
-* src/w32-util.c (_gpgme_get_gpgconf_path): Fallback to 2.1 installer
- registry key.
-
---
-Finding gpgconf is utterly important so we should be as compatible
-as possible.
----
- src/w32-util.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/w32-util.c b/src/w32-util.c
-index a27955b..0086fe3 100644
---- a/src/w32-util.c
-+++ b/src/w32-util.c
-@@ -563,15 +563,26 @@ _gpgme_get_gpgconf_path (void)
- gpgconf = find_program_at_standard_place (name2);
- }
-
-- /* 3. Try to find gpgconf.exe using that ancient registry key. This
-- should eventually be removed. */
-+ /* 3. Try to find gpgconf.exe using the Windows registry. */
- if (!gpgconf)
- {
- char *dir;
-
-- dir = read_w32_registry_string ("HKEY_LOCAL_MACHINE",
-+ dir = read_w32_registry_string (NULL,
- "Software\\GNU\\GnuPG",
- "Install Directory");
-+ if (!dir)
-+ {
-+ char *tmp = read_w32_registry_string (NULL,
-+ "Software\\GnuPG",
-+ "Install Directory");
-+ if (tmp)
-+ {
-+ if (gpgrt_asprintf (&dir, "%s\\bin", tmp) == -1)
-+ return NULL;
-+ free (tmp);
-+ }
-+ }
- if (dir)
- {
- gpgconf = find_program_in_dir (dir, name);
---
-2.1.4
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 3 +-
.../0001-Add-gpgme_pubkey_algo_string.patch | 295 ---------------------
...allback-to-2.1-reg-key-for-gpgconf-search.patch | 55 ----
...core-Don-t-split-gpgconf-strings-on-comma.patch | 46 ++++
src/inst-kleopatra.nsi | 40 +++
src/uninst-kleopatra.nsi | 7 +
6 files changed, 94 insertions(+), 352 deletions(-)
delete mode 100755 patches/gpgme-1.6.0/0001-Add-gpgme_pubkey_algo_string.patch
delete mode 100755 patches/gpgme-1.6.0/0001-w32-Fallback-to-2.1-reg-key-for-gpgconf-search.patch
create mode 100755 patches/gpgme-1.9.0/0001-core-Don-t-split-gpgconf-strings-on-comma.patch
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list