!17 remove sensitive info

From: @zppzhangpan 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

gcr.spec

@@ -3,21 +3,29 @@
 %endif
 
 Name:           gcr
-Version:        3.34.0
+Version:        3.41.0
-Release:        1
+Release:        3
 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
+Source0:        https://download-fallback.gnome.org/sources/%{name}/3.41/%{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
+BuildRequires:  chrpath docbook-style-xsl libgcrypt-devel desktop-file-utils intltool vala gnupg2 libxslt meson
+BuildRequires:  gtk-doc gettext cmake pkgconfig(libsecret-1) pkgconfig(libsystemd)
 %if 0%{?has_valgrind}
 BuildRequires:  valgrind-devel
 %endif
-
+BuildRequires:  /usr/bin/gpg2
-Provides:       %{name}-base = %{version}-%{release}
+BuildRequires:  /usr/bin/ssh-add
-Obsoletes:	%{name}-base < %{version}-%{release}
+BuildRequires:  /usr/bin/ssh-agent
+BuildRequires:  /usr/bin/xsltproc
+ 
+Requires: %{name}-base%{?_isa} = %{version}-%{release}
+Requires: /usr/bin/ssh-add
+Requires: /usr/bin/ssh-agent
 
 %description
 gcr is a library for displaying certificates, and crypto UI, accessing key stores. It also provides a viewer for
@@ -30,6 +38,13 @@ Requires:       %{name} = %{version}-%{release}
 %description    devel
 The gcr-devel package includes the header files for the gcr library.
 
+%package base
+Summary: Library files for gcr
+Conflicts: %{name} < 3.28.1-3
+ 
+%description base
+The gcr-base package includes the gcr-base library.
+
 %prep
 %autosetup -n %{name}-%{version} -p1
 # Use system valgrind headers instead
@@ -38,50 +53,86 @@ rm -rf build/valgrind/
 %endif
 
 %build
-%configure --enable-introspection
+%meson
-%make_build
+%meson_build
 
 %install
-%make_install
+%meson_install
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libmock-test-module.*
 %find_lang %{name}
 
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gcr-viewer
-chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/gcr-prompter
-
 %check
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 
+%post
+%systemd_user_post gcr-ssh-agent.service
+ 
+%preun
+%systemd_user_preun gcr-ssh-agent.service
+ 
+%postun
+%systemd_user_postun_with_restart gcr-ssh-agent.service
+
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc README NEWS
+%doc NEWS README.md
 %license COPYING
 %{_bindir}/gcr-viewer
 %{_datadir}/applications/gcr-viewer.desktop
 %dir %{_datadir}/GConf
 %dir %{_datadir}/GConf/gsettings
-%{_libdir}/girepository-1.0
+%{_datadir}/GConf/gsettings/org.gnome.crypto.pgp.convert
-%{_libdir}/libg*.so.*
+%{_datadir}/GConf/gsettings/org.gnome.crypto.pgp_keyservers.convert
-%{_libexecdir}/gcr-*
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/applications/gcr-prompter.desktop
-%{_datadir}/mime/packages/gcr-crypto-types.xml
-%{_datadir}/GConf/gsettings/org.gnome.crypto.*.convert
-%{_datadir}/dbus-1/services/org.gnome.keyring.*.service
 %{_datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
-
+%{_libdir}/girepository-1.0
+%{_libdir}/libgcr-ui-3.so.1*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/mime/packages/gcr-crypto-types.xml
+%{_libexecdir}/gcr-prompter
+%{_libexecdir}/gcr-ssh-agent
+%{_libexecdir}/gcr-ssh-askpass
+%{_datadir}/dbus-1/services/org.gnome.keyring.PrivatePrompter.service
+%{_datadir}/dbus-1/services/org.gnome.keyring.SystemPrompter.service
+%{_datadir}/applications/gcr-prompter.desktop
+%{_userunitdir}/gcr-ssh-agent.service
+%{_userunitdir}/gcr-ssh-agent.socket
+ 
 %files devel
 %{_includedir}/gck-1
 %{_includedir}/gcr-3
-%{_libdir}/libg*.so
+%{_libdir}/libgck-1.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/libgcr-base-3.so
+%{_libdir}/libgcr-ui-3.so
+%{_libdir}/pkgconfig/gck-1.pc
+%{_libdir}/pkgconfig/gcr-3.pc
+%{_libdir}/pkgconfig/gcr-base-3.pc
+%{_libdir}/pkgconfig/gcr-ui-3.pc
 %{_datadir}/gir-1.0
-%{_datadir}/gtk-doc/html/gc*
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/gck
+%{_datadir}/gtk-doc/html/gcr
 %{_datadir}/vala/
+ 
+%files base
+%{_libdir}/libgck-1.so.0*
+%{_libdir}/libgcr-base-3.so.1*
 
 %changelog
+* Fri Feb 17 2023 zhangpan <zhangpan103@h-partners.com> - 3.41.0-3
+- remove sensitive info
+
+* Wed Oct 26 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 3.41.0-2
+- Rebuild for next release
+
+* Mon Dec 6 2021 hanhui <hanhui15@huawei.com> - 3.41.0-1
+- update to gcr-3.41.0
+
+* Fri Jan 29 2021 yanglu <yanglu60@huawei.com> - 3.38.1-1
+- update to 3.38.1
+
+* Mon Jul 20 2020 wangye <wangye70@huawei.com> - 3.36.0-1
+- update to 3.36.0
+
 * Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.34.0-1
 - update to 3.34.0
 

remove-sensitive-info.patch

@@ -0,0 +1,25 @@
+From d12a449ba5ff74dc9a03755610f7a24e61e5c062 Mon Sep 17 00:00:00 2001
+From: zhouwenpei <zhouwenpei1@h-partners.com>
+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 fd9e20b..b4b33d4 100644
+--- a/gcr/gcr-ssh-askpass.c
++++ b/gcr/gcr-ssh-askpass.c
+@@ -193,8 +193,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
+