From 6f0f7d1b40a8fa8d46a2d6f4317600001cdbbb18 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 7 Apr 2024 19:57:27 +0200
Subject: Adding upstream version 43.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 plugins/packagekit/gs-markdown.c                   |  856 ++++
 plugins/packagekit/gs-markdown.h                   |   41 +
 plugins/packagekit/gs-packagekit-helper.c          |  141 +
 plugins/packagekit/gs-packagekit-helper.h          |   37 +
 plugins/packagekit/gs-packagekit-task.c            |  280 ++
 plugins/packagekit/gs-packagekit-task.h            |   38 +
 plugins/packagekit/gs-plugin-packagekit.c          | 4080 ++++++++++++++++++++
 plugins/packagekit/gs-plugin-packagekit.h          |   22 +
 plugins/packagekit/gs-self-test.c                  |  275 ++
 plugins/packagekit/meson.build                     |   50 +
 plugins/packagekit/packagekit-common.c             |  585 +++
 plugins/packagekit/packagekit-common.h             |   41 +
 plugins/packagekit/tests/build-rpm.sh              |    2 +
 .../packagekit/tests/chiron-1.1-1.fc24.x86_64.rpm  |  Bin 0 -> 6414 bytes
 plugins/packagekit/tests/chiron.spec               |   22 +
 15 files changed, 6470 insertions(+)
 create mode 100644 plugins/packagekit/gs-markdown.c
 create mode 100644 plugins/packagekit/gs-markdown.h
 create mode 100644 plugins/packagekit/gs-packagekit-helper.c
 create mode 100644 plugins/packagekit/gs-packagekit-helper.h
 create mode 100644 plugins/packagekit/gs-packagekit-task.c
 create mode 100644 plugins/packagekit/gs-packagekit-task.h
 create mode 100644 plugins/packagekit/gs-plugin-packagekit.c
 create mode 100644 plugins/packagekit/gs-plugin-packagekit.h
 create mode 100644 plugins/packagekit/gs-self-test.c
 create mode 100644 plugins/packagekit/meson.build
 create mode 100644 plugins/packagekit/packagekit-common.c
 create mode 100644 plugins/packagekit/packagekit-common.h
 create mode 100755 plugins/packagekit/tests/build-rpm.sh
 create mode 100644 plugins/packagekit/tests/chiron-1.1-1.fc24.x86_64.rpm
 create mode 100644 plugins/packagekit/tests/chiron.spec

(limited to 'plugins/packagekit')

