FreeBSD Bugzilla – Attachment 154242 Details for
Bug 198540
sysutils/policykit: use @sample, fix install from non-root
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
policykit.patch (text/plain), 3.27 KB, created by
Dmitry Marakasov
on 2015-03-12 10:55:05 UTC
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Dmitry Marakasov
Created:
2015-03-12 10:55:05 UTC
Size:
3.27 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 381068) >+++ Makefile (working copy) >@@ -4,7 +4,7 @@ > > PORTNAME= policykit > PORTVERSION= 0.9 >-PORTREVISION= 8 >+PORTREVISION= 9 > CATEGORIES= sysutils gnome > MASTER_SITES= http://hal.freedesktop.org/releases/ > DISTNAME= PolicyKit-${PORTVERSION} >@@ -34,6 +34,7 @@ > > OPTIONS_DEFINE= MANPAGES > OPTIONS_DEFAULT=MANPAGES >+OPTIONS_SUB= yes > > .include <bsd.port.options.mk> > >@@ -41,21 +42,14 @@ > 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-install: > ${MKDIR} ${STAGEDIR}${PREFIX}/etc/PolicyKit >- if [ ! -f ${PREFIX}/etc/PolicyKit/PolicyKit.conf ]; then \ >- ${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \ >- ${STAGEDIR}${PREFIX}/etc/PolicyKit/PolicyKit.conf ; \ >- fi > ${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \ >- ${STAGEDIR}${PREFIX}/etc/PolicyKit/PolicyKit.conf.dist >+ ${STAGEDIR}${PREFIX}/etc/PolicyKit/PolicyKit.conf.sample > # this file is used for reloading rules, handle it in the plist. > @${RM} ${STAGEDIR}/var/lib/misc/PolicyKit.reload > @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.* >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 381068) >+++ pkg-plist (working copy) >@@ -2,9 +2,7 @@ > bin/polkit-auth > bin/polkit-config-file-validate > bin/polkit-policy-file-validate >-@unexec if cmp -s %D/etc/PolicyKit/PolicyKit.conf %D/etc/PolicyKit/PolicyKit.conf.dist; then rm -f %D/etc/PolicyKit/PolicyKit.conf ; fi >-etc/PolicyKit/PolicyKit.conf.dist >-@exec [ -f %B/PolicyKit.conf ] || cp %B/%f %B/PolicyKit.conf >+@sample etc/PolicyKit/PolicyKit.conf.sample > etc/dbus-1/system.d/org.freedesktop.PolicyKit.conf > etc/pam.d/polkit > etc/profile.d/polkit-bash-completion.sh >@@ -47,13 +45,13 @@ > libdata/pkgconfig/polkit-dbus.pc > libdata/pkgconfig/polkit-grant.pc > libdata/pkgconfig/polkit.pc >-libexec/polkit-explicit-grant-helper >-libexec/polkit-grant-helper >-libexec/polkit-grant-helper-pam >-libexec/polkit-read-auth-helper >-libexec/polkit-resolve-exe-helper >-libexec/polkit-revoke-helper >-libexec/polkit-set-default-helper >+@(,polkit,2755) libexec/polkit-explicit-grant-helper >+@(,polkit,2755) libexec/polkit-grant-helper >+@(,polkit,4754) libexec/polkit-grant-helper-pam >+@(,polkit,2755) libexec/polkit-read-auth-helper >+@(,wheel,4755) libexec/polkit-resolve-exe-helper >+@(,polkit,2755) libexec/polkit-revoke-helper >+@(,polkit,4755) libexec/polkit-set-default-helper > libexec/polkitd-old > %%MANPAGES%%man/man1/polkit-action.1.gz > %%MANPAGES%%man/man1/polkit-auth.1.gz >@@ -65,9 +63,9 @@ > share/PolicyKit/policy/org.freedesktop.policykit.policy > share/dbus-1/interfaces/org.freedesktop.PolicyKit.AuthenticationAgent.xml > share/dbus-1/system-services/org.freedesktop.PolicyKit.service >-@rmtry /var/lib/misc/PolicyKit.reload >-@dir /var/run/PolicyKit >-@dir /var/lib/PolicyKit >-@dir /var/lib/PolicyKit-public >+@rmtry(polkit,polkit,664) /var/lib/misc/PolicyKit.reload >+@dir(,polkit,770) /var/run/PolicyKit >+@dir(,polkit,770) /var/lib/PolicyKit >+@dir(polkit,,755) /var/lib/PolicyKit-public > @dir /var/lib/misc > @dir /var/lib
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
kwm
:
maintainer-approval-
Actions:
View
|
Diff
Attachments on
bug 198540
: 154242