Attachment #158535 for bug #201362

Lines 205-210 Link Here

(-)GIDs (-1 / +1 lines)
205	polkit:*:562:	205	polkit:*:562:
206	pulse:*:563:	206	pulse:*:563:
207	pulse-access:*:564:	207	pulse-access:*:564:
		208	polkitd:*:565:
208	assp:*:587:	209	assp:*:587:
209	avahi-autoipd:*:588:	210	avahi-autoipd:*:588:
210	_xsi:*:600:	211	_xsi:*:600:
Lines 317-323 Link Here
317	kannel:*:993:	318	kannel:*:993:
318	rcynic:*:994:	319	rcynic:*:994:
319	rpkirtr:*:995:	320	rpkirtr:*:995:
320	tarantool:*:996:
321	ebnetd:*:999:	321	ebnetd:*:999:
322	nogroup:*:65533:	322	nogroup:*:65533:
323	nobody:*:65534:	323	nobody:*:65534:

Lines 1-9 Link Here

(-)sysutils/polkit/Makefile (-26 / +26 lines)
1	# Created by: Koop Mast<kwm@FreeBSD.org>	1	# Created by: Koop Mast<kwm@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
		3	# $MCom: ports/trunk/sysutils/polkit/Makefile 19013 2014-03-08 07:50:57Z kwm $
3		4
4	PORTNAME= polkit	5	PORTNAME= polkit
5	PORTVERSION= 0.105	6	PORTVERSION= 0.113
6	PORTREVISION= 6
7	CATEGORIES= sysutils gnome	7	CATEGORIES= sysutils gnome
8	MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/	8	MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/
9		9
Lines 10-49 Link Here
10	MAINTAINER= gnome@FreeBSD.org	10	MAINTAINER= gnome@FreeBSD.org
11	COMMENT= Framework for controlling access to system-wide components	11	COMMENT= Framework for controlling access to system-wide components
12		12
13	LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2	13	LICENSE= GPLv2
		14
		15	LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \
		16	libmozjs-17.0.so:${PORTSDIR}/lang/spidermonkey170
14	RUN_DEPENDS= dbus-launch:${PORTSDIR}/devel/dbus	17	RUN_DEPENDS= dbus-launch:${PORTSDIR}/devel/dbus
15		18
16	USE_GNOME= glib20 intlhack introspection	19	USERS= polkitd
		20	GROUPS= polkitd
		21
		22	USE_GNOME= glib20 intlhack introspection:build
17	USES= gettext gmake libtool pathfix pkgconfig	23	USES= gettext gmake libtool pathfix pkgconfig
18	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
19	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
20	CONFIGURE_ARGS= --disable-gtk-doc \	26	CONFIGURE_ARGS= --disable-gtk-doc-html \
		27	--without-html-dir \
21	--with-authfw=pam \	28	--with-authfw=pam \
22	--with-pam-include=system \	29	--with-pam-include=system \
23	--with-os-type=freebsd \	30	--with-os-type=freebsd \
24	--disable-systemd \	31	--with-polkitd-user=${USERS} \
25	--enable-introspection \	32	--disable-static \
		33	--disable-examples \
		34	--disable-libsystemd-login \
		35	--disable-test \
		36	--enable-introspection=yes \
26	--localstatedir=/var	37	--localstatedir=/var
27	MAKE_JOBS_UNSAFE=yes	38	MAKE_JOBS_UNSAFE=yes
28	CONFIGURE_ENV= GTKDOC="false"
29	CPPFLAGS+= -I${LOCALBASE}/include	39	CPPFLAGS+= -I${LOCALBASE}/include
30	LDFLAGS+= -L${LOCALBASE}/lib	40	LDFLAGS+= -L${LOCALBASE}/lib
		41	INSTALL_TARGET= install-strip
31		42
32	OPTIONS_DEFINE= MANPAGES	43	OPTIONS_DEFINE= MANPAGES
		44	MANPAGES_BUILD_DEPENDS= docbook-sgml>=4.5:${PORTSDIR}/textproc/docbook-sgml \
		45	docbook-xsl>=1.76:${PORTSDIR}/textproc/docbook-xsl
		46	MANPAGES_USE= gnome=libxslt:build
		47	MANPAGES_CONFIGURE_ENABLE= man-pages
		48	OPTIONS_SUB= yes
33		49
34	.include <bsd.port.options.mk>
35
36	.if ${PORT_OPTIONS:MMANPAGES}
37	BUILD_DEPENDS+= docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
38	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
39
40	USE_GNOME+= libxslt:build
41	PLIST_SUB+= MANPAGES=""
42	.else
43	CONFIGURE_ARGS+=--disable-man-pages
44	PLIST_SUB+= MANPAGES="@comment "
45	.endif
46
47	post-patch:	50	post-patch:
48	@${REINPLACE_CMD} -e 's\|/usr/bin/\|${PREFIX}/bin/\|g' \	51	@${REINPLACE_CMD} -e 's\|/usr/bin/\|${PREFIX}/bin/\|g' \
49	${WRKSRC}/docs/man/pkexec.xml \	52	${WRKSRC}/docs/man/pkexec.xml \
Lines 50-60 Link Here
50	${WRKSRC}/src/examples/org.freedesktop.policykit.examples.pkexec.policy.in	53	${WRKSRC}/src/examples/org.freedesktop.policykit.examples.pkexec.policy.in
51		54
52	post-install:	55	post-install:
53	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/	56	@${MKDIR} ${STAGEDIR}/var/lib/polkit-1
54	@${MKDIR} ${STAGEDIR}${PREFIX}/share/polkit-1/rules.d/
55	${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \	57	${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \
56	${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist	58	${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.sample
57	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib.so
58	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/polkit-1/extensions/lib*.so
59		59
60	.include <bsd.port.mk>	60	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)sysutils/polkit/distinfo (-2 / +2 lines)
1	SHA256 (polkit-0.105.tar.gz) = 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df	1	SHA256 (polkit-0.113.tar.gz) = e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81
2	SIZE (polkit-0.105.tar.gz) = 1431080	2	SIZE (polkit-0.113.tar.gz) = 1448865

Lines 1-11 Link Here

(-)sysutils/polkit/files/patch-Makefile.in (-11 / +11 lines)
1	--- Makefile.in.orig 2012-05-15 22:09:33.000000000 +0200	1	--- Makefile.in.orig 2015-06-19 20:31:12 UTC
2	+++ Makefile.in 2012-05-15 22:10:16.000000000 +0200	2	+++ Makefile.in
3	@@ -292,7 +292,7 @@	3	@@ -157,7 +157,7 @@ am__define_uniq_tagged_files = \
4	top_build_prefix = @top_build_prefix@	4	ETAGS = etags
5	top_builddir = @top_builddir@	5	CTAGS = ctags
6	top_srcdir = @top_srcdir@	6	CSCOPE = cscope
7	-SUBDIRS = actions data src docs po test	7	-DIST_SUBDIRS = actions data src docs po test
8	+SUBDIRS = actions data src docs po	8	+DIST_SUBDIRS = actions data src docs po
9	NULL =	9	am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
10	EXTRA_DIST = \	10	COPYING ChangeLog INSTALL NEWS README compile config.guess \
11	HACKING \	11	config.sub depcomp install-sh ltmain.sh missing

Lines 1-11 Link Here

(-)sysutils/polkit/files/patch-data_Makefile.in (-11 lines)
1	--- data/Makefile.in.orig 2009-08-01 16:02:38.000000000 +0200
2	+++ data/Makefile.in 2009-08-01 16:05:13.000000000 +0200
3	@@ -471,7 +471,7 @@
4
5	info-am:
6
7	-install-data-am: install-dbusconfDATA install-pamDATA \
8	+install-data-am: install-pamDATA \
9	install-pkgconfigDATA install-serviceDATA
10
11	install-dvi: install-dvi-am




--- docs/man/polkit.xml.orig	2013-05-06 18:28:21 UTC
+++ docs/man/polkit.xml
@@ -100,17 +100,17 @@ System Context         |                
 |    polkitd(8)    |
 +------------------+
 | org.freedesktop. |
-|    PolicyKit1    |<---------+
-+------------------+          |
-          ^                   |
-          |            +--------------------------------------+
-          |            | /usr/share/polkit-1/actions/*.policy |
-          |            +--------------------------------------+
+|    PolicyKit1    |<------+
++------------------+       |
+          ^                |
+          |     +--------------------------------------------+
+          |     | /usr/local/share/polkit-1/actions/*.policy |
+          |     +--------------------------------------------+
           |
-   +--------------------------------------+
-   | /etc/polkit-1/rules.d/*.rules        |
-   | /usr/share/polkit-1/rules.d/*.rules  |
-   +--------------------------------------+
+   +------------------------------------------------+
+   | /usr/local/etc/polkit-1/rules.d/*.rules        |
+   | /usr/local/share/polkit-1/rules.d/*.rules      |
+   +------------------------------------------------+
 ]]></programlisting>
       </textobject>
     </mediaobject>
@@ -217,7 +217,7 @@ System Context         |                
       order to use polkit. Actions correspond to operations that
       clients can request the mechanism to carry out and are defined
       in XML files that the mechanism installs into the <filename
-      class='directory'>/usr/share/polkit-1/actions</filename>
+      class='directory'>/usr/local/share/polkit-1/actions</filename>
       directory.
     </para>
 
@@ -473,21 +473,21 @@ System Context         |                
     <para>
       <command>polkitd</command> reads
       <filename class='extension'>.rules</filename> files from the
-      <filename class='directory'>/etc/polkit-1/rules.d</filename> and
-      <filename class='directory'>/usr/share/polkit-1/rules.d</filename>
+      <filename class='directory'>/usr/local/etc/polkit-1/rules.d</filename> and
+      <filename class='directory'>/usr/local/share/polkit-1/rules.d</filename>
       directories by sorting the files in lexical order based on the
       basename on each file (if there's a tie, files in
-      <filename class='directory'>/etc</filename>
+      <filename class='directory'>/usr/local/etc</filename>
       are processed before files in
-      <filename class='directory'>/usr</filename>).
+      <filename class='directory'>/usr/local/share</filename>).
       For example, for the following four
       files, the order is
     </para>
     <itemizedlist mark='opencircle' spacing='compact'>
-      <listitem><para><filename>/etc/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
-      <listitem><para><filename>/usr/share/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
-      <listitem><para><filename>/etc/polkit-1/rules.d/15-auth.rules</filename></para></listitem>
-      <listitem><para><filename>/usr/share/polkit-1/rules.d/20-auth.rules</filename></para></listitem>
+      <listitem><para><filename>/usr/local/etc/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
+      <listitem><para><filename>/usr/local/share/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
+      <listitem><para><filename>/usr/local/etc/polkit-1/rules.d/15-auth.rules</filename></para></listitem>
+      <listitem><para><filename>/usr/local/share/polkit-1/rules.d/20-auth.rules</filename></para></listitem>
     </itemizedlist>
     <para>
       Both directories are monitored so if a rules file is changed,
@@ -683,8 +683,8 @@ polkit.addRule(function(action, subject)
         will produce the following when the user runs 'pkexec -u bateman bash -i' from a shell:
       </para>
       <programlisting><![CDATA[
-May 24 14:28:50 thinkpad polkitd[32217]: /etc/polkit-1/rules.d/10-test.rules:3: action=[Action id='org.freedesktop.policykit.exec' command_line='/usr/bin/bash -i' program='/usr/bin/bash' user='bateman' user.gecos='Patrick Bateman' user.display='Patrick Bateman (bateman)']
-May 24 14:28:50 thinkpad polkitd[32217]: /etc/polkit-1/rules.d/10-test.rules:4: subject=[Subject pid=1352 user='davidz' groups=davidz,wheel, seat='seat0' session='1' local=true active=true]
+May 24 14:28:50 thinkpad polkitd[32217]: /usr/local/etc/polkit-1/rules.d/10-test.rules:3: action=[Action id='org.freedesktop.policykit.exec' command_line='/usr/local/bin/bash -i' program='/usr/local/bin/bash' user='bateman' user.gecos='Patrick Bateman' user.display='Patrick Bateman (bateman)']
+May 24 14:28:50 thinkpad polkitd[32217]: /usr/local/etc/polkit-1/rules.d/10-test.rules:4: subject=[Subject pid=1352 user='davidz' groups=davidz,wheel, seat='seat0' session='1' local=true active=true]
 ]]></programlisting>
 
     </refsect2>
@@ -916,7 +916,7 @@ polkit.addRule(function(action, subject)
       <programlisting><![CDATA[
 polkit.addRule(function(action, subject) {
     if (action.id == "org.freedesktop.policykit.exec" &&
-        action.lookup("program") == "/usr/bin/cat") {
+        action.lookup("program") == "/bin/cat") {
         return polkit.Result.AUTH_ADMIN;
     }
 });




--- src/polkitagent/polkitagenthelperprivate.c.orig	2011-02-23 18:18:11.000000000 +0000
+++ src/polkitagent/polkitagenthelperprivate.c	2011-02-23 18:18:41.000000000 +0000
@@ -103,7 +103,7 @@ flush_and_wait ()
 {
   fflush (stdout);
   fflush (stderr);
-  fdatasync (fileno(stdout));
-  fdatasync (fileno(stderr));
+  fsync (fileno(stdout));
+  fsync (fileno(stderr));
   usleep (100 * 1000);
 }




--- src/polkitbackend/Makefile.in.orig	2010-01-18 02:50:30.000000000 -0500
+++ src/polkitbackend/Makefile.in	2010-01-18 14:18:36.000000000 -0500
@@ -899,10 +899,18 @@ clean-local :
 
 install-exec-hook:
 	mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1
-	mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/{10-vendor.d,20-org.d,30-site.d,50-local.d,90-mandatory.d}
+	mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/10-vendor.d
+	mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/20-org.d
+	mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/30-site.d
+	mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/50-local.d
+	mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/90-mandatory.d
 	-chmod 700 $(DESTDIR)$(localstatedir)/lib/polkit-1
 	mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1
-	mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/{10-vendor.d,20-org.d,30-site.d,50-local.d,90-mandatory.d}
+	mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/10-vendor.d
+	mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/20-org.d
+	mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/30-site.d
+	mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/50-local.d
+	mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/90-mandatory.d
 	-chmod 700 $(DESTDIR)$(sysconfdir)/polkit-1/localauthority
 	mkdir -p $(DESTDIR)$(libdir)/polkit-1/extensions
 

Lines 1-11 Link Here

(-)sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c (-11 lines)
1	--- src/polkitbackend/polkitbackendinteractiveauthority.c.orig 2012-05-15 21:52:38.000000000 +0200
2	+++ src/polkitbackend/polkitbackendinteractiveauthority.c 2012-05-15 21:52:49.000000000 +0200
3	@@ -279,7 +279,7 @@
4	static volatile GQuark domain = 0;
5
6	/* Force registering error domain */
7	- domain = POLKIT_ERROR; domain;
8	+ domain = POLKIT_ERROR;
9
10	priv = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_PRIVATE (authority);
11




--- src/polkitbackend/polkitbackendlocalauthority.c.orig	2012-05-15 21:52:35.000000000 +0200
+++ src/polkitbackend/polkitbackendlocalauthority.c	2012-05-15 21:53:07.000000000 +0200
@@ -700,11 +700,7 @@
   ret = NULL;
   name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group));
 
-  if (setnetgrent (name) == 0)
-    {
-      g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno));
-      goto out;
-    }
+  setnetgrent (name);
 
   for (;;)
     {
@@ -737,7 +733,6 @@
 
   ret = g_list_reverse (ret);
 
- out:
   endnetgrent ();
   return ret;
 }




