diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index 0b385b9d4e..e501db0acd 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings PKG_VERSION:=1.0 -PKG_RELEASE:=37 +PKG_RELEASE:=38 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index ec90be2ada..c63a858a04 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -1,168 +1,69 @@ # -# Copyright (C) 2019 Xingwang Liao +# Copyright (C) 2015-2016 OpenWrt.org # -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. +# This is free software, licensed under the GNU General Public License v3. # include $(TOPDIR)/rules.mk -PKG_NAME:=v2ray-core -PKG_VERSION:=4.18.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/v2ray/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=eb66df1586720e8f375f29075ba905b694caa550ce2a322a2a26660408b37304 - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Xingwang Liao - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=v2ray.com/core +PKG_NAME:=v2ray +PKG_VERSION:=v4.19 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk -define Package/v2ray-core/Default - TITLE:=A platform for building proxies - URL:=https://www.v2ray.com +define Package/$(PKG_NAME) + SECTION:=net + CATEGORY:=Network + TITLE:=V2Ray is a cross-platform proxy software + DEPENDS:=+ca-certificates + URL:=https://github.com/v2ray/v2ray-core endef -define Package/v2ray-core/Default/description -Project V is a set of network tools that help you to build your own computer network. -It secures your network connections and thus protects your privacy. + +define Package/$(PKG_NAME)/description +V2Ray is a cross-platform proxy software endef -define project-v/SubMenu - SECTION:=net - CATEGORY:=Network - SUBMENU:=Project V -endef +ifeq ($(ARCH),x86_64) + PKG_ARCH_V2RAY:=amd64 +endif +ifeq ($(ARCH),mipsel) + PKG_ARCH_V2RAY:=mipsle +endif +ifeq ($(ARCH),mips) + PKG_ARCH_V2RAY:=mips +endif +ifeq ($(ARCH),i386) + PKG_ARCH_V2RAY:=x86 +endif +ifeq ($(ARCH),arm) + PKG_ARCH_V2RAY:=arm +endif +ifeq ($(ARCH),aarch64) + PKG_ARCH_V2RAY:=arm64 +endif -define v2ray-core/GoBinDefault - $(call Package/v2ray-core/Default) - $(call project-v/SubMenu) - USERID:=v2ray=10800:v2ray=10800 - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define v2ray-core/templates - define Package/$(1) - $$(call v2ray-core/GoBinDefault) - TITLE+= ($(1)) - DEPENDS:=+ca-certificates - endef - - define Package/$(1)/description - $$(call Package/v2ray-core/Default/description) - - This package contains the $(1). - endef - - define Package/$(1)/install - $$(INSTALL_DIR) $$(1)/usr/bin/v2ray - $$(INSTALL_BIN) $$(GO_PKG_BUILD_BIN_DIR)/$(1) $$(1)/usr/bin/v2ray - endef -endef - -V2RAY_COMPONENTS:=v2ray v2ctl - -$(foreach component,$(V2RAY_COMPONENTS), \ - $(eval $(call v2ray-core/templates,$(component))) \ -) - -define Package/v2ray-assets - $(call Package/v2ray-core/Default) - $(call project-v/SubMenu) - TITLE+= (geoip & geosite) -endef - -define Package/v2ray-assets/description -$(call Package/v2ray-core/Default/description) - - This package contains geoip.dat & geosite.dat. -endef - -define Package/v2ray-assets/install - $(INSTALL_DIR) $(1)/usr/bin/v2ray - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/release/config/{geoip,geosite}.dat \ - $(1)/usr/bin/v2ray -endef - -define Package/v2ray-core -$(call v2ray-core/GoBinDefault) - TITLE+= (full) - PROVIDES:=$(V2RAY_COMPONENTS) v2ray-assets - DEPENDS:=+ca-certificates -endef - -define Package/v2ray-core/description -$(call Package/v2ray-core/Default/description) - - This package contains v2ray, v2ctl and v2ray-assets. -endef - -define Package/v2ray-core/install -$(call Package/v2ray-assets/install,$(1)) - $(INSTALL_DIR) $(1)/usr/bin/v2ray - ( \ - for component in $(V2RAY_COMPONENTS); do \ - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/$$$$component $(1)/usr/bin/v2ray ; \ - done ; \ - ) -endef - -define Package/golang-v2ray-core-dev -$(call Package/v2ray-core/Default) -$(call GoPackage/GoSubMenu) - TITLE+= (source files) - PKGARCH:=all -endef - -define Package/golang-v2ray-core-dev/description -$(call Package/v2ray-core/Default/description) - -This package provides the source files for v2ray-core. -endef +ifeq ($(ARCH),arm) + ifneq ($(BOARD),bcm53xx) + V2RAY_BIN:=v2ray_armv7 + endif +else + V2RAY_BIN:=v2ray +endif define Build/Prepare - $(Build/Prepare/Default) - ( \ - sed -i \ - 's/\(version[[:space:]]*=[[:space:]]*"\).*\("\)/\1$(PKG_VERSION)\2/' \ - $(PKG_BUILD_DIR)/core.go ; \ - build="Lean's custom build - Release $(PKG_RELEASE)" ; \ - sed -i \ - "s/\(build[[:space:]]*=[[:space:]]*\"\).*\(\"\)/\1$$$$build\2/" \ - $(PKG_BUILD_DIR)/core.go ; \ - $(CP) ./all.go $(PKG_BUILD_DIR)/main/distro/all/all.go ; \ - ) +endef + +define Build/Configure endef define Build/Compile - $(eval GO_PKG_BUILD_PKG:=v2ray.com/core/main) - $(call GoPackage/Build/Compile,-ldflags "-s -w") - mv -f $(GO_PKG_BUILD_BIN_DIR)/main $(GO_PKG_BUILD_BIN_DIR)/v2ray - - $(eval GO_PKG_BUILD_PKG:=v2ray.com/core/infra/control/main) - $(call GoPackage/Build/Compile,-ldflags "-s -w") - mv -f $(GO_PKG_BUILD_BIN_DIR)/main $(GO_PKG_BUILD_BIN_DIR)/v2ctl endef +define Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/usr/bin/v2ray + $(INSTALL_BIN) ./files/$(PKG_ARCH_V2RAY)/$(V2RAY_BIN) $(1)/usr/bin/v2ray/v2ray +endef -$(foreach component,$(V2RAY_COMPONENTS), \ - $(eval $(call GoBinPackage,$(component))) \ - $(eval $(call BuildPackage,$(component))) \ -) -$(eval $(call BuildPackage,v2ray-assets)) - -$(eval $(call GoBinPackage,v2ray-core)) -$(eval $(call BuildPackage,v2ray-core)) -$(eval $(call GoSrcPackage,golang-v2ray-core-dev)) -$(eval $(call BuildPackage,golang-v2ray-core-dev)) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lean/v2ray/all.go b/package/lean/v2ray/all.go deleted file mode 100644 index bdb1dd4e27..0000000000 --- a/package/lean/v2ray/all.go +++ /dev/null @@ -1,64 +0,0 @@ -package all - -import ( - // The following are necessary as they register handlers in their init functions. - - // Required features. Can't remove unless there is replacements. - _ "v2ray.com/core/app/dispatcher" - _ "v2ray.com/core/app/proxyman/inbound" - _ "v2ray.com/core/app/proxyman/outbound" - - // Default commander and all its services. This is an optional feature. - _ "v2ray.com/core/app/commander" - _ "v2ray.com/core/app/log/command" - _ "v2ray.com/core/app/proxyman/command" - _ "v2ray.com/core/app/stats/command" - - // Other optional features. - // _ "v2ray.com/core/app/dns" - // _ "v2ray.com/core/app/log" - // _ "v2ray.com/core/app/policy" - _ "v2ray.com/core/app/reverse" - // _ "v2ray.com/core/app/router" - // _ "v2ray.com/core/app/stats" - - // Inbound and outbound proxies. - // _ "v2ray.com/core/proxy/blackhole" - // _ "v2ray.com/core/proxy/dns" - _ "v2ray.com/core/proxy/dokodemo" - _ "v2ray.com/core/proxy/freedom" - _ "v2ray.com/core/proxy/http" - _ "v2ray.com/core/proxy/mtproto" - // _ "v2ray.com/core/proxy/shadowsocks" - _ "v2ray.com/core/proxy/socks" - _ "v2ray.com/core/proxy/vmess/inbound" - _ "v2ray.com/core/proxy/vmess/outbound" - - // Transports - _ "v2ray.com/core/transport/internet/domainsocket" - _ "v2ray.com/core/transport/internet/http" - _ "v2ray.com/core/transport/internet/kcp" - _ "v2ray.com/core/transport/internet/quic" - _ "v2ray.com/core/transport/internet/tcp" - _ "v2ray.com/core/transport/internet/tls" - _ "v2ray.com/core/transport/internet/udp" - _ "v2ray.com/core/transport/internet/websocket" - - // Transport headers - _ "v2ray.com/core/transport/internet/headers/http" - _ "v2ray.com/core/transport/internet/headers/noop" - _ "v2ray.com/core/transport/internet/headers/srtp" - _ "v2ray.com/core/transport/internet/headers/tls" - _ "v2ray.com/core/transport/internet/headers/utp" - _ "v2ray.com/core/transport/internet/headers/wechat" - _ "v2ray.com/core/transport/internet/headers/wireguard" - - // JSON config support. Choose only one from the two below. - // The following line loads JSON from v2ctl - // _ "v2ray.com/core/main/json" - // The following line loads JSON internally - _ "v2ray.com/core/main/jsonem" - - // Load config from file or http(s) - _ "v2ray.com/core/main/confloader/external" -) diff --git a/package/lean/v2ray/files/amd64/v2ray b/package/lean/v2ray/files/amd64/v2ray new file mode 100644 index 0000000000..3c8e0641b7 Binary files /dev/null and b/package/lean/v2ray/files/amd64/v2ray differ diff --git a/package/lean/v2ray/files/arm/v2ray b/package/lean/v2ray/files/arm/v2ray new file mode 100644 index 0000000000..70bdd4a0a2 Binary files /dev/null and b/package/lean/v2ray/files/arm/v2ray differ diff --git a/package/lean/v2ray/files/arm/v2ray_armv7 b/package/lean/v2ray/files/arm/v2ray_armv7 new file mode 100644 index 0000000000..a07dbbc3e5 Binary files /dev/null and b/package/lean/v2ray/files/arm/v2ray_armv7 differ diff --git a/package/lean/v2ray/files/arm64/v2ray b/package/lean/v2ray/files/arm64/v2ray new file mode 100644 index 0000000000..d7a961696e Binary files /dev/null and b/package/lean/v2ray/files/arm64/v2ray differ diff --git a/package/lean/v2ray/files/mips/v2ray b/package/lean/v2ray/files/mips/v2ray new file mode 100644 index 0000000000..1586824579 Binary files /dev/null and b/package/lean/v2ray/files/mips/v2ray differ diff --git a/package/lean/v2ray/files/mipsle/v2ray b/package/lean/v2ray/files/mipsle/v2ray new file mode 100644 index 0000000000..8e68ce0cb7 Binary files /dev/null and b/package/lean/v2ray/files/mipsle/v2ray differ diff --git a/package/lean/v2ray/files/x86/v2ray b/package/lean/v2ray/files/x86/v2ray new file mode 100644 index 0000000000..092669bc11 Binary files /dev/null and b/package/lean/v2ray/files/x86/v2ray differ diff --git a/package/mtk/drivers/mt_wifi/config.in b/package/mtk/drivers/mt_wifi/config.in index 3f0a98e7d5..947f289495 100644 --- a/package/mtk/drivers/mt_wifi/config.in +++ b/package/mtk/drivers/mt_wifi/config.in @@ -589,7 +589,6 @@ choice config MTK_WIFI_MODE_AP tristate "AP" select MTK_MT_AP_SUPPORT - default y config MTK_WIFI_MODE_STA tristate "STA"