Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppetdb/
Date: Thu, 12 Mar 2020 01:19:59
Message-Id: 1583975986.4d62e24468acfa7aa3b170c7a02e47bdbe6b4ebb.prometheanfire@gentoo
1 commit: 4d62e24468acfa7aa3b170c7a02e47bdbe6b4ebb
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 12 01:19:30 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 12 01:19:46 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d62e244
7
8 app-admin/puppetdb: stablize 6.9.1 for amd64/x86 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/puppetdb/Manifest | 2 -
15 app-admin/puppetdb/puppetdb-6.8.0.ebuild | 92 --------------------------------
16 app-admin/puppetdb/puppetdb-6.9.0.ebuild | 87 ------------------------------
17 app-admin/puppetdb/puppetdb-6.9.1.ebuild | 2 +-
18 4 files changed, 1 insertion(+), 182 deletions(-)
19
20 diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
21 index 97a7efa3ae1..4f81134943c 100644
22 --- a/app-admin/puppetdb/Manifest
23 +++ b/app-admin/puppetdb/Manifest
24 @@ -1,3 +1 @@
25 -DIST puppetdb-6.8.0.tar.gz 44216021 BLAKE2B ac5641ee0bceef3948d108c725e2ff53d76e897cafd75c9bc6978462f4b157c3d30146ce2f57fd2aa7610b2defc4e074c168847d8aba5501cde16ee0ab7b5aaf SHA512 2dd01058edbd8a4bb3f4717dc518e58ac57139ccc0651e8e39c721a32651bd932fe4ec747c7da23561ab33d7d4d7ddc448fe9b05734d1562f799e183c5e236d5
26 -DIST puppetdb-6.9.0.tar.gz 44270700 BLAKE2B 2346bf8cf3c944b1a75d0ed9fc32678909f0a6615ea615b7d89316ce470eaaa9540b56550b655214711564c6f0f0e2931a0f037e0ffad983f5578a54b4b180ec SHA512 2450f82bcbcd84fd63f107ea69dc3890a77fc94a54b2c5601c5aa3ed80fcc12e26302f6150777fbcbc1fbedb3c9fb9dd60e6aea37101c0abb2cf19a1696be2e7
27 DIST puppetdb-6.9.1.tar.gz 44274016 BLAKE2B eaf1fe6ee88d2f4a1d147032db017eefd95a3edaba6fe5b114be6ac4ce37584ee58fa96c34fdac97b9b8b1aecd8abc982107024d2155bb78781d1c2c2f2112e1 SHA512 8db39c7571af597be2cff7e21ec5818d422f83f1c3188896e8eb9391e52d0f4bb1f85358a25998db599e9db2b93baec60415a43b519be3da600a9c1de0f073bc
28
29 diff --git a/app-admin/puppetdb/puppetdb-6.8.0.ebuild b/app-admin/puppetdb/puppetdb-6.8.0.ebuild
30 deleted file mode 100644
31 index bca5e3ccebd..00000000000
32 --- a/app-admin/puppetdb/puppetdb-6.8.0.ebuild
33 +++ /dev/null
34 @@ -1,92 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -inherit multilib systemd user
41 -
42 -DESCRIPTION="PuppetDB collects data generated by Puppet."
43 -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
44 -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
45 -
46 -LICENSE="Apache-2.0"
47 -SLOT="0"
48 -IUSE=""
49 -# will need the same keywords as puppet
50 -KEYWORDS="amd64 x86"
51 -
52 -RDEPEND+=">=virtual/jdk-1.8.0"
53 -DEPEND+=""
54 -
55 -pkg_setup() {
56 - enewgroup puppetdb
57 - enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
58 -}
59 -
60 -src_prepare() {
61 - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
62 - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
63 - sed -i 's/sysconfig/conf\.d/g' install.sh || die
64 - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
65 - sed -i 's/var\/run/run/g' install.sh || die
66 - default
67 -}
68 -
69 -src_compile() {
70 - einfo "not compiling"
71 -}
72 -
73 -src_install() {
74 - dodir /opt/puppetlabs/server/data/puppetdb
75 - insinto /opt/puppetlabs/server/apps/puppetdb
76 - insopts -m0744
77 - doins ext/ezbake-functions.sh
78 - insopts -m0644
79 - doins ext/ezbake.manifest
80 - doins puppetdb.jar
81 - insinto /etc/puppetlabs/puppetdb
82 - doins ext/config/logback.xml
83 - doins ext/config/bootstrap.cfg
84 - doins ext/config/request-logging.xml
85 - insinto /etc/puppetlabs/puppetdb/conf.d
86 - doins ext/config/conf.d/jetty.ini
87 - doins ext/config/conf.d/repl.ini
88 - doins ext/config/conf.d/database.ini
89 - doins ext/config/conf.d/config.ini
90 - insopts -m0755
91 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts
92 - doins install.sh
93 - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
94 - doins ext/cli/foreground
95 - doins ext/cli/ssl-setup
96 - doins ext/cli/config-migration
97 - doins ext/cli/foreground
98 - doins ext/cli/anonymize
99 - doins ext/cli/reload
100 - doins ext/cli/start
101 - doins ext/cli/stop
102 - insinto /opt/puppetlabs/server/apps/puppetdb/bin
103 - doins ext/bin/puppetdb
104 - insopts -m0644
105 - dodir /opt/puppetlabs/server/bin
106 - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
107 - dodir /opt/puppetlabs/bin
108 - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
109 - dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
110 - # init type tasks
111 - newconfd ext/default puppetdb
112 - systemd_dounit ext/redhat/puppetdb.service
113 - systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
114 - newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
115 - # misc
116 - insinto /etc/logrotate.d
117 - newins ext/puppetdb.logrotate.conf puppetdb
118 - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
119 - fperms -R 770 /opt/puppetlabs/server/data/puppetdb
120 -}
121 -
122 -pkg_postinst() {
123 - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
124 - elog
125 - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
126 -}
127
128 diff --git a/app-admin/puppetdb/puppetdb-6.9.0.ebuild b/app-admin/puppetdb/puppetdb-6.9.0.ebuild
129 deleted file mode 100644
130 index 5a7a32bcf49..00000000000
131 --- a/app-admin/puppetdb/puppetdb-6.9.0.ebuild
132 +++ /dev/null
133 @@ -1,87 +0,0 @@
134 -# Copyright 1999-2020 Gentoo Authors
135 -# Distributed under the terms of the GNU General Public License v2
136 -
137 -EAPI=7
138 -
139 -inherit multilib systemd
140 -
141 -DESCRIPTION="PuppetDB collects data generated by Puppet."
142 -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
143 -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
144 -
145 -LICENSE="Apache-2.0"
146 -SLOT="0"
147 -IUSE=""
148 -KEYWORDS="~amd64 ~x86"
149 -
150 -RDEPEND+=">=virtual/jdk-1.8.0"
151 -DEPEND+="acct-user/puppetdb
152 - acct-group/puppetdb"
153 -
154 -src_prepare() {
155 - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
156 - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
157 - sed -i 's/sysconfig/conf\.d/g' install.sh || die
158 - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
159 - sed -i 's/var\/run/run/g' install.sh || die
160 - default
161 -}
162 -
163 -src_compile() {
164 - einfo "not compiling"
165 -}
166 -
167 -src_install() {
168 - dodir /opt/puppetlabs/server/data/puppetdb
169 - insinto /opt/puppetlabs/server/apps/puppetdb
170 - insopts -m0744
171 - doins ext/ezbake-functions.sh
172 - insopts -m0644
173 - doins ext/ezbake.manifest
174 - doins puppetdb.jar
175 - insinto /etc/puppetlabs/puppetdb
176 - doins ext/config/logback.xml
177 - doins ext/config/bootstrap.cfg
178 - doins ext/config/request-logging.xml
179 - insinto /etc/puppetlabs/puppetdb/conf.d
180 - doins ext/config/conf.d/jetty.ini
181 - doins ext/config/conf.d/repl.ini
182 - doins ext/config/conf.d/database.ini
183 - doins ext/config/conf.d/config.ini
184 - insopts -m0755
185 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts
186 - doins install.sh
187 - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
188 - doins ext/cli/foreground
189 - doins ext/cli/ssl-setup
190 - doins ext/cli/config-migration
191 - doins ext/cli/foreground
192 - doins ext/cli/anonymize
193 - doins ext/cli/reload
194 - doins ext/cli/start
195 - doins ext/cli/stop
196 - insinto /opt/puppetlabs/server/apps/puppetdb/bin
197 - doins ext/bin/puppetdb
198 - insopts -m0644
199 - dodir /opt/puppetlabs/server/bin
200 - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
201 - dodir /opt/puppetlabs/bin
202 - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
203 - dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
204 - # init type tasks
205 - newconfd ext/default puppetdb
206 - systemd_dounit ext/redhat/puppetdb.service
207 - systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
208 - newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
209 - # misc
210 - insinto /etc/logrotate.d
211 - newins ext/puppetdb.logrotate.conf puppetdb
212 - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
213 - fperms -R 770 /opt/puppetlabs/server/data/puppetdb
214 -}
215 -
216 -pkg_postinst() {
217 - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
218 - elog
219 - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
220 -}
221
222 diff --git a/app-admin/puppetdb/puppetdb-6.9.1.ebuild b/app-admin/puppetdb/puppetdb-6.9.1.ebuild
223 index 5a7a32bcf49..784885ac312 100644
224 --- a/app-admin/puppetdb/puppetdb-6.9.1.ebuild
225 +++ b/app-admin/puppetdb/puppetdb-6.9.1.ebuild
226 @@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
227 LICENSE="Apache-2.0"
228 SLOT="0"
229 IUSE=""
230 -KEYWORDS="~amd64 ~x86"
231 +KEYWORDS="amd64 x86"
232
233 RDEPEND+=">=virtual/jdk-1.8.0"
234 DEPEND+="acct-user/puppetdb