updating puppet for CVE-2013-4969 bug 494768

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 80 insertions, 43 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 086788c78709..0d93d574e697 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,13 @@
 # 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.181 2013/12/24 12:45:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.182 2013/12/26 20:31:52 prometheanfire Exp $
+
+*puppet-2.7.24 (26 Dec 2013)
+*puppet-3.4.1 (26 Dec 2013)
+
+  26 Dec 2013; Matthew Thode <prometheanfire@gentoo.org> +puppet-2.7.24.ebuild,
+  +puppet-3.4.1.ebuild, -puppet-3.3.2-r1.ebuild, -puppet-3.3.2.ebuild:
+  updating puppet for CVE-2013-4969 bug 494768
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> puppet-3.2.4.ebuild:
   Stable for x86, wrt bug #486002
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 4cceb2d004bb..9d5e7ad92a1f 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,28 +10,29 @@ AUX puppetmaster.init 1089 SHA256 8e4ae53b115ec5379961af6e9f822b2d8cfa59241d7d62
 AUX puppetmaster.init-r1 920 SHA256 00a66031624de13e28b43c186765c36f02632a614b868192e6cf4e6f1f392830 SHA512 b0b08592464111791470b126fef0ba20863dbcb011752cccc7c24303544cbbaf12fefb37eb17ad88551ced4d5d6bf2a4f81fd93e84506411f7b8b51053d34e42 WHIRLPOOL 4027629f5d188ba1a96fb0796ff5a8c8c2887936f2f9a5a4fc41a719be9a48ad4c114b2918437e6b812f01bfcbf22e2b4617092bff84b2b76c107db4c5dfc29b
 AUX tmpfiles.d 39 SHA256 bc0c1f0aa01e1df559fa6e0b8bb686a8fc83b1272bcf4f6671fbb2a9b48aaa6f SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1 WHIRLPOOL 5dc356a6ae94e262cb0a0bdbc120351bce40e81ac79e6a5122c6eff3022ddfd53724f9230c7553dcbd4648f640c4a912baf300ea5b2cb22fa7100b33de4f4909
 DIST puppet-2.7.23.tar.gz 2025639 SHA256 73bc0d5a2334dc484148141a32274703b65b78bf87ca41f7e2da1c38518ba490 SHA512 d6173b596744b438a132a3772ed39195670d509481b5fbd30b098e8df3fceb31097369e6670587303b490f35842a39955d77ad500ab88535d43f08cc8d9dc86c WHIRLPOOL 65164214bc421b78359858258fa1e4242161ec406a20d73e5f44a5b14e74a6ed5973fcd4cd752a8817698aee8840ce67b92b12dfe487f964a736a68ae158ae80
+DIST puppet-2.7.24.tar.gz 2007979 SHA256 4f3109815502d86f0e13c12f899a17d2ff2a1a326afa2acab0c355bd649814ee SHA512 e8fbb2794bc5d16de145af97e588fd1fe469a2a1bd2719632f0e79545246dabde80d2432beea26805f34ee9876cf39f9ea9fa27fb4ef69f77915fbe47a739c0f WHIRLPOOL d6c61d9265472b979aba4156d783ba00f621863c9eb33572e38cf89a2162d833d12b4fe19bb571311f83336190236498e229faf1d90ecdde8a2eca5c5ac4c0c5
 DIST puppet-3.2.4.tar.gz 1786216 SHA256 8b38f4adee6237b8dd7b1956d90af97f2d0091245d6e30b708bbc8e333001358 SHA512 31a22cf926c6fe866e7ed1ca294dd78228bfb34b0465d44cc985dc6f737879710b5c27e1519f53c9fd9622320386950f290d774d709559b66be79e43dac1dd5e WHIRLPOOL 86bb44bd6ee5a4c31892e909a95fcea52ced289b891281bae5535dac891006d9c1a5d4613210a0ba550ab6428f206dcf9ab3fafb3c90297a64e8bad3c06509be
