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

tweak patches

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=202
This commit is contained in:
Andreas Stieger 2018-06-08 14:38:26 +00:00 committed by Git OBS Bridge
parent 539c3348ab
commit a1f48048e7
7 changed files with 39 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnupg-2.0.9-langinfo.patch
View File

@ -1,13 +1,13 @@
# fix [bnc#305725] - non latin characters displayed incorrectly by pinentry
---
# common/utf8conv.c | 1 +
# jnlib/utf8conv.c | 1 +
# 1 file changed, 1 insertion(+)
#
Index: gnupg-2.2.8/common/utf8conv.c
Index: gnupg-2.1.0/common/utf8conv.c
===================================================================
--- gnupg-2.2.8.orig/common/utf8conv.c
+++ gnupg-2.2.8/common/utf8conv.c
@@ -205,6 +205,7 @@ set_native_charset (const char *newset)
--- gnupg-2.1.0.orig/common/utf8conv.c 2014-10-11 19:45:14.000000000 +0200
+++ gnupg-2.1.0/common/utf8conv.c 2014-11-07 11:35:05.491413258 +0100
@@ -198,6 +198,7 @@ set_native_charset (const char *newset)
#else /*!HAVE_W32_SYSTEM && !HAVE_ANDROID_SYSTEM*/
#ifdef HAVE_LANGINFO_CODESET

16
gnupg-2.0.18-files-are-digests.patch → gnupg-2.2.8-files-are-digests.patch
View File

@ -1,13 +1,13 @@
---
g10/gpg.c | 4 +++
g10/options.h | 1
g10/sign.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 70 insertions(+), 5 deletions(-)
g10/sign.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
3 files changed, 67 insertions(+), 6 deletions(-)
Index: gnupg-2.2.8/g10/gpg.c
===================================================================
--- gnupg-2.2.8.orig/g10/gpg.c
+++ gnupg-2.2.8/g10/gpg.c
--- gnupg-2.2.8.orig/g10/gpg.c 2018-06-06 11:59:06.000000000 +0200
+++ gnupg-2.2.8/g10/gpg.c 2018-06-08 16:34:33.287514003 +0200
@@ -376,6 +376,7 @@ enum cmd_and_opt_values
oTTYtype,
oLCctype,
@ -42,8 +42,8 @@ Index: gnupg-2.2.8/g10/gpg.c
Index: gnupg-2.2.8/g10/options.h
===================================================================
--- gnupg-2.2.8.orig/g10/options.h
+++ gnupg-2.2.8/g10/options.h
--- gnupg-2.2.8.orig/g10/options.h 2018-05-31 12:03:06.000000000 +0200
+++ gnupg-2.2.8/g10/options.h 2018-06-08 16:34:33.287514003 +0200
@@ -210,6 +210,7 @@ struct
int no_auto_check_trustdb;
int preserve_permissions;
@ -54,8 +54,8 @@ Index: gnupg-2.2.8/g10/options.h
int enable_progress_filter;
Index: gnupg-2.2.8/g10/sign.c
===================================================================
--- gnupg-2.2.8.orig/g10/sign.c
+++ gnupg-2.2.8/g10/sign.c
--- gnupg-2.2.8.orig/g10/sign.c 2017-08-28 12:22:54.000000000 +0200
+++ gnupg-2.2.8/g10/sign.c 2018-06-08 16:34:33.287514003 +0200
@@ -43,6 +43,8 @@
#include "../common/mbox-util.h"
#include "../common/compliance.h"

20
gnupg-add_legacy_FIPS_mode_option.patch
View File

