summaryrefslogtreecommitdiff
path: root/packages/procps
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-06-30 08:19:37 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-06-30 08:19:37 +0000
commitc8e5702127e507e82e6f68a4b8c546803accea9d (patch)
tree00583491f40ecc640f2b28452af995e3a63a09d7 /packages/procps
parent87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff)
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/procps')
-rw-r--r--packages/procps/.mtn2git_empty0
-rw-r--r--packages/procps/procps-3.1.15/.mtn2git_empty0
-rw-r--r--packages/procps/procps-3.1.15/install.patch16
-rw-r--r--packages/procps/procps-3.1.15/procps_3.1.15-2.diff5133
-rw-r--r--packages/procps/procps-3.2.1/.mtn2git_empty0
-rw-r--r--packages/procps/procps-3.2.1/install.patch16
-rw-r--r--packages/procps/procps-3.2.1/pagesz-not-constant.patch22
-rw-r--r--packages/procps/procps_3.1.15.bb20
8 files changed, 5207 insertions, 0 deletions
diff --git a/packages/procps/.mtn2git_empty b/packages/procps/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/procps/.mtn2git_empty
diff --git a/packages/procps/procps-3.1.15/.mtn2git_empty b/packages/procps/procps-3.1.15/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/procps/procps-3.1.15/.mtn2git_empty
diff --git a/packages/procps/procps-3.1.15/install.patch b/packages/procps/procps-3.1.15/install.patch
index e69de29bb2..2d16c26f17 100644
--- a/packages/procps/procps-3.1.15/install.patch
+++ b/packages/procps/procps-3.1.15/install.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- procps-3.1.15/Makefile~install 2003-12-24 03:01:55.000000000 +0100
++++ procps-3.1.15/Makefile 2004-02-11 00:45:59.000000000 +0100
+@@ -147,7 +147,7 @@
+ ###### install
+
+ $(BINFILES) : all
+- $(install) --mode a=rx --strip $(notdir $@) $@
++ $(install) --mode a=rx $(notdir $@) $@
+
+ $(MANFILES) : all
+ $(install) --mode a=r $(notdir $@) $@
diff --git a/packages/procps/procps-3.1.15/procps_3.1.15-2.diff b/packages/procps/procps-3.1.15/procps_3.1.15-2.diff
index e69de29bb2..438fd0f664 100644
--- a/packages/procps/procps-3.1.15/procps_3.1.15-2.diff
+++ b/packages/procps/procps-3.1.15/procps_3.1.15-2.diff
@@ -0,0 +1,5133 @@
+--- procps-3.1.15.orig/proc/library.map
++++ procps-3.1.15/proc/library.map
+@@ -4,7 +4,7 @@
+
+ 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;
+ display_version; procps_version; linux_version_code;
+ Hertz; smp_num_cpus;
+--- procps-3.1.15.orig/proc/readproc.c
++++ procps-3.1.15/proc/readproc.c
+@@ -162,7 +162,7 @@
+ // examine a field name (hash and compare)
+ base:
+ if(unlikely(!*S)) break;
+- entry = table[63 & (asso[S[3]] + asso[S[2]] + asso[S[0]])];
++ entry = table[63 & (asso[(int)S[3]] + asso[(int)S[2]] + asso[(int)S[0]])];
+ colon = strchr(S, ':');
+ if(unlikely(!colon)) break;
+ if(unlikely(colon[1]!='\t')) break;
+@@ -888,6 +888,8 @@
+ else
+ PT = openproc(flags);
+ va_end(ap);
++ if (!PT)
++ return 0;
+ do { /* read table: */
+ tab = xrealloc(tab, (n+1)*sizeof(proc_t*));/* realloc as we go, using */
+ tab[n] = readproc_direct(PT, NULL); /* final null to terminate */
+--- procps-3.1.15.orig/proc/module.mk
++++ procps-3.1.15/proc/module.mk
+@@ -3,7 +3,7 @@
+ # for lib$(NAME).so and /usr/include/($NAME) and such
+ NAME := proc
+
+-SHARED := 1
++SHARED ?= 1
+
+ SONAME := lib$(NAME).so.$(LIBVERSION)
+
+--- procps-3.1.15.orig/debian/README.Debian
++++ procps-3.1.15/debian/README.Debian
+@@ -0,0 +1,22 @@
++README for Debian package of procps
++===================================
++
++XConsole gone
++-------------
++ XConsole and other X-based programs have been finally removed. Look in
++ the x packages for their equivalents.
++
++pgrep
++-----
++pgrep is a new program, using the Unix standard name for something that
++greps for processes. If you are looking for Perl compatible regular
++expression grep, it is called pcregrep.
++
++forks
++-----
++Procps upstream is forked. This one comes from procps.sf.net I'm really
++not interested when the others have new versions so please don't bug me about
++it. However if you see something neat in the others and would like it in
++the Debian one, report a *wishlist* level bug about it.
++
++ Craig Small <csmall@debian.org>
+--- procps-3.1.15.orig/debian/copyright
++++ procps-3.1.15/debian/copyright
+@@ -0,0 +1,27 @@
++This is the Debian Linux prepackaged version of the /proc file
++system utilities.
++
++This package was downloaded from:
++ http://procps.sourceforge.net/
++
++
++Upstream Authors:
++Werner Almesberger <almesber@di.epfl.ch>, Roger Binns, Charles
++Blake <cblake@ucsd.edu>, Brian Edmonds, David Engel <david@ods.com>,
++Larry Greenfield <greenfie@gauss.rutgers.edu>, Michael K. Johnson
++<johnsonm@sunsite.unc.edu>, Branko Lankester <lankeste@fwi.uva.nl>,
++Robert Nation <nation@rocket.sanders.lockheed.com>, Michael Shields
++<mjshield@nyx.cs.du.edu>, Henry Ware <al172@yfn.ysu.edu>, Matt
++Welsh <mdw@sunsite.unc.edu>, Albert D. Cahalan and Jim C. Warner
++<warnerjc@worldnet.att.net>
++
++All programs except ps, skill and snice are copyright by their
++authors and redistributable under the terms of the GNU General
++Public License. On Debian Linux systems, the complete text of
++the GNU General Public License can be found in
++`/usr/share/common-licenses/GPL'.
++
++ps, skill and snice are copyright by their authors and redistributable under
++the terms of the GNU Library General Public License. On Debian Linux
++systems, the complete text of the GNU Library General Public License can
++be found in `/usr/share/common/licenses/LGPL'.
+--- procps-3.1.15.orig/debian/dirs
++++ procps-3.1.15/debian/dirs
+@@ -0,0 +1,12 @@
++etc
++lib
++sbin
++bin
++usr/bin
++usr/sbin
++usr/lib
++usr/include/proc
++usr/share/man/man1
++usr/share/man/man5
++usr/share/man/man8
++
+--- procps-3.1.15.orig/debian/docs
++++ procps-3.1.15/debian/docs
+@@ -0,0 +1,4 @@
++BUGS
++TODO
++README.top
++
+--- procps-3.1.15.orig/debian/examples
++++ procps-3.1.15/debian/examples
+@@ -0,0 +1,2 @@
++debian/sysctl.conf
++
+--- procps-3.1.15.orig/debian/libproc-dev.dirs
++++ procps-3.1.15/debian/libproc-dev.dirs
+@@ -0,0 +1,2 @@
++usr/lib
++usr/include/proc
+--- procps-3.1.15.orig/debian/menu
++++ procps-3.1.15/debian/menu
+@@ -0,0 +1 @@
++?package(procps):needs=text section="Apps/System" title="Top" command="/usr/bin/top" hints="Monitoring"
+--- procps-3.1.15.orig/debian/postinst
++++ procps-3.1.15/debian/postinst
+@@ -0,0 +1,74 @@
++#!/bin/sh
++# postinst script for procps
++#
++# see: dh_installdeb(1)
++
++set -e
++
++# summary of how this script can be called:
++# * <postinst> `configure' <most-recently-configured-version>
++# * <old-postinst> `abort-upgrade' <new version>
++# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
++# <new-version>
++# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
++# <failed-install-package> <version> `removing'
++# <conflicting-package> <version>
++# for details, see http://www.debian.org/doc/debian-policy/ or
++# the debian-policy package
++#
++# quoting from the policy:
++# Any necessary prompting should almost always be confined to the
++# post-installation script, and should be protected with a conditional
++# so that unnecessary prompting doesn't happen if a package's
++# installation fails and the `postinst' is called with `abort-upgrade',
++# `abort-remove' or `abort-deconfigure'.
++
++case "$1" in
++ configure)
++ if [ -e /etc/psdevtab ] ; then
++ rm -f /etc/psdevtab
++ fi
++ if [ -e /etc/psdatabase ]
++ then
++ rm -f /etc/psdatabase
++ fi
++ # Remove old /etc/init.d/procps file, Bug #53818
++ if [ -e /etc/init.d/procps ]
++ then
++ rm -f /etc/init.d/procps
++ fi
++ # Remove old procps init.d script, if it exists Closes: #55137
++ if [ -e /etc/rcS.d/S30procps ]
++ then
++ update-rc.d procps remove >/dev/null
++ fi
++ # and if that didn't work Closes: #92184
++ if [ -e /etc/rcS.d/S30procps ]
++ then
++ rm -f /etc/rcS.d/S30procps
++ fi
++ #
++ # Now to do the alternatives for w and ps
++ update-alternatives --install /usr/bin/w w /usr/bin/w.procps 50 \
++ --slave /usr/share/man/man1/w.1.gz w.1.gz /usr/share/man/man1/w.procps.1.gz
++
++ ;;
++
++ abort-upgrade|abort-remove|abort-deconfigure)
++
++ ;;
++
++ *)
++ echo "postinst called with unknown argument \`$1'" >&2
++ exit 1
++ ;;
++esac
++
++# dh_installdeb will replace this with shell code automatically
++# generated by other debhelper scripts.
++
++#DEBHELPER#
++
++exit 0
++
++
+--- procps-3.1.15.orig/debian/prerm
++++ procps-3.1.15/debian/prerm
+@@ -0,0 +1,11 @@
++#!/bin/sh
++
++if [ "$1" != "upgrade" ]
++then
++ update-alternatives --remove w /usr/bin/w.procps
++fi
++
++#DEBHELPER#
++
++exit 0
++
+--- procps-3.1.15.orig/debian/sysctl.conf
++++ procps-3.1.15/debian/sysctl.conf
+@@ -0,0 +1,6 @@
++#
++# /etc/sysctl.conf - Configuration file for setting system variables
++# See sysctl.conf (5) for information.
++#
++#kernel.domainname = example.com
++#net/ipv4/icmp_echo_ignore_broadcasts=1
+--- procps-3.1.15.orig/debian/watch
++++ procps-3.1.15/debian/watch
+@@ -0,0 +1,6 @@
++# Example watch control file for uscan
++# Rename this file to "watch" and then you can run the "uscan" command
++# to check for upstream updates and more.
++# Site Directory Pattern Version Script
++sunsite.unc.edu /pub/Linux/Incoming procps-*.tar.gz debian uupdate
++
+--- procps-3.1.15.orig/debian/procps.sh
++++ procps-3.1.15/debian/procps.sh
+@@ -0,0 +1,40 @@
++#! /bin/sh
++# /etc/init.d/procps: Set kernel variables from /etc/sysctl.conf
++#
++# written by Elrond <Elrond@Wunder-Nett.org>
++
++# Check for existance of the default file and exit if not there,
++# Closes #52839 for the boot-floppy people
++[ -r /etc/default/rcS ] || exit 0
++. /etc/default/rcS
++
++[ -x /sbin/sysctl ] || exit 0
++
++
++case "$1" in
++ start|reload|restart|force-reload)
++ if [ ! -r /etc/sysctl.conf ]
++ then
++ exit 0
++ fi
++ if [ "$VERBOSE" = "no" ]
++ then
++ n="-n"
++ redir=">/dev/null"
++ else
++ echo -n "Setting kernel variables."
++ n=""
++ redir=""
++ fi
++ eval "/sbin/sysctl $n -p $redir"
++ echo "."
++ ;;
++ stop|show)
++ ;;
++ *)
++ echo "Usage: /etc/init.d/procps.sh {start|stop|reload|restart}" >&2
++ exit 1
++ ;;
++esac
++
++
+--- procps-3.1.15.orig/debian/procps.manpages
++++ procps-3.1.15/debian/procps.manpages
+@@ -0,0 +1 @@
++ps/ps.1
+--- procps-3.1.15.orig/debian/compat
++++ procps-3.1.15/debian/compat
+@@ -0,0 +1 @@
++4
+--- procps-3.1.15.orig/debian/libproc-dev.files
++++ procps-3.1.15/debian/libproc-dev.files
+@@ -0,0 +1,2 @@
++usr/include/proc/*.h
++lib/libproc.so
+--- procps-3.1.15.orig/debian/libproc-dev.README
++++ procps-3.1.15/debian/libproc-dev.README
+@@ -0,0 +1,12 @@
++README for libproc-dev
++======================
++
++This README is for people who want to use the libraries for their own
++programs. If you just want to use procps tools you don't need to use this
++and you can probably remove libproc-dev too.
++
++It is generally a bad idea to dynamically link to libproc. The API changes
++a fair bit and I cannot guarantee that it will stay the same between minor
++versions (though it will stay the same between Debian versions). I've now
++re-included the libproc.a file so use that.
++
+--- procps-3.1.15.orig/debian/patches/20_procps-fix+attr.dpatch
++++ procps-3.1.15/debian/patches/20_procps-fix+attr.dpatch
+@@ -0,0 +1,55 @@
++#! /bin/sh -e
++## 20_procps-fix++attr by someone
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: SELINUX Attr value in /proc
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
++
++if [ $# -ne 1 ]; then
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++ exit 1
++fi
++case "$1" in
++ -patch) patch $patch_opts -p1 < $0;;
++ -unpatch) patch $patch_opts -p1 -R < $0;;
++ *)
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum
++ent"
++ exit 1;;
++esac
++
++exit 0
++@DPATCH@
++diff -urN procps-3.1.15/ps/output.c procps-3.1.15.new/ps/output.c
++--- procps-3.1.15/ps/output.c 2003-12-23 19:46:32.000000000 -0600
+++++ procps-3.1.15.new/ps/output.c 2003-12-24 13:31:16.000000000 -0600
++@@ -944,7 +944,7 @@
++
++ // wchan file is suitable for testing
++ //snprintf(filename, sizeof filename, "/proc/%d/task/%d/wchan", pp->tgid, pp->tid);
++- snprintf(filename, sizeof filename, "/proc/%d/task/%d/attr/current", pp->tgid, pp->tid);
+++ snprintf(filename, sizeof filename, "/proc/%d/attr/current", pp->tgid);
++
++ fd = open(filename, O_RDONLY, 0);
++ if(likely(fd==-1)) goto fail;
++diff -urN procps-3.1.15/ps/parser.c procps-3.1.15.new/ps/parser.c
++--- procps-3.1.15/ps/parser.c 2003-12-23 17:58:06.000000000 -0600
+++++ procps-3.1.15.new/ps/parser.c 2003-12-24 13:45:08.000000000 -0600
++@@ -315,12 +315,10 @@
++ exclusive("-V");
++ display_version();
++ exit(0);
++-#if 0
++- case 'Z': /* full Mandatory Access Control level info */
++- trace("-Z shows full MAC info\n");
++- return "Don't understand MAC on Linux.";
+++ case 'Z':
+++ trace("-Z shows SELinux contexts\n");
+++ format_flags |= FF_Fc;
++ break;
++-#endif
++ case 'a':
++ trace("-a select all with a tty, but omit session leaders.\n");
++ simple_select |= SS_U_a;
+--- procps-3.1.15.orig/debian/patches/20_ps.1.dpatch
++++ procps-3.1.15/debian/patches/20_ps.1.dpatch
+@@ -0,0 +1,376 @@
++#! /bin/sh -e
++## 20_ps.1.dpatch by Craig Small <csmall@debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Fix ps manual page
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
++
++if [ $# -ne 1 ]; then
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++ exit 1
++fi
++case "$1" in
++ -patch) patch $patch_opts -p1 < $0;;
++ -unpatch) patch $patch_opts -p1 -R < $0;;
++ *)
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum
++ent"
++ exit 1;;
++esac
++
++exit 0
++@DPATCH@
++--- procps-3.1.15/ps/ps.1 2003-12-24 12:59:47.000000000 +1100
+++++ procps-3.1.15.newps/ps.1 2003-12-26 18:05:01.000000000 +1100
++@@ -1,3 +1,5 @@
+++'\" t
+++.\" (The preceding line is a note to broken versions of man to tell
++ .\" Man page for ps.
++ .\" Quick hack conversion by Albert Cahalan, 1998.
++ .\" Licensed under version 2 of the Gnu General Public License.
++@@ -10,8 +12,8 @@
++ .\" invented this crap in 1973. Oh yeah, they did. Sorry.
++ .\"
++ .TH PS 1 "July 5, 1998" "Linux" "Linux User's Manual"
++-.SH \fRNAME\fR
++-ps \- report process status
+++.SH NAME
+++ps \- report a snapshot of the current processes.
++ .ad r
++ .na
++ .ss 12 0
++@@ -19,17 +21,17 @@
++ .nh
++ .nf
++
++-SYNOPSIS
+++.SH SYNOPSIS
++ ps [options]
++
++
++-DESCRIPTION
+++.SH DESCRIPTION
++ ps gives a snapshot of the current processes. If you want
++ a repetitive update of this status, use top. This man
++ page documents the /proc-based version of ps, or tries to.
++
++
++-COMMAND-LINE OPTIONS
+++.SH "COMMAND-LINE OPTIONS"
++
++ This version of ps accepts several kinds of options.
++
++@@ -43,7 +45,9 @@
++ when options are preceeded by a dash. The PS_PERSONALITY environment
++ variable (described below) provides more detailed control of ps behavior.
++
++-SIMPLE PROCESS SELECTION
+++.SH "SIMPLE PROCESS SELECTION"
+++.TS
+++l l.
++ -A select all processes
++ -N negate selection
++ -a select all with a tty except session leaders
++@@ -55,8 +59,11 @@
++ r restrict output to running processes
++ x select processes without controlling ttys
++ --deselect negate selection
+++.TE
++
++-PROCESS SELECTION BY LIST
+++.SH "PROCESS SELECTION BY LIST"
+++.TS
+++l l.
++ -C select by command name
++ -G select by RGID (supports names)
++ -U select by RUID (supports names)
++@@ -78,8 +85,10 @@
++ --user select by effective user name or ID
++ -123 implied --sid
++ 123 implied --pid
++-
++-OUTPUT FORMAT CONTROL
+++.TE
+++.SH "OUTPUT FORMAT CONTROL"
+++.TS
+++l l.
++ -O is preloaded "-o"
++ -F extra full format
++ -c different scheduler info for -l option
++@@ -98,8 +107,10 @@
++ v display virtual memory format
++ --format user-defined format
++ --context display security context format (NSA SELinux, etc.)
++-
++-OUTPUT MODIFIERS
+++.TE
+++.SH "OUTPUT MODIFIERS"
+++.TS
+++l l.
++ -H show process hierarchy (forest)
++ -n set namelist file
++ -w wide output
++@@ -123,31 +134,40 @@
++ --rows set screen height
++ --sort specify sorting order
++ --width set screen width
++-
++-THREAD DISPLAY
+++.TE
+++.SH "THREAD DISPLAY"
+++.TS
+++l l.
++ -L show threads, possibly with LWP and NLWP columns
++ -T show threads, possibly with SPID column
++ -m show threads after processes
++ H show threads as if they were processes
++ m show threads after processes
+++.TE
++
++-INFORMATION
+++.SH INFORMATION
+++
+++.TS
+++l l.
++ -V print version
++ L list all format specifiers
++ V show version info
++ --help print help message
++ --info print debugging info
++ --version print version
+++.TE
+++
+++.SH OBSOLETE
++
++-OBSOLETE
+++.TS
+++l l.
++ A increases the argument space (DecUnix)
++ M use alternate core (try -n or N instead)
++ W get swap info from ... not /dev/drum (try -n or N instead)
++ k use /vmcore as c-dumpfile (try -n or N instead)
++-
++-
++-
++-NOTES
+++.TE
+++
+++.SH NOTES
++
++ User-defined format options ("o", "-o", "O", and "-O") offer
++ a way to specify individual output columns. Headers may be
++@@ -249,14 +269,17 @@
++ will be destroyed by init(8) if the parent process exits.
++
++
++-PROCESS FLAGS
++-
+++.SH "PROCESS FLAGS"
+++.TS
+++l l l.
++ FORKNOEXEC 1 forked but didn't exec
++ SUPERPRIV 4 used super-user privileges
+++.TE
++
+++.SH "PROCESS STATE CODES"
++
++-PROCESS STATE CODES
++-
+++.TS
+++l l.
++ D uninterruptible sleep (usually IO)
++ R runnable (on run queue)
++ S sleeping
++@@ -264,23 +287,30 @@
++ W paging
++ X dead
++ Z a defunct ("zombie") process
+++.TE
++
++ For BSD formats and when the "stat" keyword is used, additional
++ letters may be displayed:
++
++-W has no resident pages
++-< high-priority process
++-N low-priority task
++-L has pages locked into memory (for real-time and custom IO)
+++.IP W
+++has no resident pages
+++.IP <
+++high-priority process
+++.IP N
+++low-priority task
+++.IP L
+++has pages locked into memory (for real-time and custom IO)
++
++
++-SORT KEYS
+++.SH "SORT KEYS"
++
++ Note that the values used in sorting are the internal values ps uses and not
++ the `cooked' values used in some of the output format fields. Pipe ps
++ output into the sort(1) command if you want to sort the cooked values.
++
++-KEY LONG DESCRIPTION
+++.TS
+++l l l.
+++\fBKEY LONG DESCRIPTION\fR
++ c cmd simple name of executable
++ C cmdline full command line
++ f flags flags as in long format F field
++@@ -307,14 +337,15 @@
++ u user user name
++ v vsize total VM size in kB
++ y priority kernel scheduling priority
+++.TE
++
++-
++-AIX FORMAT DESCRIPTORS
+++.SH "AIX FORMAT DESCRIPTORS"
++
++ This ps supports AIX format descriptors, which work somewhat like the
++ formatting codes of printf(1) and printf(3). For example, the normal
++ default output can be produced with this: ps -eo "%p %y %x %c"
++-
+++.TS
+++l l l.
++ CODE NORMAL HEADER
++ %C pcpu %CPU
++ %G group GROUP
++@@ -331,14 +362,16 @@
++ %x time TIME
++ %y tty TTY
++ %z vsz VSZ
+++.TE
++
++-
++-STANDARD FORMAT SPECIFIERS
+++.SH "STANDARD FORMAT SPECIFIERS"
++
++ These may be used to control both output format and sorting.
++ For example: ps -eo pid,user,args --sort user
++
++-CODE HEADER
+++.TS
+++l l.
+++\fBCODE HEADER\fR
++ %cpu %CPU
++ %mem %MEM
++ alarm ALARM
++@@ -459,25 +492,51 @@
++ vsize VSZ
++ vsz VSZ
++ wchan WCHAN
+++.TE
++
+++.SH "ENVIRONMENT VARIABLES"
++
++-
++-
++-ENVIRONMENT VARIABLES
++ The following environment variables could affect ps:
++- COLUMNS Override default display width.
++- LINES Override default display height.
++- PS_PERSONALITY Set to one of posix,old,linux,bsd,sun,digital...
++- CMD_ENV Set to one of posix,old,linux,bsd,sun,digital...
++- I_WANT_A_BROKEN_PS Force obsolete command line interpretation.
++- LC_TIME Date format.
++- PS_COLORS Not currently supported.
++- PS_FORMAT Default output format override.
++- PS_SYSMAP Default namelist (System.map) location.
++- PS_SYSTEM_MAP Default namelist (System.map) location.
++- POSIXLY_CORRECT Don't find excuses to ignore bad "features".
++- UNIX95 Don't find excuses to ignore bad "features".
++- _XPG Cancel CMD_ENV=irix non-standard behavior.
+++
+++.TP
+++.B COLUMNS
+++Override default display width.
+++.TP
+++.B LINES
+++Override default display height.
+++.TP
+++.B PS_PERSONALITY
+++Set to one of posix,old,linux,bsd,sun,digital...
+++.TP
+++.B CMD_ENV
+++Set to one of posix,old,linux,bsd,sun,digital...
+++.TP
+++.B I_WANT_A_BROKEN_PS
+++Force obsolete command line interpretation.
+++.TP
+++.B LC_TIME
+++Date format.
+++.TP
+++.B PS_COLORS
+++Not currently supported.
+++.TP
+++.B PS_FORMAT
+++Default output format override.
+++.TP
+++.B PS_SYSMAP
+++Default namelist (System.map) location.
+++.TP
+++.B PS_SYSTEM_MAP
+++Default namelist (System.map) location.
+++.TP
+++.B POSIXLY_CORRECT
+++Don't find excuses to ignore bad "features".
+++.TP
+++.B UNIX95
+++Don't find excuses to ignore bad "features".
+++.TP
+++.B _XPG
+++Cancel CMD_ENV=irix non-standard behavior.
++
++ In general, it is a bad idea to set these variables. The one exception
++ is CMD_ENV or PS_PERSONALITY, which could be set to Linux for normal
++@@ -485,7 +544,9 @@
++ of the Unix98 standard.
++
++
++-PERSONALITY
+++.SH "PERSONALITY"
+++.TS
+++l l.
++ 390 like the S/390 OpenEdition ps
++ aix like AIX ps
++ bsd like FreeBSD ps (totally non-standard)
++@@ -507,9 +568,9 @@
++ unix standard
++ unix95 standard
++ unix98 standard
+++.TE
++
++-
++-EXAMPLES
+++.SH "EXAMPLES"
++ To see every process on the system using standard syntax:
++ ps -e
++ To see every process on the system using BSD syntax:
++@@ -523,13 +584,13 @@
++ Print only the process IDs of syslogd:
++ ps -C syslogd -o pid=
++
++-SEE ALSO
++-top(1) pgrep(1) pstree(1) proc(5)
+++.SH "SEE ALSO"
+++.BR top (1), pgrep (1), pstree (1), proc (5).
++
++-STANDARDS
+++.SH STANDARDS
++ This ps conforms to version 2 of the Single Unix Specification.
++
++-AUTHOR
+++.SH AUTHOR
++ ps was originally written by Branko Lankester <lankeste@fwi.uva.nl>. Michael
++ K. Johnson <johnsonm@redhat.com> re-wrote it significantly to use the proc
++ filesystem, changing a few things in the process. Michael Shields
++@@ -541,4 +602,4 @@
++ <acahalan@cs.uml.edu> rewrote ps for full Unix98 and BSD support, along with
++ some ugly hacks for obsolete and foreign syntax.
++
++-Please send bug reports to <acahalan@cs.uml.edu>
+++Please send bug reports to <procps-feedback@lists.sf.net>.
+--- procps-3.1.15.orig/debian/patches/20_top_manpage.dpatch
++++ procps-3.1.15/debian/patches/20_top_manpage.dpatch
+@@ -0,0 +1,384 @@
++#! /bin/sh -e
++## 20_top_manpage by Randy Hron
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Fix bold in top manual page
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
++
++if [ $# -ne 1 ]; then
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++ exit 1
++fi
++case "$1" in
++ -patch) patch $patch_opts -p1 < $0;;
++ -unpatch) patch $patch_opts -p1 -R < $0;;
++ *)
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum
++ent"
++ exit 1;;
++esac
++
++exit 0
++@DPATCH@
++--- procps/top.1.orig 2003-12-24 15:51:35.000000000 -0500
+++++ procps/top.1 2003-12-24 18:57:14.564156176 -0500
++@@ -52,7 +52,7 @@
++ .ds CF configuration file
++ .ds CI interactive command
++ .ds CO command\-line option
++-.ds CW \'current' window
+++.ds CW 'current' window
++ .ds FM full\-screen mode
++ .ds MP \fBphysical\fR memory
++ .ds MS \fBshared\fR memory
++@@ -370,7 +370,7 @@
++ The task's share of the elapsed \*(PU time since the last screen update, expressed
++ as a percentage of total \*(PU time.
++ In a true SMP environment, if 'Irix mode' is \*F, \*(Me will operate in
++-\'Solaris mode' where a task's \*(Pu usage will be divided by the total
+++'Solaris mode' where a task's \*(Pu usage will be divided by the total
++ number of \*(PUs.
++ You toggle 'Irix/Solaris' modes with the 'I' \*(CI.
++
++@@ -498,7 +498,7 @@
++ .\" ......................................................................
++ .SS 2b. SELECTING and ORDERING Columns
++ .\" ----------------------------------------------------------------------
++-After pressing the \*(CIs 'f' (Fields select) or \'o' (Order fields) you will
+++After pressing the \*(CIs 'f' (Fields select) or 'o' (Order fields) you will
++ be shown a screen containing the current \fBfields string\fR followed by names
++ and descriptions for all fields.
++
++@@ -574,7 +574,7 @@
++ see current status,
++
++ .TP 7
++-\ \ \'\fB?\fR\' or \'\fBh\fR\' :\fIHelp\fR
+++\ \ \<\fB?\fR\> or \<\fBh\fR\> :\fIHelp\fR
++ There are two help levels available.
++ The first will provide a reminder of all the basic \*(CIs.
++ If \*(Me is\fI secured\fR, that screen will be abbreviated.
++@@ -583,7 +583,7 @@
++ applicable to \*(AM.
++
++ .TP 7
++-\ \ \'\fB=\fR\' :\fIExit_Task_Limits\fR
+++\ \ \<\fB=\fR\> :\fIExit_Task_Limits\fR
++ Removes restrictions on which tasks are shown.
++ This command will reverse any 'i' (idle tasks) and 'n' (max tasks) commands
++ that might be active.
++@@ -593,13 +593,13 @@
++ When operating in \*(AM this command has a slightly broader meaning.
++
++ .TP 7
++-\ \ \'\fBA\fR\' :\fIAlternate_Display_Mode_toggle\fR
+++\ \ \<\fBA\fR\> :\fIAlternate_Display_Mode_toggle\fR
++ This command will switch between \*(FM and \*(AM.
++-\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight into
++-\*(CWs and field groups.
+++\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight
+++into \*(CWs and field groups.
++
++ .TP 7
++-\ \ \'\fBB\fR\' :\fIBold_Disable/Enable_toggle\fR
+++\ \ \<\fBB\fR\> :\fIBold_Disable/Enable_toggle\fR
++ This command will influence use of the 'bold' terminfo capability and
++ alters\fB both\fR the \*(SA and \*(TA for the \*(CW.
++ While it is intended primarily for use with dumb terminals, it can be
++@@ -611,7 +611,7 @@
++ there will be no visual confirmation that they are even on.
++
++ .TP 7
++-*\ \'\fBd\fR\' or \'\fBs\fR\' :\fIChange_Delay_Time_interval\fR
+++*\ \<\fBd\fR\> or \<\fBs\fR\> :\fIChange_Delay_Time_interval\fR
++ You will be prompted to enter the delay time, in seconds, between
++ display updates.
++
++@@ -625,32 +625,32 @@
++ and view the system summary on the second line.
++
++ .TP 7
++-\ \ \'\fBG\fR\' :\fIChoose_Another_Window/Field_Group\fR
+++\ \ \<\fBG\fR\> :\fIChoose_Another_Window/Field_Group\fR
++ You will be prompted to enter a number between 1 and 4 designating the
++ window/field group which should be made the \*(CW.
++ You will soon grow comfortable with these 4 windows, especially after
++ experimenting with \*(AM.
++
++ .TP 7
++-\ \ \'\fBI\fR\' :\fIIrix/Solaris_Mode_toggle\fR
+++\ \ \<\fBI\fR\> :\fIIrix/Solaris_Mode_toggle\fR
++ When operating in 'Solaris mode' ('I' toggled \*F), a task's \*(Pu usage
++ will be divided by the total number of \*(PUs.
++ After issuing this command, you'll be informed of the new state of this toggle.
++
++ .TP 7
++-\ \ \'\fBu\fR\' :\fIselect a user\fR
+++\ \ \<\fBu\fR\> :\fIselect a user\fR
++ You will be prompted for a UID or username. Only processes
++ belonging to the selected user will be displayed. This option
++ matches on the effective UID.
++
++ .TP 7
++-\ \ \'\fBU\fR\' :\fIselect a user\fR
+++\ \ \<\fBU\fR\> :\fIselect a user\fR
++ You will be prompted for a UID or username. Only processes
++ belonging to the selected user will be displayed. This option
++ matches on the real, effective, saved, and filesystem UID.
++
++ .TP 7
++-*\ \'\fBk\fR\' :\fIKill_a_task\fR
+++*\ \<\fBk\fR\> :\fIKill_a_task\fR
++ You will be prompted for a PID and then the signal to send.
++ The default signal, as reflected in the prompt, is SIGTERM.
++ However, you can send any signal, via number or name.
++@@ -661,24 +661,24 @@
++ 2) at the signal prompt, type 0
++
++ .TP 7
++-\ \ \'\fBq\fR\' :\fIQuit\fR
+++\ \ \<\fBq\fR\> :\fIQuit\fR
++
++ .TP 7
++-*\ \'\fBr\fR\' :\fIRenice_a_Task\fR
+++*\ \<\fBr\fR\> :\fIRenice_a_Task\fR
++ You will be prompted for a PID and then the value to nice it to.
++ Entering a positive value will cause a process to lose priority.
++ Conversely, a negative value will cause a process to be viewed more
++ favorably by the kernel.
++
++ .TP 7
++-\ \ \'\fBW\fR\' :\fIWrite_the_Configuration_File\fR
+++\ \ \<\fBW\fR\> :\fIWrite_the_Configuration_File\fR
++ This will save all of your options and toggles plus the current
++ display mode and delay time.
++ By issuing this command just before quitting \*(Me, you will be able restart
++ later in exactly that same state.
++
++ .TP 7
++-\ \ \'\fBZ\fR\' :\fIChange_Color_Mapping
+++\ \ \<\fBZ\fR\> :\fIChange_Color_Mapping
++ This key will take you to a separate screen where you can change the
++ colors for the \*(CW, or for all windows.
++ For details regarding this \*(CI \*(Xt 3d. COLOR Mapping.
++@@ -694,25 +694,25 @@
++ of messages and prompts.
++
++ These commands always impact just the \*(CW/field group.
++-\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight into
++-\*(CWs and field groups.
+++\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight
+++into \*(CWs and field groups.
++
++ .TP 7
++-\ \ \'\fBl\fR\' :\fIToggle_Load_Average/Uptime\fR \*(EM On/Off
+++\ \ \<\fBl\fR\> :\fIToggle_Load_Average/Uptime\fR \*(EM On/Off
++ This is also the line containing the program name (possibly an alias) when
++ operating in \*(FM or the \*(CW name when operating in \*(AM.
++
++ .TP 7
++-\ \ \'\fBm\fR\' :\fIToggle_Memory/Swap_Usage\fR \*(EM On/Off
+++\ \ \<\fBm\fR\> :\fIToggle_Memory/Swap_Usage\fR \*(EM On/Off
++ This command affects two \*(SA lines.
++
++ .TP 7
++-\ \ \'\fBt\fR\' :\fIToggle_Task/Cpu_States\fR \*(EM On/Off
+++\ \ \<\fBt\fR\> :\fIToggle_Task/Cpu_States\fR \*(EM On/Off
++ This command affects from 2 to many \*(SA lines, depending on the state
++ of the '1' toggle and whether or not \*(Me is running under true SMP.
++
++ .TP 7
++-\ \ \'\fB1\fR\' :\fIToggle_Single/Separate_Cpu_States\fR \*(EM On/Off
+++\ \ \<\fB1\fR\> :\fIToggle_Single/Separate_Cpu_States\fR \*(EM On/Off
++ This command affects how the 't' command's Cpu States portion is shown.
++ Although this toggle exists primarily to serve massively-parallel SMP machines,
++ it is not restricted to solely SMP environments.
++@@ -744,12 +744,12 @@
++ .in
++
++ .TP 7
++-\ \ \'\fBb\fR\' :\fIBold/Reverse_toggle\fR
+++\ \ \<\fBb\fR\> :\fIBold/Reverse_toggle\fR
++ This command will impact how the 'x' and 'y' toggles are displayed.
++ Further, it will only be available when at least one of those toggles is \*O.
++
++ .TP 7
++-\ \ \'\fBx\fR\' :\fIColumn_Highlight_toggle\fR
+++\ \ \<\fBx\fR\> :\fIColumn_Highlight_toggle\fR
++ Changes highlighting for the current sort field.
++ You probably don't need a constant visual reminder of the sort field and
++ \*(Me hopes that you always run with 'column highlight' \*F, due to the cost
++@@ -759,7 +759,7 @@
++ visual reminder.
++
++ .TP 7
++-\ \ \'\fBy\fR\' :\fIRow_Highlight_toggle\fR
+++\ \ \<\fBy\fR\> :\fIRow_Highlight_toggle\fR
++ Changes highlighting for "run