--- src/polkitd/gposixsignal.c.orig	2010-08-29 20:05:07.000000000 -0400
+++ src/polkitd/gposixsignal.c	2010-08-29 20:13:20.000000000 -0400
@@ -23,7 +23,13 @@
 #include "config.h"
 
 #include <unistd.h>
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.h>
+#else
 #include <sys/signalfd.h>
+#endif
 #include <signal.h>
 
 #include "gposixsignal.h"
@@ -83,6 +89,9 @@ _g_posix_signal_source_new (gint signum)
   gint fd;
   GSource *_source;
   _GPosixSignalSource *source;
+#ifdef __FreeBSD__
+  struct kevent ev;
+#endif
 
   _source = NULL;
 
@@ -92,7 +101,13 @@ _g_posix_signal_source_new (gint signum)
   if (sigprocmask (SIG_BLOCK, &sigset, NULL) == -1)
     g_assert_not_reached ();
 
+#ifdef __FreeBSD__
+  fd = kqueue ();
+  EV_SET (&ev, signum, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL);
+  kevent (fd, &ev, 1, NULL, 0, NULL);
+#else
   fd = signalfd (-1, &sigset, SFD_NONBLOCK | SFD_CLOEXEC);
+#endif
 
   _source = g_source_new (&_g_posix_signal_source_funcs, sizeof (_GPosixSignalSource));
   source = (_GPosixSignalSource *) _source;

Lines 1-4 Link Here

(-)sysutils/polkit/pkg-descr (-2 / +2 lines)
1	PolicyKit is a framework for defining policy for system-wide components and	1	Polkit is a toolkit for defining and handling authorizations. It is used
2	for desktop pieces to configure it. It is used by HAL.	2	for allowing unprivileged processes to speak to privileged processes.
3		3
4	WWW: http://www.freedesktop.org/wiki/Software/polkit	4	WWW: http://www.freedesktop.org/wiki/Software/polkit




bin/pk-example-frobnicate
bin/pkaction
bin/pkcheck
@(,,4755) bin/pkexec
bin/pkttyagent
@sample etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.sample
etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist
@exec [ -f %B/org.freedesktop.PolicyKit1.conf ] || cp %B/%f %B/org.freedesktop.PolicyKit1.conf
etc/pam.d/polkit-1
etc/polkit-1/rules.d/50-default.rules
etc/polkit-1/nullbackend.conf.d/50-nullbackend.conf
include/polkit-1/polkit/polkit.h
include/polkit-1/polkit/polkitactiondescription.h
include/polkit-1/polkit/polkitauthority.h
include/polkit-1/polkit/polkitauthorityfeatures.h
include/polkit-1/polkit/polkitauthority.h
include/polkit-1/polkit/polkitauthorizationresult.h
include/polkit-1/polkit/polkitcheckauthorizationflags.h
include/polkit-1/polkit/polkitdetails.h

include/polkit-1/polkitagent/polkitagentenumtypes.h
include/polkit-1/polkitagent/polkitagentlistener.h
include/polkit-1/polkitagent/polkitagentsession.h
include/polkit-1/polkitagent/polkitagenttextlistener.h
include/polkit-1/polkitagent/polkitagenttypes.h
include/polkit-1/polkitagent/polkitagenttextlistener.h
include/polkit-1/polkitbackend/polkitbackend.h
include/polkit-1/polkitbackend/polkitbackendactionlookup.h
include/polkit-1/polkitbackend/polkitbackendauthority.h
include/polkit-1/polkitbackend/polkitbackendinteractiveauthority.h
include/polkit-1/polkitbackend/polkitbackendlocalauthority.h
include/polkit-1/polkitbackend/polkitbackendtypes.h
lib/girepository-1.0/Polkit-1.0.typelib
lib/girepository-1.0/PolkitAgent-1.0.typelib
lib/libpolkit-agent-1.a
lib/libpolkit-agent-1.so
lib/libpolkit-agent-1.so.0
lib/libpolkit-agent-1.so.0.0.0
lib/libpolkit-backend-1.a
lib/libpolkit-backend-1.so
lib/libpolkit-backend-1.so.0
lib/libpolkit-backend-1.so.0.0.0
lib/libpolkit-gobject-1.a
lib/libpolkit-gobject-1.so
lib/libpolkit-gobject-1.so.0
lib/libpolkit-gobject-1.so.0.0.0
@(,,4755) lib/polkit-1/polkit-agent-helper-1
lib/polkit-1/polkitd
libdata/pkgconfig/polkit-agent-1.pc
libdata/pkgconfig/polkit-backend-1.pc
libdata/pkgconfig/polkit-gobject-1.pc
libexec/polkit-agent-helper-1
libexec/polkitd
%%MANPAGES%%man/man1/pkaction.1.gz
%%MANPAGES%%man/man1/pkcheck.1.gz
%%MANPAGES%%man/man1/pkexec.1.gz
%%MANPAGES%%man/man1/pkttyagent.1.gz
%%MANPAGES%%man/man8/pklocalauthority.8.gz
%%MANPAGES%%man/man8/polkit.8.gz
%%MANPAGES%%man/man8/polkitd.8.gz
share/dbus-1/system-services/org.freedesktop.PolicyKit1.service
share/gir-1.0/Polkit-1.0.gir
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/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy
share/polkit-1/actions/org.freedesktop.policykit.policy
@dir(polkitd,,700) etc/polkit-1/rules.d
@dir(polkitd,,700) share/polkit-1/rules.d
@dir etc/polkit-1/localauthority/50-local.d
@dir etc/polkit-1/localauthority/30-site.d
@dir etc/polkit-1/localauthority/20-org.d
@dir etc/polkit-1/localauthority/10-vendor.d
@dir /var/lib/polkit-1/localauthority/90-mandatory.d
@dir /var/lib/polkit-1/localauthority/50-local.d
@dir /var/lib/polkit-1/localauthority/30-site.d
@dir /var/lib/polkit-1/localauthority/20-org.d
@dir /var/lib/polkit-1/localauthority/10-vendor.d
@dir /var/lib/polkit-1/localauthority
@dir /var/lib/polkit-1
@dir /var/lib

Return to bug 201362

Lines 210-215 Link Here

(-)UIDs (-1 / +1 lines)
210	distcc:*:561:561::0:0:Distcc user:/nonexistent:/usr/sbin/nologin	210	distcc:*:561:561::0:0:Distcc user:/nonexistent:/usr/sbin/nologin
211	polkit:*:562:562::0:0:PolicyKit User:/nonexistent:/usr/sbin/nologin	211	polkit:*:562:562::0:0:PolicyKit User:/nonexistent:/usr/sbin/nologin
212	pulse:*:563:563::0:0:PulseAudio System User:/nonexistent:/usr/sbin/nologin	212	pulse:*:563:563::0:0:PulseAudio System User:/nonexistent:/usr/sbin/nologin
		213	polkitd:*:565:565::0:0:Polkit Daemon User:/var/empty:/usr/sbin/nologin
213	assp:*:587:587::0:0:ASSP Anti-Spam Proxy:/var/db/assp:/usr/sbin/nologin	214	assp:*:587:587::0:0:ASSP Anti-Spam Proxy:/var/db/assp:/usr/sbin/nologin
214	avahi-autoipd:*:588:588::0:0:Avahi Autoipd Daemon user:/nonexistent:/usr/sbin/nologin	215	avahi-autoipd:*:588:588::0:0:Avahi Autoipd Daemon user:/nonexistent:/usr/sbin/nologin
215	_xsi:*:600:600::0:0:XMLSysInfo User:/nonexistent:/usr/sbin/nologin	216	_xsi:*:600:600::0:0:XMLSysInfo User:/nonexistent:/usr/sbin/nologin
Lines 326-331 Link Here
326	kannel:*:993:993::0:0:Kannel User:/nonexistent:/usr/sbin/nologin	327	kannel:*:993:993::0:0:Kannel User:/nonexistent:/usr/sbin/nologin
327	rcynic:*:994:994::0:0:RPKI validation system:/nonexistent:/usr/sbin/nologin	328	rcynic:*:994:994::0:0:RPKI validation system:/nonexistent:/usr/sbin/nologin
328	rpkirtr:*:995:995::0:0:RPKI router server:/nonexistent:/usr/sbin/nologin	329	rpkirtr:*:995:995::0:0:RPKI router server:/nonexistent:/usr/sbin/nologin
329	tarantool:*:996:996::0:0:Tarantool Daemon:/nonexistent:/usr/sbin/nologin
330	ebnetd:*:999:999::0:0:EBNETD:/nonexistent:/usr/sbin/nologin	330	ebnetd:*:999:999::0:0:EBNETD:/nonexistent:/usr/sbin/nologin
331	nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin	331	nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin

Line 0 Link Here

