From 2f6abf8810f3584cfa467fc532c205eb7bb47184 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 3 Jun 2021 14:43:07 +0000 Subject: polkit: update to 0.119. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix some pkglint, including renaming a patch to match the file it applies to. This is polkit 0.119. Highlights: meson build system added CVE-2021-3560 mitigation Build requirements glib, gobject, gio >= 2.32 mozjs-78 gobject-introspection >= 0.6.2 (optional) pam (optional) ConsoleKit OR systemd Changes since polkit 0.118: Inigo Martinez: meson build system added alongside autotools (many thanks!!) Matthias Classen: properties in text listener René Genz: typos fixups Balázs Úr: Update Hungarian translation Hendrik Werner: meson post-install script mod to avoid calling external processes Kevin Backhouse, Jan Rybar: CVE-2021-3560 mitigation Many thanks to all contributors! Jan Rybar et al., June 3, 2021 --- security/polkit/Makefile | 7 ++--- security/polkit/PLIST | 4 +-- security/polkit/buildlink3.mk | 7 +++-- security/polkit/distinfo | 12 ++++----- .../polkit/patches/patch-test_mocklib_src_netdb.c | 30 ---------------------- .../polkit/patches/patch-test_mocklibc_src_netdb.c | 30 ++++++++++++++++++++++ 6 files changed, 43 insertions(+), 47 deletions(-) delete mode 100644 security/polkit/patches/patch-test_mocklib_src_netdb.c create mode 100644 security/polkit/patches/patch-test_mocklibc_src_netdb.c (limited to 'security') diff --git a/security/polkit/Makefile b/security/polkit/Makefile index 4651e5ceccb..5c22ad01de7 100644 --- a/security/polkit/Makefile +++ b/security/polkit/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.33 2021/05/24 19:54:06 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2021/06/03 14:43:07 wiz Exp $ -DISTNAME= polkit-0.118 -PKGREVISION= 3 +DISTNAME= polkit-0.119 CATEGORIES= security MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/ @@ -59,8 +58,6 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/system.d SPECIAL_PERMS+= lib/polkit-1/polkit-agent-helper-1 ${SETUID_ROOT_PERMS} SPECIAL_PERMS+= bin/pkexec ${SETUID_ROOT_PERMS} -CONF_FILES+= ${PREFIX}/share/examples/polkit/dbus-1/system.d/org.freedesktop.PolicyKit1.conf \ - ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf CONF_FILES+= ${PREFIX}/share/examples/polkit/polkit-1/rules.d/50-default.rules \ ${PKG_SYSCONFDIR}/polkit-1/rules.d/50-default.rules diff --git a/security/polkit/PLIST b/security/polkit/PLIST index 6e01916ce44..1f4e9dc93bf 100644 --- a/security/polkit/PLIST +++ b/security/polkit/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2020/11/20 17:59:18 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2021/06/03 14:43:07 wiz Exp $ bin/pk-example-frobnicate bin/pkaction bin/pkcheck @@ -47,8 +47,8 @@ man/man1/pkttyagent.1 man/man8/polkit.8 man/man8/polkitd.8 share/dbus-1/system-services/org.freedesktop.PolicyKit1.service +share/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ${PLIST.pam}share/examples/pam.d/polkit-1 -share/examples/polkit/dbus-1/system.d/org.freedesktop.PolicyKit1.conf share/examples/polkit/polkit-1/rules.d/50-default.rules share/gettext/its/polkit.its share/gettext/its/polkit.loc diff --git a/security/polkit/buildlink3.mk b/security/polkit/buildlink3.mk index ddbd26391ea..65dd848bfe9 100644 --- a/security/polkit/buildlink3.mk +++ b/security/polkit/buildlink3.mk @@ -1,14 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2021/01/19 22:36:19 nia Exp $ -# +# $NetBSD: buildlink3.mk,v 1.6 2021/06/03 14:43:07 wiz Exp $ BUILDLINK_TREE+= polkit .if !defined(POLKIT_BUILDLINK3_MK) +POLKIT_BUILDLINK3_MK:= + # configure: error: *** A compiler with support for C++17 language features is required. GCC_REQD+= 7 -POLKIT_BUILDLINK3_MK:= - BUILDLINK_API_DEPENDS.polkit+= polkit>=0.103 BUILDLINK_ABI_DEPENDS.polkit?= polkit>=0.118nb1 BUILDLINK_PKGSRCDIR.polkit?= ../../security/polkit diff --git a/security/polkit/distinfo b/security/polkit/distinfo index 1ed73206ab4..575f036ce2e 100644 --- a/security/polkit/distinfo +++ b/security/polkit/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.11 2020/11/20 17:59:18 wiz Exp $ +$NetBSD: distinfo,v 1.12 2021/06/03 14:43:07 wiz Exp $ -SHA1 (polkit-0.118.tar.gz) = 1c53d0ccacc6e6afd49ba14cb39d2514b943933d -RMD160 (polkit-0.118.tar.gz) = 9f849f0952574a239f1dce464e9c1a95c5181bbe -SHA512 (polkit-0.118.tar.gz) = 3d412f40c903cfaf68530f9c0cb616106f8edf43bec6805de129f8bb9cb4e64c98da6bf02caa3ef5619974f3e2df7a70564f08b92901662453477e9005752b4e -Size (polkit-0.118.tar.gz) = 1556765 bytes +SHA1 (polkit-0.119.tar.gz) = 0794825e31a0a6e4859f93596d3f475b9d08f9e1 +RMD160 (polkit-0.119.tar.gz) = 52d66bd2b80e3a1ca52495fd09e307adbd2360a0 +SHA512 (polkit-0.119.tar.gz) = 0260fb15da1c4c1f429e8223260981e64e297f1be8ced42f6910f09ea6581b8205aca06c9c601eb4a128acba2f468de0223118f96862ba769f95721894cf1578 +Size (polkit-0.119.tar.gz) = 1387409 bytes SHA1 (patch-src_polkit_polkitunixprocess.c) = 88818b7b64502f64eade34ad379c07f2b0fd1aea SHA1 (patch-src_polkitbackend_polkitbackendinteractiveauthority.c) = dd91b4e74e6c39f24e0f5a9b3150fdac12899cb5 SHA1 (patch-src_polkitbackend_polkitbackendjsauthority.cpp) = 432a3d7d082ba6e596ba164d91408fc521b84422 SHA1 (patch-src_polkitbackend_polkitd.c) = b8e11b40e2b171d4f030eb4c4cbc6fdc7a96b2c2 SHA1 (patch-src_programs_pkexec.c) = bfc0414c7a943c8e8b8412566a2519198eab8abd SHA1 (patch-src_programs_pkttyagent.c) = 2c249b61501a1ad2c077bc83fd497e45f2db69a8 -SHA1 (patch-test_mocklib_src_netdb.c) = 0fe71068a6261d5e2c8874f2b4507e7e3c002526 SHA1 (patch-test_mocklibc_src_grp.c) = 435ff94fd4c7f5511d74d03839fad453dd841633 +SHA1 (patch-test_mocklibc_src_netdb.c) = 0fe71068a6261d5e2c8874f2b4507e7e3c002526 SHA1 (patch-test_mocklibc_src_pwd.c) = c65b02209db1bd1d531444026822fcca73d5027a diff --git a/security/polkit/patches/patch-test_mocklib_src_netdb.c b/security/polkit/patches/patch-test_mocklib_src_netdb.c deleted file mode 100644 index 3277a2edb1a..00000000000 --- a/security/polkit/patches/patch-test_mocklib_src_netdb.c +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-test_mocklib_src_netdb.c,v 1.3 2016/12/03 01:58:50 marino Exp $ - -Darwin has setnetgrent. -SunOS has endnetgrent. - ---- test/mocklibc/src/netdb.c.orig 2014-01-14 22:42:25.000000000 +0000 -+++ test/mocklibc/src/netdb.c -@@ -36,6 +36,7 @@ static struct netgroup_iter global_iter; - - // REMEMBER: 1 means success, 0 means failure for netgroup methods - -+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) - int setnetgrent(const char *netgroup) { - if (!global_netgroup_head) - global_netgroup_head = netgroup_parse_all(); -@@ -50,11 +51,14 @@ int setnetgrent(const char *netgroup) { - netgroup_iter_init(&global_iter, group); - return 1; - } -+#endif - -+#ifndef __sun__ - void endnetgrent(void) { - netgroup_free_all(global_netgroup_head); - global_netgroup_head = NULL; - } -+#endif - - int getnetgrent(char **host, char **user, char **domain) { - if (!global_netgroup_head) diff --git a/security/polkit/patches/patch-test_mocklibc_src_netdb.c b/security/polkit/patches/patch-test_mocklibc_src_netdb.c new file mode 100644 index 00000000000..5d3307fb768 --- /dev/null +++ b/security/polkit/patches/patch-test_mocklibc_src_netdb.c @@ -0,0 +1,30 @@ +$NetBSD: patch-test_mocklibc_src_netdb.c,v 1.1 2021/06/03 14:43:07 wiz Exp $ + +Darwin has setnetgrent. +SunOS has endnetgrent. + +--- test/mocklibc/src/netdb.c.orig 2014-01-14 22:42:25.000000000 +0000 ++++ test/mocklibc/src/netdb.c +@@ -36,6 +36,7 @@ static struct netgroup_iter global_iter; + + // REMEMBER: 1 means success, 0 means failure for netgroup methods + ++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) + int setnetgrent(const char *netgroup) { + if (!global_netgroup_head) + global_netgroup_head = netgroup_parse_all(); +@@ -50,11 +51,14 @@ int setnetgrent(const char *netgroup) { + netgroup_iter_init(&global_iter, group); + return 1; + } ++#endif + ++#ifndef __sun__ + void endnetgrent(void) { + netgroup_free_all(global_netgroup_head); + global_netgroup_head = NULL; + } ++#endif + + int getnetgrent(char **host, char **user, char **domain) { + if (!global_netgroup_head) -- cgit v1.2.3