* [gentoo-commits] gentoo-x86 commit in app-admin/puppet: puppet-3.0.1-r1.ebuild ChangeLog puppet-2.7.19-r1.ebuild puppet-2.7.18-r1.ebuild puppet-3.0.1.ebuild puppet-2.7.19.ebuild
@ 2013-02-08 16:49 Matt Thode (prometheanfire)
0 siblings, 0 replies; only message in thread
From: Matt Thode (prometheanfire) @ 2013-02-08 16:49 UTC (permalink / raw
To: gentoo-commits
prometheanfire 13/02/08 16:49:13
Modified: ChangeLog
Added: puppet-3.0.1-r1.ebuild puppet-2.7.19-r1.ebuild
puppet-2.7.18-r1.ebuild
Removed: puppet-3.0.1.ebuild puppet-2.7.19.ebuild
Log:
updating initscripts with checkpath for bug 456002 CVE-2012-6120
(Portage version: 2.1.11.31/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Revision Changes Path
1.138 app-admin/puppet/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.138&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.138&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.137&r2=1.138
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- ChangeLog 3 Feb 2013 13:01:38 -0000 1.137
+++ ChangeLog 8 Feb 2013 16:49:13 -0000 1.138
@@ -1,6 +1,16 @@
# ChangeLog for app-admin/puppet
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.137 2013/02/03 13:01:38 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.138 2013/02/08 16:49:13 prometheanfire Exp $
+
+*puppet-3.0.1-r1 (08 Feb 2013)
+*puppet-2.7.19-r1 (08 Feb 2013)
+
+ 08 Feb 2013; Matthew Thode <prometheanfire@gentoo.org>
+ +files/puppetmaster-2.7.6.init-CVE-2012-6120, +puppet-2.7.18-r1.ebuild,
+ -puppet-2.7.19.ebuild, +puppet-2.7.19-r1.ebuild, -puppet-3.0.1.ebuild,
+ +puppet-3.0.1-r1.ebuild, +files/puppet.init-CVE-2012-6120,
+ files/puppet.init-r1, files/puppetmaster.init:
+ updating initscripts with checkpath for bug 456002 CVE-2012-6120
03 Feb 2013; Matthew Thode <prometheanfire@gentoo.org> metadata.xml,
puppet-3.0.1.ebuild:
1.1 app-admin/puppet/puppet-3.0.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-3.0.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-3.0.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: puppet-3.0.1-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.0.1-r1.ebuild,v 1.1 2013/02/08 16:49:13 prometheanfire Exp $
EAPI="4"
USE_RUBY="ruby18 ruby19"
inherit elisp-common xemacs-elisp-common eutils user ruby-ng versionator
DESCRIPTION="A system automation and configuration management software"
HOMEPAGE="http://puppetlabs.com/"
SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
ruby_add_rdepend "
dev-ruby/hiera
>=dev-ruby/facter-1.6.2
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
ldap? ( dev-ruby/ruby-ldap )
shadow? ( dev-ruby/ruby-shadow )
sqlite3? ( dev-ruby/sqlite3 )
virtual/ruby-ssl"
DEPEND="${DEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )"
RDEPEND="${RDEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
selinux? (
sys-libs/libselinux[ruby]
sec-policy/selinux-puppet
)
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
>=app-portage/eix-0.18.0"
SITEFILE="50${PN}-mode-gentoo.el"
pkg_setup() {
enewgroup puppet
enewuser puppet -1 -1 /var/lib/puppet puppet
}
all_ruby_compile() {
if use emacs ; then
elisp-compile ext/emacs/puppet-mode.el
fi
if use xemacs ; then
# Create a separate version for xemacs to be able to install
# emacs and xemacs in parallel.
mkdir ext/xemacs
cp ext/emacs/* ext/xemacs/
xemacs-elisp-compile ext/xemacs/puppet-mode.el
fi
}
each_ruby_install() {
${RUBY} install.rb --destdir="${D}" install || die
}
all_ruby_install() {
newinitd "${FILESDIR}"/puppet.init-r1-CVE-2012-6120 puppet
# Initial configuration files
insinto /etc/puppet
# Location of log and data files
keepdir /var/log/puppet
fowners -R puppet:puppet /var/log/puppet
if use minimal ; then
rm "${ED}/etc/puppet/auth.conf"
else
newinitd "${FILESDIR}"/puppetmaster.init-CVE-2012-6120 puppetmaster
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
insinto /etc/puppet
keepdir /etc/puppet/manifests
keepdir /etc/puppet/modules
keepdir /var/lib/puppet/ssl
keepdir /var/lib/puppet/facts
keepdir /var/lib/puppet/files
fowners -R puppet:puppet /var/lib/puppet
fi
if use emacs ; then
elisp-install ${PN} ext/emacs/puppet-mode.el*
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use xemacs ; then
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use ldap ; then
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
fi
# ext and examples files
for f in $(find ext examples -type f) ; do
docinto "$(dirname ${f})"; dodoc "${f}"
done
docinto conf; dodoc conf/namespaceauth.conf
}
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 "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-f "${EPREFIX}/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
if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
elog
elog "If you're upgrading from 2.x then we strongly suggest you to read:"
elog "http://docs.puppetlabs.com/guides/upgrading.html"
elog
fi
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}
1.1 app-admin/puppet/puppet-2.7.19-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.7.19-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.7.19-r1.ebuild?rev=1.1&content-type=text/plain
Index: puppet-2.7.19-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.19-r1.ebuild,v 1.1 2013/02/08 16:49:13 prometheanfire Exp $
EAPI="4"
USE_RUBY="ruby18 ruby19"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_TASK_TEST="test"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
inherit elisp-common xemacs-elisp-common eutils ruby-fakegem user
DESCRIPTION="A system automation and configuration management software"
HOMEPAGE="http://puppetlabs.com/"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
ruby_add_rdepend "
>=dev-ruby/facter-1.5.6
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
ldap? ( dev-ruby/ruby-ldap )
shadow? ( dev-ruby/ruby-shadow )
sqlite3? ( dev-ruby/sqlite3 )
virtual/ruby-ssl"
# couchdb? ( dev-ruby/couchrest )
# mongrel? ( www-servers/mongrel )
# rack? ( >=dev-ruby/rack-1 )
# rails? (
# dev-ruby/rails
# >=dev-ruby/activerecord-2.1
# )
# stomp? ( dev-ruby/stomp )
DEPEND="${DEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )
selinux? ( sec-policy/selinux-puppet )"
RDEPEND="${RDEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
selinux? (
sys-libs/libselinux[ruby]
sec-policy/selinux-puppet
)
>=app-portage/eix-0.18.0"
SITEFILE="50${PN}-mode-gentoo.el"
RUBY_PATCHES=(
"${PN}-2.7.18-eix_fix.patch"
)
pkg_setup() {
enewgroup puppet
enewuser puppet -1 -1 /var/lib/puppet puppet
}
all_ruby_compile() {
all_fakegem_compile
if use emacs ; then
elisp-compile ext/emacs/puppet-mode.el
fi
if use xemacs ; then
# Create a separate version for xemacs to be able to install
# emacs and xemacs in parallel.
mkdir ext/xemacs
cp ext/emacs/* ext/xemacs/
xemacs-elisp-compile ext/xemacs/puppet-mode.el
fi
}
each_fakegem_install() {
${RUBY} install.rb --destdir="${D}" install
}
all_ruby_install() {
all_fakegem_install
newinitd "${FILESDIR}"/puppet.init-r1-CVE-2012-6120 puppet
doconfd conf/gentoo/conf.d/puppet
# Initial configuration files
insinto /etc/puppet
# Bug #338439
#doins conf/gentoo/puppet/*
doins conf/redhat/puppet.conf
# Location of log and data files
keepdir /var/{run,log}/puppet
fowners -R puppet:puppet /var/{run,log}/puppet
if use minimal ; then
rm "${ED}/usr/bin/puppetmasterd"
rm "${ED}/etc/puppet/auth.conf"
else
newinitd "${FILESDIR}"/puppetmaster.init-CVE-2012-6120 puppetmaster
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
insinto /etc/puppet
doins conf/redhat/fileserver.conf
keepdir /etc/puppet/manifests
keepdir /etc/puppet/modules
keepdir /var/lib/puppet/ssl
keepdir /var/lib/puppet/facts
keepdir /var/lib/puppet/files
fowners -R puppet:puppet /var/{run,log,lib}/puppet
fi
if use emacs ; then
elisp-install ${PN} ext/emacs/puppet-mode.el*
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use xemacs ; then
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use ldap ; then
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
fi
if use vim-syntax ; then
insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
fi
# ext and examples files
for f in $(find ext examples -type f) ; do
docinto "$(dirname ${f})"; dodoc "${f}"
done
docinto conf; dodoc conf/namespaceauth.conf
}
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 "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-f "${EPREFIX}/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
use xemacs && xemacs-elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}
1.4 app-admin/puppet/puppet-2.7.18-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.7.18-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.7.18-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-2.7.18-r1.ebuild?r1=1.3&r2=1.4
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-08 16:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-08 16:49 [gentoo-commits] gentoo-x86 commit in app-admin/puppet: puppet-3.0.1-r1.ebuild ChangeLog puppet-2.7.19-r1.ebuild puppet-2.7.18-r1.ebuild puppet-3.0.1.ebuild puppet-2.7.19.ebuild Matt Thode (prometheanfire)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox