From 626a1d02f8ed605c13675637eaa2f5715e267d30 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Fri, 7 Feb 2020 11:44:00 -0600
Subject: [PATCH 1/9] "Adding package.cfg file"

---
 package.cfg | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package.cfg

diff --git a/package.cfg b/package.cfg
new file mode 100644
index 0000000..66ea79d
--- /dev/null
+++ b/package.cfg
@@ -0,0 +1,2 @@
+[koji]
+targets = epel8 epel8-playground
\ No newline at end of file

From 593a13b497e7c7ab7967c2d70709b7e1785925ac Mon Sep 17 00:00:00 2001
From: Breno B Fernandes <brandfbb@gmail.com>
Date: Tue, 14 Jul 2020 09:57:45 -0400
Subject: [PATCH 2/9] EPEL 8 build.

---
 .cvsignore                   |   0
 .gitignore                   |  11 +
 0001-Fix-puppet-paths.patch  | 392 +++++++++++++++++++++++++++++++++++
 Makefile                     |  21 --
 package.cfg                  |   2 -
 puppet-6.14.0.tar.gz.asc     |  17 ++
 puppet-nm-dispatcher.systemd |   8 +
 puppet.spec                  | 217 +++++++++++++++++++
 sources                      |  11 +
 start-puppet-wrapper         |   8 +
 10 files changed, 664 insertions(+), 23 deletions(-)
 delete mode 100644 .cvsignore
 create mode 100644 .gitignore
 create mode 100644 0001-Fix-puppet-paths.patch
 delete mode 100644 Makefile
 delete mode 100644 package.cfg
 create mode 100644 puppet-6.14.0.tar.gz.asc
 create mode 100644 puppet-nm-dispatcher.systemd
 create mode 100644 puppet.spec
 create mode 100644 start-puppet-wrapper

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1f3dfe9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+/puppet-6.14.0.tar.gz
+/puppetlabs-augeas_core-1.0.4.tar.gz
+/puppetlabs-cron_core-1.0.3.tar.gz
+/puppetlabs-host_core-1.0.2.tar.gz
+/puppetlabs-mount_core-1.0.3.tar.gz
+/puppetlabs-scheduled_task-2.0.1.tar.gz
+/puppetlabs-selinux_core-1.0.4.tar.gz
+/puppetlabs-sshkeys_core-2.0.0.tar.gz
+/puppetlabs-yumrepo_core-1.0.7.tar.gz
+/puppetlabs-zfs_core-1.0.5.tar.gz
+/puppetlabs-zone_core-1.0.3.tar.gz
diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch
new file mode 100644
index 0000000..9ff642c
--- /dev/null
+++ b/0001-Fix-puppet-paths.patch
@@ -0,0 +1,392 @@
+diff --git a/ext/redhat/client.init b/ext/redhat/client.init
+index 4ee7a2f..1a23190 100644
+--- a/ext/redhat/client.init
++++ b/ext/redhat/client.init
+@@ -17,7 +17,7 @@
+ lockfile=/var/lock/subsys/puppet
+ piddir=/var/run/puppetlabs
+ pidfile="${piddir}/agent.pid"
+-puppetd=/opt/puppetlabs/puppet/bin/puppet
++puppetd=/usr/bin/puppet
+ pid=$(cat "$pidfile" 2> /dev/null)
+ RETVAL=0
+
+diff --git a/ext/systemd/puppet.service b/ext/systemd/puppet.service
+index 7c16615..c63627d 100644
+--- a/ext/systemd/puppet.service
++++ b/ext/systemd/puppet.service
+@@ -11,13 +11,13 @@
+ [Unit]
+ Description=Puppet agent
+ Wants=basic.target
+-After=basic.target network.target
++After=basic.target network.target puppetmaster.service
+
+ [Service]
+ EnvironmentFile=-/etc/sysconfig/puppetagent
+ EnvironmentFile=-/etc/sysconfig/puppet
+ EnvironmentFile=-/etc/default/puppet
+-ExecStart=/opt/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
++ExecStart=/usr/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+
+diff --git a/install.rb b/install.rb
+old mode 100755
+new mode 100644
+index 632052e..96c02dc
+--- a/install.rb
++++ b/install.rb
+@@ -169,13 +169,13 @@ def prepare_installation
+     opts.on('--destdir[=OPTIONAL]', 'Installation prefix for all targets', 'Default essentially /') do |destdir|
+       InstallOptions.destdir = destdir
+     end
+-    opts.on('--configdir[=OPTIONAL]', 'Installation directory for config files', 'Default /etc/puppetlabs/puppet') do |configdir|
++    opts.on('--configdir[=OPTIONAL]', 'Installation directory for config files', 'Default /etc/puppetlabs/puppet') do |destdir|
+       InstallOptions.configdir = configdir
+     end
+     opts.on('--codedir[=OPTIONAL]', 'Installation directory for code files', 'Default /etc/puppetlabs/code') do |codedir|
+       InstallOptions.codedir = codedir
+     end
+-    opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /opt/puppetlabs/puppet/cache') do |vardir|
++    opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /var/lib/puppet') do |vardir|
+       InstallOptions.vardir = vardir
+     end
+     opts.on('--rundir[=OPTIONAL]', 'Installation directory for state files', 'Default /var/run/puppetlabs') do |rundir|
+@@ -187,7 +187,7 @@ def prepare_installation
+     opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides RbConfig::CONFIG["bindir"]') do |bindir|
+       InstallOptions.bindir = bindir
+     end
+-    opts.on('--localedir[=OPTIONAL]', 'Installation directory for locale information', 'Default /opt/puppetlabs/puppet/share/locale') do |localedir|
++    opts.on('--localedir[=OPTIONAL]', 'Installation directory for locale information', 'Default /usr/share/puppetlabs/puppet/locale') do |localedir|
+       InstallOptions.localedir = localedir
+     end
+     opts.on('--ruby[=OPTIONAL]', 'Ruby interpreter to use with installation', 'overrides ruby used to call install.rb') do |ruby|
+@@ -273,7 +273,7 @@ def prepare_installation
+   elsif $operatingsystem == "windows"
+     vardir = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "cache")
+   else
+-    vardir = "/opt/puppetlabs/puppet/cache"
++    vardir = "/var/lib/puppet"
+   end
+ 
+   if not InstallOptions.rundir.nil?
+@@ -304,7 +304,7 @@ def prepare_installation
+     if $operatingsystem == "windows"
+       localedir = File.join(Dir::PROGRAM_FILES, "Puppet Labs", "Puppet", "puppet", "share", "locale")
+     else
+-      localedir = "/opt/puppetlabs/puppet/share/locale"
++      localedir = "/usr/share/puppetlabs/puppet/locale"
+     end
+   end
+
+diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
+index 39834ff..2132888 100644
+--- a/lib/puppet/defaults.rb
++++ b/lib/puppet/defaults.rb
+@@ -41,7 +41,7 @@ module Puppet
+       end
+       path.join(File::PATH_SEPARATOR)
+     else
+-      '$codedir/modules:/opt/puppetlabs/puppet/modules'
++      '$codedir/modules:/usr/share/puppetlabs/puppet/modules'
+     end
+   end
+
+@@ -54,7 +54,7 @@ module Puppet
+         nil
+       end
+     else
+-      '/opt/puppetlabs/puppet/vendor_modules'
++      '/usr/share/puppetlabs/puppet/vendor_modules'
+     end
+   end
+
+diff --git a/lib/puppet/face/config.rb b/lib/puppet/face/config.rb
+index 692d12b..2d98e8c 100644
+--- a/lib/puppet/face/config.rb
++++ b/lib/puppet/face/config.rb
+@@ -131,7 +131,7 @@ Puppet::Face.define(:config, '0.0.1') do
+
+       Set the vardir for only the agent:
+
+-      $ puppet config set vardir /opt/puppetlabs/puppet/cache --section agent
++      $ puppet config set vardir /var/lib/puppet --section agent
+     EOT
+
+     when_invoked do |name, value, options|
+diff --git a/lib/puppet/face/module/install.rb b/lib/puppet/face/module/install.rb
+index 62068a5..518b0cc 100644
+--- a/lib/puppet/face/module/install.rb
++++ b/lib/puppet/face/module/install.rb
+@@ -47,20 +47,20 @@ Puppet::Face.define(:module, '1.0.0') do
+
+       Install a module into a specific directory:
+
+-      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules
+-      Preparing to install into /opt/puppetlabs/puppet/modules ...
++      $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppetlabs/puppet/modules
++      Preparing to install into /usr/share/puppetlabs/puppet/modules ...
+       Downloading from https://forgeapi.puppet.com ...
+       Installing -- do not interrupt ...
+-      /opt/puppetlabs/puppet/modules
++      /usr/share/puppetlabs/puppet/modules
+       └── puppetlabs-vcsrepo (v0.0.4)
+
+       Install a module into a specific directory and check for dependencies in other directories:
+
+-      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
+-      Preparing to install into /opt/puppetlabs/puppet/modules ...
++      $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
++      Preparing to install into /usr/share/puppetlabs/puppet/modules ...
+       Downloading from https://forgeapi.puppet.com ...
+       Installing -- do not interrupt ...
+-      /opt/puppetlabs/puppet/modules
++      /usr/share/puppetlabs/puppet/modules
+       └── puppetlabs-vcsrepo (v0.0.4)
+
+       Install a module from a release archive:
+diff --git a/lib/puppet/face/module/list.rb b/lib/puppet/face/module/list.rb
+index 001a736..946dcfe 100644
+--- a/lib/puppet/face/module/list.rb
++++ b/lib/puppet/face/module/list.rb
+@@ -27,7 +27,7 @@ Puppet::Face.define(:module, '1.0.0') do
+         ├── puppetlabs-mysql (v0.0.1)
+         ├── puppetlabs-sqlite (v0.0.1)
+         └── puppetlabs-stdlib (v2.2.1)
+-        /opt/puppetlabs/puppet/modules (no modules installed)
++        /usr/share/puppetlabs/puppet/modules (no modules installed)
+
+       List installed modules in a tree view:
+
+@@ -38,7 +38,7 @@ Puppet::Face.define(:module, '1.0.0') do
+           ├─┬ puppetlabs-mysql (v0.0.1)
+           │ └── bodepd-create_resources (v0.0.1)
+           └── puppetlabs-sqlite (v0.0.1)
+-        /opt/puppetlabs/puppet/modules (no modules installed)
++        /usr/share/puppetlabs/puppet/modules (no modules installed)
+
+       List installed modules from a specified environment:
+
+@@ -49,12 +49,12 @@ Puppet::Face.define(:module, '1.0.0') do
+         ├── puppetlabs-mysql (v0.0.1)
+         ├── puppetlabs-sqlite (v0.0.1)
+         └── puppetlabs-stdlib (v2.2.1)
+-        /opt/puppetlabs/puppet/modules (no modules installed)
++        /usr/share/puppetlabs/puppet/modules (no modules installed)
+
+       List installed modules from a specified modulepath:
+
+-      $ puppet module list --modulepath /opt/puppetlabs/puppet/modules
+-        /opt/puppetlabs/puppet/modules (no modules installed)
++      $ puppet module list --modulepath /usr/share/puppetlabs/puppet/modules
++        /usr/share/puppetlabs/puppet/modules (no modules installed)
+     EOT
+
+     when_invoked do |options|
+diff --git a/lib/puppet/face/module/uninstall.rb b/lib/puppet/face/module/uninstall.rb
+index 6e73bc6..7fa5ec7 100644
+--- a/lib/puppet/face/module/uninstall.rb
++++ b/lib/puppet/face/module/uninstall.rb
+@@ -17,8 +17,8 @@ Puppet::Face.define(:module, '1.0.0') do
+
+       Uninstall a module from a specific directory:
+
+-      $ puppet module uninstall puppetlabs-ssh --modulepath /opt/puppetlabs/puppet/modules
+-      Removed /opt/puppetlabs/puppet/modules/ssh (v1.0.0)
++      $ puppet module uninstall puppetlabs-ssh --modulepath /usr/share/puppetlabs/puppet/modules
++      Removed /usr/share/puppetlabs/puppet/modules/ssh (v1.0.0)
+
+       Uninstall a module from a specific environment:
+
+diff --git a/lib/puppet/provider/package/puppet_gem.rb b/lib/puppet/provider/package/puppet_gem.rb
+index e5cd381..64cb6f5 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/reference/configuration.rb b/lib/puppet/reference/configuration.rb
+index e747f9a..40882d8 100644
+--- a/lib/puppet/reference/configuration.rb
++++ b/lib/puppet/reference/configuration.rb
+@@ -23,7 +23,7 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
+     # Now print the data about the item.
+     val = object.default
+     if name.to_s == 'vardir'
+-      val = 'Unix/Linux: /opt/puppetlabs/puppet/cache -- Windows: C:\ProgramData\PuppetLabs\puppet\cache -- Non-root user: ~/.puppetlabs/opt/puppet/cache'
++      val = 'Unix/Linux: /var/lib/puppet -- Windows: C:\ProgramData\PuppetLabs\puppet\cache -- Non-root user: ~/.puppetlabs/opt/puppet/cache'
+     elsif name.to_s == 'confdir'
+       val = 'Unix/Linux: /etc/puppetlabs/puppet -- Windows: C:\ProgramData\PuppetLabs\puppet\etc -- Non-root user: ~/.puppetlabs/etc/puppet'
+     elsif name.to_s == 'codedir'
+diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
+index d0f9b9a..e7ecd40 100644
+--- a/lib/puppet/util/run_mode.rb
++++ b/lib/puppet/util/run_mode.rb
+@@ -67,7 +67,7 @@ module Puppet
+       end
+
+       def var_dir
+-        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
++        which_dir("/var/lib/puppet", "~/.puppetlabs/opt/puppet/cache")
+       end
+
+       def run_dir
+diff --git a/man/man5/puppet.conf.5 b/man/man5/puppet.conf.5
+index 8b46f57..5905fde 100644
+--- a/man/man5/puppet.conf.5
++++ b/man/man5/puppet.conf.5
+@@ -111,7 +111,7 @@ The search path for \fBglobal\fR modules\. Should be specified as a list of dire
+ These are the modules that will be used by \fIall\fR environments\. Note that the \fBmodules\fR directory of the active environment will have priority over any global directories\. For more info, see \fIhttps://puppet\.com/docs/puppet/latest/environments_about\.html\fR
+ .
+ .IP "\(bu" 4
+-\fIDefault\fR: $codedir/modules:/opt/puppetlabs/puppet/modules
++\fIDefault\fR: $codedir/modules:/usr/share/puppetlabs/puppet/modules
+ .
+ .IP "" 0
+ .
+@@ -1931,7 +1931,7 @@ The user Puppet Server will run as\. Used to ensure the agent side processes (ag
+ Where Puppet stores dynamic and growing data\. The default for this setting is calculated specially, like \fBconfdir\fR_\.
+ .
+ .IP "\(bu" 4
+-\fIDefault\fR: Unix/Linux: /opt/puppetlabs/puppet/cache \-\- Windows: C:\eProgramData\ePuppetLabs\epuppet\ecache \-\- Non\-root user: ~/\.puppetlabs/opt/puppet/cache
++\fIDefault\fR: Unix/Linux: /var/lib/puppet \-\- Windows: C:\eProgramData\ePuppetLabs\epuppet\ecache \-\- Non\-root user: ~/\.puppetlabs/opt/puppet/cache
+ .
+ .IP "" 0
+ .
+@@ -1939,7 +1939,7 @@ Where Puppet stores dynamic and growing data\. The default for this setting is c
+ The directory containing \fBvendored\fR modules\. These modules will be used by \fIall\fR environments like those in the \fBbasemodulepath\fR\. The only difference is that modules in the \fBbasemodulepath\fR are pluginsynced, while vendored modules are not
+ .
+ .IP "\(bu" 4
+-\fIDefault\fR: /opt/puppetlabs/puppet/vendor_modules
++\fIDefault\fR: /usr/share/puppetlabs/puppet/vendor_modules
+ .
+ .IP "" 0
+ .
+diff --git a/man/man8/puppet-config.8 b/man/man8/puppet-config.8
+index 3c8e65d..11db793 100644
+--- a/man/man8/puppet-config.8
++++ b/man/man8/puppet-config.8
+@@ -145,7 +145,7 @@ $ puppet config set rundir /var/run/puppetlabs
+ Set the vardir for only the agent:
+ .
+ .P
+-$ puppet config set vardir /opt/puppetlabs/puppet/cache \-\-section agent
++$ puppet config set vardir /var/lib/puppet \-\-section agent
+ .
+ .SH "COPYRIGHT AND LICENSE"
+ Copyright 2011 by Puppet Inc\. Apache 2 license; see COPYING
+diff --git a/man/man8/puppet-module.8 b/man/man8/puppet-module.8
+index 541142c..1f3ce39 100644
+--- a/man/man8/puppet-module.8
++++ b/man/man8/puppet-module.8
+@@ -271,13 +271,13 @@ $ puppet module install puppetlabs\-vcsrepo \-v 0\.0\.4 Preparing to install int
+ Install a module into a specific directory:
+ .
+ .P
+-$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/opt/puppetlabs/puppet/modules Preparing to install into /opt/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppet\.com \.\.\. Installing \-\- do not interrupt \.\.\. /opt/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
++$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/usr/share/puppetlabs/puppet/modules Preparing to install into /usr/share/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppet\.com \.\.\. Installing \-\- do not interrupt \.\.\. /usr/share/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
+ .
+ .P
+ Install a module into a specific directory and check for dependencies in other directories:
+ .
+ .P
+-$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/opt/puppetlabs/puppet/modules \-\-modulepath /etc/puppetlabs/code/modules Preparing to install into /opt/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppet\.com \.\.\. Installing \-\- do not interrupt \.\.\. /opt/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
++$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/usr/share/puppetlabs/puppet/modules \-\-modulepath /etc/puppetlabs/code/modules Preparing to install into /usr/share/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppet\.com \.\.\. Installing \-\- do not interrupt \.\.\. /usr/share/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
+ .
+ .P
+ Install a module from a release archive:
+@@ -298,25 +298,25 @@ $ puppet module install puppetlabs\-vcsrepo\-0\.0\.4\.tar\.gz \-\-ignore\-depend
+ List installed modules:
+ .
+ .P
+-$ puppet module list /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /opt/puppetlabs/puppet/modules (no modules installed)
++$ puppet module list /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /usr/share/puppetlabs/puppet/modules (no modules installed)
+ .
+ .P
+ List installed modules in a tree view:
+ .
+ .P
+-$ puppet module list \-\-tree /etc/puppetlabs/code/modules └─┬ puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-stdlib (v2\.2\.1) ├─┬ puppetlabs\-mysql (v0\.0\.1) │ └── bodepd\-create_resources (v0\.0\.1) └── puppetlabs\-sqlite (v0\.0\.1) /opt/puppetlabs/puppet/modules (no modules installed)
++$ puppet module list \-\-tree /etc/puppetlabs/code/modules └─┬ puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-stdlib (v2\.2\.1) ├─┬ puppetlabs\-mysql (v0\.0\.1) │ └── bodepd\-create_resources (v0\.0\.1) └── puppetlabs\-sqlite (v0\.0\.1) /usr/share/puppetlabs/puppet/modules (no modules installed)
+ .
+ .P
+ List installed modules from a specified environment:
+ .
+ .P
+-$ puppet module list \-\-environment production /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /opt/puppetlabs/puppet/modules (no modules installed)
++$ puppet module list \-\-environment production /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /usr/share/puppetlabs/puppet/modules (no modules installed)
+ .
+ .P
+ List installed modules from a specified modulepath:
+ .
+ .P
+-$ puppet module list \-\-modulepath /opt/puppetlabs/puppet/modules /opt/puppetlabs/puppet/modules (no modules installed)
++$ puppet module list \-\-modulepath /usr/share/puppetlabs/puppet/modules /usr/share/puppetlabs/puppet/modules (no modules installed)
+ .
+ .P
+ \fBsearch\fR
+@@ -340,7 +340,7 @@ $ puppet module uninstall puppetlabs\-ssh Removed /etc/puppetlabs/code/modules/s
+ Uninstall a module from a specific directory:
+ .
+ .P
+-$ puppet module uninstall puppetlabs\-ssh \-\-modulepath /opt/puppetlabs/puppet/modules Removed /opt/puppetlabs/puppet/modules/ssh (v1\.0\.0)
++$ puppet module uninstall puppetlabs\-ssh \-\-modulepath /usr/share/puppetlabs/puppet/modules Removed /usr/share/puppetlabs/puppet/modules/ssh (v1\.0\.0)
+ .
+ .P
+ Uninstall a module from a specific environment:
+diff --git a/spec/unit/defaults_spec.rb b/spec/unit/defaults_spec.rb
+index 9a6dc40..0632839 100644
+--- a/spec/unit/defaults_spec.rb
++++ b/spec/unit/defaults_spec.rb
+@@ -132,7 +132,7 @@ describe "Defaults" do
+     it 'includes the user and system modules', :unless => Puppet::Util::Platform.windows? do
+       expect(
+         Puppet[:basemodulepath]
+-      ).to match(%r{.*/code/modules:/opt/puppetlabs/puppet/modules$})
++      ).to match(%r{.*/code/modules:/usr/share/puppetlabs/puppet/modules$})
+     end
+ 
+     describe 'on windows', :if => Puppet::Util::Platform.windows? do
+@@ -160,7 +160,7 @@ describe "Defaults" do
+     it 'includes the default vendormoduledir', :unless => Puppet::Util::Platform.windows? do
+       expect(
+         Puppet[:vendormoduledir]
+-      ).to eq('/opt/puppetlabs/puppet/vendor_modules')
++      ).to eq('/usr/share/puppetlabs/puppet/vendor_modules')
+     end
+ 
+     describe 'on windows', :if => Puppet::Util::Platform.windows? do
+diff --git a/spec/unit/provider/package/puppet_gem_spec.rb b/spec/unit/provider/package/puppet_gem_spec.rb
+index 07e5fba..760af61 100644
+--- a/spec/unit/provider/package/puppet_gem_spec.rb
++++ b/spec/unit/provider/package/puppet_gem_spec.rb
+@@ -17,7 +17,7 @@ describe Puppet::Type.type(:package).provider(:puppet_gem) do
+   if Puppet::Util::Platform.windows?
+     let(:provider_gem_cmd) { 'gem' }
+   else
+-    let(:provider_gem_cmd) { '/opt/puppetlabs/puppet/bin/gem' }
++    let(:provider_gem_cmd) { '/usr/bin/gem' }
+   end
+
+   let(:execute_options) { {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}} }
+diff --git a/spec/unit/util/run_mode_spec.rb b/spec/unit/util/run_mode_spec.rb
+index 81855b1..d619588 100644
+--- a/spec/unit/util/run_mode_spec.rb
++++ b/spec/unit/util/run_mode_spec.rb
+@@ -73,8 +73,8 @@ describe Puppet::Util::RunMode do
+     end
+
+     describe "#var_dir" do
+-      it "has vardir /opt/puppetlabs/puppet/cache when run as root" do
+-        as_root { expect(@run_mode.var_dir).to eq(File.expand_path('/opt/puppetlabs/puppet/cache')) }
++      it "has vardir /usr/share/puppetlabs/puppet/cache when run as root" do
++        as_root { expect(@run_mode.var_dir).to eq(File.expand_path('/usr/share/puppetlabs/puppet/cache')) }
+       end
+
+       it "has vardir ~/.puppetlabs/opt/puppet/cache when run as non-root" do
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 692e64a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: puppet
-# $Id$
-NAME := puppet
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/package.cfg b/package.cfg
deleted file mode 100644
index 66ea79d..0000000
--- a/package.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[koji]
-targets = epel8 epel8-playground
\ No newline at end of file
diff --git a/puppet-6.14.0.tar.gz.asc b/puppet-6.14.0.tar.gz.asc
new file mode 100644
index 0000000..f72b229
--- /dev/null
+++ b/puppet-6.14.0.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABCAAGBQJeZ+43AAoJEH9DgoDvjTSf7HwQAOi8xHp2Rs43/LW9Fe25oYrq
+2xxnhYRHDpOhSVJqWy3kbcz7TxVGebn7kPSV6f2NS3bTtqgY4WendI12M+P1ASdX
+FduoFPe3MyRqaHYT9SWK/plnwGaoQIV1Tn+YHXTFgrjciXcQBe6xUCxO5BqaWYoJ
+C5utT7jVSlf81sqgqXJrpZa7HHJS8m0VJHg6fCsH0wWwlW1Cn7ar9sQB+XLbtOl/
+7IX9luJ+sGhmBf+mkvWkpAnvXhgf/f8pDI9EJfMi2TU924rce1oWhlk509tj5c/W
+CASQhW9KctTWV6Krzuim6JYgtjRS0wi0ws1QpW19YpKneq5IqNpoNIG9WwfHfpyl
+dNqoYLFKwgWuGmqIhBZeZTTW7Slx4rhhmIB2nYefFPaM/jOWsZGRtZDvhD4DUDVp
+smBY6cnUGLmiGFwHjws/hWbBb9YbREIpjVe2wQviAxqoGAKKbg8WBec+DsP6tIjK
+PJ7OtJFnFMNNMpU+oqbb/m034WSzbs6lELdLLZv7MEHIEbuGYyj3GCLGZ60EgcqA
+gpT8J0w3xwMx9k7H4h9M3a0cKPeqE3RBA5JeCJ8nu2qVwhZJH5hcQOi9P4gYFoMv
+XQq0GhnEGYWM94i2+LbZIrgfEkg0+neABCG85PiOiCdHwnrl5BeJ8fxzYWB2Mo97
+umScFXq8AOMc7qtUydVw
+=tRG+
+-----END PGP SIGNATURE-----
diff --git a/puppet-nm-dispatcher.systemd b/puppet-nm-dispatcher.systemd
new file mode 100644
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
new file mode 100644
index 0000000..d22f07c
--- /dev/null
+++ b/puppet.spec
@@ -0,0 +1,217 @@
+%global nm_dispatcher_dir %{_prefix}/lib/NetworkManager
+%global puppet_libdir %{ruby_vendorlibdir}
+
+Name:           puppet
+Version:        6.14.0
+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/puppet/%{name}-%{version}.tar.gz
+Source1:        http://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.gz.asc
+Source2:        https://forge.puppet.com/v3/files/puppetlabs-mount_core-1.0.3.tar.gz
+Source3:        https://forge.puppet.com/v3/files/puppetlabs-host_core-1.0.2.tar.gz
+Source4:        https://forge.puppet.com/v3/files/puppetlabs-augeas_core-1.0.4.tar.gz
+Source5:        https://forge.puppet.com/v3/files/puppetlabs-cron_core-1.0.3.tar.gz
+Source6:        https://forge.puppet.com/v3/files/puppetlabs-scheduled_task-2.0.1.tar.gz
+Source7:        https://forge.puppet.com/v3/files/puppetlabs-selinux_core-1.0.4.tar.gz
+Source8:        https://forge.puppet.com/v3/files/puppetlabs-sshkeys_core-2.0.0.tar.gz
+Source9:        https://forge.puppet.com/v3/files/puppetlabs-yumrepo_core-1.0.7.tar.gz
+Source10:       https://forge.puppet.com/v3/files/puppetlabs-zfs_core-1.0.5.tar.gz
+Source11:       https://forge.puppet.com/v3/files/puppetlabs-zone_core-1.0.3.tar.gz
+Source12:       puppet-nm-dispatcher.systemd
+Source13:       start-puppet-wrapper
+
+# Puppetlabs messed up with default paths
+Patch01: 0001-Fix-puppet-paths.patch
+
+BuildArch: noarch
+
+# ruby-devel does not require the base package, but requires -libs instead
+BuildRequires: ruby
+BuildRequires: ruby-devel
+BuildRequires: systemd
+BuildRequires: git
+BuildRequires: hiera >= 3.3.1
+BuildRequires: facter >= 3.9.6
+BuildRequires: facter-devel >= 3.9.6
+BuildRequires: ruby-facter >= 3.9.6
+BuildRequires: rubygem-semantic_puppet >= 1.0.2
+BuildRequires: rubygem-deep_merge
+BuildRequires: rubygem-httpclient
+BuildRequires: rubygem-multi_json
+BuildRequires: ruby-augeas >= 0.5.0
+BuildRequires: augeas >= 1.10.1
+BuildRequires: augeas-libs >= 1.10.1
+BuildRequires: cpp-hocon >= 0.2.1
+BuildRequires: cpp-hocon-devel >= 0.2.1
+BuildRequires: rubygem-concurrent-ruby >= 1.0.5
+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: 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
+Obsoletes: puppet-headless < 6.0.0
+Obsoletes: puppet-server < 6.0.0
+Obsoletes: puppet < 6.0.0
+%{!?_without_selinux:Requires: ruby(selinux), libselinux-utils}
+
+%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.
+
+%prep
+%autosetup -S git
+%setup -D -b 2 puppetlabs-mount_core-1.0.3
+%setup -D -b 3 puppetlabs-host_core-1.0.2
+%setup -D -b 4 puppetlabs-augeas_core-1.0.4
+%setup -D -b 5 puppetlabs-cron_core-1.0.3
+%setup -D -b 6 puppetlabs-scheduled_task-2.0.1
+%setup -D -b 7 puppetlabs-selinux_core-1.0.4
+%setup -D -b 8 puppetlabs-sshkeys_core-2.0.0
+%setup -D -b 9 puppetlabs-yumrepo_core-1.0.7
+%setup -D -b 10 puppetlabs-zfs_core-1.0.5
+%setup -D -b 11 puppetlabs-zone_core-1.0.3
+
+%patch01 -p1
+
+%build
+# Nothing to build
+
+%install
+ruby install.rb --destdir=%{buildroot} \
+ --bindir=%{_bindir} \
+ --logdir=%{_localstatedir}/log/puppetlabs/puppet \
+ --rundir=%{_rundir}/puppet \
+ --localedir=%{_datadir}/puppetlabs/puppet/locale \
+ --vardir=/var/lib/puppet \
+ --sitelibdir=%{puppet_libdir}
+
+mkdir -p %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules
+mv %{_builddir}/puppetlabs-mount_core-1.0.3 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/mount_core
+mv %{_builddir}/puppetlabs-host_core-1.0.2 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/host_core
+mv %{_builddir}/puppetlabs-augeas_core-1.0.4 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/augeas_core
+mv %{_builddir}/puppetlabs-cron_core-1.0.3 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/cron_core
+mv %{_builddir}/puppetlabs-scheduled_task-2.0.1 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/scheduled_task
+mv %{_builddir}/puppetlabs-selinux_core-1.0.4 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/selinux_core
+mv %{_builddir}/puppetlabs-sshkeys_core-2.0.0 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/sshkeys_core
+mv %{_builddir}/puppetlabs-yumrepo_core-1.0.7 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/yumrepo_core
+mv %{_builddir}/puppetlabs-zfs_core-1.0.5 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/zfs_core
+mv %{_builddir}/puppetlabs-zone_core-1.0.3 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/zone_core
+
+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 %{SOURCE12} \
+ %{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 %{SOURCE13} %{buildroot}%{_bindir}/start-puppet-agent
+sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \
+ %{buildroot}%{_unitdir}/puppet.service
+
+# Setup tmpfiles.d config
+mkdir -p %{buildroot}%{_tmpfilesdir}
+echo "D /run/%{name} 0755 %{name} %{name} -" > \
+ %{buildroot}%{_tmpfilesdir}/%{name}.conf
+
+# Unbundle
+# Note(hguemar): remove unrelated OS/distro specific folders
+# 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}/usr/share/puppetlabs/puppet/ext/{debian,freebsd,gentoo,ips,osx,solaris,suse,windows}
+rm %{buildroot}/usr/share/puppetlabs/puppet/ext/redhat/*.init
+rm %{buildroot}/usr/share/puppetlabs/puppet/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
+%{_unitdir}/puppetagent.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
+
+%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
+%{_mandir}/man5/puppet.conf.5.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-ssl.8.gz
+%{_mandir}/man8/puppet-status.8.gz
+%{_mandir}/man8/puppet-agent.8.gz
+%{_mandir}/man8/puppet.8.gz
+%{_mandir}/man8/puppet-apply.8.gz
+%{_mandir}/man8/puppet-catalog.8.gz
+%{_mandir}/man8/puppet-config.8.gz
+%{_mandir}/man8/puppet-describe.8.gz
+%{_mandir}/man8/puppet-device.8.gz
+%{_mandir}/man8/puppet-doc.8.gz
+%{_mandir}/man8/puppet-epp.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-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
+
+%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/auth.conf
+%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}/puppetlabs
+
+%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 \
+ -c "Puppet" puppet &>/dev/null
+
+%post
+%systemd_post puppet.service
+%systemd_postun_with_restart puppet.service
+
+
+%changelog
+* Mon Jul 13 2020 Breno Brand Fernandes <brandfbb@gmail.com> - 6.14.0-1
+- Build of puppet 6.
diff --git a/sources b/sources
index e69de29..cbd5162 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,11 @@
+SHA512 (puppet-6.14.0.tar.gz) = 066ad8de6393cb58b1f92fae450dc72dabcbe912cdbb3417848a66955fe17696a68abf67d86b107a2b1c54e7037d38da7264a9234a8833b56065c8e407ff57a4
+SHA512 (puppetlabs-augeas_core-1.0.4.tar.gz) = b40d9fcfb7afa5143ed4b715a326939635bc9fa1c243b66c9e4341e3a6a90f7ff34b4cb27dd8040e1b027fbe350f8cd69db9dee1628c8fcb96e978c4eae97da0
+SHA512 (puppetlabs-cron_core-1.0.3.tar.gz) = c305ee2e6c9f97956ad1107076ae0a37a307ab577bbc8270ad833c6dd845dcb44685cde1726709ebaac2f7a8bcd257728429d02a84405803b08222799b2ea6b8
+SHA512 (puppetlabs-host_core-1.0.2.tar.gz) = 3e79eef4de5635ab0d5f9407345a832fad669fbc0b28ecfae11a79162ad9a3561394db70bd4a93d7c210159577f6455aca9889e0f110c94a38bbe981047fef74
+SHA512 (puppetlabs-mount_core-1.0.3.tar.gz) = 61ffc116fb22c03f79a7c4abe1679cb2f90577c7e6403b1cb6f7acbd2eff7b89bcd6906c71c9faa9b9df4ee8fe1c7077b99ff918454059f4c15509509d1611e7
+SHA512 (puppetlabs-scheduled_task-2.0.1.tar.gz) = aea50e3636b3091aff4cc4890d78a081035c10d9cbf99a42bbb509d3edbd32463b582a0d701f1771070d9fe4b3dfb5e93acbe37bdb0bd92b984ffa16a913e257
+SHA512 (puppetlabs-selinux_core-1.0.4.tar.gz) = 600bef04791bd5bb9a46a5397af6e5ed5937b0e271cb312ef64db6bb93c85acf5c6df6ab53a7999ce7609a7b7ea8c299f37cb6d44dfa2c48b3456ca893be6876
+SHA512 (puppetlabs-sshkeys_core-2.0.0.tar.gz) = 5e256294f0f38b2f493b5894144ae05259589f1a9b1592581447d7ff6e868458e6a4890a726748c54cb87d524570c69fa29aa9ce7220e670a5f3c5fb0bfcaf53
+SHA512 (puppetlabs-yumrepo_core-1.0.7.tar.gz) = 8fb3cb40077ac113c332a761c01c1d7ce4bdfff1016be696efb41be20c86ff688b40b83c00a47394d79e64941cf6c23ea4bbd1107b4c7856d1b481733cb2d7ce
+SHA512 (puppetlabs-zfs_core-1.0.5.tar.gz) = e87afd7ed5bfa9bee6bc50477992dd5e7f1614095af6506e5643919ac7e35f613e4edf4fdb69cbe17dd8a84a5df28e33189efb97de098ba0d5e9f42def186132
+SHA512 (puppetlabs-zone_core-1.0.3.tar.gz) = 1083bcc810e8a7b048fad1c70656d806c65b5fa912c627bf1dfaf3b9d8a0ec675db100abc2fc6499669c17927ea3e55a5c968fde0e577fc1f4cebb1fbd5e0851
diff --git a/start-puppet-wrapper b/start-puppet-wrapper
new file mode 100644
index 0000000..e0c8b70
--- /dev/null
+++ b/start-puppet-wrapper
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# This is wrapper script to start puppet which is used to support starting
+# puppet daemon processes with correct SELinux context.
+#
+
+# Call exec rather that spawn sub-process because of signals
+exec /usr/bin/puppet $*

From 3c149dbf696be86df08de2be34e058bad08467a8 Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Fri, 28 Aug 2020 15:06:01 +0200
Subject: [PATCH 3/9] Update to 6.17.0

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 .gitignore                                    |   8 +
 0001-Fix-puppet-paths.patch                   | 392 ------------------
 ...6B15509CF8E59E6E469F327F438280EF8D349F.gpg | Bin 0 -> 2259 bytes
 puppet-6.14.0.tar.gz.asc                      |  17 -
 puppet-6.17.0.tar.gz.asc                      |  17 +
 puppet.spec                                   | 181 ++++----
 sources                                       |  16 +-
 7 files changed, 117 insertions(+), 514 deletions(-)
 delete mode 100644 0001-Fix-puppet-paths.patch
 create mode 100644 gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg
 delete mode 100644 puppet-6.14.0.tar.gz.asc
 create mode 100644 puppet-6.17.0.tar.gz.asc

diff --git a/.gitignore b/.gitignore
index 1f3dfe9..4a88c46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,11 @@
 /puppetlabs-yumrepo_core-1.0.7.tar.gz
 /puppetlabs-zfs_core-1.0.5.tar.gz
 /puppetlabs-zone_core-1.0.3.tar.gz
+/puppet-6.17.0.tar.gz
+/puppetlabs-augeas_core-1.0.5.tar.gz
+/puppetlabs-cron_core-1.0.4.tar.gz
+/puppetlabs-host_core-1.0.3.tar.gz
+/puppetlabs-mount_core-1.0.4.tar.gz
+/puppetlabs-scheduled_task-2.2.1.tar.gz
+/puppetlabs-sshkeys_core-2.1.0.tar.gz
+/puppetlabs-zfs_core-1.1.0.tar.gz
diff --git a/0001-Fix-puppet-paths.patch b/0001-Fix-puppet-paths.patch
deleted file mode 100644
index 9ff642c..0000000
--- a/0001-Fix-puppet-paths.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-diff --git a/ext/redhat/client.init b/ext/redhat/client.init
-index 4ee7a2f..1a23190 100644
---- a/ext/redhat/client.init
-+++ b/ext/redhat/client.init
-@@ -17,7 +17,7 @@
- lockfile=/var/lock/subsys/puppet
- piddir=/var/run/puppetlabs
- pidfile="${piddir}/agent.pid"
--puppetd=/opt/puppetlabs/puppet/bin/puppet
-+puppetd=/usr/bin/puppet
- pid=$(cat "$pidfile" 2> /dev/null)
- RETVAL=0
-
-diff --git a/ext/systemd/puppet.service b/ext/systemd/puppet.service
-index 7c16615..c63627d 100644
---- a/ext/systemd/puppet.service
-+++ b/ext/systemd/puppet.service
-@@ -11,13 +11,13 @@
- [Unit]
- Description=Puppet agent
- Wants=basic.target
--After=basic.target network.target
-+After=basic.target network.target puppetmaster.service
-
- [Service]
- EnvironmentFile=-/etc/sysconfig/puppetagent
- EnvironmentFile=-/etc/sysconfig/puppet
- EnvironmentFile=-/etc/default/puppet
--ExecStart=/opt/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
-+ExecStart=/usr/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
-
-diff --git a/install.rb b/install.rb
-old mode 100755
-new mode 100644
-index 632052e..96c02dc
---- a/install.rb
-+++ b/install.rb
-@@ -169,13 +169,13 @@ def prepare_installation
-     opts.on('--destdir[=OPTIONAL]', 'Installation prefix for all targets', 'Default essentially /') do |destdir|
-       InstallOptions.destdir = destdir
-     end
--    opts.on('--configdir[=OPTIONAL]', 'Installation directory for config files', 'Default /etc/puppetlabs/puppet') do |configdir|
-+    opts.on('--configdir[=OPTIONAL]', 'Installation directory for config files', 'Default /etc/puppetlabs/puppet') do |destdir|
-       InstallOptions.configdir = configdir
-     end
-     opts.on('--codedir[=OPTIONAL]', 'Installation directory for code files', 'Default /etc/puppetlabs/code') do |codedir|
-       InstallOptions.codedir = codedir
-     end
--    opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /opt/puppetlabs/puppet/cache') do |vardir|
-+    opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /var/lib/puppet') do |vardir|
-       InstallOptions.vardir = vardir
-     end
-     opts.on('--rundir[=OPTIONAL]', 'Installation directory for state files', 'Default /var/run/puppetlabs') do |rundir|
-@@ -187,7 +187,7 @@ def prepare_installation
-     opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides RbConfig::CONFIG["bindir"]') do |bindir|
-       InstallOptions.bindir = bindir
-     end
--    opts.on('--localedir[=OPTIONAL]', 'Installation directory for locale information', 'Default /opt/puppetlabs/puppet/share/locale') do |localedir|
-+    opts.on('--localedir[=OPTIONAL]', 'Installation directory for locale information', 'Default /usr/share/puppetlabs/puppet/locale') do |localedir|
-       InstallOptions.localedir = localedir
-     end
-     opts.on('--ruby[=OPTIONAL]', 'Ruby interpreter to use with installation', 'overrides ruby used to call install.rb') do |ruby|
-@@ -273,7 +273,7 @@ def prepare_installation
-   elsif $operatingsystem == "windows"
-     vardir = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "cache")
-   else
--    vardir = "/opt/puppetlabs/puppet/cache"
-+    vardir = "/var/lib/puppet"
-   end
- 
-   if not InstallOptions.rundir.nil?
-@@ -304,7 +304,7 @@ def prepare_installation
-     if $operatingsystem == "windows"
-       localedir = File.join(Dir::PROGRAM_FILES, "Puppet Labs", "Puppet", "puppet", "share", "locale")
-     else
--      localedir = "/opt/puppetlabs/puppet/share/locale"
-+      localedir = "/usr/share/puppetlabs/puppet/locale"
-     end
-   end
-
-diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
-index 39834ff..2132888 100644
---- a/lib/puppet/defaults.rb
-+++ b/lib/puppet/defaults.rb
-@@ -41,7 +41,7 @@ module Puppet
-       end
-       path.join(File::PATH_SEPARATOR)
-     else
--      '$codedir/modules:/opt/puppetlabs/puppet/modules'
-+      '$codedir/modules:/usr/share/puppetlabs/puppet/modules'
-     end
-   end
-
-@@ -54,7 +54,7 @@ module Puppet
-         nil
-       end
-     else
--      '/opt/puppetlabs/puppet/vendor_modules'
-+      '/usr/share/puppetlabs/puppet/vendor_modules'
-     end
-   end
-
-diff --git a/lib/puppet/face/config.rb b/lib/puppet/face/config.rb
-index 692d12b..2d98e8c 100644
---- a/lib/puppet/face/config.rb
-+++ b/lib/puppet/face/config.rb
-@@ -131,7 +131,7 @@ Puppet::Face.define(:config, '0.0.1') do
-
-       Set the vardir for only the agent:
-
--      $ puppet config set vardir /opt/puppetlabs/puppet/cache --section agent
-+      $ puppet config set vardir /var/lib/puppet --section agent
-     EOT
-
-     when_invoked do |name, value, options|
-diff --git a/lib/puppet/face/module/install.rb b/lib/puppet/face/module/install.rb
-index 62068a5..518b0cc 100644
---- a/lib/puppet/face/module/install.rb
-+++ b/lib/puppet/face/module/install.rb
-@@ -47,20 +47,20 @@ Puppet::Face.define(:module, '1.0.0') do
-
-       Install a module into a specific directory:
-
--      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules
--      Preparing to install into /opt/puppetlabs/puppet/modules ...
-+      $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppetlabs/puppet/modules
-+      Preparing to install into /usr/share/puppetlabs/puppet/modules ...
-       Downloading from https://forgeapi.puppet.com ...
-       Installing -- do not interrupt ...
--      /opt/puppetlabs/puppet/modules
-+      /usr/share/puppetlabs/puppet/modules
-       └── puppetlabs-vcsrepo (v0.0.4)
-
-       Install a module into a specific directory and check for dependencies in other directories:
-
--      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
--      Preparing to install into /opt/puppetlabs/puppet/modules ...
-+      $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
-+      Preparing to install into /usr/share/puppetlabs/puppet/modules ...
-       Downloading from https://forgeapi.puppet.com ...
-       Installing -- do not interrupt ...
--      /opt/puppetlabs/puppet/modules
-+      /usr/share/puppetlabs/puppet/modules
-       └── puppetlabs-vcsrepo (v0.0.4)
-
-       Install a module from a release archive:
-diff --git a/lib/puppet/face/module/list.rb b/lib/puppet/face/module/list.rb
-index 001a736..946dcfe 100644
---- a/lib/puppet/face/module/list.rb
-+++ b/lib/puppet/face/module/list.rb
-@@ -27,7 +27,7 @@ Puppet::Face.define(:module, '1.0.0') do
-         ├── puppetlabs-mysql (v0.0.1)
-         ├── puppetlabs-sqlite (v0.0.1)
-         └── puppetlabs-stdlib (v2.2.1)
--        /opt/puppetlabs/puppet/modules (no modules installed)
-+        /usr/share/puppetlabs/puppet/modules (no modules installed)
-
-       List installed modules in a tree view:
-
-@@ -38,7 +38,7 @@ Puppet::Face.define(:module, '1.0.0') do
-           ├─┬ puppetlabs-mysql (v0.0.1)
-           │ └── bodepd-create_resources (v0.0.1)
-           └── puppetlabs-sqlite (v0.0.1)
--        /opt/puppetlabs/puppet/modules (no modules installed)
-+        /usr/share/puppetlabs/puppet/modules (no modules installed)
-
-       List installed modules from a specified environment:
-
-@@ -49,12 +49,12 @@ Puppet::Face.define(:module, '1.0.0') do
-         ├── puppetlabs-mysql (v0.0.1)
-         ├── puppetlabs-sqlite (v0.0.1)
-         └── puppetlabs-stdlib (v2.2.1)
--        /opt/puppetlabs/puppet/modules (no modules installed)
-+        /usr/share/puppetlabs/puppet/modules (no modules installed)
-
-       List installed modules from a specified modulepath:
-
--      $ puppet module list --modulepath /opt/puppetlabs/puppet/modules
--        /opt/puppetlabs/puppet/modules (no modules installed)
-+      $ puppet module list --modulepath /usr/share/puppetlabs/puppet/modules
-+        /usr/share/puppetlabs/puppet/modules (no modules installed)
-     EOT
-
-     when_invoked do |options|
-diff --git a/lib/puppet/face/module/uninstall.rb b/lib/puppet/face/module/uninstall.rb
-index 6e73bc6..7fa5ec7 100644
---- a/lib/puppet/face/module/uninstall.rb
-+++ b/lib/puppet/face/module/uninstall.rb
-@@ -17,8 +17,8 @@ Puppet::Face.define(:module, '1.0.0') do
-
-       Uninstall a module from a specific directory:
-
--      $ puppet module uninstall puppetlabs-ssh --modulepath /opt/puppetlabs/puppet/modules
--      Removed /opt/puppetlabs/puppet/modules/ssh (v1.0.0)
-+      $ puppet module uninstall puppetlabs-ssh --modulepath /usr/share/puppetlabs/puppet/modules
-+      Removed /usr/share/puppetlabs/puppet/modules/ssh (v1.0.0)
-
-       Uninstall a module from a specific environment:
-
-diff --git a/lib/puppet/provider/package/puppet_gem.rb b/lib/puppet/provider/package/puppet_gem.rb
-index e5cd381..64cb6f5 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/reference/configuration.rb b/lib/puppet/reference/configuration.rb
-index e747f9a..40882d8 100644
---- a/lib/puppet/reference/configuration.rb
-+++ b/lib/puppet/reference/configuration.rb
-@@ -23,7 +23,7 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
-     # Now print the data about the item.
-     val = object.default
-     if name.to_s == 'vardir'
--      val = 'Unix/Linux: /opt/puppetlabs/puppet/cache -- Windows: C:\ProgramData\PuppetLabs\puppet\cache -- Non-root user: ~/.puppetlabs/opt/puppet/cache'
-+      val = 'Unix/Linux: /var/lib/puppet -- Windows: C:\ProgramData\PuppetLabs\puppet\cache -- Non-root user: ~/.puppetlabs/opt/puppet/cache'
-     elsif name.to_s == 'confdir'
-       val = 'Unix/Linux: /etc/puppetlabs/puppet -- Windows: C:\ProgramData\PuppetLabs\puppet\etc -- Non-root user: ~/.puppetlabs/etc/puppet'
-     elsif name.to_s == 'codedir'
-diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
-index d0f9b9a..e7ecd40 100644
---- a/lib/puppet/util/run_mode.rb
-+++ b/lib/puppet/util/run_mode.rb
-@@ -67,7 +67,7 @@ module Puppet
-       end
-
-       def var_dir
--        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
-+        which_dir("/var/lib/puppet", "~/.puppetlabs/opt/puppet/cache")
-       end
-
-       def run_dir
-diff --git a/man/man5/puppet.conf.5 b/man/man5/puppet.conf.5
-index 8b46f57..5905fde 100644
---- a/man/man5/puppet.conf.5
-+++ b/man/man5/puppet.conf.5
-@@ -111,7 +111,7 @@ The search path for \fBglobal\fR modules\. Should be specified as a list of dire
- These are the modules that will be used by \fIall\fR environments\. Note that the \fBmodules\fR directory of the active environment will have priority over any global directories\. For more info, see \fIhttps://puppet\.com/docs/puppet/latest/environments_about\.html\fR
- .
- .IP "\(bu" 4
--\fIDefault\fR: $codedir/modules:/opt/puppetlabs/puppet/modules
-+\fIDefault\fR: $codedir/modules:/usr/share/puppetlabs/puppet/modules
- .
- .IP "" 0
- .
-@@ -1931,7 +1931,7 @@ The user Puppet Server will run as\. Used to ensure the agent side processes (ag
- Where Puppet stores dynamic and growing data\. The default for this setting is calculated specially, like \fBconfdir\fR_\.
- .
- .IP "\(bu" 4
--\fIDefault\fR: Unix/Linux: /opt/puppetlabs/puppet/cache \-\- Windows: C:\eProgramData\ePuppetLabs\epuppet\ecache \-\- Non\-root user: ~/\.puppetlabs/opt/puppet/cache
-+\fIDefault\fR: Unix/Linux: /var/lib/puppet \-\- Windows: C:\eProgramData\ePuppetLabs\epuppet\ecache \-\- Non\-root user: ~/\.puppetlabs/opt/puppet/cache
- .
- .IP "" 0
- .
-@@ -1939,7 +1939,7 @@ Where Puppet stores dynamic and growing data\. The default for this setting is c
- The directory containing \fBvendored\fR modules\. These modules will be used by \fIall\fR environments like those in the \fBbasemodulepath\fR\. The only difference is that modules in the \fBbasemodulepath\fR are pluginsynced, while vendored modules are not
- .
- .IP "\(bu" 4
--\fIDefault\fR: /opt/puppetlabs/puppet/vendor_modules
-+\fIDefault\fR: /usr/share/puppetlabs/puppet/vendor_modules
- .
- .IP "" 0
- .
-diff --git a/man/man8/puppet-config.8 b/man/man8/puppet-config.8
-index 3c8e65d..11db793 100644
---- a/man/man8/puppet-config.8
-+++ b/man/man8/puppet-config.8
-@@ -145,7 +145,7 @@ $ puppet config set rundir /var/run/puppetlabs
- Set the vardir for only the agent:
- .
- .P
--$ puppet config set vardir /opt/puppetlabs/puppet/cache \-\-section agent
-+$ puppet config set vardir /var/lib/puppet \-\-section agent
- .
- .SH "COPYRIGHT AND LICENSE"
- Copyright 2011 by Puppet Inc\. Apache 2 license; see COPYING
-diff --git a/man/man8/puppet-module.8 b/man/man8/puppet-module.8
-index 541142c..1f3ce39 100644
---- a/man/man8/puppet-module.8
-+++ b/man/man8/puppet-module.8
-@@ -271,13 +271,13 @@ $ puppet module install puppetlabs\-vcsrepo \-v 0\.0\.4 Preparing to install int
- Install a module into a specific directory:
- .
- .P
--$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/opt/puppetlabs/puppet/modules Preparing to install into /opt/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppet\.com \.\.\. Installing \-\- do not interrupt \.\.\. /opt/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
-+$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/usr/share/puppetlabs/puppet/modules Preparing to install into /usr/share/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppet\.com \.\.\. Installing \-\- do not interrupt \.\.\. /usr/share/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
- .
- .P
- Install a module into a specific directory and check for dependencies in other directories:
- .
- .P
--$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/opt/puppetlabs/puppet/modules \-\-modulepath /etc/puppetlabs/code/modules Preparing to install into /opt/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppet\.com \.\.\. Installing \-\- do not interrupt \.\.\. /opt/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
-+$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/usr/share/puppetlabs/puppet/modules \-\-modulepath /etc/puppetlabs/code/modules Preparing to install into /usr/share/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppet\.com \.\.\. Installing \-\- do not interrupt \.\.\. /usr/share/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
- .
- .P
- Install a module from a release archive:
-@@ -298,25 +298,25 @@ $ puppet module install puppetlabs\-vcsrepo\-0\.0\.4\.tar\.gz \-\-ignore\-depend
- List installed modules:
- .
- .P
--$ puppet module list /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /opt/puppetlabs/puppet/modules (no modules installed)
-+$ puppet module list /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /usr/share/puppetlabs/puppet/modules (no modules installed)
- .
- .P
- List installed modules in a tree view:
- .
- .P
--$ puppet module list \-\-tree /etc/puppetlabs/code/modules └─┬ puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-stdlib (v2\.2\.1) ├─┬ puppetlabs\-mysql (v0\.0\.1) │ └── bodepd\-create_resources (v0\.0\.1) └── puppetlabs\-sqlite (v0\.0\.1) /opt/puppetlabs/puppet/modules (no modules installed)
-+$ puppet module list \-\-tree /etc/puppetlabs/code/modules └─┬ puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-stdlib (v2\.2\.1) ├─┬ puppetlabs\-mysql (v0\.0\.1) │ └── bodepd\-create_resources (v0\.0\.1) └── puppetlabs\-sqlite (v0\.0\.1) /usr/share/puppetlabs/puppet/modules (no modules installed)
- .
- .P
- List installed modules from a specified environment:
- .
- .P
--$ puppet module list \-\-environment production /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /opt/puppetlabs/puppet/modules (no modules installed)
-+$ puppet module list \-\-environment production /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /usr/share/puppetlabs/puppet/modules (no modules installed)
- .
- .P
- List installed modules from a specified modulepath:
- .
- .P
--$ puppet module list \-\-modulepath /opt/puppetlabs/puppet/modules /opt/puppetlabs/puppet/modules (no modules installed)
-+$ puppet module list \-\-modulepath /usr/share/puppetlabs/puppet/modules /usr/share/puppetlabs/puppet/modules (no modules installed)
- .
- .P
- \fBsearch\fR
-@@ -340,7 +340,7 @@ $ puppet module uninstall puppetlabs\-ssh Removed /etc/puppetlabs/code/modules/s
- Uninstall a module from a specific directory:
- .
- .P
--$ puppet module uninstall puppetlabs\-ssh \-\-modulepath /opt/puppetlabs/puppet/modules Removed /opt/puppetlabs/puppet/modules/ssh (v1\.0\.0)
-+$ puppet module uninstall puppetlabs\-ssh \-\-modulepath /usr/share/puppetlabs/puppet/modules Removed /usr/share/puppetlabs/puppet/modules/ssh (v1\.0\.0)
- .
- .P
- Uninstall a module from a specific environment:
-diff --git a/spec/unit/defaults_spec.rb b/spec/unit/defaults_spec.rb
-index 9a6dc40..0632839 100644
---- a/spec/unit/defaults_spec.rb
-+++ b/spec/unit/defaults_spec.rb
-@@ -132,7 +132,7 @@ describe "Defaults" do
-     it 'includes the user and system modules', :unless => Puppet::Util::Platform.windows? do
-       expect(
-         Puppet[:basemodulepath]
--      ).to match(%r{.*/code/modules:/opt/puppetlabs/puppet/modules$})
-+      ).to match(%r{.*/code/modules:/usr/share/puppetlabs/puppet/modules$})
-     end
- 
-     describe 'on windows', :if => Puppet::Util::Platform.windows? do
-@@ -160,7 +160,7 @@ describe "Defaults" do
-     it 'includes the default vendormoduledir', :unless => Puppet::Util::Platform.windows? do
-       expect(
-         Puppet[:vendormoduledir]
--      ).to eq('/opt/puppetlabs/puppet/vendor_modules')
-+      ).to eq('/usr/share/puppetlabs/puppet/vendor_modules')
-     end
- 
-     describe 'on windows', :if => Puppet::Util::Platform.windows? do
-diff --git a/spec/unit/provider/package/puppet_gem_spec.rb b/spec/unit/provider/package/puppet_gem_spec.rb
-index 07e5fba..760af61 100644
---- a/spec/unit/provider/package/puppet_gem_spec.rb
-+++ b/spec/unit/provider/package/puppet_gem_spec.rb
-@@ -17,7 +17,7 @@ describe Puppet::Type.type(:package).provider(:puppet_gem) do
-   if Puppet::Util::Platform.windows?
-     let(:provider_gem_cmd) { 'gem' }
-   else
--    let(:provider_gem_cmd) { '/opt/puppetlabs/puppet/bin/gem' }
-+    let(:provider_gem_cmd) { '/usr/bin/gem' }
-   end
-
-   let(:execute_options) { {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}} }
-diff --git a/spec/unit/util/run_mode_spec.rb b/spec/unit/util/run_mode_spec.rb
-index 81855b1..d619588 100644
---- a/spec/unit/util/run_mode_spec.rb
-+++ b/spec/unit/util/run_mode_spec.rb
-@@ -73,8 +73,8 @@ describe Puppet::Util::RunMode do
-     end
-
-     describe "#var_dir" do
--      it "has vardir /opt/puppetlabs/puppet/cache when run as root" do
--        as_root { expect(@run_mode.var_dir).to eq(File.expand_path('/opt/puppetlabs/puppet/cache')) }
-+      it "has vardir /usr/share/puppetlabs/puppet/cache when run as root" do
-+        as_root { expect(@run_mode.var_dir).to eq(File.expand_path('/usr/share/puppetlabs/puppet/cache')) }
-       end
-
-       it "has vardir ~/.puppetlabs/opt/puppet/cache when run as non-root" do
diff --git a/gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg b/gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..2d64c0c0522426e9941e659e37467c6429f5609b
GIT binary patch
literal 2259
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

