satisfy GPL section 2a and LGPL section 2b name+date requirement

diff --git a/ChangeLog b/ChangeLog
index ce99468017ed6f70bf38493d645e3b404df984b7..9eb20819624ff9237cc91a9822278cec0e1c3a63 100644 (file)
--- 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 ce99468017ed6f70bf38493d645e3b404df984b7..9eb20819624ff9237cc91a9822278cec0e1c3a63 100644 (file)
--- 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 4770e7c375fe7a78bf0127459afdffc3eb891a03..6ebbada51e6c85adc56102833ba205ef125e7ea7 100644 (file)
--- 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 80eefa04a5e3cf2208ce21193599d350b403ec76..bb8ef368658a6feedf3e8fd35d2c261e5400431f 100644 (file)
--- 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 a4ed1b196bfbedc115aabc534a4dbe61984a26fd..4a0aca75e58bc0ee949caa7930847f75f98399b5 100644 (file)
--- 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 <stdlib.h>
 #include <stdio.h>
 #include "alloc.h"

diff --git a/proc/compare.c b/proc/compare.c
index b3fb3182b8d9474c2c1d63fce3b7f067caa4ccce..e072794cd848379b807e8b5c139c2e9ea08615a2 100644 (file)
--- 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 <string.h>            /* for strcmp */

diff --git a/proc/devname.c b/proc/devname.c
index 2b1da274bff9ecfceb7b946efa725bda3c8ba399..162ce2cd46847775aa271bb4234b6c68d1efd21f 100644 (file)
--- 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 275c2b0b43f6218a8112d73e04b023eed446d7ff..c8a326c080ebf5ea9fb0514ea8a5988b65d38ef1 100644 (file)
--- 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 3863dc2560ebcecc5b9f9a9a7e6dbad5c5abac58..bd21f7ec6bf8cfa2751e779536cbbfd6a01b750a 100644 (file)
--- 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 <stdio.h>
 #include <ctype.h>
 #include <string.h>

diff --git a/proc/pwcache.c b/proc/pwcache.c
index 51dd2d20acc2d88cfd8b5cfb5d6051cf53c0f76b..19b64c01022ebd98d123266d44cd990878ecfe98 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>