diff --git a/plugins/packagekit/gs-markdown.c b/plugins/packagekit/gs-markdown.c
new file mode 100644
index 0000000..b7be06b
--- /dev/null
+++ b/plugins/packagekit/gs-markdown.c
@@ -0,0 +1,856 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2008 Richard Hughes <richard@hughsie.com>
+ * Copyright (C) 2015 Kalev Lember <klember@redhat.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <glib.h>
+
+#include "gs-markdown.h"
+
+/*******************************************************************************
+ *
+ * This is a simple Markdown parser.
+ * It can output to Pango, HTML or plain text. The following limitations are
+ * already known, and properly deliberate:
+ *
+ * - No code section support
+ * - No ordered list support
+ * - No blockquote section support
+ * - No image support
+ * - No links or email support
+ * - No backslash escapes support
+ * - No HTML escaping support
+ * - Auto-escapes certain word patterns, like http://
+ *
+ * It does support the rest of the standard pretty well, although it's not
+ * been run against any conformance tests. The parsing is single pass, with
+ * a simple enumerated interpretor mode and a single line back-memory.
+ *
+ ******************************************************************************/
+
+typedef enum {
+	GS_MARKDOWN_MODE_BLANK,
+	GS_MARKDOWN_MODE_RULE,
+	GS_MARKDOWN_MODE_BULLETT,
+	GS_MARKDOWN_MODE_PARA,
+	GS_MARKDOWN_MODE_H1,
+	GS_MARKDOWN_MODE_H2,
+	GS_MARKDOWN_MODE_UNKNOWN
+} GsMarkdownMode;
+
+typedef struct {
+	const gchar *em_start;
+	const gchar *em_end;
+	const gchar *strong_start;
+	const gchar *strong_end;
+	const gchar *code_start;
+	const gchar *code_end;
+	const gchar *h1_start;
+	const gchar *h1_end;
+	const gchar *h2_start;
+	const gchar *h2_end;
+	const gchar *bullet_start;
+	const gchar *bullet_end;
+	const gchar *rule;
+} GsMarkdownTags;
+
+struct _GsMarkdown {
+	GObject			 parent_instance;
+
+	GsMarkdownMode		 mode;
+	GsMarkdownTags		 tags;
+	GsMarkdownOutputKind	 output;
+	gint			 max_lines;
+	gint			 line_count;
+	gboolean		 smart_quoting;
+	gboolean		 escape;
+	gboolean		 autocode;
+	gboolean		 autolinkify;
+	GString			*pending;
+	GString			*processed;
+};
+
+G_DEFINE_TYPE (GsMarkdown, gs_markdown, G_TYPE_OBJECT)
+
+/*
+ * gs_markdown_to_text_line_is_rule:
+ *
+ * Horizontal rules are created by placing three or more hyphens, asterisks,
+ * or underscores on a line by themselves.
+ * You may use spaces between the hyphens or asterisks.
+ **/
+static gboolean
+gs_markdown_to_text_line_is_rule (const gchar *line)
+{
+	guint i;
+	guint len;
+	guint count = 0;
+	g_autofree gchar *copy = NULL;
+
+	len = (guint) strlen (line);
+	if (len == 0)
+		return FALSE;
+
+	/* replace non-rule chars with ~ */
+	copy = g_strdup (line);
+	g_strcanon (copy, "-*_ ", '~');
+	for (i = 0; i < len; i++) {
+		if (copy[i] == '~')
+			return FALSE;
+		if (copy[i] != ' ')
+			count++;
+	}
+
+	/* if we matched, return true */
+	if (count >= 3)
+		return TRUE;
+	return FALSE;
+}
+
+static gboolean
+gs_markdown_to_text_line_is_bullet (const gchar *line)
+{
+	return (g_str_has_prefix (line, "- ") ||
+		g_str_has_prefix (line, "* ") ||
+		g_str_has_prefix (line, "+ ") ||
+		g_str_has_prefix (line, " - ") ||
+		g_str_has_prefix (line, " * ") ||
+		g_str_has_prefix (line, " + "));
+}
+
+static gboolean
+gs_markdown_to_text_line_is_header1 (const gchar *line)
+{
+	return g_str_has_prefix (line, "# ");
+}
+
+static gboolean
+gs_markdown_to_text_line_is_header2 (const gchar *line)
+{
+	return g_str_has_prefix (line, "## ");
+}
+
+static gboolean
+gs_markdown_to_text_line_is_header1_type2 (const gchar *line)
+{
+	return g_str_has_prefix (line, "===");
+}
+
+static gboolean
+gs_markdown_to_text_line_is_header2_type2 (const gchar *line)
+{
+	return g_str_has_prefix (line, "---");
+}
+
+#if 0
+static gboolean
+gs_markdown_to_text_line_is_code (const gchar *line)
+{
+	return (g_str_has_prefix (line, "    ") ||
+		g_str_has_prefix (line, "\t"));
+}
+
+static gboolean
+gs_markdown_to_text_line_is_blockquote (const gchar *line)
+{
+	return (g_str_has_prefix (line, "> "));
+}
+#endif
+
+static gboolean
+gs_markdown_to_text_line_is_blank (const gchar *line)
+{
+	guint i;
+	guint len;
+
+	/* a line with no characters is blank by definition */
+	len = (guint) strlen (line);
+	if (len == 0)
+		return TRUE;
+
+	/* find if there are only space chars */
+	for (i = 0; i < len; i++) {
+		if (line[i] != ' ' && line[i] != '\t')
+			return FALSE;
+	}
+
+	/* if we matched, return true */
+	return TRUE;
+}
+
+static gchar *
+gs_markdown_replace (const gchar *haystack,
+		     const gchar *needle,
+		     const gchar *replace)
+{
+	g_auto(GStrv) split = NULL;
+	split = g_strsplit (haystack, needle, -1);
+	return g_strjoinv (replace, split);
+}
+
+static gchar *
+gs_markdown_strstr_spaces (const gchar *haystack, const gchar *needle)
+{
+	gchar *found;
+	const gchar *haystack_new = haystack;
+
+retry:
+	/* don't find if surrounded by spaces */
+	found = strstr (haystack_new, needle);
+	if (found == NULL)
+		return NULL;
+
+	/* start of the string, always valid */
+	if (found == haystack)
+		return found;
+
+	/* end of the string, always valid */
+	if (*(found-1) == ' ' && *(found+1) == ' ') {
+		haystack_new = found+1;
+		goto retry;
+	}
+	return found;
+}
+
+static gchar *
+gs_markdown_to_text_line_formatter (const gchar *line,
+				    const gchar *formatter,
+				    const gchar *left,
+				    const gchar *right)
+{
+	guint len;
+	gchar *str1;
+	gchar *str2;
+	gchar *start = NULL;
+	gchar *middle = NULL;
+	gchar *end = NULL;
+	g_autofree gchar *copy = NULL;
+
+	/* needed to know for shifts */
+	len = (guint) strlen (formatter);
+	if (len == 0)
+		return NULL;
+
+	/* find sections */
+	copy = g_strdup (line);
+	str1 = gs_markdown_strstr_spaces (copy, formatter);
+	if (str1 != NULL) {
+		*str1 = '\0';
+		str2 = gs_markdown_strstr_spaces (str1+len, formatter);
+		if (str2 != NULL) {
+			*str2 = '\0';
+			middle = str1 + len;
+			start = copy;
+			end = str2 + len;
+		}
+	}
+
+	/* if we found, replace and keep looking for the same string */
+	if (start != NULL && middle != NULL && end != NULL) {
+		g_autofree gchar *temp = NULL;
+		temp = g_strdup_printf ("%s%s%s%s%s", start, left, middle, right, end);
+		/* recursive */
+		return gs_markdown_to_text_line_formatter (temp, formatter, left, right);
+	}
+
+	/* not found, keep return as-is */
+	return g_strdup (line);
+}
+
+static gchar *
+gs_markdown_to_text_line_format_sections (GsMarkdown *self, const gchar *line)
+{
+	gchar *data = g_strdup (line);
+	gchar *temp;
+
+	/* bold1 */
+	temp = data;
+	data = gs_markdown_to_text_line_formatter (temp, "**",
+						   self->tags.strong_start,
+						   self->tags.strong_end);
+	g_free (temp);
+
+	/* bold2 */
+	temp = data;
+	data = gs_markdown_to_text_line_formatter (temp, "__",
+						   self->tags.strong_start,
+						   self->tags.strong_end);
+	g_free (temp);
+
+	/* italic1 */
+	temp = data;
+	data = gs_markdown_to_text_line_formatter (temp, "*",
+						   self->tags.em_start,
+						   self->tags.em_end);
+	g_free (temp);
+
+	/* italic2 */
+	temp = data;
+	data = gs_markdown_to_text_line_formatter (temp, "_",
+						   self->tags.em_start,
+						   self->tags.em_end);
+	g_free (temp);
+
+	/* em-dash */
+	temp = data;
+	data = gs_markdown_replace (temp, " -- ", " — ");
+	g_free (temp);
+
+	/* smart quoting */
+	if (self->smart_quoting) {
+		temp = data;
+		data = gs_markdown_to_text_line_formatter (temp, "\"", "“", "”");
+		g_free (temp);
+
+		temp = data;
+		data = gs_markdown_to_text_line_formatter (temp, "'", "‘", "’");
+		g_free (temp);
+	}
+
+	return data;
+}
+
+static gchar *
+gs_markdown_to_text_line_format (GsMarkdown *self, const gchar *line)
+{
+	GString *string;
+	gboolean mode = FALSE;
+	gchar *text;
+	guint i;
+	g_auto(GStrv) codes = NULL;
+
+	/* optimise the trivial case where we don't have any code tags */
+	text = strstr (line, "`");
+	if (text == NULL)
+		return gs_markdown_to_text_line_format_sections (self, line);
+
+	/* we want to parse the code sections without formatting */
+	codes = g_strsplit (line, "`", -1);
+	string = g_string_new ("");
+	for (i = 0; codes[i] != NULL; i++) {
+		if (!mode) {
+			text = gs_markdown_to_text_line_format_sections (self, codes[i]);
+			g_string_append (string, text);
+			g_free (text);
+			mode = TRUE;
+		} else {
+			/* just append without formatting */
+			g_string_append (string, self->tags.code_start);
+			g_string_append (string, codes[i]);
+			g_string_append (string, self->tags.code_end);
+			mode = FALSE;
+		}
+	}
+	return g_string_free (string, FALSE);
+}
+
+static gboolean
+gs_markdown_add_pending (GsMarkdown *self, const gchar *line)
+{
+	g_autofree gchar *copy = NULL;
+
+	/* would put us over the limit */
+	if (self->max_lines > 0 && self->line_count >= self->max_lines)
+		return FALSE;
+
+	copy = g_strdup (line);
+
+	/* strip leading and trailing spaces */
+	g_strstrip (copy);
+
+	/* append */
+	g_string_append_printf (self->pending, "%s ", copy);
+	return TRUE;
+}
+
+static gboolean
+gs_markdown_add_pending_header (GsMarkdown *self, const gchar *line)
+{
+	g_autofree gchar *copy = NULL;
+
+	/* strip trailing # */
+	copy = g_strdup (line);
+	g_strdelimit (copy, "#", ' ');
+	return gs_markdown_add_pending (self, copy);
+}
+
+static guint
+gs_markdown_count_chars_in_word (const gchar *text, gchar find)
+{
+	guint i;
+	guint len;
+	guint count = 0;
+
+	/* get length */
+	len = (guint) strlen (text);
+	if (len == 0)
+		return 0;
+
+	/* find matching chars */
+	for (i = 0; i < len; i++) {
+		if (text[i] == find)
+			count++;
+	}
+	return count;
+}
+
+static gboolean
+gs_markdown_word_is_code (const gchar *text)
+{
+	/* already code */
+	if (g_str_has_prefix (text, "`"))
+		return FALSE;
+	if (g_str_has_suffix (text, "`"))
+		return FALSE;
+
+	/* paths */
+	if (g_str_has_prefix (text, "/"))
+		return TRUE;
+
+	/* bugzillas */
+	if (g_str_has_prefix (text, "#"))
+		return TRUE;
+
+	/* patch files */
+	if (g_strrstr (text, ".patch") != NULL)
+		return TRUE;
+	if (g_strrstr (text, ".diff") != NULL)
+		return TRUE;
+
+	/* function names */
+	if (g_strrstr (text, "()") != NULL)
+		return TRUE;
+
+	/* email addresses */
+	if (g_strrstr (text, "@") != NULL)
+		return TRUE;
+
+	/* compiler defines */
+	if (text[0] != '_' &&
+	    gs_markdown_count_chars_in_word (text, '_') > 1)
+		return TRUE;
+
+	/* nothing special */
+	return FALSE;
+}
+
+static gchar *
+gs_markdown_word_auto_format_code (const gchar *text)
+{
+	guint i;
+	gchar *temp;
+	gboolean ret = FALSE;
+	g_auto(GStrv) words = NULL;
+
+	/* split sentence up with space */
+	words = g_strsplit (text, " ", -1);
+
+	/* search each word */
+	for (i = 0; words[i] != NULL; i++) {
+		if (gs_markdown_word_is_code (words[i])) {
+			temp = g_strdup_printf ("`%s`", words[i]);
+			g_free (words[i]);
+			words[i] = temp;
+			ret = TRUE;
+		}
+	}
+
+	/* no replacements, so just return a copy */
+	if (!ret)
+		return g_strdup (text);
+
+	/* join the array back into a string */
+	return g_strjoinv (" ", words);
+}
+
+static gboolean
+gs_markdown_word_is_url (const gchar *text)
+{
+	if (g_str_has_prefix (text, "http://"))
+		return TRUE;
+	if (g_str_has_prefix (text, "https://"))
+		return TRUE;
+	if (g_str_has_prefix (text, "ftp://"))
+		return TRUE;
+	return FALSE;
+}
+
+static gchar *
+gs_markdown_word_auto_format_urls (const gchar *text)
+{
+	guint i;
+	gchar *temp;
+	gboolean ret = FALSE;
+	g_auto(GStrv) words = NULL;
+
+	/* split sentence up with space */
+	words = g_strsplit (text, " ", -1);
+
+	/* search each word */
+	for (i = 0; words[i] != NULL; i++) {
+		if (gs_markdown_word_is_url (words[i])) {
+			temp = g_strdup_printf ("<a href=\"%s\">%s</a>",
+						words[i], words[i]);
+			g_free (words[i]);
+			words[i] = temp;
+			ret = TRUE;
+		}
+	}
+
+	/* no replacements, so just return a copy */
+	if (!ret)
+		return g_strdup (text);
+
+	/* join the array back into a string */
+	return g_strjoinv (" ", words);
+}
+
+static void
+gs_markdown_flush_pending (GsMarkdown *self)
+{
+	g_autofree gchar *copy = NULL;
+	g_autofree gchar *temp = NULL;
+
+	/* no data yet */
+	if (self->mode == GS_MARKDOWN_MODE_UNKNOWN)
+		return;
+
+	/* remove trailing spaces */
+	while (g_str_has_suffix (self->pending->str, " "))
+		g_string_set_size (self->pending, self->pending->len - 1);
+
+	/* pango requires escaping */
+	copy = g_strdup (self->pending->str);
+	if (!self->escape && self->output == GS_MARKDOWN_OUTPUT_PANGO) {
+		g_strdelimit (copy, "<", '(');
+		g_strdelimit (copy, ">", ')');
+		g_strdelimit (copy, "&", '+');
+	}
+
+	/* check words for code */
+	if (self->autocode &&
+	    (self->mode == GS_MARKDOWN_MODE_PARA ||
+	     self->mode == GS_MARKDOWN_MODE_BULLETT)) {
+		temp = gs_markdown_word_auto_format_code (copy);
+		g_free (copy);
+		copy = temp;
+	}
+
+	/* escape */
+	if (self->escape) {
+		temp = g_markup_escape_text (copy, -1);
+		g_free (copy);
+		copy = temp;
+	}
+
+	/* check words for URLS */
+	if (self->autolinkify &&
+	    self->output == GS_MARKDOWN_OUTPUT_PANGO &&
+	    (self->mode == GS_MARKDOWN_MODE_PARA ||
+	     self->mode == GS_MARKDOWN_MODE_BULLETT)) {
+		temp = gs_markdown_word_auto_format_urls (copy);
+		g_free (copy);
+		copy = temp;
+	}
+
+	/* do formatting */
+	temp = gs_markdown_to_text_line_format (self, copy);
+	if (self->mode == GS_MARKDOWN_MODE_BULLETT) {
+		g_string_append_printf (self->processed, "%s%s%s\n",
+					self->tags.bullet_start,
+					temp,
+					self->tags.bullet_end);
+		self->line_count++;
+	} else if (self->mode == GS_MARKDOWN_MODE_H1) {
+		g_string_append_printf (self->processed, "%s%s%s\n",
+					self->tags.h1_start,
+					temp,
+					self->tags.h1_end);
+	} else if (self->mode == GS_MARKDOWN_MODE_H2) {
+		g_string_append_printf (self->processed, "%s%s%s\n",
+					self->tags.h2_start,
+					temp,
+					self->tags.h2_end);
+	} else if (self->mode == GS_MARKDOWN_MODE_PARA ||
+		   self->mode == GS_MARKDOWN_MODE_RULE) {
+		g_string_append_printf (self->processed, "%s\n", temp);
+		self->line_count++;
+	}
+
+	/* clear */
+	g_string_truncate (self->pending, 0);
+}
+
+static gboolean
+gs_markdown_to_text_line_process (GsMarkdown *self, const gchar *line)
+{
+	gboolean ret;
+
+	/* blank */
+	ret = gs_markdown_to_text_line_is_blank (line);
+	if (ret) {
+		gs_markdown_flush_pending (self);
+		/* a new line after a list is the end of list, not a gap */
+		if (self->mode != GS_MARKDOWN_MODE_BULLETT)
+			ret = gs_markdown_add_pending (self, "\n");
+		self->mode = GS_MARKDOWN_MODE_BLANK;
+		goto out;
+	}
+
+	/* header1_type2 */
+	ret = gs_markdown_to_text_line_is_header1_type2 (line);
+	if (ret) {
+		if (self->mode == GS_MARKDOWN_MODE_PARA)
+			self->mode = GS_MARKDOWN_MODE_H1;
+		goto out;
+	}
+
+	/* header2_type2 */
+	ret = gs_markdown_to_text_line_is_header2_type2 (line);
+	if (ret) {
+		if (self->mode == GS_MARKDOWN_MODE_PARA)
+			self->mode = GS_MARKDOWN_MODE_H2;
+		goto out;
+	}
+
+	/* rule */
+	ret = gs_markdown_to_text_line_is_rule (line);
+	if (ret) {
+		gs_markdown_flush_pending (self);
+		self->mode = GS_MARKDOWN_MODE_RULE;
+		ret = gs_markdown_add_pending (self, self->tags.rule);
+		goto out;
+	}
+
+	/* bullet */
+	ret = gs_markdown_to_text_line_is_bullet (line);
+	if (ret) {
+		gs_markdown_flush_pending (self);
+		self->mode = GS_MARKDOWN_MODE_BULLETT;
+		ret = gs_markdown_add_pending (self, &line[2]);
+		goto out;
+	}
+
+	/* header1 */
+	ret = gs_markdown_to_text_line_is_header1 (line);
+	if (ret) {
+		gs_markdown_flush_pending (self);
+		self->mode = GS_MARKDOWN_MODE_H1;
+		ret = gs_markdown_add_pending_header (self, &line[2]);
+		goto out;
+	}
+
+	/* header2 */
+	ret = gs_markdown_to_text_line_is_header2 (line);
+	if (ret) {
+		gs_markdown_flush_pending (self);
+		self->mode = GS_MARKDOWN_MODE_H2;
+		ret = gs_markdown_add_pending_header (self, &line[3]);
+		goto out;
+	}
+
+	/* paragraph */
+	if (self->mode == GS_MARKDOWN_MODE_BLANK ||
+	    self->mode == GS_MARKDOWN_MODE_UNKNOWN) {
+		gs_markdown_flush_pending (self);
+		self->mode = GS_MARKDOWN_MODE_PARA;
+	}
+
+	/* add to pending */
+	ret = gs_markdown_add_pending (self, line);
+out:
+	/* if we failed to add, we don't know the mode */
+	if (!ret)
+		self->mode = GS_MARKDOWN_MODE_UNKNOWN;
+	return ret;
+}
+
+static void
+gs_markdown_set_output_kind (GsMarkdown *self, GsMarkdownOutputKind output)
+{
+	g_return_if_fail (GS_IS_MARKDOWN (self));
+
+	self->output = output;
+	switch (output) {
+	case GS_MARKDOWN_OUTPUT_PANGO:
+		/* PangoMarkup */
+		self->tags.em_start = "<i>";
+		self->tags.em_end = "</i>";
+		self->tags.strong_start = "<b>";
+		self->tags.strong_end = "</b>";
+		self->tags.code_start = "<tt>";
+		self->tags.code_end = "</tt>";
+		self->tags.h1_start = "<big>";
+		self->tags.h1_end = "</big>";
+		self->tags.h2_start = "<b>";
+		self->tags.h2_end = "</b>";
+		self->tags.bullet_start = "• ";
+		self->tags.bullet_end = "";
+		self->tags.rule = "⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯\n";
+		self->escape = TRUE;
+		self->autolinkify = TRUE;
+		break;
+	case GS_MARKDOWN_OUTPUT_HTML:
+		/* XHTML */
+		self->tags.em_start = "<em>";
+		self->tags.em_end = "<em>";
+		self->tags.strong_start = "<strong>";
+		self->tags.strong_end = "</strong>";
+		self->tags.code_start = "<code>";
+		self->tags.code_end = "</code>";
+		self->tags.h1_start = "<h1>";
+		self->tags.h1_end = "</h1>";
+		self->tags.h2_start = "<h2>";
+		self->tags.h2_end = "</h2>";
+		self->tags.bullet_start = "<li>";
+		self->tags.bullet_end = "</li>";
+		self->tags.rule = "<hr>";
+		self->escape = TRUE;
+		self->autolinkify = TRUE;
+		break;
+	case GS_MARKDOWN_OUTPUT_TEXT:
+		/* plain text */
+		self->tags.em_start = "";
+		self->tags.em_end = "";
+		self->tags.strong_start = "";
+		self->tags.strong_end = "";
+		self->tags.code_start = "";
+		self->tags.code_end = "";
+		self->tags.h1_start = "[";
+		self->tags.h1_end = "]";
+		self->tags.h2_start = "-";
+		self->tags.h2_end = "-";
+		self->tags.bullet_start = "* ";
+		self->tags.bullet_end = "";
+		self->tags.rule = " ----- \n";
+		self->escape = FALSE;
+		self->autolinkify = FALSE;
+		break;
+	default:
+		g_warning ("unknown output enum");
+		break;
+	}
+}
+
+void
+gs_markdown_set_max_lines (GsMarkdown *self, gint max_lines)
+{
+	g_return_if_fail (GS_IS_MARKDOWN (self));
+	self->max_lines = max_lines;
+}
+
+void
+gs_markdown_set_smart_quoting (GsMarkdown *self, gboolean smart_quoting)
+{
+	g_return_if_fail (GS_IS_MARKDOWN (self));
+	self->smart_quoting = smart_quoting;
+}
+
+void
+gs_markdown_set_escape (GsMarkdown *self, gboolean escape)
+{
+	g_return_if_fail (GS_IS_MARKDOWN (self));
+	self->escape = escape;
+}
+
+void
+gs_markdown_set_autocode (GsMarkdown *self, gboolean autocode)
+{
+	g_return_if_fail (GS_IS_MARKDOWN (self));
+	self->autocode = autocode;
+}
+
+void
+gs_markdown_set_autolinkify (GsMarkdown *self, gboolean autolinkify)
+{
+	g_return_if_fail (GS_IS_MARKDOWN (self));
+	self->autolinkify = autolinkify;
+}
+
+gchar *
+gs_markdown_parse (GsMarkdown *self, const gchar *markdown)
+{
+	gboolean ret;
+	gchar *temp;
+	guint i;
+	guint len;
+	g_auto(GStrv) lines = NULL;
+
+	g_return_val_if_fail (GS_IS_MARKDOWN (self), NULL);
+
+	/* process */
+	self->mode = GS_MARKDOWN_MODE_UNKNOWN;
+	self->line_count = 0;
+	g_string_truncate (self->pending, 0);
+	g_string_truncate (self->processed, 0);
+	lines = g_strsplit (markdown, "\n", -1);
+	len = g_strv_length (lines);
+
+	/* process each line */
+	for (i = 0; i < len; i++) {
+		ret = gs_markdown_to_text_line_process (self, lines[i]);
+		if (!ret)
+			break;
+	}
+	gs_markdown_flush_pending (self);
+
+	/* remove trailing \n */
+	while (g_str_has_suffix (self->processed->str, "\n"))
+		g_string_set_size (self->processed, self->processed->len - 1);
+
+	/* get a copy */
+	temp = g_strdup (self->processed->str);
+	g_string_truncate (self->pending, 0);
+	g_string_truncate (self->processed, 0);
+	return temp;
+}
+
+static void
+gs_markdown_finalize (GObject *object)
+{
+	GsMarkdown *self;
+
+	g_return_if_fail (GS_IS_MARKDOWN (object));
+
+	self = GS_MARKDOWN (object);
+
+	g_string_free (self->pending, TRUE);
+	g_string_free (self->processed, TRUE);
+
+	G_OBJECT_CLASS (gs_markdown_parent_class)->finalize (object);
+}
+
+static void
+gs_markdown_class_init (GsMarkdownClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	object_class->finalize = gs_markdown_finalize;
+}
+
+static void
+gs_markdown_init (GsMarkdown *self)
+{
+	self->mode = GS_MARKDOWN_MODE_UNKNOWN;
+	self->pending = g_string_new ("");
+	self->processed = g_string_new ("");
+	self->max_lines = -1;
+	self->smart_quoting = FALSE;
+	self->escape = FALSE;
+	self->autocode = FALSE;
+}
+
+GsMarkdown *
+gs_markdown_new (GsMarkdownOutputKind output)
+{
+	GsMarkdown *self;
+	self = g_object_new (GS_TYPE_MARKDOWN, NULL);
+	gs_markdown_set_output_kind (self, output);
+	return GS_MARKDOWN (self);
+}
diff --git a/plugins/packagekit/gs-markdown.h b/plugins/packagekit/gs-markdown.h
new file mode 100644
index 0000000..51e6233
--- /dev/null
+++ b/plugins/packagekit/gs-markdown.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2008-2013 Richard Hughes <richard@hughsie.com>
+ * Copyright (C) 2015 Kalev Lember <klember@redhat.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#pragma once
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GS_TYPE_MARKDOWN (gs_markdown_get_type ())
+
+G_DECLARE_FINAL_TYPE (GsMarkdown, gs_markdown, GS, MARKDOWN, GObject)
+
+typedef enum {
+	GS_MARKDOWN_OUTPUT_TEXT,
+	GS_MARKDOWN_OUTPUT_PANGO,
+	GS_MARKDOWN_OUTPUT_HTML,
+	GS_MARKDOWN_OUTPUT_LAST
+} GsMarkdownOutputKind;
+
+GsMarkdown	*gs_markdown_new			(GsMarkdownOutputKind	 output);
+void		 gs_markdown_set_max_lines		(GsMarkdown		*self,
+							 gint			 max_lines);
+void		 gs_markdown_set_smart_quoting		(GsMarkdown		*self,
+							 gboolean		 smart_quoting);
+void		 gs_markdown_set_escape			(GsMarkdown		*self,
+							 gboolean		 escape);
+void		 gs_markdown_set_autocode		(GsMarkdown		*self,
+							 gboolean		 autocode);
+void		 gs_markdown_set_autolinkify		(GsMarkdown		*self,
+							 gboolean		 autolinkify);
+gchar		*gs_markdown_parse			(GsMarkdown		*self,
+							 const gchar		*text);
+
+G_END_DECLS
diff --git a/plugins/packagekit/gs-packagekit-helper.c b/plugins/packagekit/gs-packagekit-helper.c
new file mode 100644
index 0000000..7ae42c1
--- /dev/null
+++ b/plugins/packagekit/gs-packagekit-helper.c
@@ -0,0 +1,141 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2016-2018 Richard Hughes <richard@hughsie.com>
+ * Copyright (C) 2019 Kalev Lember <klember@redhat.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include "config.h"
+
+#include <glib.h>
+
+#include "gs-packagekit-helper.h"
+#include "packagekit-common.h"
+
+struct _GsPackagekitHelper {
+	GObject			 parent_instance;
+	GHashTable		*apps;
+	GsApp			*progress_app;
+	GsAppList		*progress_list;
+	GsPlugin		*plugin;
+};
+
+G_DEFINE_TYPE (GsPackagekitHelper, gs_packagekit_helper, G_TYPE_OBJECT)
+
+void
+gs_packagekit_helper_cb (PkProgress *progress, PkProgressType type, gpointer user_data)
+{
+	GsPackagekitHelper *self = (GsPackagekitHelper *) user_data;
+	GsPlugin *plugin = gs_packagekit_helper_get_plugin (self);
+	const gchar *package_id = pk_progress_get_package_id (progress);
+	GsApp *app = NULL;
+
+	/* optional */
+	if (self->progress_app != NULL)
+		app = self->progress_app;
+	else if (package_id != NULL)
+		app = gs_packagekit_helper_get_app_by_id (self, package_id);
+
+	if (type == PK_PROGRESS_TYPE_STATUS) {
+		PkStatusEnum status = pk_progress_get_status (progress);
+		GsPluginStatus plugin_status = packagekit_status_enum_to_plugin_status (status);
+		if (plugin_status != GS_PLUGIN_STATUS_UNKNOWN)
+			gs_plugin_status_update (plugin, app, plugin_status);
+	} else if (type == PK_PROGRESS_TYPE_PERCENTAGE) {
+		gint percentage = pk_progress_get_percentage (progress);
+		if (app != NULL && percentage >= 0 && percentage <= 100)
+			gs_app_set_progress (app, (guint) percentage);
+		if (self->progress_list != NULL && percentage >= 0 && percentage <= 100)
+			gs_app_list_override_progress (self->progress_list, (guint) percentage);
+	}
+
+	/* Only go from TRUE to FALSE - it doesn't make sense for a package
+	 * install to become uncancellable later on */
+	if (app != NULL && gs_app_get_allow_cancel (app))
+		gs_app_set_allow_cancel (app, pk_progress_get_allow_cancel (progress));
+}
+
+void
+gs_packagekit_helper_add_app (GsPackagekitHelper *self, GsApp *app)
+{
+	GPtrArray *source_ids = gs_app_get_source_ids (app);
+
+	g_return_if_fail (GS_IS_PACKAGEKIT_HELPER (self));
+	g_return_if_fail (GS_IS_APP (app));
+
+	for (guint i = 0; i < source_ids->len; i++) {
+		const gchar *source_id = g_ptr_array_index (source_ids, i);
+		g_hash_table_insert (self->apps,
+				     g_strdup (source_id),
+				     g_object_ref (app));
+	}
+}
+
+void
+gs_packagekit_helper_set_progress_app (GsPackagekitHelper *self, GsApp *progress_app)
+{
+	g_set_object (&self->progress_app, progress_app);
+}
+
+void
+gs_packagekit_helper_set_progress_list (GsPackagekitHelper *self, GsAppList *progress_list)
+{
+	g_set_object (&self->progress_list, progress_list);
+}
+
+GsPlugin *
+gs_packagekit_helper_get_plugin (GsPackagekitHelper *self)
+{
+	g_return_val_if_fail (GS_IS_PACKAGEKIT_HELPER (self), NULL);
+	return self->plugin;
+}
+
+GsApp *
+gs_packagekit_helper_get_app_by_id (GsPackagekitHelper *self, const gchar *package_id)
+{
+	g_return_val_if_fail (GS_IS_PACKAGEKIT_HELPER (self), NULL);
+	g_return_val_if_fail (package_id != NULL, NULL);
+	return g_hash_table_lookup (self->apps, package_id);
+}
+
+static void
+gs_packagekit_helper_finalize (GObject *object)
+{
+	GsPackagekitHelper *self;
+
+	g_return_if_fail (GS_IS_PACKAGEKIT_HELPER (object));
+
+	self = GS_PACKAGEKIT_HELPER (object);
+
+	g_object_unref (self->plugin);
+	g_clear_object (&self->progress_app);
+	g_clear_object (&self->progress_list);
+	g_hash_table_unref (self->apps);
+
+	G_OBJECT_CLASS (gs_packagekit_helper_parent_class)->finalize (object);
+}
+
+static void
+gs_packagekit_helper_class_init (GsPackagekitHelperClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	object_class->finalize = gs_packagekit_helper_finalize;
+}
+
+static void
+gs_packagekit_helper_init (GsPackagekitHelper *self)
+{
+	self->apps = g_hash_table_new_full (g_str_hash, g_str_equal,
+					      g_free, (GDestroyNotify) g_object_unref);
+}
+
+GsPackagekitHelper *
+gs_packagekit_helper_new (GsPlugin *plugin)
+{
+	GsPackagekitHelper *self;
+	self = g_object_new (GS_TYPE_PACKAGEKIT_HELPER, NULL);
+	self->plugin = g_object_ref (plugin);
+	return GS_PACKAGEKIT_HELPER (self);
+}
diff --git a/plugins/packagekit/gs-packagekit-helper.h b/plugins/packagekit/gs-packagekit-helper.h
new file mode 100644
index 0000000..594d0c0
--- /dev/null
+++ b/plugins/packagekit/gs-packagekit-helper.h
@@ -0,0 +1,37 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2016-2018 Richard Hughes <richard@hughsie.com>
+ * Copyright (C) 2019 Kalev Lember <klember@redhat.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#pragma once
+
+#include <glib-object.h>
+#include <gnome-software.h>
+#include <packagekit-glib2/packagekit.h>
+
+G_BEGIN_DECLS
+
+#define GS_TYPE_PACKAGEKIT_HELPER (gs_packagekit_helper_get_type ())
+
+G_DECLARE_FINAL_TYPE (GsPackagekitHelper, gs_packagekit_helper, GS, PACKAGEKIT_HELPER, GObject)
+
+GsPackagekitHelper *gs_packagekit_helper_new		(GsPlugin		*plugin);
+GsPlugin	*gs_packagekit_helper_get_plugin	(GsPackagekitHelper	*self);
+void		 gs_packagekit_helper_add_app		(GsPackagekitHelper	*self,
+							 GsApp			*app);
+void		 gs_packagekit_helper_set_progress_app	(GsPackagekitHelper	*self,
+							 GsApp			*progress_app);
+void		 gs_packagekit_helper_set_progress_list	(GsPackagekitHelper	*self,
+							 GsAppList		*progress_list);
+GsApp		*gs_packagekit_helper_get_app_by_id	(GsPackagekitHelper	*self,
+							 const gchar		*package_id);
+void		 gs_packagekit_helper_cb		(PkProgress		*progress,
+							 PkProgressType		 type,
+							 gpointer		 user_data);
+
+
+G_END_DECLS
diff --git a/plugins/packagekit/gs-packagekit-task.c b/plugins/packagekit/gs-packagekit-task.c
new file mode 100644
index 0000000..7727ce3
--- /dev/null
+++ b/plugins/packagekit/gs-packagekit-task.c
@@ -0,0 +1,280 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2021 Red Hat <www.redhat.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include "config.h"
+
+#include <glib/gi18n-lib.h>
+
+#include "gs-packagekit-task.h"
+
+/**
+ * SECTION:gs-packagekit-task
+ * @short_description: PkTask subclass which implements vfuncs for user interaction during a task
+ *
+ * #GsPackagekitTask is a subclass of #PkTask which represents a single
+ * operation on PackageKit.
+ *
+ * By subclassing #PkTask, it can implement vfuncs which allow decisions
+ * to be made about the task while it’s running. For example, to decide
+ * what to do if an untrusted package needs to be installed.
+ *
+ * Since: 42
+ */
+
+typedef struct {
+	GWeakRef plugin_weakref; /* GsPlugin * */
+	GsPluginAction action;
+	GsPackagekitHelper *helper;
+
+} GsPackagekitTaskPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (GsPackagekitTask, gs_packagekit_task, PK_TYPE_TASK)
+
+static gboolean
+gs_packagekit_task_user_accepted (PkTask *task,
+				  const gchar *title,
+				  const gchar *msg,
+				  const gchar *details,
+				  const gchar *accept_label)
+{
+	GsPackagekitTask *gs_task = GS_PACKAGEKIT_TASK (task);
+	GsPackagekitTaskPrivate *priv = gs_packagekit_task_get_instance_private (gs_task);
+	g_autoptr(GsPlugin) plugin = NULL;
+	gboolean accepts = FALSE;
+
+	plugin = g_weak_ref_get (&priv->plugin_weakref);
+	if (plugin)
+		accepts = gs_plugin_ask_untrusted (plugin, title, msg, details, accept_label);
+
+	return accepts;
+}
+
+typedef struct {
+	GWeakRef task_weakref;
+	guint request;
+	gchar *title;
+	gchar *msg;
+	gchar *details;
+	gchar *accept_label;
+} QuestionData;
+
+static QuestionData *
+question_data_new (GsPackagekitTask *task,
+		   guint request,
+		   const gchar *title,
+		   const gchar *msg,
+		   const gchar *details,
+		   const gchar *accept_label)
+{
+	QuestionData *qd;
+
+	qd = g_slice_new0 (QuestionData);
+	g_weak_ref_init (&qd->task_weakref, task);
+	qd->request = request;
+	qd->title = g_strdup (title);
+	qd->msg = g_strdup (msg);
+	qd->details = g_strdup (details);
+	qd->accept_label = g_strdup (accept_label);
+
+	return qd;
+}
+
+static void
+question_data_free (gpointer ptr)
+{
+	QuestionData *qd = ptr;
+	g_weak_ref_clear (&qd->task_weakref);
+	g_free (qd->title);
+	g_free (qd->msg);
+	g_free (qd->details);
+	g_free (qd->accept_label);
+	g_slice_free (QuestionData, qd);
+}
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (QuestionData, question_data_free)
+
+static gboolean
+gs_packagekit_task_question_idle_cb (gpointer user_data)
+{
+	QuestionData *qd = user_data;
+	g_autoptr(PkTask) task = NULL;
+
+	task = g_weak_ref_get (&qd->task_weakref);
+	if (task) {
+		if (gs_packagekit_task_user_accepted (task, qd->title, qd->msg, qd->details, qd->accept_label))
+			pk_task_user_accepted (task, qd->request);
+		else
+			pk_task_user_declined (task, qd->request);
+	}
+
+	return G_SOURCE_REMOVE;
+}
+
+static void
+gs_packagekit_task_schedule_question (GsPackagekitTask *task,
+				      guint request,
+				      const gchar *title,
+				      const gchar *msg,
+				      const gchar *details,
+				      const gchar *accept_label)
+{
+	g_autoptr(QuestionData) qd = NULL;
+
+	qd = question_data_new (task, request, title, msg, details, accept_label);
+	g_idle_add_full (G_PRIORITY_HIGH_IDLE, gs_packagekit_task_question_idle_cb, g_steal_pointer (&qd), question_data_free);
+}
+
+/* This may be called in a PackageKit worker thread. */
+static void
+gs_packagekit_task_untrusted_question (PkTask *task,
+				       guint request,
+				       PkResults *results)
+{
+	GsPackagekitTask *gs_task = GS_PACKAGEKIT_TASK (task);
+	GsPackagekitTaskPrivate *priv = gs_packagekit_task_get_instance_private (gs_task);
+	g_autoptr(PkError) error = NULL;
+	const gchar *title;
+	const gchar *msg;
+	const gchar *details;
+	const gchar *accept_label;
+
+	switch (priv->action) {
+	case GS_PLUGIN_ACTION_INSTALL:
+		title = _("Install Unsigned Software?");
+		msg = _("Software that is to be installed is not signed. It will not be possible to verify the origin of updates to this software, or whether updates have been tampered with.");
+		accept_label = _("_Install");
+		break;
+	case GS_PLUGIN_ACTION_DOWNLOAD:
+		title = _("Download Unsigned Software?");
+		msg = _("Unsigned updates are available. Without a signature, it is not possible to verify the origin of the update, or whether it has been tampered with.");
+		accept_label = _("_Download");
+		break;
+	case GS_PLUGIN_ACTION_UPDATE:
+		title = _("Update Unsigned Software?");
+		msg = _("Unsigned updates are available. Without a signature, it is not possible to verify the origin of the update, or whether it has been tampered with. Software updates will be disabled until unsigned updates are either removed or updated.");
+		accept_label = _("_Update");
+		break;
+	default:
+		pk_task_user_declined (task, request);
+		return;
+	}
+
+	error = pk_results_get_error_code (results);
+	if (error)
+		details = pk_error_get_details (error);
+	else
+		details = NULL;
+
+	gs_packagekit_task_schedule_question (gs_task, request, title, msg, details, accept_label);
+}
+
+static void
+gs_packagekit_task_finalize (GObject *object)
+{
+	GsPackagekitTask *task = GS_PACKAGEKIT_TASK (object);
+	GsPackagekitTaskPrivate *priv = gs_packagekit_task_get_instance_private (task);
+
+	g_weak_ref_clear (&priv->plugin_weakref);
+	g_clear_object (&priv->helper);
+
+	G_OBJECT_CLASS (gs_packagekit_task_parent_class)->finalize (object);
+}
+
+static void
+gs_packagekit_task_class_init (GsPackagekitTaskClass *klass)
+{
+	GObjectClass *object_class;
+	PkTaskClass *task_class;
+
+	task_class = PK_TASK_CLASS (klass);
+	task_class->untrusted_question = gs_packagekit_task_untrusted_question;
+
+	object_class = G_OBJECT_CLASS (klass);
+	object_class->finalize = gs_packagekit_task_finalize;
+}
+
+static void
+gs_packagekit_task_init (GsPackagekitTask *task)
+{
+	GsPackagekitTaskPrivate *priv = gs_packagekit_task_get_instance_private (task);
+
+	g_weak_ref_init (&priv->plugin_weakref, NULL);
+}
+
+PkTask *
+gs_packagekit_task_new (GsPlugin *plugin)
+{
+	GsPackagekitTask *task;
+	GsPackagekitTaskPrivate *priv;
+
+	g_return_val_if_fail (GS_IS_PLUGIN (plugin), NULL);
+
+	task = g_object_new (GS_TYPE_PACKAGEKIT_TASK, NULL);
+	priv = gs_packagekit_task_get_instance_private (task);
+
+	g_weak_ref_set (&priv->plugin_weakref, plugin);
+
+	return PK_TASK (task);
+}
+
+void
+gs_packagekit_task_setup (GsPackagekitTask *task,
+			  GsPluginAction action,
+			  gboolean interactive)
+{
+	GsPackagekitTaskPrivate *priv = gs_packagekit_task_get_instance_private (task);
+
+	g_return_if_fail (GS_IS_PACKAGEKIT_TASK (task));
+
+	priv->action = action;
+
+	/* The :interactive and :background properties have slightly different
+	 * purposes:
+	 *  - :interactive controls whether the task can create interactive
+	 *    authentication (polkit) prompts
+	 *  - :background controls the scheduling of the task relative to other
+	 *    PackageKit tasks from this client and other clients
+	 * However, we always want to set them both based on the same
+	 * conditions. */
+	pk_client_set_interactive (PK_CLIENT (task), interactive);
+	pk_client_set_background (PK_CLIENT (task), !interactive);
+}
+
+GsPluginAction
+gs_packagekit_task_get_action (GsPackagekitTask *task)
+{
+	GsPackagekitTaskPrivate *priv = gs_packagekit_task_get_instance_private (task);
+
+	g_return_val_if_fail (GS_IS_PACKAGEKIT_TASK (task), GS_PLUGIN_ACTION_UNKNOWN);
+
+	return priv->action;
+}
+
+void
+gs_packagekit_task_take_helper (GsPackagekitTask *task,
+				GsPackagekitHelper *helper)
+{
+	GsPackagekitTaskPrivate *priv = gs_packagekit_task_get_instance_private (task);
+
+	g_return_if_fail (GS_IS_PACKAGEKIT_TASK (task));
+
+	if (priv->helper != helper) {
+		g_clear_object (&priv->helper);
+		priv->helper = helper;
+	}
+}
+
+GsPackagekitHelper *
+gs_packagekit_task_get_helper (GsPackagekitTask *task)
+{
+	GsPackagekitTaskPrivate *priv = gs_packagekit_task_get_instance_private (task);
+
+	g_return_val_if_fail (GS_IS_PACKAGEKIT_TASK (task), NULL);
+
+	return priv->helper;
+}
diff --git a/plugins/packagekit/gs-packagekit-task.h b/plugins/packagekit/gs-packagekit-task.h
new file mode 100644
index 0000000..ff4bcc6
--- /dev/null
+++ b/plugins/packagekit/gs-packagekit-task.h
@@ -0,0 +1,38 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2021 Red Hat <www.redhat.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#pragma once
+
+#include <glib-object.h>
+#include <gnome-software.h>
+#include <packagekit-glib2/packagekit.h>
+
+#include "gs-packagekit-helper.h"
+
+G_BEGIN_DECLS
+
+#define GS_TYPE_PACKAGEKIT_TASK (gs_packagekit_task_get_type ())
+
+G_DECLARE_DERIVABLE_TYPE (GsPackagekitTask, gs_packagekit_task, GS, PACKAGEKIT_TASK, PkTask)
+
+struct _GsPackagekitTaskClass
+{
+	PkTaskClass parent_class;
+};
+
+PkTask		*gs_packagekit_task_new		(GsPlugin		*plugin);
+void		 gs_packagekit_task_setup	(GsPackagekitTask	*task,
+						 GsPluginAction		 action,
+						 gboolean		 interactive);
+GsPluginAction	 gs_packagekit_task_get_action	(GsPackagekitTask	*task);
+void		 gs_packagekit_task_take_helper	(GsPackagekitTask	*task,
+						 GsPackagekitHelper	*helper);
+GsPackagekitHelper *
+		 gs_packagekit_task_get_helper	(GsPackagekitTask	*task);
+
+G_END_DECLS
diff --git a/plugins/packagekit/gs-plugin-packagekit.c b/plugins/packagekit/gs-plugin-packagekit.c
new file mode 100644
index 0000000..5b601c9
--- /dev/null
+++ b/plugins/packagekit/gs-plugin-packagekit.c
@@ -0,0 +1,4080 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2013-2016 Richard Hughes <richard@hughsie.com>
+ * Copyright (C) 2014-2018 Kalev Lember <klember@redhat.com>
+ * Copyright (C) 2017 Canonical Ltd
+ * Copyright (C) 2013 Matthias Clasen <mclasen@redhat.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <config.h>
+
+#include <glib/gi18n-lib.h>
+#include <gnome-software.h>
+#include <gsettings-desktop-schemas/gdesktop-enums.h>
+#include <packagekit-glib2/packagekit.h>
+#include <string.h>
+
+#include "packagekit-common.h"
+#include "gs-markdown.h"
+#include "gs-packagekit-helper.h"
+#include "gs-packagekit-task.h"
+#include "gs-plugin-private.h"
+
+#include "gs-plugin-packagekit.h"
+
+/*
+ * SECTION:
+ * Uses the system PackageKit instance to return installed packages,
+ * sources and the ability to add and remove packages. Supports package history
+ * and converting URIs to apps.
+ *
+ * Supports setting the session proxy on the system PackageKit instance.
+ *
+ * Also supports doing a PackageKit UpdatePackages(ONLY_DOWNLOAD) method on
+ * refresh and also converts any package files to applications the best we can.
+ *
+ * Also supports converting repo filenames to package-ids.
+ *
+ * Also supports marking previously downloaded packages as zero size, and allows
+ * scheduling the offline update.
+ *
+ * Requires:    | [source-id], [repos::repo-filename]
+ * Refines:     | [source-id], [source], [update-details], [management-plugin]
+ */
+
+#define GS_PLUGIN_PACKAGEKIT_HISTORY_TIMEOUT	5000 /* ms */
+
+/* Timeout to trigger auto-prepare update after the prepared update had been invalidated */
+#define PREPARE_UPDATE_TIMEOUT_SECS 30
+
+struct _GsPluginPackagekit {
+	GsPlugin		 parent;
+
+	PkControl		*control_refine;
+
+	PkControl		*control_proxy;
+	GSettings		*settings_proxy;
+	GSettings		*settings_http;
+	GSettings		*settings_https;
+	GSettings		*settings_ftp;
+	GSettings		*settings_socks;
+
+	GFileMonitor		*monitor;
+	GFileMonitor		*monitor_trigger;
+	GPermission		*permission;
+	gboolean		 is_triggered;
+	GHashTable		*prepared_updates;  /* (element-type utf8); set of package IDs for updates which are already prepared */
+	GMutex			 prepared_updates_mutex;
+	guint			 prepare_update_timeout_id;
+
+	GCancellable		*proxy_settings_cancellable;  /* (nullable) (owned) */
+};
+
+G_DEFINE_TYPE (GsPluginPackagekit, gs_plugin_packagekit, GS_TYPE_PLUGIN)
+
+static void gs_plugin_packagekit_updates_changed_cb (PkControl *control, GsPlugin *plugin);
+static void gs_plugin_packagekit_repo_list_changed_cb (PkControl *control, GsPlugin *plugin);
+static void gs_plugin_packagekit_refine_history_async (GsPluginPackagekit  *self,
+                                                       GsAppList           *list,
+                                                       GCancellable        *cancellable,
+                                                       GAsyncReadyCallback  callback,
+                                                       gpointer             user_data);
+static gboolean gs_plugin_packagekit_refine_history_finish (GsPluginPackagekit  *self,
+                                                            GAsyncResult        *result,
+                                                            GError             **error);
+static void gs_plugin_packagekit_proxy_changed_cb (GSettings   *settings,
+                                                   const gchar *key,
+                                                   gpointer     user_data);
+static void reload_proxy_settings_async (GsPluginPackagekit  *self,
+                                         GCancellable        *cancellable,
+                                         GAsyncReadyCallback  callback,
+                                         gpointer             user_data);
+static gboolean reload_proxy_settings_finish (GsPluginPackagekit  *self,
+                                              GAsyncResult        *result,
+                                              GError             **error);
+
+static void
+gs_plugin_packagekit_init (GsPluginPackagekit *self)
+{
+	GsPlugin *plugin = GS_PLUGIN (self);
+
+	/* refine */
+	self->control_refine = pk_control_new ();
+	g_signal_connect (self->control_refine, "updates-changed",
+			  G_CALLBACK (gs_plugin_packagekit_updates_changed_cb), plugin);
+	g_signal_connect (self->control_refine, "repo-list-changed",
+			  G_CALLBACK (gs_plugin_packagekit_repo_list_changed_cb), plugin);
+
+	/* proxy */
+	self->control_proxy = pk_control_new ();
+	self->settings_proxy = g_settings_new ("org.gnome.system.proxy");
+	g_signal_connect (self->settings_proxy, "changed",
+			  G_CALLBACK (gs_plugin_packagekit_proxy_changed_cb), self);
+
+	self->settings_http = g_settings_new ("org.gnome.system.proxy.http");
+	self->settings_https = g_settings_new ("org.gnome.system.proxy.https");
+	self->settings_ftp = g_settings_new ("org.gnome.system.proxy.ftp");
+	self->settings_socks = g_settings_new ("org.gnome.system.proxy.socks");
+	g_signal_connect (self->settings_http, "changed",
+			  G_CALLBACK (gs_plugin_packagekit_proxy_changed_cb), self);
+	g_signal_connect (self->settings_https, "changed",
+			  G_CALLBACK (gs_plugin_packagekit_proxy_changed_cb), self);
+	g_signal_connect (self->settings_ftp, "changed",
+			  G_CALLBACK (gs_plugin_packagekit_proxy_changed_cb), self);
+	g_signal_connect (self->settings_socks, "changed",
+			  G_CALLBACK (gs_plugin_packagekit_proxy_changed_cb), self);
+
+	/* offline updates */
+	g_mutex_init (&self->prepared_updates_mutex);
+	self->prepared_updates = g_hash_table_new_full (g_str_hash, g_str_equal,
+							g_free, NULL);
+
+	/* need pkgname and ID */
+	gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream");
+
+	/* we can return better results than dpkg directly */
+	gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "dpkg");
+
+	/* need repos::repo-filename */
+	gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "repos");
+
+	/* generic updates happen after PackageKit offline updates */
+	gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_BEFORE, "generic-updates");
+}
+
+static void
+gs_plugin_packagekit_dispose (GObject *object)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (object);
+
+	if (self->prepare_update_timeout_id) {
+		g_source_remove (self->prepare_update_timeout_id);
+		self->prepare_update_timeout_id = 0;
+	}
+
+	g_cancellable_cancel (self->proxy_settings_cancellable);
+	g_clear_object (&self->proxy_settings_cancellable);
+
+	/* refine */
+	g_clear_object (&self->control_refine);
+
+	/* proxy */
+	g_clear_object (&self->control_proxy);
+	g_clear_object (&self->settings_proxy);
+	g_clear_object (&self->settings_http);
+	g_clear_object (&self->settings_https);
+	g_clear_object (&self->settings_ftp);
+	g_clear_object (&self->settings_socks);
+
+	/* offline updates */
+	g_clear_pointer (&self->prepared_updates, g_hash_table_unref);
+	g_clear_object (&self->monitor);
+	g_clear_object (&self->monitor_trigger);
+
+	G_OBJECT_CLASS (gs_plugin_packagekit_parent_class)->dispose (object);
+}
+
+static void
+gs_plugin_packagekit_finalize (GObject *object)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (object);
+
+	g_mutex_clear (&self->prepared_updates_mutex);
+
+	G_OBJECT_CLASS (gs_plugin_packagekit_parent_class)->finalize (object);
+}
+
+typedef gboolean (*GsAppFilterFunc) (GsApp *app);
+
+static gboolean
+package_is_installed (const gchar *package_id)
+{
+	g_auto(GStrv) split = NULL;
+	const gchar *data;
+
+	split = pk_package_id_split (package_id);
+	if (split == NULL) {
+		return FALSE;
+	}
+
+	data = split[PK_PACKAGE_ID_DATA];
+	if (g_str_has_prefix (data, "installed") ||
+            g_str_has_prefix (data, "manual:") ||
+            g_str_has_prefix (data, "auto:")) {
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/* The elements in the returned #GPtrArray reference memory from within the
+ * @apps list, so the array is only valid as long as @apps is not modified or
+ * freed. The array is not NULL-terminated.
+ *
+ * If @apps is %NULL, that’s considered equivalent to an empty list. */
+static GPtrArray *
+app_list_get_package_ids (GsAppList       *apps,
+                          GsAppFilterFunc  app_filter,
+                          gboolean         ignore_installed)
+{
+	g_autoptr(GPtrArray) list_package_ids = g_ptr_array_new_with_free_func (NULL);
+
+	for (guint i = 0; apps != NULL && i < gs_app_list_length (apps); i++) {
+		GsApp *app = gs_app_list_index (apps, i);
+		GPtrArray *app_source_ids;
+
+		if (app_filter != NULL && !app_filter (app))
+			continue;
+
+		app_source_ids = gs_app_get_source_ids (app);
+		for (guint j = 0; j < app_source_ids->len; j++) {
+			const gchar *package_id = g_ptr_array_index (app_source_ids, j);
+
+			if (ignore_installed && package_is_installed (package_id))
+				continue;
+
+			g_ptr_array_add (list_package_ids, (gchar *) package_id);
+		}
+	}
+
+	return g_steal_pointer (&list_package_ids);
+}
+
+static gboolean
+gs_plugin_add_sources_related (GsPlugin *plugin,
+			       GHashTable *hash,
+			       GCancellable *cancellable,
+			       GError **error)
+{
+	guint i;
+	GsApp *app;
+	GsApp *app_tmp;
+	PkBitfield filter;
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(PkTask) task_related = NULL;
+	const gchar *id;
+	gboolean ret = TRUE;
+	g_autoptr(GsAppList) installed = gs_app_list_new ();
+	g_autoptr(PkResults) results = NULL;
+
+	filter = pk_bitfield_from_enums (PK_FILTER_ENUM_INSTALLED,
+					 PK_FILTER_ENUM_NEWEST,
+					 PK_FILTER_ENUM_ARCH,
+					 PK_FILTER_ENUM_NOT_COLLECTIONS,
+					 -1);
+
+	task_related = gs_packagekit_task_new (plugin);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_related), GS_PLUGIN_ACTION_GET_SOURCES, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+
+	results = pk_client_get_packages (PK_CLIENT (task_related),
+					   filter,
+					   cancellable,
+					   gs_packagekit_helper_cb, helper,
+					   error);
+
+	if (!gs_plugin_packagekit_results_valid (results, error)) {
+		g_prefix_error (error, "failed to get sources related: ");
+		return FALSE;
+	}
+	ret = gs_plugin_packagekit_add_results (plugin,
+						installed,
+						results,
+						error);
+	if (!ret)
+		return FALSE;
+	for (i = 0; i < gs_app_list_length (installed); i++) {
+		g_auto(GStrv) split = NULL;
+		app = gs_app_list_index (installed, i);
+		split = pk_package_id_split (gs_app_get_source_id_default (app));
+		if (split == NULL) {
+			g_set_error (error,
+				     GS_PLUGIN_ERROR,
+				     GS_PLUGIN_ERROR_INVALID_FORMAT,
+				     "invalid package-id: %s",
+				     gs_app_get_source_id_default (app));
+			return FALSE;
+		}
+		if (g_str_has_prefix (split[PK_PACKAGE_ID_DATA], "installed:")) {
+			id = split[PK_PACKAGE_ID_DATA] + 10;
+			app_tmp = g_hash_table_lookup (hash, id);
+			if (app_tmp != NULL) {
+				g_debug ("found package %s from %s",
+					 gs_app_get_source_default (app), id);
+				gs_app_add_related (app_tmp, app);
+			}
+		}
+	}
+	return TRUE;
+}
+
+gboolean
+gs_plugin_add_sources (GsPlugin *plugin,
+		       GsAppList *list,
+		       GCancellable *cancellable,
+		       GError **error)
+{
+	PkBitfield filter;
+	PkRepoDetail *rd;
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(PkTask) task_sources = NULL;
+	const gchar *id;
+	guint i;
+	g_autoptr(GHashTable) hash = NULL;
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GPtrArray) array = NULL;
+
+	/* ask PK for the repo details */
+	filter = pk_bitfield_from_enums (PK_FILTER_ENUM_NOT_SOURCE,
+					 PK_FILTER_ENUM_NOT_DEVELOPMENT,
+					 -1);
+
+	task_sources = gs_packagekit_task_new (plugin);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_sources), GS_PLUGIN_ACTION_GET_SOURCES, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+
+	results = pk_client_get_repo_list (PK_CLIENT (task_sources),
+					   filter,
+					   cancellable,
+					   gs_packagekit_helper_cb, helper,
+					   error);
+
+	if (!gs_plugin_packagekit_results_valid (results, error))
+		return FALSE;
+	hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+	array = pk_results_get_repo_detail_array (results);
+	for (i = 0; i < array->len; i++) {
+		g_autoptr(GsApp) app = NULL;
+		rd = g_ptr_array_index (array, i);
+		id = pk_repo_detail_get_id (rd);
+		app = gs_app_new (id);
+		gs_app_set_management_plugin (app, plugin);
+		gs_app_set_kind (app, AS_COMPONENT_KIND_REPOSITORY);
+		gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);
+		gs_app_set_scope (app, AS_COMPONENT_SCOPE_SYSTEM);
+		gs_app_add_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE);
+		gs_app_set_state (app, pk_repo_detail_get_enabled (rd) ?
+				  GS_APP_STATE_INSTALLED : GS_APP_STATE_AVAILABLE);
+		gs_app_set_name (app,
+				 GS_APP_QUALITY_NORMAL,
+				 pk_repo_detail_get_description (rd));
+		gs_app_set_summary (app,
+				    GS_APP_QUALITY_NORMAL,
+				    pk_repo_detail_get_description (rd));
+		gs_plugin_packagekit_set_packaging_format (plugin, app);
+		gs_app_set_metadata (app, "GnomeSoftware::SortKey", "300");
+		gs_app_set_origin_ui (app, _("Packages"));
+		gs_app_list_add (list, app);
+		g_hash_table_insert (hash,
+				     g_strdup (id),
+				     (gpointer) app);
+	}
+
+	/* get every application on the system and add it as a related package
+	 * if it matches */
+	return gs_plugin_add_sources_related (plugin, hash, cancellable, error);
+}
+
+static gboolean
+gs_plugin_app_origin_repo_enable (GsPluginPackagekit  *self,
+                                  PkTask              *task_enable_repo,
+                                  GsApp               *app,
+                                  GCancellable        *cancellable,
+                                  GError             **error)
+{
+	GsPlugin *plugin = GS_PLUGIN (self);
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(GsApp) repo_app = NULL;
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(PkError) error_code = NULL;
+	const gchar *repo_id;
+
+	repo_id = gs_app_get_origin (app);
+	if (repo_id == NULL) {
+		g_set_error_literal (error,
+		                     GS_PLUGIN_ERROR,
+		                     GS_PLUGIN_ERROR_NOT_SUPPORTED,
+		                     "origin not set");
+		return FALSE;
+	}
+
+	/* do sync call */
+	gs_plugin_status_update (plugin, app, GS_PLUGIN_STATUS_WAITING);
+	results = pk_client_repo_enable (PK_CLIENT (task_enable_repo),
+	                                 repo_id,
+	                                 TRUE,
+	                                 cancellable,
+	                                 gs_packagekit_helper_cb, helper,
+	                                 error);
+
+	/* pk_client_repo_enable() returns an error if the repo is already enabled. */
+	if (results != NULL &&
+	    (error_code = pk_results_get_error_code (results)) != NULL &&
+	    pk_error_get_code (error_code) == PK_ERROR_ENUM_REPO_ALREADY_SET) {
+		g_clear_error (error);
+	} else if (!gs_plugin_packagekit_results_valid (results, error)) {
+		gs_utils_error_add_origin_id (error, app);
+		return FALSE;
+	}
+
+	/* now that the repo is enabled, the app (not the repo!) moves from
+	 * UNAVAILABLE state to AVAILABLE */
+	gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
+
+	/* Construct a simple fake GsApp for the repository, used only by the signal handler */
+	repo_app = gs_app_new (repo_id);
+	gs_app_set_state (repo_app, GS_APP_STATE_INSTALLED);
+	gs_plugin_repository_changed (plugin, repo_app);
+
+	return TRUE;
+}
+
+gboolean
+gs_plugin_app_install (GsPlugin *plugin,
+		       GsApp *app,
+		       GCancellable *cancellable,
+		       GError **error)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (plugin);
+	g_autoptr(GsAppList) addons = NULL;
+	GPtrArray *source_ids;
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(PkTask) task_install = NULL;
+	const gchar *package_id;
+	guint i;
+	g_autofree gchar *local_filename = NULL;
+	g_auto(GStrv) package_ids = NULL;
+	g_autoptr(GPtrArray) array_package_ids = NULL;
+	g_autoptr(PkResults) results = NULL;
+
+	/* only process this app if was created by this plugin */
+	if (!gs_app_has_management_plugin (app, plugin))
+		return TRUE;
+
+	/* enable repo, handled by dedicated function */
+	g_return_val_if_fail (gs_app_get_kind (app) != AS_COMPONENT_KIND_REPOSITORY, FALSE);
+
+	/* queue for install if installation needs the network */
+	if (!gs_plugin_get_network_available (plugin)) {
+		gs_app_set_state (app, GS_APP_STATE_QUEUED_FOR_INSTALL);
+		return TRUE;
+	}
+
+	/* Set up a #PkTask to handle the D-Bus calls to packagekitd. */
+	task_install = gs_packagekit_task_new (plugin);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_install), GS_PLUGIN_ACTION_INSTALL, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+
+	if (gs_app_get_state (app) == GS_APP_STATE_UNAVAILABLE) {
+		/* get everything up front we need */
+		source_ids = gs_app_get_source_ids (app);
+		if (source_ids->len == 0) {
+			g_set_error_literal (error,
+					     GS_PLUGIN_ERROR,
+					     GS_PLUGIN_ERROR_NOT_SUPPORTED,
+					     "installing not available");
+			return FALSE;
+		}
+		package_ids = g_new0 (gchar *, 2);
+		package_ids[0] = g_strdup (g_ptr_array_index (source_ids, 0));
+
+		/* enable the repo where the unavailable app is coming from */
+		if (!gs_plugin_app_origin_repo_enable (self, task_install, app, cancellable, error))
+			return FALSE;
+
+		gs_app_set_state (app, GS_APP_STATE_INSTALLING);
+
+		/* FIXME: this is a hack, to allow PK time to re-initialize
+		 * everything in order to match an actual result. The root cause
+		 * is probably some kind of hard-to-debug race in the daemon. */
+		g_usleep (G_USEC_PER_SEC * 3);
+
+		/* actually install the package */
+		gs_packagekit_helper_add_app (helper, app);
+
+		results = pk_task_install_packages_sync (task_install,
+							 package_ids,
+							 cancellable,
+							 gs_packagekit_helper_cb, helper,
+							 error);
+
+		if (!gs_plugin_packagekit_results_valid (results, error)) {
+			gs_app_set_state_recover (app);
+			return FALSE;
+		}
+
+		/* state is known */
+		gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+
+		/* if we remove the app again later, we should be able to
+		 * cancel the installation if we'd never installed it */
+		gs_app_set_allow_cancel (app, TRUE);
+
+		/* no longer valid */
+		gs_app_clear_source_ids (app);
+		return TRUE;
+	}
+
+	/* get the list of available package ids to install */
+	switch (gs_app_get_state (app)) {
+	case GS_APP_STATE_AVAILABLE:
+	case GS_APP_STATE_UPDATABLE:
+	case GS_APP_STATE_QUEUED_FOR_INSTALL:
+		source_ids = gs_app_get_source_ids (app);
+		if (source_ids->len == 0) {
+			g_set_error_literal (error,
+					     GS_PLUGIN_ERROR,
+					     GS_PLUGIN_ERROR_NOT_SUPPORTED,
+					     "installing not available");
+			return FALSE;
+		}
+
+		addons = gs_app_dup_addons (app);
+		array_package_ids = app_list_get_package_ids (addons,
+							      gs_app_get_to_be_installed,
+							      TRUE);
+
+		for (i = 0; i < source_ids->len; i++) {
+			package_id = g_ptr_array_index (source_ids, i);
+			if (package_is_installed (package_id))
+				continue;
+			g_ptr_array_add (array_package_ids, (gpointer) package_id);
+		}
+
+		if (array_package_ids->len == 0) {
+			g_set_error_literal (error,
+					     GS_PLUGIN_ERROR,
+					     GS_PLUGIN_ERROR_NOT_SUPPORTED,
+					     "no packages to install");
+			return FALSE;
+		}
+
+		/* NULL-terminate the array */
+		g_ptr_array_add (array_package_ids, NULL);
+
+		gs_app_set_state (app, GS_APP_STATE_INSTALLING);
+
+		for (i = 0; addons != NULL && i < gs_app_list_length (addons); i++) {
+			GsApp *addon = gs_app_list_index (addons, i);
+			if (gs_app_get_to_be_installed (addon))
+				gs_app_set_state (addon, GS_APP_STATE_INSTALLING);
+		}
+		gs_packagekit_helper_add_app (helper, app);
+
+		results = pk_task_install_packages_sync (task_install,
+							 (gchar **) array_package_ids->pdata,
+							 cancellable,
+							 gs_packagekit_helper_cb, helper,
+							 error);
+
+		if (!gs_plugin_packagekit_results_valid (results, error)) {
+			for (i = 0; addons != NULL && i < gs_app_list_length (addons); i++) {
+				GsApp *addon = gs_app_list_index (addons, i);
+				if (gs_app_get_state (addon) == GS_APP_STATE_INSTALLING)
+					gs_app_set_state_recover (addon);
+			}
+			gs_app_set_state_recover (app);
+			return FALSE;
+		}
+
+		/* state is known */
+		for (i = 0; addons != NULL && i < gs_app_list_length (addons); i++) {
+			GsApp *addon = gs_app_list_index (addons, i);
+			if (gs_app_get_state (addon) == GS_APP_STATE_INSTALLING) {
+				gs_app_set_state (addon, GS_APP_STATE_INSTALLED);
+				gs_app_clear_source_ids (addon);
+			}
+		}
+		gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+
+		break;
+	case GS_APP_STATE_AVAILABLE_LOCAL:
+		if (gs_app_get_local_file (app) == NULL) {
+			g_set_error_literal (error,
+					     GS_PLUGIN_ERROR,
+					     GS_PLUGIN_ERROR_NOT_SUPPORTED,
+					     "local package, but no filename");
+			return FALSE;
+		}
+		local_filename = g_file_get_path (gs_app_get_local_file (app));
+		package_ids = g_strsplit (local_filename, "\t", -1);
+
+		gs_app_set_state (app, GS_APP_STATE_INSTALLING);
+		gs_packagekit_helper_add_app (helper, app);
+
+		results = pk_task_install_files_sync (task_install,
+						      package_ids,
+						      cancellable,
+						      gs_packagekit_helper_cb, helper,
+						      error);
+
+		if (!gs_plugin_packagekit_results_valid (results, error)) {
+			gs_app_set_state_recover (app);
+			return FALSE;
+		}
+
+		/* state is known */
+		gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+
+		/* get the new icon from the package */
+		gs_app_set_local_file (app, NULL);
+		gs_app_remove_all_icons (app);
+		break;
+	default:
+		g_set_error (error,
+			     GS_PLUGIN_ERROR,
+			     GS_PLUGIN_ERROR_NOT_SUPPORTED,
+			     "do not know how to install app in state %s",
+			     gs_app_state_to_string (gs_app_get_state (app)));
+		return FALSE;
+	}
+
+	/* no longer valid */
+	gs_app_clear_source_ids (app);
+
+	return TRUE;
+}
+
+gboolean
+gs_plugin_app_remove (GsPlugin *plugin,
+		      GsApp *app,
+		      GCancellable *cancellable,
+		      GError **error)
+{
+	const gchar *package_id;
+	GPtrArray *source_ids;
+	g_autoptr(GsAppList) addons = NULL;
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(PkTask) task_remove = NULL;
+	guint i;
+	guint cnt = 0;
+	g_autoptr(PkResults) results = NULL;
+	g_auto(GStrv) package_ids = NULL;
+
+	/* only process this app if was created by this plugin */
+	if (!gs_app_has_management_plugin (app, plugin))
+		return TRUE;
+
+	/* disable repo, handled by dedicated function */
+	g_return_val_if_fail (gs_app_get_kind (app) != AS_COMPONENT_KIND_REPOSITORY, FALSE);
+
+	/* get the list of available package ids to install */
+	source_ids = gs_app_get_source_ids (app);
+	if (source_ids->len == 0) {
+		g_set_error_literal (error,
+				     GS_PLUGIN_ERROR,
+				     GS_PLUGIN_ERROR_NOT_SUPPORTED,
+				     "removing not available");
+		return FALSE;
+	}
+	package_ids = g_new0 (gchar *, source_ids->len + 1);
+	for (i = 0; i < source_ids->len; i++) {
+		package_id = g_ptr_array_index (source_ids, i);
+		if (!package_is_installed (package_id))
+			continue;
+		package_ids[cnt++] = g_strdup (package_id);
+	}
+	if (cnt == 0) {
+		g_set_error_literal (error,
+				     GS_PLUGIN_ERROR,
+				     GS_PLUGIN_ERROR_NOT_SUPPORTED,
+				     "no packages to remove");
+		return FALSE;
+	}
+
+	/* do the action */
+	gs_app_set_state (app, GS_APP_STATE_REMOVING);
+	gs_packagekit_helper_add_app (helper, app);
+
+	task_remove = gs_packagekit_task_new (plugin);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_remove), GS_PLUGIN_ACTION_REMOVE, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+
+	results = pk_task_remove_packages_sync (task_remove,
+						package_ids,
+						TRUE, GS_PACKAGEKIT_AUTOREMOVE,
+						cancellable,
+						gs_packagekit_helper_cb, helper,
+						error);
+
+	if (!gs_plugin_packagekit_results_valid (results, error)) {
+		gs_app_set_state_recover (app);
+		return FALSE;
+	}
+
+	/* Make sure addons' state is updated as well */
+	addons = gs_app_dup_addons (app);
+	for (i = 0; addons != NULL && i < gs_app_list_length (addons); i++) {
+		GsApp *addon = gs_app_list_index (addons, i);
+		if (gs_app_get_state (addon) == GS_APP_STATE_INSTALLED) {
+			gs_app_set_state (addon, GS_APP_STATE_UNKNOWN);
+			gs_app_clear_source_ids (addon);
+		}
+	}
+
+	/* state is not known: we don't know if we can re-install this app */
+	gs_app_set_state (app, GS_APP_STATE_UNKNOWN);
+
+	/* no longer valid */
+	gs_app_clear_source_ids (app);
+
+	return TRUE;
+}
+
+static GsApp *
+gs_plugin_packagekit_build_update_app (GsPlugin *plugin, PkPackage *package)
+{
+	GsApp *app = gs_plugin_cache_lookup (plugin, pk_package_get_id (package));
+	if (app != NULL) {
+		if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN)
+			gs_app_set_state (app, GS_APP_STATE_UPDATABLE);
+		return app;
+	}
+	app = gs_app_new (NULL);
+	gs_plugin_packagekit_set_packaging_format (plugin, app);
+	gs_app_add_source (app, pk_package_get_name (package));
+	gs_app_add_source_id (app, pk_package_get_id (package));
+	gs_app_set_name (app, GS_APP_QUALITY_LOWEST,
+			 pk_package_get_name (package));
+	gs_app_set_summary (app, GS_APP_QUALITY_LOWEST,
+			    pk_package_get_summary (package));
+	gs_app_set_metadata (app, "GnomeSoftware::Creator",
+			     gs_plugin_get_name (plugin));
+	gs_app_set_management_plugin (app, plugin);
+	gs_app_set_update_version (app, pk_package_get_version (package));
+	gs_app_set_kind (app, AS_COMPONENT_KIND_GENERIC);
+	gs_app_set_scope (app, AS_COMPONENT_SCOPE_SYSTEM);
+	gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);
+	gs_app_set_state (app, GS_APP_STATE_UPDATABLE);
+	gs_plugin_cache_add (plugin, pk_package_get_id (package), app);
+	return app;
+}
+
+static gboolean
+gs_plugin_packagekit_add_updates (GsPlugin *plugin,
+				  GsAppList *list,
+				  GCancellable *cancellable,
+				  GError **error)
+{
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(PkTask) task_updates = NULL;
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GPtrArray) array = NULL;
+	g_autoptr(GsApp) first_app = NULL;
+	gboolean all_downloaded = TRUE;
+
+	/* do sync call */
+	gs_plugin_status_update (plugin, NULL, GS_PLUGIN_STATUS_WAITING);
+
+	task_updates = gs_packagekit_task_new (plugin);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_updates), GS_PLUGIN_ACTION_GET_UPDATES, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+
+	results = pk_client_get_updates (PK_CLIENT (task_updates),
+					 pk_bitfield_value (PK_FILTER_ENUM_NONE),
+					 cancellable,
+					 gs_packagekit_helper_cb, helper,
+					 error);
+
+	if (!gs_plugin_packagekit_results_valid (results, error))
+		return FALSE;
+
+	/* add results */
+	array = pk_results_get_package_array (results);
+	for (guint i = 0; i < array->len; i++) {
+		PkPackage *package = g_ptr_array_index (array, i);
+		g_autoptr(GsApp) app = NULL;
+		guint64 size_download_bytes;
+
+		app = gs_plugin_packagekit_build_update_app (plugin, package);
+		all_downloaded = (all_downloaded &&
+				  gs_app_get_size_download (app, &size_download_bytes) == GS_SIZE_TYPE_VALID &&
+				  size_download_bytes == 0);
+		if (all_downloaded && first_app == NULL)
+			first_app = g_object_ref (app);
+		gs_app_list_add (list, app);
+	}
+	/* Having all packages downloaded doesn't mean the update is also prepared,
+	   because the 'prepared-update' file can be missing, thus verify it and
+	   if not found, then set one application as needed download, to have
+	   the update properly prepared. */
+	if (all_downloaded && first_app != NULL) {
+		g_auto(GStrv) prepared_ids = NULL;
+		/* It's an overhead to get all the package IDs, but there's no easier
+		   way to verify the prepared-update file exists. */
+		prepared_ids = pk_offline_get_prepared_ids (NULL);
+		if (prepared_ids == NULL || prepared_ids[0] == NULL)
+			gs_app_set_size_download (first_app, GS_SIZE_TYPE_VALID, 1);
+	}
+
+	return TRUE;
+}
+
+gboolean
+gs_plugin_add_updates (GsPlugin *plugin,
+		       GsAppList *list,
+		       GCancellable *cancellable,
+		       GError **error)
+{
+	g_autoptr(GError) local_error = NULL;
+	if (!gs_plugin_packagekit_add_updates (plugin, list, cancellable, &local_error))
+		g_debug ("Failed to get updates: %s", local_error->message);
+	return TRUE;
+}
+
+static void list_apps_cb (GObject      *source_object,
+                          GAsyncResult *result,
+                          gpointer      user_data);
+
+static void
+gs_plugin_packagekit_list_apps_async (GsPlugin              *plugin,
+                                      GsAppQuery            *query,
+                                      GsPluginListAppsFlags  flags,
+                                      GCancellable          *cancellable,
+                                      GAsyncReadyCallback    callback,
+                                      gpointer               user_data)
+{
+	PkBitfield filter;
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(PkTask) task_list_apps = NULL;
+	g_autoptr(GsApp) app_dl = gs_app_new (gs_plugin_get_name (plugin));
+	gboolean interactive = (flags & GS_PLUGIN_LIST_APPS_FLAGS_INTERACTIVE);
+	g_autoptr(GTask) task = NULL;
+	const gchar *provides_tag = NULL;
+
+	task = g_task_new (plugin, cancellable, callback, user_data);
+	g_task_set_source_tag (task, gs_plugin_packagekit_list_apps_async);
+	g_task_set_task_data (task, g_object_ref (helper), g_object_unref);
+
+	gs_plugin_status_update (plugin, NULL, GS_PLUGIN_STATUS_WAITING);
+	gs_packagekit_helper_set_progress_app (helper, app_dl);
+
+	task_list_apps = gs_packagekit_task_new (plugin);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_list_apps), GS_PLUGIN_ACTION_UNKNOWN, interactive);
+
+	if (gs_app_query_get_provides_files (query) != NULL) {
+		filter = pk_bitfield_from_enums (PK_FILTER_ENUM_NEWEST,
+						 PK_FILTER_ENUM_ARCH,
+						 -1);
+		pk_client_search_files_async (PK_CLIENT (task_list_apps),
+					      filter,
+					      (gchar **) gs_app_query_get_provides_files (query),
+					      cancellable,
+					      gs_packagekit_helper_cb, helper,
+					      list_apps_cb, g_steal_pointer (&task));
+	} else if (gs_app_query_get_provides (query, &provides_tag) != GS_APP_QUERY_PROVIDES_UNKNOWN) {
+		const gchar * const provides_tag_strv[2] = { provides_tag, NULL };
+
+		filter = pk_bitfield_from_enums (PK_FILTER_ENUM_NEWEST,
+						 PK_FILTER_ENUM_ARCH,
+						 -1);
+
+		pk_client_what_provides_async (PK_CLIENT (task_list_apps),
+					       filter,
+					       (gchar **) provides_tag_strv,
+					       cancellable,
+					       gs_packagekit_helper_cb, helper,
+					       list_apps_cb, g_steal_pointer (&task));
+	} else {
+		g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+					 "Unsupported query");
+	}
+}
+
+static void
+list_apps_cb (GObject      *source_object,
+              GAsyncResult *result,
+              gpointer      user_data)
+{
+	PkClient *client = PK_CLIENT (source_object);
+	g_autoptr(GTask) task = g_steal_pointer (&user_data);
+	GsPlugin *plugin = g_task_get_source_object (task);
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GsAppList) list = gs_app_list_new ();
+	g_autoptr(GError) local_error = NULL;
+
+	results = pk_client_generic_finish (client, result, &local_error);
+
+	if (!gs_plugin_packagekit_results_valid (results, &local_error) ||
+	    !gs_plugin_packagekit_add_results (plugin, list, results, &local_error)) {
+		g_task_return_error (task, g_steal_pointer (&local_error));
+	} else {
+		g_task_return_pointer (task, g_steal_pointer (&list), g_object_unref);
+	}
+}
+
+static GsAppList *
+gs_plugin_packagekit_list_apps_finish (GsPlugin      *plugin,
+                                       GAsyncResult  *result,
+                                       GError       **error)
+{
+	return g_task_propagate_pointer (G_TASK (result), error);
+}
+
+static gboolean
+plugin_packagekit_pick_rpm_desktop_file_cb (GsPlugin *plugin,
+					    GsApp *app,
+					    const gchar *filename,
+					    GKeyFile *key_file)
+{
+	return strstr (filename, "/snapd/") == NULL &&
+	       strstr (filename, "/snap/") == NULL &&
+	       strstr (filename, "/flatpak/") == NULL &&
+	       g_key_file_has_group (key_file, "Desktop Entry") &&
+	       !g_key_file_has_key (key_file, "Desktop Entry", "X-Flatpak", NULL) &&
+	       !g_key_file_has_key (key_file, "Desktop Entry", "X-SnapInstanceName", NULL);
+}
+
+gboolean
+gs_plugin_launch (GsPlugin *plugin,
+		  GsApp *app,
+		  GCancellable *cancellable,
+		  GError **error)
+{
+	/* only process this app if was created by this plugin */
+	if (!gs_app_has_management_plugin (app, plugin))
+		return TRUE;
+
+	return gs_plugin_app_launch_filtered (plugin, app, plugin_packagekit_pick_rpm_desktop_file_cb, NULL, error);
+}
+
+static void
+gs_plugin_packagekit_updates_changed_cb (PkControl *control, GsPlugin *plugin)
+{
+	gs_plugin_updates_changed (plugin);
+}
+
+static void
+gs_plugin_packagekit_repo_list_changed_cb (PkControl *control, GsPlugin *plugin)
+{
+	gs_plugin_reload (plugin);
+}
+
+void
+gs_plugin_adopt_app (GsPlugin *plugin, GsApp *app)
+{
+	if (gs_app_get_bundle_kind (app) == AS_BUNDLE_KIND_PACKAGE &&
+	    gs_app_get_scope (app) == AS_COMPONENT_SCOPE_SYSTEM) {
+		gs_app_set_management_plugin (app, plugin);
+		gs_plugin_packagekit_set_packaging_format (plugin, app);
+		return;
+	} else if (gs_app_get_kind (app) == AS_COMPONENT_KIND_OPERATING_SYSTEM) {
+		gs_app_set_management_plugin (app, plugin);
+	}
+}
+
+typedef struct
+{
+	GsAppList *list;  /* (owned) (not nullable) */
+	GsPackagekitHelper *progress_data;  /* (owned) (not nullable) */
+} ResolvePackagesWithFilterData;
+
+static void
+resolve_packages_with_filter_data_free (ResolvePackagesWithFilterData *data)
+{
+	g_clear_object (&data->list);
+	g_clear_object (&data->progress_data);
+
+	g_free (data);
+}
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ResolvePackagesWithFilterData, resolve_packages_with_filter_data_free)
+
+static void resolve_packages_with_filter_cb (GObject      *source_object,
+                                             GAsyncResult *result,
+                                             gpointer      user_data);
+
+static void
+gs_plugin_packagekit_resolve_packages_with_filter_async (GsPluginPackagekit  *self,
+                                                         PkClient            *client_refine,
+                                                         GsAppList           *list,
+                                                         PkBitfield           filter,
+                                                         GCancellable        *cancellable,
+                                                         GAsyncReadyCallback  callback,
+                                                         gpointer             user_data)
+{
+	GsPlugin *plugin = GS_PLUGIN (self);
+	GPtrArray *sources;
+	GsApp *app;
+	const gchar *pkgname;
+	guint i;
+	guint j;
+	g_autoptr(GPtrArray) package_ids = NULL;
+	g_autoptr(GTask) task = NULL;
+	g_autoptr(ResolvePackagesWithFilterData) data = NULL;
+	ResolvePackagesWithFilterData *data_unowned;
+
+	task = g_task_new (self, cancellable, callback, user_data);
+	g_task_set_source_tag (task, gs_plugin_packagekit_resolve_packages_with_filter_async);
+	data_unowned = data = g_new0 (ResolvePackagesWithFilterData, 1);
+	data->list = g_object_ref (list);
+	data->progress_data = gs_packagekit_helper_new (plugin);
+	g_task_set_task_data (task, g_steal_pointer (&data), (GDestroyNotify) resolve_packages_with_filter_data_free);
+
+	package_ids = g_ptr_array_new_with_free_func (g_free);
+	for (i = 0; i < gs_app_list_length (list); i++) {
+		app = gs_app_list_index (list, i);
+		sources = gs_app_get_sources (app);
+		for (j = 0; j < sources->len; j++) {
+			pkgname = g_ptr_array_index (sources, j);
+			if (pkgname == NULL || pkgname[0] == '\0') {
+				g_warning ("invalid pkgname '%s' for %s",
+					   pkgname,
+					   gs_app_get_unique_id (app));
+				continue;
+			}
+			g_ptr_array_add (package_ids, g_strdup (pkgname));
+		}
+	}
+
+	if (package_ids->len == 0) {
+		g_task_return_boolean (task, TRUE);
+		return;
+	}
+
+	g_ptr_array_add (package_ids, NULL);
+
+	/* resolve them all at once */
+	pk_client_resolve_async (client_refine,
+				 filter,
+				 (gchar **) package_ids->pdata,
+				 cancellable,
+				 gs_packagekit_helper_cb, data_unowned->progress_data,
+				 resolve_packages_with_filter_cb,
+				 g_steal_pointer (&task));
+}
+
+static void
+resolve_packages_with_filter_cb (GObject      *source_object,
+                                 GAsyncResult *result,
+                                 gpointer      user_data)
+{
+	PkClient *client = PK_CLIENT (source_object);
+	g_autoptr(GTask) task = g_steal_pointer (&user_data);
+	GsPluginPackagekit *self = g_task_get_source_object (task);
+	GCancellable *cancellable = g_task_get_cancellable (task);
+	ResolvePackagesWithFilterData *data = g_task_get_task_data (task);
+	GsAppList *list = data->list;
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GPtrArray) packages = NULL;
+	g_autoptr(GError) local_error = NULL;
+
+	results = pk_client_generic_finish (client, result, &local_error);
+
+	if (!gs_plugin_packagekit_results_valid (results, &local_error)) {
+		g_prefix_error (&local_error, "failed to resolve package_ids: ");
+		g_task_return_error (task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	/* get results */
+	packages = pk_results_get_package_array (results);
+
+	/* if the user types more characters we'll get cancelled - don't go on
+	 * to mark apps as unavailable because packages->len = 0 */
+	if (g_cancellable_set_error_if_cancelled (cancellable, &local_error)) {
+		gs_utils_error_convert_gio (&local_error);
+		g_task_return_error (task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	for (guint i = 0; i < gs_app_list_length (list); i++) {
+		GsApp *app = gs_app_list_index (list, i);
+		if (gs_app_get_local_file (app) != NULL)
+			continue;
+		gs_plugin_packagekit_resolve_packages_app (GS_PLUGIN (self), packages, app);
+	}
+
+	g_task_return_boolean (task, TRUE);
+}
+
+static gboolean
+gs_plugin_packagekit_resolve_packages_with_filter_finish (GsPluginPackagekit  *self,
+                                                          GAsyncResult        *result,
+                                                          GError             **error)
+{
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+/*
+ * gs_plugin_packagekit_fixup_update_description:
+ *
+ * Lets assume Fedora is sending us valid markdown, but fall back to
+ * plain text if this fails.
+ */
+static gchar *
+gs_plugin_packagekit_fixup_update_description (const gchar *text)
+{
+	gchar *tmp;
+	g_autoptr(GsMarkdown) markdown = NULL;
+
+	/* nothing to do */
+	if (text == NULL)
+		return NULL;
+
+	/* try to parse */
+	markdown = gs_markdown_new (GS_MARKDOWN_OUTPUT_PANGO);
+	gs_markdown_set_smart_quoting (markdown, FALSE);
+	gs_markdown_set_autocode (markdown, FALSE);
+	gs_markdown_set_autolinkify (markdown, FALSE);
+	tmp = gs_markdown_parse (markdown, text);
+	if (tmp != NULL)
+		return tmp;
+	return g_strdup (text);
+}
+
+static gboolean
+gs_plugin_refine_app_needs_details (GsPluginRefineFlags  flags,
+                                    GsApp               *app)
+{
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_LICENSE) > 0 &&
+	    gs_app_get_license (app) == NULL)
+		return TRUE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_URL) > 0 &&
+	    gs_app_get_url (app, AS_URL_KIND_HOMEPAGE) == NULL)
+		return TRUE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_SIZE) > 0 &&
+	    gs_app_get_size_installed (app, NULL) != GS_SIZE_TYPE_VALID)
+		return TRUE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_SIZE) > 0 &&
+	    gs_app_get_size_download (app, NULL) != GS_SIZE_TYPE_VALID)
+		return TRUE;
+	return FALSE;
+}
+
+static gboolean
+gs_plugin_refine_requires_version (GsApp *app, GsPluginRefineFlags flags)
+{
+	const gchar *tmp;
+	tmp = gs_app_get_version (app);
+	if (tmp != NULL)
+		return FALSE;
+	return (flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_VERSION) > 0;
+}
+
+static gboolean
+gs_plugin_refine_requires_update_details (GsApp *app, GsPluginRefineFlags flags)
+{
+	const gchar *tmp;
+	tmp = gs_app_get_update_details_markup (app);
+	if (tmp != NULL)
+		return FALSE;
+	return (flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_UPDATE_DETAILS) > 0;
+}
+
+static gboolean
+gs_plugin_refine_requires_origin (GsApp *app, GsPluginRefineFlags flags)
+{
+	const gchar *tmp;
+	tmp = gs_app_get_origin (app);
+	if (tmp != NULL)
+		return FALSE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN) > 0)
+		return TRUE;
+	return FALSE;
+}
+
+static gboolean
+gs_plugin_refine_requires_package_id (GsApp *app, GsPluginRefineFlags flags)
+{
+	const gchar *tmp;
+	tmp = gs_app_get_source_id_default (app);
+	if (tmp != NULL)
+		return FALSE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_VERSION) > 0)
+		return TRUE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_LICENSE) > 0)
+		return TRUE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_URL) > 0)
+		return TRUE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_SIZE) > 0)
+		return TRUE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_DESCRIPTION) > 0)
+		return TRUE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_VERSION) > 0)
+		return TRUE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_UPDATE_DETAILS) > 0)
+		return TRUE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_PROVENANCE) > 0)
+		return TRUE;
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_SETUP_ACTION) > 0)
+		return TRUE;
+	return FALSE;
+}
+
+static gboolean
+gs_plugin_packagekit_refine_valid_package_name (const gchar *source)
+{
+	if (g_strstr_len (source, -1, "/") != NULL)
+		return FALSE;
+	return TRUE;
+}
+
+static gboolean
+gs_plugin_systemd_update_cache (GsPluginPackagekit  *self,
+                                GError             **error)
+{
+	g_autoptr(GError) error_local = NULL;
+	g_auto(GStrv) package_ids = NULL;
+	g_autoptr(GHashTable) new_prepared_updates = NULL;
+	g_autoptr(GMutexLocker) locker = NULL;
+
+	/* get new list of package-ids. This loads a local file, so should be
+	 * just about fast enough to be sync. */
+	new_prepared_updates = g_hash_table_new_full (g_str_hash, g_str_equal,
+						      g_free, NULL);
+	package_ids = pk_offline_get_prepared_ids (&error_local);
+	if (package_ids == NULL) {
+		if (g_error_matches (error_local,
+				     PK_OFFLINE_ERROR,
+				     PK_OFFLINE_ERROR_NO_DATA)) {
+			return TRUE;
+		}
+		gs_plugin_packagekit_error_convert (&error_local);
+		g_set_error (error,
+			     GS_PLUGIN_ERROR,
+			     GS_PLUGIN_ERROR_INVALID_FORMAT,
+			     "Failed to get prepared IDs: %s",
+			     error_local->message);
+		return FALSE;
+	}
+
+	/* Build the new table, stealing all the elements from @package_ids. */
+	for (guint i = 0; package_ids[i] != NULL; i++) {
+		g_hash_table_add (new_prepared_updates, g_steal_pointer (&package_ids[i]));
+	}
+
+	g_clear_pointer (&package_ids, g_free);
+
+	/* Update the shared state. */
+	locker = g_mutex_locker_new (&self->prepared_updates_mutex);
+	g_clear_pointer (&self->prepared_updates, g_hash_table_unref);
+	self->prepared_updates = g_steal_pointer (&new_prepared_updates);
+
+	return TRUE;
+}
+
+typedef struct {
+	/* Track pending operations. */
+	guint n_pending_operations;
+	gboolean completed;
+	GError *error;  /* (nullable) (owned) */
+	GPtrArray *progress_datas;  /* (element-type GsPackagekitHelper) (owned) (not nullable) */
+	PkClient *client_refine;  /* (owned) */
+
+	/* Input data for operations. */
+	GsAppList *full_list;  /* (nullable) (owned) */
+	GsAppList *resolve_list;  /* (nullable) (owned) */
+	GsApp *app_operating_system;  /* (nullable) (owned) */
+	GsAppList *update_details_list;  /* (nullable) (owned) */
+	GsAppList *details_list;  /* (nullable) (owned) */
+} RefineData;
+
+static void
+refine_data_free (RefineData *data)
+{
+	g_assert (data->n_pending_operations == 0);
+	g_assert (data->completed);
+
+	g_clear_error (&data->error);
+	g_clear_pointer (&data->progress_datas, g_ptr_array_unref);
+	g_clear_object (&data->client_refine);
+	g_clear_object (&data->full_list);
+	g_clear_object (&data->resolve_list);
+	g_clear_object (&data->app_operating_system);
+	g_clear_object (&data->update_details_list);
+	g_clear_object (&data->details_list);
+
+	g_free (data);
+}
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (RefineData, refine_data_free)
+
+/* Add @helper to the list of progress data closures to free when the
+ * #RefineData is freed. This means it can be reliably used, 0 or more times,
+ * by the async operation up until the operation is finished. */
+static GsPackagekitHelper *
+refine_task_add_progress_data (GTask              *refine_task,
+                               GsPackagekitHelper *helper)
+{
+	RefineData *data = g_task_get_task_data (refine_task);
+
+	g_ptr_array_add (data->progress_datas, g_object_ref (helper));
+
+	return helper;
+}
+
+static GTask *
+refine_task_add_operation (GTask *refine_task)
+{
+	RefineData *data = g_task_get_task_data (refine_task);
+
+	g_assert (!data->completed);
+	data->n_pending_operations++;
+
+	return g_object_ref (refine_task);
+}
+
+static void
+refine_task_complete_operation (GTask *refine_task)
+{
+	RefineData *data = g_task_get_task_data (refine_task);
+
+	g_assert (data->n_pending_operations > 0);
+	data->n_pending_operations--;
+
+	/* Have all operations completed? */
+	if (data->n_pending_operations == 0) {
+		g_assert (!data->completed);
+		data->completed = TRUE;
+
+		if (data->error != NULL)
+			g_task_return_error (refine_task, g_steal_pointer (&data->error));
+		else
+			g_task_return_boolean (refine_task, TRUE);
+	}
+}
+
+static void
+refine_task_complete_operation_with_error (GTask  *refine_task,
+					   GError *error  /* (transfer full) */)
+{
+	RefineData *data = g_task_get_task_data (refine_task);
+	g_autoptr(GError) owned_error = g_steal_pointer (&error);
+
+	/* Multiple operations might fail. Just take the first error. */
+	if (data->error == NULL)
+		data->error = g_steal_pointer (&owned_error);
+
+	refine_task_complete_operation (refine_task);
+}
+
+typedef struct {
+	GTask *refine_task;  /* (owned) (not nullable) */
+	GsApp *app;  /* (owned) (not nullable) */
+	gchar *filename;  /* (owned) (not nullable) */
+} SearchFilesData;
+
+static void
+search_files_data_free (SearchFilesData *data)
+{
+	g_free (data->filename);
+	g_clear_object (&data->app);
+	g_clear_object (&data->refine_task);
+	g_free (data);
+}
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (SearchFilesData, search_files_data_free)
+
+static SearchFilesData *
+search_files_data_new_operation (GTask       *refine_task,
+                                 GsApp       *app,
+                                 const gchar *filename)
+{
+	g_autoptr(SearchFilesData) data = g_new0 (SearchFilesData, 1);
+	data->refine_task = refine_task_add_operation (refine_task);
+	data->app = g_object_ref (app);
+	data->filename = g_strdup (filename);
+
+	return g_steal_pointer (&data);
+}
+
+static void upgrade_system_cb (GObject      *source_object,
+                               GAsyncResult *result,
+                               gpointer      user_data);
+static void resolve_all_packages_with_filter_cb (GObject      *source_object,
+                                                 GAsyncResult *result,
+                                                 gpointer      user_data);
+static void search_files_cb (GObject      *source_object,
+                             GAsyncResult *result,
+                             gpointer      user_data);
+static void get_update_detail_cb (GObject      *source_object,
+                                  GAsyncResult *result,
+                                  gpointer      user_data);
+static void get_details_cb (GObject      *source_object,
+                            GAsyncResult *result,
+                            gpointer      user_data);
+static void get_updates_cb (GObject      *source_object,
+                            GAsyncResult *result,
+                            gpointer      user_data);
+static void refine_all_history_cb (GObject      *source_object,
+                                   GAsyncResult *result,
+                                   gpointer      user_data);
+
+static void
+gs_plugin_packagekit_refine_async (GsPlugin            *plugin,
+                                   GsAppList           *list,
+                                   GsPluginRefineFlags  flags,
+                                   GCancellable        *cancellable,
+                                   GAsyncReadyCallback  callback,
+                                   gpointer             user_data)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (plugin);
+	g_autoptr(GsAppList) resolve_list = gs_app_list_new ();
+	g_autoptr(GsAppList) update_details_list = gs_app_list_new ();
+	g_autoptr(GsAppList) details_list = gs_app_list_new ();
+	g_autoptr(GsAppList) history_list = gs_app_list_new ();
+	g_autoptr(GsAppList) repos_list = gs_app_list_new ();
+	g_autoptr(GTask) task = NULL;
+	g_autoptr(RefineData) data = NULL;
+	RefineData *data_unowned = NULL;
+	g_autoptr(GError) local_error = NULL;
+
+	task = g_task_new (plugin, cancellable, callback, user_data);
+	g_task_set_source_tag (task, gs_plugin_packagekit_refine_async);
+	data_unowned = data = g_new0 (RefineData, 1);
+	data->full_list = g_object_ref (list);
+	data->n_pending_operations = 1;  /* to prevent the task being completed before all operations have been started */
+	data->progress_datas = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
+	data->client_refine = pk_client_new ();
+	pk_client_set_interactive (data->client_refine, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+	g_task_set_task_data (task, g_steal_pointer (&data), (GDestroyNotify) refine_data_free);
+
+	/* Process the @list and work out what information is needed for each
+	 * app. */
+	for (guint i = 0; i < gs_app_list_length (list); i++) {
+		GsApp *app = gs_app_list_index (list, i);
+		GPtrArray *sources;
+		const gchar *filename;
+
+		if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
+			continue;
+
+		if (!gs_app_has_management_plugin (app, NULL) &&
+		    !gs_app_has_management_plugin (app, GS_PLUGIN (self)))
+			continue;
+
+		/* Repositories */
+		filename = gs_app_get_metadata_item (app, "repos::repo-filename");
+
+		if (gs_app_get_kind (app) == AS_COMPONENT_KIND_REPOSITORY &&
+		    filename != NULL) {
+			gs_app_list_add (repos_list, app);
+		}
+
+		/* Apps */
+		sources = gs_app_get_sources (app);
+
+		if (sources->len > 0 &&
+		    gs_plugin_packagekit_refine_valid_package_name (g_ptr_array_index (sources, 0)) &&
+		    (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN ||
+		     gs_plugin_refine_requires_package_id (app, flags) ||
+		     gs_plugin_refine_requires_origin (app, flags) ||
+		     gs_plugin_refine_requires_version (app, flags))) {
+			gs_app_list_add (resolve_list, app);
+		}
+
+		if ((gs_app_get_state (app) == GS_APP_STATE_UPDATABLE ||
+		     gs_app_get_state (app) == GS_APP_STATE_UNKNOWN) &&
+		    gs_app_get_source_id_default (app) != NULL &&
+		    gs_plugin_refine_requires_update_details (app, flags)) {
+			gs_app_list_add (update_details_list, app);
+		}
+
+		if (gs_app_get_source_id_default (app) != NULL &&
+		    gs_plugin_refine_app_needs_details (flags, app)) {
+			gs_app_list_add (details_list, app);
+		}
+
+		if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_HISTORY) != 0 &&
+		    sources->len > 0 &&
+		    gs_app_get_install_date (app) == 0) {
+			gs_app_list_add (history_list, app);
+		}
+	}
+
+	/* re-read /var/lib/PackageKit/prepared-update so we know what packages
+	 * to mark as already downloaded and prepared for offline updates */
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_SIZE) &&
+	    !gs_plugin_systemd_update_cache (self, &local_error)) {
+		refine_task_complete_operation_with_error (task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	/* when we need the cannot-be-upgraded applications, we implement this
+	 * by doing a UpgradeSystem(SIMULATE) which adds the removed packages
+	 * to the related-apps list with a state of %GS_APP_STATE_UNAVAILABLE */
+	if (flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_UPGRADE_REMOVED) {
+		for (guint i = 0; i < gs_app_list_length (list); i++) {
+			GsApp *app = gs_app_list_index (list, i);
+			g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+			guint cache_age_save;
+
+			if (gs_app_get_kind (app) != AS_COMPONENT_KIND_OPERATING_SYSTEM)
+				continue;
+
+			gs_packagekit_helper_add_app (helper, app);
+
+			/* Expose the @app to the callback functions so that
+			 * upgrade packages can be added as related. This only
+			 * supports one OS. */
+			g_assert (data_unowned->app_operating_system == NULL);
+			data_unowned->app_operating_system = g_object_ref (app);
+
+			/* ask PK to simulate upgrading the system */
+			cache_age_save = pk_client_get_cache_age (data_unowned->client_refine);
+			pk_client_set_cache_age (data_unowned->client_refine, 60 * 60 * 24 * 7); /* once per week */
+			pk_client_set_interactive (data_unowned->client_refine, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+			pk_client_upgrade_system_async (data_unowned->client_refine,
+							pk_bitfield_from_enums (PK_TRANSACTION_FLAG_ENUM_SIMULATE, -1),
+							gs_app_get_version (app),
+							PK_UPGRADE_KIND_ENUM_COMPLETE,
+							cancellable,
+							gs_packagekit_helper_cb, refine_task_add_progress_data (task, helper),
+							upgrade_system_cb,
+							refine_task_add_operation (task));
+			pk_client_set_cache_age (data_unowned->client_refine, cache_age_save);
+
+			/* Only support one operating system. */
+			break;
+		}
+	}
+
+	/* can we resolve in one go? */
+	if (gs_app_list_length (resolve_list) > 0) {
+		PkBitfield filter;
+
+		/* Expose the @resolve_list to the callback functions in case a
+		 * second attempt is needed. */
+		g_assert (data_unowned->resolve_list == NULL);
+		data_unowned->resolve_list = g_object_ref (resolve_list);
+
+		/* first, try to resolve packages with ARCH filter */
+		filter = pk_bitfield_from_enums (PK_FILTER_ENUM_NEWEST,
+			                         PK_FILTER_ENUM_ARCH,
+			                         -1);
+
+		gs_plugin_packagekit_resolve_packages_with_filter_async (self,
+									 data_unowned->client_refine,
+									 resolve_list,
+									 filter,
+									 cancellable,
+									 resolve_all_packages_with_filter_cb,
+									 refine_task_add_operation (task));
+	}
+
+	/* set the package-id for an installed desktop file */
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_SETUP_ACTION) != 0) {
+		for (guint i = 0; i < gs_app_list_length (list); i++) {
+			g_autofree gchar *fn = NULL;
+			GsApp *app = gs_app_list_index (list, i);
+			const gchar *tmp;
+			const gchar *to_array[] = { NULL, NULL };
+			g_autoptr(GsPackagekitHelper) helper = NULL;
+
+			if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
+				continue;
+			if (gs_app_get_source_id_default (app) != NULL)
+				continue;
+			if (!gs_app_has_management_plugin (app, NULL) &&
+			    !gs_app_has_management_plugin (app, GS_PLUGIN (self)))
+				continue;
+			tmp = gs_app_get_id (app);
+			if (tmp == NULL)
+				continue;
+			switch (gs_app_get_kind (app)) {
+			case AS_COMPONENT_KIND_DESKTOP_APP:
+				fn = g_strdup_printf ("/usr/share/applications/%s", tmp);
+				break;
+			case AS_COMPONENT_KIND_ADDON:
+				fn = g_strdup_printf ("/usr/share/metainfo/%s.metainfo.xml", tmp);
+				if (!g_file_test (fn, G_FILE_TEST_EXISTS)) {
+					g_free (fn);
+					fn = g_strdup_printf ("/usr/share/appdata/%s.metainfo.xml", tmp);
+				}
+				break;
+			default:
+				break;
+			}
+			if (fn == NULL)
+				continue;
+			if (!g_file_test (fn, G_FILE_TEST_EXISTS)) {
+				g_debug ("ignoring %s as does not exist", fn);
+				continue;
+			}
+
+			helper = gs_packagekit_helper_new (plugin);
+			to_array[0] = fn;
+			gs_packagekit_helper_add_app (helper, app);
+			pk_client_search_files_async (data_unowned->client_refine,
+						      pk_bitfield_from_enums (PK_FILTER_ENUM_INSTALLED, -1),
+						      (gchar **) to_array,
+						      cancellable,
+						      gs_packagekit_helper_cb, refine_task_add_progress_data (task, helper),
+						      search_files_cb,
+						      search_files_data_new_operation (task, app, fn));
+		}
+	}
+
+	/* Refine repo package names */
+	for (guint i = 0; i < gs_app_list_length (repos_list); i++) {
+		GsApp *app = gs_app_list_index (repos_list, i);
+		const gchar *filename;
+		const gchar *to_array[] = { NULL, NULL };
+		g_autoptr(GsPackagekitHelper) helper = NULL;
+
+		filename = gs_app_get_metadata_item (app, "repos::repo-filename");
+
+		/* set the source package name for an installed .repo file */
+		helper = gs_packagekit_helper_new (plugin);
+		to_array[0] = filename;
+		gs_packagekit_helper_add_app (helper, app);
+
+		pk_client_search_files_async (data_unowned->client_refine,
+					      pk_bitfield_from_enums (PK_FILTER_ENUM_INSTALLED, -1),
+					      (gchar **) to_array,
+					      cancellable,
+					      gs_packagekit_helper_cb, refine_task_add_progress_data (task, helper),
+					      search_files_cb,
+					      search_files_data_new_operation (task, app, filename));
+	}
+
+	/* any update details missing? */
+	if (gs_app_list_length (update_details_list) > 0) {
+		GsApp *app;
+		g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+		g_autofree const gchar **package_ids = NULL;
+
+		/* Expose the @update_details_list to the callback functions so
+		 * its apps can be updated. */
+		g_assert (data_unowned->update_details_list == NULL);
+		data_unowned->update_details_list = g_object_ref (update_details_list);
+
+		package_ids = g_new0 (const gchar *, gs_app_list_length (update_details_list) + 1);
+		for (guint i = 0; i < gs_app_list_length (update_details_list); i++) {
+			app = gs_app_list_index (update_details_list, i);
+			package_ids[i] = gs_app_get_source_id_default (app);
+			g_assert (package_ids[i] != NULL);  /* checked when update_details_list is built */
+		}
+
+		/* get any update details */
+		pk_client_get_update_detail_async (data_unowned->client_refine,
+						   (gchar **) package_ids,
+						   cancellable,
+						   gs_packagekit_helper_cb, refine_task_add_progress_data (task, helper),
+						   get_update_detail_cb,
+						   refine_task_add_operation (task));
+	}
+
+	/* any package details missing? */
+	if (gs_app_list_length (details_list) > 0) {
+		g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+		g_autoptr(GPtrArray) package_ids = NULL;
+
+		/* Expose the @details_list to the callback functions so
+		 * its apps can be updated. */
+		g_assert (data_unowned->details_list == NULL);
+		data_unowned->details_list = g_object_ref (details_list);
+
+		package_ids = app_list_get_package_ids (details_list, NULL, FALSE);
+
+		if (package_ids->len > 0) {
+			/* NULL-terminate the array */
+			g_ptr_array_add (package_ids, NULL);
+
+			/* get any details */
+			pk_client_get_details_async (data_unowned->client_refine,
+						     (gchar **) package_ids->pdata,
+						     cancellable,
+						     gs_packagekit_helper_cb, refine_task_add_progress_data (task, helper),
+						     get_details_cb,
+						     refine_task_add_operation (task));
+		}
+	}
+
+	/* get the update severity */
+	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_UPDATE_SEVERITY) != 0) {
+		PkBitfield filter;
+		g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+
+		/* get the list of updates */
+		filter = pk_bitfield_value (PK_FILTER_ENUM_NONE);
+		pk_client_get_updates_async (data_unowned->client_refine,
+					     filter,
+					     cancellable,
+					     gs_packagekit_helper_cb, refine_task_add_progress_data (task, helper),
+					     get_updates_cb,
+					     refine_task_add_operation (task));
+	}
+
+	for (guint i = 0; i < gs_app_list_length (list); i++) {
+		GsApp *app = gs_app_list_index (list, i);
+
+		/* only process this app if was created by this plugin */
+		if (!gs_app_has_management_plugin (app, plugin))
+			continue;
+
+		/* the scope is always system-wide */
+		if (gs_app_get_scope (app) == AS_COMPONENT_SCOPE_UNKNOWN)
+			gs_app_set_scope (app, AS_COMPONENT_SCOPE_SYSTEM);
+		if (gs_app_get_bundle_kind (app) == AS_BUNDLE_KIND_UNKNOWN)
+			gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);
+	}
+
+	/* add any missing history data */
+	if (gs_app_list_length (history_list) > 0) {
+		gs_plugin_packagekit_refine_history_async (self,
+							   history_list,
+							   cancellable,
+							   refine_all_history_cb,
+							   refine_task_add_operation (task));
+	}
+
+	/* Mark the operation to set up all the other operations as completed.
+	 * The @refine_task will now be completed once all the async operations
+	 * have completed, and the task callback invoked. */
+	refine_task_complete_operation (task);
+}
+
+static void
+upgrade_system_cb (GObject      *source_object,
+                   GAsyncResult *result,
+                   gpointer      user_data)
+{
+	PkClient *client = PK_CLIENT (source_object);
+	g_autoptr(GTask) refine_task = g_steal_pointer (&user_data);
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (g_task_get_source_object (refine_task));
+	RefineData *data = g_task_get_task_data (refine_task);
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GsAppList) results_list = NULL;
+	g_autoptr(GError) local_error = NULL;
+
+	results = pk_client_generic_finish (client, result, &local_error);
+	if (!gs_plugin_packagekit_results_valid (results, &local_error)) {
+		g_prefix_error (&local_error, "failed to refine distro upgrade: ");
+		refine_task_complete_operation_with_error (refine_task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	results_list = gs_app_list_new ();
+	if (!gs_plugin_packagekit_add_results (GS_PLUGIN (self), results_list, results, &local_error)) {
+		refine_task_complete_operation_with_error (refine_task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	/* add each of these as related applications */
+	for (guint j = 0; j < gs_app_list_length (results_list); j++) {
+		GsApp *app2 = gs_app_list_index (results_list, j);
+		if (gs_app_get_state (app2) != GS_APP_STATE_UNAVAILABLE)
+			continue;
+		gs_app_add_related (data->app_operating_system, app2);
+	}
+
+	refine_task_complete_operation (refine_task);
+}
+
+static gboolean
+gs_plugin_packagekit_refine_finish (GsPlugin      *plugin,
+                                    GAsyncResult  *result,
+                                    GError       **error)
+{
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+static void resolve_all_packages_with_filter_cb2 (GObject      *source_object,
+                                                  GAsyncResult *result,
+                                                  gpointer      user_data);
+
+static void
+resolve_all_packages_with_filter_cb (GObject      *source_object,
+                                     GAsyncResult *result,
+                                     gpointer      user_data)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (source_object);
+	g_autoptr(GTask) refine_task = g_steal_pointer (&user_data);
+	RefineData *data = g_task_get_task_data (refine_task);
+	GCancellable *cancellable = g_task_get_cancellable (refine_task);
+	GsAppList *resolve_list = data->resolve_list;
+	g_autoptr(GsAppList) resolve2_list = NULL;
+	PkBitfield filter;
+	g_autoptr(GError) local_error = NULL;
+
+	if (!gs_plugin_packagekit_resolve_packages_with_filter_finish (self,
+								       result,
+								       &local_error)) {
+		refine_task_complete_operation_with_error (refine_task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	/* if any packages remaining in UNKNOWN state, try to resolve them again,
+	 * but this time without ARCH filter */
+	resolve2_list = gs_app_list_new ();
+	for (guint i = 0; i < gs_app_list_length (resolve_list); i++) {
+		GsApp *app = gs_app_list_index (resolve_list, i);
+		if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN)
+			gs_app_list_add (resolve2_list, app);
+	}
+	filter = pk_bitfield_from_enums (PK_FILTER_ENUM_NEWEST,
+		                         PK_FILTER_ENUM_NOT_ARCH,
+		                         PK_FILTER_ENUM_NOT_SOURCE,
+		                         -1);
+
+	gs_plugin_packagekit_resolve_packages_with_filter_async (self,
+								 data->client_refine,
+								 resolve2_list,
+								 filter,
+								 cancellable,
+								 resolve_all_packages_with_filter_cb2,
+								 g_steal_pointer (&refine_task));
+}
+
+static void
+resolve_all_packages_with_filter_cb2 (GObject      *source_object,
+                                      GAsyncResult *result,
+                                      gpointer      user_data)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (source_object);
+	g_autoptr(GTask) refine_task = g_steal_pointer (&user_data);
+	g_autoptr(GError) local_error = NULL;
+
+	if (!gs_plugin_packagekit_resolve_packages_with_filter_finish (self,
+								       result,
+								       &local_error)) {
+		refine_task_complete_operation_with_error (refine_task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	refine_task_complete_operation (refine_task);
+}
+
+static void
+search_files_cb (GObject      *source_object,
+                 GAsyncResult *result,
+                 gpointer      user_data)
+{
+	PkClient *client = PK_CLIENT (source_object);
+	g_autoptr(SearchFilesData) search_files_data = g_steal_pointer (&user_data);
+	GTask *refine_task = search_files_data->refine_task;
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (g_task_get_source_object (refine_task));
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GPtrArray) packages = NULL;
+	g_autoptr(GError) local_error = NULL;
+
+	results = pk_client_generic_finish (client, result, &local_error);
+
+	if (!gs_plugin_packagekit_results_valid (results, &local_error)) {
+		g_prefix_error (&local_error, "failed to search file %s: ", search_files_data->filename);
+		refine_task_complete_operation_with_error (refine_task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	/* get results */
+	packages = pk_results_get_package_array (results);
+	if (packages->len == 1) {
+		PkPackage *package;
+		package = g_ptr_array_index (packages, 0);
+		gs_plugin_packagekit_set_metadata_from_package (GS_PLUGIN (self), search_files_data->app, package);
+	} else {
+		g_debug ("Failed to find one package for %s, %s, [%u]",
+			 gs_app_get_id (search_files_data->app), search_files_data->filename, packages->len);
+	}
+
+	refine_task_complete_operation (refine_task);
+}
+
+static void
+get_update_detail_cb (GObject      *source_object,
+                      GAsyncResult *result,
+                      gpointer      user_data)
+{
+	PkClient *client = PK_CLIENT (source_object);
+	g_autoptr(GTask) refine_task = g_steal_pointer (&user_data);
+	RefineData *data = g_task_get_task_data (refine_task);
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GPtrArray) array = NULL;
+	g_autoptr(GError) local_error = NULL;
+
+	results = pk_client_generic_finish (client, result, &local_error);
+	if (!gs_plugin_packagekit_results_valid (results, &local_error)) {
+		g_prefix_error (&local_error, "failed to get update details: ");
+		refine_task_complete_operation_with_error (refine_task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	/* set the update details for the update */
+	array = pk_results_get_update_detail_array (results);
+	for (guint j = 0; j < gs_app_list_length (data->update_details_list); j++) {
+		GsApp *app = gs_app_list_index (data->update_details_list, j);
+		const gchar *package_id = gs_app_get_source_id_default (app);
+
+		for (guint i = 0; i < array->len; i++) {
+			const gchar *tmp;
+			g_autofree gchar *desc = NULL;
+			PkUpdateDetail *update_detail;
+
+			/* right package? */
+			update_detail = g_ptr_array_index (array, i);
+			if (g_strcmp0 (package_id, pk_update_detail_get_package_id (update_detail)) != 0)
+				continue;
+			tmp = pk_update_detail_get_update_text (update_detail);
+			desc = gs_plugin_packagekit_fixup_update_description (tmp);
+			if (desc != NULL)
+				gs_app_set_update_details_markup (app, desc);
+			break;
+		}
+	}
+
+	refine_task_complete_operation (refine_task);
+}
+
+static void
+get_details_cb (GObject      *source_object,
+                GAsyncResult *result,
+                gpointer      user_data)
+{
+	PkClient *client = PK_CLIENT (source_object);
+	g_autoptr(GTask) refine_task = g_steal_pointer (&user_data);
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (g_task_get_source_object (refine_task));
+	RefineData *data = g_task_get_task_data (refine_task);
+	g_autoptr(GPtrArray) array = NULL;
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GHashTable) details_collection = NULL;
+	g_autoptr(GHashTable) prepared_updates = NULL;
+	g_autoptr(GError) local_error = NULL;
+
+	results = pk_client_generic_finish (client, result, &local_error);
+
+	if (!gs_plugin_packagekit_results_valid (results, &local_error)) {
+		g_autoptr(GPtrArray) package_ids = app_list_get_package_ids (data->details_list, NULL, FALSE);
+		g_autofree gchar *package_ids_str = NULL;
+		/* NULL-terminate the array */
+		g_ptr_array_add (package_ids, NULL);
+		package_ids_str = g_strjoinv (",", (gchar **) package_ids->pdata);
+		g_prefix_error (&local_error, "failed to get details for %s: ",
+				package_ids_str);
+		refine_task_complete_operation_with_error (refine_task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	/* get the results and copy them into a hash table for fast lookups:
+	 * there are typically 400 to 700 elements in @array, and 100 to 200
+	 * elements in @list, each with 1 or 2 source IDs to look up (but
+	 * sometimes 200) */
+	array = pk_results_get_details_array (results);
+	details_collection = gs_plugin_packagekit_details_array_to_hash (array);
+
+	/* set the update details for the update */
+	g_mutex_lock (&self->prepared_updates_mutex);
+	prepared_updates = g_hash_table_ref (self->prepared_updates);
+	g_mutex_unlock (&self->prepared_updates_mutex);
+
+	for (guint i = 0; i < gs_app_list_length (data->details_list); i++) {
+		GsApp *app = gs_app_list_index (data->details_list, i);
+		gs_plugin_packagekit_refine_details_app (GS_PLUGIN (self), details_collection, prepared_updates, app);
+	}
+
+	refine_task_complete_operation (refine_task);
+}
+
+static void
+get_updates_cb (GObject      *source_object,
+                GAsyncResult *result,
+                gpointer      user_data)
+{
+	PkClient *client = PK_CLIENT (source_object);
+	g_autoptr(GTask) refine_task = g_steal_pointer (&user_data);
+	RefineData *data = g_task_get_task_data (refine_task);
+	g_autoptr(PkPackageSack) sack = NULL;
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GError) local_error = NULL;
+
+	results = pk_client_generic_finish (client, result, &local_error);
+
+	if (!gs_plugin_packagekit_results_valid (results, &local_error)) {
+		g_prefix_error (&local_error, "failed to get updates for urgency: ");
+		refine_task_complete_operation_with_error (refine_task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	/* set the update severity for the app */
+	sack = pk_results_get_package_sack (results);
+	for (guint i = 0; i < gs_app_list_length (data->full_list); i++) {
+		g_autoptr(PkPackage) pkg = NULL;
+		const gchar *package_id;
+		GsApp *app = gs_app_list_index (data->full_list, i);
+
+		if (gs_app_has_quirk (app, GS_APP_QUIRK_IS_WILDCARD))
+			continue;
+		package_id = gs_app_get_source_id_default (app);
+		if (package_id == NULL)
+			continue;
+		pkg = pk_package_sack_find_by_id (sack, package_id);
+		if (pkg == NULL)
+			continue;
+		#ifdef HAVE_PK_PACKAGE_GET_UPDATE_SEVERITY
+		switch (pk_package_get_update_severity (pkg)) {
+		case PK_INFO_ENUM_LOW:
+			gs_app_set_update_urgency (app, AS_URGENCY_KIND_LOW);
+			break;
+		case PK_INFO_ENUM_NORMAL:
+			gs_app_set_update_urgency (app, AS_URGENCY_KIND_MEDIUM);
+			break;
+		case PK_INFO_ENUM_IMPORTANT:
+			gs_app_set_update_urgency (app, AS_URGENCY_KIND_HIGH);
+			break;
+		case PK_INFO_ENUM_CRITICAL:
+			gs_app_set_update_urgency (app, AS_URGENCY_KIND_CRITICAL);
+			break;
+		default:
+			gs_app_set_update_urgency (app, AS_URGENCY_KIND_UNKNOWN);
+			break;
+		}
+		#else
+		switch (pk_package_get_info (pkg)) {
+		case PK_INFO_ENUM_AVAILABLE:
+		case PK_INFO_ENUM_NORMAL:
+		case PK_INFO_ENUM_LOW:
+		case PK_INFO_ENUM_ENHANCEMENT:
+			gs_app_set_update_urgency (app, AS_URGENCY_KIND_LOW);
+			break;
+		case PK_INFO_ENUM_BUGFIX:
+			gs_app_set_update_urgency (app, AS_URGENCY_KIND_MEDIUM);
+			break;
+		case PK_INFO_ENUM_SECURITY:
+			gs_app_set_update_urgency (app, AS_URGENCY_KIND_CRITICAL);
+			break;
+		case PK_INFO_ENUM_IMPORTANT:
+			gs_app_set_update_urgency (app, AS_URGENCY_KIND_HIGH);
+			break;
+		default:
+			gs_app_set_update_urgency (app, AS_URGENCY_KIND_UNKNOWN);
+			g_warning ("unhandled info state %s",
+				   pk_info_enum_to_string (pk_package_get_info (pkg)));
+			break;
+		}
+		#endif
+	}
+
+	refine_task_complete_operation (refine_task);
+}
+
+static void
+refine_all_history_cb (GObject      *source_object,
+                       GAsyncResult *result,
+                       gpointer      user_data)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (source_object);
+	g_autoptr(GTask) refine_task = g_steal_pointer (&user_data);
+	g_autoptr(GError) local_error = NULL;
+
+	if (!gs_plugin_packagekit_refine_history_finish (self, result, &local_error)) {
+		refine_task_complete_operation_with_error (refine_task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	refine_task_complete_operation (refine_task);
+}
+
+static void
+gs_plugin_packagekit_refine_add_history (GsApp *app, GVariant *dict)
+{
+	const gchar *version;
+	gboolean ret;
+	guint64 timestamp;
+	PkInfoEnum info_enum;
+	g_autoptr(GsApp) history = NULL;
+
+	/* create new history item with same ID as parent */
+	history = gs_app_new (gs_app_get_id (app));
+	gs_app_set_kind (history, AS_COMPONENT_KIND_GENERIC);
+	gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);
+	gs_app_set_name (history, GS_APP_QUALITY_NORMAL, gs_app_get_name (app));
+
+	/* get the installed state */
+	ret = g_variant_lookup (dict, "info", "u", &info_enum);
+	g_assert (ret);
+	switch (info_enum) {
+	case PK_INFO_ENUM_INSTALLING:
+		gs_app_set_state (history, GS_APP_STATE_INSTALLED);
+		break;
+	case PK_INFO_ENUM_REMOVING:
+		gs_app_set_state (history, GS_APP_STATE_AVAILABLE);
+		break;
+	case PK_INFO_ENUM_UPDATING:
+		gs_app_set_state (history, GS_APP_STATE_UPDATABLE);
+		break;
+	default:
+		g_debug ("ignoring history kind: %s",
+			 pk_info_enum_to_string (info_enum));
+		return;
+	}
+
+	/* set the history time and date */
+	ret = g_variant_lookup (dict, "timestamp", "t", &timestamp);
+	g_assert (ret);
+	gs_app_set_install_date (history, timestamp);
+
+	/* set the history version number */
+	ret = g_variant_lookup (dict, "version", "&s", &version);
+	g_assert (ret);
+	gs_app_set_version (history, version);
+
+	/* add the package to the main application */
+	gs_app_add_history (app, history);
+
+	/* use the last event as approximation of the package timestamp */
+	gs_app_set_install_date (app, timestamp);
+}
+
+/* Run in the main thread. */
+static void
+gs_plugin_packagekit_permission_cb (GPermission *permission,
+                                    GParamSpec  *pspec,
+                                    gpointer     data)
+{
+	GsPlugin *plugin = GS_PLUGIN (data);
+	gboolean ret = g_permission_get_allowed (permission) ||
+			g_permission_get_can_acquire (permission);
+	gs_plugin_set_allow_updates (plugin, ret);
+}
+
+static gboolean
+gs_plugin_packagekit_download (GsPlugin *plugin,
+			       GsAppList *list,
+			       GCancellable *cancellable,
+			       GError **error);
+
+static void
+gs_plugin_packagekit_auto_prepare_update_thread (GTask *task,
+						 gpointer source_object,
+						 gpointer task_data,
+						 GCancellable *cancellable)
+{
+	GsPlugin *plugin = source_object;
+	g_autoptr(GsAppList) list = NULL;
+	g_autoptr(GError) local_error = NULL;
+
+	g_return_if_fail (GS_IS_PLUGIN_PACKAGEKIT (plugin));
+
+	list = gs_app_list_new ();
+	if (!gs_plugin_packagekit_add_updates (plugin, list, cancellable, &local_error)) {
+		g_task_return_error (task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	if (gs_app_list_length (list) > 0 &&
+	    !gs_plugin_packagekit_download (plugin, list, cancellable, &local_error)) {
+		g_task_return_error (task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	/* Ignore errors here */
+	gs_plugin_systemd_update_cache (GS_PLUGIN_PACKAGEKIT (source_object), NULL);
+
+	g_task_return_boolean (task, TRUE);
+}
+
+static void
+gs_plugin_packagekit_auto_prepare_update_cb (GObject *source_object,
+					     GAsyncResult *result,
+					     gpointer user_data)
+{
+	g_autoptr(GError) local_error = NULL;
+
+	if (g_task_propagate_boolean (G_TASK (result), &local_error)) {
+		g_debug ("Successfully auto-prepared update");
+		gs_plugin_updates_changed (GS_PLUGIN (source_object));
+	} else {
+		g_debug ("Failed to auto-prepare update: %s", local_error->message);
+	}
+}
+
+static gboolean
+gs_plugin_packagekit_run_prepare_update_cb (gpointer user_data)
+{
+	GsPluginPackagekit *self = user_data;
+	g_autoptr(GTask) task = NULL;
+
+	self->prepare_update_timeout_id = 0;
+
+	g_debug ("Going to auto-prepare update");
+	task = g_task_new (self, self->proxy_settings_cancellable, gs_plugin_packagekit_auto_prepare_update_cb, NULL);
+	g_task_set_source_tag (task, gs_plugin_packagekit_run_prepare_update_cb);
+	g_task_run_in_thread (task, gs_plugin_packagekit_auto_prepare_update_thread);
+	return G_SOURCE_REMOVE;
+}
+
+/* Run in the main thread. */
+static void
+gs_plugin_packagekit_prepared_update_changed_cb (GFileMonitor      *monitor,
+						 GFile             *file,
+						 GFile             *other_file,
+						 GFileMonitorEvent  event_type,
+						 gpointer           user_data)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (user_data);
+
+	/* Interested only in these events. */
+	if (event_type != G_FILE_MONITOR_EVENT_CHANGED &&
+	    event_type != G_FILE_MONITOR_EVENT_DELETED &&
+	    event_type != G_FILE_MONITOR_EVENT_CREATED)
+		return;
+
+	/* This is going to break, if PackageKit renames the file, but it's unlikely to happen;
+	   there is no API to get the file name from, sadly. */
+	if (g_file_peek_path (file) == NULL ||
+	    !g_str_has_suffix (g_file_peek_path (file), "prepared-update"))
+		return;
+
+	if (event_type == G_FILE_MONITOR_EVENT_DELETED) {
+		g_autoptr(GSettings) settings = g_settings_new ("org.gnome.software");
+		if (g_settings_get_boolean (settings, "download-updates")) {
+			/* The prepared-update file had been removed, but the user has set
+			   to have the updates downloaded, thus prepared, thus prepare
+			   the update again. */
+			if (self->prepare_update_timeout_id)
+				g_source_remove (self->prepare_update_timeout_id);
+			g_debug ("Scheduled to auto-prepare update in %d s", PREPARE_UPDATE_TIMEOUT_SECS);
+			self->prepare_update_timeout_id = g_timeout_add_seconds (PREPARE_UPDATE_TIMEOUT_SECS,
+				gs_plugin_packagekit_run_prepare_update_cb, self);
+		} else {
+			if (self->prepare_update_timeout_id) {
+				g_source_remove (self->prepare_update_timeout_id);
+				self->prepare_update_timeout_id = 0;
+				g_debug ("Cancelled auto-prepare update");
+			}
+		}
+	} else if (self->prepare_update_timeout_id) {
+		g_source_remove (self->prepare_update_timeout_id);
+		self->prepare_update_timeout_id = 0;
+		g_debug ("Cancelled auto-prepare update");
+	}
+
+	/* update UI */
+	gs_plugin_systemd_update_cache (self, NULL);
+	gs_plugin_updates_changed (GS_PLUGIN (self));
+}
+
+static void
+gs_plugin_packagekit_refresh_is_triggered (GsPluginPackagekit *self,
+                                           GCancellable       *cancellable)
+{
+	g_autoptr(GFile) file_trigger = NULL;
+	file_trigger = g_file_new_for_path ("/system-update");
+	self->is_triggered = g_file_query_exists (file_trigger, NULL);
+	g_debug ("offline trigger is now %s",
+		 self->is_triggered ? "enabled" : "disabled");
+}
+
+/* Run in the main thread. */
+static void
+gs_plugin_systemd_trigger_changed_cb (GFileMonitor *monitor,
+				      GFile *file, GFile *other_file,
+				      GFileMonitorEvent event_type,
+				      gpointer user_data)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (user_data);
+
+	gs_plugin_packagekit_refresh_is_triggered (self, NULL);
+}
+
+static void setup_proxy_settings_cb (GObject      *source_object,
+                                     GAsyncResult *result,
+                                     gpointer      user_data);
+static void get_offline_update_permission_cb (GObject      *source_object,
+                                              GAsyncResult *result,
+                                              gpointer      user_data);
+
+static void
+gs_plugin_packagekit_setup_async (GsPlugin            *plugin,
+                                  GCancellable        *cancellable,
+                                  GAsyncReadyCallback  callback,
+                                  gpointer             user_data)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (plugin);
+	g_autoptr(GTask) task = NULL;
+
+	g_debug ("PackageKit version: %d.%d.%d",
+		PK_MAJOR_VERSION,
+		PK_MINOR_VERSION,
+		PK_MICRO_VERSION);
+
+	task = g_task_new (plugin, cancellable, callback, user_data);
+	g_task_set_source_tag (task, gs_plugin_packagekit_setup_async);
+
+	reload_proxy_settings_async (self, cancellable, setup_proxy_settings_cb, g_steal_pointer (&task));
+}
+
+static void
+setup_proxy_settings_cb (GObject      *source_object,
+                         GAsyncResult *result,
+                         gpointer      user_data)
+{
+	g_autoptr(GTask) task = g_steal_pointer (&user_data);
+	GsPluginPackagekit *self = g_task_get_source_object (task);
+	GCancellable *cancellable = g_task_get_cancellable (task);
+	g_autoptr(GFile) file_trigger = NULL;
+	g_autoptr(GError) local_error = NULL;
+
+	if (!reload_proxy_settings_finish (self, result, &local_error))
+		g_warning ("Failed to load proxy settings: %s", local_error->message);
+	g_clear_error (&local_error);
+
+	/* watch the prepared file */
+	self->monitor = pk_offline_get_prepared_monitor (cancellable, &local_error);
+	if (self->monitor == NULL) {
+		g_debug ("Failed to get prepared update file monitor: %s", local_error->message);
+		gs_utils_error_convert_gio (&local_error);
+		g_task_return_error (task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	g_signal_connect (self->monitor, "changed",
+			  G_CALLBACK (gs_plugin_packagekit_prepared_update_changed_cb),
+			  self);
+
+	/* watch the trigger file */
+	file_trigger = g_file_new_for_path ("/system-update");
+	self->monitor_trigger = g_file_monitor_file (file_trigger,
+						     G_FILE_MONITOR_NONE,
+						     NULL,
+						     &local_error);
+	if (self->monitor_trigger == NULL) {
+		gs_utils_error_convert_gio (&local_error);
+		g_task_return_error (task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	g_signal_connect (self->monitor_trigger, "changed",
+			  G_CALLBACK (gs_plugin_systemd_trigger_changed_cb),
+			  self);
+
+	/* check if we have permission to trigger offline updates */
+	gs_utils_get_permission_async ("org.freedesktop.packagekit.trigger-offline-update",
+				       cancellable, get_offline_update_permission_cb, g_steal_pointer (&task));
+}
+
+static void
+get_offline_update_permission_cb (GObject      *source_object,
+                                  GAsyncResult *result,
+                                  gpointer      user_data)
+{
+	g_autoptr(GTask) task = g_steal_pointer (&user_data);
+	GsPluginPackagekit *self = g_task_get_source_object (task);
+	g_autoptr(GError) local_error = NULL;
+
+	self->permission = gs_utils_get_permission_finish (result, &local_error);
+	if (self->permission != NULL) {
+		g_signal_connect (self->permission, "notify",
+				  G_CALLBACK (gs_plugin_packagekit_permission_cb),
+				  self);
+	}
+
+	/* get the list of currently downloaded packages */
+	if (!gs_plugin_systemd_update_cache (self, &local_error))
+		g_task_return_error (task, g_steal_pointer (&local_error));
+	else
+		g_task_return_boolean (task, TRUE);
+}
+
+static gboolean
+gs_plugin_packagekit_setup_finish (GsPlugin      *plugin,
+                                   GAsyncResult  *result,
+                                   GError       **error)
+{
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+static void
+gs_plugin_packagekit_shutdown_async (GsPlugin            *plugin,
+                                     GCancellable        *cancellable,
+                                     GAsyncReadyCallback  callback,
+                                     gpointer             user_data)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (plugin);
+	g_autoptr(GTask) task = NULL;
+
+	task = g_task_new (plugin, cancellable, callback, user_data);
+	g_task_set_source_tag (task, gs_plugin_packagekit_shutdown_async);
+
+	/* Cancel any ongoing proxy settings loading operation. */
+	g_cancellable_cancel (self->proxy_settings_cancellable);
+
+	g_task_return_boolean (task, TRUE);
+}
+
+static gboolean
+gs_plugin_packagekit_shutdown_finish (GsPlugin      *plugin,
+                                      GAsyncResult  *result,
+                                      GError       **error)
+{
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+static void refine_history_cb (GObject      *source_object,
+                               GAsyncResult *result,
+                               gpointer      user_data);
+
+static void
+gs_plugin_packagekit_refine_history_async (GsPluginPackagekit  *self,
+                                           GsAppList           *list,
+                                           GCancellable        *cancellable,
+                                           GAsyncReadyCallback  callback,
+                                           gpointer             user_data)
+{
+	GsApp *app;
+	g_autofree const gchar **package_names = NULL;
+	g_autoptr(GTask) task = NULL;
+
+	task = g_task_new (self, cancellable, callback, user_data);
+	g_task_set_source_tag (task, gs_plugin_packagekit_refine_history_async);
+	g_task_set_task_data (task, g_object_ref (list), (GDestroyNotify) g_object_unref);
+
+	/* get an array of package names */
+	package_names = g_new0 (const gchar *, gs_app_list_length (list) + 1);
+	for (guint i = 0; i < gs_app_list_length (list); i++) {
+		app = gs_app_list_index (list, i);
+		package_names[i] = gs_app_get_source_default (app);
+	}
+
+	g_debug ("getting history for %u packages", gs_app_list_length (list));
+	g_dbus_connection_call (gs_plugin_get_system_bus_connection (GS_PLUGIN (self)),
+				"org.freedesktop.PackageKit",
+				"/org/freedesktop/PackageKit",
+				"org.freedesktop.PackageKit",
+				"GetPackageHistory",
+				g_variant_new ("(^asu)", package_names, 0),
+				NULL,
+				G_DBUS_CALL_FLAGS_NONE,
+				GS_PLUGIN_PACKAGEKIT_HISTORY_TIMEOUT,
+				cancellable,
+				refine_history_cb,
+				g_steal_pointer (&task));
+}
+
+static void
+refine_history_cb (GObject      *source_object,
+                   GAsyncResult *result,
+                   gpointer      user_data)
+{
+	GDBusConnection *connection = G_DBUS_CONNECTION (source_object);
+	g_autoptr(GTask) task = g_steal_pointer (&user_data);
+	GsPluginPackagekit *self = g_task_get_source_object (task);
+	GsPlugin *plugin = GS_PLUGIN (self);
+	GsAppList *list = g_task_get_task_data (task);
+	gboolean ret;
+	guint i = 0;
+	GVariantIter iter;
+	GVariant *value;
+	g_autoptr(GVariant) result_variant = NULL;
+	g_autoptr(GVariant) tuple = NULL;
+	g_autoptr(GError) error_local = NULL;
+
+	result_variant = g_dbus_connection_call_finish (connection, result, &error_local);
+
+	if (result_variant == NULL) {
+		g_dbus_error_strip_remote_error (error_local);
+		if (g_error_matches (error_local,
+				     G_DBUS_ERROR,
+				     G_DBUS_ERROR_UNKNOWN_METHOD)) {
+			g_debug ("No history available as PackageKit is too old: %s",
+				 error_local->message);
+
+			/* just set this to something non-zero so we don't keep
+			 * trying to call GetPackageHistory */
+			for (i = 0; i < gs_app_list_length (list); i++) {
+				GsApp *app = gs_app_list_index (list, i);
+				gs_app_set_install_date (app, GS_APP_INSTALL_DATE_UNKNOWN);
+			}
+		} else if (g_error_matches (error_local,
+					    G_IO_ERROR,
+					    G_IO_ERROR_CANCELLED)) {
+			g_task_return_new_error (task,
+						 GS_PLUGIN_ERROR,
+						 GS_PLUGIN_ERROR_CANCELLED,
+						 "Failed to get history: %s",
+						 error_local->message);
+			return;
+		} else if (g_error_matches (error_local,
+					    G_IO_ERROR,
+					    G_IO_ERROR_TIMED_OUT)) {
+			g_debug ("No history as PackageKit took too long: %s",
+				 error_local->message);
+			for (i = 0; i < gs_app_list_length (list); i++) {
+				GsApp *app = gs_app_list_index (list, i);
+				gs_app_set_install_date (app, GS_APP_INSTALL_DATE_UNKNOWN);
+			}
+		}
+
+		g_task_return_new_error (task,
+					 GS_PLUGIN_ERROR,
+					 GS_PLUGIN_ERROR_NOT_SUPPORTED,
+					 "Failed to get history: %s",
+					 error_local->message);
+		return;
+	}
+
+	/* get any results */
+	tuple = g_variant_get_child_value (result_variant, 0);
+	for (i = 0; i < gs_app_list_length (list); i++) {
+		g_autoptr(GVariant) entries = NULL;
+		GsApp *app = gs_app_list_index (list, i);
+		ret = g_variant_lookup (tuple,
+					gs_app_get_source_default (app),
+					"@aa{sv}",
+					&entries);
+		if (!ret) {
+			/* make up a fake entry as we know this package was at
+			 * least installed at some point in time */
+			if (gs_app_get_state (app) == GS_APP_STATE_INSTALLED) {
+				g_autoptr(GsApp) app_dummy = NULL;
+				app_dummy = gs_app_new (gs_app_get_id (app));
+				gs_plugin_packagekit_set_packaging_format (plugin, app);
+				gs_app_set_metadata (app_dummy, "GnomeSoftware::Creator",
+						     gs_plugin_get_name (plugin));
+				gs_app_set_install_date (app_dummy, GS_APP_INSTALL_DATE_UNKNOWN);
+				gs_app_set_kind (app_dummy, AS_COMPONENT_KIND_GENERIC);
+				gs_app_set_state (app_dummy, GS_APP_STATE_INSTALLED);
+				gs_app_set_version (app_dummy, gs_app_get_version (app));
+				gs_app_add_history (app, app_dummy);
+			}
+			gs_app_set_install_date (app, GS_APP_INSTALL_DATE_UNKNOWN);
+			continue;
+		}
+
+		/* add history for application */
+		g_variant_iter_init (&iter, entries);
+		while ((value = g_variant_iter_next_value (&iter))) {
+			gs_plugin_packagekit_refine_add_history (app, value);
+			g_variant_unref (value);
+		}
+	}
+
+	g_task_return_boolean (task, TRUE);
+}
+
+static gboolean
+gs_plugin_packagekit_refine_history_finish (GsPluginPackagekit  *self,
+                                            GAsyncResult        *result,
+                                            GError             **error)
+{
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+static gboolean
+gs_plugin_packagekit_refresh_guess_app_id (GsPluginPackagekit  *self,
+                                           GsApp               *app,
+                                           const gchar         *filename,
+                                           GCancellable        *cancellable,
+                                           GError             **error)
+{
+	GsPlugin *plugin = GS_PLUGIN (self);
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_auto(GStrv) files = NULL;
+	g_autoptr(PkTask) task_local = NULL;
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GPtrArray) array = NULL;
+	g_autoptr(GString) basename_best = g_string_new (NULL);
+
+	/* get file list so we can work out ID */
+	files = g_strsplit (filename, "\t", -1);
+	gs_packagekit_helper_add_app (helper, app);
+
+	task_local = gs_packagekit_task_new (plugin);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_local), GS_PLUGIN_ACTION_FILE_TO_APP, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+
+	results = pk_client_get_files_local (PK_CLIENT (task_local),
+					     files,
+					     cancellable,
+					     gs_packagekit_helper_cb, helper,
+					     error);
+
+	if (!gs_plugin_packagekit_results_valid (results, error)) {
+		gs_utils_error_add_origin_id (error, app);
+		return FALSE;
+	}
+	array = pk_results_get_files_array (results);
+	if (array->len == 0) {
+		g_set_error (error,
+			     GS_PLUGIN_ERROR,
+			     GS_PLUGIN_ERROR_INVALID_FORMAT,
+			     "no files for %s", filename);
+		return FALSE;
+	}
+
+	/* find the smallest length desktop file, on the logic that
+	 * ${app}.desktop is going to be better than ${app}-${action}.desktop */
+	for (guint i = 0; i < array->len; i++) {
+		PkFiles *item = g_ptr_array_index (array, i);
+		gchar **fns = pk_files_get_files (item);
+		for (guint j = 0; fns[j] != NULL; j++) {
+			if (g_str_has_prefix (fns[j], "/etc/yum.repos.d/") &&
+			    g_str_has_suffix (fns[j], ".repo")) {
+				gs_app_add_quirk (app, GS_APP_QUIRK_HAS_SOURCE);
+			}
+			if (g_str_has_prefix (fns[j], "/usr/share/applications/") &&
+			    g_str_has_suffix (fns[j], ".desktop")) {
+				g_autofree gchar *basename = g_path_get_basename (fns[j]);
+				if (basename_best->len == 0 ||
+				    strlen (basename) < basename_best->len)
+					g_string_assign (basename_best, basename);
+			}
+		}
+	}
+	if (basename_best->len > 0) {
+		gs_app_set_kind (app, AS_COMPONENT_KIND_DESKTOP_APP);
+		gs_app_set_id (app, basename_best->str);
+	}
+
+	return TRUE;
+}
+
+static void
+add_quirks_from_package_name (GsApp *app, const gchar *package_name)
+{
+	/* these packages don't have a .repo file in their file lists, but
+	 * instead install one through rpm scripts / cron job */
+	const gchar *packages_with_repos[] = {
+		"google-chrome-stable",
+		"google-earth-pro-stable",
+		"google-talkplugin",
+		NULL };
+
+	if (g_strv_contains (packages_with_repos, package_name))
+		gs_app_add_quirk (app, GS_APP_QUIRK_HAS_SOURCE);
+}
+
+static gboolean
+gs_plugin_packagekit_local_check_installed (GsPluginPackagekit  *self,
+                                            PkTask              *task_local,
+                                            GsApp               *app,
+                                            GCancellable        *cancellable,
+                                            GError             **error)
+{
+	PkBitfield filter;
+	const gchar *names[] = { gs_app_get_source_default (app), NULL };
+	g_autoptr(GPtrArray) packages = NULL;
+	g_autoptr(PkResults) results = NULL;
+
+	filter = pk_bitfield_from_enums (PK_FILTER_ENUM_NEWEST,
+					 PK_FILTER_ENUM_ARCH,
+					 PK_FILTER_ENUM_INSTALLED,
+					 -1);
+	results = pk_client_resolve (PK_CLIENT (task_local), filter, (gchar **) names,
+				     cancellable, NULL, NULL, error);
+	if (results == NULL) {
+		gs_plugin_packagekit_error_convert (error);
+		return FALSE;
+	}
+	packages = pk_results_get_package_array (results);
+	if (packages->len > 0) {
+		gboolean is_higher_version = FALSE;
+		const gchar *app_version = gs_app_get_version (app);
+		for (guint i = 0; i < packages->len; i++){
+			PkPackage *pkg = g_ptr_array_index (packages, i);
+			gs_app_add_source_id (app, pk_package_get_id (pkg));
+			if (!is_higher_version &&
+			    as_vercmp_simple (pk_package_get_version (pkg), app_version) < 0)
+				is_higher_version = TRUE;
+		}
+		if (!is_higher_version) {
+			gs_app_set_state (app, GS_APP_STATE_UNKNOWN);
+			gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+		}
+	}
+	return TRUE;
+}
+
+gboolean
+gs_plugin_file_to_app (GsPlugin *plugin,
+		       GsAppList *list,
+		       GFile *file,
+		       GCancellable *cancellable,
+		       GError **error)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (plugin);
+	const gchar *package_id;
+	PkDetails *item;
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(PkTask) task_local = NULL;
+	g_autoptr(PkResults) results = NULL;
+	g_autofree gchar *content_type = NULL;
+	g_autofree gchar *filename = NULL;
+	g_autofree gchar *license_spdx = NULL;
+	g_auto(GStrv) files = NULL;
+	g_auto(GStrv) split = NULL;
+	g_autoptr(GPtrArray) array = NULL;
+	g_autoptr(GsApp) app = NULL;
+	const gchar *mimetypes[] = {
+		"application/x-app-package",
+		"application/x-deb",
+		"application/vnd.debian.binary-package",
+		"application/x-redhat-package-manager",
+		"application/x-rpm",
+		NULL };
+
+	/* does this match any of the mimetypes we support */
+	content_type = gs_utils_get_content_type (file, cancellable, error);
+	if (content_type == NULL)
+		return FALSE;
+	if (!g_strv_contains (mimetypes, content_type))
+		return TRUE;
+
+	/* get details */
+	filename = g_file_get_path (file);
+	files = g_strsplit (filename, "\t", -1);
+
+	task_local = gs_packagekit_task_new (plugin);
+	pk_client_set_cache_age (PK_CLIENT (task_local), G_MAXUINT);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_local), GS_PLUGIN_ACTION_FILE_TO_APP, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+
+	results = pk_client_get_details_local (PK_CLIENT (task_local),
+					       files,
+					       cancellable,
+					       gs_packagekit_helper_cb, helper,
+					       error);
+
+	if (!gs_plugin_packagekit_results_valid (results, error))
+		return FALSE;
+
+	/* get results */
+	array = pk_results_get_details_array (results);
+	if (array->len == 0) {
+		g_set_error (error,
+			     GS_PLUGIN_ERROR,
+			     GS_PLUGIN_ERROR_INVALID_FORMAT,
+			     "no details for %s", filename);
+		return FALSE;
+	}
+	if (array->len > 1) {
+		g_set_error (error,
+			     GS_PLUGIN_ERROR,
+			     GS_PLUGIN_ERROR_INVALID_FORMAT,
+			     "too many details [%u] for %s",
+			     array->len, filename);
+		return FALSE;
+	}
+
+	/* create application */
+	item = g_ptr_array_index (array, 0);
+	app = gs_app_new (NULL);
+	gs_plugin_packagekit_set_packaging_format (plugin, app);
+	gs_app_set_metadata (app, "GnomeSoftware::Creator",
+			     gs_plugin_get_name (plugin));
+	package_id = pk_details_get_package_id (item);
+	split = pk_package_id_split (package_id);
+	if (split == NULL) {
+		g_set_error (error,
+			     GS_PLUGIN_ERROR,
+			     GS_PLUGIN_ERROR_INVALID_FORMAT,
+			     "invalid package-id: %s", package_id);
+		return FALSE;
+	}
+	gs_app_set_management_plugin (app, plugin);
+	gs_app_set_kind (app, AS_COMPONENT_KIND_GENERIC);
+	gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);
+	gs_app_set_state (app, GS_APP_STATE_AVAILABLE_LOCAL);
+	gs_app_set_name (app, GS_APP_QUALITY_LOWEST, split[PK_PACKAGE_ID_NAME]);
+	gs_app_set_summary (app, GS_APP_QUALITY_LOWEST,
+			    pk_details_get_summary (item));
+	gs_app_set_version (app, split[PK_PACKAGE_ID_VERSION]);
+	gs_app_add_source (app, split[PK_PACKAGE_ID_NAME]);
+	gs_app_add_source_id (app, package_id);
+	gs_app_set_description (app, GS_APP_QUALITY_LOWEST,
+				pk_details_get_description (item));
+	gs_app_set_url (app, AS_URL_KIND_HOMEPAGE, pk_details_get_url (item));
+	gs_app_set_size_installed (app, GS_SIZE_TYPE_VALID, pk_details_get_size (item));
+	gs_app_set_size_download (app, GS_SIZE_TYPE_VALID, 0);
+	license_spdx = as_license_to_spdx_id (pk_details_get_license (item));
+	gs_app_set_license (app, GS_APP_QUALITY_LOWEST, license_spdx);
+	add_quirks_from_package_name (app, split[PK_PACKAGE_ID_NAME]);
+
+	/* is already installed? */
+	if (!gs_plugin_packagekit_local_check_installed (self,
+							 task_local,
+							 app,
+							 cancellable,
+							 error))
+		return FALSE;
+
+	/* look for a desktop file so we can use a valid application id */
+	if (!gs_plugin_packagekit_refresh_guess_app_id (self,
+							app,
+							filename,
+							cancellable,
+							error))
+		return FALSE;
+
+	gs_app_list_add (list, app);
+	return TRUE;
+}
+
+static gboolean
+gs_plugin_packagekit_convert_error (GError **error,
+				    PkErrorEnum error_enum,
+				    const gchar *details)
+{
+	switch (error_enum) {
+	case PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED:
+	case PK_ERROR_ENUM_NO_CACHE:
+	case PK_ERROR_ENUM_NO_NETWORK:
+	case PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY:
+	case PK_ERROR_ENUM_CANNOT_FETCH_SOURCES:
+	case PK_ERROR_ENUM_UNFINISHED_TRANSACTION:
+		g_set_error_literal (error,
+				     GS_PLUGIN_ERROR,
+				     GS_PLUGIN_ERROR_NO_NETWORK,
+				     details);
+		break;
+	case PK_ERROR_ENUM_BAD_GPG_SIGNATURE:
+	case PK_ERROR_ENUM_CANNOT_UPDATE_REPO_UNSIGNED:
+	case PK_ERROR_ENUM_GPG_FAILURE:
+	case PK_ERROR_ENUM_MISSING_GPG_SIGNATURE:
+	case PK_ERROR_ENUM_PACKAGE_CORRUPT:
+		g_set_error_literal (error,
+				     GS_PLUGIN_ERROR,
+				     GS_PLUGIN_ERROR_NO_SECURITY,
+				     details);
+		break;
+	case PK_ERROR_ENUM_TRANSACTION_CANCELLED:
+		g_set_error_literal (error,
+				     GS_PLUGIN_ERROR,
+				     GS_PLUGIN_ERROR_CANCELLED,
+				     details);
+		break;
+	case PK_ERROR_ENUM_NO_PACKAGES_TO_UPDATE:
+	case PK_ERROR_ENUM_UPDATE_NOT_FOUND:
+		g_set_error_literal (error,
+				     GS_PLUGIN_ERROR,
+				     GS_PLUGIN_ERROR_NOT_SUPPORTED,
+				     details);
+		break;
+	case PK_ERROR_ENUM_NO_SPACE_ON_DEVICE:
+		g_set_error_literal (error,
+				     GS_PLUGIN_ERROR,
+				     GS_PLUGIN_ERROR_NO_SPACE,
+				     details);
+		break;
+	default:
+		g_set_error_literal (error,
+				     GS_PLUGIN_ERROR,
+				     GS_PLUGIN_ERROR_FAILED,
+				     details);
+		break;
+	}
+	return FALSE;
+}
+
+gboolean
+gs_plugin_add_updates_historical (GsPlugin *plugin,
+				  GsAppList *list,
+				  GCancellable *cancellable,
+				  GError **error)
+{
+	guint64 mtime;
+	guint i;
+	g_autoptr(GPtrArray) package_array = NULL;
+	g_autoptr(GError) error_local = NULL;
+	g_autoptr(PkResults) results = NULL;
+	PkExitEnum exit_code;
+
+	/* get the results */
+	results = pk_offline_get_results (&error_local);
+	if (results == NULL) {
+		/* was any offline update attempted */
+		if (g_error_matches (error_local,
+		                     PK_OFFLINE_ERROR,
+		                     PK_OFFLINE_ERROR_NO_DATA)) {
+			return TRUE;
+		}
+
+		gs_plugin_packagekit_error_convert (&error_local);
+
+		g_set_error (error,
+		             GS_PLUGIN_ERROR,
+		             GS_PLUGIN_ERROR_INVALID_FORMAT,
+		             "Failed to get offline update results: %s",
+		             error_local->message);
+		return FALSE;
+	}
+
+	/* get the mtime of the results */
+	mtime = pk_offline_get_results_mtime (error);
+	if (mtime == 0) {
+		gs_plugin_packagekit_error_convert (error);
+		return FALSE;
+	}
+
+	/* only return results if successful */
+	exit_code = pk_results_get_exit_code (results);
+	if (exit_code != PK_EXIT_ENUM_SUCCESS) {
+		g_autoptr(PkError) error_code = NULL;
+
+		error_code = pk_results_get_error_code (results);
+		if (error_code == NULL) {
+			g_set_error (error,
+			             GS_PLUGIN_ERROR,
+			             GS_PLUGIN_ERROR_FAILED,
+			             "Offline update failed without error_code set");
+			return FALSE;
+		}
+
+		return gs_plugin_packagekit_convert_error (error,
+		                                           pk_error_get_code (error_code),
+		                                           pk_error_get_details (error_code));
+	}
+
+	/* distro upgrade? */
+	if (pk_results_get_role (results) == PK_ROLE_ENUM_UPGRADE_SYSTEM) {
+		g_autoptr(GsApp) app = NULL;
+
+		app = gs_app_new (NULL);
+		gs_app_set_from_unique_id (app, "*/*/*/system/*", AS_COMPONENT_KIND_GENERIC);
+		gs_app_set_management_plugin (app, plugin);
+		gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
+		gs_app_set_state (app, GS_APP_STATE_UNKNOWN);
+		gs_app_set_kind (app, AS_COMPONENT_KIND_OPERATING_SYSTEM);
+		gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);
+		gs_app_set_install_date (app, mtime);
+		gs_app_set_metadata (app, "GnomeSoftware::Creator",
+				     gs_plugin_get_name (plugin));
+		gs_app_list_add (list, app);
+
+		return TRUE;
+	}
+
+	/* get list of package-ids */
+	package_array = pk_results_get_package_array (results);
+	for (i = 0; i < package_array->len; i++) {
+		PkPackage *pkg = g_ptr_array_index (package_array, i);
+		const gchar *package_id;
+		g_autoptr(GsApp) app = NULL;
+		g_auto(GStrv) split = NULL;
+
+		app = gs_app_new (NULL);
+		package_id = pk_package_get_id (pkg);
+		split = g_strsplit (package_id, ";", 4);
+		gs_plugin_packagekit_set_packaging_format (plugin, app);
+		gs_app_add_source (app, split[0]);
+		gs_app_set_update_version (app, split[1]);
+		gs_app_set_management_plugin (app, plugin);
+		gs_app_add_source_id (app, package_id);
+		gs_app_set_state (app, GS_APP_STATE_UPDATABLE);
+		gs_app_set_kind (app, AS_COMPONENT_KIND_GENERIC);
+		gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);
+		gs_app_set_install_date (app, mtime);
+		gs_app_set_metadata (app, "GnomeSoftware::Creator",
+				     gs_plugin_get_name (plugin));
+		gs_app_list_add (list, app);
+	}
+	return TRUE;
+}
+
+gboolean
+gs_plugin_url_to_app (GsPlugin *plugin,
+		      GsAppList *list,
+		      const gchar *url,
+		      GCancellable *cancellable,
+		      GError **error)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (plugin);
+	g_autofree gchar *scheme = NULL;
+	g_autofree gchar *path = NULL;
+	const gchar *id = NULL;
+	const gchar * const *id_like = NULL;
+	g_auto(GStrv) package_ids = NULL;
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GsApp) app = NULL;
+	g_autoptr(GsOsRelease) os_release = NULL;
+	g_autoptr(GPtrArray) packages = NULL;
+	g_autoptr(GPtrArray) details = NULL;
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(PkClient) client_url_to_app = NULL;
+
+	path = gs_utils_get_url_path (url);
+
+	/* only do this for apt:// on debian or debian-like distros */
+	os_release = gs_os_release_new (error);
+	if (os_release == NULL) {
+		g_prefix_error (error, "failed to determine OS information:");
+		return FALSE;
+	} else  {
+		id = gs_os_release_get_id (os_release);
+		id_like = gs_os_release_get_id_like (os_release);
+		scheme = gs_utils_get_url_scheme (url);
+		if (!(g_strcmp0 (scheme, "apt") == 0 &&
+		     (g_strcmp0 (id, "debian") == 0 ||
+		      g_strv_contains (id_like, "debian")))) {
+			return TRUE;
+		}
+	}
+
+	app = gs_app_new (NULL);
+	gs_plugin_packagekit_set_packaging_format (plugin, app);
+	gs_app_add_source (app, path);
+	gs_app_set_kind (app, AS_COMPONENT_KIND_GENERIC);
+	gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);
+
+	package_ids = g_new0 (gchar *, 2);
+	package_ids[0] = g_strdup (path);
+
+	client_url_to_app = pk_client_new ();
+	pk_client_set_interactive (client_url_to_app, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+
+	results = pk_client_resolve (client_url_to_app,
+				     pk_bitfield_from_enums (PK_FILTER_ENUM_NEWEST, PK_FILTER_ENUM_ARCH, -1),
+				     package_ids,
+				     cancellable,
+				     gs_packagekit_helper_cb, helper,
+				     error);
+
+	if (!gs_plugin_packagekit_results_valid (results, error)) {
+		g_prefix_error (error, "failed to resolve package_ids: ");
+		return FALSE;
+	}
+
+	/* get results */
+	packages = pk_results_get_package_array (results);
+	details = pk_results_get_details_array (results);
+
+	if (packages->len >= 1) {
+		g_autoptr(GHashTable) details_collection = NULL;
+		g_autoptr(GHashTable) prepared_updates = NULL;
+
+		if (gs_app_get_local_file (app) != NULL)
+			return TRUE;
+
+		details_collection = gs_plugin_packagekit_details_array_to_hash (details);
+
+		g_mutex_lock (&self->prepared_updates_mutex);
+		prepared_updates = g_hash_table_ref (self->prepared_updates);
+		g_mutex_unlock (&self->prepared_updates_mutex);
+
+		gs_plugin_packagekit_resolve_packages_app (GS_PLUGIN (self), packages, app);
+		gs_plugin_packagekit_refine_details_app (plugin, details_collection, prepared_updates, app);
+
+		gs_app_list_add (list, app);
+	} else {
+		g_warning ("no results returned");
+	}
+
+	return TRUE;
+}
+
+static gchar *
+get_proxy_http (GsPluginPackagekit *self)
+{
+	gboolean ret;
+	GString *string = NULL;
+	gint port;
+	GDesktopProxyMode proxy_mode;
+	g_autofree gchar *host = NULL;
+	g_autofree gchar *password = NULL;
+	g_autofree gchar *username = NULL;
+
+	proxy_mode = g_settings_get_enum (self->settings_proxy, "mode");
+	if (proxy_mode != G_DESKTOP_PROXY_MODE_MANUAL)
+		return NULL;
+
+	host = g_settings_get_string (self->settings_http, "host");
+	if (host == NULL || host[0] == '\0')
+		return NULL;
+
+	port = g_settings_get_int (self->settings_http, "port");
+
+	ret = g_settings_get_boolean (self->settings_http,
+				      "use-authentication");
+	if (ret) {
+		username = g_settings_get_string (self->settings_http,
+						  "authentication-user");
+		password = g_settings_get_string (self->settings_http,
+						  "authentication-password");
+	}
+
+	/* make PackageKit proxy string */
+	string = g_string_new ("");
+	if (username != NULL || password != NULL) {
+		if (username != NULL)
+			g_string_append_printf (string, "%s", username);
+		if (password != NULL)
+			g_string_append_printf (string, ":%s", password);
+		g_string_append (string, "@");
+	}
+	g_string_append (string, host);
+	if (port > 0)
+		g_string_append_printf (string, ":%i", port);
+	return g_string_free (string, FALSE);
+}
+
+static gchar *
+get_proxy_https (GsPluginPackagekit *self)
+{
+	GString *string = NULL;
+	gint port;
+	GDesktopProxyMode proxy_mode;
+	g_autofree gchar *host = NULL;
+
+	proxy_mode = g_settings_get_enum (self->settings_proxy, "mode");
+	if (proxy_mode != G_DESKTOP_PROXY_MODE_MANUAL)
+		return NULL;
+
+	host = g_settings_get_string (self->settings_https, "host");
+	if (host == NULL || host[0] == '\0')
+		return NULL;
+	port = g_settings_get_int (self->settings_https, "port");
+	if (port == 0)
+		return NULL;
+
+	/* make PackageKit proxy string */
+	string = g_string_new (host);
+	if (port > 0)
+		g_string_append_printf (string, ":%i", port);
+	return g_string_free (string, FALSE);
+}
+
+static gchar *
+get_proxy_ftp (GsPluginPackagekit *self)
+{
+	GString *string = NULL;
+	gint port;
+	GDesktopProxyMode proxy_mode;
+	g_autofree gchar *host = NULL;
+
+	proxy_mode = g_settings_get_enum (self->settings_proxy, "mode");
+	if (proxy_mode != G_DESKTOP_PROXY_MODE_MANUAL)
+		return NULL;
+
+	host = g_settings_get_string (self->settings_ftp, "host");
+	if (host == NULL || host[0] == '\0')
+		return NULL;
+	port = g_settings_get_int (self->settings_ftp, "port");
+	if (port == 0)
+		return NULL;
+
+	/* make PackageKit proxy string */
+	string = g_string_new (host);
+	if (port > 0)
+		g_string_append_printf (string, ":%i", port);
+	return g_string_free (string, FALSE);
+}
+
+static gchar *
+get_proxy_socks (GsPluginPackagekit *self)
+{
+	GString *string = NULL;
+	gint port;
+	GDesktopProxyMode proxy_mode;
+	g_autofree gchar *host = NULL;
+
+	proxy_mode = g_settings_get_enum (self->settings_proxy, "mode");
+	if (proxy_mode != G_DESKTOP_PROXY_MODE_MANUAL)
+		return NULL;
+
+	host = g_settings_get_string (self->settings_socks, "host");
+	if (host == NULL || host[0] == '\0')
+		return NULL;
+	port = g_settings_get_int (self->settings_socks, "port");
+	if (port == 0)
+		return NULL;
+
+	/* make PackageKit proxy string */
+	string = g_string_new (host);
+	if (port > 0)
+		g_string_append_printf (string, ":%i", port);
+	return g_string_free (string, FALSE);
+}
+
+static gchar *
+get_no_proxy (GsPluginPackagekit *self)
+{
+	GString *string = NULL;
+	GDesktopProxyMode proxy_mode;
+	g_autofree gchar **hosts = NULL;
+	guint i;
+
+	proxy_mode = g_settings_get_enum (self->settings_proxy, "mode");
+	if (proxy_mode != G_DESKTOP_PROXY_MODE_MANUAL)
+		return NULL;
+
+	hosts = g_settings_get_strv (self->settings_proxy, "ignore-hosts");
+	if (hosts == NULL)
+		return NULL;
+
+	/* make PackageKit proxy string */
+	string = g_string_new ("");
+	for (i = 0; hosts[i] != NULL; i++) {
+		if (i == 0)
+			g_string_assign (string, hosts[i]);
+		else
+			g_string_append_printf (string, ",%s", hosts[i]);
+		g_free (hosts[i]);
+	}
+
+	return g_string_free (string, FALSE);
+}
+
+static gchar *
+get_pac (GsPluginPackagekit *self)
+{
+	GDesktopProxyMode proxy_mode;
+	gchar *url = NULL;
+
+	proxy_mode = g_settings_get_enum (self->settings_proxy, "mode");
+	if (proxy_mode != G_DESKTOP_PROXY_MODE_AUTO)
+		return NULL;
+
+	url = g_settings_get_string (self->settings_proxy, "autoconfig-url");
+	if (url == NULL)
+		return NULL;
+
+	return url;
+}
+
+static void get_permission_cb (GObject      *source_object,
+                               GAsyncResult *result,
+                               gpointer      user_data);
+static void set_proxy_cb (GObject      *source_object,
+                          GAsyncResult *result,
+                          gpointer      user_data);
+
+static void
+reload_proxy_settings_async (GsPluginPackagekit  *self,
+                             GCancellable        *cancellable,
+                             GAsyncReadyCallback  callback,
+                             gpointer             user_data)
+{
+	g_autoptr(GTask) task = NULL;
+
+	task = g_task_new (self, cancellable, callback, user_data);
+	g_task_set_source_tag (task, reload_proxy_settings_async);
+
+	/* only if we can achieve the action *without* an auth dialog */
+	gs_utils_get_permission_async ("org.freedesktop.packagekit."
+				       "system-network-proxy-configure",
+				       cancellable, get_permission_cb,
+				       g_steal_pointer (&task));
+}
+
+static void
+get_permission_cb (GObject      *source_object,
+                   GAsyncResult *result,
+                   gpointer      user_data)
+{
+	g_autoptr(GTask) task = g_steal_pointer (&user_data);
+	GsPluginPackagekit *self = g_task_get_source_object (task);
+	GCancellable *cancellable = g_task_get_cancellable (task);
+	g_autofree gchar *proxy_http = NULL;
+	g_autofree gchar *proxy_https = NULL;
+	g_autofree gchar *proxy_ftp = NULL;
+	g_autofree gchar *proxy_socks = NULL;
+	g_autofree gchar *no_proxy = NULL;
+	g_autofree gchar *pac = NULL;
+	g_autoptr(GError) error = NULL;
+	g_autoptr(GPermission) permission = NULL;
+	g_autoptr(GError) local_error = NULL;
+
+	permission = gs_utils_get_permission_finish (result, &local_error);
+	if (permission == NULL) {
+		g_debug ("not setting proxy as no permission: %s", local_error->message);
+		g_task_return_boolean (task, TRUE);
+		return;
+	}
+	if (!g_permission_get_allowed (permission)) {
+		g_debug ("not setting proxy as no auth requested");
+		g_task_return_boolean (task, TRUE);
+		return;
+	}
+
+	proxy_http = get_proxy_http (self);
+	proxy_https = get_proxy_https (self);
+	proxy_ftp = get_proxy_ftp (self);
+	proxy_socks = get_proxy_socks (self);
+	no_proxy = get_no_proxy (self);
+	pac = get_pac (self);
+
+	g_debug ("Setting proxies (http: %s, https: %s, ftp: %s, socks: %s, "
+	         "no_proxy: %s, pac: %s)",
+	         proxy_http, proxy_https, proxy_ftp, proxy_socks,
+	         no_proxy, pac);
+
+	pk_control_set_proxy2_async (self->control_proxy,
+				     proxy_http,
+				     proxy_https,
+				     proxy_ftp,
+				     proxy_socks,
+				     no_proxy,
+				     pac,
+				     cancellable,
+				     set_proxy_cb,
+				     g_steal_pointer (&task));
+}
+
+static void
+set_proxy_cb (GObject      *source_object,
+              GAsyncResult *result,
+              gpointer      user_data)
+{
+	PkControl *control = PK_CONTROL (source_object);
+	g_autoptr(GTask) task = g_steal_pointer (&user_data);
+	g_autoptr(GError) local_error = NULL;
+
+	if (!pk_control_set_proxy_finish (control, result, &local_error)) {
+		g_task_return_error (task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	g_task_return_boolean (task, TRUE);
+}
+
+static gboolean
+reload_proxy_settings_finish (GsPluginPackagekit  *self,
+                              GAsyncResult        *result,
+                              GError             **error)
+{
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+static void proxy_changed_reload_proxy_settings_cb (GObject      *source_object,
+                                                    GAsyncResult *result,
+                                                    gpointer      user_data);
+
+static void
+gs_plugin_packagekit_proxy_changed_cb (GSettings   *settings,
+                                       const gchar *key,
+                                       gpointer     user_data)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (user_data);
+
+	if (!gs_plugin_get_enabled (GS_PLUGIN (self)))
+		return;
+
+	g_cancellable_cancel (self->proxy_settings_cancellable);
+	g_clear_object (&self->proxy_settings_cancellable);
+	self->proxy_settings_cancellable = g_cancellable_new ();
+
+	reload_proxy_settings_async (self, self->proxy_settings_cancellable,
+				     proxy_changed_reload_proxy_settings_cb, self);
+}
+
+static void
+proxy_changed_reload_proxy_settings_cb (GObject      *source_object,
+                                        GAsyncResult *result,
+                                        gpointer      user_data)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (user_data);
+	g_autoptr(GError) local_error = NULL;
+
+	if (!reload_proxy_settings_finish (self, result, &local_error) &&
+	    !g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+		g_warning ("Failed to set proxies: %s", local_error->message);
+}
+
+gboolean
+gs_plugin_app_upgrade_download (GsPlugin *plugin,
+				GsApp *app,
+				GCancellable *cancellable,
+				GError **error)
+{
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(PkTask) task_upgrade = NULL;
+	g_autoptr(PkResults) results = NULL;
+
+	/* only process this app if was created by this plugin */
+	if (!gs_app_has_management_plugin (app, plugin))
+		return TRUE;
+
+	/* check is distro-upgrade */
+	if (gs_app_get_kind (app) != AS_COMPONENT_KIND_OPERATING_SYSTEM)
+		return TRUE;
+
+	/* ask PK to download enough packages to upgrade the system */
+	gs_app_set_state (app, GS_APP_STATE_INSTALLING);
+	gs_packagekit_helper_set_progress_app (helper, app);
+
+	task_upgrade = gs_packagekit_task_new (plugin);
+	pk_task_set_only_download (task_upgrade, TRUE);
+	pk_client_set_cache_age (PK_CLIENT (task_upgrade), 60 * 60 * 24);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_upgrade), GS_PLUGIN_ACTION_UPGRADE_DOWNLOAD, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+
+	results = pk_task_upgrade_system_sync (task_upgrade,
+					       gs_app_get_version (app),
+					       PK_UPGRADE_KIND_ENUM_COMPLETE,
+					       cancellable,
+					       gs_packagekit_helper_cb, helper,
+					       error);
+
+	if (!gs_plugin_packagekit_results_valid (results, error)) {
+		gs_app_set_state_recover (app);
+		return FALSE;
+	}
+
+	/* state is known */
+	gs_app_set_state (app, GS_APP_STATE_UPDATABLE);
+	return TRUE;
+}
+
+static void gs_plugin_packagekit_refresh_metadata_async (GsPlugin                     *plugin,
+                                                         guint64                       cache_age_secs,
+                                                         GsPluginRefreshMetadataFlags  flags,
+                                                         GCancellable                 *cancellable,
+                                                         GAsyncReadyCallback           callback,
+                                                         gpointer                      user_data);
+
+static void
+gs_plugin_packagekit_enable_repository_refresh_ready_cb (GObject *source_object,
+							 GAsyncResult *result,
+							 gpointer user_data)
+{
+	g_autoptr(GTask) task = user_data;
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (g_task_get_source_object (task));
+	GsPluginManageRepositoryData *data = g_task_get_task_data (task);
+
+	gs_plugin_repository_changed (GS_PLUGIN (self), data->repository);
+
+	/* Ignore refresh errors */
+	g_task_return_boolean (task, TRUE);
+}
+
+static void
+gs_plugin_packagekit_enable_repository_ready_cb (GObject *source_object,
+						 GAsyncResult *result,
+						 gpointer user_data)
+{
+	g_autoptr(GTask) task = user_data;
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(PkError) error_code = NULL;
+	g_autoptr(GError) local_error = NULL;
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (g_task_get_source_object (task));
+	GsPluginManageRepositoryData *data = g_task_get_task_data (task);
+	GsPluginRefreshMetadataFlags metadata_flags;
+	GCancellable *cancellable = g_task_get_cancellable (task);
+
+	results = pk_client_generic_finish (PK_CLIENT (source_object), result, &local_error);
+
+	/* pk_client_repo_enable() returns an error if the repo is already enabled. */
+	if (results != NULL &&
+	    (error_code = pk_results_get_error_code (results)) != NULL &&
+	    pk_error_get_code (error_code) == PK_ERROR_ENUM_REPO_ALREADY_SET) {
+		g_clear_error (&local_error);
+	} else if (local_error != NULL || !gs_plugin_packagekit_results_valid (results, &local_error)) {
+		gs_app_set_state_recover (data->repository);
+		gs_utils_error_add_origin_id (&local_error, data->repository);
+		g_task_return_error (task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	/* state is known */
+	gs_app_set_state (data->repository, GS_APP_STATE_INSTALLED);
+
+	metadata_flags = (data->flags & GS_PLUGIN_MANAGE_REPOSITORY_FLAGS_INTERACTIVE) != 0 ?
+			 GS_PLUGIN_REFRESH_METADATA_FLAGS_INTERACTIVE :
+			 GS_PLUGIN_REFRESH_METADATA_FLAGS_NONE;
+
+	gs_plugin_packagekit_refresh_metadata_async (GS_PLUGIN (self),
+						     1,  /* cache age */
+						     metadata_flags,
+						     cancellable,
+						     gs_plugin_packagekit_enable_repository_refresh_ready_cb,
+						     g_steal_pointer (&task));
+}
+
+static void
+gs_plugin_packagekit_enable_repository_async (GsPlugin                     *plugin,
+					      GsApp			   *repository,
+                                              GsPluginManageRepositoryFlags flags,
+                                              GCancellable		   *cancellable,
+                                              GAsyncReadyCallback	    callback,
+                                              gpointer			    user_data)
+{
+	g_autoptr(GsPackagekitHelper) helper = NULL;
+	g_autoptr(PkTask) task_enable_repo = NULL;
+	g_autoptr(GTask) task = NULL;
+
+	task = gs_plugin_manage_repository_data_new_task (plugin, repository, flags, cancellable, callback, user_data);
+	g_task_set_source_tag (task, gs_plugin_packagekit_enable_repository_async);
+
+	/* only process this app if was created by this plugin */
+	if (!gs_app_has_management_plugin (repository, plugin)) {
+		g_task_return_boolean (task, TRUE);
+		return;
+	}
+
+	/* is repo */
+	g_assert (gs_app_get_kind (repository) == AS_COMPONENT_KIND_REPOSITORY);
+
+	/* do the call */
+	gs_plugin_status_update (plugin, repository, GS_PLUGIN_STATUS_WAITING);
+	gs_app_set_state (repository, GS_APP_STATE_INSTALLING);
+
+	helper = gs_packagekit_helper_new (plugin);
+	gs_packagekit_helper_add_app (helper, repository);
+
+	task_enable_repo = gs_packagekit_task_new (plugin);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_enable_repo), GS_PLUGIN_ACTION_ENABLE_REPO,
+				  (flags & GS_PLUGIN_MANAGE_REPOSITORY_FLAGS_INTERACTIVE) != 0);
+	gs_packagekit_task_take_helper (GS_PACKAGEKIT_TASK (task_enable_repo), helper);
+
+	pk_client_repo_enable_async (PK_CLIENT (task_enable_repo),
+				     gs_app_get_id (repository),
+				     TRUE,
+				     cancellable,
+				     gs_packagekit_helper_cb, g_steal_pointer (&helper),
+				     gs_plugin_packagekit_enable_repository_ready_cb,
+				     g_steal_pointer (&task));
+}
+
+static gboolean
+gs_plugin_packagekit_enable_repository_finish (GsPlugin      *plugin,
+					       GAsyncResult  *result,
+					       GError       **error)
+{
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+static void
+gs_plugin_packagekit_disable_repository_ready_cb (GObject *source_object,
+						  GAsyncResult *result,
+						  gpointer user_data)
+{
+	g_autoptr(GTask) task = user_data;
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(PkError) error_code = NULL;
+	g_autoptr(GError) local_error = NULL;
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (g_task_get_source_object (task));
+	GsPluginManageRepositoryData *data = g_task_get_task_data (task);
+
+	results = pk_client_generic_finish (PK_CLIENT (source_object), result, &local_error);
+
+	/* pk_client_repo_enable() returns an error if the repo is already disabled. */
+	if (results != NULL &&
+	    (error_code = pk_results_get_error_code (results)) != NULL &&
+	    pk_error_get_code (error_code) == PK_ERROR_ENUM_REPO_ALREADY_SET) {
+		g_clear_error (&local_error);
+	} else if (local_error != NULL || !gs_plugin_packagekit_results_valid (results, &local_error)) {
+		gs_app_set_state_recover (data->repository);
+		gs_utils_error_add_origin_id (&local_error, data->repository);
+		g_task_return_error (task, g_steal_pointer (&local_error));
+		return;
+	}
+
+	/* state is known */
+	gs_app_set_state (data->repository, GS_APP_STATE_AVAILABLE);
+
+	gs_plugin_repository_changed (GS_PLUGIN (self), data->repository);
+
+	g_task_return_boolean (task, TRUE);
+}
+
+static void
+gs_plugin_packagekit_disable_repository_async (GsPlugin                     *plugin,
+					       GsApp			    *repository,
+                                               GsPluginManageRepositoryFlags flags,
+                                               GCancellable		    *cancellable,
+                                               GAsyncReadyCallback	     callback,
+                                               gpointer			     user_data)
+{
+	g_autoptr(GsPackagekitHelper) helper = NULL;
+	g_autoptr(PkTask) task_disable_repo = NULL;
+	g_autoptr(GTask) task = NULL;
+
+	task = gs_plugin_manage_repository_data_new_task (plugin, repository, flags, cancellable, callback, user_data);
+	g_task_set_source_tag (task, gs_plugin_packagekit_disable_repository_async);
+
+	/* only process this app if was created by this plugin */
+	if (!gs_app_has_management_plugin (repository, plugin)) {
+		g_task_return_boolean (task, TRUE);
+		return;
+	}
+
+	/* is repo */
+	g_assert (gs_app_get_kind (repository) == AS_COMPONENT_KIND_REPOSITORY);
+
+	/* do the call */
+	gs_plugin_status_update (plugin, repository, GS_PLUGIN_STATUS_WAITING);
+	gs_app_set_state (repository, GS_APP_STATE_REMOVING);
+
+	helper = gs_packagekit_helper_new (plugin);
+	gs_packagekit_helper_add_app (helper, repository);
+
+	task_disable_repo = gs_packagekit_task_new (plugin);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_disable_repo), GS_PLUGIN_ACTION_DISABLE_REPO,
+				  (flags & GS_PLUGIN_MANAGE_REPOSITORY_FLAGS_INTERACTIVE) != 0);
+	gs_packagekit_task_take_helper (GS_PACKAGEKIT_TASK (task_disable_repo), helper);
+
+	pk_client_repo_enable_async (PK_CLIENT (task_disable_repo),
+				     gs_app_get_id (repository),
+				     FALSE,
+				     cancellable,
+				     gs_packagekit_helper_cb, g_steal_pointer (&helper),
+				     gs_plugin_packagekit_disable_repository_ready_cb,
+				     g_steal_pointer (&task));
+}
+
+static gboolean
+gs_plugin_packagekit_disable_repository_finish (GsPlugin      *plugin,
+						GAsyncResult  *result,
+						GError       **error)
+{
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+static gboolean
+_download_only (GsPluginPackagekit  *self,
+                GsAppList           *list,
+                GsAppList           *progress_list,
+                GCancellable        *cancellable,
+                GError             **error)
+{
+	GsPlugin *plugin = GS_PLUGIN (self);
+	g_auto(GStrv) package_ids = NULL;
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(PkTask) task_refresh = NULL;
+	g_autoptr(PkPackageSack) sack = NULL;
+	g_autoptr(PkResults) results2 = NULL;
+	g_autoptr(PkResults) results = NULL;
+
+	/* get the list of packages to update */
+	gs_plugin_status_update (plugin, NULL, GS_PLUGIN_STATUS_WAITING);
+
+	/* never refresh the metadata here as this can surprise the frontend if
+	 * we end up downloading a different set of packages than what was
+	 * shown to the user */
+	task_refresh = gs_packagekit_task_new (plugin);
+	pk_task_set_only_download (task_refresh, TRUE);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_refresh), GS_PLUGIN_ACTION_DOWNLOAD, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
+
+	results = pk_client_get_updates (PK_CLIENT (task_refresh),
+					 pk_bitfield_value (PK_FILTER_ENUM_NONE),
+					 cancellable,
+					 gs_packagekit_helper_cb, helper,
+					 error);
+
+	if (!gs_plugin_packagekit_results_valid (results, error)) {
+		return FALSE;
+	}
+
+	/* download all the packages */
+	sack = pk_results_get_package_sack (results);
+	if (pk_package_sack_get_size (sack) == 0)
+		return TRUE;
+	package_ids = pk_package_sack_get_ids (sack);
+	for (guint i = 0; i < gs_app_list_length (list); i++) {
+		GsApp *app = gs_app_list_index (list, i);
+		gs_packagekit_helper_add_app (helper, app);
+	}
+	gs_packagekit_helper_set_progress_list (helper, progress_list);
+
+	/* never refresh the metadata here as this can surprise the frontend if
+	 * we end up downloading a different set of packages than what was
+	 * shown to the user */
+	results2 = pk_task_update_packages_sync (task_refresh,
+						 package_ids,
+						 cancellable,
+						 gs_packagekit_helper_cb, helper,
+						 error);
+
+	gs_app_list_override_progress (progress_list, GS_APP_PROGRESS_UNKNOWN);
+	if (results2 == NULL) {
+		gs_plugin_packagekit_error_convert (error);
+		return FALSE;
+	}
+	if (g_cancellable_set_error_if_cancelled (cancellable, error))
+		return FALSE;
+	for (guint i = 0; i < gs_app_list_length (list); i++) {
+		GsApp *app = gs_app_list_index (list, i);
+		/* To indicate the app is already downloaded */
+		gs_app_set_size_download (app, GS_SIZE_TYPE_VALID, 0);
+	}
+	return TRUE;
+}
+
+static gboolean
+gs_plugin_packagekit_download (GsPlugin *plugin,
+			       GsAppList *list,
+			       GCancellable *cancellable,
+			       GError **error)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (plugin);
+	g_autoptr(GsAppList) list_tmp = gs_app_list_new ();
+	g_autoptr(GError) error_local = NULL;
+	gboolean retval;
+	gpointer schedule_entry_handle = NULL;
+
+	/* add any packages */
+	for (guint i = 0; i < gs_app_list_length (list); i++) {
+		GsApp *app = gs_app_list_index (list, i);
+		GsAppList *related = gs_app_get_related (app);
+
+		/* add this app */
+		if (!gs_app_has_quirk (app, GS_APP_QUIRK_IS_PROXY)) {
+			if (gs_app_has_management_plugin (app, plugin))
+				gs_app_list_add (list_tmp, app);
+			continue;
+		}
+
+		/* add each related app */
+		for (guint j = 0; j < gs_app_list_length (related); j++) {
+			GsApp *app_tmp = gs_app_list_index (related, j);
+			if (gs_app_has_management_plugin (app_tmp, plugin))
+				gs_app_list_add (list_tmp, app_tmp);
+		}
+	}
+
+	if (gs_app_list_length (list_tmp) == 0)
+		return TRUE;
+
+	if (!gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE)) {
+		if (!gs_metered_block_app_list_on_download_scheduler (list_tmp, &schedule_entry_handle, cancellable, &error_local)) {
+			g_warning ("Failed to block on download scheduler: %s",
+				   error_local->message);
+			g_clear_error (&error_local);
+		}
+	}
+
+	retval = _download_only (self, list_tmp, list, cancellable, error);
+
+	if (!gs_metered_remove_from_download_scheduler (schedule_entry_handle, NULL, &error_local))
+		g_warning ("Failed to remove schedule entry: %s", error_local->message);
+
+	if (retval)
+		gs_plugin_updates_changed (plugin);
+
+	return retval;
+}
+
+gboolean
+gs_plugin_download (GsPlugin *plugin,
+                    GsAppList *list,
+                    GCancellable *cancellable,
+                    GError **error)
+{
+	return gs_plugin_packagekit_download (plugin, list, cancellable, error);
+}
+
+static void refresh_metadata_cb (GObject      *source_object,
+                                 GAsyncResult *result,
+                                 gpointer      user_data);
+
+static void
+gs_plugin_packagekit_refresh_metadata_async (GsPlugin                     *plugin,
+                                             guint64                       cache_age_secs,
+                                             GsPluginRefreshMetadataFlags  flags,
+                                             GCancellable                 *cancellable,
+                                             GAsyncReadyCallback           callback,
+                                             gpointer                      user_data)
+{
+	g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin);
+	g_autoptr(GsApp) app_dl = gs_app_new (gs_plugin_get_name (plugin));
+	gboolean interactive = (flags & GS_PLUGIN_REFRESH_METADATA_FLAGS_INTERACTIVE);
+	g_autoptr(GTask) task = NULL;
+	g_autoptr(PkTask) task_refresh = NULL;
+
+	task = g_task_new (plugin, cancellable, callback, user_data);
+	g_task_set_source_tag (task, gs_plugin_packagekit_refresh_metadata_async);
+	g_task_set_task_data (task, g_object_ref (helper), g_object_unref);
+
+	gs_plugin_status_update (plugin, NULL, GS_PLUGIN_STATUS_WAITING);
+	gs_packagekit_helper_set_progress_app (helper, app_dl);
+
+	task_refresh = gs_packagekit_task_new (plugin);
+	pk_task_set_only_download (task_refresh, TRUE);
+	gs_packagekit_task_setup (GS_PACKAGEKIT_TASK (task_refresh), GS_PLUGIN_ACTION_UNKNOWN, interactive);
+	pk_client_set_cache_age (PK_CLIENT (task_refresh), cache_age_secs);
+
+	/* refresh the metadata */
+	pk_client_refresh_cache_async (PK_CLIENT (task_refresh),
+				       FALSE /* force */,
+				       cancellable,
+				       gs_packagekit_helper_cb, helper,
+				       refresh_metadata_cb, g_steal_pointer (&task));
+}
+
+static void
+refresh_metadata_cb (GObject      *source_object,
+                     GAsyncResult *result,
+                     gpointer      user_data)
+{
+	PkClient *client = PK_CLIENT (source_object);
+	g_autoptr(GTask) task = g_steal_pointer (&user_data);
+	GsPlugin *plugin = g_task_get_source_object (task);
+	g_autoptr(PkResults) results = NULL;
+	g_autoptr(GError) local_error = NULL;
+
+	results = pk_client_generic_finish (client, result, &local_error);
+
+	if (!gs_plugin_packagekit_results_valid (results, &local_error)) {
+		g_task_return_error (task, g_steal_pointer (&local_error));
+	} else {
+		gs_plugin_updates_changed (plugin);
+		g_task_return_boolean (task, TRUE);
+	}
+}
+
+static gboolean
+gs_plugin_packagekit_refresh_metadata_finish (GsPlugin      *plugin,
+                                              GAsyncResult  *result,
+                                              GError       **error)
+{
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+#ifdef HAVE_PK_OFFLINE_WITH_FLAGS
+
+static PkOfflineFlags
+gs_systemd_get_offline_flags (GsPlugin *plugin)
+{
+	if (gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE))
+		return PK_OFFLINE_FLAGS_INTERACTIVE;
+	return PK_OFFLINE_FLAGS_NONE;
+}
+
+static gboolean
+gs_systemd_call_trigger (GsPlugin *plugin,
+			 PkOfflineAction action,
+			 GCancellable *cancellable,
+			 GError **error)
+{
+	return pk_offline_trigger_with_flags (action,
+					      gs_systemd_get_offline_flags (plugin),
+					      cancellable, error);
+}
+
+static gboolean
+gs_systemd_call_cancel (GsPlugin *plugin,
+			GCancellable *cancellable,
+			GError **error)
+{
+	return pk_offline_cancel_with_flags (gs_systemd_get_offline_flags (plugin), cancellable, error);
+}
+
+static gboolean
+gs_systemd_call_trigger_upgrade (GsPlugin *plugin,
+				 PkOfflineAction action,
+				 GCancellable *cancellable,
+				 GError **error)
+{
+	return pk_offline_trigger_upgrade_with_flags (action,
+						      gs_systemd_get_offline_flags (plugin),
+						      cancellable, error);
+}
+
+#else /* HAVE_PK_OFFLINE_WITH_FLAGS */
+
+static GDBusCallFlags
+gs_systemd_get_gdbus_call_flags (GsPlugin *plugin)
+{
+	if (gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE))
+		return G_DBUS_CALL_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION;
+	return G_DBUS_CALL_FLAGS_NONE;
+}
+
+static gboolean
+gs_systemd_call_trigger (GsPlugin *plugin,
+			 PkOfflineAction action,
+			 GCancellable *cancellable,
+			 GError **error)
+{
+	const gchar *tmp;
+	g_autoptr(GVariant) res = NULL;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	tmp = pk_offline_action_to_string (action);
+	res = g_dbus_connection_call_sync (gs_plugin_get_system_bus_connection (plugin),
+					   "org.freedesktop.PackageKit",
+					   "/org/freedesktop/PackageKit",
+					   "org.freedesktop.PackageKit.Offline",
+					   "Trigger",
+					   g_variant_new ("(s)", tmp),
+					   NULL,
+					   gs_systemd_get_gdbus_call_flags (plugin),
+					   -1,
+					   cancellable,
+					   error);
+	if (res == NULL)
+		return FALSE;
+	return TRUE;
+}
+
+static gboolean
+gs_systemd_call_cancel (GsPlugin *plugin,
+			GCancellable *cancellable,
+			GError **error)
+{
+	g_autoptr(GVariant) res = NULL;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	res = g_dbus_connection_call_sync (gs_plugin_get_system_bus_connection (plugin),
+					   "org.freedesktop.PackageKit",
+					   "/org/freedesktop/PackageKit",
+					   "org.freedesktop.PackageKit.Offline",
+					   "Cancel",
+					   NULL,
+					   NULL,
+					   gs_systemd_get_gdbus_call_flags (plugin),
+					   -1,
+					   cancellable,
+					   error);
+	if (res == NULL)
+		return FALSE;
+	return TRUE;
+}
+
+static gboolean
+gs_systemd_call_trigger_upgrade (GsPlugin *plugin,
+				 PkOfflineAction action,
+				 GCancellable *cancellable,
+				 GError **error)
+{
+	const gchar *tmp;
+	g_autoptr(GVariant) res = NULL;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	tmp = pk_offline_action_to_string (action);
+	res = g_dbus_connection_call_sync (gs_plugin_get_system_bus_connection (plugin),
+					   "org.freedesktop.PackageKit",
+					   "/org/freedesktop/PackageKit",
+					   "org.freedesktop.PackageKit.Offline",
+					   "TriggerUpgrade",
+					   g_variant_new ("(s)", tmp),
+					   NULL,
+					   gs_systemd_get_gdbus_call_flags (plugin),
+					   -1,
+					   cancellable,
+					   error);
+	if (res == NULL)
+		return FALSE;
+	return TRUE;
+}
+
+#endif /* HAVE_PK_OFFLINE_WITH_FLAGS */
+
+static gboolean
+_systemd_trigger_app (GsPluginPackagekit  *self,
+                      GsApp               *app,
+                      GCancellable        *cancellable,
+                      GError             **error)
+{
+	/* if we can process this online do not require a trigger */
+	if (gs_app_get_state (app) != GS_APP_STATE_UPDATABLE)
+		return TRUE;
+
+	/* only process this app if was created by this plugin */
+	if (!gs_app_has_management_plugin (app, GS_PLUGIN (self)))
+		return TRUE;
+
+	/* already in correct state */
+	if (self->is_triggered)
+		return TRUE;
+
+	/* trigger offline update */
+	if (!gs_systemd_call_trigger (GS_PLUGIN (self), PK_OFFLINE_ACTION_REBOOT, cancellable, error)) {
+		gs_plugin_packagekit_error_convert (error);
+		return FALSE;
+	}
+
+	/* don't rely on the file monitor */
+	gs_plugin_packagekit_refresh_is_triggered (self, cancellable);
+
+	/* success */
+	return TRUE;
+}
+
+gboolean
+gs_plugin_update (GsPlugin *plugin,
+		  GsAppList *list,
+		  GCancellable *cancellable,
+		  GError **error)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (plugin);
+
+	/* any are us? */
+	for (guint i = 0; i < gs_app_list_length (list); i++) {
+		GsApp *app = gs_app_list_index (list, i);
+		GsAppList *related = gs_app_get_related (app);
+
+		/* try to trigger this app */
+		if (!gs_app_has_quirk (app, GS_APP_QUIRK_IS_PROXY)) {
+			if (!_systemd_trigger_app (self, app, cancellable, error))
+				return FALSE;
+			continue;
+		}
+
+		/* try to trigger each related app */
+		for (guint j = 0; j < gs_app_list_length (related); j++) {
+			GsApp *app_tmp = gs_app_list_index (related, j);
+			if (!_systemd_trigger_app (self, app_tmp, cancellable, error))
+				return FALSE;
+		}
+	}
+
+	/* success */
+	return TRUE;
+}
+
+gboolean
+gs_plugin_update_cancel (GsPlugin *plugin,
+			 GsApp *app,
+			 GCancellable *cancellable,
+			 GError **error)
+{
+	GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (plugin);
+
+	/* only process this app if was created by this plugin */
+	if (!gs_app_has_management_plugin (app, plugin))
+		return TRUE;
+
+	/* already in correct state */
+	if (!self->is_triggered)
+		return TRUE;
+
+	/* cancel offline update */
+	if (!gs_systemd_call_cancel (plugin, cancellable, error)) {
+		gs_plugin_packagekit_error_convert (error);
+		return FALSE;
+	}
+
+	/* don't rely on the file monitor */
+	gs_plugin_packagekit_refresh_is_triggered (self, cancellable);
+
+	/* success! */
+	return TRUE;
+}
+
+gboolean
+gs_plugin_app_upgrade_trigger (GsPlugin *plugin,
+                               GsApp *app,
+                               GCancellable *cancellable,
+                               GError **error)
+{
+	/* only process this app if was created by this plugin */
+	if (!gs_app_has_management_plugin (app, plugin))
+		return TRUE;
+
+	if (!gs_systemd_call_trigger_upgrade (plugin, PK_OFFLINE_ACTION_REBOOT, cancellable, error)) {
+		gs_plugin_packagekit_error_convert (error);
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static void
+gs_plugin_packagekit_class_init (GsPluginPackagekitClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GsPluginClass *plugin_class = GS_PLUGIN_CLASS (klass);
+
+	object_class->dispose = gs_plugin_packagekit_dispose;
+	object_class->finalize = gs_plugin_packagekit_finalize;
+
+	plugin_class->setup_async = gs_plugin_packagekit_setup_async;
+	plugin_class->setup_finish = gs_plugin_packagekit_setup_finish;
+	plugin_class->shutdown_async = gs_plugin_packagekit_shutdown_async;
+	plugin_class->shutdown_finish = gs_plugin_packagekit_shutdown_finish;
+	plugin_class->refine_async = gs_plugin_packagekit_refine_async;
+	plugin_class->refine_finish = gs_plugin_packagekit_refine_finish;
+	plugin_class->refresh_metadata_async = gs_plugin_packagekit_refresh_metadata_async;
+	plugin_class->refresh_metadata_finish = gs_plugin_packagekit_refresh_metadata_finish;
+	plugin_class->list_apps_async = gs_plugin_packagekit_list_apps_async;
+	plugin_class->list_apps_finish = gs_plugin_packagekit_list_apps_finish;
+	plugin_class->enable_repository_async = gs_plugin_packagekit_enable_repository_async;
+	plugin_class->enable_repository_finish = gs_plugin_packagekit_enable_repository_finish;
+	plugin_class->disable_repository_async = gs_plugin_packagekit_disable_repository_async;
+	plugin_class->disable_repository_finish = gs_plugin_packagekit_disable_repository_finish;
+}
+
+GType
+gs_plugin_query_type (void)
+{
+	return GS_TYPE_PLUGIN_PACKAGEKIT;
+}
diff --git a/plugins/packagekit/gs-plugin-packagekit.h b/plugins/packagekit/gs-plugin-packagekit.h
new file mode 100644
index 0000000..8b698d0
--- /dev/null
+++ b/plugins/packagekit/gs-plugin-packagekit.h
@@ -0,0 +1,22 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2021 Endless OS Foundation LLC
+ *
+ * Author: Philip Withnall <pwithnall@endlessos.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#pragma once
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GS_TYPE_PLUGIN_PACKAGEKIT (gs_plugin_packagekit_get_type ())
+
+G_DECLARE_FINAL_TYPE (GsPluginPackagekit, gs_plugin_packagekit, GS, PLUGIN_PACKAGEKIT, GsPlugin)
+
+G_END_DECLS
diff --git a/plugins/packagekit/gs-self-test.c b/plugins/packagekit/gs-self-test.c
new file mode 100644
index 0000000..51ae947
--- /dev/null
+++ b/plugins/packagekit/gs-self-test.c
@@ -0,0 +1,275 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2013-2017 Richard Hughes <richard@hughsie.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include "config.h"
+
+#include "gnome-software-private.h"
+
+#include "gs-markdown.h"
+#include "gs-test.h"
+
+static void
+gs_markdown_func (void)
+{
+	gchar *text;
+	const gchar *markdown;
+	const gchar *markdown_expected;
+	g_autoptr(GsMarkdown) md = NULL;
+
+	/* get GsMarkdown object */
+	md = gs_markdown_new (GS_MARKDOWN_OUTPUT_PANGO);
+	g_assert (md);
+
+	markdown = "OEMs\n"
+		   "====\n"
+		   " - Bullett\n";
+	markdown_expected =
+		   "<big>OEMs</big>\n"
+		   "• Bullett";
+	/* markdown (type2 header) */
+	text = gs_markdown_parse (md, markdown);
+	g_assert_cmpstr (text, ==, markdown_expected);
+	g_free (text);
+
+	/* markdown (autocode) */
+	markdown = "this is http://www.hughsie.com/with_spaces_in_url inline link\n";
+	markdown_expected = "this is <tt>http://www.hughsie.com/with_spaces_in_url</tt> inline link";
+	gs_markdown_set_autocode (md, TRUE);
+	text = gs_markdown_parse (md, markdown);
+	g_assert_cmpstr (text, ==, markdown_expected);
+	g_free (text);
+
+	/* markdown some invalid header */
+	markdown = "*** This software is currently in alpha state ***\n";
+	markdown_expected = "<b><i> This software is currently in alpha state </b></i>";
+	text = gs_markdown_parse (md, markdown);
+	g_assert_cmpstr (text, ==, markdown_expected);
+	g_free (text);
+
+	/* markdown (complex1) */
+	markdown = " - This is a *very*\n"
+		   "   short paragraph\n"
+		   "   that is not usual.\n"
+		   " - Another";
+	markdown_expected =
+		   "• This is a <i>very</i> short paragraph that is not usual.\n"
+		   "• Another";
+	text = gs_markdown_parse (md, markdown);
+	g_assert_cmpstr (text, ==, markdown_expected);
+	g_free (text);
+
+	/* markdown (complex1) */
+	markdown = "*  This is a *very*\n"
+		   "   short paragraph\n"
+		   "   that is not usual.\n"
+		   "*  This is the second\n"
+		   "   bullett point.\n"
+		   "*  And the third.\n"
+		   " \n"
+		   "* * *\n"
+		   " \n"
+		   "Paragraph one\n"
+		   "isn't __very__ long at all.\n"
+		   "\n"
+		   "Paragraph two\n"
+		   "isn't much better.";
+	markdown_expected =
+		   "• This is a <i>very</i> short paragraph that is not usual.\n"
+		   "• This is the second bullett point.\n"
+		   "• And the third.\n"
+		   "⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯\n"
+		   "Paragraph one isn&apos;t <b>very</b> long at all.\n"
+		   "Paragraph two isn&apos;t much better.";
+	text = gs_markdown_parse (md, markdown);
+	g_assert_cmpstr (text, ==, markdown_expected);
+	g_free (text);
+
+	markdown = "This is a spec file description or\n"
+		   "an **update** description in bohdi.\n"
+		   "\n"
+		   "* * *\n"
+		   "# Big title #\n"
+		   "\n"
+		   "The *following* things 'were' fixed:\n"
+		   "- Fix `dave`\n"
+		   "* Fubar update because of \"security\"\n";
+	markdown_expected =
+		   "This is a spec file description or an <b>update</b> description in bohdi.\n"
+		   "⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯\n"
+		   "<big>Big title</big>\n"
+		   "The <i>following</i> things 'were' fixed:\n"
+		   "• Fix <tt>dave</tt>\n"
+		   "• Fubar update because of \"security\"";
+	/* markdown (complex2) */
+	text = gs_markdown_parse (md, markdown);
+	if (g_strcmp0 (text, markdown_expected) == 0)
+	g_assert_cmpstr (text, ==, markdown_expected);
+	g_free (text);
+
+	/* markdown (list with spaces) */
+	markdown = "* list seporated with spaces -\n"
+		   "  first item\n"
+		   "\n"
+		   "* second item\n"
+		   "\n"
+		   "* third item\n";
+	markdown_expected =
+		   "• list seporated with spaces - first item\n"
+		   "• second item\n"
+		   "• third item";
+	text = gs_markdown_parse (md, markdown);
+	g_assert_cmpstr (text, ==, markdown_expected);
+	g_free (text);
+
+	gs_markdown_set_max_lines (md, 1);
+
+	/* markdown (one line limit) */
+	markdown = "* list seporated with spaces -\n"
+		   "  first item\n"
+		   "* second item\n";
+	markdown_expected =
+		   "• list seporated with spaces - first item";
+	text = gs_markdown_parse (md, markdown);
+	g_assert_cmpstr (text, ==, markdown_expected);
+	g_free (text);
+
+	gs_markdown_set_max_lines (md, 1);
+
+	/* markdown (escaping) */
+	markdown = "* list & <spaces>";
+	markdown_expected =
+		   "• list &amp; &lt;spaces&gt;";
+	text = gs_markdown_parse (md, markdown);
+	g_assert_cmpstr (text, ==, markdown_expected);
+	g_free (text);
+
+	/* markdown (URLs) */
+	markdown = "this is the http://www.hughsie.com/ coolest site";
+	markdown_expected =
+		   "this is the "
+		   "<a href=\"http://www.hughsie.com/\">http://www.hughsie.com/</a>"
+		   " coolest site";
+	text = gs_markdown_parse (md, markdown);
+	g_assert_cmpstr (text, ==, markdown_expected);
+	g_free (text);
+
+	/* markdown (free text) */
+	gs_markdown_set_escape (md, FALSE);
+	text = gs_markdown_parse (md, "This isn't a present");
+	g_assert_cmpstr (text, ==, "This isn't a present");
+	g_free (text);
+
+	/* markdown (autotext underscore) */
+	text = gs_markdown_parse (md, "This isn't CONFIG_UEVENT_HELPER_PATH present");
+	g_assert_cmpstr (text, ==, "This isn't <tt>CONFIG_UEVENT_HELPER_PATH</tt> present");
+	g_free (text);
+
+	/* markdown (end of bullett) */
+	markdown = "*Thu Mar 12 12:00:00 2009* Dan Walsh <dwalsh@redhat.com> - 2.0.79-1\n"
+		   "- Update to upstream \n"
+		   " * Netlink socket handoff patch from Adam Jackson.\n"
+		   " * AVC caching of compute_create results by Eric Paris.\n"
+		   "\n"
+		   "*Tue Mar 10 12:00:00 2009* Dan Walsh <dwalsh@redhat.com> - 2.0.78-5\n"
+		   "- Add patch from ajax to accellerate X SELinux \n"
+		   "- Update eparis patch\n";
+	markdown_expected =
+		   "<i>Thu Mar 12 12:00:00 2009</i> Dan Walsh <tt>&lt;dwalsh@redhat.com&gt;</tt> - 2.0.79-1\n"
+		   "• Update to upstream\n"
+		   "• Netlink socket handoff patch from Adam Jackson.\n"
+		   "• AVC caching of compute_create results by Eric Paris.\n"
+		   "<i>Tue Mar 10 12:00:00 2009</i> Dan Walsh <tt>&lt;dwalsh@redhat.com&gt;</tt> - 2.0.78-5\n"
+		   "• Add patch from ajax to accellerate X SELinux\n"
+		   "• Update eparis patch";
+	gs_markdown_set_escape (md, TRUE);
+	gs_markdown_set_max_lines (md, 1024);
+	text = gs_markdown_parse (md, markdown);
+	g_assert_cmpstr (text, ==, markdown_expected);
+	g_free (text);
+}
+
+static void
+gs_plugins_packagekit_local_func (GsPluginLoader *plugin_loader)
+{
+	g_autoptr(GsApp) app = NULL;
+	g_autoptr(GError) error = NULL;
+	g_autofree gchar *fn = NULL;
+	g_autoptr(GFile) file = NULL;
+	g_autoptr(GsPluginJob) plugin_job = NULL;
+
+	/* no packagekit, abort */
+	if (!gs_plugin_loader_get_enabled (plugin_loader, "packagekit")) {
+		g_test_skip ("not enabled");
+		return;
+	}
+
+	/* load local file */
+	fn = gs_test_get_filename (TESTDATADIR, "chiron-1.1-1.fc24.x86_64.rpm");
+	g_assert (fn != NULL);
+	file = g_file_new_for_path (fn);
+	plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_FILE_TO_APP,
+					 "file", file,
+					 NULL);
+	app = gs_plugin_loader_job_process_app (plugin_loader, plugin_job, NULL, &error);
+	gs_test_flush_main_context ();
+	if (g_error_matches (error, GS_PLUGIN_ERROR, GS_PLUGIN_ERROR_NOT_SUPPORTED)) {
+		g_test_skip ("rpm files not supported");
+		return;
+	}
+	g_assert_no_error (error);
+	g_assert (app != NULL);
+	g_assert_cmpstr (gs_app_get_source_default (app), ==, "chiron");
+	g_assert_cmpstr (gs_app_get_url (app, AS_URL_KIND_HOMEPAGE), ==, "http://127.0.0.1/");
+	g_assert_cmpstr (gs_app_get_name (app), ==, "chiron");
+	g_assert_cmpstr (gs_app_get_version (app), ==, "1.1-1.fc24");
+	g_assert_cmpstr (gs_app_get_summary (app), ==, "Single line synopsis");
+	g_assert_cmpstr (gs_app_get_description (app), ==,
+			 "This is the first paragraph in the example "
+			 "package spec file.\n\nThis is the second paragraph.");
+}
+
+int
+main (int argc, char **argv)
+{
+	gboolean ret;
+	g_autoptr(GError) error = NULL;
+	g_autoptr(GsPluginLoader) plugin_loader = NULL;
+	const gchar * const allowlist[] = {
+		"packagekit",
+		NULL
+	};
+
+	/* The tests access the system proxy schemas, so pre-load those before
+	 * %G_TEST_OPTION_ISOLATE_DIRS resets the XDG system dirs. */
+	g_settings_schema_source_get_default ();
+
+	gs_test_init (&argc, &argv);
+
+	/* generic tests go here */
+	g_test_add_func ("/gnome-software/markdown", gs_markdown_func);
+
+	/* we can only load this once per process */
+	plugin_loader = gs_plugin_loader_new (NULL, NULL);
+	gs_plugin_loader_add_location (plugin_loader, LOCALPLUGINDIR);
+	ret = gs_plugin_loader_setup (plugin_loader,
+				      allowlist,
+				      NULL,
+				      NULL,
+				      &error);
+	g_assert_no_error (error);
+	g_assert (ret);
+
+	/* plugin tests go here */
+	if (!g_file_test ("/run/ostree-booted", G_FILE_TEST_EXISTS)) {
+		g_test_add_data_func ("/gnome-software/plugins/packagekit/local",
+				      plugin_loader,
+				      (GTestDataFunc) gs_plugins_packagekit_local_func);
+	}
+
+	return g_test_run ();
+}
diff --git a/plugins/packagekit/meson.build b/plugins/packagekit/meson.build
new file mode 100644
index 0000000..8dc2d5d
--- /dev/null
+++ b/plugins/packagekit/meson.build
@@ -0,0 +1,50 @@
+cargs = ['-DG_LOG_DOMAIN="GsPluginPackageKit"']
+cargs += ['-DLOCALPLUGINDIR="' + meson.current_build_dir() + '"']
+deps = [
+  plugin_libs,
+  packagekit,
+]
+
+if get_option('mogwai')
+  deps += [mogwai_schedule_client]
+endif
+
+shared_module(
+  'gs_plugin_packagekit',
+  sources : [
+    'gs-plugin-packagekit.c',
+    'gs-packagekit-helper.c',
+    'gs-packagekit-task.c',
+    'packagekit-common.c',
+    'gs-markdown.c',
+  ],
+  include_directories : [
+    include_directories('../..'),
+    include_directories('../../lib'),
+  ],
+  install : true,
+  install_dir: plugin_dir,
+  c_args : cargs,
+  dependencies : deps,
+)
+
+if get_option('tests')
+  cargs += ['-DTESTDATADIR="' + join_paths(meson.current_source_dir(), 'tests') + '"']
+  e = executable(
+    'gs-self-test-packagekit',
+    compiled_schemas,
+    sources : [
+      'gs-markdown.c',
+      'gs-self-test.c'
+    ],
+    include_directories : [
+      include_directories('../..'),
+      include_directories('../../lib'),
+    ],
+    dependencies : [
+      plugin_libs,
+    ],
+    c_args : cargs,
+  )
+  test('gs-self-test-packagekit', e, suite: ['plugins', 'packagekit'], env: test_env)
+endif
diff --git a/plugins/packagekit/packagekit-common.c b/plugins/packagekit/packagekit-common.c
new file mode 100644
index 0000000..4b6b165
--- /dev/null
+++ b/plugins/packagekit/packagekit-common.c
@@ -0,0 +1,585 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2013 Richard Hughes <richard@hughsie.com>
+ * Copyright (C) 2014-2018 Kalev Lember <klember@redhat.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include "config.h"
+
+#include <packagekit-glib2/packagekit.h>
+
+#include <gnome-software.h>
+
+#include "packagekit-common.h"
+
+GsPluginStatus
+packagekit_status_enum_to_plugin_status (PkStatusEnum status)
+{
+	GsPluginStatus plugin_status = GS_PLUGIN_STATUS_UNKNOWN;
+
+	switch (status) {
+	case PK_STATUS_ENUM_SETUP:
+	case PK_STATUS_ENUM_CANCEL:
+	case PK_STATUS_ENUM_FINISHED:
+	case PK_STATUS_ENUM_UNKNOWN:
+		break;
+	case PK_STATUS_ENUM_WAIT:
+	case PK_STATUS_ENUM_WAITING_FOR_LOCK:
+	case PK_STATUS_ENUM_WAITING_FOR_AUTH:
+		plugin_status = GS_PLUGIN_STATUS_WAITING;
+		break;
+	case PK_STATUS_ENUM_LOADING_CACHE:
+	case PK_STATUS_ENUM_TEST_COMMIT:
+	case PK_STATUS_ENUM_RUNNING:
+	case PK_STATUS_ENUM_SIG_CHECK:
+	case PK_STATUS_ENUM_REFRESH_CACHE:
+		plugin_status = GS_PLUGIN_STATUS_SETUP;
+		break;
+	case PK_STATUS_ENUM_DOWNLOAD:
+	case PK_STATUS_ENUM_DOWNLOAD_REPOSITORY:
+	case PK_STATUS_ENUM_DOWNLOAD_PACKAGELIST:
+	case PK_STATUS_ENUM_DOWNLOAD_FILELIST:
+	case PK_STATUS_ENUM_DOWNLOAD_CHANGELOG:
+	case PK_STATUS_ENUM_DOWNLOAD_GROUP:
+	case PK_STATUS_ENUM_DOWNLOAD_UPDATEINFO:
+		plugin_status = GS_PLUGIN_STATUS_DOWNLOADING;
+		break;
+	case PK_STATUS_ENUM_INSTALL:
+	case PK_STATUS_ENUM_UPDATE:
+		plugin_status = GS_PLUGIN_STATUS_INSTALLING;
+		break;
+	case PK_STATUS_ENUM_CLEANUP:
+	case PK_STATUS_ENUM_REMOVE:
+		plugin_status = GS_PLUGIN_STATUS_REMOVING;
+		break;
+	case PK_STATUS_ENUM_REQUEST:
+	case PK_STATUS_ENUM_QUERY:
+	case PK_STATUS_ENUM_INFO:
+	case PK_STATUS_ENUM_DEP_RESOLVE:
+		plugin_status = GS_PLUGIN_STATUS_QUERYING;
+		break;
+	default:
+		g_warning ("no mapping for %s",
+			   pk_status_enum_to_string (status));
+		break;
+	}
+	return plugin_status;
+}
+
+gboolean
+gs_plugin_packagekit_error_convert (GError **error)
+{
+	GError *error_tmp;
+
+	if (error == NULL)
+		return FALSE;
+
+	if (*error != NULL)
+		g_dbus_error_strip_remote_error (*error);
+
+	/* these are allowed for low-level errors */
+	if (gs_utils_error_convert_gio (error))
+		return TRUE;
+
+	/* not set */
+	error_tmp = *error;
+	if (error_tmp == NULL)
+		return FALSE;
+
+	/* already correct */
+	if (error_tmp->domain == GS_PLUGIN_ERROR)
+		return TRUE;
+
+	/* get a local version */
+	if (error_tmp->domain != PK_CLIENT_ERROR)
+		return FALSE;
+
+	/* daemon errors */
+	if (error_tmp->code <= 0xff) {
+		switch (error_tmp->code) {
+		case PK_CLIENT_ERROR_CANNOT_START_DAEMON:
+		case PK_CLIENT_ERROR_INVALID_FILE:
+		case PK_CLIENT_ERROR_NOT_SUPPORTED:
+			error_tmp->code = GS_PLUGIN_ERROR_NOT_SUPPORTED;
+			break;
+		#if PK_CHECK_VERSION(1, 2, 4)
+		case PK_CLIENT_ERROR_DECLINED_INTERACTION:
+			error_tmp->code = GS_PLUGIN_ERROR_CANCELLED;
+			break;
+		#else
+		case PK_CLIENT_ERROR_FAILED:
+			/* The text is not localized on the PackageKit side and it uses a generic error code
+			 * FIXME: This can be dropped when we depend on a
+			 * PackageKit version which includes https://github.com/PackageKit/PackageKit/pull/497 */
+			if (g_strcmp0 (error_tmp->message, "user declined interaction") == 0)
+				error_tmp->code = GS_PLUGIN_ERROR_CANCELLED;
+			else
+				error_tmp->code = GS_PLUGIN_ERROR_FAILED;
+			break;
+		#endif
+		/* this is working around a bug in libpackagekit-glib */
+		case PK_ERROR_ENUM_TRANSACTION_CANCELLED:
+			error_tmp->code = GS_PLUGIN_ERROR_CANCELLED;
+			break;
+		default:
+			error_tmp->code = GS_PLUGIN_ERROR_FAILED;
+			break;
+		}
+
+	/* backend errors */
+	} else {
+		switch (error_tmp->code - 0xff) {
+		case PK_ERROR_ENUM_INVALID_PACKAGE_FILE:
+		case PK_ERROR_ENUM_NOT_SUPPORTED:
+		case PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED:
+			error_tmp->code = GS_PLUGIN_ERROR_NOT_SUPPORTED;
+			break;
+		case PK_ERROR_ENUM_NO_CACHE:
+		case PK_ERROR_ENUM_NO_NETWORK:
+			error_tmp->code = GS_PLUGIN_ERROR_NO_NETWORK;
+			break;
+		case PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED:
+		case PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY:
+		case PK_ERROR_ENUM_CANNOT_FETCH_SOURCES:
+			error_tmp->code = GS_PLUGIN_ERROR_DOWNLOAD_FAILED;
+			break;
+		case PK_ERROR_ENUM_BAD_GPG_SIGNATURE:
+		case PK_ERROR_ENUM_CANNOT_INSTALL_REPO_UNSIGNED:
+		case PK_ERROR_ENUM_CANNOT_UPDATE_REPO_UNSIGNED:
+		case PK_ERROR_ENUM_GPG_FAILURE:
+		case PK_ERROR_ENUM_MISSING_GPG_SIGNATURE:
+		case PK_ERROR_ENUM_NO_LICENSE_AGREEMENT:
+		case PK_ERROR_ENUM_NOT_AUTHORIZED:
+		case PK_ERROR_ENUM_RESTRICTED_DOWNLOAD:
+			error_tmp->code = GS_PLUGIN_ERROR_NO_SECURITY;
+			break;
+		case PK_ERROR_ENUM_NO_SPACE_ON_DEVICE:
+			error_tmp->code = GS_PLUGIN_ERROR_NO_SPACE;
+			break;
+		case PK_ERROR_ENUM_CANCELLED_PRIORITY:
+		case PK_ERROR_ENUM_TRANSACTION_CANCELLED:
+			error_tmp->code = GS_PLUGIN_ERROR_CANCELLED;
+			break;
+		default:
+			error_tmp->code = GS_PLUGIN_ERROR_FAILED;
+			break;
+		}
+	}
+	error_tmp->domain = GS_PLUGIN_ERROR;
+	return TRUE;
+}
+
+gboolean
+gs_plugin_packagekit_results_valid (PkResults *results, GError **error)
+{
+	g_autoptr(PkError) error_code = NULL;
+
+	/* method failed? */
+	if (results == NULL) {
+		gs_plugin_packagekit_error_convert (error);
+		return FALSE;
+	}
+
+	/* check error code */
+	error_code = pk_results_get_error_code (results);
+	if (error_code != NULL) {
+		g_set_error_literal (error,
+				     PK_CLIENT_ERROR,
+				     pk_error_get_code (error_code),
+				     pk_error_get_details (error_code));
+		gs_plugin_packagekit_error_convert (error);
+		return FALSE;
+	}
+
+	/* all good */
+	return TRUE;
+}
+
+gboolean
+gs_plugin_packagekit_add_results (GsPlugin *plugin,
+				  GsAppList *list,
+				  PkResults *results,
+				  GError **error)
+{
+	const gchar *package_id;
+	guint i;
+	PkPackage *package;
+	g_autoptr(GHashTable) installed = NULL;
+	g_autoptr(PkError) error_code = NULL;
+	g_autoptr(GPtrArray) array_filtered = NULL;
+	g_autoptr(GPtrArray) array = NULL;
+
+	g_return_val_if_fail (GS_IS_PLUGIN (plugin), FALSE);
+	g_return_val_if_fail (GS_IS_APP_LIST (list), FALSE);
+
+	/* check error code */
+	error_code = pk_results_get_error_code (results);
+	if (error_code != NULL) {
+		g_set_error (error,
+			     GS_PLUGIN_ERROR,
+			     GS_PLUGIN_ERROR_INVALID_FORMAT,
+			     "failed to get-packages: %s, %s",
+			     pk_error_enum_to_string (pk_error_get_code (error_code)),
+			     pk_error_get_details (error_code));
+		return FALSE;
+	}
+
+	/* add all installed packages to a hash */
+	installed = g_hash_table_new (g_str_hash, g_str_equal);
+	array = pk_results_get_package_array (results);
+	for (i = 0; i < array->len; i++) {
+		package = g_ptr_array_index (array, i);
+		if (pk_package_get_info (package) != PK_INFO_ENUM_INSTALLED)
+			continue;
+		g_hash_table_insert (installed,
+				     (const gpointer) pk_package_get_name (package),
+				     (const gpointer) pk_package_get_id (package));
+	}
+
+	/* if the search returns more than one package with the same name,
+	 * ignore everything with that name except the installed package */
+	array_filtered = g_ptr_array_new ();
+	for (i = 0; i < array->len; i++) {
+		package = g_ptr_array_index (array, i);
+		package_id = g_hash_table_lookup (installed, pk_package_get_name (package));
+		if (pk_package_get_info (package) == PK_INFO_ENUM_INSTALLED || package_id == NULL) {
+			g_ptr_array_add (array_filtered, package);
+		} else {
+			g_debug ("ignoring available %s as installed %s also reported",
+				 pk_package_get_id (package), package_id);
+		}
+	}
+
+	/* process packages */
+	for (i = 0; i < array_filtered->len; i++) {
+		g_autoptr(GsApp) app = NULL;
+		GsAppState state = GS_APP_STATE_UNKNOWN;
+		package = g_ptr_array_index (array_filtered, i);
+
+		app = gs_plugin_cache_lookup (plugin, pk_package_get_id (package));
+		if (app == NULL) {
+			app = gs_app_new (NULL);
+			gs_plugin_packagekit_set_packaging_format (plugin, app);
+			gs_app_set_management_plugin (app, plugin);
+			gs_app_add_source (app, pk_package_get_name (package));
+			gs_app_add_source_id (app, pk_package_get_id (package));
+			gs_plugin_cache_add (plugin, pk_package_get_id (package), app);
+		}
+		gs_app_set_name (app,
+				 GS_APP_QUALITY_LOWEST,
+				 pk_package_get_name (package));
+		gs_app_set_summary (app,
+				    GS_APP_QUALITY_LOWEST,
+				    pk_package_get_summary (package));
+		gs_app_set_metadata (app, "GnomeSoftware::Creator",
+				     gs_plugin_get_name (plugin));
+		gs_app_set_version (app, pk_package_get_version (package));
+		switch (pk_package_get_info (package)) {
+		case PK_INFO_ENUM_INSTALLED:
+			state = GS_APP_STATE_INSTALLED;
+			break;
+		case PK_INFO_ENUM_AVAILABLE:
+			state = GS_APP_STATE_AVAILABLE;
+			break;
+		case PK_INFO_ENUM_INSTALLING:
+		case PK_INFO_ENUM_UPDATING:
+		case PK_INFO_ENUM_DOWNGRADING:
+		case PK_INFO_ENUM_OBSOLETING:
+		case PK_INFO_ENUM_UNTRUSTED:
+			break;
+		case PK_INFO_ENUM_UNAVAILABLE:
+		case PK_INFO_ENUM_REMOVING:
+			state =  GS_APP_STATE_UNAVAILABLE;
+			break;
+		default:
+			g_warning ("unknown info state of %s",
+				   pk_info_enum_to_string (pk_package_get_info (package)));
+		}
+		if (state != GS_APP_STATE_UNKNOWN && gs_app_get_state (app) == GS_APP_STATE_UNKNOWN)
+			gs_app_set_state (app, state);
+		if (gs_app_get_kind (app) == AS_COMPONENT_KIND_UNKNOWN)
+			gs_app_set_kind (app, AS_COMPONENT_KIND_GENERIC);
+		gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE);
+		gs_app_list_add (list, app);
+	}
+	return TRUE;
+}
+
+void
+gs_plugin_packagekit_resolve_packages_app (GsPlugin *plugin,
+					   GPtrArray *packages,
+					   GsApp *app)
+{
+	GPtrArray *sources;
+	PkPackage *package;
+	const gchar *pkgname;
+	guint i, j;
+	guint number_available = 0;
+	guint number_installed = 0;
+
+	/* find any packages that match the package name */
+	number_installed = 0;
+	number_available = 0;
+	sources = gs_app_get_sources (app);
+	for (j = 0; j < sources->len; j++) {
+		pkgname = g_ptr_array_index (sources, j);
+		for (i = 0; i < packages->len; i++) {
+			package = g_ptr_array_index (packages, i);
+			if (g_strcmp0 (pk_package_get_name (package), pkgname) == 0) {
+				gs_plugin_packagekit_set_metadata_from_package (plugin, app, package);
+				switch (pk_package_get_info (package)) {
+				case PK_INFO_ENUM_INSTALLED:
+					number_installed++;
+					break;
+				case PK_INFO_ENUM_AVAILABLE:
+					number_available++;
+					break;
+				case PK_INFO_ENUM_UNAVAILABLE:
+					number_available++;
+					break;
+				default:
+					/* should we expect anything else? */
+					break;
+				}
+			}
+		}
+	}
+
+	/* if *all* the source packages for the app are installed then the
+	 * application is considered completely installed */
+	if (number_installed == sources->len && number_available == 0) {
+		if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN)
+			gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+	} else if (number_installed + number_available == sources->len) {
+		/* if all the source packages are installed and all the rest
+		 * of the packages are available then the app is available */
+		if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN)
+			gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
+	} else if (number_installed + number_available > sources->len) {
+		/* we have more packages returned than source packages */
+		gs_app_set_state (app, GS_APP_STATE_UNKNOWN);
+		gs_app_set_state (app, GS_APP_STATE_UPDATABLE);
+	} else if (number_installed + number_available < sources->len) {
+		g_autofree gchar *tmp = NULL;
+		/* we have less packages returned than source packages */
+		tmp = gs_app_to_string (app);
+		g_debug ("Failed to find all packages for:\n%s", tmp);
+		gs_app_set_state (app, GS_APP_STATE_UNKNOWN);
+	}
+}
+
+void
+gs_plugin_packagekit_set_metadata_from_package (GsPlugin *plugin,
+                                                GsApp *app,
+                                                PkPackage *package)
+{
+	const gchar *data;
+
+	gs_plugin_packagekit_set_packaging_format (plugin, app);
+	gs_app_set_management_plugin (app, plugin);
+	gs_app_add_source (app, pk_package_get_name (package));
+	gs_app_add_source_id (app, pk_package_get_id (package));
+
+	/* set origin */
+	if (gs_app_get_origin (app) == NULL) {
+		data = pk_package_get_data (package);
+		if (g_str_has_prefix (data, "installed:"))
+			data += 10;
+		gs_app_set_origin (app, data);
+	}
+
+	/* set unavailable state */
+	if (pk_package_get_info (package) == PK_INFO_ENUM_UNAVAILABLE) {
+		gs_app_set_state (app, GS_APP_STATE_UNAVAILABLE);
+		if (gs_app_get_size_installed (app, NULL) == GS_SIZE_TYPE_UNKNOWN)
+			gs_app_set_size_installed (app, GS_SIZE_TYPE_UNKNOWABLE, 0);
+		if (gs_app_get_size_download (app, NULL) == GS_SIZE_TYPE_UNKNOWN)
+			gs_app_set_size_download (app, GS_SIZE_TYPE_UNKNOWABLE, 0);
+	}
+	if (gs_app_get_version (app) == NULL)
+		gs_app_set_version (app, pk_package_get_version (package));
+	gs_app_set_name (app,
+			 GS_APP_QUALITY_LOWEST,
+			 pk_package_get_name (package));
+	gs_app_set_summary (app,
+			    GS_APP_QUALITY_LOWEST,
+			    pk_package_get_summary (package));
+}
+
+/* Hash functions which compare PkPackageIds on NAME, VERSION and ARCH, but not DATA.
+ * This is because some backends do not append the origin.
+ *
+ * Borrowing some implementation details from pk-package-id.c, a package
+ * ID is a semicolon-separated list of NAME;[VERSION];[ARCH];[DATA],
+ * so a comparison which ignores DATA is just a strncmp() up to and
+ * including the final semicolon.
+ *
+ * Doing it this way means zero allocations, which allows the hash and
+ * equality functions to be fast. This is important when dealing with
+ * large refine() package lists.
+ *
+ * The hash and equality functions assume that the IDs they are passed are
+ * valid. */
+static guint
+package_id_hash (gconstpointer key)
+{
+	const gchar *package_id = key;
+	gchar *no_data;
+	gsize i, last_semicolon = 0;
+
+	/* find the last semicolon, which starts the DATA section */
+	for (i = 0; package_id[i] != '\0'; i++) {
+		if (package_id[i] == ';')
+			last_semicolon = i;
+	}
+
+	/* exit early if the DATA section was empty */
+	if (last_semicolon + 1 == i)
+		return g_str_hash (package_id);
+
+	/* extract up to (and including) the last semicolon into a local string */
+	no_data = g_alloca (last_semicolon + 2);
+	memcpy (no_data, package_id, last_semicolon + 1);
+	no_data[last_semicolon + 1] = '\0';
+
+	return g_str_hash (no_data);
+}
+
+static gboolean
+package_id_equal (gconstpointer a,
+                  gconstpointer b)
+{
+	const gchar *package_id_a = a;
+	const gchar *package_id_b = b;
+	gsize i, n_semicolons = 0;
+
+	/* compare up to and including the last semicolon */
+	for (i = 0; package_id_a[i] != '\0' && package_id_b[i] != '\0'; i++) {
+		if (package_id_a[i] != package_id_b[i])
+			return FALSE;
+		if (package_id_a[i] == ';')
+			n_semicolons++;
+		if (n_semicolons == 4)
+			return TRUE;
+	}
+
+	return package_id_a[i] == package_id_b[i];
+}
+
+GHashTable *
+gs_plugin_packagekit_details_array_to_hash (GPtrArray *array)
+{
+	g_autoptr(GHashTable) details_collection = NULL;
+
+	details_collection = g_hash_table_new_full (package_id_hash, package_id_equal,
+						    NULL, NULL);
+
+	for (gsize i = 0; i < array->len; i++) {
+		PkDetails *details = g_ptr_array_index (array, i);
+		g_hash_table_insert (details_collection,
+				     (void *) pk_details_get_package_id (details),
+				     details);
+	}
+
+	return g_steal_pointer (&details_collection);
+}
+
+void
+gs_plugin_packagekit_refine_details_app (GsPlugin *plugin,
+					 GHashTable *details_collection,
+					 GHashTable *prepared_updates,
+					 GsApp *app)
+{
+	GPtrArray *source_ids;
+	PkDetails *details;
+	const gchar *package_id;
+	guint j;
+	guint64 download_size = 0, install_size = 0;
+
+	/* @source_ids can have as many as 200 elements (google-noto); typically
+	 * it has 1 or 2
+	 *
+	 * @details_collection is typically a large list of apps in the
+	 * repository, on the order of 400 or 700 apps */
+	source_ids = gs_app_get_source_ids (app);
+	for (j = 0; j < source_ids->len; j++) {
+		#ifdef HAVE_PK_DETAILS_GET_DOWNLOAD_SIZE
+		guint64 download_sz;
+		#endif
+		package_id = g_ptr_array_index (source_ids, j);
+		details = g_hash_table_lookup (details_collection, package_id);
+		if (details == NULL)
+			continue;
+
+		if (gs_app_get_license (app) == NULL) {
+			g_autofree gchar *license_spdx = NULL;
+			license_spdx = as_license_to_spdx_id (pk_details_get_license (details));
+			if (license_spdx != NULL) {
+				gs_app_set_license (app,
+						    GS_APP_QUALITY_LOWEST,
+						    license_spdx);
+			}
+		}
+		if (gs_app_get_url (app, AS_URL_KIND_HOMEPAGE) == NULL) {
+			gs_app_set_url (app,
+					AS_URL_KIND_HOMEPAGE,
+					pk_details_get_url (details));
+		}
+		if (gs_app_get_description (app) == NULL) {
+			gs_app_set_description (app,
+			                        GS_APP_QUALITY_LOWEST,
+			                        pk_details_get_description (details));
+		}
+		install_size += pk_details_get_size (details);
+		#ifdef HAVE_PK_DETAILS_GET_DOWNLOAD_SIZE
+		download_sz = pk_details_get_download_size (details);
+
+		/* If the package is already prepared as part of an offline
+		 * update, no additional downloads need to be done. */
+		if (download_sz != G_MAXUINT64 &&
+		    !g_hash_table_contains (prepared_updates, package_id))
+			download_size += download_sz;
+		#endif
+	}
+
+	#ifndef HAVE_PK_DETAILS_GET_DOWNLOAD_SIZE
+	download_size = install_size;
+	#endif
+
+	/* the size is the size of all sources */
+	if (gs_app_get_state (app) == GS_APP_STATE_UPDATABLE) {
+		if (install_size > 0 && gs_app_get_size_installed (app, NULL) != GS_SIZE_TYPE_VALID)
+			gs_app_set_size_installed (app, GS_SIZE_TYPE_VALID, install_size);
+		if (download_size > 0 && gs_app_get_size_download (app, NULL) != GS_SIZE_TYPE_VALID)
+			gs_app_set_size_download (app, GS_SIZE_TYPE_VALID, download_size);
+	} else if (gs_app_is_installed (app)) {
+		if (gs_app_get_size_download (app, NULL) != GS_SIZE_TYPE_VALID)
+			gs_app_set_size_download (app, GS_SIZE_TYPE_UNKNOWABLE, 0);
+		if (install_size > 0 && gs_app_get_size_installed (app, NULL) != GS_SIZE_TYPE_VALID)
+			gs_app_set_size_installed (app, GS_SIZE_TYPE_VALID, install_size);
+	} else {
+		if (install_size > 0 && gs_app_get_size_installed (app, NULL) != GS_SIZE_TYPE_VALID)
+			gs_app_set_size_installed (app, GS_SIZE_TYPE_VALID, install_size);
+		if (download_size > 0 && gs_app_get_size_download (app, NULL) != GS_SIZE_TYPE_VALID)
+			gs_app_set_size_download (app, GS_SIZE_TYPE_VALID, download_size);
+	}
+}
+
+void
+gs_plugin_packagekit_set_packaging_format (GsPlugin *plugin, GsApp *app)
+{
+	if (gs_plugin_check_distro_id (plugin, "fedora") ||
+	    gs_plugin_check_distro_id (plugin, "rhel")) {
+		gs_app_set_metadata (app, "GnomeSoftware::PackagingFormat", "RPM");
+	} else if (gs_plugin_check_distro_id (plugin, "debian") ||
+	           gs_plugin_check_distro_id (plugin, "ubuntu")) {
+		gs_app_set_metadata (app, "GnomeSoftware::PackagingFormat", "deb");
+	} else {
+		return;
+	}
+
+	gs_app_set_metadata (app, "GnomeSoftware::PackagingBaseCssColor", "error_color");
+}
diff --git a/plugins/packagekit/packagekit-common.h b/plugins/packagekit/packagekit-common.h
new file mode 100644
index 0000000..6d673bc
--- /dev/null
+++ b/plugins/packagekit/packagekit-common.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * vi:set noexpandtab tabstop=8 shiftwidth=8:
+ *
+ * Copyright (C) 2013 Richard Hughes <richard@hughsie.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#pragma once
+
+#include <glib.h>
+#include <gnome-software.h>
+
+#include <packagekit-glib2/packagekit.h>
+
+G_BEGIN_DECLS
+
+GsPluginStatus 	packagekit_status_enum_to_plugin_status		(PkStatusEnum	 status);
+
+gboolean	gs_plugin_packagekit_add_results		(GsPlugin	*plugin,
+								 GsAppList	*list,
+								 PkResults	*results,
+								 GError		**error);
+gboolean	gs_plugin_packagekit_error_convert		(GError		**error);
+gboolean	gs_plugin_packagekit_results_valid		(PkResults	*results,
+								 GError		**error);
+void		gs_plugin_packagekit_resolve_packages_app	(GsPlugin *plugin,
+								 GPtrArray *packages,
+								 GsApp *app);
+void		gs_plugin_packagekit_set_metadata_from_package	(GsPlugin *plugin,
+								 GsApp *app,
+								 PkPackage *package);
+GHashTable *	gs_plugin_packagekit_details_array_to_hash	(GPtrArray *array);
+void		gs_plugin_packagekit_refine_details_app		(GsPlugin *plugin,
+								 GHashTable *details_collection,
+								 GHashTable *prepared_updates,
+								 GsApp *app);
+void		gs_plugin_packagekit_set_packaging_format	(GsPlugin *plugin,
+								 GsApp *app);
+
+G_END_DECLS
diff --git a/plugins/packagekit/tests/build-rpm.sh b/plugins/packagekit/tests/build-rpm.sh
new file mode 100755
index 0000000..90a4163
--- /dev/null
+++ b/plugins/packagekit/tests/build-rpm.sh
@@ -0,0 +1,2 @@
+rpmbuild -ba chiron.spec
+cp ~/rpmbuild/RPMS/*/chiron*.rpm .
diff --git a/plugins/packagekit/tests/chiron-1.1-1.fc24.x86_64.rpm b/plugins/packagekit/tests/chiron-1.1-1.fc24.x86_64.rpm
new file mode 100644
index 0000000..1453f48
Binary files /dev/null and b/plugins/packagekit/tests/chiron-1.1-1.fc24.x86_64.rpm differ
diff --git a/plugins/packagekit/tests/chiron.spec b/plugins/packagekit/tests/chiron.spec
new file mode 100644
index 0000000..6cbba7e
--- /dev/null
+++ b/plugins/packagekit/tests/chiron.spec
@@ -0,0 +1,22 @@
+Summary:	Single line synopsis
+Name:		chiron
+Version:	1.1
+Release:	1%{?dist}
+URL:		http://127.0.0.1/
+License:	GPLv2+
+
+%description
+This is the first paragraph in the example package spec file.
+
+This is the second paragraph.
+
+%install
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+touch $RPM_BUILD_ROOT/%{_bindir}/chiron
+
+%files
+%{_bindir}/chiron
+
+%changelog
+* Tue Apr 26 2016 Richard Hughes <richard@hughsie.com> - 1.1-1
+- Initial version
-- 
cgit v1.2.3