Skip to contentSkip to conversation

networkmanager: 1.0.6 -> 1.0.10

PATCH New Adrian Freihofer 1 participant 4 messages Jan 18, 2016

lore
Share & tools
lore
#0 lore raw

v4 cover networkmanager: 1.0.6 -> 1.0.10

Hi Martin
Thank you for applying the patches. The problem was in the header files of latest NetworkManager. The patch "add patches" contains now one more patch to address this issue. If you replace just the "add patches" patch v3 with v4 gnome-panel will build again. The other patches did not change. Thank you in advance.
Regards Adrian

Adrian Freihofer (2):
networkmanager: add patches
networkmanager-openvpn: Update to 1.0.8

Dai Caiyun (1):
networkmanager: 1.0.6 -> 1.0.10

 ...pn_1.0.6.bb => networkmanager-openvpn_1.0.8.bb} |  4 +-
 ...ilure-to-configure-routes-due-to-wrong-de.patch | 54 ++++++++++++++++++++
 ...-clear-ppp_watch_id-upon-pppd-termination.patch | 29 +++++++++++
 ...date-ip_iface-only-if-IP-interface-exists.patch | 45 +++++++++++++++++
 .../0006-Fix-nm-version-macro-includes.patch       | 58 ++++++++++++++++++++++
 ...rkmanager_1.0.6.bb => networkmanager_1.0.10.bb} | 10 ++--
 6 files changed, 195 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-connectivity/networkmanager/{networkmanager-openvpn_1.0.6.bb => networkmanager-openvpn_1.0.8.bb} (83%)
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-device-update-ip_iface-only-if-IP-interface-exists.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0006-Fix-nm-version-macro-includes.patch
 rename meta-oe/recipes-connectivity/networkmanager/{networkmanager_1.0.6.bb => networkmanager_1.0.10.bb} (88%)
Signature · 1 line
2.5.0
#1 lore raw

PATCH v4 1/3 networkmanager: 1.0.6 -> 1.0.10

From: Dai Caiyun <[email protected]>

Upgrade networkmanager from 1.0.6 to 1.0.10.

