Accepting request 423532 from GNOME:Factory
1 OBS-URL: https://build.opensuse.org/request/show/423532 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gcr?expand=0&rev=29
This commit is contained in:
commit
211a7f0fb7
16
gcr-bsc932232-use-libgcrypt-allocators.patch
Normal file
16
gcr-bsc932232-use-libgcrypt-allocators.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/egg/egg-libgcrypt.c b/egg/egg-libgcrypt.c
|
||||
index 0ba84fe..cca36f1 100644
|
||||
--- a/egg/egg-libgcrypt.c
|
||||
+++ b/egg/egg-libgcrypt.c
|
||||
@@ -105,11 +105,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);
|
||||
}
|
||||
|
10
gcr.changes
10
gcr.changes
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 15 20:21:06 CEST 2016 - hpj@suse.com
|
||||
|
||||
- Update to GNOME 3.20 -- Fate#318572.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 25 15:10:44 UTC 2016 - zaitor@opensuse.org
|
||||
|
||||
@ -12,6 +17,11 @@ Tue Jan 19 13:07:06 UTC 2016 - dimstar@opensuse.org
|
||||
+ Build fixes (bgo#756235, bgo#755873).
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 26 02:54:47 CET 2015 - hpj@suse.com
|
||||
|
||||
- Add gcr-bsc932232-use-libgcrypt-allocators.patch (bsc#932232).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 29 10:05:20 UTC 2015 - zaitor@opensuse.org
|
||||
|
||||
|
5
gcr.spec
5
gcr.spec
@ -26,6 +26,8 @@ Group: System/Libraries
|
||||
Url: http://www.gnome.org
|
||||
Source0: http://download.gnome.org/sources/gcr/3.20/%{name}-%{version}.tar.xz
|
||||
Source1: baselibs.conf
|
||||
# PATCH-FIX-SLE gcr-bsc932232-use-libgcrypt-allocators.patch bsc#932232 hpj@suse.com -- use libgcrypt allocators for FIPS mode
|
||||
Patch1: gcr-bsc932232-use-libgcrypt-allocators.patch
|
||||
# For directory ownership
|
||||
BuildRequires: dbus-1
|
||||
BuildRequires: gobject-introspection-devel >= 1.34
|
||||
@ -171,6 +173,9 @@ else
|
||||
sed -i "s:GLib.Object:GObject.Object:g" $file
|
||||
done
|
||||
fi
|
||||
%if !0%{?is_opensuse}
|
||||
%patch1 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
Loading…
Reference in New Issue
Block a user