[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit f72741f2165fcf6877c564f24d09e67c87180fb3
Author: Todd Zullinger <tmz at pobox.com>
Date:   Sat Jul 10 14:48:04 2010 -0400

    conf/redhat: Rebase rundir-perms patch

diff --git a/conf/redhat/rundir-perms.patch b/conf/redhat/rundir-perms.patch
index a4cc94b..445b6cf 100644
--- a/conf/redhat/rundir-perms.patch
+++ b/conf/redhat/rundir-perms.patch
@@ -1,6 +1,6 @@
-From 9c4f335261aa48b6a2b82e91d4d6fcd95f030d09 Mon Sep 17 00:00:00 2001
+From b153b4d234cd015efb52a5db8075350a75506668 Mon Sep 17 00:00:00 2001
 From: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
-Date: Fri, 4 Sep 2009 09:13:19 -0400
+Date: Sat, 10 Jul 2010 14:44:04 -0400
 Subject: [PATCH/puppet] Tighten rundir perms (rhbz #495096)
 
 The loose default permissions are not required for Red Hat systems
@@ -11,18 +11,18 @@ service user/group.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
-index 3a0feec..3132830 100644
+index 0af40f2..71027d6 100644
 --- a/lib/puppet/defaults.rb
 +++ b/lib/puppet/defaults.rb
-@@ -62,7 +62,7 @@ module Puppet
-         },
-         :rundir => {
-             :default => rundir,
--            :mode => 01777,
-+            :mode => 0755,
-             :desc => "Where Puppet PID files are kept."
-         },
-         :genconfig => [false,
+@@ -26,7 +26,7 @@ module Puppet
+     },
+     :rundir => {
+       :default => Puppet.run_mode.run_dir,
+-      :mode => 01777,
++      :mode => 0755,
+       :desc => "Where Puppet PID files are kept."
+     },
+     :genconfig => [false,
 -- 
-1.6.4.2
+1.7.1
 

-- 
Puppet packaging for Debian