app-admin/puppet-agent: removing old for CVE-2017-{10689,10690}

Bug: https://bugs.gentoo.org/647820
Package-Manager: Portage-2.3.19, Repoman-2.3.6

6 files changed, 2 insertions, 309 deletions

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index dcc6c229d997..fce36e742436 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,10 +1,4 @@
 DIST puppet-agent_1.10.10-1stretch_amd64.deb 15422814 BLAKE2B 77d23e6b66620ab9718316f9c273cef86ed2c194cb234ab55765fd28178bbdbff963f9117a5fe904ebea4ffdb901f7e5386e1b75781fe497217e261d087bb57e SHA512 49d391f63197122f2d9e1505091e09d167873255172edb6843e4e6ce28d257ca1d99ca2ec72647c349eb8367c43ef1d4390bbaa0d1aa46cab9b8bd4474c12376
 DIST puppet-agent_1.10.10-1stretch_i386.deb 16281012 BLAKE2B f03f59649724797b1f2366ce95ed1684dcfa5fa765840a7107d6b1803def4c4925a6913e44e10b72d4eac5235efb1565dadd995ac1a865c2a21e0d791d9e29d5 SHA512 2e6115b8fe16f888d315a940bed77b4a310528c5cba3d21a2d52013a6d5081f38f1120c5d5e5e19bdcab69c2836920687ac259320a1ca45d9e56210c86061e63
-DIST puppet-agent_1.10.9-1xenial_amd64.deb 16308224 BLAKE2B c7fb29e83b0aff89c01f9625b9233871e799bb85d80ec17e38f4ef598d9eb268c2bab04b7bb8304370c304909570ea93fd8f467d101f5e4a1c40aaa9794c5083 SHA512 5fc5d70a9fabeb73ac384875f485263c9e890d3792e56aa41f42de86c971190a21526381bb5330c2f52790e6aa82b9c1e5a7dd61f378b086b78cab8de7120b5b
-DIST puppet-agent_1.10.9-1xenial_i386.deb 16202586 BLAKE2B 293d7802058caf762157c209e233a344d565c0d9a536b6aba92d787647f2b2708f45dedb80d0fb1a270f0867ec9aa91bdd91b8615e689ac98ca65bebf861fdb4 SHA512 19b84b5b6080c5b842877d9e7ee6b10837309c25e52429a14bc20939b18850eec616a5daa3a457d36504d51c9c0a8a9b71c3c9cb9c84dceb66e332a075b91e73
-DIST puppet-agent_5.3.3-1stretch_amd64.deb 15954126 BLAKE2B 08772e94464bc3d56685c8f3f7da77e322c849166c41ca5f2d6efb8100059631c500a8d381e3d94058e960398b2c1f1e0d25987e48c1886f8ae72a32bbb7895d SHA512 8c3c3605b5c48036e9806b8c7472618b37724839cb2db496c4e95963f4003d918c046cf35a10f0c2236ed31d9a92e6e489483c5c30e966284e92b76c59c50541
-DIST puppet-agent_5.3.3-1stretch_i386.deb 16544078 BLAKE2B 38e8d2608b48d54387e87a6791a6a316a60b7ce33e3bf5aea7037e08eb756f5c881756a802f5f75f4c3dd841488c96acf3534b9d47529cf1bbd21abf0de2a04e SHA512 b365ffe15575b8a17837ef89e21d9cf0128971d563cc540fbd1f7e2d847f84a7d4444ae1d17e5a0d3e3f66c9f145b246f4429f53088aad25d54b11e2658defba
-DIST puppet-agent_5.3.3-1xenial_amd64.deb 15647308 BLAKE2B 461532d697b645c6e36f0abaf6c366a6bbd6caeabb1f7f1fc9357e92b252555b1ab05ba433a2f3319008ba59eaa892dc9b8642070ae4322f9826e9f758937cfe SHA512 29c826d891a3930e18ed71a1c788819fe421b6a398d77ab21900feba457a386bad34ecb210d63054372af19de81eb31b13ea729adc3cb1fdd2fa09b0783b1e7d
-DIST puppet-agent_5.3.3-1xenial_i386.deb 16329408 BLAKE2B 7d024c3c39bd2ef495c2864f69aaba599cb26e8fc9bc924211780552436c275b5ef4a89db756cad77d1c1d30b5dec0b7561c871c97c9acdcedac550db212f972 SHA512 418c5f0a289d9c7335b49961dd6ad28340ed66cddbd476ca4f2fe6edbc3933c1d4841783d3a0f1f0ea1fab748c6f14f90ebc82fd02cf4046cde95c87b7b94548
 DIST puppet-agent_5.3.4-1stretch_amd64.deb 16013766 BLAKE2B 6461011e05d4ea55b95e02a73b195a9aaea46e769f289a856f97df0c0e0809da9c31973b2ac19dc9aeb1911c5cc1379ffb5479c6b1acdc209e123edd1d532eba SHA512 d89014cf597709a0614576f3f8c60d4f76099ec23053e56fbff0d9bec4ebbc24414d1cca1aac1ae0842a8ce59842618845f2c01e6233fc7be033e36d8b5e5389
 DIST puppet-agent_5.3.4-1stretch_i386.deb 16609070 BLAKE2B c4902e8d57c2b522ab8085c0e10e94110fdc44af54790e9c0855c90877504f11a1fe12bb02b9df99f95d6736195000bc41bf4bb8cddd4e2d283da45c31ea8798 SHA512 1f5812f688cbaed4ec64f78a3417d4c83e3d013f908ffa60c33f3adab50ed157558976bdc3564433a7f4595894b1c4f27ef38e0a3f83239234fe68556a1a9e51
diff --git a/app-admin/puppet-agent/puppet-agent-1.10.10.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.10.ebuild
index 053bc1d011da..63e1635600f4 100644
--- a/app-admin/puppet-agent/puppet-agent-1.10.10.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.10.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="experimental puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-agent/puppet-agent-1.10.9.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.9.ebuild
deleted file mode 100644
index 300ebc50b6d6..000000000000
--- a/app-admin/puppet-agent/puppet-agent-1.10.9.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="experimental puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	>=sys-libs/readline-6.0
-	<sys-libs/readline-7.0
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/puppet
-	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/engines/*
-	/opt/puppetlabs/puppet/lib/virt-what/*
-	/opt/puppetlabs/puppet/lib/*
-	/opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_prepare() {
-	if use experimental; then
-		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
-	fi
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym ../../opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-5.3.3-r2.ebuild b/app-admin/puppet-agent/puppet-agent-5.3.3-r2.ebuild
deleted file mode 100644
index a638b7af8a01..000000000000
--- a/app-admin/puppet-agent/puppet-agent-5.3.3-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	sys-libs/readline:0/7
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet-agent/puppet-agent-5.3.3.ebuild b/app-admin/puppet-agent/puppet-agent-5.3.3.ebuild
deleted file mode 100644
index 1bb845bea050..000000000000
--- a/app-admin/puppet-agent/puppet-agent-5.3.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/xenial/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	>=sys-libs/readline-6.0
-	<sys-libs/readline-7.0
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/puppet
-	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/engines/*
-	/opt/puppetlabs/puppet/lib/virt-what/*
-	/opt/puppetlabs/puppet/lib/*
-	/opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet-agent/puppet-agent-5.3.4.ebuild b/app-admin/puppet-agent/puppet-agent-5.3.4.ebuild
index a638b7af8a01..657676c3b82d 100644
--- a/app-admin/puppet-agent/puppet-agent-5.3.4.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"