From fbab606eab290f0392ef282e182ebfb444ea22b8 Mon Sep 17 00:00:00 2001 From: zhangpan Date: Fri, 17 Feb 2023 07:27:12 +0000 Subject: [PATCH] remove sensitive info (cherry picked from commit c6e308c17d5159916ddea1eb133d666bccce7866) --- gcr.spec | 7 ++++++- remove-sensitive-info.patch | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 remove-sensitive-info.patch diff --git a/gcr.spec b/gcr.spec index f48ce94..8682346 100644 --- a/gcr.spec +++ b/gcr.spec @@ -4,12 +4,14 @@ Name: gcr Version: 3.34.0 -Release: 1 +Release: 2 Summary: A library for bits of crypto UI and parsing License: LGPLv2+ URL: https://wiki.gnome.org/Projects/CryptoGlue Source0: https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz +Patch9000: remove-sensitive-info.patch + BuildRequires: pkgconfig(gio-unix-2.0) pkgconfig(gobject-introspection-1.0) pkgconfig(gtk+-3.0) pkgconfig(p11-kit-1) BuildRequires: chrpath docbook-style-xsl libgcrypt-devel desktop-file-utils intltool vala gnupg2 libxslt %if 0%{?has_valgrind} @@ -82,6 +84,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop %{_datadir}/vala/ %changelog +* Fri Feb 17 2023 zhangpan - 3.34.0-2 +- remove sensitive info + * Sat Jan 11 2020 openEuler Buildteam - 3.34.0-1 - update to 3.34.0 diff --git a/remove-sensitive-info.patch b/remove-sensitive-info.patch new file mode 100644 index 0000000..22ab283 --- /dev/null +++ b/remove-sensitive-info.patch @@ -0,0 +1,25 @@ +From d12a449ba5ff74dc9a03755610f7a24e61e5c062 Mon Sep 17 00:00:00 2001 +From: zhouwenpei +Date: Sat, 28 Jan 2023 17:27:58 +0800 +Subject: [PATCH] remove sensitive information + +--- + gcr/gcr-ssh-askpass.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/gcr/gcr-ssh-askpass.c b/gcr/gcr-ssh-askpass.c +index 3261916..afca957 100644 +--- a/gcr/gcr-ssh-askpass.c ++++ b/gcr/gcr-ssh-askpass.c +@@ -197,8 +197,6 @@ askpass_thread (gpointer data) + if (input->len == 0) + g_string_append (input, _("Enter your OpenSSH passphrase")); + +- g_debug ("asking for ssh-askpass password: %s", input->str); +- + password = g_tls_password_new (G_TLS_PASSWORD_NONE, input->str); + res = g_tls_interaction_invoke_ask_password (ctx->interaction, password, ctx->cancellable, &error); + +-- +2.33.0 +