Bump, includes POODLE fixes.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

3 files changed, 198 insertions, 22 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 82e26d166099..094d0a0e116e 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.204 2014/09/21 05:14:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.205 2014/10/23 23:24:19 robbat2 Exp $
+
+*puppet-3.7.2 (23 Oct 2014)
+
+  23 Oct 2014; Robin H. Johnson <robbat2@gentoo.org> +puppet-3.7.2.ebuild:
+  Bump, includes POODLE fixes.
 
 *puppet-3.7.1 (21 Sep 2014)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 326404eb7d99..1089d73be6fc 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 50puppet-mode-gentoo.el 217 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a WHIRLPOOL 60d02a9b70d418cb453d08c17fbeb1133a6ddd924ba18565e30f7c655f5abeebf71af6f17797d3045483ae8775c905efdc11396f4f9829ab2c6b95fbafc2584f
 AUX puppet-openrc-status-fix.patch 709 SHA256 76d320e7a5f8922e3f438b3baf09fb7c86dcd70e821e364cee19fd5f33596a82 SHA512 2959646f3d2a5ceed41faff64debe2dae08ef524679ee1a117ce709a22284f055d40a7a28848a8e1cee0a2603a0a6ad417560714d4bc000b3288fe7a3a5e0d81 WHIRLPOOL 030d85bfef14d74e2ccabdf249fca657beaeba36d0dcd26cf706abf1ecdb81b79a4dd95063cf0781cb9006523cd1fa86a35ac2efd70821c1f3623bd2ea11ae77
 AUX puppet.init 916 SHA256 edad76953e36dab793010955cb4775242271c3e4a22a193ecf1ade4f0716d2bf SHA512 1528e2c9f8d145663f9dab37a5928049ae1063570048f372ceeec3892b3b9e30aa84849056d7799a4a6d292c8227f8132142e115d6019f64050f4989e6584df8 WHIRLPOOL 6295f9eceda2ad94c5e5c9beee5a7549b043c646e8884c01375ec089805a40b037a533a8ce4c04c8f9ccbab0688ac75adceda14e528854ebfcf2d3462e26757c
@@ -14,27 +11,12 @@ DIST puppet-2.7.25.tar.gz 2020161 SHA256 daf6eb2e05cab13f40c520ca6777038f052082a
 DIST puppet-3.4.1.tar.gz 1949373 SHA256 e6a929699a83c2bc1d1661674172ba7e92b6fb4235fa594cc2f3219925504b93 SHA512 0bbdd35387d4f1693023d2fe45d089453386d7bfb279365cf019081641298034b8cd84398567b7ce1868ec02406a51a53afc6842059442467e474bb26838d80b WHIRLPOOL 1a5d88f40d69c692a443dece46e282ce8a0415daa56ca1f62391d9d8a9d2f1da77a799605deda384b6c2f7760a7e0046a0c457216b8f350308b5c30d9b40f990
 DIST puppet-3.6.2.tar.gz 2252186 SHA256 9114c63108c58e39db84937cb8f7e1add3dcbaa08fd730f631de6a7f64a3c360 SHA512 a1bed4023f880e271f3f35900e158bb7fffa39ac5fde3f8f3a9c4ae416b85bf6e3cce76fd22a3778afcbe218cb7a3fe3137be16cd04eb3dfb4ea72f614276ac6 WHIRLPOOL 5f92b9a853c59706a57b6d0c4ffcd22f2d2d1b923e47f6f1e8dca8241d9ec329f95005e1eb8685eaf35f925c6c70afe17b19208da398402108f1cad31dbb2ab7
 DIST puppet-3.7.1.tar.gz 2586237 SHA256 46951c96560fb39bd717b6f4502199772617021f9574fedef00bdd04afb750a2 SHA512 dbb9994764d0da2eceafda3ca9d08fd3cd0f8c4e22980bc54f92c6232d4ef9f5af28fd792c1dc88f1a26363c16430cab67967c54cc3921892fdfb46022a32887 WHIRLPOOL df2cf03baf5ca656c7a7ac36ab9de0c100e0c2f59a897a014ef9d7057a73835541deeaf7db6e1ba8bce56d4292f82ff82e25ee935fbc174e928ea8bfb419d576
