From 507c1cf7524c5f4a92ff0ed9126bb6d977d79020 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 30 Sep 2019 13:56:51 +0200 Subject: New upstream version 1.20.4 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dcf2abbb..f487da44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (1.20.4-1) UNRELEASED; urgency=medium + + * New upstream version 1.20.4 + + -- Michael Biebl Mon, 30 Sep 2019 13:56:48 +0200 + network-manager (1.20.2-1) unstable; urgency=medium * New upstream version 1.20.2 -- cgit 1.3.0-6-gf8a5 From 92d4b8caa87046b37eaafa7561580740da507c59 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Sat, 31 Aug 2019 11:18:10 +0200 Subject: 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 --- debian/control | 4 ++-- debian/rules | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 6b119f5f..9f9b4aaf 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,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, @@ -38,7 +38,7 @@ Build-Depends: debhelper-compat (= 12), libbluetooth-dev (>= 5), valac (>= 0.17.1.24), dbus , - python-dbus + python3-dbus Standards-Version: 4.3.0 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/utopia-team/network-manager.git diff --git a/debian/rules b/debian/rules index 9b5d2eb2..e58592f0 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,8 @@ include /usr/share/dpkg/architecture.mk +export PYTHON=/usr/bin/python3 + PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir) %: -- cgit 1.3.0-6-gf8a5 From 803475e5f6a684308a9bbff97b1567ab04f7c8b1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 30 Sep 2019 16:02:03 +0200 Subject: Release version 1.20.4-1 to unstable --- debian/changelog | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f487da44..b10f4c9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,17 @@ -network-manager (1.20.4-1) UNRELEASED; urgency=medium +network-manager (1.20.4-1) unstable; urgency=medium + [ Michael Biebl ] * New upstream version 1.20.4 - -- Michael Biebl Mon, 30 Sep 2019 13:56:48 +0200 + [ 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 Mon, 30 Sep 2019 16:01:19 +0200 network-manager (1.20.2-1) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From 6917e28d2d16138d6d497dc96efafe573b4b0979 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 4 Oct 2019 00:23:38 +0200 Subject: 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. --- debian/network-manager.dirs | 10 ---------- debian/network-manager.install | 8 +++----- debian/network-manager.postinst | 3 +++ 3 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 debian/network-manager.dirs (limited to 'debian') 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 0f1e82ae..3f94d7a4 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 0f95087f..ee139d90 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -24,6 +24,9 @@ case "$1" in # org.freedesktop.NetworkManager.settings.modify.system without prior authentication addgroup --quiet --system netdev + # 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/^/- /'` -- cgit 1.3.0-6-gf8a5 From 1bb932872185da9c2619bbf2a2d1a8a710e27aba Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 4 Oct 2019 00:26:28 +0200 Subject: Fix permissions of /var/lib/NetworkManager/secret_key on upgrades The file mode is supposed to be 0600. Closes: #941609 --- debian/network-manager.postinst | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index ee139d90..f62edf2a 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -47,6 +47,12 @@ case "$1" in ln -sf /run/NetworkManager/resolv.conf /etc/resolv.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) -- cgit 1.3.0-6-gf8a5 From 790e3946f0274a272fdda4d8697ce31a757a48d2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 4 Oct 2019 00:31:01 +0200 Subject: Release version 1.20.4-2 to unstable --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b10f4c9c..96d20bec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +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 Fri, 04 Oct 2019 00:30:01 +0200 + network-manager (1.20.4-1) unstable; urgency=medium [ Michael Biebl ] -- cgit 1.3.0-6-gf8a5