From e1f0c4a1634467f370fc6fa37ace91a709b880d43f41681c6157c7cbd27fa7b0 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Wed, 7 Apr 2010 14:21:00 +0000 Subject: [PATCH 1/3] fix bnc#589994 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=20 --- gnupg-dont-fail-with-seahorse-agent.patch | 17 +++++++++++++++++ gpg2.changes | 5 +++++ gpg2.spec | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 gnupg-dont-fail-with-seahorse-agent.patch diff --git a/gnupg-dont-fail-with-seahorse-agent.patch b/gnupg-dont-fail-with-seahorse-agent.patch new file mode 100644 index 0000000..f0b3599 --- /dev/null +++ b/gnupg-dont-fail-with-seahorse-agent.patch @@ -0,0 +1,17 @@ +--- + g10/passphrase.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: gnupg-2.0.15/g10/passphrase.c +=================================================================== +--- gnupg-2.0.15.orig/g10/passphrase.c 2010-01-11 15:11:17.000000000 +0100 ++++ gnupg-2.0.15/g10/passphrase.c 2010-04-07 16:06:49.000000000 +0200 +@@ -72,7 +72,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) +- log_error (_("problem with the agent: %s\n"), gpg_strerror (err)); ++ log_info (_("problem with the agent: %s\n"), gpg_strerror (err)); + /* Default to 65536 which we used up to 2.0.13. */ + return 96; + } diff --git a/gpg2.changes b/gpg2.changes index 5f9f206..f6d38a2 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 7 14:19:11 UTC 2010 - puzel@novell.com + +- add gnupg-dont-fail-with-seahorse-agent.patch (bnc#589994) + ------------------------------------------------------------------- Wed Mar 31 13:47:00 UTC 2010 - puzel@novell.com diff --git a/gpg2.spec b/gpg2.spec index 65c5480..6854147 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -57,6 +57,7 @@ Patch11: gnupg-2.0.9-langinfo.patch Patch12: gnupg-files-are-digests.patch # PATCH-FIX-UPSTREAM gnupg-2.0.14-s2kcount.patch dimstar@opensuse.org -- use fixed s2k-count number to not use gpg-agent. Patch13: gnupg-2.0.14-s2kcount.patch +Patch14: gnupg-dont-fail-with-seahorse-agent.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -72,6 +73,7 @@ gpg-agent, and a keybox library. %patch11 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build # Required for patch7: From 512d1cdbe9900fc967110e86950d1c422e148e1b542d79598a4fb247c2624a2e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 7 Apr 2010 16:08:15 +0000 Subject: [PATCH 2/3] Accepting request 37232 from Base:System checked in (request 37232) OBS-URL: https://build.opensuse.org/request/show/37232 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=21 --- gnupg-dont-fail-with-seahorse-agent.patch | 17 ----------------- gpg2.changes | 5 ----- gpg2.spec | 2 -- 3 files changed, 24 deletions(-) delete mode 100644 gnupg-dont-fail-with-seahorse-agent.patch diff --git a/gnupg-dont-fail-with-seahorse-agent.patch b/gnupg-dont-fail-with-seahorse-agent.patch deleted file mode 100644 index f0b3599..0000000 --- a/gnupg-dont-fail-with-seahorse-agent.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - g10/passphrase.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gnupg-2.0.15/g10/passphrase.c -=================================================================== ---- gnupg-2.0.15.orig/g10/passphrase.c 2010-01-11 15:11:17.000000000 +0100 -+++ gnupg-2.0.15/g10/passphrase.c 2010-04-07 16:06:49.000000000 +0200 -@@ -72,7 +72,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) -- log_error (_("problem with the agent: %s\n"), gpg_strerror (err)); -+ log_info (_("problem with the agent: %s\n"), gpg_strerror (err)); - /* Default to 65536 which we used up to 2.0.13. */ - return 96; - } diff --git a/gpg2.changes b/gpg2.changes index f6d38a2..5f9f206 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Apr 7 14:19:11 UTC 2010 - puzel@novell.com - -- add gnupg-dont-fail-with-seahorse-agent.patch (bnc#589994) - ------------------------------------------------------------------- Wed Mar 31 13:47:00 UTC 2010 - puzel@novell.com diff --git a/gpg2.spec b/gpg2.spec index 6854147..65c5480 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -57,7 +57,6 @@ Patch11: gnupg-2.0.9-langinfo.patch Patch12: gnupg-files-are-digests.patch # PATCH-FIX-UPSTREAM gnupg-2.0.14-s2kcount.patch dimstar@opensuse.org -- use fixed s2k-count number to not use gpg-agent. Patch13: gnupg-2.0.14-s2kcount.patch -Patch14: gnupg-dont-fail-with-seahorse-agent.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,7 +72,6 @@ gpg-agent, and a keybox library. %patch11 %patch12 -p1 %patch13 -p1 -%patch14 -p1 %build # Required for patch7: From d805ae3fabd2d59dd3adbc1473e9207553f3d7e2ddc5217c0dfcb8f1603e372c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 7 Apr 2010 16:08:16 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/gpg2 revision 40.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=086a977c28ff4516cb42ec8a4e9ae376 --- gnupg-dont-fail-with-seahorse-agent.patch | 17 +++++++++++++++++ gpg2.changes | 5 +++++ gpg2.spec | 4 +++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gnupg-dont-fail-with-seahorse-agent.patch diff --git a/gnupg-dont-fail-with-seahorse-agent.patch b/gnupg-dont-fail-with-seahorse-agent.patch new file mode 100644 index 0000000..f0b3599 --- /dev/null +++ b/gnupg-dont-fail-with-seahorse-agent.patch @@ -0,0 +1,17 @@ +--- + g10/passphrase.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: gnupg-2.0.15/g10/passphrase.c +=================================================================== +--- gnupg-2.0.15.orig/g10/passphrase.c 2010-01-11 15:11:17.000000000 +0100 ++++ gnupg-2.0.15/g10/passphrase.c 2010-04-07 16:06:49.000000000 +0200 +@@ -72,7 +72,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) +- log_error (_("problem with the agent: %s\n"), gpg_strerror (err)); ++ log_info (_("problem with the agent: %s\n"), gpg_strerror (err)); + /* Default to 65536 which we used up to 2.0.13. */ + return 96; + } diff --git a/gpg2.changes b/gpg2.changes index 5f9f206..f6d38a2 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 7 14:19:11 UTC 2010 - puzel@novell.com + +- add gnupg-dont-fail-with-seahorse-agent.patch (bnc#589994) + ------------------------------------------------------------------- Wed Mar 31 13:47:00 UTC 2010 - puzel@novell.com diff --git a/gpg2.spec b/gpg2.spec index 65c5480..87b3600 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -20,7 +20,7 @@ Name: gpg2 Version: 2.0.15 -Release: 1 +Release: 2 BuildRequires: expect BuildRequires: fdupes BuildRequires: libgpg-error-devel >= 1.4 @@ -57,6 +57,7 @@ Patch11: gnupg-2.0.9-langinfo.patch Patch12: gnupg-files-are-digests.patch # PATCH-FIX-UPSTREAM gnupg-2.0.14-s2kcount.patch dimstar@opensuse.org -- use fixed s2k-count number to not use gpg-agent. Patch13: gnupg-2.0.14-s2kcount.patch +Patch14: gnupg-dont-fail-with-seahorse-agent.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -72,6 +73,7 @@ gpg-agent, and a keybox library. %patch11 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build # Required for patch7: