Merge lp:~rbalint/update-notifier/updates-available-world-readable into lp:update-notifier/ubuntu

[Balint Reczey]

[Julian Andres Klode (juliank)]

lgtm, octal modes are a bit hard to read, but ok, whatevs.

review: Approve

[Balint Reczey (rbalint)]

fixed to +r

[lp:~rbalint/update-notifier/updates-available-world-readable]

978. By Balint Reczey on 2019-09-20

Make /var/lib/update-notifier/updates-available world-readable

LP: #1844704

979. By Balint Reczey on 2019-09-20

Update changelog

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2017-09-29 14:37:12 +0000
+++ data/Makefile.am	2019-09-20 12:40:30 +0000
@@ -16,7 +16,7 @@
 helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot update-motd-hwe-eol backend_helper.py package-data-downloader package-system-locked
 
 notifydir = $(datadir)/update-notifier
-notify_SCRIPTS = notify-reboot-required
+notify_SCRIPTS = notify-reboot-required notify-updates-outdated
 notify_in_files = package-data-downloads-failed.in package-data-downloads-failed-permanently.in
 notify_DATA = $(notify_in_files:.in=)
 

=== added file 'data/notify-updates-outdated'
--- data/notify-updates-outdated	1970-01-01 00:00:00 +0000
+++ data/notify-updates-outdated	2019-09-20 12:40:30 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# we do not include ". gettext.sh" here because:
+# a) it breaks if its not available
+# b) the string we have here does not need it (because it has no vars)
+eval_gettext() {
+    if [ -x /usr/bin/gettext ]; then
+        echo $(gettext "$1")
+    else
+        echo "$1"
+    fi
+}
+export TEXTDOMAIN=update-notifier
+export TEXTDOMAINDIR=/usr/share/locale
+
+# Print the message
+echo ""
+eval_gettext "The list of available updates is more than a week old."
+eval_gettext "To check for new updates run: sudo apt update"

=== modified file 'data/update-motd-updates-available'
--- data/update-motd-updates-available	2016-04-04 21:56:09 +0000
+++ data/update-motd-updates-available	2019-09-20 12:40:30 +0000
@@ -56,4 +56,5 @@
         echo ""
     } > "$tmpfile"
     mv "$tmpfile" "$stamp"
+    chmod +r "$stamp"
 fi

=== modified file 'debian/90-updates-available'
--- debian/90-updates-available	2015-11-13 11:18:56 +0000
+++ debian/90-updates-available	2019-09-20 12:40:30 +0000
@@ -3,3 +3,5 @@
 stamp="/var/lib/update-notifier/updates-available"
 
 [ ! -r "$stamp" ] || cat "$stamp"
+
+find $stamp -newermt 'now-7 days' 2> /dev/null | grep -q -m 1 '.' || /usr/share/update-notifier/notify-updates-outdated

=== modified file 'debian/changelog'
--- debian/changelog	2019-09-11 15:29:50 +0000
+++ debian/changelog	2019-09-20 12:40:30 +0000
@@ -1,3 +1,11 @@
+update-notifier (3.192.27) UNRELEASED; urgency=medium
+
+  * Notify user about stale updates information in motd (LP: #1842159)
+  * Make /var/lib/update-notifier/updates-available world-readable
+    (LP: #1844704)
+
+ -- Balint Reczey <[e-mail]>  Thu, 19 Sep 2019 17:57:46 +0200
+
 update-notifier (3.192.26) eoan; urgency=medium
 
   * data/apt_check.py: modify wording and output regarding ESM support.

=== modified file 'debian/update-notifier-common.install'
--- debian/update-notifier-common.install	2016-08-05 22:00:54 +0000
+++ debian/update-notifier-common.install	2019-09-20 12:40:30 +0000
@@ -8,6 +8,7 @@
 debian/98-fsck-at-reboot etc/update-motd.d
 usr/share/polkit-1/actions/com.ubuntu.update-notifier.policy
 usr/share/update-notifier/notify-reboot-required
+usr/share/update-notifier/notify-updates-outdated
 usr/share/update-notifier/package-data-downloads-failed
 usr/share/update-notifier/package-data-downloads-failed-permanently
 usr/lib/update-notifier/

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2019-03-12 15:10:45 +0000
+++ po/POTFILES.in	2019-09-20 12:40:30 +0000
@@ -3,6 +3,7 @@
 # *grumpf* [type=] does not work because intltool-update does not
 # know about anything but the types available in intltool-extract --help
 [type=gettext/Shell] data/notify-reboot-required
+[type=gettext/Shell] data/notify-updates-outdated
 data/apt_check.py
 data/apt-cdrom-check
 data/cddistupgrader