1 |
commit: 5d7c75bf414d90095fc715f10a989b6e27e6228a |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 1 02:55:32 2020 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 1 02:57:16 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7c75bf |
7 |
|
8 |
app-admin/puppet-agent: 6.13.0 fast stable for CVE-2020-7942 |
9 |
|
10 |
Has cleanup as well |
11 |
|
12 |
Bug: https://bugs.gentoo.org/711138 |
13 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
14 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
15 |
|
16 |
app-admin/puppet-agent/Manifest | 2 - |
17 |
app-admin/puppet-agent/metadata.xml | 12 +++- |
18 |
app-admin/puppet-agent/puppet-agent-6.12.0.ebuild | 77 ----------------------- |
19 |
app-admin/puppet-agent/puppet-agent-6.13.0.ebuild | 2 +- |
20 |
4 files changed, 12 insertions(+), 81 deletions(-) |
21 |
|
22 |
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest |
23 |
index 0a4ed30d885..00b406eabb8 100644 |
24 |
--- a/app-admin/puppet-agent/Manifest |
25 |
+++ b/app-admin/puppet-agent/Manifest |
26 |
@@ -1,4 +1,2 @@ |
27 |
-DIST puppet-agent_6.12.0-1stretch_amd64.deb 20011636 BLAKE2B f83b795f07771d70220cac71d9b6d8ac7270a20fd5b78471ccef1c8ff802af3c035477f7741e775b10bc609d016a6e9fb79b199987e34b7d4f9a427c4adcd39f SHA512 dda8fa45b961d4a775da7eb128887eee3ceb9887d1062bc2fc748f6055811600162dfb2c4fbf87e401ad404813d2de0cc58ce7aade0aa23af637bb3707896126 |
28 |
-DIST puppet-agent_6.12.0-1stretch_i386.deb 20369446 BLAKE2B f01e39a1b307657569084e2ade1d41f17eefaa2048035f635437159e4373386c6413fa71756594d4a8748ffa0bbbdc2c54c72e696a390380bc9c57721ef010b3 SHA512 fc58e5ea22bd3dd36278db37e46d20809e284db5645ab680fb2c461ee9e4f9e635550f924278905ec13a8f9a71fbf604959e8522e4c0da52709c42f309a04921 |
29 |
DIST puppet-agent_6.13.0-1stretch_amd64.deb 22432484 BLAKE2B 231f8683afbf4d2c5ded7bfec323baecbfd52446bb3483c2c16764bc57b79a18d256ecf94b27d4db1bbe88038d7f3eef037c500a39e3b66d641e4effa94cd2d3 SHA512 6101e84e5dbfa64bd336bb23595fe559165e4a159fa5de739aa1617e6825ab11ad62d1abbee26ff94b9f68caa7a192c0339a0c721efcc534ae9ddbba161af907 |
30 |
DIST puppet-agent_6.13.0-1stretch_i386.deb 22787442 BLAKE2B 1bcea00b2da5c5b0db51fdd12d3828492a9a56af3a8c84919258ac7b90f7d135df708aba602a6d517364ac8b42f1ee3f1c11596cca0e89809a72d1d04c7ecc58 SHA512 55afd1ec6d331808a2a5adcd9c41803d932bcd7e2653da42c81c8ea1179649ae7ac642993813d527b2f365fb4f21d67015a0c2eb5379de2184585475521f8726 |
31 |
|
32 |
diff --git a/app-admin/puppet-agent/metadata.xml b/app-admin/puppet-agent/metadata.xml |
33 |
index aef6ae7f136..7ac132fb0a5 100644 |
34 |
--- a/app-admin/puppet-agent/metadata.xml |
35 |
+++ b/app-admin/puppet-agent/metadata.xml |
36 |
@@ -9,6 +9,16 @@ |
37 |
<flag name="puppetdb">Adds puppetdb support</flag> |
38 |
</use> |
39 |
<longdescription lang="en"> |
40 |
- Collection of puppet utils, clients and batteries included. |
41 |
+ Centralised configuration management for networks |
42 |
+ Puppet lets you centrally manage every important aspect of your system |
43 |
+ using a cross-platform specification language that manages all the |
44 |
+ separate elements normally aggregated in different files, like users, |
45 |
+ cron jobs, and hosts, along with obviously discrete elements like |
46 |
+ packages, services, and files. |
47 |
+ |
48 |
+ Puppet's simple declarative specification language provides powerful |
49 |
+ classing abilities for drawing out the similarities between hosts while |
50 |
+ allowing them to be as specific as necessary, and it handles dependency |
51 |
+ and prerequisite relationships between objects clearly and explicitly. |
52 |
</longdescription> |
53 |
</pkgmetadata> |
54 |
|
55 |
diff --git a/app-admin/puppet-agent/puppet-agent-6.12.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.12.0.ebuild |
56 |
deleted file mode 100644 |
57 |
index 166b77d76f3..00000000000 |
58 |
--- a/app-admin/puppet-agent/puppet-agent-6.12.0.ebuild |
59 |
+++ /dev/null |
60 |
@@ -1,77 +0,0 @@ |
61 |
-# Copyright 1999-2020 Gentoo Authors |
62 |
-# Distributed under the terms of the GNU General Public License v2 |
63 |
- |
64 |
-EAPI=7 |
65 |
-inherit eutils systemd unpacker user |
66 |
- |
67 |
-DESCRIPTION="general puppet client utils along with hiera and facter" |
68 |
-HOMEPAGE="https://puppetlabs.com/" |
69 |
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch" |
70 |
-SRC_URI=" |
71 |
- amd64? ( ${SRC_BASE}_amd64.deb ) |
72 |
- x86? ( ${SRC_BASE}_i386.deb )" |
73 |
- |
74 |
-LICENSE="Apache-2.0" |
75 |
-SLOT="0" |
76 |
-KEYWORDS="amd64 x86" |
77 |
-IUSE="puppetdb selinux" |
78 |
-RESTRICT="strip" |
79 |
- |
80 |
-CDEPEND="!app-admin/puppet |
81 |
- !dev-ruby/hiera |
82 |
- !dev-ruby/facter |
83 |
- !app-emulation/virt-what" |
84 |
- |
85 |
-DEPEND=" |
86 |
- ${CDEPEND} |
87 |
- app-admin/augeas" |
88 |
-RDEPEND="${CDEPEND} |
89 |
- app-portage/eix |
90 |
- sys-apps/dmidecode |
91 |
- sys-libs/glibc |
92 |
- sys-libs/readline:0/7 |
93 |
- sys-libs/ncurses:0[tinfo] |
94 |
- selinux? ( |
95 |
- sys-libs/libselinux[ruby] |
96 |
- sec-policy/selinux-puppet |
97 |
- ) |
98 |
- puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )" |
99 |
- |
100 |
-S=${WORKDIR} |
101 |
- |
102 |
-pkg_setup() { |
103 |
- enewgroup puppet |
104 |
- enewuser puppet -1 -1 /var/run/puppet puppet |
105 |
-} |
106 |
- |
107 |
-src_install() { |
108 |
- # conf.d |
109 |
- doconfd etc/default/puppet |
110 |
- doconfd etc/default/pxp-agent |
111 |
- # logrotate.d |
112 |
- insinto /etc/logrotate.d |
113 |
- doins etc/logrotate.d/pxp-agent |
114 |
- # puppet itself |
115 |
- insinto /etc/puppetlabs |
116 |
- doins -r etc/puppetlabs/* |
117 |
- # logdir for systemd |
118 |
- dodir var/log/puppetlabs/puppet/ |
119 |
- fperms 0750 var/log/puppetlabs/puppet/ |
120 |
- # the rest |
121 |
- insinto /opt |
122 |
- dodir opt/puppetlabs/puppet/cache |
123 |
- doins -r opt/* |
124 |
- fperms 0750 /opt/puppetlabs/puppet/cache |
125 |
- # init |
126 |
- newinitd "${FILESDIR}/puppet.initd" puppet |
127 |
- systemd_dounit lib/systemd/system/puppet.service |
128 |
- systemd_dounit lib/systemd/system/pxp-agent.service |
129 |
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf |
130 |
- # symlinks |
131 |
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" |
132 |
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" |
133 |
- dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter |
134 |
- dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera |
135 |
- dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet |
136 |
- dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what |
137 |
-} |
138 |
|
139 |
diff --git a/app-admin/puppet-agent/puppet-agent-6.13.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.13.0.ebuild |
140 |
index 6ef50802412..9d360f3dc1b 100644 |
141 |
--- a/app-admin/puppet-agent/puppet-agent-6.13.0.ebuild |
142 |
+++ b/app-admin/puppet-agent/puppet-agent-6.13.0.ebuild |
143 |
@@ -13,7 +13,7 @@ SRC_URI=" |
144 |
|
145 |
LICENSE="Apache-2.0" |
146 |
SLOT="0" |
147 |
-KEYWORDS="~amd64 ~x86" |
148 |
+KEYWORDS="amd64 x86" |
149 |
IUSE="puppetdb selinux" |
150 |
RESTRICT="strip" |