literal 0
HcmV?d00001

diff --git a/puppet-6.14.0.tar.gz.asc b/puppet-6.14.0.tar.gz.asc
deleted file mode 100644
index f72b229..0000000
--- a/puppet-6.14.0.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABCAAGBQJeZ+43AAoJEH9DgoDvjTSf7HwQAOi8xHp2Rs43/LW9Fe25oYrq
-2xxnhYRHDpOhSVJqWy3kbcz7TxVGebn7kPSV6f2NS3bTtqgY4WendI12M+P1ASdX
-FduoFPe3MyRqaHYT9SWK/plnwGaoQIV1Tn+YHXTFgrjciXcQBe6xUCxO5BqaWYoJ
-C5utT7jVSlf81sqgqXJrpZa7HHJS8m0VJHg6fCsH0wWwlW1Cn7ar9sQB+XLbtOl/
-7IX9luJ+sGhmBf+mkvWkpAnvXhgf/f8pDI9EJfMi2TU924rce1oWhlk509tj5c/W
-CASQhW9KctTWV6Krzuim6JYgtjRS0wi0ws1QpW19YpKneq5IqNpoNIG9WwfHfpyl
-dNqoYLFKwgWuGmqIhBZeZTTW7Slx4rhhmIB2nYefFPaM/jOWsZGRtZDvhD4DUDVp
-smBY6cnUGLmiGFwHjws/hWbBb9YbREIpjVe2wQviAxqoGAKKbg8WBec+DsP6tIjK
-PJ7OtJFnFMNNMpU+oqbb/m034WSzbs6lELdLLZv7MEHIEbuGYyj3GCLGZ60EgcqA
-gpT8J0w3xwMx9k7H4h9M3a0cKPeqE3RBA5JeCJ8nu2qVwhZJH5hcQOi9P4gYFoMv
-XQq0GhnEGYWM94i2+LbZIrgfEkg0+neABCG85PiOiCdHwnrl5BeJ8fxzYWB2Mo97
-umScFXq8AOMc7qtUydVw
-=tRG+
------END PGP SIGNATURE-----
diff --git a/puppet-6.17.0.tar.gz.asc b/puppet-6.17.0.tar.gz.asc
new file mode 100644
index 0000000..b4622a4
--- /dev/null
+++ b/puppet-6.17.0.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABCAAGBQJfDdkxAAoJEH9DgoDvjTSfO2IQANITfYFTu4fpqJqiFS2H01wv
+ZqjE035ncBNrJD0XQOZUqjhP4qsxgmn83xqXDeZcNkKNPWQu8622nZ6Jbkde++FA
+R2JOWlt7KsaolU+iwRuI2WKPWrhyrYrpupF7U5/6YsBccPFlmMiw89VUfkfiNXoW
+9t+DXWZxzOBhSaz+JZJE4GYEKXdIEbf6EtnaHUTYsb7JhYBKnW5CdRjJxxYZeORr
+jP8jizIALEgd9K/uM2v0EcQWBl28Fks9FoHrvUejBEqNlKN6ZgGoDWccbbK9b1mC
++UilBkmo7VR24KaW3I6P6XDWDCaGco2Wa5/j38djkD6CB89VlI89ojjLOOX7/npo
+zqlQfbES3UN7Ir1RO3/pAnoQjDIMdxMNJiDZbxrs+jLWAmG51YtRWdWZnn4nURaG
+yqOxeMqrUCgE67N88qSDrOO0/4Eb+NPHkv9feJbqRHjJ9hIC+Yv4gbqHUwcXowIl
+Sn9cGfOUZZsSVL2GQ1xnzfHk5/pEG1+Y6tc8BT/QHX0EqTBE9dC/P28NiM5loEgb
+Y5Wgpsj2StRSZTkwrPYFqKXND6qIP3IIUqCPQKcynfX4hrKY7x+eb4/8/577wzPL
+dh1F/JSJnuraYYIBLuK7f7FFPRfjMiKIN5NVHYWOqRRFEcN5prEJ41WuiiZ+KjS+
+BX8I9tAME+BQZTblybfq
+=/Irk
+-----END PGP SIGNATURE-----
diff --git a/puppet.spec b/puppet.spec
index d22f07c..61a2fec 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -2,50 +2,35 @@
 %global puppet_libdir %{ruby_vendorlibdir}
 
 Name:           puppet
