From dd73184c04bf42138efd8e8a44b16434a378e8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Thu, 15 Mar 2018 19:35:09 +0100 Subject: [PATCH] Update to 4.10.10 --- ...Skip-cipher-monkey-patch-on-ruby-2.4.patch | 36 ------------------- puppet.spec | 12 ++++--- sources | 4 +-- 3 files changed, 10 insertions(+), 42 deletions(-) delete mode 100644 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch diff --git a/0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch b/0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch deleted file mode 100644 index 1fff912..0000000 --- a/0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 578687a00195191185f44d8cb38f4b7716d99c31 Mon Sep 17 00:00:00 2001 -From: Josh Cooper -Date: Tue, 16 May 2017 15:47:04 -0700 -Subject: [PATCH] (PUP-7383) Skip cipher monkey patch on ruby 2.4+ - -Previously, we appended "!SSLv2" to the SSLContext -DEFAULT_PARAMS[:ciphers] to ensure that puppet never uses SSLv2, either -from our http client or when using open-uri. However, ruby 2.4 only -defines the `:ciphers` array if using openssl < 1.1.0[1]. As a result, -puppet as a gem running on newer systems would hard fail. - -Check existence of array before trying to append to it. - -[1] https://github.com/ruby/ruby/commit/c9dc016#diff-8406e11e4a42f9de6badcd0f6a6c4262R33 ---- - lib/puppet/util/monkey_patches.rb | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/puppet/util/monkey_patches.rb b/lib/puppet/util/monkey_patches.rb -index b999fc4..ffb887e 100644 ---- a/lib/puppet/util/monkey_patches.rb -+++ b/lib/puppet/util/monkey_patches.rb -@@ -35,7 +35,9 @@ class OpenSSL::SSL::SSLContext - else - DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3 - end -- DEFAULT_PARAMS[:ciphers] << ':!SSLv2' -+ if DEFAULT_PARAMS[:ciphers] -+ DEFAULT_PARAMS[:ciphers] << ':!SSLv2' -+ end - - alias __original_initialize initialize - private :__original_initialize --- -2.7.4 - diff --git a/puppet.spec b/puppet.spec index a5fad64..b1c0fde 100644 --- a/puppet.spec +++ b/puppet.spec @@ -18,8 +18,8 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending Name: puppet -Version: 4.10.1 -Release: 4%{?dist} +Version: 4.10.10 +Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -32,7 +32,6 @@ Source4: start-puppet-wrapper # Puppetlabs messed up with default paths Patch01: 0001-Fix-puppet-paths.patch Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch -Patch04: 0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch Patch06: 0006-Remove-Fedora-release-restrictions-from-DNF-provider.patch Group: System Environment/Base @@ -135,7 +134,6 @@ The server can also function as a certificate authority and file server. %setup -q %patch01 -p1 -b .paths %patch02 -p1 -b .server -%patch04 -p1 %patch06 -p1 # Unbundle rm -r lib/puppet/vendor/*{pathspec,rgen}* @@ -150,6 +148,7 @@ ruby install.rb --destdir=%{buildroot} \ --bindir=%{_bindir} --vardir=%{_localstatedir}/cache/puppet \ --logdir=%{_localstatedir}/log/puppet \ --rundir=%{_localstatedir}/log/puppet \ + --localedir=%{_datadir}/%{name}/locale \ --quick --no-rdoc --sitelibdir=%{puppet_libdir} @@ -284,6 +283,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-facts.8.gz %{_mandir}/man8/puppet-file.8.gz %{_mandir}/man8/puppet-filebucket.8.gz +%{_mandir}/man8/puppet-generate.8.gz %{_mandir}/man8/puppet-help.8.gz %{_mandir}/man8/puppet-inspect.8.gz #%{_mandir}/man8/puppet-instrumentation_data.8.gz @@ -291,6 +291,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules #%{_mandir}/man8/puppet-instrumentation_probe.8.gz %{_mandir}/man8/puppet-epp.8.gz %{_mandir}/man8/puppet-key.8.gz +%{_mandir}/man8/puppet-lookup.8.gz %{_mandir}/man8/puppet-man.8.gz %{_mandir}/man8/puppet-module.8.gz %{_mandir}/man8/puppet-node.8.gz @@ -402,6 +403,9 @@ fi exit 0 %changelog +* Thu Mar 15 2018 Terje Rosten - 4.10.10-1 +- Update to 4.10.10 + * Fri Feb 09 2018 Fedora Release Engineering - 4.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 069b38a..9ba66ed 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (puppet-4.10.1.tar.gz) = d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 -SHA512 (puppet-4.10.1.tar.gz.asc) = a2a168ca2f48f2db7d8998f0c81895274a2a1c26476a240bd67f0a8c23c54d1ab4fd581d2ac69141cc0de8ed4139107ff2df0ef9b4c31dd76a9592ebd6f453cd +SHA512 (puppet-4.10.10.tar.gz) = e517ee349ead56932c9ff54f910d10842c1cd6b6f28673223a65fb72334662d4eabeccc1c7c7603e17aa712c356edbc27fe53d6e7dd7ba042cc0616d0076d755 +SHA512 (puppet-4.10.10.tar.gz.asc) = 3b17e5505cb1f408e44035a655708cbef7d2bca729ad18180558be2c3b8bddc95e975bc41b53a1451807b38b4088659ed88117173826db588ce3bb96a4329caa