Merge Mainline

This commit is contained in:
AmadeusGhost 2021-02-06 18:50:03 +08:00
commit 9d29451fe9
139 changed files with 365 additions and 325 deletions

View File

@ -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 $@

View File

@ -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"

View File

@ -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

View File

@ -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.<br/>
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).

View File

@ -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"

View File

@ -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)"

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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))

View File

@ -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:
#

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 += \

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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),)

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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=

View File

@ -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

View File

@ -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)

View File

@ -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:=

View File

@ -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

View File

@ -2,7 +2,7 @@
# Copyright (C) 2014-2018 OpenWrt-dist
# Copyright (C) 2014-2018 Jian Chang <aa65535@live.com>
#
# 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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.
#

View File

@ -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

View File

@ -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.

View File

@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common
# Created By [CTCGFW]Project OpenWRT
# Created By ImmortalWrt
# https://github.com/project-openwrt
START=99

View File

@ -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.

View File

@ -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.

View File

@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2020 [CTCGFW] Project OpenWRT
# Copyright (C) 2021 ImmortalWrt
START=99
STOP=10

View File

@ -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.

View File

@ -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.

View File

@ -1,7 +1,7 @@
#
# Copyright (C) 2020 jerryk <jerrykuku@qq.com>
#
# 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.

View File

@ -2,7 +2,7 @@
# <https://github.com/KFERMercer/luci-app-baidupcs-web>
#
# Copyright (C) 2020 KFERMercer <KFER.Mercer@gmail.com>
# Copyright (C) 2020 [CTCGFW] Project OpenWRT
# Copyright (C) 2021 ImmortalWrt
#
# THIS IS FREE SOFTWARE, LICENSED UNDER GPLv3.
#

View File

@ -1,7 +1,7 @@
--[[
Copyright (C) 2020 KFERMercer <KFER.Mercer@gmail.com>
Copyright (C) 2020 [CTCGFW] Project OpenWRT
Copyright (C) 2021 ImmortalWrt
THIS IS FREE SOFTWARE, LICENSED UNDER GPLv3

View File

@ -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
# <https://project-openwrt.eu.org>
#
# 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

View File

@ -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

View File

@ -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)

View File

@ -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.")

View File

@ -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

View File

@ -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."))

View File

@ -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

View File

@ -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)

View File

@ -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.")

View File

@ -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

View File

@ -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)

View File

@ -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.")

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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/酷狗/酷我/咪咕] 等音源,替换网易云音乐 无版权/收费 歌曲链接<br/>由 [CTCGFW]Project-OpenWrt & hyird & Sunsky 提供服务器支持<br/>详细说明参见https://github.com/project-openwrt/luci-app-unblockneteasemusic-mini")
mp.description = translate("原理:采用 [QQ/酷狗/酷我/咪咕] 等音源,替换网易云音乐 无版权/收费 歌曲链接<br/>由 Project ImmortalWrt 提供服务器支持<br/>详细说明参见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

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -1,5 +1,5 @@
mp = Map("unblockneteasemusic", translate("解除网易云音乐播放限制"))
mp.description = translate("原理:采用 [QQ/虾米/百度/酷狗/酷我/咪咕/JOOX] 等音源,替换网易云音乐 无版权/收费 歌曲链接<br/>具体使用方法参见https://github.com/project-openwrt/luci-app-unblockneteasemusic")
mp.description = translate("原理:采用 [QQ/虾米/百度/酷狗/酷我/咪咕/JOOX] 等音源,替换网易云音乐 无版权/收费 歌曲链接<br/>具体使用方法参见https://github.com/immortalwrt/luci-app-unblockneteasemusic")
mp:section(SimpleSection).template = "unblockneteasemusic/unblockneteasemusic_status"

View File

@ -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

View File

@ -1,5 +1,5 @@
#!/bin/bash
# Created By [CTCGFW]Project OpenWRT
# Created By ImmortalWrt
# https://github.com/project-openwrt
header="const cache = require('../cache')

View File

@ -1,5 +1,5 @@
#!/bin/bash
# Created By [CTCGFW]Project OpenWRT
# Created By ImmortalWrt
# https://github.com/project-openwrt
NAME="unblockneteasemusic"

View File

@ -1,5 +1,5 @@
#!/bin/bash
# Created By [CTCGFW]Project OpenWRT
# Created By ImmortalWrt
# https://github.com/project-openwrt
NAME="unblockneteasemusic"

View File

@ -1,7 +1,7 @@
#
# Copyright (C) 2014-2015 KyleRicardo
#
# 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.

View File

@ -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.

View File

@ -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.

View File

@ -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

View File

@ -2,7 +2,7 @@
# Copyright (C) 2019 mleaf.org
# 微信公众号【WiFi物联网】
#
# 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.

View File

@ -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.

View File

@ -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

View File

@ -1,5 +1,5 @@
#!/bin/bash
# [CTCGFW] Project-OpenWrt
# Project ImmortalWrt
# Use it under GPLv3.
# --------------------------------------------------------
# Init build dependencies for naiveproxy

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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 <hauke@hauke-m.de>
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))

View File

@ -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

View File

@ -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 <drv_conf.h>
#include <basic_types.h>
#include <osdep_service.h>
-#include <rtw_byteorder.h>
+#include <asm/byteorder.h>
#include <wlan_bssdef.h>
#include <wifi.h>
#include <ieee80211.h>

View File

@ -0,0 +1,39 @@
From 9b2b0ec1bc2d31ddf93ed74d63fdfa6044e329a4 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
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 <greearb@candelatech.com>
---
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 <generated/autoconf.h>
+#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

View File

@ -1,7 +1,7 @@
#
# Copyright (C) 2020 stepheny
#
# 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.

View File

@ -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.

Some files were not shown because too many files have changed in this diff Show More