-Version:        6.14.0
+Version:        6.17.0
 Release:        1%{?dist}
-Summary:        A network tool for managing many disparate systems
+Summary:        Network tool for managing many disparate systems
 License:        ASL 2.0
-URL:            http://puppetlabs.com
-Source0:        http://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.gz
-Source1:        http://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.gz.asc
-Source2:        https://forge.puppet.com/v3/files/puppetlabs-mount_core-1.0.3.tar.gz
-Source3:        https://forge.puppet.com/v3/files/puppetlabs-host_core-1.0.2.tar.gz
-Source4:        https://forge.puppet.com/v3/files/puppetlabs-augeas_core-1.0.4.tar.gz
-Source5:        https://forge.puppet.com/v3/files/puppetlabs-cron_core-1.0.3.tar.gz
-Source6:        https://forge.puppet.com/v3/files/puppetlabs-scheduled_task-2.0.1.tar.gz
-Source7:        https://forge.puppet.com/v3/files/puppetlabs-selinux_core-1.0.4.tar.gz
-Source8:        https://forge.puppet.com/v3/files/puppetlabs-sshkeys_core-2.0.0.tar.gz
-Source9:        https://forge.puppet.com/v3/files/puppetlabs-yumrepo_core-1.0.7.tar.gz
-Source10:       https://forge.puppet.com/v3/files/puppetlabs-zfs_core-1.0.5.tar.gz
-Source11:       https://forge.puppet.com/v3/files/puppetlabs-zone_core-1.0.3.tar.gz
-Source12:       puppet-nm-dispatcher.systemd
-Source13:       start-puppet-wrapper
-
-# Puppetlabs messed up with default paths
-Patch01: 0001-Fix-puppet-paths.patch
+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:        gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg
+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.0.5.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.1.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
 
 BuildArch: noarch
 
 # ruby-devel does not require the base package, but requires -libs instead
 BuildRequires: ruby
 BuildRequires: ruby-devel
