[ptxdist] [PATCH 1/2] Polkit: upgrade package

[Juergen Borleis <jbe@pengutronix.de>]

It is a small upgrade, because since revision 0.106 this package depends on
mozjs and mozjs's buildsystem is a horror to cross compile.

This small upgrade is required to add support for uPower.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 rules/polkit.in   |  6 +++---
 rules/polkit.make | 27 ++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/rules/polkit.in b/rules/polkit.in
index d28de7c..ef3278a 100644
--- a/rules/polkit.in
+++ b/rules/polkit.in
@@ -4,11 +4,11 @@ config POLKIT
 	tristate
 	prompt "policykit-1"
 	select LIBC_CRYPT
-	select HOST_INTLTOOL
-	select HOST_GTK_DOC
+	select SYSTEMD
 	select GLIB
 	select DBUS_GLIB
-	select EGGDBUS
+	select LIBC_PTHREAD
+	select EXPAT
 	help
 	  PolicyKit offers an infrastructure for security policies for
 	  dbus applications.
diff --git a/rules/polkit.make b/rules/polkit.make
index b702a1b..cd3ad11 100644
--- a/rules/polkit.make
+++ b/rules/polkit.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+# Copyright (C) 2014 by Juergen Borleis <jbe@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -16,11 +17,11 @@ PACKAGES-$(PTXCONF_POLKIT) += polkit
 #
 # Paths and names
 #
-POLKIT_VERSION	:= 0.96
-POLKIT_MD5	:= e0a06da501b04ed3bab986a9df5b5aa2
+POLKIT_VERSION	:= 0.105
+POLKIT_MD5	:= 9c29e1b6c214f0bd6f1d4ee303dfaed9
 POLKIT		:= polkit-$(POLKIT_VERSION)
 POLKIT_SUFFIX	:= tar.gz
-POLKIT_URL	:= http://hal.freedesktop.org/releases/$(POLKIT).$(POLKIT_SUFFIX)
+POLKIT_URL	:= http://www.freedesktop.org/software/polkit/releases/$(POLKIT).$(POLKIT_SUFFIX)
 POLKIT_SOURCE	:= $(SRCDIR)/$(POLKIT).$(POLKIT_SUFFIX)
 POLKIT_DIR	:= $(BUILDDIR)/$(POLKIT)
 
@@ -34,13 +35,16 @@ POLKIT_DIR	:= $(BUILDDIR)/$(POLKIT)
 POLKIT_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
 	--enable-shared \
-	--enable-static \
+	--disable-static \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-ansi \
 	--disable-verbose-mode \
 	--disable-man-pages \
 	--disable-gtk-doc \
-	--disable-examples \
+	--enable-systemd=yes \
 	--disable-introspection \
+	--disable-examples \
+	--disable-nls \
 	--with-gnu-ld \
 	--with-authfw=shadow \
 	--with-os-type=ptxdist
@@ -63,8 +67,15 @@ $(STATEDIR)/polkit.targetinstall:
 		/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf)
 	@$(call install_copy, polkit, 0, 0, 0644, -, \
 		/usr/share/dbus-1/system-services/org.freedesktop.PolicyKit1.service)
+	@$(call install_link, polkit, \
+		../system-services/org.freedesktop.PolicyKit1.service, \
+		/usr/share/dbus-1/services/org.freedesktop.PolicyKit1.service)
 
 # config
+	@$(call install_copy, polkit, 0, 0, 0700, /etc/polkit-1/localauthority)
+	@$(call install_copy, polkit, 0, 0, 0700, /var/lib/polkit-1)
+	@$(call install_copy, polkit, 0, 0, 0700, /var/lib/polkit-1/localauthority)
+
 	@$(call install_copy, polkit, 0, 0, 0644, -, \
 		/etc/polkit-1/localauthority.conf.d/50-localauthority.conf)
 	@$(call install_copy, polkit, 0, 0, 0644, -, \
@@ -72,6 +83,10 @@ $(STATEDIR)/polkit.targetinstall:
 	@$(call install_copy, polkit, 0, 0, 0644, -, \
 		/usr/share/polkit-1/actions/org.freedesktop.policykit.policy)
 
+# systemd
+	@$(call install_alternative, polkit, 0, 0, 644, \
+		/lib/systemd/system/dbus-org.freedesktop.PolicyKit1.service)
+
 # libs
 	@$(call install_lib, polkit, 0, 0, 0644, libpolkit-agent-1)
 	@$(call install_lib, polkit, 0, 0, 0644, libpolkit-backend-1)
@@ -79,8 +94,6 @@ $(STATEDIR)/polkit.targetinstall:
 
 	@$(call install_copy, polkit, 0, 0, 0644, -, \
 		/usr/lib/polkit-1/extensions/libnullbackend.so)
-	@$(call install_copy, polkit, 0, 0, 0644, -, \
-		/usr/lib/polkit-1/extensions/libpkexec-action-lookup.so)
 
 # binaries
 	@$(call install_copy, polkit, 0, 0, 0755, -, /usr/bin/pkaction)
-- 
2.0.0.rc0


-- 
ptxdist mailing list
ptxdist@pengutronix.de