- up to 20110915

Changed files:
    procps-FILLBUG_backport.patch -> 1.5
    procps-global.patch -> 1.4
    procps.spec -> 1.142

diff --git a/procps-FILLBUG_backport.patch b/procps-FILLBUG_backport.patch
index 1705787fc8a70fc3e78c2e365f67239b4b518a23..71aad4fbf77fcda09db7869260e21f25e7055615 100644 (file)
--- a/procps-FILLBUG_backport.patch
+++ b/procps-FILLBUG_backport.patch
@@ -1,13 +1,12 @@
---- procps-3.2.2/proc/readproc.h.orig  2004-04-17 02:30:18.000000000 +0200
-+++ procps-3.2.2/proc/readproc.h       2004-07-24 21:24:36.488559056 +0200
-@@ -239,6 +239,9 @@
- #define PROC_FILLARG         0x0100 // alloc and fill in `cmdline'
- #define PROC_FILLCGROUP      0x0200 // alloc and fill in `cgroup`
+--- procps-procps/proc/readproc.h~     2011-09-12 14:18:23.000000000 +0200
++++ procps-procps/proc/readproc.h      2011-09-15 12:38:14.976931632 +0200
+@@ -250,6 +250,9 @@
+ // argument is the length of the list (currently only used for lists of user
+ // id's since uid_t supports no convenient termination sentinel.)
  
 +// for compatibility with procps 2.0.7
 +#define PROC_FILLBUG         0x007f /* No idea what we need */
 +
- #define PROC_LOOSE_TASKS     0x2000 // threat threads as if they were processes
- 
- // Obsolete, consider only processes with one of the passed:
-
+ #define PROC_FILLMEM         0x0001 // read statm
+ #define PROC_FILLCOM         0x0002 // alloc and fill in `cmdline'
+ #define PROC_FILLENV         0x0004 // alloc and fill in `environ'

diff --git a/procps-global.patch b/procps-global.patch
deleted file mode 100644 (file)
index ecafae4..0000000
--- a/procps-global.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- procps-procps/proc/library.map~    2011-07-15 00:52:45.000000000 +0200
-+++ procps-procps/proc/library.map     2011-07-15 08:29:40.769664436 +0200
-@@ -7,7 +7,7 @@
- 
-   readproc; readtask; readproctab; readproctab2; look_up_our_self; escape_command;
-   escape_str; escape_strlist; escaped_copy; read_cmdline;
--  openproc; closeproc;
-+  openproc; closeproc; freeproc;
-   tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; lookup_wchan;
-   display_version; procps_version; linux_version_code;
-   Hertz; smp_num_cpus; have_privs; getbtime;

diff --git a/procps.spec b/procps.spec
index ccd42705b97c5c906bd56b1238ab348096058ab1..55640dc587aeda5c844da6df30a4b0cbc5d8a7e3 100644 (file)
--- a/procps.spec
+++ b/procps.spec
@@ -1,5 +1,5 @@
-%define        snap    20110715
-%define        rel     5
+%define        snap    20110915
+%define        rel     1
 Summary:       Utilities for monitoring your system and processes on your system
 Summary(de.UTF-8):     Utilities zum Ueberwachen Ihres Systems und der Prozesse
 Summary(es.UTF-8):     Utilitarios de monitoración de procesos
@@ -14,14 +14,13 @@ Epoch:              1
 License:       GPL
 Group:         Applications/System
 Source0:       http://gitorious.org/procps/procps/archive-tarball/master#/%{name}-%{snap}.tar.gz
-# Source0-md5: 82e2f9d0ee507ad6b43dfe74f40a6a83
+# Source0-md5: ba165eebdbeb4ea2dd43acd0d8d3e696
 Source1:       http://atos.wmid.amu.edu.pl/~undefine/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 60d24720b76c10553ed4abf68b76e079
 Source2:       top.desktop
 Source3:       top.png
 Source4:       XConsole.sh
 Patch0:                %{name}-make.patch
-Patch1:                %{name}-global.patch
 Patch2:                %{name}-FILLBUG_backport.patch
 # http://www.nsa.gov/selinux/patches/procps-selinux.patch.gz
 Patch3:                %{name}-selinux.patch
@@ -124,7 +123,7 @@ Statyczna wersja biblioteki libproc.
 %prep
 %setup -q -n %{name}-%{name}
 %patch0 -p1
-%patch1 -p1
+
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1