From: albert <> Date: Sun, 15 Dec 2002 00:30:17 +0000 (+0000) Subject: satisfy GPL section 2a and LGPL section 2b name+date requirement X-Git-Tag: v3.3.0~288 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e67b58ec253c9bd1467aeef6c2f8cff00321d52;p=procps-ng satisfy GPL section 2a and LGPL section 2b name+date requirement --- diff --git a/ChangeLog b/ChangeLog index ce994680..9eb20819 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ procps-3.1.3 --> procps-3.1.4 top: was trashing every "3" in a command name top: when killing a process, the PID was cut at a "3" top: more reliable %CPU +update copyright dates (GPL & LGPL require this) procps-3.1.2 --> procps-3.1.3 diff --git a/NEWS b/NEWS index ce994680..9eb20819 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ procps-3.1.3 --> procps-3.1.4 top: was trashing every "3" in a command name top: when killing a process, the PID was cut at a "3" top: more reliable %CPU +update copyright dates (GPL & LGPL require this) procps-3.1.2 --> procps-3.1.3 diff --git a/pgrep.c b/pgrep.c index 4770e7c3..6ebbada5 100644 --- a/pgrep.c +++ b/pgrep.c @@ -6,6 +6,9 @@ * * May be distributed under the conditions of the * GNU General Public License; a copy is in COPYING + * + * Changes by Albert Cahalan, 2002. + * */ diff --git a/pmap.c b/pmap.c index 80eefa04..bb8ef368 100644 --- a/pmap.c +++ b/pmap.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights reserved. + * Copyright 2002 by Albert Cahalan; all rights reserved. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/proc/alloc.c b/proc/alloc.c index a4ed1b19..4a0aca75 100644 --- a/proc/alloc.c +++ b/proc/alloc.c @@ -1,10 +1,10 @@ -/***********************************************************************\ -* Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com * -* * -* This file is placed under the conditions of the GNU Library * -* General Public License, version 2, or any later version. * -* See file COPYING for information on distribution conditions. * -\***********************************************************************/ +// Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com +// Copyright 2002 Albert Cahalan +// +// This file is placed under the conditions of the GNU Library +// General Public License, version 2, or any later version. +// See file COPYING for information on distribution conditions. + #include #include #include "alloc.h" diff --git a/proc/compare.c b/proc/compare.c index b3fb3182..e072794c 100644 --- a/proc/compare.c +++ b/proc/compare.c @@ -5,6 +5,7 @@ * under the conditions of the GNU Library General Public License. * See the file COPYING for details. * + * Copyright 2002 Albert Cahalan */ #include /* for strcmp */ diff --git a/proc/devname.c b/proc/devname.c index 2b1da274..162ce2cd 100644 --- a/proc/devname.c +++ b/proc/devname.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights resered. + * Copyright 1998-2002 by Albert Cahalan; all rights resered. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/proc/ksym.c b/proc/ksym.c index 275c2b0b..c8a326c0 100644 --- a/proc/ksym.c +++ b/proc/ksym.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights reserved. + * Copyright 1998-2002 by Albert Cahalan; all rights reserved. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/proc/output.c b/proc/output.c index 3863dc25..bd21f7ec 100644 --- a/proc/output.c +++ b/proc/output.c @@ -1,7 +1,8 @@ -/* - Some output conversion routines for libproc - Copyright (C) 1996, Charles Blake. See COPYING for details. -*/ +// Some output conversion routines for libproc +// Copyright (C) 1996, Charles Blake. See COPYING for details. +// +// Copyright 2002, Albert Cahalan + #include #include #include diff --git a/proc/pwcache.c b/proc/pwcache.c index 51dd2d20..19b64c01 100644 --- a/proc/pwcache.c +++ b/proc/pwcache.c @@ -1,10 +1,11 @@ -/***********************************************************************\ -* Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com * -* * -* This file is placed under the conditions of the GNU Library * -* General Public License, version 2, or any later version. * -* See file ../COPYING for information on distribution conditions. * -\***********************************************************************/ +// Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com +// Note: most likely none of his code remains +// +// Copyright 2002, Albert Cahalan +// +// This file is placed under the conditions of the GNU Library +// General Public License, version 2, or any later version. +// See file COPYING for information on distribution conditions. #include #include diff --git a/proc/readproc.c b/proc/readproc.c index 132462f9..c8a9fddf 100644 --- a/proc/readproc.c +++ b/proc/readproc.c @@ -2,6 +2,7 @@ * New Interface to Process Table -- PROCTAB Stream (a la Directory streams) * Copyright (C) 1996 Charles L. Blake. * Copyright (C) 1998 Michael K. Johnson + * Copyright 1998-2002 Albert Cahalan * May be distributed under the conditions of the * GNU Library General Public License; a copy is in COPYING */ diff --git a/proc/readproc.h b/proc/readproc.h index 4bb24bd5..5452ae0f 100644 --- a/proc/readproc.h +++ b/proc/readproc.h @@ -2,8 +2,9 @@ #define PROCPS_PROC_READPROC_H /* * New Interface to Process Table -- PROCTAB Stream (a la Directory streams) - * Copyright (C) 1996 Charles L. Blake. - * Copyright (C) 1998 Michael K. Johnson + * Copyright 1996 Charles L. Blake. + * Copyright 1998 Michael K. Johnson + * Copyright 1998-2002 Albert Cahalan * May be distributed under the terms of the * GNU Library General Public License, a copy of which is provided * in the file COPYING diff --git a/proc/sig.c b/proc/sig.c index f5971637..ca41c6a1 100644 --- a/proc/sig.c +++ b/proc/sig.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights resered. + * Copyright 1998-2002 by Albert Cahalan; all rights resered. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/proc/sig.h b/proc/sig.h index 9e8e07b1..d9518e5a 100644 --- a/proc/sig.h +++ b/proc/sig.h @@ -1,7 +1,7 @@ #ifndef PROC_SIG_H #define PROC_SIG_H /* - * Copyright 1998 by Albert Cahalan; all rights resered. + * Copyright 1998-2002 by Albert Cahalan; all rights resered. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/proc/status.c b/proc/status.c index 93ba36f6..341d5544 100644 --- a/proc/status.c +++ b/proc/status.c @@ -1,11 +1,9 @@ -/***********************************************************************\ -* Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com * -* * -* This file is placed under the conditions of the GNU Library * -* General Public License, version 2, or any later version. * -* See file COPYING for information on distribution conditions. * -\***********************************************************************/ - +// Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com +// Copyright 2002 Albert Cahalan +// +// This file is placed under the conditions of the GNU Library +// General Public License, version 2, or any later version. +// See file COPYING for information on distribution conditions. #include "procps.h" #include "readproc.h" diff --git a/proc/sysinfo.c b/proc/sysinfo.c index 311a1dec..4fe6eb8d 100644 --- a/proc/sysinfo.c +++ b/proc/sysinfo.c @@ -1,10 +1,9 @@ -/***********************************************************************\ -* Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com * -* * -* This file is placed under the conditions of the GNU Library * -* General Public License, version 2, or any later version. * -* See file COPYING for information on distribution conditions. * -\***********************************************************************/ +// Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com +// Copyright 1998-2002 Albert Cahalan +// +// This file is placed under the conditions of the GNU Library +// General Public License, version 2, or any later version. +// See file COPYING for information on distribution conditions. /* File for parsing top-level /proc entities. */ diff --git a/proc/version.c b/proc/version.c index 277a0e9b..c9b9b798 100644 --- a/proc/version.c +++ b/proc/version.c @@ -1,6 +1,9 @@ /* Suite version information for procps utilities * Copyright (c) 1995 Martin Schulze * Ammended by cblake to only export the function symbol. + * + * Modified by Albert Cahalan + * * Redistributable under the terms of the * GNU Library General Public License; see COPYING */ diff --git a/proc/version.h b/proc/version.h index 15fa96f7..3769b847 100644 --- a/proc/version.h +++ b/proc/version.h @@ -8,6 +8,8 @@ * Linux kernel version information for procps utilities * Copyright (c) 1996 Charles Blake * Distributable under the terms of the GNU Library General Public License + * + * Copyright 2002 Albert Cahalan */ EXTERN_C_BEGIN diff --git a/procps.lsm b/procps.lsm index 12d66895..1815181f 100644 --- a/procps.lsm +++ b/procps.lsm @@ -1,15 +1,15 @@ Begin4 Title: procps -Version: 3.1.3 -Entered-date: 2002-12-11 +Version: 3.1.4 +Entered-date: 2002-12-14 Description: Linux system utilities Keywords: procps /proc libproc sysctl pmap ps uptime tload free w top vmstat watch skill snice kill pgrep pkill Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc. Maintained-by: various Primary-site: http://procps.sf.net/ - 236kB procps-3.1.3.tar.gz + 236kB procps-3.1.4.tar.gz Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html - 236kB procps-3.1.3.tar.gz + 236kB procps-3.1.4.tar.gz Copying-policy: mixed End diff --git a/procps.spec b/procps.spec index f73d540d..3ac60d03 100644 --- a/procps.spec +++ b/procps.spec @@ -3,7 +3,7 @@ Summary: System and process monitoring utilities Name: procps %define major_version 3 %define minor_version 1 -%define revision 3 +%define revision 4 %define version %{major_version}.%{minor_version}.%{revision} Version: %{version} Release: 1 diff --git a/ps/common.h b/ps/common.h index 21b2d530..b91d3548 100644 --- a/ps/common.h +++ b/ps/common.h @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights resered. + * Copyright 1998-2002 by Albert Cahalan; all rights resered. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/ps/display.c b/ps/display.c index 704606b6..b8475de6 100644 --- a/ps/display.c +++ b/ps/display.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights resered. + * Copyright 1998-2002 by Albert Cahalan; all rights resered. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/ps/escape.c b/ps/escape.c index 85293b2f..424cb38a 100644 --- a/ps/escape.c +++ b/ps/escape.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights resered. + * Copyright 1998-2002 by Albert Cahalan; all rights resered. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/ps/global.c b/ps/global.c index 7330f04d..ffe5ec99 100644 --- a/ps/global.c +++ b/ps/global.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights resered. + * Copyright 1998-2002 by Albert Cahalan; all rights resered. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/ps/help.c b/ps/help.c index 15ea93b8..29ab28fc 100644 --- a/ps/help.c +++ b/ps/help.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights reserved. + * Copyright 1998-2002 by Albert Cahalan; all rights reserved. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/ps/output.c b/ps/output.c index d0216505..708fb754 100644 --- a/ps/output.c +++ b/ps/output.c @@ -1,5 +1,5 @@ /* - * Copyright 1999 by Albert Cahalan; all rights resered. + * Copyright 1999-2002 by Albert Cahalan; all rights reserved. * * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version diff --git a/ps/parser.c b/ps/parser.c index b00f769f..cb121819 100644 --- a/ps/parser.c +++ b/ps/parser.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights reserved. + * Copyright 1998-2002 by Albert Cahalan; all rights reserved. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/ps/select.c b/ps/select.c index 57ab59c9..b582550c 100644 --- a/ps/select.c +++ b/ps/select.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights resered. + * Copyright 1998-2002 by Albert Cahalan; all rights resered. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/ps/sortformat.c b/ps/sortformat.c index 3a5076d5..0536d33c 100644 --- a/ps/sortformat.c +++ b/ps/sortformat.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights resered. + * Copyright 1998-2002 by Albert Cahalan; all rights resered. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/skill.c b/skill.c index e4dce0d7..c4bd7bca 100644 --- a/skill.c +++ b/skill.c @@ -1,5 +1,5 @@ /* - * Copyright 1998 by Albert Cahalan; all rights resered. + * Copyright 1998-2002 by Albert Cahalan; all rights resered. * This file may be used subject to the terms and conditions of the * GNU Library General Public License Version 2, or any later version * at your option, as published by the Free Software Foundation. diff --git a/sysctl.c b/sysctl.c index 356f04fb..5e10d159 100644 --- a/sysctl.c +++ b/sysctl.c @@ -15,6 +15,8 @@ * Changelog: * v1.01: * - added -p to preload values from a file + * + * Changes by Albert Cahalan, 2002. */ diff --git a/top.c b/top.c index e2ac6a85..07cf2997 100644 --- a/top.c +++ b/top.c @@ -12,10 +12,12 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. - */ -/* For their contributions to this program, the author wishes to thank: + * + * For their contributions to this program, the author wishes to thank: * Albert D. Cahalan, * Craig Small, + * + * Changes by Albert Cahalan, 2002. */ #include #include diff --git a/top.h b/top.h index df779281..5a38b7e8 100644 --- a/top.h +++ b/top.h @@ -12,11 +12,14 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. - */ -/* For their contributions to this program, the author wishes to thank: + * + * For their contributions to this program, the author wishes to thank: * Albert D. Cahalan, * Craig Small, + * + * Changes by Albert Cahalan, 2002. */ + #ifndef _Itop #define _Itop diff --git a/w.c b/w.c index b0340758..e9b0af5e 100644 --- a/w.c +++ b/w.c @@ -2,6 +2,8 @@ * scratch by Charles Blake circa June 1996. Some vestigal traces of the * original may exist. That was done in 1993 by Larry Greenfield with some * fixes by Michael K. Johnson. + * + * Changes by Albert Cahalan, 2002. */ #include "proc/version.h" #include "proc/whattime.h" diff --git a/watch.c b/watch.c index 571bb044..9e20cdfc 100644 --- a/watch.c +++ b/watch.c @@ -6,6 +6,8 @@ * Substantially reworked, new features (differences option, SIGWINCH * handling, unlimited command length, long line handling) added Apr 1999 by * Mike Coleman . + * + * Changes by Albert Cahalan, 2002. */ #define VERSION "0.2.0"