@ -3,11 +3,11 @@
g10/gpg.c | 9 +++++++++
2 files changed, 27 insertions(+)
Index: gnupg-2.2.8/doc/gpg.texi
Index: gnupg-2.2.7/doc/gpg.texi
===================================================================
--- gnupg-2.2.8.orig/doc/gpg.texi
+++ gnupg-2.2.8/doc/gpg.texi
@@ -2076,6 +2076,24 @@ implies, this option is for experts only
--- gnupg-2.2.7.orig/doc/gpg.texi 2018-05-04 16:14:30.949580264 +0200
+++ gnupg-2.2.7/doc/gpg.texi 2018-05-04 16:14:34.025609243 +0200
@@ -2097,6 +2097,24 @@ implies, this option is for experts only
understand the implications of what it allows you to do, leave this
off. @option{--no-expert} disables this option.
@ -32,11 +32,11 @@ Index: gnupg-2.2.8/doc/gpg.texi
@end table
Index: gnupg-2.2.8/g10/gpg.c
Index: gnupg-2.2.7/g10/gpg.c
===================================================================
--- gnupg-2.2.8.orig/g10/gpg.c
+++ gnupg-2.2.8/g10/gpg.c
@@ -421,6 +421,7 @@ enum cmd_and_opt_values
--- gnupg-2.2.7.orig/g10/gpg.c 2018-05-04 16:14:30.949580264 +0200
+++ gnupg-2.2.7/g10/gpg.c 2018-05-04 16:15:00.441858109 +0200
@@ -425,6 +425,7 @@ enum cmd_and_opt_values
oKeyOrigin,
oRequestOrigin,
oNoSymkeyCache,
@ -44,7 +44,7 @@ Index: gnupg-2.2.8/g10/gpg.c
oNoop
};
@@ -864,6 +865,7 @@ static ARGPARSE_OPTS opts[] = {
@@ -872,6 +873,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_n (oAllowMultipleMessages, "allow-multiple-messages", "@"),
ARGPARSE_s_n (oNoAllowMultipleMessages, "no-allow-multiple-messages", "@"),
ARGPARSE_s_n (oAllowWeakDigestAlgos, "allow-weak-digest-algos", "@"),
@ -52,7 +52,7 @@ Index: gnupg-2.2.8/g10/gpg.c
ARGPARSE_s_s (oDefaultNewKeyAlgo, "default-new-key-algo", "@"),
@@ -3566,6 +3568,13 @@ main (int argc, char **argv)
@@ -3568,6 +3570,13 @@ main (int argc, char **argv)
opt.def_new_key_algo = pargs.r.ret_str;
break;

21
gnupg-detect_FIPS_mode.patch
View File

@ -1,13 +1,8 @@
---
g10/encrypt.c | 5 ++++-
g10/mainproc.c | 7 ++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
Index: gnupg-2.2.8/g10/encrypt.c
Index: gnupg-2.1.1/g10/encrypt.c
===================================================================
--- gnupg-2.2.8.orig/g10/encrypt.c
+++ gnupg-2.2.8/g10/encrypt.c
@@ -825,7 +825,10 @@ encrypt_filter (void *opaque, int contro
--- gnupg-2.1.1.orig/g10/encrypt.c
+++ gnupg-2.1.1/g10/encrypt.c
@@ -783,7 +783,10 @@ encrypt_filter (void *opaque, int contro
/* Because 3DES is implicitly in the prefs, this can
only happen if we do not have any public keys in
the list. */
@ -19,11 +14,11 @@ Index: gnupg-2.2.8/g10/encrypt.c
}
/* In case 3DES has been selected, print a warning if
Index: gnupg-2.2.8/g10/mainproc.c
Index: gnupg-2.1.1/g10/mainproc.c
===================================================================
--- gnupg-2.2.8.orig/g10/mainproc.c
+++ gnupg-2.2.8/g10/mainproc.c
@@ -821,7 +821,12 @@ proc_plaintext( CTX c, PACKET *pkt )
--- gnupg-2.1.1.orig/g10/mainproc.c
+++ gnupg-2.1.1/g10/mainproc.c
@@ -719,7 +719,12 @@ proc_plaintext( CTX c, PACKET *pkt )
according to 2440, so hopefully it won't come up that often.
There is no good way to specify what algorithms to use in
that case, so these there are the historical answer. */

8
gnupg-dont-fail-with-seahorse-agent.patch
View File

@ -2,11 +2,11 @@
g10/passphrase.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gnupg-2.2.8/g10/passphrase.c
Index: gnupg-2.1.0/g10/passphrase.c
===================================================================
--- gnupg-2.2.8.orig/g10/passphrase.c
+++ gnupg-2.2.8/g10/passphrase.c
@@ -70,7 +70,7 @@ encode_s2k_iterations (int iterations)
--- gnupg-2.1.0.orig/g10/passphrase.c 2014-11-07 16:52:11.080483153 +0100
+++ gnupg-2.1.0/g10/passphrase.c 2014-11-07 16:52:11.996494299 +0100
@@ -71,7 +71,7 @@ encode_s2k_iterations (int iterations)
{
/* Don't print an error if an older agent is used. */
if (err && gpg_err_code (err) != GPG_ERR_ASS_PARAMETER)

5
gpg2.changes
View File

@ -1,5 +1,5 @@
-------------------------------------------------------------------
Fri Jun 8 12:52:39 UTC 2018 - kbabioch@suse.com
Fri Jun 8 14:37:06 UTC 2018 - kbabioch@suse.com
- Update to version 2.2.8:
* gpg: Decryption of messages not using the MDC mode will now lead to a
@ -17,7 +17,8 @@ Fri Jun 8 12:52:39 UTC 2018 - kbabioch@suse.com
--disable-mdc and --no-disable-mdc have no more effect.
* agent: Add DBUS_SESSION_BUS_ADDRESS and a few other envvars to the
list of startup environment variables.
- Applied spec-cleaner, Refreshed patches and fixed upstream URL
- Refresh gnupg-2.0.18-files-are-digests.patch
to gnupg-2.2.8-files-are-digests.patch
-------------------------------------------------------------------
Fri May 4 14:15:27 UTC 2018 - astieger@suse.com

2
gpg2.spec
View File

@ -29,7 +29,7 @@ Source2: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
Source3: %{name}.keyring
Source99: %{name}.changes
Patch4: gnupg-2.0.9-langinfo.patch
Patch5: gnupg-2.0.18-files-are-digests.patch
Patch5: gnupg-2.2.8-files-are-digests.patch
Patch6: gnupg-dont-fail-with-seahorse-agent.patch
Patch8: gnupg-set_umask_before_open_outfile.patch
Patch9: gnupg-detect_FIPS_mode.patch