(-)sysutils/polkit/files/patch-docs_man_polkit.xml (+89 lines)
		1	--- docs/man/polkit.xml.orig 2013-05-06 18:28:21 UTC
		2	+++ docs/man/polkit.xml
		3	@@ -100,17 +100,17 @@ System Context \|
		4	\| polkitd(8) \|
		5	+------------------+
		6	\| org.freedesktop. \|
		7	-\| PolicyKit1 \|<---------+
		8	-+------------------+ \|
		9	- ^ \|
		10	- \| +--------------------------------------+
		11	- \| \| /usr/share/polkit-1/actions/*.policy \|
		12	- \| +--------------------------------------+
		13	+\| PolicyKit1 \|<------+
		14	++------------------+ \|
		15	+ ^ \|
		16	+ \| +--------------------------------------------+
		17	+ \| \| /usr/local/share/polkit-1/actions/*.policy \|
		18	+ \| +--------------------------------------------+
		19	\|
		20	- +--------------------------------------+
		21	- \| /etc/polkit-1/rules.d/*.rules \|
		22	- \| /usr/share/polkit-1/rules.d/*.rules \|
		23	- +--------------------------------------+
		24	+ +------------------------------------------------+
		25	+ \| /usr/local/etc/polkit-1/rules.d/*.rules \|
		26	+ \| /usr/local/share/polkit-1/rules.d/*.rules \|
		27	+ +------------------------------------------------+
		28	]]></programlisting>
		29	</textobject>
		30	</mediaobject>
		31	@@ -217,7 +217,7 @@ System Context \|
		32	order to use polkit. Actions correspond to operations that
		33	clients can request the mechanism to carry out and are defined
		34	in XML files that the mechanism installs into the <filename
		35	- class='directory'>/usr/share/polkit-1/actions</filename>
		36	+ class='directory'>/usr/local/share/polkit-1/actions</filename>
		37	directory.
		38	</para>
		39
		40	@@ -473,21 +473,21 @@ System Context \|
		41	<para>
		42	<command>polkitd</command> reads
		43	<filename class='extension'>.rules</filename> files from the
		44	- <filename class='directory'>/etc/polkit-1/rules.d</filename> and
		45	- <filename class='directory'>/usr/share/polkit-1/rules.d</filename>
		46	+ <filename class='directory'>/usr/local/etc/polkit-1/rules.d</filename> and
		47	+ <filename class='directory'>/usr/local/share/polkit-1/rules.d</filename>
		48	directories by sorting the files in lexical order based on the
		49	basename on each file (if there's a tie, files in
		50	- <filename class='directory'>/etc</filename>
		51	+ <filename class='directory'>/usr/local/etc</filename>
		52	are processed before files in
		53	- <filename class='directory'>/usr</filename>).
		54	+ <filename class='directory'>/usr/local/share</filename>).
		55	For example, for the following four
		56	files, the order is
		57	</para>
		58	<itemizedlist mark='opencircle' spacing='compact'>
		59	- <listitem><para><filename>/etc/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
		60	- <listitem><para><filename>/usr/share/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
		61	- <listitem><para><filename>/etc/polkit-1/rules.d/15-auth.rules</filename></para></listitem>
		62	- <listitem><para><filename>/usr/share/polkit-1/rules.d/20-auth.rules</filename></para></listitem>
		63	+ <listitem><para><filename>/usr/local/etc/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
		64	+ <listitem><para><filename>/usr/local/share/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
65	+ <listitem><para><filename>/usr/local/etc/polkit-1/rules.d/15-auth.rules</filename></para></listitem>
66	+ <listitem><para><filename>/usr/local/share/polkit-1/rules.d/20-auth.rules</filename></para></listitem>
67	</itemizedlist>
68	<para>
69	Both directories are monitored so if a rules file is changed,
70	@@ -683,8 +683,8 @@ polkit.addRule(function(action, subject)
71	will produce the following when the user runs 'pkexec -u bateman bash -i' from a shell:
72	</para>
73	<programlisting><![CDATA[
74	-May 24 14:28:50 thinkpad polkitd[32217]: /etc/polkit-1/rules.d/10-test.rules:3: action=[Action id='org.freedesktop.policykit.exec' command_line='/usr/bin/bash -i' program='/usr/bin/bash' user='bateman' user.gecos='Patrick Bateman' user.display='Patrick Bateman (bateman)']
75	-May 24 14:28:50 thinkpad polkitd[32217]: /etc/polkit-1/rules.d/10-test.rules:4: subject=[Subject pid=1352 user='davidz' groups=davidz,wheel, seat='seat0' session='1' local=true active=true]
76	+May 24 14:28:50 thinkpad polkitd[32217]: /usr/local/etc/polkit-1/rules.d/10-test.rules:3: action=[Action id='org.freedesktop.policykit.exec' command_line='/usr/local/bin/bash -i' program='/usr/local/bin/bash' user='bateman' user.gecos='Patrick Bateman' user.display='Patrick Bateman (bateman)']
77	+May 24 14:28:50 thinkpad polkitd[32217]: /usr/local/etc/polkit-1/rules.d/10-test.rules:4: subject=[Subject pid=1352 user='davidz' groups=davidz,wheel, seat='seat0' session='1' local=true active=true]
78	]]></programlisting>
79
80	</refsect2>
81	@@ -916,7 +916,7 @@ polkit.addRule(function(action, subject)
82	<programlisting><![CDATA[
83	polkit.addRule(function(action, subject) {
84	if (action.id == "org.freedesktop.policykit.exec" &&
85	- action.lookup("program") == "/usr/bin/cat") {
86	+ action.lookup("program") == "/bin/cat") {
87	return polkit.Result.AUTH_ADMIN;
88	}
89	});

Lines 1-12 Link Here

(-)sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c (-12 lines)
1	--- src/polkitagent/polkitagenthelperprivate.c.orig 2011-02-23 18:18:11.000000000 +0000
2	+++ src/polkitagent/polkitagenthelperprivate.c 2011-02-23 18:18:41.000000000 +0000
3	@@ -103,7 +103,7 @@ flush_and_wait ()
4	{
5	fflush (stdout);
6	fflush (stderr);
7	- fdatasync (fileno(stdout));
8	- fdatasync (fileno(stderr));
9	+ fsync (fileno(stdout));
10	+ fsync (fileno(stderr));
11	usleep (100 * 1000);
12	}

Lines 1-23 Link Here

(-)sysutils/polkit/files/patch-src_polkitbackend_Makefile.in (-23 lines)
1	--- src/polkitbackend/Makefile.in.orig 2010-01-18 02:50:30.000000000 -0500
2	+++ src/polkitbackend/Makefile.in 2010-01-18 14:18:36.000000000 -0500
3	@@ -899,10 +899,18 @@ clean-local :
4
5	install-exec-hook:
6	mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1
7	- mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/{10-vendor.d,20-org.d,30-site.d,50-local.d,90-mandatory.d}
8	+ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/10-vendor.d
9	+ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/20-org.d
10	+ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/30-site.d
11	+ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/50-local.d
12	+ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/90-mandatory.d
13	-chmod 700 $(DESTDIR)$(localstatedir)/lib/polkit-1
14	mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1
15	- mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/{10-vendor.d,20-org.d,30-site.d,50-local.d,90-mandatory.d}
16	+ mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/10-vendor.d
17	+ mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/20-org.d
18	+ mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/30-site.d
19	+ mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/50-local.d
20	+ mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/90-mandatory.d
21	-chmod 700 $(DESTDIR)$(sysconfdir)/polkit-1/localauthority
22	mkdir -p $(DESTDIR)$(libdir)/polkit-1/extensions
23

Lines 1-23 Link Here

(-)sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c (-23 lines)
1	--- src/polkitbackend/polkitbackendlocalauthority.c.orig 2012-05-15 21:52:35.000000000 +0200
2	+++ src/polkitbackend/polkitbackendlocalauthority.c 2012-05-15 21:53:07.000000000 +0200
3	@@ -700,11 +700,7 @@
4	ret = NULL;
5	name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group));
6
7	- if (setnetgrent (name) == 0)
8	- {
9	- g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno));
10	- goto out;
11	- }
12	+ setnetgrent (name);
13
14	for (;;)
15	{
16	@@ -737,7 +733,6 @@
17
18	ret = g_list_reverse (ret);
19
20	- out:
21	endnetgrent ();
22	return ret;
23	}

Lines 1-40 Link Here

(-)sysutils/polkit/files/patch-src_polkitd_gposixsignal.c (-40 lines)
1	--- src/polkitd/gposixsignal.c.orig 2010-08-29 20:05:07.000000000 -0400
2	+++ src/polkitd/gposixsignal.c 2010-08-29 20:13:20.000000000 -0400
3	@@ -23,7 +23,13 @@
4	#include "config.h"
5
6	#include <unistd.h>
7	+#ifdef __FreeBSD__
8	+#include <sys/types.h>
9	+#include <sys/event.h>
10	+#include <sys/time.h>
11	+#else
12	#include <sys/signalfd.h>
13	+#endif
14	#include <signal.h>
15
16	#include "gposixsignal.h"
17	@@ -83,6 +89,9 @@ _g_posix_signal_source_new (gint signum)
18	gint fd;
19	GSource *_source;
20	_GPosixSignalSource *source;
21	+#ifdef __FreeBSD__
22	+ struct kevent ev;
23	+#endif
24
25	_source = NULL;
26
27	@@ -92,7 +101,13 @@ _g_posix_signal_source_new (gint signum)
28	if (sigprocmask (SIG_BLOCK, &sigset, NULL) == -1)
29	g_assert_not_reached ();
30
31	+#ifdef __FreeBSD__
32	+ fd = kqueue ();
33	+ EV_SET (&ev, signum, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL);
34	+ kevent (fd, &ev, 1, NULL, 0, NULL);
35	+#else
36	fd = signalfd (-1, &sigset, SFD_NONBLOCK \| SFD_CLOEXEC);
37	+#endif
38
39	_source = g_source_new (&_g_posix_signal_source_funcs, sizeof (_GPosixSignalSource));
40	source = (_GPosixSignalSource *) _source;

Lines 1-18 Link Here

(-)sysutils/polkit/pkg-plist (-40 / +10 lines)
1	bin/pk-example-frobnicate
2	bin/pkaction	1	bin/pkaction
3	bin/pkcheck	2	bin/pkcheck
4	bin/pkexec	3	@(,,4755) bin/pkexec
5	bin/pkttyagent	4	bin/pkttyagent
6	@unexec if cmp -s %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist; then rm -f %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; fi	5	@sample etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.sample
7	etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist
8	@exec [ -f %B/org.freedesktop.PolicyKit1.conf ] \|\| cp %B/%f %B/org.freedesktop.PolicyKit1.conf
9	etc/pam.d/polkit-1	6	etc/pam.d/polkit-1
10	etc/polkit-1/localauthority.conf.d/50-localauthority.conf	7	etc/polkit-1/rules.d/50-default.rules
11	etc/polkit-1/nullbackend.conf.d/50-nullbackend.conf
12	include/polkit-1/polkit/polkit.h	8	include/polkit-1/polkit/polkit.h
13	include/polkit-1/polkit/polkitactiondescription.h	9	include/polkit-1/polkit/polkitactiondescription.h
		10	include/polkit-1/polkit/polkitauthority.h
14	include/polkit-1/polkit/polkitauthorityfeatures.h	11	include/polkit-1/polkit/polkitauthorityfeatures.h
15	include/polkit-1/polkit/polkitauthority.h
16	include/polkit-1/polkit/polkitauthorizationresult.h	12	include/polkit-1/polkit/polkitauthorizationresult.h
17	include/polkit-1/polkit/polkitcheckauthorizationflags.h	13	include/polkit-1/polkit/polkitcheckauthorizationflags.h
18	include/polkit-1/polkit/polkitdetails.h	14	include/polkit-1/polkit/polkitdetails.h
Lines 35-93 Link Here
35	include/polkit-1/polkitagent/polkitagentenumtypes.h	31	include/polkit-1/polkitagent/polkitagentenumtypes.h
36	include/polkit-1/polkitagent/polkitagentlistener.h	32	include/polkit-1/polkitagent/polkitagentlistener.h
37	include/polkit-1/polkitagent/polkitagentsession.h	33	include/polkit-1/polkitagent/polkitagentsession.h
		34	include/polkit-1/polkitagent/polkitagenttextlistener.h
38	include/polkit-1/polkitagent/polkitagenttypes.h	35	include/polkit-1/polkitagent/polkitagenttypes.h
39	include/polkit-1/polkitagent/polkitagenttextlistener.h
40	include/polkit-1/polkitbackend/polkitbackend.h
41	include/polkit-1/polkitbackend/polkitbackendactionlookup.h
42	include/polkit-1/polkitbackend/polkitbackendauthority.h
43	include/polkit-1/polkitbackend/polkitbackendinteractiveauthority.h
44	include/polkit-1/polkitbackend/polkitbackendlocalauthority.h
45	include/polkit-1/polkitbackend/polkitbackendtypes.h
46	lib/girepository-1.0/Polkit-1.0.typelib	36	lib/girepository-1.0/Polkit-1.0.typelib
47	lib/girepository-1.0/PolkitAgent-1.0.typelib	37	lib/girepository-1.0/PolkitAgent-1.0.typelib
48	lib/libpolkit-agent-1.a
49	lib/libpolkit-agent-1.so	38	lib/libpolkit-agent-1.so
50	lib/libpolkit-agent-1.so.0	39	lib/libpolkit-agent-1.so.0
51	lib/libpolkit-agent-1.so.0.0.0	40	lib/libpolkit-agent-1.so.0.0.0
52	lib/libpolkit-backend-1.a
53	lib/libpolkit-backend-1.so
54	lib/libpolkit-backend-1.so.0
55	lib/libpolkit-backend-1.so.0.0.0
56	lib/libpolkit-gobject-1.a
57	lib/libpolkit-gobject-1.so	41	lib/libpolkit-gobject-1.so
58	lib/libpolkit-gobject-1.so.0	42	lib/libpolkit-gobject-1.so.0
59	lib/libpolkit-gobject-1.so.0.0.0	43	lib/libpolkit-gobject-1.so.0.0.0
60	lib/polkit-1/extensions/libnullbackend.a	44	@(,,4755) lib/polkit-1/polkit-agent-helper-1
61	lib/polkit-1/extensions/libnullbackend.so	45	lib/polkit-1/polkitd
62	libdata/pkgconfig/polkit-agent-1.pc	46	libdata/pkgconfig/polkit-agent-1.pc
63	libdata/pkgconfig/polkit-backend-1.pc
64	libdata/pkgconfig/polkit-gobject-1.pc	47	libdata/pkgconfig/polkit-gobject-1.pc
65	libexec/polkit-agent-helper-1
66	libexec/polkitd
67	%%MANPAGES%%man/man1/pkaction.1.gz	48	%%MANPAGES%%man/man1/pkaction.1.gz
68	%%MANPAGES%%man/man1/pkcheck.1.gz	49	%%MANPAGES%%man/man1/pkcheck.1.gz
69	%%MANPAGES%%man/man1/pkexec.1.gz	50	%%MANPAGES%%man/man1/pkexec.1.gz
70	%%MANPAGES%%man/man1/pkttyagent.1.gz	51	%%MANPAGES%%man/man1/pkttyagent.1.gz
71	%%MANPAGES%%man/man8/pklocalauthority.8.gz
72	%%MANPAGES%%man/man8/polkit.8.gz	52	%%MANPAGES%%man/man8/polkit.8.gz
73	%%MANPAGES%%man/man8/polkitd.8.gz	53	%%MANPAGES%%man/man8/polkitd.8.gz
74	share/dbus-1/system-services/org.freedesktop.PolicyKit1.service	54	share/dbus-1/system-services/org.freedesktop.PolicyKit1.service
75	share/gir-1.0/Polkit-1.0.gir	55	share/gir-1.0/Polkit-1.0.gir
76	share/gir-1.0/PolkitAgent-1.0.gir	56	share/gir-1.0/PolkitAgent-1.0.gir
		57	share/locale/cs/LC_MESSAGES/polkit-1.mo
77	share/locale/da/LC_MESSAGES/polkit-1.mo	58	share/locale/da/LC_MESSAGES/polkit-1.mo
78	share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy
79	share/polkit-1/actions/org.freedesktop.policykit.policy	59	share/polkit-1/actions/org.freedesktop.policykit.policy
80	@dir share/polkit-1/rules.d	60	@dir(polkitd,,700) etc/polkit-1/rules.d
81	@dir etc/polkit-1/localauthority/90-mandatory.d	61	@dir(polkitd,,700) share/polkit-1/rules.d
82	@dir etc/polkit-1/localauthority/50-local.d
83	@dir etc/polkit-1/localauthority/30-site.d
84	@dir etc/polkit-1/localauthority/20-org.d
85	@dir etc/polkit-1/localauthority/10-vendor.d
86	@dir /var/lib/polkit-1/localauthority/90-mandatory.d
87	@dir /var/lib/polkit-1/localauthority/50-local.d
88	@dir /var/lib/polkit-1/localauthority/30-site.d
89	@dir /var/lib/polkit-1/localauthority/20-org.d
90	@dir /var/lib/polkit-1/localauthority/10-vendor.d
91	@dir /var/lib/polkit-1/localauthority
92	@dir /var/lib/polkit-1	62	@dir /var/lib/polkit-1
93	@dir /var/lib	63	@dir /var/lib