[procps] backporting

  • From: Sami Kerola <kerolasa@xxxxxx>
  • To: procps-ng <procps@xxxxxxxxxxxxx>
  • Date: Tue, 6 Dec 2011 13:59:20 +0100

Hi,

Some days ago Craig said there was Debian patch which was a fix to
vmstat -d switch. That inspired me to take a look what what patches I
could find from internet. Unsurprisingly quite many where found from
Debian, but some from Gentoo, Slackware, Archlinux, Redhat and few
Buildroot things caught my attention as well.

I tried to backport everything gracefully so that the persons who
wrote the patches keep on credited, and the time stamps are at leas
roughly when the fixes where made. As expected these patches break
some tests, and that has to be resolved. Actually it would be really
good to review which of the patches are good, and we want to keep
them. My testing for the patches was very superficial: does the patch
compile if yes does the program run without dropping core OK good
enough, next patch.

Some patches where left out.

ps_supgid_display.patch: http://bugs.debian.org/506303
Anything with init_Linux_version stuff.
Nearly everything touching top.

Drawback of these patches, assuming they become part of
upstream/master, is that incoming nls branch needs to be conflict
resolved again. I can do that when it's known which of these patches
we keep (if any).


The following changes since commit f9ab2fec4309779123f5652dfb4a77d30bde46e5:

  Added Debian bug note for pgrep -u and testsuite (2011-12-06 21:37:45 +1100)

are available in the git repository at:
  git://gitorious.org/~kerolasa/procps/sami-procps-ng.git backport

Alfredo Esteban (1):
      ps: --sort does not work with time argument

Anthony DeRobertis (1):
      watch: add precision wait time option -p

Armin van Buuren (1):
      libproc-ng: prettyfy proc mount messages

Ciaran McCreesh (1):
      contrib: minimal ps: define mips PAGE_SIZE

Craig Small (13):
      skill: add CR to warning line
      pgrep: add -c option for counting number of matched proceesses
      pgrep: fix compiler warning saved_start_time might be used uninitialized
      pmap: provide information for -x option
      ps: rename SZ to SIZE
      libprocps-ng: readproc.c: some type conversion help
      skill: fix too greedy option parser
      sysctl: fix up some option processing
      tload: remote unneeded optarg and optind variables
      w: bassman emulation with -o option
      w: use COLUMNS environment if TIOCGWINSZ fails
      w: use environment to set user and from/host column widths
      watch: interpret ANSI color code sequences

Daniel Novotny (1):
      pwdx & libprocps-ng: Hurd does not have MAX_PATH defined

David Fries (1):
      libprocps-ng: sysinfo.c: truncate the vmstat figure to 32 bits

Dieter Ries (1):
      top: check /proc availability

Eric Belanger (2):
      libproc-ng: make a copy of locale strings
      w: guess better which command user is running

Hamish Moffatt (1):
      libproc-ng: support building without WCHAR support

Jan Christoph Nordholz (1):
      pgrep: distinguish between invalid commandline parameters and '-?'

Jarrod Lowe (1):
      watch: support unicode

Jessica McKellar (1):
      ps: add sorting to %mem for ps

Justin Pryzby (1):
      skill: kill prints perror

Karel Zak (1):
      top: ignores user and system toprc

Michael Tokarev (1):
      vmstat: do not scale si/so just like bi/bo

Mordechai T. Abzug (1):
      watch: add -exec and -beep flags and has better quoting

Steven J. Hill (1):
      sysctl: remove index() for buildroot

WANG Yunfeng (1):
      skill: do not treat skill null parameter as 0

unknown (1):
      ps: add build option to disable ps option warning

 AUTHORS           |    1 +
 configure.ac      |    8 ++
 contrib/minimal.c |    4 +-
 pgrep.1           |    4 +-
 pgrep.c           |   25 +++--
 pmap.c            |   86 +++++++++++---
 proc/escape.c     |    6 +-
 proc/ksym.c       |    4 +
 proc/readproc.c   |    8 +-
 proc/sysinfo.c    |   35 ++++--
 ps/output.c       |   36 ++++--
 ps/parser.c       |   11 ++
 ps/ps.1           |    2 +-
 pwdx.c            |   20 +++-
 skill.c           |    9 +-
 sysctl.c          |   16 ++-
 tload.c           |    3 -
 top.c             |    8 +-
 vmstat.8          |    4 +-
 w.1               |   15 ++-
 w.c               |   79 +++++++++----
 watch.1           |  104 +++++++++++++++--
 watch.c           |  347 ++++++++++++++++++++++++++++++++++++++++++++++++----
 23 files changed, 706 insertions(+), 129 deletions(-)

-- 
   Sami Kerola
   http://www.iki.fi/kerolasa/

Other related posts: