Attachment 31607 Details for Bug 25367 – patch against git tree (as of nov 13)

[patch] patch against git tree (as of nov 13)

polkit-0.95-git-use_etc_for_pkla.patch (text/plain), 3.30 KB, created by Matthew Miller on 2009-11-30 10:54:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Miller

Created: 2009-11-30 10:54:37 UTC

Size: 3.30 KB

patch

obsolete

>diff -ur PolicyKit.orig/configure.ac PolicyKit/configure.ac
>--- PolicyKit.orig/configure.ac	2009-11-24 11:34:11.000000000 -0500
>+++ PolicyKit/configure.ac	2009-11-24 11:41:27.000000000 -0500
>@@ -484,7 +484,7 @@
> 
> "
> 
>-echo "NOTE: The directory ${localstatedir}/lib/polkit-1 must be owned"
>+echo "NOTE: The directory ${sysconfdir}/security/polkit-1 must be owned"
> echo "      by root and have mode 700"
> echo
> 
>diff -ur PolicyKit.orig/docs/man/pklocalauthority.xml PolicyKit/docs/man/pklocalauthority.xml
>--- PolicyKit.orig/docs/man/pklocalauthority.xml	2009-11-24 11:34:11.000000000 -0500
>+++ PolicyKit/docs/man/pklocalauthority.xml	2009-11-24 11:44:14.000000000 -0500
>@@ -94,7 +94,7 @@
>       extension from the following directories
>     </para>
>     <programlisting>
>-/var/lib/polkit-1/
>+/etc/security/polkit-1/
> `-- localauthority
>     |-- 10-vendor.d
>     |-- 20-org.d
>diff -ur PolicyKit.orig/src/polkitbackend/Makefile.am PolicyKit/src/polkitbackend/Makefile.am
>--- PolicyKit.orig/src/polkitbackend/Makefile.am	2009-11-24 11:34:11.000000000 -0500
>+++ PolicyKit/src/polkitbackend/Makefile.am	2009-11-24 11:41:46.000000000 -0500
>@@ -100,7 +100,7 @@
> 	rm -f *~ $(ck_built_sources) $(BUILT_SOURCES)
> 
> 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}
>-	-chmod 700 $(DESTDIR)$(localstatedir)/lib/polkit-1
>+	mkdir -p $(DESTDIR)$(sysconfdir)/security/polkit-1
>+	mkdir -p $(DESTDIR)$(sysconfdir)/security/polkit-1/localauthority/{10-vendor.d,20-org.d,30-site.d,50-local.d,90-mandatory.d}
>+	-chmod 700 $(DESTDIR)$(sysconfdir)/security/polkit-1
> 	mkdir -p $(DESTDIR)$(libdir)/polkit-1/extensions
>diff -ur PolicyKit.orig/src/polkitbackend/polkitbackendlocalauthority.c PolicyKit/src/polkitbackend/polkitbackendlocalauthority.c
>--- PolicyKit.orig/src/polkitbackend/polkitbackendlocalauthority.c	2009-11-24 11:34:11.000000000 -0500
>+++ PolicyKit/src/polkitbackend/polkitbackendlocalauthority.c	2009-11-24 11:44:06.000000000 -0500
>@@ -140,10 +140,15 @@
>   const gchar *store_locations[] =
>     {
>       PACKAGE_LOCALSTATE_DIR "/lib/polkit-1/localauthority/10-vendor.d",
>+      PACKAGE_SYSCONF_DIR "/security/polkit-1/localauthority/10-vendor.d",
>       PACKAGE_LOCALSTATE_DIR "/lib/polkit-1/localauthority/20-org.d",
>+      PACKAGE_SYSCONF_DIR "/security/polkit-1/localauthority/20-org.d",
>       PACKAGE_LOCALSTATE_DIR "/lib/polkit-1/localauthority/30-site.d",
>+      PACKAGE_SYSCONF_DIR "/security/polkit-1/localauthority/30-site.d",
>       PACKAGE_LOCALSTATE_DIR "/lib/polkit-1/localauthority/50-local.d",
>+      PACKAGE_SYSCONF_DIR "/security/polkit-1/localauthority/50-local.d",
>       PACKAGE_LOCALSTATE_DIR "/lib/polkit-1/localauthority/90-mandatory.d",
>+      PACKAGE_SYSCONF_DIR "/security/polkit-1/localauthority/90-mandatory.d",
>       NULL
>     };
> 
>@@ -507,8 +512,8 @@
> static gchar *
> lockdown_get_filename (const gchar *action_id)
> {
>-  return g_strdup_printf (PACKAGE_LOCALSTATE_DIR
>-                          "/lib/polkit-1/localauthority/90-mandatory.d/"
>+  return g_strdup_printf (PACKAGE_SYSCONF_DIR
>+                          "/security/polkit-1/localauthority/90-mandatory.d/"
>                           "org.freedesktop.policykit.localauthority.lockdown.action-%s.pkla",
>                           action_id);
> }

Actions: View | Splinter Review

Attachments on bug 25367: 31607

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.