From owner-dev-commits-ports-all@freebsd.org Sat Jun 26 15:17:52 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1231F654CF0; Sat, 26 Jun 2021 15:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GByDH6vtKz4rCP; Sat, 26 Jun 2021 15:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D161F21060; Sat, 26 Jun 2021 15:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15QFHpE6041669; Sat, 26 Jun 2021 15:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15QFHpvN041668; Sat, 26 Jun 2021 15:17:51 GMT (envelope-from git) Date: Sat, 26 Jun 2021 15:17:51 GMT Message-Id: <202106261517.15QFHpvN041668@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: ba6b6059f6d7 - main - sysutils/polkit: Update to 0.119 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba6b6059f6d7f2801e5a46a12464f9a8c7180528 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jun 2021 15:17:52 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba6b6059f6d7f2801e5a46a12464f9a8c7180528 commit ba6b6059f6d7f2801e5a46a12464f9a8c7180528 Author: Tobias C. Berner AuthorDate: 2021-06-26 15:10:39 +0000 Commit: Tobias C. Berner CommitDate: 2021-06-26 15:17:47 +0000 sysutils/polkit: Update to 0.119 PR: 256405 Reported by: Olivier Duchateau Security: CVE-2021-3560 --- sysutils/polkit/Makefile | 48 +++++++++++++--------------- sysutils/polkit/distinfo | 6 ++-- sysutils/polkit/files/patch-data_meson.build | 11 +++++++ sysutils/polkit/files/patch-meson.build | 27 ++++++++++++++++ 4 files changed, 63 insertions(+), 29 deletions(-) diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile index 63e3b049861a..79b211fd069a 100644 --- a/sysutils/polkit/Makefile +++ b/sysutils/polkit/Makefile @@ -1,7 +1,7 @@ # Created by: Koop Mast PORTNAME= polkit -PORTVERSION= 0.118 +PORTVERSION= 0.119 CATEGORIES= sysutils gnome MASTER_SITES= https://www.freedesktop.org/software/polkit/releases/ @@ -12,40 +12,37 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 \ + libdbus-1.so:devel/dbus \ libmozjs-78.so:lang/spidermonkey78 -RUN_DEPENDS= dbus-launch:devel/dbus USERS= polkitd GROUPS= polkitd -USES= compiler:c++11-lib gettext gmake gnome libtool localbase \ +USES= compiler:c++11-lib gettext gnome libtool localbase meson \ pathfix pkgconfig shebangfix USE_GNOME= glib20 intltool introspection:build SHEBANG_FILES= ${WRKSRC}/src/polkitbackend/toarray.pl -GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-gtk-doc-html \ - --without-html-dir \ - --with-authfw=pam \ - --with-pam-include=system \ - --with-os-type=freebsd \ - --with-polkitd-user=${USERS} \ - --disable-static \ - --disable-examples \ - --enable-libsystemd-login=no \ - --enable-libelogind=no \ - --disable-test \ - --enable-introspection=yes \ - --localstatedir=/var -#MAKE_JOBS_UNSAFE=yes + +MESON_ARGS= -Dpam_include=system \ + -Dpolkitd_user=${USERS} \ + -Dexamples=false \ + -Dsession_tracking=ConsoleKit \ + -Dtests=false \ + -Dintrospection=true \ + -Dlocalstatedir=/var \ + -Dgtk_doc=false + INSTALL_TARGET= install-strip -OPTIONS_DEFINE= MANPAGES +OPTIONS_DEFINE= MANPAGES + MANPAGES_BUILD_DEPENDS= docbook-sgml>=4.5:textproc/docbook-sgml \ - docbook-xsl>=1.76:textproc/docbook-xsl -MANPAGES_USE= gnome=libxslt:build -MANPAGES_CONFIGURE_ENABLE= man-pages -OPTIONS_SUB= yes + docbook-xsl>=1.76:textproc/docbook-xsl +MANPAGES_USE= gnome=libxslt:build +MANPAGES_MESON_TRUE= man + +OPTIONS_SUB= yes .include @@ -57,9 +54,8 @@ post-patch: ${WRKSRC}/docs/man/polkit.xml post-install: - @${MKDIR} ${STAGEDIR}/var/lib/polkit-1 - ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \ - ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.sample + @${MKDIR} ${STAGEDIR}/var/lib/polkit-1 \ + ${STAGEDIR}${PREFIX}/share/polkit-1/rules.d .for i in 10-vendor.d 20-org.d 30-site.d 50-local.d 90-mandatory.d ${MKDIR} ${STAGEDIR}${PREFIX}/etc/polkit-1/localauthority/${i} ${MKDIR} ${STAGEDIR}/var/lib/polkit-1/localauthority/${i} diff --git a/sysutils/polkit/distinfo b/sysutils/polkit/distinfo index 586334d1f1a9..f547c6c76b7a 100644 --- a/sysutils/polkit/distinfo +++ b/sysutils/polkit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1600104913 -SHA256 (polkit-0.118.tar.gz) = 6d54e984e7072339f0d3147179e16e34e5fe0705158f259a765d772dcf78956b -SIZE (polkit-0.118.tar.gz) = 1556765 +TIMESTAMP = 1622741145 +SHA256 (polkit-0.119.tar.gz) = c8579fdb86e94295404211285fee0722ad04893f0213e571bd75c00972fd1f5c +SIZE (polkit-0.119.tar.gz) = 1387409 diff --git a/sysutils/polkit/files/patch-data_meson.build b/sysutils/polkit/files/patch-data_meson.build new file mode 100644 index 000000000000..670a51747913 --- /dev/null +++ b/sysutils/polkit/files/patch-data_meson.build @@ -0,0 +1,11 @@ +--- data/meson.build.orig 2021-01-05 14:42:11 UTC ++++ data/meson.build +@@ -10,7 +10,7 @@ configure_file( + + configure_file( + input: 'org.freedesktop.PolicyKit1.conf.in', +- output: '@BASENAME@', ++ output: '@BASENAME@.sample', + configuration: {'polkitd_user': polkitd_user}, + install: true, + install_dir: dbus_policydir, diff --git a/sysutils/polkit/files/patch-meson.build b/sysutils/polkit/files/patch-meson.build new file mode 100644 index 000000000000..85ae0d3db603 --- /dev/null +++ b/sysutils/polkit/files/patch-meson.build @@ -0,0 +1,27 @@ +--- meson.build.orig 2021-06-03 13:56:35 UTC ++++ meson.build +@@ -129,7 +129,7 @@ assert(cc.has_function('XML_ParserCreate', dependencie + mozjs_dep = dependency('mozjs-78') + + dbus_dep = dependency('dbus-1') +-dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir]) #changed from sysconfdir with respect to commit#8eada3836465838 ++dbus_confdir = dbus_dep.get_pkgconfig_variable('sysconfdir', define_variable: ['sysconfdir', pk_prefix / 'etc']) #changed from sysconfdir with respect to commit#8eada3836465838 + dbus_policydir = dbus_confdir / 'dbus-1/system.d' + dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) + +@@ -318,15 +318,6 @@ endif + configure_file( + output: 'config.h', + configuration: config_h, +-) +- +-meson.add_install_script( +- 'meson_post_install.py', +- get_option('bindir'), +- pk_pkgdatadir, +- pk_pkglibdir, +- pk_pkgsysconfdir, +- polkitd_user, + ) + + output = '\n ' + meson.project_name() + ' ' + meson.project_version() + '\n'