From d576b46c3c783ddcf6f9561f83cf59d3802e268e Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 16 May 2024 10:41:47 +1000 Subject: [PATCH] pmcd: benign adjustment to tmpfiles.d setup for pmcd logs Related: RHEL-30198 --- pcp.spec | 6 +++++- redhat-issues-RHEL-30198-pmcd-logdir-tmpfiles.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 redhat-issues-RHEL-30198-pmcd-logdir-tmpfiles.patch diff --git a/pcp.spec b/pcp.spec index 43fa0ae..e8c1cdd 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,6 +1,6 @@ Name: pcp Version: 6.2.2 -Release: 1%{?dist} +Release: 2%{?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 @@ -9,6 +9,7 @@ Source0: https://github.com/performancecopilot/pcp/releases/pcp-%{version}.src.t # Keep xx-default-archive-version.patch for the life of RHEL9 Patch1: redhat-issues-RHEL-2317-default-archive-version.patch +Patch2: redhat-issues-RHEL-30198-pmcd-logdir-tmpfiles.patch %if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 ExcludeArch: %{ix86} @@ -3536,6 +3537,9 @@ fi %files zeroconf -f pcp-zeroconf-files.rpm %changelog +* Thu May 15 2024 Nathan Scott - 6.2.2-2 +- Adjust tmpfiles.d permissions for pmcd logdir (RHEL-30198) + * Wed May 15 2024 Nathan Scott - 6.2.2-1 - Rebase to latest stable version of PCP (RHEL-30198) - Fix pcp2openmetrics on s390x reading from an archive (RHEL-32407) diff --git a/redhat-issues-RHEL-30198-pmcd-logdir-tmpfiles.patch b/redhat-issues-RHEL-30198-pmcd-logdir-tmpfiles.patch new file mode 100644 index 0000000..3b610f8 --- /dev/null +++ b/redhat-issues-RHEL-30198-pmcd-logdir-tmpfiles.patch @@ -0,0 +1,12 @@ +diff -Naurp pcp-6.2.2.orig/tmpfiles.init.setup.in pcp-6.2.2/tmpfiles.init.setup.in +--- pcp-6.2.2.orig/tmpfiles.init.setup.in 2024-05-07 10:37:04.000000000 +1000 ++++ pcp-6.2.2/tmpfiles.init.setup.in 2024-05-16 09:18:49.200282601 +1000 +@@ -3,7 +3,7 @@ + # Type Path Mode User Group Age Argument + D PCP_RUN_DIR 0775 PCP_USER PCP_GROUP - - + d PCP_LOG_DIR 0775 PCP_USER PCP_GROUP - - +-d PCP_LOG_DIR/pmcd 0775 root root - - ++d PCP_LOG_DIR/pmcd 0755 root root - - + d PCP_LOG_DIR/pmfind 0775 PCP_USER PCP_GROUP - - + d PCP_LOG_DIR/pmie 0775 PCP_USER PCP_GROUP - - + d PCP_LOG_DIR/pmlogger 0775 PCP_USER PCP_GROUP - -