pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/security/polkit



Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan 15 08:41:39 UTC 2025

Modified Files:
        pkgsrc/security/polkit: Makefile PLIST distinfo
        pkgsrc/security/polkit/patches: patch-src_polkit_polkitunixprocess.c
            patch-src_polkitbackend_polkitbackendinteractiveauthority.c
            patch-src_polkitbackend_polkitd.c patch-src_programs_pkexec.c
            patch-src_programs_pkttyagent.c
Removed Files:
        pkgsrc/security/polkit/patches:
            patch-src_polkitbackend_polkitbackendjsauthority.cpp
            patch-test_mocklibc_src_grp.c patch-test_mocklibc_src_netdb.c
            patch-test_mocklibc_src_pwd.c

Log Message:
polkit: updated to 126

polkit 126

Highlights:
- many code fixes detected either by CI or the author himself (Frantisek Sumsal)
- shellcheck and dependabot integration (Jan Macku)
- search for rules in /usr/local/share rather than /usr/local/lib (Luca Boccassi)
- Implement LogControl1 protocol for dynamic log level changes (Luca Boccassi)
- read actions also from /etc/, /run/ and /usr/local/share/ (Luca Boccassi)
- mozjs dropped in favor of duktape (Xi Ruoyao)
- many other fixes in build system and polkit code (Many thanks to all the authors.)


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/security/polkit/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/polkit/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/polkit/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/security/polkit/patches/patch-src_polkit_polkitunixprocess.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority.c \
    pkgsrc/security/polkit/patches/patch-src_programs_pkttyagent.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority.cpp
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitd.c
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/security/polkit/patches/patch-src_programs_pkexec.c
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/security/polkit/patches/patch-test_mocklibc_src_grp.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/security/polkit/patches/patch-test_mocklibc_src_netdb.c
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/security/polkit/patches/patch-test_mocklibc_src_pwd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/polkit/Makefile
diff -u pkgsrc/security/polkit/Makefile:1.54 pkgsrc/security/polkit/Makefile:1.55
--- pkgsrc/security/polkit/Makefile:1.54        Tue Jul 18 18:44:16 2023
+++ pkgsrc/security/polkit/Makefile     Wed Jan 15 08:41:38 2025
@@ -1,27 +1,28 @@
-# $NetBSD: Makefile,v 1.54 2023/07/18 18:44:16 nia Exp $
+# $NetBSD: Makefile,v 1.55 2025/01/15 08:41:38 adam Exp $
 
-DISTNAME=      polkit-121
+DISTNAME=      polkit-126
 CATEGORIES=    security
-MASTER_SITES=  http://www.freedesktop.org/software/polkit/releases/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=polkit-org/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.freedesktop.org/wiki/Software/polkit
 COMMENT=       Authorization Manager
 LICENSE=       gnu-lgpl-v2
 
-TOOL_DEPENDS+=         gettext-m4-[0-9]*:../../devel/gettext-m4
-TOOL_DEPENDS+=         gettext-tools-[0-9]*:../../devel/gettext-tools
-TOOL_DEPENDS+=         libxslt-[0-9]*:../../textproc/libxslt
-TOOL_DEPENDS+=         docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
+TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
+TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 
 NOT_PAX_MPROTECT_SAFE= lib/polkit-1/polkitd
 
-WRKSRC=                        ${WRKDIR}/polkit-v.${PKGVERSION_NOREV}
+USE_CXX_FEATURES=      c++17
 USE_LANGUAGES=         c c++
-USE_CXX_FEATURES+=     c++17
 USE_TOOLS+=            msgfmt msgmerge pkg-config perl xgettext
 
-MESON_ARGS+=           -Dman=true
+MESON_ARGS+=   -Dman=true
+MESON_ARGS+=   -Dpam_prefix=${PKG_SYSCONFDIR}/pam.d
+MESON_ARGS+=   -Dsession_tracking=ConsoleKit
 
 PKGCONFIG_OVERRIDE+=   data/polkit-gobject-1.pc.in
 PKGCONFIG_OVERRIDE+=   data/polkit-agent-1.pc.in
@@ -54,8 +55,8 @@ MAKE_DIRS+=           ${PKG_SYSCONFDIR}/dbus-1/sy
 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/polkit-1/rules.d/50-default.rules \
