diff --git a/pcp-7.1.5-CVE-2026-16526.patch b/pcp-7.1.5-CVE-2026-16526.patch
index 3606d5d..53fcc06 100644
--- a/pcp-7.1.5-CVE-2026-16526.patch
+++ b/pcp-7.1.5-CVE-2026-16526.patch
@@ -87,1276 +87,20 @@ index 92c27dc49f..1533ad5720 100644
  4751 libpcp threads valgrind local pcp helgrind
  9000 other local
 diff --git a/qa/src/GNUlocaldefs b/qa/src/GNUlocaldefs
-index dd152a6412..2009bd65b0 100644
+index dd152a6412..937d263893 100644
 --- a/qa/src/GNUlocaldefs
 +++ b/qa/src/GNUlocaldefs
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2012-2021 Red Hat.
-+# Copyright (c) 2012-2026 Red Hat.
- # Copyright (c) 2009 Aconex.  All Rights Reserved.
- # Copyright (c) 1997-2002 Silicon Graphics, Inc.  All Rights Reserved.
- #
-@@ -36,7 +36,8 @@ CFILES = disk_test.c exercise.c context_test.c chkoptfetch.c \
- 	mmv2_genstats.c mmv2_instances.c mmv2_nostats.c mmv2_simple.c \
- 	mmv3_simple.c mmv3_labels.c mmv3_bad_labels.c mmv3_nostats.c mmv3_genstats.c \
- 	record.c record-setarg.c clientid.c grind_ctx.c \
--	pmdacache.c check_import.c unpack.c hrunpack.c aggrstore.c atomstr.c \
-+	check_import_append.c check_import_name.c check_import.c check_volsize.c \
-+	pmdacache.c unpack.c hrunpack.c aggrstore.c atomstr.c \
- 	semstr.c grind_conv.c getconfig.c err.c torture_logmeta.c keycache.c \
- 	keycache2.c pmdaqueue.c drain-server.c template.c anon-sa.c \
- 	username.c rtimetest.c getcontexthost.c badpmda.c chklogputresult.c \
-@@ -56,7 +57,14 @@ CFILES = disk_test.c exercise.c context_test.c chkoptfetch.c \
+@@ -56,7 +56,8 @@ CFILES = disk_test.c exercise.c context_test.c chkoptfetch.c \
  	throttle.c throttle_timeout.c y2038.c bigpmcdpmids.c pdu-gadget.c \
  	strnfoo.c mmv_ondisk.c newcontext.c api_abi.c interp_bug3.c \
  	pmsetmode.c scanindex.c localtime.c httpcache.c unregister.c \
 -	genpmns.c undelta.c series_time_parse_test.c derived_control.c
 +	genpmns.c undelta.c series_time_parse_test.c derived_control.c \
-+	multithread0.c multithread1.c multithread2.c multithread3.c \
-+	multithread4.c multithread5.c multithread6.c multithread7.c \
-+	multithread8.c multithread9.c multithread10.c multithread11.c \
-+	multithread12.c multithread13.c multithread14.c \
-+	exerlock.c hashwalk.c parsehostattrs.c parsehostspec.c getoptions.c \
 +	check_cloexec.c
-+
  
  ifeq ($(shell test -f ../localconfig && echo 1), 1)
  include ../localconfig
