--- GIDs (revision 391365) +++ GIDs (working copy) @@ -205,6 +205,7 @@ polkit:*:562: pulse:*:563: pulse-access:*:564: +polkitd:*:565: assp:*:587: avahi-autoipd:*:588: _xsi:*:600: --- UIDs (revision 391365) +++ UIDs (working copy) @@ -210,6 +210,7 @@ distcc:*:561:561::0:0:Distcc user:/nonexistent:/usr/sbin/nologin polkit:*:562:562::0:0:PolicyKit User:/nonexistent:/usr/sbin/nologin pulse:*:563:563::0:0:PulseAudio System User:/nonexistent:/usr/sbin/nologin +polkitd:*:565:565::0:0:Polkit Daemon User:/var/empty:/usr/sbin/nologin assp:*:587:587::0:0:ASSP Anti-Spam Proxy:/var/db/assp:/usr/sbin/nologin avahi-autoipd:*:588:588::0:0:Avahi Autoipd Daemon user:/nonexistent:/usr/sbin/nologin _xsi:*:600:600::0:0:XMLSysInfo User:/nonexistent:/usr/sbin/nologin --- sysutils/polkit/Makefile (revision 391365) +++ sysutils/polkit/Makefile (working copy) @@ -3,8 +3,7 @@ # $MCom: ports/trunk/sysutils/polkit/Makefile 19013 2014-03-08 07:50:57Z kwm $ PORTNAME= polkit -PORTVERSION= 0.105 -PORTREVISION= 5 +PORTVERSION= 0.113 CATEGORIES= sysutils gnome MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/ @@ -11,40 +10,43 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Framework for controlling access to system-wide components -LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 +LICENSE= GPLv2 + +LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ + libmozjs-17.0.so:${PORTSDIR}/lang/spidermonkey170 RUN_DEPENDS= dbus-launch:${PORTSDIR}/devel/dbus -USE_GNOME= glib20 intlhack introspection -USES= gettext gmake libtool:keepla pathfix pkgconfig +USERS= polkitd +GROUPS= polkitd + +USE_GNOME= glib20 intlhack introspection:build +USES= gettext gmake libtool pathfix pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-gtk-doc \ +CONFIGURE_ARGS= --disable-gtk-doc-html \ + --without-html-dir \ --with-authfw=pam \ --with-pam-include=system \ --with-os-type=freebsd \ - --disable-systemd \ - --enable-introspection \ + --with-polkitd-user=${USERS} \ + --disable-static \ + --disable-examples \ + --disable-libsystemd-login \ + --disable-test \ + --enable-introspection=yes \ --localstatedir=/var MAKE_JOBS_UNSAFE=yes -CONFIGURE_ENV= GTKDOC="false" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip OPTIONS_DEFINE= MANPAGES +MANPAGES_BUILD_DEPENDS= docbook-sgml>=4.5:${PORTSDIR}/textproc/docbook-sgml \ + docbook-xsl>=1.76:${PORTSDIR}/textproc/docbook-xsl +MANPAGES_USE= gnome=libxslt:build +MANPAGES_CONFIGURE_ENABLE= man-pages +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MMANPAGES} -BUILD_DEPENDS+= docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \ - ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl - -USE_GNOME+= libxslt:build -PLIST_SUB+= MANPAGES="" -.else -CONFIGURE_ARGS+=--disable-man-pages -PLIST_SUB+= MANPAGES="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|g' \ ${WRKSRC}/docs/man/pkexec.xml \ @@ -51,11 +53,8 @@ ${WRKSRC}/src/examples/org.freedesktop.policykit.examples.pkexec.policy.in post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/ - @${MKDIR} ${STAGEDIR}${PREFIX}/share/polkit-1/rules.d/ + @${MKDIR} ${STAGEDIR}/var/lib/polkit-1 ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \ - ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/polkit-1/extensions/lib*.so + ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.sample .include --- sysutils/polkit/distinfo (revision 391365) +++ sysutils/polkit/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (polkit-0.105.tar.gz) = 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df -SIZE (polkit-0.105.tar.gz) = 1431080 +SHA256 (polkit-0.113.tar.gz) = e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81 +SIZE (polkit-0.113.tar.gz) = 1448865 --- sysutils/polkit/files/patch-Makefile.in (revision 391365) +++ sysutils/polkit/files/patch-Makefile.in (working copy) @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2012-05-15 22:09:33.000000000 +0200 -+++ Makefile.in 2012-05-15 22:10:16.000000000 +0200 -@@ -292,7 +292,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = actions data src docs po test -+SUBDIRS = actions data src docs po - NULL = - EXTRA_DIST = \ - HACKING \ +--- Makefile.in.orig 2015-06-19 20:31:12 UTC ++++ Makefile.in +@@ -157,7 +157,7 @@ am__define_uniq_tagged_files = \ + ETAGS = etags + CTAGS = ctags + CSCOPE = cscope +-DIST_SUBDIRS = actions data src docs po test ++DIST_SUBDIRS = actions data src docs po + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ + COPYING ChangeLog INSTALL NEWS README compile config.guess \ + config.sub depcomp install-sh ltmain.sh missing --- sysutils/polkit/files/patch-data_Makefile.in (revision 391365) +++ sysutils/polkit/files/patch-data_Makefile.in (working copy) @@ -1,11 +0,0 @@ ---- data/Makefile.in.orig 2009-08-01 16:02:38.000000000 +0200 -+++ data/Makefile.in 2009-08-01 16:05:13.000000000 +0200 -@@ -471,7 +471,7 @@ - - info-am: - --install-data-am: install-dbusconfDATA install-pamDATA \ -+install-data-am: install-pamDATA \ - install-pkgconfigDATA install-serviceDATA - - install-dvi: install-dvi-am --- sysutils/polkit/files/patch-docs_man_polkit.xml (revision 0) +++ sysutils/polkit/files/patch-docs_man_polkit.xml (working copy) @@ -0,0 +1,89 @@ +--- 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 | ++ +------------------------------------------------+ + ]]> + + +@@ -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 /usr/share/polkit-1/actions ++ class='directory'>/usr/local/share/polkit-1/actions + directory. + + +@@ -473,21 +473,21 @@ System Context | + + polkitd reads + .rules files from the +- /etc/polkit-1/rules.d and +- /usr/share/polkit-1/rules.d ++ /usr/local/etc/polkit-1/rules.d and ++ /usr/local/share/polkit-1/rules.d + directories by sorting the files in lexical order based on the + basename on each file (if there's a tie, files in +- /etc ++ /usr/local/etc + are processed before files in +- /usr). ++ /usr/local/share). + For example, for the following four + files, the order is + + +- /etc/polkit-1/rules.d/10-auth.rules +- /usr/share/polkit-1/rules.d/10-auth.rules +- /etc/polkit-1/rules.d/15-auth.rules +- /usr/share/polkit-1/rules.d/20-auth.rules ++ /usr/local/etc/polkit-1/rules.d/10-auth.rules ++ /usr/local/share/polkit-1/rules.d/10-auth.rules ++ /usr/local/etc/polkit-1/rules.d/15-auth.rules ++ /usr/local/share/polkit-1/rules.d/20-auth.rules + + + 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: + + + + +@@ -916,7 +916,7 @@ polkit.addRule(function(action, subject) + -+#ifdef __FreeBSD__ -+#include -+#include -+#include -+#else - #include -+#endif - #include - - #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; --- sysutils/polkit/pkg-descr (revision 391365) +++ sysutils/polkit/pkg-descr (working copy) @@ -1,4 +1,4 @@ -PolicyKit is a framework for defining policy for system-wide components and -for desktop pieces to configure it. It is used by HAL. +Polkit is a toolkit for defining and handling authorizations. It is used +for allowing unprivileged processes to speak to privileged processes. WWW: http://www.freedesktop.org/wiki/Software/polkit --- sysutils/polkit/pkg-install (revision 391365) +++ sysutils/polkit/pkg-install (working copy) @@ -1,16 +0,0 @@ -#!/bin/sh - -case $2 in -POST-INSTALL) - /bin/mkdir -p /var/lib/polkit-1/localauthority - /bin/mkdir -p ${PKG_PREFIX}/etc/polkit-1/localauthority - /bin/mkdir -p ${PKG_PREFIX}/share/polkit-1/rules.d - for i in 10-vendor.d 20-org.d 30-site.d 50-local.d 90-mandatory.d; do - /bin/mkdir -p /var/lib/polkit-1/localauthority/${i} - /bin/mkdir -p ${PKG_PREFIX}/etc/polkit-1/localauthority/${i} - done - /bin/chmod 0700 /var/lib/polkit-1 - /bin/chmod 0700 ${PKG_PREFIX}/etc/polkit-1 - exit 0 - ;; -esac --- sysutils/polkit/pkg-plist (revision 391365) +++ sysutils/polkit/pkg-plist (working copy) @@ -1,18 +1,14 @@ -bin/pk-example-frobnicate bin/pkaction bin/pkcheck -bin/pkexec +@(,,4755) bin/pkexec bin/pkttyagent -@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 -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 +@sample etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.sample etc/pam.d/polkit-1 -etc/polkit-1/localauthority.conf.d/50-localauthority.conf -etc/polkit-1/nullbackend.conf.d/50-nullbackend.conf +etc/polkit-1/rules.d/50-default.rules 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 @@ -35,63 +31,33 @@ 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.la 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.la -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.la lib/libpolkit-gobject-1.so lib/libpolkit-gobject-1.so.0 lib/libpolkit-gobject-1.so.0.0.0 -lib/polkit-1/extensions/libnullbackend.a -lib/polkit-1/extensions/libnullbackend.la -lib/polkit-1/extensions/libnullbackend.so +@(,,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 share/polkit-1/rules.d -@dir etc/polkit-1/localauthority/90-mandatory.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(polkitd,,700) etc/polkit-1/rules.d +@dir(polkitd,,700) share/polkit-1/rules.d @dir /var/lib/polkit-1 @dir /var/lib