Merge lp:~azzar1/update-notifier/livepatch-notification into lp:update-notifier/ubuntu

[Andrea Azzarone]

Show livepatch notifications using update-notifier.

[lp:~azzar1/update-notifier/livepatch-notification]

917. By Andrea Azzarone on 2017-08-22

Fix debian/update-notifier.install

918. By Andrea Azzarone on 2017-08-22

Trigger the notification on EVENT=create too.

[Sebastien Bacher (seb128)]

Thank you for your work, it looks good, one minor comment though
_("A LivePatch update
and
_("Canonical Livepatch"

shouldn't the spelling of Live(pP)atch be consistent between those strings?

review: Needs Information

[lp:~azzar1/update-notifier/livepatch-notification]

919. By Andrea Azzarone on 2017-08-22

LivePatch -> Livepatch

[Andrea Azzarone (azzar1)]

> Thank you for your work, it looks good, one minor comment though
> _("A LivePatch update
> and
> _("Canonical Livepatch"
>
> shouldn't the spelling of Live(pP)atch be consistent between those strings?

Fixed

[lp:~azzar1/update-notifier/livepatch-notification]

920. By Andrea Azzarone on 2017-08-22

Add "usr/bin/livepatch-notification usr/lib/update-notifier/" to update-notifier.install

921. By Andrea Azzarone on 2017-08-22

Fix path to status file in systemd and upstart file.

[Brian Murray (brian-murray)]

I've only taken a brief look at this but did not some inconsistencies between LivePatch and Livepatch.

review: Needs Fixing

[lp:~azzar1/update-notifier/livepatch-notification]

922. By Andrea Azzarone on 2017-08-23

LivePatch -> livepatch in sysmted and upstart files too.

[Andrea Azzarone (azzar1)]

> I've only taken a brief look at this but did not some inconsistencies between
> LivePatch and Livepatch.

Fixed.

[Brian Murray (brian-murray)]

In Artful we are working on removing upstart jobs from packages and given that this merge proposal is against trunk / artful I don't think the upstart job should included.

If there is a desire to get livepatch support in update-notifier into Ubuntu 16.04 the upstart job doesn't also need to exist in Artful (I say this as an SRU team member).

review: Needs Fixing

[lp:~azzar1/update-notifier/livepatch-notification]

923. By Andrea Azzarone on 2017-08-24

Remove upstart jobs conf files.

[Andrea Azzarone (azzar1)]

> In Artful we are working on removing upstart jobs from packages and given that
> this merge proposal is against trunk / artful I don't think the upstart job
> should included.
>
> If there is a desire to get livepatch support in update-notifier into Ubuntu
> 16.04 the upstart job doesn't also need to exist in Artful (I say this as an
> SRU team member).

Fixed.

=== added file 'debian/systemd/update-notifier-livepatch.path'
--- debian/systemd/update-notifier-livepatch.path	1970-01-01 00:00:00 +0000
+++ debian/systemd/update-notifier-livepatch.path	2017-08-24 10:15:37 +0000
@@ -0,0 +1,6 @@
+[Unit]
+Description=Path trigger for Livepatch status notifications
+PartOf=graphical-session.target
+
+[Path]
+PathChanged=/var/snap/canonical-livepatch/current/status

=== added file 'debian/systemd/update-notifier-livepatch.service'
--- debian/systemd/update-notifier-livepatch.service	1970-01-01 00:00:00 +0000
+++ debian/systemd/update-notifier-livepatch.service	2017-08-24 10:15:37 +0000
@@ -0,0 +1,6 @@
+[Unit]
+Description=Livepatch status notification
+
+[Service]
+ExecStart=/usr/lib/update-notifier/livepatch-notification
+Type=oneshot

=== modified file 'debian/update-notifier.install'
--- debian/update-notifier.install	2016-07-20 15:49:04 +0000
+++ debian/update-notifier.install	2017-08-24 10:15:37 +0000
@@ -8,6 +8,7 @@
 usr/share/GConf/gsettings/update-notifier.convert
 usr/bin/update-notifier
 usr/bin/distro-cd-updater usr/lib/update-notifier/
+usr/bin/livepatch-notification usr/lib/update-notifier/
 usr/bin/local-avahi-notification usr/lib/update-notifier/
 usr/bin/system-crash-notification usr/lib/update-notifier/
 # upstart jobs
@@ -24,6 +25,8 @@
 debian/systemd/unicast-local-avahi.service usr/lib/systemd/user
 debian/systemd/update-notifier-release.path usr/lib/systemd/user
 debian/systemd/update-notifier-release.service usr/lib/systemd/user
+debian/systemd/update-notifier-livepatch.path usr/lib/systemd/user
+debian/systemd/update-notifier-livepatch.service usr/lib/systemd/user
 # disable upstart job under systemd sessions
 debian/systemd/unicast-local-avahi.override usr/share/upstart/systemd-session/upstart/
 debian/systemd/update-notifier-crash.override usr/share/upstart/systemd-session/upstart/

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-06-04 17:06:19 +0000
+++ po/POTFILES.in	2017-08-24 10:15:37 +0000
@@ -10,6 +10,7 @@
 src/avahi.c
 src/cdroms.c
 src/hooks.c
+src/livepatch.c
 src/update.c
 src/update-notifier.c
 [type: gettext/glade]ui/hooks-dialog.ui

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-06-03 22:40:21 +0000
+++ src/Makefile.am	2017-08-24 10:15:37 +0000
@@ -10,7 +10,8 @@
 bin_PROGRAMS = update-notifier \
 		distro-cd-updater \
                 local-avahi-notification \
-                system-crash-notification
+                system-crash-notification \
+                livepatch-notification
 
 
 
@@ -39,6 +40,8 @@
 system_crash_notification_SOURCES = system-crash.c\
 			             system-crash.h
 
+livepatch_notification_SOURCES = livepatch.c
+
 update_notifier_LDADD = $(PACKAGE_LIBS) $(INTLLIBS) $(APP_INDICATOR_LIBS)
 update_notifier_LDFLAGS = -export-dynamic
 
@@ -47,3 +50,5 @@
 local_avahi_notification_LDADD = $(PACKAGE_LIBS) $(INTLLIBS)
 
 system_crash_notification_LDADD = $(PACKAGE_LIBS) $(INTLLIBS)
+
+livepatch_notification_LDADD = $(PACKAGE_LIBS) $(INTLLIBS)

=== added file 'src/livepatch.c'
--- src/livepatch.c	1970-01-01 00:00:00 +0000
+++ src/livepatch.c	2017-08-24 10:15:37 +0000
@@ -0,0 +1,93 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib.h>
+#include <libnotify/notify.h>
+#include <stdlib.h>
+
+#include "update-notifier.h"
+
+#define STATUS_PATH "/var/snap/canonical-livepatch/current/status"
+
+static void
+init_notification ()
+{
+    notify_init ("update-notifier");
+}
+
+static void
+init_gettext ()
+{
+    setlocale (LC_ALL, "");
+    bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+    textdomain (GETTEXT_PACKAGE);
+}
+
+static void
+show_notification (const char *summary, const char *body, const char *icon)
+{
+    NotifyNotification *n = notify_notification_new (summary, body, icon);
+    notify_notification_set_timeout (n, 60000);
+    notify_notification_show (n, NULL);
+    g_object_unref (n);
+}
+
+static void
+get_event_from_file (const char* filename, char **event, char **description)
+{
+    g_autofree gchar *content = NULL;
+
+    g_return_if_fail (filename != NULL);
+    g_return_if_fail (event != NULL);
+    g_return_if_fail (description != NULL);
+
+    *event = *description = NULL;
+
+    g_file_get_contents (filename, &content, NULL, NULL);
+
+    if (content) {
+        gchar **strings = g_strsplit (content, " ", 2);
+
+        if (g_strv_length (strings) > 0)
+            *event = g_strdup (g_strstrip (strings[0]));
+        if (g_strv_length (strings) > 1)
+            *description = g_strdup (g_strstrip (strings[1]));
+
+        g_strfreev (strings);
+    }
+}
+
+static void
+show_status_notification ()
+{
+    if (g_file_test (STATUS_PATH, G_FILE_TEST_EXISTS))
+    {
+        g_autofree gchar *event, *description;
+        get_event_from_file (STATUS_PATH, &event, &description);
+
+        if (!g_strcmp0 (event, "applied")) {
+            g_autofree gchar *body = NULL;
+
+            if (!g_strcmp0 (description, "1")) {
+                body = g_strdup_printf (_("A Livepatch update has been sucessfully applied"));
+            } else {
+                body = g_strdup_printf (_("%s Livepatch updates have been sucessfully applied"), description);
+            }
+
+            show_notification (_("Canonical Livepatch"), body, NULL);
+        }
+    }
+}
+
+int
+main (int argc, char **argv)
+{
+    init_notification ();
+    init_gettext ();
+
+    show_status_notification ();
+
+    return EXIT_SUCCESS;
+}