-@@ -68,53 +76,7 @@ $(error Cannot make qa/localconfig)
- endif
- endif
- 
--ifeq ($(shell test $(PCP_VER) -ge 3600 && echo 1), 1)
--CFILES += multithread0.c multithread1.c multithread2.c multithread3.c \
--	multithread4.c multithread5.c multithread6.c multithread7.c \
--	multithread8.c multithread9.c multithread10.c multithread11.c \
--	multithread12.c multithread13.c multithread14.c \
--	exerlock.c
--else
--MYFILES += multithread0.c multithread1.c multithread2.c multithread3.c \
--	multithread4.c multithread5.c multithread6.c multithread7.c \
--	multithread8.c multithread9.c multithread10.c multithread11.c \
--	multithread12.c multithread13.c multithread14.c \
--	exerlock.c
--LDIRT += multithread0 multithread1 multithread2 multithread3 \
--	multithread4 multithread5 multithread6 multithread7 \
--	multithread8 multithread9 multithread10 multithread11 \
--	multithread12 multithread13 multithread14 \
--	exerlock
--endif
--
--ifeq ($(shell test $(PCP_VER) -ge 3700 && echo 1), 1)
--CFILES += hashwalk.c
--else
--MYFILES += hashwalk.c
--LDIRT += hashwalk
--endif
--
--ifeq ($(shell test $(PCP_VER) -ge 3800 && echo 1), 1)
--CFILES += parsehostattrs.c parsehostspec.c check_import_name.c
--else
--MYFILES += parsehostattrs.c parsehostspec.c check_import_name.c
--LDIRT += parsehostattrs parsehostspec check_import_name
--endif
--
--ifeq ($(shell test $(PCP_VER) -ge 3802 && echo 1), 1)
--POSIXFILES += chkacc4.c
--else
--MYFILES += chkacc4.c
--LDIRT += chkacc4
--endif
--
--ifeq ($(shell test $(PCP_VER) -ge 3901 && echo 1), 1)
--CFILES += getoptions.c
- XTRATARGETS += getoptions_v2
--else
--MYFILES += getoptions.c
--LDIRT += getoptions getoptions_v2
--endif
- 
- ifeq ($(shell test -f /usr/include/pcp/fault.h && echo 1), 1)
- # only make these ones if the fault injection version of libpcp
-@@ -142,7 +104,7 @@ endif
- #
- POSIXFILES = \
- 	ipc.c proc_test.c context_fd_leak.c arch_maxfd.c torture_trace.c \
--	779246.c killparent.c fetchloop.c chain.c spawn.c 
-+	779246.c killparent.c fetchloop.c chain.c spawn.c chkacc4.c
- 
- TRACEFILES = \
- 	obs.c tstate.c tabort.c 
-@@ -284,63 +246,88 @@ statvfs:	statvfs.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ statvfs.c
- 
--pause:	pause.c
--	$(CCF) $(CDEFS) -o pause pause.c
-+chain:	chain.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ chain.c
- 
--errmap: errmap.c
--	$(CCF) $(CDEFS) -o errmap errmap.c
-+spawn:	spawn.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ spawn.c
- 
--cpuload:	cpuload.c
-+endian:	endian.c localconfig.h
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ cpuload.c
-+	$(CCF) $(CDEFS) -o $@ endian.c
- 
--load_o2000:	load_o2000.c
-+pmlcmacro:	pmlcmacro.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ load_o2000.c
-+	$(CCF) $(CDEFS) -o $@ pmlcmacro.c
- 
--chain:	chain.c
-+anon-sa: anon-sa.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ chain.c
-+	$(CCF) $(CDEFS) -o $@ anon-sa.c
- 
--syscall:	syscall.c
-+bcc_profile: bcc_profile.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ syscall.c
-+	$(CCF) $(CDEFS) -g -fno-omit-frame-pointer -o $@ bcc_profile.c
- 
--getpagesize:	getpagesize.c
-+sizeof:	sizeof.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ getpagesize.c
-+	$(CCF) $(CDEFS) -o $@ $<
- 
--rdwr:	rdwr.c
-+args:	args.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ rdwr.c
-+	$(CCF) $(CDEFS) -o $@ $<
- 
--spawn:	spawn.c
-+hanoi:	hanoi.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ spawn.c
-+	$(CCF) $(CDEFS) -o $@ $<
- 
--diowr:	diowr.c
-+infiniband-verbs:	infiniband-verbs.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ diowr.c
-+	$(CCF) $(CDEFS) -o $@ $<
- 
--endian:	endian.c localconfig.h
-+killparent:	killparent.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ endian.c
-+	$(CCF) $(CDEFS) -o $@ $<
- 
--pmlcmacro:	pmlcmacro.c
-+matchInstanceName:	matchInstanceName.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ pmlcmacro.c
-+	$(CCF) $(CDEFS) -o $@ $<
- 
--sys5_ipc:	sys5_ipc.c
-+qa_msgctl_stat:	qa_msgctl_stat.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ sys5_ipc.c
-+	$(CCF) $(CDEFS) -o $@ $<
- 
--anon-sa: anon-sa.c
--	$(CCF) $(CDEFS) -o $@ anon-sa.c
-+qa_sem_msg_ctl:	qa_sem_msg_ctl.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $<
- 
--bcc_profile: bcc_profile.c
--	$(CCF) $(CDEFS) -g -fno-omit-frame-pointer -o $@ bcc_profile.c
-+qa_semctl_stat:	qa_semctl_stat.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $<
- 
--sizeof:	sizeof.c
-+qa_shmctl_stat:	qa_shmctl_stat.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $<
-+
-+qa_shmctl:	qa_shmctl.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $<
-+
-+qa_test:	qa_test.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $<
-+
-+sum16:	sum16.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $<
-+
-+time_stamp:	time_stamp.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $<
-+
-+wrap_int:	wrap_int.c
-+	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $<
- 
- # --- need libpcp
-@@ -349,154 +336,867 @@ sizeof:	sizeof.c
- template:	template.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- exercise:	exercise.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- chkacc1:	chkacc1.c localconfig.h
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- chkacc2:	chkacc2.c localconfig.h
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- chkacc3:	chkacc3.c localconfig.h
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- ipc:	ipc.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- chk_memleak:	chk_memleak.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- chknumval:	chknumval.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- logcontrol:	logcontrol.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- numberstr: numberstr.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- pmcdgone:	pmcdgone.c localconfig.h
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- slow_af:	slow_af.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- mmv_poke:	mmv_poke.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- labels:	labels.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- mergelabels:	mergelabels.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- mergelabelsets:	mergelabelsets.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- parselabels:	parselabels.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- traverse_return_codes:	traverse_return_codes.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- getdomainname:	getdomainname.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- pmstrn:	pmstrn.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- pmfstring:	pmfstring.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- usergroup:	usergroup.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- derived_help:	derived_help.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- derived_control:	derived_control.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- ready-or-not:	ready-or-not.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- throttle:	throttle.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- throttle_timeout:	throttle_timeout.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- y2038:	y2038.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- pdu-gadget:	pdu-gadget.c myprintresult.o
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< myprintresult.o $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- strnfoo:	strnfoo.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- mmv_ondisk:	mmv_ondisk.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- newcontext:	newcontext.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- scanindex:	scanindex.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- localtime:	localtime.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- unregister:	unregister.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- genpmns:	genpmns.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- undelta:	undelta.c libpcp.h
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- series_time_parse_test:	series_time_parse_test.c libpcp.h
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+context_test:	context_test.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+chkoptfetch:	chkoptfetch.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+archfetch:	archfetch.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+779246:	779246.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+addctxdm:	addctxdm.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+addlabels:	addlabels.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+agenttimeout:	agenttimeout.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+aggrstore:	aggrstore.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+api_abi:	api_abi.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+arch_maxfd:	arch_maxfd.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+archctl_segfault:	archctl_segfault.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+archend:	archend.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+archinst:	archinst.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+badloglabel:	badloglabel.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+badmmv:	badmmv.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+badpmcdpmid:	badpmcdpmid.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+badUnitsStr_r:	badUnitsStr_r.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+bigpmcdpmids:	bigpmcdpmids.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+check_attribute:	check_attribute.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+checkstructs:	checkstructs.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+chk_metric_types:	chk_metric_types.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+chkacc4:	chkacc4.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+chkconnect:	chkconnect.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+chkctx2:	chkctx2.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+chkhelp:	chkhelp.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+chklogputresult:	chklogputresult.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+chkopenlog:	chkopenlog.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+chktrim:	chktrim.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+cleanmapdir:	cleanmapdir.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+clientid:	clientid.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+clienttimeout:	clienttimeout.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+compare:	compare.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+context_fd_leak:	context_fd_leak.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+countmark:	countmark.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+crashpmcd:	crashpmcd.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+ctx_derive:	ctx_derive.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+debug:	debug.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+defctx:	defctx.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+derived:	derived.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+descreqX2:	descreqX2.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+disk_test:	disk_test.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+drain-server:	drain-server.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+eofarch:	eofarch.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+eol:	eol.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+err:	err.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+exectest:	exectest.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+exertz:	exertz.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+fetchgroup:	fetchgroup.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+fetchloop:	fetchloop.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+fetchpdu:	fetchpdu.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+fetchrate:	fetchrate.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+getconfig:	getconfig.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+getcontexthost:	getcontexthost.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+getoptions:	getoptions.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+getversion:	getversion.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+github-50:	github-50.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+grind_conv:	grind_conv.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+hashwalk:	hashwalk.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+hex2nbo:	hex2nbo.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+hrunpack:	hrunpack.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+indom:	indom.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+indom2int:	indom2int.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+infiniband-umad:	infiniband-umad.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+int2indom:	int2indom.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+int2pmid:	int2pmid.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+interp_bug:	interp_bug.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+interp_bug2:	interp_bug2.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+interp_bug3:	interp_bug3.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+interp0:	interp0.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+interp1:	interp1.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+interp2:	interp2.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+interp3:	interp3.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+interp4:	interp4.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+loadconfig2:	loadconfig2.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+loadderived:	loadderived.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+lookupnametest:	lookupnametest.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+mark-bug:	mark-bug.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+mkfiles:	mkfiles.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+multictx:	multictx.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+multifetch:	multifetch.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+myprintresult:	myprintresult.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+nameall:	nameall.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+nullinst:	nullinst.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+nvidia-ml:	nvidia-ml.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+parsehighresinterval:	parsehighresinterval.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+parsehostattrs:	parsehostattrs.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+parsehostspec:	parsehostspec.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+parseinterval:	parseinterval.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+parsemetricspec:	parsemetricspec.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+pdubufbounds:	pdubufbounds.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+permfetch:	permfetch.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+pmconvscale:	pmconvscale.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+pmfg-derived:	pmfg-derived.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+pmid2int:	pmid2int.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+pmnsinarchives:	pmnsinarchives.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+pmnsunload:	pmnsunload.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+pmprintf:	pmprintf.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+pmsetmode:	pmsetmode.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+pmsocks_objstyle:	pmsocks_objstyle.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+pmsprintf:	pmsprintf.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+proc_test:	proc_test.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+profilecrash:	profilecrash.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+progname:	progname.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+pv:	pv.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+qa_libpcp_compat:	qa_libpcp_compat.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+qa_timezone:	qa_timezone.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+read-bf:	read-bf.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+recon:	recon.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+rtimetest:	rtimetest.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+scale:	scale.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+scandata:	scandata.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+scanmeta:	scanmeta.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+stampconv:	stampconv.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+storepast:	storepast.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+storepdu:	storepdu.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+storepmcd:	storepmcd.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+stripmark:	stripmark.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+t_fetch:	t_fetch.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+test_service_notify:	test_service_notify.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+timeshift:	timeshift.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+torture_api:	torture_api.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+torture_logmeta:	torture_logmeta.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+torture-eol:	torture-eol.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+tztest:	tztest.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+unpack:	unpack.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+unpickargs:	unpickargs.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+username:	username.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+wait_for_values:	wait_for_values.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+whichtimezone:	whichtimezone.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+write-bf:	write-bf.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+xarch:	xarch.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+xlog:	xlog.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+xmktime:	xmktime.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+xval:	xval.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
-+
-+xxx:	xxx.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- # --- need libpcp but different versions of PMAPI_VERSION and/or
- #     libpcp.$(DSOSUFFIX)
-@@ -505,19 +1205,31 @@ series_time_parse_test:	series_time_parse_test.c libpcp.h
- getoptions_v2:	getoptions.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -DPMAPI_VERSION=2 -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- api_abi_v2:	api_abi.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -DPMAPI_VERSION=2 -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- # have to play games with libpcp.h so we include the one from
- # ../../src/libpcp3/src/include/pcp, not ./libpcp.h
-+# ... trap games are to preserve libpcp.h if the compile or
-+# $(LINKER_MAKERULE) step fail [thanks coderabbitai], but extra
-+# " :" needed after $(LINKER_MAKERULE) to avoid shell
-+#	Syntax error: ";" unexpected
-+# when $(LINKER_MAKERULE) expands to nothing (like everywhere except
-+# macOS)
- #
- api_abi_compat:	api_abi.c libpcp.h
- 	rm -f $@ 
--	mv libpcp.h libpcp.h.save
--	$(CC) -I../../src/libpcp3/src/include/pcp $(CFLAGS) $(CDEFS) -o $@ $< ../../src/libpcp3/src/$(LIBPCP3)
--	mv libpcp.h.save libpcp.h
-+	`set -e; \
-+	mv libpcp.h libpcp.h.save; \
-+	trap 'mv -f libpcp.h.save libpcp.h' 0 1 2 3 15; \
-+	$(CC) -I../../src/libpcp3/src/include/pcp $(CFLAGS) $(CDEFS) -o $@ $< ../../src/libpcp3/src/$(LIBPCP3); \
-+	$(LINKER_MAKERULE) :; \
-+	mv -f libpcp.h.save libpcp.h; \
-+	trap - 0`
- 
- # --- need libpcp but also PM_CONTEXT_LOCAL
- #
-@@ -525,6 +1237,7 @@ api_abi_compat:	api_abi.c libpcp.h
- fetchrate_lite:	fetchrate_lite.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -DLITE=1 -o $@ fetchrate_lite.c $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- fetchrate_lite.c:	fetchrate.c
- 	rm -f $@
-@@ -533,6 +1246,7 @@ fetchrate_lite.c:	fetchrate.c
- chkctx2_lite:	chkctx2_lite.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -DLITE=1 -o $@ chkctx2_lite.c $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- chkctx2_lite.c:	chkctx2.c
- 	rm -f $@
-@@ -541,18 +1255,22 @@ chkctx2_lite.c:	chkctx2.c
- hp-mib: hp-mib.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -DLITE=1 -o $@ hp-mib.c $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- pcp_lite_crash: pcp_lite_crash.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -DLITE=1 -o $@ pcp_lite_crash.c $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- store: store.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -DLITE=1 -o $@ store.c $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- store_and_fetch: store_and_fetch.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -DLITE=1 -o $@ store_and_fetch.c $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- # --- need libpcp_pmda
- #
-@@ -568,37 +1286,48 @@ domain.h:	$(PCP_VAR_DIR)/pmns/stdpmid
- pmdashutdown:	pmdashutdown.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- dumb_pmda: dumb_pmda.c localconfig.h
- 	$(CCF) $(LCDEFS) $(LCOPTS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- pmdacache: pmdacache.c
- 	$(CCF) $(LCDEFS) $(LCOPTS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- pmdaqueue: pmdaqueue.c
- 	$(CCF) $(LCDEFS) $(LCOPTS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- rootclient: rootclient.c
- 	$(CCF) $(LCDEFS) $(LCOPTS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- atomstr: atomstr.c
- 	$(CCF) $(LCDEFS) $(LCOPTS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- semstr: semstr.c
- 	$(CCF) $(LCDEFS) $(LCOPTS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- keycache: keycache.c
- 	$(CCF) $(LCDEFS) $(LCOPTS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- keycache2: keycache2.c
- 	$(CCF) $(LCDEFS) $(LCOPTS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- badpmda: badpmda.c
- 	$(CCF) $(LCDEFS) $(LCOPTS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- torture_cache:	torture_cache.o 
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.o $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- # --- need libpcp_gui
- #
-@@ -606,88 +1335,121 @@ torture_cache:	torture_cache.o
- record:	record.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_gui
-+	$(LINKER_MAKERULE)
- 
- record-setarg: record-setarg.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_gui
-+	$(LINKER_MAKERULE)
- 
- # --- need libpcp_mmv
- #
- mmv%:	mmv%.o
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_mmv
-+	$(LINKER_MAKERULE)
- 
- # --- need extra libraries
- #
- pducheck:	pducheck.o 
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ pducheck.o $(TRACELIB) $(LDLIBS) -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- pducrash:	pducrash.o 
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ pducrash.o $(TRACELIB) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- pdu-server:	pdu-server.o
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ pdu-server.o $(TRACELIB) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- obs:	obs.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ obs.c $(TRACELIB) 
-+	$(LINKER_MAKERULE)
- 
- torture_trace:	torture_trace.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ torture_trace.c $(LIB_FOR_PTHREADS) $(TRACELIB) 
-+	$(LINKER_MAKERULE)
- 
- tstate:	tstate.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ tstate.c $(TRACELIB) 
-+	$(LINKER_MAKERULE)
- 
- tabort:	tabort.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ tabort.c $(TRACELIB) 
-+	$(LINKER_MAKERULE)
- 
- sortinst:	sortinst.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ sortinst.c $(LIB_FOR_REGEX)
-+	$(LINKER_MAKERULE)
- 
+@@ -654,6 +655,11 @@ sortinst:	sortinst.c
  # --- need libpcp_import
  #
  
@@ -1367,243 +111,8 @@ index dd152a6412..2009bd65b0 100644
 +
  check_import:	check_import.c
  	rm -f $@
--	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_import
-+	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_archive -lpcp_import
-+	$(LINKER_MAKERULE)
- 
- check_import_name:	check_import_name.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_import
-+	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_archive -lpcp_import
-+	$(LINKER_MAKERULE)
-+
-+check_import_append:	check_import_append.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_archive -lpcp_import
-+
-+check_volsize:	check_volsize.c
-+	rm -f $@
-+	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_archive -lpcp_import
- 
- check_pmiend_fdleak:	check_pmiend_fdleak.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_import
-+	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_archive -lpcp_import
-+	$(LINKER_MAKERULE)
- 
- check_pmi_errconv:	check_pmi_errconv.c
- 	rm -f $@
--	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_import
-+	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_archive -lpcp_import
-+	$(LINKER_MAKERULE)
- 
- # --- need libpcp_web
- #
- httpcache:	httpcache.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_pmda -lpcp_web -lpcp_mmv
-+	$(LINKER_MAKERULE)
- 
- httpfetch:	httpfetch.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_pmda -lpcp_web -lpcp_mmv
-+	$(LINKER_MAKERULE)
- json_test:	json_test.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_pmda -lpcp_web -lpcp_mmv
-+	$(LINKER_MAKERULE)
- sha1int2ext:	sha1int2ext.o
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_pmda -lpcp_web -lpcp_mmv
-+	$(LINKER_MAKERULE)
- sha1ext2int:	sha1ext2int.o
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_pmda -lpcp_web -lpcp_mmv
-+	$(LINKER_MAKERULE)
- 
- # --- need libpcp_fault
- #
-@@ -695,10 +1457,12 @@ sha1ext2int:	sha1ext2int.o
- check_fault_injection: check_fault_injection.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -DPM_FAULT_INJECTION=1 -o $@ $@.c $(LDLIBS) -lpcp_fault -lpcp -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- exercise_fault: exercise_fault.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -DPM_FAULT_INJECTION=1 -o $@ $@.c $(LDLIBS) -lpcp_fault -lpcp -lpcp_pmda
-+	$(LINKER_MAKERULE)
- 
- # --- need lib for pthreads
- #
-@@ -706,71 +1470,88 @@ exercise_fault: exercise_fault.c
- multithread0:	multithread0.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread1:	multithread1.c
- 	rm -f $@
- ifeq "$(TARGET_OS)" "darwin"
- 	@# see comments in multithread1.c to explain this crock
- 	$(CCF) $(CDEFS) -Ddarwin_hack=1 -o $@ $@.c $(LIB_FOR_PTHREADS) -framework CoreFoundation $(LDLIBS)
-+	$(LINKER_MAKERULE)
- else
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- endif
- 
- multithread2:	multithread2.c localconfig.h
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread3:	multithread3.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread4:	multithread4.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread5:	multithread5.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread6:	multithread6.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread7:	multithread7.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread8:	multithread8.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread9:	multithread9.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread10:	multithread10.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread11:	multithread11.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread12:	multithread12.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread13:	multithread13.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- multithread14:	multithread14.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- exerlock:	exerlock.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- # --- binary format dependencies
- #
-@@ -778,6 +1559,7 @@ exerlock:	exerlock.c
- ifeq ($(HAVE_64), 1)
- pv64: pv.c
- 	$(CCF) $(CDEFS) -o $@ pv.c $(LDLIBS)
-+	$(LINKER_MAKERULE)
- else
- pv64:
- endif
-@@ -788,24 +1570,29 @@ endif
- torture_indom: torture_indom.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ torture_indom.c $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- units-parse: units-parse.c
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ units-parse.c $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- # --- need add_ctx_dm()
- #
- grind_ctx:	grind_ctx.o addctxdm.o
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $^ $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- churnctx:	churnctx.o addctxdm.o
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $^ $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- torture_pmns: torture_pmns.o addctxdm.o
- 	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $^ $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- # --- miscellaneous
- #
-@@ -839,10 +1626,12 @@ ifeq "$(HAVE_CMOCKA)" "true"
- test_encodings:	test_encodings.c
- 	rm -f $@
- 	$(CCF) $(CMOCKACFLAGS) $(CDEFS) -o $@ $^ $(LDLIBS) $(LIB_FOR_CMOCKA) -lpcp_pmda -lpcp_web -lpcp_mmv
-+	$(LINKER_MAKERULE)
- 
- test_hostspec:	test_hostspec.c
- 	rm -f $@
- 	$(CCF) $(CMOCKACFLAGS) $(CDEFS) -o $@ $^ $(LDLIBS) $(LIB_FOR_CMOCKA)
-+	$(LINKER_MAKERULE)
- else
- test_encodings:
- test_hostspec:
-@@ -859,21 +1648,26 @@ dumpstack:	dumpstack.c
- 	rm -f $@
- ifeq "$(TOPDIR)" ""
- 	$(CC) -I$(PCP_INC_DIR) -I. $(PCFLAGS) -o $@ -rdynamic $^ -lpcp
-+	$(LINKER_MAKERULE)
- else
- 	$(CC) -I$(TOPDIR)/src/include -I. $(PCFLAGS) -o $@ -rdynamic $^ -L$(TOPDIR)/src/libpcp/$(LIBPCP_ABIDIR) $(LDLIBS) -lpcp
-+	$(LINKER_MAKERULE)
- endif
- 
- ifneq ($(NVIDIAQALIB),)
- $(NVIDIAQALIB):	nvidia-ml.o
- 	$(CC) $(LDFLAGS) $(_SHAREDOPTS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- endif
- 
- ifneq ($(IBUMADQALIB),)
- $(IBUMADQALIB):	infiniband-umad.o
- 	$(CC) $(LDFLAGS) $(_SHAREDOPTS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- 
- $(IBVERBSQALIB):	infiniband-verbs.o
- 	$(CC) $(LDFLAGS) $(_SHAREDOPTS) -o $@ $< $(LDLIBS)
-+	$(LINKER_MAKERULE)
- endif
- 
- arch_maxfd.o:	localconfig.h
-@@ -972,6 +1766,8 @@ xmktime.o:	libpcp.h
+ 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_import
+@@ -972,6 +978,8 @@ xmktime.o:	libpcp.h
  xxx.o:	libpcp.h
  y2038.o:	libpcp.h
  
@@ -1612,6 +121,7 @@ index dd152a6412..2009bd65b0 100644
  bozo:
  	@echo CFILES_TARGETS=$(CFILES_TARGETS)
  	@echo "patsubst ->" $(patsubst %.c,%,$(CFILES_TARGETS))
+
 diff --git a/qa/src/check_cloexec.c b/qa/src/check_cloexec.c
 new file mode 100644
 index 0000000000..ebc438d301
diff --git a/pcp-7.1.5-timezone-zoneinfo-validation.patch b/pcp-7.1.5-timezone-zoneinfo-validation.patch
index 9b1d62a..5327a34 100644
--- a/pcp-7.1.5-timezone-zoneinfo-validation.patch
+++ b/pcp-7.1.5-timezone-zoneinfo-validation.patch
@@ -131,19 +131,19 @@ index 16c5aa35e3..1103b1f526 100644
  4751 libpcp threads valgrind local pcp helgrind
  9000 other local
 diff --git a/qa/src/GNUlocaldefs b/qa/src/GNUlocaldefs
-index 2009bd65b0..1d2fa9982b 100644
+index 937d263893..a656058115 100644
 --- a/qa/src/GNUlocaldefs
 +++ b/qa/src/GNUlocaldefs
-@@ -63,7 +63,7 @@ CFILES = disk_test.c exercise.c context_test.c chkoptfetch.c \
- 	multithread8.c multithread9.c multithread10.c multithread11.c \
- 	multithread12.c multithread13.c multithread14.c \
- 	exerlock.c hashwalk.c parsehostattrs.c parsehostspec.c getoptions.c \
+@@ -57,7 +57,7 @@ CFILES = disk_test.c exercise.c context_test.c chkoptfetch.c \
+ 	strnfoo.c mmv_ondisk.c newcontext.c api_abi.c interp_bug3.c \
+ 	pmsetmode.c scanindex.c localtime.c httpcache.c unregister.c \
+ 	genpmns.c undelta.c series_time_parse_test.c derived_control.c \
 -	check_cloexec.c
 +	check_cloexec.c check_tz.c
  
- 
  ifeq ($(shell test -f ../localconfig && echo 1), 1)
-@@ -1399,6 +1399,11 @@ check_cloexec:	check_cloexec.c
+ include ../localconfig
+@@ -660,6 +660,11 @@ check_cloexec:	check_cloexec.c
  	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS)
  	$(LINKER_MAKERULE)
  
@@ -154,7 +154,8 @@ index 2009bd65b0..1d2fa9982b 100644
 +
  check_import:	check_import.c
  	rm -f $@
- 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_archive -lpcp_import
+ 	$(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_import
+
 diff --git a/qa/src/check_tz.c b/qa/src/check_tz.c
 new file mode 100644
 index 0000000000..ad96444f9c