Merge pull request #10487 from aleksander0m/aleksander/mm-fixes

ModemManager fixes and update to 1.12.0

net/modemmanager/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
-PKG_VERSION:=1.10.8
-PKG_RELEASE:=3
+PKG_VERSION:=1.12.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager
-PKG_HASH:=cbe174078dbdf3f746a55f0004353d3c27da2a31da553036d90fc7dc34a0169a
+PKG_HASH:=3daca86164145fffb589939433f596c13fa077c9a187c0d5820fdd5b4e4a6424
 PKG_BUILD_DIR:=$(BUILD_DIR)/ModemManager-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Nicholas Smith <nicholas.smith@telcoantennas.com.au>
@@ -117,6 +117,9 @@ define Package/modemmanager/install
 	$(INSTALL_DIR) $(1)/usr/share/dbus-1/system-services
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/dbus-1/system-services/org.freedesktop.ModemManager1.service $(1)/usr/share/dbus-1/system-services
 
+	$(INSTALL_DIR) $(1)/usr/share/ModemManager
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/*.conf $(1)/usr/share/ModemManager
+
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/modemmanager.init $(1)/etc/init.d/modemmanager
 

net/modemmanager/files/modemmanager.common

@@ -11,6 +11,7 @@
 # Runtime state
 
 MODEMMANAGER_RUNDIR="/var/run/modemmanager"
+MODEMMANAGER_PID_FILE="${MODEMMANAGER_RUNDIR}/modemmanager.pid"
 MODEMMANAGER_CDCWDM_CACHE="${MODEMMANAGER_RUNDIR}/cdcwdm.cache"
 MODEMMANAGER_SYSFS_CACHE="${MODEMMANAGER_RUNDIR}/sysfs.cache"
 MODEMMANAGER_EVENTS_CACHE="${MODEMMANAGER_RUNDIR}/events.cache"

net/modemmanager/files/modemmanager.proto

@@ -175,7 +175,9 @@ modemmanager_connected_method_dhcp() {
 	json_add_string name "${interface}_4"
 	json_add_string ifname "@${interface}"
 	json_add_string proto "dhcp"
+	proto_add_dynamic_defaults
 	[ -n "$metric" ] && json_add_int metric "${metric}"
+	json_close_object
 	ubus call network add_dynamic "$(json_dump)"
 }
 
@@ -375,7 +377,7 @@ proto_modemmanager_teardown() {
 	}
 
 	# load bearer connection method
-	bearerstatus=$(mmcli --bearer "${bearerpath}")
+	bearerstatus=$(mmcli --bearer "${bearerpath}" --output-keyvalue)
 	bearermethod=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.method")
 	[ -n "${bearermethod}" ] || {
 		echo "couldn't load bearer method"