diff --git a/.github/workflows/Cleaning.yml b/.github/workflows/Cleaning.yml new file mode 100644 index 000000000..81ff7d5f6 --- /dev/null +++ b/.github/workflows/Cleaning.yml @@ -0,0 +1,42 @@ +name: Cleaning + +on: + schedule: + - cron: 1 1 * * 1 + watch: + types: started + +jobs: + + Cleanup-Old-Releases: + runs-on: ubuntu-20.04 + if: github.event.repository.owner.id == github.event.sender.id + steps: + - name: Delete Older Releases + uses: dev-drprasad/delete-older-releases@master + with: + keep_latest: 9 + delete_tags: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + Cleanup-Old-Artifacts: + runs-on: ubuntu-20.04 + if: github.event.repository.owner.id == github.event.sender.id + steps: + - name: Cleanup Old Action Artifacts + uses: kolpav/purge-artifacts-action@master + with: + token: ${{ github.token }} + expire-in: 7d + + Cleanup-Workflow-Logs: + runs-on: ubuntu-20.04 + if: github.event.repository.owner.id == github.event.sender.id + steps: + - name: Cleanup Workflow Logs + uses: Mattraks/delete-workflow-runs@main + with: + token: ${{ github.token }} + repository: ${{ github.repository }} + retain_days: 7 diff --git a/.github/workflows/R2S-OpenWrt.yml b/.github/workflows/R2S-OpenWrt.yml new file mode 100644 index 000000000..276b4c656 --- /dev/null +++ b/.github/workflows/R2S-OpenWrt.yml @@ -0,0 +1,145 @@ +name: R2S-OpenWrt + +on: + schedule: + - cron: 5 6 * * 0 + watch: + types: started + +jobs: + build: + runs-on: ubuntu-20.04 + if: github.event.repository.owner.id == github.event.sender.id + + steps: + - name: Checkout + uses: actions/checkout@main + - name: Show system + run: | + echo -e "Total CPU cores\t: $(nproc)" + cat /proc/cpuinfo | grep 'model name' + free -h + uname -a + [ -f /proc/version ] && cat /proc/version + [ -f /etc/issue.net ] && cat /etc/issue.net + [ -f /etc/issue ] && cat /etc/issue + ulimit -a + - name: Free disk space + run: | + sudo -E swapoff -a + sudo -E rm -f /swapfile + sudo -E docker image prune -a -f + sudo -E snap set system refresh.retain=2 + sudo -E apt-get -y purge azure* dotnet* firefox ghc* google* hhvm llvm* mono* mysql* openjdk* php* zulu* + sudo -E apt-get -y autoremove --purge + sudo -E apt-get clean + sudo -E rm -rf /usr/share/dotnet /usr/local/lib/android/sdk /etc/mysql /etc/php /usr/local/share/boost + [ -n "$AGENT_TOOLSDIRECTORY" ] && sudo rm -rf "$AGENT_TOOLSDIRECTORY" + df -h + - name: Init build dependencies + env: + DEBIAN_FRONTEND: noninteractive + run: | + sudo -E rm -rf /etc/apt/sources.list.d + sudo -E apt-get update -y + sudo -E apt-get install -y build-essential rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons + wget -qO - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | sed 's/python-/python3-/g' | /bin/bash + sudo -E apt-get clean -y + git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com' + df -h + - name: Prepare Mixedwrt + run: | + sudo chown -R runner:runner /home/runner/work/R2S-R4S-X86-OpenWrt + cp -r ./SCRIPTS/R2S/. ./SCRIPTS/ + cp -r ./SCRIPTS/. ./ + /bin/bash 01_get_ready.sh + - name: Prepare Package + run: | + cd openwrt + cp -r ../SCRIPTS/. ./ + /bin/bash 02_prepare_package.sh + /bin/bash 02_target_only.sh + - name: Convert Translation + run: | + cd openwrt + /bin/bash 03_convert_translation.sh + - name: Add ACL + run: | + cd openwrt + /bin/bash 05_create_acl_for_luci.sh -a + - name: Make Config + run: | + cd openwrt + mv ../SEED/R2S/config.seed .config + make defconfig + + - name: Smart chmod + run: | + MY_Filter=$(mktemp) + echo '/\.git' > ${MY_Filter} + echo '/\.svn' >> ${MY_Filter} + find ./ -maxdepth 1 | grep -v '\./$' | grep -v '/\.git' | xargs -s1024 chmod -R u=rwX,og=rX + find ./ -type f | grep -v -f ${MY_Filter} | xargs -s1024 file | grep 'executable\|ELF' | cut -d ':' -f1 | xargs -s1024 chmod 755 + rm -f ${MY_Filter} + unset MY_Filter + + - name: Make Download + run: | + df -h + cd openwrt + make download -j10 + - name: Make Toolchain + run: | + df -h + cd openwrt + let make_process=$(nproc)+1 + make toolchain/install -j${make_process} V=s + - name: Compile Openwrt + id: compileopenwrt + continue-on-error: true + run: | + df -h + cd openwrt + let Make_Process=$(nproc)+1 + make -j${Make_Process} V=w + echo $? + - name: If Error + if: steps.compileopenwrt.outcome == 'failure' + run: | + cat openwrt/.config + echo '================================================================' + cd openwrt && make -j1 V=s + - name: Print Disk Space After + run: df -h + - name: Organize files + id: organize + run: | + rm -rf ./artifact/ + mkdir -p ./artifact/ + mv openwrt/bin/targets/rockchip/armv8/*sysupgrade.img* ./artifact/ + cd ./artifact/ + ls -Ahl + gzip -d *.gz && exit 0 + gzip --best *.img + ls -Ahl + sha256sum openwrt*r2s* | tee R2S-GC404-$(date +%Y-%m-%d)-21.02.sha256sum + zip R2S-GC404-$(date +%Y-%m-%d)-21.02-ext4.zip *r2s*ext4* + zip R2S-GC404-$(date +%Y-%m-%d)-21.02-sfs.zip *r2s*squashfs* + ls -Ahl + - name: Upload artifact + uses: actions/upload-artifact@main + with: + name: OpenWRT_21.02 + path: ./artifact/ + + - name: Create release + id: create_release + uses: ncipollo/release-action@v1.8.0 + with: + name: OpenWRT-R2S-R4S-X86-21.02 + allowUpdates: true + tag: 2102 + commit: master + replacesArtifacts: true + token: ${{ secrets.workflow_token }} + artifacts: ./artifact/*.zip diff --git a/.github/workflows/R4S-OpenWrt.yml b/.github/workflows/R4S-OpenWrt.yml new file mode 100644 index 000000000..17fd905b1 --- /dev/null +++ b/.github/workflows/R4S-OpenWrt.yml @@ -0,0 +1,145 @@ +name: R4S-OpenWrt + +on: + schedule: + - cron: 5 6 * * 0 + watch: + types: started + +jobs: + build: + runs-on: ubuntu-20.04 + if: github.event.repository.owner.id == github.event.sender.id + + steps: + - name: Checkout + uses: actions/checkout@main + - name: Show system + run: | + echo -e "Total CPU cores\t: $(nproc)" + cat /proc/cpuinfo | grep 'model name' + free -h + uname -a + [ -f /proc/version ] && cat /proc/version + [ -f /etc/issue.net ] && cat /etc/issue.net + [ -f /etc/issue ] && cat /etc/issue + ulimit -a + - name: Free disk space + run: | + sudo -E swapoff -a + sudo -E rm -f /swapfile + sudo -E docker image prune -a -f + sudo -E snap set system refresh.retain=2 + sudo -E apt-get -y purge azure* dotnet* firefox ghc* google* hhvm llvm* mono* mysql* openjdk* php* zulu* + sudo -E apt-get -y autoremove --purge + sudo -E apt-get clean + sudo -E rm -rf /usr/share/dotnet /usr/local/lib/android/sdk /etc/mysql /etc/php /usr/local/share/boost + [ -n "$AGENT_TOOLSDIRECTORY" ] && sudo rm -rf "$AGENT_TOOLSDIRECTORY" + df -h + - name: Init build dependencies + env: + DEBIAN_FRONTEND: noninteractive + run: | + sudo -E rm -rf /etc/apt/sources.list.d + sudo -E apt-get update -y + sudo -E apt-get install -y build-essential rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons + wget -qO - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | sed 's/python-/python3-/g' | /bin/bash + sudo -E apt-get clean -y + git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com' + df -h + - name: Prepare Mixedwrt + run: | + sudo chown -R runner:runner /home/runner/work/R2S-R4S-X86-OpenWrt + cp -r ./SCRIPTS/R4S/. ./SCRIPTS/ + cp -r ./SCRIPTS/. ./ + /bin/bash 01_get_ready.sh + - name: Prepare Package + run: | + cd openwrt + cp -r ../SCRIPTS/. ./ + /bin/bash 02_prepare_package.sh + /bin/bash 02_target_only.sh + - name: Convert Translation + run: | + cd openwrt + /bin/bash 03_convert_translation.sh + - name: Add ACL + run: | + cd openwrt + /bin/bash 05_create_acl_for_luci.sh -a + - name: Make Config + run: | + cd openwrt + mv ../SEED/R4S/config.seed .config + make defconfig + + - name: Smart chmod + run: | + MY_Filter=$(mktemp) + echo '/\.git' > ${MY_Filter} + echo '/\.svn' >> ${MY_Filter} + find ./ -maxdepth 1 | grep -v '\./$' | grep -v '/\.git' | xargs -s1024 chmod -R u=rwX,og=rX + find ./ -type f | grep -v -f ${MY_Filter} | xargs -s1024 file | grep 'executable\|ELF' | cut -d ':' -f1 | xargs -s1024 chmod 755 + rm -f ${MY_Filter} + unset MY_Filter + + - name: Make Download + run: | + df -h + cd openwrt + make download -j10 + - name: Make Toolchain + run: | + df -h + cd openwrt + let make_process=$(nproc)+1 + make toolchain/install -j${make_process} V=s + - name: Compile Openwrt + id: compileopenwrt + continue-on-error: true + run: | + df -h + cd openwrt + let Make_Process=$(nproc)+1 + make -j${Make_Process} V=w + echo $? + - name: If Error + if: steps.compileopenwrt.outcome == 'failure' + run: | + cat openwrt/.config + echo '================================================================' + cd openwrt && make -j1 V=s + - name: Print Disk Space After + run: df -h + - name: Organize files + id: organize + run: | + rm -rf ./artifact/ + mkdir -p ./artifact/ + mv openwrt/bin/targets/rockchip/armv8/*sysupgrade.img* ./artifact/ + cd ./artifact/ + ls -Ahl + gzip -d *.gz && exit 0 + gzip --best *.img + ls -Ahl + sha256sum openwrt*r4s* | tee R4S-GC404-$(date +%Y-%m-%d)-21.02.sha256sum + zip R4S-GC404-$(date +%Y-%m-%d)-21.02-ext4.zip *r4s*ext4* + zip R4S-GC404-$(date +%Y-%m-%d)-21.02-sfs.zip *r4s*squashfs* + ls -Ahl + - name: Upload artifact + uses: actions/upload-artifact@main + with: + name: OpenWRT_21.02 + path: ./artifact/ + + - name: Create release + id: create_release + uses: ncipollo/release-action@v1.8.0 + with: + name: OpenWRT-R2S-R4S-X86-21.02 + allowUpdates: true + tag: 2102 + commit: master + replacesArtifacts: true + token: ${{ secrets.workflow_token }} + artifacts: ./artifact/*.zip diff --git a/.github/workflows/X86-OpenWrt.yml b/.github/workflows/X86-OpenWrt.yml new file mode 100644 index 000000000..32b4778aa --- /dev/null +++ b/.github/workflows/X86-OpenWrt.yml @@ -0,0 +1,145 @@ +name: X86-OpenWrt + +on: + schedule: + - cron: 5 6 * * 0 + watch: + types: started + +jobs: + build: + runs-on: ubuntu-20.04 + if: github.event.repository.owner.id == github.event.sender.id + + steps: + - name: Checkout + uses: actions/checkout@main + - name: Show system + run: | + echo -e "Total CPU cores\t: $(nproc)" + cat /proc/cpuinfo | grep 'model name' + free -h + uname -a + [ -f /proc/version ] && cat /proc/version + [ -f /etc/issue.net ] && cat /etc/issue.net + [ -f /etc/issue ] && cat /etc/issue + ulimit -a + - name: Free disk space + run: | + sudo -E swapoff -a + sudo -E rm -f /swapfile + sudo -E docker image prune -a -f + sudo -E snap set system refresh.retain=2 + sudo -E apt-get -y purge azure* dotnet* firefox ghc* google* hhvm llvm* mono* mysql* openjdk* php* zulu* + sudo -E apt-get -y autoremove --purge + sudo -E apt-get clean + sudo -E rm -rf /usr/share/dotnet /usr/local/lib/android/sdk /etc/mysql /etc/php /usr/local/share/boost + [ -n "$AGENT_TOOLSDIRECTORY" ] && sudo rm -rf "$AGENT_TOOLSDIRECTORY" + df -h + - name: Init build dependencies + env: + DEBIAN_FRONTEND: noninteractive + run: | + sudo -E rm -rf /etc/apt/sources.list.d + sudo -E apt-get update -y + sudo -E apt-get install -y build-essential rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons + wget -qO - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | sed 's/python-/python3-/g' | /bin/bash + sudo -E apt-get clean -y + git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com' + df -h + - name: Prepare Mixedwrt + run: | + sudo chown -R runner:runner /home/runner/work/R2S-R4S-X86-OpenWrt + cp -r ./SCRIPTS/X86/. ./SCRIPTS/ + cp -r ./SCRIPTS/. ./ + /bin/bash 01_get_ready.sh + - name: Prepare Package + run: | + cd openwrt + cp -r ../SCRIPTS/. ./ + /bin/bash 02_prepare_package.sh + /bin/bash 02_target_only.sh + - name: Convert Translation + run: | + cd openwrt + /bin/bash 03_convert_translation.sh + - name: Add ACL + run: | + cd openwrt + /bin/bash 05_create_acl_for_luci.sh -a + - name: Make Config + run: | + cd openwrt + mv ../SEED/X86/config.seed .config + make defconfig + + - name: Smart chmod + run: | + MY_Filter=$(mktemp) + echo '/\.git' > ${MY_Filter} + echo '/\.svn' >> ${MY_Filter} + find ./ -maxdepth 1 | grep -v '\./$' | grep -v '/\.git' | xargs -s1024 chmod -R u=rwX,og=rX + find ./ -type f | grep -v -f ${MY_Filter} | xargs -s1024 file | grep 'executable\|ELF' | cut -d ':' -f1 | xargs -s1024 chmod 755 + rm -f ${MY_Filter} + unset MY_Filter + + - name: Make Download + run: | + df -h + cd openwrt + make download -j10 + - name: Make Toolchain + run: | + df -h + cd openwrt + let make_process=$(nproc)+1 + make toolchain/install -j${make_process} V=s + - name: Compile Openwrt + id: compileopenwrt + continue-on-error: true + run: | + df -h + cd openwrt + let Make_Process=$(nproc)+1 + make -j${Make_Process} V=w + echo $? + - name: If Error + if: steps.compileopenwrt.outcome == 'failure' + run: | + cat openwrt/.config + echo '================================================================' + cd openwrt && make -j1 V=s + - name: Print Disk Space After + run: df -h + - name: Organize files + id: organize + run: | + rm -rf ./artifact/ + mkdir -p ./artifact/ + mv openwrt/bin/targets/x86/64/*combined.img* ./artifact/ + cd ./artifact/ + ls -Ahl + gzip -d *.gz && exit 0 + gzip --best *.img + ls -Ahl + sha256sum openwrt*x86* | tee X86-GC404-$(date +%Y-%m-%d)-21.02.sha256sum + zip X86-GC404-$(date +%Y-%m-%d)-21.02-ext4.zip *ext4-combined* + zip X86-GC404-$(date +%Y-%m-%d)-21.02-sfs.zip *squashfs-combined* + ls -Ahl + - name: Upload artifact + uses: actions/upload-artifact@main + with: + name: OpenWRT_21.02 + path: ./artifact/ + + - name: Create release + id: create_release + uses: ncipollo/release-action@v1.8.0 + with: + name: OpenWRT-R2S-R4S-X86-21.02 + allowUpdates: true + tag: 2102 + commit: master + replacesArtifacts: true + token: ${{ secrets.workflow_token }} + artifacts: ./artifact/*.zip diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..f288702d2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/PATCH/R2S/files/etc/config/AdGuardHome b/PATCH/R2S/files/etc/config/AdGuardHome new file mode 100644 index 000000000..e20422ce9 --- /dev/null +++ b/PATCH/R2S/files/etc/config/AdGuardHome @@ -0,0 +1,14 @@ + +config AdGuardHome 'AdGuardHome' + option httpport '3000' + option configpath '/etc/config/AdGuardHome.yaml' + option logfile '/tmp/AdGuardHome.log' + option waitonboot '0' + option crontab 'cutquerylog cutruntimelog' + option redirect 'dnsmasq-upstream' + option backupfile 'filters' + option workdir '/etc/config/AdGuardHomeConfig' + option backupwdpath '/etc/config/AdGuardHomeConfig' + option binpath '/usr/bin/AdGuardHome' + option enabled '0' + option binmtime '0' diff --git a/PATCH/R2S/files/etc/config/AdGuardHome.yaml b/PATCH/R2S/files/etc/config/AdGuardHome.yaml new file mode 100644 index 000000000..be4520d45 --- /dev/null +++ b/PATCH/R2S/files/etc/config/AdGuardHome.yaml @@ -0,0 +1,144 @@ +bind_host: 0.0.0.0 +bind_port: 3000 +users: +- name: root + password: $2y$10$8GfLmnbQpS883RMTpGN66.TbyavsPmElcy2aR6vec7xL0YOG.gx52 +http_proxy: "" +language: "" +rlimit_nofile: 0 +debug_pprof: false +web_session_ttl: 720 +dns: + bind_host: 127.0.0.1 + port: 5335 + statistics_interval: 1 + querylog_enabled: false + querylog_file_enabled: true + querylog_interval: 1 + querylog_size_memory: 1000 + anonymize_client_ip: false + protection_enabled: true + blocking_mode: default + blocking_ipv4: "" + blocking_ipv6: "" + blocked_response_ttl: 10 + parental_block_host: family-block.dns.adguard.com + safebrowsing_block_host: standard-block.dns.adguard.com + ratelimit: 0 + ratelimit_whitelist: [] + refuse_any: true + upstream_dns: + - 127.0.0.1:6052 + - '[/awsglobalaccelerator.com/]127.0.0.1:6050' + upstream_dns_file: "" + bootstrap_dns: + - 127.0.0.1:6052 + all_servers: false + fastest_addr: true + allowed_clients: [] + disallowed_clients: [] + blocked_hosts: + - version.bind + - id.server + - hostname.bind + cache_size: 4194304 + cache_ttl_min: 3600 + cache_ttl_max: 36000 + bogus_nxdomain: [] + aaaa_disabled: false + enable_dnssec: false + edns_client_subnet: false + max_goroutines: 0 + ipset: [] + filtering_enabled: true + filters_update_interval: 24 + parental_enabled: false + safesearch_enabled: false + safebrowsing_enabled: false + safebrowsing_cache_size: 1048576 + safesearch_cache_size: 1048576 + parental_cache_size: 1048576 + cache_time: 30 + rewrites: + - domain: wifi.weixin.qq.com + answer: 127.0.0.1 + - domain: clock.redhat.com + answer: cn.ntp.org.cn + - domain: clock.cuhk.edu.hk + answer: cn.ntp.org.cn + - domain: https://www.meituan.com + answer: www.meituan.com + blocked_services: [] +tls: + enabled: false + server_name: "" + force_https: false + port_https: 443 + port_dns_over_tls: 853 + port_dns_over_quic: 784 + allow_unencrypted_doh: false + strict_sni_check: false + certificate_chain: "" + private_key: "" + certificate_path: "" + private_key_path: "" +filters: +- enabled: false + url: https://gitee.com/halflife/list/raw/master/ad.txt + name: HalfLife + id: 1595502658 +- enabled: false + url: https://pgl.yoyo.org/adservers/serverlist.php?hostformat=adblockplus&showintro=1&mimetype=plaintext + name: Peter Lowe's List + id: 1595502661 +- enabled: true + url: https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt + name: NoCoin Filter List + id: 1595502662 +- enabled: true + url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/rule.txt + name: 乘风 广告过滤规则 + id: 1600600707 +- enabled: true + url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/mv.txt + name: 乘风 视频广告过滤规则 + id: 1600600708 +- enabled: true + url: https://gitee.com/cjx82630/cjxlist/raw/master/cjx-ublock.txt + name: CJX's uBlock list + id: 1600600709 +- enabled: true + url: https://gitee.com/cjx82630/cjxlist/raw/master/cjx-annoyance.txt + name: CJX's Annoyance List + id: 1600600710 +- enabled: true + url: http://sub.adtchrome.com/adt-chinalist-easylist.txt + name: ChinaList and EasyList + id: 1600600711 +whitelist_filters: [] +user_rules: [] +dhcp: + enabled: false + interface_name: "" + dhcpv4: + gateway_ip: "" + subnet_mask: "" + range_start: "" + range_end: "" + lease_duration: 86400 + icmp_timeout_msec: 1000 + options: [] + dhcpv6: + range_start: "" + lease_duration: 86400 + ra_slaac_only: false + ra_allow_slaac: false +clients: [] +log_compress: false +log_localtime: false +log_max_backups: 0 +log_max_size: 100 +log_max_age: 3 +log_file: "" +verbose: false +schema_version: 7 diff --git a/PATCH/R2S/files/etc/config/MosChinaDNS b/PATCH/R2S/files/etc/config/MosChinaDNS new file mode 100644 index 000000000..1d53b8f84 --- /dev/null +++ b/PATCH/R2S/files/etc/config/MosChinaDNS @@ -0,0 +1,12 @@ + +config MosChinaDNS 'MosChinaDNS' + option httpport '3000' + option redirect 'none' + option configpath '/etc/config/MosChinaDNS.yaml' + option workdir '/usr/bin/MosChinaDNS' + option logfile 'syslog' + option binpath '/usr/bin/MosChinaDNS/MosChinaDNS' + option enabled '1' + + option binmtime '0' + option waitonboot '0' diff --git a/PATCH/R2S/files/etc/config/MosChinaDNS.yaml b/PATCH/R2S/files/etc/config/MosChinaDNS.yaml new file mode 100644 index 000000000..cc30d4378 --- /dev/null +++ b/PATCH/R2S/files/etc/config/MosChinaDNS.yaml @@ -0,0 +1,169 @@ +# addr: "127.0.0.1:6052" +# 分流器设定 +dispatcher: + # 监听地址 [必需] + # 格式: ["protocol://host:port","protocol://host:port",...] + # `protocol`为监听协议。`tcp`或`udp`。 + # `host`是监听地址。设为`0.0.0.0`可监听本机包括IPv6的所有地址,不必再监听[::]。 + # `port`为监听端口。 + # 默认: ["udp://127.0.0.1:53","tcp://127.0.0.1:53","udp://[::1]:53","tcp://[::1]:53"] + # 监听所有地址: ["udp://0.0.0.0:53","tcp://0.0.0.0:53"] + bind: [ "udp://127.0.0.1:6052","tcp://127.0.0.1:6052","udp://[::1]:6052","tcp://[::1]:6052" ] + +# 上游服务器设定 +# 可包含一个或多个上游服务器。 +# 各个上游服务器的策略将决定对于某一请求是否允许发送至该上游服务器解析以及应答是否被采纳。 +# 请求会同时发送给启用的上游服务器。分流器最终会采纳最快被上游服务器采纳的应答。 +upstream: + # 一个上游服务器,名叫local + local: # 服务器名称,可随意设定,只需保证多个服务器名称无重复即可。 + server: "mainland" # 使用的服务器的tag。该tag必需在server中定义。 + + # 策略 + # 策略决定了对于给定请求,是否允许发送至该上游,以及是否采纳返回的应答。 + # 策略处理流程从上到下。 + policies: + # 请求策略 + query: + + # 如何处理无法分流的请求类型。 + # 目前域名/IP分流策略只能处理A和AAAA请求。 + # "accept": 非(A和AAAA)请求会被发送至该服务器并且其应答会被直接采纳(不会再执行后续的任何策略)。 + # "deny": 非(A和AAAA)请求不会由本上游解析。 + unhandlable_types: "accept" + + # 域名策略 + # 域名策略将根据请求的域名决定该请求是否允许发送至该上游。 + # 可由多个策略构成,用`|`分割。处理流程从左至右,如果上一条策略没有命中,将匹配下一条。 + # 如果直到最后都没有命中任何策略,则请求会发送至该上游,然后执行后续的策略。 + # + # 格式: "action:file|action:file|action:file|action..." + # `file`为域名表的路径。如果没有指定`file`,则会匹配所有域名。 + # `action`可以是 + # `accept`: 允许发送至该上游,并且直接采纳其应答(不会再执行后续的任何策略)。 + # `deny`: 拒绝发送至该上游。 + # e.g. "deny:./blacklist.txt" `blacklist.txt`里的域名不会发送至该上游。 + # e.g. "accept:./whitelist.txt|deny" 只有`whitelist.txt`里的域名才会发送至该上游。 + domain: "accept:./chn_domain.list|deny:./non_chn_domain.list" + + reply: # 应答策略 + + # 如何处理Rcode不成功(Rcode!=0)的应答 + # "accept": 直接采纳(不会再执行后续的任何策略)。 + # "deny": 丢弃。 + # "redirect_XXXXXX": 重定向请求。 + error_rcode: "deny" + + # CNAME策略 + # 如果返回应答没有CNAME部分,该策略不会生效。 + # 可由多个策略构成,用`|`分割。处理流程从左至右,如果上一条策略没有命中,将匹配下一条。 + # 如果直到最后都没有命中任何策略,则继续执行后续的策略。 + # + # 格式: "action:file|action:file|action:file|action..." + # `file`为域名表的路径。如果没有指定`file`,则会匹配所有域名。 + # `action`可以是 + # `accept`: 直接采纳应答(不会再执行后续的任何策略)。 + # `deny`: 丢弃该应答。 + # "redirect_XXXXXX": 重定向请求。 + cname: "accept:./chn_domain.list" + + # 如何处理不包含任何IP的应答。 + # "accept": 直接采纳(不会再执行后续的任何策略)。 + # "deny": 丢弃。 + # "redirect_XXXXXX": 重定向请求。 + without_ip: "deny" + + # IP策略 + # 可由多个策略构成,用`|`分割,处理流程从左至右,如果上一条策略没有命中,将继续匹配下一条。 + # 如果直到最后都没有命中任何策略,默认`采纳该应答`。 + # + # 格式: "action:file|action:file|action:file|..." + # `file`为IP表文件的路径。如果没有指定`file`,则会匹配所有IP。 + # `action`是策略,可以是: + # `accept`: 采纳该应答。 + # `deny`: 丢弃该应答。 + # "redirect_XXXXXX": 重定向请求。 + # + # e.g. "deny:./blacklist.txt" + # e.g. "accept:./whitelist.txt|deny" 仅允许`whitelist.txt`里的IP。 + # e.g. "deny:./blacklist.txt|accept:./whitelist.txt|deny" + ip: "accept:./chn_ip.list|deny" + + # 另外一个上游服务器,名叫remote。设置说明参见上文。 + remote: + server: "oversea" + + policies: + query: + unhandlable_types: "accept" + domain: "deny:./chn_domain.list|accept" # chn_domain.list里的域名无需remote解析。 + +# 服务器设定 +# 可包含一个或多个服务器。 +server: + # 一个服务器,tag名为`aliyun`。这个tag可以可以随意更改。只需保证多个服务器无重复即可。 + mainland: + addr: "127.0.0.1:6050" # 服务器地址。 + protocol: "udp" # 服务器协议。`tcp`|`udp`|`doh`|`dot`其中之一。 + #socks5: "" # socks5代理服务器地址。注意: 不支持有密码验证的socks5服务器。udp协议不会使用socks5代理。 + + # 是否请求去重。 + # false: 来自下游的请求将一对一的发送至上游服务器。 + # true: 如果已经有一个相同的请求正在进行,后来的请求将不再发送至上游服务器,而是等待并采用之前请求返回的结果。 + deduplicate: false + + # edns0相关设定 + edns0: + + # 在转发至该服务器的请求中附加的ECS地址。 + # 格式为CIDR。e.g. "1.2.3.0/24", "2001:dd8:1a::/48"。 + # A类型的请求将附加ipv4的地址。AAAA类型的请求将附加ipv6的地址 + # 其他类别的请求不会附加ECS。 + # 如果请求中已包含ECS,默认不会复写,除非设置了`overwrite_ecs`。 + # client_subnet: + # ipv4: "" + # ipv6: "" + overwrite_ecs: false # 是否强制改写下游请求已有的ECS。 + + # TCP设定,仅`protocol`为`tcp`时有用。 + tcp: + idle_timeout: 10 # 空连接超时时间。单位: 秒。0表示禁用连接重用。 + + # DoT设定,仅`protocol`为`dot`有用。 + dot: + server_name: "" # [必需] 服务器的域名/证书名。 + idle_timeout: 10 # 空连接超时时间。单位: 秒。0表示禁用连接重用。 + + # DoH设定,仅`protocol`为`doh`有用。 + doh: + url: "" # [必需] DoH的URL。 + + oversea: + addr: "127.0.0.1:6051" + protocol: "udp" + socks5: "" + deduplicate: false + edns0: + # client_subnet: + # ipv4: "" + # ipv6: "" + overwrite_ecs: false + tcp: + idle_timeout: 10 + dot: + server_name: "" + idle_timeout: 10 + doh: + url: "" + + # 如果还想添加服务器,只需将上面的设置模板复制一遍。 + # 保持服务器的tag互相不一样和缩进对齐即可。 + +# CA证书设定 +ca: + # 导入用于TLS验证的CA证书。证书需为PEM格式。 + # 可以是ca-bundle(包含多个PEM块)。可指定多个证书文件。 + # 留空默认使用系统自带CA证书。 + # e.g. ["./my.cert"] + # e.g. ["./a.cert", "./b.cert", ...] + path: [] \ No newline at end of file diff --git a/PATCH/R2S/files/etc/config/chinadns-ng b/PATCH/R2S/files/etc/config/chinadns-ng new file mode 100644 index 000000000..403d7515f --- /dev/null +++ b/PATCH/R2S/files/etc/config/chinadns-ng @@ -0,0 +1,18 @@ + +config chinadns-ng + option ipset_name4 'chnroute' + option ipset_name6 'chnroute6' + option gfwlist_file '/etc/chinadns-ng/gfwlist.txt' + option chnlist_file '/etc/chinadns-ng/chinalist.txt' + option bind_port '6052' + option timeout_sec '1' + option china_dns '127.0.0.1#6050' + option trust_dns '127.0.0.1#6051' + option repeat_times '1' + option bind_addr '127.0.0.1' + option reuse_port '1' + option noip_as_chnip '1' + option fair_mode '1' + option chnlist_first '0' + option enable '0' + diff --git a/PATCH/R2S/files/etc/config/cpufreq b/PATCH/R2S/files/etc/config/cpufreq new file mode 100644 index 000000000..d96f08c9b --- /dev/null +++ b/PATCH/R2S/files/etc/config/cpufreq @@ -0,0 +1,5 @@ + +config settings 'cpufreq' + option governor0 'schedutil' + option minfreq0 '1008000' + option maxfreq0 '1608000' diff --git a/PATCH/R2S/files/etc/config/cpulimit b/PATCH/R2S/files/etc/config/cpulimit new file mode 100644 index 000000000..939f8ac22 --- /dev/null +++ b/PATCH/R2S/files/etc/config/cpulimit @@ -0,0 +1,6 @@ + +config list + option exename '/sbin/rngd' + option limit '1' + option enabled '1' + diff --git a/PATCH/R2S/files/etc/config/smartdns b/PATCH/R2S/files/etc/config/smartdns new file mode 100644 index 000000000..807e9e130 --- /dev/null +++ b/PATCH/R2S/files/etc/config/smartdns @@ -0,0 +1,69 @@ + +config smartdns + option server_name 'smartdns' + option port '6051' + option dualstack_ip_selection '0' + option server_group 'oversea' + option seconddns_port '6050' + option seconddns_tcp_server '1' + option seconddns_no_speed_check '0' + option coredump '0' + option seconddns_enabled '1' + option seconddns_no_dualstack_selection '1' + option ipv6_server '0' + option redirect 'none' + option seconddns_server_group 'mainland' + option prefetch_domain '1' + option serve_expired '1' + option tcp_server '1' + option seconddns_no_cache '1' + option rr_ttl_min '3600' + option rr_ttl '3600' + option rr_ttl_max '36000' + option cache_size '4194304' + option enabled '1' + +config server + option type 'udp' + option name 'DNSPod' + option ip '119.29.29.29' + option blacklist_ip '0' + option server_group 'mainland' + option enabled '1' + option addition_arg '-exclude-default-group' + +config server + option type 'udp' + option name 'AliDNS' + option ip '223.5.5.5' + option blacklist_ip '0' + option server_group 'mainland' + option enabled '1' + option addition_arg '-exclude-default-group' + +config server + option type 'tls' + option server_group 'oversea' + option blacklist_ip '0' + option no_check_certificate '0' + option name 'Google TLS' + option enabled '1' + option ip '8.8.4.4' + +config server + option type 'tls' + option server_group 'oversea' + option blacklist_ip '0' + option no_check_certificate '0' + option ip '1.1.1.1' + option enabled '1' + option name 'Cloudflare TLS' + +config server + option enabled '1' + option server_group 'oversea' + option blacklist_ip '0' + option type 'udp' + option port '5353' + option name 'USTC' + option ip '202.141.162.123' diff --git a/PATCH/R2S/files/etc/ssr/black.list b/PATCH/R2S/files/etc/ssr/black.list new file mode 100644 index 000000000..5d064162a --- /dev/null +++ b/PATCH/R2S/files/etc/ssr/black.list @@ -0,0 +1,3 @@ +dns.sb +doh.li +containerpi.com diff --git a/PATCH/R2S/files/etc/ssr/white.list b/PATCH/R2S/files/etc/ssr/white.list new file mode 100644 index 000000000..0f7abfd0e --- /dev/null +++ b/PATCH/R2S/files/etc/ssr/white.list @@ -0,0 +1,10 @@ +checkip.synology.com +checkipv6.synology.com +checkport.synology.com +ddns.synology.com +account.synology.com +whatismyip.akamai.com +checkip.dyndns.org +teamviewer.com +bing.com +api.ipify.org diff --git a/PATCH/R2S/files/etc/ssrplus/black.list b/PATCH/R2S/files/etc/ssrplus/black.list new file mode 100644 index 000000000..5d064162a --- /dev/null +++ b/PATCH/R2S/files/etc/ssrplus/black.list @@ -0,0 +1,3 @@ +dns.sb +doh.li +containerpi.com diff --git a/PATCH/R2S/files/etc/ssrplus/white.list b/PATCH/R2S/files/etc/ssrplus/white.list new file mode 100644 index 000000000..0f7abfd0e --- /dev/null +++ b/PATCH/R2S/files/etc/ssrplus/white.list @@ -0,0 +1,10 @@ +checkip.synology.com +checkipv6.synology.com +checkport.synology.com +ddns.synology.com +account.synology.com +whatismyip.akamai.com +checkip.dyndns.org +teamviewer.com +bing.com +api.ipify.org diff --git a/PATCH/R4S/files/etc/config/AdGuardHome b/PATCH/R4S/files/etc/config/AdGuardHome new file mode 100644 index 000000000..e20422ce9 --- /dev/null +++ b/PATCH/R4S/files/etc/config/AdGuardHome @@ -0,0 +1,14 @@ + +config AdGuardHome 'AdGuardHome' + option httpport '3000' + option configpath '/etc/config/AdGuardHome.yaml' + option logfile '/tmp/AdGuardHome.log' + option waitonboot '0' + option crontab 'cutquerylog cutruntimelog' + option redirect 'dnsmasq-upstream' + option backupfile 'filters' + option workdir '/etc/config/AdGuardHomeConfig' + option backupwdpath '/etc/config/AdGuardHomeConfig' + option binpath '/usr/bin/AdGuardHome' + option enabled '0' + option binmtime '0' diff --git a/PATCH/R4S/files/etc/config/AdGuardHome.yaml b/PATCH/R4S/files/etc/config/AdGuardHome.yaml new file mode 100644 index 000000000..be4520d45 --- /dev/null +++ b/PATCH/R4S/files/etc/config/AdGuardHome.yaml @@ -0,0 +1,144 @@ +bind_host: 0.0.0.0 +bind_port: 3000 +users: +- name: root + password: $2y$10$8GfLmnbQpS883RMTpGN66.TbyavsPmElcy2aR6vec7xL0YOG.gx52 +http_proxy: "" +language: "" +rlimit_nofile: 0 +debug_pprof: false +web_session_ttl: 720 +dns: + bind_host: 127.0.0.1 + port: 5335 + statistics_interval: 1 + querylog_enabled: false + querylog_file_enabled: true + querylog_interval: 1 + querylog_size_memory: 1000 + anonymize_client_ip: false + protection_enabled: true + blocking_mode: default + blocking_ipv4: "" + blocking_ipv6: "" + blocked_response_ttl: 10 + parental_block_host: family-block.dns.adguard.com + safebrowsing_block_host: standard-block.dns.adguard.com + ratelimit: 0 + ratelimit_whitelist: [] + refuse_any: true + upstream_dns: + - 127.0.0.1:6052 + - '[/awsglobalaccelerator.com/]127.0.0.1:6050' + upstream_dns_file: "" + bootstrap_dns: + - 127.0.0.1:6052 + all_servers: false + fastest_addr: true + allowed_clients: [] + disallowed_clients: [] + blocked_hosts: + - version.bind + - id.server + - hostname.bind + cache_size: 4194304 + cache_ttl_min: 3600 + cache_ttl_max: 36000 + bogus_nxdomain: [] + aaaa_disabled: false + enable_dnssec: false + edns_client_subnet: false + max_goroutines: 0 + ipset: [] + filtering_enabled: true + filters_update_interval: 24 + parental_enabled: false + safesearch_enabled: false + safebrowsing_enabled: false + safebrowsing_cache_size: 1048576 + safesearch_cache_size: 1048576 + parental_cache_size: 1048576 + cache_time: 30 + rewrites: + - domain: wifi.weixin.qq.com + answer: 127.0.0.1 + - domain: clock.redhat.com + answer: cn.ntp.org.cn + - domain: clock.cuhk.edu.hk + answer: cn.ntp.org.cn + - domain: https://www.meituan.com + answer: www.meituan.com + blocked_services: [] +tls: + enabled: false + server_name: "" + force_https: false + port_https: 443 + port_dns_over_tls: 853 + port_dns_over_quic: 784 + allow_unencrypted_doh: false + strict_sni_check: false + certificate_chain: "" + private_key: "" + certificate_path: "" + private_key_path: "" +filters: +- enabled: false + url: https://gitee.com/halflife/list/raw/master/ad.txt + name: HalfLife + id: 1595502658 +- enabled: false + url: https://pgl.yoyo.org/adservers/serverlist.php?hostformat=adblockplus&showintro=1&mimetype=plaintext + name: Peter Lowe's List + id: 1595502661 +- enabled: true + url: https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt + name: NoCoin Filter List + id: 1595502662 +- enabled: true + url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/rule.txt + name: 乘风 广告过滤规则 + id: 1600600707 +- enabled: true + url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/mv.txt + name: 乘风 视频广告过滤规则 + id: 1600600708 +- enabled: true + url: https://gitee.com/cjx82630/cjxlist/raw/master/cjx-ublock.txt + name: CJX's uBlock list + id: 1600600709 +- enabled: true + url: https://gitee.com/cjx82630/cjxlist/raw/master/cjx-annoyance.txt + name: CJX's Annoyance List + id: 1600600710 +- enabled: true + url: http://sub.adtchrome.com/adt-chinalist-easylist.txt + name: ChinaList and EasyList + id: 1600600711 +whitelist_filters: [] +user_rules: [] +dhcp: + enabled: false + interface_name: "" + dhcpv4: + gateway_ip: "" + subnet_mask: "" + range_start: "" + range_end: "" + lease_duration: 86400 + icmp_timeout_msec: 1000 + options: [] + dhcpv6: + range_start: "" + lease_duration: 86400 + ra_slaac_only: false + ra_allow_slaac: false +clients: [] +log_compress: false +log_localtime: false +log_max_backups: 0 +log_max_size: 100 +log_max_age: 3 +log_file: "" +verbose: false +schema_version: 7 diff --git a/PATCH/R4S/files/etc/config/MosChinaDNS b/PATCH/R4S/files/etc/config/MosChinaDNS new file mode 100644 index 000000000..1d53b8f84 --- /dev/null +++ b/PATCH/R4S/files/etc/config/MosChinaDNS @@ -0,0 +1,12 @@ + +config MosChinaDNS 'MosChinaDNS' + option httpport '3000' + option redirect 'none' + option configpath '/etc/config/MosChinaDNS.yaml' + option workdir '/usr/bin/MosChinaDNS' + option logfile 'syslog' + option binpath '/usr/bin/MosChinaDNS/MosChinaDNS' + option enabled '1' + + option binmtime '0' + option waitonboot '0' diff --git a/PATCH/R4S/files/etc/config/MosChinaDNS.yaml b/PATCH/R4S/files/etc/config/MosChinaDNS.yaml new file mode 100644 index 000000000..cc30d4378 --- /dev/null +++ b/PATCH/R4S/files/etc/config/MosChinaDNS.yaml @@ -0,0 +1,169 @@ +# addr: "127.0.0.1:6052" +# 分流器设定 +dispatcher: + # 监听地址 [必需] + # 格式: ["protocol://host:port","protocol://host:port",...] + # `protocol`为监听协议。`tcp`或`udp`。 + # `host`是监听地址。设为`0.0.0.0`可监听本机包括IPv6的所有地址,不必再监听[::]。 + # `port`为监听端口。 + # 默认: ["udp://127.0.0.1:53","tcp://127.0.0.1:53","udp://[::1]:53","tcp://[::1]:53"] + # 监听所有地址: ["udp://0.0.0.0:53","tcp://0.0.0.0:53"] + bind: [ "udp://127.0.0.1:6052","tcp://127.0.0.1:6052","udp://[::1]:6052","tcp://[::1]:6052" ] + +# 上游服务器设定 +# 可包含一个或多个上游服务器。 +# 各个上游服务器的策略将决定对于某一请求是否允许发送至该上游服务器解析以及应答是否被采纳。 +# 请求会同时发送给启用的上游服务器。分流器最终会采纳最快被上游服务器采纳的应答。 +upstream: + # 一个上游服务器,名叫local + local: # 服务器名称,可随意设定,只需保证多个服务器名称无重复即可。 + server: "mainland" # 使用的服务器的tag。该tag必需在server中定义。 + + # 策略 + # 策略决定了对于给定请求,是否允许发送至该上游,以及是否采纳返回的应答。 + # 策略处理流程从上到下。 + policies: + # 请求策略 + query: + + # 如何处理无法分流的请求类型。 + # 目前域名/IP分流策略只能处理A和AAAA请求。 + # "accept": 非(A和AAAA)请求会被发送至该服务器并且其应答会被直接采纳(不会再执行后续的任何策略)。 + # "deny": 非(A和AAAA)请求不会由本上游解析。 + unhandlable_types: "accept" + + # 域名策略 + # 域名策略将根据请求的域名决定该请求是否允许发送至该上游。 + # 可由多个策略构成,用`|`分割。处理流程从左至右,如果上一条策略没有命中,将匹配下一条。 + # 如果直到最后都没有命中任何策略,则请求会发送至该上游,然后执行后续的策略。 + # + # 格式: "action:file|action:file|action:file|action..." + # `file`为域名表的路径。如果没有指定`file`,则会匹配所有域名。 + # `action`可以是 + # `accept`: 允许发送至该上游,并且直接采纳其应答(不会再执行后续的任何策略)。 + # `deny`: 拒绝发送至该上游。 + # e.g. "deny:./blacklist.txt" `blacklist.txt`里的域名不会发送至该上游。 + # e.g. "accept:./whitelist.txt|deny" 只有`whitelist.txt`里的域名才会发送至该上游。 + domain: "accept:./chn_domain.list|deny:./non_chn_domain.list" + + reply: # 应答策略 + + # 如何处理Rcode不成功(Rcode!=0)的应答 + # "accept": 直接采纳(不会再执行后续的任何策略)。 + # "deny": 丢弃。 + # "redirect_XXXXXX": 重定向请求。 + error_rcode: "deny" + + # CNAME策略 + # 如果返回应答没有CNAME部分,该策略不会生效。 + # 可由多个策略构成,用`|`分割。处理流程从左至右,如果上一条策略没有命中,将匹配下一条。 + # 如果直到最后都没有命中任何策略,则继续执行后续的策略。 + # + # 格式: "action:file|action:file|action:file|action..." + # `file`为域名表的路径。如果没有指定`file`,则会匹配所有域名。 + # `action`可以是 + # `accept`: 直接采纳应答(不会再执行后续的任何策略)。 + # `deny`: 丢弃该应答。 + # "redirect_XXXXXX": 重定向请求。 + cname: "accept:./chn_domain.list" + + # 如何处理不包含任何IP的应答。 + # "accept": 直接采纳(不会再执行后续的任何策略)。 + # "deny": 丢弃。 + # "redirect_XXXXXX": 重定向请求。 + without_ip: "deny" + + # IP策略 + # 可由多个策略构成,用`|`分割,处理流程从左至右,如果上一条策略没有命中,将继续匹配下一条。 + # 如果直到最后都没有命中任何策略,默认`采纳该应答`。 + # + # 格式: "action:file|action:file|action:file|..." + # `file`为IP表文件的路径。如果没有指定`file`,则会匹配所有IP。 + # `action`是策略,可以是: + # `accept`: 采纳该应答。 + # `deny`: 丢弃该应答。 + # "redirect_XXXXXX": 重定向请求。 + # + # e.g. "deny:./blacklist.txt" + # e.g. "accept:./whitelist.txt|deny" 仅允许`whitelist.txt`里的IP。 + # e.g. "deny:./blacklist.txt|accept:./whitelist.txt|deny" + ip: "accept:./chn_ip.list|deny" + + # 另外一个上游服务器,名叫remote。设置说明参见上文。 + remote: + server: "oversea" + + policies: + query: + unhandlable_types: "accept" + domain: "deny:./chn_domain.list|accept" # chn_domain.list里的域名无需remote解析。 + +# 服务器设定 +# 可包含一个或多个服务器。 +server: + # 一个服务器,tag名为`aliyun`。这个tag可以可以随意更改。只需保证多个服务器无重复即可。 + mainland: + addr: "127.0.0.1:6050" # 服务器地址。 + protocol: "udp" # 服务器协议。`tcp`|`udp`|`doh`|`dot`其中之一。 + #socks5: "" # socks5代理服务器地址。注意: 不支持有密码验证的socks5服务器。udp协议不会使用socks5代理。 + + # 是否请求去重。 + # false: 来自下游的请求将一对一的发送至上游服务器。 + # true: 如果已经有一个相同的请求正在进行,后来的请求将不再发送至上游服务器,而是等待并采用之前请求返回的结果。 + deduplicate: false + + # edns0相关设定 + edns0: + + # 在转发至该服务器的请求中附加的ECS地址。 + # 格式为CIDR。e.g. "1.2.3.0/24", "2001:dd8:1a::/48"。 + # A类型的请求将附加ipv4的地址。AAAA类型的请求将附加ipv6的地址 + # 其他类别的请求不会附加ECS。 + # 如果请求中已包含ECS,默认不会复写,除非设置了`overwrite_ecs`。 + # client_subnet: + # ipv4: "" + # ipv6: "" + overwrite_ecs: false # 是否强制改写下游请求已有的ECS。 + + # TCP设定,仅`protocol`为`tcp`时有用。 + tcp: + idle_timeout: 10 # 空连接超时时间。单位: 秒。0表示禁用连接重用。 + + # DoT设定,仅`protocol`为`dot`有用。 + dot: + server_name: "" # [必需] 服务器的域名/证书名。 + idle_timeout: 10 # 空连接超时时间。单位: 秒。0表示禁用连接重用。 + + # DoH设定,仅`protocol`为`doh`有用。 + doh: + url: "" # [必需] DoH的URL。 + + oversea: + addr: "127.0.0.1:6051" + protocol: "udp" + socks5: "" + deduplicate: false + edns0: + # client_subnet: + # ipv4: "" + # ipv6: "" + overwrite_ecs: false + tcp: + idle_timeout: 10 + dot: + server_name: "" + idle_timeout: 10 + doh: + url: "" + + # 如果还想添加服务器,只需将上面的设置模板复制一遍。 + # 保持服务器的tag互相不一样和缩进对齐即可。 + +# CA证书设定 +ca: + # 导入用于TLS验证的CA证书。证书需为PEM格式。 + # 可以是ca-bundle(包含多个PEM块)。可指定多个证书文件。 + # 留空默认使用系统自带CA证书。 + # e.g. ["./my.cert"] + # e.g. ["./a.cert", "./b.cert", ...] + path: [] \ No newline at end of file diff --git a/PATCH/R4S/files/etc/config/chinadns-ng b/PATCH/R4S/files/etc/config/chinadns-ng new file mode 100644 index 000000000..403d7515f --- /dev/null +++ b/PATCH/R4S/files/etc/config/chinadns-ng @@ -0,0 +1,18 @@ + +config chinadns-ng + option ipset_name4 'chnroute' + option ipset_name6 'chnroute6' + option gfwlist_file '/etc/chinadns-ng/gfwlist.txt' + option chnlist_file '/etc/chinadns-ng/chinalist.txt' + option bind_port '6052' + option timeout_sec '1' + option china_dns '127.0.0.1#6050' + option trust_dns '127.0.0.1#6051' + option repeat_times '1' + option bind_addr '127.0.0.1' + option reuse_port '1' + option noip_as_chnip '1' + option fair_mode '1' + option chnlist_first '0' + option enable '0' + diff --git a/PATCH/R4S/files/etc/config/cpufreq b/PATCH/R4S/files/etc/config/cpufreq new file mode 100644 index 000000000..76ee64e3d --- /dev/null +++ b/PATCH/R4S/files/etc/config/cpufreq @@ -0,0 +1,8 @@ + +config settings 'cpufreq' + option governor0 'schedutil' + option minfreq0 '816000' + option maxfreq0 '1800000' + option governor4 'schedutil' + option minfreq4 '816000' + option maxfreq4 '2208000' diff --git a/PATCH/R4S/files/etc/config/cpulimit b/PATCH/R4S/files/etc/config/cpulimit new file mode 100644 index 000000000..939f8ac22 --- /dev/null +++ b/PATCH/R4S/files/etc/config/cpulimit @@ -0,0 +1,6 @@ + +config list + option exename '/sbin/rngd' + option limit '1' + option enabled '1' + diff --git a/PATCH/R4S/files/etc/config/smartdns b/PATCH/R4S/files/etc/config/smartdns new file mode 100644 index 000000000..cab19dce3 --- /dev/null +++ b/PATCH/R4S/files/etc/config/smartdns @@ -0,0 +1,69 @@ + +config smartdns + option server_name 'smartdns' + option port '6051' + option dualstack_ip_selection '0' + option server_group 'oversea' + option seconddns_port '6050' + option seconddns_tcp_server '1' + option seconddns_no_speed_check '0' + option coredump '0' + option seconddns_enabled '1' + option seconddns_no_dualstack_selection '1' + option ipv6_server '0' + option redirect 'none' + option seconddns_server_group 'mainland' + option prefetch_domain '1' + option serve_expired '1' + option tcp_server '1' + option seconddns_no_cache '1' + option rr_ttl_min '3600' + option rr_ttl '3600' + option rr_ttl_max '36000' + option cache_size '4194304' + option enabled '1' + +config server + option type 'udp' + option name 'DNSPod' + option ip '119.29.29.29' + option blacklist_ip '0' + option server_group 'mainland' + option enabled '1' + option addition_arg '-exclude-default-group' + +config server + option type 'udp' + option name 'AliDNS' + option ip '223.5.5.5' + option blacklist_ip '0' + option server_group 'mainland' + option enabled '1' + option addition_arg '-exclude-default-group' + +config server + option type 'tls' + option server_group 'oversea' + option blacklist_ip '0' + option no_check_certificate '0' + option name 'Google TLS' + option enabled '1' + option ip '8.8.4.4' + +config server + option type 'tls' + option server_group 'oversea' + option blacklist_ip '0' + option no_check_certificate '0' + option ip '1.1.1.1' + option enabled '1' + option name 'Cloudflare TLS' + +config server + option enabled '1' + option server_group 'oversea' + option blacklist_ip '0' + option type 'udp' + option port '5353' + option name 'USTC' + option ip '202.141.162.123' diff --git a/PATCH/R4S/files/etc/ssr/black.list b/PATCH/R4S/files/etc/ssr/black.list new file mode 100644 index 000000000..5d064162a --- /dev/null +++ b/PATCH/R4S/files/etc/ssr/black.list @@ -0,0 +1,3 @@ +dns.sb +doh.li +containerpi.com diff --git a/PATCH/R4S/files/etc/ssr/white.list b/PATCH/R4S/files/etc/ssr/white.list new file mode 100644 index 000000000..0f7abfd0e --- /dev/null +++ b/PATCH/R4S/files/etc/ssr/white.list @@ -0,0 +1,10 @@ +checkip.synology.com +checkipv6.synology.com +checkport.synology.com +ddns.synology.com +account.synology.com +whatismyip.akamai.com +checkip.dyndns.org +teamviewer.com +bing.com +api.ipify.org diff --git a/PATCH/R4S/files/etc/ssrplus/black.list b/PATCH/R4S/files/etc/ssrplus/black.list new file mode 100644 index 000000000..5d064162a --- /dev/null +++ b/PATCH/R4S/files/etc/ssrplus/black.list @@ -0,0 +1,3 @@ +dns.sb +doh.li +containerpi.com diff --git a/PATCH/R4S/files/etc/ssrplus/white.list b/PATCH/R4S/files/etc/ssrplus/white.list new file mode 100644 index 000000000..0f7abfd0e --- /dev/null +++ b/PATCH/R4S/files/etc/ssrplus/white.list @@ -0,0 +1,10 @@ +checkip.synology.com +checkipv6.synology.com +checkport.synology.com +ddns.synology.com +account.synology.com +whatismyip.akamai.com +checkip.dyndns.org +teamviewer.com +bing.com +api.ipify.org diff --git a/PATCH/X86/files/etc/config/AdGuardHome b/PATCH/X86/files/etc/config/AdGuardHome new file mode 100644 index 000000000..e20422ce9 --- /dev/null +++ b/PATCH/X86/files/etc/config/AdGuardHome @@ -0,0 +1,14 @@ + +config AdGuardHome 'AdGuardHome' + option httpport '3000' + option configpath '/etc/config/AdGuardHome.yaml' + option logfile '/tmp/AdGuardHome.log' + option waitonboot '0' + option crontab 'cutquerylog cutruntimelog' + option redirect 'dnsmasq-upstream' + option backupfile 'filters' + option workdir '/etc/config/AdGuardHomeConfig' + option backupwdpath '/etc/config/AdGuardHomeConfig' + option binpath '/usr/bin/AdGuardHome' + option enabled '0' + option binmtime '0' diff --git a/PATCH/X86/files/etc/config/AdGuardHome.yaml b/PATCH/X86/files/etc/config/AdGuardHome.yaml new file mode 100644 index 000000000..be4520d45 --- /dev/null +++ b/PATCH/X86/files/etc/config/AdGuardHome.yaml @@ -0,0 +1,144 @@ +bind_host: 0.0.0.0 +bind_port: 3000 +users: +- name: root + password: $2y$10$8GfLmnbQpS883RMTpGN66.TbyavsPmElcy2aR6vec7xL0YOG.gx52 +http_proxy: "" +language: "" +rlimit_nofile: 0 +debug_pprof: false +web_session_ttl: 720 +dns: + bind_host: 127.0.0.1 + port: 5335 + statistics_interval: 1 + querylog_enabled: false + querylog_file_enabled: true + querylog_interval: 1 + querylog_size_memory: 1000 + anonymize_client_ip: false + protection_enabled: true + blocking_mode: default + blocking_ipv4: "" + blocking_ipv6: "" + blocked_response_ttl: 10 + parental_block_host: family-block.dns.adguard.com + safebrowsing_block_host: standard-block.dns.adguard.com + ratelimit: 0 + ratelimit_whitelist: [] + refuse_any: true + upstream_dns: + - 127.0.0.1:6052 + - '[/awsglobalaccelerator.com/]127.0.0.1:6050' + upstream_dns_file: "" + bootstrap_dns: + - 127.0.0.1:6052 + all_servers: false + fastest_addr: true + allowed_clients: [] + disallowed_clients: [] + blocked_hosts: + - version.bind + - id.server + - hostname.bind + cache_size: 4194304 + cache_ttl_min: 3600 + cache_ttl_max: 36000 + bogus_nxdomain: [] + aaaa_disabled: false + enable_dnssec: false + edns_client_subnet: false + max_goroutines: 0 + ipset: [] + filtering_enabled: true + filters_update_interval: 24 + parental_enabled: false + safesearch_enabled: false + safebrowsing_enabled: false + safebrowsing_cache_size: 1048576 + safesearch_cache_size: 1048576 + parental_cache_size: 1048576 + cache_time: 30 + rewrites: + - domain: wifi.weixin.qq.com + answer: 127.0.0.1 + - domain: clock.redhat.com + answer: cn.ntp.org.cn + - domain: clock.cuhk.edu.hk + answer: cn.ntp.org.cn + - domain: https://www.meituan.com + answer: www.meituan.com + blocked_services: [] +tls: + enabled: false + server_name: "" + force_https: false + port_https: 443 + port_dns_over_tls: 853 + port_dns_over_quic: 784 + allow_unencrypted_doh: false + strict_sni_check: false + certificate_chain: "" + private_key: "" + certificate_path: "" + private_key_path: "" +filters: +- enabled: false + url: https://gitee.com/halflife/list/raw/master/ad.txt + name: HalfLife + id: 1595502658 +- enabled: false + url: https://pgl.yoyo.org/adservers/serverlist.php?hostformat=adblockplus&showintro=1&mimetype=plaintext + name: Peter Lowe's List + id: 1595502661 +- enabled: true + url: https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt + name: NoCoin Filter List + id: 1595502662 +- enabled: true + url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/rule.txt + name: 乘风 广告过滤规则 + id: 1600600707 +- enabled: true + url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/mv.txt + name: 乘风 视频广告过滤规则 + id: 1600600708 +- enabled: true + url: https://gitee.com/cjx82630/cjxlist/raw/master/cjx-ublock.txt + name: CJX's uBlock list + id: 1600600709 +- enabled: true + url: https://gitee.com/cjx82630/cjxlist/raw/master/cjx-annoyance.txt + name: CJX's Annoyance List + id: 1600600710 +- enabled: true + url: http://sub.adtchrome.com/adt-chinalist-easylist.txt + name: ChinaList and EasyList + id: 1600600711 +whitelist_filters: [] +user_rules: [] +dhcp: + enabled: false + interface_name: "" + dhcpv4: + gateway_ip: "" + subnet_mask: "" + range_start: "" + range_end: "" + lease_duration: 86400 + icmp_timeout_msec: 1000 + options: [] + dhcpv6: + range_start: "" + lease_duration: 86400 + ra_slaac_only: false + ra_allow_slaac: false +clients: [] +log_compress: false +log_localtime: false +log_max_backups: 0 +log_max_size: 100 +log_max_age: 3 +log_file: "" +verbose: false +schema_version: 7 diff --git a/PATCH/X86/files/etc/config/MosChinaDNS b/PATCH/X86/files/etc/config/MosChinaDNS new file mode 100644 index 000000000..1d53b8f84 --- /dev/null +++ b/PATCH/X86/files/etc/config/MosChinaDNS @@ -0,0 +1,12 @@ + +config MosChinaDNS 'MosChinaDNS' + option httpport '3000' + option redirect 'none' + option configpath '/etc/config/MosChinaDNS.yaml' + option workdir '/usr/bin/MosChinaDNS' + option logfile 'syslog' + option binpath '/usr/bin/MosChinaDNS/MosChinaDNS' + option enabled '1' + + option binmtime '0' + option waitonboot '0' diff --git a/PATCH/X86/files/etc/config/MosChinaDNS.yaml b/PATCH/X86/files/etc/config/MosChinaDNS.yaml new file mode 100644 index 000000000..cc30d4378 --- /dev/null +++ b/PATCH/X86/files/etc/config/MosChinaDNS.yaml @@ -0,0 +1,169 @@ +# addr: "127.0.0.1:6052" +# 分流器设定 +dispatcher: + # 监听地址 [必需] + # 格式: ["protocol://host:port","protocol://host:port",...] + # `protocol`为监听协议。`tcp`或`udp`。 + # `host`是监听地址。设为`0.0.0.0`可监听本机包括IPv6的所有地址,不必再监听[::]。 + # `port`为监听端口。 + # 默认: ["udp://127.0.0.1:53","tcp://127.0.0.1:53","udp://[::1]:53","tcp://[::1]:53"] + # 监听所有地址: ["udp://0.0.0.0:53","tcp://0.0.0.0:53"] + bind: [ "udp://127.0.0.1:6052","tcp://127.0.0.1:6052","udp://[::1]:6052","tcp://[::1]:6052" ] + +# 上游服务器设定 +# 可包含一个或多个上游服务器。 +# 各个上游服务器的策略将决定对于某一请求是否允许发送至该上游服务器解析以及应答是否被采纳。 +# 请求会同时发送给启用的上游服务器。分流器最终会采纳最快被上游服务器采纳的应答。 +upstream: + # 一个上游服务器,名叫local + local: # 服务器名称,可随意设定,只需保证多个服务器名称无重复即可。 + server: "mainland" # 使用的服务器的tag。该tag必需在server中定义。 + + # 策略 + # 策略决定了对于给定请求,是否允许发送至该上游,以及是否采纳返回的应答。 + # 策略处理流程从上到下。 + policies: + # 请求策略 + query: + + # 如何处理无法分流的请求类型。 + # 目前域名/IP分流策略只能处理A和AAAA请求。 + # "accept": 非(A和AAAA)请求会被发送至该服务器并且其应答会被直接采纳(不会再执行后续的任何策略)。 + # "deny": 非(A和AAAA)请求不会由本上游解析。 + unhandlable_types: "accept" + + # 域名策略 + # 域名策略将根据请求的域名决定该请求是否允许发送至该上游。 + # 可由多个策略构成,用`|`分割。处理流程从左至右,如果上一条策略没有命中,将匹配下一条。 + # 如果直到最后都没有命中任何策略,则请求会发送至该上游,然后执行后续的策略。 + # + # 格式: "action:file|action:file|action:file|action..." + # `file`为域名表的路径。如果没有指定`file`,则会匹配所有域名。 + # `action`可以是 + # `accept`: 允许发送至该上游,并且直接采纳其应答(不会再执行后续的任何策略)。 + # `deny`: 拒绝发送至该上游。 + # e.g. "deny:./blacklist.txt" `blacklist.txt`里的域名不会发送至该上游。 + # e.g. "accept:./whitelist.txt|deny" 只有`whitelist.txt`里的域名才会发送至该上游。 + domain: "accept:./chn_domain.list|deny:./non_chn_domain.list" + + reply: # 应答策略 + + # 如何处理Rcode不成功(Rcode!=0)的应答 + # "accept": 直接采纳(不会再执行后续的任何策略)。 + # "deny": 丢弃。 + # "redirect_XXXXXX": 重定向请求。 + error_rcode: "deny" + + # CNAME策略 + # 如果返回应答没有CNAME部分,该策略不会生效。 + # 可由多个策略构成,用`|`分割。处理流程从左至右,如果上一条策略没有命中,将匹配下一条。 + # 如果直到最后都没有命中任何策略,则继续执行后续的策略。 + # + # 格式: "action:file|action:file|action:file|action..." + # `file`为域名表的路径。如果没有指定`file`,则会匹配所有域名。 + # `action`可以是 + # `accept`: 直接采纳应答(不会再执行后续的任何策略)。 + # `deny`: 丢弃该应答。 + # "redirect_XXXXXX": 重定向请求。 + cname: "accept:./chn_domain.list" + + # 如何处理不包含任何IP的应答。 + # "accept": 直接采纳(不会再执行后续的任何策略)。 + # "deny": 丢弃。 + # "redirect_XXXXXX": 重定向请求。 + without_ip: "deny" + + # IP策略 + # 可由多个策略构成,用`|`分割,处理流程从左至右,如果上一条策略没有命中,将继续匹配下一条。 + # 如果直到最后都没有命中任何策略,默认`采纳该应答`。 + # + # 格式: "action:file|action:file|action:file|..." + # `file`为IP表文件的路径。如果没有指定`file`,则会匹配所有IP。 + # `action`是策略,可以是: + # `accept`: 采纳该应答。 + # `deny`: 丢弃该应答。 + # "redirect_XXXXXX": 重定向请求。 + # + # e.g. "deny:./blacklist.txt" + # e.g. "accept:./whitelist.txt|deny" 仅允许`whitelist.txt`里的IP。 + # e.g. "deny:./blacklist.txt|accept:./whitelist.txt|deny" + ip: "accept:./chn_ip.list|deny" + + # 另外一个上游服务器,名叫remote。设置说明参见上文。 + remote: + server: "oversea" + + policies: + query: + unhandlable_types: "accept" + domain: "deny:./chn_domain.list|accept" # chn_domain.list里的域名无需remote解析。 + +# 服务器设定 +# 可包含一个或多个服务器。 +server: + # 一个服务器,tag名为`aliyun`。这个tag可以可以随意更改。只需保证多个服务器无重复即可。 + mainland: + addr: "127.0.0.1:6050" # 服务器地址。 + protocol: "udp" # 服务器协议。`tcp`|`udp`|`doh`|`dot`其中之一。 + #socks5: "" # socks5代理服务器地址。注意: 不支持有密码验证的socks5服务器。udp协议不会使用socks5代理。 + + # 是否请求去重。 + # false: 来自下游的请求将一对一的发送至上游服务器。 + # true: 如果已经有一个相同的请求正在进行,后来的请求将不再发送至上游服务器,而是等待并采用之前请求返回的结果。 + deduplicate: false + + # edns0相关设定 + edns0: + + # 在转发至该服务器的请求中附加的ECS地址。 + # 格式为CIDR。e.g. "1.2.3.0/24", "2001:dd8:1a::/48"。 + # A类型的请求将附加ipv4的地址。AAAA类型的请求将附加ipv6的地址 + # 其他类别的请求不会附加ECS。 + # 如果请求中已包含ECS,默认不会复写,除非设置了`overwrite_ecs`。 + # client_subnet: + # ipv4: "" + # ipv6: "" + overwrite_ecs: false # 是否强制改写下游请求已有的ECS。 + + # TCP设定,仅`protocol`为`tcp`时有用。 + tcp: + idle_timeout: 10 # 空连接超时时间。单位: 秒。0表示禁用连接重用。 + + # DoT设定,仅`protocol`为`dot`有用。 + dot: + server_name: "" # [必需] 服务器的域名/证书名。 + idle_timeout: 10 # 空连接超时时间。单位: 秒。0表示禁用连接重用。 + + # DoH设定,仅`protocol`为`doh`有用。 + doh: + url: "" # [必需] DoH的URL。 + + oversea: + addr: "127.0.0.1:6051" + protocol: "udp" + socks5: "" + deduplicate: false + edns0: + # client_subnet: + # ipv4: "" + # ipv6: "" + overwrite_ecs: false + tcp: + idle_timeout: 10 + dot: + server_name: "" + idle_timeout: 10 + doh: + url: "" + + # 如果还想添加服务器,只需将上面的设置模板复制一遍。 + # 保持服务器的tag互相不一样和缩进对齐即可。 + +# CA证书设定 +ca: + # 导入用于TLS验证的CA证书。证书需为PEM格式。 + # 可以是ca-bundle(包含多个PEM块)。可指定多个证书文件。 + # 留空默认使用系统自带CA证书。 + # e.g. ["./my.cert"] + # e.g. ["./a.cert", "./b.cert", ...] + path: [] \ No newline at end of file diff --git a/PATCH/X86/files/etc/config/chinadns-ng b/PATCH/X86/files/etc/config/chinadns-ng new file mode 100644 index 000000000..403d7515f --- /dev/null +++ b/PATCH/X86/files/etc/config/chinadns-ng @@ -0,0 +1,18 @@ + +config chinadns-ng + option ipset_name4 'chnroute' + option ipset_name6 'chnroute6' + option gfwlist_file '/etc/chinadns-ng/gfwlist.txt' + option chnlist_file '/etc/chinadns-ng/chinalist.txt' + option bind_port '6052' + option timeout_sec '1' + option china_dns '127.0.0.1#6050' + option trust_dns '127.0.0.1#6051' + option repeat_times '1' + option bind_addr '127.0.0.1' + option reuse_port '1' + option noip_as_chnip '1' + option fair_mode '1' + option chnlist_first '0' + option enable '0' + diff --git a/PATCH/X86/files/etc/config/cpulimit b/PATCH/X86/files/etc/config/cpulimit new file mode 100644 index 000000000..939f8ac22 --- /dev/null +++ b/PATCH/X86/files/etc/config/cpulimit @@ -0,0 +1,6 @@ + +config list + option exename '/sbin/rngd' + option limit '1' + option enabled '1' + diff --git a/PATCH/X86/files/etc/config/smartdns b/PATCH/X86/files/etc/config/smartdns new file mode 100644 index 000000000..cab19dce3 --- /dev/null +++ b/PATCH/X86/files/etc/config/smartdns @@ -0,0 +1,69 @@ + +config smartdns + option server_name 'smartdns' + option port '6051' + option dualstack_ip_selection '0' + option server_group 'oversea' + option seconddns_port '6050' + option seconddns_tcp_server '1' + option seconddns_no_speed_check '0' + option coredump '0' + option seconddns_enabled '1' + option seconddns_no_dualstack_selection '1' + option ipv6_server '0' + option redirect 'none' + option seconddns_server_group 'mainland' + option prefetch_domain '1' + option serve_expired '1' + option tcp_server '1' + option seconddns_no_cache '1' + option rr_ttl_min '3600' + option rr_ttl '3600' + option rr_ttl_max '36000' + option cache_size '4194304' + option enabled '1' + +config server + option type 'udp' + option name 'DNSPod' + option ip '119.29.29.29' + option blacklist_ip '0' + option server_group 'mainland' + option enabled '1' + option addition_arg '-exclude-default-group' + +config server + option type 'udp' + option name 'AliDNS' + option ip '223.5.5.5' + option blacklist_ip '0' + option server_group 'mainland' + option enabled '1' + option addition_arg '-exclude-default-group' + +config server + option type 'tls' + option server_group 'oversea' + option blacklist_ip '0' + option no_check_certificate '0' + option name 'Google TLS' + option enabled '1' + option ip '8.8.4.4' + +config server + option type 'tls' + option server_group 'oversea' + option blacklist_ip '0' + option no_check_certificate '0' + option ip '1.1.1.1' + option enabled '1' + option name 'Cloudflare TLS' + +config server + option enabled '1' + option server_group 'oversea' + option blacklist_ip '0' + option type 'udp' + option port '5353' + option name 'USTC' + option ip '202.141.162.123' diff --git a/PATCH/X86/files/etc/ssr/black.list b/PATCH/X86/files/etc/ssr/black.list new file mode 100644 index 000000000..5d064162a --- /dev/null +++ b/PATCH/X86/files/etc/ssr/black.list @@ -0,0 +1,3 @@ +dns.sb +doh.li +containerpi.com diff --git a/PATCH/X86/files/etc/ssr/white.list b/PATCH/X86/files/etc/ssr/white.list new file mode 100644 index 000000000..0f7abfd0e --- /dev/null +++ b/PATCH/X86/files/etc/ssr/white.list @@ -0,0 +1,10 @@ +checkip.synology.com +checkipv6.synology.com +checkport.synology.com +ddns.synology.com +account.synology.com +whatismyip.akamai.com +checkip.dyndns.org +teamviewer.com +bing.com +api.ipify.org diff --git a/PATCH/X86/files/etc/ssrplus/black.list b/PATCH/X86/files/etc/ssrplus/black.list new file mode 100644 index 000000000..5d064162a --- /dev/null +++ b/PATCH/X86/files/etc/ssrplus/black.list @@ -0,0 +1,3 @@ +dns.sb +doh.li +containerpi.com diff --git a/PATCH/X86/files/etc/ssrplus/white.list b/PATCH/X86/files/etc/ssrplus/white.list new file mode 100644 index 000000000..0f7abfd0e --- /dev/null +++ b/PATCH/X86/files/etc/ssrplus/white.list @@ -0,0 +1,10 @@ +checkip.synology.com +checkipv6.synology.com +checkport.synology.com +ddns.synology.com +account.synology.com +whatismyip.akamai.com +checkip.dyndns.org +teamviewer.com +bing.com +api.ipify.org diff --git a/PATCH/duplicate/addition-trans-zh/Makefile b/PATCH/duplicate/addition-trans-zh/Makefile new file mode 100644 index 000000000..5e11c3d84 --- /dev/null +++ b/PATCH/duplicate/addition-trans-zh/Makefile @@ -0,0 +1,47 @@ +# +# Copyright (C) 2016-2017 GitHub +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. + +include $(TOPDIR)/rules.mk + +PKG_NAME:=addition-trans-zh +PKG_VERSION:=1.1 +PKG_RELEASE:=52 +PKG_LICENSE:=GPLv3 +PKG_LICENSE_FILES:=LICENSE + +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) + +include $(INCLUDE_DIR)/package.mk + +define Package/addition-trans-zh + SECTION:=luci + CATEGORY:=LuCI + TITLE:=LuCI support for Default Settings + PKGARCH:=all + DEPENDS:=+luci-base +kmod-fast-classifier +kmod-ipt-nat6 +kmod-tun +luci-lib-ipkg +luci-compat +openssl-util +iptables-mod-fullconenat +iptables-mod-nat-extra +ip6tables-mod-nat +@LUCI_LANG_zh_Hans +endef + +define Package/addition-trans-zh/description + Language Support Packages. +endef + +define Build/Configure +endef + +define Build/Compile +endef + +define Package/addition-trans-zh/install + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files/zzz-default-settings $(1)/etc/uci-defaults/99-default-settings + $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n + po2lmo ./i18n/default.zh_Hans.po $(1)/usr/lib/lua/luci/i18n/default.zh-cn.lmo + po2lmo ./i18n/more.zh_Hans.po $(1)/usr/lib/lua/luci/i18n/more.zh-cn.lmo + $(INSTALL_DIR) $(1)/usr/lib/lua/luci/tools + $(INSTALL_DATA) ./status/status.lua $(1)/usr/lib/lua/luci/tools/status.lua +endef + +$(eval $(call BuildPackage,addition-trans-zh)) diff --git a/PATCH/duplicate/addition-trans-zh/files/zzz-default-settings b/PATCH/duplicate/addition-trans-zh/files/zzz-default-settings new file mode 100644 index 000000000..df1b2af5d --- /dev/null +++ b/PATCH/duplicate/addition-trans-zh/files/zzz-default-settings @@ -0,0 +1,88 @@ +#!/bin/sh + +#Argon 主题 +uci set luci.main.mediaurlbase='/luci-static/argon' +uci commit luci + +#时区设置 +uci set system.@system[0].timezone=CST-8 +uci set system.@system[0].zonename=Asia/Shanghai +uci commit system + +#SSRP +uci set shadowsocksr.@global[0].gfwlist_url='https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/gfw.txt' +uci set shadowsocksr.@global[0].chnroute_url='https://cdn.jsdelivr.net/gh/QiuSimons/Chnroute@master/dist/chnroute/chnroute.txt' +uci commit shadowsocksr + +#Feeds 更换镜像源 +sed -i 's,21.02,21.02-SNAPSHOT,g' /etc/opkg/distfeeds.conf +sed -i 's,downloads.openwrt.org,mirror.sjtu.edu.cn/openwrt,g' /etc/opkg/distfeeds.conf + +#uhttpd 设置 +uci set uhttpd.main.rfc1918_filter=0 +uci set uhttpd.main.redirect_https=0 +uci commit uhttpd +/etc/init.d/uhttpd restart + +#在防火墙默认开启全锥形 NAT 以及 Flow Offloading +uci set firewall.@defaults[0].fullcone='1' +uci set firewall.@defaults[0].flow_offloading='1' +uci commit firewall + +#默认开启 Packet Steering +uci set network.globals.packet_steering='1' +uci commit network + +#通用即插即用 +uci set upnpd.config.igdv1='1' +uci set upnpd.config.enabled='1' +uci del upnpd.config.enable_upnp +uci del upnpd.config.enable_natpmp +uci set upnpd.config.external_iface='wan' +uci commit upnpd + +#网易云音乐 +#echo "59.111.239.62 httpdns.n.netease.com" >> /etc/hosts && cat /etc/hosts | sort | uniq > /tmp/tmp_hosts && cat /tmp/tmp_hosts > /etc/hosts + +#MosChinaDNS 设置 +echo "10 2 * * * chinadnslist &" >> /etc/crontabs/root && cat /etc/crontabs/root | sort | uniq > /tmp/tmp_cron_root && cat /tmp/tmp_cron_root > /etc/crontabs/root +echo "20 2 * * * /usr/share/MosChinaDNS/update_list.sh &" >> /etc/crontabs/root && cat /etc/crontabs/root | sort | uniq > /tmp/tmp_cron2_root && cat /tmp/tmp_cron2_root > /etc/crontabs/root + +#OpenClash 设置 +echo "/etc/openclash/" >> /etc/sysupgrade.conf && cat /etc/sysupgrade.conf | sort | uniq > /tmp/tmp_sysupgrade_conf && cat /tmp/tmp_sysupgrade_conf > /etc/sysupgrade.conf + +#Dockerman 设置 +#sed -i 's,/opt,/overlay,g' /etc/config/dockerman + +#qBittorrent 设置 +#echo "nobody:x:65534:" >> /etc/group + +#dnsmasq 设置以及开启 IPv6 +uci set dhcp.lan.ra='hybrid' +uci set dhcp.lan.ndp='hybrid' +uci set dhcp.lan.dhcpv6='hybrid' +uci set dhcp.lan.ra_management='1' +uci del dhcp.@dnsmasq[0].rebind_protection='1' +uci commit dhcp +sed -i '/log-facility/d' /etc/dnsmasq.conf +echo "log-facility=/dev/null" >> /etc/dnsmasq.conf + +#软链接 +ln -sf /sbin/ip /usr/bin/ip +ln -sf /usr/bin/wget /usr/bin/wget-ssl + +#Flag packages +opkg flag hold luci-app-firewall +opkg flag hold firewall +opkg flag hold dnsmasq-full + +#清理内存缓存 +#sync; echo 3 > /proc/sys/vm/drop_caches + +#清除 LuCI 残留缓存 +rm -rf /tmp/luci-modulecache +rm -f /tmp/luci-indexcache + +#默认关闭 Shortcut-FE +service shortcut-fe stop +rm -rf /etc/rc.d/S90shortcut-fe diff --git a/PATCH/duplicate/addition-trans-zh/i18n/default.zh_Hans.po b/PATCH/duplicate/addition-trans-zh/i18n/default.zh_Hans.po new file mode 100644 index 000000000..3218014b3 --- /dev/null +++ b/PATCH/duplicate/addition-trans-zh/i18n/default.zh_Hans.po @@ -0,0 +1,234 @@ +msgid "Processor" +msgstr "处理器" + +msgid "Architecture" +msgstr "架构" + +msgid "CPU Temperature" +msgstr "CPU 温度" + +msgid "CPU Info" +msgstr "CPU 信息" + +msgid "CPU Model" +msgstr "处理器型号" + +msgid "CPU frequency" +msgstr "CPU 频率" + +msgid "RAM frequency" +msgstr "RAM 频率" + +msgid "Flash Size" +msgstr "闪存大小" + +msgid "Free Memory" +msgstr "释放内存" + +msgid "RUNNING" +msgstr "运行中" + +msgid "NOT RUNNING" +msgstr "未运行" + +msgid "ZRam Settings" +msgstr "ZRam 设置" + +msgid "ZRam Compression Algorithm" +msgstr "ZRam 压缩算法" + +msgid "ZRam Compression Streams" +msgstr "ZRam 压缩数据流线程数" + +msgid "ZRam Size" +msgstr "ZRam 大小" + +msgid "Size of the ZRam device in megabytes" +msgstr "划分给 ZRam 分区的内存大小(MB),推荐留空由系统自动管理" + +msgid "Number of parallel threads used for compression" +msgstr "用于压缩内存数据的 CPU 并发线程数" + +msgid "Swap" +msgstr "虚拟内存" + +msgid "Force 40MHz mode" +msgstr "强制 40MHz 频宽" + +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" +msgstr "强制启用 40MHz 频宽并忽略辅助信道重叠。此选项可能不兼容某些无线硬件导致无法启用!" + +msgid "Disassociate On Low Acknowledgement" +msgstr "弱信号剔除" + +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "允许 AP 模式基于低 ACK 条件判断剔除弱信号的客户端" + +msgid "Base Setting" +msgstr "基本设置" + +msgid "Log" +msgstr "日志" + +msgid "Ethernet Information" +msgstr "网口信息" + +msgid "Ethernet Name" +msgstr "网口名" + +msgid "Link Status" +msgstr "连接状态" + +msgid "Speed" +msgstr "速率" + +msgid "Duplex" +msgstr "双工模式" + +msgid "Link Up" +msgstr "已连接" + +msgid "Link Down" +msgstr "已断开" + +msgid "Full Duplex" +msgstr "全双工" + +msgid "Half Duplex" +msgstr "半双工" + +msgid "10 seconds" +msgstr "10 秒" + +msgid "2 seconds" +msgstr "2 秒" + +msgid "30 seconds" +msgstr "30 秒" + +msgid "5 seconds" +msgstr "5 秒" + +msgid "Auto update every:" +msgstr "自动刷新:" + +msgid "Clients" +msgstr "客户端" + +msgid "Collecting data..." +msgstr "收集数据中..." + +msgid "Configuration" +msgstr "配置" + +msgid "Database Path" +msgstr "数据路径" + +msgid "Details" +msgstr "流量信息" + +msgid "Disabled" +msgstr "禁用" + +msgid "Download" +msgstr "下载" + +msgid "Each line must have the following format:" +msgstr "每行需要满足以下格式:" + +msgid "Enabled" +msgstr "启用" + +msgid "Error! Bandwidth reset!!!" +msgstr "错误!重置带宽!!!" + +msgid "First Seen" +msgstr "初次记录" + +msgid "General settings" +msgstr "通用设置" + +msgid "Last Seen" +msgstr "最后记录" + +msgid "Last updated at %s." +msgstr "最后更新于 %s。" + +msgid "Reset Database" +msgstr "重置" + +msgid "Save" +msgstr "保存" + +msgid "Show More:" +msgstr "显示更多:" + +msgid "Show Zeros:" +msgstr "显示 0 流量:" + +msgid "TOTAL" +msgstr "总共" + +msgid "" +"This box is used to select the Database path, which is /tmp/usage.db by " +"default." +msgstr "该选项用于选择数据存储路径,默认路径为 /tmp/usage.db。" + +msgid "This will delete the database file. Are you sure?" +msgstr "该操作将删除数据统计文件,确定执行该操作?" + +msgid "This will revert the changes. Are you sure?" +msgstr "更改将会重置,确定吗?" + +msgid "Total" +msgstr "总计" + +msgid "Total Down" +msgstr "总下载" + +msgid "Total Up" +msgstr "总上传" + +msgid "Traffic Status" +msgstr "流量监控" + +msgid "Unable to load the customized hostname file:" +msgstr "不能载入自定义用户名文件:" + +msgid "Updating again in %s seconds." +msgstr "下次更新将于 %s 秒之后。" + +msgid "Upload" +msgstr "上传" + +msgid "Usage - Configuration" +msgstr "文件设置" + +msgid "Usage - Custom User File" +msgstr "用户文件配置" + +msgid "Usage - Details" +msgstr "流量详情" + +msgid "User file" +msgstr "用户文件" + +msgid "bandwidth:" +msgstr "带宽:" + +msgid "downflow:" +msgstr "下行:" + +msgid "protocol:" +msgstr "协议:" + +msgid "seconds." +msgstr "秒。" + +msgid "upflow:" +msgstr "上传:" + +msgid "There is no password set on this router. Please configure a root password to protect the web interface and enable SSH." +msgstr "尚未设置密码。请为 root 用户设置密码以保护主机并启用 SSH 。" diff --git a/PATCH/duplicate/addition-trans-zh/i18n/more.zh_Hans.po b/PATCH/duplicate/addition-trans-zh/i18n/more.zh_Hans.po new file mode 100644 index 000000000..717799628 --- /dev/null +++ b/PATCH/duplicate/addition-trans-zh/i18n/more.zh_Hans.po @@ -0,0 +1,1208 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: dingpengyu \n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"X-Generator: Poedit 2.3.1\n" + +msgid "%d hour" +msgstr "%d 小时" + +msgid "%d minute" +msgstr "%d 分钟" + +msgid "%d minutes" +msgstr "%d 分钟" + +msgid "%d second" +msgstr "%d 秒" + +msgid "%d seconds" +msgstr "%d 秒" + +msgid "" +"Acceptable values: 1-100. This many Tracking IP addresses must respond for " +"the link to be deemed up" +msgstr "" +"取值范围: 1-100。这个设置项指定了当多少个 IP 地址能够连通时接口会被认为在线" + +msgid "Acceptable values: 1-1000. Defaults to 1 if not set" +msgstr "取值范围: 1-100。如果不填写,默认值为 1" + +msgid "Advanced" +msgstr "高级" + +msgid "Check IP rules" +msgstr "检查 IP 规则" + +msgid "Check routing table" +msgstr "检查路由表" + +msgid "Collecting data..." +msgstr "正在收集数据..." + +msgid "Configuration" +msgstr "配置" + +msgid "Currently Configured Interfaces" +msgstr "当前配置的接口" + +msgid "Currently Configured Members" +msgstr "当前配置的成员" + +msgid "Currently Configured Policies" +msgstr "当前配置的策略" + +msgid "Destination address" +msgstr "目标地址" + +msgid "Destination port" +msgstr "目标端口" + +msgid "Detailed Status" +msgstr "详细状态" + +msgid "Diagnostic Results" +msgstr "诊断结果" + +msgid "Diagnostics" +msgstr "诊断" + +msgid "Disabled" +msgstr "禁用" + +msgid "" +"Downed interface will be deemed up after this many successful ping tests" +msgstr "当 Ping 成功次数达到这个数值后,已经被认为离线的接口将会重新上线" + +msgid "Enabled" +msgstr "启用" + +msgid "Error collecting troubleshooting information" +msgstr "收集故障排除信息时出错" + +msgid "Errors" +msgstr "错误" + +msgid "Failure interval" +msgstr "故障检测间隔" + +msgid "Flush conntrack table" +msgstr "刷新连接跟踪表" + +msgid "Flush global firewall conntrack table on interface events" +msgstr "在接口事件触发时刷新全局防火墙连接跟踪表" + +msgid "Hotplug Script" +msgstr "Hotplug 脚本" + +msgid "Hotplug ifdown" +msgstr "Hotplug ifdown" + +msgid "Hotplug ifup" +msgstr "Hotplug ifup" + +msgid "IPset" +msgstr "IPset" + +msgid "IPv4" +msgstr "IPv4" + +msgid "IPv6" +msgstr "IPv6" + +msgid "Interface" +msgstr "接口" + +msgid "Interface Status" +msgstr "接口状态" + +msgid "Interface down" +msgstr "接口离线" + +msgid "Interface up" +msgstr "接口上线" + +msgid "Interface will be deemed down after this many failed ping tests" +msgstr "当 Ping 失败次数达到这个数值后接口会被认为离线" + +msgid "Interfaces" +msgstr "接口" + +msgid "Internet Protocol" +msgstr "互联网协议" + +msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :" +msgstr "最近 50 条 MWAN 系统日志,最新条目排在顶部:" + +msgid "Last resort" +msgstr "备用成员" + +msgid "Load Balancing" +msgstr "负载均衡" + +msgid "Loading" +msgstr "载入中" + +msgid "MWAN Config" +msgstr "MWAN 配置文件" + +msgid "MWAN Detailed Status" +msgstr "MWAN 详细状态" + +msgid "MWAN Interface Configuration" +msgstr "MWAN 接口配置" + +msgid "MWAN Interface Configuration - %s" +msgstr "MWAN 接口配置 - %s" + +msgid "MWAN Interface Diagnostics" +msgstr "MWAN 接口诊断" + +msgid "MWAN Interface Live Status" +msgstr "MWAN 接口实时状态" + +msgid "MWAN Interface Systemlog" +msgstr "MWAN 接口系统日志" + +msgid "MWAN Member Configuration" +msgstr "MWAN 成员配置" + +msgid "MWAN Member Configuration - %s" +msgstr "MWAN 成员配置 - %s" + +msgid "MWAN Policy Configuration" +msgstr "MWAN 策略配置" + +msgid "MWAN Policy Configuration - %s" +msgstr "MWAN 策略配置 - %s" + +msgid "MWAN Rule Configuration" +msgstr "MWAN 规则配置" + +msgid "MWAN Rule Configuration - %s" +msgstr "MWAN 规则配置 - %s" + +msgid "MWAN Service Control" +msgstr "MWAN 服务控制" + +msgid "" +"MWAN supports up to 250 physical and/or logical interfaces
MWAN " +"requires that all interfaces have a unique metric configured in /etc/config/" +"network
Names must match the interface name found in /etc/config/" +"network (see advanced tab)
Names may contain characters A-Z, a-z, 0-9, " +"_ and no spaces
Interfaces may not share the same name as configured " +"members, policies or rules" +msgstr "" +"MWAN 支持最多 250 个物理或逻辑接口。
MWAN 要求所有接口必须在 /etc/" +"config/network 中设定唯一的网关跃点。
名称必须与 /etc/config/network 中" +"的接口名称匹配。(可查看“高级”选项卡)
名称允许包括A-Z、a-z、0-9、_ 但是" +"不能有空格。
接口不应该与成员、策略、规则中的任意一个设置项使用相同的名" +"称" + +msgid "" +"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or " +"as a portrange (eg \"1024:2048\") without quotes" +msgstr "" +"可以输入一个或多个端口(例如 \"22\" 或者 \"80,443\")或者是一个端口范围(例" +"如 \"1024:2048\")不含引号" + +msgid "Member" +msgstr "成员" + +msgid "Member used" +msgstr "使用的成员" + +msgid "Members" +msgstr "成员" + +msgid "" +"Members are profiles attaching a metric and weight to an MWAN interface
Names may contain characters A-Z, a-z, 0-9, _ and no spaces
Members " +"may not share the same name as configured interfaces, policies or rules" +msgstr "" +"“成员”用来设置每一个 MWAN 接口的跃点数(即接口优先级)和所占比重。
名称" +"允许包括 A-Z、 a-、0-9、_ 但是不能有空格。
成员不应该与接口、策略、规则" +"中的任意一个设置项使用相同的名称" + +msgid "Members assigned" +msgstr "分配的成员" + +msgid "Metric" +msgstr "跃点数" + +msgid "" +"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" +"youtube.com/youtube\")" +msgstr "" +"匹配 IPset 规则列表名称。需要先配置 /etc/dnsmasq.conf 中的 IPset 规则 (例如: " +"\"ipset=/youtube.com/youtube\")" + +msgid "Network Config" +msgstr "网络配置文件" + +msgid "No" +msgstr "否" + +msgid "No MWAN interfaces found" +msgstr "没有找到 MWAN 接口" + +msgid "No MWAN systemlog history found" +msgstr "没有在系统日志中找到 MWAN 历史信息" + +msgid "No detailed status information available" +msgstr "没有状态详细信息可用" + +msgid "No diagnostic results returned" +msgstr "没有返回诊断结果" + +msgid "No protocol specified" +msgstr "未指定协议" + +msgid "Offline" +msgstr "离线" + +msgid "Online (tracking active)" +msgstr "在线(追踪启用中)" + +msgid "Online (tracking off)" +msgstr "在线(追踪已关闭)" + +msgid "Overview" +msgstr "概况" + +msgid "Ping count" +msgstr "Ping 计数" + +msgid "Ping default gateway" +msgstr "Ping 默认网关" + +msgid "Ping interval" +msgstr "Ping 间隔" + +msgid "Ping interval during failure detection" +msgstr "故障检测期间的 Ping 间隔" + +msgid "Ping interval during failure recovering" +msgstr "故障恢复期间的 Ping 间隔" + +msgid "Ping size" +msgstr "Ping 大小" + +msgid "Ping timeout" +msgstr "Ping 超时" + +msgid "Ping tracking IP" +msgstr "Ping 跟踪 IP" + +msgid "Policies" +msgstr "策略" + +msgid "" +"Policies are profiles grouping one or more members controlling how MWAN " +"distributes traffic
Member interfaces with lower metrics are used " +"first. Interfaces with the same metric load-balance
Load-balanced " +"member interfaces distribute more traffic out those with higher weights
Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be " +"15 characters or less
Policies may not share the same name as " +"configured interfaces, members or rules" +msgstr "" +"“策略”把成员进行分组,告诉 MWAN 如何分配“规则”中使用这一策略的流量
拥有" +"较低跃点数的成员将会被优先使用。拥有相同跃点数的成员把流量进行负载均衡。
进行负载均衡的成员之间拥有较高比重的成员将会被分配到更多流量。
名称允许" +"包括A-Z、a-z、0-9、_ 但是不能有空格。名称应该在 15 个字符以内
策略不应该" +"与接口、成员、规则中的任意一个设置项使用相同的名称" + +msgid "Policy" +msgstr "策略" + +msgid "Policy assigned" +msgstr "分配的策略" + +msgid "Protocol" +msgstr "协议" + +msgid "Recovery interval" +msgstr "故障恢复间隔" + +msgid "Restart MWAN" +msgstr "重启 MWAN" + +msgid "Restore default hotplug script" +msgstr "恢复默认的 hotplug 脚本" + +msgid "Restore..." +msgstr "恢复..." + +msgid "Rule" +msgstr "规则" + +msgid "Rules" +msgstr "规则" + +msgid "" +"Rules specify which traffic will use a particular MWAN policy based on IP " +"address, port or protocol
Rules are matched from top to bottom. Rules " +"below a matching rule are ignored. Traffic not matching any rule is routed " +"using the main routing table
Traffic destined for known (other than " +"default) networks is handled by the main routing table. Traffic matching a " +"rule, but all WAN interfaces for that policy are down will be blackholed
Names may contain characters A-Z, a-z, 0-9, _ and no spaces
Rules may " +"not share the same name as configured interfaces, members or policies" +msgstr "" +"“规则”基于 IP 地址、协议、端口把流量划分到指定的“策略”中。
规则按照从上" +"到下的顺序进行匹配。除了第一条能够匹配一次通信的规则以外,其它规则将被忽略。" +"不匹配任何规则的通信将会由系统默认路由表进行。
来自已知的网络的转发流量" +"由系统默认路由表接手,然后 MWAN 从中匹配出相应的流量并转移到 MWAN 自己的路由" +"表。但是所有被划分到一个无法使用的策略的流量将会无法正常进行路由。
名称" +"允许包括A-Z、a-z、0-9、_ 但是不能有空格。
规则不应该与接口、成员、策略中" +"的任意一个设置项使用相同的名称" + +msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set" +msgstr "单位为秒。接受的值: 1-1000000。留空则使用默认值 600 秒" + +msgid "Source address" +msgstr "源地址" + +msgid "Source port" +msgstr "源端口" + +msgid "Start MWAN" +msgstr "启动 MWAN" + +msgid "Sticky" +msgstr "粘滞模式" + +msgid "Sticky timeout" +msgstr "粘滞超时" + +msgid "Stop MWAN" +msgstr "停止 MWAN" + +msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes" +msgstr "支持 CIDR 记法(例如: \"192.168.100.0/24\")不含引号" + +msgid "There are currently %d of 250 supported interfaces configured" +msgstr "当前已配置 %d 个接口,最大支持 250 个" + +msgid "" +"This displays the metric assigned to this interface in /etc/config/network" +msgstr "这里显示了这个接口在 /etc/config/network 中配置的跃点数" + +msgid "" +"This hostname or IP address will be pinged to determine if the link is up or " +"down. Leave blank to assume interface is always online" +msgstr "通过 ping 此主机或 IP 地址来确定链路是否在线。留空则认为接口始终在线" + +msgid "This section allows you to modify the contents of /etc/config/mwan3" +msgstr "这里允许你修改 /etc/config/mwan3 的内容" + +msgid "This section allows you to modify the contents of /etc/config/network" +msgstr "这里允许你修改 /etc/config/network 的内容" + +msgid "This section allows you to modify the contents of /etc/config/wireless" +msgstr "这里允许你修改 /etc/config/wireless 的内容" + +msgid "" +"This section allows you to modify the contents of /etc/hotplug.d/iface/16-" +"mwancustom
This is useful for running system commands and/or scripts " +"based on interface ifup or ifdown hotplug events

Notes:
The " +"first line of the script must be "#!/bin/sh" without quotes
Lines beginning with # are comments and are not executed

Available variables:
$ACTION is the hotplug event (ifup, ifdown)
" +"$INTERFACE is the interface name (wan1, wan2, etc.)
$DEVICE is the " +"device name attached to the interface (eth0.1, eth1, etc.)" +msgstr "" +"这里允许你修改 /etc/hotplug.d/iface/16-mwancustom 的内容
这可以在接口 " +"ifup 或 ifdown Hotplug 事件时运行系统命令或脚本

注意:
脚本的" +"第一行必须是 "#!/bin/sh" 不含引号
以#开头的行是注释,不会执行" +"

可用变量:
$ACTION 是 Hotplug 事件(ifup, ifdown)
" +"$INTERFACE 是接口名称(wan1、wan2 等)
$DEVICE 是连接到接口的设备名称 " +"(eth0.1、eth1 等)" + +msgid "Tracking IP" +msgstr "追踪的 IP" + +msgid "Tracking hostname or IP address" +msgstr "追踪的主机或 IP 地址" + +msgid "Tracking reliability" +msgstr "追踪可靠性" + +msgid "Traffic Rules" +msgstr "流量规则" + +msgid "" +"Traffic from the same source IP address that previously matched this rule " +"within the sticky timeout period will use the same WAN interface" +msgstr "" +"来自相同源 IP 的流量,如果已经匹配过此规则并且在粘滞超时时间内,将会使用相同" +"的 WAN 接口" + +msgid "Troubleshooting" +msgstr "故障排除" + +msgid "Troubleshooting Data" +msgstr "故障排除数据" + +msgid "View the contents of /etc/protocols for protocol descriptions" +msgstr "请查看 /etc/protocols 获取可选协议详情" + +msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" +msgstr "警告: 已配置 %d 个接口,超过最大值 250!" + +msgid "" +"WARNING: Some policies have names exceeding the maximum of 15 characters!" +msgstr "警告: 某些策略的名称超过了 15 个字符!" + +msgid "" +"WARNING: some interfaces are configured incorrectly or not at all in /etc/" +"config/network!" +msgstr "警告: 某些接口配置不正确或未配置到 /etc/config/network!" + +msgid "" +"WARNING: some interfaces have a higher reliability requirement than there " +"are tracking IP addresses!" +msgstr "警告: 某些接口的追踪可靠性要求大于了追踪 IP 地址总数!" + +msgid "" +"WARNING: some interfaces have duplicate metrics configured in /etc/config/" +"network!" +msgstr "警告: 某些接口在 /etc/config/network 中配置了相同的跃点数!" + +msgid "" +"WARNING: some interfaces have no default route in the main routing table!" +msgstr "警告: 某些接口在主路由表中没有默认路由!" + +msgid "" +"WARNING: some interfaces have no metric configured in /etc/config/network!" +msgstr "警告: 某些接口没有在 /etc/config/network 中配置跃点数!" + +msgid "" +"WARNING: some rules have a port configured with no or improper protocol " +"specified! Please configure a specific protocol!" +msgstr "" +"警告: 某些规则指定了端口却没有配置或配置了不正确的协议,请重新指定协议!" + +msgid "" +"WARNING: this and other interfaces have duplicate metrics configured in /etc/" +"config/network!" +msgstr "警告: 此接口和其他接口在 /etc/config/network 中配置了相同的跃点数!" + +msgid "" +"WARNING: this interface has a higher reliability requirement than there are " +"tracking IP addresses!" +msgstr "警告: 此接口的追踪可靠性要求大于了追踪 IP 地址总数!" + +msgid "WARNING: this interface has no default route in the main routing table!" +msgstr "警告: 此接口在主路由表中没有默认路由!" + +msgid "" +"WARNING: this interface has no metric configured in /etc/config/network!" +msgstr "警告: 此接口没有在 /etc/config/network 中配置跃点数!" + +msgid "" +"WARNING: this interface is configured incorrectly or not at all in /etc/" +"config/network!" +msgstr "警告: 此接口配置不正确或未配置到 /etc/config/network!" + +msgid "" +"WARNING: this policy's name is %d characters exceeding the maximum of 15!" +msgstr "警告: 此策略的名称具有 %d 个字符,超过了 15 个字符!" + +msgid "" +"WARNING: this rule is incorrectly configured with no or improper protocol " +"specified! Please configure a specific protocol!" +msgstr "警告: 此规则没有配置或配置了不正确的协议,请重新指定协议!" + +msgid "Waiting for MWAN to %s..." +msgstr "等待 MWAN %s..." + +msgid "Waiting for diagnostic results..." +msgstr "等待诊断结果..." + +msgid "Weight" +msgstr "比重" + +msgid "" +"When all policy members are offline use this behavior for matched traffic" +msgstr "当所有策略成员都无法使用的时候,对使用该策略的流量使用这个操作" + +msgid "Wireless Config" +msgstr "无线配置" + +msgid "Yes" +msgstr "是" + +msgid "always" +msgstr "总是" + +msgid "blackhole (drop)" +msgstr "黑洞(丢弃)" + +msgid "default (use main routing table)" +msgstr "默认(使用主路由表)" + +msgid "ifdown" +msgstr "ifdown" + +msgid "ifup" +msgstr "ifup" + +msgid "never" +msgstr "从不" + +msgid "restart" +msgstr "重启" + +msgid "start" +msgstr "启动" + +msgid "stop" +msgstr "关闭" + +msgid "unreachable (reject)" +msgstr "不可达(拒绝)" + +msgid "%d IPv4-only hosts" +msgstr "%d 个主机仅支持 IPv4" + +msgid "%d IPv6-only hosts" +msgstr "%d 个主机仅支持 IPv6" + +msgid "%d dual-stack hosts" +msgstr "%d 个双协议栈主机" + +msgid "%s and %s" +msgstr "%s 和 %s" + +msgid "%s, %s and %s" +msgstr "%s, %s 和 %s" + +msgid "-1 - Restart every last day of month" +msgstr "-1 - 每月的最后一天重新开始" + +msgid "-7 - Restart a week before end of month" +msgstr "-7 - 每月底前一周重新开始" + +msgid "1 - Restart every 1st of month" +msgstr "1 - 每月的第一天重新开始" + +msgid "10m - frequent commits at the expense of flash wear" +msgstr "10m - 频繁提交,闪存损耗的开销也增大" + +msgid "12h - compromise between risk of data loss and flash wear" +msgstr "12h - 平衡统计数据丢失的风险以及闪存使用寿命" + +msgid "24h - least flash wear at the expense of data loss risk" +msgstr "24h - 以数据丢失风险的代价换取最小的闪存损耗" + +msgid "30s - refresh twice per minute for reasonably current stats" +msgstr "30s - 每分钟刷新二次以获得较准确的当前统计值" + +msgid "5m - rarely refresh to avoid frequently clearing conntrack counters" +msgstr "5m - 较少刷新以避免频繁清除连接跟踪计数器" + +msgid "60s - commit minutely, useful for non-flash storage" +msgstr "60s - 每分钟提交,适用于非闪存类型存储" + +msgid "0 connections" +msgstr "连接:0" + +msgid "0 hosts" +msgstr "主机:0" + +msgid "0% IPv6 support rate among hosts" +msgstr "支持 IPv6 的主机比例:0%" + +msgid "0B total IPv6 download" +msgstr "IPv6 总下载量:0B" + +msgid "0% of the total traffic is IPv6" +msgstr "IPv6 流量比例:0%" + +msgid "0B total IPv6 upload" +msgstr "IPv6 总上传量:0B" + +msgid "0 cause the most connections" +msgstr "0 是连接数最多的协议" + +msgid "0 cause the most download" +msgstr "0 是下载量最大的协议" + +msgid "0 cause the most upload" +msgstr "0 是上传量最大的协议" + +msgid "0 different application protocols" +msgstr "0 种不同的应用层协议" + +msgid "0 download" +msgstr "下载:0" + +msgid "0 upload" +msgstr "上传:0" + +msgid "Accounting period" +msgstr "统计周期" + +msgid "Advanced Settings" +msgstr "高级设置" + +msgid "Application" +msgstr "应用层协议" + +msgid "Application Protocols" +msgstr "应用层协议" + +msgid "Backup" +msgstr "备份" + +msgid "Bandwidth Monitor" +msgstr "带宽监控" + +msgid "CSV, grouped by IP" +msgstr "CSV,按 IP 分组" + +msgid "CSV, grouped by MAC" +msgstr "CSV,按 MAC 分组" + +msgid "CSV, grouped by protocol" +msgstr "CSV,按协议分组" + +msgid "" +"Changing the accounting interval type will invalidate existing databases!" +"
Download backup." +msgstr "" +"更改统计周期类型会使现有数据库无效!
下载备份." + +msgid "" +"Choose \"Day of month\" to restart the accounting period monthly on a " +"specific date, e.g. every 3rd. Choose \"Fixed interval\" to restart the " +"accounting period exactly every N days, beginning at a given date." +msgstr "" +"选择“每月的某一天”来设置统计周期的重启时间,例如:每个月的第 3 天。选择“固定" +"周期”来设置从给定日期开始每 N 天重启统计周期。" + +msgid "Commit interval" +msgstr "提交间隔" + +msgid "Compress database" +msgstr "压缩数据库" + +msgid "Conn." +msgstr "连接。" + +msgid "Connections" +msgstr "连接" + +msgid "Connections / Host" +msgstr "连接 / 主机" + +msgid "Database directory" +msgstr "数据库目录" + +msgid "" +"Database storage directory. One file per accounting period will be placed " +"into this directory." +msgstr "数据库存储目录。每个“统计周期”的文件将被放到这个目录中。" + +msgid "Day of month" +msgstr "每月的某一天" + +msgid "" +"Day of month to restart the accounting period. Use negative values to count " +"towards the end of month, e.g. \"-5\" to specify the 27th of July or the " +"24th of Februrary." +msgstr "" +"每个月重启统计周期的日期。使用负数表示从月底开始计算,例如:\"-5\" 可以表示 " +"7 月份的 27 号或者 2 月份的 24 号。" + +msgid "Display" +msgstr "显示" + +msgid "Down. (Bytes / Pkts.)" +msgstr "下载(字节 / 数据包)" + +msgid "Download (Bytes / Packets)" +msgstr "下载(字节 / 数据包)" + +msgid "Download / Application" +msgstr "下载 / 应用层协议" + +msgid "Download Database Backup" +msgstr "下载数据库备份" + +msgid "Dualstack enabled hosts" +msgstr "双协议栈主机" + +msgid "Due date" +msgstr "重置日期" + +msgid "Export" +msgstr "导出" + +msgid "Family" +msgstr "协议类型" + +msgid "Fixed interval" +msgstr "固定周期" + +msgid "Force reload…" +msgstr "强制重新加载..…" + +msgid "General Settings" +msgstr "基本设置" + +msgid "Generate Backup" +msgstr "生成备份" + +msgid "Host" +msgstr "主机" + +msgid "Hostname: example.org" +msgstr "主机名:example.org" + +msgid "IPv4 vs. IPv6" +msgstr "IPv4 与 IPv6" + +msgid "Interval" +msgstr "周期" + +msgid "" +"Interval at which the temporary in-memory database is committed to the " +"persistent database directory." +msgstr "将内存中的临时数据库提交到持久性数据库目录的间隔时间。" + +msgid "" +"Interval at which traffic counters of still established connections are " +"refreshed from netlink information." +msgstr "从 netlink 信息中刷新“已建立连接”的流量计数器的间隔时间。" + +msgid "Invalid or empty backup archive" +msgstr "备份存档无效或为空" + +msgid "JSON dump" +msgstr "JSON 输出" + +msgid "Length of accounting interval in days." +msgstr "统计周期(天)。" + +msgid "Local interfaces" +msgstr "本地接口" + +msgid "Local subnets" +msgstr "本地子网" + +msgid "MAC" +msgstr "MAC" + +msgid "Maximum entries" +msgstr "最大条目" + +msgid "" +"Maximum number of accounting periods to keep, use zero to keep databases " +"forever." +msgstr "保留的统计周期数据库的最大数量,设置 0 表示不限制。" + +msgid "Netlink Bandwidth Monitor" +msgstr "网络带宽监视器" + +msgid "Netlink Bandwidth Monitor - Backup / Restore" +msgstr "网络带宽监视器 - 备份 / 恢复" + +msgid "Netlink Bandwidth Monitor - Configuration" +msgstr "网络带宽监视器 - 配置" + +msgid "No data recorded yet." +msgstr "暂无数据记录。" + +msgid "Only conntrack streams from or to any of these networks are counted." +msgstr "仅统计来自或目标为这些网络接口的连接流量。" + +msgid "Only conntrack streams from or to any of these subnets are counted." +msgstr "仅统计来自或目标为这些子网的连接流量。" + +msgid "Preallocate database" +msgstr "预分配数据库" + +msgid "Protocol Mapping" +msgstr "协议映射" + +msgid "" +"Protocol mappings to distinguish traffic types per host, one mapping per " +"line. The first value specifies the IP protocol, the second value the port " +"number and the third column is the name of the mapped protocol." +msgstr "" +"协议映射用于区分流量类型,每行一条。第一个值指定 IP 协议类型,第二个值是端口" +"号,第三个值是映射的协议名称。" + +msgid "Refresh interval" +msgstr "刷新间隔" + +msgid "Restore" +msgstr "恢复" + +msgid "Restore Database Backup" +msgstr "恢复数据库备份" + +msgid "Select accounting period:" +msgstr "选择统计周期:" + +msgid "Source IP" +msgstr "源 IP" + +msgid "Start date" +msgstr "起始日期" + +msgid "Start date of the first accounting period, e.g. begin of ISP contract." +msgstr "第一个统计周期的起始日期,例如:ISP 合约的起始日期。" + +msgid "Stored periods" +msgstr "储存周期" + +msgid "" +"The Netlink Bandwidth Monitor (nlbwmon) is a lightweight, efficient traffic " +"accounting program keeping track of bandwidth usage per host and protocol." +msgstr "" +"网络带宽监视器(nlbwmon)是一个轻量、高效的流量统计程序,可以统计每个主机和协" +"议的带宽使用情况。" + +msgid "The following database files have been restored: %s" +msgstr "以下数据库文件已恢复:%s" + +msgid "" +"The maximum amount of entries that should be put into the database, setting " +"the limit to 0 will allow databases to grow indefinitely." +msgstr "数据库中的最大条目数量, 设置为 0 将允许数据库无限增长。" + +msgid "Traffic / Host" +msgstr "流量 / 主机" + +msgid "Traffic Distribution" +msgstr "流量分布" + +msgid "Up. (Bytes / Pkts.)" +msgstr "上传(字节 / 数据包)" + +msgid "Upload (Bytes / Packets)" +msgstr "上传(字节 / 数据包)" + +msgid "Upload / Application" +msgstr "上传 / 应用层协议" + +msgid "Vendor: Example Corp." +msgstr "供应商: Example Corp." + +msgid "Warning" +msgstr "警告" + +msgid "" +"Whether to gzip compress archive databases. Compressing the database files " +"makes accessing old data slightly slower but helps to reduce storage " +"requirements." +msgstr "" +"是否使用 gzip 压缩数据库存档。压缩数据库文件会使访问旧数据稍微慢一些, 但有助" +"于减少存储占用空间。" + +msgid "" +"Whether to preallocate the maximum possible database size in memory. This is " +"mainly useful for memory constrained systems which might not be able to " +"satisfy memory allocation after longer uptime periods." +msgstr "" +"是否预先分配数据库最大可能占用的内存大小。这主要适用于内存较小系统,这些系统" +"在长时间运行之后可能无法满足数据库的内存需求。" + +msgid "no traffic" +msgstr "无流量数据" + +msgid "other" +msgstr "其他" + +msgid "" +"Enable IGMP " +"snooping" +msgstr "" +"开启 IGMP snooping" + +msgid "Enables IGMP snooping on this bridge" +msgstr "在此桥接上启用 IGMP snooping 组播(多播)" + +msgid "Action" +msgstr "动作" + +msgid "Advanced Reboot" +msgstr "双分区启动切换" + +msgid "Alternative" +msgstr "备选" + +msgid "Cancel" +msgstr "取消" + +msgid "Confirm" +msgstr "确定" + +msgid "Current" +msgstr "当前" + +msgid "Firmware/OS (Kernel)" +msgstr "固件/系统 (内核)" + +msgid "Partition" +msgstr "分区" + +msgid "Partitions" +msgstr "分区" + +msgid "Perform power off..." +msgstr "点击关机..." + +msgid "Power Off Device" +msgstr "关闭设备" + +msgid "Proceed" +msgstr "处理" + +msgid "Reboot Device to an Alternative Partition" +msgstr "重启设备到备选分区" + +msgid "Reboot to alternative partition..." +msgstr "重启到备选分区。" + +msgid "Reboot to current partition" +msgstr "重启到当前分区" + +msgid "Rebooting..." +msgstr "正在重启..." + +msgid "Shutting down..." +msgstr "正在关闭..." + +msgid "Status" +msgstr "状态" + +msgid "" +"The system is rebooting now.
DO NOT POWER OFF THE DEVICE!
Wait a " +"few minutes before you try to reconnect. It might be necessary to renew the " +"address of your computer to reach the device again, depending on your " +"settings." +msgstr "" +"系统正在重启。
请勿关闭设备电源!
请等待几分钟,然后再尝试重新连" +"接。根据您的设置,可能需要更新计算机的地址才能再次访问该设备。" + +msgid "" +"The system is rebooting to an alternative partition now.
DO NOT POWER " +"OFF THE DEVICE!
Wait a few minutes before you try to reconnect. It " +"might be necessary to renew the address of your computer to reach the device " +"again, depending on your settings." +msgstr "" +"系统正在重新引导到备用分区。
请勿关闭设备电源!
请等待几分钟,然" +"后再尝试重新连接。根据您的设置,可能需要更新计算机的地址才能再次访问该设备。" + +msgid "" +"The system is shutting down now.
DO NOT POWER OFF THE DEVICE!
It " +"might be necessary to renew the address of your computer to reach the device " +"again, depending on your settings." +msgstr "" +"系统正在关闭。
请勿关闭设备电源!
根据您的设置,可能需要更新计算" +"机的地址才能再次访问该设备。" + +msgid "" +"WARNING: An alternative partition might have its own settings and completely " +"different firmware.

As your network configuration and WiFi SSID/" +"password on alternative partition might be different, you might have to " +"adjust your computer settings to be able to access your device once it " +"reboots.

Please also be aware that alternative partition " +"firmware might not provide an easy way to switch active partition and boot " +"back to the currently active partition.

Click \"Proceed\" below " +"to reboot device to an alternative partition." +msgstr "" +"警告:备用分区可能具有自己的设置和完全不同的固件。

由于备用分区上" +"的网络配置和 WiFi SSID / 密码可能有所不同,因此您可能必须调整计算机设置才能在" +"设备重启后访问设备。

另请注意,备用分区固件可能无法提供切换活动分" +"区并引导回当前活动分区的简便方法。

点击 \"继续\" 下面将设备重新" +"引导到备用分区。" + +msgid "" +"WARNING: Power off might result in a reboot on a device which doesn't " +"support power off.

Click \"Proceed\" below to power off your " +"device." +msgstr "" +"警告: 关闭电源可能会导致不支持关闭电源的设备重新启动。

单击下面的" +"\"继续\"以关闭设备电源。" + +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "警告:某些设置没有保存,重启将导致丢失这些配置!" + +msgid "Warning: This system does not have two partitions!" +msgstr "警告:当前系统没有包括两个分区!" + +msgid "Warning: This system does not support powering off!" +msgstr "警告:本系统不支持软关机!" + +msgid "Filter IPv6 Records" +msgstr "过滤 IPv6 记录" + +msgid "Filter IPv6(AAAA) Records during DNS resolution" +msgstr "在域名解析时,过滤 IPv6(AAAA) 记录" + +msgid "SFE flow offloading" +msgstr "SFE 流量分载" + +msgid "SFE based offloading for Routing/NAT. Restart recommended." +msgstr "基于 SFE 的 Routing/NAT 分载(开/关后建议重启设备)" + +msgid "DNS Settings" +msgstr "DNS 设置" + +msgid "Packet Steering" +msgstr "数据包引导" + +msgid "" +"Enable packet steering across all CPUs. May help or hinder network speed." +msgstr "启用所有 CPU 的数据包控制。 可能有助于或阻碍网络速度。" + +msgid "Compressed memory" +msgstr "内存压缩" + +msgid "Compressed memory subsystem" +msgstr "内存压缩系统" + +msgid "Configure the compressed memory subsystem, which allows data in memory to be compressed to enhance resource usage." +msgstr "配置内存压缩系统,允许压缩内存中的数据以提高资源利用率。" + +msgid "Compressed RAM disk properties" +msgstr "RamDisk 压缩设置" + +msgid "Configure the compressed RAM disk properties. This RAM disk will be used as a swap device." +msgstr "对 RamDisk 压缩参数进行设置。这个 RamDisk 将会作为 Swap 设备。" + +msgid "Enable swap on zram" +msgstr "在 zRam 上启用 Swap" + +msgid "Enable usage of the compressed RAM disk (zram)." +msgstr "启用 RamDisk 压缩(zRam)" + +msgid "Compression algorithm" +msgstr "压缩算法" + +msgid "Select the compression algorithm. The one with higher compression ratio is the first and the one with the lower is the last." +msgstr "选择压缩算法,压缩比按列表中的顺序,由高到低排列。启用最好的压缩算法可以节省更多的内存,但会增加 CPU 占用。" + +msgid "Base memory pool" +msgstr "基础内存池" + +msgid "This is the maximum percentage of the main memory to use as the compressed disk assuming that the data is compressible." +msgstr "压缩内存可使用的最大内存百分比。" + +msgid "Backing storage device" +msgstr "后备存储池" + +msgid "This file or device will be used when the data is hard to compress which offer no gain to keep it in memory. Note that the file or device must have the appropiate size, for example, the size of the RAM disk." +msgstr "这个文件或存储位置将在数据难以被压缩时使用。请注意,该文件或存储位置的剩余空间需大于 RamDisk。" + +msgid "Show advanced setup" +msgstr "高级设置" + +msgid "Absolute memory pool limit" +msgstr "内存池限制" + +msgid "Compressed swap cache properties" +msgstr "Swap Cache压缩设置" + +msgid "Configure the compressed swap cache. This cache will try to avoid I/O to slow disks or to use the more expensive compressor of zram." +msgstr "对 Swap Cache 压缩参数进行设置。这个 Cache 将会减少硬盘 IO。" + +msgid "Enable zswap cache" +msgstr "启用 zSwap Cache" + +msgid "Enable the usage of the compressed swap cache (zswap)." +msgstr "启用 zSwap Cache 压缩(zSwap)" + +msgid "Select the compression algorithm, they are not ordered by speed. There is no gain in choosing a slower algorithm, since the zpool limits the maximum compression ratio. Because of this, the default is the best option." +msgstr "选择压缩算法,建议使用默认的。" + +msgid "Maximum memory pool" +msgstr "最大内存池" + +msgid "This is the maximum percentage of the main memory to use as the compressed cache for swap when zram is not available." +msgstr "这个值是当 zRam 不可用时候,zSwap Cache 可使用的最大内存百分比。" + +msgid "Memory allocator" +msgstr "内存分配器" + +msgid "Select the compressed memory allocator (zpool). The zpool can store, at most, this quantity of pages in the space that uses one." +msgstr "选择内存分配器,这间影响单个页面对应的最大压缩比。" + +msgid "System swappiness" +msgstr "系统交换空间策略" + +msgid "The tendency of the system to swap unused pages instead of dropping file system cache. If your file system is compressed, such as SQUASHFS, UBI or zfs, use a slightly higher swappiness.'" +msgstr "数值越大,代表越积极的使用 Swap 空间而不是 Ram ,建议在 SQUASHFS 之类的文件系统上使用一个相对更大的值。" + +msgid "Compressor for zram" +msgstr "zRam 压缩算法" + +msgid "Select the compression algorithm for zram when zswap is enabled. The one with higher compression ratio is the first and the one with the lower is the last. Enabling the best compression enables greater memory savings." +msgstr "选择 zRam 的压缩算法,压缩比按列表中的顺序,由高到低排列。启用最好的压缩算法可以节省更多的内存,但会增加 CPU 占用。" + +msgid "Scale factor" +msgstr "比例因子" + +msgid "This is the percentage that will use the zswap pool when zram is enabled. This represents the uncompressed data size as a percentage of the zram\'s pool maximum size." +msgstr "这是 zRam 启用后,zSwap 占用的内存百分比。这也表示未压缩数据占 zRam 池的最大占比。" + +msgid "Enable FullCone NAT" +msgstr "启用 FullCone-NAT" + +msgid "Compressed swap disk and cache" +msgstr "压缩交换缓存" + +msgid "Configure the compressed memory subsystem, which allows data in memory to be compressed to enhance resource usage." +msgstr "配置内存压缩系统,允许压缩内存中的数据以提高内存资源利用率(可能会消耗更多的处理器资源)。" + +msgid "Configure the compressed RAM disk properties. This section will configure the zram "compressed" block device, which will be used by the kernel as a physical swap disk. If your CPU and RAM are fast or your device does not have external storage, zram is the best alternative to free unused or rarely used memory." +msgstr "对 RamDisk 压缩参数进行设置。在内存中划分一块空间,作为 Swap 空间。 在处理器和内存性能足够的情况下,zRam 是获额外内存空间的最佳方式。" + +msgid "Enable a zram disk as a swap area" +msgstr "将 zRam 作为 Swap 空间" + +msgid "Compressed swap cache [zswap]" +msgstr "zSwap" + +msgid "Compressed RAM disk [zram]" +msgstr "zRam" + +msgid "Configure the compressed swap cache. When used as a cache to a swap device or file, it will reduce the I/O requests to the device or filesystem, allowing faster access to swapped memory areas by keeping them in memory.
When used as a cache to zram, it will avoid using the more efficient, yet more expensive, zram block compressor.
Note that while zram is a compressed block device, this is a compact-page LRU cache, and while zram can work as a stand-alone swap device, zswap always needs a backing swap device, which can be any swap area, including zram." +msgstr "对 Swap Cache 压缩参数进行设置。这个 Cache 将会减少硬盘 IO。" + +msgid "Compressor for zram when using zswap" +msgstr "zSwap 压缩算法" + +msgid "Enable a zswap cache for swap devices" +msgstr "启用 zSwap Cache" + +msgid "MiniUPnP extra settings" +msgstr "MiniUPnP 补充设置" + +msgid "Settings for router behined DMZ" +msgstr "二级路由设置" + +msgid "External Network Interface" +msgstr "外部网络接口" + +msgid "Internal Network Interface" +msgstr "内部网络接口" + +msgid "usually is wan" +msgstr "通常为 wan" + +msgid "usually is lan" +msgstr "通常为 lan" diff --git a/PATCH/duplicate/addition-trans-zh/status/status.lua b/PATCH/duplicate/addition-trans-zh/status/status.lua new file mode 100644 index 000000000..864b3ef6b --- /dev/null +++ b/PATCH/duplicate/addition-trans-zh/status/status.lua @@ -0,0 +1,250 @@ +-- Copyright 2011 Jo-Philipp Wich +-- Licensed to the public under the Apache License 2.0. + +module("luci.tools.status", package.seeall) + +local uci = require "luci.model.uci".cursor() +local ipc = require "luci.ip" + +local function dhcp_leases_common(family) + local rv = { } + local nfs = require "nixio.fs" + local sys = require "luci.sys" + local leasefile = "/tmp/dhcp.leases" + + uci:foreach("dhcp", "dnsmasq", + function(s) + if s.leasefile and nfs.access(s.leasefile) then + leasefile = s.leasefile + return false + end + end) + + local fd = io.open(leasefile, "r") + if fd then + while true do + local ln = fd:read("*l") + if not ln then + break + else + local ts, mac, ip, name, duid = ln:match("^(%d+) (%S+) (%S+) (%S+) (%S+)") + local expire = tonumber(ts) or 0 + if ts and mac and ip and name and duid then + if family == 4 and not ip:match(":") then + rv[#rv+1] = { + expires = (expire ~= 0) and os.difftime(expire, os.time()), + macaddr = ipc.checkmac(mac) or "00:00:00:00:00:00", + ipaddr = ip, + hostname = (name ~= "*") and name + } + elseif family == 6 and ip:match(":") then + rv[#rv+1] = { + expires = (expire ~= 0) and os.difftime(expire, os.time()), + ip6addr = ip, + duid = (duid ~= "*") and duid, + hostname = (name ~= "*") and name + } + end + end + end + end + fd:close() + end + + local lease6file = "/tmp/hosts/odhcpd" + uci:foreach("dhcp", "odhcpd", + function(t) + if t.leasefile and nfs.access(t.leasefile) then + lease6file = t.leasefile + return false + end + end) + local fd = io.open(lease6file, "r") + if fd then + while true do + local ln = fd:read("*l") + if not ln then + break + else + local iface, duid, iaid, name, ts, id, length, ip = ln:match("^# (%S+) (%S+) (%S+) (%S+) (-?%d+) (%S+) (%S+) (.*)") + local expire = tonumber(ts) or 0 + if ip and iaid ~= "ipv4" and family == 6 then + rv[#rv+1] = { + expires = (expire >= 0) and os.difftime(expire, os.time()), + duid = duid, + ip6addr = ip, + hostname = (name ~= "-") and name + } + elseif ip and iaid == "ipv4" and family == 4 then + rv[#rv+1] = { + expires = (expire >= 0) and os.difftime(expire, os.time()), + macaddr = sys.net.duid_to_mac(duid) or "00:00:00:00:00:00", + ipaddr = ip, + hostname = (name ~= "-") and name + } + end + end + end + fd:close() + end + + if family == 6 then + local _, lease + local hosts = sys.net.host_hints() + for _, lease in ipairs(rv) do + local mac = sys.net.duid_to_mac(lease.duid) + local host = mac and hosts[mac] + if host then + if not lease.name then + lease.host_hint = host.name or host.ipv4 or host.ipv6 + elseif host.name and lease.hostname ~= host.name then + lease.host_hint = host.name + end + end + end + end + + return rv +end + +function dhcp_leases() + return dhcp_leases_common(4) +end + +function dhcp6_leases() + return dhcp_leases_common(6) +end + +function wifi_networks() + local rv = { } + local ntm = require "luci.model.network".init() + + local dev + for _, dev in ipairs(ntm:get_wifidevs()) do + local rd = { + up = dev:is_up(), + device = dev:name(), + name = dev:get_i18n(), + networks = { } + } + + local net + for _, net in ipairs(dev:get_wifinets()) do + local a, an = nil, 0 + for _, a in pairs(net:assoclist() or {}) do + an = an + 1 + end + + rd.networks[#rd.networks+1] = { + name = net:shortname(), + link = net:adminlink(), + up = net:is_up(), + mode = net:active_mode(), + ssid = net:active_ssid(), + bssid = net:active_bssid(), + encryption = net:active_encryption(), + frequency = net:frequency(), + channel = net:channel(), + signal = net:signal(), + quality = net:signal_percent(), + noise = net:noise(), + bitrate = net:bitrate(), + ifname = net:ifname(), + country = net:country(), + txpower = net:txpower(), + txpoweroff = net:txpower_offset(), + num_assoc = an, + disabled = (dev:get("disabled") == "1" or + net:get("disabled") == "1") + } + end + + rv[#rv+1] = rd + end + + return rv +end + +function wifi_network(id) + local ntm = require "luci.model.network".init() + local net = ntm:get_wifinet(id) + if net then + local dev = net:get_device() + if dev then + return { + id = id, + name = net:shortname(), + link = net:adminlink(), + up = net:is_up(), + mode = net:active_mode(), + ssid = net:active_ssid(), + bssid = net:active_bssid(), + encryption = net:active_encryption(), + frequency = net:frequency(), + channel = net:channel(), + signal = net:signal(), + quality = net:signal_percent(), + noise = net:noise(), + bitrate = net:bitrate(), + ifname = net:ifname(), + country = net:country(), + txpower = net:txpower(), + txpoweroff = net:txpower_offset(), + disabled = (dev:get("disabled") == "1" or + net:get("disabled") == "1"), + device = { + up = dev:is_up(), + device = dev:name(), + name = dev:get_i18n() + } + } + end + end + return { } +end + +function wifi_assoclist() + local sys = require "luci.sys" + local ntm = require "luci.model.network".init() + local hosts = sys.net.host_hints() + + local assoc = {} + local _, dev, net, bss + + for _, dev in ipairs(ntm:get_wifidevs()) do + local radioname = dev:get_i18n() + + for _, net in ipairs(dev:get_wifinets()) do + local netname = net:shortname() + local netlink = net:adminlink() + local ifname = net:ifname() + + for _, bss in pairs(net:assoclist() or {}) do + local host = hosts[_] + + bss.bssid = _ + bss.ifname = ifname + bss.radio = radioname + bss.name = netname + bss.link = netlink + + bss.host_name = (host) and (host.name or host.ipv4 or host.ipv6) + bss.host_hint = (host and host.name and (host.ipv4 or host.ipv6)) and (host.ipv4 or host.ipv6) + + assoc[#assoc+1] = bss + end + end + end + + table.sort(assoc, function(a, b) + if a.radio ~= b.radio then + return a.radio < b.radio + elseif a.ifname ~= b.ifname then + return a.ifname < b.ifname + else + return a.bssid < b.bssid + end + end) + + return assoc +end \ No newline at end of file diff --git a/PATCH/duplicate/luci-app-control-weburl/Makefile b/PATCH/duplicate/luci-app-control-weburl/Makefile new file mode 100644 index 000000000..b0df327f8 --- /dev/null +++ b/PATCH/duplicate/luci-app-control-weburl/Makefile @@ -0,0 +1,18 @@ +# Copyright (C) 2016 Openwrt.org +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=LuCI support for Weburl From Koolshare +LUCI_DEPENDS:=+iptables-mod-filter +kmod-ipt-filter +LUCI_PKGARCH:=all +PKG_VERSION:=1.5 +PKG_RELEASE:=20200923 + +include $(TOPDIR)/feeds/luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature + + diff --git a/PATCH/duplicate/luci-app-control-weburl/luasrc/controller/weburl.lua b/PATCH/duplicate/luci-app-control-weburl/luasrc/controller/weburl.lua new file mode 100644 index 000000000..539e4f988 --- /dev/null +++ b/PATCH/duplicate/luci-app-control-weburl/luasrc/controller/weburl.lua @@ -0,0 +1,10 @@ +module("luci.controller.weburl", package.seeall) + +function index() + if not nixio.fs.access("/etc/config/weburl") then return end + + entry({"admin", "control"}, firstchild(), "Control", 50).dependent = false + entry({"admin", "control", "weburl"}, cbi("weburl"), _("过滤军刀"), 12).dependent = + true +end + diff --git a/PATCH/duplicate/luci-app-control-weburl/luasrc/model/cbi/weburl.lua b/PATCH/duplicate/luci-app-control-weburl/luasrc/model/cbi/weburl.lua new file mode 100644 index 000000000..c40766079 --- /dev/null +++ b/PATCH/duplicate/luci-app-control-weburl/luasrc/model/cbi/weburl.lua @@ -0,0 +1,65 @@ +local o = require "luci.sys" +local a, t, e +local button = "" +local state_msg = "" +local running=(luci.sys.call("iptables -L FORWARD|grep WEBURL >/dev/null") == 0) +local button = "" +local state_msg = "" +if running then + state_msg = "" .. translate("正在运行") .. "" +else + state_msg = "" .. translate("没有运行") .. "" +end +a = Map("weburl", translate("网址过滤/关键字过滤/MAC黑名单/时间控制/端口控制"), translate("利用iptables来单独或组合使用多种条件过滤。条件除特别说明外都可以留空不使用。
* 如指定“关键词/URL”(MAC黑名单、时间、星期可选)则为关键字过滤,关键字可以是字符串或网址。
* 如指定“MAC黑名单”而“关键词/URL”留空则为纯MAC黑名单模式(如已改变默认时间或星期则成为时间控制)。
* 如指定端口(MAC黑名单、时间、星期可选)则禁止通过此端口联网。端口可以是端口范围如5000:5100或多端口5100,5110。" .. button .. "

" .. translate("运行状态").. " : " .. state_msg .. "
")) +t = a:section(TypedSection, "basic", translate(""), translate("")) +t.anonymous = true +e = t:option(Flag, "enabled", translate("开启功能")) +e.rmempty = false +e = t:option(ListValue, "algos", translate("过滤力度")) +e:value("bm", "一般过滤") +e:value("kmp", "强效过滤") +e.default = "kmp" +t = a:section(TypedSection, "macbind", translate("")) +t.template = "cbi/tblsection" +t.anonymous = true +t.addremove = true +e = t:option(Flag, "enable", translate("开启")) +e.rmempty = false +e.default = '1' +e = t:option(Value, "macaddr", translate("黑名单MAC(留空则过滤全部客户端)")) +e.rmempty = true +o.net.mac_hints(function(t, a) e:value(t, "%s (%s)" % {t, a}) end) +e = t:option(Value, "keyword", translate("关键词/URL(可留空)")) +e.rmempty = true +e = t:option(ListValue, "proto", translate("端口协议")) +e.rmempty = false +e.default = 'tcp' +e:value("tcp", translate("TCP")) +e:value("udp", translate("UDP")) +e = t:option(Value, "sport", translate("源端口")) +e.rmempty = true +e = t:option(Value, "dport", translate("目的端口")) +e.rmempty = true +e = t:option(Value, "timeon", translate("起控时间")) +e.placeholder = "00:00" +e.default = '00:00' +e.rmempty = true +e = t:option(Value, "timeoff", translate("停控时间")) +e.placeholder = "00:00" +e.default = '00:00' +e.rmempty = true +e = t:option(MultiValue, "daysofweek", translate("星期(至少选一天,某天不选则该天不进行控制)")) +e.optional = false +e.rmempty = false +e.default = 'Monday Tuesday Wednesday Thursday Friday Saturday Sunday' +e:value("Monday", translate("一")) +e:value("Tuesday", translate("二")) +e:value("Wednesday", translate("三")) +e:value("Thursday", translate("四")) +e:value("Friday", translate("五")) +e:value("Saturday", translate("六")) +e:value("Sunday", translate("日")) +return a + + + diff --git a/PATCH/duplicate/luci-app-control-weburl/po/zh-cn/weburl.po b/PATCH/duplicate/luci-app-control-weburl/po/zh-cn/weburl.po new file mode 100644 index 000000000..a883cf73a --- /dev/null +++ b/PATCH/duplicate/luci-app-control-weburl/po/zh-cn/weburl.po @@ -0,0 +1,2 @@ +msgid "Control" +msgstr "管控" diff --git a/PATCH/duplicate/luci-app-control-weburl/root/etc/config/weburl b/PATCH/duplicate/luci-app-control-weburl/root/etc/config/weburl new file mode 100644 index 000000000..331fc492b --- /dev/null +++ b/PATCH/duplicate/luci-app-control-weburl/root/etc/config/weburl @@ -0,0 +1,27 @@ + +config basic + option algos 'kmp' + option enabled '0' + +config macbind + option timeoff '00:00' + option timeon '00:00' + option daysofweek 'Monday Tuesday Wednesday Thursday Friday Saturday Sunday' + option keyword 'qq.com' + option enable '0' + +config macbind + option timeoff '00:00' + option timeon '00:00' + option daysofweek 'Monday Tuesday Wednesday Thursday Friday Saturday Sunday' + option enable '0' + option keyword 'www' + +config macbind + option timeoff '00:00' + option timeon '00:00' + option daysofweek 'Monday Tuesday Wednesday Thursday Friday Saturday Sunday' + option enable '0' + option keyword 'cmd.exe' + + diff --git a/PATCH/duplicate/luci-app-control-weburl/root/etc/init.d/weburl b/PATCH/duplicate/luci-app-control-weburl/root/etc/init.d/weburl new file mode 100644 index 000000000..c34d5f1e8 --- /dev/null +++ b/PATCH/duplicate/luci-app-control-weburl/root/etc/init.d/weburl @@ -0,0 +1,65 @@ +#!/bin/sh /etc/rc.common +# +# Copyright (C) 2015 OpenWrt-dist +# Copyright (C) 2016 fw867 +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# wulishui mod. at 20200923 , + +START=98 + +add_rules() { +rulessum=$(grep -c 'macbind' /etc/config/weburl) +for i in $(seq 0 $((rulessum-1))) +do +enable=$(uci get weburl.@macbind[$i].enable 2>/dev/null) +if [ "$enable" == 1 ]; then + macaddr=$(uci get weburl.@macbind[$i].macaddr 2>/dev/null) && MAC="-m mac --mac-source $macaddr" || MAC="" + keyword=$(uci get weburl.@macbind[$i].keyword 2>/dev/null) && STG="-m string --string ${keyword} --algo ${algos}" || STG="" + proto=$(uci get weburl.@macbind[$i].proto 2>/dev/null) || proto="tcp" + sport=$(uci get weburl.@macbind[$i].sport 2>/dev/null) && SPT="--sport ${sport}" || SPT="" + dport=$(uci get weburl.@macbind[$i].dport 2>/dev/null) && DPT="--dport ${dport}" || DPT="" + havesMPT=`echo "$sport"|grep ","` && sMPT="-m multiport" || sMPT="" + havedMPT=`echo "$dport"|grep ","` && dMPT="-m multiport" || dMPT="" + [ -z "$sport" -a -z "$dport" ] && PTS="" || PTS="-p ${proto} ${sMPT} ${SPT} ${dMPT} ${DPT}" + timestart=$(uci get weburl.@macbind[$i].timeon 2>/dev/null) || timestart="00:00" + timestop=$(uci get weburl.@macbind[$i].timeoff 2>/dev/null) || timestop="00:00" + week_days=$(uci get weburl.@macbind[$i].daysofweek |sed 's/ /,/g' 2>/dev/null) + [ "$timestart" = "$timestop" ] && TIME="" || TIME="--timestart ${timestart} --timestop ${timestop}" + [ -z "$week_days" -o "$week_days" = "Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday" ] && WEEK="" || WEEK="--weekdays ${week_days}" + [ -n "$TIME" -o -n "$WEEK" ] && TME="-m time --kerneltz ${TIME} ${WEEK}" || TME="" + if [ -n "$keyword" -o -n "$MAC" -o -n "$sport" -o -n "$dport" ]; then + iptables -A WEBURL ${MAC} ${PTS} ${TME} ${STG} -j REJECT 2>/dev/null + ip6tables -A WEBURL ${MAC} ${PTS} ${TME} ${STG} -j REJECT 2>/dev/null + fi +fi +done +} + +start(){ +enabled=`uci get weburl.@basic[0].enabled 2>/dev/null` +if [ "$enabled" == 1 ]; then + ENsum=`grep -c 'enable .1.' /etc/config/weburl` + if [ "$ENsum" -gt 0 ]; then + algos=`uci get weburl.@basic[0].algos 2>/dev/null` + iptables -N WEBURL 2>/dev/null || iptables -F WEBURL 2>/dev/null + ip6tables -N WEBURL 2>/dev/null || ip6tables -F WEBURL 2>/dev/null + iptables -C FORWARD -j WEBURL 2>/dev/null || iptables -I FORWARD -j WEBURL + ip6tables -C FORWARD -j WEBURL 2>/dev/null || ip6tables -I FORWARD -j WEBURL + add_rules + grep 'weburl' /etc/firewall.user || echo "/etc/init.d/weburl restart" >> /etc/firewall.user + fi +fi +} + +stop(){ + sed -i '/weburl/d' /etc/firewall.user 2>/dev/null + iptables -D FORWARD -j WEBURL 2>/dev/null + ip6tables -D FORWARD -j WEBURL 2>/dev/null + iptables -F WEBURL 2>/dev/null + ip6tables -F WEBURL 2>/dev/null + iptables - X WEBURL 2>/dev/null + ip6tables -X WEBURL 2>/dev/null +} + diff --git a/PATCH/duplicate/luci-app-control-weburl/root/etc/uci-defaults/luci-app-control-weburl b/PATCH/duplicate/luci-app-control-weburl/root/etc/uci-defaults/luci-app-control-weburl new file mode 100644 index 000000000..fed829197 --- /dev/null +++ b/PATCH/duplicate/luci-app-control-weburl/root/etc/uci-defaults/luci-app-control-weburl @@ -0,0 +1,11 @@ +#!/bin/sh + +uci -q batch <<-EOF >/dev/null + delete ucitrack.@weburl[-1] + add ucitrack weburl + set ucitrack.@weburl[-1].init=weburl + commit ucitrack +EOF + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/PATCH/duplicate/luci-app-cpulimit/Makefile b/PATCH/duplicate/luci-app-cpulimit/Makefile new file mode 100644 index 000000000..bf0eced0c --- /dev/null +++ b/PATCH/duplicate/luci-app-cpulimit/Makefile @@ -0,0 +1,14 @@ +# +# Copyright (C) 2008-2014 The LuCI Team +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=cpulimit configuration module +LUCI_DEPENDS:=+cpulimit + +include $(TOPDIR)/feeds/luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature \ No newline at end of file diff --git a/PATCH/duplicate/luci-app-cpulimit/luasrc/controller/cpulimit.lua b/PATCH/duplicate/luci-app-cpulimit/luasrc/controller/cpulimit.lua new file mode 100644 index 000000000..2ff63233d --- /dev/null +++ b/PATCH/duplicate/luci-app-cpulimit/luasrc/controller/cpulimit.lua @@ -0,0 +1,13 @@ + +module("luci.controller.cpulimit", package.seeall) + +function index() + if not nixio.fs.access("/etc/config/cpulimit") then + return + end + + local page = entry({"admin", "system", "cpulimit"}, cbi("cpulimit"), luci.i18n.translate("cpulimit"), 65) + page.i18n = "cpulimit" + page.dependent = true + +end diff --git a/PATCH/duplicate/luci-app-cpulimit/luasrc/model/cbi/cpulimit.lua b/PATCH/duplicate/luci-app-cpulimit/luasrc/model/cbi/cpulimit.lua new file mode 100644 index 000000000..af00b452e --- /dev/null +++ b/PATCH/duplicate/luci-app-cpulimit/luasrc/model/cbi/cpulimit.lua @@ -0,0 +1,38 @@ + +m = Map("cpulimit", translate("cpulimit"),translate("cpulimit ")) +s = m:section(TypedSection, "list", translate("Settings")) +s.template = "cbi/tblsection" +s.anonymous = true +s.addremove = true + +enable = s:option(Flag, "enabled", translate("enable", "enable")) +enable.optional = false +enable.rmempty = false + +exename = s:option(Value, "exename", translate("exename"), translate("name of the executable program file or path name")) +exename.optional = false +exename.rmempty = false +exename.default = "/usr/bin/transmission-daemon" +exename:value("transmission","/usr/bin/transmission-daemon") +exename:value("samba","/usr/sbin/smbd") +exename:value("mount.ntfs-3g","mount.ntfs-3g") +exename:value("vsftpd","/usr/sbin/vsftpd") +exename:value("pure-ftpd","/usr/sbin/pure-ftpd") + +limit = s:option(Value, "limit", translate("limit")) +limit.optional = false +limit.rmempty = false +limit.default = "50" +limit:value("100","100%") +limit:value("90","90%") +limit:value("80","80%") +limit:value("70","70%") +limit:value("60","60%") +limit:value("50","50%") +limit:value("40","40%") +limit:value("30","30%") +limit:value("20","20%") +limit:value("10","10%") + + +return m diff --git a/PATCH/duplicate/luci-app-cpulimit/po/zh_Hans/cpulimit.po b/PATCH/duplicate/luci-app-cpulimit/po/zh_Hans/cpulimit.po new file mode 100644 index 000000000..46e3a5799 --- /dev/null +++ b/PATCH/duplicate/luci-app-cpulimit/po/zh_Hans/cpulimit.po @@ -0,0 +1,30 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-28\n" +"PO-Revision-Date: 2014-06-28\n" +"Last-Translator: Syrone Wong \n" +"Language: zh_Hans\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "cpulimit" +msgstr "CPU占用率限制" + +msgid "Use cpulimit to restrict app's cpu usage." +msgstr "利用cpulimit限制应用程序的CPU使用率" + +msgid "Usage restrictions" +msgstr "使用率限制" + +msgid "exename" +msgstr "进程名称" + +msgid "name of the executable program file or path name" +msgstr "可执行文件名称,或包含路径的应用程序" + +msgid "limit" +msgstr "占用率限制(自定义时使用不含'%'的整数)" diff --git a/PATCH/duplicate/luci-app-cpulimit/root/etc/config/cpulimit b/PATCH/duplicate/luci-app-cpulimit/root/etc/config/cpulimit new file mode 100644 index 000000000..df66e8fec --- /dev/null +++ b/PATCH/duplicate/luci-app-cpulimit/root/etc/config/cpulimit @@ -0,0 +1,6 @@ + +config 'list' + option 'exename' '/usr/bin/transmission-daemon' + option 'limit' '50' + option 'enabled' '0' + diff --git a/PATCH/duplicate/luci-app-cpulimit/root/etc/init.d/cpulimit b/PATCH/duplicate/luci-app-cpulimit/root/etc/init.d/cpulimit new file mode 100644 index 000000000..e68580062 --- /dev/null +++ b/PATCH/duplicate/luci-app-cpulimit/root/etc/init.d/cpulimit @@ -0,0 +1,17 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2006-2011 OpenWrt.org +. /lib/functions.sh + +START=50 + +DEFAULT=/etc/default/cpulimit + + +start() { + /usr/bin/cpulimit.sh start & +} + +stop() { + killall -9 cpulimit +} + diff --git a/PATCH/duplicate/luci-app-cpulimit/root/etc/uci-defaults/luci-app-cpulimit b/PATCH/duplicate/luci-app-cpulimit/root/etc/uci-defaults/luci-app-cpulimit new file mode 100644 index 000000000..7e6637487 --- /dev/null +++ b/PATCH/duplicate/luci-app-cpulimit/root/etc/uci-defaults/luci-app-cpulimit @@ -0,0 +1,13 @@ +#!/bin/sh + +uci -q batch <<-EOF >/dev/null + delete ucitrack.@cpulimit[-1] + add ucitrack cpulimit + set ucitrack.@cpulimit[-1].init=cpulimit + commit ucitrack +EOF + +/etc/init.d/cpulimit enable + +rm -f /tmp/luci-indexcache +exit 0 diff --git a/PATCH/duplicate/luci-app-cpulimit/root/usr/bin/cpulimit.sh b/PATCH/duplicate/luci-app-cpulimit/root/usr/bin/cpulimit.sh new file mode 100644 index 000000000..76c88df34 --- /dev/null +++ b/PATCH/duplicate/luci-app-cpulimit/root/usr/bin/cpulimit.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +. /lib/functions.sh + +cpulimit_get(){ + echo cpulimit_get + config_get enabled $1 enabled + [ $enabled -gt 0 ] || return 1 + config_get limit $1 limit + config_get exename $1 exename + eval exepid=$(pgrep $exename) + cpulimit -l $limit -p $exepid & + echo cpulimit -l $limit -p $exepid +} + + + +stop() { +killall -9 cpulimit +# ps -a|grep cpulimit|while read line +# do +# killall cpulimit>/dev/null 2>&1 +# done +} + +case "$1" in + "start") + echo start + killall -9 cpulimit + config_load cpulimit + config_foreach cpulimit_get list + echo end + exit 0 +;; + "stop")echo stop; killall -9 cpulimit;; +esac diff --git a/PATCH/duplicate/luci-app-cpulimit/root/usr/share/rpcd/acl.d/luci-app-cpulimit.json b/PATCH/duplicate/luci-app-cpulimit/root/usr/share/rpcd/acl.d/luci-app-cpulimit.json new file mode 100644 index 000000000..84fa30435 --- /dev/null +++ b/PATCH/duplicate/luci-app-cpulimit/root/usr/share/rpcd/acl.d/luci-app-cpulimit.json @@ -0,0 +1,11 @@ +{ + "luci-app-cpulimit": { + "description": "Grant UCI access for luci-app-cpulimit", + "read": { + "uci": [ "cpulimit" ] + }, + "write": { + "uci": [ "cpulimit" ] + } + } +} diff --git a/PATCH/duplicate/shortcut-fe b/PATCH/duplicate/shortcut-fe new file mode 100644 index 000000000..83f628bc5 --- /dev/null +++ b/PATCH/duplicate/shortcut-fe @@ -0,0 +1,52 @@ +#!/bin/sh /etc/rc.common +# +# Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. +# Permission to use, copy, modify, and/or distribute this software for +# any purpose with or without fee is hereby granted, provided that the +# above copyright notice and this permission notice appear in all copies. +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +#SFE connection manager has a lower priority, it should be started after other connection manager +#to detect the existence of connection manager with higher priority +START=90 + +have_cm() { + [ -d "/sys/kernel/debug/ecm" ] && echo 1 && return + + echo 0 +} + +#load shortcut-fe connection manager +load_sfe_cm() { + local kernel_version=$(uname -r) + + #shortcut-fe-drv.ko is not needed because other connection manager is not enabled + [ -d "/sys/module/shortcut_fe_drv" ] && rmmod shortcut_fe_drv + + [ -e "/lib/modules/$kernel_version/fast-classifier.ko" ] && { + [ -d /sys/module/fast_classifier ] || insmod /lib/modules/$kernel_version/fast-classifier.ko && return + } + + [ -e "/lib/modules/$kernel_version/shortcut-fe-cm.ko" ] && { + [ -d /sys/module/shortcut_fe_cm ] || insmod /lib/modules/$kernel_version/shortcut-fe-cm.ko && return + } +} + +start() { + [ "$(have_cm)" = "1" ] || load_sfe_cm + echo 1 > /sys/fast_classifier/skip_to_bridge_ingress + sfe_ipv6=$(cat /sys/sfe_ipv6/debug_dev) + [ ! -f /dev/sfe_ipv6 ] && mknod /dev/sfe_ipv6 c $sfe_ipv6 0 +} + +stop() { + [ -d /sys/module/shortcut_fe_cm ] && rmmod shortcut_fe_cm + [ -d /sys/module/fast_classifier ] && rmmod fast_classifier +} diff --git a/PATCH/new/main/0001-dmc-rk3328.patch b/PATCH/new/main/0001-dmc-rk3328.patch new file mode 100644 index 000000000..b678f655f --- /dev/null +++ b/PATCH/new/main/0001-dmc-rk3328.patch @@ -0,0 +1,88 @@ +From 7a811c035ed752cad2a6705fe2391a7312bc8834 Mon Sep 17 00:00:00 2001 +This is free software, licensed under the GNU General Public License v3 +From: Immortalwrt +Repatch From: Nicholas Sun +Date: Sun, 14 Mar 2021 04:34:10 +1100 +Subject: [PATCH] DMC for Nanopi R2S + +--- + package/boot/uboot-rockchip/Makefile | 14 +- + target/linux/rockchip/image/Makefile | 14 + + target/linux/rockchip/image/armv8.mk | 2 +- + 3 files changed, 30 insertions(+), 4 deletions(-) + +diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile +index 393e8c3..cbd9d7d 100644 +--- a/package/boot/uboot-rockchip/Makefile ++++ b/package/boot/uboot-rockchip/Makefile +@@ -29,9 +29,10 @@ define U-Boot/nanopi-r2s-rk3328 + NAME:=NanoPi R2S + BUILD_DEVICES:= \ + friendlyarm_nanopi-r2s +- DEPENDS:=+PACKAGE_u-boot-nanopi-r2s-rk3328:arm-trusted-firmware-rockchip +- PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip +- ATF:=rk3328_bl31.elf ++ DEPENDS:=+PACKAGE_u-boot-nanopi-r2s-rk3328:arm-trusted-firmware-rk3328 ++ PKG_BUILD_DEPENDS:=arm-trusted-firmware-rk3328 ++ ATF:=rk322xh_bl31_v1.44.elf ++ USE_RKBIN:=1 + OF_PLATDATA:=$(1) + endef + +@@ -85,8 +86,15 @@ endef + + define Build/InstallDev + $(INSTALL_DIR) $(STAGING_DIR_IMAGE) ++ifneq ($(USE_RKBIN),) ++ $(STAGING_DIR_IMAGE)/loaderimage --pack --uboot $(PKG_BUILD_DIR)/u-boot-dtb.bin $(PKG_BUILD_DIR)/uboot.img 0x200000 ++ $(CP) $(PKG_BUILD_DIR)/uboot.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-uboot.img ++ $(CP) $(STAGING_DIR_IMAGE)/idbloader.bin $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-idbloader.bin ++ $(CP) $(STAGING_DIR_IMAGE)/trust.bin $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-trust.bin ++else + $(CP) $(PKG_BUILD_DIR)/idbloader.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-idbloader.img + $(CP) $(PKG_BUILD_DIR)/u-boot.itb $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-u-boot.itb ++endif + endef + + define Package/u-boot/install/default +diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile +index f5fdff6..3741bee 100644 +--- a/target/linux/rockchip/image/Makefile ++++ b/target/linux/rockchip/image/Makefile +@@ -45,6 +45,20 @@ define Build/pine64-img + dd if="$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-u-boot.itb of="$@" seek=16384 conv=notrunc + endef + ++define Build/pine64-bin ++ # This is a copy of pine64-img, but uses rockchip ddrloader ++ ++ $(SCRIPT_DIR)/gen_image_generic.sh \ ++ $@ \ ++ $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \ ++ $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \ ++ 32768 ++ ++ dd if="$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-idbloader.bin of="$@" seek=64 conv=notrunc ++ dd if="$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-uboot.img of="$@" seek=16384 conv=notrunc ++ dd if="$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-trust.bin of="$@" seek=24576 conv=notrunc ++endef ++ + ### Devices ### + define Device/Default + PROFILES := Default +diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk +index 24b1c38..04a9aa8 100644 +--- a/target/linux/rockchip/image/armv8.mk ++++ b/target/linux/rockchip/image/armv8.mk +@@ -7,7 +7,7 @@ define Device/friendlyarm_nanopi-r2s + DEVICE_MODEL := NanoPi R2S + SOC := rk3328 + UBOOT_DEVICE_NAME := nanopi-r2s-rk3328 +- IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-img | gzip | append-metadata ++ IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata + DEVICE_PACKAGES := kmod-usb-net-rtl8152 + endef + TARGET_DEVICES += friendlyarm_nanopi-r2s +-- +2.30.1 + diff --git a/PATCH/new/main/0002-IRQ-and-disable-eth0-tcp-udp-offloading-tx-rx.patch b/PATCH/new/main/0002-IRQ-and-disable-eth0-tcp-udp-offloading-tx-rx.patch new file mode 100644 index 000000000..255519fb7 --- /dev/null +++ b/PATCH/new/main/0002-IRQ-and-disable-eth0-tcp-udp-offloading-tx-rx.patch @@ -0,0 +1,25 @@ +From: QiuSimons <45143996+QiuSimons@users.noreply.github.com> +Repatch From: Nicholas Sun +Date: Sun, 7 Mar 2021 21:06:48 +1100 +Subject: [PATCH] IRQ and disable eth0 tcp/udp offloading tx/rx + +--- + .../armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity +index 9e4a4cf..db3b258 100644 +--- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity ++++ b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity +@@ -25,6 +25,9 @@ + friendlyarm,nanopi-r2s) + set_interface_core 2 "eth0" + set_interface_core 4 "eth1" "xhci-hcd:usb3" ++ set_interface_core 1 "ff150000" "ff150000.i2c" ++ set_interface_core 8 "ff160000" "ff160000.i2c" ++ ethtool -K eth0 rx off tx off && logger -t disable-offloading "disabed rk3328 ethernet tcp/udp offloading tx/rx" + ;; + friendlyarm,nanopi-r4s) + set_interface_core 10 "eth0" +-- +2.30.1 diff --git a/PATCH/new/main/213-RK3399-set-critical-CPU-temperature-for-thermal-throttling.patch b/PATCH/new/main/213-RK3399-set-critical-CPU-temperature-for-thermal-throttling.patch new file mode 100644 index 000000000..dca0a5d82 --- /dev/null +++ b/PATCH/new/main/213-RK3399-set-critical-CPU-temperature-for-thermal-throttling.patch @@ -0,0 +1,37 @@ +From bf6d9dcfc6c239c6be91385758d9c8332c7d8ac4 Mon Sep 17 00:00:00 2001 +From: QiuSimons <45143996+QiuSimons@users.noreply.github.com> +Date: Fri, 5 Feb 2021 16:46:34 +0800 +Subject: [PATCH] rk3399: reset thermal throttling temp + +--- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +index 2551b238b97c6..a53ff24d92bad 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +@@ -772,12 +772,12 @@ + + trips { + cpu_alert0: cpu_alert0 { +- temperature = <70000>; ++ temperature = <80000>; + hysteresis = <2000>; + type = "passive"; + }; + cpu_alert1: cpu_alert1 { +- temperature = <75000>; ++ temperature = <85000>; + hysteresis = <2000>; + type = "passive"; + }; +@@ -816,7 +816,7 @@ + + trips { + gpu_alert0: gpu_alert0 { +- temperature = <75000>; ++ temperature = <80000>; + hysteresis = <2000>; + type = "passive"; + }; diff --git a/PATCH/new/main/991-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch b/PATCH/new/main/991-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch new file mode 100644 index 000000000..75fda5ca0 --- /dev/null +++ b/PATCH/new/main/991-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch @@ -0,0 +1,179 @@ +From 04202df5cb497b1934c95211cf43784ef62245a4 Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Sat, 19 Dec 2020 12:42:27 +0000 +Subject: [PATCH] rockchip: rk3399: overclock to 2.2/1.8 GHz for NanoPi4 devices + +It's stable enough to overclock cpu frequency to 2.2/1.8 GHz, +and for better performance. + +Signed-off-by: Tianling Shen +Co-authored-by: gzelvis +--- + .../boot/dts/rockchip/rk3399-nanopi4-opp.dtsi | 149 ++++++++++++++++++ + .../boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +- + 2 files changed, 150 insertions(+), 1 deletion(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi4-opp.dtsi + +--- /dev/null ++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-opp.dtsi +@@ -0,0 +1,149 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd ++ */ ++ ++/ { ++ cluster0_opp: opp-table0 { ++ compatible = "operating-points-v2"; ++ opp-shared; ++ ++ opp00 { ++ opp-hz = /bits/ 64 <408000000>; ++ opp-microvolt = <800000>; ++ clock-latency-ns = <40000>; ++ }; ++ opp01 { ++ opp-hz = /bits/ 64 <600000000>; ++ opp-microvolt = <800000>; ++ }; ++ opp02 { ++ opp-hz = /bits/ 64 <816000000>; ++ opp-microvolt = <850000>; ++ }; ++ opp03 { ++ opp-hz = /bits/ 64 <1008000000>; ++ opp-microvolt = <925000>; ++ }; ++ opp04 { ++ opp-hz = /bits/ 64 <1200000000>; ++ opp-microvolt = <1000000>; ++ }; ++ opp05 { ++ opp-hz = /bits/ 64 <1416000000>; ++ opp-microvolt = <1125000>; ++ }; ++ opp06 { ++ opp-hz = /bits/ 64 <1608000000>; ++ opp-microvolt = <1225000>; ++ }; ++ opp07 { ++ opp-hz = /bits/ 64 <1800000000>; ++ opp-microvolt = <1275000>; ++ }; ++ }; ++ ++ cluster1_opp: opp-table1 { ++ compatible = "operating-points-v2"; ++ opp-shared; ++ ++ opp00 { ++ opp-hz = /bits/ 64 <408000000>; ++ opp-microvolt = <800000>; ++ clock-latency-ns = <40000>; ++ }; ++ opp01 { ++ opp-hz = /bits/ 64 <600000000>; ++ opp-microvolt = <800000>; ++ }; ++ opp02 { ++ opp-hz = /bits/ 64 <816000000>; ++ opp-microvolt = <825000>; ++ }; ++ opp03 { ++ opp-hz = /bits/ 64 <1008000000>; ++ opp-microvolt = <875000>; ++ }; ++ opp04 { ++ opp-hz = /bits/ 64 <1200000000>; ++ opp-microvolt = <950000>; ++ }; ++ opp05 { ++ opp-hz = /bits/ 64 <1416000000>; ++ opp-microvolt = <1025000>; ++ }; ++ opp06 { ++ opp-hz = /bits/ 64 <1608000000>; ++ opp-microvolt = <1100000>; ++ }; ++ opp07 { ++ opp-hz = /bits/ 64 <1800000000>; ++ opp-microvolt = <1200000>; ++ }; ++ opp08 { ++ opp-hz = /bits/ 64 <2016000000>; ++ opp-microvolt = <1250000>; ++ }; ++ opp09 { ++ opp-hz = /bits/ 64 <2208000000>; ++ opp-microvolt = <1325000>; ++ }; ++ }; ++ ++ gpu_opp_table: opp-table2 { ++ compatible = "operating-points-v2"; ++ ++ opp00 { ++ opp-hz = /bits/ 64 <200000000>; ++ opp-microvolt = <800000>; ++ }; ++ opp01 { ++ opp-hz = /bits/ 64 <297000000>; ++ opp-microvolt = <800000>; ++ }; ++ opp02 { ++ opp-hz = /bits/ 64 <400000000>; ++ opp-microvolt = <825000>; ++ }; ++ opp03 { ++ opp-hz = /bits/ 64 <500000000>; ++ opp-microvolt = <875000>; ++ }; ++ opp04 { ++ opp-hz = /bits/ 64 <600000000>; ++ opp-microvolt = <925000>; ++ }; ++ opp05 { ++ opp-hz = /bits/ 64 <800000000>; ++ opp-microvolt = <1100000>; ++ }; ++ }; ++}; ++ ++&cpu_l0 { ++ operating-points-v2 = <&cluster0_opp>; ++}; ++ ++&cpu_l1 { ++ operating-points-v2 = <&cluster0_opp>; ++}; ++ ++&cpu_l2 { ++ operating-points-v2 = <&cluster0_opp>; ++}; ++ ++&cpu_l3 { ++ operating-points-v2 = <&cluster0_opp>; ++}; ++ ++&cpu_b0 { ++ operating-points-v2 = <&cluster1_opp>; ++}; ++ ++&cpu_b1 { ++ operating-points-v2 = <&cluster1_opp>; ++}; ++ ++&gpu { ++ operating-points-v2 = <&gpu_opp_table>; ++}; +--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi +@@ -14,7 +14,7 @@ + /dts-v1/; + #include + #include "rk3399.dtsi" +-#include "rk3399-opp.dtsi" ++#include "rk3399-nanopi4-opp.dtsi" + + / { + chosen { diff --git a/PATCH/new/main/998-rockchip-enable-i2c0-on-NanoPi-R2S.patch b/PATCH/new/main/998-rockchip-enable-i2c0-on-NanoPi-R2S.patch new file mode 100644 index 000000000..606d73dd9 --- /dev/null +++ b/PATCH/new/main/998-rockchip-enable-i2c0-on-NanoPi-R2S.patch @@ -0,0 +1,15 @@ +From: QiuSimons +diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +@@ -226,6 +226,10 @@ + }; + }; + ++&i2c0 { ++ status = "okay"; ++}; ++ + &io_domains { + status = "okay"; + diff --git a/PATCH/new/main/r8168-fix_LAN_led-for_r4s-from_TL.patch b/PATCH/new/main/r8168-fix_LAN_led-for_r4s-from_TL.patch new file mode 100644 index 000000000..29bbf1cb2 --- /dev/null +++ b/PATCH/new/main/r8168-fix_LAN_led-for_r4s-from_TL.patch @@ -0,0 +1,12 @@ +diff --git a/package/new/r8168/src/r8168_n.c b/package/new/r8168/src/r8168_n.c +index 0cf2053a9f..ef904dc374 100644 +--- a/package/new/r8168/src/r8168_n.c ++++ b/package/new/r8168/src/r8168_n.c +@@ -24441,6 +24441,7 @@ rtl8168_init_software_variable(struct net_device *dev) + tp->NotWrMcuPatchCode = TRUE; + } + ++ RTL_W16(tp, CustomLED, 0x870); + tp->NicCustLedValue = RTL_R16(tp, CustomLED); + + rtl8168_get_hw_wol(dev); diff --git a/PATCH/new/package/100-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch b/PATCH/new/package/100-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch new file mode 100644 index 000000000..22e5b9793 --- /dev/null +++ b/PATCH/new/package/100-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch @@ -0,0 +1,401 @@ +From dfb6015ca79a9fee28f7fcb0af7e350a83574b83 Mon Sep 17 00:00:00 2001 +From: "Markku-Juhani O. Saarinen" +Date: Mon, 20 Nov 2017 14:58:41 +0000 +Subject: Implements AES and GCM with ARMv8 Crypto Extensions + +A compact patch that provides AES and GCM implementations that utilize the +ARMv8 Crypto Extensions. The config flag is MBEDTLS_ARMV8CE_AES_C, which +is disabled by default as we don't do runtime checking for the feature. +The new implementation lives in armv8ce_aes.c. + +Provides similar functionality to https://github.com/ARMmbed/mbedtls/pull/432 +Thanks to Barry O'Rourke and others for that contribtion. + +Tested on a Cortex A53 device and QEMU. On a midrange phone the real AES-GCM +throughput increases about 4x, while raw AES speed is up to 10x faster. + +When cross-compiling, you want to set something like: + + export CC='aarch64-linux-gnu-gcc' + export CFLAGS='-Ofast -march=armv8-a+crypto' + scripts/config.pl set MBEDTLS_ARMV8CE_AES_C + +QEMU seems to also need + + export LDFLAGS='-static' + +Then run normal make or cmake etc. +--- + +diff -ruNa --binary a/ChangeLog.d/armv8_crypto_extensions.txt b/ChangeLog.d/armv8_crypto_extensions.txt +--- a/ChangeLog.d/armv8_crypto_extensions.txt 1970-01-01 08:00:00.000000000 +0800 ++++ b/ChangeLog.d/armv8_crypto_extensions.txt 2021-03-07 15:07:17.781911791 +0800 +@@ -0,0 +1,2 @@ ++Features ++ * Support ARMv8 Cryptography Extensions for AES and GCM. +diff -ruNa --binary a/include/mbedtls/armv8ce_aes.h b/include/mbedtls/armv8ce_aes.h +--- a/include/mbedtls/armv8ce_aes.h 1970-01-01 08:00:00.000000000 +0800 ++++ b/include/mbedtls/armv8ce_aes.h 2021-03-07 15:07:17.781911791 +0800 +@@ -0,0 +1,63 @@ ++/** ++ * \file armv8ce_aes.h ++ * ++ * \brief ARMv8 Cryptography Extensions -- Optimized code for AES and GCM ++ */ ++ ++/* ++ * ++ * Copyright (C) 2006-2017, ARM Limited, All Rights Reserved ++ * SPDX-License-Identifier: Apache-2.0 ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); you may ++ * not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT ++ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ * ++ * This file is part of mbed TLS (https://tls.mbed.org) ++ */ ++ ++#ifndef MBEDTLS_ARMV8CE_AES_H ++#define MBEDTLS_ARMV8CE_AES_H ++ ++#include "aes.h" ++ ++/** ++ * \brief [ARMv8 Crypto Extensions] AES-ECB block en(de)cryption ++ * ++ * \param ctx AES context ++ * \param mode MBEDTLS_AES_ENCRYPT or MBEDTLS_AES_DECRYPT ++ * \param input 16-byte input block ++ * \param output 16-byte output block ++ * ++ * \return 0 on success (cannot fail) ++ */ ++ ++int mbedtls_armv8ce_aes_crypt_ecb( mbedtls_aes_context *ctx, ++ int mode, ++ const unsigned char input[16], ++ unsigned char output[16] ); ++ ++/** ++ * \brief [ARMv8 Crypto Extensions] Multiply in GF(2^128) for GCM ++ * ++ * \param c Result ++ * \param a First operand ++ * \param b Second operand ++ * ++ * \note Both operands and result are bit strings interpreted as ++ * elements of GF(2^128) as per the GCM spec. ++ */ ++ ++void mbedtls_armv8ce_gcm_mult( unsigned char c[16], ++ const unsigned char a[16], ++ const unsigned char b[16] ); ++ ++#endif /* MBEDTLS_ARMV8CE_AES_H */ +diff -ruNa --binary a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h +--- a/include/mbedtls/check_config.h 2020-12-10 20:54:15.000000000 +0800 ++++ b/include/mbedtls/check_config.h 2021-03-07 15:06:45.625543309 +0800 +@@ -95,6 +95,10 @@ + #error "MBEDTLS_AESNI_C defined, but not all prerequisites" + #endif + ++#if defined(MBEDTLS_ARMV8CE_AES_C) && !defined(MBEDTLS_HAVE_ASM) ++#error "MBEDTLS_ARMV8CE_AES_C defined, but not all prerequisites" ++#endif ++ + #if defined(MBEDTLS_CTR_DRBG_C) && !defined(MBEDTLS_AES_C) + #error "MBEDTLS_CTR_DRBG_C defined, but not all prerequisites" + #endif +@@ -772,3 +776,4 @@ + typedef int mbedtls_iso_c_forbids_empty_translation_units; + + #endif /* MBEDTLS_CHECK_CONFIG_H */ ++ +diff -ruNa --binary a/include/mbedtls/config.h b/include/mbedtls/config.h +--- a/include/mbedtls/config.h 2020-12-10 20:54:15.000000000 +0800 ++++ b/include/mbedtls/config.h 2021-03-07 15:14:27.957855484 +0800 +@@ -73,6 +73,7 @@ + * Requires support for asm() in compiler. + * + * Used in: ++ * library/armv8ce_aes.c + * library/aria.c + * library/timing.c + * include/mbedtls/bn_mul.h +@@ -1888,6 +1889,21 @@ + #define MBEDTLS_AESNI_C + + /** ++ * \def MBEDTLS_ARMV8CE_AES_C ++ * ++ * Enable ARMv8 Crypto Extensions for AES and GCM ++ * ++ * Module: library/armv8ce_aes.c ++ * Caller: library/aes.c ++ * library/gcm.c ++ * ++ * Requires: MBEDTLS_HAVE_ASM ++ * ++ * This module adds support for Armv8 Cryptography Extensions for AES and GCM. ++ */ ++#define MBEDTLS_ARMV8CE_AES_C ++ ++/** + * \def MBEDTLS_AES_C + * + * Enable the AES block cipher. +diff -ruNa --binary a/library/aes.c b/library/aes.c +--- a/library/aes.c 2020-12-10 20:54:15.000000000 +0800 ++++ b/library/aes.c 2021-03-07 15:06:45.625543309 +0800 +@@ -69,7 +69,9 @@ + #if defined(MBEDTLS_AESNI_C) + #include "mbedtls/aesni.h" + #endif +- ++#if defined(MBEDTLS_ARMV8CE_AES_C) ++#include "mbedtls/armv8ce_aes.h" ++#endif + #if defined(MBEDTLS_SELF_TEST) + #if defined(MBEDTLS_PLATFORM_C) + #include "mbedtls/platform.h" +@@ -1052,6 +1054,11 @@ + return( mbedtls_aesni_crypt_ecb( ctx, mode, input, output ) ); + #endif + ++#if defined(MBEDTLS_ARMV8CE_AES_C) ++ // We don't do runtime checking for ARMv8 Crypto Extensions ++ return mbedtls_armv8ce_aes_crypt_ecb( ctx, mode, input, output ); ++#endif ++ + #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_HAVE_X86) + if( aes_padlock_ace ) + { +diff -ruNa --binary a/library/armv8ce_aes.c b/library/armv8ce_aes.c +--- a/library/armv8ce_aes.c 1970-01-01 08:00:00.000000000 +0800 ++++ b/library/armv8ce_aes.c 2021-03-07 15:07:17.781911791 +0800 +@@ -0,0 +1,142 @@ ++/* ++ * ARMv8 Cryptography Extensions -- Optimized code for AES and GCM ++ * ++ * Copyright (C) 2006-2017, ARM Limited, All Rights Reserved ++ * SPDX-License-Identifier: Apache-2.0 ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); you may ++ * not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT ++ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ * ++ * This file is part of mbed TLS (https://tls.mbed.org) ++ */ ++ ++#if !defined(MBEDTLS_CONFIG_FILE) ++#include "mbedtls/config.h" ++#else ++#include MBEDTLS_CONFIG_FILE ++#endif ++ ++#if defined(MBEDTLS_ARMV8CE_AES_C) ++ ++#include ++#include "mbedtls/armv8ce_aes.h" ++ ++#ifndef asm ++#define asm __asm ++#endif ++ ++/* ++ * [Armv8 Cryptography Extensions] AES-ECB block en(de)cryption ++ */ ++ ++#if defined(MBEDTLS_AES_C) ++ ++int mbedtls_armv8ce_aes_crypt_ecb( mbedtls_aes_context *ctx, ++ int mode, ++ const unsigned char input[16], ++ unsigned char output[16] ) ++{ ++ unsigned int i; ++ const uint8_t *rk; ++ uint8x16_t x, k; ++ ++ x = vld1q_u8( input ); /* input block */ ++ rk = (const uint8_t *) ctx->rk; /* round keys */ ++ ++ if( mode == MBEDTLS_AES_ENCRYPT ) ++ { ++ for( i = ctx->nr - 1; i != 0; i-- ) /* encryption loop */ ++ { ++ k = vld1q_u8( rk ); ++ rk += 16; ++ x = vaeseq_u8( x, k ); ++ x = vaesmcq_u8( x ); ++ } ++ k = vld1q_u8( rk ); ++ rk += 16; ++ x = vaeseq_u8( x, k ); ++ } ++ else ++ { ++ for( i = ctx->nr - 1; i != 0 ; i-- ) /* decryption loop */ ++ { ++ k = vld1q_u8( rk ); ++ rk += 16; ++ x = vaesdq_u8( x, k ); ++ x = vaesimcq_u8( x ); ++ } ++ k = vld1q_u8( rk ); ++ rk += 16; ++ x = vaesdq_u8( x, k ); ++ } ++ ++ k = vld1q_u8( rk ); /* final key just XORed */ ++ x = veorq_u8( x, k ); ++ vst1q_u8( output, x ); /* write out */ ++ ++ return ( 0 ); ++} ++ ++#endif /* MBEDTLS_AES_C */ ++ ++ ++/* ++ * [Armv8 Cryptography Extensions] Multiply in GF(2^128) for GCM ++ */ ++ ++#if defined(MBEDTLS_GCM_C) ++ ++void mbedtls_armv8ce_gcm_mult( unsigned char c[16], ++ const unsigned char a[16], ++ const unsigned char b[16] ) ++{ ++ /* GCM's GF(2^128) polynomial basis is x^128 + x^7 + x^2 + x + 1 */ ++ const uint64x2_t base = { 0, 0x86 }; /* note missing LS bit */ ++ ++ register uint8x16_t vc asm( "v0" ); /* named registers */ ++ register uint8x16_t va asm( "v1" ); /* (to avoid conflict) */ ++ register uint8x16_t vb asm( "v2" ); ++ register uint64x2_t vp asm( "v3" ); ++ ++ va = vld1q_u8( a ); /* load inputs */ ++ vb = vld1q_u8( b ); ++ vp = base; ++ ++ asm ( ++ "rbit %1.16b, %1.16b \n\t" /* reverse bit order */ ++ "rbit %2.16b, %2.16b \n\t" ++ "pmull2 %0.1q, %1.2d, %2.2d \n\t" /* v0 = a.hi * b.hi */ ++ "pmull2 v4.1q, %0.2d, %3.2d \n\t" /* mul v0 by x^64, reduce */ ++ "ext %0.16b, %0.16b, %0.16b, #8 \n\t" ++ "eor %0.16b, %0.16b, v4.16b \n\t" ++ "ext v5.16b, %2.16b, %2.16b, #8 \n\t" /* (swap hi and lo in b) */ ++ "pmull v4.1q, %1.1d, v5.1d \n\t" /* v0 ^= a.lo * b.hi */ ++ "eor %0.16b, %0.16b, v4.16b \n\t" ++ "pmull2 v4.1q, %1.2d, v5.2d \n\t" /* v0 ^= a.hi * b.lo */ ++ "eor %0.16b, %0.16b, v4.16b \n\t" ++ "pmull2 v4.1q, %0.2d, %3.2d \n\t" /* mul v0 by x^64, reduce */ ++ "ext %0.16b, %0.16b, %0.16b, #8 \n\t" ++ "eor %0.16b, %0.16b, v4.16b \n\t" ++ "pmull v4.1q, %1.1d, %2.1d \n\t" /* v0 ^= a.lo * b.lo */ ++ "eor %0.16b, %0.16b, v4.16b \n\t" ++ "rbit %0.16b, %0.16b \n\t" /* reverse bits for output */ ++ : "=w" (vc) /* q0: output */ ++ : "w" (va), "w" (vb), "w" (vp) /* q1, q2: input */ ++ : "v4", "v5" /* q4, q5: clobbered */ ++ ); ++ ++ vst1q_u8( c, vc ); /* write out */ ++} ++ ++#endif /* MBEDTLS_GCM_C */ ++ ++#endif /* MBEDTLS_ARMV8CE_AES_C */ +diff -ruNa --binary a/library/CMakeLists.txt b/library/CMakeLists.txt +--- a/library/CMakeLists.txt 2020-12-10 20:54:15.000000000 +0800 ++++ b/library/CMakeLists.txt 2021-03-07 15:06:45.625543309 +0800 +@@ -7,6 +7,7 @@ + aesni.c + arc4.c + aria.c ++ armv8ce_aes.c + asn1parse.c + asn1write.c + base64.c +diff -ruNa --binary a/library/gcm.c b/library/gcm.c +--- a/library/gcm.c 2020-12-10 20:54:15.000000000 +0800 ++++ b/library/gcm.c 2021-03-07 15:06:45.625543309 +0800 +@@ -71,6 +71,10 @@ + #include "mbedtls/aesni.h" + #endif + ++#if defined(MBEDTLS_ARMV8CE_AES_C) ++#include "mbedtls/armv8ce_aes.h" ++#endif ++ + #if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C) + #include "mbedtls/aes.h" + #include "mbedtls/platform.h" +@@ -140,6 +144,12 @@ + if( ( ret = mbedtls_cipher_update( &ctx->cipher_ctx, h, 16, h, &olen ) ) != 0 ) + return( ret ); + ++#if defined(MBEDTLS_ARMV8CE_AES_C) ++ // we don't do feature testing with ARMv8 cryptography extensions ++ memcpy( ctx ->HL, h, 16 ); // put H at the beginning of buffer ++ return( 0 ); // that's all we need ++#endif ++ + /* pack h as two 64-bits ints, big-endian */ + GET_UINT32_BE( hi, h, 0 ); + GET_UINT32_BE( lo, h, 4 ); +@@ -248,6 +258,11 @@ + unsigned char lo, hi, rem; + uint64_t zh, zl; + ++#if defined(MBEDTLS_ARMV8CE_AES_C) ++ mbedtls_armv8ce_gcm_mult( output, x, (const unsigned char *) ctx->HL ); ++ return; ++#endif ++ + #if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64) + if( mbedtls_aesni_has_support( MBEDTLS_AESNI_CLMUL ) ) { + unsigned char h[16]; +diff -ruNa --binary a/library/Makefile b/library/Makefile +--- a/library/Makefile 2020-12-10 20:54:15.000000000 +0800 ++++ b/library/Makefile 2021-03-07 15:12:49.277078224 +0800 +@@ -65,6 +65,7 @@ + + OBJS_CRYPTO= aes.o aesni.o arc4.o \ + aria.o asn1parse.o asn1write.o \ ++ armv8ce_aes.o \ + base64.o bignum.o blowfish.o \ + camellia.o ccm.o chacha20.o \ + chachapoly.o cipher.o cipher_wrap.o \ +diff -ruNa --binary a/library/version_features.c b/library/version_features.c +--- a/library/version_features.c 2020-12-10 20:54:15.000000000 +0800 ++++ b/library/version_features.c 2021-03-07 15:06:45.625543309 +0800 +@@ -583,6 +583,9 @@ + #if defined(MBEDTLS_AESNI_C) + "MBEDTLS_AESNI_C", + #endif /* MBEDTLS_AESNI_C */ ++#if defined(MBEDTLS_ARMV8CE_AES_C) ++ "MBEDTLS_ARMV8CE_AES_C", ++#endif /* MBEDTLS_ARMV8CE_AES_C */ + #if defined(MBEDTLS_AES_C) + "MBEDTLS_AES_C", + #endif /* MBEDTLS_AES_C */ + diff --git a/PATCH/new/package/900-add-filter-aaaa-option.patch b/PATCH/new/package/900-add-filter-aaaa-option.patch new file mode 100644 index 000000000..315fa5133 --- /dev/null +++ b/PATCH/new/package/900-add-filter-aaaa-option.patch @@ -0,0 +1,59 @@ +diff -rNEZbwBdu3 a/src/dnsmasq.h b/src/dnsmasq.h +--- a/src/dnsmasq.h 2020-04-09 00:32:53.000000000 +0800 ++++ b/src/dnsmasq.h 2020-06-05 23:03:45.941176855 +0800 +@@ -269,7 +269,8 @@ + #define OPT_IGNORE_CLID 59 + #define OPT_SINGLE_PORT 60 + #define OPT_LEASE_RENEW 61 +-#define OPT_LAST 62 ++#define OPT_FILTER_AAAA 62 ++#define OPT_LAST 63 + + #define OPTION_BITS (sizeof(unsigned int)*8) + #define OPTION_SIZE ( (OPT_LAST/OPTION_BITS)+((OPT_LAST%OPTION_BITS)!=0) ) +diff -rNEZbwBdu3 a/src/option.c b/src/option.c +--- a/src/option.c 2020-04-09 00:32:53.000000000 +0800 ++++ b/src/option.c 2020-06-05 23:06:29.880350271 +0800 +@@ -167,6 +167,7 @@ + #define LOPT_SINGLE_PORT 359 + #define LOPT_SCRIPT_TIME 360 + #define LOPT_PXE_VENDOR 361 ++#define LOPT_FILTER_AAAA 362 + + #ifdef HAVE_GETOPT_LONG + static const struct option opts[] = +@@ -339,6 +340,7 @@ + { "dumpfile", 1, 0, LOPT_DUMPFILE }, + { "dumpmask", 1, 0, LOPT_DUMPMASK }, + { "dhcp-ignore-clid", 0, 0, LOPT_IGNORE_CLID }, ++ { "filter-aaaa", 0, 0, LOPT_FILTER_AAAA }, + { NULL, 0, 0, 0 } + }; + +@@ -518,6 +520,7 @@ + { LOPT_DUMPFILE, ARG_ONE, "", gettext_noop("Path to debug packet dump file"), NULL }, + { LOPT_DUMPMASK, ARG_ONE, "", gettext_noop("Mask which packets to dump"), NULL }, + { LOPT_SCRIPT_TIME, OPT_LEASE_RENEW, NULL, gettext_noop("Call dhcp-script when lease expiry changes."), NULL }, ++ { LOPT_FILTER_AAAA, OPT_FILTER_AAAA, NULL, gettext_noop("Filter all AAAA requests."), NULL }, + { 0, 0, NULL, NULL, NULL } + }; + +diff -rNEZbwBdu3 a/src/rfc1035.c b/src/rfc1035.c +--- a/src/rfc1035.c 2020-04-09 00:32:53.000000000 +0800 ++++ b/src/rfc1035.c 2020-06-05 23:08:46.476106541 +0800 +@@ -1955,6 +1955,15 @@ + } + } + ++ //patch to filter aaaa forwards ++ if (qtype == T_AAAA && option_bool(OPT_FILTER_AAAA) ){ ++ //return a null reply ++ ans = 1; ++ if (!dryrun) log_query(F_CONFIG | F_IPV6 | F_NEG, name, &addr, NULL); ++ break; ++ } ++ //end of patch ++ + if (!ans) + return 0; /* failed to answer a question */ + } diff --git a/PATCH/new/package/dnsmasq-add-filter-aaaa-option.patch b/PATCH/new/package/dnsmasq-add-filter-aaaa-option.patch new file mode 100644 index 000000000..5de320343 --- /dev/null +++ b/PATCH/new/package/dnsmasq-add-filter-aaaa-option.patch @@ -0,0 +1,36 @@ +From 23ddcf0e475059b9111d3f321a1a340cf1b48698 Mon Sep 17 00:00:00 2001 +From: Chuck +Date: Thu, 28 May 2020 22:26:04 -0700 +Subject: [PATCH] dnsmasq: add filter-aaaa option + +Signed-off-by: Chuck +--- + .../network/services/dnsmasq/files/dhcp.conf | 1 + + .../services/dnsmasq/files/dnsmasq.init | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/package/network/services/dnsmasq/files/dhcp.conf b/package/network/services/dnsmasq/files/dhcp.conf +index 360c7d79eee..c9407f5e649 100644 +--- a/package/network/services/dnsmasq/files/dhcp.conf ++++ b/package/network/services/dnsmasq/files/dhcp.conf +@@ -20,7 +20,8 @@ config dnsmasq + #list notinterface lo + #list bogusnxdomain '64.94.110.11' + option localservice 1 # disable to allow DNS requests from non-local subnets ++ option filteraaaa 1 + option ednspacket_max 1232 + + config dhcp lan + option interface lan +diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init +index 06d83b06deb..08ff64d659f 100644 +--- a/package/network/services/dnsmasq/files/dnsmasq.init ++++ b/package/network/services/dnsmasq/files/dnsmasq.init +@@ -865,6 +865,7 @@ dnsmasq_start() + append_bool "$cfg" sequential_ip "--dhcp-sequential-ip" + append_bool "$cfg" allservers "--all-servers" + append_bool "$cfg" noping "--no-ping" ++ append_bool "$cfg" filteraaaa "--filter-aaaa" + append_bool "$cfg" rapidcommit "--dhcp-rapid-commit" + append_bool "$cfg" scriptarp "--script-arp" + diff --git a/PATCH/new/package/luci-add-filter-aaaa-option.patch b/PATCH/new/package/luci-add-filter-aaaa-option.patch new file mode 100644 index 000000000..1dd6e24bd --- /dev/null +++ b/PATCH/new/package/luci-add-filter-aaaa-option.patch @@ -0,0 +1,26 @@ +From d5714003b9ba288b45e6866472315a99230292f5 Mon Sep 17 00:00:00 2001 +From: Chuck +Date: Wed, 3 Jun 2020 16:37:41 +0800 +Subject: [PATCH] dnsmasq: add filter-aaaa option + +Signed-off-by: Chuck +--- + .../feeds/luci/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/feeds/luci/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/feeds/luci/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +index 6693dc0eac..1c8f943758 100644 +--- a/feeds/luci/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js ++++ b/feeds/luci/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +@@ -199,6 +199,11 @@ return view.extend({ + s.taboption('files', form.DynamicList, 'addnhosts', + _('Additional Hosts files')).optional = true; + ++ o = s.taboption('advanced', form.Flag, 'filteraaaa', ++ _('Filter IPv6 Records'), ++ _('Filter IPv6(AAAA) Records during DNS resolution')); ++ o.optional = true; ++ + o = s.taboption('advanced', form.Flag, 'quietdhcp', + _('Suppress logging'), + _('Suppress logging of the routine operation of these protocols')); diff --git a/PATCH/new/package/luci-app-firewall_add_fullcone.patch b/PATCH/new/package/luci-app-firewall_add_fullcone.patch new file mode 100644 index 000000000..d529ce68e --- /dev/null +++ b/PATCH/new/package/luci-app-firewall_add_fullcone.patch @@ -0,0 +1,13 @@ +From: QiuSimons +diff --git a/feeds/luci/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/feeds/luci/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js +--- a/feeds/luci/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js ++++ b/feeds/luci/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js +@@ -57,6 +57,8 @@ return view.extend({ + + o = s.option(form.Flag, 'drop_invalid', _('Drop invalid packets')); + ++ o = s.option(form.Flag, 'fullcone', _('Enable FullCone NAT')); ++ + var p = [ + s.option(form.ListValue, 'input', _('Input')), + s.option(form.ListValue, 'output', _('Output')), diff --git a/PATCH/new/package/luci-app-firewall_add_sfe_switch.patch b/PATCH/new/package/luci-app-firewall_add_sfe_switch.patch new file mode 100644 index 000000000..c439ff7c8 --- /dev/null +++ b/PATCH/new/package/luci-app-firewall_add_sfe_switch.patch @@ -0,0 +1,98 @@ +From: QiuSimons +diff --git a/feeds/luci/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/feeds/luci/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js +--- a/feeds/luci/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js ++++ b/feeds/luci/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js +@@ -7,6 +7,58 @@ + 'require firewall'; + 'require tools.firewall as fwtool'; + 'require tools.widgets as widgets'; ++var callInitList, callInitAction, sfe; ++ ++callInitList = rpc.declare({ ++ object: 'luci', ++ method: 'getInitList', ++ params: ['name'], ++ expect: { ++ '': {} ++ }, ++ filter: function (res) { ++ for (var k in res) ++ return +res[k].enabled; ++ return null; ++ } ++}); ++callInitAction = rpc.declare({ ++ object: 'luci', ++ method: 'setInitAction', ++ params: ['name', 'action'], ++ expect: { ++ result: false ++ } ++}); ++sfe = form.DummyValue.extend({ ++ renderWidget: function (section_id, option_id, cfgvalue) { ++ return E([], [this.sfe_support ? E('button', { ++ 'class': 'cbi-button cbi-button-save', ++ 'click': function () { ++ this.disabled = true; ++ this.blur(); ++ this.classList.add('spinning'); ++ callInitAction('shortcut-fe', 'stop'); ++ callInitAction('shortcut-fe', 'disable').then(L.bind(function () { ++ this.classList.remove('spinning'); ++ location.reload(); ++ }, this)); ++ } ++ }, _('Enabled')) : E('button', { ++ 'class': 'cbi-button cbi-button-reset', ++ 'click': function () { ++ this.disabled = true; ++ this.blur(); ++ this.classList.add('spinning'); ++ callInitAction('shortcut-fe', 'start'); ++ callInitAction('shortcut-fe', 'enable').then(L.bind(function () { ++ this.classList.remove('spinning'); ++ location.reload(); ++ }, this)); ++ } ++ }, _('Disabled'))]); ++ }, ++}); + + return view.extend({ + callConntrackHelpers: rpc.declare({ +@@ -18,7 +70,8 @@ + load: function() { + return Promise.all([ + this.callConntrackHelpers(), +- firewall.getDefaults() ++ firewall.getDefaults(), ++ callInitList('shortcut-fe') + ]); + }, + +@@ -32,6 +85,7 @@ + renderZones: function(data) { + var ctHelpers = data[0], + fwDefaults = data[1], ++ sfe_support = data[2], + m, s, o, inp, out; + + m = new form.Map('firewall', _('Firewall - Zone Settings'), +@@ -58,6 +112,16 @@ + + /* Netfilter flow offload support */ + ++ s = m.section(form.TypedSection, 'defaults', _('Routing/NAT Offloading'), _('Experimental feature. Not fully compatible with QoS/SQM.')); ++ s.anonymous = true; ++ s.addremove = false; ++ o = s.option(sfe, _('SFE flow offloading'), ++ _('SFE flow offloading'), _('SFE based offloading for Routing/NAT. Restart recommended.')); ++ o.sfe_support = sfe_support; ++ o.load = function (section_id) { ++ return (uci.get('system', 'shortcut-fe', 'enabled') != 0) ? '1' : '0'; ++ }; ++ + if (L.hasSystemFeature('offloading')) { + s = m.section(form.TypedSection, 'defaults', _('Routing/NAT Offloading'), + _('Experimental feature. Not fully compatible with QoS/SQM.')); diff --git a/PATCH/new/package/use_json_object_new_int64.patch b/PATCH/new/package/use_json_object_new_int64.patch new file mode 100644 index 000000000..ea8441437 --- /dev/null +++ b/PATCH/new/package/use_json_object_new_int64.patch @@ -0,0 +1,31 @@ +From f0972c84d9ed457ba9b430792c4809bc6207399a Mon Sep 17 00:00:00 2001 +From: lisaac +Date: Fri, 27 Mar 2020 07:19:17 +0000 +Subject: [PATCH] luci-lib-jsonc: stringify int use json_object_new_int64 + instead + +--- + feeds/luci/libs/luci-lib-jsonc/src/jsonc.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/feeds/luci/libs/luci-lib-jsonc/src/jsonc.c b/feeds/luci/libs/luci-lib-jsonc/src/jsonc.c +index 2f56a4a688..1ccfda8765 100644 +--- a/feeds/luci/libs/luci-lib-jsonc/src/jsonc.c ++++ b/feeds/luci/libs/luci-lib-jsonc/src/jsonc.c +@@ -365,12 +365,11 @@ static struct json_object * _lua_to_json_rec(lua_State *L, int index, + + case LUA_TNUMBER: + nd = lua_tonumber(L, index); +- ni = lua_tointeger(L, index); + +- if (nd == ni) +- return json_object_new_int(nd); +- +- return json_object_new_double(nd); ++ if(nd >= INT64_MIN && nd <= INT64_MAX) ++ return json_object_new_int64(nd); ++ else ++ return json_object_new_double(nd); + + case LUA_TSTRING: + return json_object_new_string(lua_tostring(L, index)); diff --git a/PATCH/new/script/chinadnslist b/PATCH/new/script/chinadnslist new file mode 100644 index 000000000..2d255feab --- /dev/null +++ b/PATCH/new/script/chinadnslist @@ -0,0 +1,13 @@ +#!/bin/bash -e +set -o pipefail +rm -rf /tmp/chinadns-ng +mkdir /tmp/chinadns-ng +wget https://raw.githubusercontent.com/pexcn/daily/gh-pages/chnroute/chnroute.txt -nv -O /tmp/chinadns-ng/chnroute.txt +wget https://raw.githubusercontent.com/pexcn/daily/gh-pages/chnroute/chnroute-v6.txt -nv -O /tmp/chinadns-ng/chnroute6.txt +wget https://raw.githubusercontent.com/pexcn/daily/gh-pages/gfwlist/gfwlist.txt -nv -O /tmp/chinadns-ng/gfwlist.txt +wget https://raw.githubusercontent.com/pexcn/daily/gh-pages/chinalist/chinalist.txt -nv -O /tmp/chinadns-ng/chinalist.txt +find /tmp/chinadns-ng/ -size -20k -exec rm {} \; +chmod -R 755 /tmp/chinadns-ng +cp -rf /tmp/chinadns-ng/** /etc/chinadns-ng +#wget -P /tmp "https://raw.githubusercontent.com/QiuSimons/Others/master/blacklist-ip.conf" && cat /tmp/blacklist-ip.conf >> "/etc/smartdns/blacklist-ip.conf" && cat "/etc/smartdns/blacklist-ip.conf" | sort | uniq > /tmp/tmp_blacklist-ip.conf && cat /tmp/tmp_blacklist-ip.conf > "/etc/smartdns/blacklist-ip.conf" +exit 0 diff --git a/PATCH/new/script/fuck b/PATCH/new/script/fuck new file mode 100644 index 000000000..d835246ed --- /dev/null +++ b/PATCH/new/script/fuck @@ -0,0 +1,14 @@ +#!/bin/sh +# From QiuSimons + +cd /overlay +rm -rf `ls | egrep -v '(upper|.fs_state)'` +cd /overlay/upper +rm -rf `ls | egrep -v '(etc|usr)'` +cd /overlay/upper/usr +rm -rf `ls | egrep -v '(share)'` +cd /overlay/upper/usr/share +rm -rf `ls | egrep -v '(unblockneteasemusic|passwall)'` +cd /overlay/upper/etc +rm -rf `ls | egrep -v '(config|smartdns|ssr|ssrplus|bench.log|shadow|chinadns-ng|openclash|dnsmasq.ssr|dnsmasq.oversea|ssr_ip|china_ssr.txt)'` +sleep 5 && touch /etc/banner && reboot diff --git a/PATCH/new/script/move_2_services.sh b/PATCH/new/script/move_2_services.sh new file mode 100644 index 000000000..a6ca37752 --- /dev/null +++ b/PATCH/new/script/move_2_services.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# From: QiuSimons + +lua_file="$({ find |grep "\.lua"; } 2>"/dev/null")" +for a in ${lua_file} +do + [ -n "$(grep '"vpn"' "$a")" ] && sed -i 's,"vpn","services",g' "$a" + [ -n "$(grep '"VPN"' "$a")" ] && sed -i 's,"VPN","services",g' "$a" + [ -n "$(grep '\[\[vpn\]\]' "$a")" ] && sed -i 's,\[\[vpn\]\],\[\[services\]\],g' "$a" + [ -n "$(grep 'admin/vpn' "$a")" ] && sed -i 's,admin/vpn,admin/services,g' "$a" +done + +htm_file="$({ find |grep "\.htm"; } 2>"/dev/null")" +for b in ${htm_file} +do + [ -n "$(grep '"vpn"' "$b")" ] && sed -i 's,"vpn","services",g' "$b" + [ -n "$(grep '"VPN"' "$b")" ] && sed -i 's,"VPN","services",g' "$b" + [ -n "$(grep '\[\[vpn\]\]' "$b")" ] && sed -i 's,\[\[vpn\]\],\[\[services\]\],g' "$b" + [ -n "$(grep 'admin/vpn' "$b")" ] && sed -i 's,admin/vpn,admin/services,g' "$b" +done + diff --git a/README.md b/README.md new file mode 100644 index 000000000..d009cf35e --- /dev/null +++ b/README.md @@ -0,0 +1,57 @@ +

