emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

name change: procps -> procps-ng

Browse Source 
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-06-04 19:40:29 +02:00
parent 17affc6637
commit 71d10d3a49
24 changed files with 47 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUGS
View File

@ -3,7 +3,7 @@ BUG REPORTS
Please read this file before sending in a bug report or patch. Please read this file before sending in a bug report or patch.
Also, PLEASE read the documentation first. 90% of the mail I get Also, PLEASE read the documentation first. 90% of the mail I get
complaining about procps is due to the sender not having read the complaining about procps-ng is due to the sender not having read the
documentation! documentation!
@ -49,7 +49,7 @@ are kind of usable, and standard diffs (diff) are more useless than a
generic text description of what you did. Just use generic text description of what you did. Just use
diff -Naurd oldfile newfile diff -Naurd oldfile newfile
or or
diff -Naurd old-procps-dir new-procps-dir diff -Naurd old-procps-ng-dir new-procps-ng-dir
to create your diffs and you will make me happy. Also make sure to to create your diffs and you will make me happy. Also make sure to
include a description of what the diff is for or I'm likely to ignore include a description of what the diff is for or I'm likely to ignore
it because of general lack of time... it because of general lack of time...

5
NEWS
View File

@ -1,3 +1,8 @@
procps-3.2.9 --> procps-ng-3.3.0
Debian, Fedora and openSUSE fork of procps.
https://gitorious.org/procps
procps-3.2.8 --> procps-3.2.9 procps-3.2.8 --> procps-3.2.9
top: fix an aliasing problem -- thanks David Owen top: fix an aliasing problem -- thanks David Owen

12
README
View File

@ -10,7 +10,7 @@ INSTALLATION
make install make install
Only the second ("make install") is needed if you just Only the second ("make install") is needed if you just
want to build and install procps in the normal way. want to build and install procps-ng in the normal way.
If you wish to test before installing, use the scripts If you wish to test before installing, use the scripts
named t, v, and p to ensure that the correct libproc named t, v, and p to ensure that the correct libproc
@ -21,7 +21,7 @@ INSTALLATION
make SKIP='/bin/kill /usr/share/man/man1/kill.1' install make SKIP='/bin/kill /usr/share/man/man1/kill.1' install
Use SHARED=0 to build procps without shared libraries. Use SHARED=0 to build procps-ng without shared libraries.
This may be useful for installing in your home directory. This may be useful for installing in your home directory.
make SHARED=0 DESTDIR=$HOME install make SHARED=0 DESTDIR=$HOME install
@ -46,7 +46,7 @@ PACKAGING
Send patches in regularly. Many patches made by vendors have been buggy, Send patches in regularly. Many patches made by vendors have been buggy,
some quite severely so. Sending in a patch will at least get it reviewed, some quite severely so. Sending in a patch will at least get it reviewed,
if not included. There is a procps test suite that must be passed. if not included. There is a procps-ng test suite that must be passed.
Forward all bug reports. If your bug database is public and busy enough Forward all bug reports. If your bug database is public and busy enough
to bother with, please make this known. Follow Debian's lead in making to bother with, please make this known. Follow Debian's lead in making
the bug database easy to comment on via email w/o need for an account. the bug database easy to comment on via email w/o need for an account.
@ -54,7 +54,7 @@ PACKAGING
Do not change the user interface. Many of the programs are intended to be Do not change the user interface. Many of the programs are intended to be
compatible with Solaris, FreeBSD, AIX, IRIX, Tru64, and the UNIX standard. compatible with Solaris, FreeBSD, AIX, IRIX, Tru64, and the UNIX standard.
Your nice new command options WILL BE BROKEN as needed to ensure that Your nice new command options WILL BE BROKEN as needed to ensure that
procps remains compatible with the rest of the world. Sysadmins hate to procps-ng remains compatible with the rest of the world. Sysadmins hate to
deal with incompatible behavior. If you need a new option, ask for it. deal with incompatible behavior. If you need a new option, ask for it.
For normal packages, ensure that you do not add debugging flags For normal packages, ensure that you do not add debugging flags
@ -67,6 +67,4 @@ PACKAGING
BUG REPORTS BUG REPORTS
Debian users should use the Debian bug tracking system. Email to procps@freelists.org.
Email to albert@users.sf.net or csmall@debian.org or
procps-feedback@lists.sf.net will also work.

