diff --git a/gnupg-2.0.14.tar.bz2 b/gnupg-2.0.14.tar.bz2 deleted file mode 100644 index ada738e..0000000 --- a/gnupg-2.0.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:feb6050dc00e59d426485550a2af8d416cf975e5e1e0ecf1c5f1bd139baafca5 -size 3982080 diff --git a/gnupg-2.0.15.tar.bz2 b/gnupg-2.0.15.tar.bz2 new file mode 100644 index 0000000..d452433 --- /dev/null +++ b/gnupg-2.0.15.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5881882f4da120ce1c71da64468392704b391ca7652ddc512bc4f1d8968f0d1c +size 3976879 diff --git a/gnupg-files-are-digests.patch b/gnupg-files-are-digests.patch index 5a6e760..30c8686 100644 --- a/gnupg-files-are-digests.patch +++ b/gnupg-files-are-digests.patch @@ -4,11 +4,11 @@ g10/sign.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 66 insertions(+), 5 deletions(-) -Index: gnupg-2.0.14/g10/gpg.c +Index: gnupg-2.0.15/g10/gpg.c =================================================================== ---- gnupg-2.0.14.orig/g10/gpg.c 2009-12-21 15:00:55.000000000 +0100 -+++ gnupg-2.0.14/g10/gpg.c 2010-03-22 15:05:00.000000000 +0100 -@@ -340,6 +340,7 @@ enum cmd_and_opt_values +--- 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 oTTYtype, oLCctype, oLCmessages, @@ -16,7 +16,7 @@ Index: gnupg-2.0.14/g10/gpg.c oXauthority, oGroup, oUnGroup, -@@ -705,6 +706,7 @@ static ARGPARSE_OPTS opts[] = { +@@ -706,6 +707,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_s (oPersonalDigestPreferences, "personal-digest-preferences","@"), ARGPARSE_s_s (oPersonalCompressPreferences, "personal-compress-preferences", "@"), @@ -24,15 +24,15 @@ Index: gnupg-2.0.14/g10/gpg.c /* Aliases. I constantly mistype these, and assume other people do as well. */ -@@ -1998,6 +2000,7 @@ main (int argc, char **argv) +@@ -2000,6 +2002,7 @@ main (int argc, char **argv) + opt.def_sig_expire="0"; opt.def_cert_expire="0"; set_homedir ( default_homedir () ); - opt.passwd_repeat=1; + opt.files_are_digests=0; + opt.passphrase_repeat=1; /* Check whether we have a config file on the command line. */ - orig_argc = argc; -@@ -2481,6 +2484,7 @@ main (int argc, char **argv) +@@ -2488,6 +2491,7 @@ main (int argc, char **argv) case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break; case oForceV3Sigs: opt.force_v3_sigs = 1; break; case oNoForceV3Sigs: opt.force_v3_sigs = 0; break; @@ -40,10 +40,10 @@ Index: gnupg-2.0.14/g10/gpg.c case oForceV4Certs: opt.force_v4_certs = 1; break; case oNoForceV4Certs: opt.force_v4_certs = 0; break; case oForceMDC: opt.force_mdc = 1; break; -Index: gnupg-2.0.14/g10/options.h +Index: gnupg-2.0.15/g10/options.h =================================================================== ---- gnupg-2.0.14.orig/g10/options.h 2009-09-21 18:53:51.000000000 +0200 -+++ gnupg-2.0.14/g10/options.h 2010-03-22 11:34:09.000000000 +0100 +--- gnupg-2.0.15.orig/g10/options.h 2010-01-11 15:11:35.000000000 +0100 ++++ gnupg-2.0.15/g10/options.h 2010-03-31 15:33:27.000000000 +0200 @@ -194,6 +194,7 @@ struct int no_auto_check_trustdb; int preserve_permissions; @@ -52,11 +52,11 @@ Index: gnupg-2.0.14/g10/options.h struct groupitem *grouplist; int mangle_dos_filenames; int enable_progress_filter; -Index: gnupg-2.0.14/g10/sign.c +Index: gnupg-2.0.15/g10/sign.c =================================================================== ---- gnupg-2.0.14.orig/g10/sign.c 2009-09-21 18:53:51.000000000 +0200 -+++ gnupg-2.0.14/g10/sign.c 2010-03-22 16:07:47.000000000 +0100 -@@ -662,8 +662,12 @@ write_signature_packets (SK_LIST sk_list +--- gnupg-2.0.15.orig/g10/sign.c 2010-02-25 09:52:15.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 mk_notation_policy_etc (sig, NULL, sk); } @@ -69,7 +69,7 @@ Index: gnupg-2.0.14/g10/sign.c rc = do_sign( sk, sig, md, hash_for (sk) ); gcry_md_close (md); -@@ -720,6 +724,8 @@ sign_file( strlist_t filenames, int deta +@@ -723,6 +727,8 @@ sign_file( strlist_t filenames, int deta SK_LIST sk_rover = NULL; int multifile = 0; u32 duration=0; @@ -78,7 +78,7 @@ Index: gnupg-2.0.14/g10/sign.c pfx = new_progress_context (); afx = new_armor_context (); -@@ -736,7 +742,16 @@ sign_file( strlist_t filenames, int deta +@@ -739,7 +745,16 @@ sign_file( strlist_t filenames, int deta fname = NULL; if( fname && filenames->next && (!detached || encryptflag) ) @@ -96,7 +96,7 @@ Index: gnupg-2.0.14/g10/sign.c if(encryptflag==2 && (rc=setup_symkey(&efx.symkey_s2k,&efx.symkey_dek))) -@@ -764,7 +779,7 @@ sign_file( strlist_t filenames, int deta +@@ -767,7 +782,7 @@ sign_file( strlist_t filenames, int deta goto leave; /* prepare iobufs */ @@ -105,7 +105,7 @@ Index: gnupg-2.0.14/g10/sign.c inp = NULL; /* we do it later */ else { inp = iobuf_open(fname); -@@ -897,7 +912,7 @@ sign_file( strlist_t filenames, int deta +@@ -900,7 +915,7 @@ sign_file( strlist_t filenames, int deta gcry_md_enable (mfx.md, hash_for(sk)); } @@ -114,7 +114,7 @@ Index: gnupg-2.0.14/g10/sign.c iobuf_push_filter( inp, md_filter, &mfx ); if( detached && !encryptflag && !RFC1991 ) -@@ -952,6 +967,8 @@ sign_file( strlist_t filenames, int deta +@@ -955,6 +970,8 @@ sign_file( strlist_t filenames, int deta write_status_begin_signing (mfx.md); @@ -123,7 +123,7 @@ Index: gnupg-2.0.14/g10/sign.c /* Setup the inner packet. */ if( detached ) { if( multifile ) { -@@ -992,6 +1009,45 @@ sign_file( strlist_t filenames, int deta +@@ -995,6 +1012,45 @@ sign_file( strlist_t filenames, int deta if( opt.verbose ) putc( '\n', stderr ); } @@ -169,7 +169,7 @@ Index: gnupg-2.0.14/g10/sign.c else { /* read, so that the filter can calculate the digest */ while( iobuf_get(inp) != -1 ) -@@ -1009,8 +1065,8 @@ sign_file( strlist_t filenames, int deta +@@ -1012,8 +1068,8 @@ sign_file( strlist_t filenames, int deta /* write the signatures */ rc = write_signature_packets (sk_list, out, mfx.md, diff --git a/gpg2.changes b/gpg2.changes index 5fbf741..5f9f206 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 31 13:47:00 UTC 2010 - puzel@novell.com + +- update to gnupg-2.0.15 + * New command --passwd for GPG. + * Fixes a regression in 2.0.14 which prevented unprotection of new + or changed gpg-agent passphrases. + * Make use of libassuan 2.0 which is available as a DSO. + ------------------------------------------------------------------- Mon Mar 22 15:09:24 UTC 2010 - puzel@novell.com diff --git a/gpg2.spec b/gpg2.spec index 172e945..3089dab 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -1,5 +1,5 @@ # -# spec file for package gpg2 (Version 2.0.14) +# spec file for package gpg2 (Version 2.0.15) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: gpg2 -Version: 2.0.14 +Version: 2.0.15 Release: 3 BuildRequires: expect BuildRequires: fdupes diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4