diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2008-06-16 06:42:46 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2008-06-16 06:42:46 +0000 |
| commit | f6951799f40ce1c6a5f4a9aee6dd11bed5e21b42 (patch) | |
| tree | 2f289e1a68ab68469716e0799e139cba0b6d69cd /app-admin | |
| parent | Marked ppc stable for bug #219933. (diff) | |
| download | gentoo-2-f6951799f40ce1c6a5f4a9aee6dd11bed5e21b42.tar.gz gentoo-2-f6951799f40ce1c6a5f4a9aee6dd11bed5e21b42.tar.bz2 gentoo-2-f6951799f40ce1c6a5f4a9aee6dd11bed5e21b42.zip | |
Added fix to make scripts work with baselayout-2/openrc (bug #218071)
(Portage version: 2.1.5.4)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/puppet/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/puppet/files/puppet-0.24.4-openrc_initd.patch | 12 | ||||
| -rwxr-xr-x | app-admin/puppet/files/puppetmaster.init | 2 | ||||
| -rw-r--r-- | app-admin/puppet/puppet-0.24.4.ebuild | 6 |
4 files changed, 23 insertions, 4 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog index faca620f0701..73add34e5adf 100644 --- a/app-admin/puppet/ChangeLog +++ b/app-admin/puppet/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/puppet # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.14 2008/05/01 19:10:13 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.15 2008/06/16 06:42:46 dev-zero Exp $ + + 16 Jun 2008; Tiziano Müller <dev-zero@gentoo.org> + +files/puppet-0.24.4-openrc_initd.patch, files/puppetmaster.init, + puppet-0.24.4.ebuild: + Added fix to make scripts work with baselayout-2/openrc (bug #218071) 01 May 2008; Tobias Scherbaum <dertobi123@gentoo.org> puppet-0.24.4.ebuild: diff --git a/app-admin/puppet/files/puppet-0.24.4-openrc_initd.patch b/app-admin/puppet/files/puppet-0.24.4-openrc_initd.patch new file mode 100644 index 000000000000..c26c6ca37a68 --- /dev/null +++ b/app-admin/puppet/files/puppet-0.24.4-openrc_initd.patch @@ -0,0 +1,12 @@ +diff -Naur puppet-0.24.4.orig/conf/gentoo/init.d/puppet puppet-0.24.4/conf/gentoo/init.d/puppet +--- puppet-0.24.4.orig/conf/gentoo/init.d/puppet 2008-06-11 19:06:26.000000000 +0200 ++++ puppet-0.24.4/conf/gentoo/init.d/puppet 2008-06-11 19:06:45.000000000 +0200 +@@ -24,7 +24,7 @@ + [[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}" + + ebegin "Starting puppet" +- start-stop-daemon --start --quiet --exec /usr/bin/puppetd -- ${options} ++ start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetd -- ${options} + eend $? "Failed to start puppet" + } + diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init index 09def2a47c9b..60231530a08e 100755 --- a/app-admin/puppet/files/puppetmaster.init +++ b/app-admin/puppet/files/puppetmaster.init @@ -34,7 +34,7 @@ start() { [[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}" ebegin "Starting puppetmaster" - start-stop-daemon --start --quiet --exec /usr/bin/puppetmasterd \ + start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \ -- ${options} eend $? "Failed to start puppetmaster" } diff --git a/app-admin/puppet/puppet-0.24.4.ebuild b/app-admin/puppet/puppet-0.24.4.ebuild index c7dc8fd75d78..cc276ff7b7d1 100644 --- a/app-admin/puppet/puppet-0.24.4.ebuild +++ b/app-admin/puppet/puppet-0.24.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.4.ebuild,v 1.2 2008/05/01 19:10:13 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.4.ebuild,v 1.3 2008/06/16 06:42:46 dev-zero Exp $ inherit elisp-common eutils ruby @@ -34,7 +34,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${PN}-0.24.2-gentoo.patch + epatch + "${FILESDIR}/${PN}-0.24.2-gentoo.patch" \ + "${FILESDIR}/${P}-openrc_initd.patch" } src_compile() { |