Update patches.

* debian/patches/02-dbus_access_network_manager.patch: Updated.
* Remove patches which have been merged upstream.

8 files changed, 6 insertions, 275 deletions

diff --git a/debian/changelog b/debian/changelog
index 39062b02..92b07b78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ network-manager (0.9.5.95-1) UNRELEASED; urgency=low
   * New upstream release (0.9.6 rc1).
     - Remove 'max_replies_per_connection' limit from D-Bus configuration.
       (Closes: #678965)
+  * debian/patches/02-dbus_access_network_manager.patch: Updated.
+  * Remove patches which have been merged upstream.
 
  -- Michael Biebl <biebl@debian.org>  Fri, 29 Jun 2012 20:13:03 +0200
 
diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch
index 33312a4e..0105b16f 100644
--- a/debian/patches/02-dbus_access_network_manager.patch
+++ b/debian/patches/02-dbus_access_network_manager.patch
@@ -3,9 +3,9 @@ Description: Add D-Bus policy for group netdev
 Author: Michael Biebl <biebl@debian.org>
 Index: network-manager/src/org.freedesktop.NetworkManager.conf
 ===================================================================
---- network-manager.orig/src/org.freedesktop.NetworkManager.conf	2012-03-24 01:37:02.186720578 +0100
-+++ network-manager/src/org.freedesktop.NetworkManager.conf	2012-03-24 01:38:09.726722510 +0100
-@@ -88,6 +88,70 @@
+--- 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 @@
                         send_interface="org.freedesktop.NetworkManager"
                         send_member="wake"/>
          </policy>
@@ -28,15 +28,12 @@ Index: network-manager/src/org.freedesktop.NetworkManager.conf
 +                       send_interface="org.freedesktop.NetworkManager.Connection.Active"/>
 +
 +                <allow send_destination="org.freedesktop.NetworkManager"
-+                       send_interface="org.freedesktop.NetworkManager.Device.Cdma"/>
++                       send_interface="org.freedesktop.NetworkManager.Device.Modem"/>
 +
 +                <allow send_destination="org.freedesktop.NetworkManager"
 +                       send_interface="org.freedesktop.NetworkManager.Device.Wired"/>
 +
 +                <allow send_destination="org.freedesktop.NetworkManager"
-+                       send_interface="org.freedesktop.NetworkManager.Device.Gsm"/>
-+
-+                <allow send_destination="org.freedesktop.NetworkManager"
 +                       send_interface="org.freedesktop.NetworkManager.Device.Serial"/>
 +
 +                <allow send_destination="org.freedesktop.NetworkManager"
diff --git a/debian/patches/10-format-security.patch b/debian/patches/10-format-security.patch
deleted file mode 100644
index 84e50288..00000000
--- a/debian/patches/10-format-security.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix a format string vulnerability
-Author: Michael Biebl <biebl@debian.org>
-diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
-index 9f9f438..fe874ab 100644
---- a/libnm-util/nm-setting-bond.c
-+++ b/libnm-util/nm-setting-bond.c
-@@ -402,10 +402,10 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
- 		    || !value[0]
- 		    || (strlen (value) > 200)
- 		    || strchr (value, ' ')) {
--			g_set_error (error,
--			             NM_SETTING_BOND_ERROR,
--			             NM_SETTING_BOND_ERROR_INVALID_OPTION,
--			             key);
-+			g_set_error_literal (error,
-+			                     NM_SETTING_BOND_ERROR,
-+			                     NM_SETTING_BOND_ERROR_INVALID_OPTION,
-+			                     key);
- 			return FALSE;
- 		}
- 	}
diff --git a/debian/patches/11-initialize-nm-remote-settings.patch b/debian/patches/11-initialize-nm-remote-settings.patch
deleted file mode 100644
index fff4194b..00000000
--- a/debian/patches/11-initialize-nm-remote-settings.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit dd0460697c4e281fe277b53916d5251332e1aafc
-Author: Jiří Klimeš <jklimes@redhat.com>
-Date:   Tue Mar 27 22:36:55 2012 +0200
-
-    libnm-glib: initialize NMRemoteSettings in nm_remote_settings_new() (rh #806664)
-    
-    The object was not initialized after creation in nm_remote_settings_new(). This
-    was a regression caused by 762df85234e7a042a2a5d31053e6cc273ae3e2ec.
-
-diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
-index 8f213f9..b6b6c18 100644
---- a/libnm-glib/nm-remote-settings.c
-+++ b/libnm-glib/nm-remote-settings.c
-@@ -728,7 +728,12 @@ properties_changed_cb (DBusGProxy *proxy,
- NMRemoteSettings *
- nm_remote_settings_new (DBusGConnection *bus)
- {
--	return g_object_new (NM_TYPE_REMOTE_SETTINGS, NM_REMOTE_SETTINGS_BUS, bus, NULL);
-+	NMRemoteSettings *settings;
-+
-+	settings = g_object_new (NM_TYPE_REMOTE_SETTINGS, NM_REMOTE_SETTINGS_BUS, bus, NULL);
-+
-+	_nm_remote_settings_ensure_inited (settings);
-+	return settings;
- }
- 
- static void
diff --git a/debian/patches/12-initialize-gerror.patch b/debian/patches/12-initialize-gerror.patch
deleted file mode 100644
index b619a65d..00000000
--- a/debian/patches/12-initialize-gerror.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 8bb278944496102a4afad46b53e1e8279425aaac
-Author: Jiří Klimeš <jklimes@redhat.com>
-Date:   Mon Apr 2 16:37:55 2012 +0200
-
-    libnm-glib: initialize GError, else invalid free() crash can occur (rh #809123)
-
-diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
-index 9a81a8d..68aaeb4 100644
---- a/libnm-glib/nm-remote-settings.c
-+++ b/libnm-glib/nm-remote-settings.c
-@@ -109,7 +109,7 @@ static void
- _nm_remote_settings_ensure_inited (NMRemoteSettings *self)
- {
- 	NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self);
--	GError *error;
-+	GError *error = NULL;
- 
- 	if (!priv->inited) {
- 		if (!g_initable_init (G_INITABLE (self), NULL, &error)) {
-12-initialize-gerror.patch
diff --git a/debian/patches/13-dont-replace-kernel-default-route-for-IPv6.patch b/debian/patches/13-dont-replace-kernel-default-route-for-IPv6.patch
deleted file mode 100644
index 552976c2..00000000
--- a/debian/patches/13-dont-replace-kernel-default-route-for-IPv6.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-commit 77de91e5a8b1c1993ae65c54b37e0411e78e6fe6
-Author: Dan Winship <danw@gnome.org>
-Date:   Thu Apr 19 14:27:12 2012 -0400
-
-    core: don't fight with the kernel over the default IPv6 route
-    
-    The kernel wants there to be a default route over every RA-ed IPv6
-    interface, and it gets confused and annoyed if we remove that default
-    route and replace it with our own (causing it to effectively drop all
-    further RAs on the floor, which is particularly bad if some of the
-    information in the earlier RA had an expiration time).
-    
-    So, rather than replacing the kernel's default route(s), just add an
-    additional one of our own, with a lower (ie, higher priority) metric.
-    
-    https://bugzilla.redhat.com/show_bug.cgi?id=785772
-
-diff --git a/src/nm-system.c b/src/nm-system.c
-index 91153ec..4cebb13 100644
---- a/src/nm-system.c
-+++ b/src/nm-system.c
-@@ -1023,7 +1023,7 @@ add_ip6_route_to_gateway (int ifindex, const struct in6_addr *gw)
- }
- 
- static int
--replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
-+add_default_ip6_route (int ifindex, const struct in6_addr *gw)
- {
- 	struct rtnl_route *route = NULL;
- 	struct nl_sock *nlh;
-@@ -1037,22 +1037,36 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- 	route = nm_netlink_route_new (ifindex, AF_INET6, 0,
- 	                              NMNL_PROP_SCOPE, RT_SCOPE_UNIVERSE,
- 	                              NMNL_PROP_TABLE, RT_TABLE_MAIN,
-+	                              NMNL_PROP_PRIO, 1,
- 	                              NULL);
- 	g_return_val_if_fail (route != NULL, -ENOMEM);
- 
- 	/* Add the new default route */
--	err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_REPLACE);
--	if (err == -NLE_EXIST) {
--		/* FIXME: even though we use NLM_F_REPLACE the kernel won't replace
--		 * the route if it's the same.  Suppress the pointless error.
--		 */
-+	err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_CREATE);
-+	if (err == -NLE_EXIST)
- 		err = 0;
--	}
- 
- 	rtnl_route_put (route);
- 	return err;
- }
- 
-+static struct rtnl_route *
-+find_static_default_routes (struct rtnl_route *route,
-+                            struct nl_addr *dst,
-+                            const char *iface,
-+                            gpointer user_data)
-+{
-+	GList **def_routes = user_data;
-+
-+	if (   nl_addr_get_prefixlen (dst) == 0
-+	    && rtnl_route_get_protocol (route) == RTPROT_STATIC) {
-+		rtnl_route_get (route);
-+		*def_routes = g_list_prepend (*def_routes, route);
-+	}
-+
-+	return NULL;
-+}
-+
- /*
-  * nm_system_replace_default_ip6_route
-  *
-@@ -1062,12 +1076,35 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- gboolean
- nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- {
--	struct rtnl_route *gw_route = NULL;
-+	GList *def_routes, *iter;
-+	struct rtnl_route *route, *gw_route = NULL;
- 	gboolean success = FALSE;
- 	char *iface;
- 	int err;
- 
--	err = replace_default_ip6_route (ifindex, gw);
-+	/* We can't just use NLM_F_REPLACE here like in the IPv4 case, because
-+	 * the kernel doesn't like it if we replace the default routes it
-+	 * creates. (See rh#785772.) So we delete any non-kernel default routes,
-+	 * and then add a new default route of our own with a lower metric than
-+	 * the kernel ones.
-+	 */
-+	def_routes = NULL;
-+	nm_netlink_foreach_route (ifindex, AF_INET6, RT_SCOPE_UNIVERSE, TRUE,
-+	                          find_static_default_routes, &def_routes);
-+	for (iter = def_routes; iter; iter = iter->next) {
-+		route = iter->data;
-+		if (!nm_netlink_route_delete (route)) {
-+			iface = nm_netlink_index_to_iface (ifindex);
-+			nm_log_err (LOGD_DEVICE | LOGD_IP6,
-+			            "(%s): failed to delete existing IPv6 default route",
-+			            iface);
-+			g_free (iface);
-+		}
-+		rtnl_route_put (route);
-+	}
-+	g_list_free (def_routes);
-+
-+	err = add_default_ip6_route (ifindex, gw);
- 	if (err == 0)
- 		return TRUE;
- 
-@@ -1091,7 +1128,7 @@ nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- 		goto out;
- 
- 	/* Try adding the original route again */
--	err = replace_default_ip6_route (ifindex, gw);
-+	err = add_default_ip6_route (ifindex, gw);
- 	if (err != 0) {
- 		nm_netlink_route_delete (gw_route);
- 		nm_log_err (LOGD_DEVICE | LOGD_IP6,
diff --git a/debian/patches/14-use-same-kernel-API-as-wpa_supplicant.patch b/debian/patches/14-use-same-kernel-API-as-wpa_supplicant.patch
deleted file mode 100644
index 4ae4606f..00000000
--- a/debian/patches/14-use-same-kernel-API-as-wpa_supplicant.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-commit 50435e1d5deff17233f1de73ee030a5982e9fd05 (origin/wifi-fallback)
-Author: Dan Williams <dcbw@redhat.com>
-Date:   Fri May 4 14:26:10 2012 -0500
-
-    wifi: attempt to use same kernel API wpa_supplicant does (bgo #675017)
-    
-    Some drivers (ipw2x00) support capabilities reporting via nl80211 but
-    absolutely nothing else.  NM was only checking for capabilities
-    when deciding whether or not to use nl80211 to communicate with the
-    driver for associated AP, signal strength, and channel info, and that
-    clearly fails with half-implementations of nl80211 in the kernel.
-    
-    Instead, match the logic that wpa_supplicant uses to determine whether
-    to stick with nl80211 or fall back to WEXT.  For these drivers
-    NM will now fall back to WEXT and should return to the behavior we
-    had with 0.9.2 for these devices.
-
-Index: network-manager/src/wifi/wifi-utils-nl80211.c
-===================================================================
---- network-manager.orig/src/wifi/wifi-utils-nl80211.c	2012-05-15 02:00:59.049491794 +0200
-+++ network-manager/src/wifi/wifi-utils-nl80211.c	2012-05-29 12:20:15.653087949 +0200
-@@ -535,7 +535,9 @@
- 	guint32 *freqs;
- 	int num_freqs;
- 	guint32 caps;
--	gboolean can_scan, can_scan_ssid;
-+	gboolean can_scan;
-+	gboolean can_scan_ssid;
-+	gboolean supported;
- 	gboolean success;
- };
- 
-@@ -579,11 +581,24 @@
- 		struct nlattr *nl_cmd;
- 		int i;
- 
--		nla_for_each_nested (nl_cmd,
--				     tb[NL80211_ATTR_SUPPORTED_COMMANDS], i) {
--			guint32 cmd = nla_get_u32 (nl_cmd);
--			if (cmd == NL80211_CMD_TRIGGER_SCAN)
-+		nla_for_each_nested (nl_cmd, tb[NL80211_ATTR_SUPPORTED_COMMANDS], i) {
-+			switch (nla_get_u32 (nl_cmd)) {
-+			case NL80211_CMD_TRIGGER_SCAN:
- 				info->can_scan = TRUE;
-+				break;
-+			case NL80211_CMD_CONNECT:
-+			case NL80211_CMD_AUTHENTICATE:
-+				/* Only devices that support CONNECT or AUTH actually support
-+				 * 802.11, unlike say ipw2x00 (up to at least kernel 3.4) which
-+				 * has minimal info support, but no actual command support.
-+				 * This check mirrors what wpa_supplicant does to determine
-+				 * whether or not to use the nl80211 driver.
-+				 */
-+				info->supported = TRUE;
-+				break;
-+			default:
-+				break;
-+			}
- 		}
- 	}
- 
-@@ -720,6 +735,13 @@
- 				    nl80211->parent.iface);
- 		goto error;
- 	}
-+
-+	if (!device_info.supported) {
-+		nm_log_dbg (LOGD_HW | LOGD_WIFI,
-+				    "(%s): driver does not fully support nl80211, falling back to WEXT",
-+				    nl80211->parent.iface);
-+		goto error;
-+	}
- 
- 	if (!device_info.can_scan_ssid) {
- 		nm_log_err (LOGD_HW | LOGD_WIFI,
diff --git a/debian/patches/series b/debian/patches/series
index 134267a8..fc215f9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
 # Debian patches for network-manager
 02-dbus_access_network_manager.patch
 03-systemd.patch
-10-format-security.patch
-11-initialize-nm-remote-settings.patch
-12-initialize-gerror.patch
-13-dont-replace-kernel-default-route-for-IPv6.patch
-14-use-same-kernel-API-as-wpa_supplicant.patch