From 9d740cbb34a98ae546fe9e677594a41a22dec7d9 Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Fri, 28 Dec 2012 17:40:55 -0800 Subject: [PATCH 1/4] Update gitignore once more Updating to fix typo of ac to asc. Also re-adding /puppet-*/. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 88290ca..b490e46 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *~ *.rpm *.tar.gz -*.tar.gz.ac +*.tar.gz.asc +/puppet-*/ /.build*.log From 3194a84e47fe9885681af7d4b2312515b56e5d89 Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Wed, 13 Feb 2013 16:29:16 -0800 Subject: [PATCH 2/4] Update rawhide to 3.1.0 --- puppet.spec | 17 ++++++++--------- sources | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/puppet.spec b/puppet.spec index 38e92c1..f3ace0c 100644 --- a/puppet.spec +++ b/puppet.spec @@ -19,7 +19,7 @@ %global ruby_version %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]') Name: puppet -Version: 3.0.2 +Version: 3.1.0 Release: 1%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 @@ -106,8 +106,9 @@ The server can also function as a certificate authority and file server. patch -s -p1 < %{confdir}/rundir-perms.patch # Fix some rpmlint complaints -for f in mac_dscl.pp mac_dscl_revert.pp \ - mac_pkgdmg.pp ; do +for f in mac_automount.pp mcx_dock_absent.pp mcx_dock_default.pp \ + mcx_dock_full.pp mcx_dock_invalid.pp mcx_nogroup.pp \ + mcx_notexists_absent.pp; do sed -i -e'1d' examples/$f chmod a-x examples/$f done @@ -116,12 +117,6 @@ for f in external/nagios.rb relationship.rb; do done chmod +x ext/puppet-load.rb ext/regexp_nodes/regexp_nodes.rb -find examples/ -type f -empty | xargs rm -find examples/ -type f | xargs chmod a-x - -# puppet-queue.conf is more of an example, used for stompserver -mv conf/puppet-queue.conf examples/etc/puppet/ - %build # Nothing to build @@ -252,6 +247,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules %{_mandir}/man8/puppet-resource_type.8.gz %{_mandir}/man8/puppet-secret_agent.8.gz %{_mandir}/man8/puppet-status.8.gz +%{_mandir}/man8/extlookup2hiera.8.gz %files server %defattr(-, root, root, 0755) @@ -349,6 +345,9 @@ fi rm -rf %{buildroot} %changelog +* 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) diff --git a/sources b/sources index d8473a5..1290ba0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c4507a83679df9f6c8409d97cc6ef757 puppet-3.0.2.tar.gz -ca2521e8af245f25cb54f5a167b0a183 puppet-3.0.2.tar.gz.asc +4cbdcc9dfcda677c820175375a500651 puppet-3.1.0.tar.gz +d2e905ef5ae97b8b196f508082fb4680 puppet-3.1.0.tar.gz.asc From 986d96a1ae9fbab6a5c02d2b2768cbdd1bd5857b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 12:32:18 -0600 Subject: [PATCH 3/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- puppet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/puppet.spec b/puppet.spec index 38e92c1..66bd62c 100644 --- a/puppet.spec +++ b/puppet.spec @@ -20,7 +20,7 @@ Name: puppet Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -349,6 +349,9 @@ fi rm -rf %{buildroot} %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 3.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * 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) From bf3db4410d2aa04bc8c6e0779549577532c546b5 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Thu, 7 Mar 2013 16:12:39 -0600 Subject: [PATCH 4/4] Improve compat with old clients --- puppet.spec | 8 +++++- puppetmaster-old-client-compat.patch | 39 ++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 puppetmaster-old-client-compat.patch diff --git a/puppet.spec b/puppet.spec index f3ace0c..02c3f73 100644 --- a/puppet.spec +++ b/puppet.spec @@ -20,7 +20,7 @@ Name: puppet Version: 3.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -28,6 +28,8 @@ Source0: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.g Source1: http://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc Source2: puppet-nm-dispatcher +Patch0: puppetmaster-old-client-compat.patch + Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -103,6 +105,7 @@ The server can also function as a certificate authority and file server. %prep %setup -q +%patch0 -p1 patch -s -p1 < %{confdir}/rundir-perms.patch # Fix some rpmlint complaints @@ -345,6 +348,9 @@ fi rm -rf %{buildroot} %changelog +* 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 diff --git a/puppetmaster-old-client-compat.patch b/puppetmaster-old-client-compat.patch new file mode 100644 index 0000000..3787cde --- /dev/null +++ b/puppetmaster-old-client-compat.patch @@ -0,0 +1,39 @@ +From ec462b7b974fc34110437010f862780fb2ee39a3 Mon Sep 17 00:00:00 2001 +From: Daniel Drake +Date: Thu, 14 Feb 2013 15:05:10 -0600 +Subject: [PATCH] (#18781) Be more tolerant of old clients in WEBrick server + +In #18781 and #6117 there are cases of relatively simplistic puppet +setups failing between old versions of the puppet client (which +always use HTTP GET) and new versions of the puppet WEBrick server +(which has a relatively low limit on the size of a valid GET: 2083 +bytes). + +While there are other non-WEBrick server options available, WEBrick +has the advantage of simplicity, so it would be nice to keep it working. + +Here we patch the WEBrick constant which specifies the maximum size of +a HTTP GET request, increasing it to a value that should work for common +setups. +--- + lib/puppet/util/monkey_patches.rb | 9 +++++++++ + 1 file changed, 9 insertions(+) + +Index: puppet-3.1.0/lib/puppet/util/monkey_patches.rb +=================================================================== +--- puppet-3.1.0.orig/lib/puppet/util/monkey_patches.rb ++++ puppet-3.1.0/lib/puppet/util/monkey_patches.rb +@@ -356,3 +356,13 @@ unless Dir.respond_to?(:mktmpdir) + end + end + end ++ ++# Old puppet clients may make large GET requests, lets be reasonably tolerant ++# in our default WEBrick server. ++require 'webrick' ++if defined?(WEBrick::HTTPRequest::MAX_URI_LENGTH) and WEBrick::HTTPRequest::MAX_URI_LENGTH < 8192 ++ # Silence ruby warning: already initialized constant MAX_URI_LENGTH ++ v, $VERBOSE = $VERBOSE, nil ++ WEBrick::HTTPRequest.const_set("MAX_URI_LENGTH", 8192) ++ $VERBOSE = v ++end