From 693b1d10743ac3a71526c2e89506bccda78f14c0 Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Fri, 21 Jun 2013 14:26:47 -0400 Subject: [PATCH 001/136] Remove --include-dependencies when installing gems (fixes BZ#952955) --- puppet.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/puppet.spec b/puppet.spec index 6d429d5..4281d43 100644 --- a/puppet.spec +++ b/puppet.spec @@ -126,6 +126,9 @@ for f in external/nagios.rb relationship.rb; do done chmod +x ext/puppet-load.rb ext/regexp_nodes/regexp_nodes.rb +# Fixes BZ#952955 +sed -i '/include-dependencies/d' lib/puppet/provider/package/gem.rb + %build # Nothing to build From 275d2525d322e9085e11b7ad33020b2d3dd8cfd2 Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Fri, 21 Jun 2013 14:32:26 -0400 Subject: [PATCH 002/136] Incremented version --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 4281d43..ce4b6bc 100644 --- a/puppet.spec +++ b/puppet.spec @@ -22,7 +22,7 @@ Name: puppet Version: 3.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -357,6 +357,9 @@ fi rm -rf %{buildroot} %changelog +* Fri Jun 21 2013 Sam Kottler - 3.1.1-4 +- Remove --include-dependencies when installing gems + * Tue Apr 16 2013 Orion Poplawski - 3.1.1-3 - Add upstream patch for ruby 2.0 support - Fix rhel ruby conditional From 4479ea806734f6f98210e0e3655b1e54fa055bde Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Fri, 26 Jul 2013 22:50:33 -0400 Subject: [PATCH 003/136] Add hard dependency on Ruby (fixes BZ #985208) --- puppet.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index ce4b6bc..695befa 100644 --- a/puppet.spec +++ b/puppet.spec @@ -22,7 +22,7 @@ Name: puppet Version: 3.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -55,6 +55,9 @@ Requires: ruby(release) %endif Requires: ruby(shadow) +# Prevents jruby from being pulled in by dependencies (BZ #985208) +Requires: ruby + # Pull in ruby selinux bindings where available %if 0%{?fedora} || 0%{?rhel} >= 6 %{!?_without_selinux:Requires: ruby(selinux), libselinux-utils} @@ -357,6 +360,9 @@ fi rm -rf %{buildroot} %changelog +* Fri Jul 26 2013 Sam Kottler - 3.1.1-5 +- Add hard dependency on ruby + * Fri Jun 21 2013 Sam Kottler - 3.1.1-4 - Remove --include-dependencies when installing gems From f4fcad99975a64ea0f221e30141db8839986a3e1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 30 Jul 2013 11:02:54 -0600 Subject: [PATCH 004/136] Use systemd semantics and name in NM dispatcher script --- puppet-nm-dispatcher.systemd | 8 ++++++++ puppet.spec | 11 ++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100755 puppet-nm-dispatcher.systemd diff --git a/puppet-nm-dispatcher.systemd b/puppet-nm-dispatcher.systemd new file mode 100755 index 0000000..3e5eeee --- /dev/null +++ b/puppet-nm-dispatcher.systemd @@ -0,0 +1,8 @@ +#!/bin/bash +# +# Restart puppet on network changes to pickup changes to /etc/resolv.conf +# +# https://projects.puppetlabs.com/issues/2776 +# https://bugzilla.redhat.com/532085 + +[[ $2 =~ ^(up|down)$ ]] && /bin/systemctl condrestart puppetagent.service || : diff --git a/puppet.spec b/puppet.spec index 695befa..d1c1cb5 100644 --- a/puppet.spec +++ b/puppet.spec @@ -22,13 +22,14 @@ Name: puppet Version: 3.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com Source0: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz Source1: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc Source2: puppet-nm-dispatcher +Source3: puppet-nm-dispatcher.systemd # Pulled from upstream, will be released the next time they cut a release from master Patch0: 0001-18781-Be-more-tolerant-of-old-clients-in-WEBrick-ser.patch @@ -163,8 +164,13 @@ install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/p # Install a NetworkManager dispatcher script to pickup changes to # /etc/resolv.conf and such (https://bugzilla.redhat.com/532085). +%if 0%{?_with_systemd} +install -Dpv %{SOURCE3} \ + %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name} +%else install -Dpv %{SOURCE2} \ %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name} +%endif # Install the ext/ directory to %%{_datadir}/%%{name} install -d %{buildroot}%{_datadir}/%{name} @@ -360,6 +366,9 @@ fi rm -rf %{buildroot} %changelog +* Tue Jul 30 2013 Orion Poplawski - 3.1.1-6 +- Use systemd semantics and name in NM dispatcher script + * Fri Jul 26 2013 Sam Kottler - 3.1.1-5 - Add hard dependency on ruby From 553f823d5108f1fc7c7602c4404792072fc9d88a Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Sun, 4 Aug 2013 22:19:47 -0400 Subject: [PATCH 005/136] Add tar as an installation requirement (BZ #994477) --- puppet.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index d1c1cb5..975882e 100644 --- a/puppet.spec +++ b/puppet.spec @@ -22,7 +22,7 @@ Name: puppet Version: 3.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -87,6 +87,8 @@ Requires(preun): initscripts Requires(postun): initscripts %endif +Requires: tar + %description Puppet lets you centrally manage every important aspect of your system using a cross-platform specification language that manages all the separate elements @@ -366,6 +368,9 @@ fi rm -rf %{buildroot} %changelog +* Wed Aug 7 2013 Sam Kottler - 3.1.1-7 +- Add tar as an installation requirement + * Tue Jul 30 2013 Orion Poplawski - 3.1.1-6 - Use systemd semantics and name in NM dispatcher script From c9c76bc520b5b7d9a0cd7c35f855b3adfb891a51 Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Fri, 25 Oct 2013 12:21:39 -0400 Subject: [PATCH 006/136] The rundir perms fix is upstream now, so removing it --- puppet.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index dac0a69..a79e60b 100644 --- a/puppet.spec +++ b/puppet.spec @@ -109,7 +109,6 @@ The server can also function as a certificate authority and file server. %prep %setup -q -patch -s -p1 < %{confdir}/rundir-perms.patch # Fix some rpmlint complaints for f in mac_automount.pp mcx_dock_absent.pp mcx_dock_default.pp \ From 4f6ba3aa322c8e990a36576a52de0b9b6b1b6086 Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Tue, 14 Jan 2014 06:13:16 -0500 Subject: [PATCH 007/136] Update to 3.4.2 to mitigate CVE-2013-4969 (BZ#1047792) --- puppet.spec | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/puppet.spec b/puppet.spec index a79e60b..94eb070 100644 --- a/puppet.spec +++ b/puppet.spec @@ -21,7 +21,7 @@ %global confdir ext/redhat Name: puppet -Version: 3.3.1 +Version: 3.4.2 Release: 1%{?dist} Group: System Environment/Base Summary: A network tool for managing many disparate systems @@ -109,17 +109,6 @@ The server can also function as a certificate authority and file server. %prep %setup -q - -# Fix some rpmlint complaints -for f in mac_automount.pp mcx_dock_absent.pp mcx_dock_default.pp \ - mcx_dock_full.pp mcx_dock_invalid.pp mcx_nogroup.pp \ - mcx_notexists_absent.pp; do - sed -i -e'1d' examples/$f - chmod a-x examples/$f -done -for f in external/nagios.rb relationship.rb; do - sed -i -e '1d' lib/puppet/$f -done chmod +x ext/puppet-load.rb ext/regexp_nodes/regexp_nodes.rb # Fixes BZ#952955 @@ -140,7 +129,8 @@ install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet %if 0%{?_with_systemd} %{__install} -d -m0755 %{buildroot}%{_unitdir} -install -Dp -m0644 ext/systemd/puppetagent.service %{buildroot}%{_unitdir}/puppetagent.service +install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/puppet.service +ln -s %{_unitdir}/puppet.service %{buildroot}%{_unitdir}/puppetagent.service install -Dp -m0644 ext/systemd/puppetmaster.service %{buildroot}%{_unitdir}/puppetmaster.service %else install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet @@ -202,6 +192,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_bindir}/extlookup2hiera %{puppet_libdir}/* %if 0%{?_with_systemd} +%{_unitdir}/puppet.service %{_unitdir}/puppetagent.service %else %{_initrddir}/puppet @@ -307,8 +298,8 @@ exit 0 %preun %if 0%{?_with_systemd} if [ "$1" -eq 0 ] ; then - /bin/systemctl --no-reload disable puppetagent.service > /dev/null 2>&1 || : - /bin/systemctl stop puppetagent.service > /dev/null 2>&1 || : + /bin/systemctl --no-reload disable puppet.service > /dev/null 2>&1 || : + /bin/systemctl stop puppet.service > /dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %else @@ -335,7 +326,7 @@ fi %postun %if 0%{?_with_systemd} if [ $1 -ge 1 ] ; then - /bin/systemctl try-restart puppetagent.service >/dev/null 2>&1 || : + /bin/systemctl try-restart puppet.service >/dev/null 2>&1 || : fi %else if [ "$1" -ge 1 ]; then @@ -358,9 +349,21 @@ fi rm -rf %{buildroot} %changelog +* Tue Jan 14 2014 Sam Kottler - 3.4.2-1 +- Update to 3.4.2 to mitigate CVE-2013-4969 (BZ#1047792) + * Fri Oct 25 2013 Sam Kottler - 3.3.1-1 - Update to 3.3.1 (BZ# 1023527) +* Fri Sep 13 2013 Sam Kottler - 3.3.0-1 +- Update to 3.3.0 and remove the rundir-perms patch since it's no longer needed + +* Fri Aug 30 2013 Sam Kottler - 3.2.4-1 +- Update to 3.2.4 to fix CVE-2013-4761 and CVE-2013-4956 + +* Thu Aug 29 2013 Sam Kottler - 3.2.2-1 +- Update to 3.2.2 + * Wed Aug 7 2013 Sam Kottler - 3.1.1-6 - Add tar as an installation requirement From cbf57c3e349f86775a9e43f4c6045d8ba0a4ffdb Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Tue, 14 Jan 2014 06:13:53 -0500 Subject: [PATCH 008/136] Add sources for 3.4.2 --- sources | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d97a5ae..4343c51 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ -e553c381df75b24c8eda00ecc6dcef8a puppet-3.3.1.tar.gz -db515b3dc952ad3e1b2acacfb6578cf3 puppet-3.3.1.tar.gz.asc +6e5d1e2f9dcb5cba5efa92cb018c25ac 23115-convert-nil-to-undef.patch +0a83c5398abfd1f5cb8f6f538dae3739 start-puppet-wrapper +e8d77839c0e24f51604eed3fb6e8b485 puppet-3.4.2.tar.gz.asc +cbe27b5e333b87b91578778d1fa21ca4 puppet-3.4.2.tar.gz From 07d623d64973afa8fb5ef83961aed6fe70ecf906 Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Thu, 16 Jan 2014 10:46:19 +0100 Subject: [PATCH 009/136] Remove F18 conditionals since it's EOL now --- puppet.spec | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/puppet.spec b/puppet.spec index 94eb070..47dbc50 100644 --- a/puppet.spec +++ b/puppet.spec @@ -11,13 +11,7 @@ %global puppet_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') %endif -# F-17 also ships with systemd; package/use systemd files in this case -%if 0%{?fedora} > 18 %global _with_systemd 1 -%else -%global _with_systemd 0 -%endif - %global confdir ext/redhat Name: puppet @@ -41,12 +35,8 @@ BuildArch: noarch %if 0%{?rhel} && 0%{?rhel} <= 6 Requires: ruby(abi) = 1.8 %else -%if 0%{?fedora} <= 18 -Requires: ruby(abi) = 1.9.1 -%else Requires: ruby(release) %endif -%endif Requires: ruby(shadow) # Prevents jruby from being pulled in by dependencies (BZ #985208) From 7ad2bda7efcca1684c19d6acaea0e0d97a963f76 Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Thu, 16 Jan 2014 10:50:18 +0100 Subject: [PATCH 010/136] Add changelog entry and bump version since scratch-build was okay --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 47dbc50..e335783 100644 --- a/puppet.spec +++ b/puppet.spec @@ -16,7 +16,7 @@ Name: puppet Version: 3.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Base Summary: A network tool for managing many disparate systems License: ASL 2.0 @@ -339,6 +339,9 @@ fi rm -rf %{buildroot} %changelog +* Thu Jan 16 2014 Sam Kottler - 3.4.2-2 +- Remove F18 conditionals now that it's EOL + * Tue Jan 14 2014 Sam Kottler - 3.4.2-1 - Update to 3.4.2 to mitigate CVE-2013-4969 (BZ#1047792) From e0e2f3d386c8bf195d9b4b79988996e625f5c686 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Ergo Project)" Date: Fri, 19 Sep 2014 01:27:27 +0200 Subject: [PATCH 011/136] Update to 3.7.1 --- puppet.spec | 30 ++++++++++++++++++++++++++---- sources | 2 ++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/puppet.spec b/puppet.spec index be5be3c..3b0de70 100644 --- a/puppet.spec +++ b/puppet.spec @@ -9,14 +9,17 @@ %global puppet_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') %endif +%if 0%{?fedora} > 18 || 0%{?rhel} >= 7 || 0%{?suse_version} %global _with_systemd 1 +%endif + %global confdir ext/redhat %global pending_upgrade_path %{_localstatedir}/lib/rpm-state/puppet %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 3.6.2 -Release: 3%{?dist} +Version: 3.7.1 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -25,7 +28,6 @@ Source1: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.g Source2: puppet-nm-dispatcher Source3: puppet-nm-dispatcher.systemd Source4: start-puppet-wrapper -Patch0: yum_proxy_none_.patch Group: System Environment/Base @@ -33,6 +35,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: facter >= 1.6.6 BuildRequires: ruby-devel >= 1.8.7 +# ruby-devel does not require the base package, but requires -libs instead +BuildRequires: ruby >= 1.8.7 BuildArch: noarch %if 0%{?rhel} && 0%{?rhel} <= 6 @@ -42,6 +46,8 @@ Requires: ruby(release) %endif Requires: ruby(shadow) +Requires: rubygem(json) + # Prevents jruby from being pulled in by dependencies (BZ #985208) Requires: ruby @@ -88,6 +94,11 @@ along with obviously discrete elements like packages, services, and files. Group: System Environment/Base Summary: Server for the puppet system management tool Requires: puppet = %{version}-%{release} +Requires: mod_passenger +Requires: mod_ssl +Requires: puppet-dashboard +Requires: puppetdb +Requires: puppetdb-terminus %if 0%{?_with_systemd} Requires(post): systemd Requires(preun): systemd @@ -105,7 +116,6 @@ The server can also function as a certificate authority and file server. %prep %setup -q -%patch0 -p1 chmod +x ext/puppet-load.rb ext/regexp_nodes/regexp_nodes.rb %build @@ -190,6 +200,14 @@ echo "D /var/run/%{name} 0755 %{name} %{name} -" > \ # Create puppet modules directory for puppet module tool mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules +cat > %{buildroot}%{_sysconfdir}/%{name}/routes.yaml << EOF +--- +master: + facts: + terminus: puppetdb + cache: yaml +EOF + %files %defattr(-, root, root, 0755) %doc LICENSE README.md examples @@ -267,6 +285,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_initrddir}/puppetmaster %{_initrddir}/puppetqueue %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster +%config(noreplace) %{_sysconfdir}/puppet/routes.yaml %endif %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf %dir %{_sysconfdir}/puppet/manifests @@ -388,6 +407,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Wed Sep 17 2014 Jeroen van Meeuwen - 3.7.1-1 +- Update to 3.7.1 + * Tue Aug 19 2014 Lukas Zapletal 3.6.2-3 - 1131398 - added start-puppet-ca SELinux wrapper binary diff --git a/sources b/sources index db6e904..4e4def0 100644 --- a/sources +++ b/sources @@ -1,3 +1,5 @@ 7e2981dcab39771b8243432bfd359d46 puppet-3.6.2.tar.gz 6c7836c40e431353095368af11252a4d puppet-3.6.2.tar.gz.asc 5d19d719514246973649301f096c7970 start-puppet-wrapper +af7aafba7e5da21d72c13fc1e10c62a4 puppet-3.7.1.tar.gz +fa2cc84a083808815a7802771fd46309 puppet-3.7.1.tar.gz.asc From b9ef76767304a332c49a824ea9fe768a9cebf68a Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Ergo Project)" Date: Fri, 19 Sep 2014 01:29:08 +0200 Subject: [PATCH 012/136] Drop yum proxy patch --- yum_proxy_none_.patch | 50 ------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 yum_proxy_none_.patch diff --git a/yum_proxy_none_.patch b/yum_proxy_none_.patch deleted file mode 100644 index 30416e3..0000000 --- a/yum_proxy_none_.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 973c58057d1bb24d64c716e2971d5317f6e0edfb Mon Sep 17 00:00:00 2001 -From: Graham Taylor -Date: Fri, 13 Jun 2014 14:56:14 +0100 -Subject: [PATCH] (PUP-2271) Allow yumrepo proxy attribute to be set to _none_ - -Add fix and test to allow proxy to be set to _none_ to bypass global proxy -configuration for YUM. - -See https://tickets.puppetlabs.com/browse/PUP-2271 ---- - lib/puppet/type/yumrepo.rb | 2 +- - spec/unit/type/yumrepo_spec.rb | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - mode change 100644 => 100755 spec/unit/type/yumrepo_spec.rb - -diff --git a/lib/puppet/type/yumrepo.rb b/lib/puppet/type/yumrepo.rb -index daa8d44..d9ff11d 100644 ---- a/lib/puppet/type/yumrepo.rb -+++ b/lib/puppet/type/yumrepo.rb -@@ -277,7 +277,7 @@ - - newvalues(/.*/, :absent) - validate do |value| -- next if value.to_s == 'absent' -+ next if value.to_s =~ /^(absent|_none_)$/ - parsed = URI.parse(value) - - unless VALID_SCHEMES.include?(parsed.scheme) -diff --git a/spec/unit/type/yumrepo_spec.rb b/spec/unit/type/yumrepo_spec.rb -old mode 100644 -new mode 100755 -index 543a0ce..2246b72 ---- a/spec/unit/type/yumrepo_spec.rb -+++ b/spec/unit/type/yumrepo_spec.rb -@@ -295,6 +295,12 @@ - - describe "proxy" do - it_behaves_like "a yumrepo parameter that can be absent", :proxy -+ it "accepts _none_" do -+ described_class.new( -+ :name => 'puppetlabs', -+ :proxy => "_none_" -+ ) -+ end - it_behaves_like "a yumrepo parameter that accepts a single URL", :proxy - end - --- -1.9.3 - From c4780059bac41a720aa4f8ae8c92f08be39d3229 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 19 Sep 2014 09:08:28 -0600 Subject: [PATCH 013/136] Fix %files for routes.yaml --- puppet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 3b0de70..65641ea 100644 --- a/puppet.spec +++ b/puppet.spec @@ -285,9 +285,9 @@ EOF %{_initrddir}/puppetmaster %{_initrddir}/puppetqueue %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster -%config(noreplace) %{_sysconfdir}/puppet/routes.yaml %endif %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf +%config(noreplace) %{_sysconfdir}/puppet/routes.yaml %dir %{_sysconfdir}/puppet/manifests %{_mandir}/man8/puppet-kick.8.gz %{_mandir}/man8/puppet-master.8.gz From 47b591509dfa072d987705e1d23a9ce26e14c640 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 30 Sep 2014 11:47:44 -0600 Subject: [PATCH 014/136] Drop server deps and configuration changes (bug #1144298) --- puppet.spec | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/puppet.spec b/puppet.spec index 65641ea..8cbcad1 100644 --- a/puppet.spec +++ b/puppet.spec @@ -94,11 +94,6 @@ along with obviously discrete elements like packages, services, and files. Group: System Environment/Base Summary: Server for the puppet system management tool Requires: puppet = %{version}-%{release} -Requires: mod_passenger -Requires: mod_ssl -Requires: puppet-dashboard -Requires: puppetdb -Requires: puppetdb-terminus %if 0%{?_with_systemd} Requires(post): systemd Requires(preun): systemd @@ -200,13 +195,6 @@ echo "D /var/run/%{name} 0755 %{name} %{name} -" > \ # Create puppet modules directory for puppet module tool mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules -cat > %{buildroot}%{_sysconfdir}/%{name}/routes.yaml << EOF ---- -master: - facts: - terminus: puppetdb - cache: yaml -EOF %files %defattr(-, root, root, 0755) @@ -287,7 +275,6 @@ EOF %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster %endif %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf -%config(noreplace) %{_sysconfdir}/puppet/routes.yaml %dir %{_sysconfdir}/puppet/manifests %{_mandir}/man8/puppet-kick.8.gz %{_mandir}/man8/puppet-master.8.gz @@ -407,6 +394,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Tue Sep 30 2014 Orion Poplawski - 3.7.1-1 +- Drop server deps and configuration changes (bug #1144298) + * Wed Sep 17 2014 Jeroen van Meeuwen - 3.7.1-1 - Update to 3.7.1 From 86c8bf8264b61329c766a6c9490ebbd90bc4353e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 30 Sep 2014 11:49:07 -0600 Subject: [PATCH 015/136] Bump release --- puppet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index 8cbcad1..f80f12d 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 3.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -394,7 +394,7 @@ exit 0 rm -rf %{buildroot} %changelog -* Tue Sep 30 2014 Orion Poplawski - 3.7.1-1 +* Tue Sep 30 2014 Orion Poplawski - 3.7.1-2 - Drop server deps and configuration changes (bug #1144298) * Wed Sep 17 2014 Jeroen van Meeuwen - 3.7.1-1 From ac936bf6efb46a0663b178a4324e9c1f2e9bdb7f Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Sat, 28 Feb 2015 19:49:16 +0100 Subject: [PATCH 016/136] Use systemd macros (RHBZ #1197239) --- puppet.spec | 70 ++++++++++++++++++----------------------------------- 1 file changed, 24 insertions(+), 46 deletions(-) diff --git a/puppet.spec b/puppet.spec index f80f12d..359adef 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 3.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -75,6 +75,7 @@ Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +BuildRequires: systemd %else Requires(post): chkconfig Requires(preun): chkconfig @@ -98,6 +99,7 @@ Requires: puppet = %{version}-%{release} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +BuildRequires: systemd %else Requires(post): chkconfig Requires(preun): chkconfig @@ -288,24 +290,25 @@ getent passwd puppet &>/dev/null || \ useradd -r -u 52 -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \ -c "Puppet" puppet &>/dev/null # ensure that old setups have the right puppet home dir -if [ $1 -gt 1 ] ; then +if [ $1 -gt 1 ]; then usermod -d %{_localstatedir}/lib/puppet puppet &>/dev/null fi exit 0 %post %if 0%{?_with_systemd} -/bin/systemctl daemon-reload >/dev/null 2>&1 +%systemd_post puppet.service %else # If there's a running puppet agent, restart it during upgrade. Fixes # BZ #1024538. if [ "$1" -ge 1 ]; then pid="%{_localstatedir}/run/puppet/agent.pid" if [ -e "$pid" ]; then - if ps aux | grep `cat "$pid"` | grep -v grep | awk '{ print $12 }' | grep -q sbin; then - (kill $(< "$pid") && rm -f "$pid" && \ - /sbin/service puppet start) >/dev/null 2>&1 - fi + if ps -p "$(< "$pid")" -o cmd= | grep -q "puppet agent"; then + kill "$(< "$pid")" \ + && rm -f "$pid" \ + && /sbin/service puppet start + fi &>/dev/null fi fi /sbin/chkconfig --add puppet @@ -314,7 +317,7 @@ exit 0 %post server %if 0%{?_with_systemd} -/bin/systemctl daemon-reload >/dev/null 2>&1 +%systemd_post puppetmaster.service %else /sbin/chkconfig --add puppetmaster %endif @@ -322,24 +325,10 @@ exit 0 %preun %if 0%{?_with_systemd} -if [ "$1" -eq 0 ] ; then - /bin/systemctl --no-reload disable puppet.service > /dev/null 2>&1 - /bin/systemctl stop puppet.service > /dev/null 2>&1 - /bin/systemctl daemon-reload >/dev/null 2>&1 -fi - -if [ "$1" -eq 1 ]; then - /bin/systemctl is-enabled puppetagent.service > /dev/null 2>&1 - if [ "$?" -eq 0 ]; then - /bin/systemctl /bin/systemctl --no-reload disable puppetagent.service > /dev/null 2>&1 - /bin/systemctl stop puppetagent.service > /dev/null 2>&1 - /bin/systemctl daemon-reload >/dev/null 2>&1 - install -D -m 644 /dev/null %{pending_upgrade_file} > /dev/null 2>&1 - fi -fi +%systemd_preun puppet.service %else -if [ "$1" -eq 0 ] ; then - /sbin/service puppet stop >/dev/null 2>&1 +if [ "$1" -eq 0 ]; then + /sbin/service puppet stop &>/dev/null /sbin/chkconfig --del puppet fi %endif @@ -347,14 +336,10 @@ exit 0 %preun server %if 0%{?_with_systemd} -if [ "$1" -eq 0 ] ; then - /bin/systemctl --no-reload disable puppetmaster.service > /dev/null 2>&1 - /bin/systemctl stop puppetmaster.service > /dev/null 2>&1 - /bin/systemctl daemon-reload >/dev/null 2>&1 -fi +%systemd_preun puppetmaster.service %else -if [ "$1" -eq 0 ] ; then - /sbin/service puppetmaster stop >/dev/null 2>&1 +if [ "$1" -eq 0 ]; then + /sbin/service puppetmaster stop &>/dev/null /sbin/chkconfig --del puppetmaster fi %endif @@ -362,30 +347,20 @@ exit 0 %postun %if 0%{?_with_systemd} -if [ "$1" -ge 1 ] ; then - /bin/systemctl try-restart puppet.service >/dev/null 2>&1 - if [ -e %{pending_upgrade_file} ]; then - /bin/systemctl --no-reload enable puppet.service > /dev/null 2>&1 - /bin/systemctl start puppet.service > /dev/null 2>&1 - /bin/systemctl daemon-reload >/dev/null 2>&1 - rm %{pending_upgrade_file} - fi -fi +%systemd_postun_with_restart puppet.service %else if [ "$1" -ge 1 ]; then - /sbin/service puppet condrestart >/dev/null 2>&1 + /sbin/service puppet condrestart &>/dev/null fi %endif exit 0 %postun server %if 0%{?_with_systemd} -if [ "$1" -ge 1 ] ; then - /bin/systemctl try-restart puppetmaster.service >/dev/null 2>&1 -fi +%systemd_postun_with_restart puppetmaster.service %else if [ "$1" -ge 1 ]; then - /sbin/service puppetmaster condrestart >/dev/null 2>&1 + /sbin/service puppetmaster condrestart &>/dev/null fi %endif exit 0 @@ -394,6 +369,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Sat Feb 28 2015 Haïkel Guémar - 3.7.1-3 +- Use systemd macros (RHBZ #1197239) + * Tue Sep 30 2014 Orion Poplawski - 3.7.1-2 - Drop server deps and configuration changes (bug #1144298) From 6f97f078db3a32a92c8d2ad88b94259776e6d38c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 16 Mar 2015 20:43:05 -0600 Subject: [PATCH 017/136] Remove old sources --- sources | 2 -- 1 file changed, 2 deletions(-) diff --git a/sources b/sources index 4e4def0..a7f5f29 100644 --- a/sources +++ b/sources @@ -1,5 +1,3 @@ -7e2981dcab39771b8243432bfd359d46 puppet-3.6.2.tar.gz -6c7836c40e431353095368af11252a4d puppet-3.6.2.tar.gz.asc 5d19d719514246973649301f096c7970 start-puppet-wrapper af7aafba7e5da21d72c13fc1e10c62a4 puppet-3.7.1.tar.gz fa2cc84a083808815a7802771fd46309 puppet-3.7.1.tar.gz.asc From 18c8fd07466f7d84da44c16579a2da5c1e2df9be Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 31 Mar 2015 13:20:14 -0600 Subject: [PATCH 018/136] Update to 3.7.5 --- puppet.spec | 7 +++++-- sources | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/puppet.spec b/puppet.spec index 359adef..dffee2b 100644 --- a/puppet.spec +++ b/puppet.spec @@ -18,8 +18,8 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 3.7.1 -Release: 3%{?dist} +Version: 3.7.5 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -369,6 +369,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Tue Mar 31 2015 Orion Poplawski - 3.7.5-1 +- Update to 3.7.5 + * Sat Feb 28 2015 Haïkel Guémar - 3.7.1-3 - Use systemd macros (RHBZ #1197239) diff --git a/sources b/sources index a7f5f29..44aada9 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -5d19d719514246973649301f096c7970 start-puppet-wrapper -af7aafba7e5da21d72c13fc1e10c62a4 puppet-3.7.1.tar.gz -fa2cc84a083808815a7802771fd46309 puppet-3.7.1.tar.gz.asc +0314f55d4f89a00383443fb3910637ba puppet-3.7.5.tar.gz From 9e801e0a86f24a68ae3353d9022c74e35721151c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 31 Mar 2015 13:27:33 -0600 Subject: [PATCH 019/136] Unbundle libs (bug #1198366) --- puppet.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index dffee2b..7aa713b 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 3.7.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -47,6 +47,7 @@ Requires: ruby(release) Requires: ruby(shadow) Requires: rubygem(json) +Requires: rubygem(safe_yaml) # Prevents jruby from being pulled in by dependencies (BZ #985208) Requires: ruby @@ -114,6 +115,9 @@ The server can also function as a certificate authority and file server. %prep %setup -q chmod +x ext/puppet-load.rb ext/regexp_nodes/regexp_nodes.rb +# Unbundle +rm -r lib/puppet/vendor/* +echo "require 'safe_yaml'" > lib/puppet/vendor/require_vendored.rb %build # Nothing to build @@ -369,6 +373,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Tue Mar 31 2015 Orion Poplawski - 3.7.5-2 +- Unbundle libs (bug #1198366) + * Tue Mar 31 2015 Orion Poplawski - 3.7.5-1 - Update to 3.7.5 From 9b46536457c81441892851b254c84e7cb725be6f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 31 Mar 2015 13:29:36 -0600 Subject: [PATCH 020/136] Upload .asc, move wrapper to git --- .gitignore | 2 -- sources | 1 + start-puppet-wrapper | 6 ++++++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 start-puppet-wrapper diff --git a/.gitignore b/.gitignore index 1fbbdfa..b490e46 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ *.tar.gz.asc /puppet-*/ /.build*.log -/start-puppet-wrapper -/23115-convert-nil-to-undef.patch diff --git a/sources b/sources index 44aada9..c6f0fdd 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 0314f55d4f89a00383443fb3910637ba puppet-3.7.5.tar.gz +fa2cc84a083808815a7802771fd46309 puppet-3.7.1.tar.gz.asc diff --git a/start-puppet-wrapper b/start-puppet-wrapper new file mode 100644 index 0000000..4544dfd --- /dev/null +++ b/start-puppet-wrapper @@ -0,0 +1,6 @@ +#!/bin/sh +# +# This is wrapper script to start puppet which is used to support starting +# puppet daemon processes with correct SELinux context. + +/usr/bin/puppet $* From a570e09aee0728911312108a7c2a702bf28743d4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 31 Mar 2015 13:33:39 -0600 Subject: [PATCH 021/136] Upload the correct .asc file --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index c6f0fdd..d3c7bee 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 0314f55d4f89a00383443fb3910637ba puppet-3.7.5.tar.gz -fa2cc84a083808815a7802771fd46309 puppet-3.7.1.tar.gz.asc +6fee0d2a3555a4d022b7cfa77778d139 puppet-3.7.5.tar.gz.asc From fe6b061c3b3e15c23748260961ca5b0bf7b338a9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 19 Apr 2015 17:41:52 -0600 Subject: [PATCH 022/136] Require rubygem(pathspec) and rubygem(semantic) --- puppet.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 7aa713b..99093e7 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 3.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -47,6 +47,8 @@ Requires: ruby(release) Requires: ruby(shadow) Requires: rubygem(json) +Requires: rubygem(pathspec) +Requires: rubygem(semantic) Requires: rubygem(safe_yaml) # Prevents jruby from being pulled in by dependencies (BZ #985208) @@ -373,6 +375,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Sun Apr 19 2015 Orion Poplawski - 3.7.5-3 +- Require rubygem(pathspec) and rubygem(semantic) + * Tue Mar 31 2015 Orion Poplawski - 3.7.5-2 - Unbundle libs (bug #1198366) From 0812b79b16e33aaaf8ddda4d6095933795322729 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 22 Apr 2015 22:32:31 -0600 Subject: [PATCH 023/136] Do not unbundle puppet's semantic module --- puppet.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index 99093e7..aff9001 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 3.7.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -48,7 +48,6 @@ Requires: ruby(shadow) Requires: rubygem(json) Requires: rubygem(pathspec) -Requires: rubygem(semantic) Requires: rubygem(safe_yaml) # Prevents jruby from being pulled in by dependencies (BZ #985208) @@ -118,7 +117,7 @@ The server can also function as a certificate authority and file server. %setup -q chmod +x ext/puppet-load.rb ext/regexp_nodes/regexp_nodes.rb # Unbundle -rm -r lib/puppet/vendor/* +rm -r lib/puppet/vendor/*{pathspec,rgen,safe_yaml}* echo "require 'safe_yaml'" > lib/puppet/vendor/require_vendored.rb %build @@ -375,6 +374,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Wed Apr 22 2015 Orion Poplawski - 3.7.5-4 +- Do not unbundle puppet's semantic module + * Sun Apr 19 2015 Orion Poplawski - 3.7.5-3 - Require rubygem(pathspec) and rubygem(semantic) From 8ebb464e36d023f3bb2f9c39f5bdbd06e5b1dcf3 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 8 Apr 2015 23:57:29 +0200 Subject: [PATCH 024/136] Upgrade to Puppet 4 rc1 F22 introduces ruby 2.2 --- puppet.spec | 58 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/puppet.spec b/puppet.spec index aff9001..a4253e8 100644 --- a/puppet.spec +++ b/puppet.spec @@ -13,22 +13,28 @@ %global _with_systemd 1 %endif -%global confdir ext/redhat +%global confdir conf %global pending_upgrade_path %{_localstatedir}/lib/rpm-state/puppet %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending +%global prerelease_tag rc1 + Name: puppet -Version: 3.7.5 -Release: 4%{?dist} +Version: 4.0.0 +Release: 0.1%{prerelease_tag}%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com -Source0: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz -Source1: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc +Source0: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}-%{prerelease_tag}.tar.gz +Source1: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}-%{prerelease_tag}.tar.gz.asc Source2: puppet-nm-dispatcher Source3: puppet-nm-dispatcher.systemd Source4: start-puppet-wrapper +# Puppetlabs messed up with default paths +Patch01: 0001-Fix-puppet-paths.patch +# systemd is the default init for all supported Fedora releases +Patch02: 0002-make-systemd-the-default-init-for-fedora-in-puppet.patch Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -114,10 +120,11 @@ Provides the central puppet server daemon which provides manifests to clients. The server can also function as a certificate authority and file server. %prep -%setup -q -chmod +x ext/puppet-load.rb ext/regexp_nodes/regexp_nodes.rb +%setup -q -n %{name}-%{version}-%{prerelease_tag} +%patch01 -p1 -b .paths +%patch02 -p1 -b .systemd # Unbundle -rm -r lib/puppet/vendor/*{pathspec,rgen,safe_yaml}* +rm -r lib/puppet/vendor/*{pathspec,rgen}* echo "require 'safe_yaml'" > lib/puppet/vendor/require_vendored.rb %build @@ -125,13 +132,20 @@ echo "require 'safe_yaml'" > lib/puppet/vendor/require_vendored.rb %install rm -rf %{buildroot} -ruby install.rb --destdir=%{buildroot} --quick --no-rdoc --sitelibdir=%{puppet_libdir} +ruby install.rb --destdir=%{buildroot} \ + --configdir=%{_sysconfdir}/puppet \ + --bindir=%{_bindir} --vardir=%{_localstatedir}/cache/puppet \ + --logdir=%{_localstatedir}/log/puppet \ + --rundir=%{_localstatedir}/log/puppet \ + --quick --no-rdoc --sitelibdir=%{puppet_libdir} + install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests install -d -m0755 %{buildroot}%{_datadir}/%{name}/modules install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet +install -d -m0750 %{buildroot}%{_localstatedir}/cache/puppet %if 0%{?_with_systemd} %{__install} -d -m0755 %{buildroot}%{_unitdir} @@ -146,9 +160,10 @@ install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster install -Dp -m0755 %{confdir}/queue.init %{buildroot}%{_initrddir}/puppetqueue %endif +install -Dp -m0644 %{confdir}/auth.conf %{buildroot}%{_sysconfdir}/puppet/auth.conf install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf -install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet +install -Dp -m0644 ext/redhat/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet # Install a NetworkManager dispatcher script to pickup changes to # /etc/resolv.conf and such (https://bugzilla.redhat.com/532085). @@ -186,9 +201,9 @@ install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-agent install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-master install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-ca %if 0%{?_with_systemd} -sed -i 's|^ExecStart=/usr/bin/puppet|ExecStart=/usr/bin/start-puppet-master|' \ +sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|ExecStart=/usr/bin/start-puppet-master|' \ %{buildroot}%{_unitdir}/puppetmaster.service -sed -i 's|^ExecStart=/usr/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \ +sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \ %{buildroot}%{_unitdir}/puppet.service %endif @@ -237,6 +252,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %attr(-, puppet, puppet) %{_localstatedir}/run/puppet %attr(0750, puppet, puppet) %{_localstatedir}/log/puppet %attr(-, puppet, puppet) %{_localstatedir}/lib/puppet +%attr(0750, puppet, puppet) %{_localstatedir}/cache/puppet %{_mandir}/man5/puppet.conf.5.gz %{_mandir}/man8/puppet.8.gz %{_mandir}/man8/puppet-agent.8.gz @@ -256,9 +272,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-filebucket.8.gz %{_mandir}/man8/puppet-help.8.gz %{_mandir}/man8/puppet-inspect.8.gz -%{_mandir}/man8/puppet-instrumentation_data.8.gz -%{_mandir}/man8/puppet-instrumentation_listener.8.gz -%{_mandir}/man8/puppet-instrumentation_probe.8.gz +#%{_mandir}/man8/puppet-instrumentation_data.8.gz +#%{_mandir}/man8/puppet-instrumentation_listener.8.gz +#%{_mandir}/man8/puppet-instrumentation_probe.8.gz +%{_mandir}/man8/puppet-epp.8.gz %{_mandir}/man8/puppet-key.8.gz %{_mandir}/man8/puppet-man.8.gz %{_mandir}/man8/puppet-module.8.gz @@ -268,7 +285,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-report.8.gz %{_mandir}/man8/puppet-resource.8.gz %{_mandir}/man8/puppet-resource_type.8.gz -%{_mandir}/man8/puppet-secret_agent.8.gz +#%{_mandir}/man8/puppet-secret_agent.8.gz %{_mandir}/man8/puppet-status.8.gz %{_mandir}/man8/extlookup2hiera.8.gz @@ -283,9 +300,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %endif %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf %dir %{_sysconfdir}/puppet/manifests -%{_mandir}/man8/puppet-kick.8.gz +#%{_mandir}/man8/puppet-kick.8.gz %{_mandir}/man8/puppet-master.8.gz -%{_mandir}/man8/puppet-queue.8.gz +#%{_mandir}/man8/puppet-queue.8.gz # Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5), # and 471919 (RHEL-4) @@ -374,6 +391,11 @@ exit 0 rm -rf %{buildroot} %changelog +* Mon Apr 27 2015 Haïkel Guémar - 4.0.0-0.1rc1 +- Upstream 4.0.0 +- Fix issue codedir path +- Fix init provider for Fedora (systemd is default on all supported releases now) + * Wed Apr 22 2015 Orion Poplawski - 3.7.5-4 - Do not unbundle puppet's semantic module From 9320d61fcfa9ba2834fabd085589384b85843522 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 29 Apr 2015 01:20:42 +0200 Subject: [PATCH 025/136] Upload 4.0.0-rc1 sources --- 0001-Fix-puppet-paths.patch | 45 +++++++++++++++++++ ...he-default-init-for-fedora-in-puppet.patch | 25 +++++++++++ sources | 3 +- 3 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 0001-Fix-puppet-paths.patch create mode 100644 0002-make-systemd-the-default-init-for-fedora-in-puppet.patch diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch new file mode 100644 index 0000000..5071a7c --- /dev/null +++ b/0001-Fix-puppet-paths.patch @@ -0,0 +1,45 @@ +From 9deed392392c229fd8f20fe5e52a4853f8363484 Mon Sep 17 00:00:00 2001 +From: Haikel Guemar +Date: Thu, 9 Apr 2015 01:38:19 +0200 +Subject: [PATCH 1/2] Fix puppet paths + +--- + lib/puppet/util/run_mode.rb | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb +index 07e33a6..82b4558 100644 +--- a/lib/puppet/util/run_mode.rb ++++ b/lib/puppet/util/run_mode.rb +@@ -55,23 +55,23 @@ module Puppet + + class UnixRunMode < RunMode + def conf_dir +- which_dir("/etc/puppetlabs/puppet", "~/.puppet") ++ which_dir("/etc/puppet", "~/.puppet") + end + + def code_dir +- which_dir("/etc/puppetlabs/code", "~/.puppet/code") ++ which_dir("/etc/puppet", "~/.puppet/code") + end + + def var_dir +- which_dir("/opt/puppetlabs/puppet/cache", "~/.puppet/var") ++ which_dir("/var/lib/puppet/cache", "~/.puppet/var") + end + + def run_dir +- which_dir("/var/run/puppetlabs", "~/.puppet/var/run") ++ which_dir("/var/run/puppet", "~/.puppet/var/run") + end + + def log_dir +- which_dir("/var/log/puppetlabs", "~/.puppet/var/log") ++ which_dir("/var/log/puppet", "~/.puppet/var/log") + end + end + +-- +2.3.5 + diff --git a/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch b/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch new file mode 100644 index 0000000..26692de --- /dev/null +++ b/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch @@ -0,0 +1,25 @@ +From df2058dde597baf6e1534a05dde879f0a7738fdf Mon Sep 17 00:00:00 2001 +From: Haikel Guemar +Date: Mon, 13 Apr 2015 14:25:11 +0200 +Subject: [PATCH 2/2] make systemd the default init for fedora in puppet + +--- + 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 39ef5ea..89b6b62 100644 +--- a/lib/puppet/provider/service/systemd.rb ++++ b/lib/puppet/provider/service/systemd.rb +@@ -7,7 +7,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do + + defaultfor :osfamily => [:archlinux] + defaultfor :osfamily => :redhat, :operatingsystemmajrelease => "7" +- defaultfor :osfamily => :redhat, :operatingsystem => :fedora, :operatingsystemmajrelease => ["17", "18", "19", "20", "21"] ++ defaultfor :osfamily => :redhat, :operatingsystem => :fedora + defaultfor :osfamily => :suse, :operatingsystemmajrelease => ["12", "13"] + + def self.instances +-- +2.3.5 + diff --git a/sources b/sources index d3c7bee..ef5a23f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -0314f55d4f89a00383443fb3910637ba puppet-3.7.5.tar.gz -6fee0d2a3555a4d022b7cfa77778d139 puppet-3.7.5.tar.gz.asc +d73be37aa5dd10b941fe4bae5ddc9c6f puppet-4.0.0-rc1.tar.gz From d6be7b0d431c09e52025b81d2df20c9b9e84fdc9 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 29 Apr 2015 01:40:30 +0200 Subject: [PATCH 026/136] Upstream 4.0.0 --- 0001-Fix-puppet-paths.patch | 24 +++++++++---------- ...he-default-init-for-fedora-in-puppet.patch | 4 ++-- puppet.spec | 13 +++++----- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch index 5071a7c..140d635 100644 --- a/0001-Fix-puppet-paths.patch +++ b/0001-Fix-puppet-paths.patch @@ -1,6 +1,6 @@ -From 9deed392392c229fd8f20fe5e52a4853f8363484 Mon Sep 17 00:00:00 2001 -From: Haikel Guemar -Date: Thu, 9 Apr 2015 01:38:19 +0200 +From ff5be0d65a5872cd809cee98a34521f335df9412 Mon Sep 17 00:00:00 2001 +From: Haikel Guemar +Date: Wed, 29 Apr 2015 01:38:35 +0200 Subject: [PATCH 1/2] Fix puppet paths --- @@ -8,38 +8,38 @@ Subject: [PATCH 1/2] Fix puppet paths 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb -index 07e33a6..82b4558 100644 +index 453095c..bb576df 100644 --- a/lib/puppet/util/run_mode.rb +++ b/lib/puppet/util/run_mode.rb -@@ -55,23 +55,23 @@ module Puppet +@@ -72,23 +72,23 @@ module Puppet class UnixRunMode < RunMode def conf_dir -- which_dir("/etc/puppetlabs/puppet", "~/.puppet") +- which_dir("/etc/puppetlabs/puppet", "~/.puppetlabs/etc/puppet") + which_dir("/etc/puppet", "~/.puppet") end def code_dir -- which_dir("/etc/puppetlabs/code", "~/.puppet/code") +- which_dir("/etc/puppetlabs/code", "~/.puppetlabs/etc/code") + which_dir("/etc/puppet", "~/.puppet/code") end def var_dir -- which_dir("/opt/puppetlabs/puppet/cache", "~/.puppet/var") -+ which_dir("/var/lib/puppet/cache", "~/.puppet/var") +- which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache") ++ which_dir("/var/lib/puppet/cache", "~/.puppet/cache") end def run_dir -- which_dir("/var/run/puppetlabs", "~/.puppet/var/run") +- which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run") + which_dir("/var/run/puppet", "~/.puppet/var/run") end def log_dir -- which_dir("/var/log/puppetlabs", "~/.puppet/var/log") +- which_dir("/var/log/puppetlabs/puppet", "~/.puppetlabs/var/log") + which_dir("/var/log/puppet", "~/.puppet/var/log") end end -- -2.3.5 +2.3.6 diff --git a/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch b/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch index 26692de..cde5a14 100644 --- a/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch +++ b/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch @@ -1,4 +1,4 @@ -From df2058dde597baf6e1534a05dde879f0a7738fdf Mon Sep 17 00:00:00 2001 +From 11c7b82c193d88f82cab8b285cebae5be1f3b2b5 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Mon, 13 Apr 2015 14:25:11 +0200 Subject: [PATCH 2/2] make systemd the default init for fedora in puppet @@ -21,5 +21,5 @@ index 39ef5ea..89b6b62 100644 def self.instances -- -2.3.5 +2.3.6 diff --git a/puppet.spec b/puppet.spec index a4253e8..8f8fda5 100644 --- a/puppet.spec +++ b/puppet.spec @@ -17,16 +17,14 @@ %global pending_upgrade_path %{_localstatedir}/lib/rpm-state/puppet %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending -%global prerelease_tag rc1 - Name: puppet Version: 4.0.0 -Release: 0.1%{prerelease_tag}%{?dist} +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com -Source0: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}-%{prerelease_tag}.tar.gz -Source1: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}-%{prerelease_tag}.tar.gz.asc +Source0: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz +Source1: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc Source2: puppet-nm-dispatcher Source3: puppet-nm-dispatcher.systemd Source4: start-puppet-wrapper @@ -120,7 +118,7 @@ Provides the central puppet server daemon which provides manifests to clients. The server can also function as a certificate authority and file server. %prep -%setup -q -n %{name}-%{version}-%{prerelease_tag} +%setup -q %patch01 -p1 -b .paths %patch02 -p1 -b .systemd # Unbundle @@ -391,6 +389,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Tue Apr 28 2015 Haïkel Guémar - 4.0.0-1 +- Upstream 4.0.0 + * Mon Apr 27 2015 Haïkel Guémar - 4.0.0-0.1rc1 - Upstream 4.0.0 - Fix issue codedir path From 0690abb53792032383af1e6046e98200d4752e3f Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 29 Apr 2015 01:51:38 +0200 Subject: [PATCH 027/136] Upload 4.0.0 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index ef5a23f..086488b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d73be37aa5dd10b941fe4bae5ddc9c6f puppet-4.0.0-rc1.tar.gz +0dea1fae828a21bb899f49e3856c0cc5 puppet-4.0.0.tar.gz From d81485e91e08a51f9de39e6a19a3667acdee654a Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 29 Apr 2015 01:55:16 +0200 Subject: [PATCH 028/136] Upload 4.0.0 sources --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 086488b..571be21 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +67ef2b14b76e4f8cf7f5167c4b3c7a2a puppet-4.0.0.tar.gz.asc 0dea1fae828a21bb899f49e3856c0cc5 puppet-4.0.0.tar.gz From e9ad9876443c61e59bacc1d21584fa2b11b3cb14 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Sun, 17 May 2015 18:24:27 +0200 Subject: [PATCH 029/136] Fix puppet paths and unit files (upstream #12185) --- 0001-Fix-puppet-paths.patch | 8 ++++---- ...e-systemd-the-default-init-for-fedora-in-puppet.patch | 4 ++-- puppet.spec | 9 ++++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch index 140d635..d29aaef 100644 --- a/0001-Fix-puppet-paths.patch +++ b/0001-Fix-puppet-paths.patch @@ -1,4 +1,4 @@ -From ff5be0d65a5872cd809cee98a34521f335df9412 Mon Sep 17 00:00:00 2001 +From 92ec714fc77a5cc5c743367be39cd83afa2356b6 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 29 Apr 2015 01:38:35 +0200 Subject: [PATCH 1/2] Fix puppet paths @@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Fix puppet paths 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb -index 453095c..bb576df 100644 +index 453095c..bcdde95 100644 --- a/lib/puppet/util/run_mode.rb +++ b/lib/puppet/util/run_mode.rb @@ -72,23 +72,23 @@ module Puppet @@ -26,7 +26,7 @@ index 453095c..bb576df 100644 def var_dir - which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache") -+ which_dir("/var/lib/puppet/cache", "~/.puppet/cache") ++ which_dir("/var/lib/puppet", "~/.puppet/cache") end def run_dir @@ -41,5 +41,5 @@ index 453095c..bb576df 100644 end -- -2.3.6 +2.4.0 diff --git a/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch b/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch index cde5a14..ee9abfd 100644 --- a/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch +++ b/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch @@ -1,4 +1,4 @@ -From 11c7b82c193d88f82cab8b285cebae5be1f3b2b5 Mon Sep 17 00:00:00 2001 +From 4e812abeb7b373c780a6ff46a5450b9d53d68e30 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Mon, 13 Apr 2015 14:25:11 +0200 Subject: [PATCH 2/2] make systemd the default init for fedora in puppet @@ -21,5 +21,5 @@ index 39ef5ea..89b6b62 100644 def self.instances -- -2.3.6 +2.4.0 diff --git a/puppet.spec b/puppet.spec index 8f8fda5..343f0d6 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -199,9 +199,9 @@ install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-agent install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-master install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-ca %if 0%{?_with_systemd} -sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|ExecStart=/usr/bin/start-puppet-master|' \ +sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|Type=forking\nExecStart=/usr/bin/start-puppet-master|' \ %{buildroot}%{_unitdir}/puppetmaster.service -sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \ +sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|Type=forking\nExecStart=/usr/bin/start-puppet-agent|' \ %{buildroot}%{_unitdir}/puppet.service %endif @@ -389,6 +389,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Sun May 17 2015 Haïkel Guémar - 4.0.0-2 +- Fix puppet paths and unit files (upstream #12185) + * Tue Apr 28 2015 Haïkel Guémar - 4.0.0-1 - Upstream 4.0.0 From 8433963672b09efd6aef6b0fb8dba768cfe2158e Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Sun, 24 May 2015 00:17:26 +0200 Subject: [PATCH 030/136] Upstream 4.1.0 - Fix Puppet belief that Fedora is OpenBSD (PUP-4491) --- puppet.spec | 8 ++++++-- sources | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/puppet.spec b/puppet.spec index 343f0d6..530aca7 100644 --- a/puppet.spec +++ b/puppet.spec @@ -18,8 +18,8 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 4.0.0 -Release: 2%{?dist} +Version: 4.1.0 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -389,6 +389,10 @@ exit 0 rm -rf %{buildroot} %changelog +* Sat May 23 2015 Haïkel Guémar - 4.1.0-1 +- Upstream 4.1.0 +- Fix Puppet belief that Fedora is OpenBSD (PUP-4491) + * Sun May 17 2015 Haïkel Guémar - 4.0.0-2 - Fix puppet paths and unit files (upstream #12185) diff --git a/sources b/sources index 571be21..4058083 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -67ef2b14b76e4f8cf7f5167c4b3c7a2a puppet-4.0.0.tar.gz.asc -0dea1fae828a21bb899f49e3856c0cc5 puppet-4.0.0.tar.gz +a5a553f9bbc9e9e136660c05b9be3265 puppet-4.1.0.tar.gz +66f0287001548e7a2a98a25d03ad6ae9 puppet-4.1.0.tar.gz.asc From aa57ca967723899cc6500b0a71b518517cfa4754 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 17:59:20 +0000 Subject: [PATCH 031/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 530aca7..4f3a9b4 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -389,6 +389,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 4.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 23 2015 Haïkel Guémar - 4.1.0-1 - Upstream 4.1.0 - Fix Puppet belief that Fedora is OpenBSD (PUP-4491) From a75fde8e5170f718b8bc1cea4e61e06942d4b8d3 Mon Sep 17 00:00:00 2001 From: Lukas Zapletal Date: Tue, 21 Jul 2015 15:17:15 +0200 Subject: [PATCH 032/136] Call exec rather that spawn sub-process because of signals --- puppet.spec | 5 ++++- start-puppet-wrapper | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index 4f3a9b4..4e92ca4 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -389,6 +389,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Tue Jul 21 2015 Lukas Zapletal 4.1.0-3 +- Puppet agent is started via exec rather than sub-process + * Thu Jun 18 2015 Fedora Release Engineering - 4.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/start-puppet-wrapper b/start-puppet-wrapper index 4544dfd..e0c8b70 100644 --- a/start-puppet-wrapper +++ b/start-puppet-wrapper @@ -2,5 +2,7 @@ # # This is wrapper script to start puppet which is used to support starting # puppet daemon processes with correct SELinux context. +# -/usr/bin/puppet $* +# Call exec rather that spawn sub-process because of signals +exec /usr/bin/puppet $* From 19ce87e9b91d812f2e66c84a4170a6d0deb3d9ff Mon Sep 17 00:00:00 2001 From: Lukas Zapletal Date: Tue, 28 Jul 2015 17:21:36 +0200 Subject: [PATCH 033/136] 1246238 - systemd service type changed to 'simple' --- puppet.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index 4e92ca4..f3b288a 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -199,9 +199,9 @@ install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-agent install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-master install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-ca %if 0%{?_with_systemd} -sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|Type=forking\nExecStart=/usr/bin/start-puppet-master|' \ +sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=/usr/bin/start-puppet-master|' \ %{buildroot}%{_unitdir}/puppetmaster.service -sed -i 's|^ExecStart=/opt/puppetlabs/puppet/bin/puppet|Type=forking\nExecStart=/usr/bin/start-puppet-agent|' \ +sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \ %{buildroot}%{_unitdir}/puppet.service %endif @@ -389,6 +389,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Tue Jul 28 2015 Lukas Zapletal 4.1.0-4 +- 1246238 - systemd service type changed to 'simple' + * Tue Jul 21 2015 Lukas Zapletal 4.1.0-3 - Puppet agent is started via exec rather than sub-process From c3e621009bbaac104d4a3a519a8789c377df44a2 Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Wed, 29 Jul 2015 22:22:23 +0200 Subject: [PATCH 034/136] Update to Upstream 4.2.1 Signed-off-by: Gael Chamoulaud --- ...rt-maint-Remove-puppetmaster.service.patch | 46 +++++++++++++++++++ ...he-default-init-for-fedora-in-puppet.patch | 25 ---------- puppet.spec | 12 +++-- sources | 4 +- 4 files changed, 55 insertions(+), 32 deletions(-) create mode 100644 0002-Revert-maint-Remove-puppetmaster.service.patch delete mode 100644 0002-make-systemd-the-default-init-for-fedora-in-puppet.patch diff --git a/0002-Revert-maint-Remove-puppetmaster.service.patch b/0002-Revert-maint-Remove-puppetmaster.service.patch new file mode 100644 index 0000000..657f161 --- /dev/null +++ b/0002-Revert-maint-Remove-puppetmaster.service.patch @@ -0,0 +1,46 @@ +From f3d931b6c68e4305ce612949ec59dca460e578d7 Mon Sep 17 00:00:00 2001 +From: Gael Chamoulaud +Date: Wed, 29 Jul 2015 21:58:48 +0200 +Subject: [PATCH] Revert "(maint) Remove puppetmaster.service" + +This reverts commit c0e30daa53b6267c1c86b6e27c01b1c26cf49af5. +--- + ext/systemd/puppet.service | 2 +- + ext/systemd/puppetmaster.service | 12 ++++++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + create mode 100644 ext/systemd/puppetmaster.service + +diff --git a/ext/systemd/puppet.service b/ext/systemd/puppet.service +index 61b0313..c7f063e 100644 +--- a/ext/systemd/puppet.service ++++ b/ext/systemd/puppet.service +@@ -1,7 +1,7 @@ + [Unit] + Description=Puppet agent + Wants=basic.target +-After=basic.target network.target ++After=basic.target network.target puppetmaster.service + + [Service] + EnvironmentFile=-/etc/sysconfig/puppetagent +diff --git a/ext/systemd/puppetmaster.service b/ext/systemd/puppetmaster.service +new file mode 100644 +index 0000000..dbbd627 +--- /dev/null ++++ b/ext/systemd/puppetmaster.service +@@ -0,0 +1,12 @@ ++[Unit] ++Description=Puppet master ++Wants=basic.target ++After=basic.target network.target ++ ++[Service] ++EnvironmentFile=-/etc/sysconfig/puppetmaster ++EnvironmentFile=-/etc/default/puppetmaster ++ExecStart=/usr/bin/puppet master $PUPPETMASTER_EXTRA_OPTS --no-daemonize ++ ++[Install] ++WantedBy=multi-user.target +-- +2.4.3 + diff --git a/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch b/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch deleted file mode 100644 index ee9abfd..0000000 --- a/0002-make-systemd-the-default-init-for-fedora-in-puppet.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4e812abeb7b373c780a6ff46a5450b9d53d68e30 Mon Sep 17 00:00:00 2001 -From: Haikel Guemar -Date: Mon, 13 Apr 2015 14:25:11 +0200 -Subject: [PATCH 2/2] make systemd the default init for fedora in puppet - ---- - 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 39ef5ea..89b6b62 100644 ---- a/lib/puppet/provider/service/systemd.rb -+++ b/lib/puppet/provider/service/systemd.rb -@@ -7,7 +7,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do - - defaultfor :osfamily => [:archlinux] - defaultfor :osfamily => :redhat, :operatingsystemmajrelease => "7" -- defaultfor :osfamily => :redhat, :operatingsystem => :fedora, :operatingsystemmajrelease => ["17", "18", "19", "20", "21"] -+ defaultfor :osfamily => :redhat, :operatingsystem => :fedora - defaultfor :osfamily => :suse, :operatingsystemmajrelease => ["12", "13"] - - def self.instances --- -2.4.0 - diff --git a/puppet.spec b/puppet.spec index f3b288a..903e9f2 100644 --- a/puppet.spec +++ b/puppet.spec @@ -18,8 +18,8 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 4.1.0 -Release: 4%{?dist} +Version: 4.2.1 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -31,8 +31,7 @@ Source4: start-puppet-wrapper # Puppetlabs messed up with default paths Patch01: 0001-Fix-puppet-paths.patch -# systemd is the default init for all supported Fedora releases -Patch02: 0002-make-systemd-the-default-init-for-fedora-in-puppet.patch +Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -120,7 +119,7 @@ The server can also function as a certificate authority and file server. %prep %setup -q %patch01 -p1 -b .paths -%patch02 -p1 -b .systemd +%patch02 -p1 -b .server # Unbundle rm -r lib/puppet/vendor/*{pathspec,rgen}* echo "require 'safe_yaml'" > lib/puppet/vendor/require_vendored.rb @@ -389,6 +388,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Wed Jul 29 2015 Gael Chamoulaud - 4.2.1-1 +- Upstream 4.2.1 + * Tue Jul 28 2015 Lukas Zapletal 4.1.0-4 - 1246238 - systemd service type changed to 'simple' diff --git a/sources b/sources index 4058083..42c0eed 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a5a553f9bbc9e9e136660c05b9be3265 puppet-4.1.0.tar.gz -66f0287001548e7a2a98a25d03ad6ae9 puppet-4.1.0.tar.gz.asc +ec058dd9ac38dce720a9248fea23a98b puppet-4.2.1.tar.gz +50a975fd929239e7df4f5df2e6b3931a puppet-4.2.1.tar.gz.asc From 6e2b94ac4643a0b5cd642afdd69231e436b89788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=A1gr?= Date: Tue, 8 Sep 2015 21:59:53 +0200 Subject: [PATCH 035/136] Remove safe_yaml vendored library Hardcoded safe_yaml requirement breaks Puppet 4.x. This patch removes dependency on this rubygem. Resolves: rhbz#1261091 --- puppet.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index 903e9f2..61ff7f3 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -51,7 +51,6 @@ Requires: ruby(shadow) Requires: rubygem(json) Requires: rubygem(pathspec) -Requires: rubygem(safe_yaml) # Prevents jruby from being pulled in by dependencies (BZ #985208) Requires: ruby @@ -122,7 +121,6 @@ The server can also function as a certificate authority and file server. %patch02 -p1 -b .server # Unbundle rm -r lib/puppet/vendor/*{pathspec,rgen}* -echo "require 'safe_yaml'" > lib/puppet/vendor/require_vendored.rb %build # Nothing to build @@ -388,6 +386,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Wed Jul 29 2015 Gael Chamoulaud - 4.2.1-2 +- Remove usage of vendored library safe_yaml (rhbz#1261091) + * Wed Jul 29 2015 Gael Chamoulaud - 4.2.1-1 - Upstream 4.2.1 From 06db339585945b14b855660027548383166f25ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 18:36:08 +0000 Subject: [PATCH 036/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 61ff7f3..3396338 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -386,6 +386,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 4.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jul 29 2015 Gael Chamoulaud - 4.2.1-2 - Remove usage of vendored library safe_yaml (rhbz#1261091) From 1651fc68ecc19ded9a23b67d769f88eb59951c90 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 14 Sep 2016 18:20:40 +0200 Subject: [PATCH 037/136] Upstream 4.6.1 --- puppet.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index 3396338..b1ad2ac 100644 --- a/puppet.spec +++ b/puppet.spec @@ -18,8 +18,8 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 4.2.1 -Release: 3%{?dist} +Version: 4.6.2 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -386,6 +386,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Tue Sep 13 2016 Haïkel Guémar - 4.6.2-1 +- Upstream 4.6.2 + * Thu Feb 04 2016 Fedora Release Engineering - 4.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From fd11541cf68383c83537fbb4158a87a2f06bdc4e Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 14 Sep 2016 18:49:38 +0200 Subject: [PATCH 038/136] Upload 4.6.2 sources --- sources | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sources b/sources index 42c0eed..06d9a7d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -ec058dd9ac38dce720a9248fea23a98b puppet-4.2.1.tar.gz -50a975fd929239e7df4f5df2e6b3931a puppet-4.2.1.tar.gz.asc +452f4357178218c8528b1daebd89f3ef puppet-4.6.2.tar.gz From 425e3082768f12180cc2dc46f678b2fa94a2b824 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Thu, 19 Jan 2017 14:10:42 +0100 Subject: [PATCH 039/136] Push missing sources --- sources | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources b/sources index 06d9a7d..1d81261 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -452f4357178218c8528b1daebd89f3ef puppet-4.6.2.tar.gz +SHA512 (puppet-4.6.2.tar.gz) = a8b908f0e5586e9e94fab510df7f4cc4e8693a72c54719c31cf274e26367c4d04391629a1d749337eec7469be148777bc7de8d0fd3aaf78d7f213bce0a1560b4 +SHA512 (puppet-4.6.2.tar.gz.asc) = 35bb418085e6a7c20e69c0a91a9ee98f19997f388c70d3bb88df95f117f33e7bff46fbb0ef0679e413faff1eadecc7b2282bb13b2fbad171457b12149d4590ff From c99223fa4f528567c8506bc5d7f25fed4097b760 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 07:58:29 +0000 Subject: [PATCH 040/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index b1ad2ac..71e94cd 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -386,6 +386,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 4.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Sep 13 2016 Haïkel Guémar - 4.6.2-1 - Upstream 4.6.2 From 6d30d07d321453e76c4d2183abf4cd03c8922b25 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Thu, 18 May 2017 08:29:03 +0100 Subject: [PATCH 041/136] Fix Ruby 2.4 compatibility, xmlrpc/OpenSSL patches * https://github.com/puppetlabs/puppet/commit/484623ed * https://github.com/puppetlabs/puppet/commit/578687a0 Fixes BZ#1443673, BZ#1440710 --- 0003-Remove-unused-requre-xmlrpc-client.patch | 30 ++++++++++++++++ ...Skip-cipher-monkey-patch-on-ruby-2.4.patch | 36 +++++++++++++++++++ puppet.spec | 9 ++++- 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 0003-Remove-unused-requre-xmlrpc-client.patch create mode 100644 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch diff --git a/0003-Remove-unused-requre-xmlrpc-client.patch b/0003-Remove-unused-requre-xmlrpc-client.patch new file mode 100644 index 0000000..a875561 --- /dev/null +++ b/0003-Remove-unused-requre-xmlrpc-client.patch @@ -0,0 +1,30 @@ +From 484623eda09d8e8b9857f5279ebb891a423588dc Mon Sep 17 00:00:00 2001 +From: Kylo Ginsberg +Date: Sun, 18 Sep 2016 06:42:46 -0700 +Subject: [PATCH] (maint) Remove unused: requre 'xmlrpc/client' + +In 152299cc, as part of PUP-6120, use of the xmlrpc library +was removed from the code, but the require itself was not +removed. This commit simply removes the vestigial require. + +Note that this change is required to support ruby 2.4, +which no longer includes the xmlrpc library. +--- + lib/puppet/provider/package/pip.rb | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/lib/puppet/provider/package/pip.rb b/lib/puppet/provider/package/pip.rb +index 9300b7b..aad447b 100644 +--- a/lib/puppet/provider/package/pip.rb ++++ b/lib/puppet/provider/package/pip.rb +@@ -2,7 +2,6 @@ + # + + require 'puppet/provider/package' +-require 'xmlrpc/client' + require 'puppet/util/http_proxy' + + Puppet::Type.type(:package).provide :pip, +-- +2.7.4 + diff --git a/0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch b/0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch new file mode 100644 index 0000000..1fff912 --- /dev/null +++ b/0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch @@ -0,0 +1,36 @@ +From 578687a00195191185f44d8cb38f4b7716d99c31 Mon Sep 17 00:00:00 2001 +From: Josh Cooper +Date: Tue, 16 May 2017 15:47:04 -0700 +Subject: [PATCH] (PUP-7383) Skip cipher monkey patch on ruby 2.4+ + +Previously, we appended "!SSLv2" to the SSLContext +DEFAULT_PARAMS[:ciphers] to ensure that puppet never uses SSLv2, either +from our http client or when using open-uri. However, ruby 2.4 only +defines the `:ciphers` array if using openssl < 1.1.0[1]. As a result, +puppet as a gem running on newer systems would hard fail. + +Check existence of array before trying to append to it. + +[1] https://github.com/ruby/ruby/commit/c9dc016#diff-8406e11e4a42f9de6badcd0f6a6c4262R33 +--- + lib/puppet/util/monkey_patches.rb | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/puppet/util/monkey_patches.rb b/lib/puppet/util/monkey_patches.rb +index b999fc4..ffb887e 100644 +--- a/lib/puppet/util/monkey_patches.rb ++++ b/lib/puppet/util/monkey_patches.rb +@@ -35,7 +35,9 @@ class OpenSSL::SSL::SSLContext + else + DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3 + end +- DEFAULT_PARAMS[:ciphers] << ':!SSLv2' ++ if DEFAULT_PARAMS[:ciphers] ++ DEFAULT_PARAMS[:ciphers] << ':!SSLv2' ++ end + + alias __original_initialize initialize + private :__original_initialize +-- +2.7.4 + diff --git a/puppet.spec b/puppet.spec index 71e94cd..da303d7 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -32,6 +32,8 @@ Source4: start-puppet-wrapper # Puppetlabs messed up with default paths Patch01: 0001-Fix-puppet-paths.patch Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch +Patch03: 0003-Remove-unused-requre-xmlrpc-client.patch +Patch04: 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -119,6 +121,8 @@ The server can also function as a certificate authority and file server. %setup -q %patch01 -p1 -b .paths %patch02 -p1 -b .server +%patch03 -p1 +%patch04 -p1 # Unbundle rm -r lib/puppet/vendor/*{pathspec,rgen}* @@ -386,6 +390,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Thu May 18 2017 Dominic Cleal - 4.6.2-3 +- Fix Ruby 2.4 compatibility, xmlrpc + OpenSSL errors (BZ#1443673, BZ#1440710) + * Sat Feb 11 2017 Fedora Release Engineering - 4.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From a3757312cb474b0d3d2be5364eb56356aa181769 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Tue, 23 May 2017 09:16:37 +0100 Subject: [PATCH 042/136] Fix remote code execution via YAML deserialization * CVE-2017-2295 * https://puppet.com/security/cve/cve-2017-2295 * https://github.com/puppetlabs/puppet/commit/06d8c51 Fixes BZ#1452654 --- ...-Reject-all-fact-formats-except-PSON.patch | 99 +++++++++++++++++++ puppet.spec | 7 +- 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch diff --git a/0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch b/0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch new file mode 100644 index 0000000..b365b1a --- /dev/null +++ b/0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch @@ -0,0 +1,99 @@ +From 06d8c51367ca932b9da5d9b01958cfc0adf0f2ea Mon Sep 17 00:00:00 2001 +From: Josh Cooper +Date: Fri, 28 Apr 2017 12:09:11 -0700 +Subject: [PATCH] (PUP-7483) Reject all fact formats except PSON + +Previously, an authenticated user could cause the master to execute +YAML.load on user-specified input, as well as MessagePack.unpack if the +msgpack gem was installed. + +Since 3.2.2, agents have always sent facts as PSON. There is no reason +to support other formats, so reject all fact formats except PSON. +--- + lib/puppet/indirector/catalog/compiler.rb | 6 +++-- + spec/unit/indirector/catalog/compiler_spec.rb | 36 ++++++++++++++++++++++++--- + 2 files changed, 36 insertions(+), 6 deletions(-) + +diff --git a/lib/puppet/indirector/catalog/compiler.rb b/lib/puppet/indirector/catalog/compiler.rb +index e4e60ce..16c8353 100644 +--- a/lib/puppet/indirector/catalog/compiler.rb ++++ b/lib/puppet/indirector/catalog/compiler.rb +@@ -25,9 +25,11 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code + # in Network::HTTP::Handler will automagically deserialize the value. + if text_facts.is_a?(Puppet::Node::Facts) + facts = text_facts +- else ++ elsif format == 'pson' + # We unescape here because the corresponding code in Puppet::Configurer::FactHandler escapes +- facts = Puppet::Node::Facts.convert_from(format, CGI.unescape(text_facts)) ++ facts = Puppet::Node::Facts.convert_from('pson', CGI.unescape(text_facts)) ++ else ++ raise ArgumentError, "Unsupported facts format" + end + + unless facts.name == request.key +diff --git a/spec/unit/indirector/catalog/compiler_spec.rb b/spec/unit/indirector/catalog/compiler_spec.rb +index b134c90..d31eaee 100644 +--- a/spec/unit/indirector/catalog/compiler_spec.rb ++++ b/spec/unit/indirector/catalog/compiler_spec.rb +@@ -255,10 +255,10 @@ describe Puppet::Resource::Catalog::Compiler do + @facts = Puppet::Node::Facts.new('hostname', "fact" => "value", "architecture" => "i386") + end + +- def a_request_that_contains(facts) ++ def a_request_that_contains(facts, format = :pson) + request = Puppet::Indirector::Request.new(:catalog, :find, "hostname", nil) +- request.options[:facts_format] = "pson" +- request.options[:facts] = CGI.escape(facts.render(:pson)) ++ request.options[:facts_format] = format.to_s ++ request.options[:facts] = CGI.escape(facts.render(format)) + request + end + +@@ -277,7 +277,7 @@ describe Puppet::Resource::Catalog::Compiler do + expect(facts.timestamp).to eq(time) + end + +- it "should convert the facts into a fact instance and save it" do ++ it "accepts PSON facts" do + request = a_request_that_contains(@facts) + + options = { +@@ -289,6 +289,34 @@ describe Puppet::Resource::Catalog::Compiler do + + @compiler.extract_facts_from_request(request) + end ++ ++ it "rejects YAML facts" do ++ request = a_request_that_contains(@facts, :yaml) ++ ++ options = { ++ :environment => request.environment, ++ :transaction_uuid => request.options[:transaction_uuid], ++ } ++ ++ expect { ++ @compiler.extract_facts_from_request(request) ++ }.to raise_error(ArgumentError, /Unsupported facts format/) ++ end ++ ++ it "rejects unknown fact formats" do ++ request = a_request_that_contains(@facts) ++ request.options[:facts_format] = 'unknown-format' ++ ++ options = { ++ :environment => request.environment, ++ :transaction_uuid => request.options[:transaction_uuid], ++ } ++ ++ expect { ++ @compiler.extract_facts_from_request(request) ++ }.to raise_error(ArgumentError, /Unsupported facts format/) ++ end ++ + end + + describe "when finding nodes" do +-- +2.7.4 + diff --git a/puppet.spec b/puppet.spec index da303d7..884c9f1 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -34,6 +34,7 @@ Patch01: 0001-Fix-puppet-paths.patch Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch Patch03: 0003-Remove-unused-requre-xmlrpc-client.patch Patch04: 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch +Patch05: 0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -123,6 +124,7 @@ The server can also function as a certificate authority and file server. %patch02 -p1 -b .server %patch03 -p1 %patch04 -p1 +%patch05 -p1 # Unbundle rm -r lib/puppet/vendor/*{pathspec,rgen}* @@ -390,6 +392,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Tue May 23 2017 Dominic Cleal - 4.6.2-4 +- Fix remote code exec via YAML deserialization (BZ#1452654, CVE-2017-2295) + * Thu May 18 2017 Dominic Cleal - 4.6.2-3 - Fix Ruby 2.4 compatibility, xmlrpc + OpenSSL errors (BZ#1443673, BZ#1440710) From f2dd544f625b7902f404e1cc98981df65ca8d51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 14 Jan 2017 00:40:56 +0200 Subject: [PATCH 043/136] Move tmpfiles.d config to %{_tmpfilesdir}, install LICENSE as %license Fixes BZ#1413215 --- puppet.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/puppet.spec b/puppet.spec index 884c9f1..20f9663 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.6.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -210,9 +210,9 @@ sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \ %if 0%{?fedora} >= 15 # Setup tmpfiles.d config -mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d +mkdir -p %{buildroot}%{_tmpfilesdir} echo "D /var/run/%{name} 0755 %{name} %{name} -" > \ - %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf + %{buildroot}%{_tmpfilesdir}/%{name}.conf %endif # Create puppet modules directory for puppet module tool @@ -221,7 +221,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %files %defattr(-, root, root, 0755) -%doc LICENSE README.md examples +%doc README.md examples +%license LICENSE %{_bindir}/puppet %{_bindir}/start-puppet-* %{_bindir}/extlookup2hiera @@ -236,7 +237,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %dir %{_sysconfdir}/puppet %dir %{_sysconfdir}/%{name}/modules %if 0%{?fedora} >= 15 -%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf +%{_tmpfilesdir}/%{name}.conf %endif %config(noreplace) %{_sysconfdir}/puppet/puppet.conf %config(noreplace) %{_sysconfdir}/puppet/auth.conf @@ -392,6 +393,10 @@ exit 0 rm -rf %{buildroot} %changelog +* Tue May 23 2017 Ville Skyttä - 4.6.2-5 +- Move tmpfiles.d config to %%{_tmpfilesdir} +- Install LICENSE as %%license + * Tue May 23 2017 Dominic Cleal - 4.6.2-4 - Fix remote code exec via YAML deserialization (BZ#1452654, CVE-2017-2295) From 1d46e992aff71a3653ddb52f4327a0ad05f7c35c Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Thu, 25 May 2017 10:34:03 +0100 Subject: [PATCH 044/136] Update to 4.8.2 --- 0003-Remove-unused-requre-xmlrpc-client.patch | 30 ------------------- puppet.spec | 26 +++++++++------- sources | 4 +-- 3 files changed, 18 insertions(+), 42 deletions(-) delete mode 100644 0003-Remove-unused-requre-xmlrpc-client.patch diff --git a/0003-Remove-unused-requre-xmlrpc-client.patch b/0003-Remove-unused-requre-xmlrpc-client.patch deleted file mode 100644 index a875561..0000000 --- a/0003-Remove-unused-requre-xmlrpc-client.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 484623eda09d8e8b9857f5279ebb891a423588dc Mon Sep 17 00:00:00 2001 -From: Kylo Ginsberg -Date: Sun, 18 Sep 2016 06:42:46 -0700 -Subject: [PATCH] (maint) Remove unused: requre 'xmlrpc/client' - -In 152299cc, as part of PUP-6120, use of the xmlrpc library -was removed from the code, but the require itself was not -removed. This commit simply removes the vestigial require. - -Note that this change is required to support ruby 2.4, -which no longer includes the xmlrpc library. ---- - lib/puppet/provider/package/pip.rb | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/lib/puppet/provider/package/pip.rb b/lib/puppet/provider/package/pip.rb -index 9300b7b..aad447b 100644 ---- a/lib/puppet/provider/package/pip.rb -+++ b/lib/puppet/provider/package/pip.rb -@@ -2,7 +2,6 @@ - # - - require 'puppet/provider/package' --require 'xmlrpc/client' - require 'puppet/util/http_proxy' - - Puppet::Type.type(:package).provide :pip, --- -2.7.4 - diff --git a/puppet.spec b/puppet.spec index 20f9663..2970631 100644 --- a/puppet.spec +++ b/puppet.spec @@ -18,8 +18,8 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 4.6.2 -Release: 5%{?dist} +Version: 4.8.2 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -32,14 +32,12 @@ Source4: start-puppet-wrapper # Puppetlabs messed up with default paths Patch01: 0001-Fix-puppet-paths.patch Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch -Patch03: 0003-Remove-unused-requre-xmlrpc-client.patch Patch04: 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch Patch05: 0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: facter >= 1.6.6 BuildRequires: ruby-devel >= 1.8.7 # ruby-devel does not require the base package, but requires -libs instead BuildRequires: ruby >= 1.8.7 @@ -50,10 +48,11 @@ Requires: ruby(abi) = 1.8 %else Requires: ruby(release) %endif -Requires: ruby(shadow) +Requires: ruby(shadow) Requires: rubygem(json) Requires: rubygem(pathspec) +Requires: rubygem(rgen) # Prevents jruby from being pulled in by dependencies (BZ #985208) Requires: ruby @@ -67,11 +66,16 @@ Requires: ruby %endif %endif -BuildRequires: hiera >= 1.0.0 +BuildRequires: facter >= 2.0 +BuildRequires: facter < 4 +BuildRequires: hiera >= 2.0 +BuildRequires: hiera < 4 + +Requires: facter >= 2.0 +Requires: facter < 4 +Requires: hiera >= 2.0 +Requires: hiera < 4 -Requires: facter >= 1.6.6 -Requires: hiera >= 1.0.0 -Requires: rubygem(rgen) Obsoletes: hiera-puppet < 1.0.0-2 Provides: hiera-puppet = %{version}-%{release} @@ -122,7 +126,6 @@ The server can also function as a certificate authority and file server. %setup -q %patch01 -p1 -b .paths %patch02 -p1 -b .server -%patch03 -p1 %patch04 -p1 %patch05 -p1 # Unbundle @@ -393,6 +396,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Thu May 25 2017 Dominic Cleal - 4.8.2-1 +- Update to 4.8.2 + * Tue May 23 2017 Ville Skyttä - 4.6.2-5 - Move tmpfiles.d config to %%{_tmpfilesdir} - Install LICENSE as %%license diff --git a/sources b/sources index 1d81261..19d0dc5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (puppet-4.6.2.tar.gz) = a8b908f0e5586e9e94fab510df7f4cc4e8693a72c54719c31cf274e26367c4d04391629a1d749337eec7469be148777bc7de8d0fd3aaf78d7f213bce0a1560b4 -SHA512 (puppet-4.6.2.tar.gz.asc) = 35bb418085e6a7c20e69c0a91a9ee98f19997f388c70d3bb88df95f117f33e7bff46fbb0ef0679e413faff1eadecc7b2282bb13b2fbad171457b12149d4590ff +SHA512 (puppet-4.8.2.tar.gz.asc) = 3526e4787e5894a6d62af6c06a10fc20e8726759209b6d461dd7688882d7a646ff23a4efdb28ac7358bb2ac0002a1486b6f746f6a1e15c1e1cef33565d9433be +SHA512 (puppet-4.8.2.tar.gz) = d9c3d7949d88c12df49f6e9b170004087bf4eb3a598764f34ca4cc074013ecb0ab585e836c1cf12c7be4e61af0c18845dd0d65f3446fa744f949d8f2c7a8d2a1 From e98f95dcba5c53eae230fee7d86a384e9622a873 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Wed, 31 May 2017 10:12:07 +0100 Subject: [PATCH 045/136] Remove Fedora release restrictions from DNF package provider --- ...lease-restrictions-from-DNF-provider.patch | 27 +++++++++++++++++++ puppet.spec | 7 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch diff --git a/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch b/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch new file mode 100644 index 0000000..ae82d25 --- /dev/null +++ b/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch @@ -0,0 +1,27 @@ +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'] ++ 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 2970631..fed90ac 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -34,6 +34,7 @@ Patch01: 0001-Fix-puppet-paths.patch Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch Patch04: 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch Patch05: 0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch +Patch06: 0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -128,6 +129,7 @@ The server can also function as a certificate authority and file server. %patch02 -p1 -b .server %patch04 -p1 %patch05 -p1 +%patch06 -p1 # Unbundle rm -r lib/puppet/vendor/*{pathspec,rgen}* @@ -396,6 +398,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Wed May 31 2017 Dominic Cleal - 4.8.2-2 +- Remove Fedora release restrictions from DNF package provider + * Thu May 25 2017 Dominic Cleal - 4.8.2-1 - Update to 4.8.2 From c7f00c0890bbbe5941a43c91c281fa99f2bdfa56 Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Wed, 31 May 2017 15:04:17 +0100 Subject: [PATCH 046/136] Update to 4.10.1 --- ...-Reject-all-fact-formats-except-PSON.patch | 99 ------------------- ...lease-restrictions-from-DNF-provider.patch | 2 +- puppet.spec | 9 +- sources | 4 +- 4 files changed, 8 insertions(+), 106 deletions(-) delete mode 100644 0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch diff --git a/0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch b/0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch deleted file mode 100644 index b365b1a..0000000 --- a/0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 06d8c51367ca932b9da5d9b01958cfc0adf0f2ea Mon Sep 17 00:00:00 2001 -From: Josh Cooper -Date: Fri, 28 Apr 2017 12:09:11 -0700 -Subject: [PATCH] (PUP-7483) Reject all fact formats except PSON - -Previously, an authenticated user could cause the master to execute -YAML.load on user-specified input, as well as MessagePack.unpack if the -msgpack gem was installed. - -Since 3.2.2, agents have always sent facts as PSON. There is no reason -to support other formats, so reject all fact formats except PSON. ---- - lib/puppet/indirector/catalog/compiler.rb | 6 +++-- - spec/unit/indirector/catalog/compiler_spec.rb | 36 ++++++++++++++++++++++++--- - 2 files changed, 36 insertions(+), 6 deletions(-) - -diff --git a/lib/puppet/indirector/catalog/compiler.rb b/lib/puppet/indirector/catalog/compiler.rb -index e4e60ce..16c8353 100644 ---- a/lib/puppet/indirector/catalog/compiler.rb -+++ b/lib/puppet/indirector/catalog/compiler.rb -@@ -25,9 +25,11 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code - # in Network::HTTP::Handler will automagically deserialize the value. - if text_facts.is_a?(Puppet::Node::Facts) - facts = text_facts -- else -+ elsif format == 'pson' - # We unescape here because the corresponding code in Puppet::Configurer::FactHandler escapes -- facts = Puppet::Node::Facts.convert_from(format, CGI.unescape(text_facts)) -+ facts = Puppet::Node::Facts.convert_from('pson', CGI.unescape(text_facts)) -+ else -+ raise ArgumentError, "Unsupported facts format" - end - - unless facts.name == request.key -diff --git a/spec/unit/indirector/catalog/compiler_spec.rb b/spec/unit/indirector/catalog/compiler_spec.rb -index b134c90..d31eaee 100644 ---- a/spec/unit/indirector/catalog/compiler_spec.rb -+++ b/spec/unit/indirector/catalog/compiler_spec.rb -@@ -255,10 +255,10 @@ describe Puppet::Resource::Catalog::Compiler do - @facts = Puppet::Node::Facts.new('hostname', "fact" => "value", "architecture" => "i386") - end - -- def a_request_that_contains(facts) -+ def a_request_that_contains(facts, format = :pson) - request = Puppet::Indirector::Request.new(:catalog, :find, "hostname", nil) -- request.options[:facts_format] = "pson" -- request.options[:facts] = CGI.escape(facts.render(:pson)) -+ request.options[:facts_format] = format.to_s -+ request.options[:facts] = CGI.escape(facts.render(format)) - request - end - -@@ -277,7 +277,7 @@ describe Puppet::Resource::Catalog::Compiler do - expect(facts.timestamp).to eq(time) - end - -- it "should convert the facts into a fact instance and save it" do -+ it "accepts PSON facts" do - request = a_request_that_contains(@facts) - - options = { -@@ -289,6 +289,34 @@ describe Puppet::Resource::Catalog::Compiler do - - @compiler.extract_facts_from_request(request) - end -+ -+ it "rejects YAML facts" do -+ request = a_request_that_contains(@facts, :yaml) -+ -+ options = { -+ :environment => request.environment, -+ :transaction_uuid => request.options[:transaction_uuid], -+ } -+ -+ expect { -+ @compiler.extract_facts_from_request(request) -+ }.to raise_error(ArgumentError, /Unsupported facts format/) -+ end -+ -+ it "rejects unknown fact formats" do -+ request = a_request_that_contains(@facts) -+ request.options[:facts_format] = 'unknown-format' -+ -+ options = { -+ :environment => request.environment, -+ :transaction_uuid => request.options[:transaction_uuid], -+ } -+ -+ expect { -+ @compiler.extract_facts_from_request(request) -+ }.to raise_error(ArgumentError, /Unsupported facts format/) -+ end -+ - end - - describe "when finding nodes" do --- -2.7.4 - diff --git a/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch b/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch index ae82d25..5673c02 100644 --- a/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch +++ b/0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch @@ -17,7 +17,7 @@ index e144a1a..c0ed877 100644 end end -- defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => ['22', '23', '24'] +- defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => ['22', '23', '24', '25'] + defaultfor :operatingsystem => :fedora def self.update_command diff --git a/puppet.spec b/puppet.spec index fed90ac..307c00c 100644 --- a/puppet.spec +++ b/puppet.spec @@ -18,8 +18,8 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 4.8.2 -Release: 2%{?dist} +Version: 4.10.1 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -33,7 +33,6 @@ Source4: start-puppet-wrapper Patch01: 0001-Fix-puppet-paths.patch Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch Patch04: 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch -Patch05: 0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch Patch06: 0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch Group: System Environment/Base @@ -128,7 +127,6 @@ The server can also function as a certificate authority and file server. %patch01 -p1 -b .paths %patch02 -p1 -b .server %patch04 -p1 -%patch05 -p1 %patch06 -p1 # Unbundle rm -r lib/puppet/vendor/*{pathspec,rgen}* @@ -398,6 +396,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Wed May 31 2017 Dominic Cleal - 4.10.1-1 +- Update to 4.10.1 + * Wed May 31 2017 Dominic Cleal - 4.8.2-2 - Remove Fedora release restrictions from DNF package provider diff --git a/sources b/sources index 19d0dc5..069b38a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (puppet-4.8.2.tar.gz.asc) = 3526e4787e5894a6d62af6c06a10fc20e8726759209b6d461dd7688882d7a646ff23a4efdb28ac7358bb2ac0002a1486b6f746f6a1e15c1e1cef33565d9433be -SHA512 (puppet-4.8.2.tar.gz) = d9c3d7949d88c12df49f6e9b170004087bf4eb3a598764f34ca4cc074013ecb0ab585e836c1cf12c7be4e61af0c18845dd0d65f3446fa744f949d8f2c7a8d2a1 +SHA512 (puppet-4.10.1.tar.gz) = d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 +SHA512 (puppet-4.10.1.tar.gz.asc) = a2a168ca2f48f2db7d8998f0c81895274a2a1c26476a240bd67f0a8c23c54d1ab4fd581d2ac69141cc0de8ed4139107ff2df0ef9b4c31dd76a9592ebd6f453cd From 22bc31c361d576b0221af154ce64092f04b80be8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 09:10:55 +0000 Subject: [PATCH 047/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 307c00c..a51f13e 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -396,6 +396,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 4.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed May 31 2017 Dominic Cleal - 4.10.1-1 - Update to 4.10.1 From f6aa910dc404ddf5a0cb71439b224018c8bf5964 Mon Sep 17 00:00:00 2001 From: James Hogarth Date: Tue, 7 Nov 2017 11:50:36 +0000 Subject: [PATCH 048/136] F28 facter3 change means puppet needs to require the ruby bindings for facter --- puppet.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index a51f13e..fbe898f 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.10.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -66,13 +66,23 @@ Requires: ruby %endif %endif +# Fedora 28 updates to facter3 where puppet needs to require the ruby bindings specifically +%if 0%{?fedora} >= 28 +BuildRequires: ruby-facter >= 3.0 +BuildRequires: ruby-facter < 4 +Requires: ruby-facter >= 3.0 +Requires: ruby-facter < 4 +%else BuildRequires: facter >= 2.0 BuildRequires: facter < 4 +Requires: facter >= 2.0 +Requires: facter < 4 +%endif + + BuildRequires: hiera >= 2.0 BuildRequires: hiera < 4 -Requires: facter >= 2.0 -Requires: facter < 4 Requires: hiera >= 2.0 Requires: hiera < 4 @@ -396,6 +406,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Tue Nov 07 2017 James Hogarth - 4.10.1-3 +- F28 facter3 change means puppet needs to require the ruby bindings for facter + * Thu Jul 27 2017 Fedora Release Engineering - 4.10.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 0e7dd9783de9ffc216ee4c44a5018b31a6d2ed0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 05:58:55 +0000 Subject: [PATCH 049/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 fbe898f..4f44488 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 4.10.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -406,6 +406,9 @@ exit 0 rm -rf %{buildroot} %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 4.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Nov 07 2017 James Hogarth - 4.10.1-3 - F28 facter3 change means puppet needs to require the ruby bindings for facter From e6cad219976b4de40265b68f28dd709a10379322 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:21:08 +0100 Subject: [PATCH 050/136] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- puppet.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 4f44488..79a4bce 100644 --- a/puppet.spec +++ b/puppet.spec @@ -36,7 +36,6 @@ Patch04: 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch Patch06: 0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch Group: System Environment/Base -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ruby-devel >= 1.8.7 # ruby-devel does not require the base package, but requires -libs instead From 95e93227e222581ee22255ffe92763fd67bc2d66 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:32:09 +0100 Subject: [PATCH 051/136] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- puppet.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index 79a4bce..a5fad64 100644 --- a/puppet.spec +++ b/puppet.spec @@ -401,9 +401,6 @@ fi %endif exit 0 -%clean -rm -rf %{buildroot} - %changelog * Fri Feb 09 2018 Fedora Release Engineering - 4.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From dd73184c04bf42138efd8e8a44b16434a378e8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Thu, 15 Mar 2018 19:35:09 +0100 Subject: [PATCH 052/136] Update to 4.10.10 --- ...Skip-cipher-monkey-patch-on-ruby-2.4.patch | 36 ------------------- puppet.spec | 12 ++++--- sources | 4 +-- 3 files changed, 10 insertions(+), 42 deletions(-) delete mode 100644 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch diff --git a/0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch b/0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch deleted file mode 100644 index 1fff912..0000000 --- a/0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 578687a00195191185f44d8cb38f4b7716d99c31 Mon Sep 17 00:00:00 2001 -From: Josh Cooper -Date: Tue, 16 May 2017 15:47:04 -0700 -Subject: [PATCH] (PUP-7383) Skip cipher monkey patch on ruby 2.4+ - -Previously, we appended "!SSLv2" to the SSLContext -DEFAULT_PARAMS[:ciphers] to ensure that puppet never uses SSLv2, either -from our http client or when using open-uri. However, ruby 2.4 only -defines the `:ciphers` array if using openssl < 1.1.0[1]. As a result, -puppet as a gem running on newer systems would hard fail. - -Check existence of array before trying to append to it. - -[1] https://github.com/ruby/ruby/commit/c9dc016#diff-8406e11e4a42f9de6badcd0f6a6c4262R33 ---- - lib/puppet/util/monkey_patches.rb | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/puppet/util/monkey_patches.rb b/lib/puppet/util/monkey_patches.rb -index b999fc4..ffb887e 100644 ---- a/lib/puppet/util/monkey_patches.rb -+++ b/lib/puppet/util/monkey_patches.rb -@@ -35,7 +35,9 @@ class OpenSSL::SSL::SSLContext - else - DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3 - end -- DEFAULT_PARAMS[:ciphers] << ':!SSLv2' -+ if DEFAULT_PARAMS[:ciphers] -+ DEFAULT_PARAMS[:ciphers] << ':!SSLv2' -+ end - - alias __original_initialize initialize - private :__original_initialize --- -2.7.4 - diff --git a/puppet.spec b/puppet.spec index a5fad64..b1c0fde 100644 --- a/puppet.spec +++ b/puppet.spec @@ -18,8 +18,8 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 4.10.1 -Release: 4%{?dist} +Version: 4.10.10 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -32,7 +32,6 @@ Source4: start-puppet-wrapper # Puppetlabs messed up with default paths Patch01: 0001-Fix-puppet-paths.patch Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch -Patch04: 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch Patch06: 0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch Group: System Environment/Base @@ -135,7 +134,6 @@ The server can also function as a certificate authority and file server. %setup -q %patch01 -p1 -b .paths %patch02 -p1 -b .server -%patch04 -p1 %patch06 -p1 # Unbundle rm -r lib/puppet/vendor/*{pathspec,rgen}* @@ -150,6 +148,7 @@ ruby install.rb --destdir=%{buildroot} \ --bindir=%{_bindir} --vardir=%{_localstatedir}/cache/puppet \ --logdir=%{_localstatedir}/log/puppet \ --rundir=%{_localstatedir}/log/puppet \ + --localedir=%{_datadir}/%{name}/locale \ --quick --no-rdoc --sitelibdir=%{puppet_libdir} @@ -284,6 +283,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-facts.8.gz %{_mandir}/man8/puppet-file.8.gz %{_mandir}/man8/puppet-filebucket.8.gz +%{_mandir}/man8/puppet-generate.8.gz %{_mandir}/man8/puppet-help.8.gz %{_mandir}/man8/puppet-inspect.8.gz #%{_mandir}/man8/puppet-instrumentation_data.8.gz @@ -291,6 +291,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules #%{_mandir}/man8/puppet-instrumentation_probe.8.gz %{_mandir}/man8/puppet-epp.8.gz %{_mandir}/man8/puppet-key.8.gz +%{_mandir}/man8/puppet-lookup.8.gz %{_mandir}/man8/puppet-man.8.gz %{_mandir}/man8/puppet-module.8.gz %{_mandir}/man8/puppet-node.8.gz @@ -402,6 +403,9 @@ fi exit 0 %changelog +* Thu Mar 15 2018 Terje Rosten - 4.10.10-1 +- Update to 4.10.10 + * Fri Feb 09 2018 Fedora Release Engineering - 4.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 069b38a..9ba66ed 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (puppet-4.10.1.tar.gz) = d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 -SHA512 (puppet-4.10.1.tar.gz.asc) = a2a168ca2f48f2db7d8998f0c81895274a2a1c26476a240bd67f0a8c23c54d1ab4fd581d2ac69141cc0de8ed4139107ff2df0ef9b4c31dd76a9592ebd6f453cd +SHA512 (puppet-4.10.10.tar.gz) = e517ee349ead56932c9ff54f910d10842c1cd6b6f28673223a65fb72334662d4eabeccc1c7c7603e17aa712c356edbc27fe53d6e7dd7ba042cc0616d0076d755 +SHA512 (puppet-4.10.10.tar.gz.asc) = 3b17e5505cb1f408e44035a655708cbef7d2bca729ad18180558be2c3b8bddc95e975bc41b53a1451807b38b4088659ed88117173826db588ce3bb96a4329caa From 752b2fb7d15dce0db431bcf4b9369e263c886b31 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Fri, 8 Jun 2018 16:00:30 +0200 Subject: [PATCH 053/136] Upstream 5.5.1 Unmaintained editor extensions were removed upstream (PUP-7558) Deprecated commands were removed: inspect (PUP-893), extlookup2hiera (PUP-3478) Refreshed patches --- 0001-Fix-puppet-paths.patch | 10 ++-- ...rt-maint-Remove-puppetmaster.service.patch | 10 ++-- ...lease-restrictions-from-DNF-provider.patch | 27 +++++++++ puppet.spec | 58 ++++++++----------- 4 files changed, 60 insertions(+), 45 deletions(-) create mode 100644 0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch index d29aaef..1a1b1d2 100644 --- a/0001-Fix-puppet-paths.patch +++ b/0001-Fix-puppet-paths.patch @@ -1,17 +1,17 @@ -From 92ec714fc77a5cc5c743367be39cd83afa2356b6 Mon Sep 17 00:00:00 2001 +From 55933c8bd4ee983f048d1b4c90674e3dfd2583c4 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 29 Apr 2015 01:38:35 +0200 -Subject: [PATCH 1/2] Fix puppet paths +Subject: [PATCH 1/3] Fix puppet paths --- lib/puppet/util/run_mode.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb -index 453095c..bcdde95 100644 +index cf6c461..777156a 100644 --- a/lib/puppet/util/run_mode.rb +++ b/lib/puppet/util/run_mode.rb -@@ -72,23 +72,23 @@ module Puppet +@@ -59,23 +59,23 @@ module Puppet class UnixRunMode < RunMode def conf_dir @@ -41,5 +41,5 @@ index 453095c..bcdde95 100644 end -- -2.4.0 +2.17.1 diff --git a/0002-Revert-maint-Remove-puppetmaster.service.patch b/0002-Revert-maint-Remove-puppetmaster.service.patch index 657f161..39e0401 100644 --- a/0002-Revert-maint-Remove-puppetmaster.service.patch +++ b/0002-Revert-maint-Remove-puppetmaster.service.patch @@ -1,7 +1,7 @@ -From f3d931b6c68e4305ce612949ec59dca460e578d7 Mon Sep 17 00:00:00 2001 +From fc00c9d0c99e977cda8bb4a9a89952dfae5523dc Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Wed, 29 Jul 2015 21:58:48 +0200 -Subject: [PATCH] Revert "(maint) Remove puppetmaster.service" +Subject: [PATCH 2/3] Revert "(maint) Remove puppetmaster.service" This reverts commit c0e30daa53b6267c1c86b6e27c01b1c26cf49af5. --- @@ -11,10 +11,10 @@ This reverts commit c0e30daa53b6267c1c86b6e27c01b1c26cf49af5. create mode 100644 ext/systemd/puppetmaster.service diff --git a/ext/systemd/puppet.service b/ext/systemd/puppet.service -index 61b0313..c7f063e 100644 +index 7c16615..36769ac 100644 --- a/ext/systemd/puppet.service +++ b/ext/systemd/puppet.service -@@ -1,7 +1,7 @@ +@@ -11,7 +11,7 @@ [Unit] Description=Puppet agent Wants=basic.target @@ -42,5 +42,5 @@ index 0000000..dbbd627 +[Install] +WantedBy=multi-user.target -- -2.4.3 +2.17.1 diff --git a/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch b/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch new file mode 100644 index 0000000..bbe7a50 --- /dev/null +++ b/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch @@ -0,0 +1,27 @@ +From 320d9dd4a87266d40c5b73d6e020bb77ca4e4d9b Mon Sep 17 00:00:00 2001 +From: Dominic Cleal +Date: Wed, 31 May 2017 10:07:04 +0100 +Subject: [PATCH 3/3] 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 535aa6c..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..30).to_a ++ defaultfor :operatingsystem => :fedora + + def self.update_command + # In DNF, update is deprecated for upgrade +-- +2.17.1 + diff --git a/puppet.spec b/puppet.spec index b1c0fde..854434a 100644 --- a/puppet.spec +++ b/puppet.spec @@ -18,7 +18,7 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 4.10.10 +Version: 5.5.1 Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 @@ -32,7 +32,7 @@ Source4: start-puppet-wrapper # Puppetlabs messed up with default paths Patch01: 0001-Fix-puppet-paths.patch Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch -Patch06: 0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch +Patch03: 0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch Group: System Environment/Base @@ -91,9 +91,7 @@ Provides: hiera-puppet = %{version}-%{release} Requires(pre): shadow-utils %if 0%{?_with_systemd} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{?systemd_requires} BuildRequires: systemd %else Requires(post): chkconfig @@ -115,9 +113,7 @@ Group: System Environment/Base Summary: Server for the puppet system management tool Requires: puppet = %{version}-%{release} %if 0%{?_with_systemd} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{?systemd_requires} BuildRequires: systemd %else Requires(post): chkconfig @@ -134,9 +130,16 @@ The server can also function as a certificate authority and file server. %setup -q %patch01 -p1 -b .paths %patch02 -p1 -b .server -%patch06 -p1 +%patch03 -p1 # Unbundle -rm -r lib/puppet/vendor/*{pathspec,rgen}* +rm -r lib/puppet/vendor/pathspec +# Note(hguemar): remove unrelated OS/distro specific folders +# These mess-up with RPM automatic dependencies compute by adding +# unnecessary deps like /sbin/runscripts +rm -r ext/{debian,freebsd,gentoo,ips,osx,solaris,suse,windows} +rm ext/redhat/*.init +rm ext/{build_defaults.yaml,project_data.yaml} + %build # Nothing to build @@ -177,6 +180,9 @@ install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/ install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf install -Dp -m0644 ext/redhat/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet +# Note(hguemar): Conflicts with config file from hiera package +rm %{buildroot}%{_sysconfdir}/puppet/hiera.yaml + # Install a NetworkManager dispatcher script to pickup changes to # /etc/resolv.conf and such (https://bugzilla.redhat.com/532085). %if 0%{?_with_systemd} @@ -190,23 +196,6 @@ install -Dpv %{SOURCE2} \ # Install the ext/ directory to %%{_datadir}/%%{name} install -d %{buildroot}%{_datadir}/%{name} cp -a ext/ %{buildroot}%{_datadir}/%{name} -# emacs and vim bits are installed elsewhere -rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim} -# remove misc packaging artifacts in source not applicable to rpm -rm -rf %{buildroot}%{_datadir}/%{name}/ext/{gentoo,freebsd,solaris,suse,windows,osx,ips,debian} -rm -f %{buildroot}%{_datadir}/%{name}/ext/{build_defaults.yaml,project_data.yaml} -rm -f %{buildroot}%{_datadir}/%{name}/ext/redhat/*.init - -# Install emacs mode files -emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp -install -Dp -m0644 ext/emacs/puppet-mode.el $emacsdir/puppet-mode.el -install -Dp -m0644 ext/emacs/puppet-mode-init.el \ - $emacsdir/site-start.d/puppet-mode-init.el - -# Install vim syntax files -vimdir=%{buildroot}%{_datadir}/vim/vimfiles -install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim -install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim # Install wrappers for SELinux install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-agent @@ -236,7 +225,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %license LICENSE %{_bindir}/puppet %{_bindir}/start-puppet-* -%{_bindir}/extlookup2hiera %{puppet_libdir}/* %if 0%{?_with_systemd} %{_unitdir}/puppet.service @@ -256,9 +244,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %dir %{_sysconfdir}/NetworkManager %dir %{_sysconfdir}/NetworkManager/dispatcher.d %{_sysconfdir}/NetworkManager/dispatcher.d/98-puppet -# We don't want to require emacs or vim, so we need to own these dirs -%{_datadir}/emacs -%{_datadir}/vim %{_datadir}/%{name} # These need to be owned by puppet so the server can # write to them @@ -281,11 +266,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-device.8.gz %{_mandir}/man8/puppet-doc.8.gz %{_mandir}/man8/puppet-facts.8.gz -%{_mandir}/man8/puppet-file.8.gz %{_mandir}/man8/puppet-filebucket.8.gz %{_mandir}/man8/puppet-generate.8.gz %{_mandir}/man8/puppet-help.8.gz -%{_mandir}/man8/puppet-inspect.8.gz #%{_mandir}/man8/puppet-instrumentation_data.8.gz #%{_mandir}/man8/puppet-instrumentation_listener.8.gz #%{_mandir}/man8/puppet-instrumentation_probe.8.gz @@ -299,10 +282,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-plugin.8.gz %{_mandir}/man8/puppet-report.8.gz %{_mandir}/man8/puppet-resource.8.gz -%{_mandir}/man8/puppet-resource_type.8.gz #%{_mandir}/man8/puppet-secret_agent.8.gz +%{_mandir}/man8/puppet-script.8.gz %{_mandir}/man8/puppet-status.8.gz -%{_mandir}/man8/extlookup2hiera.8.gz %files server %defattr(-, root, root, 0755) @@ -403,6 +385,12 @@ fi exit 0 %changelog +* Tue May 8 2018 Haïkel Guémar - 5.5.1-1 +- Upstream 5.5.1 +- Unmaintained editor extensions were removed upstream (PUP-7558) +- Deprecated commands were removed: inspect (PUP-893), extlookup2hiera (PUP-3478) +- Refreshed patches + * Thu Mar 15 2018 Terje Rosten - 4.10.10-1 - Update to 4.10.10 From 9f0248bc8cf0e50023c721a76aad0f08825c47b5 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Fri, 8 Jun 2018 16:01:21 +0200 Subject: [PATCH 054/136] Upload upstream 5.5.1 sources --- sources | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sources b/sources index 9ba66ed..c9d1b31 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (puppet-4.10.10.tar.gz) = e517ee349ead56932c9ff54f910d10842c1cd6b6f28673223a65fb72334662d4eabeccc1c7c7603e17aa712c356edbc27fe53d6e7dd7ba042cc0616d0076d755 -SHA512 (puppet-4.10.10.tar.gz.asc) = 3b17e5505cb1f408e44035a655708cbef7d2bca729ad18180558be2c3b8bddc95e975bc41b53a1451807b38b4088659ed88117173826db588ce3bb96a4329caa +SHA512 (puppet-5.5.1.tar.gz) = 20bf7094193f30cfc7a91244275fc79eef0296036ffbc6bbe405e9ca75123b722be6855c746ef8cd35f80bd7a7308408a9205d064f0f910e11877e4db0ebdabc From ffcca8958d3ca1c93543f5d0512ae7798463b3a2 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Fri, 8 Jun 2018 16:15:14 +0200 Subject: [PATCH 055/136] Add missing sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index c9d1b31..a5d2391 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (puppet-5.5.1.tar.gz) = 20bf7094193f30cfc7a91244275fc79eef0296036ffbc6bbe405e9ca75123b722be6855c746ef8cd35f80bd7a7308408a9205d064f0f910e11877e4db0ebdabc +SHA512 (puppet-5.5.1.tar.gz.asc) = 8d176274c37a9f47130ecb373872390a4685bbcceb5270b732aacf07155fae6051cb7e445e9be24802ccfdeaf98e464a34f8812d8d91bc735e9fe9ea83fc7cdd From 662af1341767724f59ffe3d7c6b473254d4f76d9 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Fri, 8 Jun 2018 16:31:21 +0200 Subject: [PATCH 056/136] Fix sources --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index a5d2391..01c8402 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (puppet-5.5.1.tar.gz) = 20bf7094193f30cfc7a91244275fc79eef0296036ffbc6bbe405e9ca75123b722be6855c746ef8cd35f80bd7a7308408a9205d064f0f910e11877e4db0ebdabc SHA512 (puppet-5.5.1.tar.gz.asc) = 8d176274c37a9f47130ecb373872390a4685bbcceb5270b732aacf07155fae6051cb7e445e9be24802ccfdeaf98e464a34f8812d8d91bc735e9fe9ea83fc7cdd From 9e6b608e9d6f1c493e04d2f90dff5abc3ef0197a Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 02:16:36 -0500 Subject: [PATCH 057/136] Remove needless use of %defattr --- puppet.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index 854434a..873730e 100644 --- a/puppet.spec +++ b/puppet.spec @@ -220,7 +220,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %files -%defattr(-, root, root, 0755) %doc README.md examples %license LICENSE %{_bindir}/puppet @@ -287,7 +286,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-status.8.gz %files server -%defattr(-, root, root, 0755) %if 0%{?_with_systemd} %{_unitdir}/puppetmaster.service %else From e56aacf581b14ebbd093701b5cde0c4eab0a4728 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 23:00:19 +0000 Subject: [PATCH 058/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 873730e..3f30a12 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ Name: puppet Version: 5.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -383,6 +383,9 @@ fi exit 0 %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 5.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue May 8 2018 Haïkel Guémar - 5.5.1-1 - Upstream 5.5.1 - Unmaintained editor extensions were removed upstream (PUP-7558) From 2f24705a1ab306291615e4b7be0d445e93194a5a Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Tue, 24 Jul 2018 09:20:25 +0200 Subject: [PATCH 059/136] Fix epoch issues when rebuilding on RHEL Do not require rebuilds on either Fedora/EPEL --- puppet.spec | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/puppet.spec b/puppet.spec index 3f30a12..2be5ccb 100644 --- a/puppet.spec +++ b/puppet.spec @@ -13,6 +13,13 @@ %global _with_systemd 1 %endif +# FIXME(hguemar): RH products builds of facter and hiera have introduced epochs +# does not impact Fedora nor EPEL +%if 0%{?rhel} && 0%{?rhel} >= 7 && !0%{?epel} +%global has_epoch 1 +%endif + + %global confdir conf %global pending_upgrade_path %{_localstatedir}/lib/rpm-state/puppet %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending @@ -71,18 +78,18 @@ BuildRequires: ruby-facter < 4 Requires: ruby-facter >= 3.0 Requires: ruby-facter < 4 %else -BuildRequires: facter >= 2.0 -BuildRequires: facter < 4 -Requires: facter >= 2.0 -Requires: facter < 4 +BuildRequires: facter >= %{?has_epoch:1:}2.0 +BuildRequires: facter < %{?has_epoch:1:}4 +Requires: facter >= %{?has_epoch:1:}2.0 +Requires: facter < %{?has_epoch:1:}4 %endif BuildRequires: hiera >= 2.0 -BuildRequires: hiera < 4 +BuildRequires: hiera < %{?has_epoch:1:}4 Requires: hiera >= 2.0 -Requires: hiera < 4 +Requires: hiera < %{?has_epoch:1:}4 Obsoletes: hiera-puppet < 1.0.0-2 Provides: hiera-puppet = %{version}-%{release} From b517787a5df8c0e9246b6a2467eea79b4514a54a Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 31 Oct 2018 11:33:14 +0100 Subject: [PATCH 060/136] Upstream 5.5.6 Fix issues with RHEL > 7 --- puppet.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index 2be5ccb..f3844dc 100644 --- a/puppet.spec +++ b/puppet.spec @@ -25,8 +25,8 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 5.5.1 -Release: 2%{?dist} +Version: 5.5.6 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -40,6 +40,12 @@ 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: 7000.patch +# https://github.com/puppetlabs/puppet/pull/7140 (PUP-9198) +Patch05: 7140.patch Group: System Environment/Base @@ -390,6 +396,10 @@ fi exit 0 %changelog +* Wed Oct 31 2018 Haïkel Guémar - 5.5.6-1 +- Upstream 5.5.6 +- Fix issues with RHEL > 7 + * Fri Jul 13 2018 Fedora Release Engineering - 5.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 177186787bfa422c01af8b8017f05d558025988c Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 31 Oct 2018 11:40:26 +0100 Subject: [PATCH 061/136] Upload 5.5.6 sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 01c8402..12096ce 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (puppet-5.5.1.tar.gz) = 20bf7094193f30cfc7a91244275fc79eef0296036ffbc6bbe405e9ca75123b722be6855c746ef8cd35f80bd7a7308408a9205d064f0f910e11877e4db0ebdabc -SHA512 (puppet-5.5.1.tar.gz.asc) = 8d176274c37a9f47130ecb373872390a4685bbcceb5270b732aacf07155fae6051cb7e445e9be24802ccfdeaf98e464a34f8812d8d91bc735e9fe9ea83fc7cdd +SHA512 (puppet-5.5.6.tar.gz) = 53bccc4cf3d4dde3079d96cd28b4cf380d004fdf67da8eaeaf70706ca5e1fe611910042f1aa03453fb29419bb9888a0eeef9a9d64e8f0cfe5d8d7a73e5bf5850 +SHA512 (puppet-5.5.6.tar.gz.asc) = 919303ae3f944236e52d2c1008f77e383ea2ee88c450fd00c197bc751f8fd3cd042bc6fd5f544a57b30a122f04db48418ee4d44319ecb996426fec311f7b83f2 From f6d76875bb5e98965567561e4b1f3e5223b5e8a4 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 31 Oct 2018 11:42:37 +0100 Subject: [PATCH 062/136] Add missing patches --- 7000.patch | 25 +++++++++++++++++++++++++ 7140.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 7000.patch create mode 100644 7140.patch diff --git a/7000.patch b/7000.patch new file mode 100644 index 0000000..1517bf0 --- /dev/null +++ b/7000.patch @@ -0,0 +1,25 @@ +From d88bbce5af8a35d2bdf74632ef2dcd0dae8e178c Mon Sep 17 00:00:00 2001 +From: Emilien Macchi +Date: Wed, 15 Aug 2018 22:40:35 +0200 +Subject: [PATCH] (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 8dd7af21e61..2371a14acb4 100644 +--- a/lib/puppet/provider/service/systemd.rb ++++ b/lib/puppet/provider/service/systemd.rb +@@ -19,7 +19,7 @@ + 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 diff --git a/7140.patch b/7140.patch new file mode 100644 index 0000000..ae65236 --- /dev/null +++ b/7140.patch @@ -0,0 +1,49 @@ +From 7ae809e1eaa826082c9f587f8741ea50f5246034 Mon Sep 17 00:00:00 2001 +From: Alex Schultz +Date: Wed, 3 Oct 2018 12:55:30 -0600 +Subject: [PATCH] (PUP-9198) Add RHEL8 support in the dnf provider + +dnf should be the default for RHEL8 +--- + lib/puppet/provider/package/dnf.rb | 1 + + spec/unit/provider/package/dnf_spec.rb | 15 +++++++++++++++ + 2 files changed, 16 insertions(+) + +diff --git a/lib/puppet/provider/package/dnf.rb b/lib/puppet/provider/package/dnf.rb +index 535aa6c6d7f..4823ebfd523 100644 +--- a/lib/puppet/provider/package/dnf.rb ++++ b/lib/puppet/provider/package/dnf.rb +@@ -29,6 +29,7 @@ + end + + defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => (22..30).to_a ++ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["8"] + + def self.update_command + # In DNF, update is deprecated for upgrade +diff --git a/spec/unit/provider/package/dnf_spec.rb b/spec/unit/provider/package/dnf_spec.rb +index 5e57337f500..40345dcde6e 100644 +--- a/spec/unit/provider/package/dnf_spec.rb ++++ b/spec/unit/provider/package/dnf_spec.rb +@@ -23,6 +23,21 @@ + expect(provider_class).to be_default + end + end ++ ++ it "should not be the default provider on rhel7" do ++ Facter.stubs(:value).with(:osfamily).returns(:redhat) ++ Facter.stubs(:value).with(:operatingsystem).returns(:redhat) ++ Facter.stubs(:value).with(:operatingsystemmajrelease).returns("7") ++ expect(provider_class).to_not be_default ++ end ++ ++ it "should be the default provider on rhel8" do ++ Facter.stubs(:value).with(:osfamily).returns(:redhat) ++ Facter.stubs(:value).with(:operatingsystem).returns(:redhat) ++ Facter.stubs(:value).with(:operatingsystemmajrelease).returns("8") ++ expect(provider_class).to be_default ++ end ++ + end + + describe provider_class do From e03d1b2aebc865cba189693f7fd2ed2572948636 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Mon, 7 Jan 2019 15:55:27 +0100 Subject: [PATCH 063/136] Upstream 5.5.6 Fix issues with RHEL > 7 --- puppet.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index f3844dc..3d293c1 100644 --- a/puppet.spec +++ b/puppet.spec @@ -26,7 +26,7 @@ Name: puppet Version: 5.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -144,6 +144,8 @@ The server can also function as a certificate authority and file server. %patch01 -p1 -b .paths %patch02 -p1 -b .server %patch03 -p1 +%patch04 -p1 +%patch05 -p1 # Unbundle rm -r lib/puppet/vendor/pathspec # Note(hguemar): remove unrelated OS/distro specific folders From e3e8e56c1fc12913c5f82d1bea54ff8eed3f7e6f Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Mon, 7 Jan 2019 16:26:04 +0100 Subject: [PATCH 064/136] Use %autosetup and refresh patches --- 0001-Fix-puppet-paths.patch | 6 +++--- ...vert-maint-Remove-puppetmaster.service.patch | 6 +++--- ...release-restrictions-from-DNF-provider.patch | 6 +++--- ...=> 0004-PUP-9069-Add-support-for-RHEL8.patch | 11 +++++++---- ...-Add-RHEL8-support-in-the-dnf-provider.patch | 17 ++++++++++------- puppet.spec | 13 ++++--------- 6 files changed, 30 insertions(+), 29 deletions(-) rename 7000.patch => 0004-PUP-9069-Add-support-for-RHEL8.patch (78%) rename 7140.patch => 0005-PUP-9198-Add-RHEL8-support-in-the-dnf-provider.patch (80%) diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch index 1a1b1d2..47d749f 100644 --- a/0001-Fix-puppet-paths.patch +++ b/0001-Fix-puppet-paths.patch @@ -1,7 +1,7 @@ -From 55933c8bd4ee983f048d1b4c90674e3dfd2583c4 Mon Sep 17 00:00:00 2001 +From 23bcde066d9915952b9bf2c8fd0770a2ce9422ce Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 29 Apr 2015 01:38:35 +0200 -Subject: [PATCH 1/3] Fix puppet paths +Subject: [PATCH 1/5] Fix puppet paths --- lib/puppet/util/run_mode.rb | 10 +++++----- @@ -41,5 +41,5 @@ index cf6c461..777156a 100644 end -- -2.17.1 +2.19.2 diff --git a/0002-Revert-maint-Remove-puppetmaster.service.patch b/0002-Revert-maint-Remove-puppetmaster.service.patch index 39e0401..365e21f 100644 --- a/0002-Revert-maint-Remove-puppetmaster.service.patch +++ b/0002-Revert-maint-Remove-puppetmaster.service.patch @@ -1,7 +1,7 @@ -From fc00c9d0c99e977cda8bb4a9a89952dfae5523dc Mon Sep 17 00:00:00 2001 +From f54a22b96e9e631991bad095a7b321273a2e6e3f Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Wed, 29 Jul 2015 21:58:48 +0200 -Subject: [PATCH 2/3] Revert "(maint) Remove puppetmaster.service" +Subject: [PATCH 2/5] Revert "(maint) Remove puppetmaster.service" This reverts commit c0e30daa53b6267c1c86b6e27c01b1c26cf49af5. --- @@ -42,5 +42,5 @@ index 0000000..dbbd627 +[Install] +WantedBy=multi-user.target -- -2.17.1 +2.19.2 diff --git a/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch b/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch index bbe7a50..b6a390c 100644 --- a/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch +++ b/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch @@ -1,7 +1,7 @@ -From 320d9dd4a87266d40c5b73d6e020bb77ca4e4d9b Mon Sep 17 00:00:00 2001 +From 5688991cd78f7c38a1edf28f76e9b7825a7d415a Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Wed, 31 May 2017 10:07:04 +0100 -Subject: [PATCH 3/3] Remove Fedora release restrictions from DNF provider +Subject: [PATCH 3/5] Remove Fedora release restrictions from DNF provider Ensure DNF provider will be used on all versions of Fedora, without new ones being excluded. @@ -23,5 +23,5 @@ index 535aa6c..c0ed877 100644 def self.update_command # In DNF, update is deprecated for upgrade -- -2.17.1 +2.19.2 diff --git a/7000.patch b/0004-PUP-9069-Add-support-for-RHEL8.patch similarity index 78% rename from 7000.patch rename to 0004-PUP-9069-Add-support-for-RHEL8.patch index 1517bf0..3f1e578 100644 --- a/7000.patch +++ b/0004-PUP-9069-Add-support-for-RHEL8.patch @@ -1,7 +1,7 @@ -From d88bbce5af8a35d2bdf74632ef2dcd0dae8e178c Mon Sep 17 00:00:00 2001 +From 76031db0120ef8a3bdee576ca4aac9dc8b2859af Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 15 Aug 2018 22:40:35 +0200 -Subject: [PATCH] (PUP-9069) Add support for RHEL8 +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 @@ -11,10 +11,10 @@ need to make Puppet systemd provider working. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/service/systemd.rb b/lib/puppet/provider/service/systemd.rb -index 8dd7af21e61..2371a14acb4 100644 +index c444861..a68ce96 100644 --- a/lib/puppet/provider/service/systemd.rb +++ b/lib/puppet/provider/service/systemd.rb -@@ -19,7 +19,7 @@ +@@ -19,7 +19,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do end defaultfor :osfamily => [:archlinux] @@ -23,3 +23,6 @@ index 8dd7af21e61..2371a14acb4 100644 defaultfor :osfamily => :redhat, :operatingsystem => :fedora defaultfor :osfamily => :suse defaultfor :osfamily => :coreos +-- +2.19.2 + diff --git a/7140.patch b/0005-PUP-9198-Add-RHEL8-support-in-the-dnf-provider.patch similarity index 80% rename from 7140.patch rename to 0005-PUP-9198-Add-RHEL8-support-in-the-dnf-provider.patch index ae65236..6c8a8d6 100644 --- a/7140.patch +++ b/0005-PUP-9198-Add-RHEL8-support-in-the-dnf-provider.patch @@ -1,7 +1,7 @@ -From 7ae809e1eaa826082c9f587f8741ea50f5246034 Mon Sep 17 00:00:00 2001 +From 8cf4f5cb49ac3742c0c650f81875872ac3e09fbb Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 3 Oct 2018 12:55:30 -0600 -Subject: [PATCH] (PUP-9198) Add RHEL8 support in the dnf provider +Subject: [PATCH 5/5] (PUP-9198) Add RHEL8 support in the dnf provider dnf should be the default for RHEL8 --- @@ -10,22 +10,22 @@ dnf should be the default for RHEL8 2 files changed, 16 insertions(+) diff --git a/lib/puppet/provider/package/dnf.rb b/lib/puppet/provider/package/dnf.rb -index 535aa6c6d7f..4823ebfd523 100644 +index c0ed877..ee27322 100644 --- a/lib/puppet/provider/package/dnf.rb +++ b/lib/puppet/provider/package/dnf.rb -@@ -29,6 +29,7 @@ +@@ -29,6 +29,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do end - defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => (22..30).to_a + defaultfor :operatingsystem => :fedora + defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["8"] def self.update_command # In DNF, update is deprecated for upgrade diff --git a/spec/unit/provider/package/dnf_spec.rb b/spec/unit/provider/package/dnf_spec.rb -index 5e57337f500..40345dcde6e 100644 +index 5e57337..40345dc 100644 --- a/spec/unit/provider/package/dnf_spec.rb +++ b/spec/unit/provider/package/dnf_spec.rb -@@ -23,6 +23,21 @@ +@@ -23,6 +23,21 @@ context 'default' do expect(provider_class).to be_default end end @@ -47,3 +47,6 @@ index 5e57337f500..40345dcde6e 100644 end describe provider_class do +-- +2.19.2 + diff --git a/puppet.spec b/puppet.spec index 3d293c1..995fc15 100644 --- a/puppet.spec +++ b/puppet.spec @@ -43,12 +43,12 @@ 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: 7000.patch +Patch04: 0004-PUP-9069-Add-support-for-RHEL8.patch # https://github.com/puppetlabs/puppet/pull/7140 (PUP-9198) -Patch05: 7140.patch +Patch05: 0005-PUP-9198-Add-RHEL8-support-in-the-dnf-provider.patch Group: System Environment/Base - +BuildRequires: git BuildRequires: ruby-devel >= 1.8.7 # ruby-devel does not require the base package, but requires -libs instead BuildRequires: ruby >= 1.8.7 @@ -140,12 +140,7 @@ Provides the central puppet server daemon which provides manifests to clients. The server can also function as a certificate authority and file server. %prep -%setup -q -%patch01 -p1 -b .paths -%patch02 -p1 -b .server -%patch03 -p1 -%patch04 -p1 -%patch05 -p1 +%autosetup -S git # Unbundle rm -r lib/puppet/vendor/pathspec # Note(hguemar): remove unrelated OS/distro specific folders From e07ed63d656e9d3f6688eea695b1ef8e08028993 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Tue, 22 Jan 2019 16:13:30 +0100 Subject: [PATCH 065/136] Optimize systemd dependency for containers According to https://fedoraproject.org/wiki/Packaging:Scriptlets: If a package is suitable for installation without systemd (in a container image, for example) and does not require any of the systemd mechanisms such as tmpfiles.d, then the systemd_ordering macro MAY be used instead of the systemd_requires macro. That is exactly the case we want to address for container images when installing packages in it. Resolves: rhbz#1654672 Related-Bug: #1804822 Signed-off-by: Bogdan Dobrelya --- puppet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index 995fc15..ce7ba38 100644 --- a/puppet.spec +++ b/puppet.spec @@ -104,7 +104,7 @@ Provides: hiera-puppet = %{version}-%{release} Requires(pre): shadow-utils %if 0%{?_with_systemd} -%{?systemd_requires} +%{?systemd_ordering} BuildRequires: systemd %else Requires(post): chkconfig @@ -126,7 +126,7 @@ Group: System Environment/Base Summary: Server for the puppet system management tool Requires: puppet = %{version}-%{release} %if 0%{?_with_systemd} -%{?systemd_requires} +%{?systemd_ordering} BuildRequires: systemd %else Requires(post): chkconfig From 9dd95c8357dc5113b6a88c034a66d39f61b6be71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Tue, 22 Jan 2019 21:04:34 +0100 Subject: [PATCH 066/136] Add changelog and fix rpmbuild warnings --- puppet.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/puppet.spec b/puppet.spec index ce7ba38..a029813 100644 --- a/puppet.spec +++ b/puppet.spec @@ -26,7 +26,7 @@ Name: puppet Version: 5.5.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -278,9 +278,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-filebucket.8.gz %{_mandir}/man8/puppet-generate.8.gz %{_mandir}/man8/puppet-help.8.gz -#%{_mandir}/man8/puppet-instrumentation_data.8.gz -#%{_mandir}/man8/puppet-instrumentation_listener.8.gz -#%{_mandir}/man8/puppet-instrumentation_probe.8.gz +#{_mandir}/man8/puppet-instrumentation_data.8.gz +#{_mandir}/man8/puppet-instrumentation_listener.8.gz +#{_mandir}/man8/puppet-instrumentation_probe.8.gz %{_mandir}/man8/puppet-epp.8.gz %{_mandir}/man8/puppet-key.8.gz %{_mandir}/man8/puppet-lookup.8.gz @@ -291,7 +291,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-plugin.8.gz %{_mandir}/man8/puppet-report.8.gz %{_mandir}/man8/puppet-resource.8.gz -#%{_mandir}/man8/puppet-secret_agent.8.gz +#{_mandir}/man8/puppet-secret_agent.8.gz %{_mandir}/man8/puppet-script.8.gz %{_mandir}/man8/puppet-status.8.gz @@ -305,9 +305,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %endif %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf %dir %{_sysconfdir}/puppet/manifests -#%{_mandir}/man8/puppet-kick.8.gz +#{_mandir}/man8/puppet-kick.8.gz %{_mandir}/man8/puppet-master.8.gz -#%{_mandir}/man8/puppet-queue.8.gz +#{_mandir}/man8/puppet-queue.8.gz # Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5), # and 471919 (RHEL-4) @@ -393,6 +393,9 @@ fi exit 0 %changelog +* Tue Jan 22 2019 Bogdan Dobrelya - 5.5.6-3 +- Use systemd_ordering macro + * Wed Oct 31 2018 Haïkel Guémar - 5.5.6-1 - Upstream 5.5.6 - Fix issues with RHEL > 7 From 91b4fb283d622dcbc968290d09c1561e17197e74 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:13 +0100 Subject: [PATCH 067/136] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- puppet.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index a029813..acbafdd 100644 --- a/puppet.spec +++ b/puppet.spec @@ -46,7 +46,6 @@ Patch03: 0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch Patch04: 0004-PUP-9069-Add-support-for-RHEL8.patch # https://github.com/puppetlabs/puppet/pull/7140 (PUP-9198) Patch05: 0005-PUP-9198-Add-RHEL8-support-in-the-dnf-provider.patch -Group: System Environment/Base BuildRequires: git BuildRequires: ruby-devel >= 1.8.7 @@ -122,7 +121,6 @@ normally aggregated in different files, like users, cron jobs, and hosts, along with obviously discrete elements like packages, services, and files. %package server -Group: System Environment/Base Summary: Server for the puppet system management tool Requires: puppet = %{version}-%{release} %if 0%{?_with_systemd} From a99941884f81574cd3a85c84fb8e42e081051b3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 05:00:16 +0000 Subject: [PATCH 068/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 acbafdd..7971bf9 100644 --- a/puppet.spec +++ b/puppet.spec @@ -26,7 +26,7 @@ Name: puppet Version: 5.5.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -391,6 +391,9 @@ fi exit 0 %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 5.5.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 22 2019 Bogdan Dobrelya - 5.5.6-3 - Use systemd_ordering macro From 4ff2bb73dd5e1110c0d411f58d7d189f0bbdb6f5 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Mon, 11 Feb 2019 14:27:29 +0100 Subject: [PATCH 069/136] Revert "Optimize systemd dependency for containers" It was generally a mistake to use `%systemd_ordering` in those circumstances, as the tmpfiles stuff doesn't work and populate the `/tmp` and `/run` directories. The reason why the packages install is that all the commands in the macros have `|| :` at the end, so their error state is ignored. Something to re-consider for future attempts to fix/improve that: If the tmpfiles and such were split out into a subpackage that'd be required if and only if the kernel was installed or being installed, that might work. Related: rhbz#1654672 Related-Bug: #1804822 This reverts commit e07ed63d656e9d3f6688eea695b1ef8e08028993. --- puppet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index 7971bf9..83f01ff 100644 --- a/puppet.spec +++ b/puppet.spec @@ -103,7 +103,7 @@ Provides: hiera-puppet = %{version}-%{release} Requires(pre): shadow-utils %if 0%{?_with_systemd} -%{?systemd_ordering} +%{?systemd_requires} BuildRequires: systemd %else Requires(post): chkconfig @@ -124,7 +124,7 @@ along with obviously discrete elements like packages, services, and files. Summary: Server for the puppet system management tool Requires: puppet = %{version}-%{release} %if 0%{?_with_systemd} -%{?systemd_ordering} +%{?systemd_requires} BuildRequires: systemd %else Requires(post): chkconfig From 86277f74eaf6030e29059fa29d106a2155c98a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 17 Feb 2019 22:13:51 +0100 Subject: [PATCH 070/136] Revert use of systemd_ordering macro --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 83f01ff..6d1f532 100644 --- a/puppet.spec +++ b/puppet.spec @@ -26,7 +26,7 @@ Name: puppet Version: 5.5.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -391,6 +391,9 @@ fi exit 0 %changelog +* Sun Feb 17 2019 Bogdan Dobrelya - 5.5.6-5 +- Revert use of systemd_ordering macro + * Sat Feb 02 2019 Fedora Release Engineering - 5.5.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f04e1ae2d44629a2d89df0ee1a1da0d53f3550d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Thu, 7 Mar 2019 19:58:29 +0100 Subject: [PATCH 071/136] Split off headless subpackage, based on idea from Bogdan Dobrelya --- puppet.spec | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/puppet.spec b/puppet.spec index 6d1f532..07231ca 100644 --- a/puppet.spec +++ b/puppet.spec @@ -26,7 +26,7 @@ Name: puppet Version: 5.5.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -59,6 +59,7 @@ Requires: ruby(abi) = 1.8 Requires: ruby(release) %endif +Requires: puppet-headless = %{version}-%{release} Requires: ruby(shadow) Requires: rubygem(json) Requires: rubygem(pathspec) @@ -123,6 +124,7 @@ along with obviously discrete elements like packages, services, and files. %package server Summary: Server for the puppet system management tool Requires: puppet = %{version}-%{release} +Requires: puppet-headless = %{version}-%{release} %if 0%{?_with_systemd} %{?systemd_requires} BuildRequires: systemd @@ -137,6 +139,14 @@ Requires(postun): initscripts Provides the central puppet server daemon which provides manifests to clients. The server can also function as a certificate authority and file server. +%package headless +Summary: Headless Puppet +Conflicts: puppet < 5.5.6-6 +%description headless +This puppet headless subpackage may be used when there is no need to +have puppet agent running as a service, for example, in a container +image. + %prep %autosetup -S git # Unbundle @@ -228,11 +238,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %files -%doc README.md examples -%license LICENSE -%{_bindir}/puppet -%{_bindir}/start-puppet-* -%{puppet_libdir}/* %if 0%{?_with_systemd} %{_unitdir}/puppet.service %{_unitdir}/puppetagent.service @@ -245,12 +250,19 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %if 0%{?fedora} >= 15 %{_tmpfilesdir}/%{name}.conf %endif -%config(noreplace) %{_sysconfdir}/puppet/puppet.conf -%config(noreplace) %{_sysconfdir}/puppet/auth.conf %config(noreplace) %{_sysconfdir}/logrotate.d/puppet %dir %{_sysconfdir}/NetworkManager %dir %{_sysconfdir}/NetworkManager/dispatcher.d %{_sysconfdir}/NetworkManager/dispatcher.d/98-puppet + +%files headless +%doc README.md examples +%license LICENSE +%{_bindir}/puppet +%{_bindir}/start-puppet-* +%{puppet_libdir}/* +%config(noreplace) %{_sysconfdir}/puppet/puppet.conf +%config(noreplace) %{_sysconfdir}/puppet/auth.conf %{_datadir}/%{name} # These need to be owned by puppet so the server can # write to them @@ -309,7 +321,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules # Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5), # and 471919 (RHEL-4) -%pre +%pre headless getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null getent passwd puppet &>/dev/null || \ useradd -r -u 52 -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \ @@ -391,6 +403,9 @@ fi exit 0 %changelog +* Thu Mar 07 2019 Terje Rosten - 5.5.6-6 +- Split off headless subpackage, based on idea from Bogdan Dobrelya + * Sun Feb 17 2019 Bogdan Dobrelya - 5.5.6-5 - Revert use of systemd_ordering macro From 2745c62d0c87cfc9ad281d3665eec05fe016f565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Thu, 7 Mar 2019 20:33:12 +0100 Subject: [PATCH 072/136] 5.5.10 --- ...lease-restrictions-from-DNF-provider.patch | 7 +-- ...dd-RHEL8-support-in-the-dnf-provider.patch | 52 ------------------- puppet.spec | 9 ++-- sources | 4 +- 4 files changed, 9 insertions(+), 63 deletions(-) delete mode 100644 0005-PUP-9198-Add-RHEL8-support-in-the-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 b6a390c..f629d6b 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 535aa6c..c0ed877 100644 +index 4823ebf..ee27322 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 @@ -19,9 +19,6 @@ index 535aa6c..c0ed877 100644 - defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => (22..30).to_a + defaultfor :operatingsystem => :fedora + defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["8"] def self.update_command - # In DNF, update is deprecated for upgrade --- -2.19.2 - diff --git a/0005-PUP-9198-Add-RHEL8-support-in-the-dnf-provider.patch b/0005-PUP-9198-Add-RHEL8-support-in-the-dnf-provider.patch deleted file mode 100644 index 6c8a8d6..0000000 --- a/0005-PUP-9198-Add-RHEL8-support-in-the-dnf-provider.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 8cf4f5cb49ac3742c0c650f81875872ac3e09fbb Mon Sep 17 00:00:00 2001 -From: Alex Schultz -Date: Wed, 3 Oct 2018 12:55:30 -0600 -Subject: [PATCH 5/5] (PUP-9198) Add RHEL8 support in the dnf provider - -dnf should be the default for RHEL8 ---- - lib/puppet/provider/package/dnf.rb | 1 + - spec/unit/provider/package/dnf_spec.rb | 15 +++++++++++++++ - 2 files changed, 16 insertions(+) - -diff --git a/lib/puppet/provider/package/dnf.rb b/lib/puppet/provider/package/dnf.rb -index c0ed877..ee27322 100644 ---- a/lib/puppet/provider/package/dnf.rb -+++ b/lib/puppet/provider/package/dnf.rb -@@ -29,6 +29,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do - end - - defaultfor :operatingsystem => :fedora -+ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["8"] - - def self.update_command - # In DNF, update is deprecated for upgrade -diff --git a/spec/unit/provider/package/dnf_spec.rb b/spec/unit/provider/package/dnf_spec.rb -index 5e57337..40345dc 100644 ---- a/spec/unit/provider/package/dnf_spec.rb -+++ b/spec/unit/provider/package/dnf_spec.rb -@@ -23,6 +23,21 @@ context 'default' do - expect(provider_class).to be_default - end - end -+ -+ it "should not be the default provider on rhel7" do -+ Facter.stubs(:value).with(:osfamily).returns(:redhat) -+ Facter.stubs(:value).with(:operatingsystem).returns(:redhat) -+ Facter.stubs(:value).with(:operatingsystemmajrelease).returns("7") -+ expect(provider_class).to_not be_default -+ end -+ -+ it "should be the default provider on rhel8" do -+ Facter.stubs(:value).with(:osfamily).returns(:redhat) -+ Facter.stubs(:value).with(:operatingsystem).returns(:redhat) -+ Facter.stubs(:value).with(:operatingsystemmajrelease).returns("8") -+ expect(provider_class).to be_default -+ end -+ - end - - describe provider_class do --- -2.19.2 - diff --git a/puppet.spec b/puppet.spec index 07231ca..9d4f257 100644 --- a/puppet.spec +++ b/puppet.spec @@ -25,8 +25,8 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 5.5.6 -Release: 6%{?dist} +Version: 5.5.10 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -44,8 +44,6 @@ Patch03: 0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch # 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 -# https://github.com/puppetlabs/puppet/pull/7140 (PUP-9198) -Patch05: 0005-PUP-9198-Add-RHEL8-support-in-the-dnf-provider.patch BuildRequires: git BuildRequires: ruby-devel >= 1.8.7 @@ -403,6 +401,9 @@ fi exit 0 %changelog +* Thu Mar 07 2019 Terje Rosten - 5.5.10-1 +- 5.5.10 + * Thu Mar 07 2019 Terje Rosten - 5.5.6-6 - Split off headless subpackage, based on idea from Bogdan Dobrelya diff --git a/sources b/sources index 12096ce..0568f4a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (puppet-5.5.6.tar.gz) = 53bccc4cf3d4dde3079d96cd28b4cf380d004fdf67da8eaeaf70706ca5e1fe611910042f1aa03453fb29419bb9888a0eeef9a9d64e8f0cfe5d8d7a73e5bf5850 -SHA512 (puppet-5.5.6.tar.gz.asc) = 919303ae3f944236e52d2c1008f77e383ea2ee88c450fd00c197bc751f8fd3cd042bc6fd5f544a57b30a122f04db48418ee4d44319ecb996426fec311f7b83f2 +SHA512 (puppet-5.5.10.tar.gz) = 70a5684289fc576853bf908adff44c1b1ce4b37d71236e7d7a8d140fa0e3cdd46a4b570cc7e493a3f47641f6be0c3b736ab04a178c30cce4244abe686378bf4b +SHA512 (puppet-5.5.10.tar.gz.asc) = 884e7f290c6dba7076f7e5c5038326d77997598252fbf432f0e6abcbb3fe676aa38ebe5d8df682e616fa757365de423dd074a174c5e4d4f699832fd6377bd487 From 7c468502ac78b09937670311bf0cc11d92fa9e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Thu, 7 Mar 2019 23:43:40 +0100 Subject: [PATCH 073/136] Move reqs to headless --- puppet.spec | 101 +++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 53 deletions(-) diff --git a/puppet.spec b/puppet.spec index 9d4f257..75fcafb 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,14 +19,13 @@ %global has_epoch 1 %endif - %global confdir conf %global pending_upgrade_path %{_localstatedir}/lib/rpm-state/puppet %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet Version: 5.5.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -45,62 +44,14 @@ Patch03: 0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch # https://github.com/puppetlabs/puppet/pull/7000 (PUP-9069) Patch04: 0004-PUP-9069-Add-support-for-RHEL8.patch +BuildArch: noarch BuildRequires: git BuildRequires: ruby-devel >= 1.8.7 # ruby-devel does not require the base package, but requires -libs instead BuildRequires: ruby >= 1.8.7 -BuildArch: noarch -%if 0%{?rhel} && 0%{?rhel} <= 6 -Requires: ruby(abi) = 1.8 -%else -Requires: ruby(release) -%endif - Requires: puppet-headless = %{version}-%{release} -Requires: ruby(shadow) -Requires: rubygem(json) -Requires: rubygem(pathspec) -Requires: rubygem(rgen) -# Prevents jruby from being pulled in by dependencies (BZ #985208) -Requires: ruby - -# Pull in ruby selinux bindings where available -%if 0%{?fedora} || 0%{?rhel} >= 6 -%{!?_without_selinux:Requires: ruby(selinux), libselinux-utils} -%else -%if 0%{?rhel} && 0%{?rhel} == 5 -%{!?_without_selinux:Requires: libselinux-ruby, libselinux-utils} -%endif -%endif - -# Fedora 28 updates to facter3 where puppet needs to require the ruby bindings specifically -%if 0%{?fedora} >= 28 -BuildRequires: ruby-facter >= 3.0 -BuildRequires: ruby-facter < 4 -Requires: ruby-facter >= 3.0 -Requires: ruby-facter < 4 -%else -BuildRequires: facter >= %{?has_epoch:1:}2.0 -BuildRequires: facter < %{?has_epoch:1:}4 -Requires: facter >= %{?has_epoch:1:}2.0 -Requires: facter < %{?has_epoch:1:}4 -%endif - - -BuildRequires: hiera >= 2.0 -BuildRequires: hiera < %{?has_epoch:1:}4 - -Requires: hiera >= 2.0 -Requires: hiera < %{?has_epoch:1:}4 - -Obsoletes: hiera-puppet < 1.0.0-2 -Provides: hiera-puppet = %{version}-%{release} - -%{!?_without_augeas:Requires: ruby(augeas)} - -Requires(pre): shadow-utils %if 0%{?_with_systemd} %{?systemd_requires} BuildRequires: systemd @@ -111,8 +62,6 @@ Requires(preun): initscripts Requires(postun): initscripts %endif -Requires: tar - %description Puppet lets you centrally manage every important aspect of your system using a cross-platform specification language that manages all the separate elements @@ -140,6 +89,49 @@ The server can also function as a certificate authority and file server. %package headless Summary: Headless Puppet Conflicts: puppet < 5.5.6-6 +%if 0%{?rhel} && 0%{?rhel} <= 6 +Requires: ruby(abi) = 1.8 +%else +Requires: ruby(release) +%endif +Requires: ruby(shadow) +Requires: rubygem(json) +Requires: rubygem(pathspec) +Requires: rubygem(rgen) +# Prevents jruby from being pulled in by dependencies (BZ #985208) +Requires: ruby +# Pull in ruby selinux bindings where available +%if 0%{?fedora} || 0%{?rhel} >= 6 +%{!?_without_selinux:Requires: ruby(selinux), libselinux-utils} +%else +%if 0%{?rhel} && 0%{?rhel} == 5 +%{!?_without_selinux:Requires: libselinux-ruby, libselinux-utils} +%endif +%endif + +# Fedora 28 updates to facter3 where puppet needs to require the ruby bindings specifically +%if 0%{?fedora} >= 28 +BuildRequires: ruby-facter >= 3.0 +BuildRequires: ruby-facter < 4 +Requires: ruby-facter >= 3.0 +Requires: ruby-facter < 4 +%else +BuildRequires: facter >= %{?has_epoch:1:}2.0 +BuildRequires: facter < %{?has_epoch:1:}4 +Requires: facter >= %{?has_epoch:1:}2.0 +Requires: facter < %{?has_epoch:1:}4 +%endif +BuildRequires: hiera >= 2.0 +BuildRequires: hiera < %{?has_epoch:1:}4 +Requires: hiera >= 2.0 +Requires: hiera < %{?has_epoch:1:}4 +Obsoletes: hiera-puppet < 1.0.0-2 +Provides: hiera-puppet = %{version}-%{release} + +%{!?_without_augeas:Requires: ruby(augeas)} +Requires: tar +Requires(pre): shadow-utils + %description headless This puppet headless subpackage may be used when there is no need to have puppet agent running as a service, for example, in a container @@ -401,6 +393,9 @@ fi exit 0 %changelog +* Thu Mar 07 2019 Terje Rosten - 5.5.10-2 +- Move reqs to headless + * Thu Mar 07 2019 Terje Rosten - 5.5.10-1 - 5.5.10 From d434511db25cc483653f78fd1f92b0b98312e97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Fri, 8 Mar 2019 00:00:05 +0100 Subject: [PATCH 074/136] Move sysconfdirs to headless too --- puppet.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index 75fcafb..48f9807 100644 --- a/puppet.spec +++ b/puppet.spec @@ -25,7 +25,7 @@ Name: puppet Version: 5.5.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -235,8 +235,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_initrddir}/puppet %config(noreplace) %{_sysconfdir}/sysconfig/puppet %endif -%dir %{_sysconfdir}/puppet -%dir %{_sysconfdir}/%{name}/modules %if 0%{?fedora} >= 15 %{_tmpfilesdir}/%{name}.conf %endif @@ -251,6 +249,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_bindir}/puppet %{_bindir}/start-puppet-* %{puppet_libdir}/* +%dir %{_sysconfdir}/puppet +%dir %{_sysconfdir}/%{name}/modules %config(noreplace) %{_sysconfdir}/puppet/puppet.conf %config(noreplace) %{_sysconfdir}/puppet/auth.conf %{_datadir}/%{name} @@ -393,6 +393,9 @@ fi exit 0 %changelog +* Thu Mar 07 2019 Terje Rosten - 5.5.10-3 +- Move sysconfdirs to headless too + * Thu Mar 07 2019 Terje Rosten - 5.5.10-2 - Move reqs to headless From 4561a4c947ba109decc491b74050ca48fd8dd8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Wed, 13 Mar 2019 19:30:59 +0100 Subject: [PATCH 075/136] Minor clean up --- puppet-nm-dispatcher | 0 puppet-nm-dispatcher.systemd | 0 puppet.spec | 23 ++++++++--------------- 3 files changed, 8 insertions(+), 15 deletions(-) mode change 100755 => 100644 puppet-nm-dispatcher mode change 100755 => 100644 puppet-nm-dispatcher.systemd diff --git a/puppet-nm-dispatcher b/puppet-nm-dispatcher old mode 100755 new mode 100644 diff --git a/puppet-nm-dispatcher.systemd b/puppet-nm-dispatcher.systemd old mode 100755 new mode 100644 diff --git a/puppet.spec b/puppet.spec index 48f9807..c45daa1 100644 --- a/puppet.spec +++ b/puppet.spec @@ -25,7 +25,7 @@ Name: puppet Version: 5.5.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -101,13 +101,7 @@ Requires: rubygem(rgen) # Prevents jruby from being pulled in by dependencies (BZ #985208) Requires: ruby # Pull in ruby selinux bindings where available -%if 0%{?fedora} || 0%{?rhel} >= 6 %{!?_without_selinux:Requires: ruby(selinux), libselinux-utils} -%else -%if 0%{?rhel} && 0%{?rhel} == 5 -%{!?_without_selinux:Requires: libselinux-ruby, libselinux-utils} -%endif -%endif # Fedora 28 updates to facter3 where puppet needs to require the ruby bindings specifically %if 0%{?fedora} >= 28 @@ -194,10 +188,10 @@ rm %{buildroot}%{_sysconfdir}/puppet/hiera.yaml # Install a NetworkManager dispatcher script to pickup changes to # /etc/resolv.conf and such (https://bugzilla.redhat.com/532085). %if 0%{?_with_systemd} -install -Dpv %{SOURCE3} \ +install -Dpv -m0755 %{SOURCE3} \ %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name} %else -install -Dpv %{SOURCE2} \ +install -Dpv -m0755 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name} %endif @@ -205,6 +199,8 @@ install -Dpv %{SOURCE2} \ install -d %{buildroot}%{_datadir}/%{name} cp -a ext/ %{buildroot}%{_datadir}/%{name} +chmod 0755 %{buildroot}%{_datadir}/%{name}/ext/regexp_nodes/regexp_nodes.rb + # Install wrappers for SELinux install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-agent install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-master @@ -278,9 +274,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-filebucket.8.gz %{_mandir}/man8/puppet-generate.8.gz %{_mandir}/man8/puppet-help.8.gz -#{_mandir}/man8/puppet-instrumentation_data.8.gz -#{_mandir}/man8/puppet-instrumentation_listener.8.gz -#{_mandir}/man8/puppet-instrumentation_probe.8.gz %{_mandir}/man8/puppet-epp.8.gz %{_mandir}/man8/puppet-key.8.gz %{_mandir}/man8/puppet-lookup.8.gz @@ -291,7 +284,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-plugin.8.gz %{_mandir}/man8/puppet-report.8.gz %{_mandir}/man8/puppet-resource.8.gz -#{_mandir}/man8/puppet-secret_agent.8.gz %{_mandir}/man8/puppet-script.8.gz %{_mandir}/man8/puppet-status.8.gz @@ -305,9 +297,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %endif %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf %dir %{_sysconfdir}/puppet/manifests -#{_mandir}/man8/puppet-kick.8.gz %{_mandir}/man8/puppet-master.8.gz -#{_mandir}/man8/puppet-queue.8.gz # Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5), # and 471919 (RHEL-4) @@ -393,6 +383,9 @@ fi exit 0 %changelog +* Wed Mar 13 2019 Terje Rosten - 5.5.10-4 +- Minor clean up + * Thu Mar 07 2019 Terje Rosten - 5.5.10-3 - Move sysconfdirs to headless too From f96b2ccfcc9534fe8011a9144758c369da2dce18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 11:30:58 +0000 Subject: [PATCH 076/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 c45daa1..fbdb25b 100644 --- a/puppet.spec +++ b/puppet.spec @@ -25,7 +25,7 @@ Name: puppet Version: 5.5.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -383,6 +383,9 @@ fi exit 0 %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 5.5.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Mar 13 2019 Terje Rosten - 5.5.10-4 - Minor clean up From 38afc62ebd3e1670b03793d29a9f01f3f2a6e046 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 22 Aug 2019 17:07:29 +0200 Subject: [PATCH 077/136] Move the NetworkManager dispatcher script out of /etc It's not user configuration and shouldn't ever have been there. Except for that it used to be the only location NetworkManager looked into. With NetworkManager 1.20 that is no longer the case and the dispatcher scripts can be moved to /usr/lib. --- puppet.spec | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/puppet.spec b/puppet.spec index fbdb25b..24019e6 100644 --- a/puppet.spec +++ b/puppet.spec @@ -23,9 +23,15 @@ %global pending_upgrade_path %{_localstatedir}/lib/rpm-state/puppet %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending +%if 0%{?fedora} > 30 || 0%{?rhel} > 8 +%global nm_dispatcher_dir %{buildroot}%{_prefix}/lib/NetworkManager +%else +%global nm_dispatcher_dir %{buildroot}%{_sysconfdir}/NetworkManager +%endif + Name: puppet Version: 5.5.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -189,10 +195,10 @@ rm %{buildroot}%{_sysconfdir}/puppet/hiera.yaml # /etc/resolv.conf and such (https://bugzilla.redhat.com/532085). %if 0%{?_with_systemd} install -Dpv -m0755 %{SOURCE3} \ - %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name} + %{buildroot}%{nm_dispatcher_dir}/dispatcher.d/98-%{name} %else install -Dpv -m0755 %{SOURCE2} \ - %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name} + %{buildroot}%{nm_dispatcher_dir}/dispatcher.d/98-%{name} %endif # Install the ext/ directory to %%{_datadir}/%%{name} @@ -235,9 +241,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_tmpfilesdir}/%{name}.conf %endif %config(noreplace) %{_sysconfdir}/logrotate.d/puppet -%dir %{_sysconfdir}/NetworkManager -%dir %{_sysconfdir}/NetworkManager/dispatcher.d -%{_sysconfdir}/NetworkManager/dispatcher.d/98-puppet +%dir %{nm_dispatcher_dir} +%dir %{nm_dispatcher_dir}/dispatcher.d +%{nm_dispatcher_dir}/dispatcher.d/98-puppet %files headless %doc README.md examples @@ -383,6 +389,9 @@ fi exit 0 %changelog +* Thu Aug 22 2019 Lubomir Rintel - 5.5.10-6 +- Move the NetworkManager dispatcher script out of /etc + * Fri Jul 26 2019 Fedora Release Engineering - 5.5.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From d6582b3eec7b4c90afb0c10180aee66989927fc4 Mon Sep 17 00:00:00 2001 From: Lucien Weller Date: Thu, 12 Sep 2019 07:00:21 +0200 Subject: [PATCH 078/136] fix: fixed wrong path for gem in puppet_gem.rb fixes issue https://bugzilla.redhat.com/show_bug.cgi?id=1751385 --- 0001-Fix-puppet-paths.patch | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch index 47d749f..423ced3 100644 --- a/0001-Fix-puppet-paths.patch +++ b/0001-Fix-puppet-paths.patch @@ -1,12 +1,25 @@ -From 23bcde066d9915952b9bf2c8fd0770a2ce9422ce Mon Sep 17 00:00:00 2001 -From: Haikel Guemar -Date: Wed, 29 Apr 2015 01:38:35 +0200 -Subject: [PATCH 1/5] Fix puppet paths +From 88c57975f8b3832688b00afc4f41b6dd87153ec2 Mon Sep 17 00:00:00 2001 +From: Lucien Weller +Date: Wed, 11 Sep 2019 23:30:38 +0200 +Subject: [PATCH 1/5] Fix-puppet-paths --- - lib/puppet/util/run_mode.rb | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + lib/puppet/provider/package/puppet_gem.rb | 2 +- + lib/puppet/util/run_mode.rb | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) +diff --git a/lib/puppet/provider/package/puppet_gem.rb b/lib/puppet/provider/package/puppet_gem.rb +index 8d876a0..86752b7 100644 +--- a/lib/puppet/provider/package/puppet_gem.rb ++++ b/lib/puppet/provider/package/puppet_gem.rb +@@ -12,6 +12,6 @@ Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do + # sort out the absolute path. + commands :gemcmd => "gem" + else +- commands :gemcmd => "/opt/puppetlabs/puppet/bin/gem" ++ commands :gemcmd => "/usr/bin/gem" + end + end diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb index cf6c461..777156a 100644 --- a/lib/puppet/util/run_mode.rb @@ -41,5 +54,5 @@ index cf6c461..777156a 100644 end -- -2.19.2 +2.20.1 From e24a065f4cc1ef92a35962ff87ddd2e1fe2158fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 22 Sep 2019 11:35:32 +0200 Subject: [PATCH 079/136] Drop buildroot prefix in nm_dispatcher_dir macro Fix wrong path for gem in puppetet_gem.rb (rhbz#1751385), report and fix from Lucien Weller, thanks! --- puppet.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index 24019e6..b7445e2 100644 --- a/puppet.spec +++ b/puppet.spec @@ -24,14 +24,14 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending %if 0%{?fedora} > 30 || 0%{?rhel} > 8 -%global nm_dispatcher_dir %{buildroot}%{_prefix}/lib/NetworkManager +%global nm_dispatcher_dir %{_prefix}/lib/NetworkManager %else -%global nm_dispatcher_dir %{buildroot}%{_sysconfdir}/NetworkManager +%global nm_dispatcher_dir %{_sysconfdir}/NetworkManager %endif Name: puppet Version: 5.5.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -389,6 +389,11 @@ fi exit 0 %changelog +* Sun Sep 22 2019 Terje Rosten - 5.5.10-7 +- Drop buildroot prefix in nm_dispatcher_dir macro +- Fix wrong path for gem in puppetet_gem.rb (rhbz#1751385), + report and fix from Lucien Weller, thanks! + * Thu Aug 22 2019 Lubomir Rintel - 5.5.10-6 - Move the NetworkManager dispatcher script out of /etc From d9d4410a878d7efda46b526dc855ba808cb6dbe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 22 Sep 2019 11:54:12 +0200 Subject: [PATCH 080/136] Prefer /run over /var/run (rhbz#1710635) --- 0001-Fix-puppet-paths.patch | 2 +- puppet.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch index 423ced3..6034a89 100644 --- a/0001-Fix-puppet-paths.patch +++ b/0001-Fix-puppet-paths.patch @@ -44,7 +44,7 @@ index cf6c461..777156a 100644 def run_dir - which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run") -+ which_dir("/var/run/puppet", "~/.puppet/var/run") ++ which_dir("/run/puppet", "~/.puppet/var/run") end def log_dir diff --git a/puppet.spec b/puppet.spec index b7445e2..484fc11 100644 --- a/puppet.spec +++ b/puppet.spec @@ -31,7 +31,7 @@ Name: puppet Version: 5.5.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -221,7 +221,7 @@ sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \ %if 0%{?fedora} >= 15 # Setup tmpfiles.d config mkdir -p %{buildroot}%{_tmpfilesdir} -echo "D /var/run/%{name} 0755 %{name} %{name} -" > \ +echo "D /run/%{name} 0755 %{name} %{name} -" > \ %{buildroot}%{_tmpfilesdir}/%{name}.conf %endif @@ -389,6 +389,9 @@ fi exit 0 %changelog +* Sun Sep 22 2019 Terje Rosten - 5.5.10-8 +- Prefer /run over /var/run (rhbz#1710635) + * Sun Sep 22 2019 Terje Rosten - 5.5.10-7 - Drop buildroot prefix in nm_dispatcher_dir macro - Fix wrong path for gem in puppetet_gem.rb (rhbz#1751385), From 1b29836c467b345c7460004bbe14c961d83eb444 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Wed, 4 Dec 2019 16:59:26 +0000 Subject: [PATCH 081/136] Add rubygem-multi_json as dependency It's dependency upstream and without it fail to build modules in some cases, depending on the structure of metadata.json. [1] https://github.com/puppetlabs/puppet/blob/5.5.x/.gemspec#L41 [2] https://github.com/puppetlabs/puppet/blob/5.5.x/lib/puppet/util/json.rb#L18 --- puppet.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 484fc11..e603700 100644 --- a/puppet.spec +++ b/puppet.spec @@ -31,7 +31,7 @@ Name: puppet Version: 5.5.10 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -104,6 +104,7 @@ Requires: ruby(shadow) Requires: rubygem(json) Requires: rubygem(pathspec) Requires: rubygem(rgen) +Requires: rubygem(multi_json) # Prevents jruby from being pulled in by dependencies (BZ #985208) Requires: ruby # Pull in ruby selinux bindings where available @@ -389,6 +390,9 @@ fi exit 0 %changelog +* Wed Dec 04 2019 Alfrdo Moralejo - 5.5.10-9 +- Add rubygem-multi_json as dependency. + * Sun Sep 22 2019 Terje Rosten - 5.5.10-8 - Prefer /run over /var/run (rhbz#1710635) From ef734ac79671e96bf9f2d1e23f7844e500e012bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 09:58:50 +0000 Subject: [PATCH 082/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 e603700..8cfae88 100644 --- a/puppet.spec +++ b/puppet.spec @@ -31,7 +31,7 @@ Name: puppet Version: 5.5.10 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -390,6 +390,9 @@ fi exit 0 %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 5.5.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Dec 04 2019 Alfrdo Moralejo - 5.5.10-9 - Add rubygem-multi_json as dependency. From e3ee5466f48972cbc90a865dab622186b80d6436 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Wed, 5 Feb 2020 19:33:40 +0100 Subject: [PATCH 083/136] 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 From 558a3731ebed211c561b87825dba397656c82eb4 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mon, 13 Apr 2020 16:38:50 +0200 Subject: [PATCH 084/136] Fixup conditionals for EL8 Signed-off-by: Igor Raits --- puppet.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/puppet.spec b/puppet.spec index 6d88f11..de1da86 100644 --- a/puppet.spec +++ b/puppet.spec @@ -9,7 +9,7 @@ %global puppet_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') %endif -%if 0%{?fedora} > 18 || 0%{?rhel} >= 7 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} %global _with_systemd 1 %endif @@ -23,7 +23,7 @@ %global pending_upgrade_path %{_localstatedir}/lib/rpm-state/puppet %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending -%if 0%{?fedora} > 30 || 0%{?rhel} > 8 +%if 0%{?fedora} > 30 || 0%{?rhel} >= 8 %global nm_dispatcher_dir %{_prefix}/lib/NetworkManager %else %global nm_dispatcher_dir %{_sysconfdir}/NetworkManager @@ -107,7 +107,7 @@ Requires: ruby %{!?_without_selinux:Requires: ruby(selinux), libselinux-utils} # Fedora 28 updates to facter3 where puppet needs to require the ruby bindings specifically -%if 0%{?fedora} >= 28 +%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: ruby-facter >= 3.0 BuildRequires: ruby-facter < 4 Requires: ruby-facter >= 3.0 @@ -215,7 +215,7 @@ sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \ %{buildroot}%{_unitdir}/puppet.service %endif -%if 0%{?fedora} >= 15 +%if 0%{?fedora} || 0%{?rhel} >= 8 # Setup tmpfiles.d config mkdir -p %{buildroot}%{_tmpfilesdir} echo "D /run/%{name} 0755 %{name} %{name} -" > \ @@ -234,7 +234,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_initrddir}/puppet %config(noreplace) %{_sysconfdir}/sysconfig/puppet %endif -%if 0%{?fedora} >= 15 +%if 0%{?fedora} || 0%{?rhel} >= 8 %{_tmpfilesdir}/%{name}.conf %endif %config(noreplace) %{_sysconfdir}/logrotate.d/puppet From 0e3a6519359be8a0d5e0ec8a2f18747d05fce6e3 Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sat, 2 May 2020 12:38:36 +0200 Subject: [PATCH 085/136] Update to 5.5.20 and add patches to work (somewhat) with ruby 2.7 --- puppet-5.5.18-ruby-27.patch | 17 +++++++++++++++++ puppet-5.5.18-sync.patch | 20 ++++++++++++++++++++ puppet.spec | 10 +++++++++- sources | 4 ++-- 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 puppet-5.5.18-ruby-27.patch create mode 100644 puppet-5.5.18-sync.patch diff --git a/puppet-5.5.18-ruby-27.patch b/puppet-5.5.18-ruby-27.patch new file mode 100644 index 0000000..9b97f02 --- /dev/null +++ b/puppet-5.5.18-ruby-27.patch @@ -0,0 +1,17 @@ +Description: Fix Ruby 2.7 warning + The '**' operater should be used to pass keyword arguments from now on. +Author: Lucas Kanashiro +Last-Updated: 26-03-2020 +Forwarded: yes, https://github.com/puppetlabs/puppet/pull/8060 + +--- a/lib/puppet/file_system/file_impl.rb ++++ b/lib/puppet/file_system/file_impl.rb +@@ -77,7 +77,7 @@ + end + + def read(path, opts = {}) +- path.read(opts) ++ path.read(**opts) + end + + def read_preserve_line_endings(path) diff --git a/puppet-5.5.18-sync.patch b/puppet-5.5.18-sync.patch new file mode 100644 index 0000000..6f38a7e --- /dev/null +++ b/puppet-5.5.18-sync.patch @@ -0,0 +1,20 @@ +diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb +index 2ccddbe..4c6e33d 100644 +--- a/lib/puppet/configurer.rb ++++ b/lib/puppet/configurer.rb +@@ -1,5 +1,4 @@ + # The client for interacting with the puppetmaster config server. +-require 'sync' + require 'timeout' + require 'puppet/network/http_pool' + require 'puppet/util' +diff --git a/lib/puppet/util/storage.rb b/lib/puppet/util/storage.rb +index 713f650..b9183ca 100644 +--- a/lib/puppet/util/storage.rb ++++ b/lib/puppet/util/storage.rb +@@ -1,5 +1,4 @@ + require 'yaml' +-require 'sync' + require 'singleton' + require 'puppet/util/yaml' + diff --git a/puppet.spec b/puppet.spec index de1da86..eb1458f 100644 --- a/puppet.spec +++ b/puppet.spec @@ -30,7 +30,7 @@ %endif Name: puppet -Version: 5.5.18 +Version: 5.5.20 Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 @@ -45,6 +45,10 @@ 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 +# https://tickets.puppetlabs.com/browse/PUP-10247 +Patch04: puppet-5.5.18-sync.patch +# https://github.com/puppetlabs/puppet/pull/8060 +Patch05: puppet-5.5.18-ruby-27.patch BuildArch: noarch BuildRequires: git @@ -386,6 +390,10 @@ fi exit 0 %changelog +* Sat May 02 2020 Terje Rosten - 5.5.20-1 +- 5.5.20 +- Add patches to work (somewhat) with ruby 2.7 + * Mon Feb 03 2020 Terje Rosten - 5.5.18-1 - 5.5.18 diff --git a/sources b/sources index 034ec56..04dfbd2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (puppet-5.5.18.tar.gz) = 86f210ee783ca36340b22463cd4ac237d8dc1c6a35526530af0696bb3f0373b0b22f690d3e3f8e31655ea182a33eb60b66b5826bd6c4d1b0059a8e46152416e6 -SHA512 (puppet-5.5.18.tar.gz.asc) = d380e1e10494c4ad164dd65235875bd885a1747671b014633a6e571677e7c87ed6c0125c9e3093caf88fff471d920a553a1862a1d810af34ce60151bd4c35244 +SHA512 (puppet-5.5.20.tar.gz) = 83b8f234697e13d6fd8ac16634fff4e4adfece70858c32c1001925c71cc4d9a482da1880c27c08e796facb46d5d17889f9521121a69cb49e160e3c031ad564c4 +SHA512 (puppet-5.5.20.tar.gz.asc) = d862eaf430cbb86112b67a8e0b3da228d3dd2d2dc4d16cd6272c4f1d737e9c8674418e56fd96a47a6be55f699a803e0e889256ad3d2cff66f6eff397c7e719cc From eae5785be45e5c18f1f2cf8ee26c8887eab97fe6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 23:10:54 +0000 Subject: [PATCH 086/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 eb1458f..2f66584 100644 --- a/puppet.spec +++ b/puppet.spec @@ -31,7 +31,7 @@ Name: puppet Version: 5.5.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -390,6 +390,9 @@ fi exit 0 %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 5.5.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat May 02 2020 Terje Rosten - 5.5.20-1 - 5.5.20 - Add patches to work (somewhat) with ruby 2.7 From e8e5fc2c0d9a7399108bab7f0e2d917a71447c63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 08:45:16 +0000 Subject: [PATCH 087/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 2f66584..4b3c243 100644 --- a/puppet.spec +++ b/puppet.spec @@ -31,7 +31,7 @@ Name: puppet Version: 5.5.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -390,6 +390,9 @@ fi exit 0 %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 5.5.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 5.5.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a95697f47f807e3f721ff854b446abf985d380df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:58 +0100 Subject: [PATCH 088/136] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- puppet.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 4b3c243..1073d92 100644 --- a/puppet.spec +++ b/puppet.spec @@ -31,7 +31,7 @@ Name: puppet Version: 5.5.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -390,6 +390,10 @@ fi exit 0 %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 5.5.20-4 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 5.5.20-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 4ecda1c3d8af205f2693b88f1c2e4ee9542fcb99 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Thu, 1 Jul 2021 09:27:07 -0400 Subject: [PATCH 089/136] Puppet 7.7 build -- ruby 3 --- 0001-Fix-puppet-paths.patch | 58 -- ...rt-maint-Remove-puppetmaster.service.patch | 46 -- ...lease-restrictions-from-DNF-provider.patch | 24 - RPM-GPG-KEY-puppet-20250406 | 31 ++ puppet-5.5.18-ruby-27.patch | 17 - puppet-5.5.18-sync.patch | 20 - puppet.spec | 502 ++++++------------ sources | 14 +- 8 files changed, 197 insertions(+), 515 deletions(-) delete mode 100644 0001-Fix-puppet-paths.patch delete mode 100644 0002-Revert-maint-Remove-puppetmaster.service.patch delete mode 100644 0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch create mode 100644 RPM-GPG-KEY-puppet-20250406 delete mode 100644 puppet-5.5.18-ruby-27.patch delete mode 100644 puppet-5.5.18-sync.patch diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch deleted file mode 100644 index 6034a89..0000000 --- a/0001-Fix-puppet-paths.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 88c57975f8b3832688b00afc4f41b6dd87153ec2 Mon Sep 17 00:00:00 2001 -From: Lucien Weller -Date: Wed, 11 Sep 2019 23:30:38 +0200 -Subject: [PATCH 1/5] Fix-puppet-paths - ---- - lib/puppet/provider/package/puppet_gem.rb | 2 +- - lib/puppet/util/run_mode.rb | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lib/puppet/provider/package/puppet_gem.rb b/lib/puppet/provider/package/puppet_gem.rb -index 8d876a0..86752b7 100644 ---- a/lib/puppet/provider/package/puppet_gem.rb -+++ b/lib/puppet/provider/package/puppet_gem.rb -@@ -12,6 +12,6 @@ Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do - # sort out the absolute path. - commands :gemcmd => "gem" - else -- commands :gemcmd => "/opt/puppetlabs/puppet/bin/gem" -+ commands :gemcmd => "/usr/bin/gem" - end - end -diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb -index cf6c461..777156a 100644 ---- a/lib/puppet/util/run_mode.rb -+++ b/lib/puppet/util/run_mode.rb -@@ -59,23 +59,23 @@ module Puppet - - class UnixRunMode < RunMode - def conf_dir -- which_dir("/etc/puppetlabs/puppet", "~/.puppetlabs/etc/puppet") -+ which_dir("/etc/puppet", "~/.puppet") - end - - def code_dir -- which_dir("/etc/puppetlabs/code", "~/.puppetlabs/etc/code") -+ which_dir("/etc/puppet", "~/.puppet/code") - end - - def var_dir -- which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache") -+ which_dir("/var/lib/puppet", "~/.puppet/cache") - end - - def run_dir -- which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run") -+ which_dir("/run/puppet", "~/.puppet/var/run") - end - - def log_dir -- which_dir("/var/log/puppetlabs/puppet", "~/.puppetlabs/var/log") -+ which_dir("/var/log/puppet", "~/.puppet/var/log") - end - end - --- -2.20.1 - diff --git a/0002-Revert-maint-Remove-puppetmaster.service.patch b/0002-Revert-maint-Remove-puppetmaster.service.patch deleted file mode 100644 index 365e21f..0000000 --- a/0002-Revert-maint-Remove-puppetmaster.service.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f54a22b96e9e631991bad095a7b321273a2e6e3f Mon Sep 17 00:00:00 2001 -From: Gael Chamoulaud -Date: Wed, 29 Jul 2015 21:58:48 +0200 -Subject: [PATCH 2/5] Revert "(maint) Remove puppetmaster.service" - -This reverts commit c0e30daa53b6267c1c86b6e27c01b1c26cf49af5. ---- - ext/systemd/puppet.service | 2 +- - ext/systemd/puppetmaster.service | 12 ++++++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) - create mode 100644 ext/systemd/puppetmaster.service - -diff --git a/ext/systemd/puppet.service b/ext/systemd/puppet.service -index 7c16615..36769ac 100644 ---- a/ext/systemd/puppet.service -+++ b/ext/systemd/puppet.service -@@ -11,7 +11,7 @@ - [Unit] - Description=Puppet agent - Wants=basic.target --After=basic.target network.target -+After=basic.target network.target puppetmaster.service - - [Service] - EnvironmentFile=-/etc/sysconfig/puppetagent -diff --git a/ext/systemd/puppetmaster.service b/ext/systemd/puppetmaster.service -new file mode 100644 -index 0000000..dbbd627 ---- /dev/null -+++ b/ext/systemd/puppetmaster.service -@@ -0,0 +1,12 @@ -+[Unit] -+Description=Puppet master -+Wants=basic.target -+After=basic.target network.target -+ -+[Service] -+EnvironmentFile=-/etc/sysconfig/puppetmaster -+EnvironmentFile=-/etc/default/puppetmaster -+ExecStart=/usr/bin/puppet master $PUPPETMASTER_EXTRA_OPTS --no-daemonize -+ -+[Install] -+WantedBy=multi-user.target --- -2.19.2 - diff --git a/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch b/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch deleted file mode 100644 index eba3cc8..0000000 --- a/0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5688991cd78f7c38a1edf28f76e9b7825a7d415a Mon Sep 17 00:00:00 2001 -From: Dominic Cleal -Date: Wed, 31 May 2017 10:07:04 +0100 -Subject: [PATCH 3/5] 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 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 - end - end - -- defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => (22..30).to_a -+ defaultfor :operatingsystem => :fedora - defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["8"] - - def self.update_command diff --git a/RPM-GPG-KEY-puppet-20250406 b/RPM-GPG-KEY-puppet-20250406 new file mode 100644 index 0000000..333b379 --- /dev/null +++ b/RPM-GPG-KEY-puppet-20250406 @@ -0,0 +1,31 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFyrv4oBEADhL8iyDPZ+GWN7L+A8dpEpggglxTtL7qYNyN5Uga2j0cusDdOD +ftPHsurLjfxtc2EFGdFK/N8y4LSpq+nOeazhkHcPeDiWC2AuN7+NGjH9LtvMUqKy +NWPhPYP2r/xPL547oDMdvLXDH5n+FsLFW8QgATHk4AvlIhGng0gWu80OqTCiL0HC +W7TftkF8ofP8k90SnLYbI9HDVOj6VYYtqG5NeoCHGAqrb79G/jq64Z/gLktD3IrB +CxYhKFfJtZ/BSDB8Aa4ht+jIyeFCNSbGyfFfWlHKvF3JngS/76Y7gxX1sbR3gHJQ +hO25AQdsPYKxgtIgNeB9/oBp1+V3K1W/nta4gbDVwJWCqDRbEFlHIdV7fvV/sqiI +W7rQ60aAY7J6Gjt/aUmNArvT8ty3szmhR0wEEU5/hhIVV6VjS+AQsI8pFv6VB8bJ +TLfOBPDW7dw2PgyWhVTEN8KW/ckyBvGmSdzSgAhw+rAe7li50/9e2H8eiJgBbGid +8EQidZgkokh331CMDkIA6F3ygiB+u2ZZ7ywxhxIRO70JElIuIOiofhVfRnh/ODlH +X7eD+cA2rlLQd2yWf4diiA7C9R8r8vPrAdp3aPZ4xLxvYYZV8E1JBdMus5GRy4rB +Avetp0Wx/1r9zVDKD/J1bNIlt0SR9FTmynZj4kLWhoCqmbrLS35325sS6wARAQAB +tEhQdXBwZXQsIEluYy4gUmVsZWFzZSBLZXkgKFB1cHBldCwgSW5jLiBSZWxlYXNl +IEtleSkgPHJlbGVhc2VAcHVwcGV0LmNvbT6JAlQEEwEKAD4WIQTWgR7Tre64RBr1 +qo9FKLbNnmHvJgUCXKu/igIbAwUJC0c1AAULCQgHAwUVCgkICwUWAgMBAAIeAQIX +gAAKCRBFKLbNnmHvJg/vD/0eOl/pBb6ooGnzg2qoD+XwgOK3HkTdvGNZKGsIrhUG +q6O0zoyPW8v9b/i7QEDre8QahARmMAEQ+T3nbNVzw4kpE+YIrEkKjoJsrF8/K/1L +zBHJCc3S9oF9KubG5BuQ4bAmcvnI+qpEYbSTLHztYGUfXAGu+MnaDf4C60G7zM6m +ec4bX8lVnt+gcsGGGCdN89XsZLBNdv21z9xMeaAPiRYJpbqwrb8cYbKQeqFSQt2M +UylN5oVeN77Q8iyXSyVwpc6uKzXdQ8bVPbKUTWSXQ4SSp0HJjtAMiDH2pjty4PG6 +EgZ6/njJLOzQ29ZgFrS19XLONlptHwKzLYB8nJhJvGHfzzInmNttDtNwTA6IxpsR +4aCnrPWFJRCbmMBNXvBR9B/O+e/T5ngL21ipMEwzEOiQlRSacnO2pICwZ5pARMRI +dxq/5BQYry9HNlJDGR7YIfn7i0oCGk5BxwotSlAPw8jFpNU/zTOvpQAdPvZje2JP +6GS+hYxSdHsigREXI2gxTvpcLk8LOe9PsqJv631e6Kvn9P9OHiihIp8G9fRQ8T7y +elHcNanV192mfbWxJhDAcQ+JEy9883lOanaCoaf/7z4kdmCQLz5/oNg2K0qjSgZH +JY/gxCOwuAuUJlLcAXQG6txJshfMxyQUO46DXg0/gjwkKgT/9PbTJEN/WN/G6n1h +lQ== +=nKF2 +-----END PGP PUBLIC KEY BLOCK----- + diff --git a/puppet-5.5.18-ruby-27.patch b/puppet-5.5.18-ruby-27.patch deleted file mode 100644 index 9b97f02..0000000 --- a/puppet-5.5.18-ruby-27.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fix Ruby 2.7 warning - The '**' operater should be used to pass keyword arguments from now on. -Author: Lucas Kanashiro -Last-Updated: 26-03-2020 -Forwarded: yes, https://github.com/puppetlabs/puppet/pull/8060 - ---- a/lib/puppet/file_system/file_impl.rb -+++ b/lib/puppet/file_system/file_impl.rb -@@ -77,7 +77,7 @@ - end - - def read(path, opts = {}) -- path.read(opts) -+ path.read(**opts) - end - - def read_preserve_line_endings(path) diff --git a/puppet-5.5.18-sync.patch b/puppet-5.5.18-sync.patch deleted file mode 100644 index 6f38a7e..0000000 --- a/puppet-5.5.18-sync.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb -index 2ccddbe..4c6e33d 100644 ---- a/lib/puppet/configurer.rb -+++ b/lib/puppet/configurer.rb -@@ -1,5 +1,4 @@ - # The client for interacting with the puppetmaster config server. --require 'sync' - require 'timeout' - require 'puppet/network/http_pool' - require 'puppet/util' -diff --git a/lib/puppet/util/storage.rb b/lib/puppet/util/storage.rb -index 713f650..b9183ca 100644 ---- a/lib/puppet/util/storage.rb -+++ b/lib/puppet/util/storage.rb -@@ -1,5 +1,4 @@ - require 'yaml' --require 'sync' - require 'singleton' - require 'puppet/util/yaml' - diff --git a/puppet.spec b/puppet.spec index 1073d92..9a0ba0a 100644 --- a/puppet.spec +++ b/puppet.spec @@ -1,72 +1,56 @@ -# Augeas and SELinux requirements may be disabled at build time by passing -# --without augeas and/or --without selinux to rpmbuild or mock - -# Specifically not using systemd on F18 as it's technically a break between -# using SystemV on 2.7.x and Systemd on 3.1.0. -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global puppet_libdir %{ruby_vendorlibdir} -%else -%global puppet_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} -%global _with_systemd 1 -%endif - -# FIXME(hguemar): RH products builds of facter and hiera have introduced epochs -# does not impact Fedora nor EPEL -%if 0%{?rhel} && 0%{?rhel} >= 7 && !0%{?epel} -%global has_epoch 1 -%endif - -%global confdir conf -%global pending_upgrade_path %{_localstatedir}/lib/rpm-state/puppet -%global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending - -%if 0%{?fedora} > 30 || 0%{?rhel} >= 8 %global nm_dispatcher_dir %{_prefix}/lib/NetworkManager -%else -%global nm_dispatcher_dir %{_sysconfdir}/NetworkManager -%endif +%global puppet_libdir %{ruby_vendorlibdir} Name: puppet -Version: 5.5.20 -Release: 4%{?dist} -Summary: A network tool for managing many disparate systems +Version: 7.7.0 +Release: 1%{?dist} +Summary: Network tool for managing many disparate systems License: ASL 2.0 -URL: http://puppetlabs.com -Source0: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz -Source1: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc -Source2: puppet-nm-dispatcher -Source3: puppet-nm-dispatcher.systemd -Source4: start-puppet-wrapper +URL: https://puppetlabs.com +Source0: https://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.gz +Source1: https://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.gz.asc +Source2: RPM-GPG-KEY-puppet-20250406 +Source3: https://forge.puppet.com/v3/files/puppetlabs-mount_core-1.0.4.tar.gz +Source4: https://forge.puppet.com/v3/files/puppetlabs-host_core-1.0.3.tar.gz +Source5: https://forge.puppet.com/v3/files/puppetlabs-augeas_core-1.1.1.tar.gz +Source6: https://forge.puppet.com/v3/files/puppetlabs-cron_core-1.0.4.tar.gz +Source7: https://forge.puppet.com/v3/files/puppetlabs-scheduled_task-2.2.1.tar.gz +Source8: https://forge.puppet.com/v3/files/puppetlabs-selinux_core-1.0.4.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.1.0.tar.gz +Source12: https://forge.puppet.com/v3/files/puppetlabs-zone_core-1.0.3.tar.gz +Source13: puppet-nm-dispatcher.systemd +Source14: start-puppet-wrapper -# Puppetlabs messed up with default paths -Patch01: 0001-Fix-puppet-paths.patch -Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch -Patch03: 0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch -# https://tickets.puppetlabs.com/browse/PUP-10247 -Patch04: puppet-5.5.18-sync.patch -# https://github.com/puppetlabs/puppet/pull/8060 -Patch05: puppet-5.5.18-ruby-27.patch +BuildArch: noarch -BuildArch: noarch -BuildRequires: git -BuildRequires: ruby-devel >= 1.8.7 # ruby-devel does not require the base package, but requires -libs instead -BuildRequires: ruby >= 1.8.7 - -Requires: puppet-headless = %{version}-%{release} - -%if 0%{?_with_systemd} -%{?systemd_requires} +BuildRequires: ruby +BuildRequires: ruby-devel +BuildRequires: rubygem-json +BuildRequires: facter +BuildRequires: hiera BuildRequires: systemd -%else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts -%endif +BuildRequires: gnupg2 +Requires: hiera >= 3.3.1 +Requires: facter >= 3.9.6 +Requires: ruby-facter >= 3.9.6 +Requires: rubygem-semantic_puppet >= 1.0.2 +Requires: rubygem-puppet-resource_api +Requires: rubygem-deep_merge +Requires: rubygem-httpclient +Requires: rubygem-multi_json +Requires: rubygem-json +Requires: ruby-augeas >= 0.5.0 +Requires: augeas >= 1.10.1 +Requires: augeas-libs >= 1.10.1 +Requires: cpp-hocon >= 0.2.1 +Requires: rubygem-concurrent-ruby >= 1.0.5 +Requires: ruby(selinux) libselinux-utils +Obsoletes: puppet-headless < 6.0.0 +Obsoletes: puppet-server < 6.0.0 +Obsoletes: puppet < 6.0.0 %description Puppet lets you centrally manage every important aspect of your system using a @@ -74,322 +58,144 @@ cross-platform specification language that manages all the separate elements normally aggregated in different files, like users, cron jobs, and hosts, along with obviously discrete elements like packages, services, and files. -%package server -Summary: Server for the puppet system management tool -Requires: puppet = %{version}-%{release} -Requires: puppet-headless = %{version}-%{release} -%if 0%{?_with_systemd} -%{?systemd_requires} -BuildRequires: systemd -%else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts -%endif - -%description server -Provides the central puppet server daemon which provides manifests to clients. -The server can also function as a certificate authority and file server. - -%package headless -Summary: Headless Puppet -Conflicts: puppet < 5.5.6-6 -%if 0%{?rhel} && 0%{?rhel} <= 6 -Requires: ruby(abi) = 1.8 -%else -Requires: ruby(release) -%endif -Requires: ruby(shadow) -Requires: rubygem(json) -Requires: rubygem(pathspec) -Requires: rubygem(rgen) -Requires: rubygem(multi_json) -# Prevents jruby from being pulled in by dependencies (BZ #985208) -Requires: ruby -# Pull in ruby selinux bindings where available -%{!?_without_selinux:Requires: ruby(selinux), libselinux-utils} - -# Fedora 28 updates to facter3 where puppet needs to require the ruby bindings specifically -%if 0%{?fedora} || 0%{?rhel} >= 8 -BuildRequires: ruby-facter >= 3.0 -BuildRequires: ruby-facter < 4 -Requires: ruby-facter >= 3.0 -Requires: ruby-facter < 4 -%else -BuildRequires: facter >= %{?has_epoch:1:}2.0 -BuildRequires: facter < %{?has_epoch:1:}4 -Requires: facter >= %{?has_epoch:1:}2.0 -Requires: facter < %{?has_epoch:1:}4 -%endif -BuildRequires: hiera >= 2.0 -BuildRequires: hiera < %{?has_epoch:1:}4 -Requires: hiera >= 2.0 -Requires: hiera < %{?has_epoch:1:}4 -Obsoletes: hiera-puppet < 1.0.0-2 -Provides: hiera-puppet = %{version}-%{release} - -%{!?_without_augeas:Requires: ruby(augeas)} -Requires: tar -Requires(pre): shadow-utils - -%description headless -This puppet headless subpackage may be used when there is no need to -have puppet agent running as a service, for example, in a container -image. - %prep -%autosetup -S git +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%autosetup +cp -a %{sources} . +for f in puppetlabs-*.tar*; do + tar xvf $f +done +# Puppetlabs messed up with default paths +find -type f -exec \ + sed -i \ + -e 's|/opt/puppetlabs/puppet/bin|%{_bindir}|' \ + -e 's|/opt/puppetlabs/puppet/cache|%{_sharedstatedir}/puppet|' \ + -e 's|/opt/puppetlabs/puppet/share/locale|%{_datadir}/puppetlabs/puppet/locale|' \ + -e 's|/opt/puppetlabs/puppet/modules|%{_datadir}/puppetlabs/puppet/modules|' \ + -e 's|/opt/puppetlabs/puppet/vendor_modules|%{_datadir}/puppetlabs/puppet/vendor_modules|' \ + '{}' + + +%install +ruby install.rb --destdir=%{buildroot} \ + --bindir=%{_bindir} \ + --logdir=%{_localstatedir}/log/puppet \ + --rundir=%{_rundir}/puppet \ + --localedir=%{_datadir}/puppetlabs/puppet/locale \ + --vardir=%{_sharedstatedir}/puppet \ + --configdir=%{_sysconfdir}/puppet \ + --codedir=%{_sysconfdir}/puppet/code \ + --sitelibdir=%{puppet_libdir} + +mkdir -p %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules +for d in $(find -mindepth 1 -maxdepth 1 -type d -name 'puppetlabs-*'); do + modver=${d#*-} + mod=${modver%-*} + cp -a $d %{buildroot}%{_datadir}/puppetlabs/puppet/vendor_modules/$mod +done + +install -Dp -m0644 ext/redhat/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet + +%{__install} -d -m0755 %{buildroot}%{_unitdir} +install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/puppet.service +ln -s %{_unitdir}/puppet.service %{buildroot}%{_unitdir}/puppetagent.service + +install -Dpv -m0755 %{SOURCE13} \ + %{buildroot}%{nm_dispatcher_dir}/dispatcher.d/98-%{name} + +# Install the ext/ directory to %%{_datadir}/puppetlabs/%%{name} +install -d %{buildroot}%{_datadir}/puppetlabs/%{name} +cp -a ext/ %{buildroot}%{_datadir}/puppetlabs/%{name} +chmod 0755 %{buildroot}%{_datadir}/puppetlabs/%{name}/ext/regexp_nodes/regexp_nodes.rb + +# Install wrappers for SELinux +install -Dp -m0755 %{SOURCE14} %{buildroot}%{_bindir}/start-puppet-agent +sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=%{_bindir}/start-puppet-agent|' \ + %{buildroot}%{_unitdir}/puppet.service + +# Setup tmpfiles.d config +mkdir -p %{buildroot}%{_tmpfilesdir} +echo "D %{_rundir}/%{name} 0755 %{name} %{name} -" > \ + %{buildroot}%{_tmpfilesdir}/%{name}.conf + # Unbundle -rm -r lib/puppet/vendor/pathspec # Note(hguemar): remove unrelated OS/distro specific folders # These mess-up with RPM automatic dependencies compute by adding # unnecessary deps like /sbin/runscripts -rm -r ext/{debian,freebsd,gentoo,ips,osx,solaris,suse,windows} -rm ext/redhat/*.init -rm ext/{build_defaults.yaml,project_data.yaml} - - -%build -# Nothing to build - -%install -rm -rf %{buildroot} -ruby install.rb --destdir=%{buildroot} \ - --configdir=%{_sysconfdir}/puppet \ - --bindir=%{_bindir} --vardir=%{_localstatedir}/cache/puppet \ - --logdir=%{_localstatedir}/log/puppet \ - --rundir=%{_localstatedir}/log/puppet \ - --localedir=%{_datadir}/%{name}/locale \ - --quick --no-rdoc --sitelibdir=%{puppet_libdir} - - -install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests -install -d -m0755 %{buildroot}%{_datadir}/%{name}/modules -install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet -install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet -install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet -install -d -m0750 %{buildroot}%{_localstatedir}/cache/puppet - -%if 0%{?_with_systemd} -%{__install} -d -m0755 %{buildroot}%{_unitdir} -install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/puppet.service -ln -s %{_unitdir}/puppet.service %{buildroot}%{_unitdir}/puppetagent.service -install -Dp -m0644 ext/systemd/puppetmaster.service %{buildroot}%{_unitdir}/puppetmaster.service -%else -install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet -install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet -install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster -install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster -install -Dp -m0755 %{confdir}/queue.init %{buildroot}%{_initrddir}/puppetqueue -%endif - -install -Dp -m0644 %{confdir}/auth.conf %{buildroot}%{_sysconfdir}/puppet/auth.conf -install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf -install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf -install -Dp -m0644 ext/redhat/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet - -# Note(hguemar): Conflicts with config file from hiera package -rm %{buildroot}%{_sysconfdir}/puppet/hiera.yaml - -# Install a NetworkManager dispatcher script to pickup changes to -# /etc/resolv.conf and such (https://bugzilla.redhat.com/532085). -%if 0%{?_with_systemd} -install -Dpv -m0755 %{SOURCE3} \ - %{buildroot}%{nm_dispatcher_dir}/dispatcher.d/98-%{name} -%else -install -Dpv -m0755 %{SOURCE2} \ - %{buildroot}%{nm_dispatcher_dir}/dispatcher.d/98-%{name} -%endif - -# Install the ext/ directory to %%{_datadir}/%%{name} -install -d %{buildroot}%{_datadir}/%{name} -cp -a ext/ %{buildroot}%{_datadir}/%{name} - -chmod 0755 %{buildroot}%{_datadir}/%{name}/ext/regexp_nodes/regexp_nodes.rb - -# Install wrappers for SELinux -install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-agent -install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-master -install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-ca -%if 0%{?_with_systemd} -sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=/usr/bin/start-puppet-master|' \ - %{buildroot}%{_unitdir}/puppetmaster.service -sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \ - %{buildroot}%{_unitdir}/puppet.service -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 8 -# Setup tmpfiles.d config -mkdir -p %{buildroot}%{_tmpfilesdir} -echo "D /run/%{name} 0755 %{name} %{name} -" > \ - %{buildroot}%{_tmpfilesdir}/%{name}.conf -%endif - -# Create puppet modules directory for puppet module tool -mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules - +# some other things were removed with the patch +rm -r %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{debian,freebsd,gentoo,ips,osx,solaris,suse,windows} +rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/redhat/*.init +rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{build_defaults.yaml,project_data.yaml} %files -%if 0%{?_with_systemd} +%attr(-, puppet, puppet) %{_localstatedir}/log/puppet +%attr(-, puppet, puppet) %{_datadir}/puppetlabs/puppet +%dir %attr(-, puppet, puppet) %{_datadir}/puppetlabs %{_unitdir}/puppet.service %{_unitdir}/puppetagent.service -%else -%{_initrddir}/puppet -%config(noreplace) %{_sysconfdir}/sysconfig/puppet -%endif -%if 0%{?fedora} || 0%{?rhel} >= 8 %{_tmpfilesdir}/%{name}.conf -%endif -%config(noreplace) %{_sysconfdir}/logrotate.d/puppet %dir %{nm_dispatcher_dir} %dir %{nm_dispatcher_dir}/dispatcher.d %{nm_dispatcher_dir}/dispatcher.d/98-puppet +%{_bindir}/start-puppet-agent -%files headless %doc README.md examples %license LICENSE +%{_datadir}/ruby/vendor_ruby/hiera +%{_datadir}/ruby/vendor_ruby/hiera_puppet.rb +%{_datadir}/ruby/vendor_ruby/puppet +%{_datadir}/ruby/vendor_ruby/puppet_pal.rb +%{_datadir}/ruby/vendor_ruby/puppet.rb +%{_datadir}/ruby/vendor_ruby/puppet_x.rb +%{_sharedstatedir}/puppet %{_bindir}/puppet -%{_bindir}/start-puppet-* -%{puppet_libdir}/* -%dir %{_sysconfdir}/puppet -%dir %{_sysconfdir}/%{name}/modules -%config(noreplace) %{_sysconfdir}/puppet/puppet.conf -%config(noreplace) %{_sysconfdir}/puppet/auth.conf -%{_datadir}/%{name} -# These need to be owned by puppet so the server can -# write to them -%attr(-, puppet, puppet) %{_localstatedir}/run/puppet -%attr(0750, puppet, puppet) %{_localstatedir}/log/puppet -%attr(-, puppet, puppet) %{_localstatedir}/lib/puppet -%attr(0750, puppet, puppet) %{_localstatedir}/cache/puppet -%{_mandir}/man5/puppet.conf.5.gz -%{_mandir}/man8/puppet.8.gz -%{_mandir}/man8/puppet-agent.8.gz -%{_mandir}/man8/puppet-apply.8.gz -%{_mandir}/man8/puppet-catalog.8.gz -%{_mandir}/man8/puppet-describe.8.gz -%{_mandir}/man8/puppet-ca.8.gz -%{_mandir}/man8/puppet-cert.8.gz -%{_mandir}/man8/puppet-certificate.8.gz -%{_mandir}/man8/puppet-certificate_request.8.gz -%{_mandir}/man8/puppet-certificate_revocation_list.8.gz -%{_mandir}/man8/puppet-config.8.gz -%{_mandir}/man8/puppet-device.8.gz -%{_mandir}/man8/puppet-doc.8.gz -%{_mandir}/man8/puppet-facts.8.gz -%{_mandir}/man8/puppet-filebucket.8.gz -%{_mandir}/man8/puppet-generate.8.gz -%{_mandir}/man8/puppet-help.8.gz -%{_mandir}/man8/puppet-epp.8.gz -%{_mandir}/man8/puppet-key.8.gz -%{_mandir}/man8/puppet-lookup.8.gz -%{_mandir}/man8/puppet-man.8.gz -%{_mandir}/man8/puppet-module.8.gz -%{_mandir}/man8/puppet-node.8.gz -%{_mandir}/man8/puppet-parser.8.gz -%{_mandir}/man8/puppet-plugin.8.gz -%{_mandir}/man8/puppet-report.8.gz -%{_mandir}/man8/puppet-resource.8.gz -%{_mandir}/man8/puppet-script.8.gz -%{_mandir}/man8/puppet-status.8.gz +%{_mandir}/man5/puppet.conf.5* +%{_mandir}/man8/puppet-plugin.8* +%{_mandir}/man8/puppet-report.8* +%{_mandir}/man8/puppet-resource.8* +%{_mandir}/man8/puppet-script.8* +%{_mandir}/man8/puppet-ssl.8* +%{_mandir}/man8/puppet-agent.8* +%{_mandir}/man8/puppet.8* +%{_mandir}/man8/puppet-apply.8* +%{_mandir}/man8/puppet-catalog.8* +%{_mandir}/man8/puppet-config.8* +%{_mandir}/man8/puppet-describe.8* +%{_mandir}/man8/puppet-device.8* +%{_mandir}/man8/puppet-doc.8* +%{_mandir}/man8/puppet-epp.8* +%{_mandir}/man8/puppet-facts.8* +%{_mandir}/man8/puppet-filebucket.8* +%{_mandir}/man8/puppet-generate.8* +%{_mandir}/man8/puppet-help.8* +%{_mandir}/man8/puppet-lookup.8* +%{_mandir}/man8/puppet-module.8* +%{_mandir}/man8/puppet-node.8* +%{_mandir}/man8/puppet-parser.8* -%files server -%if 0%{?_with_systemd} -%{_unitdir}/puppetmaster.service -%else -%{_initrddir}/puppetmaster -%{_initrddir}/puppetqueue -%config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster -%endif -%config(noreplace) %{_sysconfdir}/puppet/fileserver.conf -%dir %{_sysconfdir}/puppet/manifests -%{_mandir}/man8/puppet-master.8.gz +%config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppet +%config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppet/code +%config(noreplace) %attr(644, puppet, puppet) %{_sysconfdir}/puppet/puppet.conf +%config(noreplace) %attr(644, puppet, puppet) %{_sysconfdir}/puppet/hiera.yaml +%config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name} -# Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5), -# and 471919 (RHEL-4) -%pre headless +%ghost %attr(755, puppet, puppet) %{_rundir}/%{name} + +%pre getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null getent passwd puppet &>/dev/null || \ -useradd -r -u 52 -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \ - -c "Puppet" puppet &>/dev/null -# ensure that old setups have the right puppet home dir -if [ $1 -gt 1 ]; then - usermod -d %{_localstatedir}/lib/puppet puppet &>/dev/null -fi -exit 0 +useradd -r -u 52 -g puppet -d /usr/local/puppetlabs -s /sbin/nologin \ + -c "Puppet" puppet &>/dev/null %post -%if 0%{?_with_systemd} %systemd_post puppet.service -%else -# If there's a running puppet agent, restart it during upgrade. Fixes -# BZ #1024538. -if [ "$1" -ge 1 ]; then - pid="%{_localstatedir}/run/puppet/agent.pid" - if [ -e "$pid" ]; then - if ps -p "$(< "$pid")" -o cmd= | grep -q "puppet agent"; then - kill "$(< "$pid")" \ - && rm -f "$pid" \ - && /sbin/service puppet start - fi &>/dev/null - fi -fi -/sbin/chkconfig --add puppet -%endif -exit 0 - -%post server -%if 0%{?_with_systemd} -%systemd_post puppetmaster.service -%else -/sbin/chkconfig --add puppetmaster -%endif -exit 0 - -%preun -%if 0%{?_with_systemd} -%systemd_preun puppet.service -%else -if [ "$1" -eq 0 ]; then - /sbin/service puppet stop &>/dev/null - /sbin/chkconfig --del puppet -fi -%endif -exit 0 - -%preun server -%if 0%{?_with_systemd} -%systemd_preun puppetmaster.service -%else -if [ "$1" -eq 0 ]; then - /sbin/service puppetmaster stop &>/dev/null - /sbin/chkconfig --del puppetmaster -fi -%endif -exit 0 %postun -%if 0%{?_with_systemd} %systemd_postun_with_restart puppet.service -%else -if [ "$1" -ge 1 ]; then - /sbin/service puppet condrestart &>/dev/null -fi -%endif -exit 0 - -%postun server -%if 0%{?_with_systemd} -%systemd_postun_with_restart puppetmaster.service -%else -if [ "$1" -ge 1 ]; then - /sbin/service puppetmaster condrestart &>/dev/null -fi -%endif -exit 0 %changelog +* Tue Jun 15 2021 Breno Brand Fernandes - 7.7.0-1 +- Update to 7.7.0 -- the version that supports ruby 3 + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 5.5.20-4 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/sources b/sources index 04dfbd2..08a1fc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,12 @@ -SHA512 (puppet-5.5.20.tar.gz) = 83b8f234697e13d6fd8ac16634fff4e4adfece70858c32c1001925c71cc4d9a482da1880c27c08e796facb46d5d17889f9521121a69cb49e160e3c031ad564c4 -SHA512 (puppet-5.5.20.tar.gz.asc) = d862eaf430cbb86112b67a8e0b3da228d3dd2d2dc4d16cd6272c4f1d737e9c8674418e56fd96a47a6be55f699a803e0e889256ad3d2cff66f6eff397c7e719cc +SHA512 (gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg) = 57dca499c8cf46ce19c07902b67f2b0f92813e5372057e468cc9dbe032cbe3dfd481b0f749cf5a696d86936977e5bafcc72c8662976e6dcee5e10860e7d9148c +SHA512 (puppet-7.7.0.tar.gz) = 2cd1bf799bfe5a3d5d3458db84021a29d119651faae111b8c3bfd374c2c1b008610f2c15d4b434dbd13caa91aea073503d40071d85e86687fa330e997b80f220 +SHA512 (puppetlabs-augeas_core-1.1.1.tar.gz) = 19e312da6b1accb74b772cb2d0a19dfa29d93cf03173bbf3c58e1def46ed352dd7c0618e0420b28a09607412ba87144ef3f2afc1cdedbe93f227b39bc4e290ac +SHA512 (puppetlabs-cron_core-1.0.4.tar.gz) = bdeab644f8f6084dcb8331edb207f5634672e512bf3573d85bb5eadcb979f83da7fb5ccbec150383d903bced3d0f05a7c20d4394abc2c479e194cff6646cb0ee +SHA512 (puppetlabs-host_core-1.0.3.tar.gz) = 09b4084663f4f6886380a473d26d1b759026f345bd3850084ac4f3ef59ed8ab2396fecdb3c836591d9097b9c5252ba794c4b7d3296b8321ff401f8a956ad093c +SHA512 (puppetlabs-mount_core-1.0.4.tar.gz) = 07aaae0c1176ffe098647094f2c7d9ea975288b52965af9dcc2aab043d65c20424bd6698988af540e4b1eb1852eaf3ceec9c71a6e08642f103370f5679d9206f +SHA512 (puppetlabs-scheduled_task-2.2.1.tar.gz) = a7d0860e28971167c3560a997e18d8ca7a528aa5ce9331645ff67eb021d5262964d7f735cf657227b8b680a930a79b50afc07324272b760866663f593851289a +SHA512 (puppetlabs-selinux_core-1.0.4.tar.gz) = 600bef04791bd5bb9a46a5397af6e5ed5937b0e271cb312ef64db6bb93c85acf5c6df6ab53a7999ce7609a7b7ea8c299f37cb6d44dfa2c48b3456ca893be6876 +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.1.0.tar.gz) = cda1fcc55a54b4690c81edadf6c62e849db80b5f09a5310cdd9b82d0cef374432c2c62b98e5c8e8cc2bbb8d22007ddb3694b88208658ff303fdd608a76c15e0b +SHA512 (puppetlabs-zone_core-1.0.3.tar.gz) = 1083bcc810e8a7b048fad1c70656d806c65b5fa912c627bf1dfaf3b9d8a0ec675db100abc2fc6499669c17927ea3e55a5c968fde0e577fc1f4cebb1fbd5e0851 From d4979b9a4d09b83af9d5c3982180bc027f9a6718 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Thu, 1 Jul 2021 10:13:28 -0400 Subject: [PATCH 090/136] Changed back paths due to conflicts with other packages --- puppet.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/puppet.spec b/puppet.spec index 9a0ba0a..aaba4a1 100644 --- a/puppet.spec +++ b/puppet.spec @@ -78,12 +78,10 @@ find -type f -exec \ %install ruby install.rb --destdir=%{buildroot} \ --bindir=%{_bindir} \ - --logdir=%{_localstatedir}/log/puppet \ + --logdir=%{_localstatedir}/log/puppetlabs/puppet \ --rundir=%{_rundir}/puppet \ --localedir=%{_datadir}/puppetlabs/puppet/locale \ --vardir=%{_sharedstatedir}/puppet \ - --configdir=%{_sysconfdir}/puppet \ - --codedir=%{_sysconfdir}/puppet/code \ --sitelibdir=%{puppet_libdir} mkdir -p %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules @@ -127,7 +125,7 @@ rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/redhat/*.init rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{build_defaults.yaml,project_data.yaml} %files -%attr(-, puppet, puppet) %{_localstatedir}/log/puppet +%attr(-, puppet, puppet) %{_localstatedir}/log/puppetlabs %attr(-, puppet, puppet) %{_datadir}/puppetlabs/puppet %dir %attr(-, puppet, puppet) %{_datadir}/puppetlabs %{_unitdir}/puppet.service @@ -172,10 +170,12 @@ rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{build_defaults.yaml,project_da %{_mandir}/man8/puppet-node.8* %{_mandir}/man8/puppet-parser.8* -%config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppet -%config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppet/code -%config(noreplace) %attr(644, puppet, puppet) %{_sysconfdir}/puppet/puppet.conf -%config(noreplace) %attr(644, puppet, puppet) %{_sysconfdir}/puppet/hiera.yaml +# Due to the long time without building puppet with a new version, sysconfig and log paths have changed +%config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppetlabs +%config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppetlabs/puppet +%config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppetlabs/code +%config(noreplace) %attr(644, puppet, puppet) %{_sysconfdir}/puppetlabs/puppet/puppet.conf +%config(noreplace) %attr(644, puppet, puppet) %{_sysconfdir}/puppetlabs/puppet/hiera.yaml %config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name} %ghost %attr(755, puppet, puppet) %{_rundir}/%{name} @@ -194,7 +194,7 @@ useradd -r -u 52 -g puppet -d /usr/local/puppetlabs -s /sbin/nologin \ %changelog * Tue Jun 15 2021 Breno Brand Fernandes - 7.7.0-1 -- Update to 7.7.0 -- the version that supports ruby 3 +- Update to 7.7.0 - latest version that supports ruby 3.0 * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 5.5.20-4 - Rebuilt for updated systemd-rpm-macros From cfea9bd83e92ae1cfb6f2b0391c9b86692d9591d Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Thu, 1 Jul 2021 10:31:50 -0400 Subject: [PATCH 091/136] Removed old gpg --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 08a1fc9..5f7787d 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg) = 57dca499c8cf46ce19c07902b67f2b0f92813e5372057e468cc9dbe032cbe3dfd481b0f749cf5a696d86936977e5bafcc72c8662976e6dcee5e10860e7d9148c SHA512 (puppet-7.7.0.tar.gz) = 2cd1bf799bfe5a3d5d3458db84021a29d119651faae111b8c3bfd374c2c1b008610f2c15d4b434dbd13caa91aea073503d40071d85e86687fa330e997b80f220 SHA512 (puppetlabs-augeas_core-1.1.1.tar.gz) = 19e312da6b1accb74b772cb2d0a19dfa29d93cf03173bbf3c58e1def46ed352dd7c0618e0420b28a09607412ba87144ef3f2afc1cdedbe93f227b39bc4e290ac SHA512 (puppetlabs-cron_core-1.0.4.tar.gz) = bdeab644f8f6084dcb8331edb207f5634672e512bf3573d85bb5eadcb979f83da7fb5ccbec150383d903bced3d0f05a7c20d4394abc2c479e194cff6646cb0ee From 42eb2eff11233d0492b3ecaa175476648b2a142e Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Thu, 1 Jul 2021 10:38:47 -0400 Subject: [PATCH 092/136] Updated sources with missing file --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 5f7787d..2d7a6b9 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ +SHA512 (puppet-7.7.0.tar.gz.asc) = 918b37590aa7812a0e36dde94d364a22fa5628d96a3b5e77fdd3292836e6fd4a5e70db392dc4627e430dcc96b5772849100146cb9ddb9f9ed7bec9aa3b3a51be SHA512 (puppet-7.7.0.tar.gz) = 2cd1bf799bfe5a3d5d3458db84021a29d119651faae111b8c3bfd374c2c1b008610f2c15d4b434dbd13caa91aea073503d40071d85e86687fa330e997b80f220 SHA512 (puppetlabs-augeas_core-1.1.1.tar.gz) = 19e312da6b1accb74b772cb2d0a19dfa29d93cf03173bbf3c58e1def46ed352dd7c0618e0420b28a09607412ba87144ef3f2afc1cdedbe93f227b39bc4e290ac SHA512 (puppetlabs-cron_core-1.0.4.tar.gz) = bdeab644f8f6084dcb8331edb207f5634672e512bf3573d85bb5eadcb979f83da7fb5ccbec150383d903bced3d0f05a7c20d4394abc2c479e194cff6646cb0ee From f61ad049151050559f2870eb5ed71589fef2b0ce Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Sun, 4 Jul 2021 10:41:18 -0400 Subject: [PATCH 093/136] Changed ownership of files in /etc/puppetlabs --- puppet.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/puppet.spec b/puppet.spec index aaba4a1..e2c52f4 100644 --- a/puppet.spec +++ b/puppet.spec @@ -171,11 +171,11 @@ rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{build_defaults.yaml,project_da %{_mandir}/man8/puppet-parser.8* # Due to the long time without building puppet with a new version, sysconfig and log paths have changed -%config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppetlabs -%config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppetlabs/puppet -%config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppetlabs/code -%config(noreplace) %attr(644, puppet, puppet) %{_sysconfdir}/puppetlabs/puppet/puppet.conf -%config(noreplace) %attr(644, puppet, puppet) %{_sysconfdir}/puppetlabs/puppet/hiera.yaml +%config(noreplace) %attr(-, root, root) %dir %{_sysconfdir}/puppetlabs +%config(noreplace) %attr(-, root, root) %dir %{_sysconfdir}/puppetlabs/puppet +%config(noreplace) %attr(-, root, root) %dir %{_sysconfdir}/puppetlabs/code +%config(noreplace) %attr(644, root, root) %{_sysconfdir}/puppetlabs/puppet/puppet.conf +%config(noreplace) %attr(644, root, root) %{_sysconfdir}/puppetlabs/puppet/hiera.yaml %config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name} %ghost %attr(755, puppet, puppet) %{_rundir}/%{name} From 2ab5939cfe8126773d6cd6159e0de1e3625ac4e4 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Mon, 5 Jul 2021 19:36:17 -0400 Subject: [PATCH 094/136] Cleaning up the spec file, adding suggestions from ekohl (Ewoud Kohl van Wijngaarden) --- puppet.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/puppet.spec b/puppet.spec index e2c52f4..2383930 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,7 +3,7 @@ Name: puppet Version: 7.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 URL: https://puppetlabs.com @@ -95,7 +95,6 @@ install -Dp -m0644 ext/redhat/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/p %{__install} -d -m0755 %{buildroot}%{_unitdir} install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/puppet.service -ln -s %{_unitdir}/puppet.service %{buildroot}%{_unitdir}/puppetagent.service install -Dpv -m0755 %{SOURCE13} \ %{buildroot}%{nm_dispatcher_dir}/dispatcher.d/98-%{name} @@ -129,7 +128,6 @@ rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{build_defaults.yaml,project_da %attr(-, puppet, puppet) %{_datadir}/puppetlabs/puppet %dir %attr(-, puppet, puppet) %{_datadir}/puppetlabs %{_unitdir}/puppet.service -%{_unitdir}/puppetagent.service %{_tmpfilesdir}/%{name}.conf %dir %{nm_dispatcher_dir} %dir %{nm_dispatcher_dir}/dispatcher.d @@ -183,7 +181,7 @@ rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{build_defaults.yaml,project_da %pre getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null getent passwd puppet &>/dev/null || \ -useradd -r -u 52 -g puppet -d /usr/local/puppetlabs -s /sbin/nologin \ +useradd -r -u 52 -g puppet -s /sbin/nologin \ -c "Puppet" puppet &>/dev/null %post @@ -193,6 +191,9 @@ useradd -r -u 52 -g puppet -d /usr/local/puppetlabs -s /sbin/nologin \ %systemd_postun_with_restart puppet.service %changelog +* Mon Jul 05 2021 Breno Brand Fernandes - 7.7.0-2 +- Cleaning up the spec file, adding suggestions from ekohl (Ewoud Kohl van Wijngaarden) + * Tue Jun 15 2021 Breno Brand Fernandes - 7.7.0-1 - Update to 7.7.0 - latest version that supports ruby 3.0 From 8535a17a669784710103dd3938d17656c16e48a6 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Wed, 7 Jul 2021 17:23:50 -0400 Subject: [PATCH 095/136] Updated puppet url --- puppet.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/puppet.spec b/puppet.spec index 2383930..a732e59 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,10 +3,10 @@ Name: puppet Version: 7.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 -URL: https://puppetlabs.com +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 Source2: RPM-GPG-KEY-puppet-20250406 @@ -191,6 +191,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart puppet.service %changelog +* Wed Jul 07 2021 Breno Brand Fernandes - 7.7.0-2 +- Updated puppet url + * Mon Jul 05 2021 Breno Brand Fernandes - 7.7.0-2 - Cleaning up the spec file, adding suggestions from ekohl (Ewoud Kohl van Wijngaarden) From f9f2ad1c13214d5257b51203ad9a5ec570f7fbbc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 04:16:15 +0000 Subject: [PATCH 096/136] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 a732e59..b1680e7 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,7 +3,7 @@ Name: puppet Version: 7.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 URL: https://puppet.com @@ -191,6 +191,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart puppet.service %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 7.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jul 07 2021 Breno Brand Fernandes - 7.7.0-2 - Updated puppet url From 6ac02046f59790d25b02268531c27105b31e1084 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 17 Aug 2021 12:42:24 +0200 Subject: [PATCH 097/136] Ignore mockbuild's results_puppet directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b490e46..2eb5ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.tar.gz.asc /puppet-*/ /.build*.log +results_puppet/ From f132964acb93c0d1198d492303aa9162522e1386 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 17 Aug 2021 12:12:19 +0200 Subject: [PATCH 098/136] Remove unused file In 4ecda1c3d8af205f2693b88f1c2e4ee9542fcb99 this was removed from the spec file but the file remained in the repository. Fixes: 4ecda1c3d8af205f2693b88f1c2e4ee9542fcb99 --- puppet-nm-dispatcher | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 puppet-nm-dispatcher diff --git a/puppet-nm-dispatcher b/puppet-nm-dispatcher deleted file mode 100644 index 6e9e0b3..0000000 --- a/puppet-nm-dispatcher +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# -# Restart puppet on network changes to pickup changes to /etc/resolv.conf -# -# https://projects.puppetlabs.com/issues/2776 -# https://bugzilla.redhat.com/532085 - -[[ $2 =~ ^(up|down)$ ]] && /sbin/service puppet condrestart || : From a9a7dc1d70a8c08df8fe11871ab88c342a2eb286 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 17 Aug 2021 12:37:49 +0200 Subject: [PATCH 099/136] Update to 7.9.0 - Update bundled modules (and sort them) - Update gem dependencies - Revert paths to FHS standards --- puppet.spec | 123 ++++++++++++++++++++++++++++++---------------------- sources | 14 +++--- 2 files changed, 79 insertions(+), 58 deletions(-) diff --git a/puppet.spec b/puppet.spec index b1680e7..7cc8103 100644 --- a/puppet.spec +++ b/puppet.spec @@ -1,24 +1,27 @@ %global nm_dispatcher_dir %{_prefix}/lib/NetworkManager %global puppet_libdir %{ruby_vendorlibdir} +%global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 7.7.0 -Release: 4%{?dist} +Version: 7.9.0 +Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: ASL 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 Source2: RPM-GPG-KEY-puppet-20250406 -Source3: https://forge.puppet.com/v3/files/puppetlabs-mount_core-1.0.4.tar.gz -Source4: https://forge.puppet.com/v3/files/puppetlabs-host_core-1.0.3.tar.gz -Source5: https://forge.puppet.com/v3/files/puppetlabs-augeas_core-1.1.1.tar.gz -Source6: https://forge.puppet.com/v3/files/puppetlabs-cron_core-1.0.4.tar.gz -Source7: https://forge.puppet.com/v3/files/puppetlabs-scheduled_task-2.2.1.tar.gz -Source8: https://forge.puppet.com/v3/files/puppetlabs-selinux_core-1.0.4.tar.gz +# 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.1.0.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 Source13: puppet-nm-dispatcher.systemd Source14: start-puppet-wrapper @@ -35,18 +38,16 @@ BuildRequires: systemd BuildRequires: gnupg2 Requires: hiera >= 3.3.1 Requires: facter >= 3.9.6 -Requires: ruby-facter >= 3.9.6 -Requires: rubygem-semantic_puppet >= 1.0.2 -Requires: rubygem-puppet-resource_api -Requires: rubygem-deep_merge -Requires: rubygem-httpclient -Requires: rubygem-multi_json -Requires: rubygem-json +Requires: rubygem(concurrent-ruby) >= 1.0.5 +Requires: rubygem(deep_merge) >= 1.0 +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: ruby-augeas >= 0.5.0 Requires: augeas >= 1.10.1 Requires: augeas-libs >= 1.10.1 Requires: cpp-hocon >= 0.2.1 -Requires: rubygem-concurrent-ruby >= 1.0.5 Requires: ruby(selinux) libselinux-utils Obsoletes: puppet-headless < 6.0.0 Obsoletes: puppet-server < 6.0.0 @@ -68,46 +69,58 @@ done # Puppetlabs messed up with default paths find -type f -exec \ sed -i \ + -e 's|/etc/puppetlabs/puppet|%{_sysconfdir}/%{name}|' \ + -e 's|/etc/puppetlabs/code|%{_sysconfdir}/%{name}/code|' \ -e 's|/opt/puppetlabs/puppet/bin|%{_bindir}|' \ - -e 's|/opt/puppetlabs/puppet/cache|%{_sharedstatedir}/puppet|' \ - -e 's|/opt/puppetlabs/puppet/share/locale|%{_datadir}/puppetlabs/puppet/locale|' \ - -e 's|/opt/puppetlabs/puppet/modules|%{_datadir}/puppetlabs/puppet/modules|' \ - -e 's|/opt/puppetlabs/puppet/vendor_modules|%{_datadir}/puppetlabs/puppet/vendor_modules|' \ + -e 's|/opt/puppetlabs/puppet/cache|%{_sharedstatedir}/%{name}|' \ + -e 's|/opt/puppetlabs/puppet/public|%{_sharedstatedir}/%{name}/public|' \ + -e 's|/opt/puppetlabs/puppet/share/locale|%{_datadir}/%{name}/locale|' \ + -e 's|/opt/puppetlabs/puppet/modules|%{_datadir}/%{name}/modules|' \ + -e 's|/opt/puppetlabs/puppet/vendor_modules|%{_datadir}/%{name}/vendor_modules|' \ + -e 's|/var/log/puppetlabs/puppet|%{_localstatedir}/log/%{name}|' \ '{}' + %install ruby install.rb --destdir=%{buildroot} \ --bindir=%{_bindir} \ - --logdir=%{_localstatedir}/log/puppetlabs/puppet \ - --rundir=%{_rundir}/puppet \ - --localedir=%{_datadir}/puppetlabs/puppet/locale \ - --vardir=%{_sharedstatedir}/puppet \ + --configdir=%{_sysconfdir}/%{name} \ + --codedir=%{_sysconfdir}/%{name}/code \ + --logdir=%{_localstatedir}/log/%{name} \ + --rundir=%{_rundir}/%{name} \ + --localedir=%{_datadir}/%{name}/locale \ + --vardir=%{_sharedstatedir}/%{name} \ + --publicdir=%{_sharedstatedir}/%{name}/public \ --sitelibdir=%{puppet_libdir} -mkdir -p %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules +mkdir -p %{buildroot}%{_datadir}/%{name}/vendor_modules for d in $(find -mindepth 1 -maxdepth 1 -type d -name 'puppetlabs-*'); do modver=${d#*-} mod=${modver%-*} - cp -a $d %{buildroot}%{_datadir}/puppetlabs/puppet/vendor_modules/$mod + cp -a $d %{buildroot}%{_datadir}/%{name}/vendor_modules/$mod done -install -Dp -m0644 ext/redhat/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet +install -Dp -m0644 ext/redhat/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %{__install} -d -m0755 %{buildroot}%{_unitdir} -install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/puppet.service +install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/%{name}.service +# Note(hguemar): Conflicts with config file from hiera package +rm %{buildroot}%{_sysconfdir}/%{name}/hiera.yaml + +# Install a NetworkManager dispatcher script to pickup changes to +# /etc/resolv.conf and such (https://bugzilla.redhat.com/532085). install -Dpv -m0755 %{SOURCE13} \ %{buildroot}%{nm_dispatcher_dir}/dispatcher.d/98-%{name} -# Install the ext/ directory to %%{_datadir}/puppetlabs/%%{name} -install -d %{buildroot}%{_datadir}/puppetlabs/%{name} -cp -a ext/ %{buildroot}%{_datadir}/puppetlabs/%{name} -chmod 0755 %{buildroot}%{_datadir}/puppetlabs/%{name}/ext/regexp_nodes/regexp_nodes.rb +# Install the ext/ directory to %%{_datadir}/%%{name} +install -d %{buildroot}%{_datadir}/%{name} +cp -a ext/ %{buildroot}%{_datadir}/%{name} +chmod 0755 %{buildroot}%{_datadir}/%{name}/ext/regexp_nodes/regexp_nodes.rb # Install wrappers for SELinux install -Dp -m0755 %{SOURCE14} %{buildroot}%{_bindir}/start-puppet-agent sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=%{_bindir}/start-puppet-agent|' \ - %{buildroot}%{_unitdir}/puppet.service + %{buildroot}%{_unitdir}/%{name}.service # Setup tmpfiles.d config mkdir -p %{buildroot}%{_tmpfilesdir} @@ -119,20 +132,25 @@ echo "D %{_rundir}/%{name} 0755 %{name} %{name} -" > \ # These mess-up with RPM automatic dependencies compute by adding # unnecessary deps like /sbin/runscripts # some other things were removed with the patch -rm -r %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{debian,freebsd,gentoo,ips,osx,solaris,suse,windows} -rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/redhat/*.init -rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{build_defaults.yaml,project_data.yaml} +rm -r %{buildroot}%{_datadir}/%{name}/ext/{debian,freebsd,gentoo,ips,osx,solaris,suse,windows,systemd,redhat} +rm %{buildroot}%{_datadir}/%{name}/ext/{build_defaults.yaml,project_data.yaml} %files -%attr(-, puppet, puppet) %{_localstatedir}/log/puppetlabs -%attr(-, puppet, puppet) %{_datadir}/puppetlabs/puppet -%dir %attr(-, puppet, puppet) %{_datadir}/puppetlabs -%{_unitdir}/puppet.service +%attr(-, puppet, puppet) %{_localstatedir}/log/%{name} +%attr(-, root, root) %{_datadir}/%{name} +%{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf %dir %{nm_dispatcher_dir} %dir %{nm_dispatcher_dir}/dispatcher.d %{nm_dispatcher_dir}/dispatcher.d/98-puppet -%{_bindir}/start-puppet-agent + +# Vendor modules +%doc %{_datadir}/%{name}/vendor_modules/*/*.md +%doc %{_datadir}/%{name}/vendor_modules/*/readmes +%license %{_datadir}/%{name}/vendor_modules/*/LICENSE +# Strip development files +%exclude %{_datadir}/%{name}/vendor_modules/*/.{github,puppet-lint.rc,sync.yml} +%exclude %{_datadir}/%{name}/vendor_modules/*/{CODEOWNERS,Gemfile,appveyor.yml,spec} %doc README.md examples %license LICENSE @@ -142,8 +160,10 @@ rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{build_defaults.yaml,project_da %{_datadir}/ruby/vendor_ruby/puppet_pal.rb %{_datadir}/ruby/vendor_ruby/puppet.rb %{_datadir}/ruby/vendor_ruby/puppet_x.rb -%{_sharedstatedir}/puppet +%dir %{_sharedstatedir}/%{name} +%dir %{_sharedstatedir}/%{name}/public %{_bindir}/puppet +%{_bindir}/start-puppet-agent %{_mandir}/man5/puppet.conf.5* %{_mandir}/man8/puppet-plugin.8* %{_mandir}/man8/puppet-report.8* @@ -168,12 +188,9 @@ rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{build_defaults.yaml,project_da %{_mandir}/man8/puppet-node.8* %{_mandir}/man8/puppet-parser.8* -# Due to the long time without building puppet with a new version, sysconfig and log paths have changed -%config(noreplace) %attr(-, root, root) %dir %{_sysconfdir}/puppetlabs -%config(noreplace) %attr(-, root, root) %dir %{_sysconfdir}/puppetlabs/puppet -%config(noreplace) %attr(-, root, root) %dir %{_sysconfdir}/puppetlabs/code -%config(noreplace) %attr(644, root, root) %{_sysconfdir}/puppetlabs/puppet/puppet.conf -%config(noreplace) %attr(644, root, root) %{_sysconfdir}/puppetlabs/puppet/hiera.yaml +%config(noreplace) %attr(-, root, root) %dir %{_sysconfdir}/%{name} +%config(noreplace) %attr(-, root, root) %dir %{_sysconfdir}/%{name}/code +%config(noreplace) %attr(644, root, root) %{_sysconfdir}/%{name}/puppet.conf %config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name} %ghost %attr(755, puppet, puppet) %{_rundir}/%{name} @@ -185,12 +202,16 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ -c "Puppet" puppet &>/dev/null %post -%systemd_post puppet.service +%systemd_post %{name}.service %postun -%systemd_postun_with_restart puppet.service +%systemd_postun_with_restart %{name}.service %changelog +* Tue Aug 17 2021 Ewoud Kohl van Wijngaarden - 7.9.0-1 +- Update to 7.9.0 +- Revert paths to FHS standards + * Fri Jul 23 2021 Fedora Release Engineering - 7.7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 2d7a6b9..becb176 100644 --- a/sources +++ b/sources @@ -1,12 +1,12 @@ -SHA512 (puppet-7.7.0.tar.gz.asc) = 918b37590aa7812a0e36dde94d364a22fa5628d96a3b5e77fdd3292836e6fd4a5e70db392dc4627e430dcc96b5772849100146cb9ddb9f9ed7bec9aa3b3a51be -SHA512 (puppet-7.7.0.tar.gz) = 2cd1bf799bfe5a3d5d3458db84021a29d119651faae111b8c3bfd374c2c1b008610f2c15d4b434dbd13caa91aea073503d40071d85e86687fa330e997b80f220 -SHA512 (puppetlabs-augeas_core-1.1.1.tar.gz) = 19e312da6b1accb74b772cb2d0a19dfa29d93cf03173bbf3c58e1def46ed352dd7c0618e0420b28a09607412ba87144ef3f2afc1cdedbe93f227b39bc4e290ac -SHA512 (puppetlabs-cron_core-1.0.4.tar.gz) = bdeab644f8f6084dcb8331edb207f5634672e512bf3573d85bb5eadcb979f83da7fb5ccbec150383d903bced3d0f05a7c20d4394abc2c479e194cff6646cb0ee +SHA512 (puppet-7.9.0.tar.gz) = 6329d89530d2cb008e28116de655024e9bf944b3f41d086e0e47c41c74af3da51c283a912ac966cf7bac52f86e54304df6cf31477a5663cae09fb4d18f958cf2 +SHA512 (puppet-7.9.0.tar.gz.asc) = 22b9f826ba310ae1dc60f525d36f06f2fb7e2392ae3f04a082b6c600877111d9b2faedc02a1e00dce6ad2711359a2035f24413148253059f607ce6ccd8c267ba +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-2.2.1.tar.gz) = a7d0860e28971167c3560a997e18d8ca7a528aa5ce9331645ff67eb021d5262964d7f735cf657227b8b680a930a79b50afc07324272b760866663f593851289a -SHA512 (puppetlabs-selinux_core-1.0.4.tar.gz) = 600bef04791bd5bb9a46a5397af6e5ed5937b0e271cb312ef64db6bb93c85acf5c6df6ab53a7999ce7609a7b7ea8c299f37cb6d44dfa2c48b3456ca893be6876 +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.1.0.tar.gz) = cda1fcc55a54b4690c81edadf6c62e849db80b5f09a5310cdd9b82d0cef374432c2c62b98e5c8e8cc2bbb8d22007ddb3694b88208658ff303fdd608a76c15e0b +SHA512 (puppetlabs-zfs_core-1.2.0.tar.gz) = 5cf44b314094a6dad45482776b1442ab941cd1f93b39141e452c8c03b441a90ab7e6077f22f6fee9796ec2af41c30a8601e9cec6ccce81c2cb2dcc4ecba7117f SHA512 (puppetlabs-zone_core-1.0.3.tar.gz) = 1083bcc810e8a7b048fad1c70656d806c65b5fa912c627bf1dfaf3b9d8a0ec675db100abc2fc6499669c17927ea3e55a5c968fde0e577fc1f4cebb1fbd5e0851 From 4f3b23ce3b7cff5b4adb9f92194ba54f8164b204 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Thu, 18 Nov 2021 20:32:28 -0500 Subject: [PATCH 100/136] Update to 7.12.1 --- logrotate | 21 +++++++++++++++++++++ puppet.spec | 11 +++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 logrotate diff --git a/logrotate b/logrotate new file mode 100644 index 0000000..dcb57a2 --- /dev/null +++ b/logrotate @@ -0,0 +1,21 @@ +# Generic logrotate config for Red Hat systems. Works with both official +# Fedora and RHEL packages as well as PuppetLabs distributions. + +/var/log/puppetlabs/masterhttp.log /var/log/puppet/masterhttp.log { + compress + missingok + notifempty + nocreate +} + +/var/log/puppetlabs/puppetd.log /var/log/puppet/puppetd.log { + compress + missingok + notifempty + nocreate + sharedscripts + postrotate + ([ -x /etc/init.d/puppet ] && /etc/init.d/puppet rotate > /dev/null 2>&1) || + ([ -x /usr/bin/systemctl ] && /usr/bin/systemctl kill -s USR2 puppet.service > /dev/null 2>&1) || true + endscript +} diff --git a/puppet.spec b/puppet.spec index 7cc8103..ebb75da 100644 --- a/puppet.spec +++ b/puppet.spec @@ -3,7 +3,7 @@ %global puppet_vendor_mod_dir %{_datadir}/%{name}/vendor_modules Name: puppet -Version: 7.9.0 +Version: 7.12.1 Release: 1%{?dist} Summary: Network tool for managing many disparate systems License: ASL 2.0 @@ -25,6 +25,7 @@ Source11: https://forge.puppet.com/v3/files/puppetlabs-zfs_core-1.2.0.tar. Source12: https://forge.puppet.com/v3/files/puppetlabs-zone_core-1.0.3.tar.gz Source13: puppet-nm-dispatcher.systemd Source14: start-puppet-wrapper +Source15: logrotate BuildArch: noarch @@ -99,7 +100,7 @@ for d in $(find -mindepth 1 -maxdepth 1 -type d -name 'puppetlabs-*'); do cp -a $d %{buildroot}%{_datadir}/%{name}/vendor_modules/$mod done -install -Dp -m0644 ext/redhat/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -Dp -m0644 %{SOURCE15} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %{__install} -d -m0755 %{buildroot}%{_unitdir} install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/%{name}.service @@ -115,7 +116,6 @@ install -Dpv -m0755 %{SOURCE13} \ # Install the ext/ directory to %%{_datadir}/%%{name} install -d %{buildroot}%{_datadir}/%{name} cp -a ext/ %{buildroot}%{_datadir}/%{name} -chmod 0755 %{buildroot}%{_datadir}/%{name}/ext/regexp_nodes/regexp_nodes.rb # Install wrappers for SELinux install -Dp -m0755 %{SOURCE14} %{buildroot}%{_bindir}/start-puppet-agent @@ -132,7 +132,7 @@ echo "D %{_rundir}/%{name} 0755 %{name} %{name} -" > \ # These mess-up with RPM automatic dependencies compute by adding # unnecessary deps like /sbin/runscripts # some other things were removed with the patch -rm -r %{buildroot}%{_datadir}/%{name}/ext/{debian,freebsd,gentoo,ips,osx,solaris,suse,windows,systemd,redhat} +rm -r %{buildroot}%{_datadir}/%{name}/ext/{debian,osx,solaris,suse,windows,systemd,redhat} rm %{buildroot}%{_datadir}/%{name}/ext/{build_defaults.yaml,project_data.yaml} %files @@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \ %systemd_postun_with_restart %{name}.service %changelog +* Thu Nov 18 2021 Breno Brand Fernandes - 7.12.1-1 +- Update to 7.12.1 + * Tue Aug 17 2021 Ewoud Kohl van Wijngaarden - 7.9.0-1 - Update to 7.9.0 - Revert paths to FHS standards From d3d27b1e3f99f1e3ce8f81c2128c3335b948de13 Mon Sep 17 00:00:00 2001 From: Breno Brand Fernandes Date: Thu, 18 Nov 2021 20:32:45 -0500 Subject: [PATCH 101/136] Updating sources --- puppet-7.12.1.tar.gz.asc | 17 +++++++++++++++++ sources | 3 +-- 2 files changed, 18 insertions(+), 2 deletions(-) create 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 new file mode 100644 index 0000000..69058f3 --- /dev/null +++ b/puppet-7.12.1.tar.gz.asc @@ -0,0 +1,17 @@ +-----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/sources b/sources index becb176..e5cc9db 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ -SHA512 (puppet-7.9.0.tar.gz) = 6329d89530d2cb008e28116de655024e9bf944b3f41d086e0e47c41c74af3da51c283a912ac966cf7bac52f86e54304df6cf31477a5663cae09fb4d18f958cf2 -SHA512 (puppet-7.9.0.tar.gz.asc) = 22b9f826ba310ae1dc60f525d36f06f2fb7e2392ae3f04a082b6c600877111d9b2faedc02a1e00dce6ad2711359a2035f24413148253059f607ce6ccd8c267ba +SHA512 (puppet-7.12.1.tar.gz) = 908685f206126b49c9bc7d70c2c6273dce025040e6fdcfac1828a13c2aa570d383772a717aea2feac2383489003a31f321a2efe3cfe612cd321d2c1696d036ac 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 bc15811b40c36f897100b2fec621638ce594b32b Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sat, 27 Nov 2021 17:31:23 +0100 Subject: [PATCH 102/136] 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 103/136] - 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 104/136] 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 105/136] 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 ddb918e204d05f3311fdb1f43c4e862a41cb69d9 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Sun, 12 Jun 2022 16:36:41 +0200 Subject: [PATCH 106/136] EOL version with known security problems and hard to update https://lists.fedoraproject.org/archives/list/epel-announce@lists.fedoraproject.org/message/EVEPQ5SDTMAJSPSNTLRTOJEU3R7G4UG4/ --- .gitignore | 8 - dead.package | 3 + puppet-nm-dispatcher | 8 - puppet-nm-dispatcher.systemd | 8 - puppet.spec | 797 ----------------------------------- sources | 3 - yum_proxy_none_.patch | 50 --- 7 files changed, 3 insertions(+), 874 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100755 puppet-nm-dispatcher delete mode 100755 puppet-nm-dispatcher.systemd delete mode 100644 puppet.spec delete mode 100644 sources delete mode 100644 yum_proxy_none_.patch diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1fbbdfa..0000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*~ -*.rpm -*.tar.gz -*.tar.gz.asc -/puppet-*/ -/.build*.log -/start-puppet-wrapper -/23115-convert-nil-to-undef.patch diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3f180e4 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +EOL version with known security problems and hard to update + +https://lists.fedoraproject.org/archives/list/epel-announce@lists.fedoraproject.org/message/EVEPQ5SDTMAJSPSNTLRTOJEU3R7G4UG4/ diff --git a/puppet-nm-dispatcher b/puppet-nm-dispatcher deleted file mode 100755 index 6e9e0b3..0000000 --- a/puppet-nm-dispatcher +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# -# Restart puppet on network changes to pickup changes to /etc/resolv.conf -# -# https://projects.puppetlabs.com/issues/2776 -# https://bugzilla.redhat.com/532085 - -[[ $2 =~ ^(up|down)$ ]] && /sbin/service puppet condrestart || : diff --git a/puppet-nm-dispatcher.systemd b/puppet-nm-dispatcher.systemd deleted file mode 100755 index 3e5eeee..0000000 --- a/puppet-nm-dispatcher.systemd +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# -# Restart puppet on network changes to pickup changes to /etc/resolv.conf -# -# https://projects.puppetlabs.com/issues/2776 -# https://bugzilla.redhat.com/532085 - -[[ $2 =~ ^(up|down)$ ]] && /bin/systemctl condrestart puppetagent.service || : diff --git a/puppet.spec b/puppet.spec deleted file mode 100644 index 177bc12..0000000 --- a/puppet.spec +++ /dev/null @@ -1,797 +0,0 @@ -# Augeas and SELinux requirements may be disabled at build time by passing -# --without augeas and/or --without selinux to rpmbuild or mock - -# Specifically not using systemd on F18 as it's technically a break between -# using SystemV on 2.7.x and Systemd on 3.1.0. -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global puppet_libdir %{ruby_vendorlibdir} -%else -%global puppet_libdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') -%endif - -%global _with_systemd 1 -%global confdir ext/redhat -%global pending_upgrade_path %{_localstatedir}/lib/rpm-state/puppet -%global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending - -Name: puppet -Version: 3.6.2 -Release: 3%{?dist} -Summary: A network tool for managing many disparate systems -License: ASL 2.0 -URL: http://puppetlabs.com -Source0: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz -Source1: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc -Source2: puppet-nm-dispatcher -Source3: puppet-nm-dispatcher.systemd -Source4: start-puppet-wrapper -Patch0: yum_proxy_none_.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: facter >= 1.6.6 -BuildRequires: ruby-devel >= 1.8.7 - -BuildArch: noarch -%if 0%{?rhel} && 0%{?rhel} <= 6 -Requires: ruby(abi) = 1.8 -%else -Requires: ruby(release) -%endif -Requires: ruby(shadow) - -# Prevents jruby from being pulled in by dependencies (BZ #985208) -Requires: ruby - -# Pull in ruby selinux bindings where available -%if 0%{?fedora} || 0%{?rhel} >= 6 -%{!?_without_selinux:Requires: ruby(selinux), libselinux-utils} -%else -%if 0%{?rhel} && 0%{?rhel} == 5 -%{!?_without_selinux:Requires: libselinux-ruby, libselinux-utils} -%endif -%endif - -BuildRequires: hiera >= 1.0.0 - -Requires: facter >= 1.6.6 -Requires: hiera >= 1.0.0 -Requires: rubygem(rgen) -Obsoletes: hiera-puppet < 1.0.0-2 -Provides: hiera-puppet = %{version}-%{release} - -%{!?_without_augeas:Requires: ruby(augeas)} - -Requires(pre): shadow-utils -%if 0%{?_with_systemd} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts -%endif - -Requires: tar - -%description -Puppet lets you centrally manage every important aspect of your system using a -cross-platform specification language that manages all the separate elements -normally aggregated in different files, like users, cron jobs, and hosts, -along with obviously discrete elements like packages, services, and files. - -%package server -Group: System Environment/Base -Summary: Server for the puppet system management tool -Requires: puppet = %{version}-%{release} -%if 0%{?_with_systemd} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts -%endif - -%description server -Provides the central puppet server daemon which provides manifests to clients. -The server can also function as a certificate authority and file server. - -%prep -%setup -q -%patch0 -p1 -chmod +x ext/puppet-load.rb ext/regexp_nodes/regexp_nodes.rb - -# Fixes BZ#952955 -sed -i '/include-dependencies/d' lib/puppet/provider/package/gem.rb - -%build -# Nothing to build - -%install -rm -rf %{buildroot} -ruby install.rb --destdir=%{buildroot} --quick --no-rdoc --sitelibdir=%{puppet_libdir} - -install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests -install -d -m0755 %{buildroot}%{_datadir}/%{name}/modules -install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet -install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet -install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet - -%if 0%{?_with_systemd} -%{__install} -d -m0755 %{buildroot}%{_unitdir} -install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/puppet.service -ln -s %{_unitdir}/puppet.service %{buildroot}%{_unitdir}/puppetagent.service -install -Dp -m0644 ext/systemd/puppetmaster.service %{buildroot}%{_unitdir}/puppetmaster.service -%else -install -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet -install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet -install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster -install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster -install -Dp -m0755 %{confdir}/queue.init %{buildroot}%{_initrddir}/puppetqueue -%endif - -install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf -install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf -install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet - -# Install a NetworkManager dispatcher script to pickup changes to -# /etc/resolv.conf and such (https://bugzilla.redhat.com/532085). -%if 0%{?_with_systemd} -install -Dpv %{SOURCE3} \ - %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name} -%else -install -Dpv %{SOURCE2} \ - %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name} -%endif - -# Install the ext/ directory to %%{_datadir}/%%{name} -install -d %{buildroot}%{_datadir}/%{name} -cp -a ext/ %{buildroot}%{_datadir}/%{name} -# emacs and vim bits are installed elsewhere -rm -rf %{buildroot}%{_datadir}/%{name}/ext/{emacs,vim} -# remove misc packaging artifacts in source not applicable to rpm -rm -rf %{buildroot}%{_datadir}/%{name}/ext/{gentoo,freebsd,solaris,suse,windows,osx,ips,debian} -rm -f %{buildroot}%{_datadir}/%{name}/ext/{build_defaults.yaml,project_data.yaml} -rm -f %{buildroot}%{_datadir}/%{name}/ext/redhat/*.init - -# Install emacs mode files -emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp -install -Dp -m0644 ext/emacs/puppet-mode.el $emacsdir/puppet-mode.el -install -Dp -m0644 ext/emacs/puppet-mode-init.el \ - $emacsdir/site-start.d/puppet-mode-init.el - -# Install vim syntax files -vimdir=%{buildroot}%{_datadir}/vim/vimfiles -install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim -install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim - -# Install wrappers for SELinux -install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-agent -install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-master -install -Dp -m0755 %{SOURCE4} %{buildroot}%{_bindir}/start-puppet-ca -%if 0%{?_with_systemd} -sed -i 's|^ExecStart=/usr/bin/puppet|ExecStart=/usr/bin/start-puppet-master|' \ - %{buildroot}%{_unitdir}/puppetmaster.service -sed -i 's|^ExecStart=/usr/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \ - %{buildroot}%{_unitdir}/puppet.service -%endif - -%if 0%{?fedora} >= 15 -# Setup tmpfiles.d config -mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d -echo "D /var/run/%{name} 0755 %{name} %{name} -" > \ - %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf -%endif - -# Create puppet modules directory for puppet module tool -mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules - -%files -%defattr(-, root, root, 0755) -%doc LICENSE README.md examples -%{_bindir}/puppet -%{_bindir}/start-puppet-* -%{_bindir}/extlookup2hiera -%{puppet_libdir}/* -%if 0%{?_with_systemd} -%{_unitdir}/puppet.service -%{_unitdir}/puppetagent.service -%else -%{_initrddir}/puppet -%config(noreplace) %{_sysconfdir}/sysconfig/puppet -%endif -%dir %{_sysconfdir}/puppet -%dir %{_sysconfdir}/%{name}/modules -%if 0%{?fedora} >= 15 -%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf -%endif -%config(noreplace) %{_sysconfdir}/puppet/puppet.conf -%config(noreplace) %{_sysconfdir}/puppet/auth.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/puppet -%dir %{_sysconfdir}/NetworkManager -%dir %{_sysconfdir}/NetworkManager/dispatcher.d -%{_sysconfdir}/NetworkManager/dispatcher.d/98-puppet -# We don't want to require emacs or vim, so we need to own these dirs -%{_datadir}/emacs -%{_datadir}/vim -%{_datadir}/%{name} -# These need to be owned by puppet so the server can -# write to them -%attr(-, puppet, puppet) %{_localstatedir}/run/puppet -%attr(0750, puppet, puppet) %{_localstatedir}/log/puppet -%attr(-, puppet, puppet) %{_localstatedir}/lib/puppet -%{_mandir}/man5/puppet.conf.5.gz -%{_mandir}/man8/puppet.8.gz -%{_mandir}/man8/puppet-agent.8.gz -%{_mandir}/man8/puppet-apply.8.gz -%{_mandir}/man8/puppet-catalog.8.gz -%{_mandir}/man8/puppet-describe.8.gz -%{_mandir}/man8/puppet-ca.8.gz -%{_mandir}/man8/puppet-cert.8.gz -%{_mandir}/man8/puppet-certificate.8.gz -%{_mandir}/man8/puppet-certificate_request.8.gz -%{_mandir}/man8/puppet-certificate_revocation_list.8.gz -%{_mandir}/man8/puppet-config.8.gz -%{_mandir}/man8/puppet-device.8.gz -%{_mandir}/man8/puppet-doc.8.gz -%{_mandir}/man8/puppet-facts.8.gz -%{_mandir}/man8/puppet-file.8.gz -%{_mandir}/man8/puppet-filebucket.8.gz -%{_mandir}/man8/puppet-help.8.gz -%{_mandir}/man8/puppet-inspect.8.gz -%{_mandir}/man8/puppet-instrumentation_data.8.gz -%{_mandir}/man8/puppet-instrumentation_listener.8.gz -%{_mandir}/man8/puppet-instrumentation_probe.8.gz -%{_mandir}/man8/puppet-key.8.gz -%{_mandir}/man8/puppet-man.8.gz -%{_mandir}/man8/puppet-module.8.gz -%{_mandir}/man8/puppet-node.8.gz -%{_mandir}/man8/puppet-parser.8.gz -%{_mandir}/man8/puppet-plugin.8.gz -%{_mandir}/man8/puppet-report.8.gz -%{_mandir}/man8/puppet-resource.8.gz -%{_mandir}/man8/puppet-resource_type.8.gz -%{_mandir}/man8/puppet-secret_agent.8.gz -%{_mandir}/man8/puppet-status.8.gz -%{_mandir}/man8/extlookup2hiera.8.gz - -%files server -%defattr(-, root, root, 0755) -%if 0%{?_with_systemd} -%{_unitdir}/puppetmaster.service -%else -%{_initrddir}/puppetmaster -%{_initrddir}/puppetqueue -%config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster -%endif -%config(noreplace) %{_sysconfdir}/puppet/fileserver.conf -%dir %{_sysconfdir}/puppet/manifests -%{_mandir}/man8/puppet-kick.8.gz -%{_mandir}/man8/puppet-master.8.gz -%{_mandir}/man8/puppet-queue.8.gz - -# Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5), -# and 471919 (RHEL-4) -%pre -getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null -getent passwd puppet &>/dev/null || \ -useradd -r -u 52 -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \ - -c "Puppet" puppet &>/dev/null -# ensure that old setups have the right puppet home dir -if [ $1 -gt 1 ] ; then - usermod -d %{_localstatedir}/lib/puppet puppet &>/dev/null -fi -exit 0 - -%post -%if 0%{?_with_systemd} -/bin/systemctl daemon-reload >/dev/null 2>&1 -%else -# If there's a running puppet agent, restart it during upgrade. Fixes -# BZ #1024538. -if [ "$1" -ge 1 ]; then - pid="%{_localstatedir}/run/puppet/agent.pid" - if [ -e "$pid" ]; then - if ps aux | grep `cat "$pid"` | grep -v grep | awk '{ print $12 }' | grep -q sbin; then - (kill $(< "$pid") && rm -f "$pid" && \ - /sbin/service puppet start) >/dev/null 2>&1 - fi - fi -fi -/sbin/chkconfig --add puppet -%endif -exit 0 - -%post server -%if 0%{?_with_systemd} -/bin/systemctl daemon-reload >/dev/null 2>&1 -%else -/sbin/chkconfig --add puppetmaster -%endif -exit 0 - -%preun -%if 0%{?_with_systemd} -if [ "$1" -eq 0 ] ; then - /bin/systemctl --no-reload disable puppet.service > /dev/null 2>&1 - /bin/systemctl stop puppet.service > /dev/null 2>&1 - /bin/systemctl daemon-reload >/dev/null 2>&1 -fi - -if [ "$1" -eq 1 ]; then - /bin/systemctl is-enabled puppetagent.service > /dev/null 2>&1 - if [ "$?" -eq 0 ]; then - /bin/systemctl /bin/systemctl --no-reload disable puppetagent.service > /dev/null 2>&1 - /bin/systemctl stop puppetagent.service > /dev/null 2>&1 - /bin/systemctl daemon-reload >/dev/null 2>&1 - install -D -m 644 /dev/null %{pending_upgrade_file} > /dev/null 2>&1 - fi -fi -%else -if [ "$1" -eq 0 ] ; then - /sbin/service puppet stop >/dev/null 2>&1 - /sbin/chkconfig --del puppet -fi -%endif -exit 0 - -%preun server -%if 0%{?_with_systemd} -if [ "$1" -eq 0 ] ; then - /bin/systemctl --no-reload disable puppetmaster.service > /dev/null 2>&1 - /bin/systemctl stop puppetmaster.service > /dev/null 2>&1 - /bin/systemctl daemon-reload >/dev/null 2>&1 -fi -%else -if [ "$1" -eq 0 ] ; then - /sbin/service puppetmaster stop >/dev/null 2>&1 - /sbin/chkconfig --del puppetmaster -fi -%endif -exit 0 - -%postun -%if 0%{?_with_systemd} -if [ "$1" -ge 1 ] ; then - /bin/systemctl try-restart puppet.service >/dev/null 2>&1 - if [ -e %{pending_upgrade_file} ]; then - /bin/systemctl --no-reload enable puppet.service > /dev/null 2>&1 - /bin/systemctl start puppet.service > /dev/null 2>&1 - /bin/systemctl daemon-reload >/dev/null 2>&1 - rm %{pending_upgrade_file} - fi -fi -%else -if [ "$1" -ge 1 ]; then - /sbin/service puppet condrestart >/dev/null 2>&1 -fi -%endif -exit 0 - -%postun server -%if 0%{?_with_systemd} -if [ "$1" -ge 1 ] ; then - /bin/systemctl try-restart puppetmaster.service >/dev/null 2>&1 -fi -%else -if [ "$1" -ge 1 ]; then - /sbin/service puppetmaster condrestart >/dev/null 2>&1 -fi -%endif -exit 0 - -%clean -rm -rf %{buildroot} - -%changelog -* Tue Aug 19 2014 Lukas Zapletal 3.6.2-3 -- 1131398 - added start-puppet-ca SELinux wrapper binary - -* Mon Jun 30 2014 Pádraig Brady - 3.6.2-2 -- Allow yumrepo proxy attribute to be set to _none_ - -* Mon Jun 16 2014 Orion Poplawski - 3.6.2-1 -- Update to 3.6.2 - -* Sat Jun 07 2014 Fedora Release Engineering - 3.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun May 18 2014 Sam Kottler 3.6.0-1 -- Remove logic specific to unsupported versions of Fedora -- Update to 3.6.0 - -* Mon Apr 28 2014 Sam Kottler 3.5.1-1 -- Update to 3.5.1 - -* Tue Apr 08 2014 Lukas Zapletal 3.4.3-3 -- RHBZ#1070395 - fixed error in postun scriplet -- Reformatted all scriplets and corrected exit codes - -* Tue Apr 08 2014 Lukas Zapletal 3.4.3-2 -- Fixed systemd unit files - wrappers are now in use and master starts - with correct context - -* Mon Feb 24 2014 Sam Kottler - 3.4.3-1 -- Update to 3.4.3 - -* Wed Jan 29 2014 Sam Kottler - 3.4.2-5 -- Add rubygem(rgen) runtime dependency - -* Thu Jan 23 2014 Sam Kottler - 3.4.2-4 -- Use localstatedir macro instead of /tmp - -* Fri Jan 17 2014 Sam Kottler - 3.4.2-3 -- Enable puppet.service during upgrade if puppetagent.service was previously enabled - -* Thu Jan 16 2014 Sam Kottler - 3.4.2-2 -- Remove F18 conditionals now that it's EOL - -* Tue Jan 14 2014 Sam Kottler - 3.4.2-1 -- Update to 3.4.2 to mitigate CVE-2013-4969 (BZ#1047792) - --* Mon Nov 18 2013 Sam Kottler - 3.3.2-1 -- Update to 3.3.2 (BZ#1031810) - -* Sat Nov 16 2013 Sam Kottler - 3.3.1-3 -- Add patch to convert nil resource parameter values to undef (BZ#1028930) - -* Fri Nov 1 2013 Lukas Zapletal - 3.3.1-2 -- Added SELinux wrappers for daemon processes - -* Mon Oct 7 2013 Orion Poplawski - 3.3.1-1 -- Update to 3.3.1 - -* Fri Sep 13 2013 Sam Kottler - 3.3.0-1 -- Update to 3.3.0 and remove the rundir-perms patch since it's no longer needed - -* Fri Aug 30 2013 Sam Kottler - 3.2.4-1 -- Update to 3.2.4 to fix CVE-2013-4761 and CVE-2013-4956 - -* Thu Aug 29 2013 Sam Kottler - 3.2.2-1 -- Update to 3.2.2 - -* Wed Aug 7 2013 Sam Kottler - 3.1.1-6 -- Add tar as an installation requirement - -* Tue Jul 30 2013 Orion Poplawski - 3.1.1-5 -- Use systemd semantics and name in NM dispatcher script - -* Fri Jul 26 2013 Sam Kottler - 3.1.1-5 -- Add hard dependency on ruby - -* Tue Apr 16 2013 Orion Poplawski - 3.1.1-3 -- Add upstream patch for ruby 2.0 support -- Fix rhel ruby conditional - -* Fri Mar 15 2013 Vít Ondruch - 3.1.1-2 -- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 - -* Wed Mar 13 2013 Michael Stahnke - 3.1.1-1 -- Fixes for CVE-2013-1640 CVE-2013-1652 CVE-2013-1653 CVE-2013-1654 -- CVE-2013-1655 CVE-2013-2274 CVE-2013-2275 - -* Thu Mar 07 2013 Michael Stahnke - 3.1.0-4 -- Disable systemd in F18 as per bz#873853 -- Update Patch0 to work with 3.1 - -* Thu Mar 7 2013 Daniel Drake - 3.1.0-2 -- Improve server compatibility with old puppet clients (#831303) - -* Mon Feb 11 2013 Sam Kottler - 3.1.0-1 -- Update to 3.1.0 - -* Tue Oct 30 2012 Moses Mendoza - 3.0.2-1 -- Update to 3.0.2 -- Update new dependencies (ruby >= 1.8.7, facter >= 1.6.6, hiera >= 1.0.0) -- Update for manpage and file changes in upstream -- Add conditionals for systemd service management -- Remove 0001-Ruby-1.9.3-has-a-different-error-when-require-fails.patch -- Remove 0001-Preserve-timestamps-when-installing-files.patch - -* Wed Jul 11 2012 Todd Zullinger - 2.7.18-1 -- Update to 2.7.17, fixes CVE-2012-3864, CVE-2012-3865, CVE-2012-3866, - CVE-2012-3867 -- Improve NetworkManager compatibility, thanks to Orion Poplawski (#532085) -- Preserve timestamps when installing files - -* Wed Apr 25 2012 Todd Zullinger - 2.7.13-1 -- Update to 2.7.13 -- Change license from GPLv2 to ASL 2.0 -- Drop %%post hacks to deal with upgrades from 0.25 -- Minor rpmlint fixes -- Backport patch to silence confine warnings in ruby-1.9.3 - -* Wed Apr 11 2012 Todd Zullinger - 2.6.16-1 -- Update to 2.6.16, fixes CVE-2012-1986, CVE-2012-1987, and CVE-2012-1988 -- Correct permissions of /var/log/puppet (0750) - -* Wed Feb 22 2012 Todd Zullinger - 2.6.14-1 -- Update to 2.6.14, fixes CVE-2012-1053 and CVE-2012-1054 - -* Mon Feb 13 2012 Todd Zullinger - 2.6.13-3 -- Move rpmlint fixes to %%prep, add a few additional fixes -- Bump minimum ruby version to 1.8.5 now that EL-4 is all but dead -- Update install locations for Fedora-17 / Ruby-1.9 -- Use ruby($lib) for augeas and shadow requirements -- Only try to run 0.25.x -> 2.6.x pid file updates on EL - -* Thu Jan 05 2012 Todd Zullinger - 2.6.13-2 -- Revert to minimal patch for augeas >= 0.10 (bz#771097) - -* Wed Dec 14 2011 Todd Zullinger - 2.6.13-1 -- Update to 2.6.13 -- Cherry-pick various augeas fixes from upstream (bz#771097) - -* Sun Oct 23 2011 Todd Zullinger - 2.6.12-1 -- Update to 2.6.12, fixes CVE-2011-3872 -- Add upstream patch to restore Mongrel XMLRPC functionality (upstream #10244) -- Apply partial fix for upstream #9167 (tagmail report sends email when nothing - happens) - -* Thu Sep 29 2011 Todd Zullinger - 2.6.6-3 -- Apply upstream patches for CVE-2011-3869, CVE-2011-3870, CVE-2011-3871, and - upstream #9793 - -* Tue Sep 27 2011 Todd Zullinger - 2.6.6-2 -- Apply upstream patch for CVE-2011-3848 - -* Wed Mar 16 2011 Todd Zullinger - 2.6.6-1 -- Update to 2.6.6 -- Ensure %%pre exits cleanly -- Fix License tag, puppet is now GPLv2 only -- Create and own /usr/share/puppet/modules (#615432) -- Properly restart puppet agent/master daemons on upgrades from 0.25.x -- Require libselinux-utils when selinux support is enabled -- Support tmpfiles.d for Fedora >= 15 (#656677) -- Apply a few upstream fixes for 0.25.5 regressions - -* Wed Feb 09 2011 Fedora Release Engineering - 0.25.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon May 17 2010 Todd Zullinger - 0.25.5-1 -- Update to 0.25.5 -- Adjust selinux conditional for EL-6 -- Apply rundir-perms patch from tarball rather than including it separately -- Update URL's to reflect the new puppetlabs.com domain - -* Fri Jan 29 2010 Todd Zullinger - 0.25.4-1 -- Update to 0.25.4 - -* Tue Jan 19 2010 Todd Zullinger - 0.25.3-2 -- Apply upstream patch to fix cron resources (upstream #2845) - -* Mon Jan 11 2010 Todd Zullinger - 0.25.3-1 -- Update to 0.25.3 - -* Tue Jan 05 2010 Todd Zullinger - 0.25.2-1.1 -- Replace %%define with %%global for macros - -* Tue Jan 05 2010 Todd Zullinger - 0.25.2-1 -- Update to 0.25.2 -- Fixes CVE-2010-0156, tmpfile security issue (#502881) -- Install auth.conf, puppetqd manpage, and queuing examples/docs - -* Wed Nov 25 2009 Jeroen van Meeuwen - 0.25.1-1 -- New upstream version - -* Tue Oct 27 2009 Todd Zullinger - 0.25.1-0.3 -- Update to 0.25.1 -- Include the pi program and man page (R.I.Pienaar) - -* Sat Oct 17 2009 Todd Zullinger - 0.25.1-0.2.rc2 -- Update to 0.25.1rc2 - -* Tue Sep 22 2009 Todd Zullinger - 0.25.1-0.1.rc1 -- Update to 0.25.1rc1 -- Move puppetca to puppet package, it has uses on client systems -- Drop redundant %%doc from manpage %%file listings - -* Fri Sep 04 2009 Todd Zullinger - 0.25.0-1 -- Update to 0.25.0 -- Fix permissions on /var/log/puppet (#495096) -- Install emacs mode and vim syntax files (#491437) -- Install ext/ directory in %%{_datadir}/%%{name} (/usr/share/puppet) - -* Mon May 04 2009 Todd Zullinger - 0.25.0-0.1.beta1 -- Update to 0.25.0beta1 -- Make Augeas and SELinux requirements build time options - -* Mon Mar 23 2009 Todd Zullinger - 0.24.8-1 -- Update to 0.24.8 -- Quiet output from %%pre -- Use upstream install script -- Increase required facter version to >= 1.5 - -* Tue Dec 16 2008 Todd Zullinger - 0.24.7-4 -- Remove redundant useradd from %%pre - -* Tue Dec 16 2008 Jeroen van Meeuwen - 0.24.7-3 -- New upstream version -- Set a static uid and gid (#472073, #471918, #471919) -- Add a conditional requirement on libselinux-ruby for Fedora >= 9 -- Add a dependency on ruby-augeas - -* Wed Oct 22 2008 Todd Zullinger - 0.24.6-1 -- Update to 0.24.6 -- Require ruby-shadow on Fedora and RHEL >= 5 -- Simplify Fedora/RHEL version checks for ruby(abi) and BuildArch -- Require chkconfig and initstripts for preun, post, and postun scripts -- Conditionally restart puppet in %%postun -- Ensure %%preun, %%post, and %%postun scripts exit cleanly -- Create puppet user/group according to Fedora packaging guidelines -- Quiet a few rpmlint complaints -- Remove useless %%pbuild macro -- Make specfile more like the Fedora/EPEL template - -* Mon Jul 28 2008 David Lutterkort - 0.24.5-1 -- Add /usr/bin/puppetdoc - -* Thu Jul 24 2008 Brenton Leanhardt -- New version -- man pages now ship with tarball -- examples/code moved to root examples dir in upstream tarball - -* Tue Mar 25 2008 David Lutterkort - 0.24.4-1 -- Add man pages (from separate tarball, upstream will fix to - include in main tarball) - -* Mon Mar 24 2008 David Lutterkort - 0.24.3-1 -- New version - -* Wed Mar 5 2008 David Lutterkort - 0.24.2-1 -- New version - -* Sat Dec 22 2007 David Lutterkort - 0.24.1-1 -- New version - -* Mon Dec 17 2007 David Lutterkort - 0.24.0-2 -- Use updated upstream tarball that contains yumhelper.py - -* Fri Dec 14 2007 David Lutterkort - 0.24.0-1 -- Fixed license -- Munge examples/ to make rpmlint happier - -* Wed Aug 22 2007 David Lutterkort - 0.23.2-1 -- New version - -* Thu Jul 26 2007 David Lutterkort - 0.23.1-1 -- Remove old config files - -* Wed Jun 20 2007 David Lutterkort - 0.23.0-1 -- Install one puppet.conf instead of old config files, keep old configs - around to ease update -- Use plain shell commands in install instead of macros - -* Wed May 2 2007 David Lutterkort - 0.22.4-1 -- New version - -* Thu Mar 29 2007 David Lutterkort - 0.22.3-1 -- Claim ownership of _sysconfdir/puppet (bz 233908) - -* Mon Mar 19 2007 David Lutterkort - 0.22.2-1 -- Set puppet's homedir to /var/lib/puppet, not /var/puppet -- Remove no-lockdir patch, not needed anymore - -* Mon Feb 12 2007 David Lutterkort - 0.22.1-2 -- Fix bogus config parameter in puppetd.conf - -* Sat Feb 3 2007 David Lutterkort - 0.22.1-1 -- New version - -* Fri Jan 5 2007 David Lutterkort - 0.22.0-1 -- New version - -* Mon Nov 20 2006 David Lutterkort - 0.20.1-2 -- Make require ruby(abi) and buildarch: noarch conditional for fedora 5 or - later to allow building on older fedora releases - -* Mon Nov 13 2006 David Lutterkort - 0.20.1-1 -- New version - -* Mon Oct 23 2006 David Lutterkort - 0.20.0-1 -- New version - -* Tue Sep 26 2006 David Lutterkort - 0.19.3-1 -- New version - -* Mon Sep 18 2006 David Lutterkort - 0.19.1-1 -- New version - -* Thu Sep 7 2006 David Lutterkort - 0.19.0-1 -- New version - -* Tue Aug 1 2006 David Lutterkort - 0.18.4-2 -- Use /usr/bin/ruby directly instead of /usr/bin/env ruby in - executables. Otherwise, initscripts break since pidof can't find the - right process - -* Tue Aug 1 2006 David Lutterkort - 0.18.4-1 -- New version - -* Fri Jul 14 2006 David Lutterkort - 0.18.3-1 -- New version - -* Wed Jul 5 2006 David Lutterkort - 0.18.2-1 -- New version - -* Wed Jun 28 2006 David Lutterkort - 0.18.1-1 -- Removed lsb-config.patch and yumrepo.patch since they are upstream now - -* Mon Jun 19 2006 David Lutterkort - 0.18.0-1 -- Patch config for LSB compliance (lsb-config.patch) -- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl - to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt, - /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml - -* Fri May 19 2006 David Lutterkort - 0.17.2-1 -- Added /usr/bin/puppetrun to server subpackage -- Backported patch for yumrepo type (yumrepo.patch) - -* Wed May 3 2006 David Lutterkort - 0.16.4-1 -- Rebuilt - -* Fri Apr 21 2006 David Lutterkort - 0.16.0-1 -- Fix default file permissions in server subpackage -- Run puppetmaster as user puppet -- rebuilt for 0.16.0 - -* Mon Apr 17 2006 David Lutterkort - 0.15.3-2 -- Don't create empty log files in post-install scriptlet - -* Fri Apr 7 2006 David Lutterkort - 0.15.3-1 -- Rebuilt for new version - -* Wed Mar 22 2006 David Lutterkort - 0.15.1-1 -- Patch0: Run puppetmaster as root; running as puppet is not ready - for primetime - -* Mon Mar 13 2006 David Lutterkort - 0.15.0-1 -- Commented out noarch; requires fix for bz184199 - -* Mon Mar 6 2006 David Lutterkort - 0.14.0-1 -- Added BuildRequires for ruby - -* Wed Mar 1 2006 David Lutterkort - 0.13.5-1 -- Removed use of fedora-usermgmt. It is not required for Fedora Extras and - makes it unnecessarily hard to use this rpm outside of Fedora. Just - allocate the puppet uid/gid dynamically - -* Sun Feb 19 2006 David Lutterkort - 0.13.0-4 -- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed -problem with listing fileserver.conf and puppetmaster.conf twice - -* Wed Feb 8 2006 David Lutterkort - 0.13.0-3 -- Fix puppetd.conf - -* Wed Feb 8 2006 David Lutterkort - 0.13.0-2 -- Changes to run puppetmaster as user puppet - -* Mon Feb 6 2006 David Lutterkort - 0.13.0-1 -- Don't mark initscripts as config files - -* Mon Feb 6 2006 David Lutterkort - 0.12.0-2 -- Fix BuildRoot. Add dist to release - -* Tue Jan 17 2006 David Lutterkort - 0.11.0-1 -- Rebuild - -* Thu Jan 12 2006 David Lutterkort - 0.10.2-1 -- Updated for 0.10.2 Fixed minor kink in how Source is given - -* Wed Jan 11 2006 David Lutterkort - 0.10.1-3 -- Added basic fileserver.conf - -* Wed Jan 11 2006 David Lutterkort - 0.10.1-1 -- Updated. Moved installation of library files to sitelibdir. Pulled -initscripts into separate files. Folded tools rpm into server - -* Thu Nov 24 2005 Duane Griffin -- Added init scripts for the client - -* Wed Nov 23 2005 Duane Griffin -- First packaging diff --git a/sources b/sources deleted file mode 100644 index db6e904..0000000 --- a/sources +++ /dev/null @@ -1,3 +0,0 @@ -7e2981dcab39771b8243432bfd359d46 puppet-3.6.2.tar.gz -6c7836c40e431353095368af11252a4d puppet-3.6.2.tar.gz.asc -5d19d719514246973649301f096c7970 start-puppet-wrapper diff --git a/yum_proxy_none_.patch b/yum_proxy_none_.patch deleted file mode 100644 index 30416e3..0000000 --- a/yum_proxy_none_.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 973c58057d1bb24d64c716e2971d5317f6e0edfb Mon Sep 17 00:00:00 2001 -From: Graham Taylor -Date: Fri, 13 Jun 2014 14:56:14 +0100 -Subject: [PATCH] (PUP-2271) Allow yumrepo proxy attribute to be set to _none_ - -Add fix and test to allow proxy to be set to _none_ to bypass global proxy -configuration for YUM. - -See https://tickets.puppetlabs.com/browse/PUP-2271 ---- - lib/puppet/type/yumrepo.rb | 2 +- - spec/unit/type/yumrepo_spec.rb | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - mode change 100644 => 100755 spec/unit/type/yumrepo_spec.rb - -diff --git a/lib/puppet/type/yumrepo.rb b/lib/puppet/type/yumrepo.rb -index daa8d44..d9ff11d 100644 ---- a/lib/puppet/type/yumrepo.rb -+++ b/lib/puppet/type/yumrepo.rb -@@ -277,7 +277,7 @@ - - newvalues(/.*/, :absent) - validate do |value| -- next if value.to_s == 'absent' -+ next if value.to_s =~ /^(absent|_none_)$/ - parsed = URI.parse(value) - - unless VALID_SCHEMES.include?(parsed.scheme) -diff --git a/spec/unit/type/yumrepo_spec.rb b/spec/unit/type/yumrepo_spec.rb -old mode 100644 -new mode 100755 -index 543a0ce..2246b72 ---- a/spec/unit/type/yumrepo_spec.rb -+++ b/spec/unit/type/yumrepo_spec.rb -@@ -295,6 +295,12 @@ - - describe "proxy" do - it_behaves_like "a yumrepo parameter that can be absent", :proxy -+ it "accepts _none_" do -+ described_class.new( -+ :name => 'puppetlabs', -+ :proxy => "_none_" -+ ) -+ end - it_behaves_like "a yumrepo parameter that accepts a single URL", :proxy - end - --- -1.9.3 - 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 107/136] 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 108/136] 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 109/136] 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 110/136] 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 111/136] 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 112/136] 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 113/136] 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 114/136] 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 115/136] 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 116/136] 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 117/136] 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 118/136] 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 119/136] 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 120/136] 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 121/136] 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 122/136] 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 123/136] 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 124/136] 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 125/136] 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 126/136] 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 127/136] 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 128/136] 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 129/136] 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 130/136] 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 131/136] 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 132/136] 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 133/136] 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 134/136] 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 135/136] 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 136/136] 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