From nobody Sat Jun 25 20:47:03 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AD1C687359F; Sat, 25 Jun 2022 20:47:03 +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 4LVmJ74Qvjz3qdd; Sat, 25 Jun 2022 20:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656190023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f+FfPhZFF+F4J5ExCpfYwpM4qRCJjowidKF7LUKcOk4=; b=mmnF89Mg7RwEvF1OgR3B09+kmj7Cw2C4RDggCFYXCphlY/jxLfqUxvLN2EUwbjoOBC6/iz w+sUt2T2Ra58qe9iAlgXe2p25QvQ1PB8Gqz48CvG2l4L1FkiP6gPQywRxh3wThnAjmiuAK 46zwwlRD2bTvEVziq0kwX3pPS6icUVZt1K0OfuW7Z3o+I0E0nCgvy80U6MoG3IvbXVA9j/ /B2ylZYSNR1EK5N9DP0Q9eaq6tfIEsLXU+51XmAmU9sxbw5CMK1muBQoAUC644gsJssXon V24hmjE6CB/2+rr+1YKcXKwSUiSLXvNQf4YopTjcXqsUwkLGoSTd1RQgeAC+nw== 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 77BAA3A5C; Sat, 25 Jun 2022 20:47:03 +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 25PKl3kW040072; Sat, 25 Jun 2022 20:47:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25PKl3gp040071; Sat, 25 Jun 2022 20:47:03 GMT (envelope-from git) Date: Sat, 25 Jun 2022 20:47:03 GMT Message-Id: <202206252047.25PKl3gp040071@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 2ddcf036d4ab - main - sysutils/polkit: use spidermonkey 91 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ddcf036d4ab747c9e82d15ccde39112fd1e15ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656190023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f+FfPhZFF+F4J5ExCpfYwpM4qRCJjowidKF7LUKcOk4=; b=Zmjrm9JNDwjQlkwgsCCu2l8ddHMIOG6NrSU9Lp0YBdlOz/0f6VFNhox09yqnkXDbZI/HCh 6iNJvUfNuLzk8yxyqlmJW6SM8Qf2AEzjIGOqQjrbl82B/C79IX5CxndTlQ4RXR6oGKK+mf DQ3n/ua1MkbeE3mms4pMSYrJSC2kKiOpO5R81FRxZD3feNytq2PgPqzce+XTIP2prodEVd V1cMX/yI95hqHSeKpLG8qXDy1UV1WS3/Sp1rOU8K/ynVaV/5uvD8fz8xHU8XPvR42rElE0 oYyU/RiBST0nm8L8+5/T895TJljh1gual2zTHURRiYi+0wZVpjsQFCsWULj3uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656190023; a=rsa-sha256; cv=none; b=qKNz4oKjd1tRX+XoijaHqufgLmyU5YZIhBaiHPudddKbzQJeEpNgkAL3sOxMisoONYIrb0 cuHKhyuA2psuEj1JCw/0ZZZ3v/xn6j4y+kUVecvQeb2u5YrwrTGJaWcP4bdycUMO6eBNIY WtOiWC6G25NGeftOHPtNtCkEDUo8DWps+aj90keNPHmqqSS9G9PunkAVGp7o6LadvNPk3b u9bI4HZklEji377Z1e6RdvAP5BMkIuc6Sx2SI3pmrCR3izfEZb/Og2Fkgs7YZBJAlVgfP/ NjzBTcWEhJJ5gTjm4KAg/k5gMYF9nD3kBR8UMbfWBS+lHnl+b0Ud3/4lh33keg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ddcf036d4ab747c9e82d15ccde39112fd1e15ae commit 2ddcf036d4ab747c9e82d15ccde39112fd1e15ae Author: Baptiste Daroussin AuthorDate: 2022-06-25 20:44:00 +0000 Commit: Baptiste Daroussin CommitDate: 2022-06-25 20:47:02 +0000 sysutils/polkit: use spidermonkey 91 Incorporate a patch from upstream which allows to move from spidermonkey 78 to spidermonkey91 --- sysutils/polkit/Makefile | 4 +-- sysutils/polkit/distinfo | 2 +- sysutils/polkit/files/patch-meson.build | 10 +++++-- ...-src_polkitbackend_polkitbackendjsauthority.cpp | 33 ++++++++++++++++++++++ 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile index 839b08d29502..c6485734f0e7 100644 --- a/sysutils/polkit/Makefile +++ b/sysutils/polkit/Makefile @@ -2,7 +2,7 @@ PORTNAME= polkit PORTVERSION= 0.120 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= https://www.freedesktop.org/software/polkit/releases/ @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 \ libdbus-1.so:devel/dbus \ - libmozjs-78.so:lang/spidermonkey78 + libmozjs-91.so:lang/spidermonkey91 USERS= polkitd GROUPS= polkitd diff --git a/sysutils/polkit/distinfo b/sysutils/polkit/distinfo index a0a990aa819b..839b6c439a75 100644 --- a/sysutils/polkit/distinfo +++ b/sysutils/polkit/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1643152765 +TIMESTAMP = 1656189343 SHA256 (polkit-0.120.tar.gz) = ee7a599a853117bf273548725719fa92fabd2f136915c7a4906cee98567aee03 SIZE (polkit-0.120.tar.gz) = 1626659 SHA256 (e7f3d9e8341d.patch) = 9a84b59d38b3f86c70c5fc3a28cbfe8d7a22cf190eb20ff433f7f53f5ff73a9a diff --git a/sysutils/polkit/files/patch-meson.build b/sysutils/polkit/files/patch-meson.build index 440dce3e8fdd..260fe5aafd82 100644 --- a/sysutils/polkit/files/patch-meson.build +++ b/sysutils/polkit/files/patch-meson.build @@ -1,7 +1,11 @@ --- meson.build.orig 2021-09-29 19:16:29 UTC +++ meson.build -@@ -136,7 +136,7 @@ assert(cc.has_function('XML_ParserCreate', dependencie - mozjs_dep = dependency('mozjs-78') +@@ -133,10 +133,10 @@ assert(cc.has_function('XML_ParserCreate', dependencie + assert(cc.has_header('expat.h', dependencies: expat_dep), 'Can\'t find expat.h. Please install expat.') + assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t find expat library. Please install expat.') + +-mozjs_dep = dependency('mozjs-78') ++mozjs_dep = dependency('mozjs-91') dbus_dep = dependency('dbus-1', required: false) -dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' @@ -9,7 +13,7 @@ if dbus_dep.found() dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) else -@@ -329,15 +329,6 @@ endif +@@ -329,15 +329,6 @@ configure_file( configure_file( output: 'config.h', configuration: config_h, diff --git a/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendjsauthority.cpp b/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendjsauthority.cpp new file mode 100644 index 000000000000..a8f47c895e8f --- /dev/null +++ b/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendjsauthority.cpp @@ -0,0 +1,33 @@ +--- src/polkitbackend/polkitbackendjsauthority.cpp.orig 2022-06-25 20:41:05 UTC ++++ src/polkitbackend/polkitbackendjsauthority.cpp +@@ -75,6 +75,13 @@ + + /* ---------------------------------------------------------------------------------------------------- */ + ++static class JsInitHelperType ++{ ++public: ++ JsInitHelperType() { JS_Init(); } ++ ~JsInitHelperType() { JS_ShutDown(); } ++} JsInitHelper; ++ + struct _PolkitBackendJsAuthorityPrivate + { + gchar **rules_dirs; +@@ -589,7 +596,6 @@ polkit_backend_js_authority_finalize (GObject *object) + delete authority->priv->js_polkit; + + JS_DestroyContext (authority->priv->cx); +- /* JS_ShutDown (); */ + + G_OBJECT_CLASS (polkit_backend_js_authority_parent_class)->finalize (object); + } +@@ -665,8 +671,6 @@ polkit_backend_js_authority_class_init (PolkitBackendJ + + + g_type_class_add_private (klass, sizeof (PolkitBackendJsAuthorityPrivate)); +- +- JS_Init (); + } + + /* ---------------------------------------------------------------------------------------------------- */