From bc15811b40c36f897100b2fec621638ce594b32b Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sat, 27 Nov 2021 17:31:23 +0100 Subject: [PATCH 01/34] Drop unneded dependency on cpp-hocon Signed-off-by: Igor Raits --- puppet.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index ebb75da..a56a22a 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 7.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 URL: https://puppet.com @@ -48,7 +48,6 @@ Requires: rubygem(semantic_puppet) >= 1.0.2 Requires: ruby-augeas >= 0.5.0 Requires: augeas >= 1.10.1 Requires: augeas-libs >= 1.10.1 -Requires: cpp-hocon >= 0.2.1 Requires: ruby(selinux) libselinux-utils Obsoletes: puppet-headless < 6.0.0 Obsoletes: puppet-server < 6.0.0 @@ -208,6 +207,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Sat Nov 27 2021 Igor Raits - 7.12.1-2 +- Drop obsolete dependency on cpp-hocon + * Thu Nov 18 2021 Breno Brand Fernandes - 7.12.1-1 - Update to 7.12.1 From 73e16243b21db7761f67cdc4f79aebdf46dfee4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 09:39:28 +0000 Subject: [PATCH 02/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index a56a22a..e5ee418 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 7.12.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 URL: https://puppet.com @@ -207,6 +207,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 7.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Nov 27 2021 Igor Raits - 7.12.1-2 - Drop obsolete dependency on cpp-hocon From 4bc6604985bd1edd1475f8476504285c76820b5c Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 20 Apr 2022 11:39:10 +0200 Subject: [PATCH 03/34] Update to 7.16.0 --- puppet-7.12.1.tar.gz.asc | 17 ----------------- puppet.spec | 8 ++++++-- sources | 3 ++- 3 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 puppet-7.12.1.tar.gz.asc diff --git a/puppet-7.12.1.tar.gz.asc b/puppet-7.12.1.tar.gz.asc deleted file mode 100644 index 69058f3..0000000 --- a/puppet-7.12.1.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJhiqyLAAoJEEUots2eYe8mXp4P/3pU/GmGMldkCSdcYLUpWO+K -LcxdTFZZg35JjJw6bIKCgGvQ/M2mC1bTaxaKKk2Wt3/V0rpYz2yEt+wskks8GqPc -Fs9+wWSNU4v5swHrH95W0uxBoexfxV1Zpqm/J6TuWsqt20U1rlWo/W/V7SB6Cilr -1bUsd/nJn+/ifDJN/OxU+n/NWAVcRi64IWKpyBIliQI5heQSuSD52czAo10L4hg8 -5HiZZyS4vx/+FpeXgnu8gVKDoqezOeYNrZxNLOajcpz5ohQdW2OxexF3l2oh+ehh -l1KCofsiP0s5GhzZq8LvFmhqEPYurEsXExe5GZSqHFFjQ27vnEl5SsHWSA817LL/ -PczCwXTe4te2nA2u+QqoJ3Of5AKet3fvEDQLZKnNaGRctcLoPmAd7vrBnNQOjlNg -h3KTI2iG5slN0n3WqHWVIHhy/8vq/24FdJE9UDwERmdpKpxtB5cDWheRC32D0+rU -BCmbKU6GCiKhjFKA3VELtKAyRVARbxxRiSB6InVfNGoLSqARiUvDy/p7ZqZThg6J -4BWBnwmYjS02gXZk0VyxfeEYa0MOL5TDDgY+rosjI6hA4I/dnosLVLzjOWkaQXc4 -uzCPjMUDSQbX9bZCygRHMLnBNzU4ldmTM2QPVkRZMTUU+gMIk+nPT+iqRAvicfr/ -ZO/FQBCmaHkbSC518ClM -=hKI2 ------END PGP SIGNATURE----- diff --git a/puppet.spec b/puppet.spec index e5ee418..23b0f3a 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,8 +3,8 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 7.12.1 -Release: 3%{?dist} +Version: 7.16.0 +Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 URL: https://puppet.com @@ -45,6 +45,7 @@ Requires: rubygem(facter) >= 3.9.6 Requires: rubygem(multi_json) >= 1.10 Requires: rubygem(puppet-resource_api) >= 1.5 Requires: rubygem(semantic_puppet) >= 1.0.2 +Requires: rubygem(scanf) >= 1.0 Requires: ruby-augeas >= 0.5.0 Requires: augeas >= 1.10.1 Requires: augeas-libs >= 1.10.1 @@ -207,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Wed Apr 20 2022 Ewoud Kohl van Wijngaarden - 7.16.0-1 +- Update to 7.16.0 + * Fri Jan 21 2022 Fedora Release Engineering - 7.12.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index e5cc9db..273c0de 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (puppet-7.12.1.tar.gz) = 908685f206126b49c9bc7d70c2c6273dce025040e6fdcfac1828a13c2aa570d383772a717aea2feac2383489003a31f321a2efe3cfe612cd321d2c1696d036ac +SHA512 (puppet-7.16.0.tar.gz) = b1f3c6072821225c9068089f44ad9ab955534f2d91bf88b44f762e0588442b9d6191eb89909dc05b7efc3a82302d2d3dc5a5a040fbc84f81645817d695b4db72 SHA512 (puppetlabs-augeas_core-1.1.2.tar.gz) = 0e2a1f136685b54636cf1741d34bb2385a0bb22d6ea78b6fe495ced3273920d266258143333a4185f901c0c1a6ee562107224b5093668f0c370723c9b3125308 SHA512 (puppetlabs-cron_core-1.0.5.tar.gz) = a31d3170b0457985fc067b73902a82a92ee0e537020056ffef825ff8b295d581808e729ff0481479086ab6c21a2ecf111df9e16b87c0c14e26ef318e7fbfcd19 SHA512 (puppetlabs-host_core-1.0.3.tar.gz) = 09b4084663f4f6886380a473d26d1b759026f345bd3850084ac4f3ef59ed8ab2396fecdb3c836591d9097b9c5252ba794c4b7d3296b8321ff401f8a956ad093c @@ -9,3 +9,4 @@ SHA512 (puppetlabs-sshkeys_core-2.2.0.tar.gz) = 933d7a41f94aa499805dfd260ee52791 SHA512 (puppetlabs-yumrepo_core-1.0.7.tar.gz) = 8fb3cb40077ac113c332a761c01c1d7ce4bdfff1016be696efb41be20c86ff688b40b83c00a47394d79e64941cf6c23ea4bbd1107b4c7856d1b481733cb2d7ce SHA512 (puppetlabs-zfs_core-1.2.0.tar.gz) = 5cf44b314094a6dad45482776b1442ab941cd1f93b39141e452c8c03b441a90ab7e6077f22f6fee9796ec2af41c30a8601e9cec6ccce81c2cb2dcc4ecba7117f SHA512 (puppetlabs-zone_core-1.0.3.tar.gz) = 1083bcc810e8a7b048fad1c70656d806c65b5fa912c627bf1dfaf3b9d8a0ec675db100abc2fc6499669c17927ea3e55a5c968fde0e577fc1f4cebb1fbd5e0851 +SHA512 (puppet-7.16.0.tar.gz.asc) = c160bf3ad4600042d89acd3581fd4399cd8d8b2d1f0e21fc51aa06d51f3d850989aab83fe0144ad7501317d42d4c15115741eac5ebed9c9fcfe229ce9538d2f1 From ddd86b7d5d15798a2a1840cd7875da19e6153b72 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 1 Jun 2022 18:35:13 +0200 Subject: [PATCH 04/34] Update to 7.17.0 --- puppet.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index 23b0f3a..cbf82f4 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,7 +3,7 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 7.16.0 +Version: 7.17.0 Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Wed Jun 01 2022 Ewoud Kohl van Wijngaarden - 7.17.0-1 +- Update to 7.17.0 + * Wed Apr 20 2022 Ewoud Kohl van Wijngaarden - 7.16.0-1 - Update to 7.16.0 diff --git a/sources b/sources index 273c0de..69e5cc5 100644 --- a/sources +++ b/sources @@ -1,4 +1,5 @@ -SHA512 (puppet-7.16.0.tar.gz) = b1f3c6072821225c9068089f44ad9ab955534f2d91bf88b44f762e0588442b9d6191eb89909dc05b7efc3a82302d2d3dc5a5a040fbc84f81645817d695b4db72 +SHA512 (puppet-7.17.0.tar.gz) = f691b6d3e931c5cc879c8e5129af2a935bedc891964ba5cbb873d6d69e0ec61bd82ca7d413a94389cda13cb6c8c536aae6f11dade4c6e2597abc7756a74f4df0 +SHA512 (puppet-7.17.0.tar.gz.asc) = b8170200b596531e7f117f3fe699955254a26483e0374fdb190b8a68cff007b35c2845d38185dc22eabac254f5305802fd67c3bf264d6112a42ad9ce4901d6c3 SHA512 (puppetlabs-augeas_core-1.1.2.tar.gz) = 0e2a1f136685b54636cf1741d34bb2385a0bb22d6ea78b6fe495ced3273920d266258143333a4185f901c0c1a6ee562107224b5093668f0c370723c9b3125308 SHA512 (puppetlabs-cron_core-1.0.5.tar.gz) = a31d3170b0457985fc067b73902a82a92ee0e537020056ffef825ff8b295d581808e729ff0481479086ab6c21a2ecf111df9e16b87c0c14e26ef318e7fbfcd19 SHA512 (puppetlabs-host_core-1.0.3.tar.gz) = 09b4084663f4f6886380a473d26d1b759026f345bd3850084ac4f3ef59ed8ab2396fecdb3c836591d9097b9c5252ba794c4b7d3296b8321ff401f8a956ad093c @@ -9,4 +10,3 @@ SHA512 (puppetlabs-sshkeys_core-2.2.0.tar.gz) = 933d7a41f94aa499805dfd260ee52791 SHA512 (puppetlabs-yumrepo_core-1.0.7.tar.gz) = 8fb3cb40077ac113c332a761c01c1d7ce4bdfff1016be696efb41be20c86ff688b40b83c00a47394d79e64941cf6c23ea4bbd1107b4c7856d1b481733cb2d7ce SHA512 (puppetlabs-zfs_core-1.2.0.tar.gz) = 5cf44b314094a6dad45482776b1442ab941cd1f93b39141e452c8c03b441a90ab7e6077f22f6fee9796ec2af41c30a8601e9cec6ccce81c2cb2dcc4ecba7117f SHA512 (puppetlabs-zone_core-1.0.3.tar.gz) = 1083bcc810e8a7b048fad1c70656d806c65b5fa912c627bf1dfaf3b9d8a0ec675db100abc2fc6499669c17927ea3e55a5c968fde0e577fc1f4cebb1fbd5e0851 -SHA512 (puppet-7.16.0.tar.gz.asc) = c160bf3ad4600042d89acd3581fd4399cd8d8b2d1f0e21fc51aa06d51f3d850989aab83fe0144ad7501317d42d4c15115741eac5ebed9c9fcfe229ce9538d2f1 From 65dda53fbe2c5b90c028665e892ec8805a03f147 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 15 Jun 2022 13:53:09 +0200 Subject: [PATCH 05/34] Require at least concurrent-ruby 1.1.9 Fixes rhbz#2077122 --- puppet.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index cbf82f4..0b9b8a9 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 7.17.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 URL: https://puppet.com @@ -39,7 +39,7 @@ BuildRequires: systemd BuildRequires: gnupg2 Requires: hiera >= 3.3.1 Requires: facter >= 3.9.6 -Requires: rubygem(concurrent-ruby) >= 1.0.5 +Requires: rubygem(concurrent-ruby) >= 1.1.9 Requires: rubygem(deep_merge) >= 1.0 Requires: rubygem(facter) >= 3.9.6 Requires: rubygem(multi_json) >= 1.10 @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Wed Jun 15 2022 Ewoud Kohl van Wijngaarden - 7.17.0-2 +- Require at least concurrent-ruby 1.1.9 (fixes rhbz#2077122) + * Wed Jun 01 2022 Ewoud Kohl van Wijngaarden - 7.17.0-1 - Update to 7.17.0 From 786139b96104c04f3818b363bf1e24541332ddc3 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 21 Jun 2022 12:03:18 +0200 Subject: [PATCH 06/34] Add tests using tmt --- .fmf/version | 1 + .gitignore | 1 + plans/lookup.fmf | 7 +++++++ plans/smoke.fmf | 5 +++++ tests/smoke/main.fmf | 4 ++++ tests/smoke/test.sh | 25 +++++++++++++++++++++++++ 6 files changed, 43 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/lookup.fmf create mode 100644 plans/smoke.fmf create mode 100644 tests/smoke/main.fmf create mode 100755 tests/smoke/test.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 2eb5ee8..8f62a61 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /puppet-*/ /.build*.log results_puppet/ +/tests/*/log.txt diff --git a/plans/lookup.fmf b/plans/lookup.fmf new file mode 100644 index 0000000..1a53fc5 --- /dev/null +++ b/plans/lookup.fmf @@ -0,0 +1,7 @@ +summary: Run puppet lookup +prepare: + how: install + package: puppet +execute: + how: tmt + script: puppet lookup --explain foo diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf new file mode 100644 index 0000000..ca3245b --- /dev/null +++ b/tests/smoke/main.fmf @@ -0,0 +1,4 @@ +summary: Basic smoke testing +require: puppet +test: ./test.sh +framework: beakerlib diff --git a/tests/smoke/test.sh b/tests/smoke/test.sh new file mode 100755 index 0000000..1037517 --- /dev/null +++ b/tests/smoke/test.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlRun "set -o pipefail" + rlAssertRpm puppet + rlPhaseEnd + + rlPhaseStartTest + rlRun -s "puppet --help" 0 "Check help message" + rlAssertNotGrep "warning" $rlRun_LOG -i + + rlRun "echo \"file { '${tmp}/applied-file': ensure => file, content => 'Hello World' }\" | puppet apply" 0 "Apply manifest" + rlAssertGrep "Hello World" "applied-file" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd From b4b3086744f6a5e0d275d480d5d7ed08088959cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 15:37:30 +0000 Subject: [PATCH 07/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 0b9b8a9..1c296a6 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 7.17.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 URL: https://puppet.com @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 7.17.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jun 15 2022 Ewoud Kohl van Wijngaarden - 7.17.0-2 - Require at least concurrent-ruby 1.1.9 (fixes rhbz#2077122) From 9017a79c57cf4e93419f3a587e6ab83e1d3ab3d7 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 30 Aug 2022 18:51:06 +0200 Subject: [PATCH 08/34] Update to 7.18.0 --- puppet.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/puppet.spec b/puppet.spec index 1c296a6..2c0fdf6 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,8 +3,8 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 7.17.0 -Release: 3%{?dist} +Version: 7.18.0 +Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 URL: https://puppet.com @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Tue Aug 30 2022 Ewoud Kohl van Wijngaarden - 7.18.0-1 +- Update to 7.18.0 + * Fri Jul 22 2022 Fedora Release Engineering - 7.17.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 69e5cc5..2b76e55 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (puppet-7.17.0.tar.gz) = f691b6d3e931c5cc879c8e5129af2a935bedc891964ba5cbb873d6d69e0ec61bd82ca7d413a94389cda13cb6c8c536aae6f11dade4c6e2597abc7756a74f4df0 -SHA512 (puppet-7.17.0.tar.gz.asc) = b8170200b596531e7f117f3fe699955254a26483e0374fdb190b8a68cff007b35c2845d38185dc22eabac254f5305802fd67c3bf264d6112a42ad9ce4901d6c3 +SHA512 (puppet-7.18.0.tar.gz) = 428268c9d8333c0624023a3d4b55b5dddfaa890eb6d88a31486c8de5112db4d1dce7553050de81c4b5ffd0fec74c5d10f3c09c3fb1826ffc196808f2b45495d4 +SHA512 (puppet-7.18.0.tar.gz.asc) = 8e47c21f8eec94a46a6a71f901d68176f8011d8009a8f34c5818217006b87128ef64d62f5a0280a651385aa08d025f821faa127902424f0c4c4f60a66dee9e41 SHA512 (puppetlabs-augeas_core-1.1.2.tar.gz) = 0e2a1f136685b54636cf1741d34bb2385a0bb22d6ea78b6fe495ced3273920d266258143333a4185f901c0c1a6ee562107224b5093668f0c370723c9b3125308 SHA512 (puppetlabs-cron_core-1.0.5.tar.gz) = a31d3170b0457985fc067b73902a82a92ee0e537020056ffef825ff8b295d581808e729ff0481479086ab6c21a2ecf111df9e16b87c0c14e26ef318e7fbfcd19 SHA512 (puppetlabs-host_core-1.0.3.tar.gz) = 09b4084663f4f6886380a473d26d1b759026f345bd3850084ac4f3ef59ed8ab2396fecdb3c836591d9097b9c5252ba794c4b7d3296b8321ff401f8a956ad093c From 870fc73fa168f07b8fbf76a3745b86088e582f9f Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Sat, 17 Sep 2022 14:51:39 +0200 Subject: [PATCH 09/34] Update to 7.19.0 --- puppet.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index 2c0fdf6..201deb0 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,7 +3,7 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 7.18.0 +Version: 7.19.0 Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Sat Sep 17 2022 Ewoud Kohl van Wijngaarden - 7.19.0-1 +- Update to 7.19.0 (fixes rhbz#2126546) + * Tue Aug 30 2022 Ewoud Kohl van Wijngaarden - 7.18.0-1 - Update to 7.18.0 diff --git a/sources b/sources index 2b76e55..aac66ff 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (puppet-7.18.0.tar.gz) = 428268c9d8333c0624023a3d4b55b5dddfaa890eb6d88a31486c8de5112db4d1dce7553050de81c4b5ffd0fec74c5d10f3c09c3fb1826ffc196808f2b45495d4 -SHA512 (puppet-7.18.0.tar.gz.asc) = 8e47c21f8eec94a46a6a71f901d68176f8011d8009a8f34c5818217006b87128ef64d62f5a0280a651385aa08d025f821faa127902424f0c4c4f60a66dee9e41 +SHA512 (puppet-7.19.0.tar.gz) = 952ae1e77e9d9aaa0a0a731f408550fd3bf483dda9bbb12845e534e6208321db774325da8621f36535d7601bd7b8611098e486ef733428b7108f613f5dade4e0 +SHA512 (puppet-7.19.0.tar.gz.asc) = 24be9f9fe5c0c68ec6e1710da81b61016fc9fa95ee73e6073220e069ce00df02238cd7a1d38b6c409e790c5a5e10a26616721cb93bf46f289a30bf043aa927b5 SHA512 (puppetlabs-augeas_core-1.1.2.tar.gz) = 0e2a1f136685b54636cf1741d34bb2385a0bb22d6ea78b6fe495ced3273920d266258143333a4185f901c0c1a6ee562107224b5093668f0c370723c9b3125308 SHA512 (puppetlabs-cron_core-1.0.5.tar.gz) = a31d3170b0457985fc067b73902a82a92ee0e537020056ffef825ff8b295d581808e729ff0481479086ab6c21a2ecf111df9e16b87c0c14e26ef318e7fbfcd19 SHA512 (puppetlabs-host_core-1.0.3.tar.gz) = 09b4084663f4f6886380a473d26d1b759026f345bd3850084ac4f3ef59ed8ab2396fecdb3c836591d9097b9c5252ba794c4b7d3296b8321ff401f8a956ad093c From 44f1d5e10bef9ff7cdd6faba1bf0cf3b04172fb7 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Thu, 20 Oct 2022 14:04:02 +0200 Subject: [PATCH 10/34] Update to 7.20.0 --- puppet.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index 201deb0..ad42649 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,7 +3,7 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 7.19.0 +Version: 7.20.0 Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Thu Oct 20 2022 Ewoud Kohl van Wijngaarden - 7.20.0-1 +- Update to 7.20.0 (fixes rhbz#2126546) + * Sat Sep 17 2022 Ewoud Kohl van Wijngaarden - 7.19.0-1 - Update to 7.19.0 (fixes rhbz#2126546) diff --git a/sources b/sources index aac66ff..5228e65 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (puppet-7.19.0.tar.gz) = 952ae1e77e9d9aaa0a0a731f408550fd3bf483dda9bbb12845e534e6208321db774325da8621f36535d7601bd7b8611098e486ef733428b7108f613f5dade4e0 -SHA512 (puppet-7.19.0.tar.gz.asc) = 24be9f9fe5c0c68ec6e1710da81b61016fc9fa95ee73e6073220e069ce00df02238cd7a1d38b6c409e790c5a5e10a26616721cb93bf46f289a30bf043aa927b5 +SHA512 (puppet-7.20.0.tar.gz) = 6774bf03ad0ee80c0fd2cd8ebad60da56df7ed9818a526084fc2cf1ba2fecc81555fff200f5feef2b5d7a2275d90f44b24160de7221d682de470b511a7051f7f +SHA512 (puppet-7.20.0.tar.gz.asc) = d68e6f5f081dea4fcec13b57afc675f14e40eac94efb4ea72cbaaea07e3ef9762507a1eb23806e975500c766619060930b5f06230768a0150309c3b268d7f4d8 SHA512 (puppetlabs-augeas_core-1.1.2.tar.gz) = 0e2a1f136685b54636cf1741d34bb2385a0bb22d6ea78b6fe495ced3273920d266258143333a4185f901c0c1a6ee562107224b5093668f0c370723c9b3125308 SHA512 (puppetlabs-cron_core-1.0.5.tar.gz) = a31d3170b0457985fc067b73902a82a92ee0e537020056ffef825ff8b295d581808e729ff0481479086ab6c21a2ecf111df9e16b87c0c14e26ef318e7fbfcd19 SHA512 (puppetlabs-host_core-1.0.3.tar.gz) = 09b4084663f4f6886380a473d26d1b759026f345bd3850084ac4f3ef59ed8ab2396fecdb3c836591d9097b9c5252ba794c4b7d3296b8321ff401f8a956ad093c From 5c59d45ff46099a3d6ca331c60ea8ff157a1c47b Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Thu, 20 Oct 2022 14:11:06 +0200 Subject: [PATCH 11/34] Add gating on tests --- gating.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..bb1d8ee --- /dev/null +++ b/gating.yaml @@ -0,0 +1,14 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_testing] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_stable] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From c3ff3326f17f04927bb768b18000d51b077fe4a8 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Sat, 17 Dec 2022 14:22:29 +0100 Subject: [PATCH 12/34] Update to 7.21.0 --- puppet.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index ad42649..8f60dc9 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,7 +3,7 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 7.20.0 +Version: 7.21.0 Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Sat Dec 17 2022 Ewoud Kohl van Wijngaarden - 7.21.0-1 +- Update to 7.21.0 (fixes rhbz#2151953) + * Thu Oct 20 2022 Ewoud Kohl van Wijngaarden - 7.20.0-1 - Update to 7.20.0 (fixes rhbz#2126546) diff --git a/sources b/sources index 5228e65..68cfe3e 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (puppet-7.20.0.tar.gz) = 6774bf03ad0ee80c0fd2cd8ebad60da56df7ed9818a526084fc2cf1ba2fecc81555fff200f5feef2b5d7a2275d90f44b24160de7221d682de470b511a7051f7f -SHA512 (puppet-7.20.0.tar.gz.asc) = d68e6f5f081dea4fcec13b57afc675f14e40eac94efb4ea72cbaaea07e3ef9762507a1eb23806e975500c766619060930b5f06230768a0150309c3b268d7f4d8 +SHA512 (puppet-7.21.0.tar.gz) = b0fbdf63391054d0496c67be963f98e3d85e3a1536e50d6a3f09d0c49110bb4c92bebdc38a48cd50e824e27268150cda0643c6df0edb01b3587f00a591645ee6 +SHA512 (puppet-7.21.0.tar.gz.asc) = 8486da5220d9b4fcff8c6e2ae7c081bb43c19b844cbbf30059dd7872fdc2ab6205aa85dbb4954d3e9564c93c3233fc621cbab1f06783bd83a7fe82db3e49dc3c SHA512 (puppetlabs-augeas_core-1.1.2.tar.gz) = 0e2a1f136685b54636cf1741d34bb2385a0bb22d6ea78b6fe495ced3273920d266258143333a4185f901c0c1a6ee562107224b5093668f0c370723c9b3125308 SHA512 (puppetlabs-cron_core-1.0.5.tar.gz) = a31d3170b0457985fc067b73902a82a92ee0e537020056ffef825ff8b295d581808e729ff0481479086ab6c21a2ecf111df9e16b87c0c14e26ef318e7fbfcd19 SHA512 (puppetlabs-host_core-1.0.3.tar.gz) = 09b4084663f4f6886380a473d26d1b759026f345bd3850084ac4f3ef59ed8ab2396fecdb3c836591d9097b9c5252ba794c4b7d3296b8321ff401f8a956ad093c From cd482a042b806431fc171453cdc7d7d01697b61e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 10:29:45 +0000 Subject: [PATCH 13/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 8f60dc9..bad678f 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 7.21.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 URL: https://puppet.com @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 7.21.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 17 2022 Ewoud Kohl van Wijngaarden - 7.21.0-1 - Update to 7.21.0 (fixes rhbz#2151953) From aecd12514f44d622e66401bb367291ab2dded9d0 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Thu, 8 Jun 2023 00:31:41 -0400 Subject: [PATCH 14/34] Update puppet to 7.24.0 --- puppet.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index bad678f..f82043f 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,10 +3,10 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 7.21.0 -Release: 2%{?dist} +Version: 7.24.0 +Release: 1%{?dist} Summary: Network tool for managing many disparate systems -License: ASL 2.0 +License: Apache-2.0 URL: https://puppet.com Source0: https://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.gz Source1: https://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.gz.asc @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Thu Jun 8 2023 Breno Brand Fernandes - 7.24.0-1 +- Build 7.24.0 + * Fri Jan 20 2023 Fedora Release Engineering - 7.21.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 145f512cd29ba837ea092f9d0cabe2d916b20211 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Thu, 8 Jun 2023 00:40:23 -0400 Subject: [PATCH 15/34] Update src files for 7.24 --- puppet-7.24.0.tar.gz.asc | 17 +++++++++++++++++ sources | 3 +-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 puppet-7.24.0.tar.gz.asc diff --git a/puppet-7.24.0.tar.gz.asc b/puppet-7.24.0.tar.gz.asc new file mode 100644 index 0000000..a84c887 --- /dev/null +++ b/puppet-7.24.0.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJkLvOXAAoJEEUots2eYe8mBRMP+wehHaik3fN/PTYOKD6KYYY5 +DM3a29KRDONoJXM6VE4CD9TNjPZvJ1Kfen5wM83SvzIPn8XWqbtSVS4zKrOfcKTb +7Ed4ZcOtv8GWTHR6HGjL0adasMuUQcz6RuuU38VkzzQMBiOBKspDQpuOtoE1E/rh +H0+nPI+/d5Hy7tIsund4HjiXKJOAmDHKbczexUpUIoE+00pcVCHnax9ocm35uCt8 +BsSjWL+RrayjCy1MIdPYf2K57Ilv7w86TDDZGck2zwKtwNdhROKX+LljpYIDymEI +Gs8FTcCGAtJxjkcarOCC92YuJ7g9AReHMgvsTovAPcNmsDwAquK93gKqGk7pDizm +Za6cg6EbaMYiLVCWV9BTi2OkX8qSkHxEFdTOw5kdpFBQn/FiofrfTqco75K1yiWw +uoDZNwbDR+DJ1wrdnotX6iRIUFZ1il6P6j8Pvzh1lbwoIlo58NGgwMndQqxHwMsW +G5gfKh7Q2Mo8VfnNSkjLkW4HmCDSXDWQVC5PHNHxpZBPA6AkASxfLBACpb2MuB54 +VtuzrynixNygHjvcs8jcoROOGZERtfMho+MxTK2yqHzlQUW+adsN0mQM5gBU+uOb +lirGkj0CiKS7JMjZBvkuKkxs8VewVok5SUvEGY4c2QlxhrzB+Mrs7oxlmnIdd1Du +18nQa7kwn2knZ2aeZQcq +=NYdp +-----END PGP SIGNATURE----- diff --git a/sources b/sources index 68cfe3e..39b4239 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ -SHA512 (puppet-7.21.0.tar.gz) = b0fbdf63391054d0496c67be963f98e3d85e3a1536e50d6a3f09d0c49110bb4c92bebdc38a48cd50e824e27268150cda0643c6df0edb01b3587f00a591645ee6 -SHA512 (puppet-7.21.0.tar.gz.asc) = 8486da5220d9b4fcff8c6e2ae7c081bb43c19b844cbbf30059dd7872fdc2ab6205aa85dbb4954d3e9564c93c3233fc621cbab1f06783bd83a7fe82db3e49dc3c +SHA512 (puppet-7.24.0.tar.gz) = bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9 SHA512 (puppetlabs-augeas_core-1.1.2.tar.gz) = 0e2a1f136685b54636cf1741d34bb2385a0bb22d6ea78b6fe495ced3273920d266258143333a4185f901c0c1a6ee562107224b5093668f0c370723c9b3125308 SHA512 (puppetlabs-cron_core-1.0.5.tar.gz) = a31d3170b0457985fc067b73902a82a92ee0e537020056ffef825ff8b295d581808e729ff0481479086ab6c21a2ecf111df9e16b87c0c14e26ef318e7fbfcd19 SHA512 (puppetlabs-host_core-1.0.3.tar.gz) = 09b4084663f4f6886380a473d26d1b759026f345bd3850084ac4f3ef59ed8ab2396fecdb3c836591d9097b9c5252ba794c4b7d3296b8321ff401f8a956ad093c From b435333ebcab4d7519a7d645f4588dcf19001ba8 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Fri, 23 Jun 2023 04:41:22 -0400 Subject: [PATCH 16/34] Build puppet 8.1.0 --- puppet-7.24.0.tar.gz.asc | 17 ----------------- puppet.spec | 5 ++++- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 puppet-7.24.0.tar.gz.asc diff --git a/puppet-7.24.0.tar.gz.asc b/puppet-7.24.0.tar.gz.asc deleted file mode 100644 index a84c887..0000000 --- a/puppet-7.24.0.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJkLvOXAAoJEEUots2eYe8mBRMP+wehHaik3fN/PTYOKD6KYYY5 -DM3a29KRDONoJXM6VE4CD9TNjPZvJ1Kfen5wM83SvzIPn8XWqbtSVS4zKrOfcKTb -7Ed4ZcOtv8GWTHR6HGjL0adasMuUQcz6RuuU38VkzzQMBiOBKspDQpuOtoE1E/rh -H0+nPI+/d5Hy7tIsund4HjiXKJOAmDHKbczexUpUIoE+00pcVCHnax9ocm35uCt8 -BsSjWL+RrayjCy1MIdPYf2K57Ilv7w86TDDZGck2zwKtwNdhROKX+LljpYIDymEI -Gs8FTcCGAtJxjkcarOCC92YuJ7g9AReHMgvsTovAPcNmsDwAquK93gKqGk7pDizm -Za6cg6EbaMYiLVCWV9BTi2OkX8qSkHxEFdTOw5kdpFBQn/FiofrfTqco75K1yiWw -uoDZNwbDR+DJ1wrdnotX6iRIUFZ1il6P6j8Pvzh1lbwoIlo58NGgwMndQqxHwMsW -G5gfKh7Q2Mo8VfnNSkjLkW4HmCDSXDWQVC5PHNHxpZBPA6AkASxfLBACpb2MuB54 -VtuzrynixNygHjvcs8jcoROOGZERtfMho+MxTK2yqHzlQUW+adsN0mQM5gBU+uOb -lirGkj0CiKS7JMjZBvkuKkxs8VewVok5SUvEGY4c2QlxhrzB+Mrs7oxlmnIdd1Du -18nQa7kwn2knZ2aeZQcq -=NYdp ------END PGP SIGNATURE----- diff --git a/puppet.spec b/puppet.spec index f82043f..e0569a2 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,7 +3,7 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 7.24.0 +Version: 8.1.0 Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Thu Jun 8 2023 Breno Brand Fernandes - 8.1.0-1 +- Build 8.1.0 + * Thu Jun 8 2023 Breno Brand Fernandes - 7.24.0-1 - Build 7.24.0 From 0c86f5071ff04a9dd9bdee5f34f44400ea27c06a Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Fri, 23 Jun 2023 04:42:06 -0400 Subject: [PATCH 17/34] Include files for 8.1.0 --- puppet-8.1.0.tar.gz.asc | 16 ++++++++++++++++ sources | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 puppet-8.1.0.tar.gz.asc diff --git a/puppet-8.1.0.tar.gz.asc b/puppet-8.1.0.tar.gz.asc new file mode 100644 index 0000000..e29438a --- /dev/null +++ b/puppet-8.1.0.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE1oEe063uuEQa9aqPRSi2zZ5h7yYFAmSJ92EACgkQRSi2zZ5h +7ybmkBAA3p7B7HDQzq50HuzXn5+RJRJUO8Y46V+6d29UR/ccYoSj6lg54fzRXTA0 +fY1JfcCl6iVpBosbOiHH2W3MMy5u6ANLrYtmA6FK7fp63/mTEW45EMChgdKZX4SM +dEVRmmFv+o/A/hcDA8uNC6AQvAD83fndPvjEQnIervL2lTjRcSBOaxbHbz6JvXAo +k/si6i6Y27wGWOeKNMZpxVoZqxfpNGtq6hueYRy8k3YY/9IBOONWu9z7bsjObFt1 +6tML/u4jHlm0jbk/oRnPVFlcSPoU4LhOKubu6PN9IvGfcFPJx6aCN29qoZnu+roo +deH1aJhNF+ZcUvOCR2kay3B6xT37miRhNpNLLc4sixzOasC23YiiiB4tetm2OCO3 +bmDsk2BcfXftpSsMrLBAUZaDsAGPqaRTDymmDh2tvx3PsDCpBTR37C/85Qt9/dJo +3i8klyn/bDJwcghWIf3gMk3SV697h++9Zd2Ky5iFEeIf/Hpdr6P2Gd3dW4NLXh5h +uThevTcIJPuI9uzk9NS+dvf5JCZoehAZI6bhV5aqE3sCDOArmzLEkYfiJsLYKVcI +7TnXH79wIiC4M2PU3d+uWqRYOecBG95SGib9vv13SYi7MRsvO13oIgsa/eihypgs +RKc4skCK6lDHQmOVMDUYBwr53gXrTNW/4CV9ub2utuuy/vSv28E= +=qxIC +-----END PGP SIGNATURE----- diff --git a/sources b/sources index 39b4239..1c83595 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (puppet-7.24.0.tar.gz) = bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9 +SHA512 (puppet-8.1.0.tar.gz) = 7811d67f83c72d67d5d463ccddece8889868f302217229f748a1d95df8b64213d9ee86a34e42af3beed9fc55cf70a14f63e6b8a6fcd18feb259e1d027dc35259 SHA512 (puppetlabs-augeas_core-1.1.2.tar.gz) = 0e2a1f136685b54636cf1741d34bb2385a0bb22d6ea78b6fe495ced3273920d266258143333a4185f901c0c1a6ee562107224b5093668f0c370723c9b3125308 SHA512 (puppetlabs-cron_core-1.0.5.tar.gz) = a31d3170b0457985fc067b73902a82a92ee0e537020056ffef825ff8b295d581808e729ff0481479086ab6c21a2ecf111df9e16b87c0c14e26ef318e7fbfcd19 SHA512 (puppetlabs-host_core-1.0.3.tar.gz) = 09b4084663f4f6886380a473d26d1b759026f345bd3850084ac4f3ef59ed8ab2396fecdb3c836591d9097b9c5252ba794c4b7d3296b8321ff401f8a956ad093c From e61e5b057181695ba9eeee4a0336dca3a22d38f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 06:31:21 +0000 Subject: [PATCH 18/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index e0569a2..d852c2b 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 8.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 URL: https://puppet.com @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 8.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 8 2023 Breno Brand Fernandes - 8.1.0-1 - Build 8.1.0 From 4ba8b5f472d0817714f4b181ada8c865a04b9c88 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 14 Nov 2023 23:19:01 +0100 Subject: [PATCH 19/34] Update to 8.3.1 (fixes rhbz#2233957) --- puppet.spec | 33 ++++++++++++++++++--------------- sources | 23 ++++++++++++----------- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/puppet.spec b/puppet.spec index d852c2b..7d1b974 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,8 +3,8 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 8.1.0 -Release: 2%{?dist} +Version: 8.3.1 +Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 URL: https://puppet.com @@ -13,16 +13,16 @@ Source1: https://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.g Source2: RPM-GPG-KEY-puppet-20250406 # Get these by checking out the right tag from https://github.com/puppetlabs/puppet-agent and: # sed 's|.\+puppetlabs/\([a-z_-]\+\).git.\+tags/\([0-9\.]\+\)"}|https://forge.puppet.com/v3/files/\1-\2.tar.gz|' configs/components/module-puppetlabs-*.json -Source3: https://forge.puppet.com/v3/files/puppetlabs-augeas_core-1.1.2.tar.gz -Source4: https://forge.puppet.com/v3/files/puppetlabs-cron_core-1.0.5.tar.gz -Source5: https://forge.puppet.com/v3/files/puppetlabs-host_core-1.0.3.tar.gz -Source6: https://forge.puppet.com/v3/files/puppetlabs-mount_core-1.0.4.tar.gz -Source7: https://forge.puppet.com/v3/files/puppetlabs-scheduled_task-1.0.0.tar.gz -Source8: https://forge.puppet.com/v3/files/puppetlabs-selinux_core-1.1.0.tar.gz -Source9: https://forge.puppet.com/v3/files/puppetlabs-sshkeys_core-2.2.0.tar.gz -Source10: https://forge.puppet.com/v3/files/puppetlabs-yumrepo_core-1.0.7.tar.gz -Source11: https://forge.puppet.com/v3/files/puppetlabs-zfs_core-1.2.0.tar.gz -Source12: https://forge.puppet.com/v3/files/puppetlabs-zone_core-1.0.3.tar.gz +Source3: https://forge.puppet.com/v3/files/puppetlabs-augeas_core-1.4.0.tar.gz +Source4: https://forge.puppet.com/v3/files/puppetlabs-cron_core-1.2.0.tar.gz +Source5: https://forge.puppet.com/v3/files/puppetlabs-host_core-1.2.0.tar.gz +Source6: https://forge.puppet.com/v3/files/puppetlabs-mount_core-1.2.0.tar.gz +Source7: https://forge.puppet.com/v3/files/puppetlabs-scheduled_task-3.1.1.tar.gz +Source8: https://forge.puppet.com/v3/files/puppetlabs-selinux_core-1.3.0.tar.gz +Source9: https://forge.puppet.com/v3/files/puppetlabs-sshkeys_core-2.4.0.tar.gz +Source10: https://forge.puppet.com/v3/files/puppetlabs-yumrepo_core-2.0.0.tar.gz +Source11: https://forge.puppet.com/v3/files/puppetlabs-zfs_core-1.4.0.tar.gz +Source12: https://forge.puppet.com/v3/files/puppetlabs-zone_core-1.1.0.tar.gz Source13: puppet-nm-dispatcher.systemd Source14: start-puppet-wrapper Source15: logrotate @@ -38,11 +38,11 @@ BuildRequires: hiera BuildRequires: systemd BuildRequires: gnupg2 Requires: hiera >= 3.3.1 -Requires: facter >= 3.9.6 +Requires: facter >= 4.3.0 Requires: rubygem(concurrent-ruby) >= 1.1.9 Requires: rubygem(deep_merge) >= 1.0 -Requires: rubygem(facter) >= 3.9.6 -Requires: rubygem(multi_json) >= 1.10 +Requires: rubygem(facter) >= 4.3.0 +Requires: rubygem(multi_json) >= 1.13 Requires: rubygem(puppet-resource_api) >= 1.5 Requires: rubygem(semantic_puppet) >= 1.0.2 Requires: rubygem(scanf) >= 1.0 @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Tue Nov 14 2023 Ewoud Kohl van Wijngaarden - 8.3.1-1 +- Update to 8.3.1 (fixes rhbz#2233957) + * Fri Jul 21 2023 Fedora Release Engineering - 8.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 1c83595..b67ee6b 100644 --- a/sources +++ b/sources @@ -1,11 +1,12 @@ -SHA512 (puppet-8.1.0.tar.gz) = 7811d67f83c72d67d5d463ccddece8889868f302217229f748a1d95df8b64213d9ee86a34e42af3beed9fc55cf70a14f63e6b8a6fcd18feb259e1d027dc35259 -SHA512 (puppetlabs-augeas_core-1.1.2.tar.gz) = 0e2a1f136685b54636cf1741d34bb2385a0bb22d6ea78b6fe495ced3273920d266258143333a4185f901c0c1a6ee562107224b5093668f0c370723c9b3125308 -SHA512 (puppetlabs-cron_core-1.0.5.tar.gz) = a31d3170b0457985fc067b73902a82a92ee0e537020056ffef825ff8b295d581808e729ff0481479086ab6c21a2ecf111df9e16b87c0c14e26ef318e7fbfcd19 -SHA512 (puppetlabs-host_core-1.0.3.tar.gz) = 09b4084663f4f6886380a473d26d1b759026f345bd3850084ac4f3ef59ed8ab2396fecdb3c836591d9097b9c5252ba794c4b7d3296b8321ff401f8a956ad093c -SHA512 (puppetlabs-mount_core-1.0.4.tar.gz) = 07aaae0c1176ffe098647094f2c7d9ea975288b52965af9dcc2aab043d65c20424bd6698988af540e4b1eb1852eaf3ceec9c71a6e08642f103370f5679d9206f -SHA512 (puppetlabs-scheduled_task-1.0.0.tar.gz) = ecec36e7944bc812fd5cbebbac8fb657c77058f6a72e8f2743b67c268678c2fa649a1953f1c9013bea5133c027e9a25a39a30871f3e5fd56690d033392e99b4f -SHA512 (puppetlabs-selinux_core-1.1.0.tar.gz) = 23145d89d475080c8e1298603dea357583b29ac1461c30a17f76bb2344af28cc0e6de75055cc0a820b76ed5f7f5242916fae8c5f5ec06f9ab92ce8474de306d2 -SHA512 (puppetlabs-sshkeys_core-2.2.0.tar.gz) = 933d7a41f94aa499805dfd260ee52791400163f47135920ffed6294978805ef9db8f7edc2ad28c60a00a23f566143565a4e8cf52929020a400feff91c04db68b -SHA512 (puppetlabs-yumrepo_core-1.0.7.tar.gz) = 8fb3cb40077ac113c332a761c01c1d7ce4bdfff1016be696efb41be20c86ff688b40b83c00a47394d79e64941cf6c23ea4bbd1107b4c7856d1b481733cb2d7ce -SHA512 (puppetlabs-zfs_core-1.2.0.tar.gz) = 5cf44b314094a6dad45482776b1442ab941cd1f93b39141e452c8c03b441a90ab7e6077f22f6fee9796ec2af41c30a8601e9cec6ccce81c2cb2dcc4ecba7117f -SHA512 (puppetlabs-zone_core-1.0.3.tar.gz) = 1083bcc810e8a7b048fad1c70656d806c65b5fa912c627bf1dfaf3b9d8a0ec675db100abc2fc6499669c17927ea3e55a5c968fde0e577fc1f4cebb1fbd5e0851 +SHA512 (puppet-8.3.1.tar.gz) = 0aff032caf7a3966f7e369d6f1785f0ada16e419f96f34dafee61457d2e97979b7934195eb356e44ef323401fa40be5eef608a175b3c2907f25ca92901ec81d2 +SHA512 (puppet-8.3.1.tar.gz.asc) = 694d88fd3163fb2b83255373820803979c49e1f4282a106ee615a3463dafade25a770755721d7c65b18d61a44bc471eb9f3b3e2b1571f8670944ac8f0b57276f +SHA512 (puppetlabs-augeas_core-1.4.0.tar.gz) = 225b614b4ecef9fb59428b0f0634f2677b704807f6ea05f4abca3631195faaf60d4d0b94e663b29ec298e4b915a42772c64e6358e88216b3767a54a1e91dc3a6 +SHA512 (puppetlabs-cron_core-1.2.0.tar.gz) = 7fd44777ab9a969ac28073a973fcb13499f672252aff1d21c243e98ca32a4c59f4165cd8d2e1c71b99e3ae804a520a153bdf84508b940ee705f6a6a18287b411 +SHA512 (puppetlabs-host_core-1.2.0.tar.gz) = 2be11180252bc31cbed6fdfd16a342d6585f99dede5ea9e20d1fdc2d6f0e5feecc9dbc5e2b21f6c69537d356b768609c8922ca8394d6a201f3eeedeb27466465 +SHA512 (puppetlabs-mount_core-1.2.0.tar.gz) = 6025fd130d64490e47b9660152ed8b800507940e5446a0f766b89c198b145b53b1c7056e789af202e98703e4dac0f5c590474b021e81452a45869bb1f16f3adf +SHA512 (puppetlabs-scheduled_task-3.1.1.tar.gz) = 12063fcc9be047c5391b2c7d873d0e10188db8256e9b99593e7ac9d79a2c14969422416235e14a15e55f2c8e085c185d4b08a37a09deb7ff748cb60eb07f75c9 +SHA512 (puppetlabs-selinux_core-1.3.0.tar.gz) = ce8ea21127b71e30da3f3ae8cb3c1284aea04a5c9bd7bb3523db06feec0465843fa649be561fac469f958309f3a9c84aca1dc7078e540cd82317725aadfc1923 +SHA512 (puppetlabs-sshkeys_core-2.4.0.tar.gz) = 0ed3050e8bdebe22b3581825d4e3b1a1b2cc20fb2efb835e84ebfaaa743d75e159c7f51e748d2fb9e007ec90cd3dc9840cd5f4c8e364f69b1d787467dc7db1ea +SHA512 (puppetlabs-yumrepo_core-2.0.0.tar.gz) = e203549235a967455d64c4cd92c8fca77f83228b41fb433340ac7cde25b1e39d09b0512b80b01ca01fea7fd3e8491cabee69db59fa51fff3d905f51a3d26e35e +SHA512 (puppetlabs-zfs_core-1.4.0.tar.gz) = 8810be1a57504f58fcf6b802bbc2fa5a4531914fe49c08c56a82c0088d61965e83947b809c334f9d4fc9f2947255b811dba0e2b9b18c67d2979bc7450d323a9d +SHA512 (puppetlabs-zone_core-1.1.0.tar.gz) = 231a197b2d62ba06b93f5914ff8935e7f3a972cb412749d3edc20e34977d1152f5dd091265eed5f4d7d11a2f67719f9feb5fbb017eebfb7ce231c4a2a69eed8d From 59974bc91394c390b11c442630cc158ba9edaadb Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 17 Nov 2023 15:22:25 +0100 Subject: [PATCH 20/34] Update command in comment for correct sources The git tags are now prefixed by v so the regex needs to reflect that. --- puppet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 7d1b974..a4369d6 100644 --- a/puppet.spec +++ b/puppet.spec @@ -12,7 +12,7 @@ Source0: https://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.g Source1: https://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.gz.asc Source2: RPM-GPG-KEY-puppet-20250406 # Get these by checking out the right tag from https://github.com/puppetlabs/puppet-agent and: -# sed 's|.\+puppetlabs/\([a-z_-]\+\).git.\+tags/\([0-9\.]\+\)"}|https://forge.puppet.com/v3/files/\1-\2.tar.gz|' configs/components/module-puppetlabs-*.json +# sed 's|.\+puppetlabs/\([a-z_-]\+\).git.\+tags/v\?\([0-9\.]\+\)"}|https://forge.puppet.com/v3/files/\1-\2.tar.gz|' configs/components/module-puppetlabs-*.json Source3: https://forge.puppet.com/v3/files/puppetlabs-augeas_core-1.4.0.tar.gz Source4: https://forge.puppet.com/v3/files/puppetlabs-cron_core-1.2.0.tar.gz Source5: https://forge.puppet.com/v3/files/puppetlabs-host_core-1.2.0.tar.gz From 59844c277775578e3fc6adedfdead44e1b4d1ce0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 22:35:43 +0000 Subject: [PATCH 21/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index a4369d6..d521b70 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 8.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 URL: https://puppet.com @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 8.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 14 2023 Ewoud Kohl van Wijngaarden - 8.3.1-1 - Update to 8.3.1 (fixes rhbz#2233957) From 2b273833ea3bb0d0688e3f9b6521a685cd6ea878 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 00:21:48 +0000 Subject: [PATCH 22/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index d521b70..b4f25d6 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 8.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 URL: https://puppet.com @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 8.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 8.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 007a2a2a0ecb76df5a683b544b61f57984fe3fb7 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 17 Nov 2023 16:14:07 +0100 Subject: [PATCH 23/34] Add EPEL to gating config --- gating.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gating.yaml b/gating.yaml index bb1d8ee..0da9f5a 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,5 +1,6 @@ --- !Policy product_versions: + - epel-* - fedora-* decision_contexts: [bodhi_update_push_testing] subject_type: koji_build @@ -7,6 +8,7 @@ rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} --- !Policy product_versions: + - epel-* - fedora-* decision_contexts: [bodhi_update_push_stable] subject_type: koji_build From d304672e2f9187bdf825e6899a9d6613eea84cd2 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Sun, 10 Mar 2024 16:32:13 +0100 Subject: [PATCH 24/34] Add a small README to simplify updating --- README.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..3c71d01 --- /dev/null +++ b/README.md @@ -0,0 +1,31 @@ +# Puppet + +This is the packaging for [Puppet](https://puppet.com/). +The files are downloaded from [downloads.puppet.com](https://downloads.puppet.com/puppet/) since they contain GPG signed tarballs, unlike on Rubygems. +Additionally it vendors various Puppet modules to match upstream's [puppet-agent config](https://github.com/puppetlabs/puppet-agent). + +## Updating + +Typically you will be notified via [release-monitoring](https://release-monitoring.org/project/7018/), which creates a Bugzilla. +Start with bumping the spec and reference the Bugzilla number. + +``` +BZ=2151953 VERSION=7.21.0 ; rpmdev-bumpspec --new="$VERSION" --comment="Update to $VERSION (fixes rhbz#$BZ)" puppet.spec +``` + +Then verify whether any vendored modules need to be updated. +See the lines in the spec file itself on how to do that. +In addition to that the dependencies should be verified. + +Once that's done, retrieve the sources: + +``` +spectool --get-files puppet.spec +``` + +Then upload the sources: +``` +spectool --list-files puppet.spec | awk '/https:/ { print $2 }' | xargs -n 1 basename | xargs fedpkg new-sources --offline +``` + +If it looks all right, drop the `--offline` parameter. From c9ee8964f8d74fd9d0dc3863c161b3a842b620df Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Sun, 10 Mar 2024 16:29:24 +0100 Subject: [PATCH 25/34] Update to 8.5.1 (fixes rhbz#2259039) --- puppet.spec | 13 +++++++++---- sources | 8 ++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/puppet.spec b/puppet.spec index b4f25d6..6298684 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,8 +3,8 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 8.3.1 -Release: 3%{?dist} +Version: 8.5.1 +Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 URL: https://puppet.com @@ -14,10 +14,10 @@ Source2: RPM-GPG-KEY-puppet-20250406 # Get these by checking out the right tag from https://github.com/puppetlabs/puppet-agent and: # sed 's|.\+puppetlabs/\([a-z_-]\+\).git.\+tags/v\?\([0-9\.]\+\)"}|https://forge.puppet.com/v3/files/\1-\2.tar.gz|' configs/components/module-puppetlabs-*.json Source3: https://forge.puppet.com/v3/files/puppetlabs-augeas_core-1.4.0.tar.gz -Source4: https://forge.puppet.com/v3/files/puppetlabs-cron_core-1.2.0.tar.gz +Source4: https://forge.puppet.com/v3/files/puppetlabs-cron_core-1.2.1.tar.gz Source5: https://forge.puppet.com/v3/files/puppetlabs-host_core-1.2.0.tar.gz Source6: https://forge.puppet.com/v3/files/puppetlabs-mount_core-1.2.0.tar.gz -Source7: https://forge.puppet.com/v3/files/puppetlabs-scheduled_task-3.1.1.tar.gz +Source7: https://forge.puppet.com/v3/files/puppetlabs-scheduled_task-3.2.0.tar.gz Source8: https://forge.puppet.com/v3/files/puppetlabs-selinux_core-1.3.0.tar.gz Source9: https://forge.puppet.com/v3/files/puppetlabs-sshkeys_core-2.4.0.tar.gz Source10: https://forge.puppet.com/v3/files/puppetlabs-yumrepo_core-2.0.0.tar.gz @@ -47,6 +47,8 @@ Requires: rubygem(puppet-resource_api) >= 1.5 Requires: rubygem(semantic_puppet) >= 1.0.2 Requires: rubygem(scanf) >= 1.0 Requires: ruby-augeas >= 0.5.0 +# racc was a default gem, is now a bundled gem but shipped as a sepeate package +Requires: (ruby-default-gems < 3.3 or rubygem(racc)) Requires: augeas >= 1.10.1 Requires: augeas-libs >= 1.10.1 Requires: ruby(selinux) libselinux-utils @@ -208,6 +210,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Sun Mar 10 2024 Ewoud Kohl van Wijngaarden - 8.5.1-1 +- Update to 8.5.1 (fixes rhbz#2259039) + * Fri Jan 26 2024 Fedora Release Engineering - 8.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index b67ee6b..ee7bbc6 100644 --- a/sources +++ b/sources @@ -1,10 +1,10 @@ -SHA512 (puppet-8.3.1.tar.gz) = 0aff032caf7a3966f7e369d6f1785f0ada16e419f96f34dafee61457d2e97979b7934195eb356e44ef323401fa40be5eef608a175b3c2907f25ca92901ec81d2 -SHA512 (puppet-8.3.1.tar.gz.asc) = 694d88fd3163fb2b83255373820803979c49e1f4282a106ee615a3463dafade25a770755721d7c65b18d61a44bc471eb9f3b3e2b1571f8670944ac8f0b57276f +SHA512 (puppet-8.5.1.tar.gz) = f1d661c34fc7c1381c6422ff7e027fdf4554a69939f5db926bf8a61a89583090fb8d28151f90093d3ca8037950ed911b0a5c7b8677a80ede72e83d9cbf89af7f +SHA512 (puppet-8.5.1.tar.gz.asc) = bd1df6f4831189accf380ea819cfa26356904bdb309b32a66b0522e3535401e59367a4a2a1d3c08c72cd28342ce3e2511086c78a0c890df94f136e13bb9475e0 SHA512 (puppetlabs-augeas_core-1.4.0.tar.gz) = 225b614b4ecef9fb59428b0f0634f2677b704807f6ea05f4abca3631195faaf60d4d0b94e663b29ec298e4b915a42772c64e6358e88216b3767a54a1e91dc3a6 -SHA512 (puppetlabs-cron_core-1.2.0.tar.gz) = 7fd44777ab9a969ac28073a973fcb13499f672252aff1d21c243e98ca32a4c59f4165cd8d2e1c71b99e3ae804a520a153bdf84508b940ee705f6a6a18287b411 +SHA512 (puppetlabs-cron_core-1.2.1.tar.gz) = 547e46f89f655e67d693f0f8216011cb984cf5d72ed5f14b40115768e7d97d3beff35478b45f5792efba8a43a7f5013a68ff22d9e552c98f2fbf48e31879c9ac SHA512 (puppetlabs-host_core-1.2.0.tar.gz) = 2be11180252bc31cbed6fdfd16a342d6585f99dede5ea9e20d1fdc2d6f0e5feecc9dbc5e2b21f6c69537d356b768609c8922ca8394d6a201f3eeedeb27466465 SHA512 (puppetlabs-mount_core-1.2.0.tar.gz) = 6025fd130d64490e47b9660152ed8b800507940e5446a0f766b89c198b145b53b1c7056e789af202e98703e4dac0f5c590474b021e81452a45869bb1f16f3adf -SHA512 (puppetlabs-scheduled_task-3.1.1.tar.gz) = 12063fcc9be047c5391b2c7d873d0e10188db8256e9b99593e7ac9d79a2c14969422416235e14a15e55f2c8e085c185d4b08a37a09deb7ff748cb60eb07f75c9 +SHA512 (puppetlabs-scheduled_task-3.2.0.tar.gz) = e6ba41bfc1b636c2c7a997a1b70e4a37f59abfd19ff338acd6c1a50fc8d9ac2f40feb9565cd52cb6ec1677c88d85cdda152f7ec05393ca94f3a01321fbca262d SHA512 (puppetlabs-selinux_core-1.3.0.tar.gz) = ce8ea21127b71e30da3f3ae8cb3c1284aea04a5c9bd7bb3523db06feec0465843fa649be561fac469f958309f3a9c84aca1dc7078e540cd82317725aadfc1923 SHA512 (puppetlabs-sshkeys_core-2.4.0.tar.gz) = 0ed3050e8bdebe22b3581825d4e3b1a1b2cc20fb2efb835e84ebfaaa743d75e159c7f51e748d2fb9e007ec90cd3dc9840cd5f4c8e364f69b1d787467dc7db1ea SHA512 (puppetlabs-yumrepo_core-2.0.0.tar.gz) = e203549235a967455d64c4cd92c8fca77f83228b41fb433340ac7cde25b1e39d09b0512b80b01ca01fea7fd3e8491cabee69db59fa51fff3d905f51a3d26e35e From 4f21b7c12ea2e9c204012dc834c0028e6987b022 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Sat, 20 Apr 2024 02:06:10 -0400 Subject: [PATCH 26/34] Update to 8.6.0 (fixes rhbz#2274550) --- puppet.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index 6298684..388453d 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,7 +3,7 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 8.5.1 +Version: 8.6.0 Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 @@ -210,6 +210,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Sat Apr 20 2024 Breno Brand Fernandes - 8.6.0-1 +- Update to 8.6.0 (fixes rhbz#2274550) + * Sun Mar 10 2024 Ewoud Kohl van Wijngaarden - 8.5.1-1 - Update to 8.5.1 (fixes rhbz#2259039) diff --git a/sources b/sources index ee7bbc6..4122548 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (puppet-8.5.1.tar.gz) = f1d661c34fc7c1381c6422ff7e027fdf4554a69939f5db926bf8a61a89583090fb8d28151f90093d3ca8037950ed911b0a5c7b8677a80ede72e83d9cbf89af7f -SHA512 (puppet-8.5.1.tar.gz.asc) = bd1df6f4831189accf380ea819cfa26356904bdb309b32a66b0522e3535401e59367a4a2a1d3c08c72cd28342ce3e2511086c78a0c890df94f136e13bb9475e0 +SHA512 (puppet-8.6.0.tar.gz) = b08d59b4ec79fec5f3dd2d37c9b6a9f016cf25068e507866ab8d545f59792b9af84e302675182a0318c792814f0bff2bf052c8953b6b44c5441fa2c692a9f04d +SHA512 (puppet-8.6.0.tar.gz.asc) = bb7eae98711802449a65f08b04e87e82cb8c17e9bf2fbe282be705a6a4a83c7b5d700c96d322e9882d939de63802f19f5fc15aae8ab9c2ff88adacd356d60caf SHA512 (puppetlabs-augeas_core-1.4.0.tar.gz) = 225b614b4ecef9fb59428b0f0634f2677b704807f6ea05f4abca3631195faaf60d4d0b94e663b29ec298e4b915a42772c64e6358e88216b3767a54a1e91dc3a6 SHA512 (puppetlabs-cron_core-1.2.1.tar.gz) = 547e46f89f655e67d693f0f8216011cb984cf5d72ed5f14b40115768e7d97d3beff35478b45f5792efba8a43a7f5013a68ff22d9e552c98f2fbf48e31879c9ac SHA512 (puppetlabs-host_core-1.2.0.tar.gz) = 2be11180252bc31cbed6fdfd16a342d6585f99dede5ea9e20d1fdc2d6f0e5feecc9dbc5e2b21f6c69537d356b768609c8922ca8394d6a201f3eeedeb27466465 From 81ec2372e41d819498e63837ca84f9cf05bf9886 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Sat, 20 Apr 2024 02:17:34 -0400 Subject: [PATCH 27/34] Testing and push steps in the readme --- README.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3c71d01..a8653bd 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,8 @@ Typically you will be notified via [release-monitoring](https://release-monitori Start with bumping the spec and reference the Bugzilla number. ``` -BZ=2151953 VERSION=7.21.0 ; rpmdev-bumpspec --new="$VERSION" --comment="Update to $VERSION (fixes rhbz#$BZ)" puppet.spec +export commit_message="Update to $VERSION (fixes rhbz#$BZ)" +BZ=2151953 VERSION=7.21.0 ; rpmdev-bumpspec --new="$VERSION" --comment="$commit_message" puppet.spec ``` Then verify whether any vendored modules need to be updated. @@ -28,4 +29,19 @@ Then upload the sources: spectool --list-files puppet.spec | awk '/https:/ { print $2 }' | xargs -n 1 basename | xargs fedpkg new-sources --offline ``` -If it looks all right, drop the `--offline` parameter. +Test out a scratch build: +``` +koji build --scratch rawhide $(fedpkg srpm 2>/dev/null | grep ^Wrote | rev | cut -d "/" -f1 | rev) +``` + +If it looks all right, drop the `--offline` parameter from the spectool. + +Commit, push, build, update + +``` +# git additions/removals/etc at this point +fedpkg commit -m "$commit_message" +fedpk build --target rawhide +fedpkg update +``` + From e2a1828ffc4e07a96f22a009a35b9adf2f76a0a1 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Sat, 20 Apr 2024 02:25:33 -0400 Subject: [PATCH 28/34] Bugfix on readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a8653bd..fc68bd3 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,9 @@ Typically you will be notified via [release-monitoring](https://release-monitori Start with bumping the spec and reference the Bugzilla number. ``` -export commit_message="Update to $VERSION (fixes rhbz#$BZ)" -BZ=2151953 VERSION=7.21.0 ; rpmdev-bumpspec --new="$VERSION" --comment="$commit_message" puppet.spec +BZ=2151953 VERSION=7.21.0 +commit_message="Update to $VERSION (fixes rhbz#$BZ)" +rpmdev-bumpspec --new="$VERSION" --comment="$commit_message" puppet.spec ``` Then verify whether any vendored modules need to be updated. From f99c309c62464a6f80dc0d9c141e54cf3e7972f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 08:44:12 +0000 Subject: [PATCH 29/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 388453d..de6dd61 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 8.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 URL: https://puppet.com @@ -210,6 +210,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 8.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Apr 20 2024 Breno Brand Fernandes - 8.6.0-1 - Update to 8.6.0 (fixes rhbz#2274550) From a5bd42b30dfe4a84aac3ce358274244275ac26b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 11:04:53 +0000 Subject: [PATCH 30/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index de6dd61..fa29cba 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 8.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 URL: https://puppet.com @@ -210,6 +210,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 8.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 8.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 86d01f52bb9c3e4b67908acccdbc361a96ff0575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Jan 2025 20:59:31 +0100 Subject: [PATCH 31/34] Add sysusers.d config file to allow rpm to create users/groups automatically --- puppet.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/puppet.spec b/puppet.spec index fa29cba..23d0595 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 8.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 URL: https://puppet.com @@ -83,6 +83,11 @@ find -type f -exec \ -e 's|/var/log/puppetlabs/puppet|%{_localstatedir}/log/%{name}|' \ '{}' + +# Create a sysusers.d config file +cat >puppet.sysusers.conf </dev/null || groupadd -r puppet -g 52 &>/dev/null -getent passwd puppet &>/dev/null || \ -useradd -r -u 52 -g puppet -s /sbin/nologin \ - -c "Puppet" puppet &>/dev/null %post %systemd_post %{name}.service @@ -210,6 +212,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 8.6.0-4 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sat Jan 18 2025 Fedora Release Engineering - 8.6.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 2c952e70a2d53778a2764d59dc1a3600fb4fb87d Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 15 Apr 2025 15:46:24 +0200 Subject: [PATCH 32/34] Update to 8.10.0 ... rhbz#2291351 - Ruby 3.3 compatibility fix rhbz#2280109 - Ruby 3.4 compatibility fix rhbz#2349352 --- ...id-closing-directory-we-re-iterating.patch | 41 +++++++++++++++++++ puppet-8.1.0.tar.gz.asc | 16 -------- puppet.spec | 31 ++++++++------ sources | 22 +++++----- tests/smoke/test.sh | 4 ++ 5 files changed, 75 insertions(+), 39 deletions(-) create mode 100644 0001-Avoid-closing-directory-we-re-iterating.patch delete mode 100644 puppet-8.1.0.tar.gz.asc diff --git a/0001-Avoid-closing-directory-we-re-iterating.patch b/0001-Avoid-closing-directory-we-re-iterating.patch new file mode 100644 index 0000000..4ff762a --- /dev/null +++ b/0001-Avoid-closing-directory-we-re-iterating.patch @@ -0,0 +1,41 @@ +From 2032d928c2520cba988fe57f888011a286bae1c8 Mon Sep 17 00:00:00 2001 +From: Ewoud Kohl van Wijngaarden +Date: Wed, 5 Mar 2025 14:01:47 +0100 +Subject: [PATCH] Avoid closing directory we're iterating + +Ruby 3.4 started error checking directory access and starts to raise +Errno::EBADF. + +This particular loop iterates on all open file descriptors and one is +the directory listing from Dir.foreach. + +In the past this could have led to leaked file descriptors, but it's +unlikely since it's likely the last opened file descriptor and have the +highest number. + +Link: https://github.com/ruby/ruby/commit/f2919bd11c570fc5f5440d1f101be38f61e3d16b +Link: https://bugzilla.redhat.com/show_bug.cgi?id=2349352 +--- + lib/puppet/util.rb | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb +index 06c7b11815db..37b37d614d3a 100644 +--- a/lib/puppet/util.rb ++++ b/lib/puppet/util.rb +@@ -478,8 +478,10 @@ module Util + $stderr = STDERR + + begin +- Dir.foreach('/proc/self/fd') do |f| +- if f != '.' && f != '..' && f.to_i >= 3 ++ d = Dir.new('/proc/self/fd') ++ ignore_fds = ['.', '..', d.fileno.to_s] ++ d.each_child do |f| ++ if !ignore_fds.include?(f) && f.to_i >= 3 + begin + IO.new(f.to_i).close + rescue +-- +2.49.0 + diff --git a/puppet-8.1.0.tar.gz.asc b/puppet-8.1.0.tar.gz.asc deleted file mode 100644 index e29438a..0000000 --- a/puppet-8.1.0.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE1oEe063uuEQa9aqPRSi2zZ5h7yYFAmSJ92EACgkQRSi2zZ5h -7ybmkBAA3p7B7HDQzq50HuzXn5+RJRJUO8Y46V+6d29UR/ccYoSj6lg54fzRXTA0 -fY1JfcCl6iVpBosbOiHH2W3MMy5u6ANLrYtmA6FK7fp63/mTEW45EMChgdKZX4SM -dEVRmmFv+o/A/hcDA8uNC6AQvAD83fndPvjEQnIervL2lTjRcSBOaxbHbz6JvXAo -k/si6i6Y27wGWOeKNMZpxVoZqxfpNGtq6hueYRy8k3YY/9IBOONWu9z7bsjObFt1 -6tML/u4jHlm0jbk/oRnPVFlcSPoU4LhOKubu6PN9IvGfcFPJx6aCN29qoZnu+roo -deH1aJhNF+ZcUvOCR2kay3B6xT37miRhNpNLLc4sixzOasC23YiiiB4tetm2OCO3 -bmDsk2BcfXftpSsMrLBAUZaDsAGPqaRTDymmDh2tvx3PsDCpBTR37C/85Qt9/dJo -3i8klyn/bDJwcghWIf3gMk3SV697h++9Zd2Ky5iFEeIf/Hpdr6P2Gd3dW4NLXh5h -uThevTcIJPuI9uzk9NS+dvf5JCZoehAZI6bhV5aqE3sCDOArmzLEkYfiJsLYKVcI -7TnXH79wIiC4M2PU3d+uWqRYOecBG95SGib9vv13SYi7MRsvO13oIgsa/eihypgs -RKc4skCK6lDHQmOVMDUYBwr53gXrTNW/4CV9ub2utuuy/vSv28E= -=qxIC ------END PGP SIGNATURE----- diff --git a/puppet.spec b/puppet.spec index 23d0595..9656e82 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,8 +3,8 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 8.6.0 -Release: 4%{?dist} +Version: 8.10.0 +Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 URL: https://puppet.com @@ -13,20 +13,22 @@ Source1: https://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.g Source2: RPM-GPG-KEY-puppet-20250406 # Get these by checking out the right tag from https://github.com/puppetlabs/puppet-agent and: # sed 's|.\+puppetlabs/\([a-z_-]\+\).git.\+tags/v\?\([0-9\.]\+\)"}|https://forge.puppet.com/v3/files/\1-\2.tar.gz|' configs/components/module-puppetlabs-*.json -Source3: https://forge.puppet.com/v3/files/puppetlabs-augeas_core-1.4.0.tar.gz -Source4: https://forge.puppet.com/v3/files/puppetlabs-cron_core-1.2.1.tar.gz -Source5: https://forge.puppet.com/v3/files/puppetlabs-host_core-1.2.0.tar.gz -Source6: https://forge.puppet.com/v3/files/puppetlabs-mount_core-1.2.0.tar.gz +Source3: https://forge.puppet.com/v3/files/puppetlabs-augeas_core-1.5.0.tar.gz +Source4: https://forge.puppet.com/v3/files/puppetlabs-cron_core-1.3.0.tar.gz +Source5: https://forge.puppet.com/v3/files/puppetlabs-host_core-1.3.0.tar.gz +Source6: https://forge.puppet.com/v3/files/puppetlabs-mount_core-1.3.0.tar.gz Source7: https://forge.puppet.com/v3/files/puppetlabs-scheduled_task-3.2.0.tar.gz -Source8: https://forge.puppet.com/v3/files/puppetlabs-selinux_core-1.3.0.tar.gz -Source9: https://forge.puppet.com/v3/files/puppetlabs-sshkeys_core-2.4.0.tar.gz -Source10: https://forge.puppet.com/v3/files/puppetlabs-yumrepo_core-2.0.0.tar.gz -Source11: https://forge.puppet.com/v3/files/puppetlabs-zfs_core-1.4.0.tar.gz -Source12: https://forge.puppet.com/v3/files/puppetlabs-zone_core-1.1.0.tar.gz +Source8: https://forge.puppet.com/v3/files/puppetlabs-selinux_core-1.4.0.tar.gz +Source9: https://forge.puppet.com/v3/files/puppetlabs-sshkeys_core-2.5.0.tar.gz +Source10: https://forge.puppet.com/v3/files/puppetlabs-yumrepo_core-2.1.0.tar.gz +Source11: https://forge.puppet.com/v3/files/puppetlabs-zfs_core-1.6.1.tar.gz +Source12: https://forge.puppet.com/v3/files/puppetlabs-zone_core-1.2.0.tar.gz Source13: puppet-nm-dispatcher.systemd Source14: start-puppet-wrapper Source15: logrotate +Patch: 0001-Avoid-closing-directory-we-re-iterating.patch + BuildArch: noarch # ruby-devel does not require the base package, but requires -libs instead @@ -64,7 +66,7 @@ along with obviously discrete elements like packages, services, and files. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup +%autosetup -p1 cp -a %{sources} . for f in puppetlabs-*.tar*; do tar xvf $f @@ -212,6 +214,11 @@ rm %{buildroot}%{_datadir}/%{name}/ext/{build_defaults.yaml,project_data.yaml} %systemd_postun_with_restart %{name}.service %changelog +* Tue Apr 15 2025 Ewoud Kohl van Wijngaarden - 8.10.0-1 +- Update to 8.10.0 (fixes rhbz#2291351) +- Ruby 3.3 regexp incompability bugfix (fixes rhbz#2280109) +- Ruby 3.4 closedir bugfix (fixes rhbz#2349352) + * Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 8.6.0-4 - Add sysusers.d config file to allow rpm to create users/groups automatically diff --git a/sources b/sources index 4122548..7864b03 100644 --- a/sources +++ b/sources @@ -1,12 +1,12 @@ -SHA512 (puppet-8.6.0.tar.gz) = b08d59b4ec79fec5f3dd2d37c9b6a9f016cf25068e507866ab8d545f59792b9af84e302675182a0318c792814f0bff2bf052c8953b6b44c5441fa2c692a9f04d -SHA512 (puppet-8.6.0.tar.gz.asc) = bb7eae98711802449a65f08b04e87e82cb8c17e9bf2fbe282be705a6a4a83c7b5d700c96d322e9882d939de63802f19f5fc15aae8ab9c2ff88adacd356d60caf -SHA512 (puppetlabs-augeas_core-1.4.0.tar.gz) = 225b614b4ecef9fb59428b0f0634f2677b704807f6ea05f4abca3631195faaf60d4d0b94e663b29ec298e4b915a42772c64e6358e88216b3767a54a1e91dc3a6 -SHA512 (puppetlabs-cron_core-1.2.1.tar.gz) = 547e46f89f655e67d693f0f8216011cb984cf5d72ed5f14b40115768e7d97d3beff35478b45f5792efba8a43a7f5013a68ff22d9e552c98f2fbf48e31879c9ac -SHA512 (puppetlabs-host_core-1.2.0.tar.gz) = 2be11180252bc31cbed6fdfd16a342d6585f99dede5ea9e20d1fdc2d6f0e5feecc9dbc5e2b21f6c69537d356b768609c8922ca8394d6a201f3eeedeb27466465 -SHA512 (puppetlabs-mount_core-1.2.0.tar.gz) = 6025fd130d64490e47b9660152ed8b800507940e5446a0f766b89c198b145b53b1c7056e789af202e98703e4dac0f5c590474b021e81452a45869bb1f16f3adf +SHA512 (puppet-8.10.0.tar.gz) = 5fc7842695c12ba07ffafbc6e1b1bc0efab8d3b2587a01aabb8fd8c6de07c6e227b741190b138eeac94ae2ac557fe9909d836827f79292b981e5d0bd2f53b91b +SHA512 (puppet-8.10.0.tar.gz.asc) = 4f938b43edb84f99f6e2154f767452b954427f4f8604c6aa8baf76503b7b9924b1a579cad6666b84d1b5c8a5ede1df5a373882e3644f9e1c930c214a2aba64d8 +SHA512 (puppetlabs-augeas_core-1.5.0.tar.gz) = b480356bea541b26966a300cd4505e94fd8a21f93a3946824250bf1d864f2d65676c17be2c954769ee21c4cd7314c53cc5f4986651513079868fafca27873e48 +SHA512 (puppetlabs-cron_core-1.3.0.tar.gz) = 7687240dd12b90d57ac76e3553db8b3dd981ace76141abff3199dce6b08a2b1153e31ebc52aa1b2b3498cf5e4b5f717f3ba8cace1d70991fcffe463de0a8a8e5 +SHA512 (puppetlabs-host_core-1.3.0.tar.gz) = b2b3e4d64818189babb2958742cd8b1d71273fed7142ed0f5f556ea5519fa33acec0255008398d059fd9a22fefc095f25872f77e47ea5755e729b78202cfc1fb +SHA512 (puppetlabs-mount_core-1.3.0.tar.gz) = b99825a614e54a0d5bc99061cfa88de4fe7a8b1d4cfded04a113594ec4107a685fa872a8e2c956026d7f99284ac181549cb8243b94b46721c7617c82489a2cfd SHA512 (puppetlabs-scheduled_task-3.2.0.tar.gz) = e6ba41bfc1b636c2c7a997a1b70e4a37f59abfd19ff338acd6c1a50fc8d9ac2f40feb9565cd52cb6ec1677c88d85cdda152f7ec05393ca94f3a01321fbca262d -SHA512 (puppetlabs-selinux_core-1.3.0.tar.gz) = ce8ea21127b71e30da3f3ae8cb3c1284aea04a5c9bd7bb3523db06feec0465843fa649be561fac469f958309f3a9c84aca1dc7078e540cd82317725aadfc1923 -SHA512 (puppetlabs-sshkeys_core-2.4.0.tar.gz) = 0ed3050e8bdebe22b3581825d4e3b1a1b2cc20fb2efb835e84ebfaaa743d75e159c7f51e748d2fb9e007ec90cd3dc9840cd5f4c8e364f69b1d787467dc7db1ea -SHA512 (puppetlabs-yumrepo_core-2.0.0.tar.gz) = e203549235a967455d64c4cd92c8fca77f83228b41fb433340ac7cde25b1e39d09b0512b80b01ca01fea7fd3e8491cabee69db59fa51fff3d905f51a3d26e35e -SHA512 (puppetlabs-zfs_core-1.4.0.tar.gz) = 8810be1a57504f58fcf6b802bbc2fa5a4531914fe49c08c56a82c0088d61965e83947b809c334f9d4fc9f2947255b811dba0e2b9b18c67d2979bc7450d323a9d -SHA512 (puppetlabs-zone_core-1.1.0.tar.gz) = 231a197b2d62ba06b93f5914ff8935e7f3a972cb412749d3edc20e34977d1152f5dd091265eed5f4d7d11a2f67719f9feb5fbb017eebfb7ce231c4a2a69eed8d +SHA512 (puppetlabs-selinux_core-1.4.0.tar.gz) = c212d1ad6bd4aaf58723aa0a5902e1ef90c481e333fa6b04dec53ee7badfd5d4869f0f6851b469d54368b47eac807c794e630ddd8a6be50397360281acc80ab1 +SHA512 (puppetlabs-sshkeys_core-2.5.0.tar.gz) = 8793e4d198de50167bdde5e49f77ba62e2c08232bbc4d861dc7e3d6b24248c94f6c0d025679978efaf5d0413e1390b41224ca0222148feb8e7061950b6d567c4 +SHA512 (puppetlabs-yumrepo_core-2.1.0.tar.gz) = 3f129b1c2c8ca8eaf105839db4f07f51c1c1723b9d6545ea672b95c14915003f95b1fc92308e280552cee0e27505ce09db7ceb5c219ec274c63b91ca04dee758 +SHA512 (puppetlabs-zfs_core-1.6.1.tar.gz) = a1fa2b90beeb7f2798c59e5932d4320af8baf1b9f18775716bbdeee172331efb93c8e6510bf7798552d74982bd8999ee092968ecba251c590b6c921d2b8d8992 +SHA512 (puppetlabs-zone_core-1.2.0.tar.gz) = 0cae94798551875dbbb362956d39cdcf63f8c07a6ca330394966ce49385497028134927751c7f91a992a51be3acff5781788689b72af4b25ba8493931e635c87 diff --git a/tests/smoke/test.sh b/tests/smoke/test.sh index 1037517..de07e21 100755 --- a/tests/smoke/test.sh +++ b/tests/smoke/test.sh @@ -15,7 +15,11 @@ rlJournalStart rlAssertNotGrep "warning" $rlRun_LOG -i rlRun "echo \"file { '${tmp}/applied-file': ensure => file, content => 'Hello World' }\" | puppet apply" 0 "Apply manifest" + rlAssertExists "${tmp}/applied-file" rlAssertGrep "Hello World" "applied-file" + + rlRun "puppet resource exec test command='/usr/bin/rm ${tmp}/applied-file'" 0 "Exec resource" + rlAssertNotExists "${tmp}/applied-file" rlPhaseEnd rlPhaseStartCleanup From 9b710b2b23aa10f373eb73595e5791acab269671 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 06:16:56 +0000 Subject: [PATCH 33/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 9656e82..0f49348 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 8.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 URL: https://puppet.com @@ -214,6 +214,9 @@ rm %{buildroot}%{_datadir}/%{name}/ext/{build_defaults.yaml,project_data.yaml} %systemd_postun_with_restart %{name}.service %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 8.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Apr 15 2025 Ewoud Kohl van Wijngaarden - 8.10.0-1 - Update to 8.10.0 (fixes rhbz#2291351) - Ruby 3.3 regexp incompability bugfix (fixes rhbz#2280109) From 3eddbf4082baf1e2d58f7c35f877a4907d5c757e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Fri, 3 Oct 2025 11:26:50 +0200 Subject: [PATCH 34/34] Add patch from openvox to fix dnf5 issue --- openvox-dnf5.patch | 84 ++++++++++++++++++++++++++++++++++++++++++++++ puppet.spec | 6 +++- 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 openvox-dnf5.patch diff --git a/openvox-dnf5.patch b/openvox-dnf5.patch new file mode 100644 index 0000000..770db7f --- /dev/null +++ b/openvox-dnf5.patch @@ -0,0 +1,84 @@ +commit 26d3405df7f35497ec07942c44c292bb25d60210 +Author: Lars Haugan +Date: Mon Dec 23 14:56:21 2024 +0100 + + Add fix for package running dnf5 on fedora + + Fedora 41 introduced dnf5 which has deprecated the use of the flags '-d' + and '-e'. This change removes the options + + Signed-off-by: Lars Haugan + +diff --git a/lib/puppet/provider/package/dnfmodule.rb b/lib/puppet/provider/package/dnfmodule.rb +index 8d58d2fdd8..de052ad744 100644 +--- a/lib/puppet/provider/package/dnfmodule.rb ++++ b/lib/puppet/provider/package/dnfmodule.rb +@@ -35,7 +35,7 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do + + def self.instances + packages = [] +- cmd = "#{command(:dnf)} module list -y -d 0 -e #{error_level}" ++ cmd = "#{command(:dnf)} module list -y" + execute(cmd).each_line do |line| + # select only lines with actual packages since DNF clutters the output + next unless line =~ /\[[eix]\][, ]/ +@@ -90,7 +90,7 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do + enable(args) + else + begin +- execute([command(:dnf), 'module', 'install', '-d', '0', '-e', self.class.error_level, '-y', args]) ++ execute([command(:dnf), 'module', 'install', '-y', args]) + rescue Puppet::ExecutionFailure => e + # module has no default profile and no profile was requested, so just enable the stream + # DNF versions prior to 4.2.8 do not need this workaround +@@ -117,20 +117,20 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do + end + + def enable(args = @resource[:name]) +- execute([command(:dnf), 'module', 'enable', '-d', '0', '-e', self.class.error_level, '-y', args]) ++ execute([command(:dnf), 'module', 'enable', '-y', args]) + end + + def uninstall +- execute([command(:dnf), 'module', 'remove', '-d', '0', '-e', self.class.error_level, '-y', @resource[:name]]) ++ execute([command(:dnf), 'module', 'remove', '-y', @resource[:name]]) + reset # reset module to the default stream + end + + def disable(args = @resource[:name]) +- execute([command(:dnf), 'module', 'disable', '-d', '0', '-e', self.class.error_level, '-y', args]) ++ execute([command(:dnf), 'module', 'disable', '-y', args]) + end + + def reset +- execute([command(:dnf), 'module', 'reset', '-d', '0', '-e', self.class.error_level, '-y', @resource[:name]]) ++ execute([command(:dnf), 'module', 'reset', '-y', @resource[:name]]) + end + + def flavor +diff --git a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb +index 15bc372c6b..6c0f85e31b 100644 +--- a/lib/puppet/provider/package/yum.rb ++++ b/lib/puppet/provider/package/yum.rb +@@ -247,7 +247,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do + update_command = self.class.update_command + # If not allowing virtual packages, do a query to ensure a real package exists + unless @resource.allow_virtual? +- execute([command(:cmd), '-d', '0', '-e', error_level, '-y', install_options, :list, wanted].compact) ++ execute([command(:cmd), '-y', install_options, :list, wanted].compact) + end + + should = @resource.should(:ensure) +@@ -307,10 +307,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do + end + end + +- # Yum on el-4 and el-5 returns exit status 0 when trying to install a package it doesn't recognize; +- # ensure we capture output to check for errors. +- no_debug = Puppet.runtime[:facter].value('os.release.major').to_i > 5 ? ["-d", "0"] : [] +- command = [command(:cmd)] + no_debug + ["-e", error_level, "-y", install_options, operation, wanted].compact ++ command = [command(:cmd)] + ["-y", install_options, operation, wanted].compact + output = execute(command) + + if output.to_s =~ /^No package #{wanted} available\.$/ + diff --git a/puppet.spec b/puppet.spec index 0f49348..e762f4e 100644 --- a/puppet.spec +++ b/puppet.spec @@ -4,7 +4,7 @@ Name: puppet Version: 8.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network tool for managing many disparate systems License: Apache-2.0 URL: https://puppet.com @@ -28,6 +28,7 @@ Source14: start-puppet-wrapper Source15: logrotate Patch: 0001-Avoid-closing-directory-we-re-iterating.patch +Patch: openvox-dnf5.patch BuildArch: noarch @@ -214,6 +215,9 @@ rm %{buildroot}%{_datadir}/%{name}/ext/{build_defaults.yaml,project_data.yaml} %systemd_postun_with_restart %{name}.service %changelog +* Fri Oct 03 2025 Terje Rosten - 8.10.0-3 +- Add patch from openvox to fix dnf5 issue + * Fri Jul 25 2025 Fedora Release Engineering - 8.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild