From 6406a9ba16bca795feac3e30e472b2ac28cb8aa1 Mon Sep 17 00:00:00 2001 From: Breno B Fernandes Date: Tue, 30 Jun 2020 15:41:44 -0400 Subject: [PATCH 1/3] EPEL 8 build --- .cvsignore | 0 .gitignore | 11 + 0001-Fix-puppet-paths.patch | 392 ++++++++++++++++++ Makefile | 21 - puppet-6.14.0.tar.gz.asc | 17 + puppet-nm-dispatcher.systemd | 8 + puppet.spec | 769 +++++++++++++++++++++++++++++++++++ sources | 11 + start-puppet-wrapper | 8 + 9 files changed, 1216 insertions(+), 21 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore create mode 100644 0001-Fix-puppet-paths.patch delete mode 100644 Makefile 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/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..ec0ce9c --- /dev/null +++ b/puppet.spec @@ -0,0 +1,769 @@ +%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 +* Fri Jan 17 2020 Breno Fernandes - 6.9.0-1 +- Build of puppet 6. + +* Wed Dec 04 2019 Alfrdo Moralejo - 5.5.10-9 +- Add rubygem-multi_json as dependency. + +* Sun Sep 22 2019 Terje Rosten - 5.5.10-8 +- Prefer /run over /var/run (rhbz#1710635) + +* Sun Sep 22 2019 Terje Rosten - 5.5.10-7 +- Drop buildroot prefix in nm_dispatcher_dir macro +- Fix wrong path for gem in puppetet_gem.rb (rhbz#1751385), + report and fix from Lucien Weller, thanks! + +* Thu Aug 22 2019 Lubomir Rintel - 5.5.10-6 +- Move the NetworkManager dispatcher script out of /etc + +* Fri Jul 26 2019 Fedora Release Engineering - 5.5.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Mar 13 2019 Terje Rosten - 5.5.10-4 +- Minor clean up + +* Thu Mar 07 2019 Terje Rosten - 5.5.10-3 +- Move sysconfdirs to headless too + +* Thu Mar 07 2019 Terje Rosten - 5.5.10-2 +- Move reqs to headless + +* Thu Mar 07 2019 Terje Rosten - 5.5.10-1 +- 5.5.10 + +* Thu Mar 07 2019 Terje Rosten - 5.5.6-6 +- Split off headless subpackage, based on idea from Bogdan Dobrelya + +* Sun Feb 17 2019 Bogdan Dobrelya - 5.5.6-5 +- Revert use of systemd_ordering macro + +* Sat Feb 02 2019 Fedora Release Engineering - 5.5.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 22 2019 Bogdan Dobrelya - 5.5.6-3 +- Use systemd_ordering macro + +* Wed Oct 31 2018 Haïkel Guémar - 5.5.6-1 +- Upstream 5.5.6 +- Fix issues with RHEL > 7 + +* Fri Jul 13 2018 Fedora Release Engineering - 5.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue May 8 2018 Haïkel Guémar - 5.5.1-1 +- Upstream 5.5.1 +- Unmaintained editor extensions were removed upstream (PUP-7558) +- Deprecated commands were removed: inspect (PUP-893), extlookup2hiera (PUP-3478) +- Refreshed patches + +* Thu Mar 15 2018 Terje Rosten - 4.10.10-1 +- Update to 4.10.10 + +* Fri Feb 09 2018 Fedora Release Engineering - 4.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Nov 07 2017 James Hogarth - 4.10.1-3 +- F28 facter3 change means puppet needs to require the ruby bindings for facter + +* Thu Jul 27 2017 Fedora Release Engineering - 4.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed May 31 2017 Dominic Cleal - 4.10.1-1 +- Update to 4.10.1 + +* Wed May 31 2017 Dominic Cleal - 4.8.2-2 +- Remove Fedora release restrictions from DNF package provider + +* Thu May 25 2017 Dominic Cleal - 4.8.2-1 +- Update to 4.8.2 + +* Tue May 23 2017 Ville Skyttä - 4.6.2-5 +- Move tmpfiles.d config to %%{_tmpfilesdir} +- Install LICENSE as %%license + +* Tue May 23 2017 Dominic Cleal - 4.6.2-4 +- Fix remote code exec via YAML deserialization (BZ#1452654, CVE-2017-2295) + +* Thu May 18 2017 Dominic Cleal - 4.6.2-3 +- Fix Ruby 2.4 compatibility, xmlrpc + OpenSSL errors (BZ#1443673, BZ#1440710) + +* Sat Feb 11 2017 Fedora Release Engineering - 4.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Sep 13 2016 Haïkel Guémar - 4.6.2-1 +- Upstream 4.6.2 + +* Thu Feb 04 2016 Fedora Release Engineering - 4.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jul 29 2015 Gael Chamoulaud - 4.2.1-2 +- Remove usage of vendored library safe_yaml (rhbz#1261091) + +* Wed Jul 29 2015 Gael Chamoulaud - 4.2.1-1 +- Upstream 4.2.1 + +* Tue Jul 28 2015 Lukas Zapletal 4.1.0-4 +- 1246238 - systemd service type changed to 'simple' + +* Tue Jul 21 2015 Lukas Zapletal 4.1.0-3 +- Puppet agent is started via exec rather than sub-process + +* Thu Jun 18 2015 Fedora Release Engineering - 4.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 23 2015 Haïkel Guémar - 4.1.0-1 +- Upstream 4.1.0 +- Fix Puppet belief that Fedora is OpenBSD (PUP-4491) + +* Sun May 17 2015 Haïkel Guémar - 4.0.0-2 +- Fix puppet paths and unit files (upstream #12185) + +* Tue Apr 28 2015 Haïkel Guémar - 4.0.0-1 +- Upstream 4.0.0 + +* Mon Apr 27 2015 Haïkel Guémar - 4.0.0-0.1rc1 +- Upstream 4.0.0 +- Fix issue codedir path +- Fix init provider for Fedora (systemd is default on all supported releases now) + +* Wed Apr 22 2015 Orion Poplawski - 3.7.5-4 +- Do not unbundle puppet's semantic module + +* Sun Apr 19 2015 Orion Poplawski - 3.7.5-3 +- Require rubygem(pathspec) and rubygem(semantic) + +* Tue Mar 31 2015 Orion Poplawski - 3.7.5-2 +- Unbundle libs (bug #1198366) + +* Tue Mar 31 2015 Orion Poplawski - 3.7.5-1 +- Update to 3.7.5 + +* Sat Feb 28 2015 Haïkel Guémar - 3.7.1-3 +- Use systemd macros (RHBZ #1197239) + +* Tue Sep 30 2014 Orion Poplawski - 3.7.1-2 +- Drop server deps and configuration changes (bug #1144298) + +* Wed Sep 17 2014 Jeroen van Meeuwen - 3.7.1-1 +- Update to 3.7.1 + +* Tue Aug 19 2014 Lukas Zapletal 3.6.2-3 +- 1131398 - added start-puppet-ca SELinux wrapper binary + +* Mon Jun 30 2014 Pádraig Brady - 3.6.2-2 +- Allow yumrepo proxy attribute to be set to _none_ + +* Mon Jun 16 2014 Orion Poplawski - 3.6.2-1 +- Update to 3.6.2 + +* Sat Jun 07 2014 Fedora Release Engineering - 3.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun May 18 2014 Sam Kottler 3.6.0-1 +- Remove logic specific to unsupported versions of Fedora +- Update to 3.6.0 + +* Mon Apr 28 2014 Sam Kottler 3.5.1-1 +- Update to 3.5.1 + +* Tue Apr 08 2014 Lukas Zapletal 3.4.3-3 +- RHBZ#1070395 - fixed error in postun scriplet +- Reformatted all scriplets and corrected exit codes + +* Tue Apr 08 2014 Lukas Zapletal 3.4.3-2 +- Fixed systemd unit files - wrappers are now in use and master starts + with correct context + +* Mon Feb 24 2014 Sam Kottler - 3.4.3-1 +- Update to 3.4.3 + +* Wed Jan 29 2014 Sam Kottler - 3.4.2-5 +- Add rubygem(rgen) runtime dependency + +* Thu Jan 23 2014 Sam Kottler - 3.4.2-4 +- Use localstatedir macro instead of /tmp + +* Fri Jan 17 2014 Sam Kottler - 3.4.2-3 +- Enable puppet.service during upgrade if puppetagent.service was previously enabled + +* Thu Jan 16 2014 Sam Kottler - 3.4.2-2 +- Remove F18 conditionals now that it's EOL + +* Tue Jan 14 2014 Sam Kottler - 3.4.2-1 +- Update to 3.4.2 to mitigate CVE-2013-4969 (BZ#1047792) + +* Mon Nov 18 2013 Sam Kottler - 3.3.2-1 +- Update to 3.3.2 (BZ#1031810) + +* Sat Nov 16 2013 Sam Kottler - 3.3.1-3 +- Add patch to convert nil resource parameter values to undef (BZ#1028930) + +* Fri Nov 1 2013 Lukas Zapletal - 3.3.1-2 +- Added SELinux wrappers for daemon processes + +* Mon Oct 7 2013 Orion Poplawski - 3.3.1-1 +- Update to 3.3.1 + +* Fri Sep 13 2013 Sam Kottler - 3.3.0-1 +- Update to 3.3.0 and remove the rundir-perms patch since it's no longer needed + +* Fri Aug 30 2013 Sam Kottler - 3.2.4-1 +- Update to 3.2.4 to fix CVE-2013-4761 and CVE-2013-4956 + +* Thu Aug 29 2013 Sam Kottler - 3.2.2-1 +- Update to 3.2.2 + +* Wed Aug 7 2013 Sam Kottler - 3.1.1-6 +- Add tar as an installation requirement + +* Tue Jul 30 2013 Orion Poplawski - 3.1.1-5 +- Use systemd semantics and name in NM dispatcher script + +* Fri Jul 26 2013 Sam Kottler - 3.1.1-4 +- Add hard dependency on ruby + +* Tue Apr 16 2013 Orion Poplawski - 3.1.1-3 +- Add upstream patch for ruby 2.0 support +- Fix rhel ruby conditional + +* Fri Mar 15 2013 Vít Ondruch - 3.1.1-2 +- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 + +* Wed Mar 13 2013 Michael Stahnke - 3.1.1-1 +- Fixes for CVE-2013-1640 CVE-2013-1652 CVE-2013-1653 CVE-2013-1654 +- CVE-2013-1655 CVE-2013-2274 CVE-2013-2275 + +* Thu Mar 07 2013 Michael Stahnke - 3.1.0-4 +- Disable systemd in F18 as per bz#873853 +- Update Patch0 to work with 3.1 + +* Thu Mar 7 2013 Daniel Drake - 3.1.0-2 +- Improve server compatibility with old puppet clients (#831303) + +* Mon Feb 11 2013 Sam Kottler - 3.1.0-1 +- Update to 3.1.0 + +* Tue Oct 30 2012 Moses Mendoza - 3.0.2-1 +- Update to 3.0.2 +- Update new dependencies (ruby >= 1.8.7, facter >= 1.6.6, hiera >= 1.0.0) +- Update for manpage and file changes in upstream +- Add conditionals for systemd service management +- Remove 0001-Ruby-1.9.3-has-a-different-error-when-require-fails.patch +- Remove 0001-Preserve-timestamps-when-installing-files.patch + +* Wed Jul 11 2012 Todd Zullinger - 2.7.18-1 +- Update to 2.7.17, fixes CVE-2012-3864, CVE-2012-3865, CVE-2012-3866, + CVE-2012-3867 +- Improve NetworkManager compatibility, thanks to Orion Poplawski (#532085) +- Preserve timestamps when installing files + +* Wed Apr 25 2012 Todd Zullinger - 2.7.13-1 +- Update to 2.7.13 +- Change license from GPLv2 to ASL 2.0 +- Drop %%post hacks to deal with upgrades from 0.25 +- Minor rpmlint fixes +- Backport patch to silence confine warnings in ruby-1.9.3 + +* Wed Apr 11 2012 Todd Zullinger - 2.6.16-1 +- Update to 2.6.16, fixes CVE-2012-1986, CVE-2012-1987, and CVE-2012-1988 +- Correct permissions of /var/log/puppet (0750) + +* Wed Feb 22 2012 Todd Zullinger - 2.6.14-1 +- Update to 2.6.14, fixes CVE-2012-1053 and CVE-2012-1054 + +* Mon Feb 13 2012 Todd Zullinger - 2.6.13-3 +- Move rpmlint fixes to %%prep, add a few additional fixes +- Bump minimum ruby version to 1.8.5 now that EL-4 is all but dead +- Update install locations for Fedora-17 / Ruby-1.9 +- Use ruby($lib) for augeas and shadow requirements +- Only try to run 0.25.x -> 2.6.x pid file updates on EL + +* Thu Jan 05 2012 Todd Zullinger - 2.6.13-2 +- Revert to minimal patch for augeas >= 0.10 (bz#771097) + +* Wed Dec 14 2011 Todd Zullinger - 2.6.13-1 +- Update to 2.6.13 +- Cherry-pick various augeas fixes from upstream (bz#771097) + +* Sun Oct 23 2011 Todd Zullinger - 2.6.12-1 +- Update to 2.6.12, fixes CVE-2011-3872 +- Add upstream patch to restore Mongrel XMLRPC functionality (upstream #10244) +- Apply partial fix for upstream #9167 (tagmail report sends email when nothing + happens) + +* Thu Sep 29 2011 Todd Zullinger - 2.6.6-3 +- Apply upstream patches for CVE-2011-3869, CVE-2011-3870, CVE-2011-3871, and + upstream #9793 + +* Tue Sep 27 2011 Todd Zullinger - 2.6.6-2 +- Apply upstream patch for CVE-2011-3848 + +* Wed Mar 16 2011 Todd Zullinger - 2.6.6-1 +- Update to 2.6.6 +- Ensure %%pre exits cleanly +- Fix License tag, puppet is now GPLv2 only +- Create and own /usr/share/puppet/modules (#615432) +- Properly restart puppet agent/master daemons on upgrades from 0.25.x +- Require libselinux-utils when selinux support is enabled +- Support tmpfiles.d for Fedora >= 15 (#656677) +- Apply a few upstream fixes for 0.25.5 regressions + +* Wed Feb 09 2011 Fedora Release Engineering - 0.25.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon May 17 2010 Todd Zullinger - 0.25.5-1 +- Update to 0.25.5 +- Adjust selinux conditional for EL-6 +- Apply rundir-perms patch from tarball rather than including it separately +- Update URL's to reflect the new puppetlabs.com domain + +* Fri Jan 29 2010 Todd Zullinger - 0.25.4-1 +- Update to 0.25.4 + +* Tue Jan 19 2010 Todd Zullinger - 0.25.3-2 +- Apply upstream patch to fix cron resources (upstream #2845) + +* Mon Jan 11 2010 Todd Zullinger - 0.25.3-1 +- Update to 0.25.3 + +* Tue Jan 05 2010 Todd Zullinger - 0.25.2-1.1 +- Replace %%define with %%global for macros + +* Tue Jan 05 2010 Todd Zullinger - 0.25.2-1 +- Update to 0.25.2 +- Fixes CVE-2010-0156, tmpfile security issue (#502881) +- Install auth.conf, puppetqd manpage, and queuing examples/docs + +* Wed Nov 25 2009 Jeroen van Meeuwen - 0.25.1-1 +- New upstream version + +* Tue Oct 27 2009 Todd Zullinger - 0.25.1-0.3 +- Update to 0.25.1 +- Include the pi program and man page (R.I.Pienaar) + +* Sat Oct 17 2009 Todd Zullinger - 0.25.1-0.2.rc2 +- Update to 0.25.1rc2 + +* Tue Sep 22 2009 Todd Zullinger - 0.25.1-0.1.rc1 +- Update to 0.25.1rc1 +- Move puppetca to puppet package, it has uses on client systems +- Drop redundant %%doc from manpage %%file listings + +* Fri Sep 04 2009 Todd Zullinger - 0.25.0-1 +- Update to 0.25.0 +- Fix permissions on /var/log/puppet (#495096) +- Install emacs mode and vim syntax files (#491437) +- Install ext/ directory in %%{_datadir}/%%{name} (/usr/share/puppet) + +* Mon May 04 2009 Todd Zullinger - 0.25.0-0.1.beta1 +- Update to 0.25.0beta1 +- Make Augeas and SELinux requirements build time options + +* Mon Mar 23 2009 Todd Zullinger - 0.24.8-1 +- Update to 0.24.8 +- Quiet output from %%pre +- Use upstream install script +- Increase required facter version to >= 1.5 + +* Tue Dec 16 2008 Todd Zullinger - 0.24.7-4 +- Remove redundant useradd from %%pre + +* Tue Dec 16 2008 Jeroen van Meeuwen - 0.24.7-3 +- New upstream version +- Set a static uid and gid (#472073, #471918, #471919) +- Add a conditional requirement on libselinux-ruby for Fedora >= 9 +- Add a dependency on ruby-augeas + +* Wed Oct 22 2008 Todd Zullinger - 0.24.6-1 +- Update to 0.24.6 +- Require ruby-shadow on Fedora and RHEL >= 5 +- Simplify Fedora/RHEL version checks for ruby(abi) and BuildArch +- Require chkconfig and initstripts for preun, post, and postun scripts +- Conditionally restart puppet in %%postun +- Ensure %%preun, %%post, and %%postun scripts exit cleanly +- Create puppet user/group according to Fedora packaging guidelines +- Quiet a few rpmlint complaints +- Remove useless %%pbuild macro +- Make specfile more like the Fedora/EPEL template + +* Mon Jul 28 2008 David Lutterkort - 0.24.5-1 +- Add /usr/bin/puppetdoc + +* Thu Jul 24 2008 Brenton Leanhardt +- New version +- man pages now ship with tarball +- examples/code moved to root examples dir in upstream tarball + +* Tue Mar 25 2008 David Lutterkort - 0.24.4-1 +- Add man pages (from separate tarball, upstream will fix to + include in main tarball) + +* Mon Mar 24 2008 David Lutterkort - 0.24.3-1 +- New version + +* Wed Mar 5 2008 David Lutterkort - 0.24.2-1 +- New version + +* Sat Dec 22 2007 David Lutterkort - 0.24.1-1 +- New version + +* Mon Dec 17 2007 David Lutterkort - 0.24.0-2 +- Use updated upstream tarball that contains yumhelper.py + +* Fri Dec 14 2007 David Lutterkort - 0.24.0-1 +- Fixed license +- Munge examples/ to make rpmlint happier + +* Wed Aug 22 2007 David Lutterkort - 0.23.2-1 +- New version + +* Thu Jul 26 2007 David Lutterkort - 0.23.1-1 +- Remove old config files + +* Wed Jun 20 2007 David Lutterkort - 0.23.0-1 +- Install one puppet.conf instead of old config files, keep old configs + around to ease update +- Use plain shell commands in install instead of macros + +* Wed May 2 2007 David Lutterkort - 0.22.4-1 +- New version + +* Thu Mar 29 2007 David Lutterkort - 0.22.3-1 +- Claim ownership of _sysconfdir/puppet (bz 233908) + +* Mon Mar 19 2007 David Lutterkort - 0.22.2-1 +- Set puppet's homedir to /var/lib/puppet, not /var/puppet +- Remove no-lockdir patch, not needed anymore + +* Mon Feb 12 2007 David Lutterkort - 0.22.1-2 +- Fix bogus config parameter in puppetd.conf + +* Sat Feb 3 2007 David Lutterkort - 0.22.1-1 +- New version + +* Fri Jan 5 2007 David Lutterkort - 0.22.0-1 +- New version + +* Mon Nov 20 2006 David Lutterkort - 0.20.1-2 +- Make require ruby(abi) and buildarch: noarch conditional for fedora 5 or + later to allow building on older fedora releases + +* Mon Nov 13 2006 David Lutterkort - 0.20.1-1 +- New version + +* Mon Oct 23 2006 David Lutterkort - 0.20.0-1 +- New version + +* Tue Sep 26 2006 David Lutterkort - 0.19.3-1 +- New version + +* Mon Sep 18 2006 David Lutterkort - 0.19.1-1 +- New version + +* Thu Sep 7 2006 David Lutterkort - 0.19.0-1 +- New version + +* Tue Aug 1 2006 David Lutterkort - 0.18.4-2 +- Use /usr/bin/ruby directly instead of /usr/bin/env ruby in + executables. Otherwise, initscripts break since pidof can't find the + right process + +* Tue Aug 1 2006 David Lutterkort - 0.18.4-1 +- New version + +* Fri Jul 14 2006 David Lutterkort - 0.18.3-1 +- New version + +* Wed Jul 5 2006 David Lutterkort - 0.18.2-1 +- New version + +* Wed Jun 28 2006 David Lutterkort - 0.18.1-1 +- Removed lsb-config.patch and yumrepo.patch since they are upstream now + +* Mon Jun 19 2006 David Lutterkort - 0.18.0-1 +- Patch config for LSB compliance (lsb-config.patch) +- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl + to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt, + /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml + +* Fri May 19 2006 David Lutterkort - 0.17.2-1 +- Added /usr/bin/puppetrun to server subpackage +- Backported patch for yumrepo type (yumrepo.patch) + +* Wed May 3 2006 David Lutterkort - 0.16.4-1 +- Rebuilt + +* Fri Apr 21 2006 David Lutterkort - 0.16.0-1 +- Fix default file permissions in server subpackage +- Run puppetmaster as user puppet +- rebuilt for 0.16.0 + +* Mon Apr 17 2006 David Lutterkort - 0.15.3-2 +- Don't create empty log files in post-install scriptlet + +* Fri Apr 7 2006 David Lutterkort - 0.15.3-1 +- Rebuilt for new version + +* Wed Mar 22 2006 David Lutterkort - 0.15.1-1 +- Patch0: Run puppetmaster as root; running as puppet is not ready + for primetime + +* Mon Mar 13 2006 David Lutterkort - 0.15.0-1 +- Commented out noarch; requires fix for bz184199 + +* Mon Mar 6 2006 David Lutterkort - 0.14.0-1 +- Added BuildRequires for ruby + +* Wed Mar 1 2006 David Lutterkort - 0.13.5-1 +- Removed use of fedora-usermgmt. It is not required for Fedora Extras and + makes it unnecessarily hard to use this rpm outside of Fedora. Just + allocate the puppet uid/gid dynamically + +* Sun Feb 19 2006 David Lutterkort - 0.13.0-4 +- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed +problem with listing fileserver.conf and puppetmaster.conf twice + +* Wed Feb 8 2006 David Lutterkort - 0.13.0-3 +- Fix puppetd.conf + +* Wed Feb 8 2006 David Lutterkort - 0.13.0-2 +- Changes to run puppetmaster as user puppet + +* Mon Feb 6 2006 David Lutterkort - 0.13.0-1 +- Don't mark initscripts as config files + +* Mon Feb 6 2006 David Lutterkort - 0.12.0-2 +- Fix BuildRoot. Add dist to release + +* Tue Jan 17 2006 David Lutterkort - 0.11.0-1 +- Rebuild + +* Thu Jan 12 2006 David Lutterkort - 0.10.2-1 +- Updated for 0.10.2 Fixed minor kink in how Source is given + +* Wed Jan 11 2006 David Lutterkort - 0.10.1-3 +- Added basic fileserver.conf + +* Wed Jan 11 2006 David Lutterkort - 0.10.1-1 +- Updated. Moved installation of library files to sitelibdir. Pulled +initscripts into separate files. Folded tools rpm into server + +* Thu Nov 24 2005 Duane Griffin +- Added init scripts for the client + +* Wed Nov 23 2005 Duane Griffin +- First packaging diff --git a/sources b/sources 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 33c656f477d1878716e89c1f61715ecdbb1fe21f Mon Sep 17 00:00:00 2001 From: Breno B Fernandes Date: Mon, 13 Jul 2020 13:50:23 -0400 Subject: [PATCH 2/3] Fixing changelog --- puppet.spec | 554 +--------------------------------------------------- 1 file changed, 1 insertion(+), 553 deletions(-) diff --git a/puppet.spec b/puppet.spec index ec0ce9c..f3b978e 100644 --- a/puppet.spec +++ b/puppet.spec @@ -213,557 +213,5 @@ useradd -r -u 52 -g puppet -d /usr/local/puppetlabs -s /sbin/nologin \ %changelog -* Fri Jan 17 2020 Breno Fernandes - 6.9.0-1 +* Mon Jul 13 2020 Breno Fernandes - 6.14.0-1 - Build of puppet 6. - -* Wed Dec 04 2019 Alfrdo Moralejo - 5.5.10-9 -- Add rubygem-multi_json as dependency. - -* Sun Sep 22 2019 Terje Rosten - 5.5.10-8 -- Prefer /run over /var/run (rhbz#1710635) - -* Sun Sep 22 2019 Terje Rosten - 5.5.10-7 -- Drop buildroot prefix in nm_dispatcher_dir macro -- Fix wrong path for gem in puppetet_gem.rb (rhbz#1751385), - report and fix from Lucien Weller, thanks! - -* Thu Aug 22 2019 Lubomir Rintel - 5.5.10-6 -- Move the NetworkManager dispatcher script out of /etc - -* Fri Jul 26 2019 Fedora Release Engineering - 5.5.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Mar 13 2019 Terje Rosten - 5.5.10-4 -- Minor clean up - -* Thu Mar 07 2019 Terje Rosten - 5.5.10-3 -- Move sysconfdirs to headless too - -* Thu Mar 07 2019 Terje Rosten - 5.5.10-2 -- Move reqs to headless - -* Thu Mar 07 2019 Terje Rosten - 5.5.10-1 -- 5.5.10 - -* Thu Mar 07 2019 Terje Rosten - 5.5.6-6 -- Split off headless subpackage, based on idea from Bogdan Dobrelya - -* Sun Feb 17 2019 Bogdan Dobrelya - 5.5.6-5 -- Revert use of systemd_ordering macro - -* Sat Feb 02 2019 Fedora Release Engineering - 5.5.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 22 2019 Bogdan Dobrelya - 5.5.6-3 -- Use systemd_ordering macro - -* Wed Oct 31 2018 Haïkel Guémar - 5.5.6-1 -- Upstream 5.5.6 -- Fix issues with RHEL > 7 - -* Fri Jul 13 2018 Fedora Release Engineering - 5.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue May 8 2018 Haïkel Guémar - 5.5.1-1 -- Upstream 5.5.1 -- Unmaintained editor extensions were removed upstream (PUP-7558) -- Deprecated commands were removed: inspect (PUP-893), extlookup2hiera (PUP-3478) -- Refreshed patches - -* Thu Mar 15 2018 Terje Rosten - 4.10.10-1 -- Update to 4.10.10 - -* Fri Feb 09 2018 Fedora Release Engineering - 4.10.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Nov 07 2017 James Hogarth - 4.10.1-3 -- F28 facter3 change means puppet needs to require the ruby bindings for facter - -* Thu Jul 27 2017 Fedora Release Engineering - 4.10.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed May 31 2017 Dominic Cleal - 4.10.1-1 -- Update to 4.10.1 - -* Wed May 31 2017 Dominic Cleal - 4.8.2-2 -- Remove Fedora release restrictions from DNF package provider - -* Thu May 25 2017 Dominic Cleal - 4.8.2-1 -- Update to 4.8.2 - -* Tue May 23 2017 Ville Skyttä - 4.6.2-5 -- Move tmpfiles.d config to %%{_tmpfilesdir} -- Install LICENSE as %%license - -* Tue May 23 2017 Dominic Cleal - 4.6.2-4 -- Fix remote code exec via YAML deserialization (BZ#1452654, CVE-2017-2295) - -* Thu May 18 2017 Dominic Cleal - 4.6.2-3 -- Fix Ruby 2.4 compatibility, xmlrpc + OpenSSL errors (BZ#1443673, BZ#1440710) - -* Sat Feb 11 2017 Fedora Release Engineering - 4.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Sep 13 2016 Haïkel Guémar - 4.6.2-1 -- Upstream 4.6.2 - -* Thu Feb 04 2016 Fedora Release Engineering - 4.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jul 29 2015 Gael Chamoulaud - 4.2.1-2 -- Remove usage of vendored library safe_yaml (rhbz#1261091) - -* Wed Jul 29 2015 Gael Chamoulaud - 4.2.1-1 -- Upstream 4.2.1 - -* Tue Jul 28 2015 Lukas Zapletal 4.1.0-4 -- 1246238 - systemd service type changed to 'simple' - -* Tue Jul 21 2015 Lukas Zapletal 4.1.0-3 -- Puppet agent is started via exec rather than sub-process - -* Thu Jun 18 2015 Fedora Release Engineering - 4.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 23 2015 Haïkel Guémar - 4.1.0-1 -- Upstream 4.1.0 -- Fix Puppet belief that Fedora is OpenBSD (PUP-4491) - -* Sun May 17 2015 Haïkel Guémar - 4.0.0-2 -- Fix puppet paths and unit files (upstream #12185) - -* Tue Apr 28 2015 Haïkel Guémar - 4.0.0-1 -- Upstream 4.0.0 - -* Mon Apr 27 2015 Haïkel Guémar - 4.0.0-0.1rc1 -- Upstream 4.0.0 -- Fix issue codedir path -- Fix init provider for Fedora (systemd is default on all supported releases now) - -* Wed Apr 22 2015 Orion Poplawski - 3.7.5-4 -- Do not unbundle puppet's semantic module - -* Sun Apr 19 2015 Orion Poplawski - 3.7.5-3 -- Require rubygem(pathspec) and rubygem(semantic) - -* Tue Mar 31 2015 Orion Poplawski - 3.7.5-2 -- Unbundle libs (bug #1198366) - -* Tue Mar 31 2015 Orion Poplawski - 3.7.5-1 -- Update to 3.7.5 - -* Sat Feb 28 2015 Haïkel Guémar - 3.7.1-3 -- Use systemd macros (RHBZ #1197239) - -* Tue Sep 30 2014 Orion Poplawski - 3.7.1-2 -- Drop server deps and configuration changes (bug #1144298) - -* Wed Sep 17 2014 Jeroen van Meeuwen - 3.7.1-1 -- Update to 3.7.1 - -* Tue Aug 19 2014 Lukas Zapletal 3.6.2-3 -- 1131398 - added start-puppet-ca SELinux wrapper binary - -* Mon Jun 30 2014 Pádraig Brady - 3.6.2-2 -- Allow yumrepo proxy attribute to be set to _none_ - -* Mon Jun 16 2014 Orion Poplawski - 3.6.2-1 -- Update to 3.6.2 - -* Sat Jun 07 2014 Fedora Release Engineering - 3.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun May 18 2014 Sam Kottler 3.6.0-1 -- Remove logic specific to unsupported versions of Fedora -- Update to 3.6.0 - -* Mon Apr 28 2014 Sam Kottler 3.5.1-1 -- Update to 3.5.1 - -* Tue Apr 08 2014 Lukas Zapletal 3.4.3-3 -- RHBZ#1070395 - fixed error in postun scriplet -- Reformatted all scriplets and corrected exit codes - -* Tue Apr 08 2014 Lukas Zapletal 3.4.3-2 -- Fixed systemd unit files - wrappers are now in use and master starts - with correct context - -* Mon Feb 24 2014 Sam Kottler - 3.4.3-1 -- Update to 3.4.3 - -* Wed Jan 29 2014 Sam Kottler - 3.4.2-5 -- Add rubygem(rgen) runtime dependency - -* Thu Jan 23 2014 Sam Kottler - 3.4.2-4 -- Use localstatedir macro instead of /tmp - -* Fri Jan 17 2014 Sam Kottler - 3.4.2-3 -- Enable puppet.service during upgrade if puppetagent.service was previously enabled - -* Thu Jan 16 2014 Sam Kottler - 3.4.2-2 -- Remove F18 conditionals now that it's EOL - -* Tue Jan 14 2014 Sam Kottler - 3.4.2-1 -- Update to 3.4.2 to mitigate CVE-2013-4969 (BZ#1047792) - -* Mon Nov 18 2013 Sam Kottler - 3.3.2-1 -- Update to 3.3.2 (BZ#1031810) - -* Sat Nov 16 2013 Sam Kottler - 3.3.1-3 -- Add patch to convert nil resource parameter values to undef (BZ#1028930) - -* Fri Nov 1 2013 Lukas Zapletal - 3.3.1-2 -- Added SELinux wrappers for daemon processes - -* Mon Oct 7 2013 Orion Poplawski - 3.3.1-1 -- Update to 3.3.1 - -* Fri Sep 13 2013 Sam Kottler - 3.3.0-1 -- Update to 3.3.0 and remove the rundir-perms patch since it's no longer needed - -* Fri Aug 30 2013 Sam Kottler - 3.2.4-1 -- Update to 3.2.4 to fix CVE-2013-4761 and CVE-2013-4956 - -* Thu Aug 29 2013 Sam Kottler - 3.2.2-1 -- Update to 3.2.2 - -* Wed Aug 7 2013 Sam Kottler - 3.1.1-6 -- Add tar as an installation requirement - -* Tue Jul 30 2013 Orion Poplawski - 3.1.1-5 -- Use systemd semantics and name in NM dispatcher script - -* Fri Jul 26 2013 Sam Kottler - 3.1.1-4 -- Add hard dependency on ruby - -* Tue Apr 16 2013 Orion Poplawski - 3.1.1-3 -- Add upstream patch for ruby 2.0 support -- Fix rhel ruby conditional - -* Fri Mar 15 2013 Vít Ondruch - 3.1.1-2 -- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 - -* Wed Mar 13 2013 Michael Stahnke - 3.1.1-1 -- Fixes for CVE-2013-1640 CVE-2013-1652 CVE-2013-1653 CVE-2013-1654 -- CVE-2013-1655 CVE-2013-2274 CVE-2013-2275 - -* Thu Mar 07 2013 Michael Stahnke - 3.1.0-4 -- Disable systemd in F18 as per bz#873853 -- Update Patch0 to work with 3.1 - -* Thu Mar 7 2013 Daniel Drake - 3.1.0-2 -- Improve server compatibility with old puppet clients (#831303) - -* Mon Feb 11 2013 Sam Kottler - 3.1.0-1 -- Update to 3.1.0 - -* Tue Oct 30 2012 Moses Mendoza - 3.0.2-1 -- Update to 3.0.2 -- Update new dependencies (ruby >= 1.8.7, facter >= 1.6.6, hiera >= 1.0.0) -- Update for manpage and file changes in upstream -- Add conditionals for systemd service management -- Remove 0001-Ruby-1.9.3-has-a-different-error-when-require-fails.patch -- Remove 0001-Preserve-timestamps-when-installing-files.patch - -* Wed Jul 11 2012 Todd Zullinger - 2.7.18-1 -- Update to 2.7.17, fixes CVE-2012-3864, CVE-2012-3865, CVE-2012-3866, - CVE-2012-3867 -- Improve NetworkManager compatibility, thanks to Orion Poplawski (#532085) -- Preserve timestamps when installing files - -* Wed Apr 25 2012 Todd Zullinger - 2.7.13-1 -- Update to 2.7.13 -- Change license from GPLv2 to ASL 2.0 -- Drop %%post hacks to deal with upgrades from 0.25 -- Minor rpmlint fixes -- Backport patch to silence confine warnings in ruby-1.9.3 - -* Wed Apr 11 2012 Todd Zullinger - 2.6.16-1 -- Update to 2.6.16, fixes CVE-2012-1986, CVE-2012-1987, and CVE-2012-1988 -- Correct permissions of /var/log/puppet (0750) - -* Wed Feb 22 2012 Todd Zullinger - 2.6.14-1 -- Update to 2.6.14, fixes CVE-2012-1053 and CVE-2012-1054 - -* Mon Feb 13 2012 Todd Zullinger - 2.6.13-3 -- Move rpmlint fixes to %%prep, add a few additional fixes -- Bump minimum ruby version to 1.8.5 now that EL-4 is all but dead -- Update install locations for Fedora-17 / Ruby-1.9 -- Use ruby($lib) for augeas and shadow requirements -- Only try to run 0.25.x -> 2.6.x pid file updates on EL - -* Thu Jan 05 2012 Todd Zullinger - 2.6.13-2 -- Revert to minimal patch for augeas >= 0.10 (bz#771097) - -* Wed Dec 14 2011 Todd Zullinger - 2.6.13-1 -- Update to 2.6.13 -- Cherry-pick various augeas fixes from upstream (bz#771097) - -* Sun Oct 23 2011 Todd Zullinger - 2.6.12-1 -- Update to 2.6.12, fixes CVE-2011-3872 -- Add upstream patch to restore Mongrel XMLRPC functionality (upstream #10244) -- Apply partial fix for upstream #9167 (tagmail report sends email when nothing - happens) - -* Thu Sep 29 2011 Todd Zullinger - 2.6.6-3 -- Apply upstream patches for CVE-2011-3869, CVE-2011-3870, CVE-2011-3871, and - upstream #9793 - -* Tue Sep 27 2011 Todd Zullinger - 2.6.6-2 -- Apply upstream patch for CVE-2011-3848 - -* Wed Mar 16 2011 Todd Zullinger - 2.6.6-1 -- Update to 2.6.6 -- Ensure %%pre exits cleanly -- Fix License tag, puppet is now GPLv2 only -- Create and own /usr/share/puppet/modules (#615432) -- Properly restart puppet agent/master daemons on upgrades from 0.25.x -- Require libselinux-utils when selinux support is enabled -- Support tmpfiles.d for Fedora >= 15 (#656677) -- Apply a few upstream fixes for 0.25.5 regressions - -* Wed Feb 09 2011 Fedora Release Engineering - 0.25.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon May 17 2010 Todd Zullinger - 0.25.5-1 -- Update to 0.25.5 -- Adjust selinux conditional for EL-6 -- Apply rundir-perms patch from tarball rather than including it separately -- Update URL's to reflect the new puppetlabs.com domain - -* Fri Jan 29 2010 Todd Zullinger - 0.25.4-1 -- Update to 0.25.4 - -* Tue Jan 19 2010 Todd Zullinger - 0.25.3-2 -- Apply upstream patch to fix cron resources (upstream #2845) - -* Mon Jan 11 2010 Todd Zullinger - 0.25.3-1 -- Update to 0.25.3 - -* Tue Jan 05 2010 Todd Zullinger - 0.25.2-1.1 -- Replace %%define with %%global for macros - -* Tue Jan 05 2010 Todd Zullinger - 0.25.2-1 -- Update to 0.25.2 -- Fixes CVE-2010-0156, tmpfile security issue (#502881) -- Install auth.conf, puppetqd manpage, and queuing examples/docs - -* Wed Nov 25 2009 Jeroen van Meeuwen - 0.25.1-1 -- New upstream version - -* Tue Oct 27 2009 Todd Zullinger - 0.25.1-0.3 -- Update to 0.25.1 -- Include the pi program and man page (R.I.Pienaar) - -* Sat Oct 17 2009 Todd Zullinger - 0.25.1-0.2.rc2 -- Update to 0.25.1rc2 - -* Tue Sep 22 2009 Todd Zullinger - 0.25.1-0.1.rc1 -- Update to 0.25.1rc1 -- Move puppetca to puppet package, it has uses on client systems -- Drop redundant %%doc from manpage %%file listings - -* Fri Sep 04 2009 Todd Zullinger - 0.25.0-1 -- Update to 0.25.0 -- Fix permissions on /var/log/puppet (#495096) -- Install emacs mode and vim syntax files (#491437) -- Install ext/ directory in %%{_datadir}/%%{name} (/usr/share/puppet) - -* Mon May 04 2009 Todd Zullinger - 0.25.0-0.1.beta1 -- Update to 0.25.0beta1 -- Make Augeas and SELinux requirements build time options - -* Mon Mar 23 2009 Todd Zullinger - 0.24.8-1 -- Update to 0.24.8 -- Quiet output from %%pre -- Use upstream install script -- Increase required facter version to >= 1.5 - -* Tue Dec 16 2008 Todd Zullinger - 0.24.7-4 -- Remove redundant useradd from %%pre - -* Tue Dec 16 2008 Jeroen van Meeuwen - 0.24.7-3 -- New upstream version -- Set a static uid and gid (#472073, #471918, #471919) -- Add a conditional requirement on libselinux-ruby for Fedora >= 9 -- Add a dependency on ruby-augeas - -* Wed Oct 22 2008 Todd Zullinger - 0.24.6-1 -- Update to 0.24.6 -- Require ruby-shadow on Fedora and RHEL >= 5 -- Simplify Fedora/RHEL version checks for ruby(abi) and BuildArch -- Require chkconfig and initstripts for preun, post, and postun scripts -- Conditionally restart puppet in %%postun -- Ensure %%preun, %%post, and %%postun scripts exit cleanly -- Create puppet user/group according to Fedora packaging guidelines -- Quiet a few rpmlint complaints -- Remove useless %%pbuild macro -- Make specfile more like the Fedora/EPEL template - -* Mon Jul 28 2008 David Lutterkort - 0.24.5-1 -- Add /usr/bin/puppetdoc - -* Thu Jul 24 2008 Brenton Leanhardt -- New version -- man pages now ship with tarball -- examples/code moved to root examples dir in upstream tarball - -* Tue Mar 25 2008 David Lutterkort - 0.24.4-1 -- Add man pages (from separate tarball, upstream will fix to - include in main tarball) - -* Mon Mar 24 2008 David Lutterkort - 0.24.3-1 -- New version - -* Wed Mar 5 2008 David Lutterkort - 0.24.2-1 -- New version - -* Sat Dec 22 2007 David Lutterkort - 0.24.1-1 -- New version - -* Mon Dec 17 2007 David Lutterkort - 0.24.0-2 -- Use updated upstream tarball that contains yumhelper.py - -* Fri Dec 14 2007 David Lutterkort - 0.24.0-1 -- Fixed license -- Munge examples/ to make rpmlint happier - -* Wed Aug 22 2007 David Lutterkort - 0.23.2-1 -- New version - -* Thu Jul 26 2007 David Lutterkort - 0.23.1-1 -- Remove old config files - -* Wed Jun 20 2007 David Lutterkort - 0.23.0-1 -- Install one puppet.conf instead of old config files, keep old configs - around to ease update -- Use plain shell commands in install instead of macros - -* Wed May 2 2007 David Lutterkort - 0.22.4-1 -- New version - -* Thu Mar 29 2007 David Lutterkort - 0.22.3-1 -- Claim ownership of _sysconfdir/puppet (bz 233908) - -* Mon Mar 19 2007 David Lutterkort - 0.22.2-1 -- Set puppet's homedir to /var/lib/puppet, not /var/puppet -- Remove no-lockdir patch, not needed anymore - -* Mon Feb 12 2007 David Lutterkort - 0.22.1-2 -- Fix bogus config parameter in puppetd.conf - -* Sat Feb 3 2007 David Lutterkort - 0.22.1-1 -- New version - -* Fri Jan 5 2007 David Lutterkort - 0.22.0-1 -- New version - -* Mon Nov 20 2006 David Lutterkort - 0.20.1-2 -- Make require ruby(abi) and buildarch: noarch conditional for fedora 5 or - later to allow building on older fedora releases - -* Mon Nov 13 2006 David Lutterkort - 0.20.1-1 -- New version - -* Mon Oct 23 2006 David Lutterkort - 0.20.0-1 -- New version - -* Tue Sep 26 2006 David Lutterkort - 0.19.3-1 -- New version - -* Mon Sep 18 2006 David Lutterkort - 0.19.1-1 -- New version - -* Thu Sep 7 2006 David Lutterkort - 0.19.0-1 -- New version - -* Tue Aug 1 2006 David Lutterkort - 0.18.4-2 -- Use /usr/bin/ruby directly instead of /usr/bin/env ruby in - executables. Otherwise, initscripts break since pidof can't find the - right process - -* Tue Aug 1 2006 David Lutterkort - 0.18.4-1 -- New version - -* Fri Jul 14 2006 David Lutterkort - 0.18.3-1 -- New version - -* Wed Jul 5 2006 David Lutterkort - 0.18.2-1 -- New version - -* Wed Jun 28 2006 David Lutterkort - 0.18.1-1 -- Removed lsb-config.patch and yumrepo.patch since they are upstream now - -* Mon Jun 19 2006 David Lutterkort - 0.18.0-1 -- Patch config for LSB compliance (lsb-config.patch) -- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl - to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt, - /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml - -* Fri May 19 2006 David Lutterkort - 0.17.2-1 -- Added /usr/bin/puppetrun to server subpackage -- Backported patch for yumrepo type (yumrepo.patch) - -* Wed May 3 2006 David Lutterkort - 0.16.4-1 -- Rebuilt - -* Fri Apr 21 2006 David Lutterkort - 0.16.0-1 -- Fix default file permissions in server subpackage -- Run puppetmaster as user puppet -- rebuilt for 0.16.0 - -* Mon Apr 17 2006 David Lutterkort - 0.15.3-2 -- Don't create empty log files in post-install scriptlet - -* Fri Apr 7 2006 David Lutterkort - 0.15.3-1 -- Rebuilt for new version - -* Wed Mar 22 2006 David Lutterkort - 0.15.1-1 -- Patch0: Run puppetmaster as root; running as puppet is not ready - for primetime - -* Mon Mar 13 2006 David Lutterkort - 0.15.0-1 -- Commented out noarch; requires fix for bz184199 - -* Mon Mar 6 2006 David Lutterkort - 0.14.0-1 -- Added BuildRequires for ruby - -* Wed Mar 1 2006 David Lutterkort - 0.13.5-1 -- Removed use of fedora-usermgmt. It is not required for Fedora Extras and - makes it unnecessarily hard to use this rpm outside of Fedora. Just - allocate the puppet uid/gid dynamically - -* Sun Feb 19 2006 David Lutterkort - 0.13.0-4 -- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed -problem with listing fileserver.conf and puppetmaster.conf twice - -* Wed Feb 8 2006 David Lutterkort - 0.13.0-3 -- Fix puppetd.conf - -* Wed Feb 8 2006 David Lutterkort - 0.13.0-2 -- Changes to run puppetmaster as user puppet - -* Mon Feb 6 2006 David Lutterkort - 0.13.0-1 -- Don't mark initscripts as config files - -* Mon Feb 6 2006 David Lutterkort - 0.12.0-2 -- Fix BuildRoot. Add dist to release - -* Tue Jan 17 2006 David Lutterkort - 0.11.0-1 -- Rebuild - -* Thu Jan 12 2006 David Lutterkort - 0.10.2-1 -- Updated for 0.10.2 Fixed minor kink in how Source is given - -* Wed Jan 11 2006 David Lutterkort - 0.10.1-3 -- Added basic fileserver.conf - -* Wed Jan 11 2006 David Lutterkort - 0.10.1-1 -- Updated. Moved installation of library files to sitelibdir. Pulled -initscripts into separate files. Folded tools rpm into server - -* Thu Nov 24 2005 Duane Griffin -- Added init scripts for the client - -* Wed Nov 23 2005 Duane Griffin -- First packaging From 4e6f324d90a7729d3c152bdfb19be6fd4464c736 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 14:23:57 -0800 Subject: [PATCH 3/3] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .gitignore | 11 - 0001-Fix-puppet-paths.patch | 392 ----------------------------------- dead.package | 1 + puppet-6.14.0.tar.gz.asc | 17 -- puppet-nm-dispatcher.systemd | 8 - puppet.spec | 217 ------------------- sources | 11 - start-puppet-wrapper | 8 - 8 files changed, 1 insertion(+), 664 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Fix-puppet-paths.patch create mode 100644 dead.package delete mode 100644 puppet-6.14.0.tar.gz.asc delete mode 100644 puppet-nm-dispatcher.systemd delete mode 100644 puppet.spec delete mode 100644 sources delete mode 100644 start-puppet-wrapper diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1f3dfe9..0000000 --- a/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/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 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/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 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-nm-dispatcher.systemd b/puppet-nm-dispatcher.systemd deleted file mode 100644 index 3e5eeee..0000000 --- a/puppet-nm-dispatcher.systemd +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# -# Restart puppet on network changes to pickup changes to /etc/resolv.conf -# -# https://projects.puppetlabs.com/issues/2776 -# https://bugzilla.redhat.com/532085 - -[[ $2 =~ ^(up|down)$ ]] && /bin/systemctl condrestart puppetagent.service || : diff --git a/puppet.spec b/puppet.spec deleted file mode 100644 index f3b978e..0000000 --- a/puppet.spec +++ /dev/null @@ -1,217 +0,0 @@ -%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 Fernandes - 6.14.0-1 -- Build of puppet 6. diff --git a/sources b/sources deleted file mode 100644 index cbd5162..0000000 --- a/sources +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index e0c8b70..0000000 --- a/start-puppet-wrapper +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 $*