pool/gpg2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 285756 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/285756
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=85
This commit is contained in:
Dominique Leuenberger 2015-02-14 12:54:21 +00:00 committed by Git OBS Bridge
commit 4f581be7e1
7 changed files with 53 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gnupg-2.0.18-files-are-digests.patch
View File

@ -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 */

3
gnupg-2.1.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:70ecd01d2875db62624c911c2fd815742f50aef5492698eb3bfc09a08690ce49
size 4801472

BIN
gnupg-2.1.1.tar.bz2.sig
View File

Binary file not shown.

3
gnupg-2.1.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:404f5a43d591dfe41f0ffb204b49a1533b67d77bc1fd68febd7e447575616792
size 4832996

BIN
gnupg-2.1.2.tar.bz2.sig Normal file
View File

Binary file not shown.

26
gpg2.changes
View File

@ -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

6
gpg2.spec
View File

@ -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