PolicyKit: Branch 'master' - 8 commits
David Zeuthen
david at kemper.freedesktop.org
Sun Sep 13 10:48:36 PDT 2009
configure.ac | 21 +++++++--------------
data/Makefile.am | 14 +++-----------
data/org.freedesktop.PolicyKit1.conf | 20 ++++++++++++++++++++
data/org.freedesktop.PolicyKit1.conf.in | 20 --------------------
src/Makefile.am | 6 +++++-
src/polkit/Makefile.am | 21 +++++++++++++++++++--
src/polkitagent/Makefile.am | 7 +++++--
src/polkitagent/polkitagentsession.c | 2 +-
src/polkitbackend/Makefile.am | 3 +++
9 files changed, 63 insertions(+), 51 deletions(-)
New commits:
commit 3b629029c313fc8d1085e297f79fbbe34d5ee503
Author: David Zeuthen <davidz at redhat.com>
Date: Sun Sep 13 13:40:16 2009 -0400
Remove POLKIT_USER from configuration summary
diff --git a/configure.ac b/configure.ac
index 4c2dd79..f3fe83a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -465,7 +465,6 @@ echo "
introspection: ${enable_introspection}
Distribution/OS: ${with_os_type}
- user for PolicyKit: ${POLKIT_USER}
authentication framework: ${POLKIT_AUTHFW}
PAM support: ${have_pam}"
commit 85e630528417abbf4e5f00e539bdf8dc5037d661
Author: Michael Biebl <biebl at debian.org>
Date: Tue Sep 1 01:38:28 2009 +0200
Don't include Polkit-1.0.gir in the dist tarball
Polkit-1.0.gir is a generated file and only built with
--enable-instrospection. So remove it from EXTRA_DIST, otherwise
"make dist" fails with --disable-introspection.
Signed-off-by: David Zeuthen <davidz at redhat.com>
diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
index f4d8a23..4b41f4e 100644
--- a/src/polkit/Makefile.am
+++ b/src/polkit/Makefile.am
@@ -169,7 +169,7 @@ Polkit-1.0.typelib: Polkit-1.0.gir $(G_IR_COMPILER)
endif # ENABLE_INTROSPECTION
-EXTRA_DIST = Polkit-1.0.gir polkitenumtypes.h.template polkitenumtypes.c.template
+EXTRA_DIST = polkitenumtypes.h.template polkitenumtypes.c.template
CLEANFILES = $(gir_DATA) $(typelibs_DATA)
dist-hook :
commit 898c8cad6fa50ad4187ebdb63e742c767ae6591a
Author: Michael Biebl <biebl at debian.org>
Date: Tue Sep 1 01:30:54 2009 +0200
Remove POLKIT_USER option
PK 1.0 no longer uses a separate user, so remove this ./configure option
which also means we no longer have to mangle the dbus policy file.
Signed-off-by: David Zeuthen <davidz at redhat.com>
diff --git a/configure.ac b/configure.ac
index 77b5055..4c2dd79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,19 +149,6 @@ if test "x$GCC" = "xyes"; then
fi
dnl ---------------------------------------------------------------------------
-dnl - User
-dnl ---------------------------------------------------------------------------
-
-AC_ARG_WITH(polkit_user,[ --with-polkit-user=<user> user for PolicyKit])
-if test -z "$with_polkit_user" ; then
- POLKIT_USER=polkituser
-else
- POLKIT_USER=$with_polkit_user
-fi
-AC_SUBST(POLKIT_USER)
-AC_DEFINE_UNQUOTED(POLKIT_USER, "$POLKIT_USER", [User for PolicyKit])
-
-dnl ---------------------------------------------------------------------------
dnl - Select which authentication framework to use
dnl ---------------------------------------------------------------------------
diff --git a/data/Makefile.am b/data/Makefile.am
index 0a6b4d8..f0beeba 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,11 +10,7 @@ $(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
dbusconfdir = $(sysconfdir)/dbus-1/system.d
-dbusconf_in_files = org.freedesktop.PolicyKit1.conf.in
-dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
-
-$(dbusconf_DATA): $(dbusconf_in_files) Makefile
- @sed -e "s|\@polkituser\@|$(POLKIT_USER)|" $< > $@
+dbusconf_DATA = org.freedesktop.PolicyKit1.conf
if POLKIT_AUTHFW_PAM
pamdir = $(sysconfdir)/pam.d
@@ -30,13 +26,9 @@ EXTRA_DIST = \
org.freedesktop.PolicyKit1.Authority.xml \
org.freedesktop.PolicyKit1.AuthenticationAgent.xml \
$(service_in_files) \
- $(dbusconf_in_files) \
- polkit-1.in \
- polkit-gobject-1.pc.in \
- polkit-backend-1.pc.in \
- polkit-agent-1.pc.in \
+ $(dbusconf_DATA) \
$(NULL)
clean-local :
- rm -f *~ $(service_DATA) $(dbusconf_DATA)
+ rm -f *~ $(service_DATA)
diff --git a/data/org.freedesktop.PolicyKit1.conf b/data/org.freedesktop.PolicyKit1.conf
new file mode 100644
index 0000000..c8ef513
--- /dev/null
+++ b/data/org.freedesktop.PolicyKit1.conf
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+ <policy user="root">
+ <allow own="org.freedesktop.PolicyKit1"/>
+ </policy>
+
+ <policy context="default">
+ <allow send_destination="org.freedesktop.PolicyKit1"/>
+ </policy>
+
+ <!-- Allow uid 0 to send messages on the org.freedesktop.PolicyKit1.AuthenticationAgent interface -->
+ <policy user="root">
+ <allow send_interface="org.freedesktop.PolicyKit1.AuthenticationAgent"/>
+ </policy>
+
+</busconfig>
diff --git a/data/org.freedesktop.PolicyKit1.conf.in b/data/org.freedesktop.PolicyKit1.conf.in
deleted file mode 100644
index c8ef513..0000000
--- a/data/org.freedesktop.PolicyKit1.conf.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
-
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
- <policy user="root">
- <allow own="org.freedesktop.PolicyKit1"/>
- </policy>
-
- <policy context="default">
- <allow send_destination="org.freedesktop.PolicyKit1"/>
- </policy>
-
- <!-- Allow uid 0 to send messages on the org.freedesktop.PolicyKit1.AuthenticationAgent interface -->
- <policy user="root">
- <allow send_interface="org.freedesktop.PolicyKit1.AuthenticationAgent"/>
- </policy>
-
-</busconfig>
commit 0caf7cb9856a36bbdc6936e50389c931d4327ef0
Author: Michael Biebl <biebl at debian.org>
Date: Tue Sep 1 01:18:42 2009 +0200
Enable silent rules
Enable silent build rules which were introduced in automake 1.11.
Signed-off-by: David Zeuthen <davidz at redhat.com>
diff --git a/configure.ac b/configure.ac
index 16f9a9d..77b5055 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,8 @@ AM_INIT_AUTOMAKE(polkit, 0.95)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
# libtool versioning - this applies to all libraries in this package
#
# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
commit ef2e1d14e8c27cd0104de256e8c7a7af295784c8
Author: Michael Biebl <biebl at debian.org>
Date: Tue Sep 1 01:16:11 2009 +0200
Make examples optional
Add --enable-examples configure switch which allows to disable the
compilation and installation of the examples.
Default is off.
diff --git a/configure.ac b/configure.ac
index 7b34692..16f9a9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,6 +414,11 @@ if test "x$enable_introspection" = xyes; then
fi
AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
+AC_ARG_ENABLE([examples],
+ AS_HELP_STRING([--enable-examples], [Build the example programs]),,
+ [enable_examples=no])
+
+AM_CONDITIONAL(BUILD_EXAMPLES, test "x$enable_examples" = "xyes")
# ********************
# Internationalization
diff --git a/src/Makefile.am b/src/Makefile.am
index a90dba2..28c7bfa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,9 @@
-SUBDIRS = polkit polkitbackend polkitagent polkitd nullbackend programs examples
+SUBDIRS = polkit polkitbackend polkitagent polkitd nullbackend programs
+
+if BUILD_EXAMPLES
+SUBDIRS += examples
+endif
clean-local :
rm -f *~
commit 784236e9f4ef2688c2c3d9a59494870b8b9d5a6e
Author: Michael Biebl <biebl at debian.org>
Date: Mon Aug 31 18:19:31 2009 +0200
Make private symbols accessible to libpolkitagent and libpolkitbackend
libpolkit{agent,backend} use private symbols from libpolkit-gobject.
As we no longer export them, the build fails.
Move those symbols into a separate noinst lib libpolkit-private, which
those three libs can link against.
Signed-off-by: David Zeuthen <davidz at redhat.com>
diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
index 2de31d6..f4d8a23 100644
--- a/src/polkit/Makefile.am
+++ b/src/polkit/Makefile.am
@@ -48,6 +48,21 @@ polkit-built-sources.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.Poli
#
polkit_built_sources = _polkitactiondescription.c _polkitactiondescription.h _polkitauthenticationagent.c _polkitauthenticationagent.h _polkitauthority.c _polkitauthority.h _polkitauthorizationresult.c _polkitauthorizationresult.h _polkitbindings.c _polkitbindings.h _polkitbindingsmarshal.c _polkitbindingsmarshal.h _polkitbindingstypes.h _polkitcheckauthorizationflags.c _polkitcheckauthorizationflags.h _polkiterror.c _polkiterror.h _polkitidentity.c _polkitidentity.h _polkitimplicitauthorization.c _polkitimplicitauthorization.h _polkitsubject.c _polkitsubject.h _polkittemporaryauthorization.c _polkittemporaryauthorization.h docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml docbook-interface-org.freedesktop.PolicyKit1.Authority.xml _polkitbindingsmarshal.list
+noinst_LTLIBRARIES = libpolkit-private.la
+
+libpolkit_private_la_SOURCES = $(polkit_built_sources)
+
+libpolkit_private_la_CFLAGS = \
+ -D_POLKIT_COMPILATION \
+ $(GLIB_CFLAGS) \
+ $(EGG_DBUS_CFLAGS) \
+ $(NULL)
+
+libpolkit_private_la_LIBADD = \
+ $(GLIB_LIBS) \
+ $(EGG_DBUS_LIBS) \
+ $(NULL)
+
lib_LTLIBRARIES=libpolkit-gobject-1.la
libpolkit_gobject_1includedir=$(includedir)/polkit-1/polkit
@@ -76,7 +91,6 @@ libpolkit_gobject_1include_HEADERS = \
libpolkit_gobject_1_la_SOURCES = \
$(BUILT_SOURCES) \
- $(polkit_built_sources) \
polkit.h \
polkitactiondescription.c polkitactiondescription.h \
polkitdetails.c polkitdetails.h \
@@ -104,6 +118,7 @@ libpolkit_gobject_1_la_CFLAGS = \
libpolkit_gobject_1_la_LIBADD = \
$(GLIB_LIBS) \
$(EGG_DBUS_LIBS) \
+ libpolkit-private.la \
$(NULL)
libpolkit_gobject_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
index 1903e0a..3f38329 100644
--- a/src/polkitagent/Makefile.am
+++ b/src/polkitagent/Makefile.am
@@ -59,6 +59,7 @@ libpolkit_agent_1_la_LIBADD = \
$(GLIB_LIBS) \
$(EGG_DBUS_LIBS) \
$(top_builddir)/src/polkit/libpolkit-gobject-1.la \
+ $(top_builddir)/src/polkit/libpolkit-private.la \
$(EXPAT_LIBS) \
$(NULL)
diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am
index c1ae1e5..48695d2 100644
--- a/src/polkitbackend/Makefile.am
+++ b/src/polkitbackend/Makefile.am
@@ -77,6 +77,7 @@ libpolkit_backend_1_la_LIBADD = \
$(GLIB_LIBS) \
$(EGG_DBUS_LIBS) \
$(top_builddir)/src/polkit/libpolkit-gobject-1.la \
+ $(top_builddir)/src/polkit/libpolkit-private.la \
$(EXPAT_LIBS) \
$(NULL)
commit 4a3cdac63bc62497e5a2682772162b2ae60147ed
Author: Michael Biebl <biebl at debian.org>
Date: Mon Aug 31 05:08:34 2009 +0200
Use _polkit_agent_marshal prefix
Use _polkit_agent_marshal prefix with glib-genmarshal to hide the
(autogenerated) symbols. Update the code accordingly.
Signed-off-by: David Zeuthen <davidz at redhat.com>
diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
index 0286c21..1903e0a 100644
--- a/src/polkitagent/Makefile.am
+++ b/src/polkitagent/Makefile.am
@@ -22,8 +22,8 @@ BUILT_SOURCES = \
$(NULL)
marshal.stamp : Makefile.am $(srcdir)/polkitagentmarshal.list
- glib-genmarshal --prefix=polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h
- (echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c
+ glib-genmarshal --prefix=_polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h
+ (echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=_polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c
touch marshal.stamp
marshal_built_sources = polkitagentmarshal.h polkitagentmarshal.c
diff --git a/src/polkitagent/polkitagentsession.c b/src/polkitagent/polkitagentsession.c
index 4327b4b..b919e0a 100644
--- a/src/polkitagent/polkitagentsession.c
+++ b/src/polkitagent/polkitagentsession.c
@@ -156,7 +156,7 @@ polkit_agent_session_class_init (PolkitAgentSessionClass *klass)
0, /* class offset */
NULL, /* accumulator */
NULL, /* accumulator data */
- polkit_agent_marshal_VOID__STRING_BOOLEAN,
+ _polkit_agent_marshal_VOID__STRING_BOOLEAN,
G_TYPE_NONE,
2,
G_TYPE_STRING,
commit 6a35bf6132d2d27ed507e894df9ba8d9e0dfc9f9
Author: Michael Biebl <biebl at debian.org>
Date: Mon Aug 31 05:06:05 2009 +0200
Trim the list of exported symbols
Add -export-symbols-regex '(^polkit_.*) to LDFLAGS for libpolkit*
Signed-off-by: David Zeuthen <davidz at redhat.com>
diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
index 436054b..2de31d6 100644
--- a/src/polkit/Makefile.am
+++ b/src/polkit/Makefile.am
@@ -106,6 +106,8 @@ libpolkit_gobject_1_la_LIBADD = \
$(EGG_DBUS_LIBS) \
$(NULL)
+libpolkit_gobject_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
+
if ENABLE_INTROSPECTION
girdir = $(GIRDIR)
gir_DATA = Polkit-1.0.gir
diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
index e64077d..0286c21 100644
--- a/src/polkitagent/Makefile.am
+++ b/src/polkitagent/Makefile.am
@@ -62,6 +62,8 @@ libpolkit_agent_1_la_LIBADD = \
$(EXPAT_LIBS) \
$(NULL)
+libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
+
libexec_PROGRAMS = polkit-agent-helper-1
polkit_agent_helper_1_SOURCES = \
diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am
index 6addc5a..c1ae1e5 100644
--- a/src/polkitbackend/Makefile.am
+++ b/src/polkitbackend/Makefile.am
@@ -80,6 +80,8 @@ libpolkit_backend_1_la_LIBADD = \
$(EXPAT_LIBS) \
$(NULL)
+libpolkit_backend_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
+
CLEANFILES = $(BUILT_SOURCES)
localauthorityconfigdir = $(sysconfdir)/polkit-1/localauthority.conf.d
More information about the hal-commit
mailing list