diff --git a/BSDmakefile b/BSDmakefile index c6a0425698..66fe08858f 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# + world ${.TARGETS}: @gmake $@ diff --git a/Config.in b/Config.in index d30c04839e..546e8249cc 100644 --- a/Config.in +++ b/Config.in @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006-2013 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# mainmenu "OpenWrt Configuration" diff --git a/Makefile b/Makefile index 0144b0c5ff..aecee6929e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,6 @@ -# Makefile for OpenWrt +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# TOPDIR:=${CURDIR} LC_ALL:=C diff --git a/README.md b/README.md index 6888a05a3f..a3d8549095 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# PROJECT OPENWRT -## The Source Code of OpenWrt-Lean Modified by CTCGFW +# PROJECT IMMORTALWRT +## The Core Source Code of ImmortalWrt ### Welcome to our Telegram Group: [@ctcgfw\_openwrt\_discuss](https://t.me/ctcgfw_openwrt_discuss). - - - @@ -24,7 +24,7 @@ sudo bash -c "bash <(curl -s https://build-scripts.project-openwrt.eu.org/init_b ## Clone the source ```bash -git clone -b openwrt-18.06-k5.4 --single-branch https://github.com/project-openwrt/openwrt && cd openwrt +git clone -b openwrt-18.06-k5.4 --single-branch https://github.com/immortalwrt/immortalwrt && cd immortalwrt ./scripts/feeds update -a && ./scripts/feeds install -a ``` @@ -35,7 +35,7 @@ make menuconfig ## Make it ```bash -make -j1 V=s +make -j$(nproc) V=s ``` ## Tips @@ -43,7 +43,7 @@ You'd better not use **root** to make it, or you may be not able to use.
Default login address: 192.168.1.1, username is **root** and password is **password**. # Contributed -### See [CONTRIBUTED.md](https://github.com/project-openwrt/openwrt/blob/openwrt-18.06/CONTRIBUTED.md). +### See [CONTRIBUTED.md](https://github.com/immortalwrt/immortalwrt/blob/openwrt-18.06/CONTRIBUTED.md). # License -### [GNU General Public License v3.0](https://github.com/project-openwrt/openwrt/blob/openwrt-18.06/LICENSE). +### [GNU General Public License v3.0](https://github.com/immortalwrt/immortalwrt/blob/openwrt-18.06/LICENSE). diff --git a/config/Config-build.in b/config/Config-build.in index 5540720c37..dd31427959 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006-2013 OpenWrt.org # Copyright (C) 2016 LEDE Project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# menu "Global build settings" diff --git a/config/Config-devel.in b/config/Config-devel.in index ff555b707b..57031d42f6 100644 --- a/config/Config-devel.in +++ b/config/Config-devel.in @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006-2013 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# menuconfig DEVEL bool "Advanced configuration options (for developers)" diff --git a/config/Config-images.in b/config/Config-images.in index 92fb3f28e2..f641d12079 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006-2013 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# menu "Target Images" diff --git a/config/Config-kernel.in b/config/Config-kernel.in index 0d6b4ec754..36d5e061d1 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# # Copyright (C) 2006-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# config KERNEL_BUILD_USER string "Custom Kernel Build User Name" @@ -989,6 +987,16 @@ config KERNEL_SECURITY_SELINUX_DEVELOP depends on KERNEL_SECURITY_SELINUX default y +config KERNEL_SECURITY_SELINUX_SIDTAB_HASH_BITS + int + depends on KERNEL_SECURITY_SELINUX + default 9 + +config KERNEL_SECURITY_SELINUX_SID2STR_CACHE_SIZE + int + depends on KERNEL_SECURITY_SELINUX + default 256 + config KERNEL_LSM string default "lockdown,yama,loadpin,safesetid,integrity,selinux" diff --git a/feeds.conf.default b/feeds.conf.default index 40511a8016..b3384a73a7 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://github.com/project-openwrt/packages.git;openwrt-18.06 -src-git luci https://github.com/project-openwrt/luci.git;openwrt-18.06 +src-git packages https://github.com/immortalwrt/packages.git;openwrt-18.06 +src-git luci https://github.com/immortalwrt/luci.git;openwrt-18.06 src-git routing https://github.com/openwrt-routing/packages.git src-git telephony https://github.com/openwrt/telephony.git diff --git a/include/autotools.mk b/include/autotools.mk index ae320fbde0..ec67c844f7 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2007-2020 OpenWrt.org autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2)) diff --git a/include/debug.mk b/include/debug.mk index 59a99c0f77..98a1d6e889 100644 --- a/include/debug.mk +++ b/include/debug.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2007-2020 OpenWrt.org # debug flags: # diff --git a/include/depends.mk b/include/depends.mk index ace7139000..0080b97876 100644 --- a/include/depends.mk +++ b/include/depends.mk @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2007-2020 OpenWrt.org + # define a dependency on a subtree # parameters: # 1: directories/files diff --git a/include/download.mk b/include/download.mk index d393bf3907..a638e69382 100644 --- a/include/download.mk +++ b/include/download.mk @@ -1,10 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2006-2012 OpenWrt.org # Copyright (C) 2016 LEDE project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# PROJECT_GIT = https://git.openwrt.org diff --git a/include/feeds.mk b/include/feeds.mk index 2b259b96b3..ef5fef7f4b 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -1,10 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2014 OpenWrt.org # Copyright (C) 2016 LEDE Project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TMP_DIR)/.packageauxvars diff --git a/include/hardening.mk b/include/hardening.mk index 4e49e6b1b9..6acd862f5c 100644 --- a/include/hardening.mk +++ b/include/hardening.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2015-2020 OpenWrt.org PKG_CHECK_FORMAT_SECURITY ?= 1 PKG_ASLR_PIE ?= 1 diff --git a/include/host-build.mk b/include/host-build.mk index ab6e05e14f..e4a5c48e72 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org include $(INCLUDE_DIR)/download.mk diff --git a/include/image.mk b/include/image.mk index 3298432a18..de08464b62 100644 --- a/include/image.mk +++ b/include/image.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org override TARGET_BUILD= include $(INCLUDE_DIR)/prereq.mk diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 14cfc1754f..32eb545b57 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org + include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/depends.mk diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index e46c8f1180..ca09bf0423 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifdef CONFIG_STRIP_KERNEL_EXPORTS KERNEL_MAKEOPTS += \ diff --git a/include/kernel-version.mk b/include/kernel-version.mk index e524308964..5861b03670 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -1,5 +1,5 @@ -# Use the default kernel version if the Makefile doesn't override it +# Use the default kernel version if the Makefile doesn't override it LINUX_RELEASE?=1 ifdef CONFIG_TESTING_KERNEL diff --git a/include/kernel.mk b/include/kernel.mk index 1466048b0c..d2a5b42138 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifneq ($(filter check,$(MAKECMDGOALS)),) CHECK:=1 diff --git a/include/netfilter.mk b/include/netfilter.mk index 75724968b0..ac05c6fd8c 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifneq ($(__inc_netfilter),1) __inc_netfilter:=1 diff --git a/include/nls.mk b/include/nls.mk index 04838821b4..742f8c25aa 100644 --- a/include/nls.mk +++ b/include/nls.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2011-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2011-2020 OpenWrt.org # iconv full ifeq ($(CONFIG_BUILD_NLS),y) diff --git a/include/package-bin.mk b/include/package-bin.mk index 4ae049af54..192f0726d2 100644 --- a/include/package-bin.mk +++ b/include/package-bin.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2007-2020 OpenWrt.org ifeq ($(DUMP),) define BuildTarget/bin diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 2a04bc17e9..3ee3a965f2 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org PKG_DEFAULT_DEPENDS = +libc +USE_GLIBC:librt +USE_GLIBC:libpthread diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk index ef98c482fb..30b0187f11 100644 --- a/include/package-dumpinfo.mk +++ b/include/package-dumpinfo.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifneq ($(DUMP),) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 32de3cc93e..ead4b5742c 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifndef DUMP include $(INCLUDE_DIR)/feeds.mk diff --git a/include/package-seccomp.mk b/include/package-seccomp.mk index fa49617d41..86e834450d 100644 --- a/include/package-seccomp.mk +++ b/include/package-seccomp.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2015-2020 OpenWrt.org PKG_CONFIG_DEPENDS+= CONFIG_KERNEL_SECCOMP diff --git a/include/package.mk b/include/package.mk index f413b4f1b3..7ed12dd042 100644 --- a/include/package.mk +++ b/include/package.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org __package_mk:=1 diff --git a/include/prereq-build.mk b/include/prereq-build.mk index fb11a070a1..6dce11cba2 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/prereq.mk diff --git a/include/prereq.mk b/include/prereq.mk index 6d14140792..c11178a884 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifneq ($(__prereq_inc),1) __prereq_inc:=1 diff --git a/include/quilt.mk b/include/quilt.mk index 56f674a2f3..00597ca0f2 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. +# Copyright (C) 2007-2020 OpenWrt.org ifeq ($(TARGET_BUILD),1) PKG_BUILD_DIR:=$(LINUX_DIR) diff --git a/include/subdir.mk b/include/subdir.mk index f01cd55f30..be080859b7 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2007-2020 OpenWrt.org ifeq ($(MAKECMDGOALS),prereq) SUBTARGETS:=prereq diff --git a/include/target.mk b/include/target.mk index 8185f836ec..530e711fa5 100644 --- a/include/target.mk +++ b/include/target.mk @@ -1,10 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2007-2008 OpenWrt.org # Copyright (C) 2016 LEDE Project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# ifneq ($(__target_inc),1) __target_inc=1 diff --git a/include/toolchain-build.mk b/include/toolchain-build.mk index 35d8c9380e..b7a253b71b 100644 --- a/include/toolchain-build.mk +++ b/include/toolchain-build.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2009-2020 OpenWrt.org override CONFIG_AUTOREBUILD= override CONFIG_AUTOREMOVE= diff --git a/include/toplevel.mk b/include/toplevel.mk index 23bae149d4..744695b19c 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -1,10 +1,6 @@ -# Makefile for OpenWrt -# -# Copyright (C) 2007-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. +# SPDX-License-Identifier: GPL-2.0-only # +# Copyright (C) 2007-2020 OpenWrt.org PREP_MK= OPENWRT_BUILD= QUIET=0 diff --git a/include/unpack.mk b/include/unpack.mk index 5bb27d41c9..6a56b8e742 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org HOST_TAR:=$(TAR) TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS) diff --git a/include/verbose.mk b/include/verbose.mk index d260080195..3ecf842d11 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2020 OpenWrt.org ifndef OPENWRT_VERBOSE OPENWRT_VERBOSE:= diff --git a/include/version.mk b/include/version.mk index b7f42e13bb..f39e35cd09 100644 --- a/include/version.mk +++ b/include/version.mk @@ -1,10 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2012-2015 OpenWrt.org # Copyright (C) 2016 LEDE Project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# # Substituted by SDK, do not remove # REVISION:=x diff --git a/package/ctcgfw/ChinaDNS/Makefile b/package/ctcgfw/ChinaDNS/Makefile index f449f798e6..83b7cd0bcd 100644 --- a/package/ctcgfw/ChinaDNS/Makefile +++ b/package/ctcgfw/ChinaDNS/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2014-2018 OpenWrt-dist # Copyright (C) 2014-2018 Jian Chang # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/annie/Makefile b/package/ctcgfw/annie/Makefile index b881ed8fa5..7416ab24bb 100644 --- a/package/ctcgfw/annie/Makefile +++ b/package/ctcgfw/annie/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile b/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile index 41b3f1045d..c2d36c1b7b 100644 --- a/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile +++ b/package/ctcgfw/brcmfmac4366c0-firmware-vendor/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/brook/Makefile b/package/ctcgfw/brook/Makefile index 24f6503ac1..b1b2249e8e 100644 --- a/package/ctcgfw/brook/Makefile +++ b/package/ctcgfw/brook/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/chinadns-ng/Makefile b/package/ctcgfw/chinadns-ng/Makefile index beeb887ce9..5b42212b80 100644 --- a/package/ctcgfw/chinadns-ng/Makefile +++ b/package/ctcgfw/chinadns-ng/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/cxxopts/Makefile b/package/ctcgfw/cxxopts/Makefile index af1f3d5b20..10b21e2bb0 100644 --- a/package/ctcgfw/cxxopts/Makefile +++ b/package/ctcgfw/cxxopts/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # (https://project-openwrt.eu.org) # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/filebrowser/Makefile b/package/ctcgfw/filebrowser/Makefile index 73722a71ab..d3072d1797 100644 --- a/package/ctcgfw/filebrowser/Makefile +++ b/package/ctcgfw/filebrowser/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 Project OpenWrt +# Copyright (C) 2021 ImmortalWrt # This is free software, licensed under the GNU General Public License v3. # See /LICENSE.txt for more information. # diff --git a/package/ctcgfw/filebrowser/files/filebrowser.init b/package/ctcgfw/filebrowser/files/filebrowser.init index db076123b5..fe9faf73ad 100755 --- a/package/ctcgfw/filebrowser/files/filebrowser.init +++ b/package/ctcgfw/filebrowser/files/filebrowser.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2019 [CTCGFW] Project OpenWRT +# Copyright (C) 2021 ImmortalWrt . /lib/functions.sh . /lib/functions/procd.sh diff --git a/package/ctcgfw/gost/Makefile b/package/ctcgfw/gost/Makefile index ee1e718ca6..1cb085d632 100644 --- a/package/ctcgfw/gost/Makefile +++ b/package/ctcgfw/gost/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/gost/files/gost.init b/package/ctcgfw/gost/files/gost.init index bdf00b4eb7..d3bbdc278e 100644 --- a/package/ctcgfw/gost/files/gost.init +++ b/package/ctcgfw/gost/files/gost.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Created By [CTCGFW]Project OpenWRT +# Created By ImmortalWrt # https://github.com/project-openwrt START=99 diff --git a/package/ctcgfw/gotop/Makefile b/package/ctcgfw/gotop/Makefile index e3bb14b0d2..463d6dcb31 100644 --- a/package/ctcgfw/gotop/Makefile +++ b/package/ctcgfw/gotop/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/gowebdav/Makefile b/package/ctcgfw/gowebdav/Makefile index 237c090b1e..561cdf548c 100644 --- a/package/ctcgfw/gowebdav/Makefile +++ b/package/ctcgfw/gowebdav/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/gowebdav/files/gowebdav.init b/package/ctcgfw/gowebdav/files/gowebdav.init index e0df0143b0..d1e3e04260 100755 --- a/package/ctcgfw/gowebdav/files/gowebdav.init +++ b/package/ctcgfw/gowebdav/files/gowebdav.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2020 [CTCGFW] Project OpenWRT +# Copyright (C) 2021 ImmortalWrt START=99 STOP=10 diff --git a/package/ctcgfw/ipt2socks-alt/Makefile b/package/ctcgfw/ipt2socks-alt/Makefile index e892f50959..cbb7ab1b18 100644 --- a/package/ctcgfw/ipt2socks-alt/Makefile +++ b/package/ctcgfw/ipt2socks-alt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/jpcre2/Makefile b/package/ctcgfw/jpcre2/Makefile index 5365f81dd7..2a021e86e2 100644 --- a/package/ctcgfw/jpcre2/Makefile +++ b/package/ctcgfw/jpcre2/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # (https://project-openwrt.eu.org) # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/lua-maxminddb/Makefile b/package/ctcgfw/lua-maxminddb/Makefile index af1f98e3c1..404323560e 100644 --- a/package/ctcgfw/lua-maxminddb/Makefile +++ b/package/ctcgfw/lua-maxminddb/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 jerryk # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/luci-app-baidupcs-web/Makefile b/package/ctcgfw/luci-app-baidupcs-web/Makefile index b94acea218..852179e3cc 100644 --- a/package/ctcgfw/luci-app-baidupcs-web/Makefile +++ b/package/ctcgfw/luci-app-baidupcs-web/Makefile @@ -2,7 +2,7 @@ # # # Copyright (C) 2020 KFERMercer -# Copyright (C) 2020 [CTCGFW] Project OpenWRT +# Copyright (C) 2021 ImmortalWrt # # THIS IS FREE SOFTWARE, LICENSED UNDER GPLv3. # diff --git a/package/ctcgfw/luci-app-baidupcs-web/luasrc/model/cbi/baidupcs-web.lua b/package/ctcgfw/luci-app-baidupcs-web/luasrc/model/cbi/baidupcs-web.lua index c693aad02d..c96dd58a17 100644 --- a/package/ctcgfw/luci-app-baidupcs-web/luasrc/model/cbi/baidupcs-web.lua +++ b/package/ctcgfw/luci-app-baidupcs-web/luasrc/model/cbi/baidupcs-web.lua @@ -1,7 +1,7 @@ --[[ Copyright (C) 2020 KFERMercer -Copyright (C) 2020 [CTCGFW] Project OpenWRT +Copyright (C) 2021 ImmortalWrt THIS IS FREE SOFTWARE, LICENSED UNDER GPLv3 diff --git a/package/ctcgfw/luci-app-filebrowser/Makefile b/package/ctcgfw/luci-app-filebrowser/Makefile index a34075954a..765e781c1f 100644 --- a/package/ctcgfw/luci-app-filebrowser/Makefile +++ b/package/ctcgfw/luci-app-filebrowser/Makefile @@ -1,6 +1,8 @@ -# Copyright (C) 2016 Openwrt.org # -# This is free software, licensed under the Apache License, Version 2.0 . +# Copyright (C) 2021 ImmortalWrt +# +# +# This is free software, licensed under the GNU General Public License v3. # include $(TOPDIR)/rules.mk @@ -14,7 +16,6 @@ PKG_VERSION:=snapshot PKG_RELEASE:=118071b PKG_LICENSE:=GPLv3 -PKG_MAINTAINER:=[CTCGFW] Project OpenWRT include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-gost/Makefile b/package/ctcgfw/luci-app-gost/Makefile index 6d6c372801..2c674d816e 100644 --- a/package/ctcgfw/luci-app-gost/Makefile +++ b/package/ctcgfw/luci-app-gost/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk @@ -14,7 +14,7 @@ LUCI_TITLE:=LuCI support for Gost LUCI_DEPENDS:=+gost LUCI_PKGARCH:=all -PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt +PKG_MAINTAINER:=ImmortalWrt include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-gost/luasrc/controller/gost.lua b/package/ctcgfw/luci-app-gost/luasrc/controller/gost.lua index aa37fce9ba..1105b08700 100644 --- a/package/ctcgfw/luci-app-gost/luasrc/controller/gost.lua +++ b/package/ctcgfw/luci-app-gost/luasrc/controller/gost.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt module("luci.controller.gost", package.seeall) diff --git a/package/ctcgfw/luci-app-gost/luasrc/model/cbi/gost.lua b/package/ctcgfw/luci-app-gost/luasrc/model/cbi/gost.lua index 0a4d53988f..116bd0dc9d 100644 --- a/package/ctcgfw/luci-app-gost/luasrc/model/cbi/gost.lua +++ b/package/ctcgfw/luci-app-gost/luasrc/model/cbi/gost.lua @@ -1,5 +1,5 @@ --- Created By [CTCGFW]Project-OpenWrt --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt mp = Map("gost", translate("Gost")) mp.description = translate("A simple security tunnel written in Golang.") diff --git a/package/ctcgfw/luci-app-gowebdav/Makefile b/package/ctcgfw/luci-app-gowebdav/Makefile index e17dd9cfd4..32aa0425ea 100644 --- a/package/ctcgfw/luci-app-gowebdav/Makefile +++ b/package/ctcgfw/luci-app-gowebdav/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk diff --git a/package/ctcgfw/luci-app-gowebdav/luasrc/model/cbi/gowebdav.lua b/package/ctcgfw/luci-app-gowebdav/luasrc/model/cbi/gowebdav.lua index a93f8de044..4a92e784ad 100644 --- a/package/ctcgfw/luci-app-gowebdav/luasrc/model/cbi/gowebdav.lua +++ b/package/ctcgfw/luci-app-gowebdav/luasrc/model/cbi/gowebdav.lua @@ -1,5 +1,5 @@ --- Created By [CTCGFW]Project-OpenWrt --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt m = Map("gowebdav", translate("GoWebDav"), translate("GoWebDav is a tiny, simple, fast WevDav server.")) diff --git a/package/ctcgfw/luci-app-naiveproxy/Makefile b/package/ctcgfw/luci-app-naiveproxy/Makefile index ae64510325..74ddc5be2a 100644 --- a/package/ctcgfw/luci-app-naiveproxy/Makefile +++ b/package/ctcgfw/luci-app-naiveproxy/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk diff --git a/package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua b/package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua index 39180ab190..b6897a8cbd 100644 --- a/package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua +++ b/package/ctcgfw/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt module("luci.controller.naiveproxy", package.seeall) diff --git a/package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua b/package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua index 5991a0d898..619b5bbb3e 100644 --- a/package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua +++ b/package/ctcgfw/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua @@ -1,5 +1,5 @@ --- Created By [CTCGFW]Project-OpenWrt --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt mp = Map("naiveproxy", translate("NaiveProxy")) mp.description = translate("NaïveProxy uses Chrome's network stack to camouflage traffic with strong censorship resistance and low detectability. Reusing Chrome's stack also ensures best practices in performance and security.") diff --git a/package/ctcgfw/luci-app-ssocks/Makefile b/package/ctcgfw/luci-app-ssocks/Makefile index 9feeaf3800..ba721b5a25 100644 --- a/package/ctcgfw/luci-app-ssocks/Makefile +++ b/package/ctcgfw/luci-app-ssocks/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk @@ -14,7 +14,7 @@ PKG_NAME:=luci-app-ssocks PKG_VERSION:=1.0 PKG_RELEASE:=1 -PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt +PKG_MAINTAINER:=ImmortalWrt include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-ssocks/luasrc/controller/ssocks.lua b/package/ctcgfw/luci-app-ssocks/luasrc/controller/ssocks.lua index 4fc9995c90..8af4b2a41f 100644 --- a/package/ctcgfw/luci-app-ssocks/luasrc/controller/ssocks.lua +++ b/package/ctcgfw/luci-app-ssocks/luasrc/controller/ssocks.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt module("luci.controller.ssocks", package.seeall) diff --git a/package/ctcgfw/luci-app-ssocks/luasrc/model/cbi/ssocks.lua b/package/ctcgfw/luci-app-ssocks/luasrc/model/cbi/ssocks.lua index 5a55c77cb2..3ff85a778b 100644 --- a/package/ctcgfw/luci-app-ssocks/luasrc/model/cbi/ssocks.lua +++ b/package/ctcgfw/luci-app-ssocks/luasrc/model/cbi/ssocks.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt mp = Map("ssocks", translate("sSocks Server")) mp.description = translate("sSocks Server is a simple, small, and easy-to-use Socks5 server program, but supports TCP on IPv4 only.") diff --git a/package/ctcgfw/luci-app-ssocks/root/etc/init.d/ssocks b/package/ctcgfw/luci-app-ssocks/root/etc/init.d/ssocks index 389a21ba85..4a20b65c72 100755 --- a/package/ctcgfw/luci-app-ssocks/root/etc/init.d/ssocks +++ b/package/ctcgfw/luci-app-ssocks/root/etc/init.d/ssocks @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common -# Created By [CTCGFW]Project OpenWRT -# https://github.com/project-openwrt +# Created By ImmortalWrt +# https://github.com/immortalwrt START=99 STOP=10 diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile index 7d0de70af3..8cf4b88b39 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk @@ -14,7 +14,7 @@ LUCI_TITLE:=LuCI support for UnblockNeteaseMusic(-Go) LUCI_DEPENDS:=+busybox +dnsmasq-full +ipset +iptables +wget LUCI_PKGARCH:=all -PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt +PKG_MAINTAINER:=ImmortalWrt include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua index 73460b723c..9def636203 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt module("luci.controller.unblockneteasemusic-mini", package.seeall) diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua index 8ce41be904..9b23d95916 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua @@ -1,8 +1,8 @@ --- Created By [CTCGFW]Project-OpenWrt --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt mp = Map("unblockneteasemusic-mini", translate("解除网易云音乐播放限制 (Mini)")) -mp.description = translate("原理:采用 [QQ/酷狗/酷我/咪咕] 等音源,替换网易云音乐 无版权/收费 歌曲链接
由 [CTCGFW]Project-OpenWrt & hyird & Sunsky 提供服务器支持
详细说明参见:https://github.com/project-openwrt/luci-app-unblockneteasemusic-mini") +mp.description = translate("原理:采用 [QQ/酷狗/酷我/咪咕] 等音源,替换网易云音乐 无版权/收费 歌曲链接
由 Project ImmortalWrt 提供服务器支持
详细说明参见:https://github.com/immortalwrt/luci-app-unblockneteasemusic-mini") mp:section(SimpleSection).template = "unblockneteasemusic-mini/unblockneteasemusic_mini_status" @@ -16,8 +16,7 @@ enable.default = 0 enable.rmempty = false select_server = s:option(ListValue, "select_server", translate("服务器位置")) -select_server:value("tencent_shanghai_nodejs", translate("[CTCGFW] 腾讯云上海(高音质)")) -select_server:value("ucloud_guangzhou_nodejs", translate("[CTCGFW] UCloud广州(高音质)")) +select_server:value("ucloud_guangzhou_nodejs", translate("UCloud广州(高音质)")) select_server.description = translate("请合理使用本插件与各个服务器,请勿滥用") select_server.default = "tencent_shanghai_nodejs" select_server.rmempty = false diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini index 7c6455bfc8..52ba64ce02 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common -# Created By [CTCGFW]Project OpenWRT -# https://github.com/project-openwrt +# Created By ImmortalWrt +# https://github.com/immortalwrt START=92 STOP=10 @@ -8,12 +8,7 @@ STOP=10 enable="$(uci get unblockneteasemusic-mini.@unblockneteasemusic-mini[0].enable)" select_server="$(uci get unblockneteasemusic-mini.@unblockneteasemusic-mini[0].select_server)" -if [ "${select_server}" = "tencent_shanghai_nodejs" ]; then - unblock_server_ip="$(ping "cdn-shanghai.service.project-openwrt.eu.org" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" - [ -z "${unblock_server_ip}" ] && unblock_server_ip="122.51.88.18" - unblock_server_http_port="30000" - unblock_server_https_port="30001" -elif [ "${select_server}" = "ucloud_guangzhou_nodejs" ]; then +if [ "${select_server}" = "ucloud_guangzhou_nodejs" ]; then unblock_server_ip="$(ping "uc-gz.service.project-openwrt.eu.org" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" [ -z "${unblock_server_ip}" ] && unblock_server_ip="106.75.156.183" unblock_server_http_port="30000" diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/Makefile b/package/ctcgfw/luci-app-unblockneteasemusic/Makefile index 788accc7e0..6cc5d7036f 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic/Makefile +++ b/package/ctcgfw/luci-app-unblockneteasemusic/Makefile @@ -2,7 +2,7 @@ # # This is a free software, use it under GNU General Public License v3.0. # -# Created By [CTCGFW]Project-OpenWrt +# Created By ImmortalWrt # https://github.com/project-openwrt include $(TOPDIR)/rules.mk @@ -14,7 +14,7 @@ PKG_NAME:=luci-app-unblockneteasemusic PKG_VERSION:=2.8 PKG_RELEASE:=8 -PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt +PKG_MAINTAINER:=ImmortalWrt include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua index 844816ab20..c2978f00ad 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/controller/unblockneteasemusic.lua @@ -1,6 +1,6 @@ -- This is a free software, use it under GNU General Public License v3.0. --- Created By [CTCGFW]Project OpenWRT --- https://github.com/project-openwrt +-- Created By ImmortalWrt +-- https://github.com/immortalwrt module("luci.controller.unblockneteasemusic", package.seeall) @@ -28,7 +28,7 @@ function act_status() end function update_luci() - luci_cloud_ver=luci.sys.exec("curl -s 'https://github.com/project-openwrt/luci-app-unblockneteasemusic/releases/latest'| grep -Eo '[0-9\.]+\-[0-9]+'") + luci_cloud_ver=luci.sys.exec("curl -s 'https://github.com/immortalwrt/luci-app-unblockneteasemusic/releases/latest'| grep -Eo '[0-9\.]+\-[0-9]+'") if not luci_cloud_ver then return "1" else diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua index dbc96c3883..68f56c0297 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic/luasrc/model/cbi/unblockneteasemusic.lua @@ -1,5 +1,5 @@ mp = Map("unblockneteasemusic", translate("解除网易云音乐播放限制")) -mp.description = translate("原理:采用 [QQ/虾米/百度/酷狗/酷我/咪咕/JOOX] 等音源,替换网易云音乐 无版权/收费 歌曲链接
具体使用方法参见:https://github.com/project-openwrt/luci-app-unblockneteasemusic") +mp.description = translate("原理:采用 [QQ/虾米/百度/酷狗/酷我/咪咕/JOOX] 等音源,替换网易云音乐 无版权/收费 歌曲链接
具体使用方法参见:https://github.com/immortalwrt/luci-app-unblockneteasemusic") mp:section(SimpleSection).template = "unblockneteasemusic/unblockneteasemusic_status" diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic index efca9ac4f8..dd32daf673 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common -# Created By [CTCGFW]Project OpenWRT -# https://github.com/project-openwrt +# Created By ImmortalWrt +# https://github.com/immortalwrt START=92 STOP=10 diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/gen_qq_provider.sh b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/gen_qq_provider.sh index e8fae9dbaf..0bdaa2496c 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/gen_qq_provider.sh +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/gen_qq_provider.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created By [CTCGFW]Project OpenWRT +# Created By ImmortalWrt # https://github.com/project-openwrt header="const cache = require('../cache') diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh index 4d51a68b00..ab25f24487 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/log_check.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created By [CTCGFW]Project OpenWRT +# Created By ImmortalWrt # https://github.com/project-openwrt NAME="unblockneteasemusic" diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh index fbf62c6d95..2355a48441 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created By [CTCGFW]Project OpenWRT +# Created By ImmortalWrt # https://github.com/project-openwrt NAME="unblockneteasemusic" diff --git a/package/ctcgfw/mentohust/Makefile b/package/ctcgfw/mentohust/Makefile index de2bbc9123..6bb9067bdb 100644 --- a/package/ctcgfw/mentohust/Makefile +++ b/package/ctcgfw/mentohust/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2014-2015 KyleRicardo # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/microsocks11/Makefile b/package/ctcgfw/microsocks11/Makefile index db34388e10..e81c268215 100644 --- a/package/ctcgfw/microsocks11/Makefile +++ b/package/ctcgfw/microsocks11/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # (https://project-openwrt.eu.org) # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/msgpack-c/Makefile b/package/ctcgfw/msgpack-c/Makefile index c78d7688da..d6a35d947d 100644 --- a/package/ctcgfw/msgpack-c/Makefile +++ b/package/ctcgfw/msgpack-c/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/mt7601u-ap/Makefile b/package/ctcgfw/mt7601u-ap/Makefile index 56fb9ae7ea..3a5a2e175f 100644 --- a/package/ctcgfw/mt7601u-ap/Makefile +++ b/package/ctcgfw/mt7601u-ap/Makefile @@ -1,7 +1,7 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # @@ -16,10 +16,9 @@ PKG_SOURCE_URL:=https://github.com/Anthony96922/mt7601u-ap.git PKG_SOURCE_VERSION:=624307427149e53b75937ccbe7cb235ec3ef2f58 PKG_MIRROR_HASH:=70e8f7e94ddca09e1f55ef1b30a47fa7c504750ec654bc0c500f1a3d491eca97 -PKG_MAINTAINER:=[CTCGFW] Project OpenWrt PKG_BUILD_PARALLEL:=1 -PKG_LICENSE:=GPLv2 +PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/kernel.mk diff --git a/package/ctcgfw/mwol/Makefile b/package/ctcgfw/mwol/Makefile index c2345a02c6..922384bd41 100644 --- a/package/ctcgfw/mwol/Makefile +++ b/package/ctcgfw/mwol/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2019 mleaf.org # 微信公众号【WiFi物联网】 # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/naiveproxy/Makefile b/package/ctcgfw/naiveproxy/Makefile index 910b92ccdb..8988bd288e 100644 --- a/package/ctcgfw/naiveproxy/Makefile +++ b/package/ctcgfw/naiveproxy/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/naiveproxy/files/naiveproxy.init b/package/ctcgfw/naiveproxy/files/naiveproxy.init index c524070f71..651b72a990 100644 --- a/package/ctcgfw/naiveproxy/files/naiveproxy.init +++ b/package/ctcgfw/naiveproxy/files/naiveproxy.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2010 [CTCGFW] Project OpenWRT +# Copyright (C) 2021 ImmortalWrt . /lib/functions.sh . /lib/functions/procd.sh diff --git a/package/ctcgfw/naiveproxy/src/init_env.sh b/package/ctcgfw/naiveproxy/src/init_env.sh index affd7f40f1..1aaf1760f7 100755 --- a/package/ctcgfw/naiveproxy/src/init_env.sh +++ b/package/ctcgfw/naiveproxy/src/init_env.sh @@ -1,5 +1,5 @@ #!/bin/bash -# [CTCGFW] Project-OpenWrt +# Project ImmortalWrt # Use it under GPLv3. # -------------------------------------------------------- # Init build dependencies for naiveproxy diff --git a/package/ctcgfw/nps/Makefile b/package/ctcgfw/nps/Makefile index 10bd40295e..3ff56868b4 100644 --- a/package/ctcgfw/nps/Makefile +++ b/package/ctcgfw/nps/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/parted/Makefile b/package/ctcgfw/parted/Makefile index 9f597d27db..7adb76f946 100644 --- a/package/ctcgfw/parted/Makefile +++ b/package/ctcgfw/parted/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/phicomm-k3screenctrl/Makefile b/package/ctcgfw/phicomm-k3screenctrl/Makefile index 9366893917..c730fa16de 100644 --- a/package/ctcgfw/phicomm-k3screenctrl/Makefile +++ b/package/ctcgfw/phicomm-k3screenctrl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/quickjs/Makefile b/package/ctcgfw/quickjs/Makefile index 9d48b3695e..6855bb46e9 100644 --- a/package/ctcgfw/quickjs/Makefile +++ b/package/ctcgfw/quickjs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/rapidjson/Makefile b/package/ctcgfw/rapidjson/Makefile index 85dcb6a59a..628cf0a645 100644 --- a/package/ctcgfw/rapidjson/Makefile +++ b/package/ctcgfw/rapidjson/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # (https://project-openwrt.eu.org) # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/rtl8189es/Makefile b/package/ctcgfw/rtl8189es/Makefile new file mode 100644 index 0000000000..ec0cf806b7 --- /dev/null +++ b/package/ctcgfw/rtl8189es/Makefile @@ -0,0 +1,72 @@ +# +# Copyright (C) 2021 ImmortalWrt +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=rtl8189es +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=https://github.com/jwrdegoede/rtl8189ES_linux.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2020-06-15 +PKG_SOURCE_VERSION:=42f293406700988c10655aaa5ee865b411389aeb +PKG_MIRROR_HASH:=1609e1dd2c8c7b664c9c012ff6b2f04d6a3989573d01b6e31e5988a88b2f8ef0 + +PKG_MAINTAINER:=Hauke Mehrtens +PKG_BUILD_PARALLEL:=1 + +STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h + +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/package.mk + +define KernelPackage/rtl8189es + SUBMENU:=Wireless Drivers + TITLE:=Realtek RTL8189ETV SDIO WiFi + DEPENDS:=+kmod-cfg80211 +kmod-mmc +@DRIVER_11N_SUPPORT + FILES:=$(PKG_BUILD_DIR)/rtl8189es.ko + AUTOLOAD:=$(call AutoProbe,rtl8189es) +endef + +NOSTDINC_FLAGS = \ + -I$(PKG_BUILD_DIR) \ + -I$(PKG_BUILD_DIR)/include \ + -I$(STAGING_DIR)/usr/include/mac80211-backport \ + -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \ + -I$(STAGING_DIR)/usr/include/mac80211 \ + -I$(STAGING_DIR)/usr/include/mac80211/uapi \ + -include backport/autoconf.h \ + -include backport/backport.h + +EXTRA_KCONFIG:= \ + CONFIG_RTL8189ES=m \ + USER_MODULE_NAME=rtl8189es + +EXTRA_CFLAGS:= \ + -DRTW_SINGLE_WIPHY \ + -DRTW_USE_CFG80211_STA_EVENT \ + -DCONFIG_IOCTL_CFG80211 + +MAKE_OPTS:= \ + $(KERNEL_MAKE_FLAGS) \ + M="$(PKG_BUILD_DIR)" \ + NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ + USER_EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ + $(EXTRA_KCONFIG) + +define Build/Compile + +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ + $(MAKE_OPTS) \ + modules +endef + +define KernelPackage/rtl8189es/install + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_DATA) ./files/50_rtl-wifi $(1)/etc/uci-defaults/ +endef + +$(eval $(call KernelPackage,rtl8189es)) diff --git a/package/ctcgfw/rtl8189es/files/50_rtl-wifi b/package/ctcgfw/rtl8189es/files/50_rtl-wifi new file mode 100644 index 0000000000..6214d8d071 --- /dev/null +++ b/package/ctcgfw/rtl8189es/files/50_rtl-wifi @@ -0,0 +1,6 @@ +#!/bin/sh + +sed -i '/iw dev "$wdev" del/d' /lib/netifd/wireless/mac80211.sh +ip link set dev wlan0 up + +exit 0 diff --git a/package/ctcgfw/rtl8189es/patches/001-use-kernel-byteorder.patch b/package/ctcgfw/rtl8189es/patches/001-use-kernel-byteorder.patch new file mode 100644 index 0000000000..9e4d3d1999 --- /dev/null +++ b/package/ctcgfw/rtl8189es/patches/001-use-kernel-byteorder.patch @@ -0,0 +1,15 @@ +Fix compile problem when rtw_byteorder.h and asm/byteorder.h gets +included in addition for example indirectly, do not use realtek own copy +of the byteorder headers. + +--- a/include/drv_types.h ++++ b/include/drv_types.h +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/package/ctcgfw/rtl8189es/patches/010-remove-repeat-flies.patch b/package/ctcgfw/rtl8189es/patches/010-remove-repeat-flies.patch new file mode 100644 index 0000000000..b017b641f5 --- /dev/null +++ b/package/ctcgfw/rtl8189es/patches/010-remove-repeat-flies.patch @@ -0,0 +1,39 @@ +From 9b2b0ec1bc2d31ddf93ed74d63fdfa6044e329a4 Mon Sep 17 00:00:00 2001 +From: Ben Greear +Date: Fri, 9 Nov 2018 16:21:43 -0800 +Subject: [PATCH] Fix build against openwrt backports tree. + +Like breaks builds elsewhere, can fix it up later. + +Signed-off-by: Ben Greear +--- + include/drv_conf.h | 4 +++- + .../{wireless.h => old_unused_rtl_wireless.h} | 0 + include/{autoconf.h => rtl_autoconf.h} | 0 + 3 files changed, 3 insertions(+), 1 deletions(-) + rename include/linux/{wireless.h => old_unused_rtl_wireless.h} (100%) + rename include/{autoconf.h => rtl_autoconf.h} (100%) + +diff --git a/include/drv_conf.h b/include/drv_conf.h +index 0d20a7e..f0a9f88 100644 +--- a/include/drv_conf.h ++++ b/include/drv_conf.h +@@ -19,7 +19,9 @@ + ******************************************************************************/ + #ifndef __DRV_CONF_H__ + #define __DRV_CONF_H__ +-#include "autoconf.h" ++ ++#include ++#include "rtl_autoconf.h" + #include "hal_ic_cfg.h" + + #if defined (PLATFORM_LINUX) && defined (PLATFORM_WINDOWS) +diff --git a/include/linux/wireless.h b/include/linux/old_unused_rtl_wireless.h +similarity index 100% +rename from include/linux/wireless.h +rename to include/linux/old_unused_rtl_wireless.h +diff --git a/include/autoconf.h b/include/rtl_autoconf.h +similarity index 100% +rename from include/autoconf.h +rename to include/rtl_autoconf.h diff --git a/package/ctcgfw/rtl8812au-ac/Makefile b/package/ctcgfw/rtl8812au-ac/Makefile index 07e931784b..4b3bd62e49 100644 --- a/package/ctcgfw/rtl8812au-ac/Makefile +++ b/package/ctcgfw/rtl8812au-ac/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 stepheny # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/rtl8821cu/Makefile b/package/ctcgfw/rtl8821cu/Makefile index b01246ed63..675b63bec6 100644 --- a/package/ctcgfw/rtl8821cu/Makefile +++ b/package/ctcgfw/rtl8821cu/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/rtl88x2bu/Makefile b/package/ctcgfw/rtl88x2bu/Makefile index 7d27ca8131..9968ee13ee 100644 --- a/package/ctcgfw/rtl88x2bu/Makefile +++ b/package/ctcgfw/rtl88x2bu/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/simple-obfs/Makefile b/package/ctcgfw/simple-obfs/Makefile index d422eba70a..032e4981f3 100644 --- a/package/ctcgfw/simple-obfs/Makefile +++ b/package/ctcgfw/simple-obfs/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2017-2019 Jian Chang # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/simple-torrent/Makefile b/package/ctcgfw/simple-torrent/Makefile index d83596b975..f9f4cfc021 100644 --- a/package/ctcgfw/simple-torrent/Makefile +++ b/package/ctcgfw/simple-torrent/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/ssocks/Makefile b/package/ctcgfw/ssocks/Makefile index 6d1b30048b..87a69ff0e9 100644 --- a/package/ctcgfw/ssocks/Makefile +++ b/package/ctcgfw/ssocks/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2017-2018 Jian Chang # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/sub-web/Makefile b/package/ctcgfw/sub-web/Makefile index de6cc81f80..eebbddd4dd 100644 --- a/package/ctcgfw/sub-web/Makefile +++ b/package/ctcgfw/sub-web/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # (https://project-openwrt.eu.org) # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/subconverter/Makefile b/package/ctcgfw/subconverter/Makefile index c3f24ec357..10ef886b97 100644 --- a/package/ctcgfw/subconverter/Makefile +++ b/package/ctcgfw/subconverter/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/subweb/Makefile b/package/ctcgfw/subweb/Makefile index be26faeac9..bfd6eff256 100644 --- a/package/ctcgfw/subweb/Makefile +++ b/package/ctcgfw/subweb/Makefile @@ -1,9 +1,10 @@ # -# Copyright (C) 2019 OpenWrt.org +# Copyright (C) 2021 ImmortalWrt # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # + include $(TOPDIR)/rules.mk PKG_NAME:=subweb @@ -19,7 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=[CTCGFW]Project OpenWrt PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/ctcgfw/tcping-simple/Makefile b/package/ctcgfw/tcping-simple/Makefile index 8962f1312a..48376395d4 100644 --- a/package/ctcgfw/tcping-simple/Makefile +++ b/package/ctcgfw/tcping-simple/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2014-2018 OpenWrt-dist -# Copyright (C) 2019 [CTCGFW]Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/tmate/Makefile b/package/ctcgfw/tmate/Makefile index cc65b77105..8bb674d83b 100644 --- a/package/ctcgfw/tmate/Makefile +++ b/package/ctcgfw/tmate/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/v2ray-plugin/Makefile b/package/ctcgfw/v2ray-plugin/Makefile index fbbdfeed5e..bb5d48ce52 100644 --- a/package/ctcgfw/v2ray-plugin/Makefile +++ b/package/ctcgfw/v2ray-plugin/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 SharerMax # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/verysync/Makefile b/package/ctcgfw/verysync/Makefile index d22823754c..186749439b 100644 --- a/package/ctcgfw/verysync/Makefile +++ b/package/ctcgfw/verysync/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/ctcgfw/webdav-go/Makefile b/package/ctcgfw/webdav-go/Makefile index 46ee6c27e3..ca6e39aeed 100644 --- a/package/ctcgfw/webdav-go/Makefile +++ b/package/ctcgfw/webdav-go/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/UnblockNeteaseMusic-Go/Makefile b/package/lean/UnblockNeteaseMusic-Go/Makefile index 7df39aef1e..210b843f85 100644 --- a/package/lean/UnblockNeteaseMusic-Go/Makefile +++ b/package/lean/UnblockNeteaseMusic-Go/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile index 22ff039ce1..da5bb98013 100644 --- a/package/lean/UnblockNeteaseMusic/Makefile +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/amule/Makefile b/package/lean/amule/Makefile index 81bca39550..4cd2d38e2d 100644 --- a/package/lean/amule/Makefile +++ b/package/lean/amule/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/antileech/Makefile b/package/lean/antileech/Makefile index 7291bfb08d..6948c267d2 100644 --- a/package/lean/antileech/Makefile +++ b/package/lean/antileech/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 50938bc75a..4ab0568c11 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 Lean # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. @@ -12,14 +12,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=37 +PKG_RELEASE:=39 include $(INCLUDE_DIR)/package.mk define Package/autocore-arm TITLE:=Arm auto core loadbalance script. MAINTAINER:=CN_SZTL - DEPENDS:=@(TARGET_bcm27xx||TARGET_bcm53xx||TARGET_mvebu||TARGET_ipq40xx||TARGET_ipq806x||TARGET_rockchip) \ + DEPENDS:=@(TARGET_bcm27xx||TARGET_bcm53xx||TARGET_ipq40xx||TARGET_ipq806x||TARGET_mvebu||TARGET_rockchip||TARGET_sunxi) \ +TARGET_bcm27xx:bcm27xx-userland \ +TARGET_bcm53xx:nvram \ +(TARGET_ipq40xx||TARGET_ipq806x):lm-sensors diff --git a/package/lean/autocore/files/arm/sbin/cpuinfo b/package/lean/autocore/files/arm/sbin/cpuinfo index aa830cfab7..148c6d5674 100755 --- a/package/lean/autocore/files/arm/sbin/cpuinfo +++ b/package/lean/autocore/files/arm/sbin/cpuinfo @@ -10,19 +10,26 @@ elif grep -q "bcm53xx" "/etc/openwrt_release"; then cpu_freq="$(nvram get clkfreq | awk -F ',' '{print $1}')MHz" elif grep -q "mvebu" "/etc/openwrt_release"; then cpu_freq="$(cat "/proc/cpuinfo" | grep "BogoMIPS" | sed -n "1p" | awk -F ': ' '{print $2}')MHz" -else - cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq) / 1000)MHz" - big_cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy4/cpuinfo_cur_freq 2>"/dev/null") / 1000 2>"/dev/null")" +elif [ -e "/sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq" ]; then + cpu_freq="$(expr $(cat "/sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq") / 1000)MHz" +elif [ -e "/sys/devices/system/cpu/cpufreq/policy4/cpuinfo_cur_freq" ]; then + big_cpu_freq="$(expr $(cat "/sys/devices/system/cpu/cpufreq/policy4/cpuinfo_cur_freq") / 1000)" [ -n "${big_cpu_freq}" ] && big_cpu_freq="${big_cpu_freq}MHz " fi -if grep -q "ipq" "/etc/openwrt_release"; then - echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq})" +if grep -q "bcm27xx" "/etc/openwrt_release"; then + cpu_temp="$(vcgencmd measure_temp | awk -F '=' '{print $2}' | awk -F "'" '{print $1}')°C" +else + [ -e "/sys/class/thermal/thermal_zone0/temp" ] && \ + cpu_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat "/sys/class/thermal/thermal_zone0/temp")/1000)}")°C" +fi + +if [ -z "${cpu_freq}" ] && [ -z "${cpu_temp}" ]; then + echo -n "${cpu_arch} x ${cpu_cores}" +elif [ -z "${cpu_temp}" ] || grep -q "ipq" "/etc/openwrt_release"; then + echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq})" +elif [ -z "${cpu_freq}" ]; then + echo -n "${cpu_arch} x ${cpu_cores} (${cpu_temp})" else - if grep -q "bcm27xx" "/etc/openwrt_release"; then - cpu_temp="$(vcgencmd measure_temp | awk -F '=' '{print $2}' | awk -F "'" '{print $1}')°C" - else - cpu_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C" - fi echo -n "${cpu_arch} x ${cpu_cores} (${big_cpu_freq}${cpu_freq}, ${cpu_temp})" fi diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index d5e525f92f..5b860174ae 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2021 Lean # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/dnsforwarder/Makefile b/package/lean/dnsforwarder/Makefile index c6e0957d3f..9cf3b16a0f 100644 --- a/package/lean/dnsforwarder/Makefile +++ b/package/lean/dnsforwarder/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/gmediarender/Makefile b/package/lean/gmediarender/Makefile index f2b03e39e8..85362ce15b 100644 --- a/package/lean/gmediarender/Makefile +++ b/package/lean/gmediarender/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 Lean # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/libcryptopp/Makefile b/package/lean/libcryptopp/Makefile index 076d450678..6dc1371bb3 100644 --- a/package/lean/libcryptopp/Makefile +++ b/package/lean/libcryptopp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua index 1ba920913c..6d77bba41a 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua @@ -21,7 +21,7 @@ end if nixio.fs.access("/usr/share/UnblockNeteaseMusic/app.js") then apptype:value("nodejs", translate("NodeJS 版本")) end -apptype:value("cloud", translate("云解锁( [CTCGFW] 云服务器)")) +apptype:value("cloud", translate("云解锁( 云服务器)")) speedtype = s:option(Value, "musicapptype", translate("音源选择")) speedtype:value("default", translate("默认")) @@ -38,7 +38,7 @@ speedtype:depends("apptype", "nodejs") speedtype:depends("apptype", "go") cloudserver = s:option(Value, "cloudserver", translate("服务器位置")) -cloudserver:value("uc-gz.service.project-openwrt.eu.org:30000:30001", translate("[CTCGFW] UCloud广州(高音质)")) +cloudserver:value("uc-gz.service.project-openwrt.eu.org:30000:30001", translate("[ImmortalWrt] UCloud广州(高音质)")) cloudserver.description = translate("自定义服务器格式为 IP[域名]:HTTP端口:HTTPS端口
如果服务器为LAN内网IP,需要将这个服务器IP放入例外客户端 (不代理HTTP和HTTPS)") cloudserver.default = "uc-gz.service.project-openwrt.eu.org:30000:30001" cloudserver.rmempty = true diff --git a/package/lean/microsocks/Makefile b/package/lean/microsocks/Makefile index 70d30bba5e..aaef0d8e47 100644 --- a/package/lean/microsocks/Makefile +++ b/package/lean/microsocks/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/n2n_v2/Makefile b/package/lean/n2n_v2/Makefile index 573624cd7f..0cefb43adf 100644 --- a/package/lean/n2n_v2/Makefile +++ b/package/lean/n2n_v2/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 - ntop.org and contributors # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/pandownload-fake-server/Makefile b/package/lean/pandownload-fake-server/Makefile index 45fd535844..fa1fd5f247 100644 --- a/package/lean/pandownload-fake-server/Makefile +++ b/package/lean/pandownload-fake-server/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/pdnsd-alt/Makefile b/package/lean/pdnsd-alt/Makefile index 9d36521274..474e17232a 100644 --- a/package/lean/pdnsd-alt/Makefile +++ b/package/lean/pdnsd-alt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/ps3netsrv/Makefile b/package/lean/ps3netsrv/Makefile index 2148839eeb..63dfdea806 100644 --- a/package/lean/ps3netsrv/Makefile +++ b/package/lean/ps3netsrv/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/shadowsocksr-libev/Makefile b/package/lean/shadowsocksr-libev/Makefile index ee46682b0c..013fb38710 100644 --- a/package/lean/shadowsocksr-libev/Makefile +++ b/package/lean/shadowsocksr-libev/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/tcpping/Makefile b/package/lean/tcpping/Makefile index c7c65de5e1..cc3ecbb72d 100644 --- a/package/lean/tcpping/Makefile +++ b/package/lean/tcpping/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lean/vlmcsd/Makefile b/package/lean/vlmcsd/Makefile index 617e9c1f5f..4f670b8c36 100644 --- a/package/lean/vlmcsd/Makefile +++ b/package/lean/vlmcsd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lienol/dns-forwarder/Makefile b/package/lienol/dns-forwarder/Makefile index 424ae7c09e..3f1371fe57 100644 --- a/package/lienol/dns-forwarder/Makefile +++ b/package/lienol/dns-forwarder/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2015 OpenWrt-dist # Copyright (C) 2015 Jian Chang # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lienol/dns2socks/Makefile b/package/lienol/dns2socks/Makefile index ef8cec73f6..383c544edf 100644 --- a/package/lienol/dns2socks/Makefile +++ b/package/lienol/dns2socks/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lienol/ipt2socks/Makefile b/package/lienol/ipt2socks/Makefile index b3aef05c75..90c0d1f0b6 100644 --- a/package/lienol/ipt2socks/Makefile +++ b/package/lienol/ipt2socks/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lienol/redsocks2/Makefile b/package/lienol/redsocks2/Makefile index 029bc90104..2fbe1a0f57 100644 --- a/package/lienol/redsocks2/Makefile +++ b/package/lienol/redsocks2/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/lienol/tcping/Makefile b/package/lienol/tcping/Makefile index 749cabd4b8..ee6b59d258 100644 --- a/package/lienol/tcping/Makefile +++ b/package/lienol/tcping/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2021 CTCGFW Project-OpenWrt +# Copyright (C) 2021 ImmortalWrt # # # This is free software, licensed under the GNU General Public License v3. diff --git a/package/system/selinux-policy/Makefile b/package/system/selinux-policy/Makefile index 491b26a83e..8f5a290fa6 100644 --- a/package/system/selinux-policy/Makefile +++ b/package/system/selinux-policy/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=selinux-policy PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.defensec.nl/selinux-policy.git -PKG_VERSION:=0.5 -PKG_MIRROR_HASH:=c96a8cf7ac3445c52a28150c5000a55bde8112402bc77ccfee825cff0bdc8a03 +PKG_VERSION:=0.6 +PKG_MIRROR_HASH:=55a27eab67f39a03ba586691984a04234d16b97e816bca17ac42c94aae01c3c6 PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host diff --git a/rules.mk b/rules.mk index 7d7851e32e..15af58e157 100644 --- a/rules.mk +++ b/rules.mk @@ -1,10 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2016 LEDE Project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# ifneq ($(__rules_inc),1) __rules_inc=1 diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile index 9e0e83474d..58654b3b15 100644 --- a/target/linux/sunxi/Makefile +++ b/target/linux/sunxi/Makefile @@ -26,7 +26,7 @@ KERNELNAME:=zImage dtbs include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += uboot-envtools +DEFAULT_PACKAGES += autocore-arm uboot-envtools DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs $(eval $(call BuildTarget))