-               ${PKG_SYSCONFDIR}/polkit-1/rules.d/50-default.rules
+#CONF_FILES+=  ${PREFIX}/share/examples/polkit/polkit-1/rules.d/50-default.rules \
+#              ${PKG_SYSCONFDIR}/polkit-1/rules.d/50-default.rules
 
 .include "options.mk"
 
@@ -65,9 +66,9 @@ SUBST_FILES.paths+=   docs/man/pkexec.xml
 SUBST_FILES.paths+=    src/examples/org.freedesktop.policykit.examples.pkexec.policy.in
 SUBST_SED.paths+=      -e 's,/usr/bin/,${PREFIX}/bin/,g'
 
-post-install:
-       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/polkit-1/rules.d/50-default.rules \
-               ${DESTDIR}${PREFIX}/share/examples/polkit/polkit-1/rules.d/50-default.rules
+#post-install:
+#      ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/polkit-1/rules.d/50-default.rules \
+#              ${DESTDIR}${PREFIX}/share/examples/polkit/polkit-1/rules.d/50-default.rules
 
 .include "../../devel/meson/build.mk"
 .include "../../lang/libduktape/buildlink3.mk"

Index: pkgsrc/security/polkit/PLIST
diff -u pkgsrc/security/polkit/PLIST:1.8 pkgsrc/security/polkit/PLIST:1.9
--- pkgsrc/security/polkit/PLIST:1.8    Wed Jun  7 15:36:40 2023
+++ pkgsrc/security/polkit/PLIST        Wed Jan 15 08:41:38 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2023/06/07 15:36:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2025/01/15 08:41:38 adam Exp $
 bin/pkaction
 bin/pkcheck
 bin/pkexec
@@ -52,7 +52,6 @@ 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/polkit-1/rules.d/50-default.rules
 share/gettext/its/polkit.its
 share/gettext/its/polkit.loc
 share/gir-1.0/Polkit-1.0.gir
@@ -60,17 +59,21 @@ share/gir-1.0/PolkitAgent-1.0.gir
 share/locale/cs/LC_MESSAGES/polkit-1.mo
 share/locale/da/LC_MESSAGES/polkit-1.mo
 share/locale/de/LC_MESSAGES/polkit-1.mo
+share/locale/hi/LC_MESSAGES/polkit-1.mo
 share/locale/hr/LC_MESSAGES/polkit-1.mo
 share/locale/hu/LC_MESSAGES/polkit-1.mo
 share/locale/id/LC_MESSAGES/polkit-1.mo
 share/locale/it/LC_MESSAGES/polkit-1.mo
+share/locale/ka/LC_MESSAGES/polkit-1.mo
 share/locale/nl/LC_MESSAGES/polkit-1.mo
 share/locale/nn/LC_MESSAGES/polkit-1.mo
 share/locale/pl/LC_MESSAGES/polkit-1.mo
 share/locale/pt/LC_MESSAGES/polkit-1.mo
 share/locale/pt_BR/LC_MESSAGES/polkit-1.mo
 share/locale/ro/LC_MESSAGES/polkit-1.mo
+share/locale/ru/LC_MESSAGES/polkit-1.mo
 share/locale/sk/LC_MESSAGES/polkit-1.mo
+share/locale/sl/LC_MESSAGES/polkit-1.mo
 share/locale/sv/LC_MESSAGES/polkit-1.mo
 share/locale/tr/LC_MESSAGES/polkit-1.mo
 share/locale/uk/LC_MESSAGES/polkit-1.mo

Index: pkgsrc/security/polkit/distinfo
diff -u pkgsrc/security/polkit/distinfo:1.19 pkgsrc/security/polkit/distinfo:1.20
--- pkgsrc/security/polkit/distinfo:1.19        Wed Jun  7 15:36:40 2023
+++ pkgsrc/security/polkit/distinfo     Wed Jan 15 08:41:38 2025
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.19 2023/06/07 15:36:40 wiz Exp $
+$NetBSD: distinfo,v 1.20 2025/01/15 08:41:38 adam Exp $
 
