Accepting request 423533 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/423533
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libsecret?expand=0&rev=15

libsecret-bsc932232-use-libgcrypt-allocators.patch

@@ -0,0 +1,16 @@
+diff --git a/egg/egg-libgcrypt.c b/egg/egg-libgcrypt.c
+index 22f005d..a01fb11 100644
+--- a/egg/egg-libgcrypt.c
++++ b/egg/egg-libgcrypt.c
+@@ -107,11 +107,6 @@ egg_libgcrypt_initialize (void)
+ 			gcry_set_log_handler (log_handler, NULL);
+ 			gcry_set_outofcore_handler (no_mem_handler, NULL);
+ 			gcry_set_fatalerror_handler (fatal_handler, NULL);
+-			gcry_set_allocation_handler ((gcry_handler_alloc_t)g_malloc, 
+-			                             (gcry_handler_alloc_t)egg_secure_alloc, 
+-			                             egg_secure_check, 
+-			                             (gcry_handler_realloc_t)egg_secure_realloc, 
+-			                             egg_secure_free);
+ 			gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+ 		}
+ 		

libsecret.changes

@@ -15,6 +15,12 @@ Tue Jan 19 08:56:19 UTC 2016 - zaitor@opensuse.org
   + Fix memory leaks (bgo#756766).
   + Updated translations.
 
+-------------------------------------------------------------------
+Thu Nov 26 03:02:09 CET 2015 - hpj@suse.com
+
+- Add libsecret-bsc932232-use-libgcrypt-allocators.patch
+  (bsc#932232).
+
 -------------------------------------------------------------------
 Tue Aug  4 08:09:41 UTC 2015 - zaitor@opensuse.org
 

libsecret.spec

@@ -27,6 +27,8 @@ Group:          System/Libraries
 Url:            https://wiki.gnome.org/Projects/Libsecret
 Source0:        http://download.gnome.org/sources/libsecret/0.18/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
+# PATCH-FIX-SLE libsecret-bsc932232-use-libgcrypt-allocators.patch bsc#932232 hpj@suse.com -- use libgcrypt allocators for FIPS mode
+Patch1:         libsecret-bsc932232-use-libgcrypt-allocators.patch
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel >= 1.29
@@ -90,6 +92,9 @@ secrets. It communicates with the "Secret Service" using DBus.
 %endif
 %prep
 %setup -q
+%if !0%{?is_opensuse}
+%patch1 -p1
+%endif
 translation-update-upstream
 
 %build