<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fa29fe7f1282995888ce51761af4d08ca16646af">https://github.com/macports/macports-ports/commit/fa29fe7f1282995888ce51761af4d08ca16646af</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fa29fe7f1282995888ce51761af4d08ca16646af
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Thu Jan 27 18:29:17 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> policykit: Update to 0.120 + 3 additional commits
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add rudimentary support for the meson build system to the
</span><span style='display:block; white-space:pre;color:#404040;'> gobject_introspection PortGroup, which is used by polkit. This may need
</span><span style='display:block; white-space:pre;color:#404040;'> further adaption in case other build systems do not name their gobject
</span><span style='display:block; white-space:pre;color:#404040;'> introspection configure flag 'introspection'.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Switch polkit to the meson build system, drop the autoconf related files
</span><span style='display:block; white-space:pre;color:#404040;'> and sections from the Portfile. Re-enable the livecheck that seems to
</span><span style='display:block; white-space:pre;color:#404040;'> have been disabled because of warning in upstream's NEWS file that has
</span><span style='display:block; white-space:pre;color:#404040;'> been also present in previous versions and was not a good reason to keep
</span><span style='display:block; white-space:pre;color:#404040;'> polkit at an older version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix CVE-2021-4034, a local privilege escalation in pkexec – although
</span><span style='display:block; white-space:pre;color:#404040;'> I have not verified whether this is exploitable on macOS.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The updated polkit would require a newer mozjs – however, polkit
</span><span style='display:block; white-space:pre;color:#404040;'> upstream is working on replacing polkit with the much smaller and
</span><span style='display:block; white-space:pre;color:#404040;'> simpler to build duktape JavaScript engine, which will ship in 0.121.
</span><span style='display:block; white-space:pre;color:#404040;'> Instead of packaging the newer version of mozjs, I packaged duktape and
</span><span style='display:block; white-space:pre;color:#404040;'> pulled in the commit the enables using it. See
</span><span style='display:block; white-space:pre;color:#404040;'> https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/97
</span><span style='display:block; white-space:pre;color:#404040;'> for further discussion that suggests that pretty much all distributions
</span><span style='display:block; white-space:pre;color:#404040;'> will switch to duktape as soon as it is available.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> CVE: CVE-2021-4034
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63277
</span>---
.../port1.0/group/gobject_introspection-1.0.tcl | 24 ++--
security/policykit/Portfile | 88 ++++++---------
security/policykit/files/autogen.sh | 123 ---------------------
.../files/patch-fix-getgrouplist-args.diff | 11 --
...ackend__meson.build-define-darwin-c-source.diff | 21 ++++
5 files changed, 68 insertions(+), 199 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/gobject_introspection-1.0.tcl b/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 612d86da0bd..bed5979c7ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,21 +36,27 @@ proc gobject_introspection_pg::gobject_introspection_setup {} {
</span> if {![option gobject_introspection]} {
if { [string match *cmake* [option configure.cmd] ] } {
configure.args-append -DENABLE_GOBJECT_INTROSPECTION=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { [string match *meson* [option configure.cmd] ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dintrospection=false
</span> } else {
configure.args-append --disable-introspection
}
} else {
depends_lib-append port:gobject-introspection
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix_frozen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The rules enabled by gobject-introspection require GNU make 3.81+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:gmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MAKE=${prefix_frozen}/bin/gmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd-replace [portbuild::build_getmaketype] ${prefix_frozen}/bin/gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![string match *meson* [option configure.cmd]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix_frozen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The rules enabled by gobject-introspection require GNU make 3.81+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MAKE=${prefix_frozen}/bin/gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd-replace [portbuild::build_getmaketype] ${prefix_frozen}/bin/gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if { [string match *cmake* [option configure.cmd] ] } {
configure.args-append -DENABLE_GOBJECT_INTROSPECTION=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { [string match *meson* [option configure.cmd] ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dintrospection=true
</span> } else {
configure.args-append --enable-introspection
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,8 +126,10 @@ proc gobject_introspection_pg::gobject_introspection_setup {} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append CFLAGS="[option configure.cflags] [option gobject_introspection.build.cflags]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="[option configure.ldflags] [option gobject_introspection.build.ldflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![string match *meson* [option configure.cmd]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append CFLAGS="[option configure.cflags] [option gobject_introspection.build.cflags]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="[option configure.ldflags] [option gobject_introspection.build.ldflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/policykit/Portfile b/security/policykit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a45945d5e9..67d6bc6ab17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/policykit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/policykit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,19 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gitlab 1.0
</span> PortGroup gobject_introspection 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span> PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# pin version at 0.116 for now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# upstream version 0.117 is an unstable prerelease and is not recommended
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://gitlab.freedesktop.org/polkit/polkit/-/commit/585f4f2715639394e36319d4918389d26e250e7b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.instance https://gitlab.freedesktop.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Pre-release version with support for ducktape and fix for CVE-2021-4034
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup polkit polkit a2bf5c9c83b6ae46cbd5c779d3055bff81ded683
</span> name policykit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.116
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.120-2022-01-25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove this when switching back to a normal release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.version 0.120
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> description PolicyKit is an application-level toolkit for defining and \
handling the policy that allows unprivileged processes to \
speak to privileged processes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,26 +22,20 @@ maintainers {devans @dbevans} openmaintainer
</span> categories security
platforms darwin
license LGPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://gitlab.freedesktop.org/polkit/polkit/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://www.freedesktop.org/software/polkit/releases/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname polkit-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2cbf1170514cd2d4c2bac82927bc2669990b28e1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1548311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 aacbf7bbbed524ef29fa6e2de1426c1f43591a3b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 276ab3b82ab2c8584d4dca758ea6f6f4b4896575b218395d2a0dc1ae30b234d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 733472
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk-doc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:docbook-xsl-nons \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:docbook-xml-4.5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:docbook-xml-4.1.2
</span>
depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mozjs60
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:duktape
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,51 +47,28 @@ pre-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-getgrouplist-args.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# use same blacklisting as mozjs60
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# mozjs60 requires C++14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *gcc-3.* *gcc-4.* {clang < 700}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INTLTOOL_PERL=${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -std=c++14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src__polkitbackend__meson.build-define-darwin-c-source.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-authfw=pam \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pam-prefix=/etc/pam.d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pam-module-dir=/usr/lib/pam \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-polkitd-user=polkitd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-systemd=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-libelogind=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-test \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-man-pages \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_prog_AWK=/usr/bin/awk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Dpolkitd_user=polkitd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dauthfw=pam \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpam_module_dir=/usr/lib/pam \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpam_prefix=/etc/pam.d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dman=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk_doc=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Djs_engine=duktape
</span>
destroot.keepdirs ${destroot}${prefix}/etc/polkit-1/localauthority \
${destroot}${prefix}/var/lib/polkit-1
variant docs description {Build API docs using gtk-doc} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-gtk-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk_doc=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk_doc=true
</span> depends_build-append port:gtk-doc
}
add_users polkitd group=polkitd realname=Policy\ Kit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporarily disable livecheck until a new stable version is availble
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see comments above
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# livecheck.url https://gitlab.freedesktop.org/polkit/polkit/-/tags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# livecheck.regex "polkit-(\\d+(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://gitlab.freedesktop.org/polkit/polkit/-/tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "polkit-(\\d+(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/policykit/files/autogen.sh b/security/policykit/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dabc79d4ef0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/policykit/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,123 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Run this to generate all the initial makefiles, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-srcdir=`dirname $0`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -z "$srcdir" && srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-DIE=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(test -f $srcdir/configure.ac) || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "**Error**: Directory $srcdir does not look like the"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " top-level package directory"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-olddir=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd "$srcdir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-touch ChangeLog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have autoconf installed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (glibtoolize --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have libtool installed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must have gtk-doc installed to compile $PROJECT."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Install the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(automake --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have automake installed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_AUTOMAKE=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if no automake, don't bother testing for aclocal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: Missing aclocal. The version of automake"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "installed doesn't appear recent enough."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if no automake, don't bother testing for autoreconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have autoreconf installed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You can get autoreconf from ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test "$DIE" -eq 1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -z "$*"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Warning**: I am going to run configure with no arguments."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "If you wish to pass any to it, please specify them on the"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $0 " command line."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-case $CC in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xlc )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am_opt=--include-deps;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aclocalinclude="$ACLOCAL_FLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running autoreconf on test/mocklibc ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (cd "test/mocklibc"; autoreconf --install)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$NO_LIBTOOLIZE" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running glibtoolize..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glibtoolize --force --copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running aclocal $aclocalinclude ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aclocal $aclocalinclude
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running autoheader..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoheader
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running automake --gnu -Wno-portability $am_opt ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- automake --add-missing --gnu -Wno-portability $am_opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running autoconf ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-intltoolize --copy --force --automake || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd "$olddir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conf_flags=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test x$NOCONFIGURE = x; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running $srcdir/configure $conf_flags $@ ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $srcdir/configure $conf_flags "$@" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && echo "Now type make to compile." || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Skipping configure process."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/policykit/files/patch-fix-getgrouplist-args.diff b/security/policykit/files/patch-fix-getgrouplist-args.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6db7c1566a7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/policykit/files/patch-fix-getgrouplist-args.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/polkitbackend/polkitbackendjsauthority.cpp.orig 2018-08-24 15:56:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/polkitbackend/polkitbackendjsauthority.cpp 2018-08-24 15:58:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -812,7 +812,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (getgrouplist (passwd->pw_name,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- passwd->pw_gid,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gids,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (int *) gids,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &num_gids) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_warning ("Error looking up groups for uid %d: %m", (gint) uid);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/policykit/files/patch-src__polkitbackend__meson.build-define-darwin-c-source.diff b/security/policykit/files/patch-src__polkitbackend__meson.build-define-darwin-c-source.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bf9bf33432b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/policykit/files/patch-src__polkitbackend__meson.build-define-darwin-c-source.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+polkitbackend: Fix compilation on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Some functions from netdb.h are only defined on macOS when either
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+_POSIX_C_SOURCE is not defined, or _DARWIN_C_SOURCE is defined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Compiling with _XOPEN_SOURCE automatically defines _POSIX_C_SOURCE on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macOS, which hides these files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -D_DARWIN_C_SOURCE=1 to the compiler flags to make these functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+available and fix the compilation issue on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Staus: Pending
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/polkitbackend/meson.build 2022-01-27 17:49:49.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/polkitbackend/meson.build.orig 2022-01-27 17:49:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-DPACKAGE_SYSCONF_DIR="@0@"'.format(pk_prefix / pk_sysconfdir),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-D_XOPEN_SOURCE=700',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-D_GNU_SOURCE=1',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-D_DARWIN_C_SOURCE=1',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if js_engine == 'duktape'
</span></pre><pre style='margin:0'>
</pre>