Sorry, forgot to attach the debdiff. -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff --git a/debian/changelog b/debian/changelog index 72f12ac..8b905b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +network-manager (0.9.4.0-6) unstable; urgency=low + + * debian/rules: Use xz compression for binary packages. + * debian/patches/15-ignore-cached-cloned-routes-ipv6-config.patch, + debian/patches/16-ignore-cached-cloned-routes-kernel-notifications.patch: + Don't create static IPv6 routes for cached/cloned routes. Patches + cherry-picked from upstream Git. (Closes: #686328) + * debian/patches/17-dbus-remove_max_replies_per_connection_limit.patch: + Remove 'max_replies_per_connection' limit from D-Bus configuration which + sets it to 512. It was intended to increase the limit from its historical + value of 32. However, since 2007 the default limit has been 8192, so this + is actually a reduction. (Closes: #678965) + + -- Michael Biebl <bi...@debian.org> Tue, 11 Sep 2012 19:24:15 +0200 + network-manager (0.9.4.0-5) unstable; urgency=low * debian/patches/14-use-same-kernel-API-as-wpa_supplicant.patch: Some diff --git a/debian/patches/15-ignore-cached-cloned-routes-ipv6-config.patch b/debian/patches/15-ignore-cached-cloned-routes-ipv6-config.patch new file mode 100644 index 0000000..ab076ca --- /dev/null +++ b/debian/patches/15-ignore-cached-cloned-routes-ipv6-config.patch @@ -0,0 +1,29 @@ +From 3ca3120e4a01ea4a86fd052311c977e7ec136365 Mon Sep 17 00:00:00 2001 +From: Ben Jencks <b...@bjencks.net> +Date: Thu, 30 Aug 2012 18:55:36 +0000 +Subject: ip6: ignore cached/cloned route notifications from the kernel (lp:1038541) (bgo #671767) + +The kernel periodically adds routes for specific operations, including +when pinging any host. These are temporary routes and aren't part of +the interface's permanent routing configuration, so we should ignore +them. +--- +Index: network-manager/src/ip6-manager/nm-ip6-manager.c +=================================================================== +--- network-manager.orig/src/ip6-manager/nm-ip6-manager.c 2012-08-31 09:19:54.000000000 +0200 ++++ network-manager/src/ip6-manager/nm-ip6-manager.c 2012-08-31 09:56:24.000000000 +0200 +@@ -602,6 +602,14 @@ + return NULL; + } + ++ /* Cached/cloned routes are created by the kernel for specific operations ++ * and aren't part of the interface's permanent routing configuration. ++ */ ++ if (rtnl_route_get_flags (rtnlroute) & RTM_F_CLONED) { ++ rtnl_route_put (rtnlroute); ++ return NULL; ++ } ++ + device = nm_ip6_manager_get_device (manager, rtnl_route_get_oif (rtnlroute)); + if (!device) { + nm_log_dbg (LOGD_IP6, "ignoring message for unknown device"); diff --git a/debian/patches/16-ignore-cached-cloned-routes-kernel-notifications.patch b/debian/patches/16-ignore-cached-cloned-routes-kernel-notifications.patch new file mode 100644 index 0000000..264ae9b --- /dev/null +++ b/debian/patches/16-ignore-cached-cloned-routes-kernel-notifications.patch @@ -0,0 +1,24 @@ +From 46e0af2942e23fb3cf1c313e58e4081877d4f289 Mon Sep 17 00:00:00 2001 +From: Dan Williams <d...@redhat.com> +Date: Thu, 30 Aug 2012 18:57:06 +0000 +Subject: ip6: ignore cached/cloned routes when retrieving IPv6 config (lp:1038541) (bgo #671767) + +Should also ignore them when building up the initial IPv6 config. +--- +Index: network-manager/src/ip6-manager/nm-ip6-manager.c +=================================================================== +--- network-manager.orig/src/ip6-manager/nm-ip6-manager.c 2012-08-31 09:56:03.000000000 +0200 ++++ network-manager/src/ip6-manager/nm-ip6-manager.c 2012-08-31 09:56:03.000000000 +0200 +@@ -1284,6 +1284,12 @@ + if (rtnl_route_get_family (rtnlroute) != AF_INET6) + continue; + ++ /* And ignore cache/cloned routes as they aren't part of the interface's ++ * permanent routing configuration. ++ */ ++ if (rtnl_route_get_flags (rtnlroute) & RTM_F_CLONED) ++ continue; ++ + nldest = rtnl_route_get_dst (rtnlroute); + if (!nldest || nl_addr_get_family (nldest) != AF_INET6) + continue; diff --git a/debian/patches/17-dbus-remove-max_replies_per_connection-limit.patch b/debian/patches/17-dbus-remove-max_replies_per_connection-limit.patch new file mode 100644 index 0000000..be64292 --- /dev/null +++ b/debian/patches/17-dbus-remove-max_replies_per_connection-limit.patch @@ -0,0 +1,22 @@ +commit d5b31d55fa1536a5bd08cf85929ac63a8f723467 +Author: JiÅà KlimeÅ¡ <jkli...@redhat.com> +Date: Wed May 23 10:31:12 2012 +0200 + + dbus: remove 'max_replies_per_connection' limit from D-Bus configuration + + It is leftover from times when D-Bus default limit was 32. Now, it is 8192, see + http://cgit.freedesktop.org/dbus/dbus/commit/?id=8d3d8ff55739eebd84d0d53a20a025329feafc3b + See also https://bugs.freedesktop.org/show_bug.cgi?id=50264 + +Index: network-manager/src/org.freedesktop.NetworkManager.conf +=================================================================== +--- network-manager.orig/src/org.freedesktop.NetworkManager.conf 2012-09-11 19:16:05.307271180 +0200 ++++ network-manager/src/org.freedesktop.NetworkManager.conf 2012-09-11 19:16:05.535271173 +0200 +@@ -179,7 +179,5 @@ + send_interface="org.freedesktop.NetworkManager" + send_member="wake"/> + </policy> +- +- <limit name="max_replies_per_connection">512</limit> + </busconfig> + diff --git a/debian/patches/series b/debian/patches/series index 134267a..8cac690 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,6 @@ 12-initialize-gerror.patch 13-dont-replace-kernel-default-route-for-IPv6.patch 14-use-same-kernel-API-as-wpa_supplicant.patch +15-ignore-cached-cloned-routes-ipv6-config.patch +16-ignore-cached-cloned-routes-kernel-notifications.patch +17-dbus-remove-max_replies_per_connection-limit.patch diff --git a/debian/rules b/debian/rules index 4ee224f..20d1e25 100755 --- a/debian/rules +++ b/debian/rules @@ -40,4 +40,7 @@ override_dh_shlibdeps: dh_girepository -plibnm-util2 dh_girepository -plibnm-glib4 +override_dh_builddeb: + dh_builddeb -- -Zxz + override_dh_auto_test:
signature.asc
Description: OpenPGP digital signature