+BuildRequires: ruby-facter
+BuildRequires: hiera
 BuildRequires: systemd
-BuildRequires: git
-BuildRequires: hiera >= 3.3.1
-BuildRequires: facter >= 3.9.6
-BuildRequires: facter-devel >= 3.9.6
-BuildRequires: ruby-facter >= 3.9.6
-BuildRequires: rubygem-semantic_puppet >= 1.0.2
-BuildRequires: rubygem-deep_merge
-BuildRequires: rubygem-httpclient
-BuildRequires: rubygem-multi_json
-BuildRequires: ruby-augeas >= 0.5.0
-BuildRequires: augeas >= 1.10.1
-BuildRequires: augeas-libs >= 1.10.1
-BuildRequires: cpp-hocon >= 0.2.1
-BuildRequires: cpp-hocon-devel >= 0.2.1
-BuildRequires: rubygem-concurrent-ruby >= 1.0.5
 Requires: hiera >= 3.3.1
 Requires: facter >= 3.9.6
 Requires: ruby-facter >= 3.9.6
@@ -59,10 +44,10 @@ 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
-%{!?_without_selinux:Requires: ruby(selinux), libselinux-utils}
 
 %description
 Puppet lets you centrally manage every important aspect of your system using a
@@ -71,22 +56,21 @@ normally aggregated in different files, like users, cron jobs, and hosts,
 along with obviously discrete elements like packages, services, and files.
 
 %prep