---
 .../{networkmanager_1.0.6.bb => networkmanager_1.0.10.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-connectivity/networkmanager/{networkmanager_1.0.6.bb => networkmanager_1.0.10.bb} (96%)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb renamed from meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +2 -2
similarity index 96%
rename from meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
rename to meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
index c2b00ed..81ce953 100644
@@ -16,8 +16,8 @@ SRC_URI = " \
     file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
     file://0002-add-pkg-config-for-libgcrypt.patch \
 "
-SRC_URI[md5sum] = "00f5f9ec69725a9f9b99366853c6f73e"
-SRC_URI[sha256sum] = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd"
+SRC_URI[md5sum] = "a8f54460a4708efd840358f32d0968fd"
+SRC_URI[sha256sum] = "1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc"
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
Signature · 1 line
2.5.0
#2 lore raw

PATCH v4 2/3 networkmanager: add patches

In reply to Adrian Freihofer

- Apply three bug fix patches from NM git.
- Apply a patch to fix a bug in the header files breaking gnome-panel build.
- fix ppp rdepend: pppd is not on the target if NM does not rdepend on it.

---
 ...ilure-to-configure-routes-due-to-wrong-de.patch | 54 ++++++++++++++++++++
 ...-clear-ppp_watch_id-upon-pppd-termination.patch | 29 +++++++++++
 ...date-ip_iface-only-if-IP-interface-exists.patch | 45 +++++++++++++++++
 .../0006-Fix-nm-version-macro-includes.patch       | 58 ++++++++++++++++++++++
 .../networkmanager/networkmanager_1.0.10.bb        |  6 ++-
 5 files changed, 191 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-device-update-ip_iface-only-if-IP-interface-exists.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0006-Fix-nm-version-macro-includes.patch
meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-core-fix-failure-to-configure-routes-due-to-wrong-de.patch new file +54 -0
new file mode 100644
index 0000000..5da536e
@@ -0,0 +1,54 @@
+From 11aa07ed939193e85516c287a57dee1837242972 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <[email protected]>
+Date: Mon, 4 Jan 2016 18:54:26 +0100
+Subject: [PATCH 1/7] core: fix failure to configure routes due to wrong
+ device-route for IPv4 peer-addresses
+
+As in the case of a OpenVPN connection, we might add an address like:
+  10.8.0.58/32 ptp 10.8.0.57
+
+In this case, kernel would automatically add a device-route like:
+  10.8.0.57/32 via 0.0.0.0 dev 32 metric 0 mss 0 src rtprot-kernel scope link pref-src 10.8.0.58
+
+nm_ip4_config_commit() checks all IP addresses to figure out
+the present device-routes. Then the routes are synced by NMRouteManager.
+Due to a bug, we would not consider the peer-address, but the local-address
+and configure a route 10.8.0.58/32, instead of 10.8.0.57/32.
+
+That stays mostly unnoticed, because usually the peer and the local-address are
+in the same subnet, so that there is no difference (/32 is an example of the
+peer-address being in a different subnet).
+
+It also seems that due to a bug fixed by df4e5357521 this issue didn't surface.
+Probably because we would not notice the 10.8.0.57/32 right away and thus
+nm_route_manager_ip4_route_sync() would not wrongly delete it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759892
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809195
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809494
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809526
+https://bugs.archlinux.org/task/47535
+https://bugzilla.redhat.com/show_bug.cgi?id=1294309
+https://mail.gnome.org/archives/networkmanager-list/2015-December/msg00059.html
+---
+ src/nm-ip4-config.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
+index f625d35..61e29af 100644
+--- a/src/nm-ip4-config.c
++++ b/src/nm-ip4-config.c
+@@ -298,7 +298,8 @@ nm_ip4_config_commit (const NMIP4Config *config, int ifindex, gboolean routes_fu
+ 
+ 				route.ifindex = ifindex;
+ 				route.source = NM_IP_CONFIG_SOURCE_KERNEL;
+-				route.network = nm_utils_ip4_address_clear_host_address (addr->address, addr->plen);
++				route.network = nm_utils_ip4_address_clear_host_address (addr->peer_address ? : addr->address,
++				                                                         addr->plen);
+ 				route.plen = addr->plen;
+ 				route.pref_src = addr->address;
+ 				route.metric = default_route_metric;
+-- 
+2.5.0
+
meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch new file +29 -0
new file mode 100644
index 0000000..41f2882
@@ -0,0 +1,29 @@
+From 8204c2a1968f757599c5ebec9a85efaacb0e522a Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <[email protected]>
+Date: Mon, 4 Jan 2016 14:18:02 +0100
+Subject: [PATCH 2/7] ppp-manager: clear @ppp_watch_id upon pppd termination
+
+Set @ppp_watch_id to zero upon pppd termination, otherwise the call to
+g_source_remove(priv->ppp_watch_id) in dispose() could trigger a failed
+assertion.
+
+(cherry picked from commit 5f93f0101538db39efe0f9ea2316e63bff953bf0)
+---
+ src/ppp-manager/nm-ppp-manager.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
+index d27b262..85ca9c5 100644
+--- a/src/ppp-manager/nm-ppp-manager.c
++++ b/src/ppp-manager/nm-ppp-manager.c
+@@ -828,6 +828,7 @@ ppp_watch_cb (GPid pid, gint status, gpointer user_data)
+ 
+ 	nm_log_dbg (LOGD_PPP, "pppd pid %d cleaned up", priv->pid);
+ 	priv->pid = 0;
++	priv->ppp_watch_id = 0;
+ 	g_signal_emit (manager, signals[STATE_CHANGED], 0, NM_PPP_STATUS_DEAD);
+ }
+ 
+-- 
+2.5.0
+
meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-device-update-ip_iface-only-if-IP-interface-exists.patch new file +45 -0

45 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager/0006-Fix-nm-version-macro-includes.patch new file +58 -0

58 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb +5 -1
index 81ce953..b47a8c8 100644
@@ -15,6 +15,10 @@ SRC_URI = " \
     ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
     file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
     file://0002-add-pkg-config-for-libgcrypt.patch \
+    file://0003-core-fix-failure-to-configure-routes-due-to-wrong-de.patch \
+    file://0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch \
+    file://0005-device-update-ip_iface-only-if-IP-interface-exists.patch \
+    file://0006-Fix-nm-version-macro-includes.patch \
 "
 SRC_URI[md5sum] = "a8f54460a4708efd840358f32d0968fd"
 SRC_URI[sha256sum] = "1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc"
@@ -46,7 +50,7 @@ PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
 PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
 PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
 PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
-PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
+PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp"
 # Use full featured dhcp client instead of internal one
 PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
 PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
Signature · 1 line
2.5.0
#3 lore raw

PATCH v4 3/3 networkmanager-openvpn: Update to 1.0.8

In reply to Adrian Freihofer
---
 ...etworkmanager-openvpn_1.0.6.bb => networkmanager-openvpn_1.0.8.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-connectivity/networkmanager/{networkmanager-openvpn_1.0.6.bb => networkmanager-openvpn_1.0.8.bb} (83%)
meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.8.bb renamed from meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.6.bb +2 -2
similarity index 83%
rename from meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.6.bb
rename to meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.8.bb
index 8334123..258ee68 100644
@@ -10,8 +10,8 @@ inherit gnomebase useradd gettext systemd
 
 SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "02931c0302310d06e43d413b5a7a3261"
-SRC_URI[sha256sum] = "c982b644fa43d3019cb654a17e692bb3a7175a86d28065ea51f55ae7dfe45d8c"
+SRC_URI[md5sum] = "758a9951ad5e20a37c72cc7326c9c750"
+SRC_URI[sha256sum] = "1b979519d72ba4d78e729d4856c5b53fad914ca7ee3ca91209ce489ba78912ac"
 
 S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
 
Signature · 1 line
2.5.0