diff --git a/proc/readproc.c b/proc/readproc.c
index 132462f95ca25923bc4c49301c10d86fc771578b..c8a9fddf84129e5c4c32f69fb5b8b7d72e8f14c3 100644 (file)
--- 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 4bb24bd5d9788fdef4f8dd72af677c0a5d122094..5452ae0f8252b8a27eefb009700a49f0d8352b04 100644 (file)
--- 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 f597163757ea9b667d0952c6525a79d6f60a2c29..ca41c6a1510f23a5b30942560eda23b03355ed9f 100644 (file)
--- 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 9e8e07b18aa9282ce535916bd9a200f09b9f37e8..d9518e5ac1dbe0a4c0b33a531a4edf3c8de6c4ac 100644 (file)
--- 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 93ba36f6061f1e2f996c4cc45c56b9aac427375d..341d5544852d2fd60e7377494f1c8a6f4f05a811 100644 (file)
--- 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 311a1deceac0d0a2395def466544dc983559d383..4fe6eb8de749b4749a6191b4300e3b0e7fdd3af3 100644 (file)
--- 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 277a0e9b09657844e4aec5403ac64de200e3b2f3..c9b9b798560cef80abe1ce9b6fbdb15ab171e15f 100644 (file)
--- a/proc/version.c
+++ b/proc/version.c
@@ -1,6 +1,9 @@
 /* Suite version information for procps utilities
  * Copyright (c) 1995 Martin Schulze <joey@infodrom.north.de>
  * 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 15fa96f7a1ebdcd634e1563a258268eea991441f..3769b8479c09e8e458c8fc4c58b1d5db7005de76 100644 (file)
--- a/proc/version.h
+++ b/proc/version.h
@@ -8,6 +8,8 @@
  * Linux kernel version information for procps utilities
  * Copyright (c) 1996 Charles Blake <cblake@bbn.com>
  * 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 12d668952c17b3b765e726a9a3d9d26797bf9607..1815181ff75ac630f09a8e9ed04578b8c6b5650d 100644 (file)
--- 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 <procps-feedback@lists.sf.net>
 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 f73d540d7576a66486e53ffc147f28bfb8be21a3..3ac60d032c36b9b4012bf7db5869b9abf1b01ba4 100644 (file)
--- 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 21b2d530a5e0214fbc2bd0c57b4c09d809591b42..b91d35487f59f7d69e244ed17b483e357aa5b547 100644 (file)
--- 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 704606b6a707dc9a9cce98db549c0065a8999380..b8475de66c5572615c469dfba083414672d32147 100644 (file)
--- 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 85293b2f3f56ae628f90e4807fcf24878ba51c01..424cb38a90ca8eaab13ce93aa81fc4361470f377 100644 (file)
--- 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 7330f04daa66a674f673c18b123f668d2ac85ee7..ffe5ec99ca162ce75d97c6778cac898149489463 100644 (file)
--- 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 15ea93b859a2434cf9965b1bc510581d8ba2dc6d..29ab28fce491a5ba4a1f27f166da6437fb3f05d8 100644 (file)
--- 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 d02165058e5e396fbc0c992d98e3207fb1bfdb1f..708fb75490a2124329421814b6e2b896365b1484 100644 (file)
--- 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 b00f769fe88129e7888f29c701ea9cb4d6e3ad1b..cb12181961f5085c03556b04a49b4280c1913ee0 100644 (file)
--- 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 57ab59c9d723841a89f94273390e6dc40b50dbea..b582550c597d1b3c04479775061ddcf47c5ed4cd 100644 (file)
--- 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 3a5076d5b31bf7c389ad3593ee3e920dc84e9191..0536d33cf7c944444ab58ae6cdd17116374cc962 100644 (file)
--- 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 e4dce0d7ecfa63dde449319964cdeb1e8e756647..c4bd7bcaecfd8a42d9363ef0e129345b4b3f0f17 100644 (file)
--- 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 356f04fb1d4177cb9b66d4996675b303039b22a6..5e10d1599ee7ff7b60d78cbfa9aee7a7c02f62a7 100644 (file)
--- a/sysctl.c
+++ b/sysctl.c
@@ -15,6 +15,8 @@
  * Changelog:
  *            v1.01:
  *                   - added -p <preload> to preload values from a file
+ *
+ * Changes by Albert Cahalan, 2002.
  */
 
 

diff --git a/top.c b/top.c
index e2ac6a85435060d1d51346ee0b57a84a70475e31..07cf2997dc735071fbbbc665bf8ea938d24a6312 100644 (file)
--- 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, <albert@users.sf.net>
  *    Craig Small, <csmall@small.dropbear.id.au>
+ *
+ * Changes by Albert Cahalan, 2002.
  */
 #include <sys/ioctl.h>
 #include <sys/resource.h>

diff --git a/top.h b/top.h
index df77928140aa5ffc1ea547cc4534f44b5097493a..5a38b7e89778b70cc88d3428c2706a97348c3ed5 100644 (file)
--- 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, <albert@users.sf.net>
  *    Craig Small, <csmall@small.dropbear.id.au>
+ *
+ * Changes by Albert Cahalan, 2002.
  */
+
 #ifndef _Itop
 #define _Itop
 

diff --git a/w.c b/w.c
index b0340758f63160e4c967590ad2cd85c87c102a37..e9b0af5e71a6a2021e12b4d0ab5c06b3a96b393e 100644 (file)
--- 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 571bb044ed5550c607486733cd796d19a2e55552..9e20cdfc3e1e75534036a8ac5e108f5ab7d208f7 100644 (file)
--- 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 <mkc@acm.org>.
+ *
+ * Changes by Albert Cahalan, 2002.
  */
 
 #define VERSION "0.2.0"