.pkla
- extension from all directories located inside the
- /etc/polkit-1/localauthority
-- and /var/lib/polkit-1/localauthority
-+ and /var/db/polkit-1/localauthority
- directories. By default, the following sub-directories are installed.
-
- -@@ -114,7 +114,7 @@ - and - ---/var/lib/polkit-1/ -+/var/db/polkit-1/ - `-- localauthority - |-- 10-vendor.d - |-- 20-org.d -@@ -125,7 +125,7 @@ -- The
-/etc/polkit-1/localauthorityhierarchy - is inteded for local configuration and -- the/var/lib/polkit-1/localauthorityis -+ the/var/db/polkit-1/localauthorityis - intended for 3rd party packages. --@@ -277,7 +277,7 @@ - the following rules. First all the basename of all - sub-directories (e.g. 30-site.d) from both - the
-/etc/polkit-1/localauthority-- and/var/lib/polkit-1/localauthority-+ and/var/db/polkit-1/localauthority- directories are enumerated and sorted (using the C locale). If a - name exists in both/etc- and/var, the one -@@ -291,7 +291,7 @@ - For example, given the following files ---/var/lib/polkit-1 -+/var/db/polkit-1 - └── localauthority - ├── 10-vendor.d - │ └── 10-desktop-policy.pkla diff --git a/sysutils/polkit/patches/patch-src_polkitbackend_Makefile_am b/sysutils/polkit/patches/patch-src_polkitbackend_Makefile_am deleted file mode 100644 index b833cded79f..00000000000 --- a/sysutils/polkit/patches/patch-src_polkitbackend_Makefile_am +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_polkitbackend_Makefile_am,v 1.2 2011/04/28 13:09:07 ajacoutot Exp $ ---- src/polkitbackend/Makefile.am.orig Mon Aug 9 20:49:57 2010 -+++ src/polkitbackend/Makefile.am Tue Nov 30 12:31:18 2010 -@@ -74,10 +74,4 @@ clean-local : - rm -f *~ $(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)/polkit-1 -- mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/localauthority/{10-vendor.d,20-org.d,30-site.d,50-local.d,90-mandatory.d} -- -chmod 700 $(DESTDIR)$(sysconfdir)/polkit-1/localauthority - mkdir -p $(DESTDIR)$(libdir)/polkit-1/extensions diff --git a/sysutils/polkit/patches/patch-src_polkitbackend_polkitbackendlocalauthority_c b/sysutils/polkit/patches/patch-src_polkitbackend_polkitbackendlocalauthority_c index c94c01dad95..bab608fc6e1 100644 --- a/sysutils/polkit/patches/patch-src_polkitbackend_polkitbackendlocalauthority_c +++ b/sysutils/polkit/patches/patch-src_polkitbackend_polkitbackendlocalauthority_c @@ -1,21 +1,37 @@ -$OpenBSD: patch-src_polkitbackend_polkitbackendlocalauthority_c,v 1.3 2011/07/12 18:39:07 ajacoutot Exp $ ---- src/polkitbackend/polkitbackendlocalauthority.c.orig Tue Jul 12 20:37:27 2011 -+++ src/polkitbackend/polkitbackendlocalauthority.c Tue Jul 12 20:38:00 2011 -@@ -186,7 +186,7 @@ add_all_authorization_stores (PolkitBackendLocalAuthor - error = NULL; +$OpenBSD: patch-src_polkitbackend_polkitbackendlocalauthority_c,v 1.4 2012/02/16 22:28:23 ajacoutot Exp $ +--- src/polkitbackend/polkitbackendlocalauthority.c.orig Tue Jan 3 15:45:22 2012 ++++ src/polkitbackend/polkitbackendlocalauthority.c Wed Feb 8 17:51:32 2012 +@@ -23,7 +23,11 @@ + #include+ #include + #include ++#if defined __OpenBSD__ ++#include ++#else + #include ++#endif + #include + #include + #include +@@ -700,15 +704,20 @@ get_users_in_net_group (PolkitIdentity + ret = NULL; + name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group)); - if (n == 0) -- toplevel_path = PACKAGE_LOCALSTATE_DIR "/lib/polkit-1/localauthority"; -+ toplevel_path = PACKAGE_LOCALSTATE_DIR "/db/polkit-1/localauthority"; - else - toplevel_path = PACKAGE_SYSCONF_DIR "/polkit-1/localauthority"; ++/* Under BSD, setnetgrent() returns void. */ ++#if defined __OpenBSD__ ++ setnetgrent (name); ++#else + if (setnetgrent (name) == 0) + { + g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno)); + goto out; + } ++#endif -@@ -296,7 +296,7 @@ polkit_backend_local_authority_init (PolkitBackendLoca - GError *error; - - if (n == 0) -- toplevel_path = PACKAGE_LOCALSTATE_DIR "/lib/polkit-1/localauthority"; -+ toplevel_path = PACKAGE_LOCALSTATE_DIR "/db/polkit-1/localauthority"; - else - toplevel_path = PACKAGE_SYSCONF_DIR "/polkit-1/localauthority"; + for (;;) + { +- char *hostname, *username, *domainname; ++ const char *hostname, *username, *domainname; + PolkitIdentity *user; + GError *error = NULL; diff --git a/sysutils/polkit/patches/patch-src_polkitbackend_polkitbackendlocalauthorizationstore_c b/sysutils/polkit/patches/patch-src_polkitbackend_polkitbackendlocalauthorizationstore_c new file mode 100644 index 00000000000..d0b643edbd9 --- /dev/null +++ b/sysutils/polkit/patches/patch-src_polkitbackend_polkitbackendlocalauthorizationstore_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-src_polkitbackend_polkitbackendlocalauthorizationstore_c,v 1.3 2012/02/16 22:28:23 ajacoutot Exp $ +--- src/polkitbackend/polkitbackendlocalauthorizationstore.c.orig Tue Jan 3 15:45:22 2012 ++++ src/polkitbackend/polkitbackendlocalauthorizationstore.c Wed Feb 8 17:46:48 2012 +@@ -21,7 +21,11 @@ + + #include "config.h" + ++#if defined __OpenBSD__ ++#include ++#else + #include ++#endif + #include + #include + #include "polkitbackendlocalauthorizationstore.h" diff --git a/sysutils/polkit/pkg/PLIST b/sysutils/polkit/pkg/PLIST index 6a372f5345a..5afb2d455f2 100644 --- a/sysutils/polkit/pkg/PLIST +++ b/sysutils/polkit/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2011/06/01 12:23:53 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.9 2012/02/16 22:28:23 ajacoutot Exp $ %%SHARED%% @bin bin/pk-example-frobnicate @bin bin/pkaction @@ -28,6 +28,7 @@ include/polkit-1/polkit/polkitsystembusname.h include/polkit-1/polkit/polkittemporaryauthorization.h include/polkit-1/polkit/polkittypes.h include/polkit-1/polkit/polkitunixgroup.h +include/polkit-1/polkit/polkitunixnetgroup.h include/polkit-1/polkit/polkitunixprocess.h include/polkit-1/polkit/polkitunixsession.h include/polkit-1/polkit/polkitunixuser.h @@ -83,9 +84,9 @@ share/examples/polkit/dbus-1/system.d/ share/examples/polkit/dbus-1/system.d/org.freedesktop.PolicyKit1.conf @sample ${SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf share/examples/polkit/polkit-1/ -@mode 0700 @sample ${SYSCONFDIR}/polkit-1/ -@sample /var/db/polkit-1/ +@mode 0700 +share/examples/polkit/polkit-1/localauthority/ @sample ${SYSCONFDIR}/polkit-1/localauthority/ @mode share/examples/polkit/polkit-1/localauthority.conf.d/ @@ -94,16 +95,41 @@ share/examples/polkit/polkit-1/localauthority.conf.d/50-localauthority.conf @sample ${SYSCONFDIR}/polkit-1/localauthority.conf.d/50-localauthority.conf share/examples/polkit/polkit-1/localauthority.conf.d/60-desktop-policy.conf @sample ${SYSCONFDIR}/polkit-1/localauthority.conf.d/60-desktop-policy.conf +share/examples/polkit/polkit-1/localauthority/10-vendor.d/ +@sample ${SYSCONFDIR}/polkit-1/localauthority/10-vendor.d/ +share/examples/polkit/polkit-1/localauthority/20-org.d/ +@sample ${SYSCONFDIR}/polkit-1/localauthority/20-org.d/ +share/examples/polkit/polkit-1/localauthority/30-site.d/ +@sample ${SYSCONFDIR}/polkit-1/localauthority/30-site.d/ +share/examples/polkit/polkit-1/localauthority/50-local.d/ +@sample ${SYSCONFDIR}/polkit-1/localauthority/50-local.d/ +share/examples/polkit/polkit-1/localauthority/90-mandatory.d/ +@sample ${SYSCONFDIR}/polkit-1/localauthority/90-mandatory.d/ share/examples/polkit/polkit-1/nullbackend.conf.d/ @sample ${SYSCONFDIR}/polkit-1/nullbackend.conf.d/ share/examples/polkit/polkit-1/nullbackend.conf.d/50-nullbackend.conf @sample ${SYSCONFDIR}/polkit-1/nullbackend.conf.d/50-nullbackend.conf share/examples/polkit/var/ share/examples/polkit/var/db/ +@mode 0700 share/examples/polkit/var/db/polkit-1/ +@sample /var/db/polkit-1/ +@mode share/examples/polkit/var/db/polkit-1/localauthority/ +@sample /var/db/polkit-1/localauthority/ share/examples/polkit/var/db/polkit-1/localauthority/10-vendor.d/ +@sample /var/db/polkit-1/localauthority/10-vendor.d/ +@mode 0644 share/examples/polkit/var/db/polkit-1/localauthority/10-vendor.d/10-desktop-policy.pkla +@mode +share/examples/polkit/var/db/polkit-1/localauthority/20-org.d/ +@sample /var/db/polkit-1/localauthority/20-org.d/ +share/examples/polkit/var/db/polkit-1/localauthority/30-site.d/ +@sample /var/db/polkit-1/localauthority/30-site.d/ +share/examples/polkit/var/db/polkit-1/localauthority/50-local.d/ +@sample /var/db/polkit-1/localauthority/50-local.d/ +share/examples/polkit/var/db/polkit-1/localauthority/90-mandatory.d/ +@sample /var/db/polkit-1/localauthority/90-mandatory.d/ share/gir-1.0/ share/gir-1.0/Polkit-1.0.gir share/gir-1.0/PolkitAgent-1.0.gir @@ -112,16 +138,3 @@ share/polkit-1/ share/polkit-1/actions/ share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy share/polkit-1/actions/org.freedesktop.policykit.policy -@mode 0700 -@sample /var/db/polkit-1/localauthority/ -@mode -@sample ${SYSCONFDIR}/polkit-1/localauthority/10-vendor.d/ -@sample /var/db/polkit-1/localauthority/10-vendor.d/ -@sample ${SYSCONFDIR}/polkit-1/localauthority/20-org.d/ -@sample /var/db/polkit-1/localauthority/20-org.d/ -@sample ${SYSCONFDIR}/polkit-1/localauthority/30-site.d/ -@sample /var/db/polkit-1/localauthority/30-site.d/ -@sample ${SYSCONFDIR}/polkit-1/localauthority/50-local.d/ -@sample /var/db/polkit-1/localauthority/50-local.d/ -@sample ${SYSCONFDIR}/polkit-1/localauthority/90-mandatory.d/ -@sample /var/db/polkit-1/localauthority/90-mandatory.d/