summaryrefslogtreecommitdiffstats
path: root/puppet-0.25.1-server-initscript.patch
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@fedoraproject.org>2010-01-05 22:41:36 +0000
committerTodd Zullinger <tmz@fedoraproject.org>2010-01-05 22:41:36 +0000
commit551a9632265353b2c1a259efdd52cce61a1b7f5b (patch)
tree31f255d38ac5a1747d1aae61b320dfc3906ee31e /puppet-0.25.1-server-initscript.patch
parentc5e32e36ad326f9d9d171364e57ee5b797e258c2 (diff)
downloadpuppet-package-551a9632265353b2c1a259efdd52cce61a1b7f5b.tar.gz
puppet-package-551a9632265353b2c1a259efdd52cce61a1b7f5b.tar.xz
puppet-package-551a9632265353b2c1a259efdd52cce61a1b7f5b.zip
Update to 0.25.2puppet-0_25_2-1_el4_1
- Fixes CVE-2010-0156, tmpfile security issue (#502881) - Install auth.conf, puppetqd manpage, and queuing examples/docs - Replace %%define with %%global for macros
Diffstat (limited to 'puppet-0.25.1-server-initscript.patch')
-rw-r--r--puppet-0.25.1-server-initscript.patch27
1 files changed, 0 insertions, 27 deletions
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
-