diff --git a/SCRIPTS/01_get_ready.sh b/SCRIPTS/01_get_ready.sh index 973f5f0c0..4997d0cc6 100755 --- a/SCRIPTS/01_get_ready.sh +++ b/SCRIPTS/01_get_ready.sh @@ -50,45 +50,21 @@ xwrt_repo="https://github.com/QiuSimons/openwrt-natflow" # 开始克隆仓库,并行执行 clone_repo $openwrt_repo $latest_release openwrt & clone_repo $openwrt_repo openwrt-23.05 openwrt_snap & -clone_repo $immortalwrt_repo master immortalwrt & -clone_repo $immortalwrt_repo openwrt-21.02 immortalwrt_21 & clone_repo $immortalwrt_repo openwrt-23.05 immortalwrt_23 & clone_repo $immortalwrt_pkg_repo master immortalwrt_pkg & -clone_repo $immortalwrt_pkg_repo openwrt-21.02 immortalwrt_pkg_21 & clone_repo $immortalwrt_luci_repo master immortalwrt_luci & -clone_repo $immortalwrt_luci_repo openwrt-21.02 immortalwrt_luci_21 & -clone_repo $immortalwrt_luci_repo openwrt-23.05 immortalwrt_luci_23 & clone_repo $lede_repo master lede & clone_repo $lede_luci_repo master lede_luci & clone_repo $lede_pkg_repo master lede_pkg & clone_repo $openwrt_repo main openwrt_ma & -clone_repo $openwrt_repo openwrt-22.03 openwrt_22 & clone_repo $openwrt_pkg_repo master openwrt_pkg_ma & clone_repo $openwrt_luci_repo master openwrt_luci_ma & -clone_repo $lienol_repo 23.05 Lienol & -clone_repo $lienol_pkg_repo main Lienol_pkg & clone_repo $openwrt_add_repo master OpenWrt-Add & -clone_repo $openwrt_node_repo master openwrt-node & -clone_repo $passwall_pkg_repo main passwall_pkg & -clone_repo $passwall_luci_repo main passwall_luci & clone_repo $openwrt_third_repo main openwrt-third & clone_repo $dockerman_repo master dockerman & -clone_repo $diskman_repo master diskman & clone_repo $docker_lib_repo master docker_lib & -clone_repo $mosdns_repo master mosdns & -clone_repo $ssrp_repo main ssrp & -clone_repo $zxlhhyccc_repo master zxlhhyccc & clone_repo $linkease_repo main linkease & -clone_repo $linkease_pkg_repo istoreos-21.02 linkease_pkg & -clone_repo $linkease_luci_repo istoreos-21.02 linkease_luci & clone_repo $sirpdboy_repo main sirpdboy & -clone_repo $sbwdaednext_repo main sbwdaednext & -clone_repo $lucidaednext_repo rebase lucidaednext & -clone_repo $sbwfw876_repo v5 sbwfw876 & -clone_repo $sbw_pkg_repo main sbw_pkg & -clone_repo $natmap_repo master natmap & -clone_repo $xwrt_repo master xwrt & - # 等待所有后台任务完成 wait diff --git a/SCRIPTS/02_prepare_package.sh b/SCRIPTS/02_prepare_package.sh index 51935e5a7..9697df37d 100755 --- a/SCRIPTS/02_prepare_package.sh +++ b/SCRIPTS/02_prepare_package.sh @@ -13,12 +13,6 @@ sed -i "s/enabled '0'/enabled '1'/g" feeds/packages/utils/irqbalance/files/irqba sed -i 's,-SNAPSHOT,,g' include/version.mk sed -i 's,-SNAPSHOT,,g' package/base-files/image-config.in # 维多利亚的秘密 -#rm -rf ./scripts/download.pl -#rm -rf ./include/download.mk -#cp -rf ../immortalwrt/scripts/download.pl ./scripts/download.pl -#cp -rf ../immortalwrt/include/download.mk ./include/download.mk -#sed -i '/unshift/d' scripts/download.pl -#sed -i '/mirror02/d' scripts/download.pl echo "net.netfilter.nf_conntrack_helper = 1" >>./package/kernel/linux/files/sysctl-nf-conntrack.conf # Nginx sed -i "s/large_client_header_buffers 2 1k/large_client_header_buffers 4 32k/g" feeds/packages/net/nginx-util/files/uci.conf.template @@ -51,11 +45,6 @@ CONFIG_LRNG_JENT=y CONFIG_LRNG_CPU=y # CONFIG_LRNG_SCHED is not set ' >>./target/linux/generic/config-5.15 -# SSL -#rm -rf ./package/libs/mbedtls -#cp -rf ../immortalwrt/package/libs/mbedtls ./package/libs/mbedtls -#rm -rf ./package/libs/openssl -#cp -rf ../immortalwrt_21/package/libs/openssl ./package/libs/openssl # fstool wget -qO - https://github.com/coolsnowwolf/lede/commit/8a4db76.patch | patch -p1 # wg @@ -78,22 +67,13 @@ mkdir -p package/network/utils/nftables/patches cp -f ../PATCH/firewall/nftables/*.patch ./package/network/utils/nftables/patches/ # custom nft command patch -p1 < ../PATCH/firewall/100-openwrt-firewall4-add-custom-nft-command-support.patch - -# FW3 -mkdir -p package/network/config/firewall/patches -cp -rf ../immortalwrt_21/package/network/config/firewall/patches/100-fullconenat.patch ./package/network/config/firewall/patches/100-fullconenat.patch -cp -rf ../lede/package/network/config/firewall/patches/101-bcm-fullconenat.patch ./package/network/config/firewall/patches/101-bcm-fullconenat.patch -# iptables -cp -rf ../lede/package/network/utils/iptables/patches/900-bcm-fullconenat.patch ./package/network/utils/iptables/patches/900-bcm-fullconenat.patch -# network -wget -qO - https://github.com/openwrt/openwrt/commit/bbf39d07.patch | patch -p1 # Patch LuCI 以增添 FullCone 开关 pushd feeds/luci patch -p1 <../../../PATCH/firewall/01-luci-app-firewall_add_nft-fullcone-bcm-fullcone_option.patch popd -# FullCone PKG -git clone --depth 1 https://github.com/fullcone-nat-nftables/nft-fullcone package/new/nft-fullcone -cp -rf ../Lienol/package/network/utils/fullconenat ./package/new/fullconenat +# ADD +cp -rf ../OpenWrt-Add ./package/new +rm -rf feeds/packages/net/{xray-core,v2ray-core,v2ray-geodata,sing-box} ### 获取额外的基础软件包 ### # 更换为 ImmortalWrt Uboot 以及 Target @@ -119,11 +99,8 @@ sed -i 's,@CMDLINE@ noinitrd,noinitrd mitigations=off,g' target/linux/x86/image/ ### 获取额外的 LuCI 应用、主题和依赖 ### # dae ready -cp -rf ../immortalwrt_pkg/net/dae ./feeds/packages/net/dae -ln -sf ../../../feeds/packages/net/dae ./package/feeds/packages/dae -cp -rf ../lucidaednext/daed-next ./package/new/daed-next -cp -rf ../lucidaednext/luci-app-daed-next ./package/new/luci-app-daed-next rm -rf ./feeds/packages/net/daed +rm -rf ./package/new/luci-app-daed git clone -b test --depth 1 https://github.com/QiuSimons/luci-app-daed package/new/luci-app-daed # btf wget -qO - https://github.com/immortalwrt/immortalwrt/commit/73e5679.patch | patch -p1 @@ -138,67 +115,21 @@ mkdir -p feeds/packages/utils/cgroupfs-mount/patches cp -rf ../PATCH/cgroupfs-mount/900-mount-cgroup-v2-hierarchy-to-sys-fs-cgroup-cgroup2.patch ./feeds/packages/utils/cgroupfs-mount/patches/ cp -rf ../PATCH/cgroupfs-mount/901-fix-cgroupfs-umount.patch ./feeds/packages/utils/cgroupfs-mount/patches/ cp -rf ../PATCH/cgroupfs-mount/902-mount-sys-fs-cgroup-systemd-for-docker-systemd-suppo.patch ./feeds/packages/utils/cgroupfs-mount/patches/ -# AutoCore -cp -rf ../immortalwrt_23/package/emortal/autocore ./package/new/autocore -sed -i 's/"getTempInfo" /"getTempInfo", "getCPUBench", "getCPUUsage" /g' package/new/autocore/files/luci-mod-status-autocore.json -cp -rf ../OpenWrt-Add/autocore/files/x86/autocore ./package/new/autocore/files/autocore -sed -i '/i386 i686 x86_64/{n;n;n;d;}' package/new/autocore/Makefile -sed -i '/i386 i686 x86_64/d' package/new/autocore/Makefile -rm -rf ./feeds/luci/modules/luci-base -cp -rf ../immortalwrt_luci_23/modules/luci-base ./feeds/luci/modules/luci-base -sed -i "s,(br-lan),,g" feeds/luci/modules/luci-base/root/usr/share/rpcd/ucode/luci -rm -rf ./feeds/luci/modules/luci-mod-status -cp -rf ../immortalwrt_luci_23/modules/luci-mod-status ./feeds/luci/modules/luci-mod-status -rm -rf ./feeds/packages/utils/coremark -cp -rf ../sbw_pkg/coremark ./feeds/packages/utils/coremark -cp -rf ../immortalwrt_23/package/utils/mhz ./package/utils/mhz -# Airconnect -git clone https://github.com/sbwml/luci-app-airconnect package/new/airconnect -sed -i 's,respawn,respawn 3600 5 0,g' package/new/airconnect/airconnect/files/airconnect.init -#cp -rf ../OpenWrt-Add/airconnect ./package/new/airconnect -#cp -rf ../OpenWrt-Add/luci-app-airconnect ./package/new/luci-app-airconnect # luci-app-ap-modem cp -rf ../linkease/applications/luci-app-ap-modem ./package/new/luci-app-ap-modem -# luci-app-irqbalance -cp -rf ../OpenWrt-Add/luci-app-irqbalance ./package/new/luci-app-irqbalance # 更换 Nodejs 版本 rm -rf ./feeds/packages/lang/node -git clone https://github.com/sbwml/feeds_packages_lang_node-prebuilt feeds/packages/lang/node -# R8168驱动 -git clone -b master --depth 1 https://github.com/BROBIRD/openwrt-r8168.git package/new/r8168 -patch -p1 <../PATCH/r8168/r8168-fix_LAN_led-for_r4s-from_TL.patch -# R8152驱动 -cp -rf ../immortalwrt/package/kernel/r8152 ./package/new/r8152 -# r8125驱动 -git clone https://github.com/sbwml/package_kernel_r8125 package/new/r8125 +cp -rf ../OpenWrt-Add/feeds_packages_lang_node-prebuilt ./feeds/packages/lang/node # igc-fix cp -rf ../lede/target/linux/x86/patches-5.15/996-intel-igc-i225-i226-disable-eee.patch ./target/linux/x86/patches-5.15/996-intel-igc-i225-i226-disable-eee.patch -# UPX 可执行软件压缩 -sed -i '/patchelf pkgconf/i\tools-y += ucl upx' ./tools/Makefile -sed -i '\/autoconf\/compile :=/i\$(curdir)/upx/compile := $(curdir)/ucl/compile' ./tools/Makefile -cp -rf ../Lienol/tools/ucl ./tools/ucl -cp -rf ../Lienol/tools/upx ./tools/upx # 更换 golang 版本 rm -rf ./feeds/packages/lang/golang cp -rf ../openwrt_pkg_ma/lang/golang ./feeds/packages/lang/golang # 访问控制 -cp -rf ../lede_luci/applications/luci-app-accesscontrol ./package/new/luci-app-accesscontrol cp -rf ../OpenWrt-Add/luci-app-control-weburl ./package/new/luci-app-control-weburl -# 广告过滤 AdGuard -git clone https://github.com/rufengsuixing/luci-app-adguardhome.git package/new/luci-app-adguardhome -rm -rf ./feeds/packages/net/adguardhome -cp -rf ../openwrt_pkg_ma/net/adguardhome ./feeds/packages/net/adguardhome -sed -i '/init/d' feeds/packages/net/adguardhome/Makefile -# Argon 主题 -git clone -b master --depth 1 https://github.com/jerrykuku/luci-theme-argon.git package/new/luci-theme-argon -rm -rf ./package/new/luci-theme-argon/htdocs/luci-static/argon/background/README.md -git clone -b master --depth 1 https://github.com/jerrykuku/luci-app-argon-config.git package/new/luci-app-argon-config # MAC 地址与 IP 绑定 cp -rf ../immortalwrt_luci/applications/luci-app-arpbind ./feeds/luci/applications/luci-app-arpbind ln -sf ../../../feeds/luci/applications/luci-app-arpbind ./package/feeds/luci/luci-app-arpbind -# 定时重启 -cp -rf ../immortalwrt_luci/applications/luci-app-autoreboot ./feeds/luci/applications/luci-app-autoreboot -ln -sf ../../../feeds/luci/applications/luci-app-autoreboot ./package/feeds/luci/luci-app-autoreboot # Boost 通用即插即用 rm -rf ./feeds/packages/net/miniupnpd cp -rf ../openwrt_pkg_ma/net/miniupnpd ./feeds/packages/net/miniupnpd @@ -222,16 +153,7 @@ popd pushd feeds/luci wget -qO- https://github.com/openwrt/luci/commit/0b5fb915.patch | patch -p1 popd -# ChinaDNS -git clone -b luci --depth 1 https://github.com/QiuSimons/openwrt-chinadns-ng.git package/new/luci-app-chinadns-ng -cp -rf ../passwall_pkg/chinadns-ng ./package/new/chinadns-ng # CPU 控制相关 -cp -rf ../OpenWrt-Add/luci-app-cpufreq ./feeds/luci/applications/luci-app-cpufreq -ln -sf ../../../feeds/luci/applications/luci-app-cpufreq ./package/feeds/luci/luci-app-cpufreq -sed -i 's,1608,1800,g' feeds/luci/applications/luci-app-cpufreq/root/etc/uci-defaults/10-cpufreq -sed -i 's,2016,2208,g' feeds/luci/applications/luci-app-cpufreq/root/etc/uci-defaults/10-cpufreq -sed -i 's,1512,1608,g' feeds/luci/applications/luci-app-cpufreq/root/etc/uci-defaults/10-cpufreq -cp -rf ../OpenWrt-Add/luci-app-cpulimit ./package/new/luci-app-cpulimit cp -rf ../immortalwrt_pkg/utils/cpulimit ./feeds/packages/utils/cpulimit ln -sf ../../../feeds/packages/utils/cpulimit ./package/feeds/packages/cpulimit # 动态DNS @@ -249,16 +171,6 @@ popd sed -i '/sysctl.d/d' feeds/packages/utils/dockerd/Makefile rm -rf ./feeds/luci/collections/luci-lib-docker cp -rf ../docker_lib/collections/luci-lib-docker ./feeds/luci/collections/luci-lib-docker -# DiskMan -cp -rf ../diskman/applications/luci-app-diskman ./package/new/luci-app-diskman -mkdir -p package/new/parted && \ -wget https://raw.githubusercontent.com/lisaac/luci-app-diskman/master/Parted.Makefile -O package/new/parted/Makefile -# Dnsfilter -git clone --depth 1 https://github.com/kiddin9/luci-app-dnsfilter.git package/new/luci-app-dnsfilter -# Dnsproxy -cp -rf ../OpenWrt-Add/luci-app-dnsproxy ./package/new/luci-app-dnsproxy -# Edge 主题 -git clone -b master --depth 1 https://github.com/kiddin9/luci-theme-edge.git package/new/luci-theme-edge # FRP 内网穿透 rm -rf ./feeds/luci/applications/luci-app-frps rm -rf ./feeds/luci/applications/luci-app-frpc @@ -268,8 +180,6 @@ sed -i '/etc/d' feeds/packages/net/frp/Makefile sed -i '/defaults/{N;d;}' feeds/packages/net/frp/Makefile cp -rf ../lede_luci/applications/luci-app-frps ./package/new/luci-app-frps cp -rf ../lede_luci/applications/luci-app-frpc ./package/new/luci-app-frpc -# IPSec -#cp -rf ../lede_luci/applications/luci-app-ipsec-server ./package/new/luci-app-ipsec-server # IPv6 兼容助手 cp -rf ../lede/package/lean/ipv6-helper ./package/new/ipv6-helper patch -p1 <../PATCH/odhcp6c/1002-odhcp6c-support-dhcpv6-hotplug.patch @@ -279,130 +189,6 @@ cp -f ../PATCH/odhcpd/0001-odhcpd-improve-RFC-9096-compliance.patch ./package/ne # 京东签到 By Jerrykuku #git clone --depth 1 https://github.com/jerrykuku/node-request.git package/new/node-request #git clone --depth 1 https://github.com/jerrykuku/luci-app-jd-dailybonus.git package/new/luci-app-jd-dailybonus -# MentoHUST -git clone --depth 1 https://github.com/BoringCat/luci-app-mentohust package/new/luci-app-mentohust -git clone --depth 1 https://github.com/KyleRicardo/MentoHUST-OpenWrt-ipk package/new/MentoHUST -# Mosdns -git clone -b v5 --depth 1 https://github.com/sbwml/luci-app-mosdns package/new/luci-app-mosdns -rm -rf ./feeds/packages/net/v2ray-geodata -cp -rf ../mosdns/v2ray-geodata ./package/new/v2ray-geodata -# 流量监管 -cp -rf ../lede_luci/applications/luci-app-netdata ./package/new/luci-app-netdata -# 上网 APP 过滤 -git clone -b master --depth 1 https://github.com/sbwml/OpenAppFilter.git package/new/OpenAppFilter -# OLED 驱动程序 -git clone -b master --depth 1 https://github.com/NateLol/luci-app-oled.git package/new/luci-app-oled -# homeproxy -git clone --single-branch --depth 1 -b dev https://github.com/immortalwrt/homeproxy.git package/new/homeproxy -rm -rf ./feeds/packages/net/sing-box -cp -rf ../immortalwrt_pkg/net/sing-box ./feeds/packages/net/sing-box -# OpenClash -git clone --single-branch --depth 1 -b master https://github.com/vernesong/OpenClash.git package/new/OpenClash -rm -rf ./package/new/OpenClash/luci-app-openclash/root/etc/openclash/GeoSite.dat -# Passwall -cp -rf ../passwall_luci/luci-app-passwall ./package/new/luci-app-passwall -wget -P package/new/luci-app-passwall/ https://github.com/QiuSimons/OpenWrt-Add/raw/master/move_2_services.sh -chmod -R 755 ./package/new/luci-app-passwall/move_2_services.sh -pushd package/new/luci-app-passwall -bash move_2_services.sh -popd -cp -rf ../passwall_pkg/tcping ./package/new/tcping -cp -rf ../passwall_pkg/trojan-go ./package/new/trojan-go -cp -rf ../passwall_pkg/brook ./package/new/brook -cp -rf ../passwall_pkg/ssocks ./package/new/ssocks -cp -rf ../passwall_pkg/microsocks ./package/new/microsocks -cp -rf ../passwall_pkg/dns2socks ./package/new/dns2socks -cp -rf ../passwall_pkg/ipt2socks ./package/new/ipt2socks -cp -rf ../passwall_pkg/pdnsd-alt ./package/new/pdnsd-alt -cp -rf ../OpenWrt-Add/trojan-plus ./package/new/trojan-plus -cp -rf ../passwall_pkg/xray-plugin ./package/new/xray-plugin -# Passwall 白名单 -echo ' -teamviewer.com -epicgames.com -dangdang.com -account.synology.com -ddns.synology.com -checkip.synology.com -checkip.dyndns.org -checkipv6.synology.com -ntp.aliyun.com -cn.ntp.org.cn -ntp.ntsc.ac.cn -' >>./package/new/luci-app-passwall/root/usr/share/passwall/rules/direct_host -# qBittorrent 下载 -cp -rf ../lede_luci/applications/luci-app-qbittorrent ./package/new/luci-app-qbittorrent -cp -rf ../lede_pkg/net/qBittorrent-static ./package/new/qBittorrent-static -cp -rf ../lede_pkg/net/qBittorrent ./package/new/qBittorrent -cp -rf ../lede_pkg/libs/qtbase ./package/new/qtbase -cp -rf ../lede_pkg/libs/qttools ./package/new/qttools -cp -rf ../lede_pkg/libs/rblibtorrent ./package/new/rblibtorrent -# 清理内存 -cp -rf ../lede_luci/applications/luci-app-ramfree ./package/new/luci-app-ramfree -# ServerChan 微信推送 -git clone -b master --depth 1 https://github.com/tty228/luci-app-wechatpush.git package/new/luci-app-serverchan -# ShadowsocksR Plus+ 依赖 -rm -rf ./feeds/packages/net/shadowsocks-libev -cp -rf ../lede_pkg/net/shadowsocks-libev ./package/new/shadowsocks-libev -cp -rf ../sbwfw876/shadow-tls ./package/new/shadow-tls -cp -rf ../sbwfw876/v2dat ./package/new/v2dat -cp -rf ../sbwfw876/tuic-client ./package/new/tuic-client -cp -rf ../sbwfw876/redsocks2 ./package/new/redsocks2 -cp -rf ../sbwfw876/trojan ./package/new/trojan -cp -rf ../sbwfw876/tcping ./package/new/tcping -cp -rf ../sbwfw876/dns2tcp ./package/new/dns2tcp -cp -rf ../sbwfw876/gn ./package/new/gn -cp -rf ../sbwfw876/shadowsocksr-libev ./package/new/shadowsocksr-libev -cp -rf ../sbwfw876/simple-obfs ./package/new/simple-obfs -cp -rf ../sbwfw876/naiveproxy ./package/new/naiveproxy -cp -rf ../sbwfw876/v2ray-core ./package/new/v2ray-core -cp -rf ../passwall_pkg/hysteria ./package/new/hysteria -cp -rf ../sbwfw876/sagernet-core ./package/new/sagernet-core -rm -rf ./feeds/packages/net/xray-core -cp -rf ../immortalwrt_pkg/net/xray-core ./feeds/packages/net/xray-core -sed -i '/CURDIR/d' feeds/packages/net/xray-core/Makefile -cp -rf ../sbwfw876/v2ray-plugin ./package/new/v2ray-plugin -cp -rf ../sbwfw876/shadowsocks-rust ./package/new/shadowsocks-rust -cp -rf ../sbwfw876/lua-neturl ./package/new/lua-neturl -rm -rf ./feeds/packages/net/kcptun -cp -rf ../immortalwrt_pkg/net/kcptun ./feeds/packages/net/kcptun -ln -sf ../../../feeds/packages/net/kcptun ./package/feeds/packages/kcptun -# ShadowsocksR Plus+ -cp -rf ../sbwfw876/luci-app-ssr-plus ./package/new/luci-app-ssr-plus -#rm -rf ./package/new/luci-app-ssr-plus/po/zh_Hans -pushd package/new -wget -qO - https://github.com/fw876/helloworld/commit/5bbf6e7.patch | patch -p1 -popd -pushd package/new/luci-app-ssr-plus -sed -i '/Clang.CN.CIDR/a\o:value("https://fastly.jsdelivr.net/gh/QiuSimons/Chnroute@master/dist/chnroute/chnroute.txt", translate("QiuSimons/Chnroute"))' luasrc/model/cbi/shadowsocksr/advanced.lua -popd -# v2raya -git clone --depth 1 https://github.com/zxlhhyccc/luci-app-v2raya.git package/new/luci-app-v2raya -rm -rf ./feeds/packages/net/v2raya -cp -rf ../openwrt_pkg_ma/net/v2raya ./feeds/packages/net/v2raya -ln -sf ../../../feeds/packages/net/v2raya ./package/feeds/packages/v2raya -# socat -cp -rf ../Lienol_pkg/luci-app-socat ./package/new/luci-app-socat -pushd package/new -wget -qO - https://github.com/Lienol/openwrt-package/pull/39.patch | patch -p1 -popd -sed -i '/socat\.config/d' feeds/packages/net/socat/Makefile -# natmap -git clone --depth 1 --branch master --single-branch --no-checkout https://github.com/muink/luci-app-natmapt.git package/luci-app-natmapt -pushd package/luci-app-natmapt -umask 022 -git checkout -popd -git clone --depth 1 --branch master --single-branch --no-checkout https://github.com/muink/openwrt-natmapt.git package/natmapt -pushd package/natmapt -umask 022 -git checkout -popd -git clone --depth 1 --branch master --single-branch --no-checkout https://github.com/muink/openwrt-stuntman.git package/stuntman -pushd package/stuntman -umask 022 -git checkout -popd # 订阅转换 cp -rf ../immortalwrt_pkg/net/subconverter ./feeds/packages/net/subconverter ln -sf ../../../feeds/packages/net/subconverter ./package/feeds/packages/subconverter @@ -416,12 +202,6 @@ cp -rf ../immortalwrt_pkg/libs/quickjspp ./feeds/packages/libs/quickjspp ln -sf ../../../feeds/packages/libs/quickjspp ./package/feeds/packages/quickjspp cp -rf ../immortalwrt_pkg/libs/toml11 ./feeds/packages/libs/toml11 ln -sf ../../../feeds/packages/libs/toml11 ./package/feeds/packages/toml11 -# 网易云音乐解锁 -git clone -b js --depth 1 https://github.com/UnblockNeteaseMusic/luci-app-unblockneteasemusic.git package/new/UnblockNeteaseMusic -sed -i 's, +node,,g' package/new/UnblockNeteaseMusic/Makefile -pushd package/new/UnblockNeteaseMusic -wget -qO - https://github.com/UnblockNeteaseMusic/luci-app-unblockneteasemusic/commit/a880428.patch | patch -p1 -popd # uwsgi sed -i 's,procd_set_param stderr 1,procd_set_param stderr 0,g' feeds/packages/net/uwsgi/files/uwsgi.init sed -i 's,buffer-size = 10000,buffer-size = 131072,g' feeds/packages/net/uwsgi/files-luci-support/luci-webui.ini @@ -433,33 +213,9 @@ sed -i 's/cheaper = 1/cheaper = 2/g' feeds/packages/net/uwsgi/files-luci-support # rpcd sed -i 's/option timeout 30/option timeout 60/g' package/system/rpcd/files/rpcd.config sed -i 's#20) \* 1000#60) \* 1000#g' feeds/luci/modules/luci-base/htdocs/luci-static/resources/rpc.js -# USB 打印机 -cp -rf ../lede_luci/applications/luci-app-usb-printer ./package/new/luci-app-usb-printer # UU加速器 cp -rf ../lede_luci/applications/luci-app-uugamebooster ./package/new/luci-app-uugamebooster cp -rf ../lede_pkg/net/uugamebooster ./package/new/uugamebooster -# KMS 激活助手 -cp -rf ../lede_luci/applications/luci-app-vlmcsd ./package/new/luci-app-vlmcsd -cp -rf ../lede_pkg/net/vlmcsd ./package/new/vlmcsd -# Mihomo -git clone -b main --depth 1 https://github.com/morytyann/OpenWrt-mihomo package/new/OpenWrt-mihomo -# 网络唤醒 -cp -rf ../zxlhhyccc/zxlhhyccc/luci-app-wolplus ./package/new/luci-app-wolplus -# 流量监视 -git clone -b master --depth 1 https://github.com/brvphoenix/wrtbwmon.git package/new/wrtbwmon -git clone -b master --depth 1 https://github.com/brvphoenix/luci-app-wrtbwmon.git package/new/luci-app-wrtbwmon -# 迅雷快鸟宽带加速 -git clone --depth 1 https://github.com/kiddin9/luci-app-xlnetacc.git package/lean/luci-app-xlnetacc -# Zerotier -cp -rf ../immortalwrt_luci/applications/luci-app-zerotier ./feeds/luci/applications/luci-app-zerotier -cp -rf ../OpenWrt-Add/move_2_services.sh ./feeds/luci/applications/luci-app-zerotier/move_2_services.sh -chmod -R 755 ./feeds/luci/applications/luci-app-zerotier/move_2_services.sh -pushd feeds/luci/applications/luci-app-zerotier -bash move_2_services.sh -popd -ln -sf ../../../feeds/luci/applications/luci-app-zerotier ./package/feeds/luci/luci-app-zerotier -rm -rf ./feeds/packages/net/zerotier -cp -rf ../immortalwrt_pkg/net/zerotier ./feeds/packages/net/zerotier # watchcat echo > ./feeds/packages/utils/watchcat/files/watchcat.config # sirpdboy @@ -476,7 +232,6 @@ sed -i 's, - !, -o !,g' package/sirpdboy/luci-app-partexp/root/etc/init.d/partex sed -i 's,expquit 1 ,#expquit 1 ,g' package/sirpdboy/luci-app-partexp/root/etc/init.d/partexp # 翻译及部分功能优化 cp -rf ../OpenWrt-Add/addition-trans-zh ./package/new/addition-trans-zh -sed -i 's,iptables-mod-fullconenat,iptables-nft +kmod-nft-fullcone,g' package/new/addition-trans-zh/Makefile ### 最后的收尾工作 ### # Lets Fuck @@ -493,28 +248,12 @@ cp -f ../PATCH/backport/sfe/601-netfilter-export-udp_get_timeouts-function.patch cp -rf ../lede/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch ./target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch # Patch LuCI 以增添 Shortcut-FE 开关 patch -p1 < ../PATCH/firewall/luci-app-firewall_add_sfe_switch.patch -# Shortcut-FE 相关组件 -mkdir ./package/lean -mkdir ./package/lean/shortcut-fe -cp -rf ../lede/package/qca/shortcut-fe/fast-classifier ./package/lean/shortcut-fe/fast-classifier -wget -qO - https://github.com/coolsnowwolf/lede/commit/331f04f.patch | patch -p1 -wget -qO - https://github.com/coolsnowwolf/lede/commit/232b8b4.patch | patch -p1 -wget -qO - https://github.com/coolsnowwolf/lede/commit/ec795c9.patch | patch -p1 -wget -qO - https://github.com/coolsnowwolf/lede/commit/789f805.patch | patch -p1 -wget -qO - https://github.com/coolsnowwolf/lede/commit/6398168.patch | patch -p1 -cp -rf ../lede/package/qca/shortcut-fe/shortcut-fe ./package/lean/shortcut-fe/shortcut-fe -wget -qO - https://github.com/coolsnowwolf/lede/commit/0e29809.patch | patch -p1 -wget -qO - https://github.com/coolsnowwolf/lede/commit/eb70dad.patch | patch -p1 -wget -qO - https://github.com/coolsnowwolf/lede/commit/7ba3ec0.patch | patch -p1 -cp -rf ../lede/package/qca/shortcut-fe/simulated-driver ./package/lean/shortcut-fe/simulated-driver # natflow -cp -rf ../xwrt/natflow ./package/new/natflow # patch -p1 < ../PATCH/firewall/luci-app-firewall_add_natflow_switch.patch -# NAT6 -git clone --depth 1 https://github.com/sbwml/packages_new_nat6 package/new/packages_new_nat6 -pushd feeds/luci + # Patch LuCI 以增添 NAT6 开关 +pushd feeds/luci patch -p1 <../../../PATCH/firewall/03-luci-app-firewall_add_ipv6-nat.patch # Patch LuCI 以支持自定义 nft 规则 patch -p1 <../../../PATCH/firewall/04-luci-add-firewall4-nft-rules-file.patch