Architecture specific change in rpms/pcp.git

The package rpms/pcp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/pcp.git/commit/?id=c60560130d9cdaf63....

Change:
+%ifarch %{ix86}

Thanks.

Full change:
============

commit 0311d145f10b2716804f8ba0aedb21ca40b1f3b5
Merge: 67e38f5 c605601
Author: Nathan Scott 
Date:   Mon Mar 31 13:03:39 2025 +1100

Merge branch 'rawhide' into f40

commit c60560130d9cdaf632976fafe1bbabaf439a1401
Author: Nathan Scott 
Date:   Mon Mar 31 13:02:41 2025 +1100

Update to latest stable upstream release

diff --git a/pcp-gcc15.patch b/pcp-gcc15.patch
deleted file mode 100644
index f64e023..0000000
--- a/pcp-gcc15.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-commit 6502759a528dbd5a816431ccc0fd51bfa752a934
-Author: Will Cohen 
-Date:   Wed Jan 29 12:25:43 2025 +1100
-
-    build: fixes to allow pcp to build with gcc version 15
-
-diff --git a/qa/src/hp-mib.c b/qa/src/hp-mib.c
-index 7293a7e11..4a3f8a991 100644
---- a/qa/src/hp-mib.c
-+++ b/qa/src/hp-mib.c
-@@ -56,9 +56,11 @@ static const char *metrics[] = {
- static pmID pmids[NMETRICS];
- 
- static int
--int_compare(int *a, int *b)
-+int_compare(const void *a, const void *b)
- {
--    return *a - *b;
-+    const int x = *(const int *)a;
-+    const int y = *(const int *)b;
-+    return x - y;
- }
- 
- int
-@@ -73,7 +75,6 @@ main(int argc, char **argv)
-     int		all_n;
-     int		*all_inst;
-     char	**all_names;
--    int		(*int_cmp)() = int_compare;
-     static char	*usage = "[-D debugspec] [-n namespace]";
- 
-     pmSetProgname(argv[0]);
-@@ -155,7 +156,7 @@ main(int argc, char **argv)
-      * sort the instance identifiers
-      * [This has to be done before every fetch]
-      */
--    qsort(all_inst, all_n, sizeof(int), int_cmp);
-+    qsort(all_inst, all_n, sizeof(int), int_compare);
- 
-     /*
-      * establish an explicit instance profile
-diff --git a/src/pmdas/summary/summary.c b/src/pmdas/summary/summary.c
-index 5d63c60c3..492fb14db 100644
---- a/src/pmdas/summary/summary.c
-+++ b/src/pmdas/summary/summary.c
-@@ -277,7 +277,7 @@ summary_store(pmResult *result, pmdaExt * ex)
- void
- summary_init(pmdaInterface *dp)
- {
--    void (*callback)() = freeResultCallback;
-+    void (*callback)(pmResult *) = freeResultCallback;
- 
-     dp->version.two.profile = summary_profile;
-     dp->version.two.fetch = summary_fetch;
-diff --git a/src/zabbix-agent/src/zbxpcp.c b/src/zabbix-agent/src/zbxpcp.c
-index e6b83391d..7112d0aff 100644
---- a/src/zabbix-agent/src/zbxpcp.c
-+++ b/src/zabbix-agent/src/zbxpcp.c
-@@ -185,9 +185,9 @@ static void zbx_module_pcp_add_metric(const char *name)
-     metrics[metric_count].key = metric;
-     metrics[metric_count].flags = 0;
-     if (zbx_version >= ZBX_VERSION3)
--	metrics[metric_count].function = zbx_module3_pcp_fetch_metric;
-+	metrics[metric_count].function = (int (*)()) zbx_module3_pcp_fetch_metric;
-     else
--	metrics[metric_count].function = zbx_module2_pcp_fetch_metric;
-+	metrics[metric_count].function = (int (*)()) zbx_module2_pcp_fetch_metric;
-     metrics[metric_count].test_param = NULL;
-     metric_count++;
- }
diff --git a/pcp.spec b/pcp.spec
index de0b9a0..5dca460 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,14 +1,11 @@
 Name:    pcp
-Version: 6.3.4
+Version: 6.3.7
 Release: 1%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPL-2.0-or-later AND LGPL-2.1-or-later AND CC-BY-3.0
 URL:     https://pcp.io

Source0: https://github.com/performancecopilot/pcp/releases/pcp-%%7Bversion%7D.src.ta...
-
-Patch0: pcp-gcc15.patch
-
 %if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
 ExcludeArch: %{ix86}
 %endif
@@ -32,12 +29,7 @@ ExcludeArch: %{ix86}
 %global _ps_executable /bin/ps
 %endif

-# On 32-bit systems time64_t and perl modules do not play well together
-%ifarch ix86
-%global disable_perl 1
-%else
 %global disable_perl 0
-%endif

%if 0%{?fedora} || 0%{?rhel} > 5
 %global disable_selinux 0
@@ -169,6 +161,17 @@ ExcludeArch: %{ix86}
 %global disable_mssql 1
 %endif

+# No mysql support on 32-bit x86 platforms from el9 and later
+%ifarch %{ix86}
+%if 0%{?rhel} >= 9
+%global disable_mysql 1
+%else
+%global disable_mysql 0
+%endif
+%else
+%global disable_mysql 0
+%endif
+
 # support for pmdanutcracker (perl deps missing on rhel)
 %if 0%{?rhel} == 0
 %global disable_nutcracker 0
@@ -440,6 +443,12 @@ Requires: pcp-selinux = %{version}-%{release}
 %global _with_mongodb --with-pmdamongodb=yes
 %endif

+%if %{disable_mysql}
+%global _with_mysql --with-pmdamysql=no
+%else
+%global _with_mysql --with-pmdamysql=yes
+%endif
+
 %if %{disable_nutcracker}
 %global _with_nutcracker --with-pmdanutcracker=no
 %else
@@ -564,7 +573,7 @@ Obsoletes: pcp-gui-testsuite < 3.9.5
 # both of which are now obsoleted by the base pcp package
 Requires: pcp-pmda-activemq pcp-pmda-bonding pcp-pmda-dbping pcp-pmda-ds389 pcp-pmda-ds389log
 Requires: pcp-pmda-elasticsearch pcp-pmda-gpfs pcp-pmda-gpsd pcp-pmda-lustre
-Requires: pcp-pmda-memcache pcp-pmda-mysql pcp-pmda-named pcp-pmda-netfilter pcp-pmda-news
+Requires: pcp-pmda-memcache pcp-pmda-named pcp-pmda-netfilter pcp-pmda-news
 Requires: pcp-pmda-nginx pcp-pmda-nfsclient pcp-pmda-pdns pcp-pmda-postfix pcp-pmda-postgresql pcp-pmda-oracle
 Requires: pcp-pmda-samba pcp-pmda-slurm pcp-pmda-zimbra
 Requires: pcp-pmda-dm pcp-pmda-apache
@@ -604,6 +613,9 @@ Requires: pcp-pmda-mongodb
 %if !%{disable_mssql}
 Requires: pcp-pmda-mssql 
 %endif
+%if !%{disable_mysql}
+Requires: pcp-pmda-mysql 
+%endif
 %if !%{disable_snmp}
 Requires: pcp-pmda-snmp
 %endif
@@ -1317,6 +1329,7 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for
 collecting metrics about Memcached.
 #end pcp-pmda-memcache

+%if !%{disable_mysql}
 #
 # pcp-pmda-mysql
 #
@@ -1333,6 +1346,7 @@ BuildRequires: perl(DBI) perl(DBD::mysql)
 This package contains the PCP Performance Metrics Domain Agent (PMDA) for
 collecting metrics about the MySQL database.
 #end pcp-pmda-mysql
+%endif

#
 # pcp-pmda-named
@@ -2481,7 +2495,7 @@ sed -i "/PACKAGE_BUILD/s/=[0-9]*/=$_build/" VERSION.pcp
 %if !%{disable_python2} && 0%{?default_python} != 3
 export PYTHON=python%{?default_python}
 %endif
-%configure %{?_with_initd} %{?_with_doc} %{?_with_dstat} %{?_with_ib} %{?_with_gfs2} %{?_with_statsd} %{?_with_perfevent} %{?_with_bcc} %{?_with_bpf} %{?_with_bpftrace} %{?_with_json} %{?_with_mongodb} %{?_with_snmp} %{?_with_nutcracker} %{?_with_python2}
+%configure %{?_with_initd} %{?_with_doc} %{?_with_dstat} %{?_with_ib} %{?_with_gfs2} %{?_with_statsd} %{?_with_perfevent} %{?_with_bcc} %{?_with_bpf} %{?_with_bpftrace} %{?_with_json} %{?_with_mongodb} %{?_with_mysql} %{?_with_snmp} %{?_with_nutcracker} %{?_with_python2}
 make %{?_smp_mflags} default_pcp

%install
@@ -2981,8 +2995,10 @@ exit 0
 %{pmda_remove "$1" "snmp"}
 %endif

+%if !%{disable_mysql}
 %preun pmda-mysql
 %{pmda_remove "$1" "mysql"}
+%endif

%preun pmda-activemq
 %{pmda_remove "$1" "activemq"}
@@ -3391,7 +3407,7 @@ fi

%files pmda-lustrecomm -f pcp-pmda-lustrecomm-files.rpm

-%if !%{disable_perl}
+%if !%{disable_mysql}
 %files pmda-mysql -f pcp-pmda-mysql-files.rpm
 %endif

@@ -3593,6 +3609,10 @@ fi
 %files zeroconf -f pcp-zeroconf-files.rpm

%changelog
+* Mon Mar 31 2025 Nathan Scott  - 6.3.7-1
+- Update PCP selinux policy (BZs 2354510, 2333727, 2333726, 2333725)
+- Update to latest upstream PCP version.
+
 * Fri Mar 14 2025 Nathan Scott  - 6.3.4-1
 - Update to latest upstream PCP version.

diff --git a/sources b/sources
index 7096c44..241d379 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pcp-6.3.4.src.tar.gz) = 1c7ca82c1b2707aab1c505a87df7d4a3407a8a974e6209d2602b93e58bf50a84a08d3ecdbaf05ff8b97d7ca0007ee19a63aaee9299e9f874caefd6de5ba56120
+SHA512 (pcp-6.3.7.src.tar.gz) = ba45f19c45b9153072cee2075c68997599e3f1fe6a7fd9e550c0c78a38677d901679fbe082bcec629477384b7964be9d0fc41f1a4da866ce7f74279e5b375f4e