-BLAKE2s (polkit-121.tar.gz) = 6314805cdcb42137a3ccfbdc827b1e00054b227d45f6e07b7d9c7595805d5940
-SHA512 (polkit-121.tar.gz) = f565027b80f32833c558900b612e089ab25027da5bf9a90c421a292467d4db9a291f6dc9850c4bca8f9ee890d476fd064a643a5f7e28497661ba1e31d4227624
-Size (polkit-121.tar.gz) = 743287 bytes
-SHA1 (patch-src_polkit_polkitunixprocess.c) = 88818b7b64502f64eade34ad379c07f2b0fd1aea
-SHA1 (patch-src_polkitbackend_polkitbackendinteractiveauthority.c) = 0182d49ad112ea354678e40453388b266216e4de
-SHA1 (patch-src_polkitbackend_polkitbackendjsauthority.cpp) = 432a3d7d082ba6e596ba164d91408fc521b84422
-SHA1 (patch-src_polkitbackend_polkitd.c) = b8e11b40e2b171d4f030eb4c4cbc6fdc7a96b2c2
-SHA1 (patch-src_programs_pkexec.c) = 053123e3da0fe76dd3639b2a6235dfd37db710d8
-SHA1 (patch-src_programs_pkttyagent.c) = 2c249b61501a1ad2c077bc83fd497e45f2db69a8
-SHA1 (patch-test_mocklibc_src_grp.c) = 435ff94fd4c7f5511d74d03839fad453dd841633
-SHA1 (patch-test_mocklibc_src_netdb.c) = 0fe71068a6261d5e2c8874f2b4507e7e3c002526
-SHA1 (patch-test_mocklibc_src_pwd.c) = c65b02209db1bd1d531444026822fcca73d5027a
+BLAKE2s (polkit-126.tar.gz) = 57477b8715fb9f11c97af94e398f1bb3909444edbf460964707c314498aedb24
+SHA512 (polkit-126.tar.gz) = dbdbc31b7a231c963788b37cf1a138e30336466fb662225a812faaf58e45439925d9d39346cc8f07e54f22040c2f142435acb9fded315d33e24930e0abc736c7
+Size (polkit-126.tar.gz) = 456138 bytes
+SHA1 (patch-src_polkit_polkitunixprocess.c) = 1550f4d6ab915dafb3cf120f953b95755d22a099
+SHA1 (patch-src_polkitbackend_polkitbackendinteractiveauthority.c) = efb2cfa112c2eed8fe6ad00d4bddce07f84e816a
+SHA1 (patch-src_polkitbackend_polkitd.c) = 555624d414223b0198dfbf8e470a72da80b41d41
+SHA1 (patch-src_programs_pkexec.c) = e678105e73a4c034921aace21cb2cd4f901de51f
+SHA1 (patch-src_programs_pkttyagent.c) = f172e0bceeacddb77b2681886500b263ddd9d930

Index: pkgsrc/security/polkit/patches/patch-src_polkit_polkitunixprocess.c
diff -u pkgsrc/security/polkit/patches/patch-src_polkit_polkitunixprocess.c:1.6 pkgsrc/security/polkit/patches/patch-src_polkit_polkitunixprocess.c:1.7
--- pkgsrc/security/polkit/patches/patch-src_polkit_polkitunixprocess.c:1.6     Thu Aug 16 12:30:43 2018
+++ pkgsrc/security/polkit/patches/patch-src_polkit_polkitunixprocess.c Wed Jan 15 08:41:38 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_polkit_polkitunixprocess.c,v 1.6 2018/08/16 12:30:43 wiz Exp $
+$NetBSD: patch-src_polkit_polkitunixprocess.c,v 1.7 2025/01/15 08:41:38 adam Exp $
 
 Fix SunOS includes.
 Fix pid_t type.
 
---- src/polkit/polkitunixprocess.c.orig        2018-06-25 13:55:45.000000000 +0000
+--- src/polkit/polkitunixprocess.c.orig        2024-08-08 13:12:35.000000000 +0000
 +++ src/polkit/polkitunixprocess.c
-@@ -24,6 +24,11 @@
- #endif
+@@ -20,6 +20,11 @@
+  */
  
  #include <sys/types.h>
 +#ifdef HAVE_SOLARIS
