This commit is contained in:
parent
4086663c1d
commit
f8d50f3b75
20
libgtop-fsusage-leak.patch
Normal file
20
libgtop-fsusage-leak.patch
Normal file
@ -0,0 +1,20 @@
|
||||
Index: sysdeps/linux/fsusage.c
|
||||
===================================================================
|
||||
--- sysdeps/linux/fsusage.c (révision 2786)
|
||||
+++ sysdeps/linux/fsusage.c (copie de travail)
|
||||
@@ -142,10 +142,14 @@ static void linux_2_6_0(glibtop *server,
|
||||
|
||||
ret = try_file_to_buffer(buffer, sizeof buffer, filename);
|
||||
|
||||
- if(ret < 0) return;
|
||||
+ if(ret < 0) {
|
||||
+ g_free(filename);
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
if (sscanf(buffer, format, &buf->read, &buf->write) != 2) {
|
||||
glibtop_warn_io_r(server, "Could not parse %s", filename);
|
||||
+ g_free(filename);
|
||||
return;
|
||||
}
|
||||
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 7 12:34:56 CET 2009 - olh@suse.de
|
||||
|
||||
- obsolete old -XXbit packages (bnc#437293)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 5 13:04:32 CET 2009 - vuntz@novell.com
|
||||
|
||||
- Add libgtop-fsusage-leak.patch to fix a potential leak. Fix
|
||||
bnc#460758.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 23 10:19:52 CDT 2008 - maw@suse.de
|
||||
|
||||
|
43
libgtop.spec
43
libgtop.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libgtop (Version 2.24.0)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -28,14 +28,21 @@ BuildRequires: xorg-x11-devel
|
||||
License: GPL v2 or later
|
||||
Group: Development/Libraries/GNOME
|
||||
Version: 2.24.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
|
||||
#%(sh %{_sourcedir}/%{name}_spec-update.sh %{_sourcedir} %{name} libgtop-2_0)
|
||||
%define libgtop-2_0_name 7
|
||||
Summary: LibGTop Library
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/libgtop/2.19/%{name}-%{version}.tar.bz2
|
||||
Source1: %{name}_spec-update.sh
|
||||
#PATCH-FIX-UPSTREAM libgtop-fsusage-leak.patch bnc460758 bgo566611 vuntz@novell.com
|
||||
Patch0: libgtop-fsusage-leak.patch
|
||||
Requires: libgtop-2_0-7 licenses
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: libgtop-64bit
|
||||
%endif
|
||||
#
|
||||
Requires: %{name}-lang = %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -60,6 +67,11 @@ Summary: LibGTop Library
|
||||
Group: Development/Libraries/GNOME
|
||||
# Require translation package (%{name}) not older than the library:
|
||||
Requires: %{name} >= %{version}
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: libgtop-64bit
|
||||
%endif
|
||||
#
|
||||
|
||||
%description -n libgtop-2_0-7
|
||||
A library that fetches information about the running system, such as
|
||||
@ -81,6 +93,11 @@ License: GPL v2 or later
|
||||
Summary: Include Files and Libraries mandatory for Development
|
||||
Group: Development/Libraries/GNOME
|
||||
Requires: %{name} = %{version} glib2-devel gdbm-devel xorg-x11-devel
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: libgtop-devel-64bit
|
||||
%endif
|
||||
#
|
||||
PreReq: %install_info_prereq
|
||||
|
||||
%description devel
|
||||
@ -119,6 +136,7 @@ Authors:
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p0
|
||||
# rpmlint note: libgtop has a separate translation for both Bengali and Bengali India
|
||||
|
||||
%build
|
||||
@ -181,6 +199,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc %{_infodir}/*.info*
|
||||
|
||||
%changelog
|
||||
* Wed Jan 07 2009 olh@suse.de
|
||||
- obsolete old -XXbit packages (bnc#437293)
|
||||
* Mon Jan 05 2009 vuntz@novell.com
|
||||
- Add libgtop-fsusage-leak.patch to fix a potential leak. Fix
|
||||
bnc#460758.
|
||||
* Tue Sep 23 2008 maw@suse.de
|
||||
- Update to version 2.24.0:
|
||||
+ Updated translations.
|
||||
@ -206,10 +229,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Thu Apr 10 2008 ro@suse.de
|
||||
- added baselibs.conf file to build xxbit packages
|
||||
for multilib support
|
||||
* Wed Apr 09 2008 maw@suse.de
|
||||
* Thu Apr 10 2008 maw@suse.de
|
||||
- Update to version 2.22.1:
|
||||
+ Bug fixed: bgo#525953.
|
||||
* Thu Mar 13 2008 maw@suse.de
|
||||
* Fri Mar 14 2008 maw@suse.de
|
||||
- Update to version 2.22.0:
|
||||
+ Fixed proc_kernel.
|
||||
* Tue Mar 04 2008 maw@suse.de
|
||||
@ -268,7 +291,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- Add libgtop-buffer-overflow.patch (#235086 and CVE-2007-0235).
|
||||
* Mon Jan 08 2007 sbrabec@suse.cz
|
||||
- Spec file cleanup.
|
||||
* Sun Jan 07 2007 ro@suse.de
|
||||
* Mon Jan 08 2007 ro@suse.de
|
||||
- GNOME moved to /usr
|
||||
* Tue Oct 03 2006 jhargadon@suse.de
|
||||
- update to version 2.14.4
|
||||
@ -319,15 +342,15 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- Fixup devel requirements
|
||||
* Fri Jul 22 2005 gekker@suse.de
|
||||
- Update to version 2.11.2
|
||||
* Tue Jun 21 2005 gekker@suse.de
|
||||
* Wed Jun 22 2005 gekker@suse.de
|
||||
- Update to version 2.11.0
|
||||
* Fri Jun 17 2005 sbrabec@suse.cz
|
||||
- Build with libXau on x86_64 (#91187).
|
||||
* Wed Jun 01 2005 sbrabec@suse.cz
|
||||
- Fixed devel requirements.
|
||||
* Wed Mar 09 2005 gekker@suse.de
|
||||
* Thu Mar 10 2005 gekker@suse.de
|
||||
- Update to version 2.10.0 (GNOME 2.10).
|
||||
* Thu Mar 03 2005 gekker@suse.de
|
||||
* Fri Mar 04 2005 gekker@suse.de
|
||||
- Update to version 2.9.92
|
||||
* Fri Feb 11 2005 gekker@suse.de
|
||||
- Update to version 2.9.91
|
||||
@ -370,7 +393,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Thu Jun 26 2003 sbrabec@suse.cz
|
||||
- Cleaned up neededforbuild.
|
||||
- Use %%find_lang.
|
||||
* Sun Jun 22 2003 ro@suse.de
|
||||
* Mon Jun 23 2003 ro@suse.de
|
||||
- added gnome-filesystem to neededforbuild
|
||||
- added directories to filelist
|
||||
* Tue May 27 2003 sbrabec@suse.cz
|
||||
@ -389,7 +412,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- fix filelist
|
||||
* Wed May 15 2002 ro@suse.de
|
||||
- use libdir
|
||||
* Wed Apr 17 2002 ro@suse.de
|
||||
* Thu Apr 18 2002 ro@suse.de
|
||||
- fix for automake-1.6
|
||||
* Thu Jan 17 2002 hhetter@suse.de
|
||||
- prefixed to /opt/gnome2
|
||||
|
Loading…
x
Reference in New Issue
Block a user