polkit: Update to 0.113 and regenerate patches

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jan 3 23:15:11 2016 +0100
Changeset:	14df325c0a996a4519bb5c237505e4a4ba3f291b

Modified Files:
	polkit/Makefile
	polkit/PLIST
	polkit/distinfo
	polkit/patches/patch-src_polkit_polkitunixprocess.c
	polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority.c
	polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority.c
	polkit/patches/patch-test_mocklibc_src_grp.c
	polkit/patches/patch-test_mocklibc_src_pwd.c
Removed Files:
	polkit/patches/patch-src_polkitagent_polkitagentsession.c
	polkit/patches/patch-src_polkitbackend_polkitd.c

Log Message:
polkit: Update to 0.113 and regenerate patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=14df325c0a996a4519bb5c237505e4a4ba3f291b

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

diffstat:
 polkit/Makefile                                    |  2 +-
 polkit/PLIST                                       |  2 +-
 polkit/distinfo                                    | 19 ++---
 .../patches/patch-src_polkit_polkitunixprocess.c   |  2 +-
 .../patch-src_polkitagent_polkitagentsession.c     | 97 ----------------------
 ...lkitbackend_polkitbackendinteractiveauthority.c | 23 +----
 ...ch-src_polkitbackend_polkitbackendjsauthority.c | 22 +----
 polkit/patches/patch-src_polkitbackend_polkitd.c   | 15 ----
 polkit/patches/patch-test_mocklibc_src_grp.c       |  2 +-
 polkit/patches/patch-test_mocklibc_src_pwd.c       |  2 +-
 10 files changed, 20 insertions(+), 166 deletions(-)

diffs:
diff --git a/polkit/Makefile b/polkit/Makefile
index ae215cf..2bd87c1 100644
--- a/polkit/Makefile
+++ b/polkit/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.10 2015/05/20 11:22:11 krytarowski Exp $
 #
 
-DISTNAME=	polkit-0.112
+DISTNAME=	polkit-0.113
 CATEGORIES=	security
 MASTER_SITES=	http://www.freedesktop.org/software/polkit/releases/
 
diff --git a/polkit/PLIST b/polkit/PLIST
index 9a68ac4..436ff2a 100644
--- a/polkit/PLIST
+++ b/polkit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2015/04/02 14:55:36 bsiegert Exp $
+@comment $NetBSD$
 bin/pk-example-frobnicate
 bin/pkaction
 bin/pkcheck
diff --git a/polkit/distinfo b/polkit/distinfo
index 0c8f155..dcd2c8f 100644
--- a/polkit/distinfo
+++ b/polkit/distinfo
@@ -1,12 +1,11 @@
 $NetBSD: distinfo,v 1.4 2015/04/02 14:55:36 bsiegert Exp $
 
-SHA1 (polkit-0.112.tar.gz) = 374397f1c32fa1290be0fce378fe9bab541ee4bf
-RMD160 (polkit-0.112.tar.gz) = 0fecdcbfffe5f79dbb44f38dee9c4f060d60e7b1
-Size (polkit-0.112.tar.gz) = 1429240 bytes
-SHA1 (patch-src_polkit_polkitunixprocess.c) = 5bb849c16d75933f9ad10ba3510a02322ecbacc2
-SHA1 (patch-src_polkitagent_polkitagentsession.c) = f00b4a14deefdfc7a6b28ecbe7c7d8be7ba42fab
-SHA1 (patch-src_polkitbackend_polkitbackendinteractiveauthority.c) = 58886dd50ce1b2ac31d52245078ac2ae8475ff58
-SHA1 (patch-src_polkitbackend_polkitbackendjsauthority.c) = f4ad96447ed4dfbc3712f9b05f56d28111a6094b
-SHA1 (patch-src_polkitbackend_polkitd.c) = 1efd0f49cc7f0dd280d1f613ad9bdf9a7e62f959
-SHA1 (patch-test_mocklibc_src_grp.c) = fee82d75052d088b597716c0576e6447b49ddef3
-SHA1 (patch-test_mocklibc_src_pwd.c) = f7a277442fbc5050f21b4573af30e828b6ad0772
+SHA1 (polkit-0.113.tar.gz) = ef855c2d04184dceb38e0940dc7bec9cc3da415c
+RMD160 (polkit-0.113.tar.gz) = 661b0a678f7c770c213404db3af604935fdb25bc
+SHA512 (polkit-0.113.tar.gz) = ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9
+Size (polkit-0.113.tar.gz) = 1448865 bytes
+SHA1 (patch-src_polkit_polkitunixprocess.c) = 347ce2b4093a126eedb5dd2168d70cf636a30236
+SHA1 (patch-src_polkitbackend_polkitbackendinteractiveauthority.c) = d8b7cbcd0db26969bc4b83c32a731ae920c2e87b
+SHA1 (patch-src_polkitbackend_polkitbackendjsauthority.c) = 53154bd069b1e4d3d0707b6345c451865cb75cca
+SHA1 (patch-test_mocklibc_src_grp.c) = 1ad61ca043e0586ded84c3157d0271a1e3af2b9e
+SHA1 (patch-test_mocklibc_src_pwd.c) = 8f2b35cb90f96a115f7621a8751b9e64cba0a106
diff --git a/polkit/patches/patch-src_polkit_polkitunixprocess.c b/polkit/patches/patch-src_polkit_polkitunixprocess.c
index 09cdd09..aa8b436 100644
--- a/polkit/patches/patch-src_polkit_polkitunixprocess.c
+++ b/polkit/patches/patch-src_polkit_polkitunixprocess.c
@@ -2,7 +2,7 @@ $NetBSD: patch-src_polkit_polkitunixprocess.c,v 1.3 2015/04/02 14:55:36 bsiegert
 
 * NetBSD support
 