@@ -17,7 +17,7 @@ Fix pid_t type.
  #ifdef HAVE_FREEBSD
  #include <sys/param.h>
  #include <sys/sysctl.h>
-@@ -95,7 +100,7 @@ enum
+@@ -175,7 +180,7 @@ enum
  
  static void subject_iface_init (PolkitSubjectIface *subject_iface);
  

Index: pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority.c
diff -u pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority.c:1.3 pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority.c:1.4
--- pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority.c:1.3      Wed Jun  7 15:36:40 2023
+++ pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority.c  Wed Jan 15 08:41:38 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_polkitbackend_polkitbackendinteractiveauthority.c,v 1.3 2023/06/07 15:36:40 wiz Exp $
+$NetBSD: patch-src_polkitbackend_polkitbackendinteractiveauthority.c,v 1.4 2025/01/15 08:41:38 adam Exp $
 
 * for *BSD netgroup functions
 
---- src/polkitbackend/polkitbackendinteractiveauthority.c.orig 2022-07-11 08:46:06.000000000 +0000
+--- src/polkitbackend/polkitbackendinteractiveauthority.c.orig 2024-08-08 13:12:35.000000000 +0000
 +++ src/polkitbackend/polkitbackendinteractiveauthority.c
-@@ -26,8 +26,13 @@
+@@ -25,8 +25,13 @@
  #ifdef HAVE_NETGROUP_H
  #include <netgroup.h>
  #else
@@ -18,11 +18,11 @@ $NetBSD: patch-src_polkitbackend_polkitb
  #include <string.h>
  #include <glib/gstdio.h>
  #include <locale.h>
-@@ -2250,7 +2255,7 @@ get_users_in_net_group (PolkitIdentity  
-   ret = NULL;
+@@ -2255,7 +2260,7 @@ get_users_in_net_group (PolkitIdentity
+ #ifdef HAVE_SETNETGRENT
    name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group));
  
