Page MenuHome GnuPG
Files F34113547

No OneTemporary
Actions

View Options

diff --git a/Makefile.am b/Makefile.am
index 59f71a6e..f097f297 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,98 +1,96 @@
# Makefile.am - Installer for GnuPG 4 Windows Makefile.
# Copyright (C) 2005, 2008, 2012 g10 Code GmbH
#
# This file is part of GPG4Win.
#
# GPG4Win is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# GPG4Win is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32
SUBDIRS = po packages doc src
# find patches -type f | sort | sed 's/$/ \\/' | sed 's/^/ /'
EXTRA_DIST = autogen.sh README.GIT ONEWS \
doc/license-page doc/GPLv3 \
build-aux/git-log-footer build-aux/git-log-fix \
patches/glib-2.41.5/01-socket.patch \
patches/qtbase/fix-freetype-link.patch \
patches/qtbase/fix-oci-detect.patch \
patches/qtbase/fix-syssemaphore.patch \
patches/qtbase/fix-zlib-link.patch \
patches/qtbase/relative-paths.patch \
patches/qtbase/fix-fontconfig.patch \
patches/qtbase/config-standardpaths.patch \
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 \
patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch \
patches/kiconthemes/0001-Make-DBus-optional.patch \
patches/qtsvg/qtsvg-link-zlib.patch \
patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
patches/kleopatra/lower-kf5-required.patch \
patches/kleopatra/relax-gpgme-checks.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/libkleo/lower-kf5-required.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
copy-news:
cp NEWS doc/website/NEWS.last
copy-release: gpg4win-$(VERSION).tar.bz2 installers/gpg4win-$(VERSION).exe \
installers/gpg4win-light-$(VERSION).exe \
installers/gpg4win-vanilla-$(VERSION).exe
@echo Copying $(VERSION) to $(RELEASEHOST) >&2
@set -e;\
if ssh "$$(echo $(RELEASEHOST)|cut -d: -f -1)" \
test -f "$$(echo $(RELEASEHOST)/gpg4win-$(VERSION).exe|cut -d: -f2-)";\
then echo "This release has already been copied to the server" >&2 ;\
else scp gpg4win-$(VERSION).tar.bz2 \
installers/gpg4win-$(VERSION).exe \
installers/gpg4win-light-$(VERSION).exe \
installers/gpg4win-vanilla-$(VERSION).exe \
installers/gpg4win-src-$(VERSION).exe $(RELEASEHOST)/ ;\
for f in en de ; do \
scp src/README.$$f.txt \
$(RELEASEHOST)/README-$(VERSION).$$f.txt; \
done;\
fi
dist-hook: gen-ChangeLog
gen_start_date = 2012-03-26T00:00:00
.PHONY: gen-ChangeLog
gen-ChangeLog:
set -e; \
if test -d $(top_srcdir)/.git; then \
(cd $(top_srcdir) && \
$(GITLOG_TO_CHANGELOG) --append-dot --tear-off \
--amend=build-aux/git-log-fix \
--since=$(gen_start_date) ) > $(distdir)/cl-t; \
cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\
rm -f $(distdir)/ChangeLog; \
mv $(distdir)/cl-t $(distdir)/ChangeLog; \
fi
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 0367e4bd..00000000
--- 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@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@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.
-
-+@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
-
-+@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}.
-+@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
--@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.
-+@code{gpgme_data_release_and_get_mem} and
-+@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 52a5cf0b..00000000
--- 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@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

File Metadata

Mime Type
text/x-diff
Expires
Fri, Dec 5, 6:10 PM (1 d, 11 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
2d/a9/88ece3515e1f814631eb0ce17d48

Event Timeline