From 867a8522071184a01eba808c1c02d4569a844b342e506f2969b52423c0c768ba Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Fri, 4 Aug 2017 09:56:51 +0000 Subject: [PATCH] Accepting request 512957 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/512957 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=118 --- gnupg-2.0.18-files-are-digests.patch | 52 ++++++++++++------------ gnupg-2.1.21.tar.bz2 | 3 -- gnupg-2.1.21.tar.bz2.sig | Bin 310 -> 0 bytes gnupg-2.1.22.tar.bz2 | 3 ++ gnupg-2.1.22.tar.bz2.sig | Bin 0 -> 310 bytes gnupg-add_legacy_FIPS_mode_option.patch | 22 +++++----- gpg2.changes | 26 ++++++++++++ gpg2.spec | 11 ++--- 8 files changed, 70 insertions(+), 47 deletions(-) delete mode 100644 gnupg-2.1.21.tar.bz2 delete mode 100644 gnupg-2.1.21.tar.bz2.sig create mode 100644 gnupg-2.1.22.tar.bz2 create mode 100644 gnupg-2.1.22.tar.bz2.sig diff --git a/gnupg-2.0.18-files-are-digests.patch b/gnupg-2.0.18-files-are-digests.patch index 8e1bba7..11dbac6 100644 --- a/gnupg-2.0.18-files-are-digests.patch +++ b/gnupg-2.0.18-files-are-digests.patch @@ -4,11 +4,11 @@ g10/sign.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 67 insertions(+), 6 deletions(-) -Index: gnupg-2.1.21/g10/gpg.c +Index: gnupg-2.1.22/g10/gpg.c =================================================================== ---- gnupg-2.1.21.orig/g10/gpg.c 2017-04-03 17:13:56.000000000 +0200 -+++ gnupg-2.1.21/g10/gpg.c 2017-04-04 15:59:20.823799866 +0200 -@@ -374,6 +374,7 @@ enum cmd_and_opt_values +--- gnupg-2.1.22.orig/g10/gpg.c ++++ gnupg-2.1.22/g10/gpg.c +@@ -379,6 +379,7 @@ enum cmd_and_opt_values oTTYtype, oLCctype, oLCmessages, @@ -16,7 +16,7 @@ Index: gnupg-2.1.21/g10/gpg.c oXauthority, oGroup, oUnGroup, -@@ -820,6 +821,7 @@ static ARGPARSE_OPTS opts[] = { +@@ -828,6 +829,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_s (oWeakDigest, "weak-digest","@"), ARGPARSE_s_n (oUnwrap, "unwrap", "@"), ARGPARSE_s_n (oOnlySignTextIDs, "only-sign-text-ids", "@"), @@ -24,7 +24,7 @@ Index: gnupg-2.1.21/g10/gpg.c /* Aliases. I constantly mistype these, and assume other people do as well. */ -@@ -2393,6 +2395,7 @@ main (int argc, char **argv) +@@ -2383,6 +2385,7 @@ main (int argc, char **argv) opt.def_cert_expire = "0"; gnupg_set_homedir (NULL); opt.passphrase_repeat = 1; @@ -32,7 +32,7 @@ Index: gnupg-2.1.21/g10/gpg.c opt.emit_version = 0; opt.weak_digests = NULL; additional_weak_digest("MD5"); -@@ -2942,6 +2945,7 @@ main (int argc, char **argv) +@@ -2944,6 +2947,7 @@ main (int argc, char **argv) opt.verify_options&=~VERIFY_SHOW_PHOTOS; break; case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break; @@ -40,11 +40,11 @@ Index: gnupg-2.1.21/g10/gpg.c case oForceMDC: opt.force_mdc = 1; break; case oNoForceMDC: opt.force_mdc = 0; break; -Index: gnupg-2.1.21/g10/options.h +Index: gnupg-2.1.22/g10/options.h =================================================================== ---- gnupg-2.1.21.orig/g10/options.h 2017-04-03 17:13:56.000000000 +0200 -+++ gnupg-2.1.21/g10/options.h 2017-04-04 15:59:20.827799905 +0200 -@@ -214,6 +214,7 @@ struct +--- gnupg-2.1.22.orig/g10/options.h ++++ gnupg-2.1.22/g10/options.h +@@ -212,6 +212,7 @@ struct int no_auto_check_trustdb; int preserve_permissions; int no_homedir_creation; @@ -52,20 +52,20 @@ Index: gnupg-2.1.21/g10/options.h struct groupitem *grouplist; int mangle_dos_filenames; int enable_progress_filter; -Index: gnupg-2.1.21/g10/sign.c +Index: gnupg-2.1.22/g10/sign.c =================================================================== ---- gnupg-2.1.21.orig/g10/sign.c 2017-04-03 17:13:56.000000000 +0200 -+++ gnupg-2.1.21/g10/sign.c 2017-04-04 15:59:27.515864763 +0200 -@@ -42,6 +42,8 @@ - #include "call-agent.h" +--- gnupg-2.1.22.orig/g10/sign.c ++++ gnupg-2.1.22/g10/sign.c +@@ -43,6 +43,8 @@ #include "../common/mbox-util.h" + #include "../common/compliance.h" +#include "../common/host2net.h" + #ifdef HAVE_DOSISH_SYSTEM #define LF "\r\n" #else -@@ -695,6 +697,8 @@ write_signature_packets(ctrl_t ctrl, +@@ -727,6 +729,8 @@ write_signature_packets (ctrl_t ctrl, if (duration || opt.sig_policy_url || opt.sig_notations || opt.sig_keyserver_url) sig->version = 4; @@ -73,8 +73,8 @@ Index: gnupg-2.1.21/g10/sign.c + sig->version = 3; else sig->version = pk->version; - -@@ -718,8 +720,12 @@ write_signature_packets (ctrl_t ctrl, + +@@ -750,8 +754,12 @@ write_signature_packets (ctrl_t ctrl, mk_notation_policy_etc (sig, NULL, pk); } @@ -87,7 +87,7 @@ Index: gnupg-2.1.21/g10/sign.c rc = do_sign (ctrl, pk, sig, md, hash_for (pk), cache_nonce); gcry_md_close (md); -@@ -781,6 +787,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -813,6 +821,8 @@ sign_file (ctrl_t ctrl, strlist_t filena SK_LIST sk_rover = NULL; int multifile = 0; u32 duration=0; @@ -96,7 +96,7 @@ Index: gnupg-2.1.21/g10/sign.c pfx = new_progress_context (); afx = new_armor_context (); -@@ -798,7 +806,16 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -830,7 +840,16 @@ sign_file (ctrl_t ctrl, strlist_t filena fname = NULL; if( fname && filenames->next && (!detached || encryptflag) ) @@ -114,7 +114,7 @@ Index: gnupg-2.1.21/g10/sign.c if(encryptflag==2 && (rc=setup_symkey(&efx.symkey_s2k,&efx.symkey_dek))) -@@ -819,7 +836,7 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -851,7 +870,7 @@ sign_file (ctrl_t ctrl, strlist_t filena goto leave; /* prepare iobufs */ @@ -123,7 +123,7 @@ Index: gnupg-2.1.21/g10/sign.c inp = NULL; /* we do it later */ else { inp = iobuf_open(fname); -@@ -957,7 +974,7 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -989,7 +1008,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)); @@ -132,7 +132,7 @@ Index: gnupg-2.1.21/g10/sign.c iobuf_push_filter( inp, md_filter, &mfx ); if( detached && !encryptflag) -@@ -1012,6 +1029,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1044,6 +1063,8 @@ sign_file (ctrl_t ctrl, strlist_t filena write_status_begin_signing (mfx.md); @@ -141,7 +141,7 @@ Index: gnupg-2.1.21/g10/sign.c /* Setup the inner packet. */ if( detached ) { if( multifile ) { -@@ -1052,6 +1071,45 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1084,6 +1105,45 @@ sign_file (ctrl_t ctrl, strlist_t filena if( opt.verbose ) log_printf ("\n"); } @@ -187,7 +187,7 @@ Index: gnupg-2.1.21/g10/sign.c else { /* read, so that the filter can calculate the digest */ while( iobuf_get(inp) != -1 ) -@@ -1070,8 +1128,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1102,8 +1162,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/gnupg-2.1.21.tar.bz2 b/gnupg-2.1.21.tar.bz2 deleted file mode 100644 index dc0cbdc..0000000 --- a/gnupg-2.1.21.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd -size 6472887 diff --git a/gnupg-2.1.21.tar.bz2.sig b/gnupg-2.1.21.tar.bz2.sig deleted file mode 100644 index 0bbb1e244da57f4d6b288a842bf60598d0b35c95543c91255da4d06fbf94b38f..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j-KX(1!T23_i24?49Zn>o@?CF8aQ0$CZkxBvAq9>LT2mnd+@Z;zfg-WR^`VT|36 zbBD4d1>H-UPdc3n*oal*N`=Jbq_w(qnpInQ_K|f8gFf4tV~+w%$q-NPG@Nr;8g#=W zhR6DdJK?=Y4mw>#cA0t|2gtbP;a{iWBtfQUo@?CF8aQ0$F=>e*g*z5G0#9 z(oZGhwiIp%0H(dV|5(j{Rmgs+PRY{3J^n3dGZ7%KAF8HwuP&?NVttqCkT@E>%c-9c zhv$^b&>@%=H_B8nt$5Ov3JiqU#nrMXTHVJk?Aio-nP?NIuLd&yb^5}e$0CM=k-n6A zH@ot*{^a8An?%Vz&^Pm+(*U*NT>dB?4fE^{4_N89(Up(AU6M-83_Hd9F5l*29s?gM ziEsWZ&M!ZkIyltOh^3lQ;X#6(mY%Q2awTZ_@wA0s^LGTE<5PuB5%cgwm;!1m0l(0o z#KqiqXezbEAa?fSEMrv4xUA*)IHr1Thi@dHKJnI>In}W3YwnRkP$Cq(Y4^C(N`SiR IpJwO