app-admin/puppetserver: stablize 6.9.1 and cleanup for CVE-2020-7943

Bug: https://bugs.gentoo.org/712198
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>

diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 9cbbdf9dcb31afbac29e85c8a457dcda9cc524cf..73d50ebefd14f2c6e1a240d737524df4d220ca15 100644 (file)
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,3 +1 @@
-DIST puppetserver-6.8.0.tar.gz 59370389 BLAKE2B 227512d3a054980867730882459bff32559f8baa5fb0c807a14fcc827b8f41fc1da2cceab6bdbd6162bb4e6e6e4312f5d47d478f6887a978c359c6a4225d663d SHA512 9e4d0ea1aad1209342151cfcfd304e4a296df0e95fefde46d4e4a28a9da62422194492d430c3492cc717a7c872ee0f448a89a40fe1e1cb565f865fc0aca7089b
-DIST puppetserver-6.9.0.tar.gz 59495229 BLAKE2B 17e02d201dd39a7c9a060c8898c76de3b85c5ffceb8dae128c032352e8f2959b6084558790c14979f95b7904bc70db0b3374d81f2b0c1f70bfb286084d6ba3a4 SHA512 b1446d407d50e3da502e2cd882647379fb51334bf5d4cc13d3654c8f7cbec2d6c4d7efd8acdfbdc1c70c6e30e3b420ed642cbdb97ee5f6a16b3b404dbd42bba7
 DIST puppetserver-6.9.1.tar.gz 59496176 BLAKE2B 1599380ebf731fb4d67c04abc06303647d5d29c99f2b9721d049972eaaf3d4c2b108c6ac2f1a45efce3c52e9a57ebd362c874c36093027ebca77a2ae1d4c0323 SHA512 3a794adfa48c7bf9bd241c9da0578ea192b8551e75093e4d95c7c10fa659ef59d59ae72b33561d13ac31e839245d266301a6067d30b466138a95a6c4879bc58a

diff --git a/app-admin/puppetserver/metadata.xml b/app-admin/puppetserver/metadata.xml
index 13a741219359a65736e1dc073173fc65cae9b093..3b90d18cc03807e9a5a3b970101cbd7bc14e2ba5 100644 (file)
--- a/app-admin/puppetserver/metadata.xml
+++ b/app-admin/puppetserver/metadata.xml
@@ -8,7 +8,4 @@
        <use>
                <flag name="puppetdb">Adds support for connecting to puppetdb</flag>
        </use>
-       <longdescription lang="en">
-               Puppet Server is the next-generation application for managing Puppet agents.
-       </longdescription>
 </pkgmetadata>

diff --git a/app-admin/puppetserver/puppetserver-6.8.0.ebuild b/app-admin/puppetserver/puppetserver-6.8.0.ebuild
deleted file mode 100644 (file)
index 3d31719..0000000
--- a/app-admin/puppetserver/puppetserver-6.8.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-               >=virtual/jdk-1.8.0
-               app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
-       enewgroup puppet
-       enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
-       sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-       sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-       sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-       sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-       sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-       sed -i 's/var\/run/run/g' install.sh || die
-       default
-}
-
-src_compile() {
-               einfo "not compiling"
-}
-
-src_install() {
-       insinto /opt/puppetlabs/server/apps/puppetserver
-       insopts -m0774
-       doins ext/ezbake-functions.sh
-       insopts -m0644
-       doins ext/ezbake.manifest
-       doins puppet-server-release.jar
-       insinto /etc/puppetlabs/puppetserver
-       doins ext/config/logback.xml
-       doins ext/config/request-logging.xml
-       insinto /etc/puppetlabs/puppetserver/services.d
-       doins ext/system-config/services.d/bootstrap.cfg
-       doins ext/config/services.d/ca.cfg
-       insinto /etc/puppetlabs/puppetserver/conf.d
-       doins ext/config/conf.d/puppetserver.conf
-       doins ext/config/conf.d/auth.conf
-       doins ext/config/conf.d/global.conf
-       doins ext/config/conf.d/web-routes.conf
-       doins ext/config/conf.d/metrics.conf
-       doins ext/config/conf.d/webserver.conf
-       insopts -m0755
-       insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-       doins install.sh
-       insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-       doins ext/cli/ca
-       doins ext/cli/irb
-       doins ext/cli/foreground
-       doins ext/cli/gem
-       doins ext/cli/ruby
-       doins ext/cli/reload
-       doins ext/cli/start
-       doins ext/cli/stop
-       insinto /opt/puppetlabs/server/apps/puppetserver/cli
-       doins ext/cli_defaults/cli-defaults.sh
-       insinto /opt/puppetlabs/server/apps/puppetserver/bin
-       doins ext/bin/puppetserver
-       insopts -m0644
-       dodir /opt/puppetlabs/server/bin
-       dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-       dodir /opt/puppetlabs/bin
-       dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-       dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-       dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-       # other sys stuff
-       dodir /etc/puppetlabs/code
-       # needed for systemd
-       dodir /var/log/puppetlabs/puppetserver
-       dodir /etc/puppetlabs/puppet/ssl
-       fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-       fperms -R 771 /etc/puppetlabs/puppet/ssl
-       # systemd type things
-       insinto /etc/systemd/system/puppetserver.service.d/
-       systemd_dounit ext/redhat/puppetserver.service
-       insinto /etc/default
-       newins ext/default puppetserver
-       # normal init type tasks
-       dosym ../default/puppetserver /etc/conf.d/puppetserver
-       newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-       # misc
-       insinto /etc/logrotate.d
-       newins ext/puppetserver.logrotate.conf puppetserver
-       # cleanup
-       dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-       fowners -R puppet:puppet /opt/puppetlabs/server/data
-       fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-       fperms -R 700 /var/log/puppetlabs/puppetserver
-       insinto /opt/puppetlabs/server/data
-       doins ext/build-scripts/jruby-gem-list.txt
-       doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-       insopts -m 0644
-       insinto /usr/lib/tmpfiles.d
-       newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-       elog "to install you may want to run the following:"
-       elog
-       elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-       elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-       elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-       elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-       elog "puppet config set --section master codedir /etc/puppetlabs/code"
-       elog
-       elog "# install puppetserver gems"
-       elog "cd /opt/puppetlabs/server/apps/puppetserver"
-       elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-       elog "while read LINE; do"
-       elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-       elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-       elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-       elog "while read LINE; do"
-       elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-       elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}

diff --git a/app-admin/puppetserver/puppetserver-6.9.0.ebuild b/app-admin/puppetserver/puppetserver-6.9.0.ebuild
deleted file mode 100644 (file)
index aefa1d0..0000000
--- a/app-admin/puppetserver/puppetserver-6.9.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND+="
-               >=virtual/jdk-1.8.0
-               app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-       acct-group/puppet"
-
-src_prepare() {
-       sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-       sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-       sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-       sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-       sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-       sed -i 's/var\/run/run/g' install.sh || die
-       default
-}
-
-src_compile() {
-               einfo "not compiling"
-}
-
-src_install() {
-       insinto /opt/puppetlabs/server/apps/puppetserver
-       insopts -m0774
-       doins ext/ezbake-functions.sh
-       insopts -m0644
-       doins ext/ezbake.manifest
-       doins puppet-server-release.jar
-       insinto /etc/puppetlabs/puppetserver
-       doins ext/config/logback.xml
-       doins ext/config/request-logging.xml
-       insinto /etc/puppetlabs/puppetserver/services.d
-       doins ext/system-config/services.d/bootstrap.cfg
-       doins ext/config/services.d/ca.cfg
-       insinto /etc/puppetlabs/puppetserver/conf.d
-       doins ext/config/conf.d/puppetserver.conf
-       doins ext/config/conf.d/auth.conf
-       doins ext/config/conf.d/global.conf
-       doins ext/config/conf.d/web-routes.conf
-       doins ext/config/conf.d/metrics.conf
-       doins ext/config/conf.d/webserver.conf
-       insopts -m0755
-       insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-       doins install.sh
-       insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-       doins ext/cli/ca
-       doins ext/cli/irb
-       doins ext/cli/foreground
-       doins ext/cli/gem
-       doins ext/cli/ruby
-       doins ext/cli/reload
-       doins ext/cli/start
-       doins ext/cli/stop
-       insinto /opt/puppetlabs/server/apps/puppetserver/cli
-       doins ext/cli_defaults/cli-defaults.sh
-       insinto /opt/puppetlabs/server/apps/puppetserver/bin
-       doins ext/bin/puppetserver
-       insopts -m0644
-       dodir /opt/puppetlabs/server/bin
-       dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-       dodir /opt/puppetlabs/bin
-       dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-       dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-       dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-       # other sys stuff
-       dodir /etc/puppetlabs/code
-       # needed for systemd
-       dodir /var/log/puppetlabs/puppetserver
-       dodir /etc/puppetlabs/puppet/ssl
-       fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-       fperms -R 771 /etc/puppetlabs/puppet/ssl
-       # systemd type things
-       insinto /etc/systemd/system/puppetserver.service.d/
-       systemd_dounit ext/redhat/puppetserver.service
-       insinto /etc/default
-       newins ext/default puppetserver
-       # normal init type tasks
-       dosym ../default/puppetserver /etc/conf.d/puppetserver
-       newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-       # misc
-       insinto /etc/logrotate.d
-       newins ext/puppetserver.logrotate.conf puppetserver
-       # cleanup
-       dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-       fowners -R puppet:puppet /opt/puppetlabs/server/data
-       fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-       fperms -R 700 /var/log/puppetlabs/puppetserver
-       insinto /opt/puppetlabs/server/data
-       doins ext/build-scripts/jruby-gem-list.txt
-       doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-       insopts -m 0644
-       insinto /usr/lib/tmpfiles.d
-       newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-       elog "to install you may want to run the following:"
-       elog
-       elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-       elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-       elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-       elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-       elog "puppet config set --section master codedir /etc/puppetlabs/code"
-       elog
-       elog "# install puppetserver gems"
-       elog "cd /opt/puppetlabs/server/apps/puppetserver"
-       elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-       elog "while read LINE; do"
-       elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-       elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-       elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-       elog "while read LINE; do"
-       elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-       elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}

diff --git a/app-admin/puppetserver/puppetserver-6.9.1.ebuild b/app-admin/puppetserver/puppetserver-6.9.1.ebuild
index aefa1d0021a2fe42ad8b4ceeb5045bd0980ba866..d738ea7dfb5eaf32d0b3c6bfb28c60c7e986bf02 100644 (file)
--- a/app-admin/puppetserver/puppetserver-6.9.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.9.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
                >=virtual/jdk-1.8.0