From 12b80ba6a78e4787d425143ba8e309b2577733ab Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 19 Nov 2024 15:16:45 -0700 Subject: [PATCH] system roles 1.90.3-0.1 Resolves: RHEL-65748 : metrics - fix: add support for Valkey fix vendoring for selinux fix cockpit full packages support for 9.6 and later ensure gfs2 tests do not run on el10 --- .gitignore | 6 ++++++ CHANGELOG.md | 2 +- linux-system-roles.spec | 16 +++++++++++----- sources | 8 ++++---- vendoring-build.inc | 12 ++++++++++++ 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index f816908..6286d08 100644 --- a/.gitignore +++ b/.gitignore @@ -971,3 +971,9 @@ /systemd-1.3.0.tar.gz /auto-maintenance-1.90.1.tar.gz /sudo-1.2.1.tar.gz +/auto-maintenance-1.90.2.tar.gz +/metrics-1.10.8.tar.gz +/cockpit-1.5.12.tar.gz +/gfs2-1.0.2.tar.gz +/auto-maintenance-1.90.3.tar.gz +/cockpit-1.5.13.tar.gz diff --git a/CHANGELOG.md b/CHANGELOG.md index 083e31f..edd116e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Changelog ========= -[1.90.1] - 2024-11-13 +[1.90.3] - 2024-11-20 ---------------------------- ### New Features diff --git a/linux-system-roles.spec b/linux-system-roles.spec index c1cbd28..ab0b522 100644 --- a/linux-system-roles.spec +++ b/linux-system-roles.spec @@ -23,7 +23,7 @@ Name: linux-system-roles %endif Url: https://github.com/linux-system-roles Summary: Set of interfaces for unified system management -Version: 1.90.1 +Version: 1.90.3 Release: 0.1%{?dist} License: GPLv3+ and MIT and BSD and Python @@ -86,7 +86,7 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0) %%global rolestodir %%{?rolestodir} %%{roletodir%{1}} } -%global mainid 1.90.1 +%global mainid 1.90.3 Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz # BEGIN AUTOGENERATED SOURCES @@ -109,7 +109,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar %deftag 6 1.18.8 %global rolename7 metrics -%deftag 7 1.10.7 +%deftag 7 1.10.8 %global rolename8 tlog %deftag 8 1.3.7 @@ -150,7 +150,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar %deftag 19 1.8.1 %global rolename20 cockpit -%deftag 20 1.5.11 +%deftag 20 1.5.13 %global rolename21 podman %deftag 21 1.7.0 @@ -183,7 +183,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar %deftag 30 1.4.2 %global rolename31 gfs2 -%deftag 31 1.0.1 +%deftag 31 1.0.2 %global rolename32 sudo %deftag 32 1.2.1 @@ -691,6 +691,12 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \ %endif %changelog +* Wed Nov 20 2024 Rich Megginson - 1.90.3-0.1 +- Resolves: RHEL-65748 : metrics - fix: add support for Valkey +- fix vendoring for selinux +- fix cockpit full packages support for 9.6 and later +- ensure gfs2 tests do not run on el10 + * Wed Nov 13 2024 Rich Megginson - 1.90.1-0.1 - Resolves: RHEL-61596 : sudo - feat: Add variable that handles semantic check for sudoers fix meta/main.yml versions diff --git a/sources b/sources index 09cad90..8788658 100644 --- a/sources +++ b/sources @@ -2,23 +2,23 @@ SHA512 (ad_integration-1.4.7.tar.gz) = c919e6c700849ab1c712577da3f104c360a9ceae1 SHA512 (aide-0.0.1.tar.gz) = de2d3028f256cc9227a1d0d870e7503224fdf9cdd87a3e1a92378b6cee72812d84fbf51c30dcd2946ef638b0639601e597149659012aee88b8fff144b2a8b15b SHA512 (ansible-posix-1.6.2.tar.gz) = c077302d9b7df04338c9a90caa909d823de5b82ae5cefa599f13e1cb067c558d44dfcbcf627b619243dbfe99f0b7d1a42ccfe6054ea923932eac35a2bc7d8959 SHA512 (ansible-sshd-v0.25.0.tar.gz) = bf789bd8b1ff34208220ef6b2865286c7a7fdfd0f7e11586cb69c328108348b4c3c91d759d0d3a268bc8ddbb5fd9797ab3b4cf86d6ca8f8cd32106b7890ae962 -SHA512 (auto-maintenance-1.90.1.tar.gz) = 64db701feb7c2f50a90aa3f0fc080e98e77852177931a14b4b9143785ee28540d8f382f73c36e14e8f01ddb3ca23e5f3c01b24fc355b91303124a2b0f20fec6e +SHA512 (auto-maintenance-1.90.3.tar.gz) = d4bfc6645d07c5c6966ca4614ee2700e13e21647df445683579d059bebea231eb92ad66a095f2c77c121da66253e6574db2882cd836288ddaad43308651fb6d4 SHA512 (bootloader-1.0.8.tar.gz) = 704edc9008199f770ea325d59d2e06110bda5321ed2c6abc7825f40d85e26dba9bd44fae3a862b7b6e15e1e0e7477ee8d81d7550414d545ce12f9cb80b37eb33 SHA512 (certificate-1.3.7.tar.gz) = 605cfc7dec74f54b581e65d2b8f4d682635158825eee442822e585c77f885fe9e920bca56de432439ebc7ab9d0a4f63ae209fe0c82f077fd4c1c49d28fba24f4 -SHA512 (cockpit-1.5.11.tar.gz) = dd1624dc187b1963d72694a8d5b0c203a4786d8ab02300872c40e6a3b7fe3e13dd35bc8934e651cdb4872c028903800b0d30e9e4a7736063f2145e7a785382b8 +SHA512 (cockpit-1.5.13.tar.gz) = 40afde1b74cb96470a83ab57d85614f4c634ec1b1b442ec42263d839afc6256971d0085dab7d5190ecd43f3c3e97be6abe1de3d610326d75db900e3842d1f9b0 SHA512 (community-general-10.0.1.tar.gz) = bec4243076b69ca93111fbc1c14d93e24869f54241d542f2f90a845233ff8b7ddd053470540f8016ccacb2b48e539d25a519d7411cfffd83badecea4c4c53a43 SHA512 (containers-podman-1.16.2.tar.gz) = b697fd4b44a4ee8faba63f60b7793b5ce5131ea4baf710ac1757497442a52980e67a53697d6e59f4c531f3851fe19db157d2c8dd04a72ce7ec28ba24d20f296e SHA512 (crypto_policies-1.4.1.tar.gz) = a75c6f255d8416d15af0f2a37f138f4f39658643c788984c56e0918370ffde64cd8e06c1cd3f78ca6632bfe56ee197407fd8861a36cb46d63d15c8251344c22f SHA512 (fapolicyd-1.1.8.tar.gz) = 813bfde5a7424d2def9efcab9b37f44bf139bad5f038a816aad2ade869bd4c48f8ac406df242c4d249715d91b0084d55fb9d7a232d215764673180b8e8ac8cdb SHA512 (firewall-1.8.1.tar.gz) = 4806fe25bfbc81cd8c60c1ed1db946703e684f1065e08124ad90745020191203c17c2fa58b30438db0e079b39162433ea2233f26082d3ed504941cd90e46f012 -SHA512 (gfs2-1.0.1.tar.gz) = 23a91df2e1d12b863a20729a7f7cfc7068c4fee4305a0669c6502800dd89cbe8f65c7b8c6c3071b07654571aef6aa64e6cb1046d5fd3bf129a349ee781c856c7 +SHA512 (gfs2-1.0.2.tar.gz) = 4f063e0f913fdeb1b578e46cc7d0cf141e079f44668676e46ad80f4186447977ba81619237f0953a0405b67a9eb88964e1b407c4759e6a0c9560407e85642ece SHA512 (ha_cluster-1.20.0.tar.gz) = 9a56f358eaaeadb204c93020d6c9f22507fb9aab041b879986ded48a6eb885457cdb43e9230fadce14a3ce86ebfc747ef8a12efe14f49bbf62f08ef6dc0bdc99 SHA512 (journald-1.3.4.tar.gz) = 5b54e138b54232297446325a906bb066f5944cd89840df26ef49ca99184e435a2d2383013513a64d795574e7f472b6217f0d25cc3802bcb63cf99cac5a594f46 SHA512 (kdump-1.4.8.tar.gz) = 403ab2954acfa5176257061669c220015eed0102bd7d778771bd89e2bc474f19b5d3dbd6d4d66c274852037f1c40419d85535363086296c17c4c69db23cd7798 SHA512 (kernel_settings-1.3.3.tar.gz) = 216e1af675ebd7b8cbaeec83a5d5f5dc77a8b8127ad5e343ee92b7574178ac14459e196bac104927e54fd50e27e3c3c6a932dbbeceed3a98b96d159f3e29b216 SHA512 (keylime_server-1.1.6.tar.gz) = 1e0511b33025474111c653124cc17825271d49422368a4533c6ab658b96a0f3bcdc8c29cc6e18cbbb9ca931ca8287bbdcc2e0bacd477651af8ddd8b20376d010 SHA512 (logging-1.14.0.tar.gz) = 731f9951fbf626f4b722346284c033d6dc90b240419ed31b47f5b306fbf2ae8d8889b6a6fc910585677ca511180d7fd33b4c3ca33f49ab7febd5fff52cc807a9 -SHA512 (metrics-1.10.7.tar.gz) = 7c98ae1d37255b5ecb0407a7d8469a0c62058699250186d374285420407b933f312f7f5c9b3d86b8a811d1ad7fc0a4eac80a385fd44dcda139afb3b5647cff3b +SHA512 (metrics-1.10.8.tar.gz) = ca830b263df63e9b1a8ad4c675a14700d84bb35490f560f08fc1cb4e3163acc334caafb6716cd0d536c3152baca856c368bf3a57f7c0beedaca1823039ff319f SHA512 (nbde_client-1.3.1.tar.gz) = cd868a40d2c910a4aa8439cd5cc24b5365467fe7fbebc752ffefbf8d7eb617467bd317f4e54ee59cec22e8fd03d8a96181a59d8d58eef0338a8dccfd4d37d3d8 SHA512 (nbde_server-1.4.8.tar.gz) = 18fcd7f48ba8843e7a88bd0192b1c6050cc603d0de8810a275e03418246bf46c8ec44a246649656e16175936edb54920a32fbede6b0fce007d5d633fedd06e54 SHA512 (network-1.17.0.tar.gz) = c53166d4621f12aa62658303bd5dd91e3a547c93a495f232216738a850eb9b396b0a2c1fc528d50bfe69999567c5b062ade0b14ac841c2cd18b4c86685d65515 diff --git a/vendoring-build.inc b/vendoring-build.inc index 1b1180a..12661f0 100644 --- a/vendoring-build.inc +++ b/vendoring-build.inc @@ -153,3 +153,15 @@ plugins/modules/podman_image.py import-3.5!skip plugins/modules/podman_play.py import-3.5!skip EOF done + +# special handling for ansible.posix seboolean +# see https://github.com/ansible-collections/ansible.posix/pull/460#issuecomment-2479725049 + +sed -e '/^from ansible.module_utils.selinux_lsr._respawn import respawn_module, HAS_RESPAWN_UTIL/a\ +HAS_RESPAWN_UTIL = False\ +\ +\ +def respawn_module(module_name):\ + pass' \ + -e '/^from ansible.module_utils.selinux_lsr._respawn import respawn_module, HAS_RESPAWN_UTIL/d' \ + -i selinux/library/seboolean.py