rpms/gnupg2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

upgrade to 2.2.19

Browse Source
This commit is contained in:
Tomas Mraz 2020-04-14 16:42:52 +02:00
parent f8044e5875
commit 14008bae6f
5 changed files with 38 additions and 436 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -88,3 +88,5 @@ gnupg-2.0.16.tar.bz2.sig
/gnupg-2.2.18.tar.bz2.sig
/gnupg-2.2.19.tar.bz2
/gnupg-2.2.19.tar.bz2.sig
/gnupg-2.2.20.tar.bz2
/gnupg-2.2.20.tar.bz2.sig

401
gnupg-2.2.19-build.patch
View File

@ -1,401 +0,0 @@
diff -up gnupg-2.2.19/agent/agent.h.build gnupg-2.2.19/agent/agent.h
--- gnupg-2.2.19/agent/agent.h.build 2019-07-09 11:08:44.000000000 +0200
+++ gnupg-2.2.19/agent/agent.h 2020-01-30 16:13:05.470939005 +0100
@@ -37,6 +37,14 @@
#include "../common/session-env.h"
#include "../common/shareddefs.h"
+#ifndef EXTERN_UNLESS_MAIN_MODULE
+#if !defined (INCLUDED_BY_MAIN_MODULE)
+#define EXTERN_UNLESS_MAIN_MODULE extern
+#else
+#define EXTERN_UNLESS_MAIN_MODULE
+#endif
+#endif
+
/* To convey some special hash algorithms we use algorithm numbers
reserved for application use. */
#ifndef GCRY_MODULE_ID_USER
@@ -55,6 +63,7 @@
/* A large struct name "opt" to keep global flags */
+EXTERN_UNLESS_MAIN_MODULE
struct
{
unsigned int debug; /* Debug flags (DBG_foo_VALUE) */
diff -up gnupg-2.2.19/agent/gpg-agent.c.build gnupg-2.2.19/agent/gpg-agent.c
--- gnupg-2.2.19/agent/gpg-agent.c.build 2019-07-09 11:08:45.000000000 +0200
+++ gnupg-2.2.19/agent/gpg-agent.c 2020-01-30 15:43:43.566456867 +0100
@@ -49,6 +49,7 @@
#endif
#include <npth.h>
+#define INCLUDED_BY_MAIN_MODULE 1
#define GNUPG_COMMON_NEED_AFLOCAL
#include "agent.h"
#include <assuan.h> /* Malloc hooks and socket wrappers. */
diff -up gnupg-2.2.19/agent/preset-passphrase.c.build gnupg-2.2.19/agent/preset-passphrase.c
--- gnupg-2.2.19/agent/preset-passphrase.c.build 2019-07-09 11:08:45.000000000 +0200
+++ gnupg-2.2.19/agent/preset-passphrase.c 2020-01-30 16:01:05.992812177 +0100
@@ -44,6 +44,7 @@
# include <windows.h> /* To initialize the sockets. fixme */
#endif
+#define INCLUDED_BY_MAIN_MODULE 1
#include "agent.h"
#include "../common/simple-pwquery.h"
#include "../common/i18n.h"
diff -up gnupg-2.2.19/agent/protect-tool.c.build gnupg-2.2.19/agent/protect-tool.c
--- gnupg-2.2.19/agent/protect-tool.c.build 2019-07-09 11:08:45.000000000 +0200
+++ gnupg-2.2.19/agent/protect-tool.c 2020-01-30 16:00:35.188363339 +0100
@@ -38,6 +38,7 @@
#include <fcntl.h> /* for setmode() */
#endif
+#define INCLUDED_BY_MAIN_MODULE 1
#include "agent.h"
#include "../common/i18n.h"
#include "../common/get-passphrase.h"
diff -up gnupg-2.2.19/agent/t-protect.c.build gnupg-2.2.19/agent/t-protect.c
--- gnupg-2.2.19/agent/t-protect.c.build 2017-12-08 07:40:06.000000000 +0100
+++ gnupg-2.2.19/agent/t-protect.c 2020-01-30 16:01:22.903509604 +0100
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <assert.h>
+#define INCLUDED_BY_MAIN_MODULE 1
#include "agent.h"
diff -up gnupg-2.2.19/common/iobuf.c.build gnupg-2.2.19/common/iobuf.c
--- gnupg-2.2.19/common/iobuf.c.build 2019-07-09 11:08:45.000000000 +0200
+++ gnupg-2.2.19/common/iobuf.c 2020-01-29 19:10:03.488980061 +0100
@@ -118,6 +118,7 @@ struct close_cache_s
typedef struct close_cache_s *close_cache_t;
static close_cache_t close_cache;
+int iobuf_debug_mode;
#ifdef HAVE_W32_SYSTEM
diff -up gnupg-2.2.19/common/iobuf.h.build gnupg-2.2.19/common/iobuf.h
--- gnupg-2.2.19/common/iobuf.h.build 2017-02-24 13:46:24.000000000 +0100
+++ gnupg-2.2.19/common/iobuf.h 2020-01-30 10:14:21.404483909 +0100
@@ -249,14 +249,7 @@ struct iobuf_struct
int subno;
};
-#ifndef EXTERN_UNLESS_MAIN_MODULE
-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
-#define EXTERN_UNLESS_MAIN_MODULE extern
-#else
-#define EXTERN_UNLESS_MAIN_MODULE
-#endif
-#endif
-EXTERN_UNLESS_MAIN_MODULE int iobuf_debug_mode;
+extern int iobuf_debug_mode;
/* Returns whether the specified filename corresponds to a pipe. In
diff -up gnupg-2.2.19/dirmngr/dirmngr.c.build gnupg-2.2.19/dirmngr/dirmngr.c
--- gnupg-2.2.19/dirmngr/dirmngr.c.build 2019-11-12 20:14:44.000000000 +0100
+++ gnupg-2.2.19/dirmngr/dirmngr.c 2020-01-30 16:30:39.650080724 +0100
@@ -55,6 +55,7 @@
#endif /*HTTP_USE_GNUTLS*/
+#define INCLUDED_BY_MAIN_MODULE 1
#define GNUPG_COMMON_NEED_AFLOCAL
#include "dirmngr.h"
diff -up gnupg-2.2.19/dirmngr/dirmngr.h.build gnupg-2.2.19/dirmngr/dirmngr.h
--- gnupg-2.2.19/dirmngr/dirmngr.h.build 2019-11-18 18:44:30.000000000 +0100
+++ gnupg-2.2.19/dirmngr/dirmngr.h 2020-01-30 16:30:12.250570852 +0100
@@ -39,6 +39,14 @@
#include "dirmngr-status.h"
#include "http.h" /* (parsed_uri_t) */
+#ifndef EXTERN_UNLESS_MAIN_MODULE
+#if !defined (INCLUDED_BY_MAIN_MODULE)
+#define EXTERN_UNLESS_MAIN_MODULE extern
+#else
+#define EXTERN_UNLESS_MAIN_MODULE
+#endif
+#endif
+
/* This objects keeps information about a particular LDAP server and
is used as item of a single linked list of servers. */
struct ldap_server_s
@@ -76,6 +84,7 @@ struct fingerprint_list_s
/* A large struct named "opt" to keep global flags. */
+EXTERN_UNLESS_MAIN_MODULE
struct
{
unsigned int debug; /* debug flags (DBG_foo_VALUE) */
diff -up gnupg-2.2.19/g10/gpgcompose.c.build gnupg-2.2.19/g10/gpgcompose.c
--- gnupg-2.2.19/g10/gpgcompose.c.build 2019-07-09 11:08:45.000000000 +0200
+++ gnupg-2.2.19/g10/gpgcompose.c 2020-01-30 10:06:13.924966959 +0100
@@ -20,6 +20,7 @@
#include <config.h>
#include <errno.h>
+#define INCLUDED_BY_MAIN_MODULE 1
#include "gpg.h"
#include "packet.h"
#include "keydb.h"
diff -up gnupg-2.2.19/g10/options.h.build gnupg-2.2.19/g10/options.h
--- gnupg-2.2.19/g10/options.h.build 2020-01-29 12:54:10.308621663 +0100
+++ gnupg-2.2.19/g10/options.h 2020-01-29 19:10:44.659238547 +0100
@@ -32,7 +32,7 @@
#ifndef EXTERN_UNLESS_MAIN_MODULE
/* Norcraft can't cope with common symbols */
-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
+#if !defined (INCLUDED_BY_MAIN_MODULE)
#define EXTERN_UNLESS_MAIN_MODULE extern
#else
#define EXTERN_UNLESS_MAIN_MODULE
diff -up gnupg-2.2.19/g10/test.c.build gnupg-2.2.19/g10/test.c
--- gnupg-2.2.19/g10/test.c.build 2017-02-10 17:24:08.000000000 +0100
+++ gnupg-2.2.19/g10/test.c 2020-01-30 10:06:33.522624663 +0100
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <string.h>
+#define INCLUDED_BY_MAIN_MODULE 1
#include "gpg.h"
/* A unit test consists of one or more tests. Tests can be broken
diff -up gnupg-2.2.19/g13/g13.c.build gnupg-2.2.19/g13/g13.c
--- gnupg-2.2.19/g13/g13.c.build 2017-08-28 12:22:54.000000000 +0200
+++ gnupg-2.2.19/g13/g13.c 2020-01-30 16:18:25.927205688 +0100
@@ -27,6 +27,7 @@
#include <fcntl.h>
#include <npth.h>
+#define INCLUDED_BY_MAIN_MODULE 1
#include "g13.h"
#include <gcrypt.h>
diff -up gnupg-2.2.19/g13/g13-common.h.build gnupg-2.2.19/g13/g13-common.h
--- gnupg-2.2.19/g13/g13-common.h.build 2017-08-28 12:22:54.000000000 +0200
+++ gnupg-2.2.19/g13/g13-common.h 2020-01-30 16:20:02.257482517 +0100
@@ -32,6 +32,13 @@
#include "../common/session-env.h"
#include "../common/strlist.h"
+#ifndef EXTERN_UNLESS_MAIN_MODULE
+#if !defined (INCLUDED_BY_MAIN_MODULE)
+#define EXTERN_UNLESS_MAIN_MODULE extern
+#else
+#define EXTERN_UNLESS_MAIN_MODULE
+#endif
+#endif
/* Debug values and macros. */
#define DBG_MOUNT_VALUE 1 /* Debug mount or device stuff. */
@@ -48,6 +55,7 @@
/* A large struct named "opt" to keep global flags. Note that this
struct is used by g13 and g13-syshelp and thus some fields may only
make sense for one of them. */
+EXTERN_UNLESS_MAIN_MODULE
struct
{
unsigned int debug; /* Debug flags (DBG_foo_VALUE). */
diff -up gnupg-2.2.19/g13/g13-syshelp.c.build gnupg-2.2.19/g13/g13-syshelp.c
--- gnupg-2.2.19/g13/g13-syshelp.c.build 2017-08-28 12:22:54.000000000 +0200
+++ gnupg-2.2.19/g13/g13-syshelp.c 2020-01-30 16:18:15.861385748 +0100
@@ -31,6 +31,7 @@
#endif
#include <unistd.h>
+#define INCLUDED_BY_MAIN_MODULE 1
#include "g13-syshelp.h"
#include <gcrypt.h>
diff -up gnupg-2.2.19/scd/scdaemon.c.build gnupg-2.2.19/scd/scdaemon.c
--- gnupg-2.2.19/scd/scdaemon.c.build 2020-01-29 12:54:10.340621101 +0100
+++ gnupg-2.2.19/scd/scdaemon.c 2020-01-30 16:13:38.942340121 +0100
@@ -37,6 +37,7 @@
#include <signal.h>
#include <npth.h>
+#define INCLUDED_BY_MAIN_MODULE 1
#define GNUPG_COMMON_NEED_AFLOCAL
#include "scdaemon.h"
#include <ksba.h>
diff -up gnupg-2.2.19/scd/scdaemon.h.build gnupg-2.2.19/scd/scdaemon.h
--- gnupg-2.2.19/scd/scdaemon.h.build 2019-07-09 11:08:45.000000000 +0200
+++ gnupg-2.2.19/scd/scdaemon.h 2020-01-30 16:12:58.986055034 +0100
@@ -31,6 +31,14 @@
#include "../common/util.h"
#include "../common/sysutils.h"
+#ifndef EXTERN_UNLESS_MAIN_MODULE
+#if !defined (INCLUDED_BY_MAIN_MODULE)
+#define EXTERN_UNLESS_MAIN_MODULE extern
+#else
+#define EXTERN_UNLESS_MAIN_MODULE
+#endif
+#endif
+
/* To convey some special hash algorithms we use algorithm numbers
reserved for application use. */
#ifndef GCRY_MODULE_ID_USER
@@ -44,6 +52,7 @@
/* A large struct name "opt" to keep global flags. */
+EXTERN_UNLESS_MAIN_MODULE
struct
{
unsigned int debug; /* Debug flags (DBG_foo_VALUE). */
diff -up gnupg-2.2.19/sm/gpgsm.c.build gnupg-2.2.19/sm/gpgsm.c
--- gnupg-2.2.19/sm/gpgsm.c.build 2020-01-29 12:54:10.306621698 +0100
+++ gnupg-2.2.19/sm/gpgsm.c 2020-01-30 10:24:17.199619771 +0100
@@ -28,6 +28,8 @@
#include <fcntl.h>
/*#include <mcheck.h>*/
+#define INCLUDED_BY_MAIN_MODULE 1
+
#include "gpgsm.h"
#include <gcrypt.h>
#include <assuan.h> /* malloc hooks */
diff -up gnupg-2.2.19/sm/gpgsm.h.build gnupg-2.2.19/sm/gpgsm.h
--- gnupg-2.2.19/sm/gpgsm.h.build 2019-12-06 20:32:57.000000000 +0100
+++ gnupg-2.2.19/sm/gpgsm.h 2020-01-30 15:36:11.325545926 +0100
@@ -36,6 +36,13 @@
#include "../common/ksba-io-support.h"
#include "../common/compliance.h"
+#ifndef EXTERN_UNLESS_MAIN_MODULE
+#if !defined (INCLUDED_BY_MAIN_MODULE)
+#define EXTERN_UNLESS_MAIN_MODULE extern
+#else
+#define EXTERN_UNLESS_MAIN_MODULE
+#endif
+#endif
#define MAX_DIGEST_LEN 64
@@ -52,7 +59,7 @@ struct keyserver_spec
/* A large struct named "opt" to keep global flags. */
-struct
+EXTERN_UNLESS_MAIN_MODULE struct
{
unsigned int debug; /* debug flags (DBG_foo_VALUE) */
int verbose; /* verbosity level */
diff -up gnupg-2.2.19/tools/gpgconf.c.build gnupg-2.2.19/tools/gpgconf.c
--- gnupg-2.2.19/tools/gpgconf.c.build 2019-07-09 11:08:45.000000000 +0200
+++ gnupg-2.2.19/tools/gpgconf.c 2020-01-30 16:42:05.759830715 +0100
@@ -25,6 +25,7 @@
#include <string.h>
#include <unistd.h>
+#define INCLUDED_BY_MAIN_MODULE 1
#include "gpgconf.h"
#include "../common/i18n.h"
#include "../common/sysutils.h"
diff -up gnupg-2.2.19/tools/gpgconf.h.build gnupg-2.2.19/tools/gpgconf.h
--- gnupg-2.2.19/tools/gpgconf.h.build 2019-02-26 13:15:58.000000000 +0100
+++ gnupg-2.2.19/tools/gpgconf.h 2020-01-30 16:41:48.570137395 +0100
@@ -22,7 +22,16 @@
#include "../common/util.h"
+#ifndef EXTERN_UNLESS_MAIN_MODULE
+#if !defined (INCLUDED_BY_MAIN_MODULE)
+#define EXTERN_UNLESS_MAIN_MODULE extern
+#else
+#define EXTERN_UNLESS_MAIN_MODULE
+#endif
+#endif
+
/* We keep all global options in the structure OPT. */
+EXTERN_UNLESS_MAIN_MODULE
struct
{
int verbose; /* Verbosity level. */
diff -up gnupg-2.2.19/tools/gpgtar.c.build gnupg-2.2.19/tools/gpgtar.c
--- gnupg-2.2.19/tools/gpgtar.c.build 2019-03-07 10:56:18.000000000 +0100
+++ gnupg-2.2.19/tools/gpgtar.c 2020-01-30 16:53:24.787712030 +0100
@@ -34,6 +34,7 @@
#include <string.h>
#include <assert.h>
+#define INCLUDED_BY_MAIN_MODULE 1
#include "../common/util.h"
#include "../common/i18n.h"
#include "../common/sysutils.h"
diff -up gnupg-2.2.19/tools/gpgtar.h.build gnupg-2.2.19/tools/gpgtar.h
--- gnupg-2.2.19/tools/gpgtar.h.build 2019-07-09 11:08:45.000000000 +0200
+++ gnupg-2.2.19/tools/gpgtar.h 2020-01-30 16:54:07.348951287 +0100
@@ -23,7 +23,16 @@
#include "../common/util.h"
#include "../common/strlist.h"
+#ifndef EXTERN_UNLESS_MAIN_MODULE
+#if !defined (INCLUDED_BY_MAIN_MODULE)
+#define EXTERN_UNLESS_MAIN_MODULE extern
+#else
+#define EXTERN_UNLESS_MAIN_MODULE
+#endif
+#endif
+
/* We keep all global options in the structure OPT. */
+EXTERN_UNLESS_MAIN_MODULE
struct
{
int verbose;
diff -up gnupg-2.2.19/tools/gpg-wks-client.c.build gnupg-2.2.19/tools/gpg-wks-client.c
--- gnupg-2.2.19/tools/gpg-wks-client.c.build 2019-07-09 11:08:45.000000000 +0200
+++ gnupg-2.2.19/tools/gpg-wks-client.c 2020-01-30 16:39:54.755167950 +0100
@@ -25,6 +25,7 @@
#include <sys/types.h>
#include <sys/stat.h>
+#define INCLUDED_BY_MAIN_MODULE 1
#include "../common/util.h"
#include "../common/status.h"
#include "../common/i18n.h"
diff -up gnupg-2.2.19/tools/gpg-wks.h.build gnupg-2.2.19/tools/gpg-wks.h
--- gnupg-2.2.19/tools/gpg-wks.h.build 2019-03-25 15:14:32.000000000 +0100
+++ gnupg-2.2.19/tools/gpg-wks.h 2020-01-30 16:40:52.412139301 +0100
@@ -25,11 +25,20 @@
#include "../common/strlist.h"
#include "mime-maker.h"
+#ifndef EXTERN_UNLESS_MAIN_MODULE
+#if !defined (INCLUDED_BY_MAIN_MODULE)
+#define EXTERN_UNLESS_MAIN_MODULE extern
+#else
+#define EXTERN_UNLESS_MAIN_MODULE
+#endif
+#endif
+
/* The draft version we implement. */
#define WKS_DRAFT_VERSION 3
/* We keep all global options in the structure OPT. */
+EXTERN_UNLESS_MAIN_MODULE
struct
{
int verbose;
diff -up gnupg-2.2.19/tools/gpg-wks-server.c.build gnupg-2.2.19/tools/gpg-wks-server.c
--- gnupg-2.2.19/tools/gpg-wks-server.c.build 2019-03-25 14:41:44.000000000 +0100
+++ gnupg-2.2.19/tools/gpg-wks-server.c 2020-01-30 16:40:05.052984229 +0100
@@ -32,6 +32,7 @@
#include <sys/stat.h>
#include <dirent.h>
+#define INCLUDED_BY_MAIN_MODULE 1
#include "../common/util.h"
#include "../common/init.h"
#include "../common/sysutils.h"

57
gnupg-2.2.18-file-is-digest.patch → gnupg-2.2.20-file-is-digest.patch
View File

@ -1,7 +1,7 @@
diff -up gnupg-2.2.18/g10/gpg.c.file-is-digest gnupg-2.2.18/g10/gpg.c
--- gnupg-2.2.18/g10/gpg.c.file-is-digest 2019-12-03 16:26:24.108285580 +0100
+++ gnupg-2.2.18/g10/gpg.c 2019-12-03 16:26:24.111285527 +0100
@@ -378,6 +378,7 @@ enum cmd_and_opt_values
diff -up gnupg-2.2.20/g10/gpg.c.file-is-digest gnupg-2.2.20/g10/gpg.c
--- gnupg-2.2.20/g10/gpg.c.file-is-digest 2020-04-14 16:33:42.630269318 +0200
+++ gnupg-2.2.20/g10/gpg.c 2020-04-14 16:34:46.455100086 +0200
@@ -380,6 +380,7 @@ enum cmd_and_opt_values
oTTYtype,
oLCctype,
oLCmessages,
@ -9,7 +9,7 @@ diff -up gnupg-2.2.18/g10/gpg.c.file-is-digest gnupg-2.2.18/g10/gpg.c
oXauthority,
oGroup,
oUnGroup,
@@ -827,6 +828,7 @@ static ARGPARSE_OPTS opts[] = {
@@ -831,6 +832,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_s (oPersonalCompressPreferences,
"personal-compress-preferences", "@"),
ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
@ -17,7 +17,7 @@ diff -up gnupg-2.2.18/g10/gpg.c.file-is-digest gnupg-2.2.18/g10/gpg.c
ARGPARSE_s_s (oWeakDigest, "weak-digest","@"),
ARGPARSE_s_n (oUnwrap, "unwrap", "@"),
ARGPARSE_s_n (oOnlySignTextIDs, "only-sign-text-ids", "@"),
@@ -2410,6 +2412,7 @@ main (int argc, char **argv)
@@ -2419,6 +2421,7 @@ main (int argc, char **argv)
opt.keyid_format = KF_NONE;
opt.def_sig_expire = "0";
opt.def_cert_expire = "0";
@ -25,18 +25,18 @@ diff -up gnupg-2.2.18/g10/gpg.c.file-is-digest gnupg-2.2.18/g10/gpg.c
gnupg_set_homedir (NULL);
opt.passphrase_repeat = 1;
opt.emit_version = 0;
@@ -2988,6 +2991,7 @@ main (int argc, char **argv)
@@ -2997,6 +3000,7 @@ main (int argc, char **argv)
opt.verify_options&=~VERIFY_SHOW_PHOTOS;
break;
case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break;
+ case oFileIsDigest: opt.file_is_digest = 1; break;
case oDisableSignerUID: opt.flags.disable_signer_uid = 1; break;
diff -up gnupg-2.2.18/g10/options.h.file-is-digest gnupg-2.2.18/g10/options.h
--- gnupg-2.2.18/g10/options.h.file-is-digest 2019-11-11 12:25:05.000000000 +0100
+++ gnupg-2.2.18/g10/options.h 2019-12-03 16:26:24.111285527 +0100
@@ -210,6 +210,7 @@ struct
case oIncludeKeyBlock: opt.flags.include_key_block = 1; break;
diff -up gnupg-2.2.20/g10/options.h.file-is-digest gnupg-2.2.20/g10/options.h
--- gnupg-2.2.20/g10/options.h.file-is-digest 2020-03-14 19:54:05.000000000 +0100
+++ gnupg-2.2.20/g10/options.h 2020-04-14 16:33:42.634269245 +0200
@@ -202,6 +202,7 @@ struct
int no_auto_check_trustdb;
int preserve_permissions;
int no_homedir_creation;
@ -44,9 +44,9 @@ diff -up gnupg-2.2.18/g10/options.h.file-is-digest gnupg-2.2.18/g10/options.h
struct groupitem *grouplist;
int mangle_dos_filenames;
int enable_progress_filter;
diff -up gnupg-2.2.18/g10/sign.c.file-is-digest gnupg-2.2.18/g10/sign.c
--- gnupg-2.2.18/g10/sign.c.file-is-digest 2019-11-11 12:38:48.000000000 +0100
+++ gnupg-2.2.18/g10/sign.c 2019-12-03 16:28:19.707231761 +0100
diff -up gnupg-2.2.20/g10/sign.c.file-is-digest gnupg-2.2.20/g10/sign.c
--- gnupg-2.2.20/g10/sign.c.file-is-digest 2020-03-14 19:35:46.000000000 +0100
+++ gnupg-2.2.20/g10/sign.c 2020-04-14 16:36:54.661751422 +0200
@@ -40,6 +40,7 @@
#include "pkglue.h"
#include "../common/sysutils.h"
@ -55,7 +55,7 @@ diff -up gnupg-2.2.18/g10/sign.c.file-is-digest gnupg-2.2.18/g10/sign.c
#include "../common/mbox-util.h"
#include "../common/compliance.h"
@@ -749,6 +750,8 @@ write_signature_packets (ctrl_t ctrl,
@@ -834,6 +835,8 @@ write_signature_packets (ctrl_t ctrl,
if (duration || opt.sig_policy_url
|| opt.sig_notations || opt.sig_keyserver_url)
sig->version = 4;
@ -64,20 +64,21 @@ diff -up gnupg-2.2.18/g10/sign.c.file-is-digest gnupg-2.2.18/g10/sign.c
else
sig->version = pk->version;
@@ -772,8 +775,10 @@ write_signature_packets (ctrl_t ctrl,
mk_notation_policy_etc (sig, NULL, pk);
@@ -860,8 +863,11 @@ write_signature_packets (ctrl_t ctrl,
else
err = 0;
}
- hash_sigversion_to_magic (md, sig);
- gcry_md_final (md);
+
+ if (!opt.file_is_digest) {
+ hash_sigversion_to_magic (md, sig);
+ gcry_md_final (md);
+ }
rc = do_sign (ctrl, pk, sig, md, hash_for (pk), cache_nonce, 0);
gcry_md_close (md);
@@ -835,6 +840,8 @@ sign_file (ctrl_t ctrl, strlist_t filena
if (!err)
err = do_sign (ctrl, pk, sig, md, hash_for (pk), cache_nonce, 0);
@@ -924,6 +930,8 @@ sign_file (ctrl_t ctrl, strlist_t filena
SK_LIST sk_rover = NULL;
int multifile = 0;
u32 duration=0;
@ -86,7 +87,7 @@ diff -up gnupg-2.2.18/g10/sign.c.file-is-digest gnupg-2.2.18/g10/sign.c
pfx = new_progress_context ();
afx = new_armor_context ();
@@ -852,7 +859,16 @@ sign_file (ctrl_t ctrl, strlist_t filena
@@ -941,7 +949,16 @@ sign_file (ctrl_t ctrl, strlist_t filena
fname = NULL;
if( fname && filenames->next && (!detached || encryptflag) )
@ -104,7 +105,7 @@ diff -up gnupg-2.2.18/g10/sign.c.file-is-digest gnupg-2.2.18/g10/sign.c
if(encryptflag==2
&& (rc=setup_symkey(&efx.symkey_s2k,&efx.symkey_dek)))
@@ -873,7 +889,7 @@ sign_file (ctrl_t ctrl, strlist_t filena
@@ -962,7 +979,7 @@ sign_file (ctrl_t ctrl, strlist_t filena
goto leave;
/* prepare iobufs */
@ -113,7 +114,7 @@ diff -up gnupg-2.2.18/g10/sign.c.file-is-digest gnupg-2.2.18/g10/sign.c
inp = NULL; /* we do it later */
else {
inp = iobuf_open(fname);
@@ -1011,7 +1027,7 @@ sign_file (ctrl_t ctrl, strlist_t filena
@@ -1100,7 +1117,7 @@ sign_file (ctrl_t ctrl, strlist_t filena
for (sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next)
gcry_md_enable (mfx.md, hash_for (sk_rover->pk));
@ -122,7 +123,7 @@ diff -up gnupg-2.2.18/g10/sign.c.file-is-digest gnupg-2.2.18/g10/sign.c
iobuf_push_filter( inp, md_filter, &mfx );
if( detached && !encryptflag)
@@ -1066,6 +1082,8 @@ sign_file (ctrl_t ctrl, strlist_t filena
@@ -1155,6 +1172,8 @@ sign_file (ctrl_t ctrl, strlist_t filena
write_status_begin_signing (mfx.md);
@ -131,7 +132,7 @@ diff -up gnupg-2.2.18/g10/sign.c.file-is-digest gnupg-2.2.18/g10/sign.c
/* Setup the inner packet. */
if( detached ) {
if( multifile ) {
@@ -1106,6 +1124,45 @@ sign_file (ctrl_t ctrl, strlist_t filena
@@ -1195,6 +1214,45 @@ sign_file (ctrl_t ctrl, strlist_t filena
if( opt.verbose )
log_printf ("\n");
}
@ -177,7 +178,7 @@ diff -up gnupg-2.2.18/g10/sign.c.file-is-digest gnupg-2.2.18/g10/sign.c
else {
/* read, so that the filter can calculate the digest */
while( iobuf_get(inp) != -1 )
@@ -1124,8 +1181,8 @@ sign_file (ctrl_t ctrl, strlist_t filena
@@ -1213,8 +1271,8 @@ sign_file (ctrl_t ctrl, strlist_t filena
/* write the signatures */
rc = write_signature_packets (ctrl, sk_list, out, mfx.md,

10
gnupg2.spec
View File

@ -6,7 +6,7 @@
Summary: Utility for secure communication and data storage
Name: gnupg2
Version: 2.2.19
Version: 2.2.20
Release: 1%{?dist}
License: GPLv3+
@ -16,14 +16,12 @@ Patch1: gnupg-2.1.21-insttools.patch
# needed for compatibility with system FIPS mode
Patch3: gnupg-2.1.10-secmem.patch
# non-upstreamable patch adding file-is-digest option needed for Copr
Patch4: gnupg-2.2.18-file-is-digest.patch
Patch4: gnupg-2.2.20-file-is-digest.patch
# fix handling of missing key usage on ocsp replies - upstream T1333
Patch5: gnupg-2.2.16-ocsp-keyusage.patch
Patch6: gnupg-2.1.1-fips-algo.patch
# allow 8192 bit RSA keys in keygen UI with large RSA
Patch9: gnupg-2.1.21-large-rsa.patch
# avoid duplicated globals to make it build
Patch10: gnupg-2.2.19-build.patch
# fix missing uid on refresh from keys.openpgp.org
# https://salsa.debian.org/debian/gnupg2/commit/f292beac1171c6c77faf41d1f88c2e0942ed4437
Patch20: gnupg-2.2.18-tests-add-test-cases-for-import-without-uid.patch
@ -106,7 +104,6 @@ to the base GnuPG package
%patch5 -p1 -b .keyusage
%patch6 -p1 -b .fips
%patch9 -p1 -b .large-rsa
%patch10 -p1 -b .build
%patch20 -p1 -b .test_missing_uid
%patch21 -p1 -b .prev_known_key
@ -217,6 +214,9 @@ make -k check
%changelog
* Tue Apr 14 2020 Tomáš Mráz <tmraz@redhat.com> - 2.2.20-1
- upgrade to 2.2.20
* Wed Jan 29 2020 Tomáš Mráz <tmraz@redhat.com> - 2.2.19-1
- upgrade to 2.2.19

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (gnupg-2.2.19.tar.bz2) = d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd
SHA512 (gnupg-2.2.19.tar.bz2.sig) = ecd5d3833f70acc389a0a52a0d91d0e899c4b2faebb0b761024ef34601123d26ffb17dac795bff7fd952c0685e14fe9045435b63fb29ee55664974062a0a308c
SHA512 (gnupg-2.2.20.tar.bz2) = 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc
SHA512 (gnupg-2.2.20.tar.bz2.sig) = fc6af8bf437cb8dd427e3c085fc65c8580bdba307b9a73326a84240d6911d3b1b9dd1f90ac28dd1e51a1afe9a8d619659c3b6eced66d15269ad19ac04d86b7da