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

upgrade to 2.2.0

Browse Source
This commit is contained in:
Tomas Mraz 2017-09-05 15:03:54 +02:00
parent 9a5275f84d
commit 719eabd56e
4 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -56,3 +56,5 @@ gnupg-2.0.16.tar.bz2.sig
/gnupg-2.1.21.tar.bz2.sig
/gnupg-2.1.22.tar.bz2
/gnupg-2.1.22.tar.bz2.sig
/gnupg-2.2.0.tar.bz2
/gnupg-2.2.0.tar.bz2.sig

36
gnupg-2.1.22-file-is-digest.patch → gnupg-2.2.0-file-is-digest.patch
View File

@ -1,7 +1,7 @@
diff -up gnupg-2.1.22/g10/gpg.c.file-is-digest gnupg-2.1.22/g10/gpg.c
--- gnupg-2.1.22/g10/gpg.c.file-is-digest 2017-08-09 16:22:19.208599993 +0200
+++ gnupg-2.1.22/g10/gpg.c 2017-08-09 16:22:19.210600042 +0200
@@ -379,6 +379,7 @@ enum cmd_and_opt_values
diff -up gnupg-2.2.0/g10/gpg.c.file-is-digest gnupg-2.2.0/g10/gpg.c
--- gnupg-2.2.0/g10/gpg.c.file-is-digest 2017-09-05 14:51:31.658702228 +0200
+++ gnupg-2.2.0/g10/gpg.c 2017-09-05 14:52:48.467413778 +0200
@@ -380,6 +380,7 @@ enum cmd_and_opt_values
oTTYtype,
oLCctype,
oLCmessages,
@ -9,7 +9,7 @@ diff -up gnupg-2.1.22/g10/gpg.c.file-is-digest gnupg-2.1.22/g10/gpg.c
oXauthority,
oGroup,
oUnGroup,
@@ -825,6 +826,7 @@ static ARGPARSE_OPTS opts[] = {
@@ -826,6 +827,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_s (oPersonalCompressPreferences,
"personal-compress-preferences", "@"),
ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
@ -17,15 +17,15 @@ diff -up gnupg-2.1.22/g10/gpg.c.file-is-digest gnupg-2.1.22/g10/gpg.c
ARGPARSE_s_s (oWeakDigest, "weak-digest","@"),
ARGPARSE_s_n (oUnwrap, "unwrap", "@"),
ARGPARSE_s_n (oOnlySignTextIDs, "only-sign-text-ids", "@"),
@@ -2384,6 +2386,7 @@ main (int argc, char **argv)
@@ -2388,6 +2390,7 @@ main (int argc, char **argv)
opt.keyid_format = KF_NONE;
opt.def_sig_expire = "0";
opt.def_cert_expire = "0";
+ opt.file_is_digest = 0;
gnupg_set_homedir (NULL);
opt.passphrase_repeat = 1;
opt.emit_version = 0;
+ opt.file_is_digest = 0;
opt.weak_digests = NULL;
additional_weak_digest("MD5");
@@ -2944,6 +2947,7 @@ main (int argc, char **argv)
@@ -2954,6 +2957,7 @@ main (int argc, char **argv)
opt.verify_options&=~VERIFY_SHOW_PHOTOS;
break;
case oPhotoViewer: opt.photo_viewer = pargs.r.ret_str; break;
@ -33,10 +33,10 @@ diff -up gnupg-2.1.22/g10/gpg.c.file-is-digest gnupg-2.1.22/g10/gpg.c
case oForceMDC: opt.force_mdc = 1; break;
case oNoForceMDC: opt.force_mdc = 0; break;
diff -up gnupg-2.1.22/g10/options.h.file-is-digest gnupg-2.1.22/g10/options.h
--- gnupg-2.1.22/g10/options.h.file-is-digest 2017-07-24 20:57:50.000000000 +0200
+++ gnupg-2.1.22/g10/options.h 2017-08-09 16:22:19.210600042 +0200
@@ -212,6 +212,7 @@ struct
diff -up gnupg-2.2.0/g10/options.h.file-is-digest gnupg-2.2.0/g10/options.h
--- gnupg-2.2.0/g10/options.h.file-is-digest 2017-08-09 15:46:17.000000000 +0200
+++ gnupg-2.2.0/g10/options.h 2017-09-05 14:51:31.661702295 +0200
@@ -213,6 +213,7 @@ struct
int no_auto_check_trustdb;
int preserve_permissions;
int no_homedir_creation;
@ -44,9 +44,9 @@ diff -up gnupg-2.1.22/g10/options.h.file-is-digest gnupg-2.1.22/g10/options.h
struct groupitem *grouplist;
int mangle_dos_filenames;
int enable_progress_filter;
diff -up gnupg-2.1.22/g10/sign.c.file-is-digest gnupg-2.1.22/g10/sign.c
--- gnupg-2.1.22/g10/sign.c.file-is-digest 2017-07-28 17:35:18.000000000 +0200
+++ gnupg-2.1.22/g10/sign.c 2017-08-09 16:23:21.437127512 +0200
diff -up gnupg-2.2.0/g10/sign.c.file-is-digest gnupg-2.2.0/g10/sign.c
--- gnupg-2.2.0/g10/sign.c.file-is-digest 2017-07-28 19:39:06.000000000 +0200
+++ gnupg-2.2.0/g10/sign.c 2017-09-05 14:51:31.661702295 +0200
@@ -40,6 +40,7 @@
#include "pkglue.h"
#include "../common/sysutils.h"

18
gnupg2.spec
View File

@ -1,6 +1,6 @@
Summary: Utility for secure communication and data storage
Name: gnupg2
Version: 2.1.22
Version: 2.2.0
Release: 1%{?dist}
License: GPLv3+
@ -15,7 +15,7 @@ Patch2: gnupg-2.1.19-exponential.patch
# needed for compatibility with system FIPS mode
Patch3: gnupg-2.1.10-secmem.patch
# non-upstreamable patch adding file-is-digest option needed for Copr
Patch4: gnupg-2.1.22-file-is-digest.patch
Patch4: gnupg-2.2.0-file-is-digest.patch
Patch5: gnupg-2.1.1-ocsp-keyusage.patch
Patch6: gnupg-2.1.1-fips-algo.patch
Patch7: gnupg-2.1.22-build.patch
@ -112,6 +112,9 @@ sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/scdaemon.c
%build
%configure \
%if 0%{?rhel} > 5
--enable-gpg-is-gpg2 \
%endif
--disable-gpgtar \
--disable-rpath \
--enable-g13 \
@ -145,10 +148,10 @@ install -m644 -p AUTHORS NEWS THANKS TODO \
%if 0%{?rhel} > 5
# compat symlinks
ln -sf gpg2 %{buildroot}%{_bindir}/gpg
ln -sf gpgv2 %{buildroot}%{_bindir}/gpgv
ln -sf gpg2.1 %{buildroot}%{_mandir}/man1/gpg.1
ln -sf gpgv2.1 %{buildroot}%{_mandir}/man1/gpgv.1
ln -sf gpg %{buildroot}%{_bindir}/gpg2
ln -sf gpgv %{buildroot}%{_bindir}/gpgv2
ln -sf gpg.1 %{buildroot}%{_mandir}/man1/gpg2.1
ln -sf gpgv.1 %{buildroot}%{_mandir}/man1/gpgv2.1
ln -sf gnupg.7 %{buildroot}%{_mandir}/man7/gnupg2.7
%endif
@ -211,6 +214,9 @@ fi
%changelog
* Tue Sep 5 2017 Tomáš Mráz <tmraz@redhat.com> - 2.2.0-1
- upgrade to 2.2.0
* Wed Aug 9 2017 Tomáš Mráz <tmraz@redhat.com> - 2.1.22-1
- upgrade to 2.1.22

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (gnupg-2.1.22.tar.bz2) = d2ccbf32716a701df9e4ad5c19b682daf1a02b0bf8a1751a32af6db0c9284a4ee7df91310bed1a2087911a9964cb7b7f2ca9dad32a880ed1e1465d8048605e16
SHA512 (gnupg-2.1.22.tar.bz2.sig) = 601d908348590314493f9ce7710944f798b42db7301e59aa3ed4ed1c30f56001396f9c7b2a389c6d7cb463b7839e73f43c862b8fa7c1e06c5fc47b15c1efde79
SHA512 (gnupg-2.2.0.tar.bz2) = 8ab7c4183d2ec2e6b62066e3cbcba95babaa0ae22da47feab716698792d26495f072d50e8ec612b8d26147636bb316320c78940184373b3f4cb6ec411933361b
SHA512 (gnupg-2.2.0.tar.bz2.sig) = 803344cda7ab1748a3bdaa750502ac627d98ee8d097ab0c0ff8acddac9efbaf996aeb96640ebfb036d0640d4fa46697fd6ea5f8bb206e0d11366c9849c591694