Merge lp:~mvo/click/native-dbus into lp:click/devel

[Michael Vogt]

Native dbus support for click without the need for PK plugin.

Unmerged revisions

542. By Michael Vogt on 2014-10-17

click/tests/test_install.py: set CLICK_IN_DBUS_SERVICE in TestClickInstaller

541. By Michael Vogt on 2014-10-17

always pass the full path to the backend

540. By Michael Vogt on 2014-10-17

fix dbus call

539. By Michael Vogt on 2014-10-17

lib/click/Makefile.am: fix pkglibexecdir substitutions

538. By Michael Vogt on 2014-10-17

debian/libclick-0.4-0.symbols: update to include the new symbols

537. By Michael Vogt on 2014-10-17

debian/click.install: include dbus files

536. By Michael Vogt on 2014-10-17

merged lp:click/devel

535. By Michael Vogt on 2014-10-17

click/commands/unregister.py: make unregister use dbus

534. By Michael Vogt on 2014-10-16

use python dbus instead of the generated vala interface to call InstallFiles

533. By Colin Watson on 2014-10-16

First cut at a native D-Bus service for click. Doesn't quite work yet.

=== modified file '.bzrignore'
--- .bzrignore	2014-07-09 12:56:21 +0000
+++ .bzrignore	2015-12-09 20:26:30 +0000
@@ -67,6 +67,9 @@
 lib/click/click.h
 lib/click/click-0.4.pc
 lib/click/click-0.4.vapi
+lib/click/click-dbus-service
+lib/click/click_dbus_service_vala.stamp
+lib/click/com.ubuntu.Click.service
 lib/click/libclick_0_4_la_vala.stamp
 lib/click/paths.vala
 lib/click/valac-wrapper

=== modified file 'click/commands/unregister.py'
--- click/commands/unregister.py	2014-04-03 08:52:02 +0000
+++ click/commands/unregister.py	2015-12-09 20:26:30 +0000
@@ -21,6 +21,7 @@
 import os
 import sys
 
+import dbus
 from gi.repository import Click
 
 
@@ -38,9 +39,11 @@
     if len(args) < 1:
         parser.error("need package name")
     if os.geteuid() != 0:
-        parser.error(
-            "click unregister must be started as root, since it may need to "
-            "remove packages from disk")
+        # only root can remove packages for other people
+        if options.user is not None or options.all_users:
+            parser.error(
+                "click unregister must be started as root, since it may "
+                "need to remove packages from disk")
     if options.user is None and "SUDO_USER" in os.environ:
         options.user = os.environ["SUDO_USER"]
     db = Click.DB()
@@ -59,7 +62,14 @@
             (package, old_version, args[1]),
             file=sys.stderr)
         sys.exit(1)
-    registry.remove(package)
-    db.maybe_remove(package, old_version)
+    # send via dbus if we are not root
+    if os.geteuid() != 0:
+        bus = dbus.SystemBus()
+        obj = bus.get_object("com.ubuntu.Click", "/com/ubuntu/Click")
+        iface = dbus.Interface(obj, "com.ubuntu.Click")
+        iface.RemovePackage(package, old_version)
+    else:
+        registry.remove(package)
+        db.maybe_remove(package, old_version)
     # TODO: remove data
     return 0

=== modified file 'click/install.py'
--- click/install.py	2015-11-24 13:03:01 +0000
+++ click/install.py	2015-12-09 20:26:30 +0000
@@ -42,6 +42,11 @@
 
 from contextlib import closing
 
+<<<<<<< TREE
+=======
+import apt_pkg
+import dbus
+>>>>>>> MERGE-SOURCE
 from debian.debfile import DebFile as _DebFile
 from debian.debian_support import Version
 from gi.repository import Click
@@ -130,6 +135,15 @@
         self.force_missing_framework = force_missing_framework
         self.allow_unauthenticated = allow_unauthenticated
 
+    @property
+    def dbus_install_flags(self):
+        flags = 0
+        if self.force_missing_framework:
+            flags |= Click.InstallFlags.FORCE_MISSING_FRAMEWORK
+        if self.allow_unauthenticated:
+            flags |= Click.InstallFlags.ALLOW_UNAUTHENTICATED
+        return flags
+
     def _preload_path(self):
         if "CLICK_PACKAGE_PRELOAD" in os.environ:
             return os.environ["CLICK_PACKAGE_PRELOAD"]
@@ -458,7 +472,25 @@
 
         return package_name, package_version, old_version
 
+<<<<<<< TREE
     def install(self, path, user=None, all_users=False, quiet=True):
+=======
+    def install(self, path, user=None, all_users=False):
+        if not all_users and "CLICK_IN_DBUS_SERVICE" not in os.environ:
+            # we can not use:
+            #   Click.DBusInterface.install_file(path, self.dbus_install_flags)
+            # here directly because the generated gobject-introspection can
+            # not be instantiated from python because its a abstract vala
+            # interface
+            bus = dbus.SystemBus()
+            obj = bus.get_object("com.ubuntu.Click", "/com/ubuntu/Click")
+            iface = dbus.Interface(obj,"com.ubuntu.Click")
+            # always pass the full path to the backend
+            abs_path = os.path.abspath(path)
+            iface.InstallFile(abs_path, self.dbus_install_flags)
+            return
+
+>>>>>>> MERGE-SOURCE
         package_name, package_version, old_version = self._unpack(
             path, user=user, all_users=all_users, quiet=quiet)
 

=== modified file 'click/tests/test_install.py'
--- click/tests/test_install.py	2015-10-15 12:53:30 +0000
+++ click/tests/test_install.py	2015-12-09 20:26:30 +0000
@@ -84,6 +84,8 @@
         # mock signature checks during the tests
         self.debsig_patcher = mock.patch("click.install.DebsigVerify")
         self.debsig_patcher.start()
+        # ensure install does not try to call the dbus
+        os.environ["CLICK_IN_DBUS_SERVICE"] = "1"
 
     def tearDown(self):
         self.debsig_patcher.stop()

=== modified file 'configure.ac'
--- configure.ac	2014-06-30 16:48:31 +0000
+++ configure.ac	2015-12-09 20:26:30 +0000
@@ -93,6 +93,24 @@
 fi
 AM_CONDITIONAL([PACKAGEKIT], [test "x$enable_packagekit" = xyes])
 
+AC_ARG_WITH([dbus-sys-dir],
+	    AS_HELP_STRING([--with-dbus-sys-dir=DIR], [D-Bus system.d directory]))
+if test "x$with_dbus_sys_dir" != x; then
+	DBUS_SYS_DIR="$with_dbus_sys_dir"
+else
+	DBUS_SYS_DIR="$sysconfdir/dbus-1/system.d"
+fi
+AC_SUBST([DBUS_SYS_DIR])
+
+AC_ARG_WITH([dbus-services-dir],
+	    AS_HELP_STRING([--with-dbus-services-dir=DIR], [D-Bus system-services directory]))
+if test "x$with_dbus_services_dir" != x; then
+	DBUS_SERVICES_DIR="$with_dbus_services_dir"
+else
+	DBUS_SERVICES_DIR="$datadir/dbus-1/system-services"
+fi
+AC_SUBST([DBUS_SERVICES_DIR])
+
 AC_ARG_ENABLE([systemd],
 	      AS_HELP_STRING([--disable-systemd], [Disable systemd integration]))
 AM_CONDITIONAL([INSTALL_SYSTEMD], [test "x$enable_systemd" != xno])

=== modified file 'debian/click.install'
--- debian/click.install	2014-03-05 16:36:20 +0000
+++ debian/click.install	2015-12-09 20:26:30 +0000
@@ -1,7 +1,9 @@
 etc/click
