From e3ee5466f48972cbc90a865dab622186b80d6436 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Wed, 5 Feb 2020 19:33:40 +0100 Subject: [PATCH] 5.5.18 --- ...lease-restrictions-from-DNF-provider.patch | 2 +- 0004-PUP-9069-Add-support-for-RHEL8.patch | 28 ------------------- ...lease-restrictions-from-DNF-provider.patch | 27 ------------------ puppet.spec | 11 ++++---- sources | 4 +-- 5 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 0004-PUP-9069-Add-support-for-RHEL8.patch delete mode 100644 0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch diff --git a/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch b/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch index f629d6b..eba3cc8 100644 --- a/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch +++ b/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch @@ -10,7 +10,7 @@ ones being excluded. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/package/dnf.rb b/lib/puppet/provider/package/dnf.rb -index 4823ebf..ee27322 100644 +index 0bf5847..be55568 100644 --- a/lib/puppet/provider/package/dnf.rb +++ b/lib/puppet/provider/package/dnf.rb @@ -28,7 +28,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do diff --git a/0004-PUP-9069-Add-support-for-RHEL8.patch b/0004-PUP-9069-Add-support-for-RHEL8.patch deleted file mode 100644 index 3f1e578..0000000 --- a/0004-PUP-9069-Add-support-for-RHEL8.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 76031db0120ef8a3bdee576ca4aac9dc8b2859af Mon Sep 17 00:00:00 2001 -From: Emilien Macchi -Date: Wed, 15 Aug 2018 22:40:35 +0200 -Subject: [PATCH 4/5] (PUP-9069) Add support for RHEL8 - -This adds support for the next version of RHEL in the systemd provider. -Note: I have no idea when it'll be released but we need this patch as we -need to make Puppet systemd provider working. ---- - lib/puppet/provider/service/systemd.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/puppet/provider/service/systemd.rb b/lib/puppet/provider/service/systemd.rb -index c444861..a68ce96 100644 ---- a/lib/puppet/provider/service/systemd.rb -+++ b/lib/puppet/provider/service/systemd.rb -@@ -19,7 +19,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do - end - - defaultfor :osfamily => [:archlinux] -- defaultfor :osfamily => :redhat, :operatingsystemmajrelease => "7" -+ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["7", "8"] - defaultfor :osfamily => :redhat, :operatingsystem => :fedora - defaultfor :osfamily => :suse - defaultfor :osfamily => :coreos --- -2.19.2 - diff --git a/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch b/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch deleted file mode 100644 index 5673c02..0000000 --- a/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ffd3da258dd526369d63df022a2fa57f6ed6c473 Mon Sep 17 00:00:00 2001 -From: Dominic Cleal -Date: Wed, 31 May 2017 10:07:04 +0100 -Subject: [PATCH] Remove Fedora release restrictions from DNF provider - -Ensure DNF provider will be used on all versions of Fedora, without new -ones being excluded. ---- - lib/puppet/provider/package/dnf.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/puppet/provider/package/dnf.rb b/lib/puppet/provider/package/dnf.rb -index e144a1a..c0ed877 100644 ---- a/lib/puppet/provider/package/dnf.rb -+++ b/lib/puppet/provider/package/dnf.rb -@@ -28,7 +28,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do - end - end - -- defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => ['22', '23', '24', '25'] -+ defaultfor :operatingsystem => :fedora - - def self.update_command - # In DNF, update is deprecated for upgrade --- -2.7.4 - diff --git a/puppet.spec b/puppet.spec index 8cfae88..6d88f11 100644 --- a/puppet.spec +++ b/puppet.spec @@ -30,8 +30,8 @@ %endif Name: puppet -Version: 5.5.10 -Release: 10%{?dist} +Version: 5.5.18 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -45,10 +45,6 @@ Source4: start-puppet-wrapper Patch01: 0001-Fix-puppet-paths.patch Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch Patch03: 0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch -# Note: Puppet 5.5.7 is broken -# Backporting patches that add supports for RHEL > 7 -# https://github.com/puppetlabs/puppet/pull/7000 (PUP-9069) -Patch04: 0004-PUP-9069-Add-support-for-RHEL8.patch BuildArch: noarch BuildRequires: git @@ -390,6 +386,9 @@ fi exit 0 %changelog +* Mon Feb 03 2020 Terje Rosten - 5.5.18-1 +- 5.5.18 + * Thu Jan 30 2020 Fedora Release Engineering - 5.5.10-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 0568f4a..034ec56 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (puppet-5.5.10.tar.gz) = 70a5684289fc576853bf908adff44c1b1ce4b37d71236e7d7a8d140fa0e3cdd46a4b570cc7e493a3f47641f6be0c3b736ab04a178c30cce4244abe686378bf4b -SHA512 (puppet-5.5.10.tar.gz.asc) = 884e7f290c6dba7076f7e5c5038326d77997598252fbf432f0e6abcbb3fe676aa38ebe5d8df682e616fa757365de423dd074a174c5e4d4f699832fd6377bd487 +SHA512 (puppet-5.5.18.tar.gz) = 86f210ee783ca36340b22463cd4ac237d8dc1c6a35526530af0696bb3f0373b0b22f690d3e3f8e31655ea182a33eb60b66b5826bd6c4d1b0059a8e46152416e6 +SHA512 (puppet-5.5.18.tar.gz.asc) = d380e1e10494c4ad164dd65235875bd885a1747671b014633a6e571677e7c87ed6c0125c9e3093caf88fff471d920a553a1862a1d810af34ce60151bd4c35244