app-admin/puppet: 6.13.0 fast stable for CVE-2020-7942
authorMatthew Thode <prometheanfire@gentoo.org>
Sun, 1 Mar 2020 02:56:45 +0000 (20:56 -0600)
committerMatthew Thode <prometheanfire@gentoo.org>
Sun, 1 Mar 2020 02:57:17 +0000 (20:57 -0600)
With Cleanup

Bug: https://bugs.gentoo.org/711138
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
app-admin/puppet/Manifest
app-admin/puppet/puppet-6.12.0.ebuild [deleted file]
app-admin/puppet/puppet-6.13.0.ebuild

index 6d885f3314564232e711e38c48a6fefd426ec171..327449701fedf684b447ea9a44989de029932b54 100644 (file)
@@ -1,4 +1,3 @@
 DIST puppet-5.5.17.tar.gz 3090402 BLAKE2B 7722ec4196ee766c29eddd7dc73539a4a5a0e4cc781a84af25210488328b5ae01178ca64e8eef14152cbeca06dc8fe145b5e39ce6a120d7689fc32cbbbe16f9f SHA512 95c6cd836a9f732ccfe2d8b83096e79c32428c43390c0826663f896ca1388e1fe3b55d93a5a7548831e95de85247db717866c36786d591e207341c734d70168b
 DIST puppet-5.5.18.tar.gz 2984835 BLAKE2B d5a1d023d3d26e04ccc81efa772131c06fc7ace8ec59c7efa97bddb775bb492d3256290824a87d54df5c28862cbba98c58cf41bb4a0c27a4128701652c06eee0 SHA512 86f210ee783ca36340b22463cd4ac237d8dc1c6a35526530af0696bb3f0373b0b22f690d3e3f8e31655ea182a33eb60b66b5826bd6c4d1b0059a8e46152416e6
-DIST puppet-6.12.0.tar.gz 2825392 BLAKE2B fdb7007ca337654f5ee89cd6f3beae300c3eb952570eaf1aa9baad407b84b418916e42aed63855bbb250f1d367be12f98261df54253f6438d33950134ef01cce SHA512 bcb77699f4a4a058ea0fa47ee2b449f19053e3ae859e3e30c65a57ad65fc052a4f05d7a932b9cc4b9974b36dc343ac482258ad8d5a44a151362df474b82c11fe
 DIST puppet-6.13.0.tar.gz 2837171 BLAKE2B dc64b23fa2d5fcb978cfb03bf67f89ff0ae084883320f267bbb7fd613fd8948193658d717ecbf30f73e313c4530f872617a186675547509db9492589e4f226d6 SHA512 fb7abc9cf79a3de1daf597c0c1768ab4abcc11a236beb8294c5fc69d07ae23149216f7c8d33599365d3c10485f3fb3f8f5fe492e0e7312d19ffdaa0bc8b87d0c
diff --git a/app-admin/puppet/puppet-6.12.0.ebuild b/app-admin/puppet/puppet-6.12.0.ebuild
deleted file mode 100644 (file)
index c07935b..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-       dev-ruby/hiera
-       dev-ruby/json:=
-       dev-ruby/semantic_puppet
-       >=dev-ruby/facter-3.0.0
-       dev-ruby/concurrent-ruby
-       augeas? ( dev-ruby/ruby-augeas )
-       diff? ( dev-ruby/diff-lcs )
-       doc? ( dev-ruby/rdoc )
-       ldap? ( dev-ruby/ruby-ldap )
-       shadow? ( dev-ruby/ruby-shadow )
-       sqlite? ( dev-ruby/sqlite3 )
-       virtual/ruby-ssl
-       dev-ruby/hocon"
-
-ruby_add_bdepend "
-       doc? ( dev-ruby/yard )
-       test? (
-               dev-ruby/mocha
-               dev-ruby/rack
-               dev-ruby/rspec-its
-       )"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-       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"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-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
-
-       # can't be run within portage.
-       epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
-
-       # fix systemd path
-       epatch "${FILESDIR}/puppet-systemd.patch"
-
-       # 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 || die
-
-       # Avoid failing spec that need further investigation.
-       rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-       each_fakegem_install
-#      dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-       all_fakegem_install
-
-       # systemd stuffs
-       insinto /usr/lib/systemd/system
-       doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-       # tmpfiles stuff
-       insinto /usr/lib/tmpfiles.d
-       newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-       # openrc init stuff
-       newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-       keepdir /etc/puppetlabs/puppet/ssl
-
-       keepdir /var/lib/puppet/facts
-       keepdir /var/lib/puppet/files
-       fowners -R puppet:puppet /var/lib/puppet
-
-       fperms 0750 /var/lib/puppet
-
-       fperms 0750 /etc/puppetlabs
-       fperms 0750 /etc/puppetlabs/puppet
-       fperms 0750 /etc/puppetlabs/puppet/ssl
-       fowners -R :puppet /etc/puppetlabs
-       fowners -R :puppet /var/lib/puppet
-
-       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
-       elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-       elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-       elog "not already done so."
-       elog
-}
index e60e40c04d63da1d845bf71efd1f9a112c713126..ed3d22541cb374d57ce04d9b3d382906cc2cba5e 100644 (file)
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"