+etc/dbus-1/system.d/
 etc/init
 lib/systemd
 usr/bin/click
 usr/lib/*/click
 usr/lib/systemd
 usr/share/upstart
+usr/share/dbus-1/system-services
\ No newline at end of file

=== modified file 'debian/libclick-0.4-0.symbols'
--- debian/libclick-0.4-0.symbols	2014-03-31 10:50:20 +0000
+++ debian/libclick-0.4-0.symbols	2015-12-09 20:26:30 +0000
@@ -18,6 +18,12 @@
  click_db_maybe_remove@Base 0.4.17
  click_db_new@Base 0.4.17
  click_db_read@Base 0.4.17
+ click_dbus_error_quark@Base 0.4.34
+ click_dbus_interface_get_type@Base 0.4.34
+ click_dbus_interface_install_file@Base 0.4.34
+ click_dbus_interface_proxy_get_type@Base 0.4.34
+ click_dbus_interface_register_object@Base 0.4.34
+ click_dbus_interface_remove_package@Base 0.4.34
  click_dir_get_type@Base 0.4.17
  click_dir_open@Base 0.4.17
  click_dir_read_name@Base 0.4.17
@@ -57,6 +63,7 @@
  click_hook_run_commands@Base 0.4.17
  click_hook_sync@Base 0.4.17
  click_hooks_error_quark@Base 0.4.17
+ click_install_flags_get_type@Base 0.4.34
  click_installed_package_get_package@Base 0.4.17
  click_installed_package_get_path@Base 0.4.17
  click_installed_package_get_type@Base 0.4.17

=== modified file 'lib/click/Makefile.am'
--- lib/click/Makefile.am	2014-06-30 16:48:31 +0000
+++ lib/click/Makefile.am	2015-12-09 20:26:30 +0000
@@ -9,19 +9,12 @@
 	-Wno-unused-function \
 	-Wno-unused-variable
 VALAC = $(srcdir)/valac-wrapper
-AM_VALAFLAGS = \
-	-H click.h \
-	--gir Click-0.4.gir \
-	--library click-0.4 \
-	--pkg posix \
-	--pkg gee-0.8 \
-	--pkg json-glib-1.0 \
-	--target-glib 2.32
 
 lib_LTLIBRARIES = libclick-0.4.la
 
 libclick_0_4_la_SOURCES = \
 	database.vala \
+	dbus-interface.vala \
 	deb822.vala \
 	framework.vala \
 	hooks.vala \
@@ -31,6 +24,15 @@
 	query.vala \
 	user.vala
 
+libclick_0_4_la_VALAFLAGS = \
+	-H click.h \
+	--gir Click-0.4.gir \
+	--library click-0.4 \
+	--pkg posix \
+	--pkg gee-0.8 \
+	--pkg json-glib-1.0 \
+	--target-glib 2.32
+
 EXTRA_libclick_0_4_la_DEPENDENCIES = \
 	click.sym
 
@@ -55,11 +57,15 @@
 
 do_subst = sed \
 	-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
-	-e 's,[@]pkgdatadir[@],$(pkgdatadir),g'
+	-e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
+	-e 's,[@]pkglibexecdir[@],$(pkglibexecdir),g'
 
 paths.vala: paths.vala.in Makefile
 	$(do_subst) < $(srcdir)/paths.vala.in > $@
 
+com.ubuntu.Click.service: paths.vala.in Makefile
+	$(do_subst) < $(srcdir)/com.ubuntu.Click.service.in > $@
+
 includeclickdir = $(includedir)/click-0.4
 includeclick_HEADERS = \
 	$(HEADER_FILES)
@@ -102,3 +108,27 @@
 
 %.typelib: %.gir
 	$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@
+
+pkglibexec_PROGRAMS = click-dbus-service
+click_dbus_service_VALAFLAGS = \
+	--vapidir $(builddir) \
+	--pkg posix \
+	--pkg gee-0.8 \
+	--pkg json-glib-1.0 \
+	--pkg click-0.4 \
+	--target-glib 2.32
+click_dbus_service_LDADD = \
+	libclick-0.4.la \
+	$(LIBCLICK_LIBS)
+click_dbus_service_LDFLAGS = \
+	$(COVERAGE_LDFLAGS)
+click_dbus_service_SOURCES = \
+	dbus-service.vala \
+	posix-extra.vapi
+
+dbussystemdir = $(DBUS_SYS_DIR)
+dist_dbussystem_DATA = com.ubuntu.Click.conf
+
+dbusservicesdir = $(DBUS_SERVICES_DIR)
+dbusservices_DATA = com.ubuntu.Click.service
+EXTRA_DIST += com.ubuntu.Click.service.in

=== modified file 'lib/click/click.sym'
--- lib/click/click.sym	2014-03-31 10:50:20 +0000
+++ lib/click/click.sym	2015-12-09 20:26:30 +0000
@@ -16,6 +16,12 @@
 click_db_maybe_remove
 click_db_new
 click_db_read
+click_dbus_error_quark
+click_dbus_interface_get_type
+click_dbus_interface_install_file
+click_dbus_interface_proxy_get_type
+click_dbus_interface_register_object
+click_dbus_interface_remove_package
 click_dir_get_type
 click_dir_open
 click_dir_read_name
@@ -55,6 +61,7 @@
 click_hook_run_commands
 click_hook_sync
 click_hooks_error_quark
+click_install_flags_get_type
 click_installed_package_get_package
 click_installed_package_get_path
 click_installed_package_get_type

=== added file 'lib/click/com.ubuntu.Click.conf'
--- lib/click/com.ubuntu.Click.conf	1970-01-01 00:00:00 +0000
+++ lib/click/com.ubuntu.Click.conf	2015-12-09 20:26:30 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!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="com.ubuntu.Click"/>
+  </policy>
+
+  <policy context="default">
+    <allow send_destination="com.ubuntu.Click"
+           send_interface="com.ubuntu.Click"/>
+    <allow send_destination="com.ubuntu.Click"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+    <allow send_destination="com.ubuntu.Click"
+           send_interface="org.freedesktop.DBus.Peer"/>
+    <allow send_destination="com.ubuntu.Click"
+           send_interface="org.freedesktop.DBus.Properties"/>
+  </policy>
+
+</busconfig>

=== added file 'lib/click/com.ubuntu.Click.service.in'
--- lib/click/com.ubuntu.Click.service.in	1970-01-01 00:00:00 +0000
+++ lib/click/com.ubuntu.Click.service.in	2015-12-09 20:26:30 +0000
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=com.ubuntu.Click
+Exec=@pkglibexecdir@/click-dbus-service
+User=root

=== added file 'lib/click/com.ubuntu.Click.xml'
--- lib/click/com.ubuntu.Click.xml	1970-01-01 00:00:00 +0000
+++ lib/click/com.ubuntu.Click.xml	2015-12-09 20:26:30 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE node PUBLIC
+ "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/com/ubuntu/Click">
+  <interface name="com.ubuntu.Click">
+    <method name="InstallFile">
+      <arg type="s" name="filename" direction="in"/>
+      <arg type="u" name="flags" direction="in"/>
+      <arg type="s" name="package" direction="out"/>
+      <arg type="s" name="version" direction="out"/>
+      <arg type="a{sv}" name="details" direction="out"/>
+    </method>
+
+    <method name="RemovePackage">
+      <arg type="s" name="package" direction="in"/>
+      <arg type="s" name="version" direction="in"/>
+    </method>
+  </interface>
+</node>

=== added file 'lib/click/dbus-interface.vala'
--- lib/click/dbus-interface.vala	1970-01-01 00:00:00 +0000
+++ lib/click/dbus-interface.vala	2015-12-09 20:26:30 +0000
@@ -0,0 +1,66 @@
+/* Copyright (C) 2014 Canonical Ltd.
+ * Author: Colin Watson <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* The Click D-Bus interface.  */
+
+namespace Click {
+
+[DBus (name = "com.ubuntu.Click.InstallFlags")]
+[Flags]
+public enum InstallFlags {
+	FORCE_MISSING_FRAMEWORK,
+	ALLOW_UNAUTHENTICATED
+}
+
+[DBus (name = "com.ubuntu.Click.Error")]
+public errordomain DBusError {
+	/**
+	 * Failure to determine the connected user name.
+	 */
+	AUTHENTICATION,
+	/**
+	 * Failure to drop privileges.
+	 */
+	DROP_PRIVS,
+	/**
+	 * Failure to read manifest.
+	 */
+	MANIFEST,
+	/**
+	 * Failure to install package.
+	 */
+	FAILED_TO_INSTALL,
+	/**
+	 * Failure to remove package.
+	 */
+	FAILED_TO_REMOVE
+}
+
+[DBus (name = "com.ubuntu.Click")]
+public interface DBusInterface : Object {
+	public abstract void
+	install_file (string filename, InstallFlags flags,
+		      out string package, out string version,
+		      out HashTable<string, Variant> details,
+		      BusName sender)
+		throws Error;
+
+	public abstract void
+	remove_package (string package, string version, BusName sender)
+		throws Error;
+}
+
+}

