[ptxdist] [PATCH] networkmanager: version bump 1.10.8 -> 1.12.0

[ptxdist] [PATCH] networkmanager: version bump 1.10.8 -> 1.12.0

[Ladislav Michl]

Most notable changes from packaging perspective are:
- 320422e4cf47 ("build: qualify plugin dir name with a version string")
- drop libnl3 depencency
See NetworkManager's NEWS file for full list.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/networkmanager.in   |  1 -
 rules/networkmanager.make | 24 +++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index 547843c26..70a013940 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -16,7 +16,6 @@ menuconfig NETWORKMANAGER
 	select LIBCURL				if NETWORKMANAGER_CONCHECK
 	select LIBNDP
 	select LIBNEWT				if NETWORKMANAGER_NMTUI
-	select LIBNL3
 	select LIBUUID
 	select MODEMMANAGER			if NETWORKMANAGER_WWAN
 	select PPP				if NETWORKMANAGER_PPP
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 3b93a32c3..c2b0730cb 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION	:= 1.10.8
-NETWORKMANAGER_MD5	:= 4bdcdfd05f609c2c53d3664b6573c078
+NETWORKMANAGER_VERSION	:= 1.12.0
+NETWORKMANAGER_MD5	:= f728a42310c85b53386b172b15d7fc20
 NETWORKMANAGER		:= NetworkManager-$(NETWORKMANAGER_VERSION)
 NETWORKMANAGER_SUFFIX	:= tar.xz
-NETWORKMANAGER_URL	:= https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.10/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
+NETWORKMANAGER_URL	:= https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.12/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_SOURCE	:= $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_DIR	:= $(BUILDDIR)/$(NETWORKMANAGER)
 NETWORKMANAGER_LICENSE	:= GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -43,9 +43,7 @@ NETWORKMANAGER_CONF_OPT = \
 	--disable-rpath \
 	--disable-config-plugin-ibft \
 	--disable-ifcfg-rh \
-	--disable-ifcfg-suse \
 	--enable-ifupdown \
-	--disable-ifnet \
 	--disable-code-coverage \
 	--$(call ptx/endis,PTXCONF_NETWORKMANAGER_WIRELESS)-wifi \
 	--disable-introspection \
@@ -64,7 +62,6 @@ NETWORKMANAGER_CONF_OPT = \
 	--disable-more-logging \
 	--disable-lto \
 	--enable-ld-gc=auto \
-	--disable-address-sanitizer \
 	--disable-undefined-sanitizer \
 	--disable-vala \
 	--disable-tests \
@@ -205,16 +202,21 @@ endif
 
 	@$(call install_tree, networkmanager, 0, 0, -, /usr/libexec/)
 
-	@$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-settings-plugin-ifupdown)
+	@$(call install_lib, networkmanager, 0, 0, 0644, \
+		NetworkManager/$(NETWORKMANAGER_VERSION)/libnm-settings-plugin-ifupdown)
 ifdef PTXCONF_NETWORKMANAGER_WIRELESS
-	@$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-device-plugin-wifi)
+	@$(call install_lib, networkmanager, 0, 0, 0644, \
+		NetworkManager/$(NETWORKMANAGER_VERSION)/libnm-device-plugin-wifi)
 endif
 ifdef PTXCONF_NETWORKMANAGER_WWAN
-	@$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-device-plugin-wwan)
-	@$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-wwan)
+	@$(call install_lib, networkmanager, 0, 0, 0644, \
+		NetworkManager/$(NETWORKMANAGER_VERSION)/libnm-device-plugin-wwan)
+	@$(call install_lib, networkmanager, 0, 0, 0644, \
+		NetworkManager/$(NETWORKMANAGER_VERSION)/libnm-wwan)
 endif
 ifdef PTXCONF_NETWORKMANAGER_PPP
-	@$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-ppp-plugin)
+	@$(call install_lib, networkmanager, 0, 0, 0644, \
+		NetworkManager/$(NETWORKMANAGER_VERSION)/libnm-ppp-plugin)
 	@$(call install_copy, networkmanager, 0, 0, 0644, -, $(PPP_SHARED_INST_PATH)/nm-pppd-plugin.so)
 endif
 	@$(call install_lib, networkmanager, 0, 0, 0644, libnm)
-- 
2.18.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de