diff --git a/gnupg-2.2.25.tar.bz2 b/gnupg-2.2.25.tar.bz2 deleted file mode 100644 index f548d30..0000000 --- a/gnupg-2.2.25.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c55307b247af4b6f44d2916a25ffd1fb64ce2e509c3c3d028dbe7fbf309dc30a -size 7195857 diff --git a/gnupg-2.2.25.tar.bz2.sig b/gnupg-2.2.25.tar.bz2.sig deleted file mode 100644 index 15035b7..0000000 Binary files a/gnupg-2.2.25.tar.bz2.sig and /dev/null differ diff --git a/gnupg-2.2.27.tar.bz2 b/gnupg-2.2.27.tar.bz2 new file mode 100644 index 0000000..451f1a3 --- /dev/null +++ b/gnupg-2.2.27.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399 +size 7191555 diff --git a/gnupg-2.2.27.tar.bz2.sig b/gnupg-2.2.27.tar.bz2.sig new file mode 100644 index 0000000..8c34ebe Binary files /dev/null and b/gnupg-2.2.27.tar.bz2.sig differ diff --git a/gnupg-2.2.8-files-are-digests.patch b/gnupg-2.2.8-files-are-digests.patch index b64927d..92992b2 100644 --- a/gnupg-2.2.8-files-are-digests.patch +++ b/gnupg-2.2.8-files-are-digests.patch @@ -4,11 +4,11 @@ g10/sign.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 67 insertions(+), 6 deletions(-) -Index: gnupg-2.2.20/g10/gpg.c +Index: gnupg-2.2.27/g10/gpg.c =================================================================== ---- gnupg-2.2.20.orig/g10/gpg.c -+++ gnupg-2.2.20/g10/gpg.c -@@ -380,6 +380,7 @@ enum cmd_and_opt_values +--- gnupg-2.2.27.orig/g10/gpg.c ++++ gnupg-2.2.27/g10/gpg.c +@@ -382,6 +382,7 @@ enum cmd_and_opt_values oTTYtype, oLCctype, oLCmessages, @@ -16,7 +16,7 @@ Index: gnupg-2.2.20/g10/gpg.c oXauthority, oGroup, oUnGroup, -@@ -834,6 +835,7 @@ static ARGPARSE_OPTS opts[] = { +@@ -838,6 +839,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.2.20/g10/gpg.c /* Aliases. I constantly mistype these, and assume other people do as well. */ -@@ -2421,6 +2423,7 @@ main (int argc, char **argv) +@@ -2372,6 +2374,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.2.20/g10/gpg.c opt.emit_version = 0; opt.weak_digests = NULL; -@@ -2997,6 +3000,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,10 +40,10 @@ Index: gnupg-2.2.20/g10/gpg.c case oDisableSignerUID: opt.flags.disable_signer_uid = 1; break; case oIncludeKeyBlock: opt.flags.include_key_block = 1; break; -Index: gnupg-2.2.20/g10/options.h +Index: gnupg-2.2.27/g10/options.h =================================================================== ---- gnupg-2.2.20.orig/g10/options.h -+++ gnupg-2.2.20/g10/options.h +--- gnupg-2.2.27.orig/g10/options.h ++++ gnupg-2.2.27/g10/options.h @@ -202,6 +202,7 @@ struct int no_auto_check_trustdb; int preserve_permissions; @@ -52,10 +52,10 @@ Index: gnupg-2.2.20/g10/options.h struct groupitem *grouplist; int mangle_dos_filenames; int enable_progress_filter; -Index: gnupg-2.2.20/g10/sign.c +Index: gnupg-2.2.27/g10/sign.c =================================================================== ---- gnupg-2.2.20.orig/g10/sign.c -+++ gnupg-2.2.20/g10/sign.c +--- gnupg-2.2.27.orig/g10/sign.c ++++ gnupg-2.2.27/g10/sign.c @@ -43,6 +43,8 @@ #include "../common/mbox-util.h" #include "../common/compliance.h" @@ -65,7 +65,7 @@ Index: gnupg-2.2.20/g10/sign.c #ifdef HAVE_DOSISH_SYSTEM #define LF "\r\n" #else -@@ -834,6 +836,8 @@ write_signature_packets (ctrl_t ctrl, +@@ -844,6 +846,8 @@ write_signature_packets (ctrl_t ctrl, if (duration || opt.sig_policy_url || opt.sig_notations || opt.sig_keyserver_url) sig->version = 4; @@ -74,10 +74,10 @@ Index: gnupg-2.2.20/g10/sign.c else sig->version = pk->version; -@@ -860,8 +864,12 @@ write_signature_packets (ctrl_t ctrl, - else - err = 0; +@@ -872,8 +876,12 @@ write_signature_packets (ctrl_t ctrl, } + else + err = 0; /* Actually never reached. */ + if (!opt.files_are_digests) { hash_sigversion_to_magic (md, sig); gcry_md_final (md); @@ -87,7 +87,7 @@ Index: gnupg-2.2.20/g10/sign.c if (!err) err = do_sign (ctrl, pk, sig, md, hash_for (pk), cache_nonce, 0); -@@ -924,6 +932,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -937,6 +945,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.2.20/g10/sign.c pfx = new_progress_context (); afx = new_armor_context (); -@@ -941,7 +951,16 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -954,7 +964,16 @@ sign_file (ctrl_t ctrl, strlist_t filena fname = NULL; if( fname && filenames->next && (!detached || encryptflag) ) @@ -114,7 +114,7 @@ Index: gnupg-2.2.20/g10/sign.c if(encryptflag==2 && (rc=setup_symkey(&efx.symkey_s2k,&efx.symkey_dek))) -@@ -962,7 +981,7 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -975,7 +994,7 @@ sign_file (ctrl_t ctrl, strlist_t filena goto leave; /* prepare iobufs */ @@ -123,7 +123,7 @@ Index: gnupg-2.2.20/g10/sign.c inp = NULL; /* we do it later */ else { inp = iobuf_open(fname); -@@ -1100,7 +1119,7 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1124,7 +1143,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.2.20/g10/sign.c iobuf_push_filter( inp, md_filter, &mfx ); if( detached && !encryptflag) -@@ -1155,6 +1174,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1179,6 +1198,8 @@ sign_file (ctrl_t ctrl, strlist_t filena write_status_begin_signing (mfx.md); @@ -141,7 +141,7 @@ Index: gnupg-2.2.20/g10/sign.c /* Setup the inner packet. */ if( detached ) { if( multifile ) { -@@ -1195,6 +1216,45 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1219,6 +1240,45 @@ sign_file (ctrl_t ctrl, strlist_t filena if( opt.verbose ) log_printf ("\n"); } @@ -187,7 +187,7 @@ Index: gnupg-2.2.20/g10/sign.c else { /* read, so that the filter can calculate the digest */ while( iobuf_get(inp) != -1 ) -@@ -1213,8 +1273,8 @@ sign_file (ctrl_t ctrl, strlist_t filena +@@ -1237,8 +1297,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/gpg2.changes b/gpg2.changes index f093fd3..83c03a1 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Jan 12 22:45:11 UTC 2021 - Andreas Stieger + +- GnuPG 2.2.27: + * gpgconf: Fix case with neither local nor global gpg.conf + * gpgconf: Fix description of two new options +- includes changes from 2.2.26: + * gpg: New AKL method "ntds" + * gpg: Fix --trusted-key with fingerprint arg + * scd: Fix writing of ECC keys to an OpenPGP card + * scd: Make an USB error fix specific to SPR532 readers + * dirmngr: With new LDAP keyservers store the new attributes. + Never store the useless pgpSignerID. Fix a long standing + bug storing some keys on an ldap server. + * dirmngr: Support the new Active Direcory LDAP schema for + keyservers + * dirmngr: Allow LDAP OpenPGP searches via fingerprint + * dirmngr: Do not block other threads during keyserver LDAP calls + * Support global configuration files + * Fix the iconv fallback handling to UTF-8 + ------------------------------------------------------------------- Mon Nov 23 22:36:17 UTC 2020 - Andreas Stieger diff --git a/gpg2.spec b/gpg2.spec index 4731da9..3c8c658 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -1,7 +1,7 @@ # # spec file for package gpg2 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gpg2 -Version: 2.2.25 +Version: 2.2.27 Release: 0 Summary: File encryption, decryption, signature creation and verification utility License: GPL-3.0-or-later @@ -61,7 +61,6 @@ Requires: libassuan0 >= 2.5.0 Requires: libgcrypt20 >= 1.8.0 Requires: libksba >= 1.3.5 Requires: pinentry -Requires(post): %{install_info_prereq} Recommends: dirmngr = %{version} Provides: gnupg = %{version} Provides: gpg = 1.4.9 @@ -165,10 +164,6 @@ install -m 755 tools/gpg-zip %{buildroot}/%{_bindir} %post %udev_rules_update -%install_info --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz - -%preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz %files lang -f gnupg2.lang