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

Accepting request 78247 from Base:System

Browse Source 
update to upstream 2.0.18 (forwarded request 78194 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/78247
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=54
This commit is contained in:
Sascha Peilicke 2011-08-08 12:59:58 +00:00 committed by Git OBS Bridge
parent bb53d00a94
commit 634198130c
6 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnupg-2.0.17.tar.bz2
View File

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

32
gnupg-files-are-digests.patch → gnupg-2.0.18-files-are-digests.patch
View File

@ -1,13 +1,6 @@
--- diff -rup gnupg-2.0.18.orig/g10/gpg.c gnupg-2.0.18/g10/gpg.c
g10/gpg.c | 4 +++ --- gnupg-2.0.18.orig/g10/gpg.c 2011-07-22 13:00:44.000000000 +0100
g10/options.h | 1 +++ gnupg-2.0.18/g10/gpg.c 2011-08-06 21:07:32.000000000 +0100
g10/sign.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 66 insertions(+), 5 deletions(-)
Index: gnupg-2.0.15/g10/gpg.c
===================================================================
--- gnupg-2.0.15.orig/g10/gpg.c 2010-02-17 09:55:45.000000000 +0100
+++ gnupg-2.0.15/g10/gpg.c 2010-03-31 15:34:12.000000000 +0200
@@ -341,6 +341,7 @@ enum cmd_and_opt_values @@ -341,6 +341,7 @@ enum cmd_and_opt_values
oTTYtype, oTTYtype,
oLCctype, oLCctype,
@ -24,7 +17,7 @@ Index: gnupg-2.0.15/g10/gpg.c
/* Aliases. I constantly mistype these, and assume other people do /* Aliases. I constantly mistype these, and assume other people do
as well. */ as well. */
@@ -2000,6 +2002,7 @@ main (int argc, char **argv) @@ -1996,6 +1998,7 @@ main (int argc, char **argv)
opt.def_sig_expire="0"; opt.def_sig_expire="0";
opt.def_cert_expire="0"; opt.def_cert_expire="0";
set_homedir ( default_homedir () ); set_homedir ( default_homedir () );
@ -32,7 +25,7 @@ Index: gnupg-2.0.15/g10/gpg.c
opt.passphrase_repeat=1; opt.passphrase_repeat=1;
/* Check whether we have a config file on the command line. */ /* Check whether we have a config file on the command line. */
@@ -2488,6 +2491,7 @@ main (int argc, char **argv) @@ -2484,6 +2487,7 @@ main (int argc, char **argv)
case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break; case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break;
case oForceV3Sigs: opt.force_v3_sigs = 1; break; case oForceV3Sigs: opt.force_v3_sigs = 1; break;
case oNoForceV3Sigs: opt.force_v3_sigs = 0; break; case oNoForceV3Sigs: opt.force_v3_sigs = 0; break;
@ -40,10 +33,10 @@ Index: gnupg-2.0.15/g10/gpg.c
case oForceV4Certs: opt.force_v4_certs = 1; break; case oForceV4Certs: opt.force_v4_certs = 1; break;
case oNoForceV4Certs: opt.force_v4_certs = 0; break; case oNoForceV4Certs: opt.force_v4_certs = 0; break;
case oForceMDC: opt.force_mdc = 1; break; case oForceMDC: opt.force_mdc = 1; break;
Index: gnupg-2.0.15/g10/options.h Only in gnupg-2.0.18/g10: gpg.c.orig
=================================================================== diff -rup gnupg-2.0.18.orig/g10/options.h gnupg-2.0.18/g10/options.h
--- gnupg-2.0.15.orig/g10/options.h 2010-01-11 15:11:35.000000000 +0100 --- gnupg-2.0.18.orig/g10/options.h 2011-07-22 13:00:44.000000000 +0100
+++ gnupg-2.0.15/g10/options.h 2010-03-31 15:33:27.000000000 +0200 +++ gnupg-2.0.18/g10/options.h 2011-08-06 21:07:32.000000000 +0100
@@ -194,6 +194,7 @@ struct @@ -194,6 +194,7 @@ struct
int no_auto_check_trustdb; int no_auto_check_trustdb;
int preserve_permissions; int preserve_permissions;
@ -52,10 +45,9 @@ Index: gnupg-2.0.15/g10/options.h
struct groupitem *grouplist; struct groupitem *grouplist;
int mangle_dos_filenames; int mangle_dos_filenames;
int enable_progress_filter; int enable_progress_filter;
Index: gnupg-2.0.15/g10/sign.c diff -rup gnupg-2.0.18.orig/g10/sign.c gnupg-2.0.18/g10/sign.c
=================================================================== --- gnupg-2.0.18.orig/g10/sign.c 2011-07-22 13:00:44.000000000 +0100
--- gnupg-2.0.15.orig/g10/sign.c 2010-02-25 09:52:15.000000000 +0100 +++ gnupg-2.0.18/g10/sign.c 2011-08-06 21:07:32.000000000 +0100
+++ gnupg-2.0.15/g10/sign.c 2010-03-31 15:33:27.000000000 +0200
@@ -665,8 +665,12 @@ write_signature_packets (SK_LIST sk_list @@ -665,8 +665,12 @@ write_signature_packets (SK_LIST sk_list
mk_notation_policy_etc (sig, NULL, sk); mk_notation_policy_etc (sig, NULL, sk);
} }

12
gnupg-2.0.10-tmpdir.diff → gnupg-2.0.18-tmpdir.diff
View File

@ -1,9 +1,7 @@
# create gpg-agent socket in TMPDIR diff -rup gnupg-2.0.18.orig/agent/gpg-agent.c gnupg-2.0.18/agent/gpg-agent.c
Index: gnupg-2.0.13/agent/gpg-agent.c --- gnupg-2.0.18.orig/agent/gpg-agent.c 2011-08-04 10:57:02.000000000 +0100
=================================================================== +++ gnupg-2.0.18/agent/gpg-agent.c 2011-08-06 21:01:32.000000000 +0100
--- gnupg-2.0.13.orig/agent/gpg-agent.c 2009-07-20 12:12:06.000000000 +0200 @@ -1002,6 +1002,10 @@ main (int argc, char **argv )
+++ gnupg-2.0.13/agent/gpg-agent.c 2009-11-13 13:00:55.000000000 +0100
@@ -960,6 +960,10 @@ main (int argc, char **argv )
gnupg_fd_t fd_ssh; gnupg_fd_t fd_ssh;
pid_t pid; pid_t pid;
@ -14,7 +12,7 @@ Index: gnupg-2.0.13/agent/gpg-agent.c
/* Remove the DISPLAY variable so that a pinentry does not /* Remove the DISPLAY variable so that a pinentry does not
default to a specific display. There is still a default default to a specific display. There is still a default
display when gpg-agent was started using --display or a display when gpg-agent was started using --display or a
@@ -971,13 +975,23 @@ main (int argc, char **argv ) @@ -1013,13 +1017,23 @@ main (int argc, char **argv )
unsetenv ("DISPLAY"); unsetenv ("DISPLAY");
#endif #endif

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48aedd762ca443fb952a9e859efe3c66706d7c2c9c77c32dbdbac4fe962dae5b
size 4016606

12
gpg2.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sat Aug 6 20:19:09 UTC 2011 - andreas.stieger@gmx.de
- update to upstream 2.0.18
* Bug fix for newer versions of Libgcrypt.
* Support the SSH confirm flag and show SSH fingerprints in ssh
related pinentries.
* Improved dirmngr/gpgsm interaction for OCSP.
* Allow generation of card keys up to 4096 bit.
- refresh patch gnupg-2.0.10-tmpdir.diff -> gnupg-2.0.18-tmpdir.diff
- refresh patch gnupg-files-are-digests.patch -> gnupg-2.0.18-files-are-digests.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 15 09:29:42 UTC 2011 - puzel@novell.com Tue Mar 15 09:29:42 UTC 2011 - puzel@novell.com

6
gpg2.spec
View File

@ -19,7 +19,7 @@
Name: gpg2 Name: gpg2
Version: 2.0.17 Version: 2.0.18
Release: 1 Release: 1
BuildRequires: expect BuildRequires: expect
BuildRequires: fdupes BuildRequires: fdupes
@ -51,11 +51,11 @@ Provides: gpg2_signd_support
Obsoletes: gpg < 1.4.9 Obsoletes: gpg < 1.4.9
Summary: GnuPG 2 Summary: GnuPG 2
Source: gnupg-%{version}.tar.bz2 Source: gnupg-%{version}.tar.bz2
Patch1: gnupg-2.0.10-tmpdir.diff Patch1: gnupg-2.0.18-tmpdir.diff
Patch2: gnupg-2.0.4-install_tools.diff Patch2: gnupg-2.0.4-install_tools.diff
Patch3: gnupg-2.0.9-RSA_ES.patch Patch3: gnupg-2.0.9-RSA_ES.patch
Patch4: gnupg-2.0.9-langinfo.patch Patch4: gnupg-2.0.9-langinfo.patch
Patch5: gnupg-files-are-digests.patch Patch5: gnupg-2.0.18-files-are-digests.patch
Patch6: gnupg-dont-fail-with-seahorse-agent.patch Patch6: gnupg-dont-fail-with-seahorse-agent.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build