diff --git a/libmbim/Makefile b/libmbim/Makefile index 85024008e..d50bde9a0 100644 --- a/libmbim/Makefile +++ b/libmbim/Makefile @@ -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 diff --git a/libqmi/Makefile b/libqmi/Makefile index 5652332fe..01e1103bc 100644 --- a/libqmi/Makefile +++ b/libqmi/Makefile @@ -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 diff --git a/luci-mod-dashboard/root/usr/share/luci/menu.d/luci-mod-dashboard.json b/luci-mod-dashboard/root/usr/share/luci/menu.d/luci-mod-dashboard.json index 555884674..88c4a4c4d 100644 --- a/luci-mod-dashboard/root/usr/share/luci/menu.d/luci-mod-dashboard.json +++ b/luci-mod-dashboard/root/usr/share/luci/menu.d/luci-mod-dashboard.json @@ -1,7 +1,7 @@ { "admin/dashboard": { "title": "Dashboard", - "order": 1, + "order": 5, "action": { "type": "view", "path": "dashboard/index" diff --git a/modemmanager/Makefile b/modemmanager/Makefile index f02db006e..853304ffb 100644 --- a/modemmanager/Makefile +++ b/modemmanager/Makefile @@ -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 diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile index 0d2466d7e..50ddd78ad 100644 --- a/ndpi-netfilter2/Makefile +++ b/ndpi-netfilter2/Makefile @@ -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 diff --git a/ndpi-netfilter2/patches/003-fix-compilation-for-kernel-6.7.0.patch b/ndpi-netfilter2/patches/003-fix-compilation-for-kernel-6.7.0.patch deleted file mode 100644 index aa7cab996..000000000 --- a/ndpi-netfilter2/patches/003-fix-compilation-for-kernel-6.7.0.patch +++ /dev/null @@ -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,