Index: head/sysutils/polkit/Makefile =================================================================== --- head/sysutils/polkit/Makefile (revision 393788) +++ head/sysutils/polkit/Makefile (revision 393789) @@ -1,60 +1,64 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= polkit -PORTVERSION= 0.105 -PORTREVISION= 7 +PORTVERSION= 0.113 CATEGORIES= sysutils gnome MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Framework for controlling access to system-wide components -LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +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 pathfix pkgconfig +USERS= polkitd +GROUPS= polkitd + +USE_GNOME= glib20 intlhack introspection:build +USES= gettext gmake libtool pathfix pkgconfig shebangfix +SHEBANG_FILES= ${WRKSRC}/src/polkitbackend/toarray.pl 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 \ + --with-mozjs=mozjs-17.0 \ + --disable-libsystemd-login \ + --disable-test \ + --enable-introspection=yes \ --localstatedir=/var -MAKE_JOBS_UNSAFE=yes -CONFIGURE_ENV= GTKDOC="false" +#MAKE_JOBS_UNSAFE=yes 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 \ ${WRKSRC}/src/examples/org.freedesktop.policykit.examples.pkexec.policy.in + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \ + ${WRKSRC}/docs/man/polkit.xml 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 Index: head/sysutils/polkit/distinfo =================================================================== --- head/sysutils/polkit/distinfo (revision 393788) +++ head/sysutils/polkit/distinfo (revision 393789) @@ -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 Index: head/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in =================================================================== --- head/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in (revision 393788) +++ head/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in (nonexistent) @@ -1,23 +0,0 @@ ---- 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 - Property changes on: head/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c =================================================================== --- head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c (revision 393788) +++ head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c (nonexistent) @@ -1,23 +0,0 @@ ---- 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; - } Property changes on: head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/polkit/files/patch-data_Makefile.in =================================================================== --- head/sysutils/polkit/files/patch-data_Makefile.in (revision 393788) +++ head/sysutils/polkit/files/patch-data_Makefile.in (nonexistent) @@ -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 Property changes on: head/sysutils/polkit/files/patch-data_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c =================================================================== --- head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c (revision 393788) +++ head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/polkitbackend/polkitbackendinteractiveauthority.c.orig 2012-05-15 21:52:38.000000000 +0200 -+++ src/polkitbackend/polkitbackendinteractiveauthority.c 2012-05-15 21:52:49.000000000 +0200 -@@ -279,7 +279,7 @@ - static volatile GQuark domain = 0; - - /* Force registering error domain */ -- domain = POLKIT_ERROR; domain; -+ domain = POLKIT_ERROR; - - priv = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_PRIVATE (authority); - Property changes on: head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/polkit/files/patch-src_polkitd_gposixsignal.c =================================================================== --- head/sysutils/polkit/files/patch-src_polkitd_gposixsignal.c (revision 393788) +++ head/sysutils/polkit/files/patch-src_polkitd_gposixsignal.c (nonexistent) @@ -1,40 +0,0 @@ ---- 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 -+#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; Property changes on: head/sysutils/polkit/files/patch-src_polkitd_gposixsignal.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c =================================================================== --- head/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c (revision 393788) +++ head/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c (nonexistent) @@ -1,12 +0,0 @@ ---- 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); - } Property changes on: head/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/polkit/files/patch-Makefile.in =================================================================== --- head/sysutils/polkit/files/patch-Makefile.in (revision 393788) +++ head/sysutils/polkit/files/patch-Makefile.in (revision 393789) @@ -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 Index: head/sysutils/polkit/files/patch-docs_man_polkit.xml =================================================================== --- head/sysutils/polkit/files/patch-docs_man_polkit.xml (nonexistent) +++ head/sysutils/polkit/files/patch-docs_man_polkit.xml (revision 393789) @@ -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) +