4 changed files with 87 additions and 71 deletions
--- a/SOURCES/libpfm-gcc14.patch
+++ b/SOURCES/libpfm-gcc14.patch
@ -0,0 +1,21 @@
+commit cb944829e0940d74009e09b8985b4f2139f5cb3b
+Author: William Cohen <wcohen@redhat.com>
+Date:   Mon Jan 29 16:23:43 2024 -0500
+
+    Correct s390x code to avoid GCC-14 -Werror=calloc-transposed-args errors
+
+diff --git a/lib/pfmlib_s390x_cpumf.c b/lib/pfmlib_s390x_cpumf.c
+index d8ce22d..718f5f8 100644
+--- a/lib/pfmlib_s390x_cpumf.c
+++ b/lib/pfmlib_s390x_cpumf.c
+@@ -216,8 +216,8 @@ static int pfm_cpumcf_init(void *this)
+ 		break;
+ 	}
+ 
+-	cpumcf_pe = calloc(sizeof(*cpumcf_pe),
+-			   cfvn_set_count + csvn_set_count + ext_set_count);
+	cpumcf_pe = calloc(cfvn_set_count + csvn_set_count + ext_set_count,
+			   sizeof(*cpumcf_pe));
+ 	if (cpumcf_pe == NULL)
+ 		return PFM_ERR_NOMEM;
+ 
--- a/SOURCES/libpfm-initp.patch
+++ b/SOURCES/libpfm-initp.patch
@ -1,19 +0,0 @@
-commit 75d8bb06f6ea0d7a8edf8e080c7ea6d434d598ff
-Author: William Cohen <wcohen@redhat.com>
-Date:   Fri Apr 14 16:07:07 2023 -0400
-
-    Make sure that p is set to a known value before using.
-
-diff --git a/lib/pfmlib_perf_event_pmu.c b/lib/pfmlib_perf_event_pmu.c
-index 637c5b1..8f7d7d1 100644
--- a/lib/pfmlib_perf_event_pmu.c
-+++ b/lib/pfmlib_perf_event_pmu.c
-@@ -361,7 +361,7 @@ gen_tracepoint_table(void)
- {
- 	DIR *dir1, *dir2;
- 	struct dirent *d1, *d2;
-	perf_event_t *p;
-+	perf_event_t *p = NULL;
- 	perf_umask_t *um;
- 	char d2path[MAXPATHLEN];
- 	char idpath[MAXPATHLEN];
--- a/SOURCES/libpfm-zen4.patch
+++ b/SOURCES/libpfm-zen4.patch
@ -1,29 +0,0 @@
-commit 1befa3d200cc17d5a278fcb2f597c4876c58f949
-Author: Stephane Eranian <eranian@gmail.com>
-Date:   Tue Apr 25 00:35:41 2023 -0700
-
-    fix AMD Zen3/Zen4 detection
-    
-    To cover more models of Zen4.
-    
-    Signed-off-by: Stephane Eranian <eranian@gmail.com>
-
-diff --git a/lib/pfmlib_amd64.c b/lib/pfmlib_amd64.c
-index e51a43d..0c6702d 100644
--- a/lib/pfmlib_amd64.c
-+++ b/lib/pfmlib_amd64.c
-@@ -181,10 +181,10 @@ amd64_get_revision(pfm_amd64_config_t *cfg)
- 	} else if (cfg->family == 22) { /* family 16h */
- 		rev = PFM_PMU_AMD64_FAM16H;
- 	} else if (cfg->family == 25) { /* family 19h */
-                if (cfg->model <= 0x0f || (cfg->model >= 0x20 && cfg->model <= 0x5f)) {
-                  rev = PFM_PMU_AMD64_FAM19H_ZEN3;
-		} else if (cfg->model == 17) {
-                        rev = PFM_PMU_AMD64_FAM19H_ZEN4;
-+                if (cfg->model >= 0x60 || (cfg->model >= 0x10 && cfg->model <= 0x1f)) {
-+			rev = PFM_PMU_AMD64_FAM19H_ZEN4;
-+		} else {
-+			rev = PFM_PMU_AMD64_FAM19H_ZEN3;
-                 }
-         }
- 
--- a/SPECS/libpfm.spec
+++ b/SPECS/libpfm.spec
@ -12,7 +12,7 @@

 Name:		libpfm
 Version:	4.13.0
-Release:	4%{?dist}
+Release:	10%{?dist}

 Summary:	Library to encode performance events for use by perf tool

@ -20,8 +20,7 @@ License:	MIT
 URL:		http://perfmon2.sourceforge.net/
 Source0:	http://sourceforge.net/projects/perfmon2/files/libpfm4/%{name}-%{version}.tar.gz
 Patch2:		libpfm-python3-setup.patch
-Patch3:		libpfm-initp.patch
-Patch4:		libpfm-zen4.patch
+Patch3:		libpfm-gcc14.patch

 BuildRequires: make
 BuildRequires:	gcc
@ -39,6 +38,7 @@ kernels performance monitoring interfaces. The current version provides support
 for the perf_events interface available in upstream Linux kernels since v2.6.31.

 %package devel
+License:	MIT
 Summary:	Development library to encode performance events for perf_events based tools
 Requires:	%{name}%{?_isa} = %{version}-%{release}

@ -48,6 +48,7 @@ applications for the perf_events interface.

 %if %{with_static}
 %package static
+License:	MIT
 Summary:	Static library to encode performance events for perf_events based tools
 Requires:	%{name}%{?_isa} = %{version}-%{release}

@ -58,6 +59,7 @@ applications for the perf_events interface.

 %if %{with python}
 %package -n python3-libpfm
+License:	MIT AND LicenseRef-Fedora-UltraPermissive
 %{?python_provide:%python_provide python3-libpfm}
 # Remove before F30
 Provides: %{name}-python = %{version}-%{release}
@ -72,9 +74,12 @@ Python bindings for libpfm4 and perf_event_open system call.

 %prep
 %setup -q
-%patch2 -p1 -b .python3
-%patch3 -p1 -b .test
-%patch4 -p1 -b .zen4
+%patch -P2 -p1 -b .python3
+%patch -P3 -p1 -b .gcc14
+# to prevent setuptools from installing an .egg, we need to pass --root to setup.py install
+# see https://github.com/pypa/setuptools/issues/3143
+# and https://github.com/pypa/pip/issues/11501
+sed -i 's/--prefix=$(DESTDIR)$(PYTHON_PREFIX)/--root=$(DESTDIR) --prefix=$(PYTHON_PREFIX)/' python/Makefile

 %build
 %if %{with python}
@ -90,14 +95,15 @@ Python bindings for libpfm4 and perf_event_open system call.
 rm -rf $RPM_BUILD_ROOT

 %if %{with python}
-%global python_config CONFIG_PFMLIB_NOPYTHON=n PYTHON_PREFIX=$RPM_BUILD_ROOT/%{python_prefix}
+%global python_config CONFIG_PFMLIB_NOPYTHON=n PYTHON_PREFIX=%{python_prefix}
 %else
 %global python_config CONFIG_PFMLIB_NOPYTHON=y
 %endif

 make \
-    PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-    LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+    DESTDIR=$RPM_BUILD_ROOT \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libdir} \
    %{python_config} \
    LDCONFIG=/bin/true \
    install
