--- procps-3.2.7.orig/procps-add-lsb-logging.patch?bug=384920;msg=5;att=1 +++ procps-3.2.7/procps-add-lsb-logging.patch?bug=384920;msg=5;att=1 @@ -0,0 +1,50 @@ +diff -ur ./procps-3.2.7.orig/debian/control ./procps-3.2.7/debian/control +--- ./procps-3.2.7.orig/debian/control 2006-08-28 00:06:34.000000000 +0200 ++++ ./procps-3.2.7/debian/control 2006-08-28 00:11:34.000000000 +0200 +@@ -7,7 +7,7 @@ + + Package: procps + Architecture: any +-Depends: ${shlibs:Depends} ++Depends: ${shlibs:Depends}, lsb-base (>= 3.0-10) + Provides: watch + Conflicts: watch, libproc-dev (<< 1:1.2.6-2), w-bassman (<< 1.0-3), procps-nonfree, pgrep (<< 3.3-5) + Replaces: watch, bsdutils (<< 2.9x-1) +diff -ur ./procps-3.2.7.orig/debian/procps.sh ./procps-3.2.7/debian/procps.sh +--- ./procps-3.2.7.orig/debian/procps.sh 2006-08-28 00:06:34.000000000 +0200 ++++ ./procps-3.2.7/debian/procps.sh 2006-08-28 00:09:55.000000000 +0200 +@@ -16,6 +16,7 @@ + # Closes #52839 for the boot-floppy people + [ -r /etc/default/rcS ] || exit 0 + . /etc/default/rcS ++. /lib/lsb/init-functions + + PATH=/sbin:$PATH + which sysctl > /dev/null || exit 0 +@@ -27,18 +28,9 @@ + then + exit 0 + fi +- if [ "$VERBOSE" = "yes" ] +- then +- quiet="" +- echo "Start setting kernel variables via /proc..." +- else +- quiet="-q" +- fi +- sysctl $quiet -p +- if [ "$VERBOSE" = "yes" ] +- then +- echo "Done setting kernel variables via /proc." +- fi ++ log_action_begin_msg "Setting kernel variables" ++ sysctl -q -p ++ log_action_end_msg $? + ;; + stop) + ;; +@@ -47,3 +39,4 @@ + exit 3 + ;; + esac ++exit 0 --- procps-3.2.7.orig/debian/docs +++ procps-3.2.7/debian/docs @@ -0,0 +1,4 @@ +BUGS +TODO +README.top + --- procps-3.2.7.orig/debian/menu +++ procps-3.2.7/debian/menu @@ -0,0 +1 @@ +?package(procps):needs="text" section="Apps/System" title="Top" command="/usr/bin/top" hints="Monitoring" --- procps-3.2.7.orig/debian/control +++ procps-3.2.7/debian/control @@ -0,0 +1,35 @@ +Source: procps +Section: admin +Priority: required +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Craig Small +Build-Depends: debhelper (>= 5), libncurses5-dev, make (>= 3.78.1-8), dpatch +Standards-Version: 3.7.2 + +Package: procps +Architecture: any +Depends: ${shlibs:Depends}, lsb-base (>= 3.0-10) +Provides: watch +Conflicts: watch, libproc-dev (<< 1:1.2.6-2), w-bassman (<< 1.0-3), procps-nonfree, pgrep (<< 3.3-5) +Replaces: watch, bsdutils (<< 2.9x-1) +Recommends: psmisc +Description: /proc file system utilities + These are utilities to browse the /proc filesystem, which is not a real file + system but a way for the kernel to provide information about the status of + entries in its process table. (e.g. running, stopped or "zombie") + Both command line and full screen utilities are provided. Ncurses is needed + for the full screen utilities. More information can be found at procps + website http://procps.sf.net/ + . + This package includes the following utilities: top, uptime, tload, + free, vmstat, watch, skill, pmap, pgrep, slabtop and pwdx. + +Package: libproc-dev +Architecture: any +Section: libdevel +Priority: optional +Depends: libc6-dev, procps (= ${Source-Version}) +Description: library for accessing process information from /proc + These are the header files for libproc. Some packages using libproc + to access process information from /proc need these to compile. + --- procps-3.2.7.orig/debian/sysctl.conf.powerpc +++ procps-3.2.7/debian/sysctl.conf.powerpc @@ -0,0 +1,5 @@ + +# Emulate the middle mouse button with F11 and the right with F12. +dev/mac_hid/mouse_button_emulation = 1 +dev/mac_hid/mouse_button2_keycode = 87 +dev/mac_hid/mouse_button3_keycode = 88 --- procps-3.2.7.orig/debian/prerm +++ procps-3.2.7/debian/prerm @@ -0,0 +1,14 @@ +#!/bin/sh + +case "$1" in + remove|deconfigure) + update-alternatives --remove w /usr/bin/w.procps + ;; + upgrade|failed-upgrade) + ;; +esac + +#DEBHELPER# + +exit 0 + --- procps-3.2.7.orig/debian/rules +++ procps-3.2.7/debian/rules @@ -0,0 +1,118 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# Include dpatch stuff +include /usr/share/dpatch/dpatch.make + +PACKAGE="procps" +DEBROOT=$(CURDIR)/debian/procps + +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) + +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) + +build: build-stamp + +build-stamp: patch-stamp + dh_testdir + + # Add here commands to compile the package. + mkdir static + $(MAKE) lib64=lib SHARED=0 proc/libproc.a + mv proc/libproc.a static + $(MAKE) clean + $(MAKE) W_SHOWFROM=\-DW_SHOWFROM lib64=lib + + touch build-stamp + +clean: clean1 unpatch +clean1: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + -rm -rf static + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/procps. + $(MAKE) lib64=lib ln_f="ln -sf" ldconfig=echo DESTDIR=$(DEBROOT) install + install --mode 644 -o root -g root debian/sysctl.conf $(DEBROOT)/etc/ +ifneq (,$(wildcard debian/sysctl.conf.$(DEB_HOST_ARCH))) + cat debian/sysctl.conf.$(DEB_HOST_ARCH) >> $(CURDIR)/debian/procps/etc/sysctl.conf +endif + cp debian/lintian $(DEBROOT)/usr/share/lintian/overrides/procps + + # Rename w as there are two of them + (cd $(DEBROOT)/usr/bin && mv w w.procps ) + (cd $(DEBROOT)/usr/share/man/man1 && mv w.1 w.procps.1 ) + + # Work-around until proc includes fixed + (cp proc/*.h $(CURDIR)/debian/libproc-dev/usr/include/proc) + cp static/libproc.a $(CURDIR)/debian/libproc-dev/usr/lib + +ifneq ($(DEB_HOST_GNU_SYSTEM), linux-gnu) + rm -f \ + $(CURDIR)/debian/procps/bin/kill \ + $(CURDIR)/debian/procps/usr/share/man/man1/kill.1 \ + $(CURDIR)/debian/procps/sbin/sysctl \ + $(CURDIR)/debian/procps/usr/share/man/man8/sysctl.8 \ + $(NULL) +endif + + dh_movefiles --sourcedir=debian/procps + #rmdir $(CURDIR)/debian/procps/usr/include/proc + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs NEWS + dh_installdocs + dh_installexamples + dh_install + dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installcatalogs +# dh_installpam +# dh_installmime + dh_installinit --update-rcd-params='start 17 S .' --init-script='procps.sh' +# dh_installcron + dh_installinfo +# dh_undocumented + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl + dh_makeshlibs -V "procps (>= 3.2.7), procps (<< 3.2.8)" + dh_installdeb + dh_shlibdeps -Lprocps -ldebian/procps/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean1 --- procps-3.2.7.orig/debian/watch +++ procps-3.2.7/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 +version=3 +http://procps.sourceforge.net/download.html procps-(.*)\.tar\.gz --- procps-3.2.7.orig/debian/changelog +++ procps-3.2.7/debian/changelog @@ -0,0 +1,1035 @@ +procps (1:3.2.7-3ubuntu3) gutsy; urgency=low + + * debian/sysctl.conf: enable /proc/$pid/maps protection, new in 2.6.22. + + -- Kees Cook Thu, 10 May 2007 00:39:48 -0700 + +procps (1:3.2.7-3ubuntu2) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:24:55 +0000 + +procps (1:3.2.7-3ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/rules: Add debian/sysctl.conf.$(DEB_HOST_ARCH) to default + sysctl.conf file. + - debian/sysctl.conf.powerpc: Mouse button emulation. + - debian/postinst, debian/rules: Place init script at priority 17. + - debian/sysctl.conf: Set kernel.printk to default values 4 4 1 7 to avoid + cluttering consoles on powerpc. + - debian/procps.sh: Respect $VERBOSE. + + -- Martin Pitt Fri, 3 Nov 2006 18:28:41 +0100 + +procps (1:3.2.7-3) unstable; urgency=low + + * Changed init script dependencies Closes: #386637, #386341 + * init script uses lsb logging Closes: #384920 + + -- Craig Small Wed, 13 Sep 2006 11:27:56 +1000 + +procps (1:3.2.7-2ubuntu3) edgy; urgency=low + + * debian/sysctl.conf: Explicitly set the kernel.printk sysctl to '4 4 1 7' + to stop kernel log spewage to consoles on powerpc. On i386/amd64 this is + the default printk setting anyway, thus does not change any default, but + with the powerpc kernels the default is '0 0 0 0'. + + -- Martin Pitt Fri, 8 Sep 2006 15:44:45 +0200 + +procps (1:3.2.7-2ubuntu2) edgy; urgency=low + + * debian/rules: Re-add debian/sysctl.conf.$(DEB_HOST_ARCH) addition to the + default sysctl.conf file (apparently this got dropped in the last merge). + This repairs mouse F11/F12 mouse button emulation on powerpc. + + -- Martin Pitt Wed, 16 Aug 2006 15:19:51 +0200 + +procps (1:3.2.7-2ubuntu1) edgy; urgency=low + + [ Ubuntu Merge-o-Matic ] + * Merge from debian unstable. + + -- Scott James Remnant Fri, 30 Jun 2006 01:33:16 +0100 + +procps (1:3.2.7-2) unstable; urgency=medium + + * pgrep c option patch works correctly Closes: #375791 + * Made urgency medium as pgrep -c segfaults pgrep + + -- Craig Small Wed, 28 Jun 2006 22:28:02 +1000 + +procps (1:3.2.7-1ubuntu1) edgy; urgency=low + + [ Ongoing Merge Process ] + * Merge from debian unstable. + + [ Scott James Remnant ] + * Drop postinst migration now that dapper is released. + + -- Scott James Remnant Wed, 28 Jun 2006 23:31:06 +0100 + +procps (1:3.2.7-1) unstable; urgency=low + + * New upstream release + * Fixed nroff typo in man page Closes: #326517 + * pgrep/pkill: fix some realloc-related crashes Closes: #353894 + * Using debhelper compat level 5 + * Bumped standards versiob to 3.7.2 + * watch difference check uses 8 bit char Closes: #207103 + * Updated watch file location Closes: #354242 + * Cleaned up init.d script Closes: #294765, #338970 + * init.d script has those lsb dependency thingies Closes: #335320 + * Removed .rej file out of gnu_kbsd patch Closes: #362875 + * Removed duplicate -N option out of sysctl.8 Closes: #364894 + * Explain load average in uptime.1 Closes: #365019 + * Removed empty directories Closes: #359146 + * IPv4/6 sysctl.conf examples fixed Closes: #341087 + * sysctl.8 has optional filename for -p Closes: #297144 + * top.1 Now has Bold enable=off as default Closes: #293981 + * free.1 documents the -g (gigabytes) flag CloseS: #286900 + * Cleanup man pages Closes: #282168 + * added rollbacks to maint scripts Closes: #374456 + * Updated gnu kbsd patch Closes: #349982 + * Added list of commands to description Closes: #354686 + * Changed copyright, most of it is under LGPL now + * Move to admin section to stop dinstaller complaining at me + * Actually apply cpu state top.1 patch Closes: #351998 + * sysctl.conf doesn't mention /etc/network/options Closes: #339788 + * sysctl.conf uses default instead of all for network stuff as networking + rc is done later Closes: #337019 + + -- Craig Small Mon, 26 Jun 2006 08:16:19 +1000 + +procps (1:3.2.6-2.2) unstable; urgency=low + + * NMU + * Document the copyright of the emacs bindings bit of pgrep in + debian/copyright (Closes: #362876) + + -- Don Armstrong Sat, 22 Apr 2006 07:45:25 -0700 + +procps (1:3.2.6-2.1) unstable; urgency=low + + * NMU + * Use a temporary file for the output of the check_gcc test to avoid + removing /dev/null on failure. Thanks to Niv Altivanik for the patch. + (Closes: #336710) + + -- Don Armstrong Sun, 19 Feb 2006 15:48:35 -0800 + +procps (1:3.2.6-2ubuntu4) dapper; urgency=low + + * Move init script to S17 so it gets run after all modules have probably + been loaded, otherwise many sysctls will probably not be set. Users + will have to worry about disabling things a different way (which this + has never been useful for anyway). + + -- Scott James Remnant Mon, 23 Jan 2006 15:34:03 +0000 + +procps (1:3.2.6-2ubuntu3) dapper; urgency=low + + * Undo rename of init script, I was overzealously reading my notes and + it's not necessary. Keeps the Debian diff smaller. + + -- Scott James Remnant Wed, 4 Jan 2006 10:41:49 +0000 + +procps (1:3.2.6-2ubuntu2) dapper; urgency=low + + * Move init script from S30 to S05 so it can apply options before + modules are loaded; especially important for disabling networking + features, etc. + * Rename init script to avoid confusion, and avoid problems using exit + in *.sh scripts. + + -- Scott James Remnant Thu, 15 Dec 2005 01:44:51 +0000 + +procps (1:3.2.6-2ubuntu1) dapper; urgency=low + + * resync with debian, merged by hand + + -- Michael Vogt Fri, 25 Nov 2005 17:50:43 +0100 + +procps (1:3.2.6-2) unstable; urgency=low + + * properly patched for kfreebsd Closes: #290719 + + -- Craig Small Wed, 2 Nov 2005 13:58:22 +1100 + +procps (1:3.2.6-1) unstable; urgency=low + + * New upstream source + * ps: man page more detailed Closes: #334682 + * spelling fixes Closes: #300333, #334684, #334685 + * top: crash on resize fixed -- thanks Michal Maruska Closes: #320289 + * vmstat: -p handles /dev/ and does not overflow Closes: #319523, #330969 + * CPU states in top man page Closes: #312157, #228899 + * w.bassman finally patched into w Closes: #45937 + * w uses COLUMNS if ioctl fails, eg with pipe Closes: #252799 + * GNU/kFreeBSD Support Closes: #290719 + * Variables that are set are specified on init Closes: #330464 + * sysctl.conf has netbase examples Closes: #331192 + * sysctl.conf example has way to stop console logging Closes: #292834 + + -- Craig Small Mon, 31 Oct 2005 18:49:07 +1100 + +procps (1:3.2.5-1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Adam Conrad Thu, 21 Apr 2005 08:50:56 +0000 + +procps (1:3.2.5-1) unstable; urgency=low + + * New upstream release + display problem on 64-bit systems fixed Closes: #287947 + top: help and version message on stdout, with exit(0) Closes: #283541 + ps: SIGTSTP and SIGTTOU shouldn't print bug email address Closes: #246123 + slabtop: fix overflow on huge NUMA boxes Closes: #264640 + slabtop: accept any slabinfo 2.x format Closes: #287691 + + -- Craig Small Thu, 27 Jan 2005 11:07:46 +1100 + +procps (1:3.2.4-1ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Wed, 8 Dec 2004 10:45:17 +0100 + +procps (1:3.2.4-1) unstable; urgency=low + + * New upstream release + ps: tolerate SubDomain security module CONTEXT/LABEL data Closes: #277401 + * init.d doesnt print done when not verbose Closes: #264431 + * init.d script runs sysctl with -q for quiet Closes: #277111 + * sysctl.conf has warning about network overiding varables Closes: #275291 + + -- Craig Small Wed, 17 Nov 2004 12:56:21 +1100 + +procps (1:3.2.3-1ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Wed, 27 Oct 2004 14:28:50 +0100 + +procps (1:3.2.3-1) unstable; urgency=low + + * New upstream release + + -- Craig Small Wed, 18 Aug 2004 13:24:19 +1000 + +procps (1:3.2.2-2) unstable; urgency=low + + * Missed one more lib64 override. Works on os390 now + + -- Craig Small Fri, 30 Jul 2004 21:48:47 +1000 + +procps (1:3.2.2-1) unstable; urgency=low + + * New upstream release + pgrep: man page SEE ALSO updated Closes: #226817 + top: try to handle terminals lacking rmam and smam Closes: #235003 + * Upstream now has quiet patch so removing dpatch for it. + + -- Craig Small Wed, 28 Jul 2004 16:25:34 +1000 + +procps (1:3.2.1-2ubuntu3) warty; urgency=low + + * On Macs, emulate the middle and right mouse buttons with F11 and F12 + respectively (closes: Warty #1187). + + -- Colin Watson Tue, 14 Sep 2004 20:11:25 +0100 + +procps (1:3.2.1-2ubuntu2) warty; urgency=low + + * Added versioned depend on lsb-base + + -- Nathaniel McCallum Fri, 3 Sep 2004 15:15:09 -0400 + +procps (1:3.2.1-2ubuntu1) warty; urgency=low + + * debian/procps.sh: pretty initscript + + -- Nathaniel McCallum Fri, 3 Sep 2004 11:59:29 -0400 + +procps (1:3.2.1-2) unstable; urgency=low + + * Fix Makefile patch so it works with newer patch packages + Closes: #242574 + * Changed the way SHARED is used in Makefiles + * init script looks nicer when setting multiple variables Closes: #241721 + + -- Craig Small Tue, 13 Apr 2004 07:59:25 +1000 + +procps (1:3.2.1-1) unstable; urgency=low + + * New upstream release + * Changed init script output Closes: #238567 + * menu item has text quoted + + -- Craig Small Thu, 1 Apr 2004 22:53:37 +1000 + +procps (1:3.2.0-1) unstable; urgency=low + + * New upstream release + test scripts build on ia-64 + Fix terminal when ^Z top Closes: #228822 + slabtop added Closes: #226778 + * postinst checks for symlink and not file to remove Closes: #234306 + + + -- Craig Small Wed, 25 Feb 2004 16:35:03 +1100 + +procps (1:3.1.15-3) unstable; urgency=low + + * Removed entry in Makefile for /libc64 so sparc64 builds + + -- Craig Small Tue, 17 Feb 2004 11:01:24 +1100 + +procps (1:3.1.15-2) unstable; urgency=low + + * Removed offending test directory Closes: #227933 + + -- Craig Small Tue, 20 Jan 2004 10:20:44 +1100 + +procps (1:3.1.15-1) unstable; urgency=low + + * Now uses dpatch to handle the various patches + * New upstream release + - Supports SELINUX flags for kernel v2.6 Closes: #193648 + - Hide kernel PID bug Closes: #217278, #219730, #217525, #224470 + - Fixed top auto-margins problem Closes: #217559 + * Fix top manual page Closes: #225089 + * Patch so SELINUX flags work in v2.4 kernels + * Extra +s in ps.1 removed Closes: #218220 + * Added patch so sysctl has quiet -q flag Closes: #189100 + + -- Craig Small Fri, 26 Dec 2003 18:02:59 +1100 + +procps (1:3.1.14-1) unstable; urgency=low + + * New upstream release + + -- Craig Small Wed, 22 Oct 2003 11:59:53 +1000 + +procps (1:3.1.13-1) unstable; urgency=low + + * New upstream release + + -- Craig Small Wed, 24 Sep 2003 16:10:42 +1000 + +procps (1:3.1.12-1) unstable; urgency=low + + * New upstream release + ps: $PS_FORMAT works properly Closes: #201575 + man page: /var/run/utmp, not /etc/utmp Closes: #206583 + required flags moved out of CFLAGS Closes: #205429 + + + -- Craig Small Sat, 13 Sep 2003 21:11:09 +1000 + +procps (1:3.1.11-2) unstable; urgency=low + + * Made shlibs have a specific version Closes: #199118 + * libproc.a is back in libproc-dev, use it + * Added README to libproc-dev for people who use the library + + -- Craig Small Wed, 20 Aug 2003 15:31:59 +1000 + +procps (1:3.1.11-1) unstable; urgency=low + + * 3.1.11 New upstream version + - handle GPLONLY_ symbols Closes: #143549, #188374 + * freeproc now defined Closes: #189047 + * warning in readproc.c fixed Closes: #197346 + * Removed optarg and optind defines Closes: #197343 + * Fixed saved_start_time warning Closes: #197342 + + -- Craig Small Thu, 24 Jul 2003 17:02:36 +1000 + +procps (1:3.1.9-1) unstable; urgency=low + + * New upstream source + * memory sizes fixed for 64-bit w/ gcc 3.x Closes: #194376, #191933 + * Doesn't segfault if /proc not mounted Closes: #172735 + * No warning in top about memory key Closes: #188271 + * More info in kill man page Closes: #182414 + * Document the different oO options Closes: #169301 + * Updated stabndards version to 3.5.9 + * Changed disk to backing storage Closes: #175925 + + -- Craig Small Mon, 2 Jun 2003 02:31:03 +1000 + +procps (1:3.1.8-1) unstable; urgency=low + + * New upstream release + watch man page fixed, Closes #182246 + * Changed section for libproc-dev + + -- Craig Small Tue, 1 Apr 2003 10:19:05 +1000 + +procps (1:3.1.6-1) unstable; urgency=low + + * New upstream release + - watch has --no-title option Closes: #179862 + - ps -C can compare very long names Closes: #178127 + * Fixed descriptions in manual pages Closes: #179046 + * w wont crash if /proc unreadable Closes: #169398 + + -- Craig Small Sat, 22 Feb 2003 21:33:45 +1100 + +procps (1:3.1.5-1) unstable; urgency=low + + * New upstream version + - watch don't drop empty lines Closes: #171005 + - top has old sort keys Closes: #167249 + - now count Inact_laundry as needed Closes: #172163 + + -- Craig Small Mon, 6 Jan 2003 13:49:32 +1100 + +procps (1:3.1.3-1) unstable; urgency=low + + * New upstream source + + -- Craig Small Fri, 13 Dec 2002 16:16:36 +1100 + +procps (1:3.1.1-1) unstable; urgency=low + + * New upstream source + - vmstats reports memort counts Closes: #169774 + + -- Craig Small Wed, 4 Dec 2002 15:57:13 +1100 + +procps (1:3.1.0-1) unstable; urgency=low + + * New upstream version + - vmstat displays IO-wait time instead of bogus "w" + - when IO-wait hidden, count as idle, not as sys + - pmap command added (like Sun has) + * Manual pages cleaned up Closes: #165970, #164481 + + -- Craig Small Mon, 11 Nov 2002 12:03:46 +1100 + +procps (1:3.0.5-1) unstable; urgency=low + + * New upstream version + - top tolerates super-wide displays Closes: #165497 + - ELF note warning gone for some kernels Closes: #165900 + - Fix ps and top man pages a bit, dropped bugs severity. + + -- Craig Small Tue, 29 Oct 2002 22:04:36 +1100 + +procps (1:3.0.4-1) unstable; urgency=low + + * New upstream version + - ELF note warning removed Closes: #165093, #165343 + - top works for most TERM= settings Closes: #164864, #164956 + * w has FROM column again by default Closes: #165252 + * debhelper dependency version fixed Closes: #165083 + * ps.1 looks a bit better now Closes: #16448 + + -- Craig Small Mon, 21 Oct 2002 08:30:04 +1000 + +procps (1:3.0.3-1) unstable; urgency=low + + * New upstream version + - w works with KOI8 locale Closes: #153043 + - fix top for non-SMP 2.2.xx and 2.0.xx Closes: #164231 + - negative idle time fixed Closes: #126260 + - sysctl handles new vlan interface Closes: #140386 + - vmstat documentation update Closes: #157935, #155684 + - "skill -n blah blah blah" lets you test options Closes: #158630 + - fixed ps --sort crash Closes: #164226 + - vmstat compiles with latest gcc-3.x Closes: #164348 + - bad (int*) cast in top removed Closes: #164468 + - Support new/improved statistics interfaces in 2.5 /proc Closes: #164013 + - top defaults to old layout and sort by pid Closes: #164277 + - rant moved out of top.1 man page Closes: #164520 + - top runs much faster Closes: #87779 + + -- Craig Small Sat, 12 Oct 2002 21:44:23 +1000 + +procps (1:3.0.0-2) unstable; urgency=low + + * Fixed pkill and skill, auto* is so broken. Closes: #163940, #163944 + * Moved libproc.so.3 into /lib as it's needed early Closes: #163981,#163899 + + -- Craig Small Thu, 10 Oct 2002 07:19:45 +1000 + +procps (1:3.0.0-1) unstable; urgency=low + + * New upstream source Closes: #163698 + - top has SMP Closes: #162316, #62282, #94896, #98277, #117040, #117735 + - SELINUX support Closes: #142892 + - top defaults to signal 15 to kill pids with Closes: #72158 + - 64-bit time reduces the overflow problem Closes: #82382, #155908 + - "w" program better at determining what a user is doing + Closes: #88758, 115529 + - oldps is gone Closes: #101917 + - Handles /proc/tty/drivers Closes: #108654, #154046 + - Supports scanf where locale uses , for decimal point Closes: #126873 + - uptime --help now calls itself uptime Closes: #128880 + - ps faster Closes: #147731 + - top calculates screen better Closes: #162296 + - top allows sorts by pid or swapped memory Closes: #79868, #159446 + - support for s/390 Closes: #126295 + - statm buffer size increased Closes: #145085 + - new top has no typos Closes: #148918 + - new top can handle lots of tasks Closes: #70900 + * Fixed init.d file so it follows policy Closes: #121945 + + -- Craig Small Tue, 8 Oct 2002 12:29:45 +1000 + +procps (1:2.0.7-10) unstable; urgency=low + + * Fixes ps crash when system.map is exact multiple of 1024 + Thankyou Colin for the patch! Closes: #109237, #142292 + + -- Craig Small Fri, 12 Apr 2002 21:02:04 +1000 + +procps (1:2.0.7-9) unstable; urgency=low + + * Sanity checking for Number of CPU Closes: #127561, #122617 + This will keep the m68k and ARM boys happy. + * uptime usage fixed Closes: #138351 + * kill man page NAME updated Closes: #119400 + * Better explanation for load average in uptime(1) Closes: #140902 + * utmp in correct location in w(1) Closes: #115725 + + -- Craig Small Mon, 8 Apr 2002 14:18:20 +1000 + +procps (1:2.0.7-8) unstable; urgency=low + + * Removed -ggdb Closes: #117203 + + -- Craig Small Sat, 27 Oct 2001 07:02:38 +1000 + +procps (1:2.0.7-7) unstable; urgency=low + + * Added os/390 patches Closes: #113494 + * w manpage now gives correct location for utmp Closes: #110723 + * watch wrap-around problem fixed Closes: #111759 + * Programs are compilied -O2 Closes: #108652 + + -- Craig Small Wed, 26 Sep 2001 08:08:43 +1000 + +procps (1:2.0.7-6) unstable; urgency=low + + * Re-fixed command line interpretation Closes: #103101 + + -- Craig Small Tue, 10 Jul 2001 17:32:02 +1000 + +procps (1:2.0.7-5) unstable; urgency=low + + * watch now copys strings better. Closes: #95404, #97948, #99780 + * skill.1 loads tbl Closes: #92242, #67899 + * long usernames are shown Closes: #86205, #94957 + * Remove /etc/rcS.d/S30procps with good ole rm Closes: #92184 + * /etc/init.d/procps.sh calls itself that Closes: #93302 + * Cannot write config in secure mode Closes: #93948 + + -- Craig Small Sun, 29 Apr 2001 14:55:20 +1000 + +procps (1:2.0.7-4) unstable; urgency=low + + * watch doesnt crash with long command lines Closes: #88592, #87693 + * bumped up a buffer in a proc read Closes: #85775 + * Now we use 24 hour time Closes: #85640 + * pgrep calls itself pgrep Closes: #86630 + * Corrected symlink in libproc-dev Closes: #87865 + + -- Craig Small Mon, 19 Mar 2001 10:13:27 +1100 + +procps (1:2.0.7-3) unstable; urgency=low + + * Conflicts with pgrep, so no more conflicts Closes: #82835 + * Minor fixes to ps.1 manpage Closes: #81921 + * watch highlighs correctly Closes: #77737 + * top wont die with evil HOMEs, Closes: #81452 + * removed reference to suidregister + * Remore -L reference in kill.1 Closes: #85913 + + -- Craig Small Thu, 8 Feb 2001 12:44:58 +1100 + +procps (1:2.0.7-2) unstable; urgency=medium + + * Moved kill back again, dammit why is the makefile so broken + Closes: #82747 + * Watch uses locale Closes: #82739 + * top's scanf is protected from evil locale problems Closes: #82671, #69128 + (Big thankyou to Guillaume for lending a test account) + + -- Craig Small Fri, 19 Jan 2001 09:15:36 +1100 + +procps (1:2.0.7-1) unstable; urgency=medium + + * New upstream version (010114) + - Merges 2.0.7 code from RedHat Closes: #80832 + - Made note that Shared memory report will be junk due to kernel + Closes: #77818 + - Remove html and null stuff from man page Closes: #81920 + - vsize is kB in man page Closes: #82210 + - man pages look better Closes: #70055, #70941 + - vmstat increase Closes: #77886 + - w tries harder to find things Closes: #24531 + - 15 char user names Closes: #71211 + * No HOME overflow in top Closes: 81452 + * Added menu Hints Closes: #80051, #82324 + + + -- Craig Small Wed, 17 Jan 2001 08:57:24 +1100 + +procps (1:2.0.6-9) unstable; urgency=medium + + * added libncurses5-dev to build-depends, Closes: #67533 + * Put kill back into /bin Closes #67580, #67582 + * Put 2.0.6-7 ps.1 back in Closes: #67451 + + -- Craig Small Tue, 25 Jul 2000 08:13:21 +1000 + +procps (1:2.0.6-8) unstable; urgency=low + + * New upstream source: + * - sysctl EOF bug fixed Closes: #62877 + * - stop crashes with unmounted /proc Closes: #63512, #55177 + * - Versions checking tolerates RH /proc/ksyms Closes: #59798 + * - Top works better with SMP Closes: #34734, #56547, #59703 + + -- Craig Small Fri, 14 Jul 2000 22:33:44 +1000 + +procps (1:2.0.6-7) unstable; urgency=low + + * Fixed missing version Closes: #62207, #62484, #59112 + * Stop crashes with umounted /proc Closes: #63512, #55177 + * Nicer man pages Closes: #63495, #59406 + * Fixed sysctl eof bug Closes: #62877 + * watch wraps properly Closes: #60913 + * watch handles tabs Closes: #46213 + * watch honors locale settings Closes: #63762 + * now versioned replaces line for bsdutils + + -- Craig Small Mon, 29 May 2000 13:31:54 +1000 + +procps (1:2.0.6-6) unstable; urgency=low + + * New patchlevel (000221) + * ps 'f' ASCII art forest fixed. Closes: #57134, #58644 + * let insane people run ps setuid. Closes: #56701 + * note that kernel 2.3 is now faster. Closes: #49130 + * top with WCHAN was leaking memory. Closes: #58172, #52257, #56889 + * can show current CPU. Closes: #37023 + * w looks better now. Closes: #55952 + * init.d/procps removed if exists. Closes: #55137, #55852 + * Fixed skill/snice man page (thanks man-db maint!) Closes: #53736, #46743 + * Fixed ps man page Closes: #58365 + + -- Craig Small Wed, 23 Feb 2000 10:31:37 +1100 + +procps (1:2.0.6-5) unstable; urgency=low + + * New upstream source + * kill "_R(smp_|smp2gig_|2gig_)?[0-9a-fA-F]{8,}" Closes: #54394, #53208 + * added type 'S' and scan past machine types Closes: #54396 + * Fixed w(1) manpage Closes: #54709 + * top now agrees with ps for RSS Closes: #52679 + + -- Craig Small Tue, 11 Jan 2000 08:23:56 +1100 + +procps (1:2.0.6-4) unstable; urgency=low + + * procps init.d script quietly dies if not /etc/default/rcS Closes: + #52839 + * Put the NEWS changelog back in Closes: #52678 + * Fixed that damn Rsmp annoying message bug Closes: #48686 + * Remove /etc/init.d/procps Closes: #53818 + + -- Craig Small Mon, 20 Dec 1999 11:14:53 +1100 + +procps (1:2.0.6-3) unstable; urgency=low + + * Patched ps so it complains if you chmod 711 /proc Closes: #52481 + * Did the same for top. + * Ditto for oldps. + * Changed and int to a char* Closes: #52482 + * sysctl.conf file references sysctl.conf (5) not 8 Closes: #52385 + * props init.d script changed to procps.sh Closes: #52228 + + -- Craig Small Mon, 13 Dec 1999 11:57:01 +1100 + +procps (1:2.0.6-2) unstable; urgency=low + + * Changed psmisc from reccomends to suggests + * %MEM now works, Closes: #50010 #50055 #50148 #50356 + * top doesn't crash with > 204 processes Closes: #50055 + * Another libproc fd leak fixed Closes: #45398 + * ps silently ignores m and -m for future compatibility Closes: #48308 + * Added a sysctl.conf and other files as suggested Closes: #51098 + * Fix start field instability + * ps.1 fixed Closes: #35137 + + -- Craig Small Tue, 7 Dec 1999 14:42:51 +1100 + +procps (1:2.0.6-1) unstable; urgency=low + + * New upstream + * sysctl crash fixed, Closes: #49015 + * libproc file descriptor leak fixed, Closes: #45398 + * False positive System.map mismatches killed, Closes: #49047 + * Supports 64 Hz for StrongARM/Shark Closes: #47461 + * pr_time fixed, Closes: #46223 + * libc num cpu workaround back in, Closes: #49039 + * Fixed kill manpage, Closes: #47018 + * This version definitely, absolutely has kill, Closes: #46762 + + + -- Craig Small Fri, 5 Nov 1999 12:46:05 +1100 + +procps (1:2.0.3-5) unstable; urgency=low + + * Changed conflicts with replaces + + -- Craig Small Wed, 6 Oct 1999 14:36:48 +1000 + +procps (1:2.0.3-4) unstable; urgency=low + + * support SMP systems with versioned kernel modules Closes: #45621, #46465 + * Added kill to this (it is removed from bsdutils). + * We now need kill manpage, Closes: #46004 + + -- Craig Small Tue, 5 Oct 1999 10:28:01 +1000 + +procps (1:2.0.3-3) unstable; urgency=low + + * System.map support for non-i386 Closes: #45592, #45250 + * Do not require /proc/ksyms Closes: #45128, #45132, #45619 + * Alternative w.1 points to the right spot, Closes: #45331 + * Copyright for skill and snice and ps fixed, Closes: #45119 + + -- Craig Small Tue, 21 Sep 1999 16:31:59 +1000 + +procps (1:2.0.3-2) unstable; urgency=medium + + * Now with top! Closes: #45106 + + -- Craig Small Wed, 15 Sep 1999 11:12:34 +1000 + +procps (1:2.0.3-1) unstable; urgency=low + + * New upstream source + * Debian personality does m flag Closes: #44832 + * Corrected typo in top.1 Closes: #44836 + * New improved watch Closes: #29970 + + -- Craig Small Mon, 13 Sep 1999 16:59:16 +1000 + +procps (1:2.0.2-4) unstable; urgency=high + + * Fixed the nasty ps formatting problem (Bug #40859 #40856 #40839 ) + + -- Craig Small Wed, 7 Jul 1999 08:41:54 +1000 + +procps (1:2.0.2-3) unstable; urgency=low + + * New upstream patches/source + * SMB Hz wierdness fixed (Bug #33023 #33284) + * non-tty output does not get chopped at 80 columns (bug #36688) + * BSD personalities set the default selection and output format (bug #36698) + * Fixed collumn spacing problem (Bug #35309) + * Work around for borken libs that return 0 processors (Bug #36902) + * skill now uses process name not command line (Bug #19208) + + -- Craig Small Mon, 5 Jul 1999 07:29:47 +1000 + +procps (1:2.0.2-2) unstable; urgency=low + + * Removed kill and manual page (Bug #36421 #36551 #36375) + * Put in patch for bogus sysconf return (Bug #36494 #36532 #36581) + + -- Craig Small Wed, 28 Apr 1999 09:04:59 +1000 + +procps (1:2.0.2-1) unstable; urgency=low + + * New upstream version (Bug #34394 #27291 #34250 #34956 #35240 #35247 + #35520 #35756 #34580 ) + + -- Craig Small Mon, 19 Apr 1999 13:26:48 +1000 + +procps (1:2.0.0-1) unstable; urgency=low + + * New upstream version (Bug #33083 23347 33462 10556 33266 33371 ) + + + -- Craig Small Mon, 15 Mar 1999 14:21:57 +1100 + +procps (1:1.9.0-2) unstable; urgency=low + + * top now resumes (Bug #32106 ) + * debhelper text problem fixed in postinst (Bug #32963 #33122 #33003 33117 ) + * oldps and ps now use alternatives (Bug #33083 ) + * ps s format now not ugly (Bug #28266 ) + * watch command line help and man page correct (Bug #31702 ) + * sessreg removed from package (Bug #32294 ) + * ps doesn't display extra spaces (Bug #27799 ) + * top has spaces in command lines again (Bug #33060 ) + * ps now has personality (Bug #22923 #18429 ) + * moved non-free skill and snice to non-free package. + + -- Craig Small Tue, 9 Feb 1999 15:10:58 +1100 + +procps (1:1.9.0-1) unstable; urgency=low + + * New Upstream source + + -- Craig Small Thu, 4 Feb 1999 14:48:37 +1100 + +procps (1:1.2.9-3) unstable; urgency=low + + * Linked to ncurses4 + + -- Craig Small Fri, 30 Oct 1998 14:13:02 +1100 + +procps (1:1.2.9-2) unstable; urgency=low + + * top now has spaces in between command lines (Bug #28178 ) + * --version or -V now shows proper version. + + -- Craig Small Mon, 26 Oct 1998 08:55:59 +1100 + +procps (1:1.2.9-1) unstable; urgency=low + + * New upstream version (Bug #27573 ) + * Menu entry changed from System to Menu/System (Bug #27438 ) + * Char variables changed to int for powerpc (Bug #26624 ) + * libproc now nulls allocated structure (Bug #26225 ) + * No longer uses psdevtab (yay!) (Bug #25388 ) + * ps doesn't double space command line parameters (Bug #25306 #24293 ) + * ps now silently ignores g flag for those BSD heads (Bug #24075 ) + + -- Craig Small Fri, 9 Oct 1998 09:15:11 +1000 + +procps (1:1.2.7-2) unstable; urgency=low + + * Top can suspend twice (or three times even) (Bug #22997 ) + * Libraries properly built (Bug #20010 ) + + -- Craig Small Mon, 1 Jun 1998 09:16:09 +1000 + +procps (1:1.2.7-1) frozen unstable; urgency=high + + * New upstream source, fixes security bug (Bug #21475) + + -- Craig Small Thu, 23 Apr 1998 08:04:54 +1000 + +procps (1:1.2.6-2) unstable; urgency=low + + * Fixed Shared library dependencies (bugs #18388 #18394 18392 ) + * Conflicts with earlier versions of w-bassman (bug #18389 ) + + -- Craig Small Mon, 23 Feb 1998 09:05:54 +1100 + +procps (1:1.2.6-1) unstable; urgency=low + + * New upstream source. + * xload is undiverted (Bug #17102 ) + * ps_fields.7.gz removed (Bug #18090 ) + * Colour patches removed, color-related bugs gone (Bug #18008 #17217 #18090 ) + * POSIX patches removed, cmd line bugs gone (Bug #15537 ) + * w is now an alternative w.procps (Bug #17960 ) + * skill now works with process names (Bug #17087 ) + * ps and top man pages have their field descriptions (Bug #17360 ) + * ps u fixed (Bug #17313 ) + * Source code is no longer FUBAR (Bug #17892 ) + * top now redraws screen after config screen (Bug #11896 ) + * Circular dependency removed (Bug #16966 ) + * top does mess up screens with wrong cmd line (Bug #17230 ) + * top suspends with ctrl-Z (Bug #16703 ) + + -- Craig Small Tue, 17 Feb 1998 08:31:21 +1100 + +procps (1:1.2.5-2) unstable; urgency=low + + * Moved /bin into /bin/ps (Bug #17001 ) + + -- Craig Small Tue, 13 Jan 1998 07:50:43 +1100 + +procps (1:1.2.5-1) unstable; urgency=low + + * TTY selection works ( #16724 ) + * top and ps now accept --colour and *_COLOURS + * xproc copyright file not compressed ( #14491 ) + * All #include now #include "proc/*.h" ( #13482 ) + * Copyright doesn't mention psmisc now ( #16704 ) + * Moved ps back into /bin ( #16737 #16705 ) + * New upstream source ( #16795 ) + + -- Craig Small Mon, 12 Jan 1998 08:35:10 +1100 + +procps (1:1.2.2-1) unstable; urgency=low + + * New maintainer + * Updated upstream source to 1.2.2 (instead of 1.2) + * Merged Helmut's color/command line patches into upstream. + * Copyright file is not compressed ( #14493 #14415 ) + * psdatabase refreshed when installing ( #10693 ) + * Fixed +/- line in free ( #10785 #10870 #11566 #12027 #12245 #12374 ) + * w collumns corrected ( #10898 #13117 ) + * top saves sort type ( #11553 ) + * Linked to libc6 ( #11725 ) + * top doesn't coredump with S option ( #11855 ) + * skill works with given patch ( #12023 ) + * libproc-dev has proper sym link ( #12697 ) + * top -h doesn't change terminal settings ( #13513 ) + * ps -s has "CAUGHT" not "CATCHED" ( #14342 ) + * ps_colors.7 and ps_fields.7 reformatted ( #14109 #14544 #14545 ) + * ps checks for tty before using colors ( #14596 ) + * top sets stop signal handler later, stopping race ( #14769 ) + * When using POSIX personality, processes show up ( #14780 ) + * top checks for valid term type ( #15807 ) + * xproc now Depends on procps-1.2.*-* ( #10762 #13347 ) + * xproc dependencies fixed ( #12698 ) + + -- Craig Small Tue, 30 Dec 1997 11:33:54 +1100 + +procps (1.12.2.1) unstable; urgency=low + + * Non-maintainer release, built for libc6. + * Added in free.c from new procps version 1.2.3 (from sunsite), seems to + fix all the problems with free reporting bogus valus. + + -- Joey Hess Fri, 24 Oct 1997 13:34:35 -0400 + +procps (1.12.2) stable unstable; urgency=low + + * fixed meminfo handling again, as the fix wouldn't work on pre-2.1.x + kernels. + * fixed free to use the meminfo routines from libproc. + + -- Helmut Geyer Fri, 13 Jun 1997 22:42:14 +0200 + +procps (1.12.1) stable unstable; urgency=low + + * fixed several bugs + * replaced utmp handling to support wrappers. + * added /proc/meminfo support for 2.1.x kernels. + + -- Helmut Geyer Tue, 10 Jun 1997 23:59:41 +0200 + +procps (1.11.6) frozen unstable; urgency=medium + + * psmisc 1.14 : new upstream version (mainly bugfixes) + * added a lot of new serial device major numbers to the device lookup + code. Somehow it seems there are new serial devices every other week. + * fixed a bug in top: broken .toprc may cause a segmentation fault. + + -- Helmut Geyer Sun, 4 May 1997 09:50:30 +0200 + +procps (1.11.5) frozen unstable; urgency=medium + + * minor changes to make it compile with libc6 + * fix top behaviour on machines having nonstandard NR_TASKS up to 4k + tasks + + -- Helmut Geyer Fri, 18 Apr 1997 02:07:46 +0200 + +procps (1.11.4) unstable; urgency=medium + + * strip libproc.so from unneeded symbols (Bug# 8311) + * fixed watch.1 example (Bug# 8169) + * partly fixed fuser sigsegv core dump (Bug# 8004) + * menu entries for xproc and procps (Bug# 8325) + * divertions for xmem and xload. (Bug# 7565) + + -- Helmut Geyer Sun, 13 Apr 1997 20:55:05 +0200 + +procps (1.11.3) unstable; urgency=low + + * fixed uptime again, minor Makefile changes + + -- Helmut Geyer Fri, 21 Feb 1997 16:22:04 +0100 + +procps (1.11.2) unstable; urgency=medium + + * fixed typo in ps_fields.7 (Bug#5457) + * fixed typo in debian/rules (Bug #5585) + * fixed bug in w introduced in 1.11.1 (Bugs #5489, #5694, #5695, #5705). + * added support for non-standard serial devices (long overdue - Bug + #5771). + * fixed uptime option handling (Bug #6099). + * fixed top problems with missing/corrupted utmp (Bug #5819). + * fixed manpage problems (Bug #5936). + + -- Helmut Geyer Wed, 19 Feb 1997 18:49:26 +0100 + +procps (1.11.1) unstable; urgency=low + + * fixed bug in w + * automatic resize if field length is exceeded. This changed the shared + library, so popping the major number. + * fixed numeric WCHAN output on Alphas and stupid bug in ps (again, + thanks to H. Koenig). + * fixed top memory statistics for systems with more than 100M memory or + swap. + + -- Helmut Geyer Tue, 12 Nov 1996 02:57:18 +0100 + +procps (1.10.1) unstable; urgency=low + + * merged in ALPHA & Sparc patches + (from ftp.azstarnet.com:/pub/linux/axp/glibc) + * fixed ps --deselect/-N for pid lists + * use shared libs from now on, install shlibs again + * manpages for libproc + * static lib compiled without -fPIC + * added libproc package for development installing libproc headers, + manpages and static library. + * fixed PROC_REAL bug when PROC_FILLSTATUS isn't set. + * fixed color bug in ps --forest + * added xproc package for xload, xmem, xidle, xcpustate + (XConsole left out as we use xconsole & klogd on debian) + * adapted xload manpage for xidle and xmem + * fixed xmem to cope with newer kernels (where shared pages are counted + once for each additional reference) + * fixed top change_fields bug (a field needs 24, not 21 spaces) + * fixed several Alpha bugs (thanks to Harald Koenig) + * due to popular demand, the old format for time intervals is back. + for all program using this, a toggle command line option has been + provided. The default behaviour depends on the compile time option + NEW_TIME_DEFAULT (see main Makefile) + + -- Helmut Geyer Wed, 23 Oct 1996 21:30:54 +0200 + +procps (1.09.2) unstable; urgency=low + + * fixed cpu nice % in summary + * fixed topsetup initialisation in top.h I messed up in last revision + * fixed pipe output bug + * fixed --deselect bug in SVR4/POSIX mode + + -- Helmut Geyer Sun, 20 Oct 1996 13:57:11 +0200 + +procps (1.09.1) unstable; urgency=low + + * fixed ps -w bug displaying too many empty lines + * fixed SIGSEGV bug in ps -www + * fixed bug in top not calculating length of the command/args/env fields + at the field selection screen in some circumstances. + * fixed SIGSEGV bug when using environ field + + -- Helmut Geyer Sat, 12 Oct 1996 07:59:29 +0200 + +procps (1.09) experimental; urgency=low + + * This is an experimental release of the procps suite. A lot of features have + been added since the 1.01(a) release: + - support for both BSD and POSIX (SVR4) style command line options. + - completely configurable display of information. + - colour markup of processes exceeding limits or belonging to a user. + Please take a look at /usr/doc/procps/NEWS and the manpages for a concise + list. This is how the next upstream release of procps may look + (i.e. it will look like this if there is not too much resistance). + + -- Helmut Geyer Sat, 5 Oct 1996 14:26:57 +0200 + --- procps-3.2.7.orig/debian/lintian +++ procps-3.2.7/debian/lintian @@ -0,0 +1 @@ +procps: package-name-doesnt-match-sonames --- procps-3.2.7.orig/debian/libproc-dev.dirs +++ procps-3.2.7/debian/libproc-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/include/proc --- procps-3.2.7.orig/debian/postinst +++ procps-3.2.7/debian/postinst @@ -0,0 +1,84 @@ +#!/bin/sh +# postinst script for procps +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# 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|abort-remove|abort-deconfigure) + 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 (#234306 with -L ) + if [ -L /etc/rcS.d/S30procps ] + then + rm -f /etc/rcS.d/S30procps + fi + + # Ubuntu boot order changes + if [ -L /etc/rcS.d/S30procps.sh ]; then + rm -f /etc/rcS.d/S30procps.sh + fi + if [ -L /etc/rcS.d/S05procps.sh ]; then + rm -f /etc/rcS.d/S05procps.sh + 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) + # Nothing to do + ;; + + *) + 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.2.7.orig/debian/compat +++ procps-3.2.7/debian/compat @@ -0,0 +1 @@ +5 --- procps-3.2.7.orig/debian/README.Debian +++ procps-3.2.7/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 --- procps-3.2.7.orig/debian/sysctl.conf +++ procps-3.2.7/debian/sysctl.conf @@ -0,0 +1,30 @@ +# +# /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 + +# the following stops low-level messages on console +kernel.printk = 4 4 1 7 + +# enable /proc/$pid/maps privacy so that memory relocations are not +# visible to other users. +kernel.maps_protect = 1 + +##############################################################3 +# Functions previously found in netbase +# + +# Uncomment the next line to enable Spoof protection (reverse-path filter) +#net.ipv4.conf.default.rp_filter=1 + +# Uncomment the next line to enable TCP/IP SYN cookies +#net.ipv4.tcp_syncookies=1 + +# Uncomment the next line to enable packet forwarding for IPv4 +#net.ipv4.conf.default.forwarding=1 + +# Uncomment the next line to enable packet forwarding for IPv6 +#net.ipv6.conf.default.forwarding=1 --- procps-3.2.7.orig/debian/procps.sh +++ procps-3.2.7/debian/procps.sh @@ -0,0 +1,51 @@ +#! /bin/sh +# /etc/init.d/procps: Set kernel variables from /etc/sysctl.conf +# +# written by Elrond + +### BEGIN INIT INFO +# Provides: procps +# Required-Start: mountkernfs +# Required-Stop: +# Default-Start: S +# Default-Stop: +### END INIT INFO + + +# 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 +. /lib/lsb/init-functions + +PATH=/sbin:$PATH +which sysctl > /dev/null || exit 0 + + +case "$1" in + start|restart|force-reload) + if [ ! -r /etc/sysctl.conf ] + then + exit 0 + fi + if [ "$VERBOSE" = "yes" ] + then + quiet="" + log_begin_msg "Setting kernel variables..." + else + quiet="-q" + fi + sysctl $quiet -p + if [ "$VERBOSE" = "yes" ] + then + log_end_msg $? + fi + ;; + stop) + ;; + *) + echo "Usage: /etc/init.d/procps.sh {start|stop|force-reload|restart}" >&2 + exit 1 + ;; +esac +exit 0 --- procps-3.2.7.orig/debian/patches/10_skill.1.dpatch +++ procps-3.2.7/debian/patches/10_skill.1.dpatch @@ -0,0 +1,116 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_skill.1.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cleanup man page #282168 + +@DPATCH@ +diff -urNad procps-3.2.7~/skill.1 procps-3.2.7/skill.1 +--- procps-3.2.7~/skill.1 2006-06-19 14:25:41.000000000 +1000 ++++ procps-3.2.7/skill.1 2006-06-26 12:22:59.000000000 +1000 +@@ -11,37 +11,38 @@ + skill, snice \- send a signal or report process status + + .SH SYNOPSIS +-.nf +-skill [signal to send] [options] process selection criteria +-snice [new priority] [options] process selection criteria +-.fi ++.B skill ++.RI [ "signal to send" ] ++.RI [ options ] ++.I process selection criteria ++.br ++.B snice ++.RI [ "new priority" ] ++.RI [ options ] ++.I process selection criteria + + .SH DESCRIPTION + These tools are probably obsolete and unportable. The command + syntax is poorly defined. Consider using the killall, pkill, + and pgrep commands instead. + +-The default signal for skill is TERM. Use -l or -L to list available signals. ++The default signal for skill is TERM. Use \-l or \-L to list available signals. + Particularly useful signals include HUP, INT, KILL, STOP, CONT, and 0. +-Alternate signals may be specified in three ways: -9 -SIGKILL -KILL. ++Alternate signals may be specified in three ways: \-9 \-SIGKILL \-KILL. + + The default priority for snice is +4. (snice +4 ...) +-Priority numbers range from +20 (slowest) to -20 (fastest). ++Priority numbers range from +20 (slowest) to \-20 (fastest). + Negative priority numbers are restricted to administrative users. + + .SH "GENERAL OPTIONS" + .TS +-l l l. +--f fast mode This is not currently useful. +--i interactive use T{ +-You will be asked to approve each action. +-T} +--v verbose output T{ +-Display information about selected processes. +-T} +--w warnings enabled This is not currently useful. +--n no action This only displays the process ID. +--V show version Displays version of program. ++lB l l. ++\-f fast mode This is not currently useful. ++\-i interactive use You will be asked to approve each action. ++\-v verbose output Display information about selected processes. ++\-w warnings enabled This is not currently useful. ++\-n no action This only displays the process ID. ++\-V show version Displays version of program. + .TE + + .SH "PROCESS SELECTION OPTIONS" +@@ -49,11 +50,11 @@ + The options below may be used to ensure correct interpretation. + Do not blame Albert for this interesting interface. + .TS +-l l. +--t The next argument is a terminal (tty or pty). +--u The next argument is a username. +--p The next argument is a process ID number. +--c The next argument is a command name. ++lB l. ++\-t The next argument is a terminal (tty or pty). ++\-u The next argument is a username. ++\-p The next argument is a process ID number. ++\-c The next argument is a command name. + .TE + + .SH SIGNALS +@@ -63,7 +64,6 @@ + lB rB lB lB + lfCW r l l. + Name Num Action Description +-.TH + 0 0 n/a exit code indicates if a signal may be sent + ALRM 14 exit + HUP 1 exit +@@ -106,13 +106,19 @@ + Command Description + .TC + snice seti crack +7 Slow down seti and crack +-skill -KILL -v /dev/pts/* Kill users on new-style PTY devices +-skill -STOP viro lm davem Stop 3 users +-snice -17 root bash Give priority to root's shell ++skill \-KILL \-v /dev/pts/* Kill users on new-style PTY devices ++skill \-STOP viro lm davem Stop 3 users ++snice \-17 root bash Give priority to root's shell + .TE + + .SH "SEE ALSO" +-killall(1) pkill(1) kill(1) renice(1) nice(1) signal(7) kill(2) ++.BR killall (1), ++.BR pkill (1), ++.BR kill (1), ++.BR renice (1), ++.BR nice(1), ++.BR kill(2), ++.BR signal(7) + + .SH STANDARDS + No standards apply. --- procps-3.2.7.orig/debian/patches/20_kill.1.dpatch +++ procps-3.2.7/debian/patches/20_kill.1.dpatch @@ -0,0 +1,121 @@ +#! /bin/sh -e +## 20_kill.1.dpatch by Craig Small +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix kill.1 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@ +diff -urNad procps-3.2.7~/kill.1 procps-3.2.7/kill.1 +--- procps-3.2.7~/kill.1 2006-06-26 09:37:50.000000000 +1000 ++++ procps-3.2.7/kill.1 2006-06-26 11:17:34.000000000 +1000 +@@ -10,23 +10,18 @@ + kill \- send a signal to a process + + .SH SYNOPSIS +-.TS +-l l. +-kill pid ... Send SIGTERM to every process listed. +-kill -signal pid ... Send a signal to every process listed. +-kill -s signal pid ... Send a signal to every process listed. +-kill -l List all signal names. +-kill -L List all signal names in a nice table. +-kill -l signal Convert a signal number into a name. +-kill -V,--version Show version of program +-.TE ++\fBkill\fR [ \-\fBsignal\fR | \-s \fBsignal\fR ] \fBpid\fR ... ++.br ++\fBkill\fR [ \-L | -V, \-\-version ] ++.br ++\fBkill\fR \-l [ \fBsignal\fR ] + + .SH DESCRIPTION +-The default signal for kill is TERM. Use -l or -L to list available signals. ++The default signal for kill is TERM. Use \-l or \-L to list available signals. + Particularly useful signals include HUP, INT, KILL, STOP, CONT, and 0. +-Alternate signals may be specified in three ways: -9 -SIGKILL -KILL. ++Alternate signals may be specified in three ways: \-9 \-SIGKILL \-KILL. + Negative PID values may be used to choose whole process groups; see the +-PGID column in ps command output. A PID of -1 is special; it indicates ++PGID column in ps command output. A PID of \-1 is special; it indicates + all processes except the kill process itself and init. + + .SH SIGNALS +@@ -37,7 +32,6 @@ + lB rB lB lB + lfCW r l l. + Name Num Action Description +-.TH + 0 0 n/a exit code indicates if a signal may be sent + ALRM 14 exit + HUP 1 exit +@@ -79,36 +73,30 @@ + the conflict. + + .SH EXAMPLES +- +-.SS +-.B "kill -9 -1" +-.nf ++.TP ++.B kill \-9 \-1 + Kill all processes you can kill. +-.fi +-.PP +-.SS +-.B "kill -l 11" +-.nf ++.TP ++.B kill \-l 11 + Translate number 11 into a signal name. +-.fi +-.PP +-.SS +-.B "kill -L" +-.nf ++.TP ++.B kill -L + List the available signal choices in a nice table. +-.fi +-.PP +-.SS +-.B "kill 123 543 2341 3453" +-.nf ++.TP ++.B kill 123 543 2341 3453 + Send the default signal, SIGTERM, to all those processes. +-.fi +-.PP ++ + .SH "SEE ALSO" +-pkill(1) skill(1) kill(2) renice(1) nice(1) signal(7) killall(1) ++.BR pkill (1), ++.BR skill (1), ++.BR kill (2), ++.BR renice (1), ++.BR nice (1), ++.BR signal (7), ++.BR killall (1). + + .SH STANDARDS +-This command meets appropriate standards. The -L flag is Linux-specific. ++This command meets appropriate standards. The \-L flag is Linux-specific. + + .SH AUTHOR + Albert Cahalan wrote kill in 1999 to replace a --- procps-3.2.7.orig/debian/patches/20_Makefile_lib64.dpatch +++ procps-3.2.7/debian/patches/20_Makefile_lib64.dpatch @@ -0,0 +1,44 @@ +#! /bin/sh -e +## 20_Makefile_lib64.dpatch by Craig Small +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Removed entry about /lib64 as it breaks the sparc + +[ -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/Makefile.orig Thu Apr 1 22:07:46 2004 ++++ procps/Makefile Thu Apr 1 22:08:31 2004 +@@ -31,7 +31,7 @@ + install := install -D --owner 0 --group 0 + + # Lame x86-64 /lib64 and /usr/lib64 abomination: +-lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++lib64 := lib + + usr/bin := $(DESTDIR)/usr/bin/ + bin := $(DESTDIR)/bin/ +@@ -110,7 +110,7 @@ + ALL_CFLAGS += $(call check_gcc,-Wpadded,) + + # Be 64-bit if at all possible. +-ALL_CFLAGS += $(call check_gcc,-m64,) ++#ALL_CFLAGS += $(call check_gcc,-m64,) + + endif + endif --- procps-3.2.7.orig/debian/patches/10_vmstat.8.dpatch +++ procps-3.2.7/debian/patches/10_vmstat.8.dpatch @@ -0,0 +1,76 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_vmstat.8.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad procps-3.2.7~/vmstat.8 procps-3.2.7/vmstat.8 +--- procps-3.2.7~/vmstat.8 2006-06-25 16:41:48.000000000 +1000 ++++ procps-3.2.7/vmstat.8 2006-06-26 12:47:08.000000000 +1000 +@@ -35,19 +35,19 @@ + The process and memory reports are instantaneous in either case. + + .SS Options +-The \fB-a\fP switch displays active/inactive memory, given a 2.5.41 kernel or better. ++The \fB\-a\fP switch displays active/inactive memory, given a 2.5.41 kernel or better. + .PP +-The \fB-f\fP switch displays the number of forks since boot. ++The \fB\-f\fP switch displays the number of forks since boot. + This includes the fork, vfork, and clone system calls, and is + equivalent to the total number of tasks created. Each process + is represented by one or more tasks, depending on thread usage. + This display does not repeat. + .PP +-The \fB-m\fP displays slabinfo. ++The \fB\-m\fP displays slabinfo. + .PP +-The \fB-n\fP switch causes the header to be displayed only once rather than periodically. ++The \fB\-n\fP switch causes the header to be displayed only once rather than periodically. + .PP +-The \fB-s\fP switch displays a table of various event counters ++The \fB\-s\fP switch displays a table of various event counters + and memory statistics. This display does not repeat. + .PP + .I delay +@@ -58,13 +58,13 @@ + is the number of updates. If no count is specified and delay is + defined, \fIcount\fP defaults to infinity. + .PP +-The \fB-d\fP reports disk statistics (2.5.70 or above required) ++The \fB\-d\fP reports disk statistics (2.5.70 or above required) + .PP +-The \fB-p\fP followed by some partition name for detailed statistics (2.5.70 or above required) ++The \fB\-p\fP followed by some partition name for detailed statistics (2.5.70 or above required) + .PP +-The \fB-S\fP followed by k or K or m or M switches outputs between 1000, 1024, 1000000, or 1048576 bytes ++The \fB\-S\fP followed by k or K or m or M switches outputs between 1000, 1024, 1000000, or 1048576 bytes + .PP +-The \fB-V\fP switch results in displaying version information. ++The \fB\-V\fP switch results in displaying version information. + .PP + .SH FIELD DESCRIPTION FOR VM MODE + .SS +@@ -81,8 +81,8 @@ + free: the amount of idle memory. + buff: the amount of memory used as buffers. + cache: the amount of memory used as cache. +-inact: the amount of inactive memory. (-a option) +-active: the amount of active memory. (-a option) ++inact: the amount of inactive memory. (\-a option) ++active: the amount of active memory. (\-a option) + .fi + .PP + .SS +@@ -110,9 +110,9 @@ + .B "CPU " + These are percentages of total CPU time. + .nf +-us: Time spent running non-kernel code. (user time, including nice time) ++us: Time spent running non\-kernel code. (user time, including nice time) + sy: Time spent running kernel code. (system time) +-id: Time spent idle. Prior to Linux 2.5.41, this includes IO-wait time. ++id: Time spent idle. Prior to Linux 2.5.41, this includes IO\-wait time. + wa: Time spent waiting for IO. Prior to Linux 2.5.41, included in idle. + st: Time stolen from a virtual machine. Prior to Linux 2.6.11, unknown. + --- procps-3.2.7.orig/debian/patches/30_top.1_cpustate.dpatch +++ procps-3.2.7/debian/patches/30_top.1_cpustate.dpatch @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_top.1_cpustate.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: top CPU state descriptions + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./top.1 /tmp/dpep-work.9EV6k0/procps-3.2.6/top.1 +--- ./top.1 2005-10-30 13:37:43.000000000 +1100 ++++ /tmp/dpep-work.9EV6k0/procps-3.2.6/top.1 2005-10-31 09:24:14.000000000 +1100 +@@ -533,6 +533,37 @@ + upper case\fR letter and to the\fB right\fR with the\fB lower case\fR + letter. + ++.\" ...................................................................... ++.SS 2c. CPU States ++.\" ---------------------------------------------------------------------- ++The CPU states are shown in the Summary Area. They are always shown as a ++percentage and are for the time between now and the last refresh. ++ ++.TP 3 ++\fB us\fR \*(EM User CPU time ++The time the CPU has spent running users' processes that are not ++niced. ++ ++.TP 3 ++\fB sy\fR \*(EM System CPU time ++The time the CPU has spent running the kernel and its processes. ++ ++.TP 3 ++\fB ni\fR \*(EM Nice CPU time ++The time the CPU has spent running users' proccess that have been ++niced. ++ ++.TP 3 ++\fB wa\fR \*(EM iowait ++Amount of time the CPU has been waiting for I/O to complete. ++ ++.TP 3 ++\fB hi\fR \*(EM Hardware IRQ ++The amount of time the CPU has been servicing hardware interrupts. ++ ++.TP 3 ++\fB si\fR \*(EM Software Interrupts ++The amount of time the CPU has been servicing software interrupts. + + .\" ---------------------------------------------------------------------- + .SH 3. INTERACTIVE Commands --- procps-3.2.7.orig/debian/patches/30_w-columns.dpatch +++ procps-3.2.7/debian/patches/30_w-columns.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_w-columns.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use COLUMNS environment if TIOCGWINSZ fails + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./w.c /tmp/dpep-work.0retPU/procps-3.2.6/w.c +--- ./w.c 2005-10-31 12:41:33.000000000 +1100 ++++ /tmp/dpep-work.0retPU/procps-3.2.6/w.c 2005-10-31 12:41:55.000000000 +1100 +@@ -231,10 +231,10 @@ + + /***** main */ + int main(int argc, char **argv) { +- char *user = NULL; ++ char *user = NULL, *p; + utmp_t *u; + struct winsize win; +- int header=1, longform=1, from=1, args, maxcmd=80, ch; ++ int header=1, longform=1, from=1, args, maxcmd, ch; + + #ifndef W_SHOWFROM + from = 0; +@@ -267,6 +267,10 @@ + + if (ioctl(1, TIOCGWINSZ, &win) != -1 && win.ws_col > 0) + maxcmd = win.ws_col; ++ else if (p = getenv("COLUMNS")) ++ maxcmd = atoi(p); ++ else ++ maxcmd = 80; + if (maxcmd < 71) { + fprintf(stderr, "%d column window is too narrow\n", maxcmd); + exit(1); --- procps-3.2.7.orig/debian/patches/10_ps.1.dpatch +++ procps-3.2.7/debian/patches/10_ps.1.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_ps.1.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: ps.1 normal indent widths + +@DPATCH@ +diff -urNad procps-3.2.7~/ps/ps.1 procps-3.2.7/ps/ps.1 +--- procps-3.2.7~/ps/ps.1 2006-06-26 09:45:43.000000000 +1000 ++++ procps-3.2.7/ps/ps.1 2006-06-26 12:11:58.000000000 +1000 +@@ -18,12 +18,6 @@ + .nh + .if n .ss 12 0 + .\" +-.\" See /usr/share/groff/current/tmac/an-old.tmac for what these do. +-.\" Setting them to zero provides extra space, but only do that for +-.\" plain text output. PostScript and such will remain indented. +-.if n .nr IN 0n +-.if n .nr an-prevailing-indent 0n +-.\" + .\" + .\" ColSize is used for the format spec table. + .\" It's the left margin, minus the right, minus --- procps-3.2.7.orig/debian/patches/30_tload_no_optargs.dpatch +++ procps-3.2.7/debian/patches/30_tload_no_optargs.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh -e +## 30_tload_no_optargs.dpatch by Craig Small +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Removed unneeded optarg and optind variables form tload.c + +[ -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.2.0.orig/tload.c ++++ procps-3.2.0/tload.c +@@ -30,9 +30,6 @@ + static int dly=5; + static jmp_buf jb; + +-extern int optind; +-extern char *optarg; +- + static void alrm(int signo) + { + (void)signo; --- procps-3.2.7.orig/debian/patches/40_pgrep_coption.dpatch +++ procps-3.2.7/debian/patches/40_pgrep_coption.dpatch @@ -0,0 +1,78 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40_pgrep-coption.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: c option for pgrep for counting number of matched proceesses + +@DPATCH@ +diff -urNad procps-3.2.7~/pgrep.1 procps-3.2.7/pgrep.1 +--- procps-3.2.7~/pgrep.1 2006-06-29 09:04:01.000000000 +1000 ++++ procps-3.2.7/pgrep.1 2006-06-29 09:35:51.000000000 +1000 +@@ -41,6 +41,9 @@ + \-c + Suppress normal output; instead print a count of matching processes. + .TP ++\-c ++Suppress normal output; instead print a count of matching processes. ++.TP + \-d \fIdelimiter\fP + Sets the string used to delimit each process ID in the output (by + default a newline). (\fBpgrep\fP only.) +diff -urNad procps-3.2.7~/pgrep.c procps-3.2.7/pgrep.c +--- procps-3.2.7~/pgrep.c 2006-06-29 09:35:51.000000000 +1000 ++++ procps-3.2.7/pgrep.c 2006-06-29 10:02:27.000000000 +1000 +@@ -54,6 +54,7 @@ + static int opt_newest = 0; + static int opt_negate = 0; + static int opt_exact = 0; ++static int opt_count = 0; + static int opt_signal = SIGTERM; + static int opt_lock = 0; + static int opt_case = 0; +@@ -77,7 +78,7 @@ + if (i_am_pkill) + fprintf (stderr, "Usage: pkill [-SIGNAL] [-fvx] "); + else +- fprintf (stderr, "Usage: pgrep [-flvx] [-d DELIM] "); ++ fprintf (stderr, "Usage: pgrep [-cflvx] [-d DELIM] "); + fprintf (stderr, "[-n|-o] [-P PPIDLIST] [-g PGRPLIST] [-s SIDLIST]\n" + "\t[-u EUIDLIST] [-U UIDLIST] [-G GIDLIST] [-t TERMLIST] " + "[PATTERN]\n"); +@@ -562,7 +563,7 @@ + strcat (opts, "ld:"); + } + +- strcat (opts, "LF:fnovxP:g:s:u:U:G:t:?V"); ++ strcat (opts, "LF:cfnovxP:g:s:u:U:G:t:?V"); + + while ((opt = getopt (argc, argv, opts)) != -1) { + switch (opt) { +@@ -610,6 +611,9 @@ + exit(EXIT_SUCCESS); + // case 'c': // Solaris: match by contract ID + // break; ++ case 'c': ++ opt_count = 1; ++ break; + case 'd': // Solaris: change the delimiter + opt_delim = strdup (optarg); + break; +@@ -721,10 +725,14 @@ + procs[i].num, strerror (errno)); + } + } else { +- if (opt_long) +- output_strlist(procs,num); +- else +- output_numlist(procs,num); ++ if (opt_count) { ++ fprintf(stdout, "%ld\n", num); ++ } else { ++ if (opt_long) ++ output_strlist (procs,num); ++ else ++ output_numlist (procs,num); ++ } + } + return !num; // exit(EXIT_SUCCESS) if match, otherwise exit(EXIT_FAILURE) + } --- procps-3.2.7.orig/debian/patches/10_uptime.1.dpatch +++ procps-3.2.7/debian/patches/10_uptime.1.dpatch @@ -0,0 +1,50 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_uptime.1.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cleanup uptime man page #282168 + +@DPATCH@ +diff -urNad procps-3.2.7~/uptime.1 procps-3.2.7/uptime.1 +--- procps-3.2.7~/uptime.1 2006-06-26 09:37:50.000000000 +1000 ++++ procps-3.2.7/uptime.1 2006-06-26 12:45:06.000000000 +1000 +@@ -6,7 +6,8 @@ + .SH SYNOPSIS + .B uptime + .br +-.BR uptime " [" "\-V" ] ++.B uptime ++.RB [ \-V ] + .SH DESCRIPTION + .B uptime + gives a one line display of the following information. +@@ -14,13 +15,25 @@ + how long the system has been running, + how many users are currently logged on, + and the system load averages for the past 1, 5, and 15 minutes. +-.sp ++ + This is the same information contained in the header line displayed by + .BR w (1). ++.sp ++System load averages is the average number of processes that are either ++in a runnable or uninterruptable state. A process in a runnable state is ++either using the CPU or waiting to use the CPU. A process in ++uninterruptable state is waiting for some I/O access, eg waiting for ++disk. The averages are taken over the three time intervals. ++Load averages are not normalized for the number of CPUs in a system, so ++a load average of 1 means a single CPU system is loaded all the time ++while on a 4 CPU system it means it was idle 75% of the time. + .SH FILES +-.IR /var/run/utmp " information about who is currently logged on" +-.br +-.IR /proc " process information" ++.TP ++.I /var/run/utmp ++information about who is currently logged on ++.TP ++.I /proc ++process information + .SH AUTHORS + .B uptime + was written by Larry Greenfield and --- procps-3.2.7.orig/debian/patches/10_slabtop.dpatch +++ procps-3.2.7/debian/patches/10_slabtop.dpatch @@ -0,0 +1,99 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_slabtop.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cleanup slabtop man page #282168 + +@DPATCH@ +diff -urNad procps-3.2.7~/slabtop.1 procps-3.2.7/slabtop.1 +--- procps-3.2.7~/slabtop.1 2006-06-18 15:10:24.000000000 +1000 ++++ procps-3.2.7/slabtop.1 2006-06-26 12:31:42.000000000 +1000 +@@ -7,36 +7,39 @@ + slabtop \- display kernel slab cache information in real time + + .SH SYNOPSIS +-.BI "slabtop [ " options " ] " ++.B slabtop ++.RI [ options ] + + .SH DESCRIPTION +-.BR slabtop (1) ++.B slabtop + displays detailed kernel slab cache information in real time. It displays a + listing of the top caches sorted by one of the listed sort criteria. It also + displays a statistics header filled with slab layer information. + + .SH OPTIONS + Normal invocation of +-.BR slabtop (1) ++.B slabtop + does not require any options. The behavior, however, can be fine-tuned by + specifying one or more of the following flags: + .TP +-.B \-\^\-delay=n, \-d n +-Refresh the display every n seconds. By default, +-.BR slabtop (1) ++.B \-\-delay=\fIn\fR, \fB\-d \fIn ++Refresh the display every ++.I n ++in seconds. By default, ++.B slabtop + refreshes the display every three seconds. To exit the program, hit + .BR q. + .TP +-.B \-\^\-sort=S, \-s S +-Sort by S, where S is one of the sort criteria. ++.B \-\-sort=\fIS\fR, \fB\-s\fR \fIS ++Sort by \fIS\fR, where \fIS\fR is one of the sort criteria. + .TP +-.B \-\^\-once, \-o ++.B \-\-once\fR, \fB\-o + Display the output once and then exit. + .TP +-.B \-\^\-version, \-V ++.B \-\-version\fR, \fB\-V + Display version information and exit. + .TP +-.B \-\^\-help ++.B \-\-help + Display usage information and exit. + + .SH SORT CRITERIA +@@ -78,7 +81,7 @@ + sort by cache utilization + + .SH COMMANDS +-.BR slabtop (1) ++.B slabtop + accepts keyboard commands from the user during use. The following are + supported. In the case of letters, both cases are accepted. + +@@ -94,7 +97,9 @@ + Quit the program. + + .SH FILES +-.IR /proc/slabinfo " \-\- slab information" ++.TP ++.I /proc/slabinfo ++slab information + + .SH "SEE ALSO" + .BR free (1), +@@ -104,7 +109,7 @@ + + .SH NOTES + Currently, +-.BR slabtop (1) ++.B slabtop + requires a 2.4 or later kernel (specifically, a version 1.1 or later + .IR /proc/slabinfo ). + Kernel 2.2 should be supported in the future. +@@ -116,7 +121,7 @@ + .SH AUTHORS + Written by Chris Rivera and Robert Love. + +-.BR slabtop (1) ++.B slabtop + was inspired by Martin Bligh's perl script, + .BR vmtop . + The procps package is maintained by Albert Cahalan . --- procps-3.2.7.orig/debian/patches/20_top_manpage.dpatch +++ procps-3.2.7/debian/patches/20_top_manpage.dpatch @@ -0,0 +1,382 @@ +#! /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 +## DP: Fix page fault description because storage may not be disk + +[ -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 -urNad procps-3.2.7~/top.1 procps-3.2.7/top.1 +--- procps-3.2.7~/top.1 2006-06-26 10:37:56.000000000 +1000 ++++ procps-3.2.7/top.1 2006-06-26 10:48:23.000000000 +1000 +@@ -190,7 +190,7 @@ + 'I' - Irix mode On\ \ (no, 'solaris' smp) + * 'p' - PID monitoring Off + * 's' - Secure mode Off (unsecured) +- 'B' - Bold disable Off ++ 'B' - Bold enable Off + \fISummary_Area_defaults\fR + 'l' - Load Avg/Uptime On\ \ (thus program name) + 't' - Task/Cpu states On\ \ (1+1 lines, see '1') +@@ -436,8 +436,8 @@ + The number of\fB major\fR page faults that have occurred for a task. + A page fault occurs when a process attempts to read from or write to a virtual + page that is not currently present in its address space. +-A major page fault is when disk access is involved in making that +-page available. ++A major page fault is when backing storage access (such as a disk) is involved ++in making that page available. + + .TP 3 + v:\fB nDRT\fR \*(EM Dirty Pages count +@@ -504,7 +504,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. + +@@ -580,7 +580,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. +@@ -589,7 +589,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. +@@ -599,13 +599,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 +@@ -617,7 +617,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. + +@@ -631,32 +631,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. +@@ -667,24 +667,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. +@@ -700,25 +700,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. +@@ -750,12 +750,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 +@@ -765,7 +765,7 @@ + visual reminder. + + .TP 7 +-\ \ \'\fBy\fR\' :\fIRow_Highlight_toggle\fR ++\ \ \<\fBy\fR\> :\fIRow_Highlight_toggle\fR + Changes highlighting for "running" tasks. + For additional insight into this task state, \*(Xt 2a. DESCRIPTIONS of Fields, + Process Status. +@@ -774,7 +774,7 @@ + The only costs will be a few additional tty escape sequences. + + .TP 7 +-\ \ \'\fBz\fR\' :\fIColor/Monochrome_toggle\fR ++\ \ \<\fBz\fR\> :\fIColor/Monochrome_toggle\fR + Switches the \*(CW between your last used color scheme and the older form + of black-on-white or white-on-black. + This command will alter\fB both\fR the \*(SA and \*(TA but does not affect the +@@ -785,20 +785,20 @@ + .B CONTENT\fR of \*(TW + .PD 0 + .TP 7 +-\ \ \'\fBc\fR\' :\fICommand_Line/Program_Name_toggle\fR ++\ \ \<\fBc\fR\> :\fICommand_Line/Program_Name_toggle\fR + This command will be honored whether or not the 'Command' column + is currently visible. + Later, should that field come into view, the change you applied will be seen. + + .TP 7 +-\ \ \'\fBf\fR\' and \'\fBo\fR\' :\fIFields_select\fR or \fIOrder_fields\fR ++\ \ \<\fBf\fR\> and \<\fBo\fR\> :\fIFields_select\fR or \fIOrder_fields\fR + These keys display separate screens where you can change which + fields are displayed and their order. + For additional information on these \*(CIs + \*(Xt 2b. SELECTING and ORDERING Columns. + + .TP 7 +-\ \ \'\fBH\fR\' :\fIThreads_toggle\fR ++\ \ \<\fBS\fR\> :\fICumulative_Time_Mode_toggle\fR + When this toggle is \*O, all individual threads will be displayed. Otherwise, \*(Me displays a summation of all threads in a process. + + .TP 7 +@@ -818,7 +818,7 @@ + effect, simply ask for help and view the window summary on the second line. + + .TP 7 +-\ \ \'\fBu\fR\' :\fIShow_Specific_User_Only\fR ++\ \ \<\fBu\fR\> :\fIShow_Specific_User_Only\fR + You will be prompted to enter the name of the user to display. + Thereafter, in that \*(TW only matching User ID's will be shown, or possibly + no tasks will be shown. +@@ -831,7 +831,7 @@ + .B SIZE\fR of \*(TW + .PD 0 + .TP 7 +-\ \ \'\fBi\fR\' :\fIIdle_Processes_toggle\fR ++\ \ \<\fBi\fR\> :\fIIdle_Processes_toggle\fR + Displays all tasks or just active tasks. + When this toggle is \*F, idled or zombied processes will not be displayed. + +@@ -839,7 +839,7 @@ + affect the window's size, as all prior \*(TDs will have already been painted. + + .TP 7 +-\ \ \'\fBn\fR\' or \'#\' :\fISet_Maximum_Tasks\fR ++\ \ \<\fBn\fR\> or \<\fB#\fR\> :\fISet_Maximum_Tasks\fR + You will be prompted to enter the number of tasks to display. + The lessor of your number and available screen rows will be used. + +@@ -878,12 +878,12 @@ + .in + + .TP 7 +-\ \ \'\fB<\fR\' :\fIMove_Sort_Field_Left\fR ++\ \ \<\fB<\fR\> :\fIMove_Sort_Field_Left\fR + Moves the sort column to the left unless the current sort field is + the first field being displayed. + + .TP 7 +-\ \ \'\fB>\fR\' :\fIMove_Sort_Field_Right\fR ++\ \ \<\fB>\fR\> :\fIMove_Sort_Field_Right\fR + Moves the sort column to the right unless the current sort field is + the last field being displayed. + +@@ -894,7 +894,7 @@ + .in + + .TP 7 +-\ \ \'\fBF\fR\' or \'\fBO\fR\' :\fISelect_Sort_Field\fR ++\ \ \<\fBF\fR\> or \<\fBO\fR\> :\fISelect_Sort_Field\fR + These keys display a separate screen where you can change which field + is used as the sort column. + +@@ -907,7 +907,7 @@ + when running \*(Me with column highlighting turned \*F. + + .TP 7 +-\ \ \'\fBR\fR\' :\fIReverse/Normal_Sort_Field_toggle\fR ++\ \ \<\fBR\fR\> :\fIReverse/Normal_Sort_Field_toggle\fR + Using this \*(CI you can alternate between high-to-low and low-to-high sorts. + + .PP +@@ -984,7 +984,7 @@ + .\" ...................................................................... + .SS 4b. COMMANDS for Windows + .TP 7 +-\ \ \'\fB-\fR\' and \'\fB_\fR\' :\fIShow/Hide_Window(s)_toggles\fR ++\ \ \<\fB-\fR\> and \<\fB_\fR\> :\fIShow/Hide_Window(s)_toggles\fR + The '-' key turns the \*(CW's \*(TD \*O and \*F. + When \*O, that \*(TA will show a minimum of the columns header you've + established with the 'f' and 'o' commands. +@@ -998,7 +998,7 @@ + as the only display element. + + .TP 7 +-*\ \'\fB=\fR\' and \'\fB+\fR\' :\fIEqualize_(re-balance)_Window(s)\fR ++*\ \<\fB=\fR\> and \<\fB+\fR\> :\fIEqualize_(re-balance)_Window(s)\fR + The '=' key forces the \*(CW's \*(TD to be visible. + It also reverses any 'i' (idle tasks) and 'n' (max tasks) commands that might + be active. +@@ -1009,7 +1009,7 @@ + except for the 'i' (idle tasks) and 'n' (max tasks) commands. + + .TP 7 +-*\ \'\fBA\fR\' :\fIAlternate_Display_Mode_toggle\fR ++*\ \<\fBA\fR\> :\fIAlternate_Display_Mode_toggle\fR + This command will switch between \*(FM and \*(AM. + + The first time you issue this command, all four \*(TDs will be shown. +@@ -1017,7 +1017,7 @@ + chosen to make visible. + + .TP 7 +-*\ \'\fBa\fR\' and \'\fBw\fR\' :\fINext_Window_Forward/Backward\fR ++*\ \<\fBa\fR\> and \<\fBw\fR\> :\fINext_Window_Forward/Backward\fR + This will change the \*(CW, which in turn changes the window to which + commands are directed. + These keys act in a circular fashion so you can reach any desired \*(CW +@@ -1028,7 +1028,7 @@ + the \*(TD is \*F and many commands will be restricted. + + .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. + +@@ -1037,15 +1037,15 @@ + commands. + + .TP 7 +-\ \ \'\fBg\fR\' :\fIChange_Window/Field_Group_Name\fR ++\ \ \<\fBg\fR\> :\fIChange_Window/Field_Group_Name\fR + You will be prompted for a new name to be applied to the \*(CW. + It does not require that the window name be visible + (the 'l' toggle to be \*O). + + .IP "*" 3 + The \*(CIs shown with an \*(AS have use beyond \*(AM. +- \'=', 'A', 'G' are always available +- \'a', 'w' act the same when color mapping ++ '=', 'A', 'G' are always available ++ 'a', 'w' act the same when color mapping + + + .\" ---------------------------------------------------------------------- --- procps-3.2.7.orig/debian/patches/50_pgrep.1.dpatch +++ procps-3.2.7/debian/patches/50_pgrep.1.dpatch @@ -0,0 +1,193 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_pgrep.1.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cleanup pgrep manual page #282168 + +@DPATCH@ +diff -urNad procps-3.2.7~/pgrep.1 procps-3.2.7/pgrep.1 +--- procps-3.2.7~/pgrep.1 2006-06-26 11:32:41.000000000 +1000 ++++ procps-3.2.7/pgrep.1 2006-06-26 11:44:01.000000000 +1000 +@@ -7,30 +7,35 @@ + pgrep, pkill \- look up or signal processes based on name and other attributes + + .SH SYNOPSIS +-pgrep [\-flvx] [\-d \fIdelimiter\fP] [\-n|\-o] [\-P \fIppid\fP,...] [\-g \fIpgrp\fP,...] +-.br +- [\-s \fIsid\fP,...] [\-u \fIeuid\fP,...] [\-U \fIuid\fP,...] [\-G \fIgid\fP,...] +-.br +- [\-t \fIterm\fP,...] [\fIpattern\fP] ++.HA ++.na ++\fBpgrep\fR [\fB\-flvx\fR] [\fB\-d\ \fIdelimiter\fR] [\fB\-n\fR|\fB\-o\fR] \ ++[\fB\-P\ \fIppid\fR,...] [\fB\-g\ \fIpgrp\fR,...] [\fB\-s\ \fIsid\fR,...] \ ++[\fB\-u\ \fIeuid\fR,...] [\fB\-U\ \fIuid\fR,...] [\fB\-G\ \fIgid\fR,...] \ ++[\fB\-t\ \fIterm\fR,...] [\fIpattern\fR] + +-pkill [\-\fIsignal\fP] [\-fvx] [\-n|\-o] [\-P \fIppid\fP,...] [\-g \fIpgrp\fP,...] +-.br +- [\-s \fIsid\fP,...] [\-u \fIeuid\fP,...] [\-U \fIuid\fP,...] [\-G \fIgid\fP,...] +-.br +- [\-t \fIterm\fP,...] [\fIpattern\fP] ++.HP ++\fBpkill\fR [\fB\-\fIsignal\fR] [\fB\-fvx\fR] [\fB\-n\fR|\fB\-o\fR] \ ++[\fB\-P\ \fIppid\fR,...] [\fB\-g\ \fIpgrp\fR,...] [\fB\-s\ \fIsid\fR,...] \ ++[\fB\-u\ \fIeuid\fR,...] [\fB\-U\ \fIuid\fR,...] [\fB\-G\ \fIgid\fR,...] \ ++[\fB\-t\ \fIterm\fR,...] [\fIpattern\fR] + + .SH DESCRIPTION + \fBpgrep\fP looks through the currently running processes and lists the + process IDs which matches the selection criteria to stdout. All + the criteria have to match. For example, + +-pgrep -u root sshd ++.IP ++$ pgrep \-u root sshd + ++.PP + will only list the processes called \fBsshd\fP AND owned by \fBroot\fP. + On the other hand, + +-pgrep -u root,daemon ++.IP ++$ pgrep \-u root,daemon + ++.PP + will list the processes owned by \fBroot\fP OR \fBdaemon\fP. + + \fBpkill\fP will send the specified signal (by default \fBSIGTERM\fP) +@@ -38,18 +43,18 @@ + + .SH OPTIONS + .TP +-\-c ++\fB\-c\fR + Suppress normal output; instead print a count of matching processes. + .TP +-\-d \fIdelimiter\fP ++\fB\-d \fIdelimiter\fP + Sets the string used to delimit each process ID in the output (by + default a newline). (\fBpgrep\fP only.) + .TP +-\-f ++\fB\-f\fR + The \fIpattern\fP is normally only matched against the process name. +-When \-f is set, the full command line is used. ++When \fB\-f\fR is set, the full command line is used. + .TP +-\-g \fIpgrp\fP,... ++\fB\-g \fIpgrp\fP,... + Only match processes in the process group IDs listed. Process group 0 + is translated into \fBpgrep\fP's or \fBpkill\fP's own process group. + .TP +@@ -57,40 +62,40 @@ + Only match processes whose real group ID is listed. Either the + numerical or symbolical value may be used. + .TP +-\-l ++\fB\-l\fR + List the process name as well as the process ID. (\fBpgrep\fP only.) + .TP +-\-n ++\fB\-n\fR + Select only the newest (most recently started) of the matching + processes. + .TP +-\-o ++\fB\-o\fR + Select only the oldest (least recently started) of the matching + processes. + .TP +-\-P \fIppid\fP,... ++\fB\-P \fIppid\fP,... + Only match processes whose parent process ID is listed. + .TP +-\-s \fIsid\fP,... ++\fB\-s \fIsid\fP,... + Only match processes whose process session ID is listed. Session ID 0 + is translated into \fBpgrep\fP's or \fBpkill\fP's own session ID. + .TP +-\-t \fIterm\fP,... ++\fB\-t \fIterm\fP,... + Only match processes whose controlling terminal is listed. The + terminal name should be specified without the "/dev/" prefix. + .TP +-\-u \fIeuid\fP,... ++\fB\-u \fIeuid\fP,... + Only match processes whose effective user ID is listed. Either the + numerical or symbolical value may be used. + .TP +-\-U \fIuid\fP,... ++\fB\-U \fIuid\fP,... + Only match processes whose real user ID is listed. Either the + numerical or symbolical value may be used. + .TP +-\-v ++\fB\-v\fR + Negates the matching. + .TP +-\-x ++\fB\-x\fR + Only match processes whose name (or command line if \-f is specified) + \fBexactly\fP match the \fIpattern\fP. + .TP +@@ -107,32 +112,40 @@ + .SH EXAMPLES + Example 1: Find the process ID of the \fBnamed\fP daemon: + +-unix$ pgrep \-u root named ++.IP ++$ pgrep \-u root named + ++.PP + Example 2: Make \fBsyslog\fP reread its configuration file: + +-unix$ pkill \-HUP syslogd ++.IP ++$ pkill \-HUP syslogd + ++.PP + Example 3: Give detailed information on all \fBxterm\fP processes: + +-unix$ ps \-fp $(pgrep \-d, \-x xterm) ++.IP ++$ ps \-fp $(pgrep \-d, \-x xterm) + ++.PP + Example 4: Make all \fBnetscape\fP processes run nicer: + +-unix$ renice +4 `pgrep netscape` ++.IP ++$ renice +4 `pgrep netscape` + + .SH "EXIT STATUS" ++.PD 0 + .TP +-.I "0" ++.I 0 + One or more processes matched the criteria. + .TP +-.I "1" ++.I 1 + No processes matched. + .TP +-.I "2" ++.I 2 + Syntax error in the command line. + .TP +-.I "3" ++.I 3 + Fatal error: out of memory etc. + + .SH NOTES +@@ -144,8 +157,8 @@ + itself as a match. + + .SH BUGS +-The options \-n and \-o and \-v can not be combined. Let me know if +-you need to do this. ++The options \fB\-n\fP and \fB\-o\fP and \fB\-v\fP can not be combined. ++Let me know if you need to do this. + + Defunct processes are reported. + --- procps-3.2.7.orig/debian/patches/20_watch_8bitchar.dpatch +++ procps-3.2.7/debian/patches/20_watch_8bitchar.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_watch_8bitchar.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad procps-3.2.7~/watch.c procps-3.2.7/watch.c +--- procps-3.2.7~/watch.c 2006-06-17 19:18:38.000000000 +1000 ++++ procps-3.2.7/watch.c 2006-06-26 08:47:57.000000000 +1000 +@@ -297,7 +297,7 @@ + move(y, x); + if (option_differences) { + int oldch = inch(); +- char oldc = oldch & A_CHARTEXT; ++ unsigned char oldc = oldch & A_CHARTEXT; + attr = !first_screen + && (c != oldc + || --- procps-3.2.7.orig/debian/patches/10_watch.1.dpatch +++ procps-3.2.7/debian/patches/10_watch.1.dpatch @@ -0,0 +1,102 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_watch.1.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad procps-3.2.7~/watch.1 procps-3.2.7/watch.1 +--- procps-3.2.7~/watch.1 2003-02-09 18:05:25.000000000 +1100 ++++ procps-3.2.7/watch.1 2006-06-26 12:57:00.000000000 +1000 +@@ -2,44 +2,54 @@ + .SH NAME + watch \- execute a program periodically, showing output fullscreen + .SH SYNOPSIS ++.HA ++.na + .B watch +-.I [\-dhvt] [\-n ] [\-\-differences[=cumulative]] [\-\-help] [\-\-interval=] [\-\-no\-title] [\-\-version] ++.RB [ \-dhvt ] ++.RB [ \-n ++.IR seconds ] ++.RB [ \-\-differences[=\fIcumulative\fP]] ++.RB [ \-\-help ] ++.RB [ \-\-interval=\fIseconds\fP] ++.RB [ \-\-no\-title ] ++.RB [ \-\-version ] ++.I command + .SH DESCRIPTION +-.BR watch ++.B watch + runs + .I command + repeatedly, displaying its output (the first screenfull). This allows you to + watch the program output change over time. By default, the program is run + every 2 seconds; use +-.I -n ++.B \-n + or +-.I --interval ++.B \-\-interval + to specify a different interval. + .PP + The +-.I -d ++.B \-d + or +-.I --differences ++.B \-\-differences + flag will highlight the differences between successive updates. The +-.I --cumulative ++.B \-\-cumulative + option makes highlighting "sticky", presenting a running display of all + positions that have ever changed. The +-.I -t ++.B \-t + or +-.I --no-title ++.B \-\-no\-title + option turns off the header showing the interval, command, and current + time at the top of the display, as well as the following blank line. + .PP +-.BR watch ++.B watch + will run until interrupted. + .SH NOTE + Note that + .I command +-is given to "sh -c" ++is given to "sh \-c" + which means that you may need to use extra quoting to get the desired effect. + .PP + Note that POSIX option processing is used (i.e., option processing stops at +-the first non-option argument). This means that flags after ++the first non\-option argument). This means that flags after + .I command + don't get interpreted by + .BR watch +@@ -61,20 +71,20 @@ + To see the effects of quoting, try these out + .IP + watch echo $$ +-.IP ++.br + watch echo '$$' +-.IP ++.br + watch echo "'"'$$'"'" + .PP + You can watch for your administrator to install the latest kernel with + .IP +-watch uname -r ++watch uname \-r + .PP + (Just kidding.) + .SH BUGS + Upon terminal resize, the screen will not be correctly repainted until the + next scheduled update. All +-.I --differences ++.B \-\-differences + highlighting is lost on that update as well. + .PP + Non-printing characters are stripped from program output. Use "cat -v" as --- procps-3.2.7.orig/debian/patches/50_dev_null_makefile_fix.dpatch +++ procps-3.2.7/debian/patches/50_dev_null_makefile_fix.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## dev_null_makefile_fix.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad procps-3.2.6~/Makefile procps-3.2.6/Makefile +--- procps-3.2.6~/Makefile 2005-10-30 07:27:04.000000000 +0100 ++++ procps-3.2.6/Makefile 2005-12-20 02:57:41.000000000 +0100 +@@ -119,7 +119,7 @@ + # Unlike the kernel one, this check_gcc goes all the way to + # producing an executable. There might be a -m64 that works + # until you go looking for a 64-bit curses library. +-check_gcc = $(shell if $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o /dev/null $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) ++check_gcc = $(shell if $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o will_this_file_really_exist.tmp $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ; rm -f will_this_file_really_exist.tmp) + + # Be 64-bit if at all possible. In a cross-compiling situation, one may + # do "make m64=-m32 lib64=lib" to produce 32-bit executables. DO NOT --- procps-3.2.7.orig/debian/patches/10_tload.1.dpatch +++ procps-3.2.7/debian/patches/10_tload.1.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_tload.1.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad procps-3.2.7~/tload.1 procps-3.2.7/tload.1 +--- procps-3.2.7~/tload.1 2002-10-07 07:26:12.000000000 +1000 ++++ procps-3.2.7/tload.1 2006-06-26 12:44:39.000000000 +1000 +@@ -39,7 +39,7 @@ + .BI "\-d" " delay" + option sets the time argument for an + .BR alarm (2); +-if -d 0 is specified, the alarm is set to 0, which will never send the ++if \-d 0 is specified, the alarm is set to 0, which will never send the + .B SIGALRM + and update the display. + --- procps-3.2.7.orig/debian/patches/10_free.1.dpatch +++ procps-3.2.7/debian/patches/10_free.1.dpatch @@ -0,0 +1,67 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_free.1.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: -g flag documented #286900 +## DP: hypen escaped #282168 + +@DPATCH@ +diff -urNad procps-3.2.7~/free.1 procps-3.2.7/free.1 +--- procps-3.2.7~/free.1 2004-02-24 08:35:55.000000000 +1100 ++++ procps-3.2.7/free.1 2006-06-26 10:56:20.000000000 +1000 +@@ -5,7 +5,7 @@ + .SH NAME + free \- Display amount of free and used memory in the system + .SH SYNOPSIS +-.BR "free " [ "\-b" " | " "\-k" " | " "\-m" "] [" "\-o" "] [" "\-s" ++.BR "free " [ "\-b" " | " "\-k" " | " "\-m" " | " "\-g" "] [" "\-o" "] [" "\-s" + .I delay + .RB "] [" "\-t" "] [" "\-V" ] + .SH DESCRIPTION +@@ -13,32 +13,34 @@ + memory in the system, as well as the buffers used by the kernel. + The shared memory column should be ignored; it is obsolete. + .SS Options +-The \fB-b\fP switch displays the amount of memory in bytes; the +-\fB-k\fP switch (set by default) displays it in kilobytes; the \fB-m\fP +-switch displays it in megabytes. ++The \fB\-b\fP switch displays the amount of memory in bytes; the ++\fB\-k\fP switch (set by default) displays it in kilobytes; the \fB\-m\fP ++switch displays it in megabytes; the \fB\-g\fP switch displays it in ++gigabytes. + .PP +-The \fB-t\fP switch displays a line containing the totals. ++The \fB\-t\fP switch displays a line containing the totals. + .PP +-The \fB-o\fP switch disables the display of a "buffer adjusted" line. +-If the -o option is not specified, \fBfree\fP subtracts buffer memory ++The \fB\-o\fP switch disables the display of a "buffer adjusted" line. ++If the \-o option is not specified, \fBfree\fP subtracts buffer memory + from the used memory and adds it to the free memory reported. + .PP +-The \fB-s\fP switch activates continuous polling \fIdelay\fP seconds apart. You ++The \fB\-s\fP switch activates continuous polling \fIdelay\fP seconds apart. You + may actually specify any floating point number for \fIdelay\fP, + .BR usleep (3) + is used for microsecond resolution delay times. + .PP +-The \fB\-V\fP displays version information. ++The \fB\\-V\fP displays version information. + .SH FILES +-.ta +-.IR /proc/meminfo "\-\- memory information" +-.fi ++.TP ++.I /proc/meminfo ++memory information ++ + + .SH "SEE ALSO" + .BR ps (1), + .BR slabtop (1), + .BR vmstat (8), +-.BR top(1) ++.BR top (1) + + .SH AUTHORS + Written by Brian Edmonds. --- procps-3.2.7.orig/debian/patches/20_module_mk_shared.dpatch +++ procps-3.2.7/debian/patches/20_module_mk_shared.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh -e +## 20_module_mk_shared.dpatch by Craig Small +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Made SHARED variable overwritable + +[ -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 -urNad procps-3.2.7~/proc/module.mk procps-3.2.7/proc/module.mk +--- procps-3.2.7~/proc/module.mk 2006-06-27 08:24:51.000000000 +1000 ++++ procps-3.2.7/proc/module.mk 2006-06-27 08:25:43.000000000 +1000 +@@ -17,7 +17,7 @@ + # numbers for future use, the ELF soname can be set equal to the + # file name until some future date when a stable ABI is declared. + +-SHARED := 1 ++SHARED ?= 1 + + # for lib$(NAME).so and /usr/include/($NAME) and such + NAME := proc --- procps-3.2.7.orig/debian/patches/40_gnu-kbsd-version.dpatch +++ procps-3.2.7/debian/patches/40_gnu-kbsd-version.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40_gnu-kbsd-version.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad procps-3.2.7~/proc/version.c procps-3.2.7/proc/version.c +--- procps-3.2.7~/proc/version.c 2006-06-27 08:55:32.000000000 +1000 ++++ procps-3.2.7/proc/version.c 2006-06-27 09:02:25.000000000 +1000 +@@ -35,15 +35,23 @@ + + static void init_Linux_version(void) __attribute__((constructor)); + static void init_Linux_version(void) { +- static struct utsname uts; + int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ ++ FILE *fp; ++ char buf[256]; + +- if (uname(&uts) == -1) /* failure implies impending death */ +- exit(1); +- if (sscanf(uts.release, "%d.%d.%d", &x, &y, &z) < 3) ++ if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */ ++ exit(1); ++ if (fgets(buf, 256, fp) == NULL) { ++ fprintf(stderr, "Cannot read kernel version from /proc/version\n"); ++ fclose(fp); ++ exit(1); ++ } ++ fclose(fp); ++ if (sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z) < 3) + fprintf(stderr, /* *very* unlikely to happen by accident */ + "Non-standard uts for running kernel:\n" +- "release %s=%d.%d.%d gives version code %d\n", +- uts.release, x, y, z, LINUX_VERSION(x,y,z)); ++ "release %s=%d.%d.%d gives version code %d\n", ++ buf, ++ x, y, z, LINUX_VERSION(x,y,z)); + linux_version_code = LINUX_VERSION(x, y, z); + } --- procps-3.2.7.orig/debian/patches/30_readproc_c.dpatch +++ procps-3.2.7/debian/patches/30_readproc_c.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh -e +## 30_readproc_c.dpatch by Craig Small +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: readproc.c some type conversion help +## DP: return if unable to open /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@ +--- procps-3.2.0.orig/proc/readproc.c ++++ procps-3.2.0/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.2.7.orig/debian/patches/00list +++ procps-3.2.7/debian/patches/00list @@ -0,0 +1,27 @@ +10_free.1 +10_pmap.1 +10_ps.1 +10_skill.1 +10_slabtop +10_sysctl.8 +10_tload.1 +10_uptime.1 +10_vmstat.8 +10_watch.1 +20_kill.1 +20_kill_warncr +20_module_mk_shared +20_top_manpage +30_top.1_cpustate +20_w-bassman +20_watch_8bitchar +30_library_map_freeproc +30_pgrep_start_time +30_readproc_c +30_tload_no_optargs +30_w.1 +30_w-columns +40_gnu-kbsd-version +40_pgrep_coption +50_dev_null_makefile_fix +50_pgrep.1 --- procps-3.2.7.orig/debian/patches/30_pgrep_start_time.dpatch +++ procps-3.2.7/debian/patches/30_pgrep_start_time.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh -e +## 30_pgrep_start_time.dpatch by Craig Small +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: pgrep.c saved_start_time was missed + +[ -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.2.0.orig/pgrep.c ++++ procps-3.2.0/pgrep.c +@@ -367,7 +367,8 @@ + preg = do_regcomp (); + + if (opt_newest) saved_start_time = 0ULL; +- if (opt_oldest) saved_start_time = ~0ULL; ++ else ++ saved_start_time = ~0ULL; + if (opt_newest) saved_pid = 0; + if (opt_oldest) saved_pid = INT_MAX; + --- procps-3.2.7.orig/debian/patches/10_sysctl.8.dpatch +++ procps-3.2.7/debian/patches/10_sysctl.8.dpatch @@ -0,0 +1,149 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_sysctl_8.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: -p flag has OPTIONAL filename (#297144) +## DP: cleanup ssysctl man page #282168 + +@DPATCH@ +diff -urNad procps-3.2.7~/sysctl.8 procps-3.2.7/sysctl.8 +--- procps-3.2.7~/sysctl.8 2006-06-26 09:44:20.000000000 +1000 ++++ procps-3.2.7/sysctl.8 2006-06-26 12:42:08.000000000 +1000 +@@ -10,76 +10,108 @@ + .SH NAME + sysctl \- configure kernel parameters at runtime + .SH SYNOPSIS +-.B "sysctl [-n] [-e] variable ..." ++.B sysctl ++.RB [ \-n ] ++.RB [ \-e ] ++.I variable ++\&... + .br +-.B "sysctl [-n] [-e] [-q] -w variable=value ..." ++.B sysctl ++.RB [ \-n ] ++.RB [ \-e ] ++.RB [ \-q ] ++.B \-w ++.IR variable = value ++\&... + .br +-.B "sysctl [-n] [-e] [-q] -p " ++.B sysctl ++.RB [ \-n ] ++.RB [ \-e ] ++.RB [ \-q ] ++.B \-p ++.RI [ filename ] + .br +-.B "sysctl [-n] [-e] -a" ++.B sysctl ++.RB [ \-n ] ++.RB [ \-e ] ++.B \-a + .br +-.B "sysctl [-n] [-e] -A" ++.B sysctl ++.RB [ \-n ] ++.RB [ \-e ] ++.B \-A + .SH DESCRIPTION + .B sysctl + is used to modify kernel parameters at runtime. The parameters available + are those listed under /proc/sys/. Procfs is required for +-.B sysctl(8) ++.B sysctl + support in Linux. You can use +-.B sysctl(8) ++.B sysctl + to both read and write sysctl data. + .SH PARAMETERS + .TP +-.B "variable" ++.I variable + The name of a key to read from. An example is kernel.ostype. The '/' + separator is also accepted in place of a '.'. + .TP +-.B "variable=value" +-To set a key, use the form variable=value, where variable is the key and +-value is the value to set it to. If the value contains quotes or characters ++.IR variable = value ++To set a key, use the form ++.IR variable = value ++where ++.I variable ++is the key and ++.I value ++is the value to set it to. If the value contains quotes or characters + which are parsed by the shell, you may need to enclose the value in double +-quotes. This requires the -w parameter to use. ++quotes. This requires the ++.B \-w ++parameter to use. + .TP +-.B "-n" ++.B \-n + Use this option to disable printing of the key name when printing values. + .TP +-.B "-e" ++.B \-e + Use this option to ignore errors about unknown keys. + .TP +-.B "-N" ++.B \-N + Use this option to only print the names. It may be useful with shells that + have programmable completion. + .TP +-.B "-q" ++.B \-q + Use this option to not display the values set to stdout. + .TP +-.B "-w" ++.B \-w + Use this option when you want to change a sysctl setting. + .TP +-.B "-p" ++.B \-p + Load in sysctl settings from the file specified or /etc/sysctl.conf if none given. + Specifying \- as filename means reading data from standard input. + .TP +-.B "-a" ++.B \-a + Display all values currently available. + .TP +-.B "-A" ++.B \-A + Display all values currently available in table form. + .SH EXAMPLES +-.TP +-/sbin/sysctl -a +-.TP +-/sbin/sysctl -n kernel.hostname +-.TP +-/sbin/sysctl -w kernel.domainname="example.com" +-.TP +-/sbin/sysctl -p /etc/sysctl.conf ++/sbin/sysctl \-a ++.br ++/sbin/sysctl \-n kernel.hostname ++.br ++/sbin/sysctl \-w kernel.domainname="example.com" ++.br ++/sbin/sysctl \-p /etc/sysctl.conf + .SH FILES + .I /proc/sys ++.br + .I /etc/sysctl.conf + .SH SEE ALSO + .BR sysctl.conf (5) + .SH BUGS +-The -A parameter behaves just as -a does. ++The ++.B \-A ++parameter behaves just as ++.B \-a ++does. + .SH AUTHOR + George Staikos, + --- procps-3.2.7.orig/debian/patches/30_w.1.dpatch +++ procps-3.2.7/debian/patches/30_w.1.dpatch @@ -0,0 +1,52 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_w.1.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad procps-3.2.7~/w.1 procps-3.2.7/w.1 +--- procps-3.2.7~/w.1 2006-06-26 12:49:18.000000000 +1000 ++++ procps-3.2.7/w.1 2006-06-26 12:50:38.000000000 +1000 +@@ -4,26 +4,26 @@ + .SH NAME + w \- Show who is logged on and what they are doing. + .SH SYNOPSIS +-.B w \- +-.RB [ husfVo ] ++.B w ++.RB [ \-husfVo ] + .RI [ user ] + .SH DESCRIPTION +-.B "w " ++.B w + displays information about the users currently on the machine, + and their processes. + The header shows, in this order, the current time, + how long the system has been running, + how many users are currently logged on, + and the system load averages for the past 1, 5, and 15 minutes. +-.sp ++ + The following entries are displayed for each user: + login name, the tty name, the remote host, login time, idle time, JCPU, PCPU, + and the command line of their current process. +-.sp ++ + The JCPU time is the time used by all processes attached to the tty. It + does not include past background jobs, but does include currently + running background jobs. +-.sp ++ + The PCPU time is the time used by the current process, named in the "what" + field. + +@@ -35,7 +35,7 @@ + .TP 0.5i + .B "\-u " + Ignores the username while figuring out the current process and cpu +-times. To demonstrate this, do a "su" and do a "w" and a "w -u". ++times. To demonstrate this, do a "su" and do a "w" and a "w \-u". + .TP 0.5i + .B "\-s " + Use the short format. --- procps-3.2.7.orig/debian/patches/20_w-bassman.dpatch +++ procps-3.2.7/debian/patches/20_w-bassman.dpatch @@ -0,0 +1,81 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_w-bassman.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: w.bassman emulation + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./w.1 /tmp/dpep-work.nW4JyL/procps-3.2.6/w.1 +--- ./w.1 2005-10-31 22:19:06.000000000 +1100 ++++ /tmp/dpep-work.nW4JyL/procps-3.2.6/w.1 2005-10-31 22:19:38.000000000 +1100 +@@ -5,7 +5,7 @@ + w \- Show who is logged on and what they are doing. + .SH SYNOPSIS + .B w \- +-.RB [ husfV ] ++.RB [ husfVo ] + .RI [ user ] + .SH DESCRIPTION + .B "w " +@@ -55,6 +55,9 @@ + .B "\-V " + Display version information. + .TP 0.5i ++.B "\-o " ++Old style output. Prints blank space for idle times less than one minute. ++.TP 0.5i + .B "user " + Show information about the specified user only. + +diff -urNad --exclude=CVS --exclude=.svn ./w.c /tmp/dpep-work.nW4JyL/procps-3.2.6/w.c +--- ./w.c 2005-10-31 22:19:06.000000000 +1100 ++++ /tmp/dpep-work.nW4JyL/procps-3.2.6/w.c 2005-10-31 22:19:38.000000000 +1100 +@@ -30,6 +30,7 @@ + #include + + static int ignoreuser = 0; /* for '-u' */ ++static int oldstyle = 0; /* for '-o' */ + static proc_t **procs; /* our snapshot of the process table */ + + typedef struct utmp utmp_t; +@@ -79,11 +80,12 @@ + if (t >= 48*60*60) /* > 2 days */ + fprintf(fout, " %2ludays", t/(24*60*60)); + else if (t >= 60*60) /* > 1 hour */ +- fprintf(fout, " %2lu:%02um", t/(60*60), (unsigned) ((t/60)%60)); ++ fprintf(fout, " %2lu:%02u ", t/(60*60), (unsigned) ((t/60)%60)); + else if (t > 60) /* > 1 minute */ +- fprintf(fout, " %2lu:%02u ", t/60, (unsigned) t%60); ++ fprintf(fout, " %2lu:%02um", t/60, (unsigned) t%60); + else +- fprintf(fout, " %2lu.%02us", t, centi_sec); ++ oldstyle ? fprintf(fout, " ") ++ : fprintf(fout, " %2lu.%02us", t, centi_sec); + } + + /**** stat the device file to get an idle time */ +@@ -239,7 +241,7 @@ + #endif + + setlocale(LC_ALL, ""); +- for (args=0; (ch = getopt(argc, argv, "hlusfV")) != EOF; args++) ++ for (args=0; (ch = getopt(argc, argv, "hlusfVo")) != EOF; args++) + switch (ch) { + case 'h': header = 0; break; + case 'l': longform = 1; break; +@@ -247,6 +249,7 @@ + case 'f': from = !from; break; + case 'V': display_version(); exit(0); + case 'u': ignoreuser = 1; break; ++ case 'o': oldstyle = 1; break; + default: + printf("usage: w -hlsufV [user]\n" + " -h skip header\n" +@@ -254,6 +257,7 @@ + " -s short listing\n" + " -u ignore uid of processes\n" + " -f toggle FROM field (default %s)\n" ++ " -o old-style output\n" + " -V display version\n", FROM_STRING); + exit(1); + } --- procps-3.2.7.orig/debian/patches/30_library_map_freeproc.dpatch +++ procps-3.2.7/debian/patches/30_library_map_freeproc.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh -e +## 30_library_map_freeproc.dpatch by Craig Small +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Added freeproc to library.map + +[ -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.2.0.orig/proc/library.map ++++ procps-3.2.0/proc/library.map +@@ -7,7 +7,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; lookup_wchan; + display_version; procps_version; linux_version_code; + Hertz; smp_num_cpus; --- procps-3.2.7.orig/debian/patches/20_kill_warncr.dpatch +++ procps-3.2.7/debian/patches/20_kill_warncr.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_kill_warncr.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add CR to warning line #331419 + +@DPATCH@ +diff -urNad procps-3.2.7~/skill.c procps-3.2.7/skill.c +--- procps-3.2.7~/skill.c 2004-09-09 23:49:38.000000000 +1000 ++++ procps-3.2.7/skill.c 2006-06-26 22:40:17.000000000 +1000 +@@ -128,7 +128,7 @@ + sprintf(buf, "/proc/%d/stat", pid); /* pid (cmd) state ppid pgrp session tty */ + fd = open(buf,O_RDONLY); + if(fd==-1){ /* process exited maybe */ +- if(pids && w_flag) printf("WARNING: process %d could not be found.",pid); ++ if(pids && w_flag) printf("WARNING: process %d could not be found.\n",pid); + return; + } + fstat(fd, &statbuf); +@@ -333,7 +333,7 @@ + }else{ + fprintf(stderr, + "Usage: snice [new priority] [options] process selection criteria\n" +- "Example: snice netscape crack +7\n" ++ "Example: snice +7 netscape crack \n" + "\n" + "The default priority is +4. (snice +4 ...)\n" + "Priority numbers range from +20 (slowest) to -20 (fastest).\n" --- procps-3.2.7.orig/debian/patches/10_pmap.1.dpatch +++ procps-3.2.7/debian/patches/10_pmap.1.dpatch @@ -0,0 +1,50 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_pmap.1.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cleanup pmap.1 manual page #282168 + +@DPATCH@ +diff -urNad procps-3.2.7~/pmap.1 procps-3.2.7/pmap.1 +--- procps-3.2.7~/pmap.1 2004-01-29 13:39:08.000000000 +1100 ++++ procps-3.2.7/pmap.1 2006-06-26 11:48:23.000000000 +1000 +@@ -10,25 +10,29 @@ + pmap \- report memory map of a process + + .SH SYNOPSIS +-.nf +-pmap [ -x | -d ] [ -q ] pids... +-pmap -V +-.fi ++.B pmap ++.RB [ \-x | \-d ] ++.RB [ \-q ] ++.I pid ++\& ... ++.br ++.B pmap \-V + + .SH DESCRIPTION + The pmap command reports the memory map of a process or processes. + + .SH "GENERAL OPTIONS" + .TS +-l l l. +--x extended Show the extended format. +--d device Show the device format. +--q quiet Do not display some header/footer lines. +--V show version Displays version of program. ++lB l l. ++\-x extended Show the extended format. ++\-d device Show the device format. ++\-q quiet Do not display some header/footer lines. ++\-V show version Displays version of program. + .TE + + .SH "SEE ALSO" +-ps(1) pgrep(1) ++.BR ps(1), ++.BR pgrep(1) + + .SH STANDARDS + No standards apply, but pmap looks an awful lot like a SunOS command. --- procps-3.2.7.orig/debian/copyright +++ procps-3.2.7/debian/copyright @@ -0,0 +1,28 @@ +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 , Roger Binns, Charles +Blake , Brian Edmonds, David Engel , +Larry Greenfield , Michael K. Johnson +, Branko Lankester , +Robert Nation , Michael Shields +, Henry Ware , Matt +Welsh , Albert D. Cahalan, Jim C. Warner +, and Kjetil Torgrim Homme + + +The programs sysctl and pgrep 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'. + +All other software is 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.2.7.orig/debian/procps.manpages +++ procps-3.2.7/debian/procps.manpages @@ -0,0 +1 @@ +ps/ps.1 --- procps-3.2.7.orig/debian/procps.dirs +++ procps-3.2.7/debian/procps.dirs @@ -0,0 +1,10 @@ +etc +lib +sbin +bin +usr/bin +usr/share/lintian/overrides +usr/share/man/man1 +usr/share/man/man5 +usr/share/man/man8 + --- procps-3.2.7.orig/debian/examples +++ procps-3.2.7/debian/examples @@ -0,0 +1,2 @@ +debian/sysctl.conf + --- procps-3.2.7.orig/debian/libproc-dev.README +++ procps-3.2.7/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.2.7.orig/pgrep.1 +++ procps-3.2.7/pgrep.1 @@ -38,6 +38,9 @@ .SH OPTIONS .TP +\-c +Suppress normal output; instead print a count of matching processes. +.TP \-d \fIdelimiter\fP Sets the string used to delimit each process ID in the output (by default a newline). (\fBpgrep\fP only.)