- updated for 3.2.3

Changed files:
    procps-global.patch -> 1.2
    procps-make.patch -> 1.5
    procps-selinux.patch -> 1.6

diff --git a/procps-global.patch b/procps-global.patch
index e8b02634d0017e1820f33ddcdf05ce4db0b771c5..dcec54f48c3c6304ccfe3ca41b9a2cb171e1cdae 100644 (file)
--- a/procps-global.patch
+++ b/procps-global.patch
@@ -1,11 +1,11 @@
---- procps-3.1.9/proc/library.map.orig Sat May 31 02:17:59 2003
-+++ procps-3.1.9/proc/library.map      Fri Jul  4 17:01:27 2003
-@@ -4,7 +4,7 @@
+--- procps-3.2.3/proc/library.map      2004-07-21 18:27:55.000000000 +0000
++++ procps-3.2.3.new/proc/library.map  2004-08-15 13:37:26.835391584 +0000
+@@ -7,7 +7,7 @@
  
-   readproc; readproctab; ps_readproc; look_up_our_self; escape_command;
+   readproc; readtask; readproctab; readproctab2; look_up_our_self; escape_command;
    escape_str; escape_strlist;
 -  openproc; closeproc;
 +  openproc; closeproc; freeproc;
-   tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; wchan;
+   tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; lookup_wchan;
    display_version; procps_version; linux_version_code;
    Hertz; smp_num_cpus;

diff --git a/procps-make.patch b/procps-make.patch
index 5b7b5370cd087e97866b6a86f417d1d99ff1c3d6..acbcccac387699dcc413a50d207e9c57d8599684 100644 (file)
--- a/procps-make.patch
+++ b/procps-make.patch
@@ -1,6 +1,6 @@
---- procps-3.2.2/Makefile.orig 2004-07-17 15:54:06.000000000 +0200
-+++ procps-3.2.2/Makefile      2004-07-24 21:06:15.129991008 +0200
-@@ -93,7 +93,7 @@
+--- procps-3.2.3/Makefile      2004-07-20 00:22:22.000000000 +0000
++++ procps-3.2.3.new/Makefile  2004-08-15 13:35:00.914574920 +0000
+@@ -90,7 +90,7 @@
    -Wstrict-prototypes -Wmissing-prototypes
  # Note that some stuff below is conditional on CFLAGS containing
  # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.)
@@ -9,7 +9,7 @@
  ALL_CFLAGS   := $(PKG_CFLAGS) $(CFLAGS)
  
  PKG_LDFLAGS  := -Wl,-warn-common
-@@ -205,10 +205,10 @@
+@@ -202,10 +202,10 @@
  ###### install
  
  $(BINFILES) : all
@@ -22,22 +22,3 @@
  
  install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
        cd $(usr/bin) && $(ln_f) skill snice
-@@ -219,7 +219,7 @@
- top.o : top.h
- 
- %.o : %.c
--      $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(CURSES) -c -o $@ $<
-+      $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $<
- 
- w.o:    w.c
-       $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(W_SHOWFROM) -c $<
---- procps-3.2.2/proc/module.mk.orig   2004-07-15 00:19:40.000000000 +0200
-+++ procps-3.2.2/proc/module.mk        2004-07-24 21:04:40.619358808 +0200
-@@ -43,7 +43,6 @@
- proc/lib$(NAME).a: $(LIBOBJ)
-       $(AR) rcs $@ $^
- 
--.PHONY: proc/$(SONAME)
- #proc/$(SONAME): proc/library.map
- proc/$(SONAME): $(LIBOBJ)
-       $(CC) -shared -Wl,-soname,$(SONAME) -Wl,--version-script=proc/library.map -o $@ $^ -lc

diff --git a/procps-selinux.patch b/procps-selinux.patch
index 2e774427db6e061e3262fef9981d4d4a10cb0dd3..d7eb5ccbd994766f50157e2c87c3f97ebde18793 100644 (file)
--- a/procps-selinux.patch
+++ b/procps-selinux.patch
@@ -1,15 +1,18 @@
---- procps-3.1.15/ps/ps.1.selinux      2003-12-23 20:59:47.000000000 -0500
-+++ procps-3.1.15/ps/ps.1      2004-01-21 13:12:33.000000000 -0500
-@@ -96,6 +96,7 @@
- s            display signal format
- u            display user-oriented format
- v            display virtual memory format
-+-Z           display security context format (NSA SELinux, etc.)
- --format     user-defined format
- --context    display security context format (NSA SELinux, etc.)
+--- procps-3.2.3/ps/ps.1       2004-08-10 01:09:31.000000000 +0000
++++ procps-3.2.3.new/ps/ps.1   2004-08-15 13:40:07.562957280 +0000
+@@ -487,6 +487,10 @@
+ display virtual memory format
  
---- procps-3.2.2/ps/parser.c.orig      2004-05-25 01:49:47.000000000 +0200
-+++ procps-3.2.2/ps/parser.c   2004-07-24 20:09:38.748319504 +0200
+ .TP
++.B \-Z
++display security context format (NSA SELinux, etc.)
++
++.TP
+ .B \-y
+ Do not show flags; show rss in place of addr.
+ This option can only be used with \fB\-l\fR.
+--- procps-3.2.3/ps/parser.c   2004-08-10 00:41:10.000000000 +0000
++++ procps-3.2.3.new/ps/parser.c       2004-08-15 13:42:52.512881080 +0000
 @@ -221,7 +221,7 @@
    flagptr = ps_argv[thisarg];
    while(*++flagptr){
@@ -55,7 +58,7 @@
      case '-':
        return "Embedded '-' among SysV options makes no sense.";
        break;
-@@ -587,10 +592,17 @@
+@@ -585,10 +590,17 @@
        trace("X Old Linux i386 register format\n");
        format_flags |= FF_LX;
        break;