Drop insecure version wrt cleanup for security bug 481186. ACK by prometheanfire.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

3 files changed, 11 insertions, 198 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 7e73c3b40c63..b156d813fcc0 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,10 @@
 # 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.169 2013/08/21 03:47:32 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.170 2013/08/27 20:58:07 creffett Exp $
+
+  27 Aug 2013; Chris Reffett <creffett@gentoo.org> -puppet-2.7.22.ebuild:
+  Drop insecure version wrt cleanup for security bug 481186. ACK by
+  prometheanfire.
 
   21 Aug 2013; Jack Morgan <jmorgan@gentoo.org> puppet-2.7.23.ebuild:
   sparc stable wrt #481186
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 00bfb178a4f9..d5c453ec220d 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -8,31 +8,21 @@ AUX puppet.init-r1 609 SHA256 1ba2b2c08e056adcb261bce51acf47dba6200246f199f25cdf
 AUX puppetmaster.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058
 AUX puppetmaster.init 1089 SHA256 8e4ae53b115ec5379961af6e9f822b2d8cfa59241d7d62d3bb8f81600fcd98d9 SHA512 3cedb45ec1c9b29b6c4e8392aa610b866c99fb2204c70d5c149090478bc42ac9454091bdec5155358b662167964a61c82307243839f923f5b15eca9e28a360e6 WHIRLPOOL cb86be91131d65e6f6a54b330e82f551dadb46725b7c882ca0fae3a501adf68f0069204351c57e2b6d69f6704846c9f7ab1aa2c3162ffd9afa93cce386ca991e
 AUX puppetmaster.init-r1 920 SHA256 00a66031624de13e28b43c186765c36f02632a614b868192e6cf4e6f1f392830 SHA512 b0b08592464111791470b126fef0ba20863dbcb011752cccc7c24303544cbbaf12fefb37eb17ad88551ced4d5d6bf2a4f81fd93e84506411f7b8b51053d34e42 WHIRLPOOL 4027629f5d188ba1a96fb0796ff5a8c8c2887936f2f9a5a4fc41a719be9a48ad4c114b2918437e6b812f01bfcbf22e2b4617092bff84b2b76c107db4c5dfc29b
-DIST puppet-2.7.22.tar.gz 2023230 SHA256 bfd79c0aecdeea4e1a8573e9325fbcb48778603d908180e88897458f01fe06de SHA512 534f40d57e57d6b16fbac6e097cccc888e12cda648f9fa8fb74e4add9be49c1733d488d13375a712e9f160d8ccfb314d4f48ee7e604388cfd5456750a2627c94 WHIRLPOOL e5a7a773a5af2dd222c5726c3dbe3a622ed60c148dc0fc88fc7568ad3f1d422a08f49a6d5f5592b218418163526fc7effe48168309024232137919e11ac40a11
 DIST puppet-2.7.23.tar.gz 2025639 SHA256 73bc0d5a2334dc484148141a32274703b65b78bf87ca41f7e2da1c38518ba490 SHA512 d6173b596744b438a132a3772ed39195670d509481b5fbd30b098e8df3fceb31097369e6670587303b490f35842a39955d77ad500ab88535d43f08cc8d9dc86c WHIRLPOOL 65164214bc421b78359858258fa1e4242161ec406a20d73e5f44a5b14e74a6ed5973fcd4cd752a8817698aee8840ce67b92b12dfe487f964a736a68ae158ae80
 DIST puppet-3.1.1-CVE-2013-3567.patch 177845 SHA256 48b8998182a6d84fcf10847183feefb4b198b8421bd46d82fb8c45577bc0c5f7 SHA512 fe3e8ad8fecf374b9ebe67f38bc49980891121134fee560d7c2e5c43d8ccda772b4ec5b26f69c0928eb35804eb47fdb29654b065b997cc8f5c190fc3e2cca7f8 WHIRLPOOL bc93d1958b2c31d76a0f5b3fb0a33224e6304b72a0875e1ca3de0516212dccf44b760899ffbc29ed179be741560ff7b16516f5b7b65cd6f6a45414edd4eedda8
 DIST puppet-3.1.1.tar.gz 1587190 SHA256 4401f6388bb96b1301a107f247af6fa558127d78467bb5cef1a1e0ff66b4463d SHA512 48759776b68f83a125a0c703ecc9ad3efe34f10e6cfd9ddcd9e596ff082c9f40bdb7e0489bf7eb0bb0ce8bdb4ad0ae87049d2ad3133e839d0a5a6caa8419074e WHIRLPOOL d7152ba5397edadba9784f3c1800c8cf31ddd547691b35567ad52a42e82e741256326d2ee0bccec0642e82f533ffb74babcaddf3a0ee54361626b875cc618b2f
 DIST puppet-3.2.4.tar.gz 1786216 SHA256 8b38f4adee6237b8dd7b1956d90af97f2d0091245d6e30b708bbc8e333001358 SHA512 31a22cf926c6fe866e7ed1ca294dd78228bfb34b0465d44cc985dc6f737879710b5c27e1519f53c9fd9622320386950f290d774d709559b66be79e43dac1dd5e WHIRLPOOL 86bb44bd6ee5a4c31892e909a95fcea52ced289b891281bae5535dac891006d9c1a5d4613210a0ba550ab6428f206dcf9ab3fafb3c90297a64e8bad3c06509be
