Accepting request 663078 from GNOME:Factory

My bad, I was sure I was in GN working on this..

OBS-URL: https://build.opensuse.org/request/show/663078
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gupnp-igd?expand=0&rev=45
This commit is contained in:
Bjørn Lie 2019-01-05 23:53:47 +00:00 committed by Git OBS Bridge
parent 3794c56926
commit 5134edfbf4
3 changed files with 6 additions and 62 deletions

View File

@ -1,44 +0,0 @@
From 761854febad29224c194fabb76c24f2701099c2f Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Fri, 10 Nov 2017 23:17:29 +1100
Subject: [PATCH] free GStaticMutex in AddRemoveData
Fixes a memory leak reported by valgrind
128 bytes in 16 blocks are definitely lost in loss record 6,923 of 7,784
at 0x4C2CE5F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x7AEAEB8: g_malloc (gmem.c:94)
by 0x7B02A25: g_slice_alloc (gslice.c:1025)
by 0x7AB6D9A: g_mutex_new (gthread-deprecated.c:1461)
by 0x7AB70B4: g_static_mutex_get_mutex_impl (gthread-deprecated.c:524)
by 0xBE6E74F: ??? (in /usr/lib/libgupnp-igd-1.0.so.4.2.0)
by 0x7AE5784: g_main_dispatch (gmain.c:3182)
by 0x7AE5784: g_main_context_dispatch (gmain.c:3847)
by 0x7AE5B4F: g_main_context_iterate.isra.30 (gmain.c:3920)
by 0x7AE5E61: g_main_loop_run (gmain.c:4116)
by 0xBE6ED7D: ??? (in /usr/lib/libgupnp-igd-1.0.so.4.2.0)
by 0x7B0D2A4: g_thread_proxy (gthread.c:784)
by 0x8028089: start_thread (in /usr/lib/libpthread-2.26.so)
by 0x833524E: clone (in /usr/lib/libc-2.26.so)
https://bugzilla.gnome.org/show_bug.cgi?id=790165
---
libgupnp-igd/gupnp-simple-igd-thread.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libgupnp-igd/gupnp-simple-igd-thread.c b/libgupnp-igd/gupnp-simple-igd-thread.c
index 8212f76..f38e9b7 100644
--- a/libgupnp-igd/gupnp-simple-igd-thread.c
+++ b/libgupnp-igd/gupnp-simple-igd-thread.c
@@ -450,6 +450,8 @@ free_add_remove_port_data (gpointer user_data)
g_free (data->local_ip);
g_free (data->description);
+ g_static_mutex_free (&data->mutex);
+
g_slice_free (struct AddRemovePortData, data);
}
--
2.18.1

View File

@ -1,11 +1,3 @@
-------------------------------------------------------------------
Sat Jan 5 22:51:40 UTC 2019 - bjorn.lie@gmail.com
- Add gupnp-igd-free-GStaticMutex-in-AddRemoveData.patch: Free
GStaticMutex in AddRemoveData. Fixes a memory leak reported by
valgrind.
- Modernize spec.
-------------------------------------------------------------------
Wed Feb 28 16:33:13 UTC 2018 - dimstar@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package gupnp-igd
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@ -25,9 +25,6 @@ Group: Development/Libraries/C and C++
URL: https://wiki.gnome.org/Projects/GUPnP
Source: http://download.gnome.org/sources/gupnp-igd/0.2/%{name}-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM gupnp-igd-free-GStaticMutex-in-AddRemoveData.patch -- Free GStaticMutex in AddRemoveData
Patch0: gupnp-igd-free-GStaticMutex-in-AddRemoveData.patch
BuildRequires: pkgconfig
BuildRequires: pkgconfig(glib-2.0) >= 2.26
BuildRequires: pkgconfig(gobject-2.0) >= 2.26
@ -72,13 +69,12 @@ GUPnP-IGD is a library to handle UPnP IGD port mapping. It is supposed
to have a very simple API.
%prep
%autosetup -p1
%setup -q
%build
%configure \
--disable-static \
%{nil}
%make_build
%configure --disable-static
make %{?_smp_mflags}
%install
%make_install