+DIST puppet-3.7.2.tar.gz 2592103 SHA256 f762c43da42c4b164afe70046ef65de88a389d718e37c79a1e92f4aa4ff571c5 SHA512 c513b5bccbe1e8bbaab49cc67956c4119dd13708d3a5d425221ab53db8fc22076f3f6dc56e9901ab109b4607f8a4c859e84f307d97fe17c675ea1d6b94d08b80 WHIRLPOOL 29131c40ba4f99fa99342653b1ff92cd1460043d58f3c31db7ab12fe3bca495f0277004478f02140780cb3b333f74169a61e6dedd9f138540170ac9ab8bacfb4
 EBUILD puppet-2.7.24.ebuild 4808 SHA256 e35c0e168bf0c24b35e2fff211fe54eab4f078f5ff8913f99833c29f54d73b94 SHA512 e4e8f8ca3e8f43e7e3052e4276b8928c5d42167d145e7aab9810ed3b3bcc4613ed86c714bb648bba733e5c490a955f684503d4ef90bba4d3d07617abb41d8e17 WHIRLPOOL b39d9d5d8afb88e4bd0a84c96f21dff16f7a22fd60735b470530c57d16de66aab55eea4815e661a3fcf4a7f682ac9f6fe9ec4aa164851f09311c5a76232f6746
 EBUILD puppet-2.7.25.ebuild 4812 SHA256 156a4ed339cf2f05cf960183ef090c4128489cf563921d32e7c26130210b0e30 SHA512 4134db3fa606524b2ad42f9081b607cb03c0497595ac32937add5c0fba8e7dda4bd874ca975ef3317ba6c6762917a0e349ce28421bc299ad26842d946a74e53f WHIRLPOOL 967051fef99e7029ceead2e5806fbd944f2f573cb68df99b52b408461f2a403d6e692b073124a54bc4e36b2474625f7d673bdbc6271b8e159b36e24a5c4bf665
 EBUILD puppet-3.4.1.ebuild 4245 SHA256 afd2d667437d610bef96e9087b840f8293c2f545c0d7fd184a13e4a2218b6bea SHA512 eefb3bad68cf3a2b476fb5e6050ffd916cfb5c6f1b0f2a6474700484166fdbebefb913e45716a5d00b9a23d6997fd2ff263a9549c5fb91d910394ec7d09d3a63 WHIRLPOOL 065cf79d7a6469bd32183a93442b044426ec0a0a982083a76dee243cc9b9d1d712e32ae233dc803641044859707bfcd9f53fc8e2551e92c274088bf69280064d
 EBUILD puppet-3.6.2.ebuild 5188 SHA256 9bd81378b5323bd4752243291f4124c936213d042e5329f76b22eef2913ec5e0 SHA512 9cb3f011de72a0260f6266a77ccb121c737ec682f9568026b59521d4daeaa078084f1c47620b521706f17f105080e90cef6842e333b7aac01aa03147200a917a WHIRLPOOL c7f8cea754e44590413a69d561655c9bad2e486d9af9e5a9b07c1a8e7a7e16ffe78aab3c16677ada9f0e08b7e9926db5a407004dc40e9e79959617ca4c244061
 EBUILD puppet-3.7.1.ebuild 5195 SHA256 c6dbdf0b8e2150ae8dd716e2075ffd0b3719dbf794a7eec3a97c7b079b2591de SHA512 a16704ceed62d606bfd3feb7ccff3dbb95e95066e02710ce9beae7a0e6b68ab735e51aec0820b89e25805a4f92733de1e6295251cdd75a16f66edc6bc5d0d408 WHIRLPOOL d69652e891ecc64a452ee36e8e05c959a92b99f9cd2a78891d31a14f2c1d5af5a5c81cf0538815f52084ab31b740132345b3794ee7497f4518299def6ddfa893