@ -124,28 +130,65 @@ rm $RPM_BUILD_ROOT%{_libdir}/lib*.a

 %if %{with python}
 %files -n python3-libpfm
-%{python3_sitearch}/*
+%{python3_sitearch}/perfmon-*.egg-info/
+%{python3_sitearch}/perfmon/
 %endif

 %changelog
-* Mon Jun 12 2023 William cohen <wcohen@redhat.com> - 4.13.0-4
- Identify AMD Bergamo processors.
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 4.13.0-10
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.13.0-9
+- Bump release for June 2024 mass rebuild
+
+* Mon Jan 29 2024 William Cohen <wcohen@redhat.com> - 4.13.0-8
+- Fix gcc-14 -Werror=calloc-transposed-args compatibility
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Aug 1 2023 William Cohen <wcohen@redhat.com> - 4.13.0-5
+- migrated to SPDX license
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 4.13.0-3
+- Rebuilt for Python 3.12
+
+* Tue Apr 25 2023 Miro Hrončok <mhroncok@redhat.com> - 4.13.0-2
+- Don't install a Python .egg
+
+* Tue Mar 28 2023 William Cohen <wcohen@redhat.com> - 4.13.0-1
+- Rebase on libpfm-4.13.0.
+
+* Tue Mar 14 2023 William Cohen <wcohen@redhat.com> - 4.11.0-12
+- Add libpfm upstream patch to allow papi-7.0.1 to build.
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

-* Wed May 3 2023 William cohen <wcohen@redhat.com> - 4.13.0-3
- Rebuild for rhbz #2186927.
+* Tue Jun 21 2022 Python Maint <python-maint@redhat.com> - 4.11.0-9
+- Fix FTBFS due to gcc12. (rhbz2045823)

-* Wed May 3 2023 William cohen <wcohen@redhat.com> - 4.13.0-2
- Rebuild for rhbz #2186927.
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 4.11.0-8
+- Rebuilt for Python 3.11

-* Fri Apr 14 2023 William cohen <wcohen@redhat.com> - 4.13.0-1
- Rebase to libpf-4.13.0 (rhbz #2185652)
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.11.0-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.11.0-5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 4.11.0-5
+- Rebuilt for Python 3.10

 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild