From 63bf03661788ba0158b63f2140e6703a447b4b29 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 21 Mar 2023 22:14:25 +0800 Subject: [PATCH] sagernet-core: remove package Signed-off-by: Tianling Shen --- sagernet-core/Makefile | 112 --------------------------- sagernet-core/patches/100-obfs.patch | 59 -------------- 2 files changed, 171 deletions(-) delete mode 100644 sagernet-core/Makefile delete mode 100644 sagernet-core/patches/100-obfs.patch diff --git a/sagernet-core/Makefile b/sagernet-core/Makefile deleted file mode 100644 index 7f1b2f059..000000000 --- a/sagernet-core/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-only -# -# Copyright (C) 2021 ImmortalWrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=sagernet-core -BASE_VERSION:=5.0.17 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/SagerNet/v2ray-core.git -PKG_SOURCE_DATE:=2022-07-30 -PKG_SOURCE_VERSION:=26e36b1cb46f387cacd65c1a5900be592913f842 -PKG_MIRROR_HASH:=f8968ef7df8775f28c30f8115e2ce2e9324b1753526af6c89631edf1b1f56f8d -PKG_VERSION:=$(BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION)) - -PKG_LICENSE:=GPL-3.0-or-later -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Tianling Shen - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/v2fly/v2ray-core/v5 -GO_PKG_BUILD_PKG:=$(GO_PKG)/main -GO_PKG_LDFLAGS_X:= \ - $(GO_PKG).build=OpenWrt \ - $(GO_PKG).version=$(BASE_VERSION) - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/sagernet/template - TITLE:=An enhanced v2ray edition for SagerNet - SECTION:=net - CATEGORY:=Network - URL:=https://sagernet.org -endef - -define Package/sagernet-core - $(call Package/sagernet/template) - DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle - CONFLICTS:=v2ray-core xray-core -endef - -define Package/sagernet-extra - $(call Package/sagernet/template) - TITLE+= (extra resources) - DEPENDS:=sagernet-core - CONFLICTS:=v2ray-extra - PKGARCH:=all -endef - -define Package/sagernet/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. -endef - -define Package/sagernet-core/description - $(call Package/sagernet/description) - - This is a v2ray-core fork for SagerNet. -endef - -define Package/sagernet-extra/description - $(call Package/sagernet/description) - - This includes extra resources for sagernet-core. -endef - -LIBCORE_NAME:=LibSagerNetCore -LIBCORE_DATE:=2022-06-10 -LIBCORE_VERSION:=9ef7ab1de7604ab959222d4de8ab6152a402e432 -LIBCORE_FILE:=$(LIBCORE_NAME)-$(LIBCORE_DATE)-$(call version_abbrev,$(LIBCORE_VERSION)).tar.xz -define Download/libcore - PROTO:=git - URL:=https://github.com/SagerNet/LibSagerNetCore.git - VERSION:=$(LIBCORE_VERSION) - FILE:=$(LIBCORE_FILE) - SUBDIR:=$(LIBCORE_NAME) - MIRROR_HASH:=9420189c45d5fbe682acee1da0b8f727cc5ea8c847ceeff5b026cd71ce60cf0f -endef - -define Build/Prepare - $(call Build/Prepare/Default) - - xzcat $(DL_DIR)/$(LIBCORE_FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) - $(CP) $(PKG_BUILD_DIR)/$(LIBCORE_NAME)/{obfs,ssr}.go \ - $(PKG_BUILD_DIR)/proxy/shadowsocks/plugin/self/ - $(SED) '/plugin\/self/d' -e 's/self.ParsePluginOptions/ParsePluginOptions/g' \ - $(PKG_BUILD_DIR)/proxy/shadowsocks/plugin/self/obfs.go - $(SED) 's/package libcore/package self/g' \ - $(PKG_BUILD_DIR)/proxy/shadowsocks/plugin/self/{obfs,ssr}.go -endef - -define Package/sagernet-core/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/main $(1)/usr/bin/v2ray - $(LN) v2ray $(1)/usr/bin/xray -endef - -define Package/sagernet-extra/install - $(INSTALL_DIR) $(1)/usr/share/v2ray/ - $(CP) $(PKG_BUILD_DIR)/release/extra/* $(1)/usr/share/v2ray/ -endef - -$(eval $(call Download,libcore)) -$(eval $(call BuildPackage,sagernet-core)) -$(eval $(call BuildPackage,sagernet-extra)) diff --git a/sagernet-core/patches/100-obfs.patch b/sagernet-core/patches/100-obfs.patch deleted file mode 100644 index 14268dbe6..000000000 --- a/sagernet-core/patches/100-obfs.patch +++ /dev/null @@ -1,59 +0,0 @@ -go get github.com/Dreamacro/clash/transport/ssr/protocol -go get github.com/Dreamacro/clash/transport/ssr/obfs -go get github.com/Dreamacro/clash/transport/simple-obfs ---- - ---- a/go.mod -+++ b/go.mod -@@ -3,6 +3,7 @@ module github.com/v2fly/v2ray-core/v5 - go 1.18 - - require ( -+ github.com/Dreamacro/clash v1.11.4 - github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da - github.com/dgryski/go-camellia v0.0.0-20191119043421-69a8a13fb23d - github.com/dgryski/go-idea v0.0.0-20170306091226-d2fb45a411fb -@@ -82,6 +83,7 @@ require ( - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect - github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4 // indirect -+ github.com/sirupsen/logrus v1.8.1 // indirect - github.com/xtaci/smux v1.5.16 // indirect - go4.org/intern v0.0.0-20220301175310-a089fc204883 // indirect - go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect ---- a/go.sum -+++ b/go.sum -@@ -20,6 +20,8 @@ dmitri.shuralyov.com/state v0.0.0-201802 - git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= - github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= - github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -+github.com/Dreamacro/clash v1.11.4 h1:ZQe/7G+JclA1vvyAn8MtaEBvQK73mWR6lV3BceDaJoY= -+github.com/Dreamacro/clash v1.11.4/go.mod h1:ParIZ6P19q5GDgRE+HV/co7GunFRmvN31YFgNp4cwDw= - github.com/FlowerWrong/water v0.0.0-20180301012659-01a4eaa1f6f2/go.mod h1:xrG5L7lq7T2DLnPr2frMnL906CNEoKRwLB+VYFhPq2w= - github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= - github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= -@@ -396,6 +398,8 @@ github.com/shurcooL/sanitized_anchor_nam - github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= - github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= - github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= - github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= - github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= - github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -@@ -455,6 +459,7 @@ go.opentelemetry.io/proto/otlp v0.7.0/go - go.starlark.net v0.0.0-20220714194419-4cadf0a12139 h1:zMemyQYZSyEdPaUFixYICrXf/0Rfnil7+jiQRf5IBZ0= - go.starlark.net v0.0.0-20220714194419-4cadf0a12139/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0= - go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= - go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= - go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= - go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= -@@ -572,6 +577,7 @@ golang.org/x/sys v0.0.0-20190606165138-5 - golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=