mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

sync (#460)

Browse source
This commit is contained in:
suyuan 2024-03-30 11:38:05 +08:00 committed by GitHub
commit 8a1a3c6b44
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 10 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libmbim/Makefile
View file

@ -8,12 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libmbim
PKG_SOURCE_VERSION:=1.30.0
PKG_SOURCE_VERSION:=1.31.2-dev
#PKG_SOURCE_VERSION:=1.30.0
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
PKG_MIRROR_HASH:=8fc4e2d78d6a1003bf89303d3ce779283b176d74e84a241ba8efb0d468605268
#PKG_MIRROR_HASH:=8fc4e2d78d6a1003bf89303d3ce779283b176d74e84a241ba8efb0d468605268
PKG_BUILD_FLAGS:=gc-sections

5
libqmi/Makefile
View file

@ -8,12 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libqmi
PKG_SOURCE_VERSION:=1.34.0
#PKG_SOURCE_VERSION:=1.34.0
PKG_SOURCE_VERSION:=1.35.2-dev
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
PKG_MIRROR_HASH:=af3dc760d0c40ef8af1f8b424435daa12bff698ed45b1cc9a9e38ea62ed047f0
#PKG_MIRROR_HASH:=af3dc760d0c40ef8af1f8b424435daa12bff698ed45b1cc9a9e38ea62ed047f0
PKG_BUILD_FLAGS:=gc-sections

2
luci-mod-dashboard/root/usr/share/luci/menu.d/luci-mod-dashboard.json
View file

@ -1,7 +1,7 @@
{
"admin/dashboard": {
"title": "Dashboard",
"order": 1,
"order": 5,
"action": {
"type": "view",
"path": "dashboard/index"

2
modemmanager/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=modemmanager
PKG_SOURCE_VERSION:=1.23.4-dev
PKG_SOURCE_VERSION:=1.23.5-dev
PKG_RELEASE:=20
PKG_SOURCE_PROTO:=git

3
ndpi-netfilter2/Makefile
View file

@ -12,7 +12,8 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ndpi-netfilter2
PKG_RELEASE:=4
#PKG_REV:=3deea541af037b663b1b83a055b80d9a06a0afd2
PKG_REV:=5cf35a64c8296b69099d3bd4c8cb9222f3174901
#PKG_REV:=5cf35a64c8296b69099d3bd4c8cb9222f3174901
PKG_REV:=761993583265cf9a022be1ad2d701e446bb91d42
PKG_VERSION:=4-$(PKG_REV)
PKG_SOURCE_PROTO:=git

26
ndpi-netfilter2/patches/003-fix-compilation-for-kernel-6.7.0.patch
View file

@ -1,26 +0,0 @@
--- a/ndpi-netfilter/src/main.c 2023-12-22 18:46:47.999596865 +0100
+++ b/ndpi-netfilter/src/main.c 2023-12-22 18:48:52.981393673 +0100
@@ -2840,7 +2840,11 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
net->ct.label_words = n->labels_word;
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 7, 0)
net->ct.labels_used--;
+#else
+ atomic_dec_return_relaxed(&net->ct.labels_used);
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)
struct nf_ct_iter_data iter_data = {
@@ -3138,7 +3142,11 @@
n->labels_word = ACCESS_ONCE(net->ct.label_words);
net->ct.label_words = 2;
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 7, 0)
net->ct.labels_used++;
+#else
+ atomic_inc_return_relaxed(&net->ct.labels_used);
+#endif
#endif
if( ndpi_enable_flow &&
nf_register_net_hooks(net, nf_nat_ipv4_ops,