=== added file 'lib/click/dbus-service.vala'
--- lib/click/dbus-service.vala	1970-01-01 00:00:00 +0000
+++ lib/click/dbus-service.vala	2015-12-09 20:26:30 +0000
@@ -0,0 +1,297 @@
+/* Copyright (C) 2014 Canonical Ltd.
+ * Author: Colin Watson <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* The Click D-Bus service.  */
+
+namespace Click {
+
+[DBus (name = "com.ubuntu.Click")]
+public class DBusService : Object, DBusInterface {
+	private DBusConnection conn;
+	private DBusProxy proxy_uid;
+
+	public DBusService (DBusConnection conn) throws Error
+	{
+		this.conn = conn;
+		proxy_uid = new DBusProxy.sync
+			(conn,
+			 DBusProxyFlags.DO_NOT_LOAD_PROPERTIES |
+			 DBusProxyFlags.DO_NOT_CONNECT_SIGNALS,
+			 null,
+			 "org.freedesktop.DBus",
+			 "/org/freedesktop/DBus",
+			 "org.freedesktop.DBus");
+	}
+
+	private string
+	get_connected_username (BusName sender) throws Error
+	{
+		var uid_reply = proxy_uid.call_sync
+			("GetConnectionUnixUser", new Variant ("(s)", sender),
+			 DBusCallFlags.NONE, -1);
+		uint uid;
+		uid_reply.get ("(u)", out uid);
+		errno = 0;
+		unowned Posix.Passwd pw = Posix.getpwuid (uid);
+		if (pw == null)
+			throw new DBusError.AUTHENTICATION
+				("Cannot get password file entry for UID " +
+				 "%d: %s", uid, strerror (errno));
+		return pw.pw_name;
+	}
+
+	private void
+	priv_drop_failure (string name) throws DBusError
+	{
+		throw new DBusError.DROP_PRIVS
+			("Cannot drop privileges (%s): %s",
+			 name, strerror (errno));
+	}
+
+	private void
+	drop_privileges (string username) throws Error
+	{
+		if (Posix.geteuid () != 0)
+			return;
+		unowned Posix.Passwd pw = Posix.getpwnam (username);
+		if (pw == null)
+			throw new DBusError.DROP_PRIVS
+				("Cannot get password file entry for user " +
+				 "'%s': %s", username, strerror (errno));
+		Posix.gid_t[] supp = {};
+		Posix.setgrent ();
+		unowned PosixExtra.Group? gr;
+		while ((gr = PosixExtra.getgrent ()) != null) {
+			foreach (unowned string member in gr.gr_mem) {
+				if (member == username) {
+					supp += gr.gr_gid;
+					break;
+				}
+			}
+		}
+		Posix.endgrent ();
+		if (PosixExtra.setgroups (supp.length, supp) < 0)
+			priv_drop_failure ("setgroups");
+		/* Portability note: this assumes that we have
+		 * [gs]etres[gu]id, which is true on Linux but not
+		 * necessarily elsewhere.  If you need to support something
+		 * else, there are reasonably standard alternatives
+		 * involving other similar calls; see e.g.
+		 * gnulib/lib/idpriv-drop.c.
+		 */
+		if (PosixExtra.setresgid (pw.pw_gid, pw.pw_gid, pw.pw_gid) < 0)
+			priv_drop_failure ("setresgid");
+		if (PosixExtra.setresuid (pw.pw_uid, pw.pw_uid, pw.pw_uid) < 0)
+			priv_drop_failure ("setresuid");
+		{
+			Posix.uid_t ruid, euid, suid;
+			Posix.gid_t rgid, egid, sgid;
+			assert (PosixExtra.getresuid (out ruid, out euid,
+						      out suid) == 0 &&
+				ruid == pw.pw_uid && euid == pw.pw_uid &&
+				suid == pw.pw_uid);
+			assert (PosixExtra.getresgid (out rgid, out egid,
+						      out sgid) == 0 &&
+				rgid == pw.pw_gid && egid == pw.pw_gid &&
+				sgid == pw.pw_gid);
+		}
+		Posix.umask (get_umask () | Posix.S_IWOTH);
+	}
+
+	private bool
+	euid_access (string username, string path, int mode) throws Error
+	{
+		var pid = Posix.fork ();
+		if (pid < 0)
+			throw new DBusError.DROP_PRIVS
+				("Cannot fork: %s", strerror (errno));
+		else if (pid == 0) {	/* child */
+			drop_privileges (username);
+			Posix._exit (Posix.access (path, mode) == 0 ? 0 : 1);
+			throw new DBusError.DROP_PRIVS ("Unreachable");
+		} else {		/* parent */
+			int status;
+			if (Posix.waitpid (pid, out status, 0) < 0)
+				throw new DBusError.DROP_PRIVS
+					("Cannot wait for privilege-dropped " +
+					 "subprocess: %s", strerror (errno));
+			return status == 0;
+		}
+	}
+
+	private Json.Object
+	get_manifest (string filename) throws Error
+	{
+		string[] command = {"click", "info", filename};
+		string manifest_text;
+		string click_stderr;
+		int click_status;
+		Process.spawn_sync
+			(null, command, null, SpawnFlags.SEARCH_PATH, null,
+			 out manifest_text, out click_stderr,
+			 out click_status);
+		try {
+			Process.check_exit_status (click_status);
+		} catch (Error e) {
+			throw new DBusError.MANIFEST
+				("\"click info %s\" failed.\n%s",
+				 filename, click_stderr);
+		}
+
+		var parser = new Json.Parser ();
+		parser.load_from_data (manifest_text);
+		return parser.get_root ().get_object ();
+	}
+
+	private string?
+	get_field_string (Json.Object manifest, string field)
+	{
+		var node = manifest.get_member (field);
+		return node != null ? node.dup_string () : null;
+	}
+
+	private Json.Object?
+	get_field_object (Json.Object manifest, string field)
+	{
+		var node = manifest.get_member (field);
+		return node != null ? node.dup_object () : null;
+	}
+
+	private bool
+	get_field_boolean (Json.Object manifest, string field, bool def)
+	{
+		var node = manifest.get_member (field);
+		return node != null ? node.get_boolean () : def;
+	}
+
+	private void
+	installed_manifest (Json.Object manifest, string username,
+			    out string package, out string version,
+			    ref HashTable<string, Variant> details)
+	{
+		package = get_field_string (manifest, "name");
+		version = get_field_string (manifest, "version");
+		if (package == null || version == null)
+			return;
+		var architecture = get_field_string (manifest, "architecture");
+		if (architecture != null)
+			details["architecture"] = architecture;
+		/* A missing "_removable" entry in the manifest means that
+		 * we just installed the package, so it must be removable.
+		 */
+		details["removable"] = get_field_boolean
+			(manifest, "_removable", true);
+		string[] app_names = {};
+		var hooks = get_field_object (manifest, "hooks");
+		if (hooks != null) {
+			foreach (var app_name in hooks.get_members ())
+				app_names += app_name;
+			details["app_names"] = app_names;
+		}
+	}
+
+	public void
+	install_file (string filename, InstallFlags flags,
+		      out string package, out string version,
+		      out HashTable<string, Variant> details,
+		      BusName sender)
+		throws Error
+	{
+		var username = get_connected_username (sender);
+		message (@"Click: installing $filename for $username");
+		if (! euid_access (username, filename, Posix.R_OK))
+			throw new DBusError.FAILED_TO_INSTALL
+				("User %s cannot read %s", username, filename);
+		string[] command = {"click", "install", @"--user=$username"};
+		if (InstallFlags.FORCE_MISSING_FRAMEWORK in flags)
+			command += "--force-missing-framework";
+		if (InstallFlags.ALLOW_UNAUTHENTICATED in flags)
+			command += "--allow-unauthenticated";
+		command += filename;
+		string click_stderr;
+		int click_status;
+		Process.spawn_sync
+			(null, command, null,
+			 SpawnFlags.SEARCH_PATH |
+			 SpawnFlags.STDOUT_TO_DEV_NULL,
+			 null, null, out click_stderr, out click_status);
+		try {
+			Process.check_exit_status (click_status);
+		} catch (Error e) {
+			throw new DBusError.FAILED_TO_INSTALL
+				("%s failed to install.\n%s",
+				 filename, click_stderr);
+		}
+		package = "";
+		version = "";
+		details = new HashTable<string, Variant> (str_hash, str_equal);
+		try {
+			installed_manifest
+				(get_manifest (filename), username,
+				 out package, out version, ref details);
+		} catch (Error e) {
+			stderr.printf ("Failed to get installed package " +
+				       "manifest: %s", e.message);
+		}
+	}
+
+	public void
+	remove_package (string package, string version, BusName sender)
+		throws Error
+	{
+		var username = get_connected_username (sender);
+		message (@"Click: removing $package $version for $username");
+		var db = new Click.DB ();
+		db.read ();
+		var registry = new Click.User.for_user (db, username);
+		var old_version = registry.get_version (package);
+		if (old_version != version) {
+			throw new DBusError.FAILED_TO_REMOVE
+				("Not removing Click package %s %s; " +
+				 "does not match current version %s.",
+				 package, version, old_version);
+		}
+		registry.remove (package);
+		db.maybe_remove (package, version);
+		/* TODO: remove data? */
+	}
+
+	private static void
+	on_bus_acquired (DBusConnection conn)
+	{
+		try {
+			conn.register_object
+				("/com/ubuntu/Click", new DBusService (conn));
+		} catch (Error e) {
+			stderr.printf ("Could not register service: %s\n",
+				       e.message);
+			Process.exit (Posix.EXIT_FAILURE);
+		}
+	}
+
+	static void
+	main ()
+	{
+		Environment.set_variable ("CLICK_IN_DBUS_SERVICE", "1", true);
+		Bus.own_name
+			(BusType.SYSTEM, "com.ubuntu.Click",
+			 BusNameOwnerFlags.NONE, on_bus_acquired, () => {},
+			 () => stderr.printf ("Could not acquire name\n"));
+		new MainLoop ().run ();
+	}
+}
+
+}

=== modified file 'lib/click/valac-wrapper.in'
--- lib/click/valac-wrapper.in	2014-03-06 07:03:09 +0000
+++ lib/click/valac-wrapper.in	2015-12-09 20:26:30 +0000
@@ -22,12 +22,13 @@
 
 # Keep this in sync with any options used in lib/click/Makefile.am.  -C is
 # emitted by automake.
-eval set -- "$(getopt -o CH: -l gir:,library:,pkg:,target-glib: -- "$@")" || \
+eval set -- "$(getopt -o CH: -l vapidir:,gir:,library:,pkg:,target-glib: -- "$@")" || \
 	{ echo "$0: failed to parse valac options" >&2; exit 2; }
 while :; do
 	case $1 in
 		-C) shift ;;
 		-H) header="$2"; shift 2 ;;
+		--vapidir) shift 2 ;;
 		--pkg|--target-glib) shift 2 ;;
 		--gir) gir="$2"; shift 2 ;;
 		--library) library="$2"; shift 2 ;;
@@ -36,10 +37,13 @@
 	esac
 done
 
+if [ -z "$library" ]; then
+	# We're building something else, not a library.
+	exit 0
+fi
+
 [ "$header" ] || { echo "$0: failed to find -H in valac options" >&2; exit 2; }
 [ "$gir" ] || { echo "$0: failed to find --gir in valac options" >&2; exit 2; }
-[ "$library" ] || \
-	{ echo "$0: failed to find --library in valac options" >&2; exit 2; }
 
 if egrep 'Gee|gee_' "$header"; then
 	echo "libgee should not be exposed in our public header file." >&2