Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync #396

Merged
merged 2 commits into from
Dec 25, 2023
Merged

sync #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9971a1c
Add kernel 6.7 restrictions
Ysurac Dec 23, 2023
f1d429e
Fix NDPI patch for kernel 5.4
Ysurac Dec 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion luci-app-firewall/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk

LUCI_TITLE:=Firewall and Portforwarding application
LUCI_DEPENDS:=+@LINUX_5_4:firewall +@(LINUX_5_15||LINUX_6_1):uci-firewall
LUCI_DEPENDS:=+@LINUX_5_4:firewall +@(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_7):uci-firewall

PKG_LICENSE:=Apache-2.0
PKG_VERSION:=omr-202103
Expand Down
2 changes: 1 addition & 1 deletion mptcpd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)
SECTION:=net
CATEGORY:=Network
DEPENDS:=+libell @(LINUX_5_15||LINUX_6_1||LINUX_6_6)
DEPENDS:=+libell @!(LINUX_5_4)
TITLE:=mptcpd
URL:=https://github.com/intel/mptcpd
endef
Expand Down
4 changes: 3 additions & 1 deletion ndpi-netfilter2/patches/002-no-livepatch-required.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
--- a/ndpi-netfilter/src/main.c 2023-12-22 18:09:04.107421950 +0100
+++ b/ndpi-netfilter/src/main.c 2023-12-22 18:10:11.038240353 +0100
@@ -103,13 +103,7 @@
@@ -103,13 +103,9 @@
static char debug_name[]="debug";
static char risk_name[]="risks";

+#if LINUX_VERSION_CODE > KERNEL_VERSION(5,19,0)
-#ifdef CONFIG_NF_CONNTRACK_DESTROY_HOOK
#define USE_NF_CONNTRACK_DESTROY_HOOK
-#elif LINUX_VERSION_CODE > KERNEL_VERSION(5,19,0)
-#ifndef USE_LIVEPATCH
-#define USE_LIVEPATCH
-#endif
-#endif
+#endif

#ifdef USE_LIVEPATCH
#if IS_ENABLED(CONFIG_LIVEPATCH)
2 changes: 1 addition & 1 deletion openmptcprouter-full/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ MY_DEPENDS := \
luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware kmod-usb2 libustream-openssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf (TARGET_x86||TARGET_x86_64):kmod-igbvf \
hwinfo (TARGET_x86||TARGET_x86_64):dmidecode luci-app-packet-capture kmod-bonding luci-proto-bonding luci-app-sysupgrade \
luci-theme-openwrt-2020 luci-proto-wireguard luci-app-wireguard kmod-crypto-lib-blake2s (TARGET_x86||TARGET_x86_64):kmod-r8125 \
(LINUX_5_15||LINUX_6_1):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc !TARGET_mvebu:kmod-mmc-spi kmod-macsec usbutils v2ray-core syslogd \
!(LINUX_5_4):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc !TARGET_mvebu:kmod-mmc-spi kmod-macsec usbutils v2ray-core syslogd \
(TARGET_x86||TARGET_x86_64):kmod-mlx4-core \
!(TARGET_ips40xx||TARGET_ramips):iptables-mod-ndpi !(TARGET_ips40xx||TARGET_ramips):kmod-ipt-ndpi libip4tc libip6tc \
xray-core shadowsocks-rust-sslocal shadowsocks-rust-ssservice shadowsocks-rust-config luci-app-shadowsocks-rust (LINUX_5_4&&(TARGET_x86_64||aarch64)):kmod-tcp-bbr2 kmod-ovpn-dco-v2
Expand Down