-DIST puppet-3.3.2.tar.gz 1897677 SHA256 8e8019617bc00a583a1062e125d3ce76bc40968ebf1fdd9fff67ac5321952637 SHA512 afdc06f0d3a6edbf44a313e6c4937bcc9e3cf84b3500e9df9484901becb902e9f96ba438cfdd9938e98a4a896720e1e88dd0f499815b27209e4693d9af7b0bb9 WHIRLPOOL 889584028738573d32b73a220f80dbf6aa1ac77dae3c943dfb13f396b745702abca24ede233d0b0b55f1b5506df356b55e4771f17e685f19b6974f242fb982f3
+DIST puppet-3.4.1.tar.gz 1949373 SHA256 e6a929699a83c2bc1d1661674172ba7e92b6fb4235fa594cc2f3219925504b93 SHA512 0bbdd35387d4f1693023d2fe45d089453386d7bfb279365cf019081641298034b8cd84398567b7ce1868ec02406a51a53afc6842059442467e474bb26838d80b WHIRLPOOL 1a5d88f40d69c692a443dece46e282ce8a0415daa56ca1f62391d9d8a9d2f1da77a799605deda384b6c2f7760a7e0046a0c457216b8f350308b5c30d9b40f990
 EBUILD puppet-2.7.23.ebuild 4819 SHA256 2dd746a070446e53ce9b62aff8ef28d9b2906f3ed1673f085a5e0c0f2cd7adef SHA512 4db1abf2648378c164bab5d0a5a9925c16bef561acbef1c2ebd27fccc2f2336ca9096d40184a6d6d835621afac4c4c7365d4aa721ed6e3d626cd6e7d0b92e3ab WHIRLPOOL 41f1c00ddda305c758c5ee6c4e4a977b2f8ec0dc4d9ed6b7c55ba13dfebe502d58bf626f2c3d1c13380ec48433c30e9a6c14d77cdb5581bfec9932c809d392d0
+EBUILD puppet-2.7.24.ebuild 4824 SHA256 4219ca2bcfa8c05098506f73a5db5cd35493d5dd14197975eb97d692071be3fa SHA512 9fceda2b0bc774ebae2a1a83ee4e979c92df2089386d93ca8ad56bd0c913e8e3a3e1afa1892e7b552bf9c1f602385f587d8acf3f2b1065a9cb91d2fecf1d8d87 WHIRLPOOL ff2621418e98bd44adb1ead6e880bc41b04381dfcb693094f5037e267fd0ddf72147d3eac9d7271b07c2b94d926cb6e7b041e8c5606bfb66eebc2acf7f6bf7cb
 EBUILD puppet-3.2.4.ebuild 4290 SHA256 824e540230fe229d144b1e69234d71bbe48a0eb5f2907339733c1189b0d0d445 SHA512 58a1eff46c6acac4c532c90a2f253b1fb4326b6cd0221fcc1e909b9ac765c7ec2db71db7084f737c8cac07fb16eb809567d0c1732150fbbe1c645017c28fe685 WHIRLPOOL 72c39fd4ea15b0205f632f2d8bd85f7118c3a839bc40749125f4c05e0a504e0a82e67a86b7490fac2246fa078d8022f5eb60281bdd00d29ff290c963daafb09d
