# 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.10 2008/02/07 16:45:04 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.11 2008/03/05 16:15:54 matsuu Exp $
+
+*puppet-0.24.2 (05 Mar 2008)
+
+ 05 Mar 2008; MATSUU Takuto <matsuu@gentoo.org>
+ +files/puppet-0.24.2-gentoo.patch, +files/puppetmaster.init,
+ +puppet-0.24.2.ebuild:
+ Version bumped, bug #212262.
+ Fixed /etc/init.d/puppetmaster, bug #211910.
*puppet-0.24.1-r1 (07 Feb 2008)
AUX puppet-0.23.2-gentoo.patch 7957 RMD160 cecf241522ad4400a942762e327496f0f8834a7f SHA1 352fbaeeccd479592a7447bf5bd106154de3c01a SHA256 4449467bd7b145bc42a019609c36afdfc8b1f6f35c60f59191d01475be165575
AUX puppet-0.24.1-gentoo.patch 5898 RMD160 ad378ccb4e99f488b1a0b0a2e5f240b85fe577f3 SHA1 32abbc5b3fa07ba10a217623f12f13b3531ecff5 SHA256 0dd2837574e9007c3cf8900f94d8f3a8550dab94d13209077c2fe9729c9d3c67
AUX puppet-0.24.1-service.patch 528 RMD160 8b3dc4ef4db1d3880ba5cb225f4dde87156ce6d3 SHA1 e0ac3359b297ac6fb780e5280bc7249062564c80 SHA256 87255fd26a5f21f4121a76ba46c5f666d17c49145ef67fbbc1183b7d5af8152d
+AUX puppet-0.24.2-gentoo.patch 628 RMD160 9149d2b68a82a87dc4bcdae3ef5608ca0f152973 SHA1 d7bd432ef27be9dc14dc4e37b8302659caa0f3f4 SHA256 abc592df144baec0c93cc90459ab273fe2aec9f195670ca5dba5d8bc4e6ee886
+AUX puppetmaster.init 1373 RMD160 b93140bf89a0bd179719c393087325db7fa3f822 SHA1 42627b01ae8e847f2b34b89c973a26220c722bd8 SHA256 f7ec6b2d66f5ac82ad867817f658e53b349d139876222c6f8c306ba2ae65fcaa
DIST puppet-0.23.2.tgz 698593 RMD160 bbc88da5a15ac65c05c103b123680515aadec6b5 SHA1 682e97473a80ebc29ea1c75966b26a1a3e95618d SHA256 eb80e4d4adeb174c2ec5198f73d581f9a77cb07a2cae15114b9b11b13021bfa8
DIST puppet-0.24.1.tgz 678506 RMD160 7d52e6659a1acc4251a8fc4fc5ea37df2961f2c2 SHA1 0f9e128f9dbe3cac3a641017cfeb30c77cb1a208 SHA256 5ed1dc3da91124f3c1e701c9727ee7bb7747e8abcc612bc47c808015a0f3bba6
+DIST puppet-0.24.2.tgz 648607 RMD160 26c96e3da5fdb53e7784c1068d84a2cf2471c0de SHA1 7e1bcce33c824aa958c8122853d819594b5cde04 SHA256 540d339e3ef6cc430ac6e005d011ff08be3662fbd90925e361a78e813452fd4b
EBUILD puppet-0.23.2-r1.ebuild 3082 RMD160 bc582501288f923a3d43bdbe8b07ee4ded92ad9e SHA1 473af40fd990bbf71ec0225e68b4558c971552ec SHA256 63b4f07cd206e2393b87de7d8255fb066140eea1e05f5ccd527eac8a22c2c5e0
EBUILD puppet-0.24.1-r1.ebuild 3256 RMD160 35622336f22f8fcc7206bfe6699d0fe18c4e2cfb SHA1 47c555ab756b790e442fdecaba8cc203503212ba SHA256 181da2ea1a866ebcf6ece814b94701a0e3cc0c53fca96aa6e99fa87a9240259c
EBUILD puppet-0.24.1.ebuild 3079 RMD160 385daf6b86d81a2c0e34bfc687a97f4136cb4c4b SHA1 13533a39c8caf820b579c270995af182434e4799 SHA256 617adb372a7d70da52373b521ab77a8cace375019f66935400fe4d9240796b6c
-MISC ChangeLog 2170 RMD160 1be4a5c295b8d4b0249057e199887866a23ef452 SHA1 51228d53996cafe1d2d5bb7b6633403bf5352ed8 SHA256 7318ffac8af7fa0a7f88ea88f3ba7c7810fbfcd5d0384ee79850eac786a03cdc
+EBUILD puppet-0.24.2.ebuild 3283 RMD160 a4ad45ec93862f86085e705ba0cf81cc21d3db10 SHA1 02253a310c76cd10a7e62ac15bcfeb8910a930cc SHA256 e4a91d507327100ce7feb727b5d212fb35f3759837f29c16e1d44c814d1111fa
+MISC ChangeLog 2416 RMD160 a40f6a5850e8ee902771db259101771a6ee08047 SHA1 fb95f53a29dce9dd63b6839477269d23ae4570b5 SHA256 d6283ce9570548b17365f728a7648ef6f20f8ee902e1120606ba8646b280344d
MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337
--- /dev/null
+diff -Naur puppet-0.24.2.orig/lib/puppet/provider/service/gentoo.rb puppet-0.24.2/lib/puppet/provider/service/gentoo.rb
+--- puppet-0.24.2.orig/lib/puppet/provider/service/gentoo.rb 2008-03-04 01:32:37.000000000 +0900
++++ puppet-0.24.2/lib/puppet/provider/service/gentoo.rb 2008-03-06 00:53:20.000000000 +0900
+@@ -33,7 +33,7 @@
+ return :false unless line
+
+ # If it's enabled then it will print output showing service | runlevel
+- if output =~ /#{@resource[:name]}\s*|\s*default/
++ if output =~ /#{@resource[:name]}\s*\|\s*default/
+ return :true
+ else
+ return :false
--- /dev/null
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+ before puppet
+ use dns logger
+}
+
+checkconfig() {
+ if [[ ! -d "${PUPPETMASTER_PID_DIR}" ]] ; then
+ eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory"
+ return 1
+ fi
+
+ local site_manifest="/etc/puppet/manifests/site.pp"
+ [[ -n "${PUPPETMASTER_MANIFEST}" ]] && site_manifest="${PUPPETMASTER_MANIFEST}"
+
+ if [ ! -f "${site_manifest}" ] ; then
+ eerror "Please create ${site_manifest} before running puppet"
+ return 1
+ fi
+
+ return 0
+}
+
+start() {
+ checkconfig || return $?
+
+ local options=""
+ [[ -n "${PUPPETMASTER_MANIFEST}" ]] && options="${options} --manifest=${PUPPETMASTER_MANIFEST}"
+ [[ -n "${PUPPETMASTER_LOG}" ]] && options="${options} --logdest=${PUPPETMASTER_LOG}"
+ [[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
+
+ ebegin "Starting puppetmaster"
+ start-stop-daemon --start --quiet --exec /usr/bin/puppetmasterd \
+ -- ${options}
+ eend $? "Failed to start puppetmaster"
+}
+
+stop() {
+ ebegin "Stopping puppetmaster"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+ local ret=$?
+ eend ${ret} "Failed to stop puppetmaster"
+ rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+ return ${ret}
+}
--- /dev/null
+# 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.2.ebuild,v 1.1 2008/03/05 16:15:54 matsuu Exp $
+
+inherit elisp-common eutils ruby
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
+SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="emacs vim-syntax"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+ >=dev-ruby/facter-1.3.5
+ >=app-portage/eix-0.9.4"
+
+USE_RUBY="ruby18"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+ built_with_use virtual/ruby ipv6 || \
+ die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run"
+
+ enewgroup puppet || die "Problem creating group puppet"
+ enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet"
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+ if use emacs ; then
+ elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
+ fi
+}
+
+src_install() {
+ DESTDIR="${D}" ruby_einstall "$@" || die
+ DESTDIR="${D}" erubydoc
+
+ # Installation of init scripts and configuration
+ # bug #211910
+ #doinitd conf/gentoo/init.d/puppetmaster
+ newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
+ doconfd conf/gentoo/conf.d/puppetmaster
+ doinitd conf/gentoo/init.d/puppet
+ doconfd conf/gentoo/conf.d/puppet
+
+ # Initial configuration files
+ keepdir /etc/puppet/manifests
+ insinto /etc/puppet
+ doins conf/gentoo/puppet/*
+
+ # Location of log and data files
+ keepdir /var/run/puppet
+ keepdir /var/log/puppet
+ keepdir /var/lib/puppet/ssl
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/{run,log,lib}/puppet
+
+ if use emacs ; then
+ elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
+ insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto $(dirname ${f})
+ dodoc ${f}
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Puppet uses eix to get information about currently installed packages,"
+ elog "so please keep the eix metadata cache updated so puppet is able to properly"
+ elog "handle package installations."
+ elog
+ elog "Currently puppet only supports adding and removing services to the default"
+ elog "runlevel, if you want to add/remove a service from another runlevel you may"
+ elog "do so using symlinking."
+ elog
+
+ if [ \
+ -f "${ROOT}/etc/puppet/puppetd.conf" -o \
+ -f "${ROOT}/etc/puppet/puppetmaster.conf" -o \
+ -f "${ROOT}/etc/puppet/puppetca.conf" \
+ ] ; then
+ elog
+ elog "Please remove deprecated config files."
+ elog " /etc/puppet/puppetca.conf"
+ elog " /etc/puppet/puppetd.conf"
+ elog " /etc/puppet/puppetmasterd.conf"
+ elog
+ fi
+ use emacs && elisp-site-regen
+}
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
projects / gentoo.git / commitdiff