4
TODO
View File

@ -6,8 +6,8 @@ Implement /usr/proc/bin tools like Solaris has.
The prstat command is interesting, like top in batch mode. The prstat command is interesting, like top in batch mode.
SCO has a pstat command. SCO has a pstat command.
Don't these really belong in the procps package? Don't these really belong in the procps-ng package?
killall pstree fuser lsof who killall pstree fuser lsof who
(they are maintained elsewhere, which causes version problems) (they are maintained elsewhere, which causes version problems)
OpenBSD has a pfind command. OpenBSD has a pfind command.

10
autogen.sh
View File

@ -12,33 +12,33 @@ DIE=0
test -f top.c || { test -f top.c || {
echo echo
echo "You must run this script in the top-level procps directory" echo "You must run this script in the top-level procps-ng directory"
echo echo
DIE=1 DIE=1
} }
(autoconf --version) < /dev/null > /dev/null 2>&1 || { (autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "You must have autoconf installed to generate procps build system." echo "You must have autoconf installed to generate procps-ng build system."
echo echo
DIE=1 DIE=1
} }
(autoheader --version) < /dev/null > /dev/null 2>&1 || { (autoheader --version) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "You must have autoheader installed to generate procps build system." echo "You must have autoheader installed to generate procps-ng build system."
echo "The autoheader command is part of the GNU autoconf package." echo "The autoheader command is part of the GNU autoconf package."
echo echo
DIE=1 DIE=1
} }
(libtool --version) < /dev/null > /dev/null 2>&1 || { (libtool --version) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "You must have libtool-2 installed to generate procps build system." echo "You must have libtool-2 installed to generate procps-ng build system."
echo echo
DIE=1 DIE=1
} }
(automake --version) < /dev/null > /dev/null 2>&1 || { (automake --version) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "You must have automake installed to generate procps build system." echo "You must have automake installed to generate procps-ng build system."
echo echo
DIE=1 DIE=1
} }

2
configure.ac
View File

