From 1f92066037ff71aa895fe552d4821247010da72e Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 26 Jun 2019 12:46:09 +0000 Subject: [PATCH 1/1] network-manager: Bump version 1.16.2 Signed-off-by: Pascal Vizeli --- ...we-have-enough-space-for-the-DHCP6-o.patch | 38 ------------------- package/network-manager/Config.in | 5 ++- package/network-manager/network-manager.hash | 3 +- package/network-manager/network-manager.mk | 10 +++-- 4 files changed, 11 insertions(+), 45 deletions(-) delete mode 100644 package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch diff --git a/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch b/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch deleted file mode 100644 index c6066abe28..0000000000 --- a/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 01ca2053bbea09f35b958c8cc7631e15469acb79 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Fri, 19 Oct 2018 12:12:33 +0200 -Subject: dhcp6: make sure we have enough space for the DHCP6 option header - -Fixes a vulnerability originally discovered by Felix Wilhelm from -Google. - -CVE-2018-15688 -LP: #1795921 -https://bugzilla.redhat.com/show_bug.cgi?id=1639067 - -(cherry picked from commit 4dac5eaba4e419b29c97da38a8b1f82336c2c892) - -Patch downloaded from upstream commit: -https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=01ca2053bbea09f35b958c8cc7631e15469acb79 - -Signed-off-by: Bernd Kuhls ---- - src/systemd/src/libsystemd-network/dhcp6-option.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c -index d178fe2..9027c14 100644 ---- a/src/systemd/src/libsystemd-network/dhcp6-option.c -+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c -@@ -108,7 +108,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) { - return -EINVAL; - } - -- if (*buflen < len) -+ if (*buflen < offsetof(DHCP6Option, data) + len) - return -ENOBUFS; - - ia_hdr = *buf; --- -cgit v1.1 - diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index ca508185f0..1db6f32d31 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -16,8 +16,9 @@ config BR2_PACKAGE_NETWORK_MANAGER select BR2_PACKAGE_LIBGUDEV select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_WIRELESS_TOOLS - select BR2_PACKAGE_WIRELESS_TOOLS_LIB + select BR2_PACKAGE_WPA_SUPPLICANT + select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW + select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION select BR2_PACKAGE_READLINE select BR2_PACKAGE_LIBNDP help diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 3439439175..f1bc5d1b09 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,4 @@ # From https://download.gnome.org/sources/NetworkManager/1.10/NetworkManager-1.10.8.sha256sum -sha256 eb4ac8ce75fed5ec804f409caec7b54342d4e01512baf7d7fc119fd40ac8a938 NetworkManager-1.10.8.tar.xz +sha256 8fe9cd2c45bd661c58a91b03d8a922d6d2ab6b25bc185b2d3f050c80f427589f NetworkManager-1.16.2.tar.xz # Locally computed sha256 49d9659a4f9a09747c320d51d3cf9dfde210de67b70862acf849890f6477b00d COPYING -sha256 3a2968e3abb4fea464cd8dc1146d71996f9544af91a5f687bc4f3a2932df49b4 libnm-util/COPYING diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 2b9f68a030..2951f1230e 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,13 +4,13 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.10 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).8 +NETWORK_MANAGER_VERSION_MAJOR = 1.16 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \ - libgcrypt wireless_tools util-linux host-intltool readline libndp libgudev + libgcrypt wpa_supplicant util-linux host-intltool readline libndp libgudev NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.0+ (libnm-util) NETWORK_MANAGER_LICENSE_FILES = COPYING libnm-util/COPYING @@ -93,6 +93,7 @@ endef define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants ln -sf /usr/lib/systemd/system/NetworkManager.service \ $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service @@ -100,6 +101,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD ln -sf /usr/lib/systemd/system/NetworkManager.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service + ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \ + $(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service + ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \ $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service endef -- 2.17.1