-EBUILD puppet-2.7.22.ebuild 4815 SHA256 673be32c365fbe6090011fab52b80e5cb0cb57b5481d801df64b6eb142a925f6 SHA512 33802be249210f542d31f8af97c0e5efd919968ecbe52c02a3fe487eaf7b6ac44feff4410ecb74dac12f9c37486917311d764685ad6e77aaa7419b261733346d WHIRLPOOL efd2874dd45226989406cc6d48e26005fa5470cff9393f0f495febd4a6d01870f447dcd713e5ca6fbb972c3781c539a4727d5856243b2a1a7029be70a4e043b4
 EBUILD puppet-2.7.23.ebuild 4819 SHA256 2dd746a070446e53ce9b62aff8ef28d9b2906f3ed1673f085a5e0c0f2cd7adef SHA512 4db1abf2648378c164bab5d0a5a9925c16bef561acbef1c2ebd27fccc2f2336ca9096d40184a6d6d835621afac4c4c7365d4aa721ed6e3d626cd6e7d0b92e3ab WHIRLPOOL 41f1c00ddda305c758c5ee6c4e4a977b2f8ec0dc4d9ed6b7c55ba13dfebe502d58bf626f2c3d1c13380ec48433c30e9a6c14d77cdb5581bfec9932c809d392d0
 EBUILD puppet-3.1.1-r3.ebuild 4421 SHA256 d226968ec07f5c98cc04a4b516a187524245ff9b54fae1b75ff71e64f740f0ce SHA512 189dc2acfdc428893e4cde55c9f06cf0895a89fdb5c3a7862b8ada5058f508be32c6b568aa9a1ac4ee02ea575ba9b6f8d39cbe9280bbf4c74cb66c977189d641 WHIRLPOOL 8d679d6ba7660694d7ac836c77b91cab5fb73e38f5309acc664cf13400dcbc8a9141716cc2875d74a01835a7a1625632f676c8eb1d896462984e6e8263ee0ec5
 EBUILD puppet-3.2.4.ebuild 4298 SHA256 8f8383ebe30b91fbb13e60f1b5e9f7040a3820a4f03b13cbbb7ee3d4d06711ee SHA512 7f73fd64e22337bcd0f05c8ef695ff3f94211d57f7bbca1ce99b80e5deeed3890f09669599aa334d7ee73dfe570ab028d725d96d28e71a98a9703a1048d82bbf WHIRLPOOL c66d676982c2a2262c86c017b6b25af2d1a02a990a5f7259ecb398550e445a094c2bc8be0ee88b50eba21eb4fc756eed71649ff0d4dc058a0653e16c165087fb