-EBUILD puppet-3.3.2-r1.ebuild 4230 SHA256 b600b8ce0b077800bab7030876aa1f280f83d8a5cf47e1aa3c3ddea9c7064d05 SHA512 1d01602a675e779827309a199c23a1abee7cc77ce934c0a58e0ae539023ff5fc4e259bb9d349ebd2423a15ad122d0bfe3000cb33db1b6de48d8cfcaf22e39b21 WHIRLPOOL e180104acb2a62ebb2137f94c24f2befb3ff69f090385a0c1940cb578b0669ca04792f439a056138290fc54aa63b1ab97b6e10c64025860b2425295f33397596
-EBUILD puppet-3.3.2.ebuild 3944 SHA256 fccf6ee7cf74d0e0962fe3cbfecbe65fedcb763cbb0f571db4a52418a19093d0 SHA512 9f471643d212ed3064e38419f6fe2a04027aaa165e086f9b029c7312e10adc23e8e97094b52fa158c7c2670ed8b600ee7fe6b75a7a160c59ff7c59f8f9349aa9 WHIRLPOOL fc33b391ca7a2255d3544c804766474008a0c5340bae2745b9d2e2237b84c19d03986e28e86e142da7d3c16a467606a5efbc744852837327dd44f7858a003f58
-MISC ChangeLog 29652 SHA256 7fb9bf22e0da7dd089d1bace83e9b35d7fdbfc5c682a363cecae454fbc58f31b SHA512 4ce29d1136679958778d61e4e2e4da6b548a912937cab4e448d57cd5a7a3b36d95e941655ffba738f5bc4b6fcce4c974148a3405b4e2c5dd0bcdf1db7cccdf38 WHIRLPOOL b52fbefd6e12e4c2ed58c45b5d2698a4c183950c34998c516373aa7f165509dc3166728ea759aa5ccc9f56776fac3138e3d8b9dc3714969af9f6ccee6f3ffbcc
+EBUILD puppet-3.4.1.ebuild 4261 SHA256 5983e9f54f1cbf56bbe25062c2b65068df4388fc2e1eb53877d7789a9ffeff10 SHA512 aab433cbf31f4de175828627772de49a531cc99b972f04c06491ca742675d9db7f9934dfefcc6fc9f1be5cb9ddd63ff007244f0718d0517bd71983d4e165a54e WHIRLPOOL 3cf696a134446543fd6cafa9cd59893f093efb6f665fddde2b27eb5c84faa90e83736fba7b5fac0660f35d67ddd1fa99be23e8b70d527b0bf61201e387f2daa4
+MISC ChangeLog 29920 SHA256 9339facf2264deb8ab242022e72bcadc6847a86d840cf4b6f7c20dfd32b8f406 SHA512 98830a76661b9b8ba3d3a600324effa75e01ed9aa3660d7250ef969daf4c0d35dff7ae1c0012a3a9d7c5fbd8111f8a717e130fcfe85d6d736141256117b0f0cb WHIRLPOOL 33916aee1a18cb08983fbc36655cd8141731acacb4ef9e07dfeba6f5873611eec77325ce48d67aae67b9aa526ef59cebe6469e354a72d381faa87f0654be554c
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuYH4AAoJELp701BxlEWfb1UP/i5mLGlmLD5WUYHAHosL0c2d
-7Bcwc3DboOWYsexem4LsRwlqaby+FkN2OlDHDxqoONdtMFBI4Mhpi6Y+OShIpBT6
-GwbyejSBtbBDXaOI1A369cfhCUw2SuduWBrynrrzDza2v2Bcx2hU4cAcBYXU1h0K
-46sBgWx+DWHfv2VfuF+btx8uyquuRJuTyh5QeqTeoVdJLcFq766gZmHGzMlwWRXI
-mT4tRc2BCqTAlJ+G5to9wUET/39YoLFgPBhXZDi4W3/Sy/BQGuXpbhTwEo+njPVo
-8zkqNR3CkcYGH7xsSifW84GSxbInXNmiTKOeB/4HgZAh4ZFyP5gvV2ZOdCmFAWEE
-BHiVmowMndIXiJHoF2hiBesoGo34KxQrPTUTfGUMPsOmCGZHYAA7dhzVrH8AssFP
-I1NvoB4Mh1F6cTW9+Ca0tJA09I8Scx8hRAcapTJrYg4PTE77jynERr6ndcc8Pe8P
-+l3k1k4lfYlie5I1b+0l1Del015QH7QgK0NmPEr6td5LrNDIyU1zNTTNXsAr2BX5
-mFgLP2QfQQX91IlgibT+GAyYaFGzcQrZAv/gEesLZlLtYu9Qq+7u0jQ8KEp9LU1x
-p8O+gcwC20naJRXEwTfvxg/0UQvNYMPcQLewRZ9lpy0FUDEZhkPi/BoTkQ65Y4QT
-8lRKsC+Gz0oLfTAWtGXK
-=7u3d
+iQIcBAEBCAAGBQJSvJJNAAoJECRx6z5ArFrDQYcQAKOiCiOLMgjtl5PM8m5FeTXV
+MwX91RD1gkANQSfLepNjcTMggoCzuq/aNhy7t+/262hKGUHmdSPaHKudMZzKbXie
+hZx4DwuZWKpqDK7wnnQUsAMS6HivUxYAH44E0qQJ7/Wpdy2bO14KX315MCVWlrG4
+dXQXZ2YFQIIti+k+ZZNsD1xGUaliqCen63+WZOhsO7BDGEf872xLw0+QXV9IqUeZ
+YkvclZu9JU3jjUnAyulfVeZ56ydK0sdSrqx0sVc0VoUPffFIPMKd+sBK0T4kUWZv
+t443IDyYu74SnfdjYkQuluo11kFavK5yX+is7Lne/hloT+7cl1YjJBBEKd2jkcU2
+42EmvoIE1p9yIZ0aPD7NM6yWtAmak2LELqqFL9pOcYohvF37ce1n7hXm7NIS152X
+VqO1Zv+RNmT5A81ncGxlXIzT2DZdxCGQf6LNfS0zmdCgYIWuof+8LYqMPm7yhe4K
+5BYwx1vFvkqRESgqYKepzxHaUdR4CEYQ7MV6ZInKemullKImDYOzVMd338jg6SC1
+l+001kzODry8amao50ARkPO9Vtv+I5ZOpPufPdWatwizxoaF5BhgWHD8nrrbSUbf
+1gyVbG5oHQIiCevXml/mqLKsqLGrYUPH0UxlW+D8bFrhNoQxSHL330R5GWAl3iPC
+nllUVOpixyP1a8l8VpKd
+=xM3G
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-3.3.2.ebuild b/app-admin/puppet/puppet-2.7.24.ebuild
index 45c096472984..7c7a5d84aaa7 100644
--- a/app-admin/puppet/puppet-3.3.2.ebuild
+++ b/app-admin/puppet/puppet-2.7.24.ebuild
@@ -1,12 +1,15 @@
 # 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.3.2.ebuild,v 1.2 2013/11/17 12:32:05 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.24.ebuild,v 1.1 2013/12/26 20:31:52 prometheanfire Exp $
 
 EAPI="5"
