.gitignore

@@ -1 +1 @@
-SOURCES/pcp-5.3.5.src.tar.gz
+SOURCES/pcp-5.3.7.src.tar.gz

.pcp.metadata

@@ -1 +1 @@
-ee69b4a4e33cb5366d30c4c006ba41ccd6386d87 SOURCES/pcp-5.3.5.src.tar.gz
+a0a05bf501b016cb859fb211ae60ce18be2bbd99 SOURCES/pcp-5.3.7.src.tar.gz

SOURCES/redhat-bugzilla-1973833.patch

@@ -1,193 +0,0 @@
-commit 6b907e90c74fce82d6b712493d8b362bdd1a1ec1
-Author: Nathan Scott <nathans@redhat.com>
-Date:   Tue Dec 14 08:54:14 2021 +1100
-
-    pmlogconf: switch to the bulk pmLookupDescs(3) interface
-    
-    No functional change, all existing regression tests pass.
-    
-    Related to Red Hat BZ #1973833.
-
-diff --git a/src/pmlogconf/pmlogconf.c b/src/pmlogconf/pmlogconf.c
-index fa1156859d..ef4fc08bbd 100644
---- a/src/pmlogconf/pmlogconf.c
-+++ b/src/pmlogconf/pmlogconf.c
-@@ -473,13 +473,19 @@ fetch_groups(void)
- {
-     static pmResult	*result;
-     const char		**names;
-+    pmDesc		*descs;
-     pmID		*pmids;
--    int			i, n, sts;
-+    int			i, n, sts, count;
- 
--    /* prepare arrays of names and identifiers for PMAPI metric lookup */
-+    /* prepare arrays of names, descriptors and IDs for PMAPI metric lookup */
-     if ((names = calloc(ngroups, sizeof(char *))) == NULL)
- 	return -ENOMEM;
-+    if ((descs = calloc(ngroups, sizeof(pmDesc))) == NULL) {
-+	free(names);
-+	return -ENOMEM;
-+    }
-     if ((pmids = calloc(ngroups, sizeof(pmID))) == NULL) {
-+	free(descs);
- 	free(names);
- 	return -ENOMEM;
-     }
-@@ -490,15 +496,16 @@ fetch_groups(void)
- 	    continue;
- 	names[n++] = (const char *)groups[i].metric;
-     }
-+    count = n;
- 
--    if ((sts = pmLookupName(n, names, pmids)) < 0) {
--	if (n == 1)
-+    if ((sts = pmLookupName(count, names, pmids)) < 0) {
-+	if (count == 1)
- 	    groups[0].pmid = PM_ID_NULL;
- 	else
- 	    fprintf(stderr, "%s: cannot lookup metric names: %s\n",
- 			    pmGetProgname(), pmErrStr(sts));
-     }
--    else if ((sts = pmFetch(n, pmids, &result)) < 0) {
-+    else if ((sts = pmFetch(count, pmids, &result)) < 0) {
- 	fprintf(stderr, "%s: cannot fetch metric values: %s\n",
- 			pmGetProgname(), pmErrStr(sts));
-     }
-@@ -510,6 +517,13 @@ fetch_groups(void)
- 	    else
- 		groups[i].pmid = pmids[n++];
- 	}
-+	/* descriptor lookup, descs_hash handles failure here */
-+	(void) pmLookupDescs(count, pmids, descs);
-+
-+	/* create a hash over the descs for quick PMID lookup */
-+	if ((sts = descs_hash(count, descs)) < 0)
-+	    fprintf(stderr, "%s: cannot hash metric descs: %s\n",
-+			    pmGetProgname(), pmErrStr(sts));
- 	/* create a hash over the result for quick PMID lookup */
- 	if ((sts = values_hash(result)) < 0)
- 	    fprintf(stderr, "%s: cannot hash metric values: %s\n",
-@@ -806,14 +820,16 @@ evaluate_string_regexp(group_t *group, regex_cmp_t compare)
-     int			i, found;
-     pmValueSet		*vsp;
-     pmValue		*vp;
-+    pmDesc		*dp;
-     pmAtomValue		atom;
-     regex_t		regex;
-     int			sts, type;
- 
--    if ((vsp = metric_values(group->pmid)) == NULL)
-+    if ((vsp = metric_values(group->pmid)) == NULL ||
-+        (dp = metric_desc(group->pmid)) == NULL)
- 	return 0;
- 
--    type = metric_type(group->pmid);
-+    type = dp->type;
-     if (type < 0 || type > PM_TYPE_STRING) {
- 	fprintf(stderr, "%s: %s uses regular expression on non-scalar metric\n",
- 		pmGetProgname(), group->tag);
-@@ -849,11 +865,14 @@ evaluate_string_regexp(group_t *group, regex_cmp_t compare)
- static int
- evaluate_values(group_t *group, numeric_cmp_t ncmp, string_cmp_t scmp)
- {
--    int			type = metric_type(group->pmid);
-+    pmDesc		*dp;
-+
-+    if ((dp = metric_desc(group->pmid)) == NULL)
-+	return 0;
- 
--    if (type == PM_TYPE_STRING)
-+    if (dp->type == PM_TYPE_STRING)
- 	return evaluate_string_values(group, scmp);
--    return evaluate_number_values(group, type, ncmp);
-+    return evaluate_number_values(group, dp->type, ncmp);
- }
- 
- int
-diff --git a/src/pmlogconf/util.c b/src/pmlogconf/util.c
-index d44c2e529a..293eb2eca3 100644
---- a/src/pmlogconf/util.c
-+++ b/src/pmlogconf/util.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2020 Red Hat.  All Rights Reserved.
-+ * Copyright (c) 2020-2021 Red Hat.  All Rights Reserved.
-  * 
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License as published by the
-@@ -14,7 +14,7 @@
- #include "util.h"
- 
- static __pmHashCtl	valuesctl;	/* pointers to values in pmResult */
--static __pmHashCtl	typesctl;	/* metric types from pmLookupDesc */
-+static __pmHashCtl	descsctl;	/* metric descs from pmLookupDesc */
- 
- int
- values_hash(pmResult *result)
-@@ -47,27 +47,33 @@ metric_values(pmID pmid)
- }
- 
- int
--metric_type(pmID pmid)
-+descs_hash(int numpmid, pmDesc *descs)
- {
--    __pmHashNode	*node;
--    pmDesc		desc;
--    int			sts, *data;
-+    unsigned int	i;
-+    pmDesc		*dp;
-+    int			sts;
- 
--    if (pmid == PM_IN_NULL)
--	return PM_TYPE_UNKNOWN;
--    if ((node = __pmHashSearch(pmid, &typesctl)) == NULL) {
--	if ((sts = pmLookupDesc(pmid, &desc)) < 0)
--	    return sts;
--	if ((data = malloc(sizeof(int))) == NULL)
--	    return sts;
--	*data = desc.type;
--	if ((sts = __pmHashAdd(pmid, data, &typesctl)) < 0) {
--	    free(data);
-+    if ((sts = __pmHashPreAlloc(numpmid, &descsctl)) < 0)
-+	return sts;
-+
-+    for (i = 0; i < numpmid; i++) {
-+	dp = &descs[i];
-+	if ((sts = __pmHashAdd(dp->pmid, dp, &descsctl)) < 0)
- 	    return sts;
--	}
--	return *data;
-     }
--    return *(int *)node->data;
-+    return numpmid;
-+}
-+
-+pmDesc *
-+metric_desc(pmID pmid)
-+{
-+    __pmHashNode	*node;
-+
-+    if (pmid == PM_IN_NULL)
-+	return NULL;
-+    if ((node = __pmHashSearch(pmid, &descsctl)) == NULL)
-+	return NULL;
-+    return (pmDesc *)node->data;
- }
- 
- int
-diff --git a/src/pmlogconf/util.h b/src/pmlogconf/util.h
-index 17d856a0d7..a11350d899 100644
---- a/src/pmlogconf/util.h
-+++ b/src/pmlogconf/util.h
-@@ -34,7 +34,9 @@ extern void fmt(const char *, char *, size_t, int, int, fmt_t, void *);
- 
- extern int values_hash(pmResult *);
- extern pmValueSet *metric_values(pmID);
--extern int metric_type(pmID);
-+
-+extern int descs_hash(int, pmDesc *);
-+extern pmDesc *metric_desc(pmID);
- 
- typedef int (*numeric_cmp_t)(double, double);
- extern int number_equal(double, double);

SOURCES/redhat-bugzilla-1981886-pmdasockets-backporting.patch

@@ -0,0 +1,374 @@
+diff --git a/qa/1927 b/qa/1927
+new file mode 100755
+index 000000000..46afa9509
+--- /dev/null
++++ b/qa/1927
+@@ -0,0 +1,88 @@
++#!/bin/sh
++# PCP QA Test No. 1927
++# Exercise the sockets PMDA Install/Remove and string metric bug.
++#
++# Copyright (c) 2022 Red Hat.  All Rights Reserved.
++#
++
++seq=`basename $0`
++echo "QA output created by $seq"
++
++# get standard environment, filters and checks
++. ./common.product
++. ./common.filter
++. ./common.check
++
++[ -f $PCP_PMDAS_DIR/sockets/pmdasockets ] || _notrun "sockets pmda not installed"
++
++_cleanup()
++{
++    cd $here
++    $sudo rm -rf $tmp $tmp.*
++}
++
++status=0	# success is the default!
++$sudo rm -rf $tmp $tmp.* $seq.full
++
++_filter_sockets()
++{
++    grep -v 'No value(s) available'
++}
++
++pmdasockets_remove()
++{
++    echo
++    echo "=== remove sockets agent ==="
++    $sudo ./Remove >$tmp.out 2>&1
++    _filter_pmda_remove <$tmp.out
++}
++
++pmdasockets_install()
++{
++    # start from known starting points
++    cd $PCP_PMDAS_DIR/sockets
++    $sudo ./Remove >/dev/null 2>&1
++
++    echo
++    echo "=== sockets agent installation ==="
++    $sudo ./Install </dev/null >$tmp.out 2>&1
++    cat $tmp.out >>$here/$seq.full
++    # Check sockets metrics have appeared ... X metrics and Y values
++    _filter_pmda_install <$tmp.out \
++    | sed \
++        -e 's/[0-9][0-9]* warnings, //' \
++    | $PCP_AWK_PROG '
++/Check network.persocket metrics have appeared/ {
++                                          if ($7 >= 50 && $7 <= 99) $7 = "X"
++                                          if ($10 >= 0) $10 = "Y"
++                                        }
++                                        { print }'
++}
++
++_prepare_pmda sockets
++# note: _restore_auto_restart pmcd done in _cleanup_pmda()
++trap "_cleanup_pmda sockets; exit \$status" 0 1 2 3 15
++
++_stop_auto_restart pmcd
++
++# real QA test starts here
++pmdasockets_install
++
++# pmcd should have been started by the Install process - check
++if pminfo -v network.persocket > $tmp.info 2> $tmp.err
++then
++    :
++else
++    echo "... failed! ... here is the Install log ..."
++    cat $tmp.out
++fi
++cat $tmp.info $tmp.err | _filter_sockets
++
++echo "Check the values for v6only metric are 0 or 1 ..."
++pminfo -f network.persocket.v6only | egrep -v 'value [01]$' | sed -e '/^$/d'
++
++pmdasockets_remove
++status=0
++
++# success, all done
++exit
+diff --git a/qa/1927.out b/qa/1927.out
+new file mode 100644
+index 000000000..2ae4385fd
+--- /dev/null
++++ b/qa/1927.out
+@@ -0,0 +1,17 @@
++QA output created by 1927
++
++=== sockets agent installation ===
++Updating the Performance Metrics Name Space (PMNS) ...
++Terminate PMDA if already installed ...
++[...install files, make output...]
++Updating the PMCD control file, and notifying PMCD ...
++Check network.persocket metrics have appeared ... X metrics and Y values
++Check the values for v6only metric are 0 or 1 ...
++network.persocket.v6only
++
++=== remove sockets agent ===
++Culling the Performance Metrics Name Space ...
++network.persocket ... done
++Updating the PMCD control file, and notifying PMCD ...
++[...removing files...]
++Check network.persocket metrics have gone away ... OK
+diff --git a/qa/group b/qa/group
+index acfc5d208..846c0c4bd 100644
+--- a/qa/group
++++ b/qa/group
+@@ -1967,6 +1967,7 @@ x11
+ 1901 pmlogger local
+ 1902 help local
+ 1914 atop local
++1927 pmda.sockets local
+ 1937 pmlogrewrite pmda.xfs local
+ 1955 libpcp pmda pmda.pmcd local
+ 1956 pmda.linux pmcd local
+diff --git a/src/pmdas/linux_sockets/pmda.c b/src/pmdas/linux_sockets/pmda.c
+index d10eacf29..5a3018d8a 100644
+--- a/src/pmdas/linux_sockets/pmda.c
++++ b/src/pmdas/linux_sockets/pmda.c
+@@ -1,7 +1,7 @@
+ /*
+  * Sockets PMDA
+  *
+- * Copyright (c) 2021 Red Hat.
++ * Copyright (c) 2021-2022 Red Hat.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU General Public License as published by the
+@@ -14,6 +14,7 @@
+  * for more details.
+  */
+ 
++#include <ctype.h>
+ #include "pmapi.h"
+ #include "pmda.h"
+ 
+@@ -147,6 +148,31 @@ sockets_fetchCallBack(pmdaMetric *metric, unsigned int inst, pmAtomValue *atom)
+     return PMDA_FETCH_STATIC;
+ }
+ 
++/*
++ * Restrict the allowed filter strings to only limited special
++ * characters (open and close brackets - everthing else can be
++ * done with alphanumerics) to limit any attack surface here.
++ * The ss filtering language is more complex than we ever want
++ * to be attempting to parse ourself, so we leave that side of
++ * things to the ss command itself.
++ */
++int
++sockets_check_filter(const char *string)
++{
++    const char *p;
++
++    for (p = string; *p; p++) {
++	if (isspace(*p))
++	    continue;
++	if (isalnum(*p))
++	    continue;
++	if (*p == '(' || *p == ')')
++	    continue;
++	return 0; /* disallow */
++    }
++    return 1;
++}
++
+ static int
+ sockets_store(pmResult *result, pmdaExt *pmda)
+ {
+@@ -165,9 +191,14 @@ sockets_store(pmResult *result, pmdaExt *pmda)
+ 	    	case 0: /* network.persocket.filter */
+ 		    if ((sts = pmExtractValue(vsp->valfmt, &vsp->vlist[0],
+ 			PM_TYPE_STRING, &av, PM_TYPE_STRING)) >= 0) {
++			if (sockets_check_filter(av.cp)) {
++			    sts = PM_ERR_BADSTORE;
++			    free(av.cp);
++			    break;
++			}
+ 			if (ss_filter)
+ 			    free(ss_filter);
+-			ss_filter = av.cp; /* TODO filter syntax check */
++			ss_filter = av.cp;
+ 		    }
+ 		    break;
+ 		default:
+diff --git a/src/pmdas/linux_sockets/ss_parse.c b/src/pmdas/linux_sockets/ss_parse.c
+index 94c5e16e9..9f3afc691 100644
+--- a/src/pmdas/linux_sockets/ss_parse.c
++++ b/src/pmdas/linux_sockets/ss_parse.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2021 Red Hat.
++ * Copyright (c) 2021-2022 Red Hat.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU General Public License as published by the
+@@ -21,65 +21,70 @@ static ss_stats_t ss_p;
+ /* boolean value with no separate value, default 0 */
+ #define PM_TYPE_BOOL (PM_TYPE_UNKNOWN-1)
+ 
++/* helper macros to extract field address and size */
++#define SSFIELD(str,type,f) {(str), (sizeof(str)-1), type, (&(f)), (sizeof(f))}
++#define SSNULLFIELD(str) {(str), (sizeof(str)-1), PM_TYPE_UNKNOWN, NULL}
++
+ static struct {
+     char *field;
+     int len;
+     int type;
+     void *addr;
++    int size;
+     int found;
+ } parse_table[] = {
+-    { "timer:", 6, PM_TYPE_STRING, &ss_p.timer_str },
+-    { "uid:", 4, PM_TYPE_U32, &ss_p.uid },
+-    { "ino:", 4, PM_TYPE_64, &ss_p.inode },
+-    { "sk:", 3, PM_TYPE_U64, &ss_p.sk },
+-    { "cgroup:", 7, PM_TYPE_STRING, &ss_p.cgroup },
+-    { "v6only:", 7, PM_TYPE_32, &ss_p.v6only },
+-    { "--- ", 4, PM_TYPE_UNKNOWN, NULL  },
+-    { "<-> ", 4, PM_TYPE_UNKNOWN, NULL  },
+-    { "--> ", 4, PM_TYPE_UNKNOWN, NULL  },
+-    { "skmem:", 6, PM_TYPE_STRING, &ss_p.skmem_str,  },
+-    { "ts ", 3, PM_TYPE_BOOL, &ss_p.ts },
+-    { "sack ", 5, PM_TYPE_BOOL, &ss_p.sack },
+-    { "cubic ", 6, PM_TYPE_BOOL, &ss_p.cubic },
+-    { "wscale:", 7, PM_TYPE_STRING, &ss_p.wscale_str },
+-    { "rto:", 4, PM_TYPE_DOUBLE, &ss_p.rto },
+-    { "rtt:", 4, PM_TYPE_STRING, &ss_p.round_trip_str  },
+-    { "ato:", 4, PM_TYPE_DOUBLE, &ss_p.ato },
+-    { "backoff:", 8, PM_TYPE_32, &ss_p.backoff },
+-    { "mss:", 4, PM_TYPE_U32, &ss_p.mss },
+-    { "pmtu:", 5, PM_TYPE_U32, &ss_p.pmtu },
+-    { "rcvmss:", 7, PM_TYPE_U32, &ss_p.rcvmss },
+-    { "advmss:", 7, PM_TYPE_U32, &ss_p.advmss },
+-    { "cwnd:", 5, PM_TYPE_U32, &ss_p.cwnd },
+-    { "lost:", 5, PM_TYPE_32, &ss_p.lost },
+-    { "ssthresh:", 9, PM_TYPE_U32, &ss_p.ssthresh },
+-    { "bytes_sent:", 11, PM_TYPE_U64, &ss_p.bytes_sent },
+-    { "bytes_retrans:", 14, PM_TYPE_U64, &ss_p.bytes_retrans },
+-    { "bytes_acked:", 12, PM_TYPE_U64, &ss_p.bytes_acked },
+-    { "bytes_received:", 15, PM_TYPE_U64, &ss_p.bytes_received },
+-    { "segs_out:", 9, PM_TYPE_U32, &ss_p.segs_out },
+-    { "segs_in:", 8, PM_TYPE_U32, &ss_p.segs_in },
+-    { "data_segs_out:", 14, PM_TYPE_U32, &ss_p.data_segs_out },
+-    { "data_segs_in:", 13, PM_TYPE_U32, &ss_p.data_segs_in },
+-    { "send ", 5, PM_TYPE_DOUBLE, &ss_p.send }, /* no ':' */
+-    { "lastsnd:", 8, PM_TYPE_U32, &ss_p.lastsnd },
+-    { "lastrcv:", 8, PM_TYPE_U32, &ss_p.lastrcv },
+-    { "lastack:", 8, PM_TYPE_U32, &ss_p.lastack },
+-    { "pacing_rate ", 12, PM_TYPE_DOUBLE, &ss_p.pacing_rate }, /* no ':' */
+-    { "delivery_rate ", 14, PM_TYPE_DOUBLE, &ss_p.delivery_rate }, /* no ':' */
+-    { "delivered:", 10, PM_TYPE_U32, &ss_p.delivered },
+-    { "app_limited ", 12, PM_TYPE_BOOL, &ss_p.app_limited },
+-    { "reord_seen:", 11, PM_TYPE_32, &ss_p.reord_seen },
+-    { "busy:", 5, PM_TYPE_U64, &ss_p.busy },
+-    { "unacked:", 8, PM_TYPE_32, &ss_p.unacked },
+-    { "rwnd_limited:", 13, PM_TYPE_U64, &ss_p.rwnd_limited },
+-    { "retrans:", 8, PM_TYPE_STRING, &ss_p.retrans_str },
+-    { "dsack_dups:", 11, PM_TYPE_U32, &ss_p.dsack_dups },
+-    { "rcv_rtt:", 8, PM_TYPE_DOUBLE, &ss_p.rcv_rtt },
+-    { "rcv_space:", 10, PM_TYPE_32, &ss_p.rcv_space },
+-    { "rcv_ssthresh:", 13, PM_TYPE_32, &ss_p.rcv_ssthresh },
+-    { "minrtt:", 7, PM_TYPE_DOUBLE, &ss_p.minrtt },
+-    { "notsent:", 8, PM_TYPE_U32, &ss_p.notsent },
++    SSFIELD("timer:", PM_TYPE_STRING, ss_p.timer_str),
++    SSFIELD("uid:", PM_TYPE_U32, ss_p.uid),
++    SSFIELD("ino:", PM_TYPE_64, ss_p.inode),
++    SSFIELD("sk:", PM_TYPE_U64, ss_p.sk),
++    SSFIELD("cgroup:", PM_TYPE_STRING, ss_p.cgroup),
++    SSFIELD("v6only:", PM_TYPE_32, ss_p.v6only),
++    SSNULLFIELD("--- "),
++    SSNULLFIELD("<-> "),
++    SSNULLFIELD("--> "),
++    SSFIELD("skmem:", PM_TYPE_STRING, ss_p.skmem_str),
++    SSFIELD("ts ", PM_TYPE_BOOL, ss_p.ts),
++    SSFIELD("sack ", PM_TYPE_BOOL, ss_p.sack),
++    SSFIELD("cubic ", PM_TYPE_BOOL, ss_p.cubic),
++    SSFIELD("wscale:", PM_TYPE_STRING, ss_p.wscale_str),
++    SSFIELD("rto:", PM_TYPE_DOUBLE, ss_p.rto),
++    SSFIELD("rtt:", PM_TYPE_STRING, ss_p.round_trip_str),
++    SSFIELD("ato:", PM_TYPE_DOUBLE, ss_p.ato),
++    SSFIELD("backoff:", PM_TYPE_32, ss_p.backoff),
++    SSFIELD("mss:", PM_TYPE_U32, ss_p.mss),
++    SSFIELD("pmtu:", PM_TYPE_U32, ss_p.pmtu),
++    SSFIELD("rcvmss:", PM_TYPE_U32, ss_p.rcvmss),
++    SSFIELD("advmss:", PM_TYPE_U32, ss_p.advmss),
++    SSFIELD("cwnd:", PM_TYPE_U32, ss_p.cwnd),
++    SSFIELD("lost:", PM_TYPE_32, ss_p.lost),
++    SSFIELD("ssthresh:", PM_TYPE_U32, ss_p.ssthresh),
++    SSFIELD("bytes_sent:", PM_TYPE_U64, ss_p.bytes_sent),
++    SSFIELD("bytes_retrans:", PM_TYPE_U64, ss_p.bytes_retrans),
++    SSFIELD("bytes_acked:", PM_TYPE_U64, ss_p.bytes_acked),
++    SSFIELD("bytes_received:", PM_TYPE_U64, ss_p.bytes_received),
++    SSFIELD("segs_out:", PM_TYPE_U32, ss_p.segs_out),
++    SSFIELD("segs_in:", PM_TYPE_U32, ss_p.segs_in),
++    SSFIELD("data_segs_out:", PM_TYPE_U32, ss_p.data_segs_out),
++    SSFIELD("data_segs_in:", PM_TYPE_U32, ss_p.data_segs_in),
++    SSFIELD("send ", PM_TYPE_DOUBLE, ss_p.send), /* no ':' */
++    SSFIELD("lastsnd:", PM_TYPE_U32, ss_p.lastsnd),
++    SSFIELD("lastrcv:", PM_TYPE_U32, ss_p.lastrcv),
++    SSFIELD("lastack:", PM_TYPE_U32, ss_p.lastack),
++    SSFIELD("pacing_rate ", PM_TYPE_DOUBLE, ss_p.pacing_rate), /* no ':' */
++    SSFIELD("delivery_rate ", PM_TYPE_DOUBLE, ss_p.delivery_rate), /* no ':' */
++    SSFIELD("delivered:", PM_TYPE_U32, ss_p.delivered),
++    SSFIELD("app_limited ", PM_TYPE_BOOL, ss_p.app_limited),
++    SSFIELD("reord_seen:", PM_TYPE_32, ss_p.reord_seen),
++    SSFIELD("busy:", PM_TYPE_U64, ss_p.busy),
++    SSFIELD("unacked:", PM_TYPE_32, ss_p.unacked),
++    SSFIELD("rwnd_limited:", PM_TYPE_U64, ss_p.rwnd_limited),
++    SSFIELD("retrans:", PM_TYPE_STRING, ss_p.retrans_str),
++    SSFIELD("dsack_dups:", PM_TYPE_U32, ss_p.dsack_dups),
++    SSFIELD("rcv_rtt:", PM_TYPE_DOUBLE, ss_p.rcv_rtt),
++    SSFIELD("rcv_space:", PM_TYPE_32, ss_p.rcv_space),
++    SSFIELD("rcv_ssthresh:", PM_TYPE_32, ss_p.rcv_ssthresh),
++    SSFIELD("minrtt:", PM_TYPE_DOUBLE, ss_p.minrtt),
++    SSFIELD("notsent:", PM_TYPE_U32, ss_p.notsent),
+ 
+     { NULL }
+ };
+@@ -225,8 +230,11 @@ ss_parse(char *line, int has_state_field, ss_stats_t *ss)
+ 		    if (*p == '(')
+ 		    	p++;
+ 		    r = (char *)parse_table[i].addr;
+-		    for (s=p; *s && *s != ' ' && *s != '\n' && *s != ')'; s++)
+-			*r++ = *s; /* TODO check r len */
++		    for (s=p; *s && *s != ' ' && *s != '\n' && *s != ')'; s++) {
++			*r++ = *s;
++			if (r - (char *)parse_table[i].addr >= parse_table[i].size - 1)
++			    break;
++		    }
+ 		    *r = '\0';
+ 		    break;
+ 		case PM_TYPE_32:
+diff --git a/src/pmdas/linux_sockets/ss_stats.h b/src/pmdas/linux_sockets/ss_stats.h
+index 183db5afa..009a00cd9 100644
+--- a/src/pmdas/linux_sockets/ss_stats.h
++++ b/src/pmdas/linux_sockets/ss_stats.h
+@@ -1,11 +1,11 @@
+ /*
+- * Copyright (c) 2021 Red Hat.
+- * 
++ * Copyright (c) 2021-2022 Red Hat.
++ *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU General Public License as published by the
+  * Free Software Foundation; either version 2 of the License, or (at your
+  * option) any later version.
+- * 
++ *
+  * This program is distributed in the hope that it will be useful, but
+  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+@@ -26,7 +26,7 @@ typedef struct ss_stats {
+     __int32_t		timer_retrans;
+     __uint32_t		uid;
+     __uint64_t		sk;
+-    char		cgroup[64];
++    char		cgroup[128];
+     __int32_t		v6only;
+     char		skmem_str[64];
+     __int32_t		skmem_rmem_alloc;

SOURCES/redhat-bugzilla-1991763.patch

@@ -1,83 +0,0 @@
-commit 69c7d9bf5ac24bda51f8c876dc258bfe054b7cf8
-Author: Sunil Mohan Adapa <sunil@medhas.org>
-Date:   Tue Feb 1 09:55:23 2022 -0800
-
-    pmlogger: zeroconf: Prioritize user configuration over zeroconf
-    
-    In 2c17ba0cc16f58de511dff1e3122096d60c50bb0, zeroconf provided
-    defaults (/usr/share/pcp/zeroconf/pmlogger, which was actually
-    /etc/sysconf/pmlogger_zeroconf at the time of the change) were prioritized over
-    user configuration (/etc/sysconf/pmlogger). This lead to regression in clients
-    which edited the user configuration and expected the changes to be given
-    priority over zeroconf configuration. This was identified at least in
-    ansible-pcp[1].
-    
-    Undo the changes in this commit so that the final priority is as follows:
-    
-    User configuration (/etc/sysconfig/pmlogger)
-      (priority over)
-    Zeroconf defaults (/usr/share/pcp/zeroconf/pmlogger)
-      (priority over)
-    Code defaults (pmlogger.c)
-    
-    Links:
-    
-    1) https://github.com/performancecopilot/pcp/pull/1462#issuecomment-1022714960
-    
-    Tests:
-    
-    - Install pcp. Ensure pmlogger is running. Notice that there is no
-    PMLOGGER_INTERVAL set in the pmlogger daemon's environment.
-    
-    - Install pcp-zeroconf. Restart pmlogger. Notice that PMLOGGER_INTERVAL
-    environment is set in the pmlogger daemon's environment. The value is 10.
-    
-    - Edit /etc/sysconfig/pmlogger and set the value of PMLOGGER_INTERVAL to 15.
-    Restart pmlogger and notice that PMLOGGER_INTERVAL is set to 15 in pmlogger
-    daemon's environment.
-    
-    Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
-    Tested-by: Sunil Mohan Adapa <sunil@medhas.org>
-
-diff --git a/src/pmlogger/pmlogger.defaults b/src/pmlogger/pmlogger.defaults
-index 1765760b5..1e96cd6ff 100644
---- a/src/pmlogger/pmlogger.defaults
-+++ b/src/pmlogger/pmlogger.defaults
-@@ -1,7 +1,7 @@
- # Environment variables for the primary pmlogger daemon.  See also
- # the pmlogger control file and pmlogconf(1) for additional details.
--# Settings defined in this file will be overridden by any settings
--# in the pmlogger zeroconf file (if present).
-+# Settings defined in this file will override any settings in the
-+# pmlogger zeroconf file (if present).
- 
- # Behaviour regarding listening on external-facing interfaces;
- # unset PMLOGGER_LOCAL to allow connections from remote hosts.
-diff --git a/src/pmlogger/pmlogger.zeroconf b/src/pmlogger/pmlogger.zeroconf
-index 9defc6e3d..fe86dedcc 100644
---- a/src/pmlogger/pmlogger.zeroconf
-+++ b/src/pmlogger/pmlogger.zeroconf
-@@ -1,6 +1,6 @@
- #
--# PMLOGGER environment variables defined in this file take precedence over
--# the same variables defined in the standard pmlogger config file.
-+# PMLOGGER environment variables defined in the standard pmlogger config file
-+# take precedence over the same variables defined in this file.
- #
- # The PMLOGGER_INTERVAL setting affects the default primary pmlogger recording
- # frequency. This only affects the *default* interval setting when specified
-diff --git a/src/pmlogger/pmlogger_check.sh b/src/pmlogger/pmlogger_check.sh
-index 6cc2a8ed7..64750cb5f 100755
---- a/src/pmlogger/pmlogger_check.sh
-+++ b/src/pmlogger/pmlogger_check.sh
-@@ -983,8 +983,8 @@ END				{ print m }'`
- 	then
- 	    if [ "X$primary" = Xy ]
- 	    then
--		# pcp-zeroconf environment variables (if present) take precedence
--		envs=`grep -h ^PMLOGGER "$PMLOGGERENVS" "$PMLOGGERZEROCONFENVS" 2>/dev/null`
-+		# User configuration takes precedence over pcp-zeroconf
-+		envs=`grep -h ^PMLOGGER "$PMLOGGERZEROCONFENVS" "$PMLOGGERENVS" 2>/dev/null`
- 		args="-P $args"
- 		iam=" primary"
- 		# clean up port-map, just in case

SOURCES/redhat-bugzilla-2017632.patch

@@ -1,126 +0,0 @@
-commit 343aef25472baa74c3a4669cf86b670d93d41dcb
-Author: Nathan Scott <nathans@redhat.com>
-Date:   Tue Nov 23 16:11:24 2021 +1100
-
-    pmlogconf: fix reprobing with interactive changes
-    
-    In testing an earlier persistance fix it was discovered
-    that reprobe was inadvertently overwriting user requests
-    for changes interactively.
-    
-    Related to Red Hat BZ #2017632
-
-diff --git a/qa/368.out b/qa/368.out
-index 829162f859..179a1142cf 100644
---- a/qa/368.out
-+++ b/qa/368.out
-@@ -80,44 +80,10 @@ Differences ...
- Keep changes? [y] 
- Group: qa group one
- Log this group? [y] ...
--Differences ...
--*** TMP.orig ...
----- TMP.conf.new ...
--***************
--*** 22,35 ****
--  	sample.long.million
--  }
--  #----
--! #+ 02:x::
--! #----
--! #+ 03:y:default:
--! ## qa group three
--  log advisory on default {
--! 	sample.longlong.ten
--  }
--  #----
--  #+ 04:n:default:
--  ## qa group four
--  #----
----- 22,36 ----
--  	sample.long.million
--  }
--  #----
--! #+ 02:y:default:
--! ## qa group two
--  log advisory on default {
--! 	sample.ulong.ten
--  }
--  #----
--+ #+ 03:n:default:
--+ ## qa group three
--+ #----
--  #+ 04:n:default:
--  ## qa group four
--  #----
--Keep changes? [y] 
-+No changes
-+
- Group: qa group one
--Log this group? [y] ......
-+Log this group? [y] .....
- Differences ...
- *** TMP.orig ...
- --- TMP.conf.new ...
-@@ -132,18 +98,8 @@ Differences ...
-   #----
- --- 18,23 ----
- ***************
--*** 26,31 ****
----- 25,31 ----
--  ## qa group two
--  log advisory on default {
--  	sample.ulong.ten
--+ 	sample.ulong.million
--  }
--  #----
--  #+ 03:n:default:
--***************
--*** 37,42 ****
----- 37,53 ----
-+*** 36,41 ****
-+--- 35,51 ----
-   #+ 05:n:default:
-   ## qa group five
-   #----
-@@ -185,15 +141,13 @@ log advisory on default {
- 	sample.long.million
- }
- #----
--#+ 02:y:default:
--## qa group two
--log advisory on default {
--	sample.ulong.ten
--	sample.ulong.million
--}
-+#+ 02:x::
- #----
--#+ 03:n:default:
-+#+ 03:y:default:
- ## qa group three
-+log advisory on default {
-+	sample.longlong.ten
-+}
- #----
- #+ 04:n:default:
- ## qa group four
-diff --git a/src/pmlogconf/pmlogconf.c b/src/pmlogconf/pmlogconf.c
-index c03c61e797..fa1156859d 100644
---- a/src/pmlogconf/pmlogconf.c
-+++ b/src/pmlogconf/pmlogconf.c
-@@ -913,13 +913,13 @@ evaluate_state(group_t *group)
-     if ((group->pmlogger || group->pmrep) && !group->pmlogconf) {
- 	state = group->saved_state;
-     } else if (evaluate_group(group)) {	/* probe */
--	if (reprobe == 0 && group->saved_state != 0)
-+	if (group->saved_state != 0)
- 	    state = group->saved_state;
- 	else
- 	    state = group->true_state;
- 	group->success = 1;
-     } else {
--	if (reprobe == 0 && group->saved_state != 0)
-+	if (group->saved_state != 0)
- 	    state = group->saved_state;
- 	else
- 	    state = group->false_state;

SOURCES/redhat-bugzilla-2027753.patch

@@ -1,841 +0,0 @@
-diff -Naurp pcp-5.3.5.orig/qa/032 pcp-5.3.5/qa/032
---- pcp-5.3.5.orig/qa/032	2021-11-01 13:02:26.000000000 +1100
-+++ pcp-5.3.5/qa/032	2022-01-21 10:55:30.286602172 +1100
-@@ -34,13 +34,6 @@ trap "_cleanup" 0 1 2 3 15
- 
- _stop_auto_restart pmcd
- 
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
- _service pcp stop | _filter_pcp_stop
- _wait_pmcd_end
- _writable_primary_logger
-@@ -48,7 +41,7 @@ _writable_primary_logger
- _service pmcd start 2>&1 | _filter_pcp_start
- _wait_for_pmcd
- _service pmlogger start 2>&1 | _filter_pcp_start
--_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log
-+_wait_for_pmlogger
- 
- # real QA test starts here
- _echo "expect this to be off"
-diff -Naurp pcp-5.3.5.orig/qa/041 pcp-5.3.5/qa/041
---- pcp-5.3.5.orig/qa/041	2021-09-01 08:58:41.000000000 +1000
-+++ pcp-5.3.5/qa/041	2022-01-21 10:55:30.286602172 +1100
-@@ -40,12 +40,11 @@ _expect()
-     echo "" | tee -a $seq.full
- }
- 
-+status=1
- _needclean=true
- TAG=000666000magic
--status=1
--[ -z "$PCP_PMLOGGERCONTROL_PATH" ] && \
--	PCP_PMLOGGERCONTROL_PATH="$PCP_SYSCONF_DIR/pmlogger/control"
--
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
-+rm -f $seq.full
- trap "_cleanup" 0 1 2 3 15
- 
- _stop_auto_restart pmcd
-@@ -68,15 +67,6 @@ _cleanup()
-     exit $status
- }
- 
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
--rm -f $seq.full
--
- # real QA test starts here
- 
- # disable all pmloggers ...
-diff -Naurp pcp-5.3.5.orig/qa/066 pcp-5.3.5/qa/066
---- pcp-5.3.5.orig/qa/066	2021-02-17 15:27:41.000000000 +1100
-+++ pcp-5.3.5/qa/066	2022-01-21 10:55:30.286602172 +1100
-@@ -42,6 +42,7 @@ signal=$PCP_BINADM_DIR/pmsignal
- log=$PCP_PMCDLOG_PATH
- _needclean=true
- LOCALHOST=`hostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- 
- _filter_log()
- {
-@@ -80,13 +81,6 @@ interrupt()
-     exit
- }
- 
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
- cleanup()
- {
-     if [ $_needclean ]
-diff -Naurp pcp-5.3.5.orig/qa/067 pcp-5.3.5/qa/067
---- pcp-5.3.5.orig/qa/067	2021-02-17 15:27:41.000000000 +1100
-+++ pcp-5.3.5/qa/067	2022-01-21 10:55:30.287602155 +1100
-@@ -31,6 +31,7 @@ trap "rm -f $tmp.*; exit" 0 1 2 3 15
- signal=$PCP_BINADM_DIR/pmsignal
- log=$PCP_PMCDLOG_PATH
- LOCALHOST=`hostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- 
- _filter_log()
- {
-@@ -69,13 +70,6 @@ interrupt()
-     exit
- }
- 
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
- cleanup()
- {
-     _restore_config $PCP_PMCDCONF_PATH
-diff -Naurp pcp-5.3.5.orig/qa/068 pcp-5.3.5/qa/068
---- pcp-5.3.5.orig/qa/068	2019-01-13 14:14:12.000000000 +1100
-+++ pcp-5.3.5/qa/068	2022-01-21 10:55:30.287602155 +1100
-@@ -19,22 +19,11 @@ echo "QA output created by $seq"
- 
- _needclean=true
- LOCALHOST=`hostname`
--
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- trap "_cleanup" 0 1 2 3 15
- 
--# don't need to regenerate config.default with pmlogconf
--#
--export PMLOGGER_CHECK_SKIP_LOGCONF=yes
--
- _stop_auto_restart pmcd
- 
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
- _cleanup()
- {
-     echo >>$seq.full
-diff -Naurp pcp-5.3.5.orig/qa/069 pcp-5.3.5/qa/069
---- pcp-5.3.5.orig/qa/069	2021-11-08 09:45:56.000000000 +1100
-+++ pcp-5.3.5/qa/069	2022-01-21 10:55:30.287602155 +1100
-@@ -45,6 +45,7 @@ nconfig=$tmp.pmcd.conf.new
- log=$PCP_PMCDLOG_PATH
- LOCALHOST=`hostname`
- LOCALHOST_FULL=`pmhostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- _needclean=true
- 
- rm -f $seq.full
-@@ -104,13 +105,6 @@ skip > 0				{ skip--; next }
- 
- }
- 
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
- cleanup()
- {
-     if $_needclean
-diff -Naurp pcp-5.3.5.orig/qa/1055 pcp-5.3.5/qa/1055
---- pcp-5.3.5.orig/qa/1055	2021-02-17 15:27:41.000000000 +1100
-+++ pcp-5.3.5/qa/1055	2022-01-21 10:55:30.287602155 +1100
-@@ -17,6 +17,7 @@ signal=$PCP_BINADM_DIR/pmsignal
- status=1
- done_clean=false
- LOCALHOST=`hostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- 
- _cleanup()
- {
-@@ -66,13 +67,7 @@ $sudo cp $tmp.tmp $PCP_PMCDCONF_PATH
- _writable_primary_logger
- _service pcp restart 2>&1 | _filter_pcp_start
- _wait_for_pmcd
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log
-+_wait_for_pmlogger
- 
- # Reset pmlogger
- echo "log sample.dynamic.meta.metric"
-diff -Naurp pcp-5.3.5.orig/qa/172 pcp-5.3.5/qa/172
---- pcp-5.3.5.orig/qa/172	2021-02-17 15:27:41.000000000 +1100
-+++ pcp-5.3.5/qa/172	2022-01-21 10:55:30.287602155 +1100
-@@ -39,6 +39,7 @@ else
-     esac
- fi
- 
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- LOCALHOST=`hostname`
- _needclean=true
- status=0
-@@ -48,13 +49,6 @@ _interrupt()
-     status=1
- }
- 
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
- _cleanup()
- {
-     if $_needclean
-diff -Naurp pcp-5.3.5.orig/qa/192 pcp-5.3.5/qa/192
---- pcp-5.3.5.orig/qa/192	2019-01-13 14:14:12.000000000 +1100
-+++ pcp-5.3.5/qa/192	2022-01-21 10:55:30.287602155 +1100
-@@ -13,6 +13,7 @@ echo "QA output created by $seq"
- . ./common.filter
- . ./common.check
- 
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- LOCALHOST=`hostname`
- _needclean=true
- status=0
-@@ -22,13 +23,6 @@ _interrupt()
-     status=1
- }
- 
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
- _cleanup()
- {
-     if $_needclean
-diff -Naurp pcp-5.3.5.orig/qa/220 pcp-5.3.5/qa/220
---- pcp-5.3.5.orig/qa/220	2021-07-13 09:34:38.000000000 +1000
-+++ pcp-5.3.5/qa/220	2022-01-21 10:55:30.287602155 +1100
-@@ -18,13 +18,7 @@ which netstat >/dev/null 2>&1 || _notrun
- status=0
- clean=false
- LOCALHOST=`hostname`
--
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- 
- _cleanup()
- {
-diff -Naurp pcp-5.3.5.orig/qa/258 pcp-5.3.5/qa/258
---- pcp-5.3.5.orig/qa/258	2019-01-30 14:22:38.000000000 +1100
-+++ pcp-5.3.5/qa/258	2022-01-21 10:55:30.287602155 +1100
-@@ -19,6 +19,7 @@ echo "QA output created by $seq"
- signal=$PCP_BINADM_DIR/pmsignal
- status=1
- LOCALHOST=`hostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- _needclean=true
- 
- _interrupt()
-@@ -26,13 +27,6 @@ _interrupt()
-     status=1
- }
- 
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
- _cleanup()
- {
-     cd $here
-diff -Naurp pcp-5.3.5.orig/qa/279 pcp-5.3.5/qa/279
---- pcp-5.3.5.orig/qa/279	2021-02-17 15:27:41.000000000 +1100
-+++ pcp-5.3.5/qa/279	2022-01-21 10:55:30.287602155 +1100
-@@ -17,6 +17,7 @@ echo "QA output created by $seq"
- status=1	# failure is the default!
- killer=`pwd`/src/killparent
- LOCALHOST=`hostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- _needclean=true
- 
- rm -f $seq.full
-@@ -76,13 +77,6 @@ _filter_pmcd()
-     # end
- }
- 
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
- _save_config $PCP_PMCDCONF_PATH
- _disable_loggers
- pmafm $LOGGING_DIR/$LOCALHOST/Latest remove >$tmp.cmd 2>&1 \
-diff -Naurp pcp-5.3.5.orig/qa/280 pcp-5.3.5/qa/280
---- pcp-5.3.5.orig/qa/280	2021-08-16 14:12:25.000000000 +1000
-+++ pcp-5.3.5/qa/280	2022-01-21 10:55:30.287602155 +1100
-@@ -13,16 +13,6 @@ echo "QA output created by $seq"
- . ./common.filter
- . ./common.check
- 
--if [ -d "$PCP_ARCHIVE_DIR" ]
--then
--    LOGGING_DIR=$PCP_ARCHIVE_DIR
--elif [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
- _filter()
- {
-     [ -z "$PCP_PMLOGGERCONTROL_PATH" ] && \
-@@ -52,6 +42,7 @@ _filter()
- status=1	# failure is the default!
- signal=$PCP_BINADM_DIR/pmsignal
- LOCALHOST=`hostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- trap "_cleanup; $sudo rm -f $tmp.* $LOGGING_DIR/$LOCALHOST/lock; exit \$status" 0 1 2 3 15
- 
- _stop_auto_restart pmcd
-diff -Naurp pcp-5.3.5.orig/qa/282 pcp-5.3.5/qa/282
---- pcp-5.3.5.orig/qa/282	2021-02-17 15:27:41.000000000 +1100
-+++ pcp-5.3.5/qa/282	2022-01-21 10:55:30.287602155 +1100
-@@ -32,7 +32,7 @@ _needclean=true
- sleepy=false
- 
- LOCALHOST=`hostname`
--LOGGING_DIR=$PCP_LOG_DIR/pmlogger
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- CHECK=`which pmlogger_check`
- [ -z "$CHECK" -o ! -x "$CHECK" ] && \
-     _notrun "Cannot find an executable pmlogger_check: \"$CHECK\""
-diff -Naurp pcp-5.3.5.orig/qa/336 pcp-5.3.5/qa/336
---- pcp-5.3.5.orig/qa/336	2018-10-23 07:37:45.000000000 +1100
-+++ pcp-5.3.5/qa/336	2022-01-21 10:55:30.288602138 +1100
-@@ -19,6 +19,7 @@ echo "QA output created by $seq"
- signal=$PCP_BINADM_DIR/pmsignal
- status=1	# failure is the default!
- LOCALHOST=`hostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- _needclean=true
- 
- if [ -n "$PCP_TRACE_HOST" ]
-@@ -31,13 +32,6 @@ _interrupt()
-     status=1
- }
- 
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--
- _cleanup()
- {
-     cd $here
-diff -Naurp pcp-5.3.5.orig/qa/854 pcp-5.3.5/qa/854
---- pcp-5.3.5.orig/qa/854	2021-02-17 15:27:41.000000000 +1100
-+++ pcp-5.3.5/qa/854	2022-01-21 10:55:30.288602138 +1100
-@@ -17,6 +17,7 @@ signal=$PCP_BINADM_DIR/pmsignal
- status=1
- done_clean=false
- LOCALHOST=`hostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- 
- _cleanup()
- {
-@@ -59,20 +60,14 @@ cat <<End-of-File >$tmp.tmp
- # Installed by PCP QA test $seq on `date`
- pmcd	2	dso	pmcd_init	$PMDA_PMCD_PATH
- sample	29	pipe	binary 		$PCP_PMDAS_DIR/sample/pmdasample -d 29 
--simple	253	pipe	binary 		/var/lib/pcp/pmdas/simple/pmdasimple -d 253 
-+simple	253	pipe	binary 		$PCP_PMDAS_DIR/simple/pmdasimple -d 253 
- End-of-File
- $sudo cp $tmp.tmp $PCP_PMCDCONF_PATH
- 
- _writable_primary_logger
- _service pcp restart 2>&1 | _filter_pcp_start
- _wait_for_pmcd
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log
-+_wait_for_pmlogger
- 
- # Reset pmlogger
- echo "log sample.dynamic.meta.metric"
-diff -Naurp pcp-5.3.5.orig/qa/856 pcp-5.3.5/qa/856
---- pcp-5.3.5.orig/qa/856	2019-01-13 14:14:12.000000000 +1100
-+++ pcp-5.3.5/qa/856	2022-01-21 10:55:30.288602138 +1100
-@@ -17,6 +17,7 @@ signal=$PCP_BINADM_DIR/pmsignal
- status=1
- done_clean=false
- LOCALHOST=`hostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- 
- _cleanup()
- {
-@@ -69,13 +70,7 @@ $sudo cp $tmp.tmp $PCP_PMCDCONF_PATH
- _writable_primary_logger
- _service pcp restart 2>&1 | _filter_pcp_start
- _wait_for_pmcd
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log
-+_wait_for_pmlogger
- 
- # Reset pmlogger
- echo "log sample.dynamic.meta.metric"
-diff -Naurp pcp-5.3.5.orig/qa/882 pcp-5.3.5/qa/882
---- pcp-5.3.5.orig/qa/882	2019-01-13 14:14:12.000000000 +1100
-+++ pcp-5.3.5/qa/882	2022-01-21 10:55:30.288602138 +1100
-@@ -17,6 +17,7 @@ signal=$PCP_BINADM_DIR/pmsignal
- status=1
- done_clean=false
- LOCALHOST=`hostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- 
- _cleanup()
- {
-@@ -69,13 +70,7 @@ $sudo cp $tmp.tmp $PCP_PMCDCONF_PATH
- _writable_primary_logger
- _service pcp restart 2>&1 | _filter_pcp_start
- _wait_for_pmcd
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log
-+_wait_for_pmlogger
- 
- # Reset pmlogger
- echo "log sample.dynamic.meta.metric"
-diff -Naurp pcp-5.3.5.orig/qa/932 pcp-5.3.5/qa/932
---- pcp-5.3.5.orig/qa/932	2021-02-17 15:27:41.000000000 +1100
-+++ pcp-5.3.5/qa/932	2022-01-21 10:55:30.288602138 +1100
-@@ -17,6 +17,7 @@ signal=$PCP_BINADM_DIR/pmsignal
- status=1
- done_clean=false
- LOCALHOST=`hostname`
-+LOGGING_DIR="$PCP_ARCHIVE_DIR"
- 
- _cleanup()
- {
-@@ -67,13 +68,7 @@ $sudo cp $tmp.tmp $PCP_PMCDCONF_PATH
- _writable_primary_logger
- _service pcp restart 2>&1 | _filter_pcp_start
- _wait_for_pmcd
--if [ -d $PCP_LOG_DIR/pmlogger ]
--then
--    LOGGING_DIR=$PCP_LOG_DIR/pmlogger
--else
--    LOGGING_DIR=$PCP_LOG_DIR
--fi
--_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log
-+_wait_for_pmlogger
- 
- # Reset pmlogger
- echo "log sample.dynamic.meta.metric"
-diff -Naurp pcp-5.3.5.orig/qa/common.check pcp-5.3.5/qa/common.check
---- pcp-5.3.5.orig/qa/common.check	2021-11-05 09:54:05.000000000 +1100
-+++ pcp-5.3.5/qa/common.check	2022-01-21 10:55:30.288602138 +1100
-@@ -262,7 +262,7 @@ _service()
- 			# good reason for this)
- 			# ditto for pmlogger_daily and pmlogger_daily-poll
- 			#
--			for svc in pmlogger_check pmlogger_daily pmlogger_daily-poll
-+			for svc in pmlogger_check pmlogger_daily pmlogger_farm_check pmlogger_daily-poll
- 			do
- 			    if systemctl show --property=ActiveState $svc.timer 2>&1 \
- 			      | grep '=active$' >/dev/null
-@@ -1940,9 +1940,11 @@ _remove_job_scheduler()
-     $rc_sudo rm -f $rc_cron_backup $rc_systemd_state
- 
-     if systemctl cat pmie_daily.timer >/dev/null 2>&1; then
--	for i in pmie.service pmie_daily.timer pmie_check.timer pmlogger_daily.timer \
-+	for i in pmie.service pmie_daily.timer \
-+		pmie_check.timer pmie_farm_check.timer \
- 		pmlogger_daily_report.timer pmlogger_daily_report-poll.timer \
--		pmlogger_daily-poll.timer pmlogger_check.timer ; do
-+		pmlogger_daily-poll.timer pmlogger_daily.timer \
-+		pmlogger_check.timer pmlogger_farm_check.timer ; do
- 	    $rc_sudo systemctl is-active "$i" > /dev/null || continue
- 	    $rc_sudo systemctl stop $i >/dev/null
- 	    echo "$i" >> $rc_systemd_state
-diff -Naurp pcp-5.3.5.orig/src/pmie/GNUmakefile pcp-5.3.5/src/pmie/GNUmakefile
---- pcp-5.3.5.orig/src/pmie/GNUmakefile	2021-11-09 10:50:58.000000000 +1100
-+++ pcp-5.3.5/src/pmie/GNUmakefile	2022-01-21 10:55:54.918186303 +1100
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2013-2015,2020-2021 Red Hat.
-+# Copyright (c) 2013-2015,2020-2022 Red Hat.
- # Copyright (c) 2000,2004 Silicon Graphics, Inc.  All Rights Reserved.
- # 
- # This program is free software; you can redistribute it and/or modify it
-@@ -84,7 +84,6 @@ pmie.service : pmie.service.in
- 
- pmie_farm.service : pmie_farm.service.in
- 	$(SED) <$< >$@ \
--	    -e 's;@CRONTAB_PATH@;'$(CRONTAB_PATH)';' \
- 	    -e 's;@PCP_SYSCONFIG_DIR@;'$(PCP_SYSCONFIG_DIR)';' \
- 	    -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \
- 	    -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
-@@ -95,7 +94,10 @@ pmie_farm.service : pmie_farm.service.in
- 
- pmie_farm_check.service : pmie_farm_check.service.in
- 	$(SED) <$< >$@ \
-+	    -e 's;@CRONTAB_PATH@;'$(CRONTAB_PATH)';' \
- 	    -e 's;@PCP_BIN_DIR@;'$(PCP_BIN_DIR)';' \
-+	    -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
-+	    -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \
- 	# END
- 
- pmie_check.service : pmie_check.service.in
-diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_check.service.in pcp-5.3.5/src/pmie/pmie_check.service.in
---- pcp-5.3.5.orig/src/pmie/pmie_check.service.in	2021-11-04 08:26:15.000000000 +1100
-+++ pcp-5.3.5/src/pmie/pmie_check.service.in	2022-01-21 10:55:30.288602138 +1100
-@@ -2,7 +2,6 @@
- Description=Check PMIE instances are running
- Documentation=man:pmie_check(1)
- ConditionPathExists=!@CRONTAB_PATH@
--PartOf=pmie.service
- 
- [Service]
- Type=@SD_SERVICE_TYPE@
-@@ -15,6 +14,3 @@ ExecStart=@PCP_BINADM_DIR@/pmie_check $P
- WorkingDirectory=@PCP_VAR_DIR@
- Group=@PCP_GROUP@
- User=@PCP_USER@
--
--[Install]
--RequiredBy=pmie.service
-diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_check.timer pcp-5.3.5/src/pmie/pmie_check.timer
---- pcp-5.3.5.orig/src/pmie/pmie_check.timer	2021-02-17 15:27:41.000000000 +1100
-+++ pcp-5.3.5/src/pmie/pmie_check.timer	2022-01-21 10:55:30.288602138 +1100
-@@ -1,6 +1,5 @@
- [Unit]
- Description=Half-hourly check of PMIE instances
--PartOf=pmie.service
- 
- [Timer]
- # if enabled, runs 1m after boot and every half hour
-diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_daily.service.in pcp-5.3.5/src/pmie/pmie_daily.service.in
---- pcp-5.3.5.orig/src/pmie/pmie_daily.service.in	2021-10-07 14:28:56.000000000 +1100
-+++ pcp-5.3.5/src/pmie/pmie_daily.service.in	2022-01-21 10:55:30.288602138 +1100
-@@ -6,6 +6,7 @@ ConditionPathExists=!@CRONTAB_PATH@
- [Service]
- Type=@SD_SERVICE_TYPE@
- Restart=no
-+TimeoutStartSec=1h
- Environment="PMIE_DAILY_PARAMS=-X xz -x 3"
- EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmie_timers
- ExecStart=@PCP_BINADM_DIR@/pmie_daily $PMIE_DAILY_PARAMS
-diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_daily.timer pcp-5.3.5/src/pmie/pmie_daily.timer
---- pcp-5.3.5.orig/src/pmie/pmie_daily.timer	2019-02-20 18:03:00.000000000 +1100
-+++ pcp-5.3.5/src/pmie/pmie_daily.timer	2022-01-21 10:55:30.288602138 +1100
-@@ -2,6 +2,7 @@
- Description=Daily processing of PMIE logs
- 
- [Timer]
-+Persistent=true
- OnCalendar=*-*-* 00:08:00
- 
- [Install]
-diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_farm_check.service.in pcp-5.3.5/src/pmie/pmie_farm_check.service.in
---- pcp-5.3.5.orig/src/pmie/pmie_farm_check.service.in	2021-11-09 10:50:58.000000000 +1100
-+++ pcp-5.3.5/src/pmie/pmie_farm_check.service.in	2022-01-21 10:55:54.918186303 +1100
-@@ -1,19 +1,15 @@
- [Unit]
--Description=Check and migrate non-primary pmie instances to pmie_farm
--Documentation=man:pmie_check(1)
--# TODO non-systemd ConditionPathExists=!/etc/cron.d/pcp-pmie
-+Description=Check and migrate non-primary pmie farm instances
-+Documentation=man:pmiectl(1)
-+ConditionPathExists=!@CRONTAB_PATH@
- 
- [Service]
--Type=exec
-+Type=@SD_SERVICE_TYPE@
- Restart=no
- TimeoutStartSec=4h
- TimeoutStopSec=120
- ExecStart=@PCP_BIN_DIR@/pmiectl -m check
--WorkingDirectory=/var/lib/pcp
--
-+WorkingDirectory=@PCP_VAR_DIR@
- # root so pmiectl can migrate pmie processes to the pmie_farm service
- Group=root
- User=root
--
--[Install]
--RequiredBy=pmie_farm.service
-diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_farm_check.timer pcp-5.3.5/src/pmie/pmie_farm_check.timer
---- pcp-5.3.5.orig/src/pmie/pmie_farm_check.timer	2021-11-04 08:26:15.000000000 +1100
-+++ pcp-5.3.5/src/pmie/pmie_farm_check.timer	2022-01-21 10:49:07.985980678 +1100
-@@ -1,10 +1,11 @@
- [Unit]
--Description=5 minute check of pmie farm instances
-+Description=Half-hourly check of pmie farm instances
- 
- [Timer]
--# if enabled, runs 1m after boot and every 5 mins
-+# if enabled, runs 1m after boot and every half hour
- OnBootSec=1min
--OnCalendar=*:00/5
-+OnCalendar=*-*-* *:28:10
-+OnCalendar=*-*-* *:58:10
- 
- [Install]
- WantedBy=timers.target
-diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_farm.service.in pcp-5.3.5/src/pmie/pmie_farm.service.in
---- pcp-5.3.5.orig/src/pmie/pmie_farm.service.in	2021-11-04 08:26:15.000000000 +1100
-+++ pcp-5.3.5/src/pmie/pmie_farm.service.in	2022-01-21 10:49:07.986980661 +1100
-@@ -1,9 +1,9 @@
- [Unit]
- Description=pmie farm service
--Documentation=man:pmie(1)
--After=network-online.target pmcd.service
--Before=pmie_check.timer pmie_daily.timer
--BindsTo=pmie_farm_check.timer pmie_check.timer pmie_daily.timer
-+Documentation=man:pmie_check(1)
-+Before=pmie_farm_check.timer
-+BindsTo=pmie_farm_check.timer
-+PartOf=pmie.service
- 
- [Service]
- Type=@SD_SERVICE_TYPE@
-@@ -15,13 +15,9 @@ TimeoutStopSec=120
- Environment="PMIE_CHECK_PARAMS=--skip-primary"
- EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmie_timers
- ExecStart=@PCP_BINADM_DIR@/pmie_farm $PMIE_CHECK_PARAMS
--
- WorkingDirectory=@PCP_VAR_DIR@
- Group=@PCP_GROUP@
- User=@PCP_USER@
- 
- [Install]
--WantedBy=multi-user.target
--
--# This dependency will be removed in PCPv6.
--WantedBy=pmie.service
-+RequiredBy=pmie.service
-diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_farm.sh pcp-5.3.5/src/pmie/pmie_farm.sh
---- pcp-5.3.5.orig/src/pmie/pmie_farm.sh	2021-11-05 17:02:47.000000000 +1100
-+++ pcp-5.3.5/src/pmie/pmie_farm.sh	2022-01-21 10:49:07.986980661 +1100
-@@ -12,8 +12,8 @@
- # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- # for more details.
- #
--# Administrative script to start the pmlogger_farm service.
--# All arguments to pmlogger_check are passed from pmlogger_farm.service.
-+# Administrative script to start the pmie_farm service.
-+# All arguments to pmie_check are passed from pmie_farm.service.
- #
- . $PCP_DIR/etc/pcp.env
- 
-diff -Naurp pcp-5.3.5.orig/src/pmie/pmie.service.in pcp-5.3.5/src/pmie/pmie.service.in
---- pcp-5.3.5.orig/src/pmie/pmie.service.in	2021-02-22 11:32:05.000000000 +1100
-+++ pcp-5.3.5/src/pmie/pmie.service.in	2022-01-21 10:49:07.986980661 +1100
-@@ -2,8 +2,8 @@
- Description=Performance Metrics Inference Engine
- Documentation=man:pmie(1)
- After=network-online.target pmcd.service
--Before=pmie_check.timer pmie_daily.timer
--BindsTo=pmie_check.timer pmie_daily.timer
-+Before=pmie_farm.service pmie_check.timer pmie_daily.timer
-+BindsTo=pmie_farm.service pmie_check.timer pmie_daily.timer
- Wants=pmcd.service
- 
- [Service]
-diff -Naurp pcp-5.3.5.orig/src/pmlogger/GNUmakefile pcp-5.3.5/src/pmlogger/GNUmakefile
---- pcp-5.3.5.orig/src/pmlogger/GNUmakefile	2021-11-09 09:08:40.000000000 +1100
-+++ pcp-5.3.5/src/pmlogger/GNUmakefile	2022-01-21 10:55:54.918186303 +1100
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2013-2021 Red Hat.
-+# Copyright (c) 2013-2022 Red Hat.
- # Copyright (c) 2000,2004 Silicon Graphics, Inc.  All Rights Reserved.
- # 
- # This program is free software; you can redistribute it and/or modify it
-@@ -99,7 +99,6 @@ pmlogger.service : pmlogger.service.in
- 
- pmlogger_farm.service : pmlogger_farm.service.in
- 	$(SED) <$< >$@ \
--	    -e 's;@CRONTAB_PATH@;'$(CRONTAB_PATH)';' \
- 	    -e 's;@PCP_SYSCONFIG_DIR@;'$(PCP_SYSCONFIG_DIR)';' \
- 	    -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \
- 	    -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
-@@ -110,7 +109,10 @@ pmlogger_farm.service : pmlogger_farm.se
- 
- pmlogger_farm_check.service : pmlogger_farm_check.service.in
- 	$(SED) <$< >$@ \
-+	    -e 's;@CRONTAB_PATH@;'$(CRONTAB_PATH)';' \
- 	    -e 's;@PCP_BIN_DIR@;'$(PCP_BIN_DIR)';' \
-+	    -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
-+	    -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \
- 	# END
- 
- pmlogger_daily.service : pmlogger_daily.service.in
-diff -Naurp pcp-5.3.5.orig/src/pmlogger/pmlogger_check.service.in pcp-5.3.5/src/pmlogger/pmlogger_check.service.in
---- pcp-5.3.5.orig/src/pmlogger/pmlogger_check.service.in	2021-11-04 08:26:15.000000000 +1100
-+++ pcp-5.3.5/src/pmlogger/pmlogger_check.service.in	2022-01-21 10:55:30.289602121 +1100
-@@ -15,6 +15,3 @@ ExecStart=@PCP_BINADM_DIR@/pmlogger_chec
- WorkingDirectory=@PCP_VAR_DIR@
- Group=@PCP_GROUP@
- User=@PCP_USER@
--
--[Install]
--RequiredBy=pmlogger.service
-diff -Naurp pcp-5.3.5.orig/src/pmlogger/pmlogger_daily_report.service.in pcp-5.3.5/src/pmlogger/pmlogger_daily_report.service.in
---- pcp-5.3.5.orig/src/pmlogger/pmlogger_daily_report.service.in	2021-10-07 14:28:56.000000000 +1100
-+++ pcp-5.3.5/src/pmlogger/pmlogger_daily_report.service.in	2022-01-21 10:55:30.289602121 +1100
-@@ -13,6 +13,3 @@ ExecStart=@PCP_BINADM_DIR@/pmlogger_dail
- WorkingDirectory=@PCP_VAR_DIR@
- Group=@PCP_GROUP@
- User=@PCP_USER@
--
--[Install]
--WantedBy=pmlogger.service
-diff -Naurp pcp-5.3.5.orig/src/pmlogger/pmlogger_farm_check.service.in pcp-5.3.5/src/pmlogger/pmlogger_farm_check.service.in
---- pcp-5.3.5.orig/src/pmlogger/pmlogger_farm_check.service.in	2021-11-09 09:08:40.000000000 +1100
-+++ pcp-5.3.5/src/pmlogger/pmlogger_farm_check.service.in	2022-01-21 10:55:54.918186303 +1100
-@@ -1,19 +1,15 @@
- [Unit]
--Description=Check and migrate non-primary pmlogger instances to pmlogger_farm
--Documentation=man:pmlogger_check(1)
--# TODO non-systemd ConditionPathExists=!/etc/cron.d/pcp-pmlogger
-+Description=Check and migrate non-primary pmlogger farm instances
-+Documentation=man:pmlogctl(1)
-+ConditionPathExists=!@CRONTAB_PATH@
- 
- [Service]
--Type=exec
-+Type=@SD_SERVICE_TYPE@
- Restart=no
- TimeoutStartSec=4h
- TimeoutStopSec=120
- ExecStart=@PCP_BIN_DIR@/pmlogctl -m check
--WorkingDirectory=/var/lib/pcp
--
--# root so pmlogctl can migrate pmloggers to the pmlogger_farm service
-+WorkingDirectory=@PCP_VAR_DIR@
-+# root so pmlogctl can migrate pmlogger processes to the pmlogger_farm service
- Group=root
- User=root
--
--[Install]
--RequiredBy=pmlogger_farm.service
-diff -Naurp pcp-5.3.5.orig/src/pmlogger/pmlogger_farm_check.timer pcp-5.3.5/src/pmlogger/pmlogger_farm_check.timer
---- pcp-5.3.5.orig/src/pmlogger/pmlogger_farm_check.timer	2021-11-04 08:26:15.000000000 +1100
-+++ pcp-5.3.5/src/pmlogger/pmlogger_farm_check.timer	2022-01-21 10:49:07.986980661 +1100
-@@ -1,10 +1,11 @@
- [Unit]
--Description=5 minute check of pmlogger farm instances
-+Description=Half-hourly check of pmlogger farm instances
- 
- [Timer]
--# if enabled, runs 1m after boot and every 5 mins
-+# if enabled, runs 1m after boot and every half hour
- OnBootSec=1min
--OnCalendar=*:00/5
-+OnCalendar=*-*-* *:25:10
-+OnCalendar=*-*-* *:55:10
- 
- [Install]
- WantedBy=timers.target
-diff -Naurp pcp-5.3.5.orig/src/pmlogger/pmlogger_farm.service.in pcp-5.3.5/src/pmlogger/pmlogger_farm.service.in
---- pcp-5.3.5.orig/src/pmlogger/pmlogger_farm.service.in	2021-11-04 08:26:15.000000000 +1100
-+++ pcp-5.3.5/src/pmlogger/pmlogger_farm.service.in	2022-01-21 10:55:30.289602121 +1100
-@@ -1,9 +1,9 @@
- [Unit]
- Description=pmlogger farm service
--Documentation=man:pmlogger(1)
--After=network-online.target pmcd.service
--Before=pmlogger_check.timer pmlogger_daily.timer
--BindsTo=pmlogger_farm_check.timer pmlogger_check.timer pmlogger_daily.timer
-+Documentation=man:pmlogger_check(1)
-+Before=pmlogger_farm_check.timer
-+BindsTo=pmlogger_farm_check.timer
-+PartOf=pmlogger.service
- 
- [Service]
- Type=@SD_SERVICE_TYPE@
-@@ -12,16 +12,12 @@ Restart=always
- TimeoutStartSec=4h
- TimeoutStopSec=120
- # the pmlogger_farm service manages all pmloggers except the primary
--Environment="PMLOGGER_CHECK_PARAMS=--skip-primary"
-+Environment="PMLOGGER_CHECK_PARAMS=--skip-primary --quick"
- EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger_timers
- ExecStart=@PCP_BINADM_DIR@/pmlogger_farm $PMLOGGER_CHECK_PARAMS
--
- WorkingDirectory=@PCP_VAR_DIR@
- Group=@PCP_GROUP@
- User=@PCP_USER@
- 
- [Install]
--WantedBy=multi-user.target
--
--# This dependency will be removed in PCPv6.
--WantedBy=pmlogger.service
-+RequiredBy=pmlogger.service
-diff -Naurp pcp-5.3.5.orig/src/pmlogger/pmlogger.service.in pcp-5.3.5/src/pmlogger/pmlogger.service.in
---- pcp-5.3.5.orig/src/pmlogger/pmlogger.service.in	2021-11-04 08:26:15.000000000 +1100
-+++ pcp-5.3.5/src/pmlogger/pmlogger.service.in	2022-01-21 10:49:07.986980661 +1100
-@@ -2,8 +2,8 @@
- Description=Performance Metrics Archive Logger
- Documentation=man:pmlogger(1)
- After=network-online.target pmcd.service
--Before=pmlogger_check.timer pmlogger_daily.timer
--BindsTo=pmlogger_check.timer pmlogger_daily.timer
-+Before=pmlogger_farm.service pmlogger_check.timer pmlogger_daily.timer
-+BindsTo=pmlogger_farm.service pmlogger_check.timer pmlogger_daily.timer
- Wants=pmcd.service
- 
- [Service]

SOURCES/redhat-bugzilla-2029301.patch

@@ -1,38 +0,0 @@
-commit 9d9adc9d6c8eb24a6884da81c18b927ea706a68e
-Author: Nathan Scott <nathans@redhat.com>
-Date:   Tue Dec 7 11:18:11 2021 +1100
-
-    pmdanvidia: fix mishandling of zero-byte size passed to realloc
-    
-    Picked up during QA of recent nvidia changes - some hardware lacks
-    support for per-process metrics, or the hardware (GPU) has not yet
-    been accessed by a process using its resources, which had the side
-    effect that a zero-byte size argument was passed into realloc.  In
-    turn, this passes back something that can be freed and an issue in
-    the logic meant this would happen on subsequent calls also.
-    
-    Resolves the QA failure and Red Hat BZ #2029301
-
-diff --git a/src/pmdas/nvidia/nvidia.c b/src/pmdas/nvidia/nvidia.c
-index f1c12f2275..dc5bb93a0d 100644
---- a/src/pmdas/nvidia/nvidia.c
-+++ b/src/pmdas/nvidia/nvidia.c
-@@ -617,11 +617,16 @@ refresh(pcp_nvinfo_t *nvinfo, int need_processes)
-     /* update indoms, cull old entries that remain inactive */
-     if (need_processes) {
- 	pmdaIndom	*proc_indomp = &indomtab[PROC_INDOM];
--	pmdaInstid	*it_set = proc_indomp->it_set;
-+	pmdaInstid	*it_set = NULL;
- 	size_t		bytes = nproc * sizeof(pmdaInstid);
- 
--	if ((it_set = (pmdaInstid *)realloc(it_set, bytes)) == NULL)
-+	if (bytes > 0) {
-+	    it_set = (pmdaInstid *)realloc(proc_indomp->it_set, bytes);
-+	    if (it_set == NULL)
-+		free(proc_indomp->it_set);
-+	} else if (proc_indomp->it_set != NULL) {
- 	    free(proc_indomp->it_set);
-+	}
- 
- 	if ((proc_indomp->it_set = it_set) != NULL) {
- 	    for (i = j = 0; i < processes.hsize && j < nproc; i++) {

SOURCES/redhat-bugzilla-2030121.patch

@@ -1,50 +0,0 @@
-commit df7b7bf64eb354114e6c519e3e03ffc446afa8ba
-Author: Nathan Scott <nathans@redhat.com>
-Date:   Fri Nov 26 09:17:23 2021 +1100
-
-    libpcp_pmda: add indom cache fast-paths for inst lookup beyond max
-    
-    We encountered a situation where indom cache loading consumed vast
-    CPU resources for an indom of size ~150k instances.  Profiling was
-    used to identify the insert loop that ensures the inst linked list
-    within the cache hash tables is sorted - this loop is O(N*2) as we
-    potentially walk this list from the start on every insert during a
-    cache load.  Because cache loading happens from a sorted file, the
-    worst-case scenario happened every time - each new instance insert
-    occurs beyond the current maximum.  Fortunately we maintain a last
-    entry pointer, so the new fast path uses that first and falls back
-    to the original behaviour for an out-of-order insertion.
-    
-    A second opportunity for the same optimization was identified when
-    auditing the rest of cache.c - in the find_inst() routine for inst
-    identifier lookups beyond the current maximum observed instance.
-    
-    Resolves Red Hat BZ #2024648
-
-diff --git a/src/libpcp_pmda/src/cache.c b/src/libpcp_pmda/src/cache.c
-index 0e66506d74..196ffc1da9 100644
---- a/src/libpcp_pmda/src/cache.c
-+++ b/src/libpcp_pmda/src/cache.c
-@@ -328,6 +328,9 @@ find_inst(hdr_t *h, int inst)
- {
-     entry_t	*e;
- 
-+    if ((e = h->last) != NULL && e->inst < inst)
-+	return NULL;
-+
-     for (e = h->first; e != NULL; e = e->next) {
- 	if (e->inst == inst && e->state != PMDA_CACHE_EMPTY)
- 	    break;
-@@ -621,7 +624,11 @@ insert_cache(hdr_t *h, const char *name, int inst, int *sts)
- 	    *sts = PM_ERR_INST;
- 	    return e;
- 	}
--	for (e = h->first; e != NULL; e = e->next) {
-+	/* if this entry is beyond the (sorted) list end, avoid linear scan */
-+	if ((e = h->last) == NULL || e->inst > inst)
-+	    e = h->first;
-+	/* linear search over linked list, starting at either first or last */
-+	for (; e != NULL; e = e->next) {
- 	    if (e->inst < inst)
- 		last_e = e;
- 	    else if (e->inst > inst)

SOURCES/redhat-bugzilla-2030140.patch

@@ -1,742 +0,0 @@
-diff -Naurp pcp-5.3.5.orig/qa/1458 pcp-5.3.5/qa/1458
---- pcp-5.3.5.orig/qa/1458	1970-01-01 10:00:00.000000000 +1000
-+++ pcp-5.3.5/qa/1458	2021-12-09 11:25:01.973327231 +1100
-@@ -0,0 +1,219 @@
-+#!/bin/sh
-+# PCP QA Test No. 1458
-+# Exercise access pmproxy with secure.enabled = false
-+#
-+# The main purpose of this is to test that the component works correctly
-+# when secure.enabled = false; we can expect the https URLs to fail.
-+#
-+# See https://github.com/performancecopilot/pcp/issues/1490
-+
-+# Copyright (c) 2019,2021 Red Hat
-+# Modified by Netflix, Inc.
-+#
-+
-+seq=`basename $0`
-+echo "QA output created by $seq"
-+
-+# get standard environment, filters and checks
-+. ./common.product
-+. ./common.filter
-+. ./common.check
-+
-+_check_series	# pmseries availability means libuv is in use
-+_check_valgrind
-+openssl help 2>/dev/null || _notrun "No openssl binary found"
-+
-+if [ -f /etc/lsb-release ]
-+then
-+    . /etc/lsb-release
-+    if [ "$DISTRIB_ID" = Ubuntu ]
-+    then
-+	# This test fails for Ubuntu 19.10 with a myriad of errors involving
-+	# the use of uninitialized values.  The code paths very but typically
-+	# involve libuv -> libssl ->  libcrypto
-+	#
-+	case "$DISTRIB_RELEASE"
-+	in
-+	    19.10)
-+		_notrun "problems with libuv, libssl, libcrypto and valgrind on Ubuntu $DISTRIB_RELEASE"
-+		;;
-+	esac
-+    fi
-+fi
-+
-+_cleanup()
-+{
-+    cd $here
-+    if $need_restore
-+    then
-+	need_restore=false
-+	_restore_config $PCP_SYSCONF_DIR/labels
-+	_sighup_pmcd
-+    fi
-+    $sudo rm -rf $tmp $tmp.*
-+}
-+
-+status=1	# failure is the default!
-+need_restore=false
-+username=`id -u -n`
-+$sudo rm -rf $tmp $tmp.* $seq.full
-+trap "_cleanup; exit \$status" 0 1 2 3 15
-+
-+_check_empty()
-+{
-+    tee -a $seq.full > $tmp.unfiltered
-+    if [ -s $tmp.unfiltered ]
-+    then
-+	echo "Botch: got output from curl"
-+    else
-+	echo "Good!, empty output from curl"
-+    fi
-+}
-+
-+_filter_json()
-+{
-+    tee -a $seq.full > $tmp.unfiltered
-+    if [ -s $tmp.unfiltered ]
-+    then
-+	pmjson < $tmp.unfiltered > $tmp.filtered
-+	status=$?
-+	    if [ $status -eq 0 ]; then
-+	    cat $tmp.filtered | \
-+	    sed \
-+		-e '/"machineid": .*/d' \
-+		-e 's,"series": .*,"series": "SERIES",g' \
-+		-e 's,"context": .*,"context": "CONTEXT",g' \
-+		-e 's,"hostname": .*,"hostname": "HOSTNAME",g' \
-+		-e 's,"domainname": .*,"domainname": "DOMAINNAME",g' \
-+	    #end
-+	else
-+	    echo "Invalid JSON: $status"
-+	    cat $tmp.unfiltered
-+	    rm -f $tmp.context
-+	fi
-+    else
-+	echo "Botch: no output from curl"
-+    fi
-+}
-+
-+_filter_port()
-+{
-+    sed \
-+        -e '/ ipv6 /d' \
-+	-e "s/ $port / PORT /g" \
-+    #end
-+}
-+
-+# real QA test starts here
-+_save_config $PCP_SYSCONF_DIR/labels
-+need_restore=true
-+
-+$sudo rm -rf $PCP_SYSCONF_DIR/labels/*
-+_sighup_pmcd
-+
-+openssl req \
-+	-new -newkey rsa:4096 -days 365 -nodes -x509 \
-+	-subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.pcpqa.com" \
-+	-keyout $tmp.key -out $tmp.cert >$seq.full 2>&1
-+# creates a self-signed (insecure) certificate, so for testing only
-+
-+echo "[pmproxy]" >> $tmp.conf
-+echo "pcp.enabled = true" >> $tmp.conf
-+echo "http.enabled = true" >> $tmp.conf
-+echo "redis.enabled = false" >> $tmp.conf
-+echo "secure.enabled = false" >> $tmp.conf
-+
-+port=`_find_free_port`
-+mkdir -p $tmp.pmproxy/pmproxy
-+export PCP_RUN_DIR=$tmp.pmproxy
-+export PCP_TMP_DIR=$tmp.pmproxy
-+
-+$_valgrind_clean_assert pmproxy -f -l- --timeseries \
-+	-c $tmp.conf -p $port -U $username \
-+	>$tmp.valout 2>$tmp.valerr &
-+pid=$!
-+
-+echo "valgrind pid: $pid" >>$seq.full
-+echo "pmproxy port: $port" >>$seq.full
-+
-+# valgrind takes awhile to fire up
-+i=0
-+while [ $i -lt 40 ]
-+do
-+    $PCP_BINADM_DIR/telnet-probe -c localhost $port && break
-+    sleep 1
-+    i=`expr $i + 1`
-+done
-+if $PCP_BINADM_DIR/telnet-probe -c localhost $port
-+then
-+    echo "Startup took $i secs" >>$seq.full
-+else
-+    echo "Arrgh: valgrind failed start pmproxy and get port $port ready after 30 secs"
-+    exit
-+fi
-+
-+date >>$seq.full
-+echo "=== checking serial http operation ===" | tee -a $seq.full
-+for i in 1 2 3 4; do
-+    curl -Gs "http://localhost:$port/pmapi/metric?name=sample.long.ten" 2>$tmp.err$i >$tmp.out$i
-+done
-+for i in 1 2 3 4; do
-+echo === out$i === | tee -a $seq.full
-+_filter_json < $tmp.out$i
-+done
-+
-+date >>$seq.full
-+echo "=== checking parallel http operation ===" | tee -a $seq.full
-+for i in 1 2 3 4; do
-+    curl -Gs "http://localhost:$port/pmapi/metric?name=sample.long.ten" 2>$tmp.err$i >$tmp.out$i & 2>/dev/null eval pid$i=$!
-+done
-+wait $pid1 $pid2 $pid3 $pid4
-+for i in 1 2 3 4; do
-+echo === out$i === | tee -a $seq.full
-+_filter_json < $tmp.out$i
-+done
-+
-+date >>$seq.full
-+echo "=== checking serial https/TLS operation ===" | tee -a $seq.full
-+for i in 1 2 3 4; do
-+    curl -k -Gs "https://localhost:$port/pmapi/metric?name=sample.long.ten" 2>$tmp.err$i >$tmp.out$i
-+done
-+for i in 1 2 3 4; do
-+echo === out$i === | tee -a $seq.full
-+_check_empty < $tmp.out$i
-+done
-+
-+date >>$seq.full
-+echo "=== checking parallel https/TLS operation ===" | tee -a $seq.full
-+for i in 1 2 3 4; do
-+    curl -k -Gs "https://localhost:$port/pmapi/metric?name=sample.long.ten" 2>$tmp.err$i >$tmp.out$i & 2>/dev/null eval pid$i=$!
-+done
-+wait $pid1 $pid2 $pid3 $pid4
-+for i in 1 2 3 4; do
-+echo === out$i === | tee -a $seq.full
-+_check_empty < $tmp.out$i
-+done
-+
-+echo "=== check pmproxy is running ==="
-+pminfo -v -h localhost@localhost:$port hinv.ncpu
-+if [ $? -eq 0 ]; then
-+    echo "pmproxy check passed"
-+else
-+    echo "pmproxy check failed"
-+fi
-+
-+# valgrind takes awhile to shutdown too
-+pmsignal $pid >/dev/null 2>&1
-+pmsleep 3.5
-+echo "=== valgrind stdout ===" | tee -a $seq.full
-+cat $tmp.valout | _filter_valgrind
-+
-+echo "=== valgrind stderr ===" | tee -a $seq.full
-+cat $tmp.valerr | _filter_pmproxy_log | _filter_port
-+
-+# final kill if it's spinning
-+$sudo kill -9 $pid >/dev/null 2>&1
-+
-+# success, all done
-+status=0
-+exit
-diff -Naurp pcp-5.3.5.orig/qa/1458.out pcp-5.3.5/qa/1458.out
---- pcp-5.3.5.orig/qa/1458.out	1970-01-01 10:00:00.000000000 +1000
-+++ pcp-5.3.5/qa/1458.out	2021-12-09 11:25:01.973327231 +1100
-@@ -0,0 +1,221 @@
-+QA output created by 1458
-+=== checking serial http operation ===
-+=== out1 ===
-+{
-+    "context": "CONTEXT"
-+    "metrics": [
-+        {
-+            "name": "sample.long.ten",
-+            "series": "SERIES"
-+            "pmid": "29.0.11",
-+            "type": "32",
-+            "sem": "instant",
-+            "units": "none",
-+            "labels": {
-+                "agent": "sample",
-+                "cluster": "zero",
-+                "domainname": "DOMAINNAME"
-+                "hostname": "HOSTNAME"
-+                "role": "testing"
-+            },
-+            "text-oneline": "10 as a 32-bit integer",
-+            "text-help": "10 as a 32-bit integer"
-+        }
-+    ]
-+}
-+=== out2 ===
-+{
-+    "context": "CONTEXT"
-+    "metrics": [
-+        {
-+            "name": "sample.long.ten",
-+            "series": "SERIES"
-+            "pmid": "29.0.11",
-+            "type": "32",
-+            "sem": "instant",
-+            "units": "none",
-+            "labels": {
-+                "agent": "sample",
-+                "cluster": "zero",
-+                "domainname": "DOMAINNAME"
-+                "hostname": "HOSTNAME"
-+                "role": "testing"
-+            },
-+            "text-oneline": "10 as a 32-bit integer",
-+            "text-help": "10 as a 32-bit integer"
-+        }
-+    ]
-+}
-+=== out3 ===
-+{
-+    "context": "CONTEXT"
-+    "metrics": [
-+        {
-+            "name": "sample.long.ten",
-+            "series": "SERIES"
-+            "pmid": "29.0.11",
-+            "type": "32",
-+            "sem": "instant",
-+            "units": "none",
-+            "labels": {
-+                "agent": "sample",
-+                "cluster": "zero",
-+                "domainname": "DOMAINNAME"
-+                "hostname": "HOSTNAME"
-+                "role": "testing"
-+            },
-+            "text-oneline": "10 as a 32-bit integer",
-+            "text-help": "10 as a 32-bit integer"
-+        }
-+    ]
-+}
-+=== out4 ===
-+{
-+    "context": "CONTEXT"
-+    "metrics": [
-+        {
-+            "name": "sample.long.ten",
-+            "series": "SERIES"
-+            "pmid": "29.0.11",
-+            "type": "32",
-+            "sem": "instant",
-+            "units": "none",
-+            "labels": {
-+                "agent": "sample",
-+                "cluster": "zero",
-+                "domainname": "DOMAINNAME"
-+                "hostname": "HOSTNAME"
-+                "role": "testing"
-+            },
-+            "text-oneline": "10 as a 32-bit integer",
-+            "text-help": "10 as a 32-bit integer"
-+        }
-+    ]
-+}
-+=== checking parallel http operation ===
-+=== out1 ===
-+{
-+    "context": "CONTEXT"
-+    "metrics": [
-+        {
-+            "name": "sample.long.ten",
-+            "series": "SERIES"
-+            "pmid": "29.0.11",
-+            "type": "32",
-+            "sem": "instant",
-+            "units": "none",
-+            "labels": {
-+                "agent": "sample",
-+                "cluster": "zero",
-+                "domainname": "DOMAINNAME"
-+                "hostname": "HOSTNAME"
-+                "role": "testing"
-+            },
-+            "text-oneline": "10 as a 32-bit integer",
-+            "text-help": "10 as a 32-bit integer"
-+        }
-+    ]
-+}
-+=== out2 ===
-+{
-+    "context": "CONTEXT"
-+    "metrics": [
-+        {
-+            "name": "sample.long.ten",
-+            "series": "SERIES"
-+            "pmid": "29.0.11",
-+            "type": "32",
-+            "sem": "instant",
-+            "units": "none",
-+            "labels": {
-+                "agent": "sample",
-+                "cluster": "zero",
-+                "domainname": "DOMAINNAME"
-+                "hostname": "HOSTNAME"
-+                "role": "testing"
-+            },
-+            "text-oneline": "10 as a 32-bit integer",
-+            "text-help": "10 as a 32-bit integer"
-+        }
-+    ]
-+}
-+=== out3 ===
-+{
-+    "context": "CONTEXT"
-+    "metrics": [
-+        {
-+            "name": "sample.long.ten",
-+            "series": "SERIES"
-+            "pmid": "29.0.11",
-+            "type": "32",
-+            "sem": "instant",
-+            "units": "none",
-+            "labels": {
-+                "agent": "sample",
-+                "cluster": "zero",
-+                "domainname": "DOMAINNAME"
-+                "hostname": "HOSTNAME"
-+                "role": "testing"
-+            },
-+            "text-oneline": "10 as a 32-bit integer",
-+            "text-help": "10 as a 32-bit integer"
-+        }
-+    ]
-+}
-+=== out4 ===
-+{
-+    "context": "CONTEXT"
-+    "metrics": [
-+        {
-+            "name": "sample.long.ten",
-+            "series": "SERIES"
-+            "pmid": "29.0.11",
-+            "type": "32",
-+            "sem": "instant",
-+            "units": "none",
-+            "labels": {
-+                "agent": "sample",
-+                "cluster": "zero",
-+                "domainname": "DOMAINNAME"
-+                "hostname": "HOSTNAME"
-+                "role": "testing"
-+            },
-+            "text-oneline": "10 as a 32-bit integer",
-+            "text-help": "10 as a 32-bit integer"
-+        }
-+    ]
-+}
-+=== checking serial https/TLS operation ===
-+=== out1 ===
-+Good!, empty output from curl
-+=== out2 ===
-+Good!, empty output from curl
-+=== out3 ===
-+Good!, empty output from curl
-+=== out4 ===
-+Good!, empty output from curl
-+=== checking parallel https/TLS operation ===
-+=== out1 ===
-+Good!, empty output from curl
-+=== out2 ===
-+Good!, empty output from curl
-+=== out3 ===
-+Good!, empty output from curl
-+=== out4 ===
-+Good!, empty output from curl
-+=== check pmproxy is running ===
-+pmproxy check passed
-+=== valgrind stdout ===
-+=== valgrind stderr ===
-+Log for pmproxy on HOST started DATE
-+
-+pmproxy: PID = PID
-+pmproxy request port(s):
-+  sts fd   port  family address
-+  === ==== ===== ====== =======
-+ok FD unix UNIX_DOMAIN_SOCKET
-+ok FD PORT inet INADDR_ANY
-+[DATE] pmproxy(PID) Info: pmproxy caught SIGTERM
-+[DATE] pmproxy(PID) Info: pmproxy Shutdown
-+
-+Log finished DATE
-diff -Naurp pcp-5.3.5.orig/src/pmproxy/src/pcp.c pcp-5.3.5/src/pmproxy/src/pcp.c
---- pcp-5.3.5.orig/src/pmproxy/src/pcp.c	2021-09-24 09:33:06.000000000 +1000
-+++ pcp-5.3.5/src/pmproxy/src/pcp.c	2021-12-09 11:22:09.829321418 +1100
-@@ -1,6 +1,6 @@
- /*
-- * Copyright (c) 2018-2019 Red Hat.
-- * 
-+ * Copyright (c) 2018-2019,2021 Red Hat.
-+ *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-  * by the Free Software Foundation; either version 2.1 of the License, or
-@@ -19,22 +19,13 @@
- #define PDU_MAXLENGTH	(MAXHOSTNAMELEN + HEADER_LENGTH + sizeof("65536")-1)
- 
- static void
--client_free(struct client *client)
--{
--    if (client->u.pcp.hostname)
--	sdsfree(client->u.pcp.hostname);
--    if (client->buffer)
--	sdsfree(client->buffer);
--}
--
--static void
- on_server_close(uv_handle_t *handle)
- {
-     struct client	*client = (struct client *)handle;
- 
-     if (pmDebugOptions.pdu)
- 	fprintf(stderr, "client %p pmcd connection closed\n", client);
--    client_free(client);
-+    client_put(client);
- }
- 
- static void
-@@ -92,12 +83,11 @@ on_server_read(uv_stream_t *stream, ssiz
- void
- on_pcp_client_close(struct client *client)
- {
--    if (client->u.pcp.connected) {
-+    if (client->u.pcp.connected)
- 	uv_close((uv_handle_t *)&client->u.pcp.socket, on_server_close);
--	memset(&client->u.pcp, 0, sizeof(client->u.pcp));
--    } else {
--	client_free(client);
--    }
-+    if (client->u.pcp.hostname)
-+	sdsfree(client->u.pcp.hostname);
-+    memset(&client->u.pcp, 0, sizeof(client->u.pcp));
- }
- 
- static void
-@@ -118,6 +108,8 @@ on_pcp_client_connect(uv_connect_t *conn
- 
-     /* socket connection to pmcd successfully established */
-     client->u.pcp.state = PCP_PROXY_SETUP;
-+    client->u.pcp.connected = 1;
-+    client_get(client);
- 
-     /* if we have already received PDUs, send them on now */
-     if ((buffer = client->buffer) != NULL) {
-diff -Naurp pcp-5.3.5.orig/src/pmproxy/src/secure.c pcp-5.3.5/src/pmproxy/src/secure.c
---- pcp-5.3.5.orig/src/pmproxy/src/secure.c	2021-11-01 13:02:26.000000000 +1100
-+++ pcp-5.3.5/src/pmproxy/src/secure.c	2021-12-09 11:22:09.831321384 +1100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2019 Red Hat.
-+ * Copyright (c) 2019,2021 Red Hat.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -16,7 +16,7 @@
- #include <openssl/opensslv.h>
- #include <openssl/ssl.h>
- 
--/* called with proxy->mutex locked */
-+/* called with proxy->write_mutex locked */
- static void
- remove_connection_from_queue(struct client *client)
- {
-@@ -44,9 +44,9 @@ on_secure_client_close(struct client *cl
-     if (pmDebugOptions.auth || pmDebugOptions.http)
- 	fprintf(stderr, "%s: client %p\n", "on_secure_client_close", client);
- 
--    uv_mutex_lock(&client->proxy->mutex);
-+    uv_mutex_lock(&client->proxy->write_mutex);
-     remove_connection_from_queue(client);
--    uv_mutex_unlock(&client->proxy->mutex);
-+    uv_mutex_unlock(&client->proxy->write_mutex);
-     /* client->read and client->write freed by SSL_free */
-     SSL_free(client->secure.ssl);
- }
-@@ -63,7 +63,7 @@ maybe_flush_ssl(struct proxy *proxy, str
- 	client->secure.pending.writes_count > 0)
- 	return;
- 
--    uv_mutex_lock(&proxy->mutex);
-+    uv_mutex_lock(&proxy->write_mutex);
-     if (proxy->pending_writes == NULL) {
-     	proxy->pending_writes = client;
- 	client->secure.pending.prev = client->secure.pending.next = NULL;
-@@ -75,7 +75,7 @@ maybe_flush_ssl(struct proxy *proxy, str
- 	client->secure.pending.prev = c;
-     }
-     client->secure.pending.queued = 1;
--    uv_mutex_unlock(&proxy->mutex);
-+    uv_mutex_unlock(&proxy->write_mutex);
- }
- 
- static void
-@@ -161,7 +161,7 @@ flush_secure_module(struct proxy *proxy)
-     size_t		i, used;
-     int			sts;
- 
--    uv_mutex_lock(&proxy->mutex);
-+    uv_mutex_lock(&proxy->write_mutex);
-     head = &proxy->pending_writes;
-     while ((client = *head) != NULL) {
- 	flush_ssl_buffer(client);
-@@ -212,7 +212,7 @@ flush_secure_module(struct proxy *proxy)
- 		    sizeof(uv_buf_t) * client->secure.pending.writes_count);
- 	}
-     }
--    uv_mutex_unlock(&proxy->mutex);
-+    uv_mutex_unlock(&proxy->write_mutex);
- }
- 
- void
-@@ -221,7 +221,8 @@ secure_client_write(struct client *clien
-     struct proxy	*proxy = client->proxy;
-     uv_buf_t		*dup;
-     size_t		count, bytes;
--    int			i, sts, defer = 0, maybe = 0;
-+    unsigned int	i;
-+    int			sts, defer = 0, maybe = 0;
- 
-     for (i = 0; i < request->nbuffers; i++) {
- 	if (defer == 0) {
-diff -Naurp pcp-5.3.5.orig/src/pmproxy/src/server.c pcp-5.3.5/src/pmproxy/src/server.c
---- pcp-5.3.5.orig/src/pmproxy/src/server.c	2021-11-01 13:02:26.000000000 +1100
-+++ pcp-5.3.5/src/pmproxy/src/server.c	2021-12-09 11:22:09.831321384 +1100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2018-2019 Red Hat.
-+ * Copyright (c) 2018-2019,2021 Red Hat.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -125,7 +125,7 @@ server_init(int portcount, const char *l
- 			pmGetProgname());
- 	return NULL;
-     }
--    uv_mutex_init(&proxy->mutex);
-+    uv_mutex_init(&proxy->write_mutex);
- 
-     count = portcount + (*localpath ? 1 : 0);
-     if (count) {
-@@ -229,7 +229,6 @@ void
- client_put(struct client *client)
- {
-     unsigned int	refcount;
--    struct proxy	*proxy = client->proxy;
- 
-     uv_mutex_lock(&client->mutex);
-     assert(client->refcount);
-@@ -237,22 +236,16 @@ client_put(struct client *client)
-     uv_mutex_unlock(&client->mutex);
- 
-     if (refcount == 0) {
--	/* remove client from the doubly-linked list */
--	uv_mutex_lock(&proxy->mutex);
--	if (client->next != NULL)
--	    client->next->prev = client->prev;
--	*client->prev = client->next;
--	uv_mutex_unlock(&proxy->mutex);
--
- 	if (client->protocol & STREAM_PCP)
- 	    on_pcp_client_close(client);
- 	if (client->protocol & STREAM_HTTP)
- 	    on_http_client_close(client);
- 	if (client->protocol & STREAM_REDIS)
- 	    on_redis_client_close(client);
--	if (client->protocol & STREAM_SECURE)
-+	if ((client->protocol & STREAM_SECURE) && client->stream.secure)
- 	    on_secure_client_close(client);
--
-+	if (client->buffer)
-+	    sdsfree(client->buffer);
- 	memset(client, 0, sizeof(*client));
- 	free(client);
-     }
-@@ -284,7 +277,7 @@ on_client_write(uv_write_t *writer, int
- 			"on_client_write", status, client);
- 
-     if (status == 0) {
--	if (client->protocol & STREAM_SECURE)
-+	if ((client->protocol & STREAM_SECURE) && client->stream.secure)
- 	    on_secure_client_write(client);
- 	if (client->protocol & STREAM_PCP)
- 	    on_pcp_client_write(client);
-@@ -434,10 +427,16 @@ on_client_read(uv_stream_t *stream, ssiz
-     if (nread > 0) {
- 	if (client->protocol == STREAM_UNKNOWN)
- 	    client->protocol |= client_protocol(*buf->base);
--	if (client->protocol & STREAM_SECURE)
-+
-+#ifdef HAVE_OPENSSL
-+	if ((client->protocol & STREAM_SECURE) && (proxy->ssl != NULL))
- 	    on_secure_client_read(proxy, client, nread, buf);
- 	else
- 	    on_protocol_read(stream, nread, buf);
-+#else
-+	on_protocol_read(stream, nread, buf);
-+#endif
-+
-     } else if (nread < 0) {
- 	if (pmDebugOptions.af)
- 	    fprintf(stderr, "%s: read error %ld "
-@@ -494,14 +493,6 @@ on_client_connection(uv_stream_t *stream
-     handle->data = (void *)proxy;
-     client->proxy = proxy;
- 
--    /* insert client into doubly-linked list at the head */
--    uv_mutex_lock(&proxy->mutex);
--    if ((client->next = proxy->first) != NULL)
--	proxy->first->prev = &client->next;
--    proxy->first = client;
--    client->prev = &proxy->first;
--    uv_mutex_unlock(&proxy->mutex);
--
-     status = uv_read_start((uv_stream_t *)&client->stream.u.tcp,
- 			    on_buffer_alloc, on_client_read);
-     if (status != 0) {
-@@ -719,7 +710,7 @@ shutdown_ports(void *arg)
-     struct proxy	*proxy = (struct proxy *)arg;
-     struct server	*server;
-     struct stream	*stream;
--    int			i;
-+    unsigned int	i;
- 
-     for (i = 0; i < proxy->nservers; i++) {
- 	server = &proxy->servers[i];
-@@ -756,7 +747,8 @@ dump_request_ports(FILE *output, void *a
-     struct proxy	*proxy = (struct proxy *)arg;
-     struct stream	*stream;
-     uv_os_fd_t		uv_fd;
--    int			i, fd;
-+    unsigned int	i;
-+    int			fd;
- 
-     fprintf(output, "%s request port(s):\n"
- 		"  sts fd   port  family address\n"
-diff -Naurp pcp-5.3.5.orig/src/pmproxy/src/server.h pcp-5.3.5/src/pmproxy/src/server.h
---- pcp-5.3.5.orig/src/pmproxy/src/server.h	2021-09-24 09:33:06.000000000 +1000
-+++ pcp-5.3.5/src/pmproxy/src/server.h	2021-12-09 11:22:09.830321401 +1100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2018-2019 Red Hat.
-+ * Copyright (c) 2018-2019,2021 Red Hat.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -97,11 +97,11 @@ typedef struct http_client {
- 
- typedef struct pcp_client {
-     pcp_proxy_state_t	state;
--    sds			hostname;
-     unsigned int	port : 16;
-     unsigned int	certreq : 1;
-     unsigned int	connected : 1;
-     unsigned int	pad : 14;
-+    sds			hostname;
-     uv_connect_t	pmcd;
-     uv_tcp_t		socket;
- } pcp_client_t;
-@@ -136,8 +136,6 @@ typedef struct client {
- 	pcp_client_t	pcp;
-     } u;
-     struct proxy	*proxy;
--    struct client	*next;
--    struct client	**prev;
-     sds			buffer;
- } client_t;
- 
-@@ -161,7 +159,7 @@ typedef struct proxy {
-     struct dict		*config;	/* configuration dictionary */
-     uv_loop_t		*events;	/* global, async event loop */
-     uv_callback_t	write_callbacks;
--    uv_mutex_t		mutex;		/* protects client lists and pending writes */
-+    uv_mutex_t		write_mutex;	/* protects pending writes */
- } proxy_t;
- 
- extern void proxylog(pmLogLevel, sds, void *);

SOURCES/redhat-bugzilla-2059461-pmie-systemd-fixup.patch

@@ -0,0 +1,11 @@
+diff -Naurp pcp-5.3.7.orig/src/pmie/GNUmakefile pcp-5.3.7/src/pmie/GNUmakefile
+--- pcp-5.3.7.orig/src/pmie/GNUmakefile	2022-02-02 11:53:05.000000000 +1100
++++ pcp-5.3.7/src/pmie/GNUmakefile	2022-05-03 11:45:12.108743480 +1000
+@@ -80,6 +80,7 @@ pmie.service : pmie.service.in
+ 	$(SED) <$< >$@ \
+ 	    -e 's;@PCP_RC_DIR@;'$(PCP_RC_DIR)';' \
+ 	    -e 's;@PCP_RUN_DIR@;'$(PCP_RUN_DIR)';' \
++	    -e 's;@PCP_SYSCONFIG_DIR@;'$(PCP_SYSCONFIG_DIR)';' \
+ 	# END
+ 
+ pmie_farm.service : pmie_farm.service.in

SOURCES/redhat-bugzilla-2059463-pmdapostfix-harden.patch

@@ -0,0 +1,146 @@
+commit f54eddf494e474531e5af609bcc376037a918977
+Author: Nathan Scott <nathans@redhat.com>
+Date:   Tue Apr 26 14:32:59 2022 +1000
+
+    pmdapostfix: harden against a not-yet-running postfix
+    
+    Ensure the postfix PMDA can start and service requests even
+    if postfix is not yet started.
+
+diff --git a/src/perl/PMDA/local.c b/src/perl/PMDA/local.c
+index e223bde7a..33130bc5d 100644
+--- a/src/perl/PMDA/local.c
++++ b/src/perl/PMDA/local.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012-2017 Red Hat.
++ * Copyright (c) 2012-2017,2022 Red Hat.
+  * Copyright (c) 2008-2011 Aconex.  All Rights Reserved.
+  * 
+  * This program is free software; you can redistribute it and/or modify it
+@@ -139,18 +139,15 @@ int
+ local_tail(char *file, scalar_t *callback, int cookie)
+ {
+     int fd = open(file, O_RDONLY | O_NDELAY);
+-    struct stat stats;
++    struct stat stats = {0};
+     int me;
+ 
+-    if (fd < 0) {
+-	pmNotifyErr(LOG_ERR, "open failed (%s): %s", file, osstrerror());
+-	exit(1);
+-    }
+-    if (fstat(fd, &stats) < 0) {
+-	pmNotifyErr(LOG_ERR, "fstat failed (%s): %s", file, osstrerror());
+-	exit(1);
+-    }
+-    lseek(fd, 0L, SEEK_END);
++    if (fd < 0)
++	pmNotifyErr(LOG_INFO, "open failed (%s): %s", file, osstrerror());
++    else if (fstat(fd, &stats) < 0)
++	pmNotifyErr(LOG_INFO, "fstat failed (%s): %s", file, osstrerror());
++    else 
++	lseek(fd, 0L, SEEK_END);
+     me = local_file(FILE_TAIL, fd, callback, cookie);
+     files[me].me.tail.path = strdup(file);
+     files[me].me.tail.dev = stats.st_dev;
+@@ -416,10 +413,11 @@ local_pmdaMain(pmdaInterface *self)
+ 	}
+ 
+ 	for (i = 0; i < nfiles; i++) {
+-	    fd = files[i].fd;
+ 	    /* check for log rotation or host reconnection needed */
+ 	    if ((count % 10) == 0)	/* but only once every 10 */
+ 		local_connection(&files[i]);
++	    if ((fd = files[i].fd) < 0)
++		continue;
+ 	    if (files[i].type != FILE_TAIL && !(__pmFD_ISSET(fd, &readyfds)))
+ 		continue;
+ 	    offset = 0;
+@@ -431,21 +429,16 @@ multiread:
+ 		     (oserror() == EAGAIN) ||
+ 		     (oserror() == EWOULDBLOCK)))
+ 		    continue;
+-		if (files[i].type == FILE_SOCK) {
+-		    close(files[i].fd);
+-		    files[i].fd = -1;
+-		    continue;
+-		}
+-		pmNotifyErr(LOG_ERR, "Data read error on %s: %s\n",
+-				local_filetype(files[i].type), osstrerror());
+-		exit(1);
++		close(files[i].fd);
++		files[i].fd = -1;
++		continue;
+ 	    }
+ 	    if (bytes == 0) {
+ 		if (files[i].type == FILE_TAIL)
+ 		    continue;
+-		pmNotifyErr(LOG_ERR, "No data to read - %s may be closed\n",
+-				local_filetype(files[i].type));
+-		exit(1);
++		close(files[i].fd);
++		files[i].fd = -1;
++		continue;
+ 	    }
+ 	    /*
+ 	     * good read ... data up to buffer + offset + bytes is all OK
+diff --git a/src/pmdas/postfix/pmdapostfix.pl b/src/pmdas/postfix/pmdapostfix.pl
+index ac46816bc..d6d3f4d3a 100644
+--- a/src/pmdas/postfix/pmdapostfix.pl
++++ b/src/pmdas/postfix/pmdapostfix.pl
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2012-2015 Red Hat.
++# Copyright (c) 2012-2015,2022 Red Hat.
+ # Copyright (c) 2009-2010 Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
+ #
+ # This program is free software; you can redistribute it and/or modify it
+@@ -56,8 +56,6 @@ my @postfix_received_dom = (
+ 		1 => 'smtp',
+ 	     );
+ 
+-my $setup = defined($ENV{'PCP_PERL_PMNS'}) || defined($ENV{'PCP_PERL_DOMAIN'});
+-
+ sub postfix_do_refresh
+ {
+     QUEUE:
+@@ -212,7 +210,7 @@ $logstats{"received"}{1} = 0;
+ 
+ # Note:
+ # Environment variables.
+-# $PMDA_POSTFIX_QSHAPE: alternative executable qshape scrpipt (for QA)
++# $PMDA_POSTFIX_QSHAPE: alternative executable qshape script (for QA)
+ #                       ... over-rides default and command line argument.
+ #			... over-rides default arguments -b 10 -t $refresh
+ # $PMDA_POSTFIX_REFRESH: alternative refresh rate (for QA)
+@@ -228,7 +226,7 @@ if (defined($ENV{'PMDA_POSTFIX_QSHAPE'})) {
+     $qshape = $ENV{'PMDA_POSTFIX_QSHAPE'};
+     $qshape_args = '';
+ }
+-if (!$setup) { $pmda->log("qshape cmd: $qshape $qshape_args <qname>"); }
++unless (pmda_install()) { $pmda->log("qshape cmd: $qshape $qshape_args <qname>"); }
+ 
+ if (defined($ENV{'PMDA_POSTFIX_REFRESH'})) { $refresh = $ENV{'PMDA_POSTFIX_REFRESH'}; }
+ 
+@@ -238,12 +236,15 @@ foreach my $file ( @logfiles ) {
+     }
+ }
+ if (defined($ENV{'PMDA_POSTFIX_LOG'})) { $logfile = $ENV{'PMDA_POSTFIX_LOG'}; } 
+-unless(defined($logfile))
+-{
+-    $pmda->log("Fatal: No Postfix log file found in: @logfiles");
+-    die 'No Postfix log file found';
++unless (pmda_install()) {
++    if (defined($logfile)) {
++	$pmda->log("logfile: $logfile");
++    } else {
++	$pmda->log("Warning: assuming logfile: $logfiles[0] as no Postfix log found yet from: @logfiles");
++    }
+ }
+-if (!$setup) { $pmda->log("logfile: $logfile"); }
++# set a good default if none found, before continuing
++unless (defined($logfile)) { $logfile = $logfiles[0]; }
+ 
+ $pmda->add_indom($postfix_queues_indom, \@postfix_queues_dom, '', '');
+ $pmda->add_indom($postfix_sent_indom, \@postfix_sent_dom, '', '');

SOURCES/redhat-bugzilla-2081262-pmdaproc-cgroups-fix.patch

@@ -0,0 +1,44 @@
+commit d874d2e486c8a64fa9945ed7aa0048cccbd46f77
+Author: Nathan Scott <nathans@redhat.com>
+Date:   Wed May 4 17:11:19 2022 +1000
+
+    pmdaproc: fix cgroup cpu metrics refresh structures
+    
+    Jan Kurik encountered this issue when running the regression
+    testsuite (especially qa/359) on non-x86_64 architectures.
+    
+    Something must've changed in the toolchain recently on these
+    platforms since we've not seen this before, but this bug has
+    been in our code for some time.  It works everywhere else by
+    good fortune, when there just happen to be NULLs after these
+    cgroups CPU parsing data structures.
+    
+    Resolves Red Hat BZ #2081262.
+
+diff --git a/src/pmdas/linux_proc/cgroups.c b/src/pmdas/linux_proc/cgroups.c
+index 413a72343..26d59863a 100644
+--- a/src/pmdas/linux_proc/cgroups.c
++++ b/src/pmdas/linux_proc/cgroups.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012-2019 Red Hat.
++ * Copyright (c) 2012-2019,2022 Red Hat.
+  * Copyright (c) 2010 Aconex.  All Rights Reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+@@ -863,6 +863,7 @@ read_cpu_time(const char *file, cgroup_cputime_t *ccp)
+ 	{ "usage_usec",			&cputime.usage },
+ 	{ "user_usec",			&cputime.user },
+ 	{ "system_usec",		&cputime.system },
++	{ NULL, NULL }
+     };
+     char buffer[4096], name[64];
+     unsigned long long value;
+@@ -903,6 +904,7 @@ read_cpu_stats(const char *file, cgroup_cpustat_t *ccp)
+ 	{ "nr_periods",			&cpustat.nr_periods },
+ 	{ "nr_throttled",		&cpustat.nr_throttled },
+ 	{ "throttled_time",		&cpustat.throttled_time },
++	{ NULL, NULL }
+     };
+     char buffer[4096], name[64];
+     unsigned long long value;

SOURCES/redhat-bugzilla-2083897-dstat-missed-ticks.patch

@@ -0,0 +1,74 @@
+diff -Naurp pcp-5.3.7.orig/src/pcp/dstat/pcp-dstat.1 pcp-5.3.7/src/pcp/dstat/pcp-dstat.1
+--- pcp-5.3.7.orig/src/pcp/dstat/pcp-dstat.1	2021-05-26 17:43:26.000000000 +1000
++++ pcp-5.3.7/src/pcp/dstat/pcp-dstat.1	2022-10-20 08:57:02.176922290 +1100
+@@ -1,6 +1,6 @@
+ '\"macro stdmacro
+ .\"
+-.\" Copyright (c) 2018-2020 Red Hat.
++.\" Copyright (c) 2018-2022 Red Hat.
+ .\"
+ .\" This program is free software; you can redistribute it and/or modify it
+ .\" under the terms of the GNU General Public License as published by the
+@@ -34,6 +34,7 @@
+ [\f3\-\-integer\f1]
+ [\f3\-\-nocolor\f1]
+ [\f3\-\-noheaders\f1]
++[\f3\-\-nomissed\f1]
+ [\f3\-\-noupdate\f1]
+ [\f3\-\-list\f1]
+ [\f3\-\-pidfile\f1 \f2pid-file\f1]
+@@ -404,6 +405,9 @@ disable colors
+ \fB\-\-noheaders\fR
+ disable repetitive headers
+ .TP
++\fB\-\-nomissed\fR
++disable missed ticks warnings for intermediate samples.
++.TP
+ \fB\-\-noupdate\fR
+ disable intermediate updates when \fIdelay\fR greater than 1.
+ .TP
+diff -Naurp pcp-5.3.7.orig/src/pcp/dstat/pcp-dstat.py pcp-5.3.7/src/pcp/dstat/pcp-dstat.py
+--- pcp-5.3.7.orig/src/pcp/dstat/pcp-dstat.py	2022-04-05 09:05:43.000000000 +1000
++++ pcp-5.3.7/src/pcp/dstat/pcp-dstat.py	2022-10-20 08:57:02.176922290 +1100
+@@ -455,6 +455,7 @@ class DstatTool(object):
+ 
+         # Internal
+         self.missed = 0
++        self.nomissed = False # report missed ticks by default
+         self.runtime = -1
+         self.plugins = []     # list of requested plugin names
+         self.allplugins = []  # list of all known plugin names
+@@ -783,7 +784,8 @@ class DstatTool(object):
+         opts.pmSetLongOption('color', 0, '', '', 'force colors')
+         opts.pmSetLongOption('nocolor', 0, '', '', 'disable colors')
+         opts.pmSetLongOption('noheaders', 0, '', '', 'disable repetitive headers')
+-        opts.pmSetLongOption('noupdate', 0, '', '', 'disable intermediate headers')
++        opts.pmSetLongOption('noupdate', 0, '', '', 'disable intermediate updates')
++        opts.pmSetLongOption('nomissed', 0, '', '', 'disable missed ticks warnings')
+         opts.pmSetLongOption('output', 1, 'o', 'file', 'write CSV output to file')
+         opts.pmSetLongOption('version', 0, 'V', '', '')
+         opts.pmSetLongOption('debug', 1, None, '', '')
+@@ -920,6 +922,8 @@ class DstatTool(object):
+             self.header = False
+         elif opt in ['noupdate']:
+             self.update = False
++        elif opt in ['nomissed']:
++            self.nomissed = True
+         elif opt in ['o', 'output']:
+             self.output = arg
+         elif opt in ['pidfile']:
+@@ -1773,12 +1777,12 @@ class DstatTool(object):
+             outputfile = open(self.output, omode)
+             outputfile.write(oline)
+ 
+-        if self.missed > 0:
++        if self.missed > 0 and self.nomissed is False:
+             line = 'missed ' + str(self.missed + 1) + ' ticks'
+             sys.stdout.write(' ' + THEME['error'] + line + THEME['input'])
+             if self.output and step == self.delay:
+                 outputfile.write(',"' + line + '"')
+-            self.missed = 0
++        self.missed = 0
+         # Finish the line
+         if not op.update and self.novalues is False:
+             sys.stdout.write('\n')

SOURCES/redhat-bugzilla-2093751-sudoers-docs.patch

@@ -0,0 +1,135 @@
+commit 55e8c83ee5920ab30644f54f7a525255b1de4b84
+Author: Nathan Scott <nathans@redhat.com>
+Date:   Mon Aug 29 14:25:03 2022 +1000
+
+    docs: describe working sudoers configuration with requiretty
+    
+    When /etc/sudoers is configured with 'Defaults requiretty',
+    pmlogctl cannot invoke pmlogger_check in the normal fashion.
+    Symptoms of the problem are the following system log message:
+    
+    pmlogctl[PID]: sudo: sorry, you must have a tty to run sudo
+    
+    pmiectl and pmie_check are similarly affected.  The simplest
+    solution is to add an additional configuration line excluding
+    these commands from requiring a tty; this is the approach now
+    documented.
+    
+    Note these PCP commands are not interactive (require no tty)
+    and the unprivileged 'pcp' account uses nologin(8) as a shell
+    anyway, so requiretty offers no advantages here.  Note also
+    there's debate about whether requiretty is a useful security
+    measure in general as it can be trivially bypassed; further
+    details: https://bugzilla.redhat.com/show_bug.cgi?id=1020147
+    
+    Resolves Red Hat BZ #2093751
+
+diff -Naurp pcp-5.3.7.orig/man/man1/pmie_check.1 pcp-5.3.7/man/man1/pmie_check.1
+--- pcp-5.3.7.orig/man/man1/pmie_check.1	2021-11-04 08:26:15.000000000 +1100
++++ pcp-5.3.7/man/man1/pmie_check.1	2022-08-31 11:17:52.362276530 +1000
+@@ -406,6 +406,42 @@ no
+ entries are needed as the timer mechanism provided by
+ .B systemd
+ is used instead.
++.PP
++The
++.BR pmiectl (1)
++utility may invoke
++.B pmie_check
++using the
++.BR sudo (1)
++command to run it under the $PCP_USER ``pcp'' account.
++If
++.B sudo
++is configured with the non-default
++.I requiretty
++option (see below),
++.B pmie_check
++may fail to run due to not having a tty configured.
++This issue can be resolved by adding a second line
++(expand $PCP_BINADM_DIR according to your platform)
++to the
++.I /etc/sudoers
++configuration file as follows:
++.P
++.ft CW
++.nf
++.in +0.5i
++Defaults requiretty
++Defaults!$PCP_BINADM_DIR/pmie_check !requiretty
++.in
++.fi
++.ft 1
++.P
++Note that the unprivileged PCP account under which these
++commands run uses
++.I /sbin/nologin
++as the shell, so the
++.I requiretty
++option is ineffective here and safe to disable in this way.
+ .SH FILES
+ .TP 5
+ .I $PCP_PMIECONTROL_PATH
+diff -Naurp pcp-5.3.7.orig/man/man1/pmlogger_check.1 pcp-5.3.7/man/man1/pmlogger_check.1
+--- pcp-5.3.7.orig/man/man1/pmlogger_check.1	2022-04-05 09:05:43.000000000 +1000
++++ pcp-5.3.7/man/man1/pmlogger_check.1	2022-08-31 11:20:52.470086724 +1000
+@@ -830,6 +830,42 @@ no
+ entries are needed as the timer mechanism provided by
+ .B systemd
+ is used instead.
++.PP
++The
++.BR pmlogctl (1)
++utility may invoke
++.B pmlogger_check
++using the
++.BR sudo (1)
++command to run it under the $PCP_USER ``pcp'' account.
++If
++.B sudo
++is configured with the non-default
++.I requiretty
++option (see below),
++.B pmlogger_check
++may fail to run due to not having a tty configured.
++This issue can be resolved by adding a second line
++(expand $PCP_BINADM_DIR according to your platform)
++to the
++.I /etc/sudoers
++configuration file as follows:
++.P
++.ft CW
++.nf
++.in +0.5i
++Defaults requiretty
++Defaults!$PCP_BINADM_DIR/pmlogger_check !requiretty
++.in
++.fi
++.ft 1
++.P
++Note that the unprivileged PCP account under which these
++commands run uses
++.I /sbin/nologin
++as the shell, so the
++.I requiretty 
++option is ineffective here and safe to disable in this way.
+ .SH FILES
+ .TP 5
+ .I $PCP_PMLOGGERCONTROL_PATH
+@@ -926,7 +962,7 @@ instances for
+ .I hostname
+ have been launched in the interim.
+ Because the cron-driven PCP archive management scripts run under
+-the uid of the user ``pcp'',
++the $PCP_USER account ``pcp'',
+ .BI $PCP_ARCHIVE_DIR/ hostname /SaveLogs
+ typically needs to be owned by the user ``pcp''.
+ .TP
+@@ -994,6 +1030,7 @@ platforms.
+ .BR pmlogmv (1),
+ .BR pmlogrewrite (1),
+ .BR pmsocks (1),
++.BR sudo (1),
+ .BR systemd (1),
+ .BR xz (1)
+ and

SOURCES/redhat-bugzilla-2101574-farm-config.patch

@@ -0,0 +1,103 @@
+From 73c024c64f7db68fdcd224c27c1711fa6dd1d254 Mon Sep 17 00:00:00 2001
+From: Nathan Scott <nathans@redhat.com>
+Date: Tue, 28 Jun 2022 10:06:06 +1000
+Subject: [PATCH] pmlogger_farm: add default configuration file for farm
+ loggers
+
+Provide a mechanism whereby the farm loggers can be configured.
+There has been reluctance in the past to sharing configuration
+of the local primary logger, so these are now done separately.
+Makes sense to me as the primary pmlogger may need to use more
+frequent sampling, may not want to allow remote pmlc, etc.
+
+Resolves Red Hat BZ #2101574
+---
+ src/pmlogger/GNUmakefile            |  1 +
+ src/pmlogger/pmlogger.defaults      |  2 ++
+ src/pmlogger/pmlogger_check.sh      |  5 +++--
+ src/pmlogger/pmlogger_farm.defaults | 27 +++++++++++++++++++++++++++
+ 4 files changed, 33 insertions(+), 2 deletions(-)
+ create mode 100644 src/pmlogger/pmlogger_farm.defaults
+
+diff -Naurp pcp-5.3.7.orig/src/pmlogger/GNUmakefile pcp-5.3.7/src/pmlogger/GNUmakefile
+--- pcp-5.3.7.orig/src/pmlogger/GNUmakefile	2022-02-02 11:53:05.000000000 +1100
++++ pcp-5.3.7/src/pmlogger/GNUmakefile	2022-08-31 11:23:08.758672970 +1000
+@@ -45,6 +45,7 @@ install:: $(SUBDIRS)
+ 
+ install:: default
+ 	$(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_VAR_DIR)/config/pmlogger
++	$(INSTALL) -m 644 pmlogger_farm.defaults $(PCP_SYSCONFIG_DIR)/pmlogger_farm
+ 	$(INSTALL) -m 644 pmlogger.defaults $(PCP_SYSCONFIG_DIR)/pmlogger
+ 	$(INSTALL) -m 755 -d $(PCP_SHARE_DIR)/zeroconf
+ 	$(INSTALL) -m 644 pmlogger.zeroconf $(PCP_SHARE_DIR)/zeroconf/pmlogger
+diff -Naurp pcp-5.3.7.orig/src/pmlogger/pmlogger_check.sh pcp-5.3.7/src/pmlogger/pmlogger_check.sh
+--- pcp-5.3.7.orig/src/pmlogger/pmlogger_check.sh	2022-04-05 09:05:43.000000000 +1000
++++ pcp-5.3.7/src/pmlogger/pmlogger_check.sh	2022-08-31 11:23:08.758672970 +1000
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ #
+-# Copyright (c) 2013-2016,2018,2020-2021 Red Hat.
++# Copyright (c) 2013-2016,2018,2020-2022 Red Hat.
+ # Copyright (c) 1995-2000,2003 Silicon Graphics, Inc.  All Rights Reserved.
+ #
+ # This program is free software; you can redistribute it and/or modify it
+@@ -24,6 +24,7 @@
+ PMLOGGER="$PCP_BINADM_DIR/pmlogger"
+ PMLOGCONF="$PCP_BINADM_DIR/pmlogconf"
+ PMLOGGERENVS="$PCP_SYSCONFIG_DIR/pmlogger"
++PMLOGGERFARMENVS="$PCP_SYSCONFIG_DIR/pmlogger_farm"
+ PMLOGGERZEROCONFENVS="$PCP_SHARE_DIR/zeroconf/pmlogger"
+ 
+ # error messages should go to stderr, not the GUI notifiers
+@@ -972,8 +973,8 @@ END				{ print m }'`
+ 		    continue
+ 		fi
+ 	    else
++		envs=`grep -h ^PMLOGGER "$PMLOGGERFARMENVS" 2>/dev/null`
+ 		args="-h $host $args"
+-		envs=""
+ 		iam=""
+ 	    fi
+ 
+diff -Naurp pcp-5.3.7.orig/src/pmlogger/pmlogger.defaults pcp-5.3.7/src/pmlogger/pmlogger.defaults
+--- pcp-5.3.7.orig/src/pmlogger/pmlogger.defaults	2022-02-03 16:11:40.000000000 +1100
++++ pcp-5.3.7/src/pmlogger/pmlogger.defaults	2022-08-31 11:23:08.758672970 +1000
+@@ -1,5 +1,7 @@
+ # Environment variables for the primary pmlogger daemon.  See also
+ # the pmlogger control file and pmlogconf(1) for additional details.
++# Also see separate pmlogger_farm configuration for the non-primary
++# logger configuration settings, separate to this file.
+ # Settings defined in this file will override any settings in the
+ # pmlogger zeroconf file (if present).
+ 
+diff -Naurp pcp-5.3.7.orig/src/pmlogger/pmlogger_farm.defaults pcp-5.3.7/src/pmlogger/pmlogger_farm.defaults
+--- pcp-5.3.7.orig/src/pmlogger/pmlogger_farm.defaults	1970-01-01 10:00:00.000000000 +1000
++++ pcp-5.3.7/src/pmlogger/pmlogger_farm.defaults	2022-08-31 11:23:08.758672970 +1000
+@@ -0,0 +1,27 @@
++# Environment variables for the pmlogger farm daemons.  See also
++# pmlogger control file(s) and pmlogconf(1) for additional details.
++# Also see separate pmlogger configuration for the primary logger
++# configuration settings, separate to this file.
++
++# Behaviour regarding listening on external-facing interfaces;
++# unset PMLOGGER_LOCAL to allow connections from remote hosts.
++# A value of 0 permits remote connections, 1 permits local only.
++# PMLOGGER_LOCAL=1
++
++# Max length to which the queue of pending connections may grow
++# A value of 5 is the default.
++# PMLOGGER_MAXPENDING=5
++
++# Default sampling interval pmlogger uses when no more specific
++# interval is requested.  A value of 60 seconds is the default.
++# Both pmlogger command line (via control file) and also pmlogger
++# configuration file directives will override this value.
++# PMLOGGER_INTERVAL=60
++
++# The default behaviour, when pmlogger configuration comes from
++# pmlogconf(1), is to regenerate the configuration file and check for
++# changes whenever pmlogger is started from pmlogger_check(1).
++# If the PMDA configuration is stable, this is not necessary, and
++# setting PMLOGGER_CHECK_SKIP_LOGCONF to yes disables the regeneration
++# and checking.
++# PMLOGGER_CHECK_SKIP_LOGCONF=yes

SOURCES/redhat-bugzilla-2135314-pmfind-fix.patch

@@ -0,0 +1,534 @@
+diff -Naurp pcp-5.3.7.orig/qa/1985 pcp-5.3.7/qa/1985
+--- pcp-5.3.7.orig/qa/1985	1970-01-01 10:00:00.000000000 +1000
++++ pcp-5.3.7/qa/1985	2022-10-19 21:32:03.971832371 +1100
+@@ -0,0 +1,38 @@
++#!/bin/sh
++# PCP QA Test No. 1985
++# Exercise a pmfind fix - valgrind-enabled variant.
++#
++# Copyright (c) 2022 Red Hat.  All Rights Reserved.
++#
++
++seq=`basename $0`
++echo "QA output created by $seq"
++
++# get standard environment, filters and checks
++. ./common.product
++. ./common.filter
++. ./common.check
++
++_check_valgrind
++
++_cleanup()
++{
++    cd $here
++    $sudo rm -rf $tmp $tmp.*
++}
++
++status=0	# success is the default!
++$sudo rm -rf $tmp $tmp.* $seq.full
++trap "_cleanup; exit \$status" 0 1 2 3 15
++
++# real QA test starts here
++export seq
++./1986 --valgrind \
++| $PCP_AWK_PROG '
++skip == 1 && $1 == "==="       { skip = 0 }
++/^=== std err ===/             { skip = 1 }
++skip == 0              { print }
++skip == 1              { print >>"'$here/$seq.full'" }'
++
++# success, all done
++exit
+diff -Naurp pcp-5.3.7.orig/qa/1985.out pcp-5.3.7/qa/1985.out
+--- pcp-5.3.7.orig/qa/1985.out	1970-01-01 10:00:00.000000000 +1000
++++ pcp-5.3.7/qa/1985.out	2022-10-19 21:32:03.971832371 +1100
+@@ -0,0 +1,11 @@
++QA output created by 1985
++QA output created by 1986 --valgrind
++=== std out ===
++SOURCE HOSTNAME
++=== filtered valgrind report ===
++Memcheck, a memory error detector
++Command: pmfind -S -m probe=127.0.0.1/32
++LEAK SUMMARY:
++definitely lost: 0 bytes in 0 blocks
++indirectly lost: 0 bytes in 0 blocks
++ERROR SUMMARY: 0 errors from 0 contexts ...
+diff -Naurp pcp-5.3.7.orig/qa/1986 pcp-5.3.7/qa/1986
+--- pcp-5.3.7.orig/qa/1986	1970-01-01 10:00:00.000000000 +1000
++++ pcp-5.3.7/qa/1986	2022-10-19 21:32:03.971832371 +1100
+@@ -0,0 +1,62 @@
++#!/bin/sh
++# PCP QA Test No. 1986
++# Exercise libpcp_web timers pmfind regression fix.
++#
++# Copyright (c) 2022 Red Hat.  All Rights Reserved.
++#
++
++if [ $# -eq 0 ]
++then
++    seq=`basename $0`
++    echo "QA output created by $seq"
++else
++    # use $seq from caller, unless not set
++    [ -n "$seq" ] || seq=`basename $0`
++    echo "QA output created by `basename $0` $*"
++fi
++
++# get standard environment, filters and checks
++. ./common.product
++. ./common.filter
++. ./common.check
++
++do_valgrind=false
++if [ "$1" = "--valgrind" ]
++then
++    _check_valgrind
++    do_valgrind=true
++fi
++
++test -x $PCP_BIN_DIR/pmfind || _notrun No support for pmfind
++
++_cleanup()
++{
++    cd $here
++    $sudo rm -rf $tmp $tmp.*
++}
++
++status=0	# success is the default!
++hostname=`hostname || echo localhost`
++$sudo rm -rf $tmp $tmp.* $seq.full
++trap "_cleanup; exit \$status" 0 1 2 3 15
++
++_filter()
++{
++    sed \
++	-e "s@$tmp@TMP@g" \
++	-e "s/ $hostname/ HOSTNAME/" \
++	-e 's/^[a-f0-9][a-f0-9]* /SOURCE /' \
++    # end
++}
++
++# real QA test starts here
++if $do_valgrind
++then
++    _run_valgrind pmfind -S -m probe=127.0.0.1/32
++else
++    pmfind -S -m probe=127.0.0.1/32
++fi \
++| _filter
++
++# success, all done
++exit
+diff -Naurp pcp-5.3.7.orig/qa/1986.out pcp-5.3.7/qa/1986.out
+--- pcp-5.3.7.orig/qa/1986.out	1970-01-01 10:00:00.000000000 +1000
++++ pcp-5.3.7/qa/1986.out	2022-10-19 21:32:03.971832371 +1100
+@@ -0,0 +1,2 @@
++QA output created by 1986
++SOURCE HOSTNAME
+diff -Naurp pcp-5.3.7.orig/qa/group pcp-5.3.7/qa/group
+--- pcp-5.3.7.orig/qa/group	2022-10-19 20:49:42.638708707 +1100
++++ pcp-5.3.7/qa/group	2022-10-19 21:32:03.972832359 +1100
+@@ -1974,4 +1974,6 @@ x11
+ 1957 libpcp local valgrind
+ 1978 atop local
+ 1984 pmlogconf pmda.redis local
++1985 pmfind local valgrind
++1986 pmfind local
+ 4751 libpcp threads valgrind local pcp helgrind
+diff -Naurp pcp-5.3.7.orig/src/libpcp_web/src/webgroup.c pcp-5.3.7/src/libpcp_web/src/webgroup.c
+--- pcp-5.3.7.orig/src/libpcp_web/src/webgroup.c	2021-11-01 13:02:26.000000000 +1100
++++ pcp-5.3.7/src/libpcp_web/src/webgroup.c	2022-10-19 21:32:03.973832346 +1100
+@@ -287,11 +287,24 @@ webgroup_new_context(pmWebGroupSettings
+ }
+ 
+ static void
++webgroup_timers_stop(struct webgroups *groups)
++{
++    if (groups->active) {
++	uv_timer_stop(&groups->timer);
++	uv_close((uv_handle_t *)&groups->timer, NULL);
++	pmWebTimerRelease(groups->timerid);
++	groups->timerid = -1;
++	groups->active = 0;
++    }
++}
++
++static void
+ webgroup_garbage_collect(struct webgroups *groups)
+ {
+     dictIterator        *iterator;
+     dictEntry           *entry;
+     context_t		*cp;
++    unsigned int	count = 0, drops = 0;
+ 
+     if (pmDebugOptions.http || pmDebugOptions.libweb)
+ 	fprintf(stderr, "%s: started\n", "webgroup_garbage_collect");
+@@ -308,33 +321,40 @@ webgroup_garbage_collect(struct webgroup
+ 		uv_mutex_unlock(&groups->mutex);
+ 		webgroup_drop_context(cp, groups);
+ 		uv_mutex_lock(&groups->mutex);
++		drops++;
+ 	    }
++	    count++;
+ 	}
+ 	dictReleaseIterator(iterator);
++
++	/* if dropping the last remaining context, do cleanup */
++	if (groups->active && drops == count) {
++	    if (pmDebugOptions.http || pmDebugOptions.libweb)
++		fprintf(stderr, "%s: freezing\n", "webgroup_garbage_collect");
++	    webgroup_timers_stop(groups);
++	}
+ 	uv_mutex_unlock(&groups->mutex);
+     }
+ 
+     if (pmDebugOptions.http || pmDebugOptions.libweb)
+-	fprintf(stderr, "%s: finished\n", "webgroup_garbage_collect");
++	fprintf(stderr, "%s: finished [%u drops from %u entries]\n",
++			"webgroup_garbage_collect", drops, count);
+ }
+ 
+ static void
+ refresh_maps_metrics(void *data)
+ {
+     struct webgroups	*groups = (struct webgroups *)data;
++    unsigned int	value;
+ 
+-    if (groups->metrics) {
+-	unsigned int	value;
+-
+-	value = dictSize(contextmap);
+-	mmv_set(groups->map, groups->metrics[CONTEXT_MAP_SIZE], &value);
+-	value = dictSize(namesmap);
+-	mmv_set(groups->map, groups->metrics[NAMES_MAP_SIZE], &value);
+-	value = dictSize(labelsmap);
+-	mmv_set(groups->map, groups->metrics[LABELS_MAP_SIZE], &value);
+-	value = dictSize(instmap);
+-	mmv_set(groups->map, groups->metrics[INST_MAP_SIZE], &value);
+-    }
++    value = contextmap? dictSize(contextmap) : 0;
++    mmv_set(groups->map, groups->metrics[CONTEXT_MAP_SIZE], &value);
++    value = namesmap? dictSize(namesmap) : 0;
++    mmv_set(groups->map, groups->metrics[NAMES_MAP_SIZE], &value);
++    value = labelsmap? dictSize(labelsmap) : 0;
++    mmv_set(groups->map, groups->metrics[LABELS_MAP_SIZE], &value);
++    value = instmap? dictSize(instmap) : 0;
++    mmv_set(groups->map, groups->metrics[INST_MAP_SIZE], &value);
+ }
+ 
+ static void
+@@ -487,6 +507,7 @@ pmWebGroupDestroy(pmWebGroupSettings *se
+ 	if (pmDebugOptions.libweb)
+ 	    fprintf(stderr, "%s: destroy context %p gp=%p\n", "pmWebGroupDestroy", cp, gp);
+ 
++	webgroup_deref_context(cp);
+ 	webgroup_drop_context(cp, gp);
+     }
+     sdsfree(msg);
+@@ -2394,17 +2415,12 @@ pmWebGroupClose(pmWebGroupModule *module
+ 
+     if (groups) {
+ 	/* walk the contexts, stop timers and free resources */
+-	if (groups->active) {
+-	    groups->active = 0;
+-	    uv_timer_stop(&groups->timer);
+-	    pmWebTimerRelease(groups->timerid);
+-	    groups->timerid = -1;
+-	}
+ 	iterator = dictGetIterator(groups->contexts);
+ 	while ((entry = dictNext(iterator)) != NULL)
+ 	    webgroup_drop_context((context_t *)dictGetVal(entry), NULL);
+ 	dictReleaseIterator(iterator);
+ 	dictRelease(groups->contexts);
++	webgroup_timers_stop(groups);
+ 	memset(groups, 0, sizeof(struct webgroups));
+ 	free(groups);
+     }
+diff -Naurp pcp-5.3.7.orig/src/pmfind/source.c pcp-5.3.7/src/pmfind/source.c
+--- pcp-5.3.7.orig/src/pmfind/source.c	2021-02-17 15:27:41.000000000 +1100
++++ pcp-5.3.7/src/pmfind/source.c	2022-10-19 21:32:03.973832346 +1100
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2020 Red Hat.
++ * Copyright (c) 2020,2022 Red Hat.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU General Public License as published by the
+@@ -25,6 +25,7 @@ static pmWebGroupSettings settings;
+ typedef struct {
+     sds			source;
+     sds			hostspec;
++    unsigned int	refcount;
+ } context_t;
+ 
+ typedef struct {
+@@ -38,22 +39,34 @@ typedef struct {
+ } sources_t;
+ 
+ static void
++source_release(sources_t *sp, context_t *cp, sds ctx)
++{
++    pmWebGroupDestroy(&settings, ctx, sp);
++    sdsfree(cp->hostspec);
++    sdsfree(cp->source);
++    free(cp);
++}
++
++static void
+ sources_release(void *arg, const struct dictEntry *entry)
+ {
+     sources_t	*sp = (sources_t *)arg;
+     context_t	*cp = (context_t *)dictGetVal(entry);
+     sds		ctx = (sds)entry->key;
+ 
+-    pmWebGroupDestroy(&settings, ctx, sp);
+-    sdsfree(cp->hostspec);
+-    sdsfree(cp->source);
++    if (pmDebugOptions.discovery)
++	fprintf(stderr, "releasing context %s\n", ctx);
++
++    source_release(sp, cp, ctx);
+ }
+ 
+ static void
+-sources_containers(sources_t *sp, sds id, dictEntry *uniq)
++sources_containers(sources_t *sp, context_t *cp, sds id, dictEntry *uniq)
+ {
+     uv_mutex_lock(&sp->mutex);
+-    sp->count++;	/* issuing another PMWEBAPI request */
++    /* issuing another PMWEBAPI request */
++    sp->count++;
++    cp->refcount++;
+     uv_mutex_unlock(&sp->mutex);
+ 
+     pmWebGroupScrape(&settings, id, sp->params, sp);
+@@ -75,6 +88,7 @@ on_source_context(sds id, pmWebSource *s
+ 
+     cp->source = sdsdup(src->source);
+     cp->hostspec = sdsdup(src->hostspec);
++    cp->refcount = 1;
+ 
+     uv_mutex_lock(&sp->mutex);
+     dictAdd(sp->contexts, id, cp);
+@@ -84,7 +98,7 @@ on_source_context(sds id, pmWebSource *s
+     if (entry) {	/* source just discovered */
+ 	printf("%s %s\n", src->source, src->hostspec);
+ 	if (containers)
+-	    sources_containers(sp, id, entry);
++	    sources_containers(sp, cp, id, entry);
+     }
+ }
+ 
+@@ -116,7 +130,9 @@ static void
+ on_source_done(sds context, int status, sds message, void *arg)
+ {
+     sources_t	*sp = (sources_t *)arg;
+-    int		count = 0, release = 0;
++    context_t	*cp;
++    dictEntry	*he;
++    int		remove = 0, count = 0, release = 0;
+ 
+     if (pmDebugOptions.discovery)
+ 	fprintf(stderr, "done on context %s (sts=%d)\n", context, status);
+@@ -127,19 +143,26 @@ on_source_done(sds context, int status,
+     uv_mutex_lock(&sp->mutex);
+     if ((count = --sp->count) <= 0)
+ 	release = 1;
++    if ((he = dictFind(sp->contexts, context)) != NULL &&
++	(cp = (context_t *)dictGetVal(he)) != NULL &&
++	(--cp->refcount <= 0))
++	remove = 1;
+     uv_mutex_unlock(&sp->mutex);
+ 
++    if (remove) {
++	if (pmDebugOptions.discovery)
++	    fprintf(stderr, "remove context %s\n", context);
++	source_release(sp, cp, context);
++	dictDelete(sp->contexts, context);
++    }
++
+     if (release) {
+ 	unsigned long	cursor = 0;
+-
+-	if (pmDebugOptions.discovery)
+-	   fprintf(stderr, "release context %s (sts=%d)\n", context, status);
+ 	do {
+ 	    cursor = dictScan(sp->contexts, cursor, sources_release, NULL, sp);
+ 	} while (cursor);
+-    } else {
+-	if (pmDebugOptions.discovery)
+-	    fprintf(stderr, "not yet releasing (count=%d)\n", count);
++    } else if (pmDebugOptions.discovery) {
++	fprintf(stderr, "not yet releasing (count=%d)\n", count);
+     }
+ }
+ 
+@@ -190,6 +213,7 @@ sources_discovery_start(uv_timer_t *arg)
+     }
+ 
+     dictRelease(dp);
++    pmWebTimerClose();
+ }
+ 
+ /*
+@@ -214,8 +238,8 @@ source_discovery(int count, char **urls)
+     uv_mutex_init(&find.mutex);
+     find.urls = urls;
+     find.count = count;	/* at least one PMWEBAPI request for each url */
+-    find.uniq = dictCreate(&sdsDictCallBacks, NULL);
+-    find.params = dictCreate(&sdsDictCallBacks, NULL);
++    find.uniq = dictCreate(&sdsKeyDictCallBacks, NULL);
++    find.params = dictCreate(&sdsOwnDictCallBacks, NULL);
+     dictAdd(find.params, sdsnew("name"), sdsnew("containers.state.running"));
+     find.contexts = dictCreate(&sdsKeyDictCallBacks, NULL);
+ 
+@@ -230,6 +254,7 @@ source_discovery(int count, char **urls)
+ 
+     pmWebGroupSetup(&settings.module);
+     pmWebGroupSetEventLoop(&settings.module, loop);
++    pmWebTimerSetEventLoop(loop);
+ 
+     /*
+      * Start a one-shot timer to add a start function into the loop
+@@ -244,7 +269,9 @@ source_discovery(int count, char **urls)
+     /*
+      * Finished, release all resources acquired so far
+      */
++    pmWebGroupClose(&settings.module);
+     uv_mutex_destroy(&find.mutex);
++    dictRelease(find.uniq);
+     dictRelease(find.params);
+     dictRelease(find.contexts);
+     return find.status;
+diff -Naurp pcp-5.3.7.orig/src/pmproxy/src/server.c pcp-5.3.7/src/pmproxy/src/server.c
+--- pcp-5.3.7.orig/src/pmproxy/src/server.c	2022-04-05 09:05:43.000000000 +1000
++++ pcp-5.3.7/src/pmproxy/src/server.c	2022-10-19 21:31:43.831093354 +1100
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2018-2019,2021 Red Hat.
++ * Copyright (c) 2018-2019,2021-2022 Red Hat.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as published
+@@ -310,17 +310,21 @@ on_write_callback(uv_callback_t *handle,
+     struct client		*client = (struct client *)request->writer.data;
+     int				sts;
+ 
++    (void)handle;
+     if (pmDebugOptions.af)
+ 	fprintf(stderr, "%s: client=%p\n", "on_write_callback", client);
+ 
+     if (client->stream.secure == 0) {
+ 	sts = uv_write(&request->writer, (uv_stream_t *)&client->stream,
+ 		 &request->buffer[0], request->nbuffers, request->callback);
+-	if (sts != 0)
+-	    fprintf(stderr, "%s: ERROR uv_write failed\n", "on_write_callback");
++	if (sts != 0) {
++	    pmNotifyErr(LOG_ERR, "%s: %s - uv_write failed [%s]: %s\n",
++			pmGetProgname(), "on_write_callback",
++			uv_err_name(sts), uv_strerror(sts));
++	    client_close(client);
++	}
+     } else
+ 	secure_client_write(client, request);
+-    (void)handle;
+     return 0;
+ }
+ 
+@@ -455,14 +459,16 @@ on_client_connection(uv_stream_t *stream
+     uv_handle_t		*handle;
+ 
+     if (status != 0) {
+-	fprintf(stderr, "%s: client connection failed: %s\n",
+-			pmGetProgname(), uv_strerror(status));
++	pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
++		    pmGetProgname(), "on_client_connection", "connection",
++		    uv_err_name(status), uv_strerror(status));
+ 	return;
+     }
+ 
+     if ((client = calloc(1, sizeof(*client))) == NULL) {
+-	fprintf(stderr, "%s: out-of-memory for new client\n",
+-			pmGetProgname());
++	pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
++			pmGetProgname(), "on_client_connection", "calloc",
++			"ENOMEM", strerror(ENOMEM));
+ 	return;
+     }
+     if (pmDebugOptions.context | pmDebugOptions.af)
+@@ -476,16 +482,18 @@ on_client_connection(uv_stream_t *stream
+ 
+     status = uv_tcp_init(proxy->events, &client->stream.u.tcp);
+     if (status != 0) {
+-	fprintf(stderr, "%s: client tcp init failed: %s\n",
+-			pmGetProgname(), uv_strerror(status));
++	pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
++		    pmGetProgname(), "on_client_connection", "uv_tcp_init",
++		    uv_err_name(status), uv_strerror(status));
+ 	client_put(client);
+ 	return;
+     }
+ 
+     status = uv_accept(stream, (uv_stream_t *)&client->stream.u.tcp);
+     if (status != 0) {
+-	fprintf(stderr, "%s: client tcp init failed: %s\n",
+-			pmGetProgname(), uv_strerror(status));
++	pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
++		    pmGetProgname(), "on_client_connection", "uv_accept",
++		    uv_err_name(status), uv_strerror(status));
+ 	client_put(client);
+ 	return;
+     }
+@@ -496,8 +504,9 @@ on_client_connection(uv_stream_t *stream
+     status = uv_read_start((uv_stream_t *)&client->stream.u.tcp,
+ 			    on_buffer_alloc, on_client_read);
+     if (status != 0) {
+-	fprintf(stderr, "%s: client read start failed: %s\n",
+-			pmGetProgname(), uv_strerror(status));
++	pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
++		    pmGetProgname(), "on_client_connection", "uv_read_start",
++		    uv_err_name(status), uv_strerror(status));
+ 	client_close(client);
+     }
+ }
+@@ -530,8 +539,9 @@ open_request_port(struct proxy *proxy, s
+ 
+     sts = uv_listen((uv_stream_t *)&stream->u.tcp, maxpending, on_client_connection);
+     if (sts != 0) {
+-	fprintf(stderr, "%s: socket listen error %s\n",
+-			pmGetProgname(), uv_strerror(sts));
++	pmNotifyErr(LOG_ERR, "%s: %s - uv_listen failed [%s]: %s\n",
++			pmGetProgname(), "open_request_port",
++			uv_err_name(sts), uv_strerror(sts));
+ 	uv_close(handle, NULL);
+ 	return -ENOTCONN;
+     }
+@@ -554,15 +564,23 @@ open_request_local(struct proxy *proxy,
+     uv_pipe_init(proxy->events, &stream->u.local, 0);
+     handle = (uv_handle_t *)&stream->u.local;
+     handle->data = (void *)proxy;
+-    uv_pipe_bind(&stream->u.local, name);
++    sts = uv_pipe_bind(&stream->u.local, name);
++    if (sts != 0) {
++	pmNotifyErr(LOG_ERR, "%s: %s - uv_pipe_bind %s failed [%s]: %s\n",
++			pmGetProgname(), "open_request_local", name,
++			uv_err_name(sts), uv_strerror(sts));
++	uv_close(handle, NULL);
++	return -ENOTCONN;
++    }
+ #ifdef HAVE_UV_PIPE_CHMOD
+     uv_pipe_chmod(&stream->u.local, UV_READABLE | UV_WRITABLE);
+ #endif
+ 
+     sts = uv_listen((uv_stream_t *)&stream->u.local, maxpending, on_client_connection);
+     if (sts != 0) {
+-	fprintf(stderr, "%s: local listen error %s\n",
+-			pmGetProgname(), uv_strerror(sts));
++	pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
++		    pmGetProgname(), "open_request_local", "uv_listen",
++		    uv_err_name(sts), uv_strerror(sts));
+ 	uv_close(handle, NULL);
+         return -ENOTCONN;
+     }

SOURCES/redhat-bugzilla-2139012-pmdasnmp-config.patch

@@ -0,0 +1,32 @@
+commit 4014e295f7b5f541439774bd3c88924d3c061325
+Author: Masatake YAMATO <yamato@redhat.com>
+Date:   Thu Oct 20 13:55:43 2022 +0900
+
+    pmdas/snmp: install the agent specific configuration file to PMDATMPDIR
+    
+    When running ./Install of the agent, the following line is printed in
+    /var/log/pcp/pmcd/snmp.log.
+    
+      Log for pmdasnmp on pcp-netsnmp started Tue Oct 18 22:45:23 2022
+    
+      opening /var/lib/pcp/pmdas/snmp/snmp.conf No such file or directory at /var/lib/pcp/pmdas/snmp/pmdasnmp.pl line 90.
+    
+    As a result, pmdasnmp.pl cannot read its configuration file though it
+    is "./Install"ed.
+    
+    Signed-off-by: Masatake YAMATO <yamato@redhat.com>
+
+diff --git a/src/pmdas/snmp/GNUmakefile b/src/pmdas/snmp/GNUmakefile
+index ce0e3e8036..7bf5471a76 100644
+--- a/src/pmdas/snmp/GNUmakefile
++++ b/src/pmdas/snmp/GNUmakefile
+@@ -44,7 +44,7 @@ install_pcp install: default
+ 	$(INSTALL) -m 755 -t $(PMDATMPDIR) Install Remove $(PMDAADMDIR)
+ 	$(INSTALL) -m 644 -t $(PMDATMPDIR)/pmda$(IAM).pl pmda$(IAM).pl $(PMDAADMDIR)/pmda$(IAM).pl
+ 	$(INSTALL) -m 755 -d $(PMDACONFIG)
+-	$(INSTALL) -m 644 snmp.conf $(PMDACONFIG)/snmp.conf
++	$(INSTALL) -m 644 -t $(PMDATMPDIR)/$(IAM).conf $(IAM).conf $(PMDACONFIG)/$(IAM).conf
+ 	@$(INSTALL_MAN)
+ else
+ build-me:
+

SOURCES/redhat-build-jsonsl.patch

@@ -0,0 +1,50 @@
+diff --git a/src/pmdas/podman/.gitignore b/src/pmdas/podman/.gitignore
+index a4f35e0f43..aea2c4052e 100644
+--- a/src/pmdas/podman/.gitignore
++++ b/src/pmdas/podman/.gitignore
+@@ -2,8 +2,6 @@ deps/
+ domain.h
+ pmdapodman
+ pmda_podman.so
+-jsonsl.c
+-jsonsl.h
+ help.dir
+ help.pag
+ exports
+diff --git a/src/pmdas/podman/GNUmakefile b/src/pmdas/podman/GNUmakefile
+index d6e58cfca5..1117a7a4e4 100644
+--- a/src/pmdas/podman/GNUmakefile
++++ b/src/pmdas/podman/GNUmakefile
+@@ -83,6 +83,7 @@ domain.h: ../../pmns/stdpmid
+ $(OBJECTS): domain.h
+ pmda.o: $(VERSION_SCRIPT)
+ pmda.o:	$(TOPDIR)/src/include/pcp/libpcp.h
++podman.o: $(JSONSL_HFILES)
+ 
+ check:: $(CFILES) $(HFILES)
+ 	$(CLINT) $^
+diff --git a/src/pmdas/root/.gitignore b/src/pmdas/root/.gitignore
+index 21f507f0dd..b78b1fd28a 100644
+--- a/src/pmdas/root/.gitignore
++++ b/src/pmdas/root/.gitignore
+@@ -1,8 +1,6 @@
+ deps/
+ domain.h
+ pmdaroot
+-jsonsl.c
+-jsonsl.h
+ help.dir
+ help.pag
+ pmns
+diff --git a/src/pmdas/root/GNUmakefile b/src/pmdas/root/GNUmakefile
+index ed01a18fb8..b02d4ea834 100644
+--- a/src/pmdas/root/GNUmakefile
++++ b/src/pmdas/root/GNUmakefile
+@@ -83,6 +83,7 @@ pmns :
+ 	$(LN_S) -f root_root pmns
+ 
+ lxc.o root.o:	$(TOPDIR)/src/include/pcp/libpcp.h
++podman.o:	$(JSONSL_HFILES)
+ 
+ check:: $(CFILES) $(HFILES)
+ 	$(CLINT) $^

SPECS/pcp.spec

@@ -1,22 +1,28 @@
 Name:    pcp
-Version: 5.3.5
-Release: 8%{?dist}
+Version: 5.3.7
+Release: 16%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
 URL:     https://pcp.io
 
 %global  artifactory https://performancecopilot.jfrog.io/artifactory
 Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz
+Patch0:  redhat-bugzilla-2003956-pmdabcc-update-kernel-version-check-due-to-backporting.patch
+Patch1:  redhat-bugzilla-1981886-pmdasockets-backporting.patch
+Patch2:  redhat-bugzilla-2059461-pmie-systemd-fixup.patch
+Patch3:  redhat-bugzilla-2081262-pmdaproc-cgroups-fix.patch
+Patch4:  redhat-bugzilla-2059463-pmdapostfix-harden.patch
+Patch5:  redhat-bugzilla-2083897-dstat-missed-ticks.patch
+Patch6:  redhat-bugzilla-2111742-selinux-policy.patch
+Patch7:  redhat-bugzilla-2093751-sudoers-docs.patch
+Patch8:  redhat-bugzilla-2101574-farm-config.patch
+Patch9:  redhat-bugzilla-2135314-pmfind-fix.patch
+Patch10: redhat-bugzilla-2139012-pmdasnmp-config.patch
+Patch11: redhat-build-jsonsl.patch
 
-Patch0: redhat-bugzilla-2017632.patch
-Patch1: redhat-bugzilla-2029301.patch
-Patch2: redhat-bugzilla-2030121.patch
-Patch3: redhat-bugzilla-2027753.patch
-Patch4: redhat-bugzilla-2030140.patch
-Patch5: redhat-bugzilla-2003956.patch
-Patch6: redhat-bugzilla-2003956-pmdabcc-update-kernel-version-check-due-to-backporting.patch
-Patch7: redhat-bugzilla-1973833.patch
-Patch8: redhat-bugzilla-1991763.patch
+# The additional linker flags break out-of-tree PMDAs.
+# https://bugzilla.redhat.com/show_bug.cgi?id=2043092
+%undefine _package_note_flags 
 
 %if 0%{?fedora} >= 26 || 0%{?rhel} > 7
 %global __python2 python2
@@ -295,27 +301,27 @@ BuildRequires: qt5-qtsvg-devel
 
 Requires: bash xz gawk sed grep findutils which %{_hostname_executable}
 Requires: pcp-libs = %{version}-%{release}
+
 %if !%{disable_selinux}
+# rpm boolean dependencies are supported since RHEL 8
+%if 0%{?fedora} >= 35 || 0%{?rhel} >= 8
+# This ensures that the pcp-selinux package and all its dependencies are
+# not pulled into containers and other systems that do not use SELinux
+Requires: (pcp-selinux = %{version}-%{release} if selinux-policy-targeted)
+%else
 Requires: pcp-selinux = %{version}-%{release}
 %endif
+%endif
 
 %global _confdir        %{_sysconfdir}/pcp
 %global _logsdir        %{_localstatedir}/log/pcp
 %global _pmnsdir        %{_localstatedir}/lib/pcp/pmns
-%global _pmnsexecdir    %{_libexecdir}/pcp/pmns
-%global _tempsdir       %{_localstatedir}/lib/pcp/tmp
 %global _pmdasdir       %{_localstatedir}/lib/pcp/pmdas
 %global _pmdasexecdir   %{_libexecdir}/pcp/pmdas
 %global _testsdir       %{_localstatedir}/lib/pcp/testsuite
-%global _selinuxdir     %{_localstatedir}/lib/pcp/selinux
-%global _selinuxexecdir %{_libexecdir}/pcp/selinux
-%global _logconfdir     %{_localstatedir}/lib/pcp/config/pmlogconf
+%global _ieconfigdir    %{_localstatedir}/lib/pcp/config/pmie
 %global _ieconfdir      %{_localstatedir}/lib/pcp/config/pmieconf
-%global _tapsetdir      %{_datadir}/systemtap/tapset
-%global _bashcompdir    %{_datadir}/bash-completion/completions
-%global _pixmapdir      %{_datadir}/pcp-gui/pixmaps
-%global _hicolordir     %{_datadir}/icons/hicolor
-%global _booksdir       %{_datadir}/doc/pcp-doc
+%global _selinuxdir     %{_datadir}/selinux/packages/targeted
 
 %if 0%{?fedora} >= 20 || 0%{?rhel} >= 8
 %global _with_doc --with-docdir=%{_docdir}/%{name}
@@ -436,14 +442,13 @@ else
 fi
 }
 
-%global selinux_handle_policy() %{expand:
-if [ %1 -ge 1 ]
+%global run_pmieconf() %{expand:
+if [ -w "%1" ]
 then
-    %{_libexecdir}/pcp/bin/selinux-setup %{_selinuxdir} install %2
-elif [ %1 -eq 0 ]
-then
-    %{_libexecdir}/pcp/bin/selinux-setup %{_selinuxdir} remove %2
-fi
+    pmieconf -c enable "%2"
+else
+    echo "WARNING: Cannot write to %1, skipping pmieconf enable of %2." >&2
+fi  
 }
 
 %description
@@ -2291,6 +2296,9 @@ updated policy package.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 # the buildsubdir macro gets defined in %setup and is apparently only available in the next step (i.e. the %build step)
@@ -2438,7 +2446,7 @@ total_manifest | keep 'tutorials|/html/|pcp-doc|man.*\.[1-9].*' | cull 'out' >pc
 total_manifest | keep 'testsuite|etc/systemd/system|libpcp_fault|pcp/fault.h' >pcp-testsuite-files
 
 basic_manifest | keep "$PCP_GUI|pcp-gui|applications|pixmaps|hicolor" | cull 'pmtime.h' >pcp-gui-files
-basic_manifest | keep 'selinux' | cull 'tmp|GNUselinuxdefs' >pcp-selinux-files
+basic_manifest | keep 'selinux' | cull 'tmp|testsuite' >pcp-selinux-files
 basic_manifest | keep 'zeroconf|daily[-_]report|/sa$' >pcp-zeroconf-files
 basic_manifest | grep -E -e 'pmiostat|pmrep|dstat|htop|pcp2csv' \
    -e 'pcp-atop|pcp-dmcache|pcp-dstat|pcp-free|pcp-htop' \
@@ -2682,6 +2690,9 @@ done
 %endif
 
 %pre testsuite
+%if !%{disable_selinux}
+%selinux_relabel_pre -s targeted
+%endif
 test -d %{_testsdir} || mkdir -p -m 755 %{_testsdir}
 getent group pcpqa >/dev/null || groupadd -r pcpqa
 getent passwd pcpqa >/dev/null || \
@@ -2690,6 +2701,11 @@ chown -R pcpqa:pcpqa %{_testsdir} 2>/dev/null
 exit 0
 
 %post testsuite
+%if !%{disable_selinux}
+semodule -r pcpqa >/dev/null 2>&1 || true
+%selinux_modules_install -s targeted %{_selinuxdir}/pcp-testsuite.pp.bz2
+%selinux_relabel_post -s targeted
+%endif
 chown -R pcpqa:pcpqa %{_testsdir} 2>/dev/null
 %if 0%{?rhel}
 %if !%{disable_systemd}
@@ -2704,6 +2720,14 @@ chown -R pcpqa:pcpqa %{_testsdir} 2>/dev/null
 %endif
 exit 0
 
+%if !%{disable_selinux}
+%postun testsuite
+if [ $1 -eq 0 ]; then
+    %selinux_modules_uninstall -s targeted pcp-testsuite
+    %selinux_relabel_post -s targeted
+fi
+%endif
+
 %pre
 getent group pcp >/dev/null || groupadd -r pcp
 getent passwd pcp >/dev/null || \
@@ -2990,6 +3014,7 @@ fi
 PCP_PMDAS_DIR=%{_pmdasdir}
 PCP_SYSCONFIG_DIR=%{_sysconfdir}/sysconfig
 PCP_PMCDCONF_PATH=%{_confdir}/pmcd/pmcd.conf
+PCP_PMIECONFIG_DIR=%{_ieconfigdir}
 # auto-install important PMDAs for RH Support (if not present already)
 for PMDA in dm nfsclient openmetrics ; do
     if ! grep -q "$PMDA/pmda$PMDA" "$PCP_PMCDCONF_PATH"
@@ -2998,7 +3023,7 @@ for PMDA in dm nfsclient openmetrics ; do
     fi
 done
 # auto-enable these usually optional pmie rules
-pmieconf -c enable dmthin
+%{run_pmieconf "$PCP_PMIECONFIG_DIR" dmthin}
 %if 0%{?rhel}
 %if !%{disable_systemd}
     systemctl restart pmcd pmlogger pmie >/dev/null 2>&1
@@ -3013,17 +3038,6 @@ pmieconf -c enable dmthin
 %endif
 %endif
 
-%if !%{disable_selinux}
-%post selinux
-%{selinux_handle_policy "$1" "pcpupstream"}
-
-%triggerin selinux -- docker-selinux
-%{selinux_handle_policy "$1" "pcpupstream-docker"}
-
-%triggerin selinux -- container-selinux
-%{selinux_handle_policy "$1" "pcpupstream-container"}
-%endif
-
 %post
 PCP_PMNS_DIR=%{_pmnsdir}
 PCP_LOG_DIR=%{_logsdir}
@@ -3062,14 +3076,21 @@ PCP_LOG_DIR=%{_logsdir}
 %endif
 
 %if !%{disable_selinux}
-%preun selinux
-%{selinux_handle_policy "$1" "pcpupstream"}
+%pre selinux
+%selinux_relabel_pre -s targeted
 
-%triggerun selinux -- docker-selinux
-%{selinux_handle_policy "$1" "pcpupstream-docker"}
+%post selinux
+semodule -r pcpupstream-container >/dev/null 2>&1 || true
+semodule -r pcpupstream-docker >/dev/null 2>&1 || true
+semodule -r pcpupstream >/dev/null 2>&1 || true
+%selinux_modules_install -s targeted %{_selinuxdir}/pcp.pp.bz2
+%selinux_relabel_post -s targeted
 
-%triggerun selinux -- container-selinux
-%{selinux_handle_policy "$1" "pcpupstream-container"}
+%postun selinux
+if [ $1 -eq 0 ]; then
+    %selinux_modules_uninstall -s targeted pcp
+    %selinux_relabel_post -s targeted
+fi
 %endif
 
 %files -f pcp-files.rpm
@@ -3088,6 +3109,7 @@ PCP_LOG_DIR=%{_logsdir}
 
 %if !%{disable_selinux}
 %files selinux -f pcp-selinux-files.rpm
+%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/targeted/active/modules/200/pcp
 %endif
 
 %if !%{disable_qt}
@@ -3348,6 +3370,36 @@ PCP_LOG_DIR=%{_logsdir}
 %files zeroconf -f pcp-zeroconf-files.rpm
 
 %changelog
+* Thu Nov 17 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-16
+- Ensure SNMP metrics config symlink installed (BZ 2139012)
+
+* Thu Oct 27 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-15
+- Backport independent selinux policy rework (BZ 2111742)
+- Fix invalid memory access in pmfind utility (BZ 2135314)
+- Allow pcp-dstat(1) missed ticks suppression (BZ 2083897)
+
+* Mon Sep 05 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-9
+- Additional selinux policy rules for pmdabcc (BZ 2050094)
+- Describe working sudoers requiretty configuration (BZ 2093751)
+- Separate pmlogger_farm configuration mechanism (BZ 2101574)
+
+* Mon May 09 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-7
+- Additional selinux policy rules for pmdasockets (BZ 1981886)
+
+* Thu May 05 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-5
+- Harden pmdapostfix(1) against missing Postfix (BZ 2059463)
+- Fix cgroups failure on non-x86_64 platforms (BZ 2081262)
+
+* Tue May 03 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-3
+- Fix remaining issues in the pcp-ss(1) utility (BZ 1981886)
+- Remove benign warning message from pmie systemd unit file.
+
+* Tue Apr 05 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-1
+- Fix several issues in the pcp-ss(1) utility (BZ 1981886)
+- Document pmproxy archive discovery further (BZ 2026726)
+- Improve SQL Server PMDA secure settings (BZ 2057615)
+- Rebase to latest stable version of PCP (BZ 2059461)
+
 * Wed Feb 02 2022 Nathan Scott <nathans@redhat.com> - 5.3.5-8
 - Fix pcp-zeroconf logger interval override regression (BZ 1991763)
 - Remove warnings from spec setup of PCP systemd units (BZ 2048024)