From 394cc366b3210924ed270c3745d37a7be3d1965b Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 7 Mar 2023 10:50:02 +0800 Subject: [PATCH 1/9] msgpack-c: Update to 6.0.0 Removed 010-no-gtest.patch as upstream no longer detects it. Signed-off-by: Tianling Shen --- libs/msgpack-c/Makefile | 6 +++--- libs/msgpack-c/patches/010-no-gtest.patch | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 libs/msgpack-c/patches/010-no-gtest.patch diff --git a/libs/msgpack-c/Makefile b/libs/msgpack-c/Makefile index d2d20fe9e..7cdaae73a 100644 --- a/libs/msgpack-c/Makefile +++ b/libs/msgpack-c/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=msgpack-c -PKG_VERSION:=5.0.0 +PKG_VERSION:=6.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/msgpack/msgpack-c/tar.gz/c-$(PKG_VERSION)? -PKG_HASH:=a61288a9a46fd3b3b4cbd48a17736a9568b65419141cb536833f9adfe8fc97d7 +PKG_HASH:=af6f3cf25edb220aa2140b09bb5bdd73ddf00938194bd94ebe5c92090cccb466 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-c-$(PKG_VERSION) PKG_LICENSE:=BSL-1.0 @@ -46,7 +46,7 @@ endef define Package/msgpack-c/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmsgpackc.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmsgpack-c.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,msgpack-c)) diff --git a/libs/msgpack-c/patches/010-no-gtest.patch b/libs/msgpack-c/patches/010-no-gtest.patch deleted file mode 100644 index 7bb4dbeed..000000000 --- a/libs/msgpack-c/patches/010-no-gtest.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,7 +74,6 @@ IF (MSGPACK_CHAR_SIGN) - SET (CMAKE_C_FLAGS "-f${MSGPACK_CHAR_SIGN}-char ${CMAKE_C_FLAGS}") - ENDIF () - --FIND_PACKAGE (GTest) - FIND_PACKAGE (ZLIB) - FIND_PACKAGE (Threads) - IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND) From 928710813baba4f6f5130d936f0cab44c0033b90 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 7 Mar 2023 10:52:37 +0800 Subject: [PATCH 2/9] tmate: fix build against msgpack-c 6.0 This patch is taken from https://git.alpinelinux.org/aports/commit/?id=f923597f4bdea424dc28b1d026269df060596fac Signed-off-by: Tianling Shen --- net/tmate/Makefile | 2 +- net/tmate/patches/020-msgpack-c.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 net/tmate/patches/020-msgpack-c.patch diff --git a/net/tmate/Makefile b/net/tmate/Makefile index 0ab28a0ba..ee3c0b588 100644 --- a/net/tmate/Makefile +++ b/net/tmate/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tmate PKG_VERSION:=2.4.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tmate-io/tmate/tar.gz/$(PKG_VERSION)? diff --git a/net/tmate/patches/020-msgpack-c.patch b/net/tmate/patches/020-msgpack-c.patch new file mode 100644 index 000000000..5d0cec628 --- /dev/null +++ b/net/tmate/patches/020-msgpack-c.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -201,7 +201,7 @@ fi + + PKG_CHECK_MODULES( + MSGPACK, +- msgpack >= 1.1.0, ++ msgpack-c >= 1.1.0, + [ + CPPFLAGS="$MSGPACK_CFLAGS $CPPFLAGS" + LIBS="$MSGPACK_LIBS $LIBS" From c49a1dad52f6556757dc93f787c84cac76629435 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 7 Mar 2023 15:44:29 +0800 Subject: [PATCH 3/9] tmate-ssh-server: fix build against msgpack-c 6.0 This patch is taken from https://git.alpinelinux.org/aports/commit/?id=f923597f4bdea424dc28b1d026269df060596fac Signed-off-by: Tianling Shen --- net/tmate-ssh-server/Makefile | 2 +- net/tmate-ssh-server/patches/010-msgpack-c.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 net/tmate-ssh-server/patches/010-msgpack-c.patch diff --git a/net/tmate-ssh-server/Makefile b/net/tmate-ssh-server/Makefile index c5ffe3dec..f45a7f5fa 100644 --- a/net/tmate-ssh-server/Makefile +++ b/net/tmate-ssh-server/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tmate-ssh-server PKG_VERSION:=511fd2bd852464e76824279609a34ee93fe148a4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tmate-io/tmate-ssh-server/tar.gz/$(PKG_VERSION)? diff --git a/net/tmate-ssh-server/patches/010-msgpack-c.patch b/net/tmate-ssh-server/patches/010-msgpack-c.patch new file mode 100644 index 000000000..f18fcd5aa --- /dev/null +++ b/net/tmate-ssh-server/patches/010-msgpack-c.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -193,7 +193,7 @@ fi + + PKG_CHECK_MODULES( + MSGPACK, +- msgpack >= 1.2.0, ++ msgpack-c >= 1.2.0, + [ + CPPFLAGS="$MSGPACK_CFLAGS $CPPFLAGS" + LIBS="$MSGPACK_LIBS $LIBS" From 926617ec4dfc9a85e29b7445ad08e79f9e1143d1 Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Wed, 8 Mar 2023 21:14:07 +0800 Subject: [PATCH 4/9] lua-eco: update to 2.1.0 * updated description * switched default SSL engine to mbedtls * added new network module Signed-off-by: Jianhui Zhao --- lang/lua-eco/Makefile | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/lang/lua-eco/Makefile b/lang/lua-eco/Makefile index c836de92e..c176946b0 100644 --- a/lang/lua-eco/Makefile +++ b/lang/lua-eco/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua-eco -PKG_VERSION:=2.0.0 +PKG_VERSION:=2.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL=https://github.com/zhaojh329/lua-eco/releases/download/v$(PKG_VERSION) -PKG_HASH:=df2bed363ac89ce5c776c02baa914fbf4b096e0b87cbf4347d1a48cb4d3b8428 +PKG_HASH:=0e6d1906f15f350a825a4325cd579251baf6eb4b7ce6ef88f57357de49c0e00e PKG_MAINTAINER:=Jianhui Zhao PKG_LICENSE:=MIT @@ -30,10 +30,9 @@ define Package/lua-eco endef define Package/lua-eco/description - Lua-eco is a Lua interpreter with a built-in libev event loop. It makes all Lua code - running in Lua coroutines so code that does I/O can be suspended until data is ready. - This allows you write code as if you're using blocking I/O, while still allowing code - in other coroutines to run when you'd otherwise wait for I/O. It's kind of like Goroutines. + Lua-eco is a Lua interpreter with a built-in event loop for scheduling + lightweight coroutines automatically, enabling efficient concurrency in + Lua. Build high-performance, scalable applications. endef define Package/lua-eco/Module @@ -56,15 +55,16 @@ Package/lua-eco-ssl=$(call Package/lua-eco/Module,ssl,\ +LUA_ECO_OPENSSL:libopenssl +LUA_ECO_WOLFSSL:libwolfssl \ +LUA_ECO_MBEDTLS:libmbedtls +LUA_ECO_MBEDTLS:zlib +lua-eco-socket) Package/lua-eco-ubus=$(call Package/lua-eco/Module,ubus,+libubus) -Package/lua-eco-termios=$(call Package/lua-eco/Module,termios) Package/lua-eco-http=$(call Package/lua-eco/Module,http/https,+lua-eco-dns +lua-eco-ssl +lua-eco-log) Package/lua-eco-mqtt=$(call Package/lua-eco/Module,mqtt,+lua-eco-socket +lua-eco-dns +lua-mosquitto) Package/lua-eco-websocket=$(call Package/lua-eco/Module,websocket,+lua-eco-http +lua-eco-base64 +lua-eco-sha1) +Package/lua-eco-termios=$(call Package/lua-eco/Module,termios) +Package/lua-eco-network=$(call Package/lua-eco/Module,network) define Package/lua-eco-ssl/config choice prompt "SSL Library" - default LUA_ECO_WOLFSSL + default LUA_ECO_MBEDTLS config LUA_ECO_OPENSSL bool "OpenSSL" @@ -170,6 +170,11 @@ define Package/lua-eco-termios/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/eco/termios.so $(1)/usr/lib/lua/eco endef +define Package/lua-eco-network/install + $(INSTALL_DIR) $(1)/usr/lib/lua/eco + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/eco/network.so $(1)/usr/lib/lua/eco +endef + $(eval $(call BuildPackage,lua-eco)) $(eval $(call BuildPackage,lua-eco-log)) $(eval $(call BuildPackage,lua-eco-sys)) @@ -184,3 +189,4 @@ $(eval $(call BuildPackage,lua-eco-http)) $(eval $(call BuildPackage,lua-eco-mqtt)) $(eval $(call BuildPackage,lua-eco-websocket)) $(eval $(call BuildPackage,lua-eco-termios)) +$(eval $(call BuildPackage,lua-eco-network)) From 8fcc48c339060b6652f6093278c8a74b0c7ca542 Mon Sep 17 00:00:00 2001 From: Van Waholtz Date: Thu, 16 Feb 2023 10:21:20 +0800 Subject: [PATCH 5/9] frp: update to 0.47.0 A restart is only required if `$conf_file` has been modified. Signed-off-by: Van Waholtz --- net/frp/Makefile | 4 ++-- net/frp/files/frpc.init | 6 +----- net/frp/files/frps.init | 6 +----- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/net/frp/Makefile b/net/frp/Makefile index d77066e9b..f664fa8e1 100644 --- 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.47.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:=d98ebf8638701cf8662604b9fe2fb355f91209f87edcb77f2830c7fa40ccbe37 PKG_MAINTAINER:=Richard Yu PKG_LICENSE:=Apache-2.0 diff --git a/net/frp/files/frpc.init b/net/frp/files/frpc.init index e7f06edbd..68fe43c4e 100644 --- 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 b87525cd2..38f714fb1 100644 --- 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 -} From 4f8874f636f39928a71da053103eefc70e71d0de Mon Sep 17 00:00:00 2001 From: Van Waholtz Date: Wed, 8 Mar 2023 15:47:26 +0800 Subject: [PATCH 6/9] frp: update to 0.48.0 Changelog: https://github.com/fatedier/frp/releases/tag/v0.48.0 Signed-off-by: Van Waholtz --- net/frp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/frp/Makefile b/net/frp/Makefile index f664fa8e1..7adbac02c 100644 --- a/net/frp/Makefile +++ b/net/frp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=frp -PKG_VERSION:=0.47.0 +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:=d98ebf8638701cf8662604b9fe2fb355f91209f87edcb77f2830c7fa40ccbe37 +PKG_HASH:=efba8ec9fad3369ce62631369f52b78a7248df426b5b54311e96231adac5cc76 PKG_MAINTAINER:=Richard Yu PKG_LICENSE:=Apache-2.0 From c15b76750f6e3d5da5a0a7cd1eed9634f7a40e04 Mon Sep 17 00:00:00 2001 From: Kuan-Yi Li Date: Tue, 7 Mar 2023 18:34:10 +0800 Subject: [PATCH 7/9] libmbim: bump to 1.28.4 Signed-off-by: Kuan-Yi Li --- libs/libmbim/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libmbim/Makefile b/libs/libmbim/Makefile index abd94d617..8591b4337 100644 --- 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 From 4d26fec72170675c655c145d2ba922ff95aeacaa Mon Sep 17 00:00:00 2001 From: Kuan-Yi Li Date: Tue, 7 Mar 2023 18:34:22 +0800 Subject: [PATCH 8/9] libqmi: bump to 1.32.4 Signed-off-by: Kuan-Yi Li --- libs/libqmi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index bfa3bab7c..8dac95155 100644 --- 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 From 0c526d09a8b3a2b18ce9421740271fe64bb4ded1 Mon Sep 17 00:00:00 2001 From: Kuan-Yi Li Date: Tue, 7 Mar 2023 18:34:38 +0800 Subject: [PATCH 9/9] modemmanager: bump to 1.20.6 Signed-off-by: Kuan-Yi Li --- net/modemmanager/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index 6cbd6f738..e27988733 100644 --- 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 PKG_LICENSE:=GPL-2.0-or-later