rpms/rhel-system-roles
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert OL modifications

Browse Source
This commit is contained in:
eabdullin 2025-11-05 08:43:15 +00:00
parent 995030a9a8
commit e4a2d4e099
2 changed files with 7 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
SOURCES/1000-Remove-comments-which-confuse-ruamel.patch
View File

@ -1,54 +0,0 @@
From f6942310a80b227c6fffbc4f3216f5b37204925e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lipinsk=C3=BD?=
<lukas.lipinsky@oracle.com>
Date: Tue, 4 Apr 2023 14:53:23 -0700
Subject: [PATCH] Remove comments which confuse ruamel
When these comments are present, lsr_role2collection.py produces invalid yaml files.
Signed-off-by: David Sloboda <david.x.sloboda@oracle.com>
Signed-off-by: Natalya Naumova <natalya.naumova@oracle.com>
Signed-off-by: Mark Will <mark.will@oracle.com>
Date: Fri, 25 Oct 2024
Subject: Update patch for rhel-system-roles-1.88.9-0.1.el9_5
Signed-off-by: John McWalters <john.mcwalters@oracle.com>
diff -urwN auto-maintenance-1.94.2.orig/selinux-1.8.2/examples/selinux-playbook.yml auto-maintenance-1.94.2/selinux-1.8.2/examples/selinux-playbook.yml
--- auto-maintenance-1.94.2.orig/selinux-1.8.2/examples/selinux-playbook.yml 2025-02-19 07:16:49.084198517 -0800
+++ auto-maintenance-1.94.2/selinux-1.8.2/examples/selinux-playbook.yml 2025-02-19 07:18:57.602444604 -0800
@@ -8,14 +8,6 @@
selinux_state: enforcing
# Switch some SELinux booleans
selinux_booleans:
- # Set the 'samba_enable_home_dirs' boolean to 'on' in the current
- # session only
- - name: samba_enable_home_dirs
- state: true
- # Set the 'ssh_sysadm_login' boolean to 'on' permanently
- - name: ssh_sysadm_login
- state: true
- persistent: true
# Map '/tmp/test_dir' and its subdirectories to the 'user_home_dir_t'
# SELinux file type
selinux_fcontexts:
@@ -40,18 +32,6 @@
state: present
# Manage modules
selinux_modules:
- # Install the 'localpolicy.cil' with priority 300
- - path: localpolicy.cil
- priority: 300
- state: enabled
- # Disable the 'unconfineduser' module with priority 100
- - name: unconfineduser
- priority: 100
- state: disabled
- # Remove the 'temporarypolicy' module with priority 400
- - name: temporarypolicy
- priority: 400
- state: absent
tasks:
- name: Creates directory
file:

24
SPECS/linux-system-roles.spec
View File

@ -24,7 +24,7 @@ Name: linux-system-roles
Url: https://github.com/linux-system-roles
Summary: Set of interfaces for unified system management
Version: 1.96.0
Release: 0.1.0.1%{?dist}
Release: 0.1%{?dist}
License: GPLv3+ and MIT and BSD and Python
%global _pkglicensedir %{_licensedir}/%{name}
@ -244,7 +244,6 @@ Source1003: vendoring-prep.inc
Source1004: vendoring-build.inc
Source995: CHANGELOG.md
Patch1000: 1000-Remove-comments-which-confuse-ruamel.patch
BuildArch: noarch
@ -259,12 +258,12 @@ BuildRequires: python3-setuptools
%description
Collection of Ansible roles and modules that provide a stable and
consistent configuration interface for managing multiple versions
of Oracle Linux.
of Red Hat Enterprise Linux.
%else
%description
Collection of Ansible roles and modules that provide a stable and
consistent configuration interface for managing multiple versions
of Fedora, Red Hat Enterprise Linux, Oracle Linux & CentOS.
of Fedora, Red Hat Enterprise Linux & CentOS.
%endif
%if %{with collection_artifact}
@ -295,7 +294,6 @@ end
%prep
# BEGIN AUTOGENERATED SETUP
%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31 -a32 -a33 -a34 -n %{getarchivedir 0}
%patch1000 -p1
# END AUTOGENERATED SETUP
# vendoring prep steps, if any
@ -423,11 +421,11 @@ fi
# Convert the upstream collection readme to the downstream one
%{SOURCE998} lsr_role2collection/collection_readme.md
%{python3} ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
"Linux System Roles Ansible Collection" \
"https://github.com/linux-system-roles/linux-system-roles.github.io/" \
"https://github.com/linux-system-roles/linux-system-roles.github.io/blob/master/README.md" \
"Red Hat Enterprise Linux System Roles Ansible Collection" \
"https://linux-system-roles.github.io" \
"https://github.com/oracle/oracle-linux" \
"https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/administration_and_configuration_tasks_using_system_roles_in_rhel" \
"https://access.redhat.com/articles/3050101" \
"https://issues.redhat.com/secure/CreateIssueDetails!init.jspa?pid=12332745&summary=Your%20request%20summary&issuetype=1&priority=10200&labels=Partner-Feature-Request&components=12380283" \
> galaxy.yml.tmp
# we vendor-in all of the dependencies on rhel, so remove them
rm -f lsr_role2collection/collection_requirements.txt
@ -697,13 +695,6 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
%endif
%changelog
* Tue Nov 04 2025 EL Errata <el-errata_ww@oracle.com> - 1.96.0-0.1.0.1
- Replace bug reporting url [Orabug: 34202300]
- Replace upstream references from description tag [OLDIS-1810]
- Replace upstream URLs from galaxy_transform.py command in spec file
- Remove comments which confuse ruamel
- Replace upstream reference of Ansible Collection in spec file [Orabug: 32904501]
* Mon Oct 6 2025 Sergei Petrosian <spetrosi@redhat.com> - 1.96.0-0.1
- Resolves: RHEL-100720 : Add an HPC System Role
@ -790,7 +781,6 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
* Fri Sep 13 2024 Rich Megginson <rmeggins@redhat.com> - 1.88.9-0.1
- Resolves: RHEL-56626 : podman - fails to configure and run containers with podman rootless using different username and groupname
- logging - test issue with imuxsock and loginctl used by podman - restart systemd-logind to fix podman tests
- logging - test issue with imuxsock and loginctl used by podman - restart sy.0.1stemd-logind to fix podman tests
- updates collection README for new Automation Hub format
* Wed Sep 11 2024 Rich Megginson <rmeggins@redhat.com> - 1.88.8-0.1