From 0ba2c5752c8f5f049d9a98be119f5999567be9fd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 11 Sep 2012 18:16:22 +0200 Subject: debian/rules: Use xz compression for binary packages. --- debian/changelog | 6 ++++++ debian/rules | 3 +++ 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 72f12acf..e1acb571 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.9.4.0-6) UNRELEASED; urgency=low + + * debian/rules: Use xz compression for binary packages. + + -- Michael Biebl Tue, 11 Sep 2012 18:15:49 +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/rules b/debian/rules index 4ee224f9..20d1e25d 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: -- cgit 1.3.0-6-gf8a5 From 69e44dbd65022908ffb5e364ae71f2ad98078e88 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 11 Sep 2012 19:08:51 +0200 Subject: Don't create static IPv6 routes for cached/cloned routes. (Closes: #686328) * debian/patches/15-ignore-cached-cloned-routes-ipv6-config.patch, Don't create static IPv6 routes for cached/cloned routes. Patches debian/patches/16-ignore-cached-cloned-routes-kernel-notifications.patch: cherry-picked from upstream Git. (Closes: #686328) --- debian/changelog | 4 +++ ...5-ignore-cached-cloned-routes-ipv6-config.patch | 29 ++++++++++++++++++++++ ...cached-cloned-routes-kernel-notifications.patch | 24 ++++++++++++++++++ debian/patches/series | 2 ++ 4 files changed, 59 insertions(+) create mode 100644 debian/patches/15-ignore-cached-cloned-routes-ipv6-config.patch create mode 100644 debian/patches/16-ignore-cached-cloned-routes-kernel-notifications.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e1acb571..64312f49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ network-manager (0.9.4.0-6) UNRELEASED; 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) -- Michael Biebl Tue, 11 Sep 2012 18:15:49 +0200 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 00000000..ab076ca6 --- /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 +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 00000000..264ae9b7 --- /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 +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/series b/debian/patches/series index 134267a8..9ee2e2f0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,5 @@ 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 -- cgit 1.3.0-6-gf8a5 From f63ffb9415d33c5447b0f4cd04e5ab8110870526 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 11 Sep 2012 19:14:59 +0200 Subject: Remove 'max_replies_per_connection' limit from D-Bus configuration. (Closes: #678965) * 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) --- debian/changelog | 5 +++++ ...s-remove-max_replies_per_connection-limit.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 28 insertions(+) create mode 100644 debian/patches/17-dbus-remove-max_replies_per_connection-limit.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 64312f49..5551b786 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,11 @@ network-manager (0.9.4.0-6) UNRELEASED; urgency=low 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 Tue, 11 Sep 2012 18:15:49 +0200 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 00000000..be642922 --- /dev/null +++ b/debian/patches/17-dbus-remove-max_replies_per_connection-limit.patch @@ -0,0 +1,22 @@ +commit d5b31d55fa1536a5bd08cf85929ac63a8f723467 +Author: Jiří Klimeš +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"/> + +- +- 512 + + diff --git a/debian/patches/series b/debian/patches/series index 9ee2e2f0..8cac6905 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ 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 -- cgit 1.3.0-6-gf8a5 From 976ce3c2d5039cf3f4b2ea9133082f2415c460be Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 11 Sep 2012 19:24:44 +0200 Subject: Release version 0.9.4.0-6 to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5551b786..8b905b93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.9.4.0-6) UNRELEASED; urgency=low +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, @@ -11,7 +11,7 @@ network-manager (0.9.4.0-6) UNRELEASED; urgency=low value of 32. However, since 2007 the default limit has been 8192, so this is actually a reduction. (Closes: #678965) - -- Michael Biebl Tue, 11 Sep 2012 18:15:49 +0200 + -- Michael Biebl Tue, 11 Sep 2012 19:24:15 +0200 network-manager (0.9.4.0-5) unstable; urgency=low -- cgit 1.3.0-6-gf8a5