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

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

Browse Source
This commit is contained in:
OBS User unknown 2009-06-19 21:35:26 +00:00 committed by Git OBS Bridge
parent 27bce2427a
commit 29588c2186
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
procps-3.2.8-pmap-smaps-rml-2.patch
View File

@ -91,8 +91,8 @@
+The procps package is maintained by Albert Calahan. Please send +The procps package is maintained by Albert Calahan. Please send
+bug reports to <albert@users.sf.net>. +bug reports to <albert@users.sf.net>.
--- pmap.c --- pmap.c
+++ pmap.c 2009-05-11 12:12:27.653901642 +0200 +++ pmap.c 2009-06-16 16:28:36.169902773 +0200
@@ -1,372 +1,395 @@ @@ -1,372 +1,405 @@
/* /*
- * Copyright 2002 by Albert Cahalan; all rights reserved. - * Copyright 2002 by Albert Cahalan; all rights reserved.
- * This file may be used subject to the terms and conditions of the - * This file may be used subject to the terms and conditions of the
@ -227,7 +227,7 @@
+static unsigned long referenced; +static unsigned long referenced;
+static unsigned long swap; +static unsigned long swap;
+static FILE *smaps_fp; +static FILE *smaps_fp;
+static int maj, min, patch, dopss, noref, doswap; +static int maj, min, patch, dopss, noref, doswap, dopage;
+static long lbits; +static long lbits;
+#define BLK ((lbits==64)?" ":"") +#define BLK ((lbits==64)?" ":"")
+#define WDT ((lbits==64)?16:8) +#define WDT ((lbits==64)?16:8)
@ -356,6 +356,14 @@
+ return 1; + return 1;
+ smap->swap = data; + smap->swap = data;
+ swap += data; + swap += data;
+
+ if (!dopage)
+ goto out;
+
+ if (!fgets(buff, BUFFERSIZE, smaps_fp))
+ return 1;
+ if (!fgets(buff, BUFFERSIZE, smaps_fp))
+ return 1;
+out: +out:
+ return 0; + return 0;
} }
@ -595,6 +603,8 @@
+ } + }
+ sscanf(uts.release, "%d.%d.%d", &maj, &min, &patch); + sscanf(uts.release, "%d.%d.%d", &maj, &min, &patch);
+ +
+ if ((maj > 2) || ((maj == 2) && ((min > 6) || ((min == 6) && (patch >= 30)))))
+ dopage++;
+ if ((maj > 2) || ((maj == 2) && ((min > 6) || ((min == 6) && (patch >= 27))))) + if ((maj > 2) || ((maj == 2) && ((min > 6) || ((min == 6) && (patch >= 27)))))
+ doswap++; + doswap++;
+ if ((maj > 2) || ((maj == 2) && ((min > 6) || ((min == 6) && (patch >= 25))))) + if ((maj > 2) || ((maj == 2) && ((min > 6) || ((min == 6) && (patch >= 25)))))

6
procps.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 16 16:31:45 CEST 2009 - werner@suse.de
- The kernel people forgotten to inform me about new smaps layout
* ignore KernelPageSize and MMUPageSize in pmap (bnc#513542)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 11 12:42:59 CEST 2009 - werner@suse.de Mon May 11 12:42:59 CEST 2009 - werner@suse.de

7
procps.spec
View File

@ -22,12 +22,12 @@ Name: procps
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
Url: http://procps.sf.net Url: http://procps.sf.net
License: GPL v2 or later; LGPL v2.1 or later License: GPL v2 or later ; LGPL v2.1 or later
Group: System/Monitoring Group: System/Monitoring
PreReq: %fillup_prereq %insserv_prereq PreReq: %fillup_prereq %insserv_prereq
AutoReqProv: on AutoReqProv: on
Version: 3.2.8 Version: 3.2.8
Release: 1 Release: 2
Summary: ps utilities for /proc Summary: ps utilities for /proc
Provides: ps Provides: ps
Obsoletes: ps Obsoletes: ps
@ -181,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
%_mandir/man8/sysctl.8.gz %_mandir/man8/sysctl.8.gz
%changelog %changelog
* Tue Jun 16 2009 werner@suse.de
- The kernel people forgotten to inform me about new smaps layout
* ignore KernelPageSize and MMUPageSize in pmap (bnc#513542)
* Mon May 11 2009 werner@suse.de * Mon May 11 2009 werner@suse.de
- Update to procps-3.2.8 - Update to procps-3.2.8
* ps: allow "+" in sort specifications, as in man page * ps: allow "+" in sort specifications, as in man page