-MISC ChangeLog 33079 SHA256 35b16942a803e7bc7f1381796220a7cd1b2bb4d34346e6ce0aec3794fbef709e SHA512 7f94bacebd634e5f170f703c00f8bd4d575c747620d50b93a26af70c2bb4bfa8e613abc1c56c43edb3be3878c41a6dcc190152ab546dfecb3a0c9eb034a11d47 WHIRLPOOL f9e77f44d1981bd4f06689f2baeb52c9b0bdf22d191efe5ca1c2c0acca86e8447ac446168a0e79a0dad15ce59ef3e44c142a449b879228b587b4699696d60791
+EBUILD puppet-3.7.2.ebuild 5188 SHA256 61bb54f7414b6670d01137c018c9b0ecf9e6a0fa922f216f5b48f55577b9261e SHA512 bdfa4e0868449c42d306cdbe5dc29c4ff4bf76876742a211b5a642a6f496313ee2a6ffa0fd6f4f6b1851c06f9ac9fa4c8d0e434376c616df86db0518d7845963 WHIRLPOOL 6ebca80d88692563eb0a4f24dc7ec97b0c74592bc4f27482c4eef846a67816b3d545a34babc691c83788c00827ec2f6ad353654bbee8eda67323b67875f3dec7
+MISC ChangeLog 33208 SHA256 47956b0c1740c1ce2b75cc669200d684dd03a4dde225e58500e8323bfad1a24b SHA512 6baf78864351e3d3d4bbd8960cc6643b1206a70b6388e4e7df314fb26bb73e663719be5b245ef70f0b2cbc621c80af12095887aa82ecdace523a6daa6df346e0 WHIRLPOOL 65a4d3c0fecb978cd34a89959868fac1b6a7dcdb91ca5cdbb5dc16179b476d838fad0e02dd570da4e6deb44c4d4ea01afc94a378657dceef1a8a9011925b15e7
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUHl7EAAoJECRx6z5ArFrDBHIQALvlGLFr6mK7jwcmRB0nVT7u
-E+SZ7WXC86uHzEvWXFBRmXGWhgpFy73ikHm0IaLZsG1dfdQixyVjqfp9+RYCMrH7
-/+zL39GeKtRkQ3F+LmfBq3GC0UaNNuiVMiJrxQ4eCJBsSKS8uRzh89sgNuapy4mo
-xNwyME1LRfdfM0P1ENH5nBlcVC0voRE47tnJVejwqk2ddNkprPzOmBD3whOKI6Tl
-o+M09jU4tzle/7sMCxaMdLjxDd21R/xwQEMt0lX0AExEPLkZh1D/sP/iMMjJDEqN
-ik9CZuZoQ6Apfoe83dg24+Ppv/zQdMX11aQOMAK4yf4pHd+k+5gGXgF3QGBz+eRU
-G9uXEZlyMcjWbeJ2hrl+Kw+r/zE+TcGVnyRo9qRk2aAnpkAXjkKceqgXw5n8eZvy
-Nn3f0Xun1OkFcXn7b3iKOcr/LzgBFIMdOhnt12DS4KOcyacjektPXe97+KJe7925
-msuBl0NLKycJWTuilMziuaTjdOlYsiaSACy/sBcmGZzoHj1MFjmjP7DbUbPe5cF6
-ZCX3cWCLvQ3JU+sWKPp6pRwmyUj9bdcjZriB2pJjXF93Qnwe7tvB7gdg5pntzaCr
-kiLIdOkxWfH7P9dJY3/doFa8/jMu04fryARNhWgzwUAnfZbEemikzvpfQeqjwH0o
-ekE6EY6TwG2p+QsG+ftH
-=OnMw
------END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-3.7.2.ebuild b/app-admin/puppet/puppet-3.7.2.ebuild
new file mode 100644
index 000000000000..9d62955215a3
--- /dev/null
+++ b/app-admin/puppet/puppet-3.7.2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.7.2.ebuild,v 1.1 2014/10/23 23:24:19 robbat2 Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem 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 ~sparc ~x86"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
+	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
+	dev-ruby/json
+	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_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# Avoid Rails specs to avoid this dependency and because they
+	# currently fail against Rails 4.1.
+	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
+	rm -r spec/unit/rails || die
+	rm spec/unit/parser/collector_spec.rb || die
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+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() {
+	each_fakegem_install
+	#${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	#systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	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
+		insinto /usr/lib/systemd/system
+		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
+		newinitd "${FILESDIR}"/puppetmaster.init-r1 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
+		fperms 0750 /var/lib/puppet
+	fi
+	fperms 0750 /etc/puppet
+	fowners :puppet /etc/puppet
+
+	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
+}
+
+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 "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	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
+}