+USE_RUBY="ruby19"
 
-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 user ruby-ng versionator
+inherit elisp-common xemacs-elisp-common eutils ruby-fakegem user
 
 DESCRIPTION="A system automation and configuration management software"
 HOMEPAGE="http://puppetlabs.com/"
@@ -14,12 +17,11 @@ SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 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/hiera
-	>=dev-ruby/facter-1.6.2
+	>=dev-ruby/facter-1.5.6
 	augeas? ( dev-ruby/ruby-augeas )
 	diff? ( dev-ruby/diff-lcs )
 	doc? ( dev-ruby/rdoc )
@@ -27,29 +29,43 @@ ruby_add_rdepend "
 	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 )"
+	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
 	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
 	>=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
@@ -63,27 +79,35 @@ all_ruby_compile() {
 	fi
 }
 
-each_ruby_install() {
-	${RUBY} install.rb --destdir="${D}" install || die
+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/log/puppet
-	fowners -R puppet:puppet /var/log/puppet
+	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-r1 puppetmaster
+		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
@@ -91,7 +115,7 @@ all_ruby_install() {
 		keepdir /var/lib/puppet/ssl
 		keepdir /var/lib/puppet/facts
 		keepdir /var/lib/puppet/files
-		fowners -R puppet:puppet /var/lib/puppet
+		fowners -R puppet:puppet /var/{run,log,lib}/puppet
 	fi
 
 	if use emacs ; then
@@ -108,10 +132,16 @@ all_ruby_install() {
 		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() {
@@ -119,8 +149,13 @@ pkg_postinst() {
 	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 "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
+	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 [ \
@@ -136,13 +171,6 @@ pkg_postinst() {
 		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
 }
diff --git a/app-admin/puppet/puppet-3.3.2-r1.ebuild b/app-admin/puppet/puppet-3.4.1.ebuild
index 19a237811a7b..8db71d1bfd75 100644
--- a/app-admin/puppet/puppet-3.3.2-r1.ebuild
+++ b/app-admin/puppet/puppet-3.4.1.ebuild
@@ -1,9 +1,10 @@
 # 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.3.2-r1.ebuild,v 1.1 2013/12/23 00:01:03 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.4.1.ebuild,v 1.1 2013/12/26 20:31:52 prometheanfire Exp $
 
 EAPI="5"
 
+#supports ruby20, but needs deps first
 USE_RUBY="ruby19"
 
 inherit elisp-common xemacs-elisp-common eutils user ruby-ng versionator
@@ -70,7 +71,7 @@ each_ruby_install() {
 all_ruby_install() {
 	#systemd stuffs
 	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppetagent.service"
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
 	insinto /usr/lib/tmpfiles.d
 	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"