+ +

+

+ +

+

+GitHub All Releases +GitHub +

+

+ + + +

+ + +

请勿用于商业用途!!!

+ + + +### 特性 + +- 基于原生 OpenWrt 21.02 编译,默认管理地址192.168.1.1 +- 同时支持 SFE/Software Offload (选则其一开启,默认开启Software Offload) +- 内置升级功能可用,物理 Reset 按键可用 +- 预配置了部分插件(包括但不限于 DNS 套娃,使用时先将 SSRP 的 DNS 上游提前选成本机5335端口,然后再 ADG 中勾上启用就好*“管理账户root,密码admin”,如果要作用于路由器本身,可以把lan和wan的dns都配置成127.0.0.1,dhcp高级里设置下发dns 6,192.168.1.1。注:这里取决于你设定的路由的ip地址) +- 正式 Release 版本将具有可无脑 opkg kmod 的特性 +- R2S核心频率1.6(交换了LAN WAN),R4S核心频率2.2/1.8(建议使用5v4a电源,死机大多数情况下,都是因为你用的电源过于垃圾,另外,你也可以选择使用自带的app限制最大频率,茄子🍆) +- O3 编译 +- 插件包含:SSRP,PassWall,OpenClash,AdguardHome,微信推送,网易云解锁,SQM,SmartDNS,ChinaDNS,网络唤醒,DDNS,迅雷快鸟,UPNP,FullCone(防火墙中开启,默认开启),流量分载,SFE流量分载,irq优化,京东签到,Zerotier,FRPC,FRPS,无线打印,流量监控,过滤军刀,R2S-OLED +- ss协议在armv8上实现了aes硬件加速(请仅使用aead加密的连接方式) +- 如有任何问题,请先尝试ssh进入后台,输入fuck后回车,等待机器重启后确认问题是否已经解决 + +### 下载 + +- 选择自己设备对应的固件,并[下载](https://github.com/QiuSimons/R2S-R4S-OpenWrt/releases) + +### 截图 + +| 组件 | 流量分载 | +| :----------------------------------------------------------: | :----------------------------------------------------------: | +| ![主页.png](https://raw.githubusercontent.com/QiuSimons/R4S-OpenWrt/master/PIC/app.png) | ![offload.png](https://raw.githubusercontent.com/QiuSimons/R4S-OpenWrt/master/PIC/offload.png) | + +### 鸣谢 + +| [CTCGFW](https://github.com/immortalwrt) | [coolsnowwolf](https://github.com/coolsnowwolf) | [Lienol](https://github.com/Lienol) | +| :----------------------------------------------------------: | :----------------------------------------------------------: | :----------------------------------------------------------: | +| | | | +| [NoTengoBattery](https://github.com/NoTengoBattery) | [tty228](https://github.com/tty228) | [destan19](https://github.com/destan19) | +| | | | +| [jerrykuku](https://github.com/jerrykuku) | [lisaac](https://github.com/lisaac) | [rufengsuixing](https://github.com/rufengsuixing) | +| | | | +| [ElonH](https://github.com/ElonH) | [NateLol](https://github.com/NateLol) | [garypang13](https://github.com/garypang13) | +| | | | +| [AmadeusGhost](https://github.com/AmadeusGhost) | [1715173329](https://github.com/1715173329) | [vernesong](https://github.com/vernesong) | +| | | | diff --git a/SCRIPTS/01_get_ready.sh b/SCRIPTS/01_get_ready.sh new file mode 100644 index 000000000..f818b5773 --- /dev/null +++ b/SCRIPTS/01_get_ready.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +<<'COMMENT' +latest_release="$(curl -s https://github.com/openwrt/openwrt/releases |grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" |sed -n '/21/p' |sed -n 1p)" +curl -LO "https://github.com/openwrt/openwrt/archive/${latest_release}" +mkdir openwrt_back +shopt -s extglob +tar zxvf ${latest_release} --strip-components 1 -C ./openwrt_back +rm -f ${latest_release} +git clone --single-branch -b openwrt-21.02 https://github.com/openwrt/openwrt openwrt_new +rm -f ./openwrt_new/include/version.mk +rm -f ./openwrt_new/include/kernel-version.mk +rm -f ./openwrt_new/package/base-files/image-config.in +rm -rf ./openwrt_new/target/linux/* +cp -f ./openwrt_back/include/version.mk ./openwrt_new/include/version.mk +cp -f ./openwrt_back/include/kernel-version.mk ./openwrt_new/include/kernel-version.mk +cp -f ./openwrt_back/package/base-files/image-config.in ./openwrt_new/package/base-files/image-config.in +cp -rf ./openwrt_back/target/linux/* ./openwrt_new/target/linux/ +mkdir openwrt +cp -rf ./openwrt_new/* ./openwrt/ +COMMENT + +# 获取源代码 +git clone --single-branch -b openwrt-21.02 https://github.com/openwrt/openwrt openwrt +git clone -b main --depth 1 https://github.com/Lienol/openwrt.git openwrt-lienol +git clone -b main --depth 1 https://github.com/Lienol/openwrt-packages packages-lienol +git clone -b main --depth 1 https://github.com/Lienol/openwrt-luci luci-lienol +git clone -b linksys-ea6350v3-mastertrack --depth 1 https://github.com/NoTengoBattery/openwrt NoTengoBattery + +exit 0 diff --git a/SCRIPTS/02_prepare_package.sh b/SCRIPTS/02_prepare_package.sh new file mode 100644 index 000000000..6e50a3443 --- /dev/null +++ b/SCRIPTS/02_prepare_package.sh @@ -0,0 +1,297 @@ +#!/bin/bash +clear + +### 基础部分 ### +# 使用 O3 级别的优化 +sed -i 's/Os/O3/g' include/target.mk +# 更新 Feeds +./scripts/feeds update -a +./scripts/feeds install -a +# 默认开启 Irqbalance +sed -i "s/enabled '0'/enabled '1'/g" feeds/packages/utils/irqbalance/files/irqbalance.config +# 移除 SNAPSHOT 标签 +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 +wget -P scripts/ https://github.com/immortalwrt/immortalwrt/raw/master/scripts/download.pl +wget -P include/ https://github.com/immortalwrt/immortalwrt/raw/master/include/download.mk + +### 必要的 Patches ### +# Patch arm64 型号名称 +wget -P target/linux/generic/pending-5.4 https://github.com/immortalwrt/immortalwrt/raw/master/target/linux/generic/hack-5.4/312-arm64-cpuinfo-Add-model-name-in-proc-cpuinfo-for-64bit-ta.patch +# Patch jsonc +patch -p1 < ../PATCH/new/package/use_json_object_new_int64.patch +# Patch dnsmasq +patch -p1 < ../PATCH/new/package/dnsmasq-add-filter-aaaa-option.patch +patch -p1 < ../PATCH/new/package/luci-add-filter-aaaa-option.patch +cp -f ../PATCH/new/package/900-add-filter-aaaa-option.patch ./package/network/services/dnsmasq/patches/900-add-filter-aaaa-option.patch + +### Fullcone-NAT 部分 ### +# Patch Kernel 以解决 FullCone 冲突 +pushd target/linux/generic/hack-5.4 +wget https://github.com/coolsnowwolf/lede/raw/master/target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch +popd +# Patch FireWall 以增添 FullCone 功能 +mkdir package/network/config/firewall/patches +wget -P package/network/config/firewall/patches/ https://github.com/immortalwrt/immortalwrt/raw/master/package/network/config/firewall/patches/fullconenat.patch +# Patch LuCI 以增添 FullCone 开关 +patch -p1 < ../PATCH/new/package/luci-app-firewall_add_fullcone.patch +# FullCone 相关组件 +cp -rf ../openwrt-lienol/package/network/fullconenat ./package/network/fullconenat + +### Shortcut-FE 部分 ### +# Patch Kernel 以支持 Shortcut-FE +pushd target/linux/generic/hack-5.4 +wget https://github.com/coolsnowwolf/lede/raw/master/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +popd +# Patch LuCI 以增添 Shortcut-FE 开关 +patch -p1 < ../PATCH/new/package/luci-app-firewall_add_sfe_switch.patch +# Shortcut-FE 相关组件 +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/shortcut-fe package/lean/shortcut-fe +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/fast-classifier package/lean/fast-classifier +cp -f ../PATCH/duplicate/shortcut-fe ./package/base-files/files/etc/init.d + +### 获取额外的基础软件包 ### +# AutoCore +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/lean/autocore package/lean/autocore +rm -rf ./feeds/packages/utils/coremark +svn co https://github.com/immortalwrt/packages/trunk/utils/coremark feeds/packages/utils/coremark +# 更换 Nodejs 版本 +rm -rf ./feeds/packages/lang/node +svn co https://github.com/nxhack/openwrt-node-packages/trunk/node feeds/packages/lang/node +rm -rf ./feeds/packages/lang/node-arduino-firmata +svn co https://github.com/nxhack/openwrt-node-packages/trunk/node-arduino-firmata feeds/packages/lang/node-arduino-firmata +rm -rf ./feeds/packages/lang/node-cylon +svn co https://github.com/nxhack/openwrt-node-packages/trunk/node-cylon feeds/packages/lang/node-cylon +rm -rf ./feeds/packages/lang/node-hid +svn co https://github.com/nxhack/openwrt-node-packages/trunk/node-hid feeds/packages/lang/node-hid +rm -rf ./feeds/packages/lang/node-homebridge +svn co https://github.com/nxhack/openwrt-node-packages/trunk/node-homebridge feeds/packages/lang/node-homebridge +rm -rf ./feeds/packages/lang/node-serialport +svn co https://github.com/nxhack/openwrt-node-packages/trunk/node-serialport feeds/packages/lang/node-serialport +rm -rf ./feeds/packages/lang/node-serialport-bindings +svn co https://github.com/nxhack/openwrt-node-packages/trunk/node-serialport-bindings feeds/packages/lang/node-serialport-bindings +rm -rf ./feeds/packages/lang/node-yarn +svn co https://github.com/nxhack/openwrt-node-packages/trunk/node-yarn feeds/packages/lang/node-yarn +ln -sf ../../../feeds/packages/lang/node-yarn ./package/feeds/packages/node-yarn +# R8168驱动 +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/ctcgfw/r8168 package/new/r8168 +patch -p1 < ../PATCH/new/main/r8168-fix_LAN_led-for_r4s-from_TL.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 +svn co https://github.com/immortalwrt/immortalwrt/branches/master/tools/upx tools/upx +svn co https://github.com/immortalwrt/immortalwrt/branches/master/tools/ucl tools/ucl + +### 获取额外的 LuCI 应用、主题和依赖 ### +# 访问控制 +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-accesscontrol package/lean/luci-app-accesscontrol +cp -rf ../PATCH/duplicate/luci-app-control-weburl ./package/new/luci-app-control-weburl +# 广告过滤 Adbyby +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-adbyby-plus package/lean/luci-app-adbyby-plus +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/adbyby package/lean/adbyby +# 广告过滤 AdGuard +cp -rf ../openwrt-lienol/package/diy/luci-app-adguardhome ./package/new/luci-app-adguardhome +rm -rf ./feeds/packages/net/adguardhome +svn co https://github.com/openwrt/packages/trunk/net/adguardhome feeds/packages/net/adguardhome +sed -i '/\t)/a\\t$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/AdGuardHome' ./feeds/packages/net/adguardhome/Makefile +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 +git clone -b master --depth 1 https://github.com/jerrykuku/luci-app-argon-config.git package/new/luci-app-argon-config +# MAC 地址与 IP 绑定 +svn co https://github.com/QiuSimons/OpenWrt_luci-app/trunk/lean/luci-app-arpbind package/lean/luci-app-arpbind +# 定时重启 +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-autoreboot package/lean/luci-app-autoreboot +# Boost 通用即插即用 +svn co https://github.com/ryohuang/slim-wrt/trunk/slimapps/application/luci-app-boostupnp package/new/luci-app-boostupnp +sed -i 's,https://api.ipify.org,http://members.3322.org/dyndns/getip,g' ./package/new/luci-app-boostupnp/root/usr/sbin/boostupnp.sh +# ChinaDNS +git clone -b luci --depth 1 https://github.com/pexcn/openwrt-chinadns-ng.git package/new/luci-app-chinadns-ng +svn co https://github.com/xiaorouji/openwrt-passwall/trunk/chinadns-ng package/new/chinadns-ng +# 内存压缩 +#wget -O- https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/2840.patch | patch -p1 +wget -O- https://github.com/NoTengoBattery/openwrt/commit/40f1d5.patch | patch -p1 +wget -O- https://github.com/NoTengoBattery/openwrt/commit/a83a0b.patch | patch -p1 +wget -O- https://github.com/NoTengoBattery/openwrt/commit/6d5fb4.patch | patch -p1 +mkdir ./package/new +cp -rf ../NoTengoBattery/feeds/luci/applications/luci-app-compressed-memory ./package/new/luci-app-compressed-memory +sed -i 's,include ../..,include $(TOPDIR)/feeds/luci,g' ./package/new/luci-app-compressed-memory/Makefile +cp -rf ../NoTengoBattery/package/system/compressed-memory ./package/system/compressed-memory +# CPU 控制相关 +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/lean/luci-app-cpufreq package/lean/luci-app-cpufreq +cp -rf ../PATCH/duplicate/luci-app-cpulimit ./package/lean/luci-app-cpulimit +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/ntlf9t/cpulimit package/lean/cpulimit +# 动态DNS +#rm -rf ./feeds/packages/net/ddns-scripts +#rm -rf ./feeds/luci/applications/luci-app-ddns +#svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/ddns-scripts_aliyun package/lean/ddns-scripts_aliyun +#svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/ddns-scripts_dnspod package/lean/ddns-scripts_dnspod +git clone --depth 1 https://github.com/small-5/ddns-scripts-dnspod package/lean/ddns-scripts_dnspod +git clone --depth 1 https://github.com/sensec/ddns-scripts_aliyun package/lean/ddns-scripts_aliyun +svn co https://github.com/openwrt/packages/branches/openwrt-18.06/net/ddns-scripts feeds/packages/net/ddns-scripts +svn co https://github.com/openwrt/luci/branches/openwrt-18.06/applications/luci-app-ddns feeds/luci/applications/luci-app-ddns +svn co https://github.com/QiuSimons/OpenWrt_luci-app/trunk/others/luci-app-tencentddns package/lean/luci-app-tencentddns +svn co https://github.com/kenzok8/openwrt-packages/trunk/luci-app-aliddns package/new/luci-app-aliddns +# Docker 容器(会导致 OpenWrt 出现 UDP 转发问题,慎用) +#sed -i 's/+docker/+docker \\\n\t+dockerd/g' ./feeds/luci/applications/luci-app-dockerman/Makefile +rm -rf ./feeds/luci/applications/luci-app-dockerman +cp -rf ../openwrt-lienol/package/diy/luci-app-dockerman ./feeds/luci/applications/luci-app-dockerman +# Edge 主题 +git clone -b master --depth 1 https://github.com/garypang13/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 +rm -rf ./feeds/packages/net/frp +rm -f ./package/feeds/packages/frp +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-frps package/lean/luci-app-frps +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-frpc package/lean/luci-app-frpc +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/frp package/lean/frp +# IPSec +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-ipsec-vpnd package/lean/luci-app-ipsec-vpnd +# IPv6 兼容助手 +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/ipv6-helper package/lean/ipv6-helper +# 京东签到 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 +pushd package/new/luci-app-jd-dailybonus +sed -i 's/wget-ssl/wget/g' root/usr/share/jd-dailybonus/newapp.sh luasrc/controller/jd-dailybonus.lua +popd +# 回滚通用即插即用 +#rm -rf ./feeds/packages/net/miniupnpd +#svn co https://github.com/coolsnowwolf/packages/trunk/net/miniupnpd feeds/packages/net/miniupnpd +# Moschinadns +svn co https://github.com/QiuSimons/openwrt-packages/branches/main/mos-chinadns package/new/mos-chinadns +svn co https://github.com/QiuSimons/openwrt-packages/branches/main/luci-app-moschinadns package/new/luci-app-moschinadns +# 流量监管 +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-netdata package/lean/luci-app-netdata +# 上网 APP 过滤 +git clone -b master --depth 1 https://github.com/destan19/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 +# OpenClash +git clone -b master --depth 1 https://github.com/vernesong/OpenClash.git package/new/luci-app-openclash +# 花生壳内网穿透 +svn co https://github.com/teasiu/dragino2/trunk/package/teasiu/luci-app-phtunnel package/new/luci-app-phtunnel +svn co https://github.com/QiuSimons/dragino2-teasiu/trunk/package/teasiu/luci-app-oray package/new/luci-app-oray +svn co https://github.com/teasiu/dragino2/trunk/package/teasiu/phtunnel package/new/phtunnel +# Pandownload +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/lean/pandownload-fake-server package/lean/pandownload-fake-server +# Passwall +svn co https://github.com/xiaorouji/openwrt-passwall/trunk/luci-app-passwall package/new/luci-app-passwall +sed -i 's,default n,default y,g' package/new/luci-app-passwall/Makefile +sed -i '/V2ray:v2ray/d' package/new/luci-app-passwall/Makefile +sed -i '/plugin:v2ray/d' package/new/luci-app-passwall/Makefile +cp -f ../PATCH/new/script/move_2_services.sh ./package/new/luci-app-passwall/move_2_services.sh +pushd package/new/luci-app-passwall +bash move_2_services.sh +popd +rm -rf ./feeds/packages/net/https-dns-proxy +svn co https://github.com/Lienol/openwrt-packages/trunk/net/https-dns-proxy feeds/packages/net/https-dns-proxy +svn co https://github.com/xiaorouji/openwrt-passwall/trunk/tcping package/new/tcping +svn co https://github.com/xiaorouji/openwrt-passwall/trunk/trojan-go package/new/trojan-go +svn co https://github.com/xiaorouji/openwrt-passwall/trunk/brook package/new/brook +svn co https://github.com/xiaorouji/openwrt-passwall/trunk/trojan-plus package/new/trojan-plus +svn co https://github.com/xiaorouji/openwrt-passwall/trunk/ssocks package/new/ssocks +svn co https://github.com/xiaorouji/openwrt-passwall/trunk/xray-core package/new/xray-core +svn co https://github.com/xiaorouji/openwrt-passwall/trunk/v2ray package/new/v2ray +svn co https://github.com/xiaorouji/openwrt-passwall/trunk/v2ray-plugin package/new/v2ray-plugin +svn co https://github.com/xiaorouji/openwrt-passwall/trunk/xray-plugin package/new/xray-plugin +# qBittorrent 下载 +svn co https://github.com/garypang13/openwrt-static-qb/trunk/qBittorrent-Enhanced-Edition package/lean/qBittorrent-Enhanced-Edition +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-qbittorrent package/lean/luci-app-qbittorrent +sed -i 's/+qBittorrent +python3/+qBittorrent-Enhanced-Edition/g' package/lean/luci-app-qbittorrent/Makefile +# 清理内存 +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-ramfree package/lean/luci-app-ramfree +# ServerChan 微信推送 +git clone -b master --depth 1 https://github.com/tty228/luci-app-serverchan.git package/new/luci-app-serverchan +# SmartDNS +rm -rf ./feeds/packages/net/smartdns +mkdir package/new/smartdns +wget -P package/new/smartdns/ https://github.com/HiGarfield/lede-17.01.4-Mod/raw/master/package/extra/smartdns/Makefile +sed -i 's,files/etc/config,$(PKG_BUILD_DIR)/package/openwrt/files/etc/config,g' ./package/new/smartdns/Makefile +# ShadowsocksR Plus+ +svn co https://github.com/fw876/helloworld/trunk/luci-app-ssr-plus package/lean/luci-app-ssr-plus +rm -rf ./package/lean/luci-app-ssr-plus/po/zh_Hans +pushd package/lean +#wget -qO - https://patch-diff.githubusercontent.com/raw/fw876/helloworld/pull/430.patch | patch -p1 +popd +sed -i 's,default n,default y,g' package/lean/luci-app-ssr-plus/Makefile +sed -i 's,Xray:xray ,Xray:xray-core ,g' package/lean/luci-app-ssr-plus/Makefile +sed -i '/V2ray:v2ray/d' package/lean/luci-app-ssr-plus/Makefile +sed -i '/plugin:v2ray/d' package/lean/luci-app-ssr-plus/Makefile +#sed -i '/result.encrypt_method/a\result.fast_open = "1"' package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua +sed -i 's,ispip.clang.cn/all_cn.txt,raw.sevencdn.com/QiuSimons/Chnroute/master/dist/chnroute/chnroute.txt,g' package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +sed -i 's,YW5vbnltb3Vz/domain-list-community/release/gfwlist.txt,Loyalsoldier/v2ray-rules-dat/release/gfw.txt,g' package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +# ShadowsocksR Plus+ 依赖 +rm -rf ./feeds/packages/net/kcptun +rm -rf ./feeds/packages/net/proxychains-ng +rm -rf ./feeds/packages/net/shadowsocks-libev +rm -rf ./feeds/packages/net/xray-core +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/shadowsocksr-libev package/lean/shadowsocksr-libev +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/pdnsd-alt package/lean/pdnsd +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/kcptun package/lean/kcptun +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/srelay package/lean/srelay +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/microsocks package/lean/microsocks +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/dns2socks package/lean/dns2socks +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/redsocks2 package/lean/redsocks2 +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/proxychains-ng package/lean/proxychains-ng +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/ipt2socks package/lean/ipt2socks +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/simple-obfs package/lean/simple-obfs +svn co https://github.com/coolsnowwolf/packages/trunk/net/shadowsocks-libev package/lean/shadowsocks-libev +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/trojan package/lean/trojan +svn co https://github.com/fw876/helloworld/trunk/naiveproxy package/lean/naiveproxy +svn co https://github.com/fw876/helloworld/trunk/shadowsocks-rust package/lean/shadowsocks-rust +# 订阅转换 +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/ctcgfw/subconverter package/new/subconverter +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/ctcgfw/jpcre2 package/new/jpcre2 +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/ctcgfw/rapidjson package/new/rapidjson +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/ctcgfw/duktape package/new/duktape +# 网易云音乐解锁 +git clone --depth 1 https://github.com/immortalwrt/luci-app-unblockneteasemusic.git package/new/UnblockNeteaseMusic +# USB 打印机 +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-usb-printer package/lean/luci-app-usb-printer +# UU加速器 +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-uugamebooster package/lean/luci-app-uugamebooster +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/uugamebooster package/lean/uugamebooster +# KMS 激活助手 +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-vlmcsd package/lean/luci-app-vlmcsd +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/vlmcsd package/lean/vlmcsd +# VSSR +git clone -b master --depth 1 https://github.com/jerrykuku/luci-app-vssr.git package/lean/luci-app-vssr +git clone -b master --depth 1 https://github.com/jerrykuku/lua-maxminddb.git package/lean/lua-maxminddb +sed -i 's,default n,default y,g' package/lean/luci-app-vssr/Makefile +sed -i '/V2ray:v2ray/d' package/lean/luci-app-vssr/Makefile +sed -i '/plugin:v2ray/d' package/lean/luci-app-vssr/Makefile +sed -i '/result.encrypt_method/a\result.fast_open = "1"' package/lean/luci-app-vssr/root/usr/share/vssr/subscribe.lua +sed -i 's,ispip.clang.cn/all_cn.txt,raw.sevencdn.com/QiuSimons/Chnroute/master/dist/chnroute/chnroute.txt,g' package/lean/luci-app-vssr/luasrc/controller/vssr.lua +sed -i 's,ispip.clang.cn/all_cn.txt,raw.sevencdn.com/QiuSimons/Chnroute/master/dist/chnroute/chnroute.txt,g' package/lean/luci-app-vssr/root/usr/share/vssr/update.lua +# 网络唤醒 +svn co https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-services-wolplus package/new/luci-app-services-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/garypang13/luci-app-xlnetacc.git package/lean/luci-app-xlnetacc +# Zerotier +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/lean/luci-app-zerotier package/lean/luci-app-zerotier +cp -f ../PATCH/new/script/move_2_services.sh ./package/lean/luci-app-zerotier/move_2_services.sh +pushd package/lean/luci-app-zerotier +bash move_2_services.sh +popd +rm -rf ./feeds/packages/net/zerotier/files/etc/init.d/zerotier + + +### 最后的收尾工作 ### +# Lets Fuck +mkdir package/base-files/files/usr/bin +cp -f ../PATCH/new/script/fuck package/base-files/files/usr/bin/fuck +cp -f ../PATCH/new/script/chinadnslist package/base-files/files/usr/bin/chinadnslist +# 最大连接数 +sed -i 's/16384/65535/g' package/kernel/linux/files/sysctl-nf-conntrack.conf +# 生成默认配置及缓存 +rm -rf .config + +exit 0 diff --git a/SCRIPTS/03_convert_translation.sh b/SCRIPTS/03_convert_translation.sh new file mode 100644 index 000000000..23232a7e4 --- /dev/null +++ b/SCRIPTS/03_convert_translation.sh @@ -0,0 +1,51 @@ +#!/bin/bash +# [CTCGFW]immortalwrt +# Use it under GPLv3, please. +# -------------------------------------------------------- +# Convert translation files zh-cn to zh_Hans +# The script is still in testing, welcome to report bugs. + +po_file="$({ find |grep -E "[a-z0-9]+\.zh\-cn.+po"; } 2>"/dev/null")" +for a in ${po_file} +do + [ -n "$(grep "Language: zh_CN" "$a")" ] && sed -i "s/Language: zh_CN/Language: zh_Hans/g" "$a" + po_new_file="$(echo -e "$a"|sed "s/zh-cn/zh_Hans/g")" + mv "$a" "${po_new_file}" 2>"/dev/null" +done + +po_file2="$({ find |grep "/zh-cn/" |grep "\.po"; } 2>"/dev/null")" +for b in ${po_file2} +do + [ -n "$(grep "Language: zh_CN" "$b")" ] && sed -i "s/Language: zh_CN/Language: zh_Hans/g" "$b" + po_new_file2="$(echo -e "$b"|sed "s/zh-cn/zh_Hans/g")" + mv "$b" "${po_new_file2}" 2>"/dev/null" +done + +lmo_file="$({ find |grep -E "[a-z0-9]+\.zh_Hans.+lmo"; } 2>"/dev/null")" +for c in ${lmo_file} +do + lmo_new_file="$(echo -e "$c"|sed "s/zh_Hans/zh-cn/g")" + mv "$c" "${lmo_new_file}" 2>"/dev/null" +done + +lmo_file2="$({ find |grep "/zh_Hans/" |grep "\.lmo"; } 2>"/dev/null")" +for d in ${lmo_file2} +do + lmo_new_file2="$(echo -e "$d"|sed "s/zh_Hans/zh-cn/g")" + mv "$d" "${lmo_new_file2}" 2>"/dev/null" +done + +po_dir="$({ find |grep "/zh-cn" |sed "/\.po/d" |sed "/\.lmo/d"; } 2>"/dev/null")" +for e in ${po_dir} +do + po_new_dir="$(echo -e "$e"|sed "s/zh-cn/zh_Hans/g")" + mv "$e" "${po_new_dir}" 2>"/dev/null" +done + +makefile_file="$({ find|grep Makefile |sed "/Makefile./d"; } 2>"/dev/null")" +for f in ${makefile_file} +do + [ -n "$(grep "zh-cn" "$f")" ] && sed -i "s/zh-cn/zh_Hans/g" "$f" + [ -n "$(grep "zh_Hans.lmo" "$f")" ] && sed -i "s/zh_Hans.lmo/zh-cn.lmo/g" "$f" +done +exit 0 diff --git a/SCRIPTS/04_remove_upx.sh b/SCRIPTS/04_remove_upx.sh new file mode 100644 index 000000000..fe438a5ad --- /dev/null +++ b/SCRIPTS/04_remove_upx.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# [CTCGFW]immortalwrt +# Use it under GPLv3, please. +# -------------------------------------------------------- +# Remove upx commands + +makefile_file="$({ find package|grep Makefile |sed "/Makefile./d"; } 2>"/dev/null")" +for a in ${makefile_file} +do + [ -n "$(grep "upx" "$a")" ] && sed -i "/upx/d" "$a" +done +exit 0 \ No newline at end of file diff --git a/SCRIPTS/05_create_acl_for_luci.sh b/SCRIPTS/05_create_acl_for_luci.sh new file mode 100644 index 000000000..a0138ea11 --- /dev/null +++ b/SCRIPTS/05_create_acl_for_luci.sh @@ -0,0 +1,117 @@ +#!/bin/bash +# [CTCGFW]immortalwrt +# Use it under GPLv3, please. +# -------------------------------------------------------- +# Script for creating ACL file for each LuCI APP + +error_font="\033[31m[Error]$\033[0m " +success_font="\033[32m[Success]\033[0m " +info_font="\033[36m[Info]\033[0m " + +function echo_green_bg(){ + echo -e "\033[42;37m$1\033[0m" +} + +function echo_yellow_bg(){ + echo -e "\033[43;37m$1\033[0m" +} + +function echo_red_bg(){ + echo -e "\033[41;37m$1\033[0m" +} + +function clean_outdated_files(){ + rm -f "create_acl_for_luci.err" "create_acl_for_luci.warn" "create_acl_for_luci.ok" +} + +function check_if_acl_exist(){ + ls "$1"/root/usr/share/rpcd/acl.d/*.json >/dev/null 2>&1 && return 0 || return 1 +} + +function check_config_files(){ + [ "$(ls "$1"/root/etc/config/* 2>/dev/null | wc -l)" -ne "1" ] && return 0 || return 1 +} + +function get_config_name(){ + ls "$1"/root/etc/config/* 2>/dev/null | awk -F '/' '{print $NF}' +} + +function create_acl_file(){ + mkdir -p "$1" + echo -e "{ + \"$2\": { + \"description\": \"Grant UCI access for $2\", + \"read\": { + \"uci\": [ \"$3\" ] + }, + \"write\": { + \"uci\": [ \"$3\" ] + } + } +}" > "$1/$2.json" +} + +function auto_create_acl(){ + luci_app_list="$(find package -maxdepth 2 | grep -Eo "package/.+/luci-app-[a-zA-Z0-9_-]+" | sort -s)" + + [ "$(echo -e "${luci_app_list}" | wc -l)" -gt "0" ] && for i in ${luci_app_list} + do + if check_if_acl_exist "$i"; then + echo_yellow_bg "$i: has ACL file already, skipping..." | tee -a create_acl_for_luci.warn + elif check_config_files "$i"; then + echo_red_bg "$i: has no/multi config file(s), skipping..." | tee -a create_acl_for_luci.err + else + create_acl_file "$i/root/usr/share/rpcd/acl.d" "${i##*/}" "$(get_config_name "$i")" + echo_green_bg "$i: ACL file has been generated." | tee -a create_acl_for_luci.ok + fi + done +} + +while getopts "achml:n:p:" input_arg +do + case $input_arg in + a) + clean_outdated_files + auto_create_acl + exit + ;; + m) + manual_mode=1 + ;; + p) + acl_path="$OPTARG" + ;; + l) + luci_name="$OPTARG" + ;; + n) + conf_name="$OPTARG" + ;; + c) + clean_outdated_files + exit + ;; + h|?|*) + echo -e "${info_font}Usage: $0 [-a|-m (-p ) -l -n |-c]" + exit 2 + ;; + esac +done + +[ "$?" -ne "0" ] && exit + +if [ "*${manual_mode}*" == "*1*" ]; then + acl_path="${acl_path:-root/usr/share/rpcd/acl.d}" + if create_acl_file "${acl_path}" "${luci_name}" "${conf_name}"; then + echo -e "${success_font}Output file: $(ls "${acl_path}/${luci_name}.json")" + echo_green_bg "$(cat "${acl_path}/${luci_name}.json")" + echo_green_bg "${luci_name}: ACL file has been generated." >> "create_acl_for_luci.ok" + [ -e "create_acl_for_luci.err" ] && sed -i "/${luci_name}/d" "create_acl_for_luci.err" + else + echo -e "${error_font}Failed to create file ${acl_path}/${luci_name}.json" + echo_red_bg "${luci_name}: Failed to create ACL file." >> "create_acl_for_luci.err" + fi +else + echo -e "${info_font}Usage: $0 [-a|-m -p -l -n |-c]" + exit 2 +fi diff --git a/SCRIPTS/06_cleaning.sh b/SCRIPTS/06_cleaning.sh new file mode 100644 index 000000000..1319e4be4 --- /dev/null +++ b/SCRIPTS/06_cleaning.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +rm -rf `ls | grep -v "squashfs"` +gzip -d *.gz +gzip *.img + +exit 0 diff --git a/SCRIPTS/R2S/02_target_only.sh b/SCRIPTS/R2S/02_target_only.sh new file mode 100644 index 000000000..24ad2c87a --- /dev/null +++ b/SCRIPTS/R2S/02_target_only.sh @@ -0,0 +1,88 @@ +#!/bin/bash +clear + +# 使用专属优化 +sed -i 's,-mcpu=generic,-march=armv8-a+crypto+crc -mabi=lp64,g' include/target.mk +cp -f ../PATCH/new/package/100-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch ./package/libs/mbedtls/patches/100-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch + +# 解决 DDR 内存问题 +patch -p1 < ../PATCH/new/main/0001-dmc-rk3328.patch +wget -P target/linux/rockchip/patches-5.4 https://github.com/immortalwrt/immortalwrt/raw/master/target/linux/rockchip/patches-5.4/803-PM-devfreq-rockchip-add-devfreq-driver-for-rk3328-dmc.patch +wget -P target/linux/rockchip/patches-5.4 https://github.com/immortalwrt/immortalwrt/raw/master/target/linux/rockchip/patches-5.4/804-clk-rockchip-support-setting-ddr-clock-via-SIP-Version-2-.patch +wget -P target/linux/rockchip/patches-5.4 https://github.com/immortalwrt/immortalwrt/raw/master/target/linux/rockchip/patches-5.4/805-PM-devfreq-rockchip-dfi-add-more-soc-support.patch +wget -P target/linux/rockchip/patches-5.4 https://github.com/immortalwrt/immortalwrt/raw/master/target/linux/rockchip/patches-5.4/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch +wget -P target/linux/rockchip/patches-5.4 https://github.com/immortalwrt/immortalwrt/raw/master/target/linux/rockchip/patches-5.4/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch +svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip/files target/linux/rockchip/files +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/arm-trusted-firmware-rk3328 package/boot/arm-trusted-firmware-rk3328 + +# RK3328 加入 idle 模式 +wget -P target/linux/rockchip/patches-5.4 https://github.com/immortalwrt/immortalwrt/raw/master/target/linux/rockchip/patches-5.4/007-arm64-dts-rockchip-Add-RK3328-idle-state.patch +# 修改内核 DMA 到 2MiB +wget -P target/linux/rockchip/patches-5.4 https://github.com/immortalwrt/immortalwrt/raw/master/target/linux/rockchip/patches-5.4/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch +# 超频到 1.6 GHz +wget -P target/linux/rockchip/patches-5.4 https://github.com/immortalwrt/immortalwrt/raw/master/target/linux/rockchip/patches-5.4/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch +# 开启 i2c0 +cp -f ../PATCH/new/main/998-rockchip-enable-i2c0-on-NanoPi-R2S.patch ./target/linux/rockchip/patches-5.4/998-rockchip-enable-i2c0-on-NanoPi-R2S.patch +# 配置 IRQ 并默认关闭 eth0 offloading rx/rx +patch -p1 < ../PATCH/new/main/0002-IRQ-and-disable-eth0-tcp-udp-offloading-tx-rx.patch +# 交换 lan/wan 口 +sed -i 's,"eth1" "eth0","eth0" "eth1",g' target/linux/rockchip/armv8/base-files/etc/board.d/02_network +sed -i "s,'eth1' 'eth0','eth0' 'eth1',g" target/linux/rockchip/armv8/base-files/etc/board.d/02_network + +# ShadowsocksR Plus+ +pushd package/lean +wget -qO - https://github.com/fw876/helloworld/pull/439.patch | patch -Rp1 +popd + +# 翻译及部分功能优化 +cp -rf ../PATCH/duplicate/addition-trans-zh ./package/lean/lean-translate +echo " +sed -i 's,#devcrypto,devcrypto,g' /etc/ssl/openssl.cnf +sed -i 's,#USE_SOFTDRIVERS = 2,USE_SOFTDRIVERS = 1,g' /etc/ssl/openssl.cnf +exit 0 + +" >> ./package/lean/lean-translate/files/zzz-default-settings +<<'COMMENT' +#Vermagic +latest_version="$(curl -s https://github.com/openwrt/openwrt/releases |grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" |sed -n '/21/p' |sed -n 1p |sed 's/v//g' |sed 's/.tar.gz//g')" +wget https://downloads.openwrt.org/releases/${latest_version}/targets/rockchip/armv8/packages/Packages.gz +zgrep -m 1 "Depends: kernel (=.*)$" Packages.gz | sed -e 's/.*-\(.*\))/\1/' > .vermagic +sed -i -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk +COMMENT + +# 对齐内核 Vermagic +wget https://downloads.openwrt.org/releases/21.02-SNAPSHOT/targets/rockchip/armv8/packages/Packages.gz +zgrep -m 1 "Depends: kernel (=.*)$" Packages.gz | sed -e 's/.*-\(.*\))/\1/' > .vermagic +sed -i -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk + +# 内核加解密组件 +echo ' +CONFIG_ARM64_CRYPTO=y +CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y +CONFIG_ARM_PSCI_FW=y +CONFIG_ARM_RK3328_DMC_DEVFREQ=y +CONFIG_CRYPTO_AES_ARM64=y +CONFIG_CRYPTO_AES_ARM64_BS=y +CONFIG_CRYPTO_AES_ARM64_CE=y +CONFIG_CRYPTO_AES_ARM64_CE_BLK=y +CONFIG_CRYPTO_AES_ARM64_CE_CCM=y +CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y +CONFIG_CRYPTO_CHACHA20_NEON=y +# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set +CONFIG_CRYPTO_GHASH_ARM64_CE=y +CONFIG_CRYPTO_NHPOLY1305_NEON=y +CONFIG_CRYPTO_POLY1305_NEON=y +CONFIG_CRYPTO_SHA1_ARM64_CE=y +CONFIG_CRYPTO_SHA2_ARM64_CE=y +CONFIG_CRYPTO_SHA256_ARM64=y +CONFIG_CRYPTO_SHA3_ARM64=y +CONFIG_CRYPTO_SHA512_ARM64=y +# CONFIG_CRYPTO_SHA512_ARM64_CE is not set +CONFIG_CRYPTO_SM3_ARM64_CE=y +CONFIG_CRYPTO_SM4_ARM64_CE=y +' >> ./target/linux/rockchip/armv8/config-5.4 + +# 预配置一些插件 +cp -rf ../PATCH/R2S/files ./files + +exit 0 diff --git a/SCRIPTS/R4S/02_target_only.sh b/SCRIPTS/R4S/02_target_only.sh new file mode 100644 index 000000000..02a745c40 --- /dev/null +++ b/SCRIPTS/R4S/02_target_only.sh @@ -0,0 +1,109 @@ +#!/bin/bash +clear + +# 更换为 ImmortalWrt Uboot 以及 Target +rm -rf ./target/linux/rockchip +svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip target/linux/rockchip +rm -rf ./package/boot/uboot-rockchip +svn co https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/uboot-rockchip package/boot/uboot-rockchip + +# 超频到 2.2/1.8 GHz +rm -rf ./target/linux/rockchip/patches-5.4/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch +cp -f ../PATCH/new/main/991-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch ./target/linux/rockchip/patches-5.4/991-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch +cp -f ../PATCH/new/main/213-RK3399-set-critical-CPU-temperature-for-thermal-throttling.patch ./target/linux/rockchip/patches-5.4/213-RK3399-set-critical-CPU-temperature-for-thermal-throttling.patch + +# 使用特定的优化 +sed -i 's,-mcpu=generic,-march=armv8-a+crypto+crc -mabi=lp64,g' include/target.mk +cp -f ../PATCH/new/package/100-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch ./package/libs/mbedtls/patches/100-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch +sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/rockchip/image/armv8.mk +# 测试性功能 +sed -i '/CRYPTO_DEV_ROCKCHIP/d' ./target/linux/rockchip/armv8/config-5.4 +sed -i '/HW_RANDOM_ROCKCHIP/d' ./target/linux/rockchip/armv8/config-5.4 +echo ' +CONFIG_CRYPTO_DEV_ROCKCHIP=y +CONFIG_HW_RANDOM_ROCKCHIP=y +' >> ./target/linux/rockchip/armv8/config-5.4 + +# IRQ 调优 +sed -i '/set_interface_core 20 "eth1"/a\set_interface_core 8 "ff3c0000" "ff3c0000.i2c"' target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity +sed -i '/set_interface_core 20 "eth1"/a\ethtool -C eth0 rx-usecs 1000 rx-frames 25 tx-usecs 100 tx-frames 25' target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity + +# ShadowsocksR Plus+ +pushd package/lean +wget -qO - https://github.com/fw876/helloworld/pull/439.patch | patch -Rp1 +popd + +# 翻译及部分功能优化 +cp -rf ../PATCH/duplicate/addition-trans-zh ./package/lean/lean-translate +echo " +#R4S_LED +uci del system.led_wan.mode +uci del system.led_lan.mode +uci del system.@led[-1] +uci del system.@led[-1] +uci add system led +uci set system.@led[-1].name='LAN' +uci set system.@led[-1].sysfs='nanopi-r4s:green:lan' +uci set system.@led[-1].trigger='netdev' +uci set system.@led[-1].dev='eth1' +uci add_list system.@led[-1].mode='link' +uci add_list system.@led[-1].mode='tx' +uci add_list system.@led[-1].mode='rx' +uci add system led +uci set system.@led[-1].name='WAN' +uci set system.@led[-1].sysfs='nanopi-r4s:green:wan' +uci set system.@led[-1].trigger='netdev' +uci set system.@led[-1].dev='eth0' +uci add_list system.@led[-1].mode='link' +uci add_list system.@led[-1].mode='tx' +uci commit +#R4S_LANWAN +uci set network.wan.ifname='eth0' +uci set network.lan.ifname='eth1' +uci del network.wan6 +uci commit network +exit 0 + +" >> ./package/lean/lean-translate/files/zzz-default-settings + +# 内核加解密模块 +echo ' +CONFIG_ARM64_CRYPTO=y +CONFIG_CRYPTO_SHA256_ARM64=y +CONFIG_CRYPTO_SHA512_ARM64=y +CONFIG_CRYPTO_SHA1_ARM64_CE=y +CONFIG_CRYPTO_SHA2_ARM64_CE=y +# CONFIG_CRYPTO_SHA512_ARM64_CE is not set +CONFIG_CRYPTO_SHA3_ARM64=y +CONFIG_CRYPTO_SM3_ARM64_CE=y +CONFIG_CRYPTO_SM4_ARM64_CE=y +CONFIG_CRYPTO_GHASH_ARM64_CE=y +# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set +CONFIG_CRYPTO_AES_ARM64=y +CONFIG_CRYPTO_AES_ARM64_CE=y +CONFIG_CRYPTO_AES_ARM64_CE_CCM=y +CONFIG_CRYPTO_AES_ARM64_CE_BLK=y +CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y +CONFIG_CRYPTO_CHACHA20_NEON=y +CONFIG_CRYPTO_POLY1305_NEON=y +CONFIG_CRYPTO_NHPOLY1305_NEON=y +CONFIG_CRYPTO_AES_ARM64_BS=y +' >> ./target/linux/rockchip/armv8/config-5.4 + +<<'COMMENT' +#Vermagic +latest_version="$(curl -s https://github.com/openwrt/openwrt/releases |grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" |sed -n '/21/p' |sed -n 1p |sed 's/v//g' |sed 's/.tar.gz//g')" +wget https://downloads.openwrt.org/releases/${latest_version}/targets/rockchip/armv8/packages/Packages.gz +zgrep -m 1 "Depends: kernel (=.*)$" Packages.gz | sed -e 's/.*-\(.*\))/\1/' > .vermagic +sed -i -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk +COMMENT + +# 对齐内核 Vermagic +wget https://downloads.openwrt.org/releases/21.02-SNAPSHOT/targets/rockchip/armv8/packages/Packages.gz +zgrep -m 1 "Depends: kernel (=.*)$" Packages.gz | sed -e 's/.*-\(.*\))/\1/' > .vermagic +sed -i -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk + +# 预配置一些插件 +cp -rf ../PATCH/R4S/files ./files + +exit 0 diff --git a/SCRIPTS/X86/02_target_only.sh b/SCRIPTS/X86/02_target_only.sh new file mode 100644 index 000000000..a89bae5ce --- /dev/null +++ b/SCRIPTS/X86/02_target_only.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# 使用 O2 级别的优化 +sed -i 's/O3/O2/g' include/target.mk + +# 翻译及部分功能优化 +cp -rf ../PATCH/duplicate/addition-trans-zh ./package/lean/lean-translate +echo " +exit 0 + +" >> ./package/lean/lean-translate/files/zzz-default-settings + +# 在 X86 架构下移除 Shadowsocks-rust +sed -i '/Rust:/d' package/lean/luci-app-ssr-plus/Makefile +sed -i '/Rust:/d' package/new/luci-app-passwall/Makefile +sed -i '/Rust:/d' package/lean/luci-app-vssr/Makefile + +<<'COMMENT' +#Vermagic +latest_version="$(curl -s https://github.com/openwrt/openwrt/releases |grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" |sed -n '/21/p' |sed -n 1p |sed 's/v//g' |sed 's/.tar.gz//g')" +wget https://downloads.openwrt.org/releases/${latest_version}/targets/x86/64/packages/Packages.gz +zgrep -m 1 "Depends: kernel (=.*)$" Packages.gz | sed -e 's/.*-\(.*\))/\1/' > .vermagic +sed -i -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk +COMMENT + +# 对齐内核 Vermagic +wget https://downloads.openwrt.org/releases/21.02-SNAPSHOT/targets/x86/64/packages/Packages.gz +zgrep -m 1 "Depends: kernel (=.*)$" Packages.gz | sed -e 's/.*-\(.*\))/\1/' > .vermagic +sed -i -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk + +# 预配置一些插件 +cp -rf ../PATCH/X86/files ./files + +exit 0 diff --git a/SEED/R2S/config.seed b/SEED/R2S/config.seed new file mode 100644 index 000000000..e0573e7dc --- /dev/null +++ b/SEED/R2S/config.seed @@ -0,0 +1,187 @@ +### INITIALIZATION ### +CONFIG_KERNEL_BUILD_DOMAIN="buildhost" +CONFIG_KERNEL_BUILD_USER="builder" +CONFIG_TARGET_rockchip=y +CONFIG_TARGET_rockchip_armv8=y +CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y +CONFIG_TARGET_ROOTFS_PARTSIZE=960 +# CONFIG_COLLECT_KERNEL_DEBUG is not set + +### AGGRESSIVE ### +CONFIG_PACKAGE_node=y +CONFIG_NODEJS_14=y +#CONFIG_DEVEL=y +#CONFIG_TOOLCHAINOPTS=y +#CONFIG_GCC_USE_VERSION_9=y + +### BASIC ### +CONFIG_PACKAGE_addition-trans-zh=y +CONFIG_PACKAGE_arm-trusted-firmware-rockchip=y +CONFIG_PACKAGE_autocore-arm=y +CONFIG_PACKAGE_ipv6helper=y +CONFIG_PACKAGE_cgi-io=y +CONFIG_PACKAGE_ethtool=y +CONFIG_PACKAGE_diffutils=y +CONFIG_PACKAGE_dnsmasq-full=y +CONFIG_PACKAGE_dnsmasq_full_auth=y +CONFIG_PACKAGE_dnsmasq_full_conntrack=y +CONFIG_PACKAGE_dnsmasq_full_dhcp=y +CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y +CONFIG_PACKAGE_dnsmasq_full_dnssec=y +CONFIG_PACKAGE_dnsmasq_full_ipset=y +CONFIG_PACKAGE_dnsmasq_full_noid=y +CONFIG_PACKAGE_dnsmasq_full_tftp=y +# CONFIG_PACKAGE_dnsmasq is not set +CONFIG_PACKAGE_iptables-mod-fullconenat=y +CONFIG_PACKAGE_ip6tables-mod-fullconenat=y +CONFIG_PACKAGE_iptables-mod-nat-extra=y +CONFIG_PACKAGE_kmod-fs-f2fs=y +CONFIG_PACKAGE_kmod-ipt-nat6=y +CONFIG_PACKAGE_kmod-tun=y +CONFIG_PACKAGE_kmod-shortcut-fe=y +CONFIG_PACKAGE_kmod-fast-classifier=y +# CONFIG_PACKAGE_kmod-shortcut-fe-cm is not set +CONFIG_PACKAGE_libiwinfo=y +CONFIG_PACKAGE_libiwinfo-lua=y +CONFIG_PACKAGE_liblua=y +CONFIG_PACKAGE_liblucihttp=y +CONFIG_PACKAGE_liblucihttp-lua=y +CONFIG_PACKAGE_libubus-lua=y +CONFIG_PACKAGE_libustream-openssl=y +# CONFIG_PACKAGE_libustream-wolfssl is not set +CONFIG_PACKAGE_rpcd=y +CONFIG_PACKAGE_rpcd-mod-file=y +CONFIG_PACKAGE_rpcd-mod-iwinfo=y +CONFIG_PACKAGE_rpcd-mod-luci=y +CONFIG_PACKAGE_rpcd-mod-rrdns=y +CONFIG_PACKAGE_uhttpd=y +CONFIG_PACKAGE_wget-ssl=y +CONFIG_PACKAGE_lua=y + +### LUCI ### +CONFIG_LUCI_LANG_zh_Hans=y +# CONFIG_LUCI_CSSTIDY is not set +# CONFIG_LUCI_JSMIN is not set +CONFIG_PACKAGE_luci=y +CONFIG_PACKAGE_luci-app-firewall=y +CONFIG_PACKAGE_luci-base=y +CONFIG_PACKAGE_luci-compat=y +CONFIG_PACKAGE_luci-lib-ip=y +CONFIG_PACKAGE_luci-lib-ipkg=y +CONFIG_PACKAGE_luci-lib-jsonc=y +CONFIG_PACKAGE_luci-lib-nixio=y +CONFIG_PACKAGE_luci-mod-admin-full=y +CONFIG_PACKAGE_luci-mod-network=y +CONFIG_PACKAGE_luci-mod-status=y +CONFIG_PACKAGE_luci-mod-system=y +CONFIG_PACKAGE_luci-proto-ipv6=y +CONFIG_PACKAGE_luci-proto-ppp=y + +### APPLICATION ### +CONFIG_PACKAGE_luci-app-adguardhome=y +CONFIG_PACKAGE_adguardhome=y +CONFIG_PACKAGE_luci-app-argon-config=y +CONFIG_PACKAGE_luci-app-arpbind=y +CONFIG_PACKAGE_luci-app-autoreboot=y +CONFIG_PACKAGE_luci-app-boostupnp=y +CONFIG_PACKAGE_luci-app-control-weburl=y +CONFIG_PACKAGE_luci-app-cpufreq=y +CONFIG_PACKAGE_luci-app-cpulimit=y +CONFIG_PACKAGE_luci-app-ddns=y +CONFIG_PACKAGE_ddns-scripts-cloudflare=y +CONFIG_PACKAGE_luci-app-frpc=y +CONFIG_PACKAGE_frpc=y +CONFIG_PACKAGE_luci-app-frps=y +CONFIG_PACKAGE_frps=y +CONFIG_PACKAGE_luci-app-jd-dailybonus=y +CONFIG_PACKAGE_luci-app-moschinadns=y +CONFIG_PACKAGE_luci-app-oled=y +CONFIG_PACKAGE_luci-app-openclash=y +CONFIG_PACKAGE_luci-app-opkg=y +#CONFIG_PACKAGE_luci-app-qbittorrent=y +CONFIG_PACKAGE_luci-app-ramfree=y +CONFIG_PACKAGE_luci-app-serverchan=y +CONFIG_PACKAGE_luci-app-smartdns=y +CONFIG_PACKAGE_luci-app-sqm=y +CONFIG_PACKAGE_luci-app-vlmcsd=y +CONFIG_PACKAGE_luci-app-vssr=y +CONFIG_PACKAGE_luci-app-ssr-plus=y +CONFIG_PACKAGE_luci-app-passwall=y +CONFIG_PACKAGE_luci-app-unblockneteasemusic=y +CONFIG_PACKAGE_luci-app-upnp=y +CONFIG_PACKAGE_luci-app-usb-printer=y +CONFIG_PACKAGE_luci-app-services-wolplus=y +CONFIG_PACKAGE_luci-app-wrtbwmon=y +CONFIG_PACKAGE_luci-app-xlnetacc=y +CONFIG_PACKAGE_luci-app-zerotier=y +CONFIG_PACKAGE_zerotier=y +CONFIG_PACKAGE_coremark=y +CONFIG_PACKAGE_htop=y +CONFIG_PACKAGE_subconverter=y + +### ZRAM ### +CONFIG_PACKAGE_luci-app-compressed-memory=y +CONFIG_PACKAGE_zram-swap=n +CONFIG_PACKAGE_block-mount=y +CONFIG_PACKAGE_swap-utils=y + +### THEME ### +CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-theme-bootstrap=y + +### RESET ### +CONFIG_PACKAGE_kmod-gpio-button-hotplug=y + +### SHARE NETWORK ### +CONFIG_PACKAGE_usbmuxd=y +CONFIG_PACKAGE_kmod-usb-net-rndis=y +CONFIG_PACKAGE_kmod-usb-net-ipheth=y + +### CRYPTO ### +CONFIG_PACKAGE_kmod-crypto-acompress=y +CONFIG_PACKAGE_kmod-crypto-aead=y +CONFIG_PACKAGE_kmod-crypto-authenc=y +CONFIG_PACKAGE_kmod-crypto-cbc=y +CONFIG_PACKAGE_kmod-crypto-crc32c=y +CONFIG_PACKAGE_kmod-crypto-ctr=y +CONFIG_PACKAGE_kmod-crypto-deflate=y +CONFIG_PACKAGE_kmod-crypto-des=y +CONFIG_PACKAGE_kmod-crypto-ecb=y +CONFIG_PACKAGE_kmod-crypto-echainiv=y +CONFIG_PACKAGE_kmod-crypto-gcm=y +CONFIG_PACKAGE_kmod-crypto-gf128=y +CONFIG_PACKAGE_kmod-crypto-ghash=y +CONFIG_PACKAGE_kmod-crypto-hash=y +CONFIG_PACKAGE_kmod-crypto-hmac=y +CONFIG_PACKAGE_kmod-crypto-iv=y +CONFIG_PACKAGE_kmod-crypto-manager=y +CONFIG_PACKAGE_kmod-crypto-md5=y +CONFIG_PACKAGE_kmod-crypto-null=y +CONFIG_PACKAGE_kmod-crypto-pcompress=y +CONFIG_PACKAGE_kmod-crypto-rng=y +CONFIG_PACKAGE_kmod-crypto-seqiv=y +CONFIG_PACKAGE_kmod-crypto-sha1=y +CONFIG_PACKAGE_kmod-crypto-sha256=y +CONFIG_PACKAGE_kmod-crypto-wq=y +CONFIG_PACKAGE_kmod-cryptodev=y + +### OPENSSL ### +CONFIG_OPENSSL_ENGINE=y +CONFIG_OPENSSL_OPTIMIZE_SPEED=y +CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y +CONFIG_OPENSSL_WITH_ASM=y +# CONFIG_OPENSSL_WITH_ERROR_MESSAGES is not set +CONFIG_PACKAGE_libopenssl-devcrypto=y +CONFIG_PACKAGE_libopenssl-conf=y +CONFIG_PACKAGE_openssl-util=y +CONFIG_PACKAGE_libcurl=y +CONFIG_LIBCURL_OPENSSL=y +# CONFIG_LIBCURL_MBEDTLS is not set +# CONFIG_LIBCURL_WOLFSSL is not set +# CONFIG_LIBCURL_GNUTLS is not set +# CONFIG_LIBCURL_NOSSL is not set + + +### DOCKER ###(实验性,有需要的删掉下面两行的注释) +#CONFIG_PACKAGE_docker=y +#CONFIG_PACKAGE_luci-app-dockerman=y diff --git a/SEED/R4S/config.seed b/SEED/R4S/config.seed new file mode 100644 index 000000000..98ffeb2cf --- /dev/null +++ b/SEED/R4S/config.seed @@ -0,0 +1,182 @@ +### INITIALIZATION ### +CONFIG_KERNEL_BUILD_DOMAIN="buildhost" +CONFIG_KERNEL_BUILD_USER="builder" +CONFIG_TARGET_rockchip=y +CONFIG_TARGET_rockchip_armv8=y +CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y +CONFIG_TARGET_ROOTFS_PARTSIZE=960 +# CONFIG_COLLECT_KERNEL_DEBUG is not set + +### AGGRESSIVE ### +CONFIG_PACKAGE_node=y +CONFIG_NODEJS_14=y +#CONFIG_DEVEL=y +#CONFIG_TOOLCHAINOPTS=y +#CONFIG_GCC_USE_VERSION_9=y + +### BASIC ### +CONFIG_PACKAGE_addition-trans-zh=y +CONFIG_PACKAGE_arm-trusted-firmware-rockchip=y +CONFIG_PACKAGE_autocore-arm=y +CONFIG_PACKAGE_ipv6helper=y +CONFIG_PACKAGE_cgi-io=y +CONFIG_PACKAGE_ethtool=y +CONFIG_PACKAGE_diffutils=y +CONFIG_PACKAGE_dnsmasq-full=y +CONFIG_PACKAGE_dnsmasq_full_auth=y +CONFIG_PACKAGE_dnsmasq_full_conntrack=y +CONFIG_PACKAGE_dnsmasq_full_dhcp=y +CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y +CONFIG_PACKAGE_dnsmasq_full_dnssec=y +CONFIG_PACKAGE_dnsmasq_full_ipset=y +CONFIG_PACKAGE_dnsmasq_full_noid=y +CONFIG_PACKAGE_dnsmasq_full_tftp=y +# CONFIG_PACKAGE_dnsmasq is not set +CONFIG_PACKAGE_iptables-mod-fullconenat=y +CONFIG_PACKAGE_ip6tables-mod-fullconenat=y +CONFIG_PACKAGE_iptables-mod-nat-extra=y +CONFIG_PACKAGE_kmod-fs-f2fs=y +CONFIG_PACKAGE_kmod-ipt-nat6=y +CONFIG_PACKAGE_kmod-tun=y +CONFIG_PACKAGE_kmod-r8168=y +CONFIG_PACKAGE_kmod-shortcut-fe=y +CONFIG_PACKAGE_kmod-fast-classifier=y +# CONFIG_PACKAGE_kmod-shortcut-fe-cm is not set +CONFIG_PACKAGE_libiwinfo=y +CONFIG_PACKAGE_libiwinfo-lua=y +CONFIG_PACKAGE_liblua=y +CONFIG_PACKAGE_liblucihttp=y +CONFIG_PACKAGE_liblucihttp-lua=y +CONFIG_PACKAGE_libubus-lua=y +CONFIG_PACKAGE_libustream-openssl=y +# CONFIG_PACKAGE_libustream-wolfssl is not set +CONFIG_PACKAGE_rpcd=y +CONFIG_PACKAGE_rpcd-mod-file=y +CONFIG_PACKAGE_rpcd-mod-iwinfo=y +CONFIG_PACKAGE_rpcd-mod-luci=y +CONFIG_PACKAGE_rpcd-mod-rrdns=y +CONFIG_PACKAGE_uhttpd=y +CONFIG_PACKAGE_wget-ssl=y +CONFIG_PACKAGE_lua=y + +### LUCI ### +CONFIG_LUCI_LANG_zh_Hans=y +# CONFIG_LUCI_CSSTIDY is not set +# CONFIG_LUCI_JSMIN is not set +CONFIG_PACKAGE_luci=y +CONFIG_PACKAGE_luci-app-firewall=y +CONFIG_PACKAGE_luci-base=y +CONFIG_PACKAGE_luci-compat=y +CONFIG_PACKAGE_luci-lib-ip=y +CONFIG_PACKAGE_luci-lib-ipkg=y +CONFIG_PACKAGE_luci-lib-jsonc=y +CONFIG_PACKAGE_luci-lib-nixio=y +CONFIG_PACKAGE_luci-mod-admin-full=y +CONFIG_PACKAGE_luci-mod-network=y +CONFIG_PACKAGE_luci-mod-status=y +CONFIG_PACKAGE_luci-mod-system=y +CONFIG_PACKAGE_luci-proto-ipv6=y +CONFIG_PACKAGE_luci-proto-ppp=y + +### APPLICATION ### +CONFIG_PACKAGE_luci-app-adguardhome=y +CONFIG_PACKAGE_adguardhome=y +CONFIG_PACKAGE_luci-app-argon-config=y +CONFIG_PACKAGE_luci-app-arpbind=y +CONFIG_PACKAGE_luci-app-autoreboot=y +CONFIG_PACKAGE_luci-app-boostupnp=y +CONFIG_PACKAGE_luci-app-control-weburl=y +CONFIG_PACKAGE_luci-app-cpufreq=y +CONFIG_PACKAGE_luci-app-cpulimit=y +CONFIG_PACKAGE_luci-app-ddns=y +CONFIG_PACKAGE_ddns-scripts-cloudflare=y +CONFIG_PACKAGE_luci-app-frpc=y +CONFIG_PACKAGE_frpc=y +CONFIG_PACKAGE_luci-app-frps=y +CONFIG_PACKAGE_frps=y +CONFIG_PACKAGE_luci-app-jd-dailybonus=y +CONFIG_PACKAGE_luci-app-moschinadns=y +CONFIG_PACKAGE_luci-app-oled=y +CONFIG_PACKAGE_luci-app-openclash=y +CONFIG_PACKAGE_luci-app-opkg=y +#CONFIG_PACKAGE_luci-app-qbittorrent=y +CONFIG_PACKAGE_luci-app-ramfree=y +CONFIG_PACKAGE_luci-app-serverchan=y +CONFIG_PACKAGE_luci-app-smartdns=y +CONFIG_PACKAGE_luci-app-sqm=y +CONFIG_PACKAGE_luci-app-vlmcsd=y +CONFIG_PACKAGE_luci-app-vssr=y +CONFIG_PACKAGE_luci-app-ssr-plus=y +CONFIG_PACKAGE_luci-app-passwall=y +CONFIG_PACKAGE_luci-app-unblockneteasemusic=y +CONFIG_PACKAGE_luci-app-upnp=y +CONFIG_PACKAGE_luci-app-usb-printer=y +CONFIG_PACKAGE_luci-app-services-wolplus=y +CONFIG_PACKAGE_luci-app-wrtbwmon=y +CONFIG_PACKAGE_luci-app-xlnetacc=y +CONFIG_PACKAGE_luci-app-zerotier=y +CONFIG_PACKAGE_zerotier=y +CONFIG_PACKAGE_coremark=y +CONFIG_PACKAGE_htop=y +CONFIG_PACKAGE_subconverter=y + +### THEME ### +CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-theme-bootstrap=y + +### RESET ### +CONFIG_PACKAGE_kmod-gpio-button-hotplug=y + +### SHARE NETWORK ### +CONFIG_PACKAGE_usbmuxd=y +CONFIG_PACKAGE_kmod-usb-net-rndis=y +CONFIG_PACKAGE_kmod-usb-net-ipheth=y + +### CRYPTO ### +CONFIG_PACKAGE_kmod-crypto-acompress=y +CONFIG_PACKAGE_kmod-crypto-aead=y +CONFIG_PACKAGE_kmod-crypto-authenc=y +CONFIG_PACKAGE_kmod-crypto-cbc=y +CONFIG_PACKAGE_kmod-crypto-crc32c=y +CONFIG_PACKAGE_kmod-crypto-ctr=y +CONFIG_PACKAGE_kmod-crypto-deflate=y +CONFIG_PACKAGE_kmod-crypto-des=y +CONFIG_PACKAGE_kmod-crypto-ecb=y +CONFIG_PACKAGE_kmod-crypto-echainiv=y +CONFIG_PACKAGE_kmod-crypto-gcm=y +CONFIG_PACKAGE_kmod-crypto-gf128=y +CONFIG_PACKAGE_kmod-crypto-ghash=y +CONFIG_PACKAGE_kmod-crypto-hash=y +CONFIG_PACKAGE_kmod-crypto-hmac=y +CONFIG_PACKAGE_kmod-crypto-iv=y +CONFIG_PACKAGE_kmod-crypto-manager=y +CONFIG_PACKAGE_kmod-crypto-md5=y +CONFIG_PACKAGE_kmod-crypto-null=y +CONFIG_PACKAGE_kmod-crypto-pcompress=y +CONFIG_PACKAGE_kmod-crypto-rng=y +CONFIG_PACKAGE_kmod-crypto-seqiv=y +CONFIG_PACKAGE_kmod-crypto-sha1=y +CONFIG_PACKAGE_kmod-crypto-sha256=y +CONFIG_PACKAGE_kmod-crypto-wq=y +CONFIG_PACKAGE_kmod-cryptodev=y + +### OPENSSL ### +CONFIG_OPENSSL_ENGINE=y +CONFIG_OPENSSL_OPTIMIZE_SPEED=y +CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y +CONFIG_OPENSSL_WITH_ASM=y +# CONFIG_OPENSSL_WITH_ERROR_MESSAGES is not set +CONFIG_PACKAGE_libopenssl-devcrypto=y +CONFIG_PACKAGE_libopenssl-conf=y +CONFIG_PACKAGE_openssl-util=y +CONFIG_PACKAGE_libcurl=y +CONFIG_LIBCURL_OPENSSL=y +# CONFIG_LIBCURL_MBEDTLS is not set +# CONFIG_LIBCURL_WOLFSSL is not set +# CONFIG_LIBCURL_GNUTLS is not set +# CONFIG_LIBCURL_NOSSL is not set + + +### DOCKER ###(实验性,有需要的删掉下面两行的注释) +#CONFIG_PACKAGE_docker=y +#CONFIG_PACKAGE_luci-app-dockerman=y diff --git a/SEED/X86/config.seed b/SEED/X86/config.seed new file mode 100644 index 000000000..1f7988f5d --- /dev/null +++ b/SEED/X86/config.seed @@ -0,0 +1,150 @@ +### INITIALIZATION ### +CONFIG_KERNEL_BUILD_DOMAIN="buildhost" +CONFIG_KERNEL_BUILD_USER="builder" +CONFIG_TARGET_x86=y +CONFIG_TARGET_x86_64=y +CONFIG_TARGET_x86_64_Generic=y +CONFIG_TARGET_ROOTFS_PARTSIZE=960 +CONFIG_GRUB_TIMEOUT="0" +# CONFIG_COLLECT_KERNEL_DEBUG is not set + +### AGGRESSIVE ### +CONFIG_PACKAGE_node=y +CONFIG_NODEJS_14=y +#CONFIG_DEVEL=y +#CONFIG_TOOLCHAINOPTS=y +#CONFIG_GCC_USE_VERSION_9=y + +### BASIC ### +CONFIG_PACKAGE_addition-trans-zh=y +CONFIG_PACKAGE_autocore-x86=y +CONFIG_PACKAGE_ipv6helper=y +CONFIG_PACKAGE_cgi-io=y +CONFIG_PACKAGE_ethtool=y +CONFIG_PACKAGE_diffutils=y +CONFIG_PACKAGE_dnsmasq-full=y +CONFIG_PACKAGE_dnsmasq_full_auth=y +CONFIG_PACKAGE_dnsmasq_full_conntrack=y +CONFIG_PACKAGE_dnsmasq_full_dhcp=y +CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y +CONFIG_PACKAGE_dnsmasq_full_dnssec=y +CONFIG_PACKAGE_dnsmasq_full_ipset=y +CONFIG_PACKAGE_dnsmasq_full_noid=y +CONFIG_PACKAGE_dnsmasq_full_tftp=y +# CONFIG_PACKAGE_dnsmasq is not set +CONFIG_PACKAGE_iptables-mod-fullconenat=y +CONFIG_PACKAGE_ip6tables-mod-fullconenat=y +CONFIG_PACKAGE_iptables-mod-nat-extra=y +CONFIG_PACKAGE_kmod-fs-f2fs=y +CONFIG_PACKAGE_kmod-ipt-nat6=y +CONFIG_PACKAGE_kmod-tun=y +CONFIG_PACKAGE_kmod-shortcut-fe=y +CONFIG_PACKAGE_kmod-fast-classifier=y +# CONFIG_PACKAGE_kmod-shortcut-fe-cm is not set +CONFIG_PACKAGE_libiwinfo=y +CONFIG_PACKAGE_libiwinfo-lua=y +CONFIG_PACKAGE_liblua=y +CONFIG_PACKAGE_liblucihttp=y +CONFIG_PACKAGE_liblucihttp-lua=y +CONFIG_PACKAGE_libubus-lua=y +CONFIG_PACKAGE_libustream-openssl=y +# CONFIG_PACKAGE_libustream-wolfssl is not set +CONFIG_PACKAGE_rpcd=y +CONFIG_PACKAGE_rpcd-mod-file=y +CONFIG_PACKAGE_rpcd-mod-iwinfo=y +CONFIG_PACKAGE_rpcd-mod-luci=y +CONFIG_PACKAGE_rpcd-mod-rrdns=y +CONFIG_PACKAGE_uhttpd=y +CONFIG_PACKAGE_wget-ssl=y +CONFIG_PACKAGE_lua=y +CONFIG_PACKAGE_qemu-ga=y +CONFIG_PACKAGE_irqbalance=y + +### LUCI ### +CONFIG_LUCI_LANG_zh_Hans=y +# CONFIG_LUCI_CSSTIDY is not set +# CONFIG_LUCI_JSMIN is not set +CONFIG_PACKAGE_luci=y +CONFIG_PACKAGE_luci-app-firewall=y +CONFIG_PACKAGE_luci-base=y +CONFIG_PACKAGE_luci-compat=y +CONFIG_PACKAGE_luci-lib-ip=y +CONFIG_PACKAGE_luci-lib-ipkg=y +CONFIG_PACKAGE_luci-lib-jsonc=y +CONFIG_PACKAGE_luci-lib-nixio=y +CONFIG_PACKAGE_luci-mod-admin-full=y +CONFIG_PACKAGE_luci-mod-network=y +CONFIG_PACKAGE_luci-mod-status=y +CONFIG_PACKAGE_luci-mod-system=y +CONFIG_PACKAGE_luci-proto-ipv6=y +CONFIG_PACKAGE_luci-proto-ppp=y + +### APPLICATION ### +CONFIG_PACKAGE_luci-app-adguardhome=y +CONFIG_PACKAGE_adguardhome=y +CONFIG_PACKAGE_luci-app-argon-config=y +CONFIG_PACKAGE_luci-app-arpbind=y +CONFIG_PACKAGE_luci-app-autoreboot=y +CONFIG_PACKAGE_luci-app-boostupnp=y +CONFIG_PACKAGE_luci-app-control-weburl=y +CONFIG_PACKAGE_luci-app-cpufreq=y +CONFIG_PACKAGE_luci-app-cpulimit=y +CONFIG_PACKAGE_luci-app-ddns=y +CONFIG_PACKAGE_ddns-scripts-cloudflare=y +CONFIG_PACKAGE_luci-app-frpc=y +CONFIG_PACKAGE_frpc=y +CONFIG_PACKAGE_luci-app-frps=y +CONFIG_PACKAGE_frps=y +CONFIG_PACKAGE_luci-app-jd-dailybonus=y +CONFIG_PACKAGE_luci-app-moschinadns=y +CONFIG_PACKAGE_luci-app-oled=y +CONFIG_PACKAGE_luci-app-openclash=y +CONFIG_PACKAGE_luci-app-opkg=y +#CONFIG_PACKAGE_luci-app-qbittorrent=y +CONFIG_PACKAGE_luci-app-ramfree=y +CONFIG_PACKAGE_luci-app-serverchan=y +CONFIG_PACKAGE_luci-app-smartdns=y +CONFIG_PACKAGE_luci-app-sqm=y +CONFIG_PACKAGE_luci-app-vlmcsd=y +CONFIG_PACKAGE_luci-app-vssr=y +CONFIG_PACKAGE_luci-app-ssr-plus=y +CONFIG_PACKAGE_luci-app-passwall=y +CONFIG_PACKAGE_luci-app-unblockneteasemusic=y +CONFIG_PACKAGE_luci-app-upnp=y +CONFIG_PACKAGE_luci-app-usb-printer=y +CONFIG_PACKAGE_luci-app-services-wolplus=y +CONFIG_PACKAGE_luci-app-wrtbwmon=y +CONFIG_PACKAGE_luci-app-xlnetacc=y +CONFIG_PACKAGE_luci-app-zerotier=y +CONFIG_PACKAGE_zerotier=y +CONFIG_PACKAGE_coremark=y +CONFIG_PACKAGE_htop=y +CONFIG_PACKAGE_subconverter=y + +### THEME ### +CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-theme-bootstrap=y + +### SHARE NETWORK ### +CONFIG_PACKAGE_usbmuxd=y +CONFIG_PACKAGE_kmod-usb-net-rndis=y +CONFIG_PACKAGE_kmod-usb-net-ipheth=y + +### OPENSSL ### +CONFIG_OPENSSL_ENGINE=y +CONFIG_OPENSSL_OPTIMIZE_SPEED=y +CONFIG_OPENSSL_WITH_ASM=y +# CONFIG_OPENSSL_WITH_ERROR_MESSAGES is not set +CONFIG_PACKAGE_libopenssl-devcrypto=y +CONFIG_PACKAGE_libopenssl-conf=y +CONFIG_PACKAGE_openssl-util=y +CONFIG_PACKAGE_libcurl=y +CONFIG_LIBCURL_OPENSSL=y +# CONFIG_LIBCURL_MBEDTLS is not set +# CONFIG_LIBCURL_WOLFSSL is not set +# CONFIG_LIBCURL_GNUTLS is not set +# CONFIG_LIBCURL_NOSSL is not set + +### DOCKER ###(实验性,有需要的删掉下面两行的注释) +#CONFIG_PACKAGE_docker=y +#CONFIG_PACKAGE_luci-app-dockerman=y diff --git a/SWITCH b/SWITCH new file mode 100644 index 000000000..6b7e489a1 --- /dev/null +++ b/SWITCH @@ -0,0 +1 @@ +2020年8月17日