From 1b4695482d02796381049c39a54d2dcb6849fd9707e5ab366c5d166b1c749ea9 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Thu, 12 Feb 2015 08:37:54 +0000 Subject: [PATCH] Accepting request 285737 from home:AndreasStieger:branches:Base:System GnuPG 2.1.2 OBS-URL: https://build.opensuse.org/request/show/285737 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=92 --- gnupg-2.0.18-files-are-digests.patch | 33 +++++++++++++++++---------- gnupg-2.1.1.tar.bz2 | 3 --- gnupg-2.1.1.tar.bz2.sig | Bin 574 -> 0 bytes gnupg-2.1.2.tar.bz2 | 3 +++ gnupg-2.1.2.tar.bz2.sig | Bin 0 -> 287 bytes gpg2.changes | 26 +++++++++++++++++++++ gpg2.spec | 6 ++--- 7 files changed, 53 insertions(+), 18 deletions(-) delete mode 100644 gnupg-2.1.1.tar.bz2 delete mode 100644 gnupg-2.1.1.tar.bz2.sig create mode 100644 gnupg-2.1.2.tar.bz2 create mode 100644 gnupg-2.1.2.tar.bz2.sig diff --git a/gnupg-2.0.18-files-are-digests.patch b/gnupg-2.0.18-files-are-digests.patch index 939a1e3..5b69f43 100644 --- a/gnupg-2.0.18-files-are-digests.patch +++ b/gnupg-2.0.18-files-are-digests.patch @@ -4,10 +4,10 @@ g10/sign.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 66 insertions(+), 5 deletions(-) -Index: gnupg-2.1.1/g10/gpg.c +Index: gnupg-2.1.2/g10/gpg.c =================================================================== ---- gnupg-2.1.1.orig/g10/gpg.c -+++ gnupg-2.1.1/g10/gpg.c +--- gnupg-2.1.2.orig/g10/gpg.c ++++ gnupg-2.1.2/g10/gpg.c @@ -349,6 +349,7 @@ enum cmd_and_opt_values oTTYtype, oLCctype, @@ -24,7 +24,7 @@ Index: gnupg-2.1.1/g10/gpg.c /* Aliases. I constantly mistype these, and assume other people do as well. */ -@@ -2125,6 +2127,7 @@ main (int argc, char **argv) +@@ -2127,6 +2129,7 @@ main (int argc, char **argv) opt.def_cert_expire = "0"; set_homedir (default_homedir ()); opt.passphrase_repeat = 1; @@ -32,7 +32,7 @@ Index: gnupg-2.1.1/g10/gpg.c opt.emit_version = 1; /* Limit to the major number. */ /* Check whether we have a config file on the command line. */ -@@ -2630,6 +2633,7 @@ main (int argc, char **argv) +@@ -2632,6 +2635,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.1.1/g10/gpg.c case oForceMDC: opt.force_mdc = 1; break; case oNoForceMDC: opt.force_mdc = 0; break; -Index: gnupg-2.1.1/g10/options.h +Index: gnupg-2.1.2/g10/options.h =================================================================== ---- gnupg-2.1.1.orig/g10/options.h -+++ gnupg-2.1.1/g10/options.h +--- gnupg-2.1.2.orig/g10/options.h ++++ gnupg-2.1.2/g10/options.h @@ -192,6 +192,7 @@ struct int no_auto_check_trustdb; int preserve_permissions; @@ -52,10 +52,19 @@ Index: gnupg-2.1.1/g10/options.h struct groupitem *grouplist; int mangle_dos_filenames; int enable_progress_filter; -Index: gnupg-2.1.1/g10/sign.c +Index: gnupg-2.1.2/g10/sign.c =================================================================== ---- gnupg-2.1.1.orig/g10/sign.c -+++ gnupg-2.1.1/g10/sign.c +--- gnupg-2.1.2.orig/g10/sign.c ++++ gnupg-2.1.2/g10/sign.c +@@ -41,7 +41,7 @@ + #include "pkglue.h" + #include "sysutils.h" + #include "call-agent.h" +- ++#include "host2net.h" + + #ifdef HAVE_DOSISH_SYSTEM + #define LF "\r\n" @@ -706,8 +706,12 @@ write_signature_packets (SK_LIST sk_list mk_notation_policy_etc (sig, NULL, pk); } @@ -164,7 +173,7 @@ Index: gnupg-2.1.1/g10/sign.c + sigclass = ts[0]; + if (sigclass != 0x00 && sigclass != 0x01) + log_bug("bad cipher class\n"); -+ timestamp = buffer_to_u32(ts + 1); ++ timestamp = buf32_to_u32(ts + 1); + } else { /* read, so that the filter can calculate the digest */ diff --git a/gnupg-2.1.1.tar.bz2 b/gnupg-2.1.1.tar.bz2 deleted file mode 100644 index e165c4d..0000000 --- a/gnupg-2.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70ecd01d2875db62624c911c2fd815742f50aef5492698eb3bfc09a08690ce49 -size 4801472 diff --git a/gnupg-2.1.1.tar.bz2.sig b/gnupg-2.1.1.tar.bz2.sig deleted file mode 100644 index 83cbbfc504f57ade3dd20fd845040f6606dda91beb6940b426c576541604d911..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 574 zcmV-E0>S->0UQJX0SEvF1p-u%PniG;2@oWkInqxh zJ03Y;ttz!nQUDqDB8rI%A@&6hTK`HuP6L@5E$vb$KiR6L{j_5d=9G`g$#(EOHIomDVvTzH zt-7XfF$b)-qXH8X8FmOIK!#8&og}LG2&p5~ZqxrFsqS|&rgPjnvySep17fHdcwufu zXT}5N%#@J5@1rC!fm7Us&I1N-dPq>?uT><^=M;_l-G2tEImjyR%xgv6aoxQ4_?5Ut M8pGsj$0{e+!Z(}=-2eap diff --git a/gnupg-2.1.2.tar.bz2 b/gnupg-2.1.2.tar.bz2 new file mode 100644 index 0000000..605451b --- /dev/null +++ b/gnupg-2.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:404f5a43d591dfe41f0ffb204b49a1533b67d77bc1fd68febd7e447575616792 +size 4832996 diff --git a/gnupg-2.1.2.tar.bz2.sig b/gnupg-2.1.2.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..849d6acd43977539d4e3bd4759a62cf64fee0c7dbcd984562d401f9ce6c4bc6b GIT binary patch literal 287 zcmV+)0pR|L0UQJX0SEvF1p-vtqZ9xN2@oWkInqxh8DM7$CZAeg5jgN}#E8>3jpP4NZE4!{V93K_=)d3c@s#st9z9^nPcPIvny1v>t*f7BRr zK^E4{#LUH8hdLNy-3nlIHXFxFvx58Ho}S)?Suh4U3r6D+ZLQujo{u=W6iw4?#hq6B zXIt?rQhovM#(r31v8isUOKF8Afn_4YlVjgb&VCmBp`V39SN3MUm5z41g;TJYKrB0i lJ{|NAC-j~*O@>I#;~Z8gr|2pmf)i}tS=o6x2~Ur`{ZYR+fz1E_ literal 0 HcmV?d00001 diff --git a/gpg2.changes b/gpg2.changes index a772267..eaa4307 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Feb 11 21:48:13 UTC 2015 - astieger@suse.com + +- update to 2.1.2: + * gpg: The parameter 'Passphrase' for batch key generation works + again. + * gpg: Using a passphrase option in batch mode now has the + expected effect on --quick-gen-key. + * gpg: Improved reporting of unsupported PGP-2 keys. + * gpg: Added support for algo names when generating keys using + --command-fd. + * gpg: Fixed DoS based on bogus and overlong key packets. + * agent: When setting --default-cache-ttl the value + for --max-cache-ttl is adjusted to be not lower than the former. + * agent: Fixed problems with the new --extra-socket. + * agent: Made --allow-loopback-pinentry changeable with gpgconf. + * agent: Fixed importing of unprotected openpgp keys. + * agent: Now tries to use a fallback pinentry if the standard + pinentry is not installed. + * scd: Added support for ECDH. + * Fixed several bugs related to bogus keyrings and improved some + other code. +- in gnupg-2.0.18-files-are-digests.patch, change buffer_to_u32 to + buf32_to_u32 from host2net.h to match upstream changes +- now requires automake 1.14 + ------------------------------------------------------------------- Fri Dec 26 21:15:55 UTC 2014 - andreas.stieger@gmx.de diff --git a/gpg2.spec b/gpg2.spec index d90b53c..2f8c900 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -1,7 +1,7 @@ # # spec file for package gpg2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # 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.1.1 +Version: 2.1.2 Release: 0 Summary: GnuPG 2 License: GPL-3.0+ @@ -36,7 +36,7 @@ Patch9: gnupg-detect_FIPS_mode.patch Patch11: gnupg-add_legacy_FIPS_mode_option.patch Patch12: gnupg-remove_development_version_warning.patch Patch14: gnupg-large_keys.patch -BuildRequires: automake >= 1.10 +BuildRequires: automake >= 1.14 BuildRequires: expect BuildRequires: fdupes BuildRequires: gnutls-devel >= 3.0