-%autosetup -S git
-%setup -D -b 2 puppetlabs-mount_core-1.0.3
-%setup -D -b 3 puppetlabs-host_core-1.0.2
-%setup -D -b 4 puppetlabs-augeas_core-1.0.4
-%setup -D -b 5 puppetlabs-cron_core-1.0.3
-%setup -D -b 6 puppetlabs-scheduled_task-2.0.1
-%setup -D -b 7 puppetlabs-selinux_core-1.0.4
-%setup -D -b 8 puppetlabs-sshkeys_core-2.0.0
-%setup -D -b 9 puppetlabs-yumrepo_core-1.0.7
-%setup -D -b 10 puppetlabs-zfs_core-1.0.5
-%setup -D -b 11 puppetlabs-zone_core-1.0.3
-
-%patch01 -p1
-
-%build
-# Nothing to build
+%{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} \
@@ -94,20 +78,15 @@ ruby install.rb --destdir=%{buildroot} \
  --logdir=%{_localstatedir}/log/puppetlabs/puppet \
  --rundir=%{_rundir}/puppet \
  --localedir=%{_datadir}/puppetlabs/puppet/locale \
- --vardir=/var/lib/puppet \
+ --vardir=%{_sharedstatedir}/puppet \
  --sitelibdir=%{puppet_libdir}
 
 mkdir -p %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules
