Make patches gbp-pq compatible

5 files changed, 69 insertions, 47 deletions

diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/0001-Add-D-Bus-policy-for-group-netdev.patch
index 0105b16f..a1aea3e0 100644
--- a/debian/patches/02-dbus_access_network_manager.patch
+++ b/debian/patches/0001-Add-D-Bus-policy-for-group-netdev.patch
@@ -1,11 +1,17 @@
-Description: Add D-Bus policy for group netdev
- It is more or less a copy of the at_console section.
-Author: Michael Biebl <biebl@debian.org>
-Index: network-manager/src/org.freedesktop.NetworkManager.conf
-===================================================================
---- network-manager.orig/src/org.freedesktop.NetworkManager.conf	2012-06-29 20:12:59.056208718 +0200
-+++ network-manager/src/org.freedesktop.NetworkManager.conf	2012-06-29 20:17:00.479762828 +0200
-@@ -85,6 +85,67 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Wed, 2 Apr 2014 03:15:53 +0200
+Subject: Add D-Bus policy for group netdev
+
+This is more or less a verbatim copy of the at_console section.
+---
+ src/org.freedesktop.NetworkManager.conf | 61 +++++++++++++++++++++++++++++++++
+ 1 file changed, 61 insertions(+)
+
+diff --git a/src/org.freedesktop.NetworkManager.conf b/src/org.freedesktop.NetworkManager.conf
+index 5e7bafa..e5378d7 100644
+--- a/src/org.freedesktop.NetworkManager.conf
++++ b/src/org.freedesktop.NetworkManager.conf
+@@ -86,6 +86,67 @@
                         send_interface="org.freedesktop.NetworkManager"
                         send_member="wake"/>
          </policy>
diff --git a/debian/patches/0002-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch b/debian/patches/0002-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch
new file mode 100644
index 00000000..c6fedf14
--- /dev/null
+++ b/debian/patches/0002-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch
@@ -0,0 +1,33 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Wed, 2 Apr 2014 03:15:53 +0200
+Subject: Debian specific tweaks for NetworkManager systemd service file
+
+This patch is needed to avoid a dependency loop which is generated
+by early boot (rcS) SysV init scripts depending on the $network LSB
+system facility (either directly or indirectly via $remote_fs).
+
+The $network LSB system facility is mapped to network.target.
+
+Those rcS SysV init scripts are started in sysinit.target,
+NetworkManager.service is started via multi-user.target, which depends
+on sysinit.target.
+
+As long as we have rcS SysV init scripts which such a dependency on
+$remote_fs or $network we can not make NetworkManager.service a provider
+for network.target.
+---
+ data/NetworkManager.service.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
+index ddc1627..526a56e 100644
+--- a/data/NetworkManager.service.in
++++ b/data/NetworkManager.service.in
+@@ -1,7 +1,5 @@
+ [Unit]
+ Description=Network Manager
+-Wants=network.target
+-Before=network.target
+ 
+ [Service]
+ Type=dbus
diff --git a/debian/patches/05-force-online-with-unmanaged-devices.patch b/debian/patches/0003-Force-online-state-with-unmanaged-devices.patch
index 31d5cadb..0e4f91db 100644
--- a/debian/patches/05-force-online-with-unmanaged-devices.patch
+++ b/debian/patches/0003-Force-online-state-with-unmanaged-devices.patch
@@ -1,9 +1,18 @@
-Description: Force online state with unmanaged devices
- If we have unmanaged devices in /e/n/i, monitor the ifupdown state file
- and in case we find active interfaces besides lo, forcefully set the
- online state to CONNECTED.
-Author: Michael Biebl <biebl@debian.org>
+From: Michael Biebl <biebl@debian.org>
+Date: Wed, 2 Apr 2014 03:15:53 +0200
+Subject: Force online state with unmanaged devices
+
+If we have unmanaged devices in /e/n/i, monitor the ifupdown state file
+and in case we find active interfaces besides lo, forcefully set the
+online state to CONNECTED.
+
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
+---
+ src/nm-manager.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 102 insertions(+)
+
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index 9c82d14..7dbba47 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -78,6 +78,8 @@
@@ -15,7 +24,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  static gboolean impl_manager_get_devices (NMManager *manager,
                                            GPtrArray **devices,
                                            GError **err);
-@@ -249,6 +251,11 @@
+@@ -249,6 +251,11 @@ typedef struct {
  	guint fw_monitor_id;
  	guint fw_changed_id;
  
@@ -27,7 +36,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  	guint timestamp_update_id;
  
  	GHashTable *nm_bridges;
-@@ -618,6 +625,14 @@
+@@ -618,6 +625,14 @@ nm_manager_update_state (NMManager *manager)
  				}
  			}
  
@@ -42,7 +51,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  			if (nm_device_is_activating (dev))
  				new_state = NM_STATE_CONNECTING;
  			else if (new_state != NM_STATE_CONNECTING) {
-@@ -4090,6 +4105,65 @@
+@@ -4090,6 +4105,65 @@ policy_activating_device_changed (GObject *object, GParamSpec *pspec, gpointer u
  	}
  }
  
@@ -108,7 +117,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  #define NM_PERM_DENIED_ERROR "org.freedesktop.NetworkManager.PermissionDenied"
  #define DEV_PERM_DENIED_ERROR "org.freedesktop.NetworkManager.Device.PermissionDenied"
  
-@@ -4506,6 +4580,17 @@
+@@ -4506,6 +4580,17 @@ dispose (GObject *object)
  		g_object_unref (priv->fw_monitor);
  	}
  
@@ -126,7 +135,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  	g_slist_free (priv->factories);
  
  	if (priv->timestamp_update_id) {
-@@ -4865,6 +4950,23 @@
+@@ -4865,6 +4950,23 @@ nm_manager_init (NMManager *manager)
  		             KERNEL_FIRMWARE_DIR);
  	}
  
diff --git a/debian/patches/03-systemd.patch b/debian/patches/03-systemd.patch
deleted file mode 100644
index cb3c9d6f..00000000
--- a/debian/patches/03-systemd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Debian specific tweaks for NetworkManager systemd service file
- This patch is needed to avoid a dependency loop which is generated
- by early boot (rcS) SysV init scripts depending on the $network LSB
- system facility (either directly or indirectly via $remote_fs).
- .
- The $network LSB system facility is mapped to network.target.
- .
- Those rcS SysV init scripts are started in sysinit.target,
- NetworkManager.service is started via multi-user.target, which depends
- on sysinit.target.
- .
- As long as we have rcS SysV init scripts which such a dependency on
- $remote_fs or $network we can not make NetworkManager.service a provider
- for network.target.
-
-Author: Michael Biebl <biebl@debian.org>
---- a/data/NetworkManager.service.in
-+++ b/data/NetworkManager.service.in
-@@ -1,7 +1,5 @@
- [Unit]
- Description=Network Manager
--Wants=network.target
--Before=network.target
- 
- [Service]
- Type=dbus
diff --git a/debian/patches/series b/debian/patches/series
index 1eef0c6e..251dba2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-02-dbus_access_network_manager.patch
-03-systemd.patch
-05-force-online-with-unmanaged-devices.patch
+0001-Add-D-Bus-policy-for-group-netdev.patch
+0002-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch
+0003-Force-online-state-with-unmanaged-devices.patch