From 3e7073eecc187fdd072b17fa193691c9d58320b6 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@fedoraproject.org>
Date: Tue, 5 Jan 2010 21:33:30 +0000
Subject: Remove unused patches

---
 ...supplementary-groups-ported-patch-from-0..patch | 75 ----------------------
 puppet-0.25.1-server-initscript.patch              | 27 --------
 2 files changed, 102 deletions(-)
 delete mode 100644 puppet-0.25.1-0001-Initialize-supplementary-groups-ported-patch-from-0..patch
 delete mode 100644 puppet-0.25.1-server-initscript.patch

diff --git a/puppet-0.25.1-0001-Initialize-supplementary-groups-ported-patch-from-0..patch b/puppet-0.25.1-0001-Initialize-supplementary-groups-ported-patch-from-0..patch
deleted file mode 100644
index 3cc8c09..0000000
--- a/puppet-0.25.1-0001-Initialize-supplementary-groups-ported-patch-from-0..patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 50952a627a9c96a147c7bcac91f6e2380e483310 Mon Sep 17 00:00:00 2001
-From: Jeroen van Meeuwen (Fedora Unity) <kanarip@fedoraunity.org>
-Date: Wed, 25 Nov 2009 13:38:52 +0100
-Subject: [PATCH] Initialize supplementary groups (ported patch from 0.24.8 originally from Till Maas)
-
----
- lib/puppet/util.rb             |    5 +++--
- lib/puppet/util/suidmanager.rb |   12 +++++++++++-
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
-index 6f83c7a..8e2e8a3 100644
---- a/lib/puppet/util.rb
-+++ b/lib/puppet/util.rb
-@@ -55,10 +55,11 @@ module Util
-             end
-             unless Puppet::Util::SUIDManager.uid == user
-                 begin
-+                    Puppet::Util::SUIDManager.initgroups(user)
-                     Puppet::Util::SUIDManager.uid = user
-                     Puppet::Util::SUIDManager.euid = user
--                rescue
--                    $stderr.puts "could not change to user %s" % user
-+                rescue => detail
-+                    $stderr.puts "could not change to user %s: %s" % [user, detail]
-                     exit(74)
-                 end
-             end
-diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
-index c5df0d1..7896945 100644
---- a/lib/puppet/util/suidmanager.rb
-+++ b/lib/puppet/util/suidmanager.rb
-@@ -7,7 +7,7 @@ module Puppet::Util::SUIDManager
-     extend Forwardable
- 
-     to_delegate_to_process = [ :euid=, :euid, :egid=, :egid,
--                               :uid=, :uid, :gid=, :gid ]
-+                               :uid=, :uid, :gid=, :gid, :groups=, :groups ]
- 
-     to_delegate_to_process.each do |method|
-         def_delegator Process, method
-@@ -26,13 +26,16 @@ module Puppet::Util::SUIDManager
-         # We set both because some programs like to drop privs, i.e. bash.
-         old_uid, old_gid = self.uid, self.gid
-         old_euid, old_egid = self.euid, self.egid
-+        old_groups = self.groups
-         begin
-             self.egid = convert_xid :gid, new_gid if new_gid
-+            self.initgroups(convert_xid(:uid, new_uid)) if new_uid
-             self.euid = convert_xid :uid, new_uid if new_uid
- 
-             yield
-         ensure
-             self.euid, self.egid = old_euid, old_egid
-+            self.groups = old_groups
-         end
-     end
-     module_function :asuser
-@@ -49,6 +52,13 @@ module Puppet::Util::SUIDManager
-     end
-     module_function :convert_xid
- 
-+    # Initialize supplementary groups
-+    def initgroups(user)
-+        require 'etc'
-+        Process.initgroups(Etc.getpwuid(user).name, Process.gid)
-+    end
-+    module_function :initgroups
-+
- 
-     def run_and_capture(command, new_uid=nil, new_gid=nil)
-         output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid)
--- 
-1.6.5.2
-
diff --git a/puppet-0.25.1-server-initscript.patch b/puppet-0.25.1-server-initscript.patch
deleted file mode 100644
index 69bbfac..0000000
--- a/puppet-0.25.1-server-initscript.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8894aae81d26a9564305ae89ac159320c53dca83 Mon Sep 17 00:00:00 2001
-From: Todd Zullinger <tmz@pobox.com>
-Date: Tue, 27 Oct 2009 10:30:08 -0400
-Subject: [PATCH/puppet] conf/redhat: Prevent killproc from removing /usr/sbin/puppetmasterd
-
-Mattias Saou ran into a serious bug cause by 9dff71 (Use -p option to
-killproc).  The puppetmaster init script lacked a pidfile variable,
-which ended up with /usr/sbin/puppetmasterd being removed.
----
- conf/redhat/server.init |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/conf/redhat/server.init b/conf/redhat/server.init
-index 5505058..4f44206 100644
---- a/conf/redhat/server.init
-+++ b/conf/redhat/server.init
-@@ -13,6 +13,7 @@ PATH=/usr/bin:/sbin:/bin:/usr/sbin
- export PATH
- 
- lockfile=/var/lock/subsys/puppetmaster
-+pidfile=/var/run/puppet/puppetmasterd.pid
- 
- # Source function library.
- . /etc/rc.d/init.d/functions
--- 
-1.6.5.2
-
-- 
cgit