diff --git a/lang/python/python-aio-mqtt-mod/Makefile b/lang/python/python-aio-mqtt-mod/Makefile index b5afab5cc..ae553fc44 100644 --- a/lang/python/python-aio-mqtt-mod/Makefile +++ b/lang/python/python-aio-mqtt-mod/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-aio-mqtt-mod -PKG_VERSION:=0.3.3 +PKG_VERSION:=0.3.4 PKG_RELEASE:=1 PYPI_NAME:=aio-mqtt-mod -PKG_HASH:=2271f8a2fd6c6aea914896dc3d4dd6e384cd0da405b06dcfa566bd01f968bf9d +PKG_HASH:=340184b35771b7eb7982072fcca313213d856638dd7f98b99bda3ab16ba23552 PKG_MAINTAINER:=Quintin Hill PKG_LICENSE:=Apache-2.0 @@ -27,7 +27,7 @@ define Package/python3-aio-mqtt-mod SUBMENU:=Python TITLE:=Asynchronous MQTT client URL:=https://github.com/devbis/aio-mqtt - DEPENDS:=+python3-light +python3-asyncio +python3-openssl + DEPENDS:=+python3-light +python3-asyncio endef define Package/python3-aio-mqtt-mod/description diff --git a/lang/python/python-ble2mqtt/Makefile b/lang/python/python-ble2mqtt/Makefile index 8e78d36ee..7a99110a8 100644 --- a/lang/python/python-ble2mqtt/Makefile +++ b/lang/python/python-ble2mqtt/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-ble2mqtt -PKG_VERSION:=0.1.7 -PKG_RELEASE:=2 +PKG_VERSION:=0.1.8 +PKG_RELEASE:=1 PYPI_NAME:=ble2mqtt -PKG_HASH:=c57d6823f1133ce0b5e0e3d9f7d2b3fd58d2ad64c0cc86cb3fa180b178999fa6 +PKG_HASH:=206f707f5ad04b72247b1e772a569e14167e109f4e9f13d1d74eb4b049d4e6da PKG_MAINTAINER:=Quintin Hill PKG_LICENSE:=MIT diff --git a/lang/python/python-dbus-fast/Makefile b/lang/python/python-dbus-fast/Makefile index ddcfdb046..74b79d9bf 100644 --- a/lang/python/python-dbus-fast/Makefile +++ b/lang/python/python-dbus-fast/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-dbus-fast -PKG_VERSION:=1.86.0 +PKG_VERSION:=1.91.2 PKG_RELEASE:=1 PYPI_NAME:=dbus-fast PYPI_SOURCE_NAME:=dbus_fast -PKG_HASH:=ca376a360f1bc2c3d59e9edfb5e4de5be389cca37e8c92f4539176ddf755341e +PKG_HASH:=648b70804da35c92ac44af1d321aeb19df6596dbad362adc2f2507fd99f0f5ae PKG_MAINTAINER:=Quintin Hill PKG_LICENSE:=MIT diff --git a/lang/python/python-dbus-fast/patches/001-unpin-setuptools.patch b/lang/python/python-dbus-fast/patches/001-unpin-setuptools.patch deleted file mode 100644 index 327f0e74d..000000000 --- a/lang/python/python-dbus-fast/patches/001-unpin-setuptools.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -97,5 +97,5 @@ module = "docs.*" - ignore_errors = true - - [build-system] --requires = ['setuptools>=65.4.1', 'wheel', 'Cython', "poetry-core>=1.0.0"] -+requires = ['setuptools', 'wheel', 'Cython', "poetry-core>=1.0.0"] - build-backend = "poetry.core.masonry.api" diff --git a/net/dnslookup/Makefile b/net/dnslookup/Makefile index 1c178a76b..3ac257c33 100644 --- a/net/dnslookup/Makefile +++ b/net/dnslookup/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnslookup -PKG_VERSION:=1.9.1 +PKG_VERSION:=1.9.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ameshkov/dnslookup/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=ac108b80f5d7b510ce1fdb1880470d177c5b89cf228c34302442527cf68bb76e +PKG_HASH:=0f9b19f57c0d2fbae03e6ba2f652af017e3ceb8f8ed2a3efb3f983e48bc304fe PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MIT diff --git a/net/dnsproxy/Makefile b/net/dnsproxy/Makefile index 8260170b3..b791903f1 100644 --- a/net/dnsproxy/Makefile +++ b/net/dnsproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsproxy -PKG_VERSION:=0.52.0 +PKG_VERSION:=0.54.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=e650ab9df52e33de1431690b84e700e88212dfc14684d0a88dd148f3cfc8336a +PKG_HASH:=13d25158408387995cbb294efe630f14bf1340f50305e895854c950e1a34d498 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=Apache-2.0 diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index 8a4958404..6819e96b9 100644 --- a/net/modemmanager/Makefile +++ b/net/modemmanager/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager PKG_SOURCE_VERSION:=1.20.6 -PKG_RELEASE:=8 +PKG_RELEASE:=11 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git diff --git a/net/modemmanager/files/modemmanager.proto b/net/modemmanager/files/modemmanager.proto index b8ebce924..e97b768d0 100755 --- a/net/modemmanager/files/modemmanager.proto +++ b/net/modemmanager/files/modemmanager.proto @@ -327,7 +327,6 @@ modemmanager_disconnected_method_common() { local interface="$1" echo "running disconnection (common)" - proto_notify_error "${interface}" MM_DISCONNECT_IN_PROGRESS proto_init_update "*" 0 proto_send_update "${interface}" @@ -336,15 +335,17 @@ modemmanager_disconnected_method_common() { proto_modemmanager_init_config() { available=1 no_device=1 - proto_config_add_string device - proto_config_add_string apn - proto_config_add_string 'allowedauth:list(string)' - proto_config_add_string username - proto_config_add_string password - proto_config_add_string pincode - proto_config_add_string iptype - proto_config_add_string plmn - proto_config_add_int signalrate + proto_config_add_string device + proto_config_add_string apn + proto_config_add_string 'allowedauth:list(string)' + proto_config_add_string username + proto_config_add_string password + proto_config_add_string allowedmode + proto_config_add_string preferredmode + proto_config_add_string pincode + proto_config_add_string iptype + proto_config_add_string plmn + proto_config_add_int signalrate proto_config_add_boolean lowpower proto_config_add_boolean allow_roaming proto_config_add_defaults @@ -359,18 +360,65 @@ append_param() { connectargs="${connectargs}${param}" } +modemmanager_set_allowed_mode() { + local device="$1" + local interface="$2" + local allowedmode="$3" + + echo "setting allowed mode to '${allowedmode}'" + mmcli --modem="${device}" --set-allowed-modes="${allowedmode}" || { + proto_notify_error "${interface}" MM_INVALID_ALLOWED_MODES_LIST + proto_block_restart "${interface}" + return 1 + } +} + +modemmanager_set_preferred_mode() { + local device="$1" + local interface="$2" + local allowedmode="$3" + local preferredmode="$4" + + [ -z "${preferredmode}" ] && { + echo "no preferred mode configured" + proto_notify_error "${interface}" MM_NO_PREFERRED_MODE_CONFIGURED + proto_block_restart "${interface}" + return 1 + } + + [ -z "${allowedmode}" ] && { + echo "no allowed mode configured" + proto_notify_error "${interface}" MM_NO_ALLOWED_MODE_CONFIGURED + proto_block_restart "${interface}" + return 1 + } + + echo "setting preferred mode to '${preferredmode}' (${allowedmode})" + mmcli --modem="${device}" \ + --set-preferred-mode="${preferredmode}" \ + --set-allowed-modes="${allowedmode}" || { + proto_notify_error "${interface}" MM_FAILED_SETTING_PREFERRED_MODE + proto_block_restart "${interface}" + return 1 + } +} + proto_modemmanager_setup() { local interface="$1" local modempath modemstatus bearercount bearerpath connectargs bearerstatus beareriface local bearermethod_ipv4 bearermethod_ipv6 auth cliauth local operatorname operatorid registration accesstech signalquality + local allowedmode preferredmode - local device apn allowedauth username password pincode iptype plmn metric signalrate allow_roaming + local device apn allowedauth username password pincode + local iptype plmn metric signalrate allow_roaming local address prefix gateway mtu dns1 dns2 - json_get_vars device apn allowedauth username password pincode iptype plmn metric signalrate allow_roaming + json_get_vars device apn allowedauth username password + json_get_vars pincode iptype plmn metric signalrate allow_roaming + json_get_vars allowedmode preferredmode # validate sysfs path given in config [ -n "${device}" ] || { @@ -391,6 +439,33 @@ proto_modemmanager_setup() { } echo "modem available at ${modempath}" + [ -z "${allowedmode}" ] || { + case "$allowedmode" in + "2g") + modemmanager_set_allowed_mode "$device" \ + "$interface" "2g" + ;; + "3g") + modemmanager_set_allowed_mode "$device" \ + "$interface" "3g" + ;; + "4g") + modemmanager_set_allowed_mode "$device" \ + "$interface" "4g" + ;; + "5g") + modemmanager_set_allowed_mode "$device" \ + "$interface" "5g" + ;; + *) + modemmanager_set_preferred_mode "$device" \ + "$interface" "${allowedmode}" "${preferredmode}" + ;; + esac + # check error for allowed_mode and preferred_mode function call + [ "$?" -ne "0" ] && return 1 + } + # always cleanup before attempting a new connection, just in case modemmanager_cleanup_connection "${modemstatus}" @@ -561,7 +636,6 @@ proto_modemmanager_teardown() { # disable mmcli --modem="${device}" --disable - proto_notify_error "${interface}" MM_MODEM_DISABLED # low power, only if requested [ "${lowpower:-0}" -lt 1 ] || diff --git a/utils/qemu/Makefile b/utils/qemu/Makefile index ba6da4e1c..4f99c320d 100644 --- a/utils/qemu/Makefile +++ b/utils/qemu/Makefile @@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/package.mk QEMU_DEPS_IN_GUEST := @(TARGET_x86_64||TARGET_armsr||TARGET_malta) -QEMU_DEPS_IN_HOST := @(TARGET_x86_64||TARGET_sunxi) +QEMU_DEPS_IN_HOST := @(TARGET_x86_64||TARGET_armsr_armv8||TARGET_sunxi) QEMU_DEPS_IN_HOST += +libstdcpp QEMU_DEPS_IN_HOST += $(ICONV_DEPENDS) @@ -220,6 +220,7 @@ endef qemu-target-list := \ x86_64-softmmu \ arm-softmmu \ + aarch64-softmmu \ qemu-target-x86_64-softmmu-deps:= \ +qemu-firmware-pxe \