-MISC ChangeLog 27774 SHA256 bfd6c94e09d63a7e7486651868ac4bf8c08c075e1e4d45bb1e1bd8096b1723ae SHA512 aff0c5872e09c09e4c88c3863a05503dd08eb477c4fb35b55ce6aede3729a7081ef6f379e0ded42836f6df8ae2a776bcab052cec1ed66a14560f1dce297dfed7 WHIRLPOOL 46e523e6362e0a77e87749510412b4f812dac60fe0879cfc5ed0593efe600355b7052c4e2b1de8a1857167b8a21b056585c5f27bb2aefa092fe8917a34c7ece7
+MISC ChangeLog 27936 SHA256 775a9a15b7d16e6cc982661abda2e4f3a2c1c1f57dbbfb5e5096eaaa2cb8544c SHA512 3f358df202407c91cae653a6443c2f6961efbda595b72f45af822d3ef310d0f5cbd8423436676918b70d7ad4a9722c7ee28d7f261691299db440866ae64ea83f WHIRLPOOL 7ad737b7d37061b0bd7bd5458686ccf3c8f61fea6d8e7db4abd0aa6bc71a1b58b6ee1784cfc329d7ad42c0dcae46711d1db60fe9dc55a2a0f72d0c5eea6c058c
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSFDhPAAoJEL9Txpt2HY4Kq8EQAIxOR+P4uSS98jRa+4aA5bZm
-gJnuRHzHv1ihGv9LUML85fXRZgS+8VwoVl5Uf6az0jS7ywJdfJa4eDDstapYVYoV
-RdZjBP0mU5zkhohzFTeJngl0p+l/DT7mDj7rT/8FWsFV/YL1yeBU0RDJXmp21vP1
-+bC5bFezaYog6e0mTOO6S+SLVFh+URMiGIcmWzp5N7a1mb6sg0Haq/RtNr9HL5TZ
-ai43tBZhq3UYWPFJlyukMWz0iZEiy7yEk599rACV2Jsb9nsW9Jqe/vmjJeURFYHr
-cerEqljxzBsuKZthO+e1WRv/NPYyHwE/7qmyRRQdc8NDHCNRajkQr1YWPGyKtmZv
-9ZEsjxap5rS9uTNH5cm79WE29f8JmXcy8DYan4frbCH4iLiK6EWBf8FMx0ulKjj4
-PA+LSzNv5MUQ+PEDZa9JcNjxGAFZ6cBXQUhD1LJ4klsqGcjVSbeyVzdefOyDG7bJ
-RXzRXRXbsH9ukijg1B/n52HBkRdSq9DfJDlWGp/kKhwjE+Qf4Cp42PYXllBybZzf
-NFSZV3vXtH3VkzefgycGirLUa39K5JvSQPDAw963TRmxuxsmDjYHTdRmS+vzKWDG
-0tC+9wve0w6u3R2guqUgWTg5xJ+P8C/dh7vdEROfgsPcKzI1kexPgzcGcIjdHjtI
-hoFnn/9tvsMoSfe/cI58
-=pssF
+iKYEAREIAGYFAlIdEuFfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1TMowCfQ6/CHWb4Uz7WbrEGBpFFCrh4
+K4IAoJIL3Sr86BFTDvo7p681qDSmfIhF
+=lGKK
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-2.7.22.ebuild b/app-admin/puppet/puppet-2.7.22.ebuild
deleted file mode 100644
index f7d902d1c0ae..000000000000
--- a/app-admin/puppet/puppet-2.7.22.ebuild
+++ /dev/null
@@ -1,181 +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-2.7.22.ebuild,v 1.6 2013/07/21 17:55:12 ago 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/"
-SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
-
-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=(  )
-
-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 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 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
-}