-mv %{_builddir}/puppetlabs-mount_core-1.0.3 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/mount_core
-mv %{_builddir}/puppetlabs-host_core-1.0.2 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/host_core
-mv %{_builddir}/puppetlabs-augeas_core-1.0.4 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/augeas_core
-mv %{_builddir}/puppetlabs-cron_core-1.0.3 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/cron_core
-mv %{_builddir}/puppetlabs-scheduled_task-2.0.1 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/scheduled_task
-mv %{_builddir}/puppetlabs-selinux_core-1.0.4 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/selinux_core
-mv %{_builddir}/puppetlabs-sshkeys_core-2.0.0 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/sshkeys_core
-mv %{_builddir}/puppetlabs-yumrepo_core-1.0.7 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/yumrepo_core
-mv %{_builddir}/puppetlabs-zfs_core-1.0.5 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/zfs_core
-mv %{_builddir}/puppetlabs-zone_core-1.0.3 %{buildroot}/usr/share/puppetlabs/puppet/vendor_modules/zone_core
+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
 
@@ -115,7 +94,7 @@ install -Dp -m0644 ext/redhat/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/p
 install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/puppet.service
 ln -s %{_unitdir}/puppet.service %{buildroot}%{_unitdir}/puppetagent.service
 
-install -Dpv -m0755 %{SOURCE12} \
+install -Dpv -m0755 %{SOURCE13} \
  %{buildroot}%{nm_dispatcher_dir}/dispatcher.d/98-%{name}
 
 # Install the ext/ directory to %%{_datadir}/puppetlabs/%%{name}
@@ -124,13 +103,13 @@ 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 %{SOURCE13} %{buildroot}%{_bindir}/start-puppet-agent
-sed -i 's|^ExecStart=.*/bin/puppet|ExecStart=/usr/bin/start-puppet-agent|' \
+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 /run/%{name} 0755 %{name} %{name} -" > \
+echo "D %{_rundir}/%{name} 0755 %{name} %{name} -" > \
  %{buildroot}%{_tmpfilesdir}/%{name}.conf
 
 # Unbundle