commit 15dbb7285a978c31ee257646550f6bbde8f432b7
Author: Yaakov Selkowitz 
Date:   Mon Mar 17 18:08:14 2025 -0400

Enable RPM sysusers in ELN builds

ELN (the future RHEL 11) tracks rawhide and has the latest RPM sysusers
    change.  Also, fix a typo (missing leading 0) in a related conditional.

diff --git a/pcp.spec b/pcp.spec
index bad3f26..de0b9a0 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -2870,8 +2870,8 @@ done
 %if !%{disable_selinux}
 %selinux_relabel_pre -s targeted
 %endif
-%if 0%{?fedora} >= 42
-%elif %{?fedora} >= 32 || 0%{?rhel} >= 9
+%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11
+%elif 0%{?fedora} >= 32 || 0%{?rhel} >= 9
 echo u pcpqa - "PCP Quality Assurance" %{_testsdir} /bin/bash | \
   systemd-sysusers --replace=/usr/lib/sysusers.d/pcp-testsuite.conf -
 %else
@@ -2913,7 +2913,7 @@ fi
 %endif

%pre
-%if 0%{?fedora} >= 42
+%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11
 %elif 0%{?fedora} >= 32 || 0%{?rhel} >= 9
 echo u pcp - "Performance Co-Pilot" %{_localstatedir}/lib/pcp | \
   systemd-sysusers --replace=/usr/lib/sysusers.d/pcp.conf -