pool/libgtop
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgtop?expand=0&rev=12

Browse Source
This commit is contained in:
OBS User unknown 2008-05-16 12:36:38 +00:00 committed by Git OBS Bridge
parent 9d0c53da59
commit 159c5de118
3 changed files with 70 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libgtop-bnc386735.patch Normal file
View File

@ -0,0 +1,42 @@
Index: sysdeps/linux/glibtop_private.c
===================================================================
--- sysdeps/linux/glibtop_private.c (revision 2740)
+++ sysdeps/linux/glibtop_private.c (revision 2741)
@@ -119,20 +119,27 @@
static unsigned long
read_boot_time(glibtop *server)
{
- char buffer[BUFSIZ];
- char *btime;
+ char* line = NULL;
+ size_t size = 0;
+ FILE* stat;
+ unsigned long btime = 0;
- file_to_buffer(server, buffer, sizeof buffer, "/proc/stat");
+ if (!(stat = fopen("/proc/stat", "r"))) {
+ glibtop_error_io_r(server, "fopen(\"/proc/stat\")");
+ goto out;
+ }
- btime = strstr(buffer, "btime");
-
- if (!btime) {
- glibtop_warn_io_r(server, "cannot find btime in /proc/stat");
- return 0UL;
+ while (getline(&line, &size, stat) != -1) {
+ if (!strncmp(line, "btime", 5)) {
+ btime = strtoul(skip_token(line), NULL, 10);
+ break;
+ }
}
- btime = skip_token(btime);
- return strtoul(btime, NULL, 10);
+ free(line);
+ fclose(stat);
+out:
+ return btime;
}

5
libgtop.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 12 16:14:07 EDT 2008 - hfiguiere@suse.de
- added libgtop-bnc386735.patch to fix bnc#386735.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de

41
libgtop.spec
View File

@ -15,7 +15,7 @@ BuildRequires: fdupes gdbm-devel glib2-devel gtk-doc intltool licenses popt-dev
License: GPL v2 or later License: GPL v2 or later
Group: Development/Libraries/GNOME Group: Development/Libraries/GNOME
Version: 2.22.1 Version: 2.22.1
Release: 2 Release: 12
# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: # 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) #%(sh %{_sourcedir}/%{name}_spec-update.sh %{_sourcedir} %{name} libgtop-2_0)
%define libgtop-2_0_name 7 %define libgtop-2_0_name 7
@ -24,6 +24,8 @@ Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/libgtop/2.19/%{name
Source1: %{name}_spec-update.sh Source1: %{name}_spec-update.sh
#PATCH-FIX-UPSTREAM gnome-system-monitor-resident-schema.patch bnc157022 bgo336376 joeshaw@novell.com -- Probably need to really show Resident by default #PATCH-FIX-UPSTREAM gnome-system-monitor-resident-schema.patch bnc157022 bgo336376 joeshaw@novell.com -- Probably need to really show Resident by default
Patch: libgtop-resident-field-fix.patch Patch: libgtop-resident-field-fix.patch
#PATCH-FIX-UPSTREAM libgtop-bnc386735.patch bnc386735 hfiguiere@suse.de -- Already in SVN.
Patch2: libgtop-bnc386735.patch
Requires: libgtop-2_0-7 licenses Requires: libgtop-2_0-7 licenses
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -108,6 +110,7 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch %patch
%patch2
# rpmlint note: libgtop has a separate translation for both Bengali and Bengali India # rpmlint note: libgtop has a separate translation for both Bengali and Bengali India
%build %build
@ -168,13 +171,15 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_infodir}/*.info* %doc %{_infodir}/*.info*
%changelog %changelog
* Mon May 12 2008 hfiguiere@suse.de
- added libgtop-bnc386735.patch to fix bnc#386735.
* Thu Apr 10 2008 ro@suse.de * Thu Apr 10 2008 ro@suse.de
- added baselibs.conf file to build xxbit packages - added baselibs.conf file to build xxbit packages
for multilib support for multilib support
* Thu Apr 10 2008 maw@suse.de * Wed Apr 09 2008 maw@suse.de
- Update to version 2.22.1: - Update to version 2.22.1:
+ Bug fixed: bgo#525953. + Bug fixed: bgo#525953.
* Fri Mar 14 2008 maw@suse.de * Thu Mar 13 2008 maw@suse.de
- Update to version 2.22.0: - Update to version 2.22.0:
+ Fixed proc_kernel. + Fixed proc_kernel.
* Tue Mar 04 2008 maw@suse.de * Tue Mar 04 2008 maw@suse.de
@ -198,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT
* Mon Sep 17 2007 sbrabec@suse.cz * Mon Sep 17 2007 sbrabec@suse.cz
- Updated to version 2.20.0: - Updated to version 2.20.0:
* updated translations * updated translations
* Tue Sep 11 2007 maw@suse.de * Mon Sep 10 2007 maw@suse.de
- Update to version 2.19.92: - Update to version 2.19.92:
+ Fix hardwired path in linux/sysinfo.c. + Fix hardwired path in linux/sysinfo.c.
* Tue Aug 07 2007 maw@suse.de * Tue Aug 07 2007 maw@suse.de
@ -210,7 +215,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Jul 17 2007 sbrabec@suse.cz * Tue Jul 17 2007 sbrabec@suse.cz
- Fixed shared library packaging. - Fixed shared library packaging.
- Added script to update library package names. - Added script to update library package names.
* Tue Jul 10 2007 maw@suse.de * Mon Jul 09 2007 maw@suse.de
- Rename the package to libgtop-2_0-7 - Rename the package to libgtop-2_0-7
- Update to version 2.19.4 - Update to version 2.19.4
- Minor API change - get_proclist returns pit_t instead of unsigned - Minor API change - get_proclist returns pit_t instead of unsigned
@ -223,7 +228,7 @@ rm -rf $RPM_BUILD_ROOT
- Add gdbm-devel BuildRequires. - Add gdbm-devel BuildRequires.
* Tue Feb 27 2007 maw@suse.de * Tue Feb 27 2007 maw@suse.de
- Create a -doc subpackage (#248813). - Create a -doc subpackage (#248813).
* Tue Feb 20 2007 maw@suse.de * Mon Feb 19 2007 maw@suse.de
- Update to version 2.14.7 - Update to version 2.14.7
- Remove libgtop-buffer-overflow.patch which is now upstream - Remove libgtop-buffer-overflow.patch which is now upstream
- Package gtk-doc generated docs in the -devel subpackage. - Package gtk-doc generated docs in the -devel subpackage.
@ -233,20 +238,20 @@ rm -rf $RPM_BUILD_ROOT
- Add libgtop-buffer-overflow.patch (#235086 and CVE-2007-0235). - Add libgtop-buffer-overflow.patch (#235086 and CVE-2007-0235).
* Mon Jan 08 2007 sbrabec@suse.cz * Mon Jan 08 2007 sbrabec@suse.cz
- Spec file cleanup. - Spec file cleanup.
* Mon Jan 08 2007 ro@suse.de * Sun Jan 07 2007 ro@suse.de
- GNOME moved to /usr - GNOME moved to /usr
* Tue Oct 03 2006 jhargadon@suse.de * Tue Oct 03 2006 jhargadon@suse.de
- update to version 2.14.4 - update to version 2.14.4
- Fixed linux maps/smaps parsing on 64bit kernel - Fixed linux maps/smaps parsing on 64bit kernel
- Fixed build with --as-needed - Fixed build with --as-needed
- Added missing G_BEGIN_DECLS/G_END_DECLS - Added missing G_BEGIN_DECLS/G_END_DECLS
* Wed Aug 16 2006 jhargadon@suse.de * Tue Aug 15 2006 jhargadon@suse.de
- update to version 2.14.2 - update to version 2.14.2
- Updated solaris support - Updated solaris support
- interface addition to handle wireless interfaces. - interface addition to handle wireless interfaces.
* Tue Aug 15 2006 sbrabec@suse.cz * Tue Aug 15 2006 sbrabec@suse.cz
- Call ldconfig (#198912). - Call ldconfig (#198912).
* Wed Aug 02 2006 gekker@suse.de * Tue Aug 01 2006 gekker@suse.de
- Update to version 2.14.1 - Update to version 2.14.1
* Updated translations. * Updated translations.
* Fixed NetBSD port (Julio M. Merino Vidal <jmmv@NetBSD.org>). * Fixed NetBSD port (Julio M. Merino Vidal <jmmv@NetBSD.org>).
@ -271,7 +276,7 @@ rm -rf $RPM_BUILD_ROOT
- Added %%install_info_prereq. - Added %%install_info_prereq.
* Wed Jan 25 2006 mls@suse.de * Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Thu Dec 01 2005 gekker@suse.de * Wed Nov 30 2005 gekker@suse.de
- Update to version 2.12.2 - Update to version 2.12.2
* Mon Sep 05 2005 gekker@suse.de * Mon Sep 05 2005 gekker@suse.de
- Update to version 2.12.0 (GNOME 2.12) - Update to version 2.12.0 (GNOME 2.12)
@ -279,20 +284,20 @@ rm -rf $RPM_BUILD_ROOT
- Update to version 2.11.92 - Update to version 2.11.92
* Mon Aug 08 2005 rodrigo@suse.de * Mon Aug 08 2005 rodrigo@suse.de
- Updated to 2.11.91 - Updated to 2.11.91
* Wed Aug 03 2005 gekker@suse.de * Tue Aug 02 2005 gekker@suse.de
- Update to version 2.11.90 - Update to version 2.11.90
- Fixup devel requirements - Fixup devel requirements
* Sat Jul 23 2005 gekker@suse.de * Fri Jul 22 2005 gekker@suse.de
- Update to version 2.11.2 - Update to version 2.11.2
* Wed Jun 22 2005 gekker@suse.de * Tue Jun 21 2005 gekker@suse.de
- Update to version 2.11.0 - Update to version 2.11.0
* Fri Jun 17 2005 sbrabec@suse.cz * Fri Jun 17 2005 sbrabec@suse.cz
- Build with libXau on x86_64 (#91187). - Build with libXau on x86_64 (#91187).
* Wed Jun 01 2005 sbrabec@suse.cz * Wed Jun 01 2005 sbrabec@suse.cz
- Fixed devel requirements. - Fixed devel requirements.
* Thu Mar 10 2005 gekker@suse.de * Wed Mar 09 2005 gekker@suse.de
- Update to version 2.10.0 (GNOME 2.10). - Update to version 2.10.0 (GNOME 2.10).
* Fri Mar 04 2005 gekker@suse.de * Thu Mar 03 2005 gekker@suse.de
- Update to version 2.9.92 - Update to version 2.9.92
* Fri Feb 11 2005 gekker@suse.de * Fri Feb 11 2005 gekker@suse.de
- Update to version 2.9.91 - Update to version 2.9.91
@ -300,7 +305,7 @@ rm -rf $RPM_BUILD_ROOT
- updated to version 2.9.90 - updated to version 2.9.90
* Mon Jan 24 2005 ro@suse.de * Mon Jan 24 2005 ro@suse.de
- fix build on x86_64 working around non-fPIC libXau - fix build on x86_64 working around non-fPIC libXau
* Sat Jan 22 2005 gekker@suse.de * Fri Jan 21 2005 gekker@suse.de
- Update to version 2.9.4 - Update to version 2.9.4
* Tue Jan 04 2005 gekker@suse.de * Tue Jan 04 2005 gekker@suse.de
- Update to version 2.9.3 - Update to version 2.9.3
@ -335,7 +340,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Jun 26 2003 sbrabec@suse.cz * Thu Jun 26 2003 sbrabec@suse.cz
- Cleaned up neededforbuild. - Cleaned up neededforbuild.
- Use %%find_lang. - Use %%find_lang.
* Mon Jun 23 2003 ro@suse.de * Sun Jun 22 2003 ro@suse.de
- added gnome-filesystem to neededforbuild - added gnome-filesystem to neededforbuild
- added directories to filelist - added directories to filelist
* Tue May 27 2003 sbrabec@suse.cz * Tue May 27 2003 sbrabec@suse.cz
@ -354,7 +359,7 @@ rm -rf $RPM_BUILD_ROOT
- fix filelist - fix filelist
* Wed May 15 2002 ro@suse.de * Wed May 15 2002 ro@suse.de
- use libdir - use libdir
* Thu Apr 18 2002 ro@suse.de * Wed Apr 17 2002 ro@suse.de
- fix for automake-1.6 - fix for automake-1.6
* Thu Jan 17 2002 hhetter@suse.de * Thu Jan 17 2002 hhetter@suse.de
- prefixed to /opt/gnome2 - prefixed to /opt/gnome2