Merge pull request #20584 from mpeleshenko/samba4-4.17.5

samba4: update to 4.17.5

diff --git a/libs/libmbim/Makefile b/libs/libmbim/Makefile
index abd94d617aea056607f48b72ee5b73153cb466b0..8591b4337f7a329c58d8f6a640b39d2f3023f94f 100644 (file)
--- a/libs/libmbim/Makefile
+++ b/libs/libmbim/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmbim
-PKG_SOURCE_VERSION:=1.28.2
+PKG_SOURCE_VERSION:=1.28.4
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
-PKG_MIRROR_HASH:=0b0b46016738fc22355d5a58c8a2d1b2f04906c49c51a50b57a09640d13b00b7
+PKG_MIRROR_HASH:=7ecc6d1e565392817311254045337907bbad015b46ec88542ea63594f47778be
 
 PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
 

diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile
index bfa3bab7c9c54a154f04493a1d14d6773f5ee6d5..8dac951552d2d0b6a71032d2437faa458274b364 100644 (file)
--- a/libs/libqmi/Makefile
+++ b/libs/libqmi/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libqmi
-PKG_SOURCE_VERSION:=1.32.2
+PKG_SOURCE_VERSION:=1.32.4
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
-PKG_MIRROR_HASH:=711d16d75a6a9afaefcf2be1bc845a4a6181dff786dfbd079e41e91279a0be91
+PKG_MIRROR_HASH:=674f5848c56c11cdc2fbc82c52e5bc2a3a0fddb56315dc4220544688a7b0e17a
 
 PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
 

diff --git a/net/frp/Makefile b/net/frp/Makefile
index d77066e9becb8d85a43773ddfa2828752a9d6e87..7adbac02c924a4df0a0b46e0e67187111613533c 100644 (file)
--- a/net/frp/Makefile
+++ b/net/frp/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=frp
-PKG_VERSION:=0.46.1
+PKG_VERSION:=0.48.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=af3e8d9d4144cf520cee2609cd45fb575afe711c03cc7441dc89d0402628a869
+PKG_HASH:=efba8ec9fad3369ce62631369f52b78a7248df426b5b54311e96231adac5cc76
 
 PKG_MAINTAINER:=Richard Yu <yurichard3839@gmail.com>
 PKG_LICENSE:=Apache-2.0

diff --git a/net/frp/files/frpc.init b/net/frp/files/frpc.init
index e7f06edbd513d6b3573bd40d1eb01732abe6068c..68fe43c4e022a49e3e88203f888b05cd566469ee 100644 (file)
--- a/net/frp/files/frpc.init
+++ b/net/frp/files/frpc.init
@@ -69,6 +69,7 @@ start_service() {
 
        procd_open_instance
        procd_set_param command "$PROG" -c "$conf_file"
+       procd_set_param file $conf_file
        procd_set_param stdout $stdout
        procd_set_param stderr $stderr
        [ -n "$user" ] && procd_set_param user "$user"
@@ -77,8 +78,3 @@ start_service() {
        [ -n "$env" ] && config_list_foreach "$init_cfg" env "procd_append_param env"
        procd_close_instance
 }
-
-reload_service() {
-       stop
-       start
-}

diff --git a/net/frp/files/frps.init b/net/frp/files/frps.init
index b87525cd2a3a107331590d5da797a7907a0e1f6f..38f714fb1bed6a69cac1a389f3a70d032a8a9c21 100644 (file)
--- a/net/frp/files/frps.init
+++ b/net/frp/files/frps.init
@@ -67,6 +67,7 @@ start_service() {
 
        procd_open_instance
        procd_set_param command "$PROG" -c "$conf_file"
+       procd_set_param file $conf_file
        procd_set_param stdout $stdout
        procd_set_param stderr $stderr
        [ -n "$user" ] && procd_set_param user "$user"
@@ -75,8 +76,3 @@ start_service() {
        [ -n "$env" ] && config_list_foreach "$init_cfg" env "procd_append_param env"
        procd_close_instance
 }
-
-reload_service() {
-       stop
-       start
-}

diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index 6cbd6f7383e19486683602857d1c8f0403a2929c..e27988733d8db6827709cfb446f71b3ff337bf0b 100644 (file)
--- a/net/modemmanager/Makefile
+++ b/net/modemmanager/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
-PKG_SOURCE_VERSION:=1.20.2
+PKG_SOURCE_VERSION:=1.20.6
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
-PKG_MIRROR_HASH:=f138effc693456c5040ec22e17c0a8b41143c3b17b62437462995c297a9150dc
+PKG_MIRROR_HASH:=e90103e2e42bb826bbbac83937a9a69f50348cd6ce0d8da655a12b65494ce7c9
 
 PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
 PKG_LICENSE:=GPL-2.0-or-later