Merge remote-tracking branch 'salsa/master'

6 files changed, 44 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 85d0434b..1e747f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,36 @@
-network-manager (1.20.2-1ubuntu1) eoan; urgency=medium
+network-manager (1.20.4-2ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream version, merged from Debian
-    - Don't ask wpa_supplicant to attempt to enable FT if the interface
-      doesn't support it.
 
  -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 11 Sep 2019 11:16:12 +0200
 
+network-manager (1.20.4-2) unstable; urgency=medium
+
+  * Install directories as created by upstream build system.
+    Drop network-manager.dirs and instead use the directories created by the
+    upstream build system. Fix permissions of /var/lib/NetworkManager to be
+    0700 as it contains possibly sensitive data and should not be
+    world-readable.
+  * Fix permissions of /var/lib/NetworkManager/secret_key on upgrades.
+    The file mode is supposed to be 0600. (Closes: #941609)
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 04 Oct 2019 00:30:01 +0200
+
+network-manager (1.20.4-1) unstable; urgency=medium
+
+  [ Michael Biebl ]
+  * New upstream version 1.20.4
+
+  [ Andreas Henriksson ]
+  * Switch build-dependencies to python3.
+    The tests are designed to work with either python2 or python3.
+    We should be able to simply switch build-dependencies to python3
+    equivalents. However if something transitively pulls in python2 the
+    AM_PATH_PYTHON autoconf macro will find python(2) binary, so we
+    explicitly set PYTHON=/usr/bin/python3. (Closes: #938944)
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 30 Sep 2019 16:01:19 +0200
+
 network-manager (1.20.2-1) unstable; urgency=medium
 
   * New upstream version 1.20.2
diff --git a/debian/control b/debian/control
index 7d0fc53c..4c1b690f 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: debhelper-compat (= 12),
                libudev-dev (>= 175),
                libgirepository1.0-dev (>= 0.10.7-1~),
                gobject-introspection (>= 0.9.12-4~),
-               python-gi,
+               python3-gi,
                libpsl-dev (>= 0.1),
                libcurl4-gnutls-dev (>= 7.24.0),
                gtk-doc-tools,
@@ -39,7 +39,7 @@ Build-Depends: debhelper-compat (= 12),
                libbluetooth-dev (>= 5),
                valac (>= 0.17.1.24),
                dbus <!nocheck>,
-               python-dbus <!nocheck>
+               python3-dbus <!nocheck>
 Standards-Version: 4.3.0
 Rules-Requires-Root: no
 XS-Debian-Vcs-Git: https://salsa.debian.org/utopia-team/network-manager.git
diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs
deleted file mode 100644
index e09403be..00000000
--- a/debian/network-manager.dirs
+++ /dev/null
@@ -1,10 +0,0 @@
-etc/NetworkManager/conf.d/
-etc/NetworkManager/dispatcher.d/no-wait.d/
-etc/NetworkManager/dispatcher.d/pre-down.d/
-etc/NetworkManager/dispatcher.d/pre-up.d/
-etc/NetworkManager/dnsmasq.d/
-etc/NetworkManager/dnsmasq-shared.d/
-etc/NetworkManager/system-connections/
-usr/lib/NetworkManager/conf.d/
-usr/lib/NetworkManager/VPN/
-var/lib/NetworkManager/
diff --git a/debian/network-manager.install b/debian/network-manager.install
index 4873679f..526f3d6f 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -2,10 +2,7 @@ usr/sbin/NetworkManager
 usr/bin/nm-online
 usr/bin/nmcli
 usr/bin/nmtui*
-usr/lib/NetworkManager/nm-dhcp-helper
-usr/lib/NetworkManager/nm-iface-helper
-usr/lib/NetworkManager/nm-dispatcher
-usr/lib/NetworkManager/nm-initrd-generator
+usr/lib/NetworkManager/
 usr/lib/*/NetworkManager/*/libnm-settings-plugin-ifupdown.so
 usr/lib/*/NetworkManager/*/libnm-device-plugin-*.so
 usr/lib/*/NetworkManager/*/libnm-ppp-plugin.so
@@ -18,7 +15,8 @@ usr/share/dbus-1/system.d/org.freedesktop.NetworkManager.conf
 usr/share/dbus-1/system.d/nm-dispatcher.conf
 usr/share/polkit-1/
 usr/share/bash-completion/
-etc/NetworkManager/dispatcher.d/
+etc/NetworkManager/
+var/lib/NetworkManager/
 lib/udev/rules.d/*.rules
 lib/systemd/system/NetworkManager.service
 lib/systemd/system/NetworkManager-dispatcher.service
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst
index e4fb2981..a4ea9a21 100644
--- a/debian/network-manager.postinst
+++ b/debian/network-manager.postinst
@@ -31,6 +31,9 @@ case "$1" in
             invoke-rc.d dbus force-reload || true
         fi
 
+        # This directory can contain sensitive data and should not be world-readable
+        chmod 0700 /var/lib/NetworkManager
+
         NIF=/etc/network/interfaces
         if [ -z "$2" ] && [ -f $NIF ]; then
             ifaces=`grep -v '^#' $NIF | awk '/iface/ {print $2}' | sort -u | sed -e 's/lo//' -e '/^$/d' -e 's/^/- /'`
@@ -60,6 +63,12 @@ case "$1" in
 			touch /etc/NetworkManager/conf.d/10-globally-managed-devices.conf
 		fi
 	fi
+
+        if dpkg --compare-versions "$2" lt-nl "1.20.4-2"; then
+            if [ -f /var/lib/NetworkManager/secret_key ]; then
+                chmod 0600 /var/lib/NetworkManager/secret_key
+            fi
+        fi
         ;;
 
     abort-upgrade|abort-deconfigure|abort-remove)
diff --git a/debian/rules b/debian/rules
index e9eb4f93..98e08c1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ include /usr/share/dpkg/architecture.mk
 LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')
 export LDFLAGS
 
+export PYTHON=/usr/bin/python3
+
 PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir)
 
 %: