1 |
commit: e248bbd4667c50465e9c1fa8517dc073369923b1 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 12 01:17:40 2020 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 12 01:19:45 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e248bbd4 |
7 |
|
8 |
app-admin/puppetserver: stablize 6.9.1 and cleanup for CVE-2020-7943 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/712198 |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
13 |
|
14 |
app-admin/puppetserver/Manifest | 2 - |
15 |
app-admin/puppetserver/metadata.xml | 3 - |
16 |
app-admin/puppetserver/puppetserver-6.8.0.ebuild | 135 ----------------------- |
17 |
app-admin/puppetserver/puppetserver-6.9.0.ebuild | 131 ---------------------- |
18 |
app-admin/puppetserver/puppetserver-6.9.1.ebuild | 2 +- |
19 |
5 files changed, 1 insertion(+), 272 deletions(-) |
20 |
|
21 |
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest |
22 |
index 9cbbdf9dcb3..73d50ebefd1 100644 |
23 |
--- a/app-admin/puppetserver/Manifest |
24 |
+++ b/app-admin/puppetserver/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
-DIST puppetserver-6.8.0.tar.gz 59370389 BLAKE2B 227512d3a054980867730882459bff32559f8baa5fb0c807a14fcc827b8f41fc1da2cceab6bdbd6162bb4e6e6e4312f5d47d478f6887a978c359c6a4225d663d SHA512 9e4d0ea1aad1209342151cfcfd304e4a296df0e95fefde46d4e4a28a9da62422194492d430c3492cc717a7c872ee0f448a89a40fe1e1cb565f865fc0aca7089b |
27 |
-DIST puppetserver-6.9.0.tar.gz 59495229 BLAKE2B 17e02d201dd39a7c9a060c8898c76de3b85c5ffceb8dae128c032352e8f2959b6084558790c14979f95b7904bc70db0b3374d81f2b0c1f70bfb286084d6ba3a4 SHA512 b1446d407d50e3da502e2cd882647379fb51334bf5d4cc13d3654c8f7cbec2d6c4d7efd8acdfbdc1c70c6e30e3b420ed642cbdb97ee5f6a16b3b404dbd42bba7 |
28 |
DIST puppetserver-6.9.1.tar.gz 59496176 BLAKE2B 1599380ebf731fb4d67c04abc06303647d5d29c99f2b9721d049972eaaf3d4c2b108c6ac2f1a45efce3c52e9a57ebd362c874c36093027ebca77a2ae1d4c0323 SHA512 3a794adfa48c7bf9bd241c9da0578ea192b8551e75093e4d95c7c10fa659ef59d59ae72b33561d13ac31e839245d266301a6067d30b466138a95a6c4879bc58a |
29 |
|
30 |
diff --git a/app-admin/puppetserver/metadata.xml b/app-admin/puppetserver/metadata.xml |
31 |
index 13a74121935..3b90d18cc03 100644 |
32 |
--- a/app-admin/puppetserver/metadata.xml |
33 |
+++ b/app-admin/puppetserver/metadata.xml |
34 |
@@ -8,7 +8,4 @@ |
35 |
<use> |
36 |
<flag name="puppetdb">Adds support for connecting to puppetdb</flag> |
37 |
</use> |
38 |
- <longdescription lang="en"> |
39 |
- Puppet Server is the next-generation application for managing Puppet agents. |
40 |
- </longdescription> |
41 |
</pkgmetadata> |
42 |
|
43 |
diff --git a/app-admin/puppetserver/puppetserver-6.8.0.ebuild b/app-admin/puppetserver/puppetserver-6.8.0.ebuild |
44 |
deleted file mode 100644 |
45 |
index 3d317193a27..00000000000 |
46 |
--- a/app-admin/puppetserver/puppetserver-6.8.0.ebuild |
47 |
+++ /dev/null |
48 |
@@ -1,135 +0,0 @@ |
49 |
-# Copyright 1999-2020 Gentoo Authors |
50 |
-# Distributed under the terms of the GNU General Public License v2 |
51 |
- |
52 |
-EAPI=7 |
53 |
- |
54 |
-inherit multilib systemd user |
55 |
- |
56 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
57 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
58 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
59 |
- |
60 |
-LICENSE="Apache-2.0" |
61 |
-SLOT="0" |
62 |
-IUSE="puppetdb" |
63 |
-# will need the same keywords as puppet |
64 |
-KEYWORDS="amd64 x86" |
65 |
- |
66 |
-RDEPEND+=" |
67 |
- >=virtual/jdk-1.8.0 |
68 |
- app-admin/puppet-agent[puppetdb?]" |
69 |
-DEPEND+="" |
70 |
- |
71 |
-pkg_setup() { |
72 |
- enewgroup puppet |
73 |
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" |
74 |
-} |
75 |
- |
76 |
-src_prepare() { |
77 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
78 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
79 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die |
80 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
81 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
82 |
- sed -i 's/var\/run/run/g' install.sh || die |
83 |
- default |
84 |
-} |
85 |
- |
86 |
-src_compile() { |
87 |
- einfo "not compiling" |
88 |
-} |
89 |
- |
90 |
-src_install() { |
91 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
92 |
- insopts -m0774 |
93 |
- doins ext/ezbake-functions.sh |
94 |
- insopts -m0644 |
95 |
- doins ext/ezbake.manifest |
96 |
- doins puppet-server-release.jar |
97 |
- insinto /etc/puppetlabs/puppetserver |
98 |
- doins ext/config/logback.xml |
99 |
- doins ext/config/request-logging.xml |
100 |
- insinto /etc/puppetlabs/puppetserver/services.d |
101 |
- doins ext/system-config/services.d/bootstrap.cfg |
102 |
- doins ext/config/services.d/ca.cfg |
103 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
104 |
- doins ext/config/conf.d/puppetserver.conf |
105 |
- doins ext/config/conf.d/auth.conf |
106 |
- doins ext/config/conf.d/global.conf |
107 |
- doins ext/config/conf.d/web-routes.conf |
108 |
- doins ext/config/conf.d/metrics.conf |
109 |
- doins ext/config/conf.d/webserver.conf |
110 |
- insopts -m0755 |
111 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
112 |
- doins install.sh |
113 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
114 |
- doins ext/cli/ca |
115 |
- doins ext/cli/irb |
116 |
- doins ext/cli/foreground |
117 |
- doins ext/cli/gem |
118 |
- doins ext/cli/ruby |
119 |
- doins ext/cli/reload |
120 |
- doins ext/cli/start |
121 |
- doins ext/cli/stop |
122 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
123 |
- doins ext/cli_defaults/cli-defaults.sh |
124 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
125 |
- doins ext/bin/puppetserver |
126 |
- insopts -m0644 |
127 |
- dodir /opt/puppetlabs/server/bin |
128 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
129 |
- dodir /opt/puppetlabs/bin |
130 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
131 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
132 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
133 |
- # other sys stuff |
134 |
- dodir /etc/puppetlabs/code |
135 |
- # needed for systemd |
136 |
- dodir /var/log/puppetlabs/puppetserver |
137 |
- dodir /etc/puppetlabs/puppet/ssl |
138 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
139 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
140 |
- # systemd type things |
141 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
142 |
- systemd_dounit ext/redhat/puppetserver.service |
143 |
- insinto /etc/default |
144 |
- newins ext/default puppetserver |
145 |
- # normal init type tasks |
146 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
147 |
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver |
148 |
- # misc |
149 |
- insinto /etc/logrotate.d |
150 |
- newins ext/puppetserver.logrotate.conf puppetserver |
151 |
- # cleanup |
152 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
153 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
154 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
155 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
156 |
- insinto /opt/puppetlabs/server/data |
157 |
- doins ext/build-scripts/jruby-gem-list.txt |
158 |
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt |
159 |
- insopts -m 0644 |
160 |
- insinto /usr/lib/tmpfiles.d |
161 |
- newins ext/puppetserver.tmpfiles.conf puppetserver.conf |
162 |
-} |
163 |
- |
164 |
-pkg_postinst() { |
165 |
- elog "to install you may want to run the following:" |
166 |
- elog |
167 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
168 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
169 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
170 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
171 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
172 |
- elog |
173 |
- elog "# install puppetserver gems" |
174 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
175 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" |
176 |
- elog "while read LINE; do" |
177 |
- 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}')" |
178 |
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
179 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
180 |
- elog "while read LINE; do" |
181 |
- 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}')" |
182 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" |
183 |
-} |
184 |
|
185 |
diff --git a/app-admin/puppetserver/puppetserver-6.9.0.ebuild b/app-admin/puppetserver/puppetserver-6.9.0.ebuild |
186 |
deleted file mode 100644 |
187 |
index aefa1d0021a..00000000000 |
188 |
--- a/app-admin/puppetserver/puppetserver-6.9.0.ebuild |
189 |
+++ /dev/null |
190 |
@@ -1,131 +0,0 @@ |
191 |
-# Copyright 1999-2020 Gentoo Authors |
192 |
-# Distributed under the terms of the GNU General Public License v2 |
193 |
- |
194 |
-EAPI=7 |
195 |
- |
196 |
-inherit multilib systemd |
197 |
- |
198 |
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." |
199 |
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" |
200 |
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
201 |
- |
202 |
-LICENSE="Apache-2.0" |
203 |
-SLOT="0" |
204 |
-IUSE="puppetdb" |
205 |
-# will need the same keywords as puppet |
206 |
-KEYWORDS="~amd64 ~x86" |
207 |
- |
208 |
-RDEPEND+=" |
209 |
- >=virtual/jdk-1.8.0 |
210 |
- app-admin/puppet-agent[puppetdb?]" |
211 |
-DEPEND+="acct-user/puppet |
212 |
- acct-group/puppet" |
213 |
- |
214 |
-src_prepare() { |
215 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die |
216 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die |
217 |
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die |
218 |
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die |
219 |
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die |
220 |
- sed -i 's/var\/run/run/g' install.sh || die |
221 |
- default |
222 |
-} |
223 |
- |
224 |
-src_compile() { |
225 |
- einfo "not compiling" |
226 |
-} |
227 |
- |
228 |
-src_install() { |
229 |
- insinto /opt/puppetlabs/server/apps/puppetserver |
230 |
- insopts -m0774 |
231 |
- doins ext/ezbake-functions.sh |
232 |
- insopts -m0644 |
233 |
- doins ext/ezbake.manifest |
234 |
- doins puppet-server-release.jar |
235 |
- insinto /etc/puppetlabs/puppetserver |
236 |
- doins ext/config/logback.xml |
237 |
- doins ext/config/request-logging.xml |
238 |
- insinto /etc/puppetlabs/puppetserver/services.d |
239 |
- doins ext/system-config/services.d/bootstrap.cfg |
240 |
- doins ext/config/services.d/ca.cfg |
241 |
- insinto /etc/puppetlabs/puppetserver/conf.d |
242 |
- doins ext/config/conf.d/puppetserver.conf |
243 |
- doins ext/config/conf.d/auth.conf |
244 |
- doins ext/config/conf.d/global.conf |
245 |
- doins ext/config/conf.d/web-routes.conf |
246 |
- doins ext/config/conf.d/metrics.conf |
247 |
- doins ext/config/conf.d/webserver.conf |
248 |
- insopts -m0755 |
249 |
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts |
250 |
- doins install.sh |
251 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps |
252 |
- doins ext/cli/ca |
253 |
- doins ext/cli/irb |
254 |
- doins ext/cli/foreground |
255 |
- doins ext/cli/gem |
256 |
- doins ext/cli/ruby |
257 |
- doins ext/cli/reload |
258 |
- doins ext/cli/start |
259 |
- doins ext/cli/stop |
260 |
- insinto /opt/puppetlabs/server/apps/puppetserver/cli |
261 |
- doins ext/cli_defaults/cli-defaults.sh |
262 |
- insinto /opt/puppetlabs/server/apps/puppetserver/bin |
263 |
- doins ext/bin/puppetserver |
264 |
- insopts -m0644 |
265 |
- dodir /opt/puppetlabs/server/bin |
266 |
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver |
267 |
- dodir /opt/puppetlabs/bin |
268 |
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver |
269 |
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver |
270 |
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d |
271 |
- # other sys stuff |
272 |
- dodir /etc/puppetlabs/code |
273 |
- # needed for systemd |
274 |
- dodir /var/log/puppetlabs/puppetserver |
275 |
- dodir /etc/puppetlabs/puppet/ssl |
276 |
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl |
277 |
- fperms -R 771 /etc/puppetlabs/puppet/ssl |
278 |
- # systemd type things |
279 |
- insinto /etc/systemd/system/puppetserver.service.d/ |
280 |
- systemd_dounit ext/redhat/puppetserver.service |
281 |
- insinto /etc/default |
282 |
- newins ext/default puppetserver |
283 |
- # normal init type tasks |
284 |
- dosym ../default/puppetserver /etc/conf.d/puppetserver |
285 |
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver |
286 |
- # misc |
287 |
- insinto /etc/logrotate.d |
288 |
- newins ext/puppetserver.logrotate.conf puppetserver |
289 |
- # cleanup |
290 |
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems |
291 |
- fowners -R puppet:puppet /opt/puppetlabs/server/data |
292 |
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver |
293 |
- fperms -R 700 /var/log/puppetlabs/puppetserver |
294 |
- insinto /opt/puppetlabs/server/data |
295 |
- doins ext/build-scripts/jruby-gem-list.txt |
296 |
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt |
297 |
- insopts -m 0644 |
298 |
- insinto /usr/lib/tmpfiles.d |
299 |
- newins ext/puppetserver.tmpfiles.conf puppetserver.conf |
300 |
-} |
301 |
- |
302 |
-pkg_postinst() { |
303 |
- elog "to install you may want to run the following:" |
304 |
- elog |
305 |
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" |
306 |
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" |
307 |
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" |
308 |
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" |
309 |
- elog "puppet config set --section master codedir /etc/puppetlabs/code" |
310 |
- elog |
311 |
- elog "# install puppetserver gems" |
312 |
- elog "cd /opt/puppetlabs/server/apps/puppetserver" |
313 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf" |
314 |
- elog "while read LINE; do" |
315 |
- 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}')" |
316 |
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt" |
317 |
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf" |
318 |
- elog "while read LINE; do" |
319 |
- 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}')" |
320 |
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt" |
321 |
-} |
322 |
|
323 |
diff --git a/app-admin/puppetserver/puppetserver-6.9.1.ebuild b/app-admin/puppetserver/puppetserver-6.9.1.ebuild |
324 |
index aefa1d0021a..d738ea7dfb5 100644 |
325 |
--- a/app-admin/puppetserver/puppetserver-6.9.1.ebuild |
326 |
+++ b/app-admin/puppetserver/puppetserver-6.9.1.ebuild |
327 |
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0" |
328 |
SLOT="0" |
329 |
IUSE="puppetdb" |
330 |
# will need the same keywords as puppet |
331 |
-KEYWORDS="~amd64 ~x86" |
332 |
+KEYWORDS="amd64 x86" |
333 |
|
334 |
RDEPEND+=" |
335 |
>=virtual/jdk-1.8.0 |