Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/polkit/
Date: Sat, 05 Feb 2022 20:46:49
Message-Id: 1644093648.c0502be50e13cb62efd5c5fbb3e2cac255490e15.asturm@gentoo
1 commit: c0502be50e13cb62efd5c5fbb3e2cac255490e15
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 5 20:30:47 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 5 20:40:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0502be5
7
8 sys-auth/polkit: Cleanup vulnerable 0.117-r2, 0.119-r2 and 0.120-r1
9
10 Bug: https://bugs.gentoo.org/832057
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 sys-auth/polkit/Manifest | 1 -
15 sys-auth/polkit/polkit-0.117-r2.ebuild | 133 ---------------------------------
16 sys-auth/polkit/polkit-0.119-r2.ebuild | 132 --------------------------------
17 sys-auth/polkit/polkit-0.120-r1.ebuild | 119 -----------------------------
18 4 files changed, 385 deletions(-)
19
20 diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
21 index c77a19832113..b92c7602f92f 100644
22 --- a/sys-auth/polkit/Manifest
23 +++ b/sys-auth/polkit/Manifest
24 @@ -1,3 +1,2 @@
25 DIST polkit-0.117.tar.gz 1554536 BLAKE2B 1cf7e0ff9db19a29be626f4bea96c9e2ef8b1eab4b8287a5f1f4d2a818b86d58c1c4c4a41849d95e31559dba1b18853a31e934ebbadd8e07f94dfd58b45240e0 SHA512 c10ea984f2386fe436e58a2866e5323afc80d24f744f0ee61d966941259aa491bd96b07d911434aa731b300c3cca25b647804b396501175ab5b3c53384e94c70
26 -DIST polkit-0.119.tar.gz 1387409 BLAKE2B aeb605598393d1cab40f7c77954008a0392600584c5fe8cc9acaa0e122418ee48b9cce0b6839189ea415277ff0ae4dbd5b7c71cb910aa349dcaf7e1f3f70ef06 SHA512 0260fb15da1c4c1f429e8223260981e64e297f1be8ced42f6910f09ea6581b8205aca06c9c601eb4a128acba2f468de0223118f96862ba769f95721894cf1578
27 DIST polkit-0.120.tar.gz 1626659 BLAKE2B 745727445b4946d44b8ea470d21ac131ca7706e83f5dbaf85cf3541ac60a1bbe23b3bf3172a62d9256ebb3dae02d2b2d476e3e0f7fe79a80c47864a120e62ed9 SHA512 db072769439d5e17d0eed681e7b94251b77828c1474b40fe40b94293903a64333e7fa17515a3270648691f04a1374d8b404405ead6abf292a8eb8483164adc46
28
29 diff --git a/sys-auth/polkit/polkit-0.117-r2.ebuild b/sys-auth/polkit/polkit-0.117-r2.ebuild
30 deleted file mode 100644
31 index c2446ea9b371..000000000000
32 --- a/sys-auth/polkit/polkit-0.117-r2.ebuild
33 +++ /dev/null
34 @@ -1,133 +0,0 @@
35 -# Copyright 1999-2021 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -inherit autotools pam pax-utils systemd xdg-utils
41 -
42 -DESCRIPTION="Policy framework for controlling privileges for system-wide services"
43 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit"
44 -SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
45 -
46 -LICENSE="LGPL-2"
47 -SLOT="0"
48 -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86"
49 -IUSE="elogind examples gtk +introspection kde nls pam selinux systemd test"
50 -RESTRICT="!test? ( test )"
51 -
52 -REQUIRED_USE="^^ ( elogind systemd )"
53 -
54 -BDEPEND="
55 - acct-user/polkitd
56 - app-text/docbook-xml-dtd:4.1.2
57 - app-text/docbook-xsl-stylesheets
58 - dev-libs/glib
59 - dev-libs/gobject-introspection-common
60 - dev-libs/libxslt
61 - dev-util/glib-utils
62 - dev-util/gtk-doc-am
63 - dev-util/intltool
64 - sys-devel/gettext
65 - virtual/pkgconfig
66 - introspection? ( dev-libs/gobject-introspection )
67 -"
68 -DEPEND="
69 - dev-lang/spidermonkey:68[-debug]
70 - dev-libs/glib:2
71 - dev-libs/expat
72 - elogind? ( sys-auth/elogind )
73 - pam? (
74 - sys-auth/pambase
75 - sys-libs/pam
76 - )
77 - !pam? ( virtual/libcrypt:= )
78 - systemd? ( sys-apps/systemd:0=[policykit] )
79 -"
80 -RDEPEND="${DEPEND}
81 - acct-user/polkitd
82 - selinux? ( sec-policy/selinux-policykit )
83 -"
84 -PDEPEND="
85 - gtk? ( || (
86 - >=gnome-extra/polkit-gnome-0.105
87 - >=lxde-base/lxsession-0.5.2
88 - ) )
89 - kde? ( kde-plasma/polkit-kde-agent )
90 -"
91 -
92 -DOCS=( docs/TODO HACKING NEWS README )
93 -
94 -PATCHES=(
95 - # bug 660880
96 - "${FILESDIR}"/polkit-0.115-elogind.patch
97 -)
98 -
99 -QA_MULTILIB_PATHS="
100 - usr/lib/polkit-1/polkit-agent-helper-1
101 - usr/lib/polkit-1/polkitd"
102 -
103 -src_prepare() {
104 - default
105 -
106 - sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
107 -
108 - # Workaround upstream hack around standard gtk-doc behavior, bug #552170
109 - sed -i -e 's/@ENABLE_GTK_DOC_TRUE@\(TARGET_DIR\)/\1/' \
110 - -e '/install-data-local:/,/uninstall-local:/ s/@ENABLE_GTK_DOC_TRUE@//' \
111 - -e 's/@ENABLE_GTK_DOC_FALSE@install-data-local://' \
112 - docs/polkit/Makefile.in || die
113 -
114 - # disable broken test - bug #624022
115 - sed -i -e "/^SUBDIRS/s/polkitbackend//" test/Makefile.am || die
116 -
117 - # Fix cross-building, bug #590764, elogind patch, bug #598615
118 - eautoreconf
119 -}
120 -
121 -src_configure() {
122 - xdg_environment_reset
123 -
124 - local myeconfargs=(
125 - --localstatedir="${EPREFIX}"/var
126 - --disable-static
127 - --enable-man-pages
128 - --disable-gtk-doc
129 - --disable-examples
130 - $(use_enable elogind libelogind)
131 - $(use_enable introspection)
132 - $(use_enable nls)
133 - $(usex pam "--with-pam-module-dir=$(getpam_mod_dir)" '')
134 - --with-authfw=$(usex pam pam shadow)
135 - $(use_enable systemd libsystemd-login)
136 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
137 - $(use_enable test)
138 - --with-os-type=gentoo
139 - )
140 - econf "${myeconfargs[@]}"
141 -}
142 -
143 -src_compile() {
144 - default
145 -
146 - # Required for polkitd on hardened/PaX due to spidermonkey's JIT
147 - pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
148 -}
149 -
150 -src_install() {
151 - default
152 -
153 - if use examples; then
154 - docinto examples
155 - dodoc src/examples/{*.c,*.policy*}
156 - fi
157 -
158 - diropts -m 0700 -o polkitd
159 - keepdir /usr/share/polkit-1/rules.d
160 -
161 - find "${ED}" -name '*.la' -delete || die
162 -}
163 -
164 -pkg_postinst() {
165 - chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
166 - chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
167 -}
168
169 diff --git a/sys-auth/polkit/polkit-0.119-r2.ebuild b/sys-auth/polkit/polkit-0.119-r2.ebuild
170 deleted file mode 100644
171 index 1fd9a3e3feeb..000000000000
172 --- a/sys-auth/polkit/polkit-0.119-r2.ebuild
173 +++ /dev/null
174 @@ -1,132 +0,0 @@
175 -# Copyright 1999-2021 Gentoo Authors
176 -# Distributed under the terms of the GNU General Public License v2
177 -
178 -EAPI=7
179 -
180 -inherit autotools pam pax-utils systemd xdg-utils
181 -
182 -DESCRIPTION="Policy framework for controlling privileges for system-wide services"
183 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit"
184 -SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
185 -
186 -LICENSE="LGPL-2"
187 -SLOT="0"
188 -KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv ~s390 x86"
189 -IUSE="elogind examples gtk +introspection kde nls pam selinux systemd test"
190 -RESTRICT="!test? ( test )"
191 -
192 -REQUIRED_USE="^^ ( elogind systemd )"
193 -
194 -BDEPEND="
195 - acct-user/polkitd
196 - app-text/docbook-xml-dtd:4.1.2
197 - app-text/docbook-xsl-stylesheets
198 - dev-libs/glib
199 - dev-libs/gobject-introspection-common
200 - dev-libs/libxslt
201 - dev-util/glib-utils
202 - dev-util/gtk-doc-am
203 - dev-util/intltool
204 - sys-devel/gettext
205 - virtual/pkgconfig
206 - introspection? ( dev-libs/gobject-introspection )
207 -"
208 -DEPEND="
209 - dev-lang/spidermonkey:78[-debug]
210 - dev-libs/glib:2
211 - dev-libs/expat
212 - elogind? ( sys-auth/elogind )
213 - pam? (
214 - sys-auth/pambase
215 - sys-libs/pam
216 - )
217 - !pam? ( virtual/libcrypt:= )
218 - systemd? ( sys-apps/systemd:0=[policykit] )
219 -"
220 -RDEPEND="${DEPEND}
221 - acct-user/polkitd
222 - selinux? ( sec-policy/selinux-policykit )
223 -"
224 -PDEPEND="
225 - gtk? ( || (
226 - >=gnome-extra/polkit-gnome-0.105
227 - >=lxde-base/lxsession-0.5.2
228 - ) )
229 - kde? ( kde-plasma/polkit-kde-agent )
230 -"
231 -
232 -DOCS=( docs/TODO HACKING NEWS README )
233 -
234 -PATCHES=(
235 - "${FILESDIR}"/${PN}-0.115-elogind.patch # bug 660880
236 -)
237 -
238 -QA_MULTILIB_PATHS="
239 - usr/lib/polkit-1/polkit-agent-helper-1
240 - usr/lib/polkit-1/polkitd"
241 -
242 -src_prepare() {
243 - default
244 -
245 - sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
246 -
247 - # Workaround upstream hack around standard gtk-doc behavior, bug #552170
248 - sed -i -e 's/@ENABLE_GTK_DOC_TRUE@\(TARGET_DIR\)/\1/' \
249 - -e '/install-data-local:/,/uninstall-local:/ s/@ENABLE_GTK_DOC_TRUE@//' \
250 - -e 's/@ENABLE_GTK_DOC_FALSE@install-data-local://' \
251 - docs/polkit/Makefile.in || die
252 -
253 - # disable broken test - bug #624022
254 - sed -i -e "/^SUBDIRS/s/polkitbackend//" test/Makefile.am || die
255 -
256 - # Fix cross-building, bug #590764, elogind patch, bug #598615
257 - eautoreconf
258 -}
259 -
260 -src_configure() {
261 - xdg_environment_reset
262 -
263 - local myeconfargs=(
264 - --localstatedir="${EPREFIX}"/var
265 - --disable-static
266 - --enable-man-pages
267 - --disable-gtk-doc
268 - --disable-examples
269 - $(use_enable elogind libelogind)
270 - $(use_enable introspection)
271 - $(use_enable nls)
272 - $(usex pam "--with-pam-module-dir=$(getpam_mod_dir)" '')
273 - --with-authfw=$(usex pam pam shadow)
274 - $(use_enable systemd libsystemd-login)
275 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
276 - $(use_enable test)
277 - --with-os-type=gentoo
278 - )
279 - econf "${myeconfargs[@]}"
280 -}
281 -
282 -src_compile() {
283 - default
284 -
285 - # Required for polkitd on hardened/PaX due to spidermonkey's JIT
286 - pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
287 -}
288 -
289 -src_install() {
290 - default
291 -
292 - if use examples; then
293 - docinto examples
294 - dodoc src/examples/{*.c,*.policy*}
295 - fi
296 -
297 - diropts -m 0700 -o polkitd
298 - keepdir /usr/share/polkit-1/rules.d
299 -
300 - find "${ED}" -name '*.la' -delete || die
301 -}
302 -
303 -pkg_postinst() {
304 - chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
305 - chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
306 -}
307
308 diff --git a/sys-auth/polkit/polkit-0.120-r1.ebuild b/sys-auth/polkit/polkit-0.120-r1.ebuild
309 deleted file mode 100644
310 index 3ec998fa6f02..000000000000
311 --- a/sys-auth/polkit/polkit-0.120-r1.ebuild
312 +++ /dev/null
313 @@ -1,119 +0,0 @@
314 -# Copyright 1999-2022 Gentoo Authors
315 -# Distributed under the terms of the GNU General Public License v2
316 -
317 -EAPI=7
318 -
319 -inherit meson pam pax-utils systemd xdg-utils
320 -
321 -DESCRIPTION="Policy framework for controlling privileges for system-wide services"
322 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit"
323 -SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
324 -
325 -LICENSE="LGPL-2"
326 -SLOT="0"
327 -KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv ~s390 x86"
328 -IUSE="examples gtk +introspection kde pam selinux systemd test"
329 -#RESTRICT="!test? ( test )"
330 -# Tests currently don't work with meson. See
331 -# https://gitlab.freedesktop.org/polkit/polkit/-/issues/144
332 -RESTRICT="test"
333 -
334 -BDEPEND="
335 - acct-user/polkitd
336 - app-text/docbook-xml-dtd:4.1.2
337 - app-text/docbook-xsl-stylesheets
338 - dev-libs/glib
339 - dev-libs/gobject-introspection-common
340 - dev-libs/libxslt
341 - dev-util/glib-utils
342 - sys-devel/gettext
343 - virtual/pkgconfig
344 - introspection? ( dev-libs/gobject-introspection )
345 -"
346 -DEPEND="
347 - dev-lang/spidermonkey:78[-debug]
348 - dev-libs/glib:2
349 - dev-libs/expat
350 - pam? (
351 - sys-auth/pambase
352 - sys-libs/pam
353 - )
354 - !pam? ( virtual/libcrypt:= )
355 - systemd? ( sys-apps/systemd:0=[policykit] )
356 - !systemd? ( sys-auth/elogind )
357 -"
358 -RDEPEND="${DEPEND}
359 - acct-user/polkitd
360 - selinux? ( sec-policy/selinux-policykit )
361 -"
362 -PDEPEND="
363 - gtk? ( || (
364 - >=gnome-extra/polkit-gnome-0.105
365 - >=lxde-base/lxsession-0.5.2
366 - ) )
367 - kde? ( kde-plasma/polkit-kde-agent )
368 -"
369 -
370 -DOCS=( docs/TODO HACKING NEWS README )
371 -
372 -QA_MULTILIB_PATHS="
373 - usr/lib/polkit-1/polkit-agent-helper-1
374 - usr/lib/polkit-1/polkitd"
375 -
376 -src_prepare() {
377 - local PATCHES=(
378 - "${FILESDIR}/polkit-0.120-meson.patch"
379 - )
380 - default
381 -
382 - sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
383 -}
384 -
385 -src_configure() {
386 - xdg_environment_reset
387 -
388 - local emesonargs=(
389 - --localstatedir="${EPREFIX}"/var
390 - -Dauthfw="$(usex pam pam shadow)"
391 - -Dexamples=false
392 - -Dgtk_doc=false
393 - -Dman=true
394 - -Dos_type=gentoo
395 - -Dsession_tracking="$(usex systemd libsystemd-login libelogind)"
396 - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
397 - $(meson_use introspection)
398 - $(meson_use test tests)
399 - $(usex pam "-Dpam_module_dir=$(getpam_mod_dir)" '')
400 - )
401 - meson_src_configure
402 -}
403 -
404 -src_compile() {
405 - meson_src_compile
406 -
407 - # Required for polkitd on hardened/PaX due to spidermonkey's JIT
408 - pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
409 -}
410 -
411 -src_install() {
412 - meson_src_install
413 -
414 - if use examples ; then
415 - docinto examples
416 - dodoc src/examples/{*.c,*.policy*}
417 - fi
418 -
419 - diropts -m 0700 -o polkitd
420 - keepdir /usr/share/polkit-1/rules.d
421 -
422 - # meson does not install required files with SUID bit. See
423 - # https://bugs.gentoo.org/816393
424 - # Remove the following lines once this has been fixed by upstream
425 - fperms u+s /usr/bin/pkexec
426 - fperms u+s /usr/lib/polkit-1/polkit-agent-helper-1
427 -}
428 -
429 -pkg_postinst() {
430 - chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
431 - chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
432 -}