diff --git a/common.seed b/common.seed index 1e38051..84b125d 100644 --- a/common.seed +++ b/common.seed @@ -26,7 +26,6 @@ CONFIG_PACKAGE_luci-app-cifs-mount=y CONFIG_PACKAGE_luci-app-ddns=y CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-filetransfer=y -CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-jd-dailybonus=y CONFIG_PACKAGE_luci-app-ksmbd=y CONFIG_PACKAGE_luci-app-linkease=y diff --git a/scripts/merge_packages.sh b/scripts/merge_packages.sh index cad5c58..628183c 100644 --- a/scripts/merge_packages.sh +++ b/scripts/merge_packages.sh @@ -34,7 +34,8 @@ merge_feed helloworld "https://github.com/klever1988/helloworld;tmp" merge_package https://github.com/project-lede/luci-app-godproxy merge_package https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-wolplus merge_package https://github.com/kuoruan/openwrt-frp frp -merge_package https://github.com/kuoruan/luci-app-frpc +merge_package https://github.com/liudf0716/luci-app-xfrpc +merge_package https://github.com/liudf0716/xfrpc merge_package https://github.com/messense/aliyundrive-webdav/trunk/openwrt/aliyundrive-webdav merge_package https://github.com/messense/aliyundrive-webdav/trunk/openwrt/luci-app-aliyundrive-webdav merge_package https://github.com/jerrykuku/luci-app-jd-dailybonus diff --git a/scripts/patches.sh b/scripts/patches.sh index 84f616e..6bd64f5 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -11,7 +11,6 @@ sed -i 's/192.168.1.1/192.168.2.1/' package/base-files/files/bin/config_generate sed -i 's/=1/=0/g' package/kernel/linux/files/sysctl-br-netfilter.conf sed -i '/DEPENDS+/ s/$/ +wsdd2/' `find package/ -follow -type f -path '*/ksmbd-tools/Makefile'` -sed -i '/DEPENDS/ s/$/ +frpc/' `find package/ -follow -type f -path '*/luci-app-frpc/Makefile'` sed -i 's/ +ntfs-3g/ +ntfs3-mount/' `find package/ -follow -type f -path '*/automount/Makefile'` sed -i '/skip\=/ a skip=`mount | grep -q /dev/$device; echo $?`' `find package/ -follow -type f -path */automount/files/15-automount`