From 30c36b8fd2ff7f246bebd7ea5823b5b91ca5122c Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 11 Mar 2025 07:40:14 +0000 Subject: [PATCH] Import from CS git --- .opentelemetry-collector.metadata | 2 +- SPECS/opentelemetry-collector.spec | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.opentelemetry-collector.metadata b/.opentelemetry-collector.metadata index 1ac8c40..f345b69 100644 --- a/.opentelemetry-collector.metadata +++ b/.opentelemetry-collector.metadata @@ -1 +1 @@ -7564ab87ae9d79787e494e430df728657f8ce036 SOURCES/redhat-opentelemetry-collector-0.107.0.tar.gz +38f5ad96f29b9cae1d3e44eebc12851399f0d270 SOURCES/redhat-opentelemetry-collector-0.107.0.tar.gz diff --git a/SPECS/opentelemetry-collector.spec b/SPECS/opentelemetry-collector.spec index a875a46..9bd2d6d 100644 --- a/SPECS/opentelemetry-collector.spec +++ b/SPECS/opentelemetry-collector.spec @@ -12,7 +12,7 @@ Collector with the supported components for a Red Hat build of OpenTelemetry} %global godocs README.md Name: opentelemetry-collector -Release: 2%{?dist} +Release: 4%{?dist} Summary: Red Hat build of OpenTelemetry License: Apache-2.0 @@ -26,6 +26,8 @@ BuildRequires: binutils BuildRequires: git BuildRequires: policycoreutils, checkpolicy, selinux-policy-devel +Requires(pre): shadow-utils +Requires(pre): util-linux Requires(pre): /usr/sbin/useradd, /usr/bin/getent Requires(postun): /usr/sbin/userdel @@ -69,7 +71,9 @@ install -m 0755 -p ./opentelemetry-collector-with-options %{buildroot}%{_bindir} /usr/bin/getent passwd observability > /dev/null || /usr/sbin/useradd -r -M -s /sbin/nologin -g observability -G systemd-journal observability %postun -/usr/sbin/userdel observability +if [ $1 -eq 0 ]; then + /usr/sbin/userdel observability +fi %post semodule -i %{_datadir}/selinux/packages/otel_collector_journald.pp @@ -102,6 +106,18 @@ fi %{_bindir}/* %changelog +* Thu Mar 06 2025 Conor Cowman - 0.107.0-4 +- Bump revision +- Add runtime requirements for shadow-utils and util-linux to ensure successful creation of observability user on installation +- Modify post-uninstallation stage to only delete delete the observability user on full uninstallation to prevent the user being deleted during upgrades + Resolves: RHEL-81967 + +* Wed Feb 12 2025 Conor Cowman - 0.107.0-3 +- Bump revision +- Update tarball golang from 1.21.0 to 1.22.11 +- Update addresses CVE-2024-45336 + Resolves: RHEL-79113 + * Tue Feb 11 2025 Kseniia Nivnia - 0.107.0-2 - Bump revision - Update tarball name to match upstream