diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2016-11-06 23:06:51 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-11-22 13:38:21 +0100 |
commit | 71a05ec0040b2f873a1ebc9c3ab503f5f1303e14 (patch) | |
tree | 6a677cbe485e4d560e008708a055d6270310f74f | |
parent | a7ecdec5200f2e469edb429d14489f65910a16fb (diff) | |
download | meta-openembedded-71a05ec0040b2f873a1ebc9c3ab503f5f1303e14.tar.gz |
networkmanager: update to 1.4.2
* could not find out what made md5 change for
docs/api/html/license.html but checked: it is still GPLv2
* all traces to libgcrypt are gone -> remove 0002-add-pkg-config-for-libgcrypt.patch
* upstream sets up service same as in
0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch
* patches 0003.. 0004.. 0005.. were not used -> remove
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7 files changed, 18 insertions, 226 deletions
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0006-Fix-nm-version-macro-includes.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch index aa57c832c..aa57c832c 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0006-Fix-nm-version-macro-includes.patch +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch | |||
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-add-pkg-config-for-libgcrypt.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-add-pkg-config-for-libgcrypt.patch deleted file mode 100644 index bb95eaaa4..000000000 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-add-pkg-config-for-libgcrypt.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From a9261fee4a41045c42e0d292237cee532e11982c Mon Sep 17 00:00:00 2001 | ||
2 | From: Adrian <adrian.freihofer@gmail.com> | ||
3 | Date: Thu, 27 Nov 2014 15:43:26 +0100 | ||
4 | Subject: [PATCH] add pkg config for libgcrypt | ||
5 | |||
6 | --- | ||
7 | configure.ac | 18 +++++++----------- | ||
8 | 1 file changed, 7 insertions(+), 11 deletions(-) | ||
9 | |||
10 | diff --git a/configure.ac b/configure.ac | ||
11 | index 94b0758..654a015 100644 | ||
12 | --- a/configure.ac | ||
13 | +++ b/configure.ac | ||
14 | @@ -480,17 +480,13 @@ if test x"$ac_crypto" = xnss; then | ||
15 | with_nss=yes | ||
16 | elif test x"$ac_crypto" = xgnutls; then | ||
17 | PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.2]) | ||
18 | - AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) | ||
19 | - if test x"$LIBGCRYPT_CONFIG" = xno; then | ||
20 | - AC_MSG_ERROR([gnutls explicitly requested but gcrypt not found on system]) | ||
21 | - else | ||
22 | - AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have libgnutls]) | ||
23 | - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` | ||
24 | - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` | ||
25 | - AC_SUBST(LIBGCRYPT_CFLAGS) | ||
26 | - AC_SUBST(LIBGCRYPT_LIBS) | ||
27 | - with_gnutls=yes | ||
28 | - fi | ||
29 | + AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have libgnutls]) | ||
30 | + PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= 1.1.42], [ | ||
31 | + AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.]) | ||
32 | + with_gnutls=yes | ||
33 | + ], [ | ||
34 | + AC_MSG_ERROR([gnutls explicitly requested but gcrypt not found on system]) | ||
35 | + ]) | ||
36 | else | ||
37 | AC_MSG_ERROR([Please choose either 'nss' or 'gnutls' for certificate and crypto operations]) | ||
38 | fi | ||
39 | -- | ||
40 | 1.9.1 | ||
41 | |||
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch deleted file mode 100644 index 4eb9e2168..000000000 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 0690452b863286e524d2037427816b7850301f93 Mon Sep 17 00:00:00 2001 | ||
2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> | ||
3 | Date: Tue, 6 Sep 2016 09:27:38 +0800 | ||
4 | Subject: [PATCH] networkmanager: fixed issues of | ||
5 | NetworkManager-wait-online.service.in. | ||
6 | |||
7 | Remove network.target in "Before" to avoid circle dependency. | ||
8 | Wants=network.target | ||
9 | Before=network.target network-online.target | ||
10 | |||
11 | Correct the "WantedBy" to network-online.target. | ||
12 | |||
13 | Upstream-status: Pending | ||
14 | |||
15 | Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> | ||
16 | --- | ||
17 | data/NetworkManager-wait-online.service.in | 7 ++++--- | ||
18 | 1 file changed, 4 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in | ||
21 | index 6ad6942..1753d20 100644 | ||
22 | --- a/data/NetworkManager-wait-online.service.in | ||
23 | +++ b/data/NetworkManager-wait-online.service.in | ||
24 | @@ -1,13 +1,14 @@ | ||
25 | [Unit] | ||
26 | Description=Network Manager Wait Online | ||
27 | +Documentation=man:nm-online(1) | ||
28 | Requisite=NetworkManager.service | ||
29 | After=NetworkManager.service | ||
30 | -Wants=network.target | ||
31 | -Before=network.target network-online.target | ||
32 | +Before=network-online.target | ||
33 | |||
34 | [Service] | ||
35 | Type=oneshot | ||
36 | ExecStart=@bindir@/nm-online -s -q --timeout=30 | ||
37 | +RemainAfterExit=yes | ||
38 | |||
39 | [Install] | ||
40 | -WantedBy=multi-user.target | ||
41 | +WantedBy=network-online.target | ||
42 | -- | ||
43 | 1.9.1 | ||
44 | |||
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-core-fix-failure-to-configure-routes-due-to-wrong-de.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-core-fix-failure-to-configure-routes-due-to-wrong-de.patch deleted file mode 100644 index 5da536e68..000000000 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-core-fix-failure-to-configure-routes-due-to-wrong-de.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From 11aa07ed939193e85516c287a57dee1837242972 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Haller <thaller@redhat.com> | ||
3 | Date: Mon, 4 Jan 2016 18:54:26 +0100 | ||
4 | Subject: [PATCH 1/7] core: fix failure to configure routes due to wrong | ||
5 | device-route for IPv4 peer-addresses | ||
6 | |||
7 | As in the case of a OpenVPN connection, we might add an address like: | ||
8 | 10.8.0.58/32 ptp 10.8.0.57 | ||
9 | |||
10 | In this case, kernel would automatically add a device-route like: | ||
11 | 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 | ||
12 | |||
13 | nm_ip4_config_commit() checks all IP addresses to figure out | ||
14 | the present device-routes. Then the routes are synced by NMRouteManager. | ||
15 | Due to a bug, we would not consider the peer-address, but the local-address | ||
16 | and configure a route 10.8.0.58/32, instead of 10.8.0.57/32. | ||
17 | |||
18 | That stays mostly unnoticed, because usually the peer and the local-address are | ||
19 | in the same subnet, so that there is no difference (/32 is an example of the | ||
20 | peer-address being in a different subnet). | ||
21 | |||
22 | It also seems that due to a bug fixed by df4e5357521 this issue didn't surface. | ||
23 | Probably because we would not notice the 10.8.0.57/32 right away and thus | ||
24 | nm_route_manager_ip4_route_sync() would not wrongly delete it. | ||
25 | |||
26 | https://bugzilla.gnome.org/show_bug.cgi?id=759892 | ||
27 | |||
28 | https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809195 | ||
29 | https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809494 | ||
30 | https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809526 | ||
31 | https://bugs.archlinux.org/task/47535 | ||
32 | https://bugzilla.redhat.com/show_bug.cgi?id=1294309 | ||
33 | https://mail.gnome.org/archives/networkmanager-list/2015-December/msg00059.html | ||
34 | --- | ||
35 | src/nm-ip4-config.c | 3 ++- | ||
36 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
37 | |||
38 | diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c | ||
39 | index f625d35..61e29af 100644 | ||
40 | --- a/src/nm-ip4-config.c | ||
41 | +++ b/src/nm-ip4-config.c | ||
42 | @@ -298,7 +298,8 @@ nm_ip4_config_commit (const NMIP4Config *config, int ifindex, gboolean routes_fu | ||
43 | |||
44 | route.ifindex = ifindex; | ||
45 | route.source = NM_IP_CONFIG_SOURCE_KERNEL; | ||
46 | - route.network = nm_utils_ip4_address_clear_host_address (addr->address, addr->plen); | ||
47 | + route.network = nm_utils_ip4_address_clear_host_address (addr->peer_address ? : addr->address, | ||
48 | + addr->plen); | ||
49 | route.plen = addr->plen; | ||
50 | route.pref_src = addr->address; | ||
51 | route.metric = default_route_metric; | ||
52 | -- | ||
53 | 2.5.0 | ||
54 | |||
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch deleted file mode 100644 index 41f288281..000000000 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 8204c2a1968f757599c5ebec9a85efaacb0e522a Mon Sep 17 00:00:00 2001 | ||
2 | From: Beniamino Galvani <bgalvani@redhat.com> | ||
3 | Date: Mon, 4 Jan 2016 14:18:02 +0100 | ||
4 | Subject: [PATCH 2/7] ppp-manager: clear @ppp_watch_id upon pppd termination | ||
5 | |||
6 | Set @ppp_watch_id to zero upon pppd termination, otherwise the call to | ||
7 | g_source_remove(priv->ppp_watch_id) in dispose() could trigger a failed | ||
8 | assertion. | ||
9 | |||
10 | (cherry picked from commit 5f93f0101538db39efe0f9ea2316e63bff953bf0) | ||
11 | --- | ||
12 | src/ppp-manager/nm-ppp-manager.c | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c | ||
16 | index d27b262..85ca9c5 100644 | ||
17 | --- a/src/ppp-manager/nm-ppp-manager.c | ||
18 | +++ b/src/ppp-manager/nm-ppp-manager.c | ||
19 | @@ -828,6 +828,7 @@ ppp_watch_cb (GPid pid, gint status, gpointer user_data) | ||
20 | |||
21 | nm_log_dbg (LOGD_PPP, "pppd pid %d cleaned up", priv->pid); | ||
22 | priv->pid = 0; | ||
23 | + priv->ppp_watch_id = 0; | ||
24 | g_signal_emit (manager, signals[STATE_CHANGED], 0, NM_PPP_STATUS_DEAD); | ||
25 | } | ||
26 | |||
27 | -- | ||
28 | 2.5.0 | ||
29 | |||
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-device-update-ip_iface-only-if-IP-interface-exists.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-device-update-ip_iface-only-if-IP-interface-exists.patch deleted file mode 100644 index 05c2dca00..000000000 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-device-update-ip_iface-only-if-IP-interface-exists.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From cbcb848e6d4f4e8c4aa11c80f1f3dbb7fb2d397e Mon Sep 17 00:00:00 2001 | ||
2 | From: Beniamino Galvani <bgalvani@redhat.com> | ||
3 | Date: Mon, 4 Jan 2016 14:22:01 +0100 | ||
4 | Subject: [PATCH 3/7] device: update @ip_iface only if IP interface exists | ||
5 | |||
6 | If @ip_ifindex is zero, the IP interface has disappeared and | ||
7 | there's no point in updating @ip_iface. | ||
8 | |||
9 | Actually, unconditionally updating @ip_iface is dangerous because it | ||
10 | breaks the assumption used by other functions (as | ||
11 | nm_device_get_ip_ifindex()) that a non-NULL @ip_iface implies a valid | ||
12 | @ip_ifindex. This was causing the scary failure: | ||
13 | |||
14 | devices/nm-device.c:666:get_ip_iface_identifier: assertion failed: (ifindex) | ||
15 | |||
16 | https://bugzilla.redhat.com/show_bug.cgi?id=1268617 | ||
17 | (cherry picked from commit ed536998f9530698ff3082fc5587dbeb7d3a594f) | ||
18 | --- | ||
19 | src/devices/nm-device.c | 7 ++++--- | ||
20 | 1 file changed, 4 insertions(+), 3 deletions(-) | ||
21 | |||
22 | diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c | ||
23 | index bb39ca5..4413e92 100644 | ||
24 | --- a/src/devices/nm-device.c | ||
25 | +++ b/src/devices/nm-device.c | ||
26 | @@ -1526,12 +1526,13 @@ device_ip_link_changed (NMDevice *self) | ||
27 | { | ||
28 | NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); | ||
29 | const NMPlatformLink *pllink; | ||
30 | - int ip_ifindex; | ||
31 | |||
32 | priv->device_ip_link_changed_id = 0; | ||
33 | |||
34 | - ip_ifindex = nm_device_get_ip_ifindex (self); | ||
35 | - pllink = nm_platform_link_get (NM_PLATFORM_GET, ip_ifindex); | ||
36 | + if (!priv->ip_ifindex) | ||
37 | + return G_SOURCE_REMOVE; | ||
38 | + | ||
39 | + pllink = nm_platform_link_get (NM_PLATFORM_GET, priv->ip_ifindex); | ||
40 | if (!pllink) | ||
41 | return G_SOURCE_REMOVE; | ||
42 | |||
43 | -- | ||
44 | 2.5.0 | ||
45 | |||
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.12.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb index 913488085..90d023292 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.12.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb | |||
@@ -4,22 +4,32 @@ SECTION = "net/misc" | |||
4 | LICENSE = "GPLv2+" | 4 | LICENSE = "GPLv2+" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ |
6 | file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ | 6 | file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ |
7 | file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b \ | 7 | file://docs/api/html/license.html;md5=6baf214193dfc5d10b297b41fc2d22c9 \ |
8 | " | 8 | " |
9 | 9 | ||
10 | DEPENDS = "intltool-native libnl dbus dbus-glib dbus-glib-native libgudev util-linux libndp libnewt polkit" | 10 | DEPENDS = " \ |
11 | intltool-native \ | ||
12 | libnl \ | ||
13 | dbus \ | ||
14 | dbus-glib \ | ||
15 | dbus-glib-native \ | ||
16 | libgudev \ | ||
17 | util-linux \ | ||
18 | libndp \ | ||
19 | libnewt \ | ||
20 | polkit \ | ||
21 | jansson \ | ||
22 | " | ||
11 | 23 | ||
12 | inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection | 24 | inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection |
13 | 25 | ||
14 | SRC_URI = " \ | 26 | SRC_URI = " \ |
15 | ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ | 27 | ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ |
16 | file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ | 28 | file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ |
17 | file://0002-add-pkg-config-for-libgcrypt.patch \ | 29 | file://0002-Fix-nm-version-macro-includes.patch \ |
18 | file://0006-Fix-nm-version-macro-includes.patch \ | ||
19 | file://0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch \ | ||
20 | " | 30 | " |
21 | SRC_URI[md5sum] = "ebb273456a81ccf9dfaf2461061b0e96" | 31 | SRC_URI[md5sum] = "59b5b5585467756787c6cb535cbd306e" |
22 | SRC_URI[sha256sum] = "3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e" | 32 | SRC_URI[sha256sum] = "a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204" |
23 | 33 | ||
24 | S = "${WORKDIR}/NetworkManager-${PV}" | 34 | S = "${WORKDIR}/NetworkManager-${PV}" |
25 | 35 | ||
@@ -57,7 +67,7 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" | |||
57 | PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" | 67 | PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" |
58 | PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" | 68 | PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" |
59 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" | 69 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" |
60 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt" | 70 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" |
61 | PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools" | 71 | PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools" |
62 | PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" | 72 | PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" |
63 | PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" | 73 | PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" |
@@ -89,11 +99,6 @@ RRECOMMENDS_${PN} += "iptables \ | |||
89 | " | 99 | " |
90 | RCONFLICTS_${PN} = "connman" | 100 | RCONFLICTS_${PN} = "connman" |
91 | 101 | ||
92 | FILES_${PN}-dbg += " \ | ||
93 | ${libdir}/NetworkManager/.debug/ \ | ||
94 | ${libdir}/pppd/*/.debug/ \ | ||
95 | " | ||
96 | |||
97 | FILES_${PN}-dev += " \ | 102 | FILES_${PN}-dev += " \ |
98 | ${datadir}/NetworkManager/gdb-cmd \ | 103 | ${datadir}/NetworkManager/gdb-cmd \ |
99 | ${libdir}/pppd/*/*.la \ | 104 | ${libdir}/pppd/*/*.la \ |