diff --git a/gnupg-2.0.18-files-are-digests.patch b/gnupg-2.0.18-files-are-digests.patch index 11dbac6..7035cc6 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.22/g10/gpg.c +Index: gnupg-2.1.23/g10/gpg.c =================================================================== ---- gnupg-2.1.22.orig/g10/gpg.c -+++ gnupg-2.1.22/g10/gpg.c -@@ -379,6 +379,7 @@ enum cmd_and_opt_values +--- gnupg-2.1.23.orig/g10/gpg.c 2017-08-09 15:46:17.000000000 +0200 ++++ gnupg-2.1.23/g10/gpg.c 2017-08-10 16:21:26.692847431 +0200 +@@ -380,6 +380,7 @@ enum cmd_and_opt_values oTTYtype, oLCctype, oLCmessages, @@ -16,7 +16,7 @@ Index: gnupg-2.1.22/g10/gpg.c oXauthority, oGroup, oUnGroup, -@@ -828,6 +829,7 @@ static ARGPARSE_OPTS opts[] = { +@@ -829,6 +830,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,15 +24,15 @@ Index: gnupg-2.1.22/g10/gpg.c /* Aliases. I constantly mistype these, and assume other people do as well. */ -@@ -2383,6 +2385,7 @@ main (int argc, char **argv) +@@ -2388,6 +2390,7 @@ main (int argc, char **argv) opt.def_cert_expire = "0"; gnupg_set_homedir (NULL); opt.passphrase_repeat = 1; + opt.files_are_digests=0; opt.emit_version = 0; opt.weak_digests = NULL; - additional_weak_digest("MD5"); -@@ -2944,6 +2947,7 @@ main (int argc, char **argv) + +@@ -2952,6 +2955,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.22/g10/gpg.c case oForceMDC: opt.force_mdc = 1; break; case oNoForceMDC: opt.force_mdc = 0; break; -Index: gnupg-2.1.22/g10/options.h +Index: gnupg-2.1.23/g10/options.h =================================================================== ---- gnupg-2.1.22.orig/g10/options.h -+++ gnupg-2.1.22/g10/options.h -@@ -212,6 +212,7 @@ struct +--- gnupg-2.1.23.orig/g10/options.h 2017-08-09 15:46:17.000000000 +0200 ++++ gnupg-2.1.23/g10/options.h 2017-08-10 16:21:26.692847431 +0200 +@@ -213,6 +213,7 @@ struct int no_auto_check_trustdb; int preserve_permissions; int no_homedir_creation; @@ -52,10 +52,10 @@ Index: gnupg-2.1.22/g10/options.h struct groupitem *grouplist; int mangle_dos_filenames; int enable_progress_filter; -Index: gnupg-2.1.22/g10/sign.c +Index: gnupg-2.1.23/g10/sign.c =================================================================== ---- gnupg-2.1.22.orig/g10/sign.c -+++ gnupg-2.1.22/g10/sign.c +--- gnupg-2.1.23.orig/g10/sign.c 2017-07-28 19:39:06.000000000 +0200 ++++ gnupg-2.1.23/g10/sign.c 2017-08-10 16:21:26.692847431 +0200 @@ -43,6 +43,8 @@ #include "../common/mbox-util.h" #include "../common/compliance.h" diff --git a/gnupg-2.1.22.tar.bz2 b/gnupg-2.1.22.tar.bz2 deleted file mode 100644 index 182c69f..0000000 --- a/gnupg-2.1.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46716faf9e1b92cfca86609f3bfffbf5bb4b6804df90dc853ff7061cfcfb4ad7 -size 6530433 diff --git a/gnupg-2.1.22.tar.bz2.sig b/gnupg-2.1.22.tar.bz2.sig deleted file mode 100644 index 1f26f4f..0000000 Binary files a/gnupg-2.1.22.tar.bz2.sig and /dev/null differ diff --git a/gnupg-2.2.0.tar.bz2 b/gnupg-2.2.0.tar.bz2 new file mode 100644 index 0000000..75642d3 --- /dev/null +++ b/gnupg-2.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4514a0be0f7a1ff263193330019eb4b53c82f0f5e230af3c14df371271a45e6 +size 6532475 diff --git a/gnupg-2.2.0.tar.bz2.sig b/gnupg-2.2.0.tar.bz2.sig new file mode 100644 index 0000000..cb3c0b3 Binary files /dev/null and b/gnupg-2.2.0.tar.bz2.sig differ diff --git a/gpg2.changes b/gpg2.changes index f1836f6..88636e6 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Mon Aug 28 17:21:30 UTC 2017 - astieger@suse.com + +- GnuPG 2.2.0: + * New long term stable branch, replacing the 2.0.x series + * gpg: Reverted change in 2.1.23 so that --no-auto-key-retrieve + is again the default boo#1054088 + * Fixed a few minor bugs + +------------------------------------------------------------------- +Sat Aug 12 16:56:26 UTC 2017 - astieger@suse.com + +- GnuPG 2.1.23: + * gpg: Options --auto-key-retrieve and --auto-key-locate "local,wkd" + are now used by default. Note: this enables keyserver and Web Key + Directory operators to notice when a signature from a locally + non-available key is being verified for the first time or when + you intend to encrypt to a mail address without having the key + locally. This new behaviour will eventually make key discovery + much easier and mostly automatic. Disable this by adding + no-auto-key-retrieve + auto-key-locate local + to your gpg.conf. + * agent: Option --no-grab is now the default. The new option --grab + allows to revert this. + * gpg: New import option "show-only". + * gpg: New option --disable-dirmngr to entirely disable network + access for gpg. + * gpg,gpgsm: Tweaked DE-VS compliance behaviour. + * New configure flag --enable-all-tests to run more extensive tests + during "make check". + * gpgsm: The keygrip is now always printed in colon mode as + documented in the man page. + ------------------------------------------------------------------- Fri Jul 28 19:29:52 UTC 2017 - astieger@suse.com diff --git a/gpg2.spec b/gpg2.spec index 2c9e9c8..5b77867 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -17,7 +17,7 @@ Name: gpg2 -Version: 2.1.22 +Version: 2.2.0 Release: 0 Summary: File encryption, decryption, signature creation and verification utility License: GPL-3.0+ @@ -103,8 +103,9 @@ date=$(date -u +%%Y-%%m-%%dT%%H:%%M+0000 -r %{SOURCE99}) --enable-large-secmem \ --enable-wks-tools \ --with-gnu-ld \ - --with-default-trust-store=%{_sysconfdir}/ssl/ca-bundle.pem \ + --with-default-trust-store-file=%{_sysconfdir}/ssl/ca-bundle.pem \ --enable-build-timestamp=$date \ + --enable-gpg-is-gpg2 \ make %{?_smp_mflags}