Merge changes from master branch.

* Don't make NetworkManager D-Bus activatable. If the daemon has been
  stopped manually, we don't want it to be autostarted by client requests.
  (Closes: #760998)
* Don't block network.target on NetworkManager-wait-online.service. While at
  it, add a few other minor fixes like the addition of Documentation or
  RemainAfterExit=yes.

5 files changed, 131 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 9748239b..8a01796f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (1.0.0-4) UNRELEASED; urgency=medium
+
+  * Merge changes from master branch.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 31 Mar 2015 07:19:49 +0200
+
 network-manager (1.0.0-3) experimental; urgency=medium
 
   * Add strictly versioned Depends on libnm0 to libnm-dev.
@@ -29,6 +35,26 @@ network-manager (1.0.0-1) experimental; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Fri, 23 Jan 2015 21:26:50 +0100
 
+network-manager (0.9.10.0-7) unstable; urgency=medium
+
+  * Don't make NetworkManager D-Bus activatable. If the daemon has been
+    stopped manually, we don't want it to be autostarted by client requests.
+    (Closes: #760998)
+  * Don't block network.target on NetworkManager-wait-online.service. While at
+    it, add a few other minor fixes like the addition of Documentation or
+    RemainAfterExit=yes.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 31 Mar 2015 07:06:07 +0200
+
+network-manager (0.9.10.0-6) unstable; urgency=medium
+
+  * Detect at runtime whether to start ModemManager. When not running under
+    systemd, start ModemManager via dbus activation. (Closes: #770871)
+  * Do not assert when a device is enslaved externally. Fixes crash when
+    running something like 'brctl addif br0 eth0'. (Closes: #773216)
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 09 Feb 2015 02:29:46 +0100
+
 network-manager (0.9.10.0-5) unstable; urgency=medium
 
   * Cherry-pick upstream commit which prevents breaking PtP TUN interfaces by
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst
index 62aadf1e..61916284 100644
--- a/debian/network-manager.preinst
+++ b/debian/network-manager.preinst
@@ -25,6 +25,12 @@ case "$1" in
 	    fi
 	fi
 
+	if dpkg --compare-versions "$2" lt "0.9.10.0-7"; then
+	    if [ -L /etc/systemd/system/dbus-org.freedesktop.NetworkManager.service ]; then
+	        rm -f /etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
+	    fi
+	fi
+
 	# Upgrade from previous versions
 	if dpkg --compare-versions "$2" lt "0.9.7.997-2"; then
 	    # Move old pid file to /var/run/NetworkManager so the init script
diff --git a/debian/patches/0011-Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/0011-Don-t-make-NetworkManager-D-Bus-activatable.patch
new file mode 100644
index 00000000..ce028367
--- /dev/null
+++ b/debian/patches/0011-Don-t-make-NetworkManager-D-Bus-activatable.patch
@@ -0,0 +1,40 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Sun, 29 Mar 2015 22:57:50 +0200
+Subject: Don't make NetworkManager D-Bus activatable
+
+If the NetworkManager daemon has been stopped manually we don't want it
+to be autostarted by a client request.
+---
+ data/Makefile.am               | 7 -------
+ data/NetworkManager.service.in | 1 -
+ 2 files changed, 8 deletions(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index e91361a..a7c8070 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -19,13 +19,6 @@ endif
+ NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in
+ 	$(edit) $< >$@
+ 
+-servicedir = $(datadir)/dbus-1/system-services
+-service_in_files = org.freedesktop.NetworkManager.service.in
+-service_DATA = $(service_in_files:.service.in=.service)
+-
+-$(service_DATA): $(service_in_files) Makefile
+-	$(edit) $< >$@
+-
+ install-exec-local:
+ 	install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
+ 	ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
+diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
+index 1883b40..5282e5b 100644
+--- a/data/NetworkManager.service.in
++++ b/data/NetworkManager.service.in
+@@ -11,6 +11,5 @@ KillMode=process
+ 
+ [Install]
+ WantedBy=multi-user.target
+-Alias=dbus-org.freedesktop.NetworkManager.service
+ Also=NetworkManager-dispatcher.service
+ 
diff --git a/debian/patches/0012-Don-t-block-network.target-on-NetworkManager-wait-on.patch b/debian/patches/0012-Don-t-block-network.target-on-NetworkManager-wait-on.patch
new file mode 100644
index 00000000..1ddb666d
--- /dev/null
+++ b/debian/patches/0012-Don-t-block-network.target-on-NetworkManager-wait-on.patch
@@ -0,0 +1,57 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Sun, 29 Mar 2015 22:58:43 +0200
+Subject: Don't block network.target on NetworkManager-wait-online.service
+
+network.target is supposed to be a passive unit which is pulled in my
+the network management service.
+
+Also, we want NetworkManager-wait-online.service be hooked up in
+network-online.target, not multi-user.target.
+
+While at it, add a few other smaller fixes, like the addition of
+Documentation= and RemainAfterExit=yes
+
+http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
+https://bugzilla.gnome.org/show_bug.cgi?id=746039
+---
+ data/Makefile.am                           | 4 ----
+ data/NetworkManager-wait-online.service.in | 7 ++++---
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index a7c8070..60443bf 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -18,10 +18,6 @@ endif
+ 
+ NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in
+ 	$(edit) $< >$@
+-
+-install-exec-local:
+-	install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
+-	ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
+ endif
+ 
+ examplesdir = $(docdir)/examples
+diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in
+index 6ad6942..1753d20 100644
+--- a/data/NetworkManager-wait-online.service.in
++++ b/data/NetworkManager-wait-online.service.in
+@@ -1,13 +1,14 @@
+ [Unit]
+ Description=Network Manager Wait Online
++Documentation=man:nm-online(1)
+ Requisite=NetworkManager.service
+ After=NetworkManager.service
+-Wants=network.target
+-Before=network.target network-online.target
++Before=network-online.target
+ 
+ [Service]
+ Type=oneshot
+ ExecStart=@bindir@/nm-online -s -q --timeout=30
++RemainAfterExit=yes
+ 
+ [Install]
+-WantedBy=multi-user.target
++WantedBy=network-online.target
diff --git a/debian/patches/series b/debian/patches/series
index 5fd82c7d..eed36928 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@
 0008-Fix-dependencies-in-libnm.pc.patch
 0009-Check-at-runtime-whether-to-start-ModemManager.patch
 0010-build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch
+0011-Don-t-make-NetworkManager-D-Bus-activatable.patch
+0012-Don-t-block-network.target-on-NetworkManager-wait-on.patch