From 251dce28832371fda60e1dd854ba621267dead8d0014a01f041a196dc97b06d3 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 15 Aug 2011 13:03:00 +0000 Subject: [PATCH] Accepting request 78620 from Base:System - Update to pcp-3.5.8. + Rework rsyslog PMDA to remove Switch use, very odd behaviour observed on RHEL5.2 (mysteriously failing to compile). + Add in Kens scripting defenses against dodgey toolchains. - Update to pcp-3.5.7. + Fix build issue on SLES11 SP1 IA64 systems. + Improved rsyslog PMDA handling of queue metrics. + Add open file-descriptor count metric to the Linux PMDA. + Implement logger PMDA line-oriented event mode. + Add regular expression based event filtering in logger PMDA. + The default pmcd.conf now has an access control section, and all remote store operations are blocked by default. - Update to pcp-3.5.6. + Fix warning from pmie_daily with some /bin/pwd versions. + Numerous Debian packaging updates for lintian cleanliness. + Fixed typos in several man pages. + Added ElasticSearch PMDA. + Fix build on RHEL4 with older sys/queue.h variant. - Update to pcp-3.5.5. + Resolve Debian packaging issues preventing new uploads. + Fix warnings from pmie_check with some /bin/pwd versions. - Update to pcp-3.5.4. + Fix warnings from pmlogger_check with some /bin/pwd versions. - Update to pcp-3.5.3. + Remove reliance on a cpp binary being installed locally. + Ensure compressed pmie log files are also cleaned up daily. + Extend the event store mechanism to be more generally useful. (forwarded request 78537 from dmdiss) OBS-URL: https://build.opensuse.org/request/show/78620 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcp?expand=0&rev=17 --- pcp-2.5.0-GCC44.patch | 3181 -------------------------------- pcp-2.5.0-SuSE.diff | 92 - pcp-2.5.0-buffer-overflow.diff | 11 - pcp-2.5.0-ndbm.diff | 42 - pcp-2.5.0-rpmlint.diff | 12 - pcp-2.5.0.src.tar.gz | 3 - pcp-3.5.8-1.src.tar.gz | 3 + pcp-gcc43.patch | 1747 ------------------ pcp-init.patch | 39 - pcp-pic.diff | 73 - pcp-xenbuild.patch | 12 +- pcp.changes | 533 ++++++ pcp.spec | 537 +++--- static_lib_perms.diff | 125 ++ 14 files changed, 994 insertions(+), 5416 deletions(-) delete mode 100644 pcp-2.5.0-GCC44.patch delete mode 100644 pcp-2.5.0-SuSE.diff delete mode 100644 pcp-2.5.0-buffer-overflow.diff delete mode 100644 pcp-2.5.0-ndbm.diff delete mode 100644 pcp-2.5.0-rpmlint.diff delete mode 100644 pcp-2.5.0.src.tar.gz create mode 100644 pcp-3.5.8-1.src.tar.gz delete mode 100644 pcp-gcc43.patch delete mode 100644 pcp-init.patch delete mode 100644 pcp-pic.diff create mode 100644 static_lib_perms.diff diff --git a/pcp-2.5.0-GCC44.patch b/pcp-2.5.0-GCC44.patch deleted file mode 100644 index 704aa93..0000000 --- a/pcp-2.5.0-GCC44.patch +++ /dev/null @@ -1,3181 +0,0 @@ -Index: pcp-2.5.0/src/dbpmda/src/dbpmda.c -=================================================================== ---- pcp-2.5.0.orig/src/dbpmda/src/dbpmda.c -+++ pcp-2.5.0/src/dbpmda/src/dbpmda.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: dbpmda.c,v 2.19 2002/07/05 02:57:20 kenmcd Exp $" -+// "$Id: dbpmda.c,v 2.19 2002/07/05 02:57:20 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/dbpmda/src/gram.save.c -=================================================================== ---- pcp-2.5.0.orig/src/dbpmda/src/gram.save.c -+++ pcp-2.5.0/src/dbpmda/src/gram.save.c -@@ -45,7 +45,7 @@ - - #line 24 "gram.y" - --#ident "$Id: gram.save.c,v 1.1 2004/07/02 05:52:57 kenmcd Exp $" -+// "$Id: gram.save.c,v 1.1 2004/07/02 05:52:57 kenmcd Exp $" - - #include - #include "./dbpmda.h" -Index: pcp-2.5.0/src/dbpmda/src/gram.y -=================================================================== ---- pcp-2.5.0.orig/src/dbpmda/src/gram.y -+++ pcp-2.5.0/src/dbpmda/src/gram.y -@@ -20,7 +20,7 @@ - */ - - %{ --#ident "$Id: gram.y,v 2.11 1997/07/14 23:42:04 kenmcd Exp $" -+// "$Id: gram.y,v 2.11 1997/07/14 23:42:04 kenmcd Exp $" - - #include - #include "./dbpmda.h" -Index: pcp-2.5.0/src/dbpmda/src/lex.l -=================================================================== ---- pcp-2.5.0.orig/src/dbpmda/src/lex.l -+++ pcp-2.5.0/src/dbpmda/src/lex.l -@@ -20,7 +20,7 @@ - */ - - %{ --#ident "$Id: lex.l,v 2.14 2004/06/30 01:05:59 kenmcd Exp $" -+// "$Id: lex.l,v 2.14 2004/06/30 01:05:59 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/include/pmda.h -=================================================================== ---- pcp-2.5.0.orig/src/include/pmda.h -+++ pcp-2.5.0/src/include/pmda.h -@@ -22,7 +22,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmda.h,v 1.7 2005/08/31 01:50:24 kenmcd Exp $" -+// "$Id: pmda.h,v 1.7 2005/08/31 01:50:24 kenmcd Exp $" - - #include - -Index: pcp-2.5.0/src/libpcp/src/AF.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/AF.c -+++ pcp-2.5.0/src/libpcp/src/AF.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: AF.c,v 1.26 2004/06/07 10:17:19 nathans Exp $" -+// "$Id: AF.c,v 1.26 2004/06/07 10:17:19 nathans Exp $" - - /* - * general purpose asynchronous event management -Index: pcp-2.5.0/src/libpcp/src/access.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/access.c -+++ pcp-2.5.0/src/libpcp/src/access.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: access.c,v 1.21 2004/07/22 07:00:57 kenmcd Exp $" -+// "$Id: access.c,v 1.21 2004/07/22 07:00:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/auxconnect.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/auxconnect.c -+++ pcp-2.5.0/src/libpcp/src/auxconnect.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id" -+// "$Id" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/config.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/config.c -+++ pcp-2.5.0/src/libpcp/src/config.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: config.c,v 1.3 2004/12/03 19:32:18 kenmcd Exp $" -+// "$Id: config.c,v 1.3 2004/12/03 19:32:18 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/connect.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/connect.c -+++ pcp-2.5.0/src/libpcp/src/connect.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: connect.c,v 1.9 2005/06/15 03:11:39 kenmcd Exp $" -+// "$Id: connect.c,v 1.9 2005/06/15 03:11:39 kenmcd Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/context.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/context.c -+++ pcp-2.5.0/src/libpcp/src/context.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: context.c,v 1.3 2004/07/22 07:00:57 kenmcd Exp $" -+// "$Id: context.c,v 1.3 2004/07/22 07:00:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/desc.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/desc.c -+++ pcp-2.5.0/src/libpcp/src/desc.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: desc.c,v 1.1 2000/12/05 03:49:43 max Exp $" -+// "$Id: desc.c,v 1.1 2000/12/05 03:49:43 max Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/err.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/err.c -+++ pcp-2.5.0/src/libpcp/src/err.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: err.c,v 1.5 2005/07/20 00:14:05 markgw Exp $" -+// "$Id: err.c,v 1.5 2005/07/20 00:14:05 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/fetch.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/fetch.c -+++ pcp-2.5.0/src/libpcp/src/fetch.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: fetch.c,v 1.2 2004/06/07 10:17:19 nathans Exp $" -+// "$Id: fetch.c,v 1.2 2004/06/07 10:17:19 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/fetchlocal.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/fetchlocal.c -+++ pcp-2.5.0/src/libpcp/src/fetchlocal.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: fetchlocal.c,v 1.2 2004/06/07 10:17:19 nathans Exp $" -+// "$Id: fetchlocal.c,v 1.2 2004/06/07 10:17:19 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/findpmda4linux.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/findpmda4linux.c -+++ pcp-2.5.0/src/libpcp/src/findpmda4linux.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: findpmda4linux.c,v 1.2 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: findpmda4linux.c,v 1.2 2004/06/24 06:15:36 kenmcd Exp $" - - #include - -Index: pcp-2.5.0/src/libpcp/src/freeresult.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/freeresult.c -+++ pcp-2.5.0/src/libpcp/src/freeresult.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: freeresult.c,v 1.1 2000/12/05 03:49:43 max Exp $" -+// "$Id: freeresult.c,v 1.1 2000/12/05 03:49:43 max Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/help.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/help.c -+++ pcp-2.5.0/src/libpcp/src/help.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: help.c,v 1.1 2000/12/05 03:49:43 max Exp $" -+// "$Id: help.c,v 1.1 2000/12/05 03:49:43 max Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/instance.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/instance.c -+++ pcp-2.5.0/src/libpcp/src/instance.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: instance.c,v 1.2 2004/06/07 10:17:19 nathans Exp $" -+// "$Id: instance.c,v 1.2 2004/06/07 10:17:19 nathans Exp $" - - #include - #include "pmapi.h" -Index: pcp-2.5.0/src/libpcp/src/interp.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/interp.c -+++ pcp-2.5.0/src/libpcp/src/interp.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: interp.c,v 1.4 2005/07/01 03:44:49 kenmcd Exp $" -+// "$Id: interp.c,v 1.4 2005/07/01 03:44:49 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/logconnect.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/logconnect.c -+++ pcp-2.5.0/src/libpcp/src/logconnect.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: logconnect.c,v 1.22 2004/07/22 07:00:57 kenmcd Exp $" -+// "$Id: logconnect.c,v 1.22 2004/07/22 07:00:57 kenmcd Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/logcontrol.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/logcontrol.c -+++ pcp-2.5.0/src/libpcp/src/logcontrol.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: logcontrol.c,v 1.14 2002/07/06 05:48:20 kenmcd Exp $" -+// "$Id: logcontrol.c,v 1.14 2002/07/06 05:48:20 kenmcd Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/logmeta.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/logmeta.c -+++ pcp-2.5.0/src/libpcp/src/logmeta.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: logmeta.c,v 1.2 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: logmeta.c,v 1.2 2004/08/02 07:11:43 kenmcd Exp $" - - #include - #include "pmapi.h" -Index: pcp-2.5.0/src/libpcp/src/logportmap.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/logportmap.c -+++ pcp-2.5.0/src/libpcp/src/logportmap.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: logportmap.c,v 1.6 2005/02/22 05:01:12 markgw Exp $" -+// "$Id: logportmap.c,v 1.6 2005/02/22 05:01:12 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/logutil.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/logutil.c -+++ pcp-2.5.0/src/libpcp/src/logutil.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: logutil.c,v 1.11 2005/05/11 02:06:48 kenmcd Exp $" -+// "$Id: logutil.c,v 1.11 2005/05/11 02:06:48 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/mspec.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/mspec.c -+++ pcp-2.5.0/src/libpcp/src/mspec.c -@@ -23,7 +23,7 @@ - * parse uniform metric spec syntax - */ - --#ident "$Id: mspec.c,v 1.4 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: mspec.c,v 1.4 2004/08/02 07:11:43 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/optfetch.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/optfetch.c -+++ pcp-2.5.0/src/libpcp/src/optfetch.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: optfetch.c,v 1.1 2000/12/05 03:49:43 max Exp $" -+// "$Id: optfetch.c,v 1.1 2000/12/05 03:49:43 max Exp $" - - /* - * Generic routines to provide the "optimized" pmFetch bundling -Index: pcp-2.5.0/src/libpcp/src/p_creds.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_creds.c -+++ pcp-2.5.0/src/libpcp/src/p_creds.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_creds.c,v 1.1 2000/12/05 03:49:43 max Exp $" -+// "$Id: p_creds.c,v 1.1 2000/12/05 03:49:43 max Exp $" - - #include - #include "pmapi.h" -Index: pcp-2.5.0/src/libpcp/src/p_desc.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_desc.c -+++ pcp-2.5.0/src/libpcp/src/p_desc.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_desc.c,v 1.3 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: p_desc.c,v 1.3 2004/08/02 07:11:43 kenmcd Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/p_error.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_error.c -+++ pcp-2.5.0/src/libpcp/src/p_error.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_error.c,v 1.3 2004/07/02 05:52:57 kenmcd Exp $" -+// "$Id: p_error.c,v 1.3 2004/07/02 05:52:57 kenmcd Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/p_fetch.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_fetch.c -+++ pcp-2.5.0/src/libpcp/src/p_fetch.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_fetch.c,v 1.2 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: p_fetch.c,v 1.2 2004/08/02 07:11:43 kenmcd Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/p_instance.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_instance.c -+++ pcp-2.5.0/src/libpcp/src/p_instance.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_instance.c,v 1.3 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: p_instance.c,v 1.3 2004/08/02 07:11:43 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/p_lcontrol.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_lcontrol.c -+++ pcp-2.5.0/src/libpcp/src/p_lcontrol.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_lcontrol.c,v 1.16 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: p_lcontrol.c,v 1.16 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/p_lrequest.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_lrequest.c -+++ pcp-2.5.0/src/libpcp/src/p_lrequest.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_lrequest.c,v 1.18 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: p_lrequest.c,v 1.18 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/p_lstatus.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_lstatus.c -+++ pcp-2.5.0/src/libpcp/src/p_lstatus.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_lstatus.c,v 1.18 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: p_lstatus.c,v 1.18 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/p_pmns.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_pmns.c -+++ pcp-2.5.0/src/libpcp/src/p_pmns.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_pmns.c,v 1.1 2000/12/05 03:49:43 max Exp $" -+// "$Id: p_pmns.c,v 1.1 2000/12/05 03:49:43 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/p_profile.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_profile.c -+++ pcp-2.5.0/src/libpcp/src/p_profile.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_profile.c,v 1.2 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: p_profile.c,v 1.2 2004/08/02 07:11:43 kenmcd Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/p_result.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_result.c -+++ pcp-2.5.0/src/libpcp/src/p_result.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_result.c,v 1.6 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: p_result.c,v 1.6 2004/08/02 07:11:43 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/p_text.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/p_text.c -+++ pcp-2.5.0/src/libpcp/src/p_text.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_text.c,v 1.2 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: p_text.c,v 1.2 2004/08/02 07:11:43 kenmcd Exp $" - - #include - #include "pmapi.h" -Index: pcp-2.5.0/src/libpcp/src/pdu.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/pdu.c -+++ pcp-2.5.0/src/libpcp/src/pdu.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pdu.c,v 1.12 2005/08/11 22:02:45 markgw Exp $" -+// "$Id: pdu.c,v 1.12 2005/08/11 22:02:45 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/pdubuf.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/pdubuf.c -+++ pcp-2.5.0/src/libpcp/src/pdubuf.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pdubuf.c,v 1.2 2004/06/07 10:17:19 nathans Exp $" -+// "$Id: pdubuf.c,v 1.2 2004/06/07 10:17:19 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/pmns.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/pmns.c -+++ pcp-2.5.0/src/libpcp/src/pmns.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmns.c,v 1.11 2005/07/10 06:57:52 kenmcd Exp $" -+// "$Id: pmns.c,v 1.11 2005/07/10 06:57:52 kenmcd Exp $" - - #include - #include -@@ -2650,7 +2650,7 @@ pmLookupName(int numpmid, char *namelist - free(l_name); - } - } --#elif -+#else - else { - sts = PM_ERR_NAME; - pmidlist[i] = PM_ID_NULL; -Index: pcp-2.5.0/src/libpcp/src/pool.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/pool.c -+++ pcp-2.5.0/src/libpcp/src/pool.c -@@ -23,7 +23,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pool.c,v 1.1 2000/12/05 03:49:43 max Exp $" -+// "$Id: pool.c,v 1.1 2000/12/05 03:49:43 max Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/profile.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/profile.c -+++ pcp-2.5.0/src/libpcp/src/profile.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: profile.c,v 1.2 2002/07/06 05:48:20 kenmcd Exp $" -+// "$Id: profile.c,v 1.2 2002/07/06 05:48:20 kenmcd Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/rtime.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/rtime.c -+++ pcp-2.5.0/src/libpcp/src/rtime.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: rtime.c,v 1.3 2005/02/23 09:55:12 kenmcd Exp $" -+// "$Id: rtime.c,v 1.3 2005/02/23 09:55:12 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/sortinst.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/sortinst.c -+++ pcp-2.5.0/src/libpcp/src/sortinst.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: sortinst.c,v 1.1 2000/12/05 03:49:43 max Exp $" -+// "$Id: sortinst.c,v 1.1 2000/12/05 03:49:43 max Exp $" - - #include - #include "pmapi.h" -Index: pcp-2.5.0/src/libpcp/src/store.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/store.c -+++ pcp-2.5.0/src/libpcp/src/store.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: store.c,v 1.1 2000/12/05 03:49:43 max Exp $" -+// "$Id: store.c,v 1.1 2000/12/05 03:49:43 max Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/stuffvalue.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/stuffvalue.c -+++ pcp-2.5.0/src/libpcp/src/stuffvalue.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: stuffvalue.c,v 1.1 2000/12/05 03:49:43 max Exp $" -+// "$Id: stuffvalue.c,v 1.1 2000/12/05 03:49:43 max Exp $" - - #include - #include "pmapi.h" -Index: pcp-2.5.0/src/libpcp/src/tv.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/tv.c -+++ pcp-2.5.0/src/libpcp/src/tv.c -@@ -20,7 +20,7 @@ - */ - - --#ident "$Id: tv.c,v 1.1 2000/12/05 03:49:43 max Exp $" -+// "$Id: tv.c,v 1.1 2000/12/05 03:49:43 max Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp/src/tz.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/tz.c -+++ pcp-2.5.0/src/libpcp/src/tz.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: tz.c,v 1.7 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: tz.c,v 1.7 2004/08/02 07:11:43 kenmcd Exp $" - - /* - * ensure the re-entrant versions of the time string functions are -Index: pcp-2.5.0/src/libpcp/src/units.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/units.c -+++ pcp-2.5.0/src/libpcp/src/units.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: units.c,v 1.4 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: units.c,v 1.4 2004/08/02 07:11:43 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/util.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/util.c -+++ pcp-2.5.0/src/libpcp/src/util.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: util.c,v 1.8 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: util.c,v 1.8 2004/08/02 07:11:43 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp/src/util_solaris.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp/src/util_solaris.c -+++ pcp-2.5.0/src/libpcp/src/util_solaris.c -@@ -25,7 +25,7 @@ - * - */ - --#ident "$Id: util_solaris.c,v 1.3 2003/10/02 07:14:43 kenmcd Exp $" -+// "$Id: util_solaris.c,v 1.3 2003/10/02 07:14:43 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_http/src/http_lib.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_http/src/http_lib.c -+++ pcp-2.5.0/src/libpcp_http/src/http_lib.c -@@ -30,7 +30,7 @@ - * Description : Use http protocol, connects to server to echange data - */ - --#ident "$Id: http_lib.c,v 1.9 2004/07/22 07:00:57 kenmcd Exp $" -+// "$Id: http_lib.c,v 1.9 2004/07/22 07:00:57 kenmcd Exp $" - - /* #define VERBOSE */ - -Index: pcp-2.5.0/src/libpcp_pmc/src/Bool.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Bool.h -+++ pcp-2.5.0/src/libpcp_pmc/src/Bool.h -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Bool.h,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: Bool.h,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" - - enum PMC_Bool { PMC_false = 0, PMC_true = 1 }; - -Index: pcp-2.5.0/src/libpcp_pmc/src/Context.c++ -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Context.c++ -+++ pcp-2.5.0/src/libpcp_pmc/src/Context.c++ -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Context.c++,v 1.5 2005/05/10 01:59:58 kenmcd Exp $" -+// "$Id: Context.c++,v 1.5 2005/05/10 01:59:58 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_pmc/src/Context.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Context.h -+++ pcp-2.5.0/src/libpcp_pmc/src/Context.h -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Context.h,v 1.3 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: Context.h,v 1.3 2005/05/10 00:46:37 kenmcd Exp $" - - #ifndef PCP_DEBUG - #ifndef NDEBUG -Index: pcp-2.5.0/src/libpcp_pmc/src/Desc.c++ -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Desc.c++ -+++ pcp-2.5.0/src/libpcp_pmc/src/Desc.c++ -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Desc.c++,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: Desc.c++,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" - - #include - #include "Desc.h" -Index: pcp-2.5.0/src/libpcp_pmc/src/Desc.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Desc.h -+++ pcp-2.5.0/src/libpcp_pmc/src/Desc.h -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Desc.h,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: Desc.h,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" - - #include "PMC.h" - #include "String.h" -Index: pcp-2.5.0/src/libpcp_pmc/src/Group.c++ -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Group.c++ -+++ pcp-2.5.0/src/libpcp_pmc/src/Group.c++ -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Group.c++,v 1.10 2005/05/10 01:59:58 kenmcd Exp $" -+// "$Id: Group.c++,v 1.10 2005/05/10 01:59:58 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_pmc/src/Group.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Group.h -+++ pcp-2.5.0/src/libpcp_pmc/src/Group.h -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Group.h,v 1.4 2005/05/10 01:59:58 kenmcd Exp $" -+// "$Id: Group.h,v 1.4 2005/05/10 01:59:58 kenmcd Exp $" - - #include - #include "PMC.h" -Index: pcp-2.5.0/src/libpcp_pmc/src/Hash.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Hash.h -+++ pcp-2.5.0/src/libpcp_pmc/src/Hash.h -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Hash.h,v 1.4 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: Hash.h,v 1.4 2005/05/10 00:46:37 kenmcd Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/libpcp_pmc/src/Indom.c++ -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Indom.c++ -+++ pcp-2.5.0/src/libpcp_pmc/src/Indom.c++ -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Indom.c++,v 1.9 2005/05/10 01:59:58 kenmcd Exp $" -+// "$Id: Indom.c++,v 1.9 2005/05/10 01:59:58 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_pmc/src/Indom.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Indom.h -+++ pcp-2.5.0/src/libpcp_pmc/src/Indom.h -@@ -22,7 +22,7 @@ - #ifndef _PMC_INDOM_H_ - #define _PMC_INDOM_H_ - --#ident "$Id: Indom.h,v 1.10 2005/05/10 01:59:58 kenmcd Exp $" -+// "$Id: Indom.h,v 1.10 2005/05/10 01:59:58 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_pmc/src/List.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/List.h -+++ pcp-2.5.0/src/libpcp_pmc/src/List.h -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: List.h,v 1.3 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: List.h,v 1.3 2005/05/10 00:46:37 kenmcd Exp $" - - #ifndef PCP_DEBUG - #ifndef NDEBUG -Index: pcp-2.5.0/src/libpcp_pmc/src/Metric.c++ -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Metric.c++ -+++ pcp-2.5.0/src/libpcp_pmc/src/Metric.c++ -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Metric.c++,v 1.9 2005/05/10 01:59:58 kenmcd Exp $" -+// "$Id: Metric.c++,v 1.9 2005/05/10 01:59:58 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_pmc/src/Metric.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Metric.h -+++ pcp-2.5.0/src/libpcp_pmc/src/Metric.h -@@ -22,7 +22,7 @@ - #ifndef _PMC_METRIC_H_ - #define _PMC_METRIC_H_ - --#ident "$Id: Metric.h,v 1.11 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: Metric.h,v 1.11 2005/05/10 00:46:37 kenmcd Exp $" - - #include "PMC.h" - #include "Vector.h" -Index: pcp-2.5.0/src/libpcp_pmc/src/PMC.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/PMC.h -+++ pcp-2.5.0/src/libpcp_pmc/src/PMC.h -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: PMC.h,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: PMC.h,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" - - #ifndef PCP_DEBUG - #ifndef NDEBUG -Index: pcp-2.5.0/src/libpcp_pmc/src/Source.c++ -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Source.c++ -+++ pcp-2.5.0/src/libpcp_pmc/src/Source.c++ -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Source.c++,v 1.5 2005/05/10 01:59:58 kenmcd Exp $" -+// "$Id: Source.c++,v 1.5 2005/05/10 01:59:58 kenmcd Exp $" - - #include "Source.h" - -Index: pcp-2.5.0/src/libpcp_pmc/src/Source.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Source.h -+++ pcp-2.5.0/src/libpcp_pmc/src/Source.h -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: Source.h,v 1.3 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: Source.h,v 1.3 2005/05/10 00:46:37 kenmcd Exp $" - - #include - #include "PMC.h" -Index: pcp-2.5.0/src/libpcp_pmc/src/String.c++ -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/String.c++ -+++ pcp-2.5.0/src/libpcp_pmc/src/String.c++ -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: String.c++,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: String.c++,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" - - #include - #include "String.h" -Index: pcp-2.5.0/src/libpcp_pmc/src/String.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/String.h -+++ pcp-2.5.0/src/libpcp_pmc/src/String.h -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: String.h,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: String.h,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" - - #ifndef PCP_DEBUG - #ifndef NDEBUG -Index: pcp-2.5.0/src/libpcp_pmc/src/Vector.h -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmc/src/Vector.h -+++ pcp-2.5.0/src/libpcp_pmc/src/Vector.h -@@ -22,7 +22,7 @@ - #ifndef _PMC_VECTOR_H_ - #define _PMC_VECTOR_H_ - --#ident "$Id: Vector.h,v 1.4 2005/05/10 00:46:37 kenmcd Exp $" -+// "$Id: Vector.h,v 1.4 2005/05/10 00:46:37 kenmcd Exp $" - - #ifndef PCP_DEBUG - #ifndef NDEBUG -Index: pcp-2.5.0/src/libpcp_pmda/src/cache.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmda/src/cache.c -+++ pcp-2.5.0/src/libpcp_pmda/src/cache.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: cache.c,v 1.7 2005/08/31 01:50:24 kenmcd Exp $" -+// "$Id: cache.c,v 1.7 2005/08/31 01:50:24 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_pmda/src/callback.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmda/src/callback.c -+++ pcp-2.5.0/src/libpcp_pmda/src/callback.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: callback.c,v 1.8 2005/08/25 01:07:13 markgw Exp $" -+// "$Id: callback.c,v 1.8 2005/08/25 01:07:13 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_pmda/src/help.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmda/src/help.c -+++ pcp-2.5.0/src/libpcp_pmda/src/help.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: help.c,v 1.4 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: help.c,v 1.4 2004/08/02 07:11:43 kenmcd Exp $" - - /* - * Get help text from files built using newhelp -Index: pcp-2.5.0/src/libpcp_pmda/src/mainloop.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmda/src/mainloop.c -+++ pcp-2.5.0/src/libpcp_pmda/src/mainloop.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: mainloop.c,v 1.6 2005/06/07 00:56:45 kenmcd Exp $" -+// "$Id: mainloop.c,v 1.6 2005/06/07 00:56:45 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_pmda/src/open.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_pmda/src/open.c -+++ pcp-2.5.0/src/libpcp_pmda/src/open.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: open.c,v 1.5 2004/07/22 07:00:57 kenmcd Exp $" -+// "$Id: open.c,v 1.5 2004/07/22 07:00:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_trace/src/ftrace.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_trace/src/ftrace.c -+++ pcp-2.5.0/src/libpcp_trace/src/ftrace.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: ftrace.c,v 1.5 2000/12/28 07:37:59 max Exp $" -+// "$Id: ftrace.c,v 1.5 2000/12/28 07:37:59 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_trace/src/hash.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_trace/src/hash.c -+++ pcp-2.5.0/src/libpcp_trace/src/hash.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: hash.c,v 1.20 2000/12/28 07:37:59 max Exp $" -+// "$Id: hash.c,v 1.20 2000/12/28 07:37:59 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_trace/src/p_ack.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_trace/src/p_ack.c -+++ pcp-2.5.0/src/libpcp_trace/src/p_ack.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: p_ack.c,v 1.12 2004/07/02 05:52:57 kenmcd Exp $" -+// "$Id: p_ack.c,v 1.12 2004/07/02 05:52:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_trace/src/p_data.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_trace/src/p_data.c -+++ pcp-2.5.0/src/libpcp_trace/src/p_data.c -@@ -24,7 +24,7 @@ - * 64-bit integer, but no other format conversion - */ - --#ident "$Id: p_data.c,v 1.20 2004/07/02 05:52:57 kenmcd Exp $" -+// "$Id: p_data.c,v 1.20 2004/07/02 05:52:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_trace/src/pdu.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_trace/src/pdu.c -+++ pcp-2.5.0/src/libpcp_trace/src/pdu.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pdu.c,v 1.22 2004/07/02 05:52:57 kenmcd Exp $" -+// "$Id: pdu.c,v 1.22 2004/07/02 05:52:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_trace/src/pdubuf.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_trace/src/pdubuf.c -+++ pcp-2.5.0/src/libpcp_trace/src/pdubuf.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pdubuf.c,v 1.13 2004/06/07 10:19:59 nathans Exp $" -+// "$Id: pdubuf.c,v 1.13 2004/06/07 10:19:59 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/libpcp_trace/src/trace.c -=================================================================== ---- pcp-2.5.0.orig/src/libpcp_trace/src/trace.c -+++ pcp-2.5.0/src/libpcp_trace/src/trace.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: trace.c,v 1.55 2005/07/11 03:59:38 markgw Exp $" -+// "$Id: trace.c,v 1.55 2005/07/11 03:59:38 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/newhelp/chkhelp.c -=================================================================== ---- pcp-2.5.0.orig/src/newhelp/chkhelp.c -+++ pcp-2.5.0/src/newhelp/chkhelp.c -@@ -25,7 +25,7 @@ - * chkhelp helpfile metric-name ... - */ - --#ident "$Id: chkhelp.c,v 1.4 2002/09/08 10:45:41 kenmcd Exp $" -+// "$Id: chkhelp.c,v 1.4 2002/09/08 10:45:41 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/newhelp/newhelp.c -=================================================================== ---- pcp-2.5.0.orig/src/newhelp/newhelp.c -+++ pcp-2.5.0/src/newhelp/newhelp.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: newhelp.c,v 1.6 2003/02/20 19:20:25 kenmcd Exp $" -+// "$Id: newhelp.c,v 1.6 2003/02/20 19:20:25 kenmcd Exp $" - - /* - * newhelp file -Index: pcp-2.5.0/src/pmcd/src/agent.c -=================================================================== ---- pcp-2.5.0.orig/src/pmcd/src/agent.c -+++ pcp-2.5.0/src/pmcd/src/agent.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: agent.c,v 1.4 2005/08/11 22:02:45 markgw Exp $" -+// "$Id: agent.c,v 1.4 2005/08/11 22:02:45 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmcd/src/client.c -=================================================================== ---- pcp-2.5.0.orig/src/pmcd/src/client.c -+++ pcp-2.5.0/src/pmcd/src/client.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: client.c,v 1.4 2004/07/22 07:00:57 kenmcd Exp $" -+// "$Id: client.c,v 1.4 2004/07/22 07:00:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmcd/src/config.c -=================================================================== ---- pcp-2.5.0.orig/src/pmcd/src/config.c -+++ pcp-2.5.0/src/pmcd/src/config.c -@@ -22,7 +22,7 @@ - * attaching to DSOs. - */ - --#ident "$Id: config.c,v 1.12 2005/08/11 22:02:45 markgw Exp $" -+// "$Id: config.c,v 1.12 2005/08/11 22:02:45 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmcd/src/dofetch.c -=================================================================== ---- pcp-2.5.0.orig/src/pmcd/src/dofetch.c -+++ pcp-2.5.0/src/pmcd/src/dofetch.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: dofetch.c,v 1.1 2000/12/05 03:42:25 max Exp $" -+// "$Id: dofetch.c,v 1.1 2000/12/05 03:42:25 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmcd/src/dopdus.c -=================================================================== ---- pcp-2.5.0.orig/src/pmcd/src/dopdus.c -+++ pcp-2.5.0/src/pmcd/src/dopdus.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: dopdus.c,v 1.3 2002/07/23 10:47:31 kenmcd Exp $" -+// "$Id: dopdus.c,v 1.3 2002/07/23 10:47:31 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmcd/src/dostore.c -=================================================================== ---- pcp-2.5.0.orig/src/pmcd/src/dostore.c -+++ pcp-2.5.0/src/pmcd/src/dostore.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: dostore.c,v 1.2 2002/07/23 10:47:31 kenmcd Exp $" -+// "$Id: dostore.c,v 1.2 2002/07/23 10:47:31 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmcd/src/pmcd.c -=================================================================== ---- pcp-2.5.0.orig/src/pmcd/src/pmcd.c -+++ pcp-2.5.0/src/pmcd/src/pmcd.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmcd.c,v 1.12 2005/06/22 19:43:46 kenmcd Exp $" -+// "$Id: pmcd.c,v 1.12 2005/06/22 19:43:46 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmcd/src/pmcd.h -=================================================================== ---- pcp-2.5.0.orig/src/pmcd/src/pmcd.h -+++ pcp-2.5.0/src/pmcd/src/pmcd.h -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmcd.h,v 1.2 2001/01/02 08:54:08 kenmcd Exp $" -+// "$Id: pmcd.h,v 1.2 2001/01/02 08:54:08 kenmcd Exp $" - - #ifndef _PMCD_H - #define _PMCD_H -Index: pcp-2.5.0/src/pmcd/src/util.c -=================================================================== ---- pcp-2.5.0.orig/src/pmcd/src/util.c -+++ pcp-2.5.0/src/pmcd/src/util.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: util.c,v 1.1 2000/12/05 03:42:25 max Exp $" -+// "$Id: util.c,v 1.1 2000/12/05 03:42:25 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmcdctl/pmcd_wait.c -=================================================================== ---- pcp-2.5.0.orig/src/pmcdctl/pmcd_wait.c -+++ pcp-2.5.0/src/pmcdctl/pmcd_wait.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmcd_wait.c,v 1.2 2000/12/28 09:17:25 max Exp $" -+// "$Id: pmcd_wait.c,v 1.2 2000/12/28 09:17:25 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmclient/pmclient.c -=================================================================== ---- pcp-2.5.0.orig/src/pmclient/pmclient.c -+++ pcp-2.5.0/src/pmclient/pmclient.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmclient.c,v 2.15 2003/01/08 03:50:10 kenmcd Exp $" -+// "$Id: pmclient.c,v 2.15 2003/01/08 03:50:10 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/aix/aix.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/aix/aix.c -+++ pcp-2.5.0/src/pmdas/aix/aix.c -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: aix.c,v 1.1 2004/08/05 01:26:58 kenmcd Exp $" -+// "$Id: aix.c,v 1.1 2004/08/05 01:26:58 kenmcd Exp $" - - #include - #include "./common.h" -Index: pcp-2.5.0/src/pmdas/cisco/cisco.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/cisco/cisco.c -+++ pcp-2.5.0/src/pmdas/cisco/cisco.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: cisco.c,v 2.29 2001/03/14 15:51:10 kenmcd Exp $" -+// "$Id: cisco.c,v 2.29 2001/03/14 15:51:10 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/cisco/cisco.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/cisco/cisco.h -+++ pcp-2.5.0/src/pmdas/cisco/cisco.h -@@ -24,7 +24,7 @@ - #ifndef _CISCO_H - #define _CISCO_H - --#ident "$Id: cisco.h,v 2.11 2002/07/05 03:04:50 kenmcd Exp $" -+// "$Id: cisco.h,v 2.11 2002/07/05 03:04:50 kenmcd Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/pmdas/cisco/interface.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/cisco/interface.c -+++ pcp-2.5.0/src/pmdas/cisco/interface.c -@@ -23,7 +23,7 @@ - - #include "./cisco.h" - --#ident "$Id: interface.c,v 1.7 2002/07/05 03:04:50 kenmcd Exp $" -+// "$Id: interface.c,v 1.7 2002/07/05 03:04:50 kenmcd Exp $" - - /* - * first letter defines command line argument for interface type -Index: pcp-2.5.0/src/pmdas/cisco/pmda.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/cisco/pmda.c -+++ pcp-2.5.0/src/pmdas/cisco/pmda.c -@@ -40,7 +40,7 @@ - * options and applies for all occurrences of the hostname. - */ - --#ident "$Id: pmda.c,v 2.30 2004/06/15 09:39:44 kenmcd Exp $" -+// "$Id: pmda.c,v 2.30 2004/06/15 09:39:44 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/cisco/probe.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/cisco/probe.c -+++ pcp-2.5.0/src/pmdas/cisco/probe.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: probe.c,v 2.20 2004/06/07 10:19:59 nathans Exp $" -+// "$Id: probe.c,v 2.20 2004/06/07 10:19:59 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/cisco/telnet.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/cisco/telnet.c -+++ pcp-2.5.0/src/pmdas/cisco/telnet.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: telnet.c,v 1.18 2004/08/19 06:37:12 kenmcd Exp $" -+// "$Id: telnet.c,v 1.18 2004/08/19 06:37:12 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/clusters.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/clusters.h -+++ pcp-2.5.0/src/pmdas/linux/clusters.h -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: clusters.h,v 1.1 2005/05/10 05:37:54 markgw Exp $" -+// "$Id: clusters.h,v 1.1 2005/05/10 05:37:54 markgw Exp $" - - #ifndef _CLUSTERS_H - #define _CLUSTERS_H -Index: pcp-2.5.0/src/pmdas/linux/filesys.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/filesys.c -+++ pcp-2.5.0/src/pmdas/linux/filesys.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: filesys.c,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: filesys.c,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/filesys.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/filesys.h -+++ pcp-2.5.0/src/pmdas/linux/filesys.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: filesys.h,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: filesys.h,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" - - #include - -Index: pcp-2.5.0/src/pmdas/linux/indom.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/indom.h -+++ pcp-2.5.0/src/pmdas/linux/indom.h -@@ -20,7 +20,7 @@ - * - */ - --#ident "$Id: indom.h,v 1.1 2005/06/07 07:18:20 markgw Exp $" -+// "$Id: indom.h,v 1.1 2005/06/07 07:18:20 markgw Exp $" - - #ifndef _INDOM_H - #define _INDOM_H -Index: pcp-2.5.0/src/pmdas/linux/pmda.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/pmda.c -+++ pcp-2.5.0/src/pmdas/linux/pmda.c -@@ -23,7 +23,7 @@ - * - */ - --#ident "$Id: pmda.c,v 1.69 2005/06/07 07:18:20 markgw Exp $" -+// "$Id: pmda.c,v 1.69 2005/06/07 07:18:20 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_cpuinfo.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_cpuinfo.c -+++ pcp-2.5.0/src/pmdas/linux/proc_cpuinfo.c -@@ -25,7 +25,7 @@ - * All rights reserved. - */ - --#ident "$Id: proc_cpuinfo.c,v 1.15 2005/08/11 03:26:21 markgw Exp $" -+// "$Id: proc_cpuinfo.c,v 1.15 2005/08/11 03:26:21 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_cpuinfo.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_cpuinfo.h -+++ pcp-2.5.0/src/pmdas/linux/proc_cpuinfo.h -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_cpuinfo.h,v 1.7 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_cpuinfo.h,v 1.7 2004/06/24 06:15:36 kenmcd Exp $" - - #ifdef __alpha__ - #define HAVE_ALPHA_LINUX -Index: pcp-2.5.0/src/pmdas/linux/proc_fs_xfs.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_fs_xfs.c -+++ pcp-2.5.0/src/pmdas/linux/proc_fs_xfs.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_fs_xfs.c,v 1.6 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_fs_xfs.c,v 1.6 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_fs_xfs.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_fs_xfs.h -+++ pcp-2.5.0/src/pmdas/linux/proc_fs_xfs.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_fs_xfs.h,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_fs_xfs.h,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" - - typedef struct { - int errcode; /* error from previous refresh */ -Index: pcp-2.5.0/src/pmdas/linux/proc_interrupts.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_interrupts.c -+++ pcp-2.5.0/src/pmdas/linux/proc_interrupts.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_interrupts.c,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_interrupts.c,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_interrupts.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_interrupts.h -+++ pcp-2.5.0/src/pmdas/linux/proc_interrupts.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_interrupts.h,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_interrupts.h,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" - - typedef struct { - int id; -Index: pcp-2.5.0/src/pmdas/linux/proc_loadavg.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_loadavg.c -+++ pcp-2.5.0/src/pmdas/linux/proc_loadavg.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_loadavg.c,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_loadavg.c,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_loadavg.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_loadavg.h -+++ pcp-2.5.0/src/pmdas/linux/proc_loadavg.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_loadavg.h,v 1.2 2002/10/03 05:49:06 markgw Exp $" -+// "$Id: proc_loadavg.h,v 1.2 2002/10/03 05:49:06 markgw Exp $" - - typedef struct { - float loadavg[3]; /* 1, 5 and 15 min load average */ -Index: pcp-2.5.0/src/pmdas/linux/proc_meminfo.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_meminfo.c -+++ pcp-2.5.0/src/pmdas/linux/proc_meminfo.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_meminfo.c,v 1.8 2004/12/15 06:50:50 markgw Exp $" -+// "$Id: proc_meminfo.c,v 1.8 2004/12/15 06:50:50 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_meminfo.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_meminfo.h -+++ pcp-2.5.0/src/pmdas/linux/proc_meminfo.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_meminfo.h,v 1.3 2002/10/11 02:33:38 markgw Exp $" -+// "$Id: proc_meminfo.h,v 1.3 2002/10/11 02:33:38 markgw Exp $" - - /* - * All fields in /proc/meminfo for 2.5.x -Index: pcp-2.5.0/src/pmdas/linux/proc_net_dev.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_net_dev.c -+++ pcp-2.5.0/src/pmdas/linux/proc_net_dev.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_net_dev.c,v 1.10 2005/08/31 01:50:24 kenmcd Exp $" -+// "$Id: proc_net_dev.c,v 1.10 2005/08/31 01:50:24 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_net_dev.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_net_dev.h -+++ pcp-2.5.0/src/pmdas/linux/proc_net_dev.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_net_dev.h,v 1.6 2005/06/06 08:27:45 kenmcd Exp $" -+// "$Id: proc_net_dev.h,v 1.6 2005/06/06 08:27:45 kenmcd Exp $" - - #define PROC_DEV_COUNTERS_PER_LINE 16 - -Index: pcp-2.5.0/src/pmdas/linux/proc_net_rpc.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_net_rpc.c -+++ pcp-2.5.0/src/pmdas/linux/proc_net_rpc.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_net_rpc.c,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_net_rpc.c,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_net_rpc.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_net_rpc.h -+++ pcp-2.5.0/src/pmdas/linux/proc_net_rpc.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_net_rpc.h,v 1.3 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_net_rpc.h,v 1.3 2004/06/24 06:15:36 kenmcd Exp $" - - #define NR_RPC_COUNTERS 18 - #define NR_RPC3_COUNTERS 22 -Index: pcp-2.5.0/src/pmdas/linux/proc_net_snmp.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_net_snmp.c -+++ pcp-2.5.0/src/pmdas/linux/proc_net_snmp.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_net_snmp.c,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_net_snmp.c,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_net_snmp.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_net_snmp.h -+++ pcp-2.5.0/src/pmdas/linux/proc_net_snmp.h -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_net_snmp.h,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_net_snmp.h,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" - - - enum { -Index: pcp-2.5.0/src/pmdas/linux/proc_net_sockstat.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_net_sockstat.c -+++ pcp-2.5.0/src/pmdas/linux/proc_net_sockstat.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_net_sockstat.c,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_net_sockstat.c,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_net_sockstat.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_net_sockstat.h -+++ pcp-2.5.0/src/pmdas/linux/proc_net_sockstat.h -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_net_sockstat.h,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_net_sockstat.h,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" - - #define _PM_SOCKSTAT_INUSE 0 - #define _PM_SOCKSTAT_HIGHEST 1 -Index: pcp-2.5.0/src/pmdas/linux/proc_net_tcp.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_net_tcp.c -+++ pcp-2.5.0/src/pmdas/linux/proc_net_tcp.c -@@ -23,7 +23,7 @@ - * This code contributed by Michal Kara (lemming@arthur.plbohnice.cz) - */ - --#ident "$Id: proc_net_tcp.c,v 1.6 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_net_tcp.c,v 1.6 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_net_tcp.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_net_tcp.h -+++ pcp-2.5.0/src/pmdas/linux/proc_net_tcp.h -@@ -23,7 +23,7 @@ - * This code contributed by Michal Kara (lemming@arthur.plbohnice.cz) - */ - --#ident "$Id: proc_net_tcp.h,v 1.2 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_net_tcp.h,v 1.2 2004/06/24 06:15:36 kenmcd Exp $" - - enum { - _PM_TCP_ESTABLISHED = 1, -Index: pcp-2.5.0/src/pmdas/linux/proc_partitions.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_partitions.c -+++ pcp-2.5.0/src/pmdas/linux/proc_partitions.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_partitions.c,v 1.15 2005/07/12 07:33:35 markgw Exp $" -+// "$Id: proc_partitions.c,v 1.15 2005/07/12 07:33:35 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_partitions.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_partitions.h -+++ pcp-2.5.0/src/pmdas/linux/proc_partitions.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_partitions.h,v 1.11 2005/06/07 07:18:20 markgw Exp $" -+// "$Id: proc_partitions.h,v 1.11 2005/06/07 07:18:20 markgw Exp $" - - typedef struct { - int id; -Index: pcp-2.5.0/src/pmdas/linux/proc_pid.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_pid.c -+++ pcp-2.5.0/src/pmdas/linux/proc_pid.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_pid.c,v 1.10 2004/11/25 08:27:37 markgw Exp $" -+// "$Id: proc_pid.c,v 1.10 2004/11/25 08:27:37 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_pid.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_pid.h -+++ pcp-2.5.0/src/pmdas/linux/proc_pid.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_pid.h,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_pid.h,v 1.5 2004/06/24 06:15:36 kenmcd Exp $" - - #ifndef _PROC_PID_H - #define _PROC_PID_H -Index: pcp-2.5.0/src/pmdas/linux/proc_runq.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_runq.c -+++ pcp-2.5.0/src/pmdas/linux/proc_runq.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_runq.c,v 1.9 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_runq.c,v 1.9 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_runq.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_runq.h -+++ pcp-2.5.0/src/pmdas/linux/proc_runq.h -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_runq.h,v 1.6 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_runq.h,v 1.6 2004/06/24 06:15:36 kenmcd Exp $" - - #ifndef _PROC_RUNQ_H - #define _PROC_RUNQ_H -Index: pcp-2.5.0/src/pmdas/linux/proc_scsi.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_scsi.c -+++ pcp-2.5.0/src/pmdas/linux/proc_scsi.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_scsi.c,v 1.7 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_scsi.c,v 1.7 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_scsi.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_scsi.h -+++ pcp-2.5.0/src/pmdas/linux/proc_scsi.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_scsi.h,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: proc_scsi.h,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" - - typedef struct { - int id; /* internal instance id */ -Index: pcp-2.5.0/src/pmdas/linux/proc_slabinfo.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_slabinfo.c -+++ pcp-2.5.0/src/pmdas/linux/proc_slabinfo.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_slabinfo.c,v 1.4 2005/02/07 05:01:52 markgw Exp $" -+// "$Id: proc_slabinfo.c,v 1.4 2005/02/07 05:01:52 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_slabinfo.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_slabinfo.h -+++ pcp-2.5.0/src/pmdas/linux/proc_slabinfo.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_slabinfo.h,v 1.2 2004/05/26 06:00:59 markgw Exp $" -+// "$Id: proc_slabinfo.h,v 1.2 2004/05/26 06:00:59 markgw Exp $" - - /*** version 1.1 - "cache-name" num-active-objs total-objs object-size num-active-slabs \ -Index: pcp-2.5.0/src/pmdas/linux/proc_stat.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_stat.c -+++ pcp-2.5.0/src/pmdas/linux/proc_stat.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_stat.c,v 1.24 2005/05/10 05:37:54 markgw Exp $" -+// "$Id: proc_stat.c,v 1.24 2005/05/10 05:37:54 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_stat.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_stat.h -+++ pcp-2.5.0/src/pmdas/linux/proc_stat.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_stat.h,v 1.13 2005/05/10 05:37:54 markgw Exp $" -+// "$Id: proc_stat.h,v 1.13 2005/05/10 05:37:54 markgw Exp $" - - typedef struct { - unsigned int user, sys, nice, wait, irq, sirq; -Index: pcp-2.5.0/src/pmdas/linux/proc_vmstat.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_vmstat.c -+++ pcp-2.5.0/src/pmdas/linux/proc_vmstat.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_vmstat.c,v 1.1 2004/12/15 06:50:50 markgw Exp $" -+// "$Id: proc_vmstat.c,v 1.1 2004/12/15 06:50:50 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/proc_vmstat.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/proc_vmstat.h -+++ pcp-2.5.0/src/pmdas/linux/proc_vmstat.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: proc_vmstat.h,v 1.1 2004/12/15 06:50:50 markgw Exp $" -+// "$Id: proc_vmstat.h,v 1.1 2004/12/15 06:50:50 markgw Exp $" - - /* - * All fields in /proc/vmstat for 2.6.x -Index: pcp-2.5.0/src/pmdas/linux/swapdev.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/swapdev.c -+++ pcp-2.5.0/src/pmdas/linux/swapdev.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: swapdev.c,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: swapdev.c,v 1.4 2004/06/24 06:15:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/linux/swapdev.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/linux/swapdev.h -+++ pcp-2.5.0/src/pmdas/linux/swapdev.h -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: swapdev.h,v 1.2 1999/03/10 02:38:24 markgw Exp $" -+// "$Id: swapdev.h,v 1.2 1999/03/10 02:38:24 markgw Exp $" - - typedef struct { - int id; -Index: pcp-2.5.0/src/pmdas/mailq/mailq.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/mailq/mailq.c -+++ pcp-2.5.0/src/pmdas/mailq/mailq.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: mailq.c,v 1.15 2004/05/21 02:03:05 kenmcd Exp $" -+// "$Id: mailq.c,v 1.15 2004/05/21 02:03:05 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/pmcd/src/pmcd.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/pmcd/src/pmcd.c -+++ pcp-2.5.0/src/pmdas/pmcd/src/pmcd.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmcd.c,v 1.11 2004/07/22 07:02:39 kenmcd Exp $" -+// "$Id: pmcd.c,v 1.11 2004/07/22 07:02:39 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/roomtemp/roomtemp.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/roomtemp/roomtemp.c -+++ pcp-2.5.0/src/pmdas/roomtemp/roomtemp.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: roomtemp.c,v 1.5 2004/06/15 18:53:11 kenmcd Exp $" -+// "$Id: roomtemp.c,v 1.5 2004/06/15 18:53:11 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/sample/src/pmda.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/sample/src/pmda.c -+++ pcp-2.5.0/src/pmdas/sample/src/pmda.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmda.c,v 2.21 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: pmda.c,v 2.21 2004/08/02 07:11:43 kenmcd Exp $" - - /* - * Generic driver for a daemon-based PMDA -Index: pcp-2.5.0/src/pmdas/sample/src/sample.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/sample/src/sample.c -+++ pcp-2.5.0/src/pmdas/sample/src/sample.c -@@ -20,7 +20,7 @@ - * - */ - --#ident "$Id: sample.c,v 2.62 2005/05/18 02:42:53 kenmcd Exp $" -+// "$Id: sample.c,v 2.62 2005/05/18 02:42:53 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/sendmail/sendmail.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/sendmail/sendmail.c -+++ pcp-2.5.0/src/pmdas/sendmail/sendmail.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: sendmail.c,v 1.9 2004/06/15 09:39:44 kenmcd Exp $" -+// "$Id: sendmail.c,v 1.9 2004/06/15 09:39:44 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/shping/pmda.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/shping/pmda.c -+++ pcp-2.5.0/src/pmdas/shping/pmda.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmda.c,v 1.5 2004/06/15 09:39:44 kenmcd Exp $" -+// "$Id: pmda.c,v 1.5 2004/06/15 09:39:44 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/shping/shping.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/shping/shping.c -+++ pcp-2.5.0/src/pmdas/shping/shping.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: shping.c,v 1.9 2004/07/22 07:02:39 kenmcd Exp $" -+// "$Id: shping.c,v 1.9 2004/07/22 07:02:39 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/shping/shping.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/shping/shping.h -+++ pcp-2.5.0/src/pmdas/shping/shping.h -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: shping.h,v 1.2 2001/02/12 04:45:25 max Exp $" -+// "$Id: shping.h,v 1.2 2001/02/12 04:45:25 max Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/pmdas/simple/simple.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/simple/simple.c -+++ pcp-2.5.0/src/pmdas/simple/simple.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: simple.c,v 2.41 2005/06/06 08:27:45 kenmcd Exp $" -+// "$Id: simple.c,v 2.41 2005/06/06 08:27:45 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/solaris/solaris.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/solaris/solaris.c -+++ pcp-2.5.0/src/pmdas/solaris/solaris.c -@@ -24,7 +24,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: solaris.c,v 1.2 2004/08/02 02:25:18 kenmcd Exp $" -+// "$Id: solaris.c,v 1.2 2004/08/02 02:25:18 kenmcd Exp $" - - #include - #include "./common.h" -Index: pcp-2.5.0/src/pmdas/summary/mainloop.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/summary/mainloop.c -+++ pcp-2.5.0/src/pmdas/summary/mainloop.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: mainloop.c,v 2.21 2000/08/22 09:28:34 max Exp $" -+// "$Id: mainloop.c,v 2.21 2000/08/22 09:28:34 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/summary/pmda.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/summary/pmda.c -+++ pcp-2.5.0/src/pmdas/summary/pmda.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmda.c,v 2.31 2004/08/02 07:11:43 kenmcd Exp $" -+// "$Id: pmda.c,v 2.31 2004/08/02 07:11:43 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/summary/summary.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/summary/summary.c -+++ pcp-2.5.0/src/pmdas/summary/summary.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: summary.c,v 2.19 2003/02/20 19:20:25 kenmcd Exp $" -+// "$Id: summary.c,v 2.19 2003/02/20 19:20:25 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/summary/summary.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/summary/summary.h -+++ pcp-2.5.0/src/pmdas/summary/summary.h -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: summary.h,v 2.4 2000/08/21 06:10:48 mg Exp $" -+// "$Id: summary.h,v 2.4 2000/08/21 06:10:48 mg Exp $" - - /* - * exported summary metrics -Index: pcp-2.5.0/src/pmdas/trace/app1.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/app1.c -+++ pcp-2.5.0/src/pmdas/trace/app1.c -@@ -34,7 +34,7 @@ - * $ pminfo -tT trace - */ - --#ident "$Id: app1.c,v 1.11 2000/05/05 03:15:54 nathans Exp $" -+// "$Id: app1.c,v 1.11 2000/05/05 03:15:54 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/trace/app2.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/app2.c -+++ pcp-2.5.0/src/pmdas/trace/app2.c -@@ -34,7 +34,7 @@ - * $ pminfo -tT trace - */ - --#ident "$Id: app2.c,v 1.11 2003/02/20 05:28:13 kenmcd Exp $" -+// "$Id: app2.c,v 1.11 2003/02/20 05:28:13 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/trace/app3.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/app3.c -+++ pcp-2.5.0/src/pmdas/trace/app3.c -@@ -34,7 +34,7 @@ - * $ pminfo -tT trace - */ - --#ident "$Id: app3.c,v 1.11 2004/06/07 10:19:59 nathans Exp $" -+// "$Id: app3.c,v 1.11 2004/06/07 10:19:59 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/trace/pmtrace.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/pmtrace.c -+++ pcp-2.5.0/src/pmdas/trace/pmtrace.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmtrace.c,v 1.23 2003/07/03 19:56:49 kenmcd Exp $" -+// "$Id: pmtrace.c,v 1.23 2003/07/03 19:56:49 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/trace/src/client.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/src/client.c -+++ pcp-2.5.0/src/pmdas/trace/src/client.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: client.c,v 1.11 2001/01/02 09:02:00 kenmcd Exp $" -+// "$Id: client.c,v 1.11 2001/01/02 09:02:00 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/trace/src/client.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/src/client.h -+++ pcp-2.5.0/src/pmdas/trace/src/client.h -@@ -22,7 +22,7 @@ - #ifndef CLIENT_H - #define CLIENT_H - --#ident "$Id: client.h,v 1.3 1997/09/09 00:13:09 nathans Exp $" -+// "$Id: client.h,v 1.3 1997/09/09 00:13:09 nathans Exp $" - - typedef struct { - int fd; /* socket descriptor */ -Index: pcp-2.5.0/src/pmdas/trace/src/comms.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/src/comms.c -+++ pcp-2.5.0/src/pmdas/trace/src/comms.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: comms.c,v 1.27 2004/07/22 06:48:40 kenmcd Exp $" -+// "$Id: comms.c,v 1.27 2004/07/22 06:48:40 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/trace/src/comms.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/src/comms.h -+++ pcp-2.5.0/src/pmdas/trace/src/comms.h -@@ -22,7 +22,7 @@ - #ifndef COMMS_H - #define COMMS_H - --#ident "$Id: comms.h,v 1.2 2001/01/02 09:02:00 kenmcd Exp $" -+// "$Id: comms.h,v 1.2 2001/01/02 09:02:00 kenmcd Exp $" - - #define TR_OP_NONE 0x0 - #define TR_OP_SEND 0x1 -Index: pcp-2.5.0/src/pmdas/trace/src/data.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/src/data.c -+++ pcp-2.5.0/src/pmdas/trace/src/data.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: data.c,v 1.1 1998/01/16 03:09:20 nathans Exp $" -+// "$Id: data.c,v 1.1 1998/01/16 03:09:20 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/trace/src/pmda.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/src/pmda.c -+++ pcp-2.5.0/src/pmdas/trace/src/pmda.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmda.c,v 1.30 2004/06/15 09:39:44 kenmcd Exp $" -+// "$Id: pmda.c,v 1.30 2004/06/15 09:39:44 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/trace/src/trace.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/src/trace.c -+++ pcp-2.5.0/src/pmdas/trace/src/trace.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: trace.c,v 1.39 2000/12/28 07:37:59 max Exp $" -+// "$Id: trace.c,v 1.39 2000/12/28 07:37:59 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/trace/stub.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/stub.c -+++ pcp-2.5.0/src/pmdas/trace/stub.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: stub.c,v 1.5 2000/05/05 03:16:01 nathans Exp $" -+// "$Id: stub.c,v 1.5 2000/05/05 03:16:01 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/trivial/trivial.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trivial/trivial.c -+++ pcp-2.5.0/src/pmdas/trivial/trivial.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: trivial.c,v 2.15 2004/06/15 09:39:44 kenmcd Exp $" -+// "$Id: trivial.c,v 2.15 2004/06/15 09:39:44 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/txmon/txmon.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/txmon/txmon.c -+++ pcp-2.5.0/src/pmdas/txmon/txmon.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: txmon.c,v 2.19 2004/06/16 23:33:34 nathans Exp $" -+// "$Id: txmon.c,v 2.19 2004/06/16 23:33:34 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/txmon/txrecord.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/txmon/txrecord.c -+++ pcp-2.5.0/src/pmdas/txmon/txrecord.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: txrecord.c,v 2.6 2000/12/28 07:37:59 max Exp $" -+// "$Id: txrecord.c,v 2.6 2000/12/28 07:37:59 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdas/weblog/check_match.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/weblog/check_match.c -+++ pcp-2.5.0/src/pmdas/weblog/check_match.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Revision: 1.10 $" -+// "$Revision: 1.10 $" - - /* - * Uses the same regualr expression logic as pmdaweblog, but extracted -Index: pcp-2.5.0/src/pmdas/weblog/pmda.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/weblog/pmda.c -+++ pcp-2.5.0/src/pmdas/weblog/pmda.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmda.c,v 2.23 2004/06/20 22:38:25 kenmcd Exp $" -+// "$Id: pmda.c,v 2.23 2004/06/20 22:38:25 kenmcd Exp $" - - #include "pmapi.h" - -Index: pcp-2.5.0/src/pmdas/weblog/sproc.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/weblog/sproc.c -+++ pcp-2.5.0/src/pmdas/weblog/sproc.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: sproc.c,v 1.7 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: sproc.c,v 1.7 2004/06/24 06:15:36 kenmcd Exp $" - - #ifndef HAVE_SPROC - -Index: pcp-2.5.0/src/pmdas/weblog/weblog.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/weblog/weblog.c -+++ pcp-2.5.0/src/pmdas/weblog/weblog.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: weblog.c,v 2.23 2004/06/24 06:15:36 kenmcd Exp $" -+// "$Id: weblog.c,v 2.23 2004/06/24 06:15:36 kenmcd Exp $" - - #include "./weblog.h" - #include -Index: pcp-2.5.0/src/pmdas/weblog/weblog.h -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/weblog/weblog.h -+++ pcp-2.5.0/src/pmdas/weblog/weblog.h -@@ -20,7 +20,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: weblog.h,v 2.14 2004/06/15 09:39:44 kenmcd Exp $" -+// "$Id: weblog.h,v 2.14 2004/06/15 09:39:44 kenmcd Exp $" - - #ifndef _WEBLOG_H - #define _WEBLOG_H -Index: pcp-2.5.0/src/pmdas/windows/pmda.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/windows/pmda.c -+++ pcp-2.5.0/src/pmdas/windows/pmda.c -@@ -26,7 +26,7 @@ - * - */ - --#ident "$Id: pmda.c,v 1.4 2004/07/20 20:04:36 kenmcd Exp $" -+// "$Id: pmda.c,v 1.4 2004/07/20 20:04:36 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdbg/pmdbg.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdbg/pmdbg.c -+++ pcp-2.5.0/src/pmdbg/pmdbg.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmdbg.c,v 1.2 2003/02/20 19:20:25 kenmcd Exp $" -+// "$Id: pmdbg.c,v 1.2 2003/02/20 19:20:25 kenmcd Exp $" - - /* - * pmdbg - help for PCP debug flags -Index: pcp-2.5.0/src/pmdumplog/pmdumplog.c -=================================================================== ---- pcp-2.5.0.orig/src/pmdumplog/pmdumplog.c -+++ pcp-2.5.0/src/pmdumplog/pmdumplog.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmdumplog.c,v 1.5 2004/06/16 23:33:34 nathans Exp $" -+// "$Id: pmdumplog.c,v 1.5 2004/06/16 23:33:34 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmdumptext/pmdumptext.c++ -=================================================================== ---- pcp-2.5.0.orig/src/pmdumptext/pmdumptext.c++ -+++ pcp-2.5.0/src/pmdumptext/pmdumptext.c++ -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmdumptext.c++,v 1.44 2005/05/10 01:59:58 kenmcd Exp $" -+// "$Id: pmdumptext.c++,v 1.44 2005/05/10 01:59:58 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmerr/pmerr.c -=================================================================== ---- pcp-2.5.0.orig/src/pmerr/pmerr.c -+++ pcp-2.5.0/src/pmerr/pmerr.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmerr.c,v 1.3 2003/02/20 19:20:25 kenmcd Exp $" -+// "$Id: pmerr.c,v 1.3 2003/02/20 19:20:25 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmhostname/pmhostname.c -=================================================================== ---- pcp-2.5.0.orig/src/pmhostname/pmhostname.c -+++ pcp-2.5.0/src/pmhostname/pmhostname.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmhostname.c,v 1.3 2003/02/20 05:28:13 kenmcd Exp $" -+// "$Id: pmhostname.c,v 1.3 2003/02/20 05:28:13 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmie/src/dstruct.c -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/dstruct.c -+++ pcp-2.5.0/src/pmie/src/dstruct.c -@@ -22,7 +22,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: dstruct.c,v 1.10 2004/07/02 05:52:57 kenmcd Exp $" -+// "$Id: dstruct.c,v 1.10 2004/07/02 05:52:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmie/src/eval.c -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/eval.c -+++ pcp-2.5.0/src/pmie/src/eval.c -@@ -22,7 +22,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: eval.c,v 1.3 2002/07/06 05:48:20 kenmcd Exp $" -+// "$Id: eval.c,v 1.3 2002/07/06 05:48:20 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmie/src/grammar.save.c -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/grammar.save.c -+++ pcp-2.5.0/src/pmie/src/grammar.save.c -@@ -49,7 +49,7 @@ - - #line 27 "grammar.y" - --#ident "$Id: grammar.save.c,v 1.1 2004/07/02 05:52:57 kenmcd Exp $" -+// "$Id: grammar.save.c,v 1.1 2004/07/02 05:52:57 kenmcd Exp $" - - #include "dstruct.h" - #include "syntax.h" -Index: pcp-2.5.0/src/pmie/src/grammar.y -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/grammar.y -+++ pcp-2.5.0/src/pmie/src/grammar.y -@@ -23,7 +23,7 @@ - */ - - %{ --#ident "$Id: grammar.y,v 1.1 2000/12/05 03:42:25 max Exp $" -+// "$Id: grammar.y,v 1.1 2000/12/05 03:42:25 max Exp $" - - #include "dstruct.h" - #include "syntax.h" -Index: pcp-2.5.0/src/pmie/src/lexicon.c -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/lexicon.c -+++ pcp-2.5.0/src/pmie/src/lexicon.c -@@ -26,7 +26,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: lexicon.c,v 1.3 2003/02/20 05:28:13 kenmcd Exp $" -+// "$Id: lexicon.c,v 1.3 2003/02/20 05:28:13 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmie/src/match_inst.c -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/match_inst.c -+++ pcp-2.5.0/src/pmie/src/match_inst.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: match_inst.c,v 1.1 2000/12/05 03:42:25 max Exp $" -+// "$Id: match_inst.c,v 1.1 2000/12/05 03:42:25 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmie/src/pmie.c -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/pmie.c -+++ pcp-2.5.0/src/pmie/src/pmie.c -@@ -22,7 +22,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmie.c,v 1.14 2004/06/23 01:42:45 kenmcd Exp $" -+// "$Id: pmie.c,v 1.14 2004/06/23 01:42:45 kenmcd Exp $" - - /* - * pmie debug flags: -Index: pcp-2.5.0/src/pmie/src/pragmatics.c -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/pragmatics.c -+++ pcp-2.5.0/src/pmie/src/pragmatics.c -@@ -25,7 +25,7 @@ - * the PMAPI access are kept in this source file. - */ - --#ident "$Id: pragmatics.c,v 1.5 2004/06/20 22:38:25 kenmcd Exp $" -+// "$Id: pragmatics.c,v 1.5 2004/06/20 22:38:25 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmie/src/show.c -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/show.c -+++ pcp-2.5.0/src/pmie/src/show.c -@@ -22,7 +22,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: show.c,v 1.4 2003/02/20 19:20:25 kenmcd Exp $" -+// "$Id: show.c,v 1.4 2003/02/20 19:20:25 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmie/src/symbol.c -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/symbol.c -+++ pcp-2.5.0/src/pmie/src/symbol.c -@@ -23,7 +23,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: symbol.c,v 1.3 2004/06/07 10:17:19 nathans Exp $" -+// "$Id: symbol.c,v 1.3 2004/06/07 10:17:19 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmie/src/syntax.c -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/syntax.c -+++ pcp-2.5.0/src/pmie/src/syntax.c -@@ -22,7 +22,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: syntax.c,v 1.3 2002/11/06 00:42:53 kenmcd Exp $" -+// "$Id: syntax.c,v 1.3 2002/11/06 00:42:53 kenmcd Exp $" - #ifdef HAVE_CONFIG_H - #include - #endif -Index: pcp-2.5.0/src/pmie/src/syslog.c -=================================================================== ---- pcp-2.5.0.orig/src/pmie/src/syslog.c -+++ pcp-2.5.0/src/pmie/src/syslog.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: syslog.c,v 1.5 2004/07/22 07:02:39 kenmcd Exp $" -+// "$Id: syslog.c,v 1.5 2004/07/22 07:02:39 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pminfo/pminfo.c -=================================================================== ---- pcp-2.5.0.orig/src/pminfo/pminfo.c -+++ pcp-2.5.0/src/pminfo/pminfo.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pminfo.c,v 1.4 2003/02/20 05:28:13 kenmcd Exp $" -+// "$Id: pminfo.c,v 1.4 2003/02/20 05:28:13 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmkstat/src/pmkstat.c -=================================================================== ---- pcp-2.5.0.orig/src/pmkstat/src/pmkstat.c -+++ pcp-2.5.0/src/pmkstat/src/pmkstat.c -@@ -28,7 +28,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmkstat.c,v 1.6 2004/06/07 10:17:19 nathans Exp $" -+// "$Id: pmkstat.c,v 1.6 2004/06/07 10:17:19 nathans Exp $" - - #define HAVE_NETWORK 0 - -Index: pcp-2.5.0/src/pmlc/actions.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlc/actions.c -+++ pcp-2.5.0/src/pmlc/actions.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: actions.c,v 1.4 2005/08/02 16:46:27 kenmcd Exp $" -+// "$Id: actions.c,v 1.4 2005/08/02 16:46:27 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlc/gram.save.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlc/gram.save.c -+++ pcp-2.5.0/src/pmlc/gram.save.c -@@ -43,7 +43,7 @@ - - #line 5 "gram.y" - --#ident "$Id: gram.save.c,v 1.1 2004/07/02 05:52:57 kenmcd Exp $" -+// "$Id: gram.save.c,v 1.1 2004/07/02 05:52:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlc/gram.y -=================================================================== ---- pcp-2.5.0.orig/src/pmlc/gram.y -+++ pcp-2.5.0/src/pmlc/gram.y -@@ -20,7 +20,7 @@ - */ - - %{ --#ident "$Id: gram.y,v 1.4 2002/10/22 04:27:01 kenmcd Exp $" -+// "$Id: gram.y,v 1.4 2002/10/22 04:27:01 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlc/lex.l -=================================================================== ---- pcp-2.5.0.orig/src/pmlc/lex.l -+++ pcp-2.5.0/src/pmlc/lex.l -@@ -20,7 +20,7 @@ - */ - - %{ --#ident "$Id: lex.l,v 1.4 2002/07/05 05:14:56 kenmcd Exp $" -+// "$Id: lex.l,v 1.4 2002/07/05 05:14:56 kenmcd Exp $" - - #include "pmapi.h" - #include "./pmlc.h" -Index: pcp-2.5.0/src/pmlc/pmlc.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlc/pmlc.c -+++ pcp-2.5.0/src/pmlc/pmlc.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmlc.c,v 1.3 2005/08/02 16:46:27 kenmcd Exp $" -+// "$Id: pmlc.c,v 1.3 2005/08/02 16:46:27 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlc/pmlc.h -=================================================================== ---- pcp-2.5.0.orig/src/pmlc/pmlc.h -+++ pcp-2.5.0/src/pmlc/pmlc.h -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmlc.h,v 1.4 2005/08/02 16:46:27 kenmcd Exp $" -+// "$Id: pmlc.h,v 1.4 2005/08/02 16:46:27 kenmcd Exp $" - - #ifndef _PMLC_H - #define _PMLC_H -Index: pcp-2.5.0/src/pmlc/util.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlc/util.c -+++ pcp-2.5.0/src/pmlc/util.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: util.c,v 1.1 2004/06/15 09:39:44 kenmcd Exp $" -+// "$Id: util.c,v 1.1 2004/06/15 09:39:44 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogextract/error.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogextract/error.c -+++ pcp-2.5.0/src/pmlogextract/error.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: error.c,v 1.3 2000/12/28 07:37:59 max Exp $" -+// "$Id: error.c,v 1.3 2000/12/28 07:37:59 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogextract/gram.save.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogextract/gram.save.c -+++ pcp-2.5.0/src/pmlogextract/gram.save.c -@@ -12,7 +12,7 @@ - - #line 6 "gram.y" - --#ident "$Id: gram.save.c,v 1.1 2004/07/02 05:52:57 kenmcd Exp $" -+// "$Id: gram.save.c,v 1.1 2004/07/02 05:52:57 kenmcd Exp $" - - /* - * pmlogextract parser -Index: pcp-2.5.0/src/pmlogextract/gram.y -=================================================================== ---- pcp-2.5.0.orig/src/pmlogextract/gram.y -+++ pcp-2.5.0/src/pmlogextract/gram.y -@@ -21,7 +21,7 @@ - - - %{ --#ident "$Id: gram.y,v 1.15 2002/11/05 23:06:18 kenmcd Exp $" -+// "$Id: gram.y,v 1.15 2002/11/05 23:06:18 kenmcd Exp $" - - /* - * pmlogextract parser -Index: pcp-2.5.0/src/pmlogextract/lex.l -=================================================================== ---- pcp-2.5.0.orig/src/pmlogextract/lex.l -+++ pcp-2.5.0/src/pmlogextract/lex.l -@@ -24,7 +24,7 @@ - /* - * pmlogextract configfile lexer - */ --#ident "$Id: lex.l,v 1.6 2002/07/05 02:57:20 kenmcd Exp $" -+// "$Id: lex.l,v 1.6 2002/07/05 02:57:20 kenmcd Exp $" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/pmlogextract/logio.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogextract/logio.c -+++ pcp-2.5.0/src/pmlogextract/logio.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: logio.c,v 1.13 2004/06/20 22:38:25 kenmcd Exp $" -+// "$Id: logio.c,v 1.13 2004/06/20 22:38:25 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogextract/metriclist.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogextract/metriclist.c -+++ pcp-2.5.0/src/pmlogextract/metriclist.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id" -+// "$Id" - - #include - #include -Index: pcp-2.5.0/src/pmlogextract/pmlogextract.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogextract/pmlogextract.c -+++ pcp-2.5.0/src/pmlogextract/pmlogextract.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmlogextract.c,v 1.51 2005/07/10 06:57:52 kenmcd Exp $" -+// "$Id: pmlogextract.c,v 1.51 2005/07/10 06:57:52 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogger/callback.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/callback.c -+++ pcp-2.5.0/src/pmlogger/callback.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: callback.c,v 1.5 2004/12/06 00:56:58 kenmcd Exp $" -+// "$Id: callback.c,v 1.5 2004/12/06 00:56:58 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogger/check.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/check.c -+++ pcp-2.5.0/src/pmlogger/check.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: check.c,v 1.3 2001/03/09 01:34:57 kenmcd Exp $" -+// "$Id: check.c,v 1.3 2001/03/09 01:34:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogger/dopdu.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/dopdu.c -+++ pcp-2.5.0/src/pmlogger/dopdu.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: dopdu.c,v 1.5 2004/12/06 00:56:58 kenmcd Exp $" -+// "$Id: dopdu.c,v 1.5 2004/12/06 00:56:58 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogger/error.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/error.c -+++ pcp-2.5.0/src/pmlogger/error.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: error.c,v 1.2 2000/12/28 09:17:25 max Exp $" -+// "$Id: error.c,v 1.2 2000/12/28 09:17:25 max Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogger/fetch.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/fetch.c -+++ pcp-2.5.0/src/pmlogger/fetch.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: fetch.c,v 1.2 2004/06/07 10:17:19 nathans Exp $" -+// "$Id: fetch.c,v 1.2 2004/06/07 10:17:19 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogger/gram.save.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/gram.save.c -+++ pcp-2.5.0/src/pmlogger/gram.save.c -@@ -37,7 +37,7 @@ - - #line 19 "gram.y" - --#ident "$Id: gram.save.c,v 1.1 2004/07/02 05:52:57 kenmcd Exp $" -+// "$Id: gram.save.c,v 1.1 2004/07/02 05:52:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogger/gram.y -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/gram.y -+++ pcp-2.5.0/src/pmlogger/gram.y -@@ -34,7 +34,7 @@ - */ - - %{ --#ident "$Id: gram.y,v 1.5 2002/10/11 04:14:47 markgw Exp $" -+// "$Id: gram.y,v 1.5 2002/10/11 04:14:47 markgw Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogger/lex.l -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/lex.l -+++ pcp-2.5.0/src/pmlogger/lex.l -@@ -20,7 +20,7 @@ - */ - - %{ --#ident "$Id: lex.l,v 1.4 2002/07/05 05:14:56 kenmcd Exp $" -+// "$Id: lex.l,v 1.4 2002/07/05 05:14:56 kenmcd Exp $" - #include - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/pmlogger/logger.h -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/logger.h -+++ pcp-2.5.0/src/pmlogger/logger.h -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: logger.h,v 1.4 2004/12/06 00:56:58 kenmcd Exp $" -+// "$Id: logger.h,v 1.4 2004/12/06 00:56:58 kenmcd Exp $" - - #ifndef _LOGGER_H - #define _LOGGER_H -Index: pcp-2.5.0/src/pmlogger/pmlogger.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/pmlogger.c -+++ pcp-2.5.0/src/pmlogger/pmlogger.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmlogger.c,v 1.7 2004/12/06 00:56:58 kenmcd Exp $" -+// "$Id: pmlogger.c,v 1.7 2004/12/06 00:56:58 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogger/ports.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/ports.c -+++ pcp-2.5.0/src/pmlogger/ports.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: ports.c,v 1.8 2004/07/22 07:00:57 kenmcd Exp $" -+// "$Id: ports.c,v 1.8 2004/07/22 07:00:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogger/preamble.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/preamble.c -+++ pcp-2.5.0/src/pmlogger/preamble.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: preamble.c,v 1.3 2004/06/15 09:39:44 kenmcd Exp $" -+// "$Id: preamble.c,v 1.3 2004/06/15 09:39:44 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogger/rewrite.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/rewrite.c -+++ pcp-2.5.0/src/pmlogger/rewrite.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: rewrite.c,v 1.2 2000/12/28 09:17:25 max Exp $" -+// "$Id: rewrite.c,v 1.2 2000/12/28 09:17:25 max Exp $" - - #include - #include "pmapi.h" -Index: pcp-2.5.0/src/pmlogger/util.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogger/util.c -+++ pcp-2.5.0/src/pmlogger/util.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: util.c,v 1.1 2004/06/15 09:39:44 kenmcd Exp $" -+// "$Id: util.c,v 1.1 2004/06/15 09:39:44 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogreduce/logio.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogreduce/logio.c -+++ pcp-2.5.0/src/pmlogreduce/logio.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: logio.c,v 1.1 2004/04/13 08:59:30 kenmcd Exp $" -+// "$Id: logio.c,v 1.1 2004/04/13 08:59:30 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogreduce/pmlogreduce.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogreduce/pmlogreduce.c -+++ pcp-2.5.0/src/pmlogreduce/pmlogreduce.c -@@ -37,7 +37,7 @@ - * in the head of scan.c - */ - --#ident "$Id: pmlogreduce.c,v 1.5 2005/03/16 09:45:23 kenmcd Exp $" -+// "$Id: pmlogreduce.c,v 1.5 2005/03/16 09:45:23 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmlogsummary/pmlogsummary.c -=================================================================== ---- pcp-2.5.0.orig/src/pmlogsummary/pmlogsummary.c -+++ pcp-2.5.0/src/pmlogsummary/pmlogsummary.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmlogsummary.c,v 1.31 2004/06/15 09:39:44 kenmcd Exp $" -+// "$Id: pmlogsummary.c,v 1.31 2004/06/15 09:39:44 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmns/pmnsdel.c -=================================================================== ---- pcp-2.5.0.orig/src/pmns/pmnsdel.c -+++ pcp-2.5.0/src/pmns/pmnsdel.c -@@ -23,7 +23,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmnsdel.c,v 1.5 2003/02/10 02:32:07 kenmcd Exp $" -+// "$Id: pmnsdel.c,v 1.5 2003/02/10 02:32:07 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmns/pmnsmerge.c -=================================================================== ---- pcp-2.5.0.orig/src/pmns/pmnsmerge.c -+++ pcp-2.5.0/src/pmns/pmnsmerge.c -@@ -23,7 +23,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmnsmerge.c,v 1.5 2003/05/07 07:21:03 nathans Exp $" -+// "$Id: pmnsmerge.c,v 1.5 2003/05/07 07:21:03 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmns/pmnsutil.c -=================================================================== ---- pcp-2.5.0.orig/src/pmns/pmnsutil.c -+++ pcp-2.5.0/src/pmns/pmnsutil.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id" -+// "$Id" - - #include "pmapi.h" - #include "impl.h" -Index: pcp-2.5.0/src/pmnscomp/pmnscomp.c -=================================================================== ---- pcp-2.5.0.orig/src/pmnscomp/pmnscomp.c -+++ pcp-2.5.0/src/pmnscomp/pmnscomp.c -@@ -23,7 +23,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmnscomp.c,v 1.4 2004/06/07 10:17:19 nathans Exp $" -+// "$Id: pmnscomp.c,v 1.4 2004/06/07 10:17:19 nathans Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmprobe/pmprobe.c -=================================================================== ---- pcp-2.5.0.orig/src/pmprobe/pmprobe.c -+++ pcp-2.5.0/src/pmprobe/pmprobe.c -@@ -21,7 +21,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmprobe.c,v 1.4 2001/03/22 05:26:43 max Exp $" -+// "$Id: pmprobe.c,v 1.4 2001/03/22 05:26:43 max Exp $" - - #include - #include "pmapi.h" -Index: pcp-2.5.0/src/pmproxy/client.c -=================================================================== ---- pcp-2.5.0.orig/src/pmproxy/client.c -+++ pcp-2.5.0/src/pmproxy/client.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: client.c,v 1.3 2005/07/10 05:45:35 kenmcd Exp $" -+// "$Id: client.c,v 1.3 2005/07/10 05:45:35 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmproxy/pmproxy.c -=================================================================== ---- pcp-2.5.0.orig/src/pmproxy/pmproxy.c -+++ pcp-2.5.0/src/pmproxy/pmproxy.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmproxy.c,v 1.4 2005/07/10 05:45:35 kenmcd Exp $" -+// "$Id: pmproxy.c,v 1.4 2005/07/10 05:45:35 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmproxy/pmproxy.h -=================================================================== ---- pcp-2.5.0.orig/src/pmproxy/pmproxy.h -+++ pcp-2.5.0/src/pmproxy/pmproxy.h -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmproxy.h,v 1.3 2005/07/10 05:45:35 kenmcd Exp $" -+// "$Id: pmproxy.h,v 1.3 2005/07/10 05:45:35 kenmcd Exp $" - - #ifndef _PROXY_H - #define _PROXY_H -Index: pcp-2.5.0/src/pmstore/pmstore.c -=================================================================== ---- pcp-2.5.0.orig/src/pmstore/pmstore.c -+++ pcp-2.5.0/src/pmstore/pmstore.c -@@ -22,7 +22,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmstore.c,v 1.6 2004/07/02 05:52:57 kenmcd Exp $" -+// "$Id: pmstore.c,v 1.6 2004/07/02 05:52:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmtrace/pmtrace.c -=================================================================== ---- pcp-2.5.0.orig/src/pmtrace/pmtrace.c -+++ pcp-2.5.0/src/pmtrace/pmtrace.c -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmtrace.c,v 1.23 2003/07/03 19:56:49 kenmcd Exp $" -+// "$Id: pmtrace.c,v 1.23 2003/07/03 19:56:49 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/pmval/pmval.c -=================================================================== ---- pcp-2.5.0.orig/src/pmval/pmval.c -+++ pcp-2.5.0/src/pmval/pmval.c -@@ -22,7 +22,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: pmval.c,v 1.11 2005/03/15 04:56:57 kenmcd Exp $" -+// "$Id: pmval.c,v 1.11 2005/03/15 04:56:57 kenmcd Exp $" - - #include - #include -Index: pcp-2.5.0/src/procmemstat/procmemstat.c -=================================================================== ---- pcp-2.5.0.orig/src/procmemstat/procmemstat.c -+++ pcp-2.5.0/src/procmemstat/procmemstat.c -@@ -22,7 +22,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#ident "$Id: procmemstat.c,v 1.2 2004/06/23 18:05:05 kenmcd Exp $" -+// "$Id: procmemstat.c,v 1.2 2004/06/23 18:05:05 kenmcd Exp $" - - #include - #include diff --git a/pcp-2.5.0-SuSE.diff b/pcp-2.5.0-SuSE.diff deleted file mode 100644 index 7ec8925..0000000 --- a/pcp-2.5.0-SuSE.diff +++ /dev/null @@ -1,92 +0,0 @@ -diff -ur pcp-2.5.0/configure.in pcp-2.5.0.SuSE/configure.in ---- pcp-2.5.0/configure.in 2005-11-29 02:39:26.000000000 +0100 -+++ pcp-2.5.0.SuSE/configure.in 2006-01-16 16:22:45.462489138 +0100 -@@ -1215,11 +1215,6 @@ - break - fi - done -- if test -x /usr/lib/rpm/brp-compress -- then -- have_gzipped_manpages=true -- have_bzip2ed_manpages=false -- fi - fi - else - pcp_man_dir=`eval echo $mandir` -@@ -1229,6 +1224,11 @@ - echo "FATAL ERROR: could not find find pcp_man_dir directory." - exit 1 - fi -+if test -x /usr/lib/rpm/brp-compress -+then -+ have_gzipped_manpages=true -+ have_bzip2ed_manpages=false -+fi - AC_SUBST(pcp_man_dir) - AC_SUBST(have_gzipped_manpages) - AC_SUBST(have_bzip2ed_manpages) -@@ -1324,6 +1324,9 @@ - if test $target_os = irix - then - pcp_doc_dir=/usr/pcp/doc -+ elif test -x /sbin/SuSEconfig -+ then -+ pcp_doc_dir=/usr/share/doc/packages/pcp - else - if test -d /usr/share/doc/packages - then -@@ -1349,6 +1352,9 @@ - if test $target_os = irix - then - pcp_demos_dir=/var/pcp/demos -+ elif test -x /sbin/SuSEconfig -+ then -+ pcp_demos_dir=/var/lib/pcp/demos - else - if test -d /usr/share/demos - then -diff -ur pcp-2.5.0/src/pmdas/cisco/GNUmakefile pcp-2.5.0.SuSE/src/pmdas/cisco/GNUmakefile ---- pcp-2.5.0/src/pmdas/cisco/GNUmakefile 2005-11-29 02:52:32.000000000 +0100 -+++ pcp-2.5.0.SuSE/src/pmdas/cisco/GNUmakefile 2006-01-16 12:46:38.444340290 +0100 -@@ -49,6 +49,7 @@ - - install: default - $(INSTALL) -m 755 -d $(PMDADIR) -+ $(INSTALL) -m 755 -d $(PMIE) - $(INSTALL) -m 755 $(IAM) $(PMDADIR)/pmda$(IAM) - $(INSTALL) -m 755 probe parse Install Remove $(PMDADIR) - $(INSTALL) -m 644 $(DFILES) root help pmns domain.h $(PMDADIR) -diff -ur pcp-2.5.0/src/pmdas/shping/GNUmakefile pcp-2.5.0.SuSE/src/pmdas/shping/GNUmakefile ---- pcp-2.5.0/src/pmdas/shping/GNUmakefile 2005-11-29 02:53:55.000000000 +0100 -+++ pcp-2.5.0.SuSE/src/pmdas/shping/GNUmakefile 2006-01-16 12:47:12.428062067 +0100 -@@ -49,6 +49,7 @@ - - install: default - $(INSTALL) -m 755 -d $(PMDADIR) -+ $(INSTALL) -m 755 -d $(PMIE) - $(INSTALL) -m 755 $(IAM) $(PMDADIR)/pmda$(IAM) - $(INSTALL) -m 755 Install Remove $(PMDADIR) - $(INSTALL) -m 644 GNUmakefile.install $(PMDADIR)/Makefile -diff -ur pcp-2.5.0/src/pmpost/GNUmakefile pcp-2.5.0.SuSE/src/pmpost/GNUmakefile ---- pcp-2.5.0/src/pmpost/GNUmakefile 2005-11-29 02:47:22.000000000 +0100 -+++ pcp-2.5.0.SuSE/src/pmpost/GNUmakefile 2006-01-13 13:55:30.200846770 +0100 -@@ -34,7 +34,7 @@ - include $(BUILDRULES) - - install: default -- $(INSTALL) -m 4755 -o root $(CMDTARGET) $(PCP_BINADM_DIR)/$(CMDTARGET) -+ $(INSTALL) -m 4750 -o root -g trusted $(CMDTARGET) $(PCP_BINADM_DIR)/$(CMDTARGET) - - default_pcp: default - ---- pcp-2.5.0-51/src/libpcp/src/connect.c 2005-11-29 02:40:20.000000000 +0100 -+++ pcp-2.5.0/src/libpcp/src/connect.c 2007-07-12 15:42:43.000000000 +0200 -@@ -253,7 +253,7 @@ - __pmConnectPMCD(const char *hostname) - { - __pmIPC ipcinfo = { UNKNOWN_VERSION, NULL }; -- int sts; -+ int sts = -1; - int fd; /* Fd for socket connection to pmcd */ - int port; - int i; diff --git a/pcp-2.5.0-buffer-overflow.diff b/pcp-2.5.0-buffer-overflow.diff deleted file mode 100644 index de25afa..0000000 --- a/pcp-2.5.0-buffer-overflow.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pmdas/linux/proc_pid.c -+++ src/pmdas/linux/proc_pid.c 2008/10/07 14:37:46 -@@ -153,7 +153,7 @@ - sprintf(buf, "/proc/%d/cmdline", pidlist[i]); - if ((fd = open(buf, O_RDONLY)) >= 0) { - sprintf(buf, "%06d ", pidlist[i]); -- if ((k = read(fd, buf+7, sizeof(buf))) > 0) { -+ if ((k = read(fd, buf+7, sizeof(buf)-7)) > 0) { - /* Remove NULL terminators from cmdline string array */ - /* Added by Mike Mason */ - for (n = 7; n < k + 6; n++) { diff --git a/pcp-2.5.0-ndbm.diff b/pcp-2.5.0-ndbm.diff deleted file mode 100644 index ed7487f..0000000 --- a/pcp-2.5.0-ndbm.diff +++ /dev/null @@ -1,42 +0,0 @@ -=========================================================================== -Index: src/include/impl.h -=========================================================================== - ---- a/src/include/impl.h 2006-05-25 12:27:12.000000000 +1000 -+++ b/src/include/impl.h 2006-05-25 12:27:12.000000000 +1000 -@@ -16,7 +16,7 @@ - #include - #include - #include --#if defined(HAVE_NDBM_H) -+#if (defined __sgi) && (defined mips) && (defined HAVE_NDBM_H) - #include - #endif - #include -@@ -654,7 +654,7 @@ - bozo - unknown size of long !!! - #endif - --#ifdef HAVE_NDBM_H -+#if (defined __sgi) && (defined mips) && (defined HAVE_NDBM_H) - /* - * If you use help files created via "newhelp -v1" and ndbm(3B), then - * this is the key you should use, i.e. dptr -> __pmHelpKey and -@@ -664,6 +664,8 @@ - int ident; /* PMID or InDom */ - int type; - } __pmHelpKey; -+ -+extern char *__pmGetText(DBM *, int, int); - #endif - - /* -@@ -676,8 +678,6 @@ - #define PM_TEXT_PMID 4 - #define PM_TEXT_INDOM 8 - --extern char *__pmGetText(DBM *, int, int); -- - /* - * Quick-and-dirty pool memory allocator ... - */ diff --git a/pcp-2.5.0-rpmlint.diff b/pcp-2.5.0-rpmlint.diff deleted file mode 100644 index d4eed2d..0000000 --- a/pcp-2.5.0-rpmlint.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur pcp-2.5.0-51/src/pmns/GNUmakefile pcp-2.5.0/src/pmns/GNUmakefile ---- pcp-2.5.0-51/src/pmns/GNUmakefile 2005-11-29 02:41:56.000000000 +0100 -+++ pcp-2.5.0/src/pmns/GNUmakefile 2007-07-12 14:35:11.000000000 +0200 -@@ -70,7 +70,7 @@ - install: default - $(INSTALL) -m 755 $(TARGETS) $(SCRIPTS) $(PMNS_BIN_DIR) - $(INSTALL) -m 755 $(LOCKERS) $(PMNS_LIB_DIR) -- $(INSTALL) -m 755 GNUmakefile.install $(PMNS_VAR_DIR)/Makefile -+ $(INSTALL) -m 644 GNUmakefile.install $(PMNS_VAR_DIR)/Makefile - $(INSTALL) -m 755 Rebuild4linux $(PMNS_VAR_DIR)/Rebuild - $(INSTALL) -m 755 Make.stdpmid $(PMNS_VAR_DIR)/Make.stdpmid - $(INSTALL) -m 644 $(STDPMIDS) $(PMNS_VAR_DIR) diff --git a/pcp-2.5.0.src.tar.gz b/pcp-2.5.0.src.tar.gz deleted file mode 100644 index a16b436..0000000 --- a/pcp-2.5.0.src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eff19fdca0fbf57e0c60049a3ba57210b96770fe44e5ab81a8189e423f4017b8 -size 1396887 diff --git a/pcp-3.5.8-1.src.tar.gz b/pcp-3.5.8-1.src.tar.gz new file mode 100644 index 0000000..c5da1e1 --- /dev/null +++ b/pcp-3.5.8-1.src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28808981cd3505da5ac723e1f7a6ad25ce47ae50012ada7624fa6f1eb91061c7 +size 2440119 diff --git a/pcp-gcc43.patch b/pcp-gcc43.patch deleted file mode 100644 index f576747..0000000 --- a/pcp-gcc43.patch +++ /dev/null @@ -1,1747 +0,0 @@ ---- src/libpcp_pmc/examples/fixed.c++ -+++ src/libpcp_pmc/examples/fixed.c++ -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#include -+#include - #include "Group.h" - #include "Metric.h" - ---- src/libpcp_pmc/examples/hotproc.c++ -+++ src/libpcp_pmc/examples/hotproc.c++ -@@ -19,7 +19,7 @@ - * Mountain View, CA 94043, USA, or: http://www.sgi.com - */ - --#include -+#include - #include - #include - #include -@@ -85,7 +85,7 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) -- cerr << "interrupt detected - exiting..." << endl; -+ std::cerr << "interrupt detected - exiting..." << std::endl; - #endif - - printf("\n"); -@@ -432,8 +432,8 @@ - if (name->error(c) < 0) { - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) -- cerr << "Proc " << cpu->instName(c) << ": " -- << pmErrStr(cpu->error(c)) << endl; -+ std::cerr << "Proc " << cpu->instName(c) << ": " -+ << pmErrStr(cpu->error(c)) << std::endl; - #endif - continue; - } -@@ -483,9 +483,9 @@ - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL2) { - fflush(stdout); -- cpu->dump(cerr); -- cerr << endl; -- cerr.flush(); -+ cpu->dump(std::cerr); -+ std::cerr << std::endl; -+ std::cerr.flush(); - } - #endif - -@@ -498,8 +498,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) -- cerr << "Indom has changed, had " << name->numInst() -- << " instances" << endl; -+ std::cerr << "Indom has changed, had " << name->numInst() -+ << " instances" << std::endl; - #endif - - user->updateIndom(); -@@ -515,17 +515,17 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) -- cerr << "Indom updated, have " << name->numInst() -+ std::cerr << "Indom updated, have " << name->numInst() - << " instances (nprocs = " << nprocs->value(0) -- << ')' << endl; -+ << ')' << std::endl; - #endif - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) { -- cerr << "Indom updated and fetched, got " -- << nprocs->value(0) << " procs" << endl; -- name->dump(cerr); -- name->indom()->dump(cerr); -+ std::cerr << "Indom updated and fetched, got " -+ << nprocs->value(0) << " procs" << std::endl; -+ name->dump(std::cerr); -+ name->indom()->dump(std::cerr); - } - #endif - } -@@ -554,7 +554,7 @@ - if (diff < 0.0) { // We missed an update - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) { -- cerr << "Need to slip " << -diff << " seconds" << endl; -+ std::cerr << "Need to slip " << -diff << " seconds" << std::endl; - } - #endif - do { -@@ -566,7 +566,7 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL1) { -- cerr << "Napping for " << diff << " seconds" << endl; -+ std::cerr << "Napping for " << diff << " seconds" << std::endl; - } - #endif - ---- src/libpcp_pmc/src/Context.c++ -+++ src/libpcp_pmc/src/Context.c++ -@@ -21,7 +21,7 @@ - - #ident "$Id: Context.c++,v 1.5 2005/05/10 01:59:58 kenmcd Exp $" - --#include -+#include - #include - #include "Context.h" - #include "Metric.h" -@@ -94,8 +94,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Context::lookupDesc: Matched \"" << name -- << "\" to id " << pmIDStr(id) << endl; -+ std::cerr << "PMC_Context::lookupDesc: Matched \"" << name -+ << "\" to id " << pmIDStr(id) << std::endl; - #endif - break; - } -@@ -155,8 +155,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Context::lookupDesc: Add descriptor for " -- << pmIDStr(descPtr->id()) << endl; -+ std::cerr << "PMC_Context::lookupDesc: Add descriptor for " -+ << pmIDStr(descPtr->id()) << std::endl; - } - #endif - } -@@ -166,8 +166,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Context::lookupDesc: Reusing descriptor " -- << pmIDStr(descPtr->id()) << endl; -+ std::cerr << "PMC_Context::lookupDesc: Reusing descriptor " -+ << pmIDStr(descPtr->id()) << std::endl; - } - #endif - } -@@ -192,8 +192,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Context::lookupDesc: Add indom for " -- << pmInDomStr(indomPtr->id()) << endl; -+ std::cerr << "PMC_Context::lookupDesc: Add indom for " -+ << pmInDomStr(indomPtr->id()) << std::endl; - } - #endif - } -@@ -204,8 +204,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Context::lookupDesc: Reusing indom " -- << pmInDomStr(indomPtr->id()) << endl; -+ std::cerr << "PMC_Context::lookupDesc: Reusing indom " -+ << pmInDomStr(indomPtr->id()) << std::endl; - } - #endif - } -@@ -214,8 +214,8 @@ - return sts; - } - --ostream& --operator<<(ostream &os, const PMC_Context &cntx) -+std::ostream& -+operator<<(std::ostream &os, const PMC_Context &cntx) - { - os << cntx.source().desc() << " has " - << cntx._metrics.length() << " metrics"; -@@ -231,20 +231,20 @@ - } - - void --PMC_Context::dump(ostream& os) -+PMC_Context::dump(std::ostream& os) - { - os << "Context " << _context << " has " << _names.length() -- << " metric names for source:" << endl; -+ << " metric names for source:" << std::endl; - _source->dump(os); - } - - void --PMC_Context::dumpMetrics(ostream& os) -+PMC_Context::dumpMetrics(std::ostream& os) - { - uint_t i; - for (i = 0; i < _metrics.length(); i++) - os << " [" << i << "] " -- << _metrics[i]->spec(PMC_false, PMC_true) << endl; -+ << _metrics[i]->spec(PMC_false, PMC_true) << std::endl; - } - - void -@@ -294,8 +294,8 @@ - } - #ifdef PCP_DEBUG - else if (pmDebug & DBG_TRACE_OPTFETCH) -- cerr << "PMC_Context::fetch: Unable to switch to this context: " -- << pmErrStr(sts) << endl; -+ std::cerr << "PMC_Context::fetch: Unable to switch to this context: " -+ << pmErrStr(sts) << std::endl; - #endif - - if (sts >= 0 && _needReconnect) { -@@ -307,15 +307,15 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Context::fetch: Reconnected context \"" -- << *_source << endl; -+ std::cerr << "PMC_Context::fetch: Reconnected context \"" -+ << *_source << std::endl; - } - #endif - } - #ifdef PCP_DEBUG - else if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Context::fetch: Reconnect failed: " -- << pmErrStr(sts) << endl; -+ std::cerr << "PMC_Context::fetch: Reconnect failed: " -+ << pmErrStr(sts) << std::endl; - } - #endif - } -@@ -324,8 +324,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_OPTFETCH) -- cerr << "PMC_Context::fetch: fetching context " << *this -- << endl; -+ std::cerr << "PMC_Context::fetch: fetching context " << *this -+ << std::endl; - #endif - - sts = pmFetch(_pmids.length(), -@@ -352,8 +352,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_OPTFETCH) -- cerr << "PMC_Context::fetch: pmFetch: " << pmErrStr(sts) -- << endl; -+ std::cerr << "PMC_Context::fetch: pmFetch: " << pmErrStr(sts) -+ << std::endl; - #endif - - for (i = 0; i < _metrics.length(); i++) { -@@ -371,7 +371,7 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_OPTFETCH) -- cerr << "PMC_Context::fetch: Updating metrics" << endl; -+ std::cerr << "PMC_Context::fetch: Updating metrics" << std::endl; - #endif - - for (i = 0; i < _metrics.length(); i++) { -@@ -384,7 +384,7 @@ - } - #ifdef PCP_DEBUG - else if (pmDebug & DBG_TRACE_OPTFETCH) -- cerr << "PMC_Context::fetch: nothing to fetch" << endl; -+ std::cerr << "PMC_Context::fetch: nothing to fetch" << std::endl; - #endif - - return sts; -@@ -409,12 +409,12 @@ - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) { - if (sts >= 0) { -- cerr << "PMC_Context::traverse: Found " << list.length() -- << " names from " << name << endl; -+ std::cerr << "PMC_Context::traverse: Found " << list.length() -+ << " names from " << name << std::endl; - } - else -- cerr << "PMC_Context::traverse: Failed: " << pmErrStr(sts) -- << endl; -+ std::cerr << "PMC_Context::traverse: Failed: " << pmErrStr(sts) -+ << std::endl; - } - #endif - ---- src/libpcp_pmc/src/Context.h -+++ src/libpcp_pmc/src/Context.h -@@ -32,7 +32,7 @@ - #endif - #endif - --#include -+#include - - #include "PMC.h" - #include "Vector.h" -@@ -157,13 +157,13 @@ - int traverse(char const* name, PMC_StrList& list); - - // Output the source description -- friend ostream &operator<<(ostream &os, const PMC_Context & rhs); -+ friend std::ostream &operator<<(std::ostream &os, const PMC_Context & rhs); - - // Dump debugging information -- void dump(ostream& os); -+ void dump(std::ostream& os); - - // Dump list of metrics -- void dumpMetrics(ostream& os); -+ void dumpMetrics(std::ostream& os); - - private: - ---- src/libpcp_pmc/src/Desc.c++ -+++ src/libpcp_pmc/src/Desc.c++ -@@ -21,7 +21,7 @@ - - #ident "$Id: Desc.c++,v 1.2 2005/05/10 00:46:37 kenmcd Exp $" - --#include -+#include - #include "Desc.h" - - PMC_Desc::PMC_Desc(pmID pmid) -@@ -34,8 +34,8 @@ - } - #ifdef PCP_DEBUG - else if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Desc::PMC_Desc: unable to lookup " -- << pmIDStr(_pmid) << ": " << pmErrStr(_sts) << endl; -+ std::cerr << "PMC_Desc::PMC_Desc: unable to lookup " -+ << pmIDStr(_pmid) << ": " << pmErrStr(_sts) << std::endl; - } - #endif - } ---- src/libpcp_pmc/src/Group.c++ -+++ src/libpcp_pmc/src/Group.c++ -@@ -156,8 +156,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Group::use: No direct match for context \"" << source -- << "\"." << endl; -+ std::cerr << "PMC_Group::use: No direct match for context \"" << source -+ << "\"." << std::endl; - } - #endif - -@@ -205,8 +205,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Group::use: Creating new context for \"" << source -- << '\"' << endl; -+ std::cerr << "PMC_Group::use: Creating new context for \"" << source -+ << '\"' << std::endl; - } - #endif - -@@ -255,8 +255,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Group::use: Added context " << _use << ": " -- << *newContext << endl; -+ std::cerr << "PMC_Group::use: Added context " << _use << ": " -+ << *newContext << std::endl; - #endif - } - -@@ -274,15 +274,15 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Group::use: Using existing context " << _use -- << " for " << which()->source().desc() << endl; -+ std::cerr << "PMC_Group::use: Using existing context " << _use -+ << " for " << which()->source().desc() << std::endl; - #endif - } - #ifdef PCP_DEBUG - else if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Group::use: Using current context " << _use -+ std::cerr << "PMC_Group::use: Using current context " << _use - << " (hndl = " << which()->hndl() << ") for " -- << which()->source().desc() << endl; -+ << which()->source().desc() << std::endl; - #endif - - return which()->hndl(); -@@ -299,9 +299,9 @@ - _tzGroupIndex = _use; - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Group::useTZ: Using timezone of " -+ std::cerr << "PMC_Group::useTZ: Using timezone of " - << which()->source().desc() -- << " (" << _tzGroupIndex << ')' << endl; -+ << " (" << _tzGroupIndex << ')' << std::endl; - #endif - } - return sts; -@@ -320,8 +320,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Group::useTZ: Switching timezones to \"" << tz -- << "\" (" << _tzUserStr << ')' << endl; -+ std::cerr << "PMC_Group::useTZ: Switching timezones to \"" << tz -+ << "\" (" << _tzUserStr << ')' << std::endl; - } - #endif - } -@@ -340,7 +340,7 @@ - _tzDefault = _tzLocal; - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Group::useTZ: Using timezone of host \"localhost\"" << endl; -+ std::cerr << "PMC_Group::useTZ: Using timezone of host \"localhost\"" << std::endl; - #endif - } - } -@@ -404,12 +404,12 @@ - - #ifdef PCP_DEBUG - if (_localSource->status() < 0 && pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Group::createLocalContext: Default context to " -+ std::cerr << "PMC_Group::createLocalContext: Default context to " - << _localSource->desc() << " failed: " -- << pmErrStr(_localSource->status()) << endl; -+ << pmErrStr(_localSource->status()) << std::endl; - else if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Group::createLocalContext: Default context to " -- << _localSource->desc() << endl; -+ std::cerr << "PMC_Group::createLocalContext: Default context to " -+ << _localSource->desc() << std::endl; - #endif - - PMC_Context *newContext = new PMC_Context(_localSource); -@@ -453,15 +453,15 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Group::getTimeBounds: start = " << _timeStart.tv_sec -+ std::cerr << "PMC_Group::getTimeBounds: start = " << _timeStart.tv_sec - << '.' << _timeStart.tv_usec << ", end = " -- << _timeEnd.tv_sec << '.' << _timeEnd.tv_usec << endl; -+ << _timeEnd.tv_sec << '.' << _timeEnd.tv_usec << std::endl; - } - #endif - } - - void --PMC_Group::dump(ostream &os) -+PMC_Group::dump(std::ostream &os) - { - uint_t i; - -@@ -495,11 +495,11 @@ - break; - } - -- os << "\": " << endl; -+ os << "\": " << std::endl; - -- os << " " << numContexts() << " contexts:" << endl; -+ os << " " << numContexts() << " contexts:" << std::endl; - for (i = 0; i < numContexts(); i++) { -- os << " [" << i << "] " << *(_contexts[i]) << endl; -+ os << " [" << i << "] " << *(_contexts[i]) << std::endl; - _contexts[i]->dumpMetrics(os); - } - } -@@ -542,7 +542,7 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Group::fetch: " << numContexts() << " contexts" << endl; -+ std::cerr << "PMC_Group::fetch: " << numContexts() << " contexts" << std::endl; - #endif - - for (i = 0; i < numContexts(); i++) -@@ -553,7 +553,7 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Group::fetch: Done" << endl; -+ std::cerr << "PMC_Group::fetch: Done" << std::endl; - #endif - - return sts; ---- src/libpcp_pmc/src/Group.h -+++ src/libpcp_pmc/src/Group.h -@@ -26,7 +26,7 @@ - - #ident "$Id: Group.h,v 1.4 2005/05/10 01:59:58 kenmcd Exp $" - --#include -+#include - #include "PMC.h" - #include "List.h" - #include "String.h" -@@ -167,7 +167,7 @@ - // Determine the archive start and finish times - void updateBounds(); - -- void dump(ostream &os); -+ void dump(std::ostream &os); - - private: - ---- src/libpcp_pmc/src/Indom.c++ -+++ src/libpcp_pmc/src/Indom.c++ -@@ -21,7 +21,7 @@ - - #ident "$Id: Indom.c++,v 1.9 2005/05/10 01:59:58 kenmcd Exp $" - --#include -+#include - #include - #include "Indom.h" - #include "Desc.h" -@@ -107,8 +107,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_INDOM) { -- cerr << "PMC_Indom::PMC_Indom: indom "; -- dump(cerr); -+ std::cerr << "PMC_Indom::PMC_Indom: indom "; -+ dump(std::cerr); - } - #endif - -@@ -116,10 +116,10 @@ - - #ifdef PCP_DEBUG - else if (_sts < 0 && pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Indom::PMC_Indom: unable to lookup " -+ std::cerr << "PMC_Indom::PMC_Indom: unable to lookup " - << pmInDomStr(_id) << " from " - << (_type == PM_CONTEXT_ARCHIVE ? "archive" : "host/local") -- << " source: " << pmErrStr(_sts) << endl; -+ << " source: " << pmErrStr(_sts) << std::endl; - } - #endif - } -@@ -163,9 +163,9 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Indom::lookup: inst \"" << name << "\"(" << i -+ std::cerr << "PMC_Indom::lookup: inst \"" << name << "\"(" << i - << ") matched to \"" << _instances[i]._name << "\"(" << i -- << ')' << endl; -+ << ')' << std::endl; - #endif - - if (_instances[i]._refCount == 0) { -@@ -207,9 +207,9 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Metric::setupDesc: numerical inst \"" -+ std::cerr << "PMC_Metric::setupDesc: numerical inst \"" - << name << " matched to \"" << _instances[i]._name -- << "\"(" << i << ')' << endl; -+ << "\"(" << i << ')' << std::endl; - #endif - - if (_instances[i]._refCount == 0) { -@@ -332,13 +332,13 @@ - if (pmDebug & DBG_TRACE_PMC || - pmDebug & DBG_TRACE_INDOM || - pmDebug & DBG_TRACE_PROFILE) { -- cerr << "PMC_Indom::genProfile: id = " << _id << ", count = " -+ std::cerr << "PMC_Indom::genProfile: id = " << _id << ", count = " - << _count << ", numInsts = " << numInsts() << ", active = " - << _numActive << ", activeRef = " << _numActiveRef - << ": " << action << " ptr = " << ptr; - if (sts < 0) -- cerr << ", sts = " << sts << ": " << pmErrStr(sts); -- cerr << endl; -+ std::cerr << ", sts = " << sts << ": " << pmErrStr(sts); -+ std::cerr << std::endl; - } - #endif - -@@ -349,20 +349,20 @@ - } - - void --PMC_Indom::dump(ostream &os) const -+PMC_Indom::dump(std::ostream &os) const - { - uint_t i; - - os << pmInDomStr(_id) << ": " << numInsts() << " instances (" -- << _nullCount << " NULL)" << endl; -+ << _nullCount << " NULL)" << std::endl; - for (i = 0; i < _instances.length(); i++) - if (!_instances[i].null()) - os << " [" << _instances[i]._inst << "] = \"" - << _instances[i]._name << "\" (" << _instances[i]._refCount - << " refs) " << (_instances[i]._active ? "active" : "inactive") -- << endl; -+ << std::endl; - else -- os << " NULL -> " << _instances[i]._index << endl; -+ os << " NULL -> " << _instances[i]._index << std::endl; - } - - int -@@ -401,9 +401,9 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_INDOM && _nullCount != oldNullCount) { -- cerr << "PMC_Indom::update: Cleaning indom " << pmInDomStr(_id) -+ std::cerr << "PMC_Indom::update: Cleaning indom " << pmInDomStr(_id) - << ": Removed " << _nullCount - oldNullCount -- << " instances" << endl; -+ << " instances" << std::endl; - } - #endif - -@@ -426,9 +426,9 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Indom::update: Updating indom " << pmInDomStr(_id) -+ std::cerr << "PMC_Indom::update: Updating indom " << pmInDomStr(_id) - << ": Got " << count << " instances (vs " << numInsts() -- << ")" << endl; -+ << ")" << std::endl; - #endif - - // Any instances which are not in the new indom AND are not -@@ -474,8 +474,8 @@ - _instances[i]._name == nameList[i]) { - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_INDOM) -- cerr << "PMC_Indom::update: Unchanged \"" << nameList[i] -- << "\"(" << instList[i] << ')' << endl; -+ std::cerr << "PMC_Indom::update: Unchanged \"" << nameList[i] -+ << "\"(" << instList[i] << ')' << std::endl; - #endif - _instances[i]._active = PMC_true; - _numActive++; -@@ -500,10 +500,10 @@ - } - #ifdef PCP_DEBUG - else if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Indom::update: Ignoring \"" -+ std::cerr << "PMC_Indom::update: Ignoring \"" - << nameList[i] - << "\" with identical internal identifier (" -- << instList[i] << ")" << endl; -+ << instList[i] << ")" << std::endl; - #endif - break; - } -@@ -512,8 +512,8 @@ - if (j == oldLen) { - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_INDOM) -- cerr << "PMC_Indom::update: Adding \"" << nameList[i] -- << "\"(" << instList[i] << ")" << endl; -+ std::cerr << "PMC_Indom::update: Adding \"" << nameList[i] -+ << "\"(" << instList[i] << ")" << std::endl; - #endif - - if (_nullCount) { -@@ -537,11 +537,11 @@ - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_INDOM) { - if (_instances.length() == oldLen && _nullCount == oldNullCount) -- cerr << "PMC_Indom::update: indom size unchanged" << endl; -+ std::cerr << "PMC_Indom::update: indom size unchanged" << std::endl; - else { -- cerr << "PMC_Indom::update: indom changed from " -- << oldLen - oldNullCount << " to " << numInsts() << endl; -- dump(cerr); -+ std::cerr << "PMC_Indom::update: indom changed from " -+ << oldLen - oldNullCount << " to " << numInsts() << std::endl; -+ dump(std::cerr); - } - } - #endif -@@ -553,11 +553,11 @@ - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) { - if (sts == 0) -- cerr << "PMC_Indom::update: indom empty!" << endl; -+ std::cerr << "PMC_Indom::update: indom empty!" << std::endl; - else -- cerr << "PMC_Indom::update: unable to lookup " -+ std::cerr << "PMC_Indom::update: unable to lookup " - << pmInDomStr(_id) << " from host/local source: " -- << pmErrStr(sts) << endl; -+ << pmErrStr(sts) << std::endl; - } - #endif - } ---- src/libpcp_pmc/src/Indom.h -+++ src/libpcp_pmc/src/Indom.h -@@ -24,7 +24,7 @@ - - #ident "$Id: Indom.h,v 1.10 2005/05/10 01:59:58 kenmcd Exp $" - --#include -+#include - #include - #include "PMC.h" - #include "String.h" -@@ -164,7 +164,7 @@ - { _instances[inst]._index = index; } - - // Dump some debugging output for this indom -- void dump(ostream &os) const; -+ void dump(std::ostream &os) const; - }; - - #endif /* _PMC_INDOM_H_ */ ---- src/libpcp_pmc/src/Metric.c++ -+++ src/libpcp_pmc/src/Metric.c++ -@@ -21,7 +21,7 @@ - - #ident "$Id: Metric.c++,v 1.9 2005/05/10 01:59:58 kenmcd Exp $" - --#include -+#include - #include - #include "Metric.h" - #include "Group.h" -@@ -312,7 +312,7 @@ - } - - void --PMC_Metric::dumpSource(ostream &os) const -+PMC_Metric::dumpSource(std::ostream &os) const - { - switch(context().source().type()) { - case PM_CONTEXT_LOCAL: -@@ -328,7 +328,7 @@ - } - - void --PMC_Metric::dumpValue(ostream &os, uint_t inst) const -+PMC_Metric::dumpValue(std::ostream &os, uint_t inst) const - { - if (error(inst) < 0) - os << pmErrStr(error(inst)); -@@ -339,7 +339,7 @@ - } - - void --PMC_Metric::dump(ostream &os, PMC_Bool srcFlag, uint_t instance) const -+PMC_Metric::dump(std::ostream &os, PMC_Bool srcFlag, uint_t instance) const - { - uint_t i; - -@@ -349,7 +349,7 @@ - os << name(); - - if (_sts < 0) -- os << ": " << pmErrStr(_sts) << endl; -+ os << ": " << pmErrStr(_sts) << std::endl; - else if (hasInstances()) { - if (instance == UINT_MAX) { - if (numInst() == 1) -@@ -360,31 +360,31 @@ - if (indom()->changed()) - os << " (indom has changed)"; - -- os << endl; -+ os << std::endl; - - for (i = 0; i < numInst(); i++) { - os << " [" << instID(i) << " or \"" << instName(i) << "\" (" - << _values[i]._instance << ")] = "; - dumpValue(os, i); -- os << endl; -+ os << std::endl; - } - } - else { - os << '[' << instID(instance) << " or \"" << instName(instance) - << "\" (" << _values[instance]._instance << ")] = "; - dumpValue(os, instance); -- os << endl; -+ os << std::endl; - } - } - else { - os << " = "; - dumpValue(os, 0); -- os << endl; -+ os << std::endl; - } - } - --ostream& --operator<<(ostream &os, const PMC_Metric &mtrc) -+std::ostream& -+operator<<(std::ostream &os, const PMC_Metric &mtrc) - { - uint_t num = mtrc.numValues(); - uint_t i; -@@ -433,8 +433,8 @@ - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_VALUE) - if (_values[i]._error < 0) -- cerr << "PMC_Metric::update: " << spec(PMC_true, PMC_true, i) -- << ": " << pmErrStr(_values[i]._error) << endl; -+ std::cerr << "PMC_Metric::update: " << spec(PMC_true, PMC_true, i) -+ << ": " << pmErrStr(_values[i]._error) << std::endl; - #endif - } - -@@ -460,9 +460,9 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_VALUE) { -- cerr << "PMC_Metric::update: Previous: " -+ std::cerr << "PMC_Metric::update: Previous: " - << spec(PMC_true, PMC_true, i) << ": " -- << pmErrStr(value._error) << endl; -+ << pmErrStr(value._error) << std::endl; - } - #endif - -@@ -555,9 +555,9 @@ - _values[i]._value = oval.d; - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_VALUE) -- cerr << "PMC_Metric::update: scaled " << _name -+ std::cerr << "PMC_Metric::update: scaled " << _name - << " from " << ival.d << " to " << oval.d -- << endl; -+ << std::endl; - #endif - } - } -@@ -569,9 +569,9 @@ - void - PMC_Metric::dumpAll() const - { -- cerr << *this << " from " << context().source().desc() -+ std::cerr << *this << " from " << context().source().desc() - << " with scale = " << _scale << " and units = " << desc().units() -- << endl; -+ << std::endl; - } - - void -@@ -684,10 +684,10 @@ - if (!_explicit && ((int)_values.length() != set->numval)) { - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_INDOM) -- cerr << "PMC_Metric::extractValues: implicit indom " -+ std::cerr << "PMC_Metric::extractValues: implicit indom " - << pmInDomStr(indomPtr->id()) << " changed (" - << set->numval << " != " << _values.length() << ')' -- << endl; -+ << std::endl; - #endif - indomPtr->hasChanged(); - } -@@ -749,9 +749,9 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_OPTFETCH) -- cerr << "PMC_Metric::extractValues: " -+ std::cerr << "PMC_Metric::extractValues: " - << spec(PMC_true, PMC_true, i) << ": " -- << pmErrStr(PM_ERR_VALUE) << endl; -+ << pmErrStr(PM_ERR_VALUE) << std::endl; - #endif - - if (valueRef._prevError != PM_ERR_VALUE) -@@ -806,9 +806,9 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_OPTFETCH) -- cerr << "PMC_Metric::extractValues: " << spec(PMC_true) -+ std::cerr << "PMC_Metric::extractValues: " << spec(PMC_true) - << " is a singular metric but result contained " -- << set->numval << " values" << endl; -+ << set->numval << " values" << std::endl; - #endif - - setError(PM_ERR_VALUE); -@@ -820,8 +820,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_OPTFETCH) -- cerr << "PMC_Metric::extractValues: numval == 0: " << spec(PMC_true, PMC_false) -- << ": " << pmErrStr(PM_ERR_VALUE) << endl; -+ std::cerr << "PMC_Metric::extractValues: numval == 0: " << spec(PMC_true, PMC_false) -+ << ": " << pmErrStr(PM_ERR_VALUE) << std::endl; - #endif - - setError(PM_ERR_VALUE); -@@ -833,8 +833,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_OPTFETCH) -- cerr << "PMC_Metric::extractValues: numval < 0: " << spec(PMC_true, PMC_false) -- << ": " << pmErrStr(set->numval) << endl; -+ std::cerr << "PMC_Metric::extractValues: numval < 0: " << spec(PMC_true, PMC_false) -+ << ": " << pmErrStr(set->numval) << std::endl; - #endif - - setError(set->numval); -@@ -883,7 +883,7 @@ - if (!_active || i == _values.length()) { - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_INDOM) -- cerr << "PMC_Metric::updateIndom: No change required" << endl; -+ std::cerr << "PMC_Metric::updateIndom: No change required" << std::endl; - #endif - return PMC_false; - /*NOTREACHED*/ -@@ -942,8 +942,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Metric::updateIndom: " << spec(PMC_true) << ": Had " -- << oldNum << " instances, now have " << numInst() << endl; -+ std::cerr << "PMC_Metric::updateIndom: " << spec(PMC_true) << ": Had " -+ << oldNum << " instances, now have " << numInst() << std::endl; - #endif - - indomPtr->update(); ---- src/libpcp_pmc/src/Metric.h -+++ src/libpcp_pmc/src/Metric.h -@@ -219,15 +219,15 @@ - uint_t instance = UINT_MAX) const; - - // Dump out the metric and its current value(s) -- void dump(ostream &os, -+ void dump(std::ostream &os, - PMC_Bool srcFlag = PMC_false, - uint_t instance = UINT_MAX) const; - - // Dump out the current value -- void dumpValue(ostream &os, uint_t instance) const; -+ void dumpValue(std::ostream &os, uint_t instance) const; - - // Dump out the metric source -- void dumpSource(ostream &os) const; -+ void dumpSource(std::ostream &os) const; - - // Format a value into a fixed width format - static const char *formatNumber(double value); -@@ -235,7 +235,7 @@ - // Determine the current errors and rate-converted scaled values - int update(); - -- friend ostream &operator<<(ostream &os, const PMC_Metric &metric); -+ friend std::ostream &operator<<(std::ostream &os, const PMC_Metric &metric); - - private: - ---- src/libpcp_pmc/src/Source.c++ -+++ src/libpcp_pmc/src/Source.c++ -@@ -113,8 +113,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Source::PMC_Source: Created context " -- << _hndls.tail() << " to " << _desc << endl; -+ std::cerr << "PMC_Source::PMC_Source: Created context " -+ << _hndls.tail() << " to " << _desc << std::endl; - #endif - - oldTZ = pmWhichZone(&tzs); -@@ -144,8 +144,8 @@ - } - #ifdef PCP_DEBUG - else if (pmDebug & DBG_TRACE_PMC) { -- cerr << "PMC_Source::PMC_Source: Context to " << source -- << " failed: " << pmErrStr(_sts) << endl; -+ std::cerr << "PMC_Source::PMC_Source: Context to " << source -+ << " failed: " << pmErrStr(_sts) << std::endl; - } - #endif - -@@ -186,9 +186,9 @@ - src->host() == source) { - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Source::getSource: Matched host " -+ std::cerr << "PMC_Source::getSource: Matched host " - << source << " to archive " << src->source() -- << " (source " << i << ")" << endl; -+ << " (source " << i << ")" << std::endl; - #endif - break; - } -@@ -197,8 +197,8 @@ - src->source() == source) { - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Source::getSource: Matched " << source -- << " to source " << i << endl; -+ std::cerr << "PMC_Source::getSource: Matched " << source -+ << " to source " << i << std::endl; - #endif - if (src->_sts < 0) { - // try and connect again -@@ -214,11 +214,11 @@ - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) - if (type != PM_CONTEXT_LOCAL) -- cerr << "PMC_Source::getSource: Creating new source for " -- << source << endl; -+ std::cerr << "PMC_Source::getSource: Creating new source for " -+ << source << std::endl; - else -- cerr << "PMC_Source::getSource: Creating new LOCAL source" -- << endl; -+ std::cerr << "PMC_Source::getSource: Creating new LOCAL source" -+ << std::endl; - #endif - - src = new PMC_Source(type, source); -@@ -226,8 +226,8 @@ - - #ifdef PCP_DEBUG - if (src == NULL && pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Source::getSource: Unable to map host " -- << source << " to an arch context" << endl; -+ std::cerr << "PMC_Source::getSource: Unable to map host " -+ << source << " to an arch context" << std::endl; - #endif - - return src; -@@ -262,8 +262,8 @@ - _dupFlag = PMC_true; - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Source::dupContext: Using original context for " -- << _desc << endl; -+ std::cerr << "PMC_Source::dupContext: Using original context for " -+ << _desc << std::endl; - #endif - } - else { -@@ -280,9 +280,9 @@ - _hndls.append(sts); - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Source::dupContext: " << _desc -+ std::cerr << "PMC_Source::dupContext: " << _desc - << " duplicated, hndl[" << _hndls.length()-1 -- << "] = " << sts << endl; -+ << "] = " << sts << std::endl; - #endif - } - else { -@@ -309,16 +309,16 @@ - _hndls.append(sts); - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Source::dupContext: new context to " << _desc -- << " created, hndl = " << sts << endl; -+ std::cerr << "PMC_Source::dupContext: new context to " << _desc -+ << " created, hndl = " << sts << std::endl; - #endif - } - } - #ifdef PCP_DEBUG - if (sts < 0 && pmDebug & DBG_TRACE_PMC) { - if (sts < 0) -- cerr << "PMC_Source::dupContext: context to " << _desc -- << " failed: " << pmErrStr(_sts) << endl; -+ std::cerr << "PMC_Source::dupContext: context to " << _desc -+ << " failed: " << pmErrStr(_sts) << std::endl; - } - #endif - -@@ -338,9 +338,9 @@ - if (i == _hndls.length()) { - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Source::delContext: Attempt to delete " << hndl -+ std::cerr << "PMC_Source::delContext: Attempt to delete " << hndl - << " from list for " << _desc << ", but it is not listed" -- << endl; -+ << std::endl; - #endif - return PM_ERR_NOCONTEXT; - /*NOTREACHED*/ -@@ -354,8 +354,8 @@ - if (_hndls.length() == 0 && _sts >= 0) { - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_PMC) -- cerr << "PMC_Source::delContext: No contexts remain, removing " -- << _desc << endl; -+ std::cerr << "PMC_Source::delContext: No contexts remain, removing " -+ << _desc << std::endl; - #endif - delete this; - } -@@ -363,42 +363,42 @@ - return sts; - } - --ostream& --operator<<(ostream &os, const PMC_Source &rhs) -+std::ostream& -+operator<<(std::ostream &os, const PMC_Source &rhs) - { - os << rhs._desc; - return os; - } - - void --PMC_Source::dump(ostream& os) -+PMC_Source::dump(std::ostream& os) - { - uint_t i; - - os << " sts = " << _sts << ", type = " << _type << ", source = " -- << _source << endl << " host = " << _host << ", timezone = " -- << _timezone << ", tz hndl = " << _tz << endl; -+ << _source << std::endl << " host = " << _host << ", timezone = " -+ << _timezone << ", tz hndl = " << _tz << std::endl; - - if (_sts >= 0) { - os << " start = " << __pmtimevalToReal(&_start) << ", end = " - << __pmtimevalToReal(&_end) << ", dupFlag = " -- << (_dupFlag == PMC_true ? "true" : "false") << endl << " " -+ << (_dupFlag == PMC_true ? "true" : "false") << std::endl << " " - << _hndls.length() << " contexts: "; - } - - for (i = 0; i < _hndls.length(); i++) - os << _hndls[i] << ' '; - -- os << endl; -+ os << std::endl; - } - - void --PMC_Source::dumpList(ostream& os) -+PMC_Source::dumpList(std::ostream& os) - { - uint_t i; -- os << _sourceList.length() << " sources:" << endl; -+ os << _sourceList.length() << " sources:" << std::endl; - for (i = 0; i < _sourceList.length(); i++) { -- os << '[' << i << "] " << *(_sourceList[i]) << endl; -+ os << '[' << i << "] " << *(_sourceList[i]) << std::endl; - _sourceList[i]->dump(os); - } - } ---- src/libpcp_pmc/src/Source.h -+++ src/libpcp_pmc/src/Source.h -@@ -26,7 +26,7 @@ - - #ident "$Id: Source.h,v 1.3 2005/05/10 00:46:37 kenmcd Exp $" - --#include -+#include - #include "PMC.h" - #include "String.h" - #include "List.h" -@@ -118,13 +118,13 @@ - int delContext(int hndl); - - // Output the source -- friend ostream &operator<<(ostream &os, const PMC_Source & rhs); -+ friend std::ostream &operator<<(std::ostream &os, const PMC_Source & rhs); - - // Dump all info about a source -- void dump(ostream& os); -+ void dump(std::ostream& os); - - // Dump list of known sources -- static void dumpList(ostream& os); -+ static void dumpList(std::ostream& os); - - private: - ---- src/libpcp_pmc/src/String.c++ -+++ src/libpcp_pmc/src/String.c++ -@@ -280,8 +280,8 @@ - return *this; - } - --ostream& --operator<<(ostream &os, PMC_String const& rhs) -+std::ostream& -+operator<<(std::ostream &os, PMC_String const& rhs) - { - os << rhs._str.ptr(); - return os; ---- src/libpcp_pmc/src/String.h -+++ src/libpcp_pmc/src/String.h -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include "Vector.h" - #include "List.h" - #include "Bool.h" -@@ -131,7 +131,7 @@ - { _str.resize(_len + 1); return *this; } - - // Output the string -- friend ostream& operator<<(ostream &os, PMC_String const& rhs); -+ friend std::ostream& operator<<(std::ostream &os, PMC_String const& rhs); - }; - - typedef PMC_List PMC_StrList; ---- src/pmdumptext/pmdumptext.c++ -+++ src/pmdumptext/pmdumptext.c++ -@@ -23,8 +23,8 @@ - - #include - #include --#include --#include -+#include -+#include - #include - #include - #include -@@ -110,8 +110,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) { -- cerr << "checkUnits: Changing " << metric->name() -- << " to use bytes" << endl; -+ std::cerr << "checkUnits: Changing " << metric->name() -+ << " to use bytes" << std::endl; - } - #endif - } -@@ -128,8 +128,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) { -- cerr << "checkUnits: Changing " << metric->name() -- << " to use counts" << endl; -+ std::cerr << "checkUnits: Changing " << metric->name() -+ << " to use counts" << std::endl; - } - #endif - } -@@ -147,8 +147,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) { -- cerr << "checkUnits: Changing " << metric->name() -- << " to use time utilization" << endl; -+ std::cerr << "checkUnits: Changing " << metric->name() -+ << " to use time utilization" << std::endl; - } - #endif - } -@@ -344,8 +344,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) -- cerr << "parseConfig: Adding metric '" << buf << "' with scale = " -- << scale << " from line " << line << endl; -+ std::cerr << "parseConfig: Adding metric '" << buf << "' with scale = " -+ << scale << " from line " << line << std::endl; - #endif - - if (traverse(buf, scale) < 0) -@@ -431,11 +431,11 @@ - for (m = 0, v = 1; m < (int)metrics.length(); m++) { - metric = metrics[m]; - for (i = 0; i < (int)metric->numValues(); i++, v++) { -- cout << '[' << setw(2) << v << "] " -- << metric->spec(sourceFlag, PMC_true, i) << endl; -+ std::cout << '[' << std::setw(2) << v << "] " -+ << metric->spec(sourceFlag, PMC_true, i) << std::endl; - } - } -- cout << endl; -+ std::cout << std::endl; - } - - if (fullOnce) { -@@ -443,20 +443,20 @@ - if (len < (int)columnStr.length()) { - columnStr.remove(len, columnStr.length() - len); - } -- cout << setw(len) << columnStr << delimiter; -+ std::cout << std::setw(len) << columnStr << delimiter; - } - - for (m = 0, v = 1; m < (int)metrics.length(); m++) { - metric = metrics[m]; - for (i = 0; i < (int)metric->numValues(); i++) { -- cout << setw(width) << v; -+ std::cout << std::setw(width) << v; - if (v < numValues) { -- cout << delimiter; -+ std::cout << delimiter; - v++; - } - } - } -- cout << endl; -+ std::cout << std::endl; - } - - if (niceFlag && sourceFlag) { -@@ -464,7 +464,7 @@ - if (len < (int)srcStr.length()) { - srcStr.remove(len, srcStr.length() - len); - } -- cout << setw(len) << srcStr << delimiter; -+ std::cout << std::setw(len) << srcStr << delimiter; - } - - for (m = 0, v = 1; m < (int)metrics.length(); m++) { -@@ -473,14 +473,14 @@ - strncpy(buffer, str.ptr(), width); - buffer[width] = '\0'; - for (i = 0; i < (int)metric->numValues(); i++) { -- cout << setw(width) << buffer; -+ std::cout << std::setw(width) << buffer; - if (v < numValues) { -- cout << delimiter; -+ std::cout << delimiter; - v++; - } - } - } -- cout << endl; -+ std::cout << std::endl; - } - - if (metricFlag || (sourceFlag && !niceFlag)) { -@@ -489,10 +489,10 @@ - if (len < (int)metricStr.length()) { - metricStr.remove(len, metricStr.length() - len); - } -- cout << setw(len) << metricStr << delimiter; -+ std::cout << std::setw(len) << metricStr << delimiter; - } - else -- cout << "Time" << delimiter; -+ std::cout << "Time" << delimiter; - - for (m = 0, v = 1; m < (int)metrics.length(); m++) { - metric = metrics[m]; -@@ -512,22 +512,22 @@ - } - } - if (c < (int)str.length()) -- cout << setw(width) << (str.ptr() + c); -+ std::cout << std::setw(width) << (str.ptr() + c); - else -- cout << setw(width) << (str.ptr() + p); -+ std::cout << std::setw(width) << (str.ptr() + p); - } - else -- cout << setw(width) << str; -+ std::cout << std::setw(width) << str; - } - else -- cout << metric->spec(sourceFlag, PMC_true, i); -+ std::cout << metric->spec(sourceFlag, PMC_true, i); - if (v < numValues) { -- cout << delimiter; -+ std::cout << delimiter; - v++; - } - } - } -- cout << endl; -+ std::cout << std::endl; - } - - if (instFlag) { -@@ -536,10 +536,10 @@ - if (len < (int)instStr.length()) { - instStr.remove(len, instStr.length() - len); - } -- cout << setw(len) << instStr << delimiter; -+ std::cout << std::setw(len) << instStr << delimiter; - } - else -- cout << setw(len) << errStr << delimiter; -+ std::cout << std::setw(len) << errStr << delimiter; - - for (m = 0, v = 1; m < (int)metrics.length(); m++) { - metric = metrics[m]; -@@ -548,18 +548,18 @@ - PMC_String const &str = metric->instName(i); - strncpy(buffer, str.ptr(), width); - buffer[width] = '\0'; -- cout << setw(width) << buffer; -+ std::cout << std::setw(width) << buffer; - } - else -- cout << setw(width) << "n/a"; -+ std::cout << std::setw(width) << "n/a"; - - if (v < numValues) { -- cout << delimiter; -+ std::cout << delimiter; - v++; - } - } - } -- cout << endl; -+ std::cout << std::endl; - } - - if (normFlag) { -@@ -568,33 +568,33 @@ - if (len < (int)normStr.length()) { - normStr.remove(len, normStr.length() - len); - } -- cout << setw(len) << normStr << delimiter; -+ std::cout << std::setw(len) << normStr << delimiter; - } - else -- cout << errStr << delimiter; -+ std::cout << errStr << delimiter; - - for (m = 0, v = 1; m < (int)metrics.length(); m++) { - metric = metrics[m]; - for (i = 0; i < (int)metric->numValues(); i++) { - if (shortFlag) -- cout << setprecision(precision) -- << setw(width) -+ std::cout << std::setprecision(precision) -+ << std::setw(width) - << metric->scale(); - else if (descFlag) -- cout << setw(width) -+ std::cout << std::setw(width) - << PMC_Metric::formatNumber(metric->scale()); - else -- cout << setiosflags(ios::fixed) -- << setprecision(precision) -- << setw(width) -+ std::cout << setiosflags(std::ios::fixed) -+ << std::setprecision(precision) -+ << std::setw(width) - << metric->scale(); - if (v < numValues) { -- cout << delimiter; -+ std::cout << delimiter; - v++; - } - } - } -- cout << endl; -+ std::cout << std::endl; - } - - if (unitFlag) { -@@ -603,10 +603,10 @@ - if (len < (int)unitStr.length()) { - unitStr.remove(len, unitStr.length() - len); - } -- cout << setw(len) << unitStr << delimiter; -+ std::cout << std::setw(len) << unitStr << delimiter; - } - else -- cout << noneStr << delimiter; -+ std::cout << noneStr << delimiter; - - for (m = 0, v = 1; m < (int)metrics.length(); m++) { - metric = metrics[m]; -@@ -615,19 +615,19 @@ - for (i = 0; i < (int)metric->numValues(); i++) { - if (niceFlag) - if ((int)str.length() > width) -- cout << setw(width) -+ std::cout << std::setw(width) - << (str.ptr() + str.length() - width); - else -- cout << setw(width) << str; -+ std::cout << std::setw(width) << str; - else -- cout << str; -+ std::cout << str; - if (v < numValues) { -- cout << delimiter; -+ std::cout << delimiter; - v++; - } - } - } -- cout << endl; -+ std::cout << std::endl; - } - } - -@@ -1050,7 +1050,7 @@ - /*NOTREACHED*/ - } - -- // Set up cout to use the required formatting -+ // Set up std::cout to use the required formatting - // - if (niceFlag) { - width = width < 6 ? 6 : width; -@@ -1081,9 +1081,9 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) -- cerr << "main: optind = " << optind << ", argc = " << argc -+ std::cerr << "main: optind = " << optind << ", argc = " << argc - << ", width = " << width << ", precision = " << precision -- << endl; -+ << std::endl; - #endif - - if (optind == argc) { -@@ -1132,8 +1132,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) -- cerr << "main: parsed " << metrics.length() << " metrics" -- << endl; -+ std::cerr << "main: parsed " << metrics.length() << " metrics" -+ << std::endl; - #endif - - group->useDefault(); -@@ -1150,7 +1150,7 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) -- cerr << "main: default source is " << *(group->which()) << endl; -+ std::cerr << "main: default source is " << *(group->which()) << std::endl; - #endif - - if (zflag) -@@ -1170,8 +1170,8 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) { -- cerr << "main: Using timezone \"" << tzString << "\" from " << tzLabel -- << endl; -+ std::cerr << "main: Using timezone \"" << tzString << "\" from " << tzLabel -+ << std::endl; - } - #endif - -@@ -1187,8 +1187,8 @@ - } - #ifdef PCP_DEBUG - else if (pmDebug & DBG_TRACE_APPL0) -- cerr << "main: Changed environment with \"" -- << tzEnv << '"' << endl; -+ std::cerr << "main: Changed environment with \"" -+ << tzEnv << '"' << std::endl; - #endif - } - -@@ -1210,10 +1210,10 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) { -- cerr << "main: start = " -+ std::cerr << "main: start = " - << __pmtimevalToReal(&logStartTime) << ", end = " - << __pmtimevalToReal(&logEndTime) -- << endl; -+ << std::endl; - } - #endif - -@@ -1237,9 +1237,9 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) { -- cerr << "main: realStartTime = " << __pmtimevalToReal(&realStartTime) -+ std::cerr << "main: realStartTime = " << __pmtimevalToReal(&realStartTime) - << ", endTime = " << endTime << ", pos = " << pos -- << ", delay = " << delay << endl; -+ << ", delay = " << delay << std::endl; - } - #endif - -@@ -1262,11 +1262,11 @@ - } - - if (shortFlag) { -- cout.precision(precision); -+ std::cout.precision(precision); - } - else if (!descFlag) { -- cout.precision(precision); -- cout.setf(ios::fixed); -+ std::cout.precision(precision); -+ std::cout.setf(std::ios::fixed); - } - - while(pos <= endTime && -@@ -1276,7 +1276,7 @@ - sampleCount++; - - if (timeFlag) -- cout << dumpTime(position) << delimiter; -+ std::cout << dumpTime(position) << delimiter; - - for (m = 0, v = 1; m < (int)metrics.length(); m++) { - metric = metrics[m]; -@@ -1285,9 +1285,9 @@ - if (rawFlag) { - if (metric->currError(i) < 0) { - if (niceFlag) -- cout << setw(width) << errStr; -+ std::cout << std::setw(width) << errStr; - else -- cout << errStr; -+ std::cout << errStr; - goto next; - } - else if (metric->real()) -@@ -1295,9 +1295,9 @@ - } - else if (metric->error(i) < 0) { - if (niceFlag) -- cout << setw(width) << errStr; -+ std::cout << std::setw(width) << errStr; - else -- cout << errStr; -+ std::cout << errStr; - goto next; - } - else if (metric->real()) -@@ -1306,14 +1306,14 @@ - if (metric->real()) { - if (descFlag) - if (niceFlag) -- cout << setw(width) -+ std::cout << std::setw(width) - << PMC_Metric::formatNumber(value); - else -- cout << PMC_Metric::formatNumber(value); -+ std::cout << PMC_Metric::formatNumber(value); - else if (niceFlag) -- cout << setw(width) << value; -+ std::cout << std::setw(width) << value; - else -- cout << value; -+ std::cout << value; - } - // String - else { -@@ -1325,13 +1325,13 @@ - width - 2); - buffer[width - 1] = '\"'; - buffer[width] = '\0'; -- cout << setw(width) << buffer; -+ std::cout << std::setw(width) << buffer; - } - else { - strcpy(buffer+1, metric->strValue(i).ptr()); - buffer[l + 1] = '\"'; - buffer[l + 2] = '\0'; -- cout << setw(width) << buffer; -+ std::cout << std::setw(width) << buffer; - } - } - else if (widthFlag) { -@@ -1340,28 +1340,28 @@ - width - 5); - strcpy(buffer + width - 4, "...\""); - buffer[width] = '\0'; -- cout << setw(width) << buffer; -+ std::cout << std::setw(width) << buffer; - } - else { - strncpy(buffer+1, metric->strValue(i).ptr(), - width - 2); - buffer[width - 1] = '\"'; - buffer[width] = '\0'; -- cout << setw(width) << buffer; -+ std::cout << std::setw(width) << buffer; - } - } - else -- cout << '\"' << metric->strValue(i) << '\"'; -+ std::cout << '\"' << metric->strValue(i) << '\"'; - } - - next: - if (v < numValues) { -- cout << delimiter; -+ std::cout << delimiter; - v++; - } - } - } -- cout << endl; -+ std::cout << std::endl; - - position.tv_sec += interval.tv_sec; - position.tv_usec += interval.tv_usec; -@@ -1373,7 +1373,7 @@ - if (diff < 0.0) { // We missed an update - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL0) { -- cerr << "Need to slip " << -diff << " seconds" << endl; -+ std::cerr << "Need to slip " << -diff << " seconds" << std::endl; - } - #endif - do { -@@ -1385,7 +1385,7 @@ - - #ifdef PCP_DEBUG - if (pmDebug & DBG_TRACE_APPL1) { -- cerr << "Napping for " << diff << " seconds" << endl; -+ std::cerr << "Napping for " << diff << " seconds" << std::endl; - } - #endif - sginap((long)(diff * (double)CLK_TCK)); -@@ -1394,7 +1394,7 @@ - pos = __pmtimevalToReal(&position); - lines++; - if (repeatLines > 0 && repeatLines == lines) { -- cout << endl; -+ std::cout << std::endl; - dumpHeader(); - lines = 0; - } diff --git a/pcp-init.patch b/pcp-init.patch deleted file mode 100644 index b41a562..0000000 --- a/pcp-init.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- src/pmcd/rc_pcp -+++ src/pmcd/rc_pcp -@@ -31,8 +31,8 @@ - # e.g. SuSE, where chkconfig is a perl script. - ### BEGIN INIT INFO - # Provides: pcp --# Required-Start: $network --# Required-Stop: -+# Required-Start: $network $remote_fs -+# Required-Stop: $network $remote_fs - # Default-Start: 2 3 5 - # Default-Stop: - # Description: Configure the Performance Co-Pilot and starts logging. ---- src/pmie/etc_init.d_pmie -+++ src/pmie/etc_init.d_pmie -@@ -30,8 +30,8 @@ - # e.g. SuSE, where chkconfig is a perl script. - ### BEGIN INIT INFO - # Provides: pmie --# Required-Start: $network --# Required-Stop: -+# Required-Start: $network $remote_fs -+# Required-Stop: $network $remote_fs - # Default-Start: 2 3 5 - # Default-Stop: - # Description: pmie is a performance monitoring inference engine ---- src/pmproxy/rc_pmproxy -+++ src/pmproxy/rc_pmproxy -@@ -31,8 +31,8 @@ - # e.g. SuSE, where chkconfig is a perl script. - ### BEGIN INIT INFO - # Provides: pmproxy --# Required-Start: $network --# Required-Stop: -+# Required-Start: $network $remote_fs -+# Required-Stop: $network $remote_fs - # Default-Start: 2 3 5 - # Default-Stop: - # Description: Control pmproxy for PCP diff --git a/pcp-pic.diff b/pcp-pic.diff deleted file mode 100644 index e48cc32..0000000 --- a/pcp-pic.diff +++ /dev/null @@ -1,73 +0,0 @@ ---- - src/include/builddefs.in | 2 +- - src/include/buildrules | 2 +- - src/pmdas/simple/GNUmakefile.install | 2 +- - src/pmdas/trace/GNUmakefile.stub | 2 +- - src/pmdas/trivial/GNUmakefile.install | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -Index: pcp-2.5.0/src/include/builddefs.in -=================================================================== ---- pcp-2.5.0.orig/src/include/builddefs.in -+++ pcp-2.5.0/src/include/builddefs.in -@@ -56,7 +56,7 @@ PTHREAD_LIB=@ac_cv_pthread_lib@ - PCP_LIBS = -L$(TOPDIR)/src/libpcp/src -L$(TOPDIR)/src/libpcp_pmda/src - - # platform-specific CFLAGS, LDLIBS, and shared library extension --PCFLAGS = -fpic -fno-strict-aliasing -+PCFLAGS = -fPIC -fno-strict-aliasing - DSOSUFFIX = so - EXECSUFFIX = - PLDFLAGS = -Index: pcp-2.5.0/src/include/buildrules -=================================================================== ---- pcp-2.5.0.orig/src/include/buildrules -+++ pcp-2.5.0/src/include/buildrules -@@ -41,7 +41,7 @@ ifeq ($(TARGET_OS), linux) - _SHAREDOPTS = -shared -Wl,-soname,$(LIBTARGET) - endif - ifeq ($(TARGET_OS), solaris) --_SHAREDOPTS = -shared -fpic -+_SHAREDOPTS = -shared -fPIC - endif - ifeq ($(TARGET_OS), darwin) - # libtool doesnt understand -dynamiclib so we need both -Index: pcp-2.5.0/src/pmdas/simple/GNUmakefile.install -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/simple/GNUmakefile.install -+++ pcp-2.5.0/src/pmdas/simple/GNUmakefile.install -@@ -44,7 +44,7 @@ LDOPTS = - LDLIBS = -lpcp_pmda -lpcp - - ifeq "$(PCP_PLATFORM)" "solaris" --DSOOPTS = -fpic -shared -+DSOOPTS = -fPIC -shared - else - DSOOPTS = -shared -Wl,-soname,$(LIBTARGET) - endif -Index: pcp-2.5.0/src/pmdas/trace/GNUmakefile.stub -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trace/GNUmakefile.stub -+++ pcp-2.5.0/src/pmdas/trace/GNUmakefile.stub -@@ -28,7 +28,7 @@ CFILES = stub.c - CFLAGS += -DPMTRACE_DEBUG - HAVE_64 = $(shell test `uname -m` = "ia64" && echo 1 || echo 0) - ifeq ($(HAVE_64), 1) --CFLAGS += -fpic -fno-strict-aliasing -+CFLAGS += -fPIC -fno-strict-aliasing - endif - LDIRT = lib lib32 lib64 - -Index: pcp-2.5.0/src/pmdas/trivial/GNUmakefile.install -=================================================================== ---- pcp-2.5.0.orig/src/pmdas/trivial/GNUmakefile.install -+++ pcp-2.5.0/src/pmdas/trivial/GNUmakefile.install -@@ -44,7 +44,7 @@ LDOPTS = - LDLIBS = -lpcp_pmda -lpcp - - ifeq "$(PCP_PLATFORM)" "solaris" --DSOOPTS = -fpic -shared -+DSOOPTS = -fPIC -shared - else - DSOOPTS = -shared -Wl,-soname,$(LIBTARGET) - endif diff --git a/pcp-xenbuild.patch b/pcp-xenbuild.patch index 797df53..72ff1b5 100644 --- a/pcp-xenbuild.patch +++ b/pcp-xenbuild.patch @@ -1,10 +1,12 @@ ---- configure.in +Index: configure.in +=================================================================== +--- configure.in.orig +++ configure.in -@@ -425,6 +425,7 @@ +@@ -545,6 +545,7 @@ NR == 1 { if ($1 != "UID" && $1 != "US # Unix variants $2 == 1 && / init/ { print "OK"; exit } $2 == 1 && / \/etc\/init/ { print "OK"; exit } +$2 == 1 && / \/bin\/bash/ { print "OK"; exit } - # Interix (aka SFU) - $2 == 0 && /IdleProcess/{ print "OK"; exit } - # Cygwin + # Fedora 9 + $2 == 1 && / \/sbin\/init/ { print "OK"; exit } + # Fedora 15 diff --git a/pcp.changes b/pcp.changes index 14c3f40..e8089ff 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,536 @@ +------------------------------------------------------------------- +Wed Aug 10 12:39:05 CEST 2011 - ddiss@suse.de + +- Update to pcp-3.5.8. + + Rework rsyslog PMDA to remove Switch use, very odd behaviour + observed on RHEL5.2 (mysteriously failing to compile). + + Add in Kens scripting defenses against dodgey toolchains. + +------------------------------------------------------------------- +Tue Aug 9 10:56:34 CEST 2011 - ddiss@suse.de + +- Update to pcp-3.5.7. + + Fix build issue on SLES11 SP1 IA64 systems. + + Improved rsyslog PMDA handling of queue metrics. + + Add open file-descriptor count metric to the Linux PMDA. + + Implement logger PMDA line-oriented event mode. + + Add regular expression based event filtering in logger PMDA. + + The default pmcd.conf now has an access control section, and + all remote store operations are blocked by default. + +------------------------------------------------------------------- +Mon Aug 1 18:50:18 CEST 2011 - ddiss@suse.de + +- Update to pcp-3.5.6. + + Fix warning from pmie_daily with some /bin/pwd versions. + + Numerous Debian packaging updates for lintian cleanliness. + + Fixed typos in several man pages. + + Added ElasticSearch PMDA. + + Fix build on RHEL4 with older sys/queue.h variant. + +------------------------------------------------------------------- +Thu Jul 7 12:17:17 CEST 2011 - ddiss@suse.de + +- Update to pcp-3.5.5. + + Resolve Debian packaging issues preventing new uploads. + + Fix warnings from pmie_check with some /bin/pwd versions. + +- Update to pcp-3.5.4. + + Fix warnings from pmlogger_check with some /bin/pwd versions. + +- Update to pcp-3.5.3. + + Remove reliance on a cpp binary being installed locally. + + Ensure compressed pmie log files are also cleaned up daily. + + Extend the event store mechanism to be more generally useful. + + Add memory limiting functionality to pmdalogger. + + Add SQLServer metric for user settable queries. + + Fix potential sigsegv in pmprobe fetching multiple live values. + + Perl changes for Solaris. + + Fix Fedora15 build relating to handling of systemd. + + Solaris pmda zpool_vdev_name() api change. + + Update sar2pcp for sysstat version 9.1.7. + + Resolve realloc issue in event metric handling in libpcp_pmda. + +- Update to pcp-3.5.2. + + pmlogreduce - fix 2 problems (memory leak, additional mark records) + + Initial version of pmdalogger, from David Smith, a log monitoring + PMDA exporting event metrics. + + Make Windows drive instance domain code less chatty. + + RC scripts and pmie_check - Mac OS X porting + + pmlogger_check - symbolic link issue fixed + + Add in the rsyslog PMDA (http://www.rsyslog.com) + + Extend PCP::PMDA so that the log tail mode can be used on named papes. + + Numerous updates to the Perl packaging infrastructure + + Fix build when $HOME is not set. + + pmlogconf - another non-posix awk issue fixed + + Darwin pmda - filesys.maxfiles metric + + pmie_daily - assorted minor fixups + + Unix domain socket issue found on Mac OS X + + pmcd config parsing error handling cleanup + + Quieten pmevent output in the absence of new events. + + Pass process ID out on success of __pmProcessCreate. + + pmdaproc.sh - add PMDA_INTERFACE_5 support + + pcp_completion.sh - add pmevent for bash metic completion + + pmevent - add instance domain support + + Bugfix: fetching hinv.cpu.* aborts if cpu indom is not initialized + + Rearrange the per-CPU intr metrics on Linux to use dynamic namespace + + Add perl modules into Mac OS X installations + + Additional vmstat metrics added to Linux kernel PMDA + + Fix pmieconf after syscall metrics went away on Linux + + pmevent - new util to report event records, with instance domain support + + sample PMDA - instance domain for event records metric + + pmval, pminfo - man page typo corrections + + pmval - fix typo in error message + + pmlogextract, pmlogreduce - auto volume switch at 2^31 bytes + + pmnscomp - defaults to Version 2 of the compiled PMNS + + Remove unconditional diagnostic in MMV agent, log spam + + Rework the code that uncompresses archives for Win32 + + Updates to Win32 makefiles to get a clean package build + + Enable compressed log processing for Windows as well + + Sample event consumer code for Windows ETW + + Update PDH Win32 headers to use those from current mingw-m64 tree + + Win32 socket error messages are reporting correctly + + Great strides in getting error reporting correct on Windows + + Add Win32 pthread wrapper for threading work on Windows + + Add PowerDNS recursor stats to the pdns PMDA + +- Update to pcp-3.5.0. + + Infrastucture support for doing distributed event tracing with PCP. + This includes a new metric type (PM_TYPE_EVENT), cunning mechanisms + for encoding event records in pmResults, and providing PMDAs with + per-client context connection information allowing agents to track + which clients have seen which parts of a trace stream so far. Some + reference uses of these extensions can be seen in pmdasample and in + the pmcd PMDA as well. + + Transparent support for archive de-compression by clients. + + Manual page formatting errors corrected. + + Fix a pmDupContext memory corruption issue seen with derived metrics. + + Added a one-trip optimisation/guard to pcp.env + + Improved pmdaFetch and pmdaFetchCallback man pages with respect to + return codes and value memory allocation models. + + Fix for Windows unintentionally allowing multiple pmcd processes + to startup and bind to the same port, with "undefined" results. + + Fix Windows services interaction, preventing pmcd service stop. + + Fix Mac OS X scandir memory leak on empty directories. + + Fix Mac OS X mem.util.wired metric, was exporting the wrong value. + + Correct the handling of SLES11 distro identification (lsb-release + file not used again, on SuSE Linux distributions). + + Fix postfix PMDA log file path handling for Redhat Linux distros. + + Extend Perl PMDA interfaces to allow additional metrics to be + added at runtime (now makes use of dynamic namespace support). + + Set KEEPALIVE option on pmproxy client sockets, mirroring pmcd + behaviour and reducing open file descriptor pressure. + + Improvements to the native Windows version of pmlogger, preventing + it from exiting prematurely thanks to a socket read race condition. + + Fix /proc/interrupts parser in Linux PMDA, thanks to Arthur Kepner. + +------------------------------------------------------------------- +Mon Jan 24 15:00:50 CET 2011 - ddiss@suse.de + +- Update to pcp-3.4.0. + + Add new libpcp_import C API library to pcp-libs. + + Add perl-PCP-LogImport RPM sub-package for libpcp_import perl binding. + + Add pcp-import-* RPM sub-packages containing front-end tools for + importing data from sar, iostat, generic speadsheets and mrtg. + + Major Solaris PMDA updates: CPUs, vnode ops, disk stats and disk queue + stats, switch to using pmid clusters, internal timers, ZFS Adjustable + Replacement Cache stats, new help text, memory metrics, fsflush stats. + + Use Solaris devinfo to get information about pretty disk names. + + Fix a memory leak in Perl PMDA wrapper string handling. + + Use correct structure to extrace zpool write counters in Solaris PMDA. + + pmafm now supports multiple -a arguments. + + Fix pmie multiple -a options bug. + + Fix pmdaInit() callback handling where it did not handle all the + interface versions correctly. + + Quote filenames reported by pmwtf, else awk can get confused. + + Fix pmdawindows missing metrics help text. + + Add network interface speed metrics into pmdawindows. + + Fix pmdalinux handling of long network interface names. + + Updated pmdaapache to use cross-platform http library. + + Updated pmdaapache install process to allow port selection. + +- Update to pcp-3.3.3. + + Fix two off-by-one errors in NUMA metrics in Linux PMDA. + + Rework timezone environment variable handling to be able to + coexist more peacefully with Perl. + + Remove Fedora specfile now that this is in Fedora CVS. + +- Update to pcp-3.3.2. + + Fix FreeBSD build and packaging issues affecting Debian. + + Move PCP::Glider Perl code into core PCP with other Perl modules. + + Avoid a mingw64-compiler-runtime bug in gettimeofday. + + Fix spec file issue in Fedora/RHEL builds. + + Add in the gpsd PMDA. + +- Update to pcp-3.3.1. + + Fix a sigsegv in pmdalinux in the kernel.pernode.cpu metrics. + + Don't kill dbpmda if namespace cannot be loaded. + + Resolve a Windows build error under latest toolchain. + + Some minor pmieconf and pmimport related cleanups. + +- Update to pcp-3.3.0. + + Rework pmlogconf utility - version 2.0 ondisk format. + + Initial support for Linux kernel cgroup subsystem, using dynamic + metrics (cpu sets, cpu sched, cpu acct, memory, ...) + + Fix per-process I/O (proc.io.*) metric values. + + Fix potential SEGV in derived metrics when pmcd connection lost. + + Fix to allow pmlogger to log derived metrics. + + Fix open file descriptor leak in Linux disk scheduler code. + + Postfix PMDA updated to report aggregate stats from mail.log parsing. + + Add per-node CPU metrics to Linux kernel agent. + + Integrate pmieconf into the build, modernisation and porting work. + + Add install-sh to the set of pcp-internal programs for external code. + + Improved checking of PMDA domain numbers. + + Allow use of SunStudio compiler on Solaris. + + Add load average metrics to Solaris kernel agent. + + Windows 7 porting work. + + Make Win32 build work with more recent versions of gcc and Perl. + + Fix pmie [no]match_inst botch, tweak sleepTight reporting. + + Allow \$ for pmie regular expressions. + + Ensure pmlogger doesn't write extended pmcd host syntax as hostname. + + Switch over to not using local context for bash completion. + + Improve Lustre agent metric help text. + + Added a readonly filesystems metric into Linux kernel agent. + + Ensure xfs.buffer metrics are always properly refreshed. + + Add Linux kernel statistics related to XFS btree operations. + +- Update to pcp-3.2.1. + + Export information about ZFS snapshots + + Correct accounting of PMNS size in a libpcp_pmda helper routine. + +- Update to pcp-3.2.0. + + Change how PM_CONTEXT_LOCAL determines available PMDAs: + rework local context code to retire $PMDA_LOCAL_*, build DSO table + from pmcd.conf at run-time, new __pmLocalPMDA and __pmSpecLocalPMDA + routines in libpcp, -K options for pminfo, pmval and pmprobe. + + Make some pmda dynamic name operations take (const char *) args. + + Fix bash completion so dynamic names expanded, and stderr culled + (culling DSO agent initialisation messages). + + Improve pmlogger handling of alias names (same PMID, different names). + + Honour the -T command line option in pmlogreduce. + + Resolve an MMV issue evident in the Mac OS X installer, which resulted + in failed dmg (binary) installation attempts. + + Solaris startup script improvements. + + Add details of the extended hostname syntax to pcpintro(1). + + Fix a memory leak in pmdawindows help text handling. + + Fix a memory leak in pmdammv help text handling. + + Add anonymous huge page Linux memory utilisation metric. + + Fix local context reporting of help text. + + Solaris man page build changes. + + Clean up diagnostic messages in pmlogextract. + + Teach pmdaproc about Solaris' ping. + + If pmstat fails to connect to local pmcd, fallback to local context. + + Mark as const the final (requested units) pmConvScale argument + + Clean out SGI-isms from build related files (no longer used by SGI). + + Fix mem.numa.util.NFS_Unstable metric. + + Removed pmdajstat, this has long been superceded by the capabilities + of the Parfait package for instrumenting Java applications with PCP. + +- Update to pcp-3.1.2. + + Add indom save and restore logic into Windows PMDA. + + Fix a typo in the Postfix PMDA. + + Update and extend /proc/meminfo stats on Linux. + + Improve handling of monitored process in pmdammv, especially + when the monitored process exits (pmns not cleaned up before). + +- Update to pcp-3.1.1. + + Use a better MMV generation number, using all bits available. + + Fix a metric count calculation error in pmdammv. + + Add precision argument (-p) to pmwtf. + + Added an open socket sockname command to dbpmda. + + Remove use of grep -q, unavailable on OpenSolaris. + + Couple of trivial build fixes for the Win32 platform. + +- Update to pcp-3.1.0. + + Derived metric support. + + Fix a memory leak in the Solaris kernel PMDA. + + Extract information about network links on Solaris. + + MMV PMDA (DSO) is now installed and enabled by default. + + Reintroduced MMV support for cross-(mmap-)file instances. + + Bug fix in pmdammv which was capable of causing SIGSEGV. + + Add dbpmda readline support (and packaging dependencies). + + Add in -Z option to pmwtf, to pass through to pmlogsummary. + + Export NUMA memory statistics from the linux kernel. + + Make pmie_check work on Solaris. + + Make perdisk stats part of the zpool hierarchy. + + dbpmda fix for name lookup and dynamic metrics. + + Add a new PMDA exporting the Postfix queue lengths. + + BuildRequires initscripts for %{_vendor} == redhat. + +- Update to pcp-3.0.2. + + Improvements and fixes to PCP::PMDA perl module. + + Added the SQL Server dtsrun log file parser PMDA. + + Switch MMV PMDA to use dynamic namespace interfaces, which resolves + long-standing spurious EAGAIN error on reconfiguration. + + Separate out the Infiniband and cluster PMDAs into their own + package - removing dependencies and configure complexities from + pcp into specialised, layered packages. + + Configure packaging to use libexecdir for private pcp binaries, + if supported on the platform (also honour --libexecdir configure flag) + + Add sysfs.kernel metrics cluster to Linux PMDA. + +- Update to pcp-3.0.1. + + Reverted rc scripts default start/stop settings back to how + it was in 2.9.3-1, for Debian bug #544350. On Red Hat platforms, + the RPM spec overrides this to be chkconfig off by default. + + Lexical analyser tweaks (various tools) to work on Windows. + + pmlogextract change timezone selection algorithm, add -f for old behaviour + + configure.in clean up more thoroughly on Mac OS X + + Get pcp building on Debian GNU/kFreeBSD port. + + Add missing return statement causing incorrect mem.util on Win32. + + Improved support for Slackware distro makepkg packaging + + Solaris fixes: pass information about compiler into Perl PMDA makefiles, + don't change pointer types of pmCtime's arguments, deal with default lex + + Move Infiniband and Cluster PMDAs to a stand-alone packages + + Trim the set of RPM files marked as %config to just those + that are actually likely to be edited (rpm -qlcv pcp pcp-libs). + +- Update to pcp-3.0.0. + + PMDA_INTERFACE_4 and the support of dynamic subtrees of the PMNS + where the PMDA (not PMCD) maintains knowledge of the PMNS. + + RPM packaging split into pcp, pcp-libs and pcp-libs-devel + pcp-libs is common - it's required by pcp and by pcp-libs-devel but + pcp and pcp-libs-devel can be installed with or without each other. + + Added separate specific licenses for the new subpackages, + particularly pcp-libs, which is LGPL. + + Added ldconfig %post and %postun scriptlets for -libs + + Don't explicitly require Infiniband libs, since they're libs and RPM + figures it out + + No need to explicitly BuildRequire gcc-c++ libstdc++-devel + + Add BuildRequires on perl-ExtUtils-MakeMaker + + Remove explicit ia64 Requires: libunwind + + Preserve generated gram.tab.c in several places since debuginfo needs it + + Create %{_localstatedir}/run/pcp and ship it (so it'll be removed) + + Use %doc in spec for CHANGELOG COPYING INSTALL README VERSION.pcp pcp.lsm + + Tweak configure to move PCP_BINADM_DIR out of /usr/share, into /usr/lib. + Arch dependent binaries should not be installed below /usr/share. + + Delete unneeded "explicit script interpreter" in several places + to keep rpmlint happy + + Remove setuid from pmpost, not needed (and not in debian either) + + Nuke the migrate_pcp_var_dir, script and it's %post scriptlet + + Default "chkconfig off" for all PCP services (retain settings on upgrade) + + Clean-up and simplify the %post scriptlets (rather dramatically) + + Don't ship static libraries in Fedora, we have the debug package for that + + Install .NeedRebuild, add to %files and remove crud from %post scriptlets + + Added %changelog in RPM spec and moved %files to end before %changelog + + Move demos, examples and demo PMDAS to the libs-devel package since they + are not used for production (but are useful for devel and needed for QA). + + Don't install trace demo binaries since src is installed anyway + + Reconciled build/rpm/pcp.spec.in with build/rpm/pcp_fedora.spec + + Integrated RPM packaging support for perl-PCP-PMDA and perl-PCP-MMV + (but perl-PCP-Logsummary is not currently shipped in RPM packages) + + RPM build requires perl(ExtUtils::MakeMaker) rather than + perl-extutils-makemaker (this is the standard notation) + + For easier upgrades, the perl PMDAs only really require pcp >= package + version (until we change or extend an API). + + ReplacePmnsSubtree fix bad signal handling botch (affecting MMV PMDA) + + Fix pmcd.timezone metric such that value updates on daylight savings + (or other timezone) changes. + + Initial packaging work for Slackware Linux, thanks to Roman Revyakin. + +- Update to pcp-2.9.3. + + configure.in fix for Windows iptypes.h header. + + Fixup Windows SQL Server metrics on 64 bit platforms. + +- Update to pcp-2.9.2. + + Final iteration on pmval sample count changes. + + Build fallout on Mac/Win32 in MMV client library. + + Tidy configure.in sys/stat time field/types handling for Alpha builds. + +- Update to pcp-2.9.1. + + Fix a long-standing pmval sample count miscalculation. + + Add missing runlevels and dependencies in start scripts. + + Fix a segv observed in the Windows PMDA accessing SQL Server metrics. + + Fix logic error causing wrong Windows version to be reported sometimes. + + Add kernel.all.uptime to the Windows kernel agent. + + Initial version of the (perl-based) Samba PMDA. + + Fixes to pmdasimple.pl so it functions correctly on all platforms. + + Add PCP::PMDA helper routines for determining native long sizes. + + Extend MMV to allow teardown of MMV file, and set errno on failure. + + Initial stable (1.00) version of MMV Perl interface. + + Correct the metric units for several Windows per-process memory metrics. + + Add network metrics to Solaris PMDA + + Report ZFS statistics from Solaris PMDA + + Export zpool stats from Solaris PMDA + + Generate packages for Solaris + + Allow user to choose her compiler (proper use of AC_PROG_CC) + +- Update to pcp-2.9.0. + + Fix Linux PMDA issue with -fstack-protector gcc option. + + Get socket daemon PMDAs working with Win32 pmcd. + + Bind 9.4 PMDA. + + PowerDNS PMDA. + + Fix atexit handling in the Perl PMDA module. + + Fix a duplicate PMID in the MySQL PMDA. + + Infiniband PMDA improvements and man page. + + Minor packaging tweaks for rpm and deb formats. + +- Update to pcp-2.8.12. + + Bug fixes in Zimbra and MySQL PMDAs. + + Fix memory leaks in the Perl PMDA interface. + + Fix the Mac OS X pmdadarwin metric table direct mapping. + +- Update to pcp-2.8.11. + + Rework namespace file generation for Perl PMDAs. + +- Update to pcp-2.8.10. + + RPM packaging fixes for Perl modules. + +- Update to pcp-2.8.9. + + Remove Cygwin support, we're now committed to native Win32 + port - first production install yesterday, hooray! + + Further Win32 work - wrapper batch files for shell scripts + run as commands, moved daemon configs into $PCP_DIR/etc, + bug fixes to process creation code. + + Significant work on the MMV PMDA, including revamped API, + Perl API, updated on-disk support with string values and + help text support, amongst other changes. + + Fix build of Perl PMDA module when PCP not installed. + + Fix Zimbra PMDA status metrics. + +- Update to pcp-2.8.8. + + Added a Zimbra Collaboration Suite PMDA. + + Build fixes for OpenSolaris. + + Perl PMDA fixes in tail mode. + + Correct physical memory reporting in Windows PMDA on 32 bit + machines. + + Other small tweaks and improvements to Windows PMDA also. + +- Update to pcp-2.8.7. + + Windows PMDA major rework to improve memory footprint. + + Yet another Mac OS X build issue resolution. + +- Update to pcp-2.8.6. + + Fix build on Mac OS X after lex warning cleanups. + + Fix pmdate build when PCP headers not in the root. + + A single PMNS domain number file now used in-tree. + + Added tmpfs filesystem metrics to Linux PMDA. + +- Update to pcp-2.8.5. + + Packaging tweaks for Debian (builddefs/rules moved). + + Make timezone manipulation in Windows work (mimic MSYS). + + Numerous warnings fixed. + + Several changes to tempfile handling for Vista. + + Make setting pcp_rc_dir in configure.in more robust. + + Further pathname separator auditing for Windows. + + Fixed a libpcp_gui linker issue on Mac OS X. + +- Update to pcp-2.8.4. + + Descend into src/bashrc. D'oh! + +- Update to pcp-2.8.3. + + Bash auto-completion of metric names. + + Fix a memory leak in xfs project quotas metrics. + + Several Win32 fixes for Windows Server 2008. + + Add Linux per-CPU and aggregate "guest" CPU utilisation metrics. + + Add a pmlogsummary option to report a "header" line (-H). + + Add optional pmstat support for time control via pmtime. + + Add pmcd.client.* metrics for identifying connected clients. + +- Update to pcp-2.8.2. + + Fix pmie bug in the handling of && and || operators. + + Improve daily pmie/pmlogger script behaviour. + +- Update to pcp-2.8.1. + + Fix build issue with libpcp_mmv - would not build-from-source + if was not in the root filesystem. + + Finer control of pmie2col(1) reporting precision. + +- Update to pcp-2.8.0. + + Linux netfilter (IP connection tracking) PMDA included + + Memory Mapped Value (MMV) PMDA and client library included + + Linux bonding (bonded network interface) PMDA included + + Lustre PMDA included + + Added pcp_gui library as pcpmon replacement, supporting the + new (open source) version of pmtime for console tools. + + Perl PCP::LogSummary module included. + + KVM (Linux Kernel Virtualisation layer) PMDA + + Infiniband PMDA included + + VMware PMDA included + + Perl PCP::PMDA module completed, stabilised and incorporated. + + Default pmcd and pmproxy ports changed to IANA registered ones. + ( The old behaviour - i.e. both original and IANA ports - is + still available using PMCD_PORTS and PMPROXY_PORTS variables ). + +- Update to pcp-2.7.7. + + Infiniband metric enhancements + + Handle missing "which" binary during rpm installation + + Added new quota metrics (XFS project quota) + + Aggregate and per-CPU hypervisor "steal" time metrics added + + NFS v4 metrics + + commitLimit meminfo metric added + + Namespace locking fix in pmdaproc.sh + + Additional Windows memory metrics + + Several pmie fixes from Ken + + Kens pmlogreduce archive corruption fix + + Kens pmproxy PDU size fix + + Nathan's pmlogsummary sum calulation fix + + Added a (cheap) runnable processes metric. + +- Update to pcp-2.7.4. + + MaxOSX and Debian/Ubuntu build/package fixes + + Add sqlserver active_transactions metrics to the Windows PMDA. + + Fix a pmie_check typo causing mis-identification of pmie processes. + + Allow pmie and/or operators to function with some data missing. + + Resolve path naming issues with more recent versions of autoconf. + + pmlogsummary report sum option + + pmval kmtime support + + Additional Linux SNMP metrics + + Fix Linux vmstat nr_slab metrics + + Make pcp status command report build version + + Windows split_io metrics + + Fix pmdapmcd empty pmie instance + + pmdamailq filename regex + + Windows TCP metrics + + pmie log file rotation + + Changed the default compression program to be bzip2(1) + +- Update to pcp-2.7.3. + + add network.ib.control to timeout infiniband stats workthread + + add mem.util.anonpages + +- Update to pcp-2.7.2. + + pcp doc updates + + pmdalinux death from open file descriptors: pclose needed in network.ib + + network.ib stats updated to cope with OFED 1.2 changes + + some numa.link fixes for shub2 & NL4 + + Improve start/stop times of pmcd,pmlogger,pmie + + create portable pmsleep (subsecond sleep) exe + +- Update to pcp-2.7.0. + This log has been allowed to lapse for some time. Blanket catch-up.. + the following PVs describe changes made in that time: + + 947510 - UNIX95 patches break pcp tools + + 948548 - [SUSE#182852] Buffer overflow in linux proc_pmda + + 948551 - Update pcp configure and build infrastructure + + 948799 - Move telnet-probe to oss part of pcp + + 948958 - *nodeid conversions have inconsistent naming + + 952623 - possible use-after-free of pmProfile objects used by pmda + + 952932 - pcp-open RPM requires libpcp.so.2 but doesn't provide it + + 953015 - Promote libpcp_pmc to DSO + + 953301 - Update irix pcp bits + + 953876 - Use swap.pagesin/pagesout instead of swap.in/.out in pmstat + + 954035 - Update macosx build infrastructure + + 954165 - pmdumptext reports wrong time with sub-second intervals + + 954173 - pmReceiveNamesOfChildren returns bogus value + + 954203 - pmnscomp generates bogus binary pmns files + + 954342 - Add support for FreeBSD + + 954343 - Update windows pmda + + 954432 - Use a pidfile to stop pcp + + 954652 - telnet-probe ate my arguments + + 954842 - Update qa on sles10 for pcp 2.5 and 2.6 + + 956190 - add IB traffic stats to linux PMDA + + 956199 - pmlogsummary double free causes graph failures + + 957598 - add debuginfo to pcp-open build in mangrove + + 957758 - valgrind finds "invalid read of size 8" etc in __pmStuffValue + + 957884 - need network.ib.status for per-port IB status and description + + 958273 - If OFED is installed but no ports are found, return PM_ERR_VALUE from refresh_ib + + 958379 - IB PMDA broken (port num appearing twice in perfquery calls) + + 958476 - path to pmie_check binary incorrect in pmie crontab config file + +- Update to pcp-2.5.0-2. + + 947602 - pmdas/aix/common.h is missing from the tarball + ------------------------------------------------------------------- Thu Feb 11 00:44:51 UTC 2010 - jengelh@medozas.de diff --git a/pcp.spec b/pcp.spec index aadc5db..1f318bb 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,7 +1,7 @@ # -# spec file for package pcp (Version 2.5.0) +# spec file for package pcp # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,252 +17,367 @@ # norootforbuild +Name: pcp +Version: 3.5.8 +%define pcp_release 1 +Release: %{pcp_release} +Summary: System-level performance monitoring and performance management +License: GPLv2 +URL: http://oss.sgi.com/projects/pcp +Group: System/Monitoring +Source: %{name}-%{version}-%{pcp_release}.src.tar.gz +Distribution: suse +Requires: pcp-libs = %{version} +Requires: bash gawk sed grep fileutils findutils +%if "%{_vendor}" == "suse" +Requires: sysconfig cpp +%else +Requires: initscripts +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build +BuildRequires: procps autoconf bison flex ncurses-devel readline-devel +BuildRequires: perl(ExtUtils::MakeMaker) +Patch6: pcp-xenbuild.patch +Patch9: static_lib_perms.diff -Name: pcp -BuildRequires: bison flex gcc-c++ ncurses-devel procps -Version: 2.5.0 -Release: 130 -Summary: Performance Co-Pilot (system-level performance monitoring) -License: GPLv2+ -Url: http://oss.sgi.com/projects/pcp -Group: System/Monitoring -Source: pcp-%{version}.src.tar.gz -Patch0: pcp-%{version}-SuSE.diff -Patch1: pcp-%{version}-ndbm.diff -Patch2: pcp-%{version}-rpmlint.diff -Patch3: pcp-gcc43.patch -Patch4: pcp-init.patch -Patch5: pcp-2.5.0-buffer-overflow.diff -Patch6: pcp-xenbuild.patch -Patch7: pcp-2.5.0-GCC44.patch -Patch8: pcp-pic.diff -PreReq: %insserv_prereq %fillup_prereq permissions -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -Performance Co-Pilot (PCP) is a framework and services to support -system-level performance monitoring and performance management. -Authors: --------- - SGI OSS +%description +Performance Co-Pilot (PCP) provides a framework and services to support +system-level performance monitoring and performance management. -%package devel -Summary: Include Files and Libraries mandatory for Development -Group: Development/Libraries/C and C++ -License: GPLv2+ -Requires: %{name} = %{version} +The PCP open source release provides a unifying abstraction for all of +the interesting performance data in a system, and allows client +applications to easily retrieve and process any subset of that data. -%description devel -This package contains all necessary include files and libraries needed -to develop applications that require these. +# +# pcp-libs +# +%package libs +License: LGPLv2+ +Group: System/Libraries +Summary: Performance Co-Pilot run-time libraries +URL: http://oss.sgi.com/projects/pcp/ +Obsoletes: pcp < 3.0 +%description libs +Performance Co-Pilot (PCP) run-time libraries +# +# pcp-libs-dvel +# +%package libs-devel +License: GPLv2 +Group: Development/Libraries/Other +Summary: Performance Co-Pilot (PCP) development headers and documentation +URL: http://oss.sgi.com/projects/pcp/ +Requires: pcp-libs = %{version} -Authors: --------- - SGI OSS +%description libs-devel +Performance Co-Pilot (PCP) headers, documentation and tools for development. + +# +# perl-PCP-PMDA. This is the PCP agent perl binding. +# +%package -n perl-PCP-PMDA +License: GPLv2 +Group: System/Monitoring +Summary: Performance Co-Pilot (PCP) Perl bindings and documentation +URL: http://oss.sgi.com/projects/pcp/ +Requires: pcp >= %{version} perl-base + +%description -n perl-PCP-PMDA +The PCP::PMDA Perl module contains the language bindings for +building Performance Metric Domain Agents (PMDAs) using Perl. +Each PMDA exports performance data for one specific domain, for +example the operating system kernel, Cisco routers, a database, +an application, etc. + +# +# perl-PCP-MMV +# +%package -n perl-PCP-MMV +License: GPLv2 +Group: System/Monitoring +Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values +URL: http://oss.sgi.com/projects/pcp/ +Requires: pcp >= %{version} perl-base + +%description -n perl-PCP-MMV +The PCP::MMV module contains the Perl language bindings for +building scripts instrumented with the Performance Co-Pilot +(PCP) Memory Mapped Value (MMV) mechanism. +This mechanism allows arbitrary values to be exported from an +instrumented script into the PCP infrastructure for monitoring +and analysis with pmchart, pmie, pmlogger and other PCP tools. + +# +# perl-PCP-LogImport +# +%package -n perl-PCP-LogImport +License: GPLv2 +Group: System/Monitoring +Summary: Performance Co-Pilot Perl bindings for importing external data +URL: http://oss.sgi.com/projects/pcp/ +Requires: pcp >= %{version} perl-base + +%description -n perl-PCP-LogImport +The PCP::LogImport module contains the Perl language bindings for +importing data in various 3rd party formats into PCP archives so +they can be replayed with standard PCP monitoring tools. + +# +# perl-PCP-LogSummary +# +%package -n perl-PCP-LogSummary +License: GPLv2 +Group: System/Monitoring +Summary: Performance Co-Pilot Perl bindings for processing pmlogsummary output +URL: http://oss.sgi.com/projects/pcp/ +Requires: pcp >= %{version} perl-base + +%description -n perl-PCP-LogSummary +The PCP::LogSummary module provides a Perl module for using the +statistical summary data produced by the Performance Co-Pilot +pmlogsummary utility. This utility produces various averages, +minima, maxima, and other calculations based on the performance +data stored in a PCP archive. The Perl interface is ideal for +exporting this data into third-party tools (e.g. spreadsheets). + +# +# pcp-import-sar2pcp +# +%package import-sar2pcp +License: LGPLv2+ +Group: System/Monitoring +Summary: Performance Co-Pilot tools for importing sar data into PCP archive logs +URL: http://oss.sgi.com/projects/pcp/ +Requires: pcp-libs >= %{version} perl-PCP-LogImport >= %{version} sysstat + +%description import-sar2pcp +Performance Co-Pilot (PCP) front-end tools for importing sar data +into standard PCP archive logs for replay with any PCP monitoring tool. + +# +# pcp-import-iostat2pcp +# +%package import-iostat2pcp +License: LGPLv2+ +Group: System/Monitoring +Summary: Performance Co-Pilot tools for importing iostat data into PCP archive logs +URL: http://oss.sgi.com/projects/pcp/ +Requires: pcp-libs >= %{version} perl-PCP-LogImport >= %{version} sysstat + +%description import-iostat2pcp +Performance Co-Pilot (PCP) front-end tools for importing iostat data +into standard PCP archive logs for replay with any PCP monitoring tool. + +# +# pcp-import-sheet2pcp +# +%package import-sheet2pcp +License: LGPLv2+ +Group: System/Monitoring +Summary: Performance Co-Pilot tools for importing spreadsheet data into PCP archive logs +URL: http://oss.sgi.com/projects/pcp/ +Requires: pcp-libs >= %{version} perl-PCP-LogImport >= %{version} sysstat + +%description import-sheet2pcp +Performance Co-Pilot (PCP) front-end tools for importing spreadsheet data +into standard PCP archive logs for replay with any PCP monitoring tool. + +# +# pcp-import-mrtg2pcp +# +%package import-mrtg2pcp +License: LGPLv2+ +Group: System/Monitoring +Summary: Performance Co-Pilot tools for importing MTRG data into PCP archive logs +URL: http://oss.sgi.com/projects/pcp/ +Requires: pcp-libs >= %{version} perl-PCP-LogImport >= %{version} + +%description import-mrtg2pcp +Performance Co-Pilot (PCP) front-end tools for importing MTRG data +into standard PCP archive logs for replay with any PCP monitoring tool. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -%patch4 -%patch5 %patch6 -%patch7 -p1 -%patch -P 8 -p1 +%patch9 +autoconf +./configure --bindir=%{_bindir} \ + --libdir=%{_libdir} \ + --libexecdir=%{_libexecdir} && touch config.done + +%clean +[ ! -z "$DIST_ROOT" ] && rm -rf $DIST_ROOT +rm -Rf $RPM_BUILD_ROOT %build -%{suse_update_config -f} -autoconf -YACC="yacc" ./configure \ - --bindir=%{_bindir} \ - --mandir=%{_mandir} \ - --libdir=%{_libdir} \ - --datadir=%{_datadir}/pcp \ - --sysconfdir=/etc/pcp \ - --sbindir=/usr/lib/pcp \ - --localstatedir=/var/lib/pcp -export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-fomit-frame-pointer/} -CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ /usr/bin/gmake default_pcp %install +BACKDIR=`pwd`; DIST_ROOT=$RPM_BUILD_ROOT DIST_MANIFEST=`pwd`/install.manifest export DIST_ROOT DIST_MANIFEST rm -f $DIST_MANIFEST /usr/bin/gmake install_pcp -# local setting -install -d $RPM_BUILD_ROOT/usr/sbin -./install-sh -S ../../etc/init.d/pcp /usr/sbin/rcpcp -./install-sh -S ../../etc/init.d/pmie /usr/sbin/rcpmie -./install-sh -S ../../etc/init.d/pmproxy /usr/sbin/rcpmproxy + set +x -PCP_CONF=src/include/pcp.conf +PCP_CONF=$BACKDIR/src/include/pcp.conf export PCP_CONF -. src/include/pcp.env -sort $DIST_MANIFEST | uniq | $PCP_AWK_PROG ' -$1 == "d" { printf ("%%%%dir %%%%attr(%%s,root,root) %%s\n", $2, $5); } -$1 == "f" { if ( match ($6, "'$PCP_VAR_DIR'/config") || - match ($6, "'$PCP_SYSCONFIG_DIR'") ) { - printf ("%%%%config "); +. $BACKDIR/src/include/pcp.env +LIBFILELIST=`ls -1 $BACKDIR/debian/*.{install,dirs} | fgrep -v -- -dev. | fgrep -v -- -import` +DEVFILELIST=`ls -1 $BACKDIR/debian/*-dev.{install,dirs}` + +# +# Package split: pcp, pcp-libs, pcp-libs-devel, pcp-import-* +# -libs gets first pick, then libs-devel, then pcp-import-* +# The base package catches-all remaining. +# +sed -e 's/^/\//' $LIBFILELIST >libs_files +sed -e 's/^/\//' $DEVFILELIST >devel_files +%ifarch ia64 x86_64 ppc64 +sed -i -e 's/usr\/lib\//usr\/lib64\//' libs_files +sed -i -e 's/usr\/lib\//usr\/lib64\//' devel_files +%endif + +# +# some special cases for devel +awk '{print $NF}' $DIST_MANIFEST |\ +egrep 'pcp\/(examples|demos)|pmdas\/(sample|simple|trivial|txmon)' >>devel_files + +# +# Patterns for files to be marked \%config(noreplace). +# Note: /etc/pcp.conf is \%config, but not noreplace +# and is treated specially below. +cat >conf_files <import_sar2pcp_files +awk '{print $NF}' $DIST_MANIFEST | egrep 'iostat2pcp' >import_iostat2pcp_files +awk '{print $NF}' $DIST_MANIFEST | egrep 'sheet2pcp' >import_sheet2pcp_files +awk '{print $NF}' $DIST_MANIFEST | egrep 'mrtg2pcp' >import_mrtg2pcp_files + +rm -f devel_files.rpm libs_files.rpm base_files.rpm import_*_files.rpm +sort -u $DIST_MANIFEST | $PCP_AWK_PROG ' +BEGIN { + while( getline < "libs_files") lib[$0]=1; + while( getline < "devel_files") dev[$0]=1; + while( getline < "import_sar2pcp_files") import_sar2pcp[$0]=1; + while( getline < "import_iostat2pcp_files") import_iostat2pcp[$0]=1; + while( getline < "import_sheet2pcp_files") import_sheet2pcp[$0]=1; + while( getline < "import_mrtg2pcp_files") import_mrtg2pcp[$0]=1; + while( getline < "conf_files") conf[nconf++]=$0; +} +{ + if (lib[$NF]) f="libs_files.rpm"; + else if (dev[$NF]) f="devel_files.rpm"; + else if (import_sar2pcp[$NF]) f="import_sar2pcp_files.rpm"; + else if (import_iostat2pcp[$NF]) f="import_iostat2pcp_files.rpm"; + else if (import_sheet2pcp[$NF]) f="import_sheet2pcp_files.rpm"; + else if (import_mrtg2pcp[$NF]) f="import_mrtg2pcp_files.rpm"; + else f="base_files.rpm" +} +$1 == "d" { printf ("%%%%dir %%%%attr(%s,root,root) %s\n", $2, $5) >> f } + +$1 == "f" && $6 ~ "etc/pcp.conf" { printf ("%%%%config ") >> f; } +$1 == "f" { + for (i=0; i < nconf; i++) { + if ($6 ~ conf[i]) { + printf ("%%%%config(noreplace) ") >> f; + break; + } } if (match ($6, "'$PCP_MAN_DIR'") || match ($6, "'$PCP_DOC_DIR'")) { - printf ("%%%%doc "); + printf ("%%%%doc ") >> f; } - g = $4; - if (g == "trusted") { - printf ("%%%%verify(not mode group) "); - } else if (g == "bin") { - g = "root"; - } - printf ("%%%%attr(%%s,root,%%s) %s\n", $2, g, $6); } -$1 == "l" { printf "%%%%attr(-,root,root) %%s\n", $3; } -' | tee files-all.rpm | -perl -e ' - open(N, "> files.rpm") || die; - open(D, "> files-devel.rpm") || die; - while ( <> ) { - if ( m{(include|man3|/var/lib/pcp/(pmdas|demos))} || m{\.(c|h|so)$} ) { - print D; - } else { - print N; - } - }' + printf ("%%%%attr(%s,root,root) %s\n", $2, $6) >> f } +$1 == "l" { print "%attr(0777,root,root)", $3 >> f }' + +# add /etc/init.d/X symlinks at /usr/sbin/rcX +%__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sbindir} +for script in pcp pmie pmproxy; do + ln -s "%{_sysconfdir}/init.d/${script}" "${RPM_BUILD_ROOT}/%{_sbindir}/rc${script}" + echo "%{_sbindir}/rc${script}" >> base_files.rpm +done + set -x -%clean -[ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ] || rm -rf $RPM_BUILD_ROOT -%verifyscript -%verify_permissions -e /usr/lib/pcp/pmpost - -%files -f files.rpm - -%files -f files-devel.rpm devel +%post +/sbin/ldconfig %preun -if [ "$1" -eq 0 ] -then - # - # Stop daemons before erasing the package - # - if [ -f /etc/pcp.env ] ; then - . /etc/pcp.env - $PCP_RC_DIR/pcp stop >/dev/null 2>&1 - $PCP_RC_DIR/pmie stop >/dev/null 2>&1 - [ -x $PCP_RC_DIR/pmproxy ] && $PCP_RC_DIR/pmproxy stop >/dev/null 2>&1 - rm -f $PCP_VAR_DIR/pmns/.NeedRebuild - fi -fi -exit 0 +%{?stop_on_removal:%{stop_on_removal pcp pmproxy pmie}} %postun -%insserv_cleanup -exit 0 +/sbin/ldconfig +%{?restart_on_update:%{restart_on_update pcp pmproxy pmie}} +%{?insserv_cleanup:%{insserv_cleanup}} -%post -%run_permissions -if [ -f /etc/pcp.env ] ; then - . /etc/pcp.env - . $PCP_SHARE_DIR/lib/rc-proc.sh - touch $PCP_VAR_DIR/pmns/.NeedRebuild - chmod 644 $PCP_VAR_DIR/pmns/.NeedRebuild - if [ ! -f $PCP_VAR_DIR/pmns/root ] - then - if [ -f $PCP_VAR_DIR/pmns/root.saved ] - then - # restore the previous pmns after upgrade - mv $PCP_VAR_DIR/pmns/root.saved $PCP_VAR_DIR/pmns/root - else - # empty initial name space (prior to Rebuild) - echo "root {" >$PCP_VAR_DIR/pmns/root - echo "}" >>$PCP_VAR_DIR/pmns/root - fi - chmod 644 $PCP_VAR_DIR/pmns/root - else - # root pmns already exists, so we need to restore - # pmcd.conf and pmcd.options if they were saved. - for f in $PCP_PMCDCONF_PATH $PCP_PMCDOPTIONS_PATH - do - if [ -f $f -a -f $f.rpmsave ] - then - mv $f $f.rpmnew - mv $f.rpmsave $f - fi - done - fi - # - # delete *.rpmorig turds that are the same as their new version - find $PCP_VAR_DIR/config -name \*.rpmorig -print \ - | while read f - do - if diff $f `basename $f .rpmorig` >/dev/null 2>&1 - then - rm -f $f - fi - done - x=$PCP_SHARE_DIR/lib/.migrate_pcp_var_dir - [ -x $x ] && $x -fi -%{fillup_and_insserv pcp} -exit 0 +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig -%triggerpostun -- pcp < 2.1.9 -# -# Fix for bug where pcp-2.1.6 %postun script would chkconfig pcp off -# and remove the .NeedRebuild and .NeedUpdate files. This was done -# *after* the %post script of the new version, causing upgrade havoc. -# -if [ "$1" -gt 0 ] -then - . /etc/pcp.env - . $PCP_SHARE_DIR/lib/rc-proc.sh - touch $PCP_VAR_DIR/pmns/.NeedRebuild - chmod 644 $PCP_VAR_DIR/pmns/.NeedRebuild -fi -exit 0 +%files -f base_files.rpm +%defattr(-,root,root) +%dir /usr/lib*/pcp +%dir /var/lib/pcp/config/pmlogconf -%triggerun -- pcp < 2.2.0-18 -# -# first half of fix for bug #825229 where upgrade -# clobbers $PCP_VAR_DIR/pmns/root -# -if [ "$1" -gt 0 ] -then - . /etc/pcp.env - if [ -f $PCP_VAR_DIR/pmns/root ] - then - cp $PCP_VAR_DIR/pmns/root $PCP_VAR_DIR/pmns/root.saved - fi -fi -exit 0 +%files libs -f libs_files.rpm +%defattr(-,root,root) -%triggerpostun -- pcp < 2.2.0-18 -# -# second half of the fix for bug #825229 -# -if [ "$1" -gt 0 ] -then - . /etc/pcp.env - if [ ! -f $PCP_VAR_DIR/pmns/root ] - then - if [ -f $PCP_VAR_DIR/pmns/root.saved ] - then - mv $PCP_VAR_DIR/pmns/root.saved $PCP_VAR_DIR/pmns/root - else - # empty initial name space (prior to Rebuild) - echo "root {" >$PCP_VAR_DIR/pmns/root - echo "}" >>$PCP_VAR_DIR/pmns/root - fi - chmod 644 $PCP_VAR_DIR/pmns/root - fi -fi -exit 0 +%files libs-devel -f devel_files.rpm +%defattr(-,root,root) + +%files import-sar2pcp -f import_sar2pcp_files.rpm +%defattr(-,root,root) + +%files import-iostat2pcp -f import_iostat2pcp_files.rpm +%defattr(-,root,root) + +%files import-sheet2pcp -f import_sheet2pcp_files.rpm +%defattr(-,root,root) + +%files import-mrtg2pcp -f import_mrtg2pcp_files.rpm +%defattr(-,root,root) + +%files -n perl-PCP-PMDA -f perl-pcp-pmda.list +%defattr(-,root,root) +%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi/PCP +%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi/auto/PCP +%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi/auto/PCP/PMDA + +%files -n perl-PCP-MMV -f perl-pcp-mmv.list +%defattr(-,root,root) +%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi/PCP +%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi/auto/PCP +%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi/auto/PCP/MMV + +%files -n perl-PCP-LogImport -f perl-pcp-logimport.list +%defattr(-,root,root) +%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi/PCP +%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi/auto/PCP +%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi/auto/PCP/LogImport + +%files -n perl-PCP-LogSummary -f perl-pcp-logsummary.list +%defattr(-,root,root) +%dir /usr/lib/perl5/vendor_perl/*/PCP %changelog diff --git a/static_lib_perms.diff b/static_lib_perms.diff new file mode 100644 index 0000000..30f4307 --- /dev/null +++ b/static_lib_perms.diff @@ -0,0 +1,125 @@ +Index: src/libpcp_pmda/src/GNUmakefile +=================================================================== +--- src/libpcp_pmda/src/GNUmakefile ++++ src/libpcp_pmda/src/GNUmakefile +@@ -65,7 +65,7 @@ $(LIBTARGET_V2): $(LIBTARGET_V3) + include $(BUILDRULES) + + install : default +- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + ifneq "$(LIBTARGET_V1)" "" + $(INSTALL) -S $(LIBTARGET_V3) $(PCP_LIB_DIR)/$(LIBTARGET_V1) + endif +@@ -73,7 +73,7 @@ ifneq "$(LIBTARGET_V2)" "" + $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET_V2) + endif + ifneq "$(STATICLIBTARGET)" "" +- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) ++ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + endif + + default_pcp : default +Index: src/libpcp_trace/src/GNUmakefile +=================================================================== +--- src/libpcp_trace/src/GNUmakefile ++++ src/libpcp_trace/src/GNUmakefile +@@ -54,12 +54,12 @@ endif + include $(BUILDRULES) + + install : default +- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + ifneq "$(SYMTARGET)" "" + $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(SYMTARGET) + endif + ifneq "$(STATICLIBTARGET)" "" +- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) ++ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + endif + + default_pcp : default +Index: src/libpcp_gui/src/GNUmakefile +=================================================================== +--- src/libpcp_gui/src/GNUmakefile ++++ src/libpcp_gui/src/GNUmakefile +@@ -52,14 +52,14 @@ endif + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + ifneq "$(SYMTARGET)" "" + for tt in $(SYMTARGET); do \ + $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \ + done + endif + ifneq "$(STATICLIBTARGET)" "" +- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) ++ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + endif + + default_pcp: default +Index: src/libpcp_import/src/GNUmakefile +=================================================================== +--- src/libpcp_import/src/GNUmakefile ++++ src/libpcp_import/src/GNUmakefile +@@ -45,14 +45,14 @@ $(OBJECTS): $(HFILES) + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + ifneq "$(SYMTARGET)" "" + for tt in $(SYMTARGET); do \ + $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \ + done + endif + ifneq "$(STATICLIBTARGET)" "" +- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) ++ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + endif + + default_pcp: default +Index: src/libpcp_mmv/src/GNUmakefile +=================================================================== +--- src/libpcp_mmv/src/GNUmakefile ++++ src/libpcp_mmv/src/GNUmakefile +@@ -40,14 +40,14 @@ default: pcp $(LIBTARGET) $(SYMTARGET) $ + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + ifneq "$(SYMTARGET)" "" + for tt in $(SYMTARGET); do \ + $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \ + done + endif + ifneq "$(STATICLIBTARGET)" "" +- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) ++ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + endif + + default_pcp: default +Index: src/libpcp/src/GNUmakefile +=================================================================== +--- src/libpcp/src/GNUmakefile ++++ src/libpcp/src/GNUmakefile +@@ -93,14 +93,14 @@ kernel_pmda_dso = $(TARGET_OS) + endif + + install : default +- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + ifneq "$(SYMTARGET)" "" + for tt in $(SYMTARGET); do \ + $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \ + done + endif + ifneq "$(STATICLIBTARGET)" "" +- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) ++ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + endif + + default_pcp : default