rpms/gnupg2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

new upstream release fixing minor bugs

Browse Source
This commit is contained in:
Tomas Mraz 2015-04-16 18:06:21 +02:00
parent 4d96c715b0
commit 497a1a5e99
4 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -20,3 +20,5 @@ gnupg-2.0.16.tar.bz2.sig
/gnupg-2.1.1.tar.bz2.sig /gnupg-2.1.1.tar.bz2.sig
/gnupg-2.1.2.tar.bz2 /gnupg-2.1.2.tar.bz2
/gnupg-2.1.2.tar.bz2.sig /gnupg-2.1.2.tar.bz2.sig
/gnupg-2.1.3.tar.bz2
/gnupg-2.1.3.tar.bz2.sig

30
gnupg-2.1.2-file-is-digest.patch → gnupg-2.1.3-file-is-digest.patch
View File

@ -1,7 +1,7 @@
diff -up gnupg-2.1.2/g10/gpg.c.file-is-digest gnupg-2.1.2/g10/gpg.c diff -up gnupg-2.1.3/g10/gpg.c.file-is-digest gnupg-2.1.3/g10/gpg.c
--- gnupg-2.1.2/g10/gpg.c.file-is-digest 2015-02-17 17:54:53.838469211 +0100 --- gnupg-2.1.3/g10/gpg.c.file-is-digest 2015-04-16 17:54:20.327168135 +0200
+++ gnupg-2.1.2/g10/gpg.c 2015-02-18 18:24:46.374201953 +0100 +++ gnupg-2.1.3/g10/gpg.c 2015-04-16 17:54:20.330168205 +0200
@@ -349,6 +349,7 @@ enum cmd_and_opt_values @@ -352,6 +352,7 @@ enum cmd_and_opt_values
oTTYtype, oTTYtype,
oLCctype, oLCctype,
oLCmessages, oLCmessages,
@ -9,7 +9,7 @@ diff -up gnupg-2.1.2/g10/gpg.c.file-is-digest gnupg-2.1.2/g10/gpg.c
oXauthority, oXauthority,
oGroup, oGroup,
oUnGroup, oUnGroup,
@@ -730,6 +731,7 @@ static ARGPARSE_OPTS opts[] = { @@ -738,6 +739,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_s (oPersonalCompressPreferences, ARGPARSE_s_s (oPersonalCompressPreferences,
"personal-compress-preferences", "@"), "personal-compress-preferences", "@"),
ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"), ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
@ -17,7 +17,7 @@ diff -up gnupg-2.1.2/g10/gpg.c.file-is-digest gnupg-2.1.2/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. */
@@ -2128,6 +2130,7 @@ main (int argc, char **argv) @@ -2149,6 +2151,7 @@ main (int argc, char **argv)
set_homedir (default_homedir ()); set_homedir (default_homedir ());
opt.passphrase_repeat = 1; opt.passphrase_repeat = 1;
opt.emit_version = 1; /* Limit to the major number. */ opt.emit_version = 1; /* Limit to the major number. */
@ -25,7 +25,7 @@ diff -up gnupg-2.1.2/g10/gpg.c.file-is-digest gnupg-2.1.2/g10/gpg.c
/* Check whether we have a config file on the command line. */ /* Check whether we have a config file on the command line. */
orig_argc = argc; orig_argc = argc;
@@ -2632,6 +2635,7 @@ main (int argc, char **argv) @@ -2661,6 +2664,7 @@ main (int argc, char **argv)
opt.verify_options&=~VERIFY_SHOW_PHOTOS; opt.verify_options&=~VERIFY_SHOW_PHOTOS;
break; break;
case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break; case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break;
@ -33,10 +33,10 @@ diff -up gnupg-2.1.2/g10/gpg.c.file-is-digest gnupg-2.1.2/g10/gpg.c
case oForceMDC: opt.force_mdc = 1; break; case oForceMDC: opt.force_mdc = 1; break;
case oNoForceMDC: opt.force_mdc = 0; break; case oNoForceMDC: opt.force_mdc = 0; break;
diff -up gnupg-2.1.2/g10/options.h.file-is-digest gnupg-2.1.2/g10/options.h diff -up gnupg-2.1.3/g10/options.h.file-is-digest gnupg-2.1.3/g10/options.h
--- gnupg-2.1.2/g10/options.h.file-is-digest 2015-01-28 09:24:33.000000000 +0100 --- gnupg-2.1.3/g10/options.h.file-is-digest 2015-04-06 13:41:53.000000000 +0200
+++ gnupg-2.1.2/g10/options.h 2015-02-17 17:54:53.840469255 +0100 +++ gnupg-2.1.3/g10/options.h 2015-04-16 17:54:20.330168205 +0200
@@ -192,6 +192,7 @@ struct @@ -194,6 +194,7 @@ struct
int no_auto_check_trustdb; int no_auto_check_trustdb;
int preserve_permissions; int preserve_permissions;
int no_homedir_creation; int no_homedir_creation;
@ -44,9 +44,9 @@ diff -up gnupg-2.1.2/g10/options.h.file-is-digest gnupg-2.1.2/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;
diff -up gnupg-2.1.2/g10/sign.c.file-is-digest gnupg-2.1.2/g10/sign.c diff -up gnupg-2.1.3/g10/sign.c.file-is-digest gnupg-2.1.3/g10/sign.c
--- gnupg-2.1.2/g10/sign.c.file-is-digest 2015-01-28 09:24:33.000000000 +0100 --- gnupg-2.1.3/g10/sign.c.file-is-digest 2015-04-05 19:43:32.000000000 +0200
+++ gnupg-2.1.2/g10/sign.c 2015-02-18 18:24:44.989169317 +0100 +++ gnupg-2.1.3/g10/sign.c 2015-04-16 17:56:08.764693096 +0200
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
#include "pkglue.h" #include "pkglue.h"
#include "sysutils.h" #include "sysutils.h"
@ -126,7 +126,7 @@ diff -up gnupg-2.1.2/g10/sign.c.file-is-digest gnupg-2.1.2/g10/sign.c
if( multifile ) { if( multifile ) {
@@ -1035,6 +1053,45 @@ sign_file (ctrl_t ctrl, strlist_t filena @@ -1035,6 +1053,45 @@ sign_file (ctrl_t ctrl, strlist_t filena
if( opt.verbose ) if( opt.verbose )
putc( '\n', stderr ); log_printf ("\n");
} }
+ else if (opt.file_is_digest) { + else if (opt.file_is_digest) {
+ byte *mdb, ts[5]; + byte *mdb, ts[5];

11
gnupg2.spec
View File

@ -1,7 +1,7 @@
Summary: Utility for secure communication and data storage Summary: Utility for secure communication and data storage
Name: gnupg2 Name: gnupg2
Version: 2.1.2 Version: 2.1.3
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/System Group: Applications/System
@ -12,7 +12,7 @@ Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.
Patch1: gnupg-2.0.20-insttools.patch Patch1: gnupg-2.0.20-insttools.patch
Patch3: gnupg-2.0.20-secmem.patch Patch3: gnupg-2.0.20-secmem.patch
# non-upstreamable patch adding file-is-digest option needed for Copr # non-upstreamable patch adding file-is-digest option needed for Copr
Patch4: gnupg-2.1.2-file-is-digest.patch Patch4: gnupg-2.1.3-file-is-digest.patch
Patch5: gnupg-2.1.1-ocsp-keyusage.patch Patch5: gnupg-2.1.1-ocsp-keyusage.patch
Patch6: gnupg-2.1.1-fips-algo.patch Patch6: gnupg-2.1.1-fips-algo.patch
@ -115,7 +115,7 @@ make install DESTDIR=%{buildroot} \
# drop file conflicting with gnupg-1.x # drop file conflicting with gnupg-1.x
rm -f %{buildroot}%{_mandir}/man1/gpg-zip.1* rm -f %{buildroot}%{_mandir}/man1/gpg-zip.1*
# and rename another # and rename another
rename gnupg gnupg2 %{buildroot}%{_mandir}/man7/gnupg.7* rename gnupg.7 gnupg2.7 %{buildroot}%{_mandir}/man7/gnupg.7*
%endif %endif
%find_lang %{name} %find_lang %{name}
@ -206,6 +206,9 @@ fi
%changelog %changelog
* Thu Apr 16 2015 Tomáš Mráz <tmraz@redhat.com> - 2.1.3-1
- new upstream release fixing minor bugs
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.1.2-2 * Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.1.2-2
- Rebuilt for Fedora 23 Change - Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code

4
sources
View File

@ -1,2 +1,2 @@
156fbd6566f4c51caac741c858d30d96 gnupg-2.1.2.tar.bz2 e2c6b4d3194f5595bfc43050b580ce7e gnupg-2.1.3.tar.bz2
d68ab26438134f2e83d3c49bc04652c4 gnupg-2.1.2.tar.bz2.sig 7f62cc5aea7c6f12f0efc227d518a48f gnupg-2.1.3.tar.bz2.sig