community/polkit-elogind: upgrade to 0.118

2 files changed, 16 insertions, 29 deletions

diff --git a/community/polkit-elogind/APKBUILD b/community/polkit-elogind/APKBUILD
index 3e26a42f905..a7a4e4d39f3 100644
--- a/community/polkit-elogind/APKBUILD
+++ b/community/polkit-elogind/APKBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=polkit-elogind
-pkgver=0.116
-pkgrel=2
+pkgver=0.118
+pkgrel=0
 pkgdesc="Application development toolkit for controlling system-wide privileges (elogind variant)"
 url="https://www.freedesktop.org/wiki/Software/polkit/"
-arch="all"
+arch="all !mips !mips64 !s390x" # Rust
 license="GPL-2.0-or-later"
 options="suid !check"
 depends_dev="dbus-glib-dev"
 makedepends="$depends_dev expat-dev glib-dev gtk-doc gobject-introspection-dev
-	intltool autoconf automake libtool bash mozjs60-dev elogind-dev linux-pam-dev"
+	intltool autoconf automake libtool bash mozjs78-dev elogind-dev linux-pam-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc"
 source="https://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.gz
 	make-innetgr-optional.patch
@@ -76,7 +76,7 @@ dev() {
 	default_dev
 }
 
-sha512sums="b66b01cc2bb4349de70147f41f161f0f6f41e7230b581dfb054058b48969ec57041ab05b51787c749ccfc36aa5f317952d7e7ba337b4f6f6c0a923ed5866c2d5  polkit-0.116.tar.gz
-05a4fa21a42237a68d40f581d70a84937ba94f703e5342f37a59cca171ed5446acf7ae83fd5b05a3a92600ad38ad74d0c735a20f1b932750f91c0988ba900f60  make-innetgr-optional.patch
+sha512sums="3d412f40c903cfaf68530f9c0cb616106f8edf43bec6805de129f8bb9cb4e64c98da6bf02caa3ef5619974f3e2df7a70564f08b92901662453477e9005752b4e  polkit-0.118.tar.gz
+0c47751e928a91ce3a477a330ef38b8f6f003b515c94e7fb9842e6f2043be43d749ab7390cc1dbcf1fa6128b62cf0eab353d4f8855d68e595bc53777512f4562  make-innetgr-optional.patch
 f5102dc00d390b3a3c957b62e1712db778c7ffb7378f3d8e816c0757c11a308c5d5303e42595b0d6add9839247c773880cd34e56afacc89eb6efaadf9aae7826  alpine-polkit.pam
 f6e5ac0ed41feb392dfd104979ec577c5936f3db2bd252b12b7b9b2609a0901dae38bebec1ea65ccf4f427860b520383ae4d2c66fb74ab986c715f6b0ad50473  polkit.initd"
diff --git a/community/polkit-elogind/make-innetgr-optional.patch b/community/polkit-elogind/make-innetgr-optional.patch
index 36eabbbd7b5..8459c670ba5 100644
--- a/community/polkit-elogind/make-innetgr-optional.patch
+++ b/community/polkit-elogind/make-innetgr-optional.patch
@@ -19,21 +19,11 @@ Closes polkit/polkit#14.
 
 Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
 ---
- configure.ac                                     |  2 +-
- src/polkit/polkitidentity.c                      | 16 ++++++++++++++++
- src/polkit/polkitunixnetgroup.c                  |  3 +++
- .../polkitbackendinteractiveauthority.c          | 14 ++++++++------
- src/polkitbackend/polkitbackendjsauthority.cpp   |  2 ++
- test/polkit/polkitidentitytest.c                 |  9 ++++++++-
- test/polkit/polkitunixnetgrouptest.c             |  3 +++
- .../test-polkitbackendjsauthority.c              |  2 ++
- 8 files changed, 43 insertions(+), 8 deletions(-)
-
 diff --git a/configure.ac b/configure.ac
-index 5cedb4e..87aa0ad 100644
+index 4ac2219..ca478df 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"],
+@@ -100,7 +100,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"],
  	     [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
  AC_SUBST(EXPAT_LIBS)
  
@@ -144,10 +134,10 @@ index 056d9a8..36c2f3d 100644
  }
  
 diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp
-index 9b752d1..09b2878 100644
+index ca17108..da95180 100644
 --- a/src/polkitbackend/polkitbackendjsauthority.cpp
 +++ b/src/polkitbackend/polkitbackendjsauthority.cpp
-@@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext  *cx,
+@@ -1520,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext  *cx,
  
    JS::CallArgs args = JS::CallArgsFromVp (argc, vp);
  
@@ -155,11 +145,11 @@ index 9b752d1..09b2878 100644
    JS::RootedString usrstr (authority->priv->cx);
    usrstr = args[0].toString();
    user = JS_EncodeStringToUTF8 (cx, usrstr);
-@@ -1519,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext  *cx,
- 
-   JS_free (cx, netgroup);
-   JS_free (cx, user);
-+#endif
+@@ -1534,6 +1535,7 @@ js_polkit_user_is_in_netgroup (JSContext  *cx,
+     {
+       is_in_netgroup =  true;
+     }
++ #endif
  
    ret = true;
  
@@ -229,7 +219,7 @@ index 3701ba1..e3352eb 100644
    return g_test_run ();
  }
 diff --git a/test/polkitbackend/test-polkitbackendjsauthority.c b/test/polkitbackend/test-polkitbackendjsauthority.c
-index 71aad23..fdd28f3 100644
+index f97e0e0..fc52149 100644
 --- a/test/polkitbackend/test-polkitbackendjsauthority.c
 +++ b/test/polkitbackend/test-polkitbackendjsauthority.c
 @@ -137,12 +137,14 @@ test_get_admin_identities (void)
@@ -247,6 +237,3 @@ index 71aad23..fdd28f3 100644
    };
    guint n;
  
--- 
-2.18.1
-