adding puppet-2.7.21.ebuild and puppet-3.1.1.ebuild for bug 461656 multiple CVEs

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

4 files changed, 18 insertions, 168 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 706a7dcd34ea..768a0d4f6625 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,15 @@
 # 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.145 2013/02/24 18:47:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.146 2013/03/13 17:38:32 prometheanfire Exp $
+
+*puppet-3.1.1 (13 Mar 2013)
+*puppet-2.7.21 (13 Mar 2013)
+
+  13 Mar 2013; Matthew Thode <prometheanfire@gentoo.org>
+  -puppet-2.7.18-r1.ebuild, +puppet-2.7.21.ebuild, -puppet-3.0.1-r1.ebuild,
+  -puppet-3.1.0.ebuild, +puppet-3.1.1.ebuild:
+  adding puppet-2.7.21.ebuild and puppet-3.1.1.ebuild for bug 461656 multiple
+  CVEs
 
   24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> puppet-2.7.19-r1.ebuild:
   Stable for sparc, wrt bug #456002
diff --git a/app-admin/puppet/puppet-2.7.18-r1.ebuild b/app-admin/puppet/puppet-2.7.21.ebuild
index c26b474901c8..31eff96b64e1 100644
--- a/app-admin/puppet/puppet-2.7.18-r1.ebuild
+++ b/app-admin/puppet/puppet-2.7.21.ebuild
@@ -1,11 +1,9 @@
 # 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.18-r1.ebuild,v 1.4 2013/02/08 16:49:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.21.ebuild,v 1.1 2013/03/13 17:38:32 prometheanfire Exp $
 
 EAPI="4"
-# ruby19: dev-ruby/ruby-ldap has no ruby19
-#USE_RUBY="ruby18 ruby19 ree18"
-USE_RUBY="ruby18"
+USE_RUBY="ruby18 ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -40,10 +38,12 @@ ruby_add_rdepend "
 #	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] )
@@ -83,7 +83,7 @@ each_fakegem_install() {
 all_ruby_install() {
 	all_fakegem_install
 
-	newinitd "${FILESDIR}"/puppet.init-CVE-2012-6120 puppet
+	newinitd "${FILESDIR}"/puppet.init-r1 puppet
 	doconfd conf/gentoo/conf.d/puppet
 
 	# Initial configuration files
@@ -100,8 +100,8 @@ all_ruby_install() {
 		rm "${ED}/usr/bin/puppetmasterd"
 		rm "${ED}/etc/puppet/auth.conf"
 	else
-		newinitd "${FILESDIR}"/puppetmaster-2.7.6.init-CVE-2012-6120 puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster-2.7.6.confd puppetmaster
+		newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
 
 		insinto /etc/puppet
 		doins conf/redhat/fileserver.conf
diff --git a/app-admin/puppet/puppet-3.0.1-r1.ebuild b/app-admin/puppet/puppet-3.0.1-r1.ebuild
deleted file mode 100644
index 76c66c318022..000000000000
--- a/app-admin/puppet/puppet-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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.2 2013/02/09 01:00:03 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 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 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
-}
diff --git a/app-admin/puppet/puppet-3.1.0.ebuild b/app-admin/puppet/puppet-3.1.1.ebuild
index e3bba48edd53..15d6a8fa463e 100644
--- a/app-admin/puppet/puppet-3.1.0.ebuild
+++ b/app-admin/puppet/puppet-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.0.ebuild,v 1.1 2013/02/11 16:43:38 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.1.1.ebuild,v 1.1 2013/03/13 17:38:32 prometheanfire Exp $
 
 EAPI="4"