@ -3,7 +3,7 @@
AC_PREREQ([2.64]) AC_PREREQ([2.64])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_INIT([procps], AC_INIT([procps-ng],
[3.3.0], [3.3.0],
[procps@freelists.org],,[http://gitorious.org/procps]) [procps@freelists.org],,[http://gitorious.org/procps])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE

2
free.c
View File

@ -1,6 +1,6 @@
/* /*
* free.c - free(1) * free.c - free(1)
* procps utility to display free memory information * procps-ng utility to display free memory information
* *
* Mostly new, Sami Kerola <kerolasa@iki.fi> 15 Apr 2011 * Mostly new, Sami Kerola <kerolasa@iki.fi> 15 Apr 2011
* All new, Robert Love <rml@tech9.net> 18 Nov 2002 * All new, Robert Love <rml@tech9.net> 18 Nov 2002

2
kill.1
View File

@ -103,4 +103,4 @@ Albert Cahalan <albert@users.sf.net> wrote kill in 1999 to replace a
bsdutils one that was not standards compliant. The util-linux one might bsdutils one that was not standards compliant. The util-linux one might
also work correctly. also work correctly.
Please send bug reports to <procps-feedback@lists.sf.net> Please send bug reports to <procps@freelists.org>

5
pgrep.1
View File

@ -174,7 +174,4 @@ implementation is fully compatible.
.SH AUTHOR .SH AUTHOR
Kjetil Torgrim Homme <kjetilho@ifi.uio.no> Kjetil Torgrim Homme <kjetilho@ifi.uio.no>
Albert Cahalan <albert@users.sf.net> is the current maintainer of Please send bug reports to <procps@freelists.org>
the procps package.
Please send bug reports to <procps-feedback@lists.sf.net>

6
pmap.1
View File

@ -37,7 +37,5 @@ lB l l.
.SH STANDARDS .SH STANDARDS
No standards apply, but pmap looks an awful lot like a SunOS command. No standards apply, but pmap looks an awful lot like a SunOS command.
.SH AUTHOR .SH BUG REPORTS
Albert Cahalan <albert@users.sf.net> wrote pmap in 2002, and is the current Please send bug reports to <procps@freelists.org>
maintainer of the procps collection. Please send bug reports
to <procps-feedback@lists.sf.net>.

2
proc/procps.h
View File

@ -78,7 +78,7 @@
#define STRINGIFY_ARG(a) #a #define STRINGIFY_ARG(a) #a
#define STRINGIFY(a) STRINGIFY_ARG(a) #define STRINGIFY(a) STRINGIFY_ARG(a)
// marks old junk, to warn non-procps library users // marks old junk, to warn non-procps-ng library users
#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
#define OBSOLETE __attribute__((deprecated)) #define OBSOLETE __attribute__((deprecated))
#else #else

4
proc/version.c
View File

@ -1,4 +1,4 @@
/* Suite version information for procps utilities /* Suite version information for procps-ng utilities
* Copyright (c) 1995 Martin Schulze <joey@infodrom.north.de> * Copyright (c) 1995 Martin Schulze <joey@infodrom.north.de>
* Ammended by cblake to only export the function symbol. * Ammended by cblake to only export the function symbol.
* *
@ -18,7 +18,7 @@ void display_version(void) {
fprintf(stdout, "%s\n", procps_version); fprintf(stdout, "%s\n", procps_version);
} }
/* Linux kernel version information for procps utilities /* Linux kernel version information for procps-ng utilities
* Copyright (c) 1996 Charles Blake <cblake@bbn.com> * Copyright (c) 1996 Charles Blake <cblake@bbn.com>
*/ */
#include <sys/utsname.h> #include <sys/utsname.h>

4
proc/version.h
View File

@ -3,9 +3,9 @@
#include "procps.h" #include "procps.h"
/* Suite version information for procps utilities /* Suite version information for procps-ng utilities
* Copyright (c) 1995 Martin Schulze <joey@infodrom.north.de> * Copyright (c) 1995 Martin Schulze <joey@infodrom.north.de>
* Linux kernel version information for procps utilities * Linux kernel version information for procps-ng utilities
* Copyright (c) 1996 Charles Blake <cblake@bbn.com> * Copyright (c) 1996 Charles Blake <cblake@bbn.com>
* Distributable under the terms of the GNU Library General Public License * Distributable under the terms of the GNU Library General Public License
* *

15
procps.lsm
View File

@ -1,15 +0,0 @@
Begin4
Title: procps
Version: 3.2.7
Entered-date: 2006-06-25
Description: Linux system utilities
Keywords: procps /proc libproc sysctl pmap ps uptime tload slabtop
free w top vmstat watch skill snice kill pgrep pkill
Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc.
Maintained-by: various <procps-feedback@lists.sf.net>
Primary-site: http://procps.sf.net/
281kB procps-3.2.7.tar.gz
Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html
281kB procps-3.2.7.tar.gz
Copying-policy: mixed
End

52
procps.spec
View File

@ -1,52 +0,0 @@
URL: http://procps.sf.net/
Summary: System and process monitoring utilities
Name: procps
%define major_version 3
%define minor_version 2
%define revision 8
%define version %{major_version}.%{minor_version}.%{revision}
Version: %{version}
Release: 1
License: LGPL, GPL, BSD-like
Group: Applications/System
Source: http://procps.sf.net/procps-%{version}.tar.gz
BuildRoot: %{_tmppath}/procps-root
Packager: <procps-feedback@lists.sf.net>
%description
The procps package contains a set of system utilities which provide
system information. Procps includes ps, free, sysctl, skill, snice,
tload, top, uptime, vmstat, w, and watch. You need some of these.
%prep
%setup
%build
make SKIP="/bin/kill /usr/share/man/man1/kill.1" CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
make SKIP="/bin/kill /usr/share/man/man1/kill.1" DESTDIR=$RPM_BUILD_ROOT ldconfig=echo install="install -D" lib="$RPM_BUILD_ROOT/%{_lib}/" install
%clean
rm -rf $RPM_BUILD_ROOT
%post
# add libproc to the cache
/sbin/ldconfig
%files
%defattr(0644,root,root,755)
%doc NEWS BUGS TODO COPYING COPYING.LIB README.top README AUTHORS sysctl.conf
%attr(555,root,root) /lib*/libproc*.so*
%attr(555,root,root) /bin/*
%attr(555,root,root) /sbin/*
%attr(555,root,root) /usr/bin/*
%attr(0644,root,root) /usr/share/man/man1/*
%attr(0644,root,root) /usr/share/man/man5/*
%attr(0644,root,root) /usr/share/man/man8/*
%changelog
* Fri Apr 14 09:23:45 PDT 2006 Jesse Brandeburg <jesse.brandeburg@in...>
- fix missing trailing slash in %install to fix builds on x86_64

2
ps/display.c
View File

@ -46,7 +46,7 @@ static void signal_handler(int signo){
fprintf(stderr, fprintf(stderr,
"\n\n" "\n\n"
"Signal %d (%s) caught by ps (%s).\n" "Signal %d (%s) caught by ps (%s).\n"
"Please send bug reports to <feedback@lists.sf.net> or <albert@users.sf.net>\n", "Please send bug reports to <procps@freelists.org>\n",
signo, signo,
signal_number_to_name(signo), signal_number_to_name(signo),
procps_version procps_version

4
ps/parser.c
View File

@ -1156,7 +1156,7 @@ static const char *thread_option_check(void){
if(thread_flags&(TF_B_m|TF_U_m|TF_B_H)){ if(thread_flags&(TF_B_m|TF_U_m|TF_B_H)){
// Got a thread style, so format modification is a requirement? // Got a thread style, so format modification is a requirement?
// Maybe -T/-L has H thread style though. (sorting interaction?) // Maybe -T/-L has H thread style though. (sorting interaction?)
//return "Huh? Tell procps-feedback@lists.sf.net what you expected."; //return "Huh? Tell procps@freelists.org what you expected.";
thread_flags |= TF_must_use; thread_flags |= TF_must_use;
}else{ }else{
// using -L/-T thread style, so format from elsewhere is OK // using -L/-T thread style, so format from elsewhere is OK
@ -1228,7 +1228,7 @@ try_bsd:
// out the friendly warning. Cut-over is likely to be in 2005. // out the friendly warning. Cut-over is likely to be in 2005.
if(!(personality & PER_FORCE_BSD)) if(!(personality & PER_FORCE_BSD))
fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n"); fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n");
// Remember: contact albert@users.sf.net or procps-feedback@lists.sf.net // Remember: contact procps@freelists.org
// if you should feel tempted. Be damn sure you understand all // if you should feel tempted. Be damn sure you understand all
// the issues. The same goes for other stuff too, BTW. Please ask. // the issues. The same goes for other stuff too, BTW. Please ask.
// I'm happy to justify various implementation choices. // I'm happy to justify various implementation choices.

8
ps/ps.1
View File

@ -643,13 +643,13 @@ Print debugging info.
List all format specifiers. List all format specifiers.
.opt V .opt V
Print the procps version. Print the procps-ng version.
.opt \-V .opt \-V
Print the procps version. Print the procps-ng version.
.opt \-\-version .opt \-\-version
Print the procps version. Print the procps-ng version.
.\" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" .\" """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.PD .PD
@ -1534,5 +1534,5 @@ Mossberger\-Tang wrote the generic BFD support for psupdate. Albert Cahalan
<albert@users.sf.net> rewrote ps for full Unix98 and BSD support, along with <albert@users.sf.net> rewrote ps for full Unix98 and BSD support, along with
some ugly hacks for obsolete and foreign syntax. some ugly hacks for obsolete and foreign syntax.
Please send bug reports to <procps\-feedback@lists.sf.net>. Please send bug reports to <procps@freelists.org>.
No\ subscription is required or suggested. No\ subscription is required or suggested.

4
ps/sortformat.c
View File

@ -800,7 +800,7 @@ const char *process_sf_options(int localbroken){
// with sorting. Do the threads remain grouped, with sorting // with sorting. Do the threads remain grouped, with sorting
// by process, or do the threads get sorted by themselves? // by process, or do the threads get sorted by themselves?
if(sort_list && (thread_flags&TF_no_sort)){ if(sort_list && (thread_flags&TF_no_sort)){
return "Tell procps-feedback@lists.sf.net what you expected."; return "Tell procps@freelists.org what you expected.";
} }
// If nothing else, try to use $PS_FORMAT before the default. // If nothing else, try to use $PS_FORMAT before the default.
@ -810,7 +810,7 @@ const char *process_sf_options(int localbroken){
if(tmp && *tmp){ if(tmp && *tmp){
const char *err; const char *err;
sf_node sfn; sf_node sfn;
if(thread_flags&TF_must_use) return "Tell procps-feedback@sf.net what you want. (-L/-T, -m/m/H, and $PS_FORMAT)"; if(thread_flags&TF_must_use) return "Tell procps@freelists.org what you want. (-L/-T, -m/m/H, and $PS_FORMAT)";
sfn.sf = tmp; sfn.sf = tmp;
sfn.f_cooked = NULL; sfn.f_cooked = NULL;
err = format_parse(&sfn); err = format_parse(&sfn);

2
pwdx.1
View File

@ -34,4 +34,4 @@ No standards apply, but pwdx looks an awful lot like a SunOS command.
.SH AUTHOR .SH AUTHOR
Nicholas Miell <nmiell@gmail.com> wrote pwdx in 2004. Please send bug Nicholas Miell <nmiell@gmail.com> wrote pwdx in 2004. Please send bug
reports to <procps-feedback@lists.sf.net>. reports to <procps@freelists.org>

5
skill.1
View File

@ -124,5 +124,6 @@ No standards apply.
.SH AUTHOR .SH AUTHOR
Albert Cahalan <albert@users.sf.net> wrote skill and snice in 1999 as a Albert Cahalan <albert@users.sf.net> wrote skill and snice in 1999 as a
replacement for a non-free version, and is the current maintainer of the replacement for a non-free version.
procps collection. Please send bug reports to <procps-feedback@lists.sf.net>.
Please send bug reports to <procps@freelists.org>.

6
slabtop.1
View File

@ -1,4 +1,4 @@
.\" slabtop.1 - manpage for the slabtop(1) utility, part of procps .\" slabtop.1 - manpage for the slabtop(1) utility, part of procps-ng
.\" .\"
.\" Copyright (C) 2003 Chris Rivera .\" Copyright (C) 2003 Chris Rivera
.\" Licensed under the terms of the GNU Library General Public License, v2 .\" Licensed under the terms of the GNU Library General Public License, v2
@ -124,6 +124,4 @@ Written by Chris Rivera and Robert Love.
.B slabtop .B slabtop
was inspired by Martin Bligh's perl script, was inspired by Martin Bligh's perl script,
.BR vmtop . .BR vmtop .
The procps package is maintained by Albert Cahalan <albert@users.sf.net>. Please send bug reports to <procps@freelists.org>.
Please send bug reports to <procps-feedback@lists.sf.net>.

2
uptime.1
View File

@ -39,7 +39,7 @@ process information
was written by Larry Greenfield <greenfie@gauss.rutgers.edu> and was written by Larry Greenfield <greenfie@gauss.rutgers.edu> and
Michael K. Johnson <johnsonm@sunsite.unc.edu>. Michael K. Johnson <johnsonm@sunsite.unc.edu>.
Please send bug reports to <albert@users.sf.net> Please send bug reports to <procps@freelists.org>
.SH "SEE ALSO" .SH "SEE ALSO"
.BR ps (1), .BR ps (1),
.BR top (1), .BR top (1),

2
w.1
View File

@ -81,4 +81,4 @@ was re-written almost entirely by Charles Blake, based on the version by Larry
Greenfield <greenfie@gauss.rutgers.edu> and Michael K. Johnson Greenfield <greenfie@gauss.rutgers.edu> and Michael K. Johnson
<johnsonm@redhat.com>. <johnsonm@redhat.com>.
Please send bug reports to <albert@users.sf.net> Please send bug reports to <procps@freelists.org>