From 1e5ad2ecd399217a658174d99dce0c47fe49fa02 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Apr 07 2023 14:46:37 +0000 Subject: update to upstream 1.36.0; fix examples file handling; fix semaphore handling update to upstream 1.36.0 fix examples file handling - the code was assuming that the role examples/ directory held only playbooks - handle other files now too fix semaphore handling - the semaphore files should all be gone, so use `rm -f` to avoid errors if there are no matching files --- diff --git a/.gitignore b/.gitignore index 1b510a5..299eca5 100644 --- a/.gitignore +++ b/.gitignore @@ -404,3 +404,24 @@ /rhc-1.1.0.tar.gz /network-1.11.2.tar.gz /auto-maintenance-40e904d40dcfb8b522c91e525b2a0da24f9ad7ea.tar.gz +/postfix-1.3.4.tar.gz +/selinux-1.5.7.tar.gz +/timesync-1.7.3.tar.gz +/kdump-1.2.7.tar.gz +/storage-1.9.7.tar.gz +/metrics-1.8.2.tar.gz +/tlog-1.2.12.tar.gz +/kernel_settings-1.1.13.tar.gz +/logging-1.11.6.tar.gz +/nbde_server-1.3.4.tar.gz +/certificate-1.1.10.tar.gz +/crypto_policies-1.2.8.tar.gz +/ssh-1.1.13.tar.gz +/ha_cluster-1.9.0.tar.gz +/vpn-1.5.4.tar.gz +/firewall-1.4.3.tar.gz +/podman-1.1.3.tar.gz +/ad_integration-1.0.3.tar.gz +/rhc-1.1.1.tar.gz +/journald-1.0.1.tar.gz +/postgresql-1.0.0.tar.gz diff --git a/linux-system-roles.spec b/linux-system-roles.spec index 68ba048..498fcaf 100644 --- a/linux-system-roles.spec +++ b/linux-system-roles.spec @@ -26,8 +26,8 @@ Name: linux-system-roles %endif Url: https://github.com/linux-system-roles Summary: Set of interfaces for unified system management -Version: 1.35.1 -Release: 3%{?dist} +Version: 1.36.0 +Release: 1%{?dist} License: GPLv3+ and MIT and BSD and Python %global _pkglicensedir %{_licensedir}/%{name} @@ -91,46 +91,46 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar # BEGIN AUTOGENERATED SOURCES %global rolename1 postfix -%deftag 1 1.3.3 +%deftag 1 1.3.4 %global rolename2 selinux -%deftag 2 1.5.6 +%deftag 2 1.5.7 %global rolename3 timesync -%deftag 3 1.7.2 +%deftag 3 1.7.3 %global rolename4 kdump -%deftag 4 1.2.6 +%deftag 4 1.2.7 %global rolename5 network %deftag 5 1.11.2 %global rolename6 storage -%deftag 6 1.9.6 +%deftag 6 1.9.7 %global rolename7 metrics -%deftag 7 1.8.1 +%deftag 7 1.8.2 %global rolename8 tlog -%deftag 8 1.2.11 +%deftag 8 1.2.12 %global rolename9 kernel_settings -%deftag 9 1.1.12 +%deftag 9 1.1.13 %global rolename10 logging -%deftag 10 1.11.5 +%deftag 10 1.11.6 %global rolename11 nbde_server -%deftag 11 1.3.3 +%deftag 11 1.3.4 %global rolename12 nbde_client %deftag 12 1.2.10 %global rolename13 certificate -%deftag 13 1.1.9 +%deftag 13 1.1.10 %global rolename14 crypto_policies -%deftag 14 1.2.7 +%deftag 14 1.2.8 %global forgeorg15 https://github.com/willshersystems %global repo15 ansible-sshd @@ -138,31 +138,34 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar %deftag 15 v0.18.1 %global rolename16 ssh -%deftag 16 1.1.12 +%deftag 16 1.1.13 %global rolename17 ha_cluster -%deftag 17 1.8.7 +%deftag 17 1.9.0 %global rolename18 vpn -%deftag 18 1.5.3 +%deftag 18 1.5.4 %global rolename19 firewall -%deftag 19 1.4.2 +%deftag 19 1.4.3 %global rolename20 cockpit %deftag 20 1.4.3 %global rolename21 podman -%deftag 21 1.1.2 +%deftag 21 1.1.3 %global rolename22 ad_integration -%deftag 22 1.0.2 +%deftag 22 1.0.3 %global rolename23 rhc -%deftag 23 1.1.0 +%deftag 23 1.1.1 %global rolename24 journald -%deftag 24 1.0.0 +%deftag 24 1.0.1 + +%global rolename25 postgresql +%deftag 25 1.0.0 Source1: %{archiveurl1} Source2: %{archiveurl2} @@ -188,6 +191,7 @@ Source21: %{archiveurl21} Source22: %{archiveurl22} Source23: %{archiveurl23} Source24: %{archiveurl24} +Source25: %{archiveurl25} # END AUTOGENERATED SOURCES # Includes with definitions/tags that differ between RHEL and Fedora @@ -259,7 +263,7 @@ 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 -n %{getarchivedir 0} +%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 -n %{getarchivedir 0} # END AUTOGENERATED SETUP %if 0%{?rhel} @@ -569,16 +573,20 @@ for role in %{rolenames}; do "%{buildroot}%{_pkglicensedir}/$role.LICENSE" fi if [ -d "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/examples" ]; then - for file in "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/examples/"*.yml ; do - basename=$(basename "$file" .yml) - newname="$basename" - if [[ "$newname" != example-* ]]; then - newname="example-$newname" - fi - if [[ "$newname" != *-playbook ]]; then - newname="${newname}-playbook" + for file in "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/examples/"* ; do + if [[ "$file" == *.yml ]]; then + basename=$(basename "$file" .yml) + newname="$basename" + if [[ "$newname" != example-* ]]; then + newname="example-$newname" + fi + if [[ "$newname" != *-playbook ]]; then + newname="${newname}-playbook" + fi + cp "$file" "%{buildroot}%{_pkgdocdir}/$role/${newname}.yml" + else + cp "$file" "%{buildroot}%{_pkgdocdir}/$role" fi - cp "$file" "%{buildroot}%{_pkgdocdir}/$role/${newname}.yml" rm "$file" done if [ -f "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/examples/inventory" ]; then @@ -592,7 +600,7 @@ for role in %{rolenames}; do fi done -rm %{buildroot}%{ansible_roles_dir}/%{roleinstprefix}*/semaphore +rm -f %{buildroot}%{ansible_roles_dir}/%{roleinstprefix}*/semaphore rm -r %{buildroot}%{ansible_roles_dir}/%{roleinstprefix}*/molecule rm -r %{buildroot}%{ansible_roles_dir}/%{roleinstprefix}*/.[A-Za-z]* @@ -735,6 +743,10 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \ %endif %changelog +* Fri Apr 07 2023 Rich Megginson - 1.36.0-1 +- update to upstream version 1.36.0 +- fix handling of postgresql examples + * Tue Apr 04 2023 Rich Megginson - 1.35.1-3 - use lsr_fingerprint.py to change fingerprints in sshd and metrics ansible-pcp diff --git a/sources b/sources index 753d355..4f188a9 100644 --- a/sources +++ b/sources @@ -1,25 +1,26 @@ SHA512 (auto-maintenance-40e904d40dcfb8b522c91e525b2a0da24f9ad7ea.tar.gz) = 1d9dff01db07af6ffab329fa7a83aa44969e7c8f77248d47678a746a7b77ff351b9c65f86974b16b040d15149e5ea755a07fce8380dc26491f40c0ee4a5efd33 -SHA512 (postfix-1.3.3.tar.gz) = 93cb2ec4764d5ea7922298194e5ed8613bac50a6646e4410bb608c8590e5f4a1b7aa3a6251bc9551ab3ba2033394a2700542f6377d9bf08676c8ee2b963710de -SHA512 (selinux-1.5.6.tar.gz) = 7467d3f048735151ab2f54949b8ef4af0e5a0a4b808558e0a4bc7bc2f6adcf1e2e4003d5709e3d6b6c4f75ebf2a6ac678e98fe46764e04d373efbd69d4b84afa -SHA512 (timesync-1.7.2.tar.gz) = 0410ef3934ca080f968253a6f5b655e5d7467808af0320f1eb3237eb758415010f8bfe74447ea949fe9d30af63f7b145c455c5485c12227768b8567bb89b024b -SHA512 (kdump-1.2.6.tar.gz) = 2e0b8ef49970a43d1c64d55a688925e48733f29e8ee862b0c1f5b01572d6e330ca1de01f65412ea492598d2fb43bc4f9d860f29b45a56051b3a4599001b3536f +SHA512 (postfix-1.3.4.tar.gz) = 6885d69b240ef70cab32e855cb6a133b50058a91e20339e58f69016a410b40924722ada7af80e92d342aed386978e16913b26444bd40d5a774f229bb284990dc +SHA512 (selinux-1.5.7.tar.gz) = cc56a650ddcf48683c975acb5e2be5c8944ff48b3c6ee466a32fe9c1fd083bd8f5c64a8b581668b95566fa9df1e0d36b7149b4016e73cc67da68a458ae90f89d +SHA512 (timesync-1.7.3.tar.gz) = e544e56d676401f29dd30d7cacfc620acfde3ec7075b7e62576688708752f927b2b8b43d173b2317524d58c29866ff55b840f99da7f30c186240d2169d0a5a20 +SHA512 (kdump-1.2.7.tar.gz) = 48421c99e8f5a5eecd9f7920490d33d43956b020183e1026c84e8402101a3265ab6d722b58279ab2f36cb5a1e98ac419b387e3a4f9b74e0e59e8380af60da1c9 SHA512 (network-1.11.2.tar.gz) = 642c8d9158be816109d4a153b6c844e4276648d3ae253ff7225eaf19be24c0c494e8bbe3547097ed2def89d5d12d2cd464da4b4a0344e14f36fd4d419073bb5a -SHA512 (storage-1.9.6.tar.gz) = a8de206da08fdc2ad467e493e3a601b72d3aa31133b7d2878ef3b920ad767ea7090b51518eea40de5b7b652fa68d11d14324beb62354956cacd8f6e9c05cc850 -SHA512 (metrics-1.8.1.tar.gz) = c4373bc925b5b89f47d4abe23e576dba8c8043682e7cd0e564c87474c14e80e347f4fe3ce78ae15bd5eca525c1ab7b9079908651bcf52590fa789fe362453b28 -SHA512 (tlog-1.2.11.tar.gz) = 98240b3042ff3640a7eccedc4f8b2a99749b2507d7ff7588fa8a2f8cc1004433389b11f654ee5887039e427858eeb891bfd434131daa2bf62b4cd4678c0fe62b -SHA512 (kernel_settings-1.1.12.tar.gz) = 6a4553bd69da7bf9d1cb0a487164bfa88570d5dd3db0742b21007004150ce3bf240cd43f774266e5251efe2d72847068a08ccd7478dbd07f6295893fbce35380 -SHA512 (logging-1.11.5.tar.gz) = 8594d4fec3cc6d1fec9feb5a6a2929992f1774dd0c586ab45bcac9f41dc8e9f3d969e417ed855892c281d7c7b5fe29f3da9f5316660c6d268298621fa4ec937f -SHA512 (nbde_server-1.3.3.tar.gz) = 41161f373dda9682796fa3d9940b9e0c39db030b6588c6313f1863c455f213335bb867ddea04bd4719c2d41aa54f0c79fa92e33403b35199f581cbccada4b59b +SHA512 (storage-1.9.7.tar.gz) = b8ce26b181fc041f28d6412b52a2f5f0bfba2ab7c8e9529c42e0bded569ecc6910a718badc231313fad56268f43755cebeb41badbd50cfc34ee1ecd3dd5b3bca +SHA512 (metrics-1.8.2.tar.gz) = d4353085ad9a2e9a9ebca0af0a64e11856398a2fd19ae91d07a6951a67cc02713e93e20e4c709f2862663c77c76851f49631b545164b3e93445ba2313cbbb3ab +SHA512 (tlog-1.2.12.tar.gz) = 148580d5a15d6dba200bc46572106ef060f45227ab4a1c74b80d68ddd9523c32f1b452126527c8b07e34eafba51cceafb189e59f32301eb1ab615b2d08d9e4b3 +SHA512 (kernel_settings-1.1.13.tar.gz) = d980c174ba01cb33010919c3930a47b432cbac2d6d03a46fadfa32f14f18fd5ac52613faee529273d79ee38033bb1f32974f64d6a50845e427896a8d827b4a4b +SHA512 (logging-1.11.6.tar.gz) = 27a45be27ad9c6c535f5f9411c47039c64e6afb2f01c3b4fecf522dc7f9ee7e9c12f739218033b5947921b2dfd330c9d1c41e860e86792f5687fecddbfe048b8 +SHA512 (nbde_server-1.3.4.tar.gz) = 410711f374b97dc5fcd67d8cf716abaa6f085bf097a4c257088ba3abd062b74ae003cc45db169bdefb6c70c7513fbb2a10757f7dd5fb37ac5d83d63f32de294c SHA512 (nbde_client-1.2.10.tar.gz) = 3f9458cbf572bbaeca58a99db2e7613106e265a44082d470e31944d508a142954a9fd96bbb4ab9ba483fd1b1e8973b9c60ed6d00838f46acd57e3d3e1e54b293 -SHA512 (certificate-1.1.9.tar.gz) = 97f1c81d587add9362a8006a3045f48ce321e99866be812fe8ec1e3a302eda03b12f456535288b167997508784b520c9ccb802025bb4089919d117ec2d0d8dbe -SHA512 (crypto_policies-1.2.7.tar.gz) = 3c47e46f49bfe6116b834cfc32f5242fe866074d8cbbc530ad1391980c8dea8dc418bc9372565cbdd46becbab97de7ed69b4ea425750add0925e279e80954b45 +SHA512 (certificate-1.1.10.tar.gz) = 81ff43739c9a35c6d030df530faffbe0dc6b2901562e97384f37c11d4804f9d319cae222e18929585c595318d5369f6a0579e60232a97066c803ab2df5352deb +SHA512 (crypto_policies-1.2.8.tar.gz) = b6052eab4c6a251f2feff081e4b1006056e86eabbb8b2c60bd2b7d70b0ca9f2d9bc838d059e01945f16ce3366dfb5c40d944a8be11052ad87dfcb055fd26c683 SHA512 (ansible-sshd-v0.18.1.tar.gz) = e537160b69a1fe096b59a683acf7c5b1cd25b43d8666124da63b78a1664513d1bd3623cf94f2521347ca0a77448622cc329d215af4d2d67ccbe830cfee12befc -SHA512 (ssh-1.1.12.tar.gz) = b3041110726467bb9711babc2dd327622cacb31e3ba19f5f0036b538575ebe71b55521eb7f7e7cb6e5fc22ee230f2909c3eb2308ac163144c72422211f979d6d -SHA512 (ha_cluster-1.8.7.tar.gz) = e67ddfc6a63e88f2fa850caeadf4a060bc9147abb5020140028b96a7027bd0cdd1e89c0167ac481a1b6302ef36dbfec86e1a58ad0effebb4e14a76b26aa59182 -SHA512 (vpn-1.5.3.tar.gz) = fcd0f3c5beaf96f9e07d968562753d2742b9ef32f95c42f1f1093f9de60e0c44772df35964ccc5db8ee0d720ed93f081a96c8e6fd2877b15c8cc1c7cfc451016 -SHA512 (firewall-1.4.2.tar.gz) = 88ecce48eb84044c980e2320ea8e06053464e9385ee51b2c4022cdac9a48b18c3ba58b108ae7267decc27d6c991a0ec83f1b2aa0f6b719d93c18b9870663d6a7 +SHA512 (ssh-1.1.13.tar.gz) = 51e27598045842bcbdd0f84415a2ae97ee89391356293806a682eb4708746e912f8b43f167be525e45950d3e6c0731fd2ebf5a0f3455b3d4451609236c378fa1 +SHA512 (ha_cluster-1.9.0.tar.gz) = 5b6d6615368f9c772adec998f9abe40071aa56d8b312491f34089f87cf41639089a82b95ef6ea3fe60c4877e3f31e40d19d2d7500672f1906bf78607716cecbf +SHA512 (vpn-1.5.4.tar.gz) = 86ae74b33f016aba8dcba9cd88a04f0953492d5815078e7f62cd40eb2eade4c3325f7f542183ef9ee9d551d64664c8997b2ce20d482a4182be3adc2af3e938fb +SHA512 (firewall-1.4.3.tar.gz) = bcd1e4e30c46b9d94860f5f4de4f4ae65f67fe9df7282d6349edc296b712a631b9e401e9dbcd7f3d52c204ed14563a38de79e57f9302ff6d19fa49cd728187ac SHA512 (cockpit-1.4.3.tar.gz) = 9bc613ea4b1dc25831df3b1503ed6697d1b9fc6a61183cd4feb8a5c29568e1b60534d6b088d6a24f6ea773d44502b10090a92a4c344bf3c4150680095f5a5209 -SHA512 (podman-1.1.2.tar.gz) = 627bdca8053a2e7b817f2c039dea3ce4a2ec1bf116a455ce812bd1d6f6fc01214a02d582a8789ffd6f8657c959fad773423000ef773fa47e314059a12a70aa6a -SHA512 (ad_integration-1.0.2.tar.gz) = ef717a925e5f59391b0e09704e78aed68f03bc89862a2a5063943d46bbed51bda12e85bd4d59c0a332140adf475f64dd84f6b90bab07d2f0e316a5390b9a92f5 -SHA512 (rhc-1.1.0.tar.gz) = 8c02d8b5d408605ce782df8d5f9363766539a3a206de5d4ba33cd113466ce485b1104c851ed508fa441c520f93dbf053fbc048e689e52cc5e672d39eb8c7c58f -SHA512 (journald-1.0.0.tar.gz) = e2af83530ae5e493c3d0833360c7e9fc43772757920b43e3d8b18093f2f98ab03e1ac9e91adbdd76490bb2b39b6e7a6c6b2f9c09d77d5d817676324634089cd5 +SHA512 (podman-1.1.3.tar.gz) = 80e57dad786eb12facbd0d9c6f0f1d00a0761bc93063b918d3af36ca6ba6c8a2a8dd3e9f8449ca512992bfcc55caf176fd2890557c351441f9880944c1d06219 +SHA512 (ad_integration-1.0.3.tar.gz) = 4833b6f4db39142436c46e53532307081e640f959b26a6151ec65694ed17e55f1c6bf04ed1d0fddf0f51d6075b2c205a3c2b3187d6a57caba480c2e839794492 +SHA512 (rhc-1.1.1.tar.gz) = 3cba735d52bee486068867b8881e4a627deb2d56bc408b1fe51af2289506abe379de2c61a0dbf7779af8b0f3963dd218971b8f1be0f0fdfec6ebbd487ffd111c +SHA512 (journald-1.0.1.tar.gz) = 268507bacdc66dd68ab907611018bb36be0db5c8424537518c665af7ad4005a18d067e3a742b1e1fe9f3916af648a9c8a0c9daa9e1ca5da3521fb032af927750 +SHA512 (postgresql-1.0.0.tar.gz) = bcf2395d3ec14e2f4c9282d34a58b57a2850374e2646755153fa7d700bfdc82c7cb0545c23fcc88b0da959bf49e15f3da627fe6ab6f840cbe39cc1e46d14171e