networkmanager 1.0.6 -> 1.0.10
v2 cover networkmanager 1.0.6 -> 1.0.10
networkmanager: update to 1.0.10
networkmanager: add patches, one of them fixes broken openvpn
networkmanager-openvpn: Update to 1.0.8
networkmanager: fix ppp rdepend
Adrian Freihofer (3):
networkmanager: add patches
networkmanager-openvpn: Update to 1.0.8
networkmanager: fix ppp rdepend
Dai Caiyun (1):
networkmanager: 1.0.6 -> 1.0.10
.../networkmanager/networkmanager-openvpn_1.0.6.bb | 31 ------ .../networkmanager/networkmanager-openvpn_1.0.8.bb | 31 ++++++ ...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 ++++++++ .../networkmanager/networkmanager_1.0.10.bb | 120 +++++++++++++++++++++ .../networkmanager/networkmanager_1.0.6.bb | 117 -------------------- 7 files changed, 279 insertions(+), 148 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.6.bb create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.8.bb 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_1.0.10.bb delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
Signature · 1 line
2.5.0
PATCH v2 1/4 networkmanager: 1.0.6 -> 1.0.10
From: Dai Caiyun <[email protected]>
Upgrade networkmanager from 1.0.6 to 1.0.10.
--- .../networkmanager/networkmanager_1.0.10.bb | 117 +++++++++++++++++++++ .../networkmanager/networkmanager_1.0.6.bb | 117 --------------------- 2 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb new file +117 -0
@@ -0,0 +1,117 @@ +SUMMARY = "NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ + file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ + file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b \ +" + +DEPENDS = "libnl dbus dbus-glib libgudev util-linux libndp libnewt" + +inherit gnomebase gettext systemd bluetooth + +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 \ +" +SRC_URI[md5sum] = "a8f54460a4708efd840358f32d0968fd" +SRC_URI[sha256sum] = "1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc" + +S = "${WORKDIR}/NetworkManager-${PV}" + +EXTRA_OECONF = " \ + --disable-ifcfg-rh \ + --disable-ifnet \ + --disable-ifcfg-suse \ + --disable-more-warnings \ + --with-iptables=${sbindir}/iptables \ + --with-tests \ + --with-nmtui=yes \ +" + +PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','bluetooth','${BLUEZ}','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \ +" +PACKAGECONFIG[systemd] = " \ + --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ + --without-systemdsystemunitdir, \ + polkit \ +" +PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +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" +# Use full featured dhcp client instead of internal one +PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" +PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" +PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" +PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools" +PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" +PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" + +PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion \ + ${PN}-nmtui ${PN}-nmtui-doc \ + ${PN}-adsl \ +" + +FILES_libnmutil += "${libdir}/libnm-util.so.*" +FILES_libnmglib += "${libdir}/libnm-glib.so.*" +FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" + +FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" + +FILES_${PN} += " \ + ${libexecdir} \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ + ${libdir}/NetworkManager/*.so \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${base_libdir}/udev/* \ + ${systemd_unitdir}/system \ +" + +RRECOMMENDS_${PN} += "iptables \ + ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \ +" +RCONFLICTS_${PN} = "connman" + +FILES_${PN}-dbg += " \ + ${libdir}/NetworkManager/.debug/ \ + ${libdir}/pppd/*/.debug/ \ +" + +FILES_${PN}-dev += " \ + ${datadir}/NetworkManager/gdb-cmd \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ +" + +FILES_${PN}-tests = " \ + ${bindir}/nm-online \ +" + +FILES_${PN}-bash-completion = "${datadir}/bash-completion" + +FILES_${PN}-nmtui = " \ + ${bindir}/nmtui \ + ${bindir}/nmtui-edit \ + ${bindir}/nmtui-connect \ + ${bindir}/nmtui-hostname \ +" + +FILES_${PN}-nmtui-doc = " \ + ${mandir}/man1/nmtui* \ +" + +SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service" + +do_install_append() { + rm -rf ${D}/run ${D}${localstatedir}/run +}
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb deleted +0 -117
117 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH v2 2/4 networkmanager: add patches
In reply to Adrian FreihoferApply three bug fix patches from NM git.
--- ...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 ++++++++++++++++++ .../networkmanager/networkmanager_1.0.10.bb | 3 ++ 4 files changed, 131 insertions(+) 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
meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-core-fix-failure-to-configure-routes-due-to-wrong-de.patch new file +54 -0
@@ -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
@@ -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_1.0.10.bb +3 -0
@@ -15,6 +15,9 @@ 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 \ " SRC_URI[md5sum] = "a8f54460a4708efd840358f32d0968fd" SRC_URI[sha256sum] = "1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc"
Signature · 1 line
2.5.0
PATCH v2 3/4 networkmanager-openvpn: Update to 1.0.8
In reply to Adrian Freihofer--- .../networkmanager/networkmanager-openvpn_1.0.6.bb | 31 ---------------------- .../networkmanager/networkmanager-openvpn_1.0.8.bb | 31 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.6.bb create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.8.bb
meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.6.bb deleted +0 -31
@@ -1,31 +0,0 @@ -SUMMARY = "NetworkManager-openvpn-plugin" -SECTION = "net/misc" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c" - -DEPENDS = "dbus dbus-glib networkmanager openvpn" - -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" - -S = "${WORKDIR}/NetworkManager-openvpn-${PV}" - -PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome" - -# Create user and group nm-openvpn that are needed since version 1.0.6 -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system nm-openvpn" - -FILES_${PN} += " \ - ${libdir}/NetworkManager/*.so \ -" - -RDEPENDS_${PN} = " \ - networkmanager \ - openvpn \ -"
meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.8.bb new file +31 -0
@@ -0,0 +1,31 @@ +SUMMARY = "NetworkManager-openvpn-plugin" +SECTION = "net/misc" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c" + +DEPENDS = "dbus dbus-glib networkmanager openvpn" + +inherit gnomebase useradd gettext systemd + +SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" + +SRC_URI[md5sum] = "758a9951ad5e20a37c72cc7326c9c750" +SRC_URI[sha256sum] = "1b979519d72ba4d78e729d4856c5b53fad914ca7ee3ca91209ce489ba78912ac" + +S = "${WORKDIR}/NetworkManager-openvpn-${PV}" + +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome" + +# Create user and group nm-openvpn that are needed since version 1.0.6 +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system nm-openvpn" + +FILES_${PN} += " \ + ${libdir}/NetworkManager/*.so \ +" + +RDEPENDS_${PN} = " \ + networkmanager \ + openvpn \ +"
Signature · 1 line
2.5.0
PATCH v2 4/4 networkmanager: fix ppp rdepend
In reply to Adrian Freihoferpppd is not on the target if NM does not list is as a runtime dependency.
--- meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb +1 -1
@@ -49,7 +49,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
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 12-01-16 om 11:09 schreef Adrian Freihofer:
Quoted 3 lines
networkmanager: update to 1.0.10 networkmanager: add patches, one of them fixes broken openvpn networkmanager-openvpn: Update to 1.0.8
networkmanager: fix ppp rdepend
Patch 2 and 4 can be squashed into patch 1.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFWlNgKMkyGM64RGpERAipgAJ9LLE+bMWhoMB2njYM0z/QF/sjxfACgsFkQ KNoBjCYNeyIr9ML3A2fxkF0=
=0E4A
-----END PGP SIGNATURE-----