From 1d46e992aff71a3653ddb52f4327a0ad05f7c35c Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dominic@cleal.org>
Date: Thu, 25 May 2017 10:34:03 +0100
Subject: [PATCH] Update to 4.8.2

---
 0003-Remove-unused-requre-xmlrpc-client.patch | 30 -------------------
 puppet.spec                                   | 26 +++++++++-------
 sources                                       |  4 +--
 3 files changed, 18 insertions(+), 42 deletions(-)
 delete mode 100644 0003-Remove-unused-requre-xmlrpc-client.patch

diff --git a/0003-Remove-unused-requre-xmlrpc-client.patch b/0003-Remove-unused-requre-xmlrpc-client.patch
deleted file mode 100644
index a875561..0000000
--- a/0003-Remove-unused-requre-xmlrpc-client.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 484623eda09d8e8b9857f5279ebb891a423588dc Mon Sep 17 00:00:00 2001
-From: Kylo Ginsberg <kylo@puppet.com>
-Date: Sun, 18 Sep 2016 06:42:46 -0700
-Subject: [PATCH] (maint) Remove unused: requre 'xmlrpc/client'
-
-In 152299cc, as part of PUP-6120, use of the xmlrpc library
-was removed from the code, but the require itself was not
-removed. This commit simply removes the vestigial require.
-
-Note that this change is required to support ruby 2.4,
-which no longer includes the xmlrpc library.
----
- lib/puppet/provider/package/pip.rb | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/puppet/provider/package/pip.rb b/lib/puppet/provider/package/pip.rb
-index 9300b7b..aad447b 100644
---- a/lib/puppet/provider/package/pip.rb
-+++ b/lib/puppet/provider/package/pip.rb
-@@ -2,7 +2,6 @@
- # <http://pip.pypa.io/>
- 
- require 'puppet/provider/package'
--require 'xmlrpc/client'
- require 'puppet/util/http_proxy'
- 
- Puppet::Type.type(:package).provide :pip,
--- 
-2.7.4
-
diff --git a/puppet.spec b/puppet.spec
index 20f9663..2970631 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -18,8 +18,8 @@
 %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending
 
 Name:           puppet
-Version:        4.6.2
-Release:        5%{?dist}
+Version:        4.8.2
+Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
@@ -32,14 +32,12 @@ Source4:        start-puppet-wrapper
 # Puppetlabs messed up with default paths
 Patch01:        0001-Fix-puppet-paths.patch
 Patch02:        0002-Revert-maint-Remove-puppetmaster.service.patch
-Patch03:        0003-Remove-unused-requre-xmlrpc-client.patch
 Patch04:        0004-PUP-7383-Skip-cipher-monkey-patch-on-ruby-2.4.patch
 Patch05:        0005-PUP-7483-Reject-all-fact-formats-except-PSON.patch
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  facter >= 1.6.6
 BuildRequires:  ruby-devel >= 1.8.7
 # ruby-devel does not require the base package, but requires -libs instead
 BuildRequires:  ruby >= 1.8.7
@@ -50,10 +48,11 @@ Requires:       ruby(abi) = 1.8
 %else
 Requires:       ruby(release)
 %endif
-Requires:       ruby(shadow)
 
+Requires:       ruby(shadow)
 Requires:       rubygem(json)
 Requires:       rubygem(pathspec)
+Requires:       rubygem(rgen)
 
 # Prevents jruby from being pulled in by dependencies (BZ #985208)
 Requires:       ruby
@@ -67,11 +66,16 @@ Requires:       ruby
 %endif
 %endif
 
-BuildRequires:  hiera >= 1.0.0
+BuildRequires:  facter >= 2.0
+BuildRequires:  facter < 4
+BuildRequires:  hiera >= 2.0
+BuildRequires:  hiera < 4
+
+Requires:       facter >= 2.0
+Requires:       facter < 4
+Requires:       hiera >= 2.0
+Requires:       hiera < 4
 
-Requires:       facter >= 1.6.6
-Requires:       hiera >= 1.0.0
-Requires:       rubygem(rgen)
 Obsoletes:      hiera-puppet < 1.0.0-2
 Provides:       hiera-puppet = %{version}-%{release}
 
@@ -122,7 +126,6 @@ The server can also function as a certificate authority and file server.
 %setup -q
 %patch01 -p1 -b .paths
 %patch02 -p1 -b .server
-%patch03 -p1
 %patch04 -p1
 %patch05 -p1
 # Unbundle
@@ -393,6 +396,9 @@ exit 0
 rm -rf %{buildroot}
 
 %changelog
+* Thu May 25 2017 Dominic Cleal <dominic@cleal.org> - 4.8.2-1
+- Update to 4.8.2
+
 * Tue May 23 2017 Ville Skyttä <ville.skytta@iki.fi> - 4.6.2-5
 - Move tmpfiles.d config to %%{_tmpfilesdir}
 - Install LICENSE as %%license
diff --git a/sources b/sources
index 1d81261..19d0dc5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (puppet-4.6.2.tar.gz) = a8b908f0e5586e9e94fab510df7f4cc4e8693a72c54719c31cf274e26367c4d04391629a1d749337eec7469be148777bc7de8d0fd3aaf78d7f213bce0a1560b4
-SHA512 (puppet-4.6.2.tar.gz.asc) = 35bb418085e6a7c20e69c0a91a9ee98f19997f388c70d3bb88df95f117f33e7bff46fbb0ef0679e413faff1eadecc7b2282bb13b2fbad171457b12149d4590ff
+SHA512 (puppet-4.8.2.tar.gz.asc) = 3526e4787e5894a6d62af6c06a10fc20e8726759209b6d461dd7688882d7a646ff23a4efdb28ac7358bb2ac0002a1486b6f746f6a1e15c1e1cef33565d9433be
+SHA512 (puppet-4.8.2.tar.gz) = d9c3d7949d88c12df49f6e9b170004087bf4eb3a598764f34ca4cc074013ecb0ab585e836c1cf12c7be4e61af0c18845dd0d65f3446fa744f949d8f2c7a8d2a1