@@ -138,9 +117,9 @@ echo "D /run/%{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}/usr/share/puppetlabs/puppet/ext/{debian,freebsd,gentoo,ips,osx,solaris,suse,windows}
-rm %{buildroot}/usr/share/puppetlabs/puppet/ext/redhat/*.init
-rm %{buildroot}/usr/share/puppetlabs/puppet/ext/{build_defaults.yaml,project_data.yaml}
+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
 %attr(-, puppet, puppet) %{_localstatedir}/log/puppetlabs
@@ -164,32 +143,32 @@ rm %{buildroot}/usr/share/puppetlabs/puppet/ext/{build_defaults.yaml,project_dat
 %{_datadir}/ruby/vendor_ruby/puppet_x.rb
 %{_sharedstatedir}/puppet
 %{_bindir}/puppet
-%{_mandir}/man5/puppet.conf.5.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-ssl.8.gz
-%{_mandir}/man8/puppet-status.8.gz
-%{_mandir}/man8/puppet-agent.8.gz
-%{_mandir}/man8/puppet.8.gz
-%{_mandir}/man8/puppet-apply.8.gz
-%{_mandir}/man8/puppet-catalog.8.gz
-%{_mandir}/man8/puppet-config.8.gz
-%{_mandir}/man8/puppet-describe.8.gz
-%{_mandir}/man8/puppet-device.8.gz
-%{_mandir}/man8/puppet-doc.8.gz
-%{_mandir}/man8/puppet-epp.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-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}/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-status.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-key.8*
+%{_mandir}/man8/puppet-lookup.8*
+%{_mandir}/man8/puppet-man.8*
+%{_mandir}/man8/puppet-module.8*
+%{_mandir}/man8/puppet-node.8*
+%{_mandir}/man8/puppet-parser.8*
 
 %config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppetlabs
 %config(noreplace) %attr(-, puppet, puppet) %dir %{_sysconfdir}/puppetlabs/puppet
@@ -199,7 +178,7 @@ rm %{buildroot}/usr/share/puppetlabs/puppet/ext/{build_defaults.yaml,project_dat
 %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}/puppetlabs
+%ghost %attr(755, puppet, puppet) %{_rundir}/%{name}
 
 %pre
 getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null
@@ -209,9 +188,17 @@ useradd -r -u 52 -g puppet -d /usr/local/puppetlabs -s /sbin/nologin \
 
 %post
 %systemd_post puppet.service
+
+%postun
 %systemd_postun_with_restart puppet.service
 
 
 %changelog
+* Fri Aug 28 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 6.17.0-1
+- Update to 6.17.0
+- Verify GPG key of the main tarball
+- Drop unneeded BuildRequires
+- Trivial fixes in packaging
+
 * Mon Jul 13 2020 Breno Brand Fernandes <brandfbb@gmail.com> - 6.14.0-1
 - Build of puppet 6.
diff --git a/sources b/sources
index cbd5162..67087c3 100644
--- a/sources
+++ b/sources
@@ -1,11 +1,11 @@
-SHA512 (puppet-6.14.0.tar.gz) = 066ad8de6393cb58b1f92fae450dc72dabcbe912cdbb3417848a66955fe17696a68abf67d86b107a2b1c54e7037d38da7264a9234a8833b56065c8e407ff57a4
-SHA512 (puppetlabs-augeas_core-1.0.4.tar.gz) = b40d9fcfb7afa5143ed4b715a326939635bc9fa1c243b66c9e4341e3a6a90f7ff34b4cb27dd8040e1b027fbe350f8cd69db9dee1628c8fcb96e978c4eae97da0
-SHA512 (puppetlabs-cron_core-1.0.3.tar.gz) = c305ee2e6c9f97956ad1107076ae0a37a307ab577bbc8270ad833c6dd845dcb44685cde1726709ebaac2f7a8bcd257728429d02a84405803b08222799b2ea6b8
-SHA512 (puppetlabs-host_core-1.0.2.tar.gz) = 3e79eef4de5635ab0d5f9407345a832fad669fbc0b28ecfae11a79162ad9a3561394db70bd4a93d7c210159577f6455aca9889e0f110c94a38bbe981047fef74
-SHA512 (puppetlabs-mount_core-1.0.3.tar.gz) = 61ffc116fb22c03f79a7c4abe1679cb2f90577c7e6403b1cb6f7acbd2eff7b89bcd6906c71c9faa9b9df4ee8fe1c7077b99ff918454059f4c15509509d1611e7
-SHA512 (puppetlabs-scheduled_task-2.0.1.tar.gz) = aea50e3636b3091aff4cc4890d78a081035c10d9cbf99a42bbb509d3edbd32463b582a0d701f1771070d9fe4b3dfb5e93acbe37bdb0bd92b984ffa16a913e257
+SHA512 (puppet-6.17.0.tar.gz) = 2ebf31cce1dcc4ce0bf9403f56d3f97a41a4014111be1f27e340de8e4db157549bc4609068ee6396be3c88ff1a93b40792692a5b01140fa66a1f5a82453ba1d1
+SHA512 (puppetlabs-augeas_core-1.0.5.tar.gz) = 3f648472b0bc39eff78b9be8f4f6ff466144710c34e1180f1a0e8072fd2b9df9261459a00c954920abe3815ae438428be66d80d15e64aabce501084634eeef31
+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.0.0.tar.gz) = 5e256294f0f38b2f493b5894144ae05259589f1a9b1592581447d7ff6e868458e6a4890a726748c54cb87d524570c69fa29aa9ce7220e670a5f3c5fb0bfcaf53
+SHA512 (puppetlabs-sshkeys_core-2.1.0.tar.gz) = acc9877bcb076376f0c2184b19f3b79e042506d663e2ffaccf226bbd2025e57a5c718214ed920c8c4dbb0ad3fbf167073137e816898ac3ea93c859cbd7542f1f
 SHA512 (puppetlabs-yumrepo_core-1.0.7.tar.gz) = 8fb3cb40077ac113c332a761c01c1d7ce4bdfff1016be696efb41be20c86ff688b40b83c00a47394d79e64941cf6c23ea4bbd1107b4c7856d1b481733cb2d7ce
-SHA512 (puppetlabs-zfs_core-1.0.5.tar.gz) = e87afd7ed5bfa9bee6bc50477992dd5e7f1614095af6506e5643919ac7e35f613e4edf4fdb69cbe17dd8a84a5df28e33189efb97de098ba0d5e9f42def186132
+SHA512 (puppetlabs-zfs_core-1.1.0.tar.gz) = cda1fcc55a54b4690c81edadf6c62e849db80b5f09a5310cdd9b82d0cef374432c2c62b98e5c8e8cc2bbb8d22007ddb3694b88208658ff303fdd608a76c15e0b
 SHA512 (puppetlabs-zone_core-1.0.3.tar.gz) = 1083bcc810e8a7b048fad1c70656d806c65b5fa912c627bf1dfaf3b9d8a0ec675db100abc2fc6499669c17927ea3e55a5c968fde0e577fc1f4cebb1fbd5e0851

From b23dbcfd58ac455e6fb2506d0dbd6798872988ba Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Fri, 28 Aug 2020 18:00:58 +0200
Subject: [PATCH 4/9] Add dependency on rubygem-json

It is actually mandatory dependency from the util/json.rb.

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 puppet.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/puppet.spec b/puppet.spec
index 61a2fec..31acbb0 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -39,6 +39,7 @@ 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

From e0bf460885227db2ba631876362ad1ae36ae7dce Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Sat, 26 Sep 2020 08:49:06 +0200
Subject: [PATCH 5/9] Update to 6.18.0

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 .gitignore               |  1 +
 puppet-6.17.0.tar.gz.asc | 17 -----------------
 puppet-6.18.0.tar.gz.asc | 17 +++++++++++++++++
 puppet.spec              |  5 ++++-
 sources                  |  2 +-
 5 files changed, 23 insertions(+), 19 deletions(-)
 delete mode 100644 puppet-6.17.0.tar.gz.asc
 create mode 100644 puppet-6.18.0.tar.gz.asc

diff --git a/.gitignore b/.gitignore
index 4a88c46..576d609 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /puppetlabs-scheduled_task-2.2.1.tar.gz
 /puppetlabs-sshkeys_core-2.1.0.tar.gz
 /puppetlabs-zfs_core-1.1.0.tar.gz
+/puppet-6.18.0.tar.gz
diff --git a/puppet-6.17.0.tar.gz.asc b/puppet-6.17.0.tar.gz.asc
deleted file mode 100644
index b4622a4..0000000
--- a/puppet-6.17.0.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABCAAGBQJfDdkxAAoJEH9DgoDvjTSfO2IQANITfYFTu4fpqJqiFS2H01wv
-ZqjE035ncBNrJD0XQOZUqjhP4qsxgmn83xqXDeZcNkKNPWQu8622nZ6Jbkde++FA
-R2JOWlt7KsaolU+iwRuI2WKPWrhyrYrpupF7U5/6YsBccPFlmMiw89VUfkfiNXoW
-9t+DXWZxzOBhSaz+JZJE4GYEKXdIEbf6EtnaHUTYsb7JhYBKnW5CdRjJxxYZeORr
-jP8jizIALEgd9K/uM2v0EcQWBl28Fks9FoHrvUejBEqNlKN6ZgGoDWccbbK9b1mC
-+UilBkmo7VR24KaW3I6P6XDWDCaGco2Wa5/j38djkD6CB89VlI89ojjLOOX7/npo
-zqlQfbES3UN7Ir1RO3/pAnoQjDIMdxMNJiDZbxrs+jLWAmG51YtRWdWZnn4nURaG
-yqOxeMqrUCgE67N88qSDrOO0/4Eb+NPHkv9feJbqRHjJ9hIC+Yv4gbqHUwcXowIl
-Sn9cGfOUZZsSVL2GQ1xnzfHk5/pEG1+Y6tc8BT/QHX0EqTBE9dC/P28NiM5loEgb
-Y5Wgpsj2StRSZTkwrPYFqKXND6qIP3IIUqCPQKcynfX4hrKY7x+eb4/8/577wzPL
-dh1F/JSJnuraYYIBLuK7f7FFPRfjMiKIN5NVHYWOqRRFEcN5prEJ41WuiiZ+KjS+
-BX8I9tAME+BQZTblybfq
-=/Irk
------END PGP SIGNATURE-----
diff --git a/puppet-6.18.0.tar.gz.asc b/puppet-6.18.0.tar.gz.asc
new file mode 100644
index 0000000..ce14dad
--- /dev/null
+++ b/puppet-6.18.0.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABCAAGBQJfRThMAAoJEH9DgoDvjTSfthIQANF3fnJxe6I3s2lpbkZBCxbd
+JlVI3e3enz+yXcTc/eqxoQ1sAskK8Skgc60bG6L9bH5HkAGsSEL05lYZ7/1Tjctv
+TmrRc0tLNkHlzTRJc69qtvnskPvdRG/By3ylGLY+7Qrg8QWswZ4sjMC/4SJpDfrE
+KGEfNWIIwOmO5nDNtytMrcQAgKD5WLv61LR00bpD0KtL9uQGscomSaHllZJmWC9P
+tDaxsJ34dsHUcKwXP0jHogYNnNe6JfTxYOfYk+4cAmtTYslU3/LEKyYBs/W9tKhX
+dD0NBY6EGiuTlA6t/gQ0j9VhMeZMShgaPiDnfz9CX6Y5vK2DKRAgYn/OTzmni8xq
+1Nw/KH24bQdKeHDhz/vdaHcCE3wzNLamiZo5HQmSnbE2s1T434nHE6xHLYAWQzcq
+xbAxJybUnH35vnFYfvDeUc4eQ8FfjF/lmY9xePr3wMFdA1gEoY3UJBIcIAhvcUcO
+XqW0OOxc19L/t8dgGI658aHepw+8aSbuSWUaiGEskjw6MXKkg7N5p9laAEyP4rBz
+IK5jX70uIsYpJGEyPwV2MgwCcDEbd3NMH1EgCym352HXaYQ7iWnR8JVsB8T5k5We
+PAEOOSiPLBgs/mbOCB9hOVLOLQ4OrlRGB4zpdbthypQY/vnwL9XiBB5i3ezJy7/h
+vvnzkBecaI3fISSsRZyO
+=CnED
+-----END PGP SIGNATURE-----
diff --git a/puppet.spec b/puppet.spec
index 31acbb0..cd58e49 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -2,7 +2,7 @@
 %global puppet_libdir %{ruby_vendorlibdir}
 
 Name:           puppet
-Version:        6.17.0
+Version:        6.18.0
 Release:        1%{?dist}
 Summary:        Network tool for managing many disparate systems
 License:        ASL 2.0
@@ -195,6 +195,9 @@ useradd -r -u 52 -g puppet -d /usr/local/puppetlabs -s /sbin/nologin \
 
 
 %changelog
+* Sat Sep 26 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 6.18.0-1
+- Update to 6.18.0
+
 * Fri Aug 28 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 6.17.0-1
 - Update to 6.17.0
 - Verify GPG key of the main tarball
diff --git a/sources b/sources
index 67087c3..bdd2dbb 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (puppet-6.17.0.tar.gz) = 2ebf31cce1dcc4ce0bf9403f56d3f97a41a4014111be1f27e340de8e4db157549bc4609068ee6396be3c88ff1a93b40792692a5b01140fa66a1f5a82453ba1d1
+SHA512 (puppet-6.18.0.tar.gz) = a14994aea502fbc78219967e2d711952b580df1e7befeab2d254a73f28036c6c7923d167a20bc61c9abe76000f93dcd3cba92b3353540e2a26fc27b10b06efe1
 SHA512 (puppetlabs-augeas_core-1.0.5.tar.gz) = 3f648472b0bc39eff78b9be8f4f6ff466144710c34e1180f1a0e8072fd2b9df9261459a00c954920abe3815ae438428be66d80d15e64aabce501084634eeef31
 SHA512 (puppetlabs-cron_core-1.0.4.tar.gz) = bdeab644f8f6084dcb8331edb207f5634672e512bf3573d85bb5eadcb979f83da7fb5ccbec150383d903bced3d0f05a7c20d4394abc2c479e194cff6646cb0ee
 SHA512 (puppetlabs-host_core-1.0.3.tar.gz) = 09b4084663f4f6886380a473d26d1b759026f345bd3850084ac4f3ef59ed8ab2396fecdb3c836591d9097b9c5252ba794c4b7d3296b8321ff401f8a956ad093c

From 6a8f1776b74a60cf85bacd36bfbb00f6bdd3f7df Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Thu, 22 Oct 2020 10:40:31 +0200
Subject: [PATCH 6/9] Update to 6.19.0

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 .gitignore               |  3 +++
 puppet-6.18.0.tar.gz.asc | 17 -----------------
 puppet-6.19.0.tar.gz.asc | 17 +++++++++++++++++
 puppet.spec              |  9 ++++++---
 sources                  |  6 +++---
 5 files changed, 29 insertions(+), 23 deletions(-)
 delete mode 100644 puppet-6.18.0.tar.gz.asc
 create mode 100644 puppet-6.19.0.tar.gz.asc

diff --git a/.gitignore b/.gitignore
index 576d609..7f2ba30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,6 @@
 /puppetlabs-sshkeys_core-2.1.0.tar.gz
 /puppetlabs-zfs_core-1.1.0.tar.gz
 /puppet-6.18.0.tar.gz
+/puppet-6.19.0.tar.gz
+/puppetlabs-augeas_core-1.1.1.tar.gz
+/puppetlabs-sshkeys_core-2.2.0.tar.gz
diff --git a/puppet-6.18.0.tar.gz.asc b/puppet-6.18.0.tar.gz.asc
deleted file mode 100644
index ce14dad..0000000
--- a/puppet-6.18.0.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABCAAGBQJfRThMAAoJEH9DgoDvjTSfthIQANF3fnJxe6I3s2lpbkZBCxbd
-JlVI3e3enz+yXcTc/eqxoQ1sAskK8Skgc60bG6L9bH5HkAGsSEL05lYZ7/1Tjctv
-TmrRc0tLNkHlzTRJc69qtvnskPvdRG/By3ylGLY+7Qrg8QWswZ4sjMC/4SJpDfrE
-KGEfNWIIwOmO5nDNtytMrcQAgKD5WLv61LR00bpD0KtL9uQGscomSaHllZJmWC9P
-tDaxsJ34dsHUcKwXP0jHogYNnNe6JfTxYOfYk+4cAmtTYslU3/LEKyYBs/W9tKhX
-dD0NBY6EGiuTlA6t/gQ0j9VhMeZMShgaPiDnfz9CX6Y5vK2DKRAgYn/OTzmni8xq
-1Nw/KH24bQdKeHDhz/vdaHcCE3wzNLamiZo5HQmSnbE2s1T434nHE6xHLYAWQzcq
-xbAxJybUnH35vnFYfvDeUc4eQ8FfjF/lmY9xePr3wMFdA1gEoY3UJBIcIAhvcUcO
-XqW0OOxc19L/t8dgGI658aHepw+8aSbuSWUaiGEskjw6MXKkg7N5p9laAEyP4rBz
-IK5jX70uIsYpJGEyPwV2MgwCcDEbd3NMH1EgCym352HXaYQ7iWnR8JVsB8T5k5We
-PAEOOSiPLBgs/mbOCB9hOVLOLQ4OrlRGB4zpdbthypQY/vnwL9XiBB5i3ezJy7/h
-vvnzkBecaI3fISSsRZyO
-=CnED
------END PGP SIGNATURE-----
diff --git a/puppet-6.19.0.tar.gz.asc b/puppet-6.19.0.tar.gz.asc
new file mode 100644
index 0000000..eb70f9d
--- /dev/null
+++ b/puppet-6.19.0.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABCAAGBQJfjxxrAAoJEH9DgoDvjTSf1XkP/ijzAjlw2C5PATRWpT0Zgg03
+IqGUkqHQX8ZFRDywypYlZlSLKChreF6jGBWWuiH3i6Bg+rnIU4JvpOX2VN1lVeo7
+XLqlKuL8fIrp6oeqO+0ejnGWbFPJtqddV/nLavU3VV7YO/ujrk02ACoQnZDOx7Z2
+V/Eb9akwUH7cMf+c/x54sC0fwHpXtT6DIAJiH9N6pZurad6lqwYxRLlyawlW0qQi
+BlW63JzW2aZRV2gGbWAouLZKFc6G2Q9MwdhK4NLKzrzbWeXla8fhFKFmK3JbXF/d
+GReeF2UWplVhWYx85bFVWpdORoN6mrk5ng8K5Eq8+63wFLgaPFFu/fNlTk9UYZh/
+UNGGUdAd26TdW9fnIeW/Qh5GmW1dPusNBA2zEZ/oygVqv6tuZg2ZXf27t//L7RLY
+/S9czEZmff6QONcY/Gcigvt4fr/bpJqQAQwr+PW52lV1WqNKrtCI9CuTxODlkEjx
+creVvp7/fIGq1Y4o1NvwzMRDH8lHfX497OSeY5ahJTZpqQRKcIv7QawVdELJIC5B
+338R7tirIhJjBdeFndfr3M6SO4Qzi7SwnMz0LAscsy7Z0PAxn/nfe4f5P5RaEkpA
+d7lvP4GOc3x7k/IclEXpnSJS9T4/pHhcYwd7/PFCih8cwTkPq539HgyslziYUPPF
+r/l/AyQGB+zKrkfgrw7R
+=/v0J
+-----END PGP SIGNATURE-----
diff --git a/puppet.spec b/puppet.spec
index cd58e49..8b8c4f4 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -2,7 +2,7 @@
 %global puppet_libdir %{ruby_vendorlibdir}
 
 Name:           puppet
-Version:        6.18.0
+Version:        6.19.0
 Release:        1%{?dist}
 Summary:        Network tool for managing many disparate systems
 License:        ASL 2.0
@@ -12,11 +12,11 @@ Source1:        https://downloads.puppetlabs.com/puppet/%{name}-%{version}.tar.g
 Source2:        gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg
 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.0.5.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.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
 Source12:       https://forge.puppet.com/v3/files/puppetlabs-zone_core-1.0.3.tar.gz
@@ -195,6 +195,9 @@ useradd -r -u 52 -g puppet -d /usr/local/puppetlabs -s /sbin/nologin \
 
 
 %changelog
+* Thu Oct 22 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 6.19.0-1
+- Update to 6.19.0
+
 * Sat Sep 26 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 6.18.0-1
 - Update to 6.18.0
 
diff --git a/sources b/sources
index bdd2dbb..a541611 100644
--- a/sources
+++ b/sources
@@ -1,11 +1,11 @@
-SHA512 (puppet-6.18.0.tar.gz) = a14994aea502fbc78219967e2d711952b580df1e7befeab2d254a73f28036c6c7923d167a20bc61c9abe76000f93dcd3cba92b3353540e2a26fc27b10b06efe1
-SHA512 (puppetlabs-augeas_core-1.0.5.tar.gz) = 3f648472b0bc39eff78b9be8f4f6ff466144710c34e1180f1a0e8072fd2b9df9261459a00c954920abe3815ae438428be66d80d15e64aabce501084634eeef31
+SHA512 (puppet-6.19.0.tar.gz) = 88f9731e435234d74aba6b46793d44be6e97848b4365cae1b02641102dc2e1638b8912404912ebd2e49a9fe0f6c88fa06c3c4a22c91ff5ecc45a9bec386d357e
+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.1.0.tar.gz) = acc9877bcb076376f0c2184b19f3b79e042506d663e2ffaccf226bbd2025e57a5c718214ed920c8c4dbb0ad3fbf167073137e816898ac3ea93c859cbd7542f1f
+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 4a3f654feaf27cd1c8b7b2bd477b94f95a8e153f Mon Sep 17 00:00:00 2001
From: Breno Brand Fernandes <brandfbb@gmail.com>
Date: Thu, 18 Nov 2021 18:05:45 -0500
Subject: [PATCH 7/9] Bump to 6.25.1

---
 RPM-GPG-KEY-puppet-20250406                   |  31 ++++++++++++++++++
 ...6B15509CF8E59E6E469F327F438280EF8D349F.gpg | Bin 2259 -> 0 bytes
 logrotate                                     |  21 ++++++++++++
 puppet.spec                                   |  13 +++++---
 4 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 RPM-GPG-KEY-puppet-20250406
 delete mode 100644 gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg
 create mode 100644 logrotate

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/gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg b/gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg
deleted file mode 100644
index 2d64c0c0522426e9941e659e37467c6429f5609b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2259
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

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 8b8c4f4..932c27c 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -2,14 +2,14 @@
 %global puppet_libdir %{ruby_vendorlibdir}
 
 Name:           puppet
-Version:        6.19.0
+Version:        6.25.1
 Release:        1%{?dist}
 Summary:        Network tool for managing many disparate systems
 License:        ASL 2.0
 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:        gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg
+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
@@ -22,6 +22,7 @@ Source11:       https://forge.puppet.com/v3/files/puppetlabs-zfs_core-1.1.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
 
@@ -89,7 +90,7 @@ for d in $(find -mindepth 1 -maxdepth 1 -type d -name 'puppetlabs-*'); do
   cp -a $d %{buildroot}%{_datadir}/puppetlabs/puppet/vendor_modules/$mod
 done
 
-install -Dp -m0644 ext/redhat/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
+install -Dp -m0644 %{SOURCE15} %{buildroot}%{_sysconfdir}/logrotate.d/puppet
 
 %{__install} -d -m0755 %{buildroot}%{_unitdir}
 install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/puppet.service
@@ -101,7 +102,6 @@ install -Dpv -m0755 %{SOURCE13} \
 # 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
@@ -118,7 +118,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}/puppetlabs/puppet/ext/{debian,freebsd,gentoo,ips,osx,solaris,suse,windows}
+rm -r %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{debian,solaris,suse,windows}
 rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/redhat/*.init
 rm %{buildroot}%{_datadir}/puppetlabs/puppet/ext/{build_defaults.yaml,project_data.yaml}
 
@@ -195,6 +195,9 @@ useradd -r -u 52 -g puppet -d /usr/local/puppetlabs -s /sbin/nologin \
 
 
 %changelog
+* Thu Nov 18 2021 Breno Brand Fernandes <brandfbb@gmail.com> - 6.25.1-1
+- Update to 6.25.1
+
 * Thu Oct 22 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 6.19.0-1
 - Update to 6.19.0
 

From 96115c35646b70e54ca927305ad8b262d7d6a86c Mon Sep 17 00:00:00 2001
From: Breno Brand Fernandes <brandfbb@gmail.com>
Date: Thu, 18 Nov 2021 18:13:05 -0500
Subject: [PATCH 8/9] Updating sources

---
 .gitignore               |  1 +
 puppet-6.19.0.tar.gz.asc | 17 -----------------
 puppet-6.25.1.tar.gz.asc | 17 +++++++++++++++++
 sources                  |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 puppet-6.19.0.tar.gz.asc
 create mode 100644 puppet-6.25.1.tar.gz.asc

diff --git a/.gitignore b/.gitignore
index 7f2ba30..f78b234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /puppet-6.19.0.tar.gz
 /puppetlabs-augeas_core-1.1.1.tar.gz
 /puppetlabs-sshkeys_core-2.2.0.tar.gz
+/puppet-6.25.1.tar.gz
diff --git a/puppet-6.19.0.tar.gz.asc b/puppet-6.19.0.tar.gz.asc
deleted file mode 100644
index eb70f9d..0000000
--- a/puppet-6.19.0.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABCAAGBQJfjxxrAAoJEH9DgoDvjTSf1XkP/ijzAjlw2C5PATRWpT0Zgg03
-IqGUkqHQX8ZFRDywypYlZlSLKChreF6jGBWWuiH3i6Bg+rnIU4JvpOX2VN1lVeo7
-XLqlKuL8fIrp6oeqO+0ejnGWbFPJtqddV/nLavU3VV7YO/ujrk02ACoQnZDOx7Z2
-V/Eb9akwUH7cMf+c/x54sC0fwHpXtT6DIAJiH9N6pZurad6lqwYxRLlyawlW0qQi
-BlW63JzW2aZRV2gGbWAouLZKFc6G2Q9MwdhK4NLKzrzbWeXla8fhFKFmK3JbXF/d
-GReeF2UWplVhWYx85bFVWpdORoN6mrk5ng8K5Eq8+63wFLgaPFFu/fNlTk9UYZh/
-UNGGUdAd26TdW9fnIeW/Qh5GmW1dPusNBA2zEZ/oygVqv6tuZg2ZXf27t//L7RLY
-/S9czEZmff6QONcY/Gcigvt4fr/bpJqQAQwr+PW52lV1WqNKrtCI9CuTxODlkEjx
-creVvp7/fIGq1Y4o1NvwzMRDH8lHfX497OSeY5ahJTZpqQRKcIv7QawVdELJIC5B
-338R7tirIhJjBdeFndfr3M6SO4Qzi7SwnMz0LAscsy7Z0PAxn/nfe4f5P5RaEkpA
-d7lvP4GOc3x7k/IclEXpnSJS9T4/pHhcYwd7/PFCih8cwTkPq539HgyslziYUPPF
-r/l/AyQGB+zKrkfgrw7R
-=/v0J
------END PGP SIGNATURE-----
diff --git a/puppet-6.25.1.tar.gz.asc b/puppet-6.25.1.tar.gz.asc
new file mode 100644
index 0000000..7594510
--- /dev/null
+++ b/puppet-6.25.1.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABCAAGBQJhiqx3AAoJEEUots2eYe8mfVkQALzen674oNAVarYrv6gvsnVq
+A+X9JHFFFCm2SEi9WMlkvU+1dsWJoqMyXbsKfJGUINlWbEbv8Gm7izY0cvyGcHmV
+dPrB/GmqAj1Rxuc29llABjy5VThWC/r7+4sbcwPX5CQ/sJwvE15JtYpMbPit9YtJ
+76bxY8G7fv2Vq+lyRFtskmJ3OOvX4endccgf5qkdj1jo247zjBXhBejPvaBHYtFp
+QvV5/mjpsGKt2yY6c0UJES15Sw2CLIDFr3JsaM2ADUIfc+7PP36JCT9hq60Lsl1o
+8OWZZ+ruztFIQl6AKWjHJgnBMWxqqofJGCy1CXXdbOGt117eShsNfh2D+Bw70atM
+y1Lb8l383VAFf0n8yqXjTvyU/lgHxC9nBtCMmPNrLEmOwqIR1hU0RtCEbwdC4izw
+SnZKEI3SMM/dyalmGrkl5Tr26iMkAxpAIVlREH0eO0RYZXpJry5r1kcsuhKjiUsU
+9P6M//5ltrmSZsxRfrdqwd8ulZgPktZN2D6Pimzvz68WE3RGRIcaazvTu3uIVF3K
+pP7IND37H73QqJ9/u4QnSwBzX440LwEN9O+LKHqovqJaZFw7FV99IbD2+ETtKlPS
+3dxM3GhIm7KZ2nw8xj1L+XRp8LrtBah1kCGv7jjuIJu2jvV58uNvgpMrPSFylLl0
+OOSSfYgOPTh8JX4l+lQE
+=rZpx
+-----END PGP SIGNATURE-----
diff --git a/sources b/sources
index a541611..f5000cf 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (puppet-6.19.0.tar.gz) = 88f9731e435234d74aba6b46793d44be6e97848b4365cae1b02641102dc2e1638b8912404912ebd2e49a9fe0f6c88fa06c3c4a22c91ff5ecc45a9bec386d357e
+SHA512 (puppet-6.25.1.tar.gz) = 88000578cbcdc09165512345ef8f4182635ad5508279ccdec9ca8019663c485adf01e0db8adbb6ad7c9089d96a98524b2e62136af68c18bcb2834764c02402a1
 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

From 18faf1003565bd699cda72e90d77b5c7f80beb45 Mon Sep 17 00:00:00 2001
From: Breno Brand Fernandes <brandfbb@gmail.com>
Date: Wed, 26 Jan 2022 15:02:33 -0500
Subject: [PATCH 9/9] Update to 6.26.0

---
 .gitignore               |  1 +
 puppet-6.25.1.tar.gz.asc | 17 -----------------
 puppet-6.26.0.tar.gz.asc | 17 +++++++++++++++++
 puppet.spec              |  5 ++++-
 sources                  |  2 +-
 5 files changed, 23 insertions(+), 19 deletions(-)
 delete mode 100644 puppet-6.25.1.tar.gz.asc
 create mode 100644 puppet-6.26.0.tar.gz.asc

diff --git a/.gitignore b/.gitignore
index f78b234..80f5985 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /puppetlabs-augeas_core-1.1.1.tar.gz
 /puppetlabs-sshkeys_core-2.2.0.tar.gz
 /puppet-6.25.1.tar.gz
+/puppet-6.26.0.tar.gz
diff --git a/puppet-6.25.1.tar.gz.asc b/puppet-6.25.1.tar.gz.asc
deleted file mode 100644
index 7594510..0000000
--- a/puppet-6.25.1.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABCAAGBQJhiqx3AAoJEEUots2eYe8mfVkQALzen674oNAVarYrv6gvsnVq
-A+X9JHFFFCm2SEi9WMlkvU+1dsWJoqMyXbsKfJGUINlWbEbv8Gm7izY0cvyGcHmV
-dPrB/GmqAj1Rxuc29llABjy5VThWC/r7+4sbcwPX5CQ/sJwvE15JtYpMbPit9YtJ
-76bxY8G7fv2Vq+lyRFtskmJ3OOvX4endccgf5qkdj1jo247zjBXhBejPvaBHYtFp
-QvV5/mjpsGKt2yY6c0UJES15Sw2CLIDFr3JsaM2ADUIfc+7PP36JCT9hq60Lsl1o
-8OWZZ+ruztFIQl6AKWjHJgnBMWxqqofJGCy1CXXdbOGt117eShsNfh2D+Bw70atM
-y1Lb8l383VAFf0n8yqXjTvyU/lgHxC9nBtCMmPNrLEmOwqIR1hU0RtCEbwdC4izw
-SnZKEI3SMM/dyalmGrkl5Tr26iMkAxpAIVlREH0eO0RYZXpJry5r1kcsuhKjiUsU
-9P6M//5ltrmSZsxRfrdqwd8ulZgPktZN2D6Pimzvz68WE3RGRIcaazvTu3uIVF3K
-pP7IND37H73QqJ9/u4QnSwBzX440LwEN9O+LKHqovqJaZFw7FV99IbD2+ETtKlPS
-3dxM3GhIm7KZ2nw8xj1L+XRp8LrtBah1kCGv7jjuIJu2jvV58uNvgpMrPSFylLl0
-OOSSfYgOPTh8JX4l+lQE
-=rZpx
------END PGP SIGNATURE-----
diff --git a/puppet-6.26.0.tar.gz.asc b/puppet-6.26.0.tar.gz.asc
new file mode 100644
index 0000000..61cd309
--- /dev/null
+++ b/puppet-6.26.0.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABCAAGBQJh6ZmQAAoJEEUots2eYe8mnOgP/1aX8OwhGx8uZMVaqUSL5ZEH
+q+y5PY+UVV5mDhpzAiF4T+aJJ1PpZ5nr+5RFxMz4H8m8btLK35mhZJf2jFZ4aBrM
+k5OXG9M3L26YfoLbAM2JEpFGpli/wXi6tTOUg3Yfx0qNfjagaYJtL6YvntlOexa0
+lsIWTmlkVcyIMY1K26PIfIQOpolsxEGQeoBfr/oKvPVTbkbiG3y/SDcF0H2FcppE
+85vwvOk7InrQvl3+JNmfsgX5GIE9SqG3bkWY8KXJrguynium5Ige55vrVpbl1eNc
+A6yhTCzfqPM8QXnp3ze6snpu3ksCQ6yovWBlO7bfX9M47PZau/8FS7pYy06oI0FD
+1G9TJwF96LqaCLgnBLKcbcoze0vxxfcap5gxnWxh3iXh++31Mh3b6JIpski4tOy+
+lBpNTTnttYA/86ROIQCPgTDGIwcXWprvO/2tUTXne5KUIRhSZghrexEHLoKiQoFO
+Ry2HKYVulPPi+1PuMFUleBqsgmWVpQZZ8u0opEQgTqNHbGFYx88aSSL4MuF+5Msv
+Lno1J7FD/4ctu+ck0Xc7+rWqSLC2hK6FVS555/quIyV9gJODcW/fEB8tSLoZUPCc
+ex4Iy1wu0u1KnmVcOC8WiP2gcWJS67TDl9U3CFzks6CGBjwu6n+RlS3TmZu7l/C6
+Ea7562XrM8z9HOSQ+ymE
+=degl
+-----END PGP SIGNATURE-----
diff --git a/puppet.spec b/puppet.spec
index 932c27c..9337c11 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -2,7 +2,7 @@
 %global puppet_libdir %{ruby_vendorlibdir}
 
 Name:           puppet
-Version:        6.25.1
+Version:        6.26.0
 Release:        1%{?dist}
 Summary:        Network tool for managing many disparate systems
 License:        ASL 2.0
@@ -195,6 +195,9 @@ useradd -r -u 52 -g puppet -d /usr/local/puppetlabs -s /sbin/nologin \
 
 
 %changelog
+* Wed Jan 26 2022 Breno Brand Fernandes <brandfbb@gmail.com> - 6.26.0-1
+- Update to 6.26.0
+
 * Thu Nov 18 2021 Breno Brand Fernandes <brandfbb@gmail.com> - 6.25.1-1
 - Update to 6.25.1
 
diff --git a/sources b/sources
index f5000cf..45300f0 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (puppet-6.25.1.tar.gz) = 88000578cbcdc09165512345ef8f4182635ad5508279ccdec9ca8019663c485adf01e0db8adbb6ad7c9089d96a98524b2e62136af68c18bcb2834764c02402a1
+SHA512 (puppet-6.26.0.tar.gz) = 7fe4d0dd9d3ae93095d8196499ee532865e7a81d2795a377ae0ca1bff45bc38b59df1643210c5f8cff8edf63780a41171191b10194cc54ac97e09258ad75b1cb
 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