rpms/pcp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolve an issue with installing sysusers entries

Browse Source 
Resolves: rhbz#2138758
This commit is contained in:
Nathan Scott 2022-11-13 17:02:59 +11:00
parent 5099d4d9f9
commit dfd9327501
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcp.spec
View File

@ -1,15 +1,12 @@
Name: pcp Name: pcp
Version: 6.0.1 Version: 6.0.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: System-level performance monitoring and performance management Summary: System-level performance monitoring and performance management
License: GPLv2+ and LGPLv2+ and CC-BY License: GPLv2+ and LGPLv2+ and CC-BY
URL: https://pcp.io URL: https://pcp.io
%global artifactory https://performancecopilot.jfrog.io/artifactory %global artifactory https://performancecopilot.jfrog.io/artifactory
%global pcp_git_url https://github.com/performancecopilot/pcp/blob
Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz
Source1: %{pcp_git_url}/main/debian/pcp-testsuite.sysusers
Source2: %{pcp_git_url}/main/debian/pcp.sysusers
Patch0: redhat-bugzilla-2117074-vendored_vmlinux.h.patch Patch0: redhat-bugzilla-2117074-vendored_vmlinux.h.patch
Patch1: redhat-bugzilla-2117074-ppc_arm_vmlinux.h.patch Patch1: redhat-bugzilla-2117074-ppc_arm_vmlinux.h.patch
@ -2690,7 +2687,8 @@ done
%selinux_relabel_pre -s targeted %selinux_relabel_pre -s targeted
%endif %endif
%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 %if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
systemd-sysusers --replace=/usr/lib/sysusers.d/pcp-testsuite.conf - < %{SOURCE1} echo u pcpqa - \"PCP Quality Assurance\" %{_testsdir} /bin/bash | \
systemd-sysusers --replace=/usr/lib/sysusers.d/pcp-testsuite.conf -
%else %else
getent group pcpqa >/dev/null || groupadd -r pcpqa getent group pcpqa >/dev/null || groupadd -r pcpqa
getent passwd pcpqa >/dev/null || \ getent passwd pcpqa >/dev/null || \
@ -2732,7 +2730,8 @@ fi
%pre %pre
%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 %if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
systemd-sysusers --replace=/usr/lib/sysusers.d/pcp.conf - < %{SOURCE2} echo u pcp - \"Performance Co-Pilot\" %{_localstatedir}/lib/pcp | \
systemd-sysusers --replace=/usr/lib/sysusers.d/pcp.conf -
%else %else
getent group pcp >/dev/null || groupadd -r pcp getent group pcp >/dev/null || groupadd -r pcp
getent passwd pcp >/dev/null || \ getent passwd pcp >/dev/null || \
@ -3377,6 +3376,9 @@ fi
%files zeroconf -f pcp-zeroconf-files.rpm %files zeroconf -f pcp-zeroconf-files.rpm
%changelog %changelog
* Fri Nov 11 2022 Nathan Scott <nathans@redhat.com> - 6.0.1-2
- Resolve an issue with installing sysusers entries (BZ 2138758)
* Fri Oct 28 2022 Nathan Scott <nathans@redhat.com> - 6.0.1-1 * Fri Oct 28 2022 Nathan Scott <nathans@redhat.com> - 6.0.1-1
- Convert to independent selinux policy (BZs 1941873, 2127037) - Convert to independent selinux policy (BZs 1941873, 2127037)
- Improve pmproxy REST API timeout handling (BZ 2130208) - Improve pmproxy REST API timeout handling (BZ 2130208)

2
sources
View File

@ -1,3 +1 @@
SHA512 (pcp-6.0.1.src.tar.gz) = 922b787a2f28aab6355cb701500890ae83ee93b55047b65f142f9767619b2fbf91abe555106f9aa3f52f851fdb0413a92582dcf8f4dbb49894c2a557e80da5fd SHA512 (pcp-6.0.1.src.tar.gz) = 922b787a2f28aab6355cb701500890ae83ee93b55047b65f142f9767619b2fbf91abe555106f9aa3f52f851fdb0413a92582dcf8f4dbb49894c2a557e80da5fd
SHA512 (pcp-testsuite.sysusers) = ee1eec784356eb5e3b6c49645fcf4f49d4d73cabbe6d4fb6745af2979809c25762248daf4d82bb3b11a9442e87bf50afa277116a90cfd50ea83c5bb4f29a25ab
SHA512 (pcp.sysusers) = c944a80d7ec00635a1e582cce0eeb20f38641179c6539e481f4822fae30caefa4d9462fd61f517364ea1cd37d36bf1828b6540a8a2a948e70151be022321c10d