--#ifdef HAVE_SETNETGRENT_RETURN
+-# ifdef HAVE_SETNETGRENT_RETURN
 +#if defined(HAVE_SETNETGRENT_RETURN) && !defined(__NetBSD__)
    if (setnetgrent (name) == 0)
      {
Index: pkgsrc/security/polkit/patches/patch-src_programs_pkttyagent.c
diff -u pkgsrc/security/polkit/patches/patch-src_programs_pkttyagent.c:1.3 pkgsrc/security/polkit/patches/patch-src_programs_pkttyagent.c:1.4
--- pkgsrc/security/polkit/patches/patch-src_programs_pkttyagent.c:1.3  Sun Apr  5 06:14:08 2020
+++ pkgsrc/security/polkit/patches/patch-src_programs_pkttyagent.c      Wed Jan 15 08:41:38 2025
@@ -1,18 +1,18 @@
-$NetBSD: patch-src_programs_pkttyagent.c,v 1.3 2020/04/05 06:14:08 wiz Exp $
+$NetBSD: patch-src_programs_pkttyagent.c,v 1.4 2025/01/15 08:41:38 adam Exp $
 
 Avoid %m usage in printf.
 
---- src/programs/pkttyagent.c.orig     2019-04-02 11:20:42.000000000 +0000
+--- src/programs/pkttyagent.c.orig     2024-08-08 13:12:35.000000000 +0000
 +++ src/programs/pkttyagent.c
-@@ -24,6 +24,7 @@
- #endif
+@@ -20,6 +20,7 @@
+  */
  
  #include <stdio.h>
 +#include <errno.h>
  #include <stdlib.h>
  #include <signal.h>
  #include <termios.h>
-@@ -242,7 +243,7 @@ main (int argc, char *argv[])
+@@ -256,7 +257,7 @@ main (int argc, char *argv[])
      {
        if (close (opt_notify_fd) != 0)
          {

Index: pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitd.c
diff -u pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitd.c:1.2 pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitd.c:1.3
--- pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitd.c:1.2        Sun Apr 29 05:14:37 2018
+++ pkgsrc/security/polkit/patches/patch-src_polkitbackend_polkitd.c    Wed Jan 15 08:41:38 2025
@@ -1,18 +1,18 @@
-$NetBSD: patch-src_polkitbackend_polkitd.c,v 1.2 2018/04/29 05:14:37 wiz Exp $
+$NetBSD: patch-src_polkitbackend_polkitd.c,v 1.3 2025/01/15 08:41:38 adam Exp $
 
 Avoid %m usage in printf.
 
---- src/polkitbackend/polkitd.c.orig   2018-04-03 18:16:17.000000000 +0000
+--- src/polkitbackend/polkitd.c.orig   2025-01-13 14:54:22.000000000 +0000
 +++ src/polkitbackend/polkitd.c
-@@ -22,6 +22,7 @@
- #include "config.h"
+@@ -20,6 +20,7 @@
+  */
  
  #include <signal.h>
 +#include <errno.h>
  #include <stdlib.h>
  
  #include <glib-unix.h>
-@@ -110,20 +111,20 @@ become_user (const gchar  *user,
+@@ -148,7 +149,7 @@ become_user (const gchar  *user,
    if (pw == NULL)
      {
        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
@@ -21,6 +21,7 @@ Avoid %m usage in printf.
        goto out;
      }
  
+@@ -163,13 +164,13 @@ become_user (const gchar  *user,
    if (setgroups (0, NULL) != 0)
      {
        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
@@ -36,7 +37,7 @@ Avoid %m usage in printf.
        goto out;
      }
  
-@@ -133,16 +134,16 @@ become_user (const gchar  *user,
+@@ -179,16 +180,16 @@ become_user (const gchar  *user,
        (getegid () != pw->pw_gid) || (getgid () != pw->pw_gid))
      {
        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
@@ -47,17 +48,17 @@ Avoid %m usage in printf.
        goto out;
      }
  
-   if (chdir (pw->pw_dir) != 0)
+   if (chdir ("/") != 0)
      {
        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
--                   "Error changing to home directory %s: %m",
+-                   "Error changing to root directory %s: %m",
 -                   pw->pw_dir);
-+                   "Error changing to home directory %s: %s",
++                   "Error changing to root directory %s: %s",
 +                   pw->pw_dir, g_strerror(errno));
        goto out;
      }
  
-@@ -198,7 +199,7 @@ main (int    argc,
+@@ -245,7 +246,7 @@ main (int    argc,
          }
        else
          {

Index: pkgsrc/security/polkit/patches/patch-src_programs_pkexec.c
diff -u pkgsrc/security/polkit/patches/patch-src_programs_pkexec.c:1.4 pkgsrc/security/polkit/patches/patch-src_programs_pkexec.c:1.5
--- pkgsrc/security/polkit/patches/patch-src_programs_pkexec.c:1.4      Wed Jun  7 15:36:40 2023
+++ pkgsrc/security/polkit/patches/patch-src_programs_pkexec.c  Wed Jan 15 08:41:38 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_programs_pkexec.c,v 1.4 2023/06/07 15:36:40 wiz Exp $
+$NetBSD: patch-src_programs_pkexec.c,v 1.5 2025/01/15 08:41:38 adam Exp $
 
 gfdwalk: Avoid conflict with SunOS function.
 
---- src/programs/pkexec.c.orig 2022-07-11 08:46:06.000000000 +0000
+--- src/programs/pkexec.c.orig 2024-08-08 13:12:35.000000000 +0000
 +++ src/programs/pkexec.c
-@@ -245,8 +245,8 @@ set_close_on_exec (gint     fd,
+@@ -247,8 +247,8 @@ set_close_on_exec (gint     fd,
  }
  
  static gboolean
@@ -15,12 +15,12 @@ gfdwalk: Avoid conflict with SunOS funct
  {
    gint fd;
    gint max_fd;
-@@ -941,7 +941,7 @@ main (int argc, char *argv[])
+@@ -958,7 +958,7 @@ main (int argc, char *argv[])
      }
  
    /* set close_on_exec on all file descriptors except stdin, stdout, stderr */
 -  if (!fdwalk (set_close_on_exec, GINT_TO_POINTER (3)))
 +  if (!gfdwalk (set_close_on_exec, GINT_TO_POINTER (3)))
      {
-       g_printerr ("Error setting close-on-exec for file desriptors\n");
+       g_printerr ("Error setting close-on-exec for file descriptors\n");
        goto out;



Home | Main Index | Thread Index | Old Index