From 8fb2c893f4543efcd61cdf4666fb726ecfc0719a Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Wed, 7 Mar 2012 16:21:14 +0100 Subject: [PATCH] Initial import (#797962). --- .gitignore | 1 + procps-ng-3.3.2-fsf-address.patch | 24 + procps-ng-3.3.2-license.patch | 1196 +++++++++++++++++++++++++++++ procps-ng.spec | 144 ++++ sources | 1 + 5 files changed, 1366 insertions(+) create mode 100644 procps-ng-3.3.2-fsf-address.patch create mode 100644 procps-ng-3.3.2-license.patch create mode 100644 procps-ng.spec diff --git a/.gitignore b/.gitignore index e69de29..a75fd7f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/procps-ng-3.3.2.tar.xz diff --git a/procps-ng-3.3.2-fsf-address.patch b/procps-ng-3.3.2-fsf-address.patch new file mode 100644 index 0000000..e48aef1 --- /dev/null +++ b/procps-ng-3.3.2-fsf-address.patch @@ -0,0 +1,24 @@ +diff -Naur procps-ng-3.3.2.orig/COPYING procps-ng-3.3.2/COPYING +--- procps-ng-3.3.2.orig/COPYING 2012-01-06 06:48:09.000000000 +0100 ++++ procps-ng-3.3.2/COPYING 2012-02-24 12:24:12.255999996 +0100 +@@ -2,7 +2,7 @@ + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +diff -Naur procps-ng-3.3.2.orig/COPYING.LIB procps-ng-3.3.2/COPYING.LIB +--- procps-ng-3.3.2.orig/COPYING.LIB 2012-01-06 06:48:09.000000000 +0100 ++++ procps-ng-3.3.2/COPYING.LIB 2012-02-24 12:24:20.431999511 +0100 +@@ -2,7 +2,7 @@ + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + diff --git a/procps-ng-3.3.2-license.patch b/procps-ng-3.3.2-license.patch new file mode 100644 index 0000000..380b34a --- /dev/null +++ b/procps-ng-3.3.2-license.patch @@ -0,0 +1,1196 @@ +From 240ef79448b4926255fb9878b308d6a8355414b3 Mon Sep 17 00:00:00 2001 +From: Sami Kerola +Date: Fri, 2 Mar 2012 13:29:36 +0100 +Subject: [PATCH] docs: clarification to license headers in files + +Add license header to all files. The summary of licensing is below, +taken from Craig Small's email which is referred in commit message +tail. + +sysctl and pgrep are GPL 2+ +The rest is LGPL 2.1+ + +Reference: http://www.freelists.org/post/procps/Incorrect-FSF-address-in-the-license-files,8 +Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=797962 +CC: Craig Small +CC: Jaromir Capik +Signed-off-by: Sami Kerola +--- + contrib/dummy.c | 21 +++++++++++++++++++-- + contrib/minimal.c | 21 ++++++++++++++------- + contrib/tmp-junk.c | 23 +++++++++++++++++++---- + contrib/utmp.c | 19 +++++++++++++++++++ + free.c | 18 ++++++++++++++++-- + lib/strutils.c | 18 ++++++++++++++++++ + pgrep.c | 21 ++++++++++++++------- + pmap.c | 22 +++++++++++++++------- + proc/alloc.c | 25 +++++++++++++++++++------ + proc/devname.c | 22 +++++++++++++++------- + proc/escape.c | 25 +++++++++++++++++-------- + proc/ksym.c | 23 ++++++++++++++++------- + proc/pwcache.c | 30 ++++++++++++++++++++++-------- + proc/readproc.c | 16 ++++++++++++++-- + proc/sig.c | 23 ++++++++++++++++------- + proc/slab.c | 16 ++++++++++++++-- + proc/sysinfo.c | 30 ++++++++++++++++++++---------- + proc/version.c | 18 +++++++++++++++--- + proc/whattime.c | 16 +++++++++++++++- + ps/display.c | 22 +++++++++++++++------- + ps/global.c | 22 +++++++++++++++------- + ps/help.c | 22 +++++++++++++++------- + ps/output.c | 21 ++++++++++++++------- + ps/parser.c | 22 +++++++++++++++------- + ps/select.c | 22 +++++++++++++++------- + ps/sortformat.c | 22 +++++++++++++++------- + ps/stacktrace.c | 15 +++++++++++++++ + pwdx.c | 21 ++++++++++++++------- + skill.c | 23 ++++++++++++++++------- + slabtop.c | 16 ++++++++++++++-- + sysctl.c | 20 ++++++++++++++------ + tload.c | 15 +++++++++++++++ + uptime.c | 19 +++++++++++++++++++ + vmstat.c | 17 ++++++++++++++++- + w.c | 14 ++++++++++++++ + watch.c | 14 ++++++++++++++ + 36 files changed, 572 insertions(+), 162 deletions(-) + +diff --git a/contrib/dummy.c b/contrib/dummy.c +index 95e7824..dffc707 100644 +--- a/contrib/dummy.c ++++ b/contrib/dummy.c +@@ -1,4 +1,21 @@ +-// This is to test the compiler. ++/* ++ * This is to test the compiler. ++ * Copyright (C) Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ + + #include + #include +@@ -15,7 +32,7 @@ + #include + #include + +-// Foul POS defines all sorts of stuff... ++/* Foul POS defines all sorts of stuff... */ + #include + #undef tab + +diff --git a/contrib/minimal.c b/contrib/minimal.c +index 820c11d..cda1423 100644 +--- a/contrib/minimal.c ++++ b/contrib/minimal.c +@@ -1,12 +1,19 @@ + /* +- * Copyright 1998,2004 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. +- * This program is distributed in the hope that it will be useful, ++ * Copyright 1998,2004 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + /* This is a minimal /bin/ps, designed to be smaller than the old ps +diff --git a/contrib/tmp-junk.c b/contrib/tmp-junk.c +index db011b1..06f4da8 100644 +--- a/contrib/tmp-junk.c ++++ b/contrib/tmp-junk.c +@@ -1,13 +1,28 @@ + /* +- * w.c v1.4 +- * +- * An alternative "w" program for Linux. +- * Shows users and their processes. ++ * w.c - show logged users and what they are doing + * + * Copyright (c) Dec 1993, Oct 1994 Steve "Mr. Bassman" Bryant + * bassman@hpbbi30.bbn.hp.com (Old address) + * bassman@muttley.soc.staffs.ac.uk + * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++/* An alternative "w" program for Linux. ++ * Shows users and their processes. ++ * + * Info: + * I starting writing as an improvement of the w program included + * with linux. The idea was to add in some extra functionality to the +diff --git a/contrib/utmp.c b/contrib/utmp.c +index 936a7f6..933a31e 100644 +--- a/contrib/utmp.c ++++ b/contrib/utmp.c +@@ -1,3 +1,22 @@ ++/* ++ * utmp.c - utmp printing command ++ * Copyright (C) Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ + #include + #include + #include +diff --git a/free.c b/free.c +index 5a618d3..7df8563 100644 +--- a/free.c ++++ b/free.c +@@ -2,14 +2,28 @@ + * free.c - free(1) + * procps-ng utility to display free memory information + * ++ * Copyright (C) 1992-2012 ++ * + * Mostly new, Sami Kerola 15 Apr 2011 + * All new, Robert Love 18 Nov 2002 + * Original by Brian Edmonds and Rafal Maszkowski 14 Dec 1992 + * +- * This program is licensed under the GNU Library General Public License, v2 +- * + * Copyright 2003 Robert Love + * Copyright 2004 Albert Cahalan ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + + #include "config.h" +diff --git a/lib/strutils.c b/lib/strutils.c +index 325e18c..2d63b87 100644 +--- a/lib/strutils.c ++++ b/lib/strutils.c +@@ -1,5 +1,23 @@ + /* ++ * strutils.c - various string routines shared by commands + * This file was copied from util-linux at fall 2011. ++ * ++ * Copyright (C) 2010 Karel Zak ++ * Copyright (C) 2010 Davidlohr Bueso ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + + #include +diff --git a/pgrep.c b/pgrep.c +index b9e6fe2..239120c 100644 +--- a/pgrep.c ++++ b/pgrep.c +@@ -1,17 +1,24 @@ +-/* emacs settings: -*- c-basic-offset: 8 tab-width: 8 -*- +- * ++/* + * pgrep/pkill -- utilities to filter the process table + * + * Copyright 2000 Kjetil Torgrim Homme ++ * Changes by Albert Cahalan, 2002,2006. + * +- * May be distributed under the conditions of the +- * GNU General Public License; a copy is in COPYING ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. + * +- * Changes by Albert Cahalan, 2002,2006. +- * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +- + #include + #include + #include +diff --git a/pmap.c b/pmap.c +index 88f1bf1..1f8b0a0 100644 +--- a/pmap.c ++++ b/pmap.c +@@ -1,12 +1,20 @@ + /* +- * 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. +- * This program is distributed in the hope that it will be useful, ++ * pmap.c - print process memory mapping ++ * Copyright 2002 Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/proc/alloc.c b/proc/alloc.c +index 21185cc..671d752 100644 +--- a/proc/alloc.c ++++ b/proc/alloc.c +@@ -1,9 +1,22 @@ +-// 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. ++/* ++ * alloc.c - memory allocation functions ++ * Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com ++ * Copyright 2002 Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ + + #include + #include +diff --git a/proc/devname.c b/proc/devname.c +index fa96523..f9f1a37 100644 +--- a/proc/devname.c ++++ b/proc/devname.c +@@ -1,12 +1,20 @@ + /* +- * 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. +- * This program is distributed in the hope that it will be useful, ++ * devname - device name functions ++ * Copyright 1998-2002 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/proc/escape.c b/proc/escape.c +index ca73198..1b1ca97 100644 +--- a/proc/escape.c ++++ b/proc/escape.c +@@ -1,13 +1,22 @@ + /* +- * 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. +- * This program is distributed in the hope that it will be useful, ++ * escape.c - printing handling ++ * Copyright 1998-2002 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. +- */ ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ + #include + #include + #include +diff --git a/proc/ksym.c b/proc/ksym.c +index b99a8a6..fe8ff4e 100644 +--- a/proc/ksym.c ++++ b/proc/ksym.c +@@ -1,13 +1,22 @@ + /* +- * Copyright 1998-2003 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. +- * This program is distributed in the hope that it will be useful, ++ * ksym.c - kernel symbol handling ++ * Copyright 1998-2003 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ ++ + #include + #include + #include +diff --git a/proc/pwcache.c b/proc/pwcache.c +index 4b6c455..e20ba66 100644 +--- a/proc/pwcache.c ++++ b/proc/pwcache.c +@@ -1,11 +1,25 @@ +-// 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. ++/* ++ * pwcache.c - memory cache passwd file handling ++ * ++ * Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com ++ * Note: most likely none of his code remains ++ * ++ * Copyright 2002, Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ + + #include + #include +diff --git a/proc/readproc.c b/proc/readproc.c +index c0345d7..36658d9 100644 +--- a/proc/readproc.c ++++ b/proc/readproc.c +@@ -3,8 +3,20 @@ + * Copyright (C) 1996 Charles L. Blake. + * Copyright (C) 1998 Michael K. Johnson + * Copyright 1998-2003 Albert Cahalan +- * May be distributed under the conditions of the +- * GNU Library General Public License; a copy is in COPYING ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include "version.h" +diff --git a/proc/sig.c b/proc/sig.c +index b427e01..9fc91f7 100644 +--- a/proc/sig.c ++++ b/proc/sig.c +@@ -1,13 +1,22 @@ + /* +- * Copyright 1998-2003 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. +- * This program is distributed in the hope that it will be useful, ++ * sig.c - signal name, and number, conversions ++ * Copyright 1998-2003 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ ++ + #include + #include + #include +diff --git a/proc/slab.c b/proc/slab.c +index c1e8624..b0bccaa 100644 +--- a/proc/slab.c ++++ b/proc/slab.c +@@ -4,10 +4,22 @@ + * Chris Rivera + * Robert Love + * +- * This program is licensed under the GNU Library General Public License, v2 +- * + * Copyright (C) 2003 Chris Rivera + * Copyright 2004, Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/proc/sysinfo.c b/proc/sysinfo.c +index 1d7b797..3851ff7 100644 +--- a/proc/sysinfo.c ++++ b/proc/sysinfo.c +@@ -1,13 +1,23 @@ +-// Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com +-// Copyright 1998-2003 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. */ +-// +-// June 2003, Fabian Frederick, disk and slab info ++/* ++ * File for parsing top-level /proc entities. ++ * Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com ++ * Copyright 1998-2003 Albert Cahalan ++ * June 2003, Fabian Frederick, disk and slab info ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ + + #include + #include +diff --git a/proc/version.c b/proc/version.c +index 593f4f4..e0dca3c 100644 +--- a/proc/version.c ++++ b/proc/version.c +@@ -1,11 +1,23 @@ +-/* Suite version information for procps-ng utilities ++/* ++ * Suite version information for procps-ng utilities + * Copyright (c) 1995 Martin Schulze + * Ammended by cblake to only export the function symbol. + * + * Modified by Albert Cahalan, ????-2003 + * +- * Redistributable under the terms of the +- * GNU Library General Public License; see COPYING ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/proc/whattime.c b/proc/whattime.c +index 5064cec..9d6abb3 100644 +--- a/proc/whattime.c ++++ b/proc/whattime.c +@@ -1,4 +1,5 @@ +-/* This is a trivial uptime program. I hereby release this program ++/* ++ * This is a trivial uptime program. I hereby release this program + * into the public domain. I disclaim any responsibility for this + * program --- use it at your own risk. (as if there were any.. ;-) + * -michaelkjohnson (johnsonm@sunsite.unc.edu) +@@ -11,6 +12,19 @@ + * Modified by J. Cowley to add printing the uptime message to a + * string (for top) and to optimize file handling. 19 Mar 1993. + * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/ps/display.c b/ps/display.c +index 1676426..3038600 100644 +--- a/ps/display.c ++++ b/ps/display.c +@@ -1,12 +1,20 @@ + /* +- * Copyright 1998-2003 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. +- * This program is distributed in the hope that it will be useful, ++ * display.c - display ps output ++ * Copyright 1998-2003 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/ps/global.c b/ps/global.c +index 4a625df..70f26fa 100644 +--- a/ps/global.c ++++ b/ps/global.c +@@ -1,12 +1,20 @@ + /* +- * 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. +- * This program is distributed in the hope that it will be useful, ++ * global.c - generic ps symbols and functions ++ * Copyright 1998-2002 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/ps/help.c b/ps/help.c +index 9ce9e76..028d186 100644 +--- a/ps/help.c ++++ b/ps/help.c +@@ -1,12 +1,20 @@ + /* +- * Copyright 1998-2004 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. +- * This program is distributed in the hope that it will be useful, ++ * help.c - ps help output ++ * Copyright 1998-2004 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/ps/output.c b/ps/output.c +index 58d0cf6..f97fa63 100644 +--- a/ps/output.c ++++ b/ps/output.c +@@ -1,13 +1,20 @@ + /* +- * Copyright 1999-2004 by Albert Cahalan; all rights reserved. ++ * output.c - ps output definitions ++ * Copyright 1999-2004 by Albert Cahalan + * +- * 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. +- * This program is distributed in the hope that it will be useful, ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + /* +diff --git a/ps/parser.c b/ps/parser.c +index 13329b9..2c3ec03 100644 +--- a/ps/parser.c ++++ b/ps/parser.c +@@ -1,12 +1,20 @@ + /* +- * Copyright 1998-2003 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. +- * This program is distributed in the hope that it will be useful, ++ * parser.c - ps command options parser ++ * Copyright 1998-2003 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + /* Ought to have debug print stuff like this: +diff --git a/ps/select.c b/ps/select.c +index 524544d..619d895 100644 +--- a/ps/select.c ++++ b/ps/select.c +@@ -1,12 +1,20 @@ + /* +- * 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. +- * This program is distributed in the hope that it will be useful, ++ * select.c - ps process selection ++ * Copyright 1998-2002 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/ps/sortformat.c b/ps/sortformat.c +index 06335cc..eeec7e9 100644 +--- a/ps/sortformat.c ++++ b/ps/sortformat.c +@@ -1,12 +1,20 @@ + /* +- * Copyright 1998-2004 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. +- * This program is distributed in the hope that it will be useful, ++ * sortformat - ps output sorting ++ * Copyright 1998-2004 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/ps/stacktrace.c b/ps/stacktrace.c +index b831401..a4e2938 100644 +--- a/ps/stacktrace.c ++++ b/ps/stacktrace.c +@@ -1,8 +1,23 @@ + /* ++ * stacktrace.c - ps debugging additions + * Gnu debugger stack trace code provided by Peter Mattis + * on Thu, 2 Nov 1995 + * + * Modified for easy use by Albert Cahalan. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/pwdx.c b/pwdx.c +index 24c7b8d..fa1a47e 100644 +--- a/pwdx.c ++++ b/pwdx.c +@@ -1,13 +1,20 @@ + /* ++ * pwdx.c - print process working directory + * Copyright 2004 Nicholas Miell + * +- * This file may be used subject to the terms and conditions of the +- * GNU Library General Public License Version 2 as published by the +- * Free Software Foundation.This program is distributed in the hope +- * that it will be useful, 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. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/skill.c b/skill.c +index 0ea21ca..8fe0639 100644 +--- a/skill.c ++++ b/skill.c +@@ -1,13 +1,22 @@ + /* +- * 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. +- * This program is distributed in the hope that it will be useful, ++ * skill.c - send a signal to process ++ * Copyright 1998-2002 by Albert Cahalan ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, + * 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. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ ++ + #include + #include + #include +diff --git a/slabtop.c b/slabtop.c +index 567556a..17c1fcc 100644 +--- a/slabtop.c ++++ b/slabtop.c +@@ -4,9 +4,21 @@ + * Chris Rivera + * Robert Love + * +- * This program is licensed under the GNU Library General Public License, v2 +- * + * Copyright (C) 2003 Chris Rivera ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/sysctl.c b/sysctl.c +index b6f6fc0..a2fa211 100644 +--- a/sysctl.c ++++ b/sysctl.c +@@ -2,12 +2,20 @@ + * Sysctl 1.01 - A utility to read and manipulate the sysctl parameters + * + * "Copyright 1999 George Staikos +- * This file may be used subject to the terms and conditions of the GNU +- * General Public License Version 2, or any later version at your option, as +- * published by the Free Software Foundation. This program is distributed in +- * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even +- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +- * PURPOSE. See the GNU General Public License for more details." ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Changelog: + * v1.01: +diff --git a/tload.c b/tload.c +index b21ddd8..151ab46 100644 +--- a/tload.c ++++ b/tload.c +@@ -8,7 +8,22 @@ + * Copyright (c) 1992 Branko Lankester + * /proc changes by David Engel (david@ods.com) + * Made a little more efficient by Michael K. Johnson (johnsonm@sunsite.unc.edu) ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ ++ + #include "proc/version.h" + #include "proc/sysinfo.h" + #include "c.h" +diff --git a/uptime.c b/uptime.c +index 557b08c..a865856 100644 +--- a/uptime.c ++++ b/uptime.c +@@ -1,3 +1,22 @@ ++/* ++ * uptime.c - display system uptime ++ * Copyright (C) 2012 Craig Small ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ + #include + #include + #include +diff --git a/vmstat.c b/vmstat.c +index a28395a..2b1e9a9 100644 +--- a/vmstat.c ++++ b/vmstat.c +@@ -1,4 +1,5 @@ +-/* old: "Copyright 1994 by Henry Ware . Copyleft same year." ++/* ++ * old: "Copyright 1994 by Henry Ware . Copyleft same year." + * most code copyright 2002 Albert Cahalan + * + * 27/05/2003 (Fabian Frederick) : Add unit conversion + interface +@@ -11,6 +12,20 @@ + * July 2003 (Fabian) : Adding disk partition output + * Adding disk table + * Syncing help / usage ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include +diff --git a/w.c b/w.c +index 40c9bee..ceb18c1 100644 +--- a/w.c ++++ b/w.c +@@ -7,6 +7,20 @@ + * Michael K. Johnson. + * + * Changes by Albert Cahalan, 2002. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include "c.h" +diff --git a/watch.c b/watch.c +index aae4632..e9ce7c0 100644 +--- a/watch.c ++++ b/watch.c +@@ -11,6 +11,20 @@ + * Changes by Albert Cahalan, 2002-2003. + * stderr handling, exec, and beep option added by Morty Abzug, 2008 + * Unicode Support added by Jarrod Lowe in 2009. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #include "c.h" +-- +1.7.6 + diff --git a/procps-ng.spec b/procps-ng.spec new file mode 100644 index 0000000..978625e --- /dev/null +++ b/procps-ng.spec @@ -0,0 +1,144 @@ +# testsuite doesn't work yet +%global tests_enabled 0 + +Summary: System and process monitoring utilities +Name: procps-ng +Version: 3.3.2 +Release: 2%{?dist} +License: GPLv2+ and LGPLv2+ +Group: Applications/System +URL: http://gitorious.org/procps + +# git clone git://gitorious.org/procps/procps.git +# cd procps && git archive --format=tar --prefix="procps-ng-3.3.2/" v3.3.2 | xz > procps-ng-3.3.2.tar.xz +Source: %{name}-%{version}.tar.xz + +Patch0: %{name}-3.3.2-fsf-address.patch +# The following patch can't be applied as is, but as it has no effect +# on the target binaries, it doesn't necessarily need to be applied. +# It's included for clarification purposes only. +# wget http://gitorious.org/~kerolasa/procps/sami-procps-ng/commit/240ef79448b4926255fb9878b308d6a8355414b3?format=patch -O procps-ng-3.3.2-license.patch +Patch1: %{name}-3.3.2-license.patch + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +BuildRequires: ncurses-devel +BuildRequires: libtool +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext-devel + +%if %{tests_enabled} +BuildRequires: expect +%endif + +Provides: procps = %{version}-%{release} +Obsoletes: procps < 3.2.9-1 + +# usrmove hack - will be removed once initscripts are fixed +Provides: /sbin/sysctl + +%description +The procps package contains a set of system utilities that provide +system information. Procps includes ps, free, skill, pkill, pgrep, +snice, tload, top, uptime, vmstat, w, watch and pdwx. The ps command +displays a snapshot of running processes. The top command provides +a repetitive update of the statuses of running processes. The free +command displays the amounts of free and used memory on your +system. The skill command sends a terminate command (or another +specified signal) to a specified set of processes. The snice +command is used to change the scheduling priority of specified +processes. The tload command prints a graph of the current system +load average to a specified tty. The uptime command displays the +current time, how long the system has been running, how many users +are logged on, and system load averages for the past one, five, +and fifteen minutes. The w command displays a list of the users +who are currently logged on and what they are running. The watch +program watches a running program. The vmstat command displays +virtual memory statistics about processes, memory, paging, block +I/O, traps, and CPU activity. The pwdx command reports the current +working directory of a process or processes. + +%package devel +Summary: System and process monitoring utilities +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Provides: procps-devel = %{version}-%{release} +Obsoletes: procps-devel < 3.2.9-1 + +%description devel +System and process monitoring utilities development headers + +%prep +%setup -q -n %{name}-%{version} + +%patch0 -p1 + +# The following patch can't be applied as is, but as it has no effect +# on the target binaries, it doesn't necessarily need to be applied. +# It's included for clarification purposes only. +#%%patch1 -p1 + +%build +./autogen.sh +./configure --prefix=/ \ + --bindir=%{_bindir} \ + --sbindir=%{_sbindir} \ + --libdir=%{_libdir} \ + --mandir=%{_mandir} \ + --includedir=%{_includedir} \ + --sysconfdir=%{_sysconfdir} \ + --docdir=/unwanted \ + --disable-static \ + --disable-w-from \ + --disable-kill \ + --disable-rpath + + +make CFLAGS="$RPM_OPT_FLAGS" + + +%if %{tests_enabled} +%check +make check +%endif + + +%install +make DESTDIR=%{buildroot} install + +mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%doc AUTHORS BUGS COPYING COPYING.LIB FAQ NEWS README top/README.top TODO + +%{_libdir}/libprocps.so.* +%{_libdir}/pkgconfig/libprocps.pc +%{_bindir}/* +%{_sbindir}/* +%{_sysconfdir}/sysctl.d +%{_mandir}/man1/* +%{_mandir}/man8/* +%{_mandir}/man5/* + +%exclude %{_libdir}/libprocps.la +%exclude %{_sysconfdir}/sysctl.conf +%exclude /unwanted/* + +%files devel +%doc COPYING COPYING.LIB +%{_libdir}/libprocps.so +%{_includedir}/proc + +%changelog +* Tue Mar 06 2012 Jaromir Capik - 3.3.2-2 +- Fixing requires in the devel subpackage (missing %{?_isa} macro) +- License statement clarification (upstream patch referrenced in the spec header) + +* Mon Feb 27 2012 Jaromir Capik - 3.3.2-1 +- Initial version diff --git a/sources b/sources index e69de29..92d55f6 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +6dd30fc00389cb42104cc88f3ea79959 procps-ng-3.3.2.tar.xz