1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-14 03:10:47 +00:00

Update polkit to 0.114.

* Use spidermonkey52 instead of the ancient 17.0 version.

Obtained from:	gnome devel repo
This commit is contained in:
Koop Mast 2018-05-24 20:46:54 +00:00
parent 2219ead739
commit b110077a7c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=470808
5 changed files with 57 additions and 59 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= polkit
PORTVERSION= 0.113
PORTREVISION= 5
PORTVERSION= 0.114
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/
@ -14,14 +13,14 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libexpat.so:textproc/expat2 \
libmozjs-17.0.so:lang/spidermonkey170
libmozjs-52.so:lang/spidermonkey52
RUN_DEPENDS= dbus-launch:devel/dbus
USERS= polkitd
GROUPS= polkitd
USE_GNOME= glib20 intlhack introspection:build
USES= gettext gmake libtool pathfix pkgconfig shebangfix
USES= gettext gmake libtool localbase pathfix pkgconfig shebangfix
SHEBANG_FILES= ${WRKSRC}/src/polkitbackend/toarray.pl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
@ -33,14 +32,12 @@ CONFIGURE_ARGS= --disable-gtk-doc-html \
--with-polkitd-user=${USERS} \
--disable-static \
--disable-examples \
--with-mozjs=mozjs-17.0 \
--disable-libsystemd-login \
--disable-libelogind \
--disable-test \
--enable-introspection=yes \
--localstatedir=/var
#MAKE_JOBS_UNSAFE=yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= MANPAGES
@ -56,7 +53,7 @@ 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' \
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
${WRKSRC}/docs/man/polkit.xml
post-install:

View File

@ -1,2 +1,3 @@
SHA256 (polkit-0.113.tar.gz) = e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81
SIZE (polkit-0.113.tar.gz) = 1448865
TIMESTAMP = 1525103481
SHA256 (polkit-0.114.tar.gz) = bdf4007367d758fd794de2495975c115984d206267e52d1e6ac5ceea77e8ede6
SIZE (polkit-0.114.tar.gz) = 1557340

View File

@ -1,11 +0,0 @@
--- 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

View File

@ -1,57 +1,45 @@
--- docs/man/polkit.xml.orig 2013-05-06 18:28:21 UTC
--- docs/man/polkit.xml.orig 2018-01-20 14:00:19 UTC
+++ docs/man/polkit.xml
@@ -100,17 +100,17 @@ System Context |
| polkitd(8) |
+------------------+
| org.freedesktop. |
-| PolicyKit1 |<---------+
-+------------------+ |
- ^ |
- | +--------------------------------------+
@@ -104,12 +104,12 @@ System Context | |
+------------------+ |
^ |
| +--------------------------------------+
- | | /usr/share/polkit-1/actions/*.policy |
- | +--------------------------------------+
+| PolicyKit1 |<------+
++------------------+ |
+ ^ |
+ | +--------------------------------------------+
+ | | /usr/local/share/polkit-1/actions/*.policy |
+ | +--------------------------------------------+
+ | | %%LOCALBASE%%/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 |
+ +------------------------------------------------+
+ | %%LOCALBASE%%/etc/polkit-1/rules.d/*.rules |
+ | %%LOCALBASE%%/share/polkit-1/rules.d/*.rules |
+--------------------------------------+
]]></programlisting>
</textobject>
</mediaobject>
@@ -217,7 +217,7 @@ System Context |
@@ -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>
+ class='directory'>%%LOCALBASE%%/share/polkit-1/actions</filename>
directory.
</para>
@@ -473,21 +473,21 @@ System Context |
@@ -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>
+ <filename class='directory'>%%LOCALBASE%%/etc/polkit-1/rules.d</filename> and
+ <filename class='directory'>%%LOCALBASE%%/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>
+ <filename class='directory'>%%LOCALBASE%%/etc</filename>
are processed before files in
- <filename class='directory'>/usr</filename>).
+ <filename class='directory'>/usr/local/share</filename>).
+ <filename class='directory'>%%LOCALBASE/share</filename>).
For example, for the following four
files, the order is
</para>
@ -60,25 +48,34 @@
- <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>
+ <listitem><para><filename>%%LOCALBASE%%/etc/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
+ <listitem><para><filename>%%LOCALBASE%%/share/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
+ <listitem><para><filename>%%LOCALBASE%%/etc/polkit-1/rules.d/15-auth.rules</filename></para></listitem>
+ <listitem><para><filename>%%LOCALBASE%%/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)
@@ -567,7 +567,7 @@ System Context | |
called in the order they have been added until one of the
functions returns a value. Hence, to add an authorization rule
that is processed before other rules, put it in a file in
- <filename class='directory'>/etc/polkit-1/rules.d</filename>
+ <filename class='directory'>%%LOCALBASE%%/etc/polkit-1/rules.d</filename>
with a name that sorts before other rules files, for example
<filename>00-early-checks.rules</filename>. Each function should
return a value from <literal>polkit.Result</literal>
@@ -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]
+May 24 14:28:50 thinkpad polkitd[32217]: %%LOCALBASE%%/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]: %%LOCALBASE%%/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)
@@ -916,7 +916,7 @@ polkit.addRule(function(action, subject) {
<programlisting><![CDATA[
polkit.addRule(function(action, subject) {
if (action.id == "org.freedesktop.policykit.exec" &&

View File

@ -52,10 +52,24 @@ libdata/pkgconfig/polkit-gobject-1.pc
%%MANPAGES%%man/man8/polkit.8.gz
%%MANPAGES%%man/man8/polkitd.8.gz
share/dbus-1/system-services/org.freedesktop.PolicyKit1.service
share/gettext/its/polkit.its
share/gettext/its/polkit.loc
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/locale/de/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/pl/LC_MESSAGES/polkit-1.mo
share/locale/pt_BR/LC_MESSAGES/polkit-1.mo
share/locale/sk/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
share/locale/zh_CN/LC_MESSAGES/polkit-1.mo
share/locale/zh_TW/LC_MESSAGES/polkit-1.mo
share/polkit-1/actions/org.freedesktop.policykit.policy
@dir(polkitd,,700) etc/polkit-1/rules.d
@dir(polkitd,,700) share/polkit-1/rules.d