From 293038488c9864173d65711abfd0ea6ed219eb93 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 3 Dec 2019 16:37:20 +0100 Subject: [PATCH] upgrade to 2.2.18 --- .gitignore | 2 + ...patch => gnupg-2.2.18-file-is-digest.patch | 46 +++++++++---------- gnupg2.spec | 9 ++-- sources | 4 +- 4 files changed, 33 insertions(+), 28 deletions(-) rename gnupg-2.2.8-file-is-digest.patch => gnupg-2.2.18-file-is-digest.patch (78%) diff --git a/.gitignore b/.gitignore index 704df02..0fbcdc5 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,5 @@ gnupg-2.0.16.tar.bz2.sig /gnupg-2.2.16.tar.bz2.sig /gnupg-2.2.17.tar.bz2 /gnupg-2.2.17.tar.bz2.sig +/gnupg-2.2.18.tar.bz2 +/gnupg-2.2.18.tar.bz2.sig diff --git a/gnupg-2.2.8-file-is-digest.patch b/gnupg-2.2.18-file-is-digest.patch similarity index 78% rename from gnupg-2.2.8-file-is-digest.patch rename to gnupg-2.2.18-file-is-digest.patch index 49345cd..15c3b19 100644 --- a/gnupg-2.2.8-file-is-digest.patch +++ b/gnupg-2.2.18-file-is-digest.patch @@ -1,7 +1,7 @@ -diff -up gnupg-2.2.8/g10/gpg.c.file-is-digest gnupg-2.2.8/g10/gpg.c ---- gnupg-2.2.8/g10/gpg.c.file-is-digest 2018-06-11 10:15:33.755167428 +0200 -+++ gnupg-2.2.8/g10/gpg.c 2018-06-11 10:17:36.352063501 +0200 -@@ -376,6 +376,7 @@ enum cmd_and_opt_values +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 oTTYtype, oLCctype, oLCmessages, @@ -9,7 +9,7 @@ diff -up gnupg-2.2.8/g10/gpg.c.file-is-digest gnupg-2.2.8/g10/gpg.c oXauthority, oGroup, oUnGroup, -@@ -821,6 +822,7 @@ static ARGPARSE_OPTS opts[] = { +@@ -827,6 +828,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.8/g10/gpg.c.file-is-digest gnupg-2.2.8/g10/gpg.c ARGPARSE_s_s (oWeakDigest, "weak-digest","@"), ARGPARSE_s_n (oUnwrap, "unwrap", "@"), ARGPARSE_s_n (oOnlySignTextIDs, "only-sign-text-ids", "@"), -@@ -2390,6 +2392,7 @@ main (int argc, char **argv) +@@ -2410,6 +2412,7 @@ main (int argc, char **argv) opt.keyid_format = KF_NONE; opt.def_sig_expire = "0"; opt.def_cert_expire = "0"; @@ -25,7 +25,7 @@ diff -up gnupg-2.2.8/g10/gpg.c.file-is-digest gnupg-2.2.8/g10/gpg.c gnupg_set_homedir (NULL); opt.passphrase_repeat = 1; opt.emit_version = 0; -@@ -2963,6 +2966,7 @@ main (int argc, char **argv) +@@ -2988,6 +2991,7 @@ main (int argc, char **argv) opt.verify_options&=~VERIFY_SHOW_PHOTOS; break; case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break; @@ -33,9 +33,9 @@ diff -up gnupg-2.2.8/g10/gpg.c.file-is-digest gnupg-2.2.8/g10/gpg.c case oDisableSignerUID: opt.flags.disable_signer_uid = 1; break; -diff -up gnupg-2.2.8/g10/options.h.file-is-digest gnupg-2.2.8/g10/options.h ---- gnupg-2.2.8/g10/options.h.file-is-digest 2018-05-31 12:03:06.000000000 +0200 -+++ gnupg-2.2.8/g10/options.h 2018-06-11 10:15:33.757167476 +0200 +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 int no_auto_check_trustdb; int preserve_permissions; @@ -44,9 +44,9 @@ diff -up gnupg-2.2.8/g10/options.h.file-is-digest gnupg-2.2.8/g10/options.h struct groupitem *grouplist; int mangle_dos_filenames; int enable_progress_filter; -diff -up gnupg-2.2.8/g10/sign.c.file-is-digest gnupg-2.2.8/g10/sign.c ---- gnupg-2.2.8/g10/sign.c.file-is-digest 2017-08-28 12:22:54.000000000 +0200 -+++ gnupg-2.2.8/g10/sign.c 2018-06-11 10:15:33.757167476 +0200 +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 @@ -40,6 +40,7 @@ #include "pkglue.h" #include "../common/sysutils.h" @@ -55,7 +55,7 @@ diff -up gnupg-2.2.8/g10/sign.c.file-is-digest gnupg-2.2.8/g10/sign.c #include "../common/mbox-util.h" #include "../common/compliance.h" -@@ -727,6 +728,8 @@ write_signature_packets (ctrl_t ctrl, +@@ -749,6 +750,8 @@ write_signature_packets (ctrl_t ctrl, if (duration || opt.sig_policy_url || opt.sig_notations || opt.sig_keyserver_url) sig->version = 4; @@ -64,7 +64,7 @@ diff -up gnupg-2.2.8/g10/sign.c.file-is-digest gnupg-2.2.8/g10/sign.c else sig->version = pk->version; -@@ -750,8 +753,10 @@ write_signature_packets (ctrl_t ctrl, +@@ -772,8 +775,10 @@ write_signature_packets (ctrl_t ctrl, mk_notation_policy_etc (sig, NULL, pk); } @@ -75,9 +75,9 @@ diff -up gnupg-2.2.8/g10/sign.c.file-is-digest gnupg-2.2.8/g10/sign.c + gcry_md_final (md); + } - rc = do_sign (ctrl, pk, sig, md, hash_for (pk), cache_nonce); + rc = do_sign (ctrl, pk, sig, md, hash_for (pk), cache_nonce, 0); gcry_md_close (md); -@@ -813,6 +818,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -835,6 +840,8 @@ sign_file (ctrl_t ctrl, strlist_t filena SK_LIST sk_rover = NULL; int multifile = 0; u32 duration=0; @@ -86,7 +86,7 @@ diff -up gnupg-2.2.8/g10/sign.c.file-is-digest gnupg-2.2.8/g10/sign.c pfx = new_progress_context (); afx = new_armor_context (); -@@ -830,7 +837,16 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -852,7 +859,16 @@ sign_file (ctrl_t ctrl, strlist_t filena fname = NULL; if( fname && filenames->next && (!detached || encryptflag) ) @@ -104,7 +104,7 @@ diff -up gnupg-2.2.8/g10/sign.c.file-is-digest gnupg-2.2.8/g10/sign.c if(encryptflag==2 && (rc=setup_symkey(&efx.symkey_s2k,&efx.symkey_dek))) -@@ -851,7 +867,7 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -873,7 +889,7 @@ sign_file (ctrl_t ctrl, strlist_t filena goto leave; /* prepare iobufs */ @@ -113,7 +113,7 @@ diff -up gnupg-2.2.8/g10/sign.c.file-is-digest gnupg-2.2.8/g10/sign.c inp = NULL; /* we do it later */ else { inp = iobuf_open(fname); -@@ -989,7 +1005,7 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1011,7 +1027,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 +122,7 @@ diff -up gnupg-2.2.8/g10/sign.c.file-is-digest gnupg-2.2.8/g10/sign.c iobuf_push_filter( inp, md_filter, &mfx ); if( detached && !encryptflag) -@@ -1044,6 +1060,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1066,6 +1082,8 @@ sign_file (ctrl_t ctrl, strlist_t filena write_status_begin_signing (mfx.md); @@ -131,7 +131,7 @@ diff -up gnupg-2.2.8/g10/sign.c.file-is-digest gnupg-2.2.8/g10/sign.c /* Setup the inner packet. */ if( detached ) { if( multifile ) { -@@ -1084,6 +1102,45 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1106,6 +1124,45 @@ sign_file (ctrl_t ctrl, strlist_t filena if( opt.verbose ) log_printf ("\n"); } @@ -177,7 +177,7 @@ diff -up gnupg-2.2.8/g10/sign.c.file-is-digest gnupg-2.2.8/g10/sign.c else { /* read, so that the filter can calculate the digest */ while( iobuf_get(inp) != -1 ) -@@ -1102,8 +1159,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1124,8 +1181,8 @@ sign_file (ctrl_t ctrl, strlist_t filena /* write the signatures */ rc = write_signature_packets (ctrl, sk_list, out, mfx.md, diff --git a/gnupg2.spec b/gnupg2.spec index 08446e0..774ca17 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -6,8 +6,8 @@ Summary: Utility for secure communication and data storage Name: gnupg2 -Version: 2.2.17 -Release: 3%{?dist} +Version: 2.2.18 +Release: 1%{?dist} License: GPLv3+ Source0: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2 @@ -16,7 +16,7 @@ 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.8-file-is-digest.patch +Patch4: gnupg-2.2.18-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 @@ -204,6 +204,9 @@ make -k check %changelog +* Tue Dec 3 2019 Tomáš Mráz - 2.2.18-1 +- upgrade to 2.2.18 + * Wed Nov 6 2019 Tomáš Mráz - 2.2.17-3 - fix the gnupg(7) manual page (#1769072) diff --git a/sources b/sources index 69514fd..4b69257 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gnupg-2.2.17.tar.bz2) = a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d -SHA512 (gnupg-2.2.17.tar.bz2.sig) = f4d577de99cc1b30e00b5c2f0a7a030d24d3e2ecc623622395b03b24ae32045e513a262e4ec9819b9a11cd1e6671acbb9d588277a4982ff3d589fc9a172d2fa8 +SHA512 (gnupg-2.2.18.tar.bz2) = f1b75e420569982ab3b192fc52f8272c924e07c08ea3d93725f2ba3a25a96d8fedf2f32fabd51cbb978e18fb143c961b02cfaefdb7df0e8097d30a5736f992d2 +SHA512 (gnupg-2.2.18.tar.bz2.sig) = c6197461b96f4cdd61798eff9465cfec6a4cc360464ff2509bce5c10d0e06ad8c05b907b466cff4523ab13d19b4e13819a916d47370731694736ebb1a8dd4c2c