---- src/polkit/polkitunixprocess.c.orig	2013-05-06 17:54:15.000000000 +0000
+--- src/polkit/polkitunixprocess.c.orig	2014-01-14 22:42:25.000000000 +0000
 +++ src/polkit/polkitunixprocess.c
 @@ -29,6 +29,10 @@
  #include <sys/sysctl.h>
diff --git a/polkit/patches/patch-src_polkitagent_polkitagentsession.c b/polkit/patches/patch-src_polkitagent_polkitagentsession.c
deleted file mode 100644
index 4e1de76..0000000
--- a/polkit/patches/patch-src_polkitagent_polkitagentsession.c
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD: patch-src_polkitagent_polkitagentsession.c,v 1.3 2015/04/02 14:55:36 bsiegert Exp $
-
-PolkitAgentSession: fix race between child and io watches
-
---- src/polkitagent/polkitagentsession.c.orig	2013-04-29 17:28:57.000000000 +0000
-+++ src/polkitagent/polkitagentsession.c
-@@ -92,7 +92,6 @@ struct _PolkitAgentSession
-   int child_stdout;
-   GPid child_pid;
- 
--  GSource *child_watch_source;
-   GSource *child_stdout_watch_source;
-   GIOChannel *child_stdout_channel;
- 
-@@ -377,13 +376,6 @@ kill_helper (PolkitAgentSession *session
-       session->child_pid = 0;
-     }
- 
--  if (session->child_watch_source != NULL)
--    {
--      g_source_destroy (session->child_watch_source);
--      g_source_unref (session->child_watch_source);
--      session->child_watch_source = NULL;
--    }
--
-   if (session->child_stdout_watch_source != NULL)
-     {
-       g_source_destroy (session->child_stdout_watch_source);
-@@ -429,26 +421,6 @@ complete_session (PolkitAgentSession *se
-     }
- }
- 
--static void
--child_watch_func (GPid     pid,
--                  gint     status,
--                  gpointer user_data)
--{
--  PolkitAgentSession *session = POLKIT_AGENT_SESSION (user_data);
--
--  if (G_UNLIKELY (_show_debug ()))
--    {
--      g_print ("PolkitAgentSession: in child_watch_func for pid %d (WIFEXITED=%d WEXITSTATUS=%d)\n",
--               (gint) pid,
--               WIFEXITED(status),
--               WEXITSTATUS(status));
--    }
--
--  /* kill all the watches we have set up, except for the child since it has exited already */
--  session->child_pid = 0;
--  complete_session (session, FALSE);
--}
--
- static gboolean
- io_watch_have_data (GIOChannel    *channel,
-                     GIOCondition   condition,
-@@ -475,10 +447,13 @@ io_watch_have_data (GIOChannel    *chann
-                           NULL,
-                           NULL,
-                           &error);
--  if (error != NULL)
-+  if (error != NULL || line == NULL)
-     {
--      g_warning ("Error reading line from helper: %s", error->message);
--      g_error_free (error);
-+      /* In case we get just G_IO_HUP, line is NULL but error is
-+         unset.*/
-+      g_warning ("Error reading line from helper: %s",
-+                 error ? error->message : "nothing to read");
-+      g_clear_error (error);
- 
-       complete_session (session, FALSE);
-       goto out;
-@@ -540,6 +515,9 @@ io_watch_have_data (GIOChannel    *chann
-   g_free (line);
-   g_free (unescaped);
- 
-+  if (condition & (G_IO_ERR | G_IO_HUP))
-+    complete_session (session, FALSE);
-+
-   /* keep the IOChannel around */
-   return TRUE;
- }
-@@ -650,12 +628,9 @@ polkit_agent_session_initiate (PolkitAge
-   if (G_UNLIKELY (_show_debug ()))
-     g_print ("PolkitAgentSession: spawned helper with pid %d\n", (gint) session->child_pid);
- 
--  session->child_watch_source = g_child_watch_source_new (session->child_pid);
--  g_source_set_callback (session->child_watch_source, (GSourceFunc) child_watch_func, session, NULL);
--  g_source_attach (session->child_watch_source, g_main_context_get_thread_default ());
--
-   session->child_stdout_channel = g_io_channel_unix_new (session->child_stdout);
--  session->child_stdout_watch_source = g_io_create_watch (session->child_stdout_channel, G_IO_IN);
-+  session->child_stdout_watch_source = g_io_create_watch (session->child_stdout_channel,
-+                                                          G_IO_IN | G_IO_ERR | G_IO_HUP);
-   g_source_set_callback (session->child_stdout_watch_source, (GSourceFunc) io_watch_have_data, session, NULL);
-   g_source_attach (session->child_stdout_watch_source, g_main_context_get_thread_default ());
- 
diff --git a/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority.c b/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority.c
index c71ebb7..bc2ea49 100644
--- a/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority.c
+++ b/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority.c
@@ -2,7 +2,7 @@ $NetBSD: patch-src_polkitbackend_polkitbackendinteractiveauthority.c,v 1.3 2015/
 
 * for *BSD netgroup functions
 
---- src/polkitbackend/polkitbackendinteractiveauthority.c.orig	2013-04-04 18:16:50.000000000 +0000
+--- src/polkitbackend/polkitbackendinteractiveauthority.c.orig	2015-06-19 20:39:58.000000000 +0000
 +++ src/polkitbackend/polkitbackendinteractiveauthority.c
 @@ -23,7 +23,12 @@
  #include <errno.h>
@@ -17,27 +17,12 @@ $NetBSD: patch-src_polkitbackend_polkitbackendinteractiveauthority.c,v 1.3 2015/
  #include <string.h>
  #include <glib/gstdio.h>
  #include <locale.h>
-@@ -2113,15 +2118,23 @@ get_users_in_net_group (PolkitIdentity  
+@@ -2224,7 +2229,7 @@ get_users_in_net_group (PolkitIdentity  
    ret = NULL;
    name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group));
  
-+#ifdef BSD_NETGROUP
-+  setnetgrent (name);
-+#else
+-#ifdef HAVE_SETNETGRENT_RETURN
++#if HAVE_SETNETGRENT_RETURN && !defined(__NetBSD__)
    if (setnetgrent (name) == 0)
      {
        g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno));
-       goto out;
-     }
-+#endif
- 
-   for (;;)
-     {
-+#ifdef BSD_NETGROUP
-+      const char *hostname, *username, *domainname;
-+#else
-       char *hostname, *username, *domainname;
-+#endif
-       PolkitIdentity *user;
-       GError *error = NULL;
- 
diff --git a/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority.c b/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority.c
index 370670b..d9ff9f2 100644
--- a/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority.c
+++ b/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority.c
@@ -4,7 +4,7 @@ $NetBSD: patch-src_polkitbackend_polkitbackendjsauthority.c,v 1.3 2015/04/02 14:
 * for no SIGPOLL
 * Fix a memory leak
 
---- src/polkitbackend/polkitbackendjsauthority.c.orig	2013-05-06 18:28:21.000000000 +0000
+--- src/polkitbackend/polkitbackendjsauthority.c.orig	2015-06-19 20:39:58.000000000 +0000
 +++ src/polkitbackend/polkitbackendjsauthority.c
 @@ -24,7 +24,12 @@
  #include <errno.h>
@@ -19,25 +19,7 @@ $NetBSD: patch-src_polkitbackend_polkitbackendjsauthority.c,v 1.3 2015/04/02 14:
  #include <string.h>
  #include <glib/gstdio.h>
  #include <locale.h>
-@@ -1286,7 +1291,9 @@ get_signal_name (gint signal_number)
-     _HANDLE_SIG (SIGTTIN);
-     _HANDLE_SIG (SIGTTOU);
-     _HANDLE_SIG (SIGBUS);
-+#ifdef SIGPOLL
-     _HANDLE_SIG (SIGPOLL);
-+#endif
-     _HANDLE_SIG (SIGPROF);
-     _HANDLE_SIG (SIGSYS);
-     _HANDLE_SIG (SIGTRAP);
-@@ -1363,7 +1370,6 @@ js_polkit_spawn (JSContext  *cx,
-           goto out;
- 	}
-       s = JS_EncodeString (cx, JSVAL_TO_STRING (elem_val));
--      s = JS_EncodeString (cx, JSVAL_TO_STRING (elem_val));
-       argv[n] = g_strdup (s);
-       JS_free (cx, s);
-     }
-@@ -1450,8 +1456,13 @@ js_polkit_user_is_in_netgroup (JSContext
+@@ -1508,8 +1513,13 @@ js_polkit_user_is_in_netgroup (JSContext
    JSBool ret = JS_FALSE;
    JSString *user_str;
    JSString *netgroup_str;
diff --git a/polkit/patches/patch-src_polkitbackend_polkitd.c b/polkit/patches/patch-src_polkitbackend_polkitd.c
deleted file mode 100644
index 2b43160..0000000
--- a/polkit/patches/patch-src_polkitbackend_polkitd.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_polkitbackend_polkitd.c,v 1.3 2015/04/02 14:55:36 bsiegert Exp $
-
-polkitd: Fix problem with removing non-existent source
-
---- src/polkitbackend/polkitd.c.orig	2013-04-29 17:28:57.000000000 +0000
-+++ src/polkitbackend/polkitd.c
-@@ -92,7 +92,7 @@ on_sigint (gpointer user_data)
- {
-   g_print ("Handling SIGINT\n");
-   g_main_loop_quit (loop);
--  return FALSE;
-+  return TRUE;
- }
- 
- static gboolean
diff --git a/polkit/patches/patch-test_mocklibc_src_grp.c b/polkit/patches/patch-test_mocklibc_src_grp.c
index d152537..8dcd59c 100644
--- a/polkit/patches/patch-test_mocklibc_src_grp.c
+++ b/polkit/patches/patch-test_mocklibc_src_grp.c
@@ -2,7 +2,7 @@ $NetBSD: patch-test_mocklibc_src_grp.c,v 1.3 2015/04/02 14:55:36 bsiegert Exp $
 
 * XXX: no fgetgrent(3)
 
---- test/mocklibc/src/grp.c.orig	2013-02-02 03:22:52.000000000 +0000
+--- test/mocklibc/src/grp.c.orig	2014-01-14 22:42:25.000000000 +0000
 +++ test/mocklibc/src/grp.c
 @@ -27,6 +27,12 @@
  
diff --git a/polkit/patches/patch-test_mocklibc_src_pwd.c b/polkit/patches/patch-test_mocklibc_src_pwd.c
index 6fbed03..ae750c1 100644
--- a/polkit/patches/patch-test_mocklibc_src_pwd.c
+++ b/polkit/patches/patch-test_mocklibc_src_pwd.c
@@ -2,7 +2,7 @@ $NetBSD: patch-test_mocklibc_src_pwd.c,v 1.3 2015/04/02 14:55:36 bsiegert Exp $
 
 * XXX: no fgetpwent(3)
 
---- test/mocklibc/src/pwd.c.orig	2013-02-02 03:22:52.000000000 +0000
+--- test/mocklibc/src/pwd.c.orig	2014-01-14 22:42:25.000000000 +0000
 +++ test/mocklibc/src/pwd.c
 @@ -27,6 +27,12 @@