diff --git a/package/ctcgfw/ChinaDNS/Makefile b/package/ctcgfw/ChinaDNS/Makefile deleted file mode 100644 index bfd0294a1d..0000000000 --- a/package/ctcgfw/ChinaDNS/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (C) 2014-2018 OpenWrt-dist -# Copyright (C) 2014-2018 Jian Chang -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ChinaDNS -PKG_VERSION:=2.0.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/lrinQVQ/openwrt-chinadns/releases/download/v$(PKG_VERSION) -PKG_HASH:=caab37a27c444d917f0b92c65d7082543dc22acc7c24322be07a108a44794369 - -PKG_LICENSE:=GPLv3 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jian Chang - -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/ChinaDNS - SECTION:=net - CATEGORY:=Network - TITLE:=Protect yourself against DNS poisoning in China. - URL:=https://github.com/shadowsocks/ChinaDNS -endef - -define Package/ChinaDNS/description - Protect yourself against DNS poisoning in China. -endef - -define Package/ChinaDNS/conffiles -/etc/chinadns_chnroute.txt -endef - -define Package/ChinaDNS/install - $(INSTALL_DIR) $(1)/etc - $(INSTALL_CONF) $(PKG_INSTALL_DIR)/usr/share/chnroute.txt $(1)/etc/chinadns_chnroute.txt - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/chinadns $(1)/usr/sbin -endef - -$(eval $(call BuildPackage,ChinaDNS)) diff --git a/package/ctcgfw/GoQuiet/Makefile b/package/ctcgfw/GoQuiet/Makefile deleted file mode 100644 index b55974cbc7..0000000000 --- a/package/ctcgfw/GoQuiet/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# -# Copyright (C) 2015-2016 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v3. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=GoQuiet -PKG_VERSION:=1.2.2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/cbeuw/GoQuiet.git -PKG_SOURCE_VERSION:=013cdfdf72000dcd4691799c37a0cf960ab4c82f -PKG_MIRROR_HASH:=c9c97463e5286e8ad10de5e86512b98f60672235c47cfd9696188a16496fc56c - -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -PKG_CONFIG_DEPENDS:= \ - CONFIG_GQ_CLIENT_COMPRESS_UPX \ - CONFIG_GQ_SERVER_COMPRESS_UPX - -GO_PKG:=github.com/cbeuw/GoQuiet -GO_PKG_LDFLAGS:=-s -w -GO_PKG_LDFLAGS_X:=main.version=$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/GoQuiet/template - SECTION:=net - CATEGORY:=Network - TITLE:=GoQuiet - DEPENDS:=$(GO_ARCH_DEPENDS) +libpthread - URL:=https://github.com/cbeuw/GoQuiet - SUBMENU:=Web Servers/Proxies -endef - -define Package/gq-client - $(call Package/GoQuiet/template) - TITLE+= Client -endef - -define Package/gq-server - $(call Package/GoQuiet/template) - TITLE+= Server -endef - -define Package/gq-client/config -config GQ_CLIENT_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -define Package/gq-server/config -config GQ_SERVER_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -GO_PKG_BUILD_VARS += GO111MODULE=auto - -define Build/Compile - $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/gq-client) - $(call GoPackage/Build/Configure) - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_GQ_CLIENT_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gq-client -endif - $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/gq-server) - $(call GoPackage/Build/Configure) - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_GQ_SERVER_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gq-server -endif -endef - -define Package/gq-client/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/gq-client $(1)/usr/bin/ -endef - -define Package/gq-server/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/gq-server $(1)/usr/bin/ -endef - -$(eval $(call GoBinPackage,gq-client)) -$(eval $(call GoBinPackage,gq-server)) -$(eval $(call BuildPackage,gq-client)) -$(eval $(call BuildPackage,gq-server)) diff --git a/package/ctcgfw/annie/Makefile b/package/ctcgfw/annie/Makefile deleted file mode 100644 index 63d804a191..0000000000 --- a/package/ctcgfw/annie/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE.txt for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=annie -PKG_VERSION:=0.10.3 -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/iawia002/annie.git -PKG_SOURCE_DATE:=2020-12-15 -PKG_SOURCE_VERSION:=abc3c9df18173c91a5ca7a77fecc0665dea01aa1 -PKG_MIRROR_HASH:=d49d79c342377a1edbf6870f7dd49cb4de70718934151793298004db72fc538a - -PKG_MAINTAINER:=CN_SZTL -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE - -PKG_CONFIG_DEPENDS:= \ - CONFIG_ANNIE_COMPRESS_GOPROXY \ - CONFIG_ANNIE_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/iawia002/annie -GO_PKG_BUILD_PKG:=$$(GO_PKG) -GO_PKG_LDFLAGS:=-s -w - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/annie - SECTION:=multimedia - CATEGORY:=Multimedia - TITLE:=Fast, simple and clean video downloader - URL:=https://github.com/iawia002/annie - DEPENDS:=$(GO_ARCH_DEPENDS) +ffmpeg -endef - -define Package/annie/description - Annie is a fast, simple and clean video downloader built with Go. -endef - -define Package/annie/config -config ANNIE_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config ANNIE_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_ANNIE_COMPRESS_GOPROXY),y) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_ANNIE_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/annie -endif -endef - -$(eval $(call GoBinPackage,annie)) -$(eval $(call BuildPackage,annie)) diff --git a/package/ctcgfw/bpytop/Makefile b/package/ctcgfw/bpytop/Makefile deleted file mode 100644 index 786e5fa2a4..0000000000 --- a/package/ctcgfw/bpytop/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# 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:=bpytop -PKG_VERSION:=1.0.62 -PKG_RELEASE:=1 - -PYPI_NAME:=bpytop -PKG_HASH:=9a408ffe6575c4e20621215e532b206fe6b6d2e7e4bd053ab4b4906e6d7ba909 - -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE - -include $(TOPDIR)/feeds/packages/lang/python/pypi.mk -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk - -define Package/bpytop - SECTION:=admin - CATEGORY:=Administration - TITLE:=Python port of bashtop - URL:=https://github.com/aristocratos/bpytop - DEPENDS:=+python3-psutil +python3-setuptools -endef - -define Package/bpytop/description - Resource monitor that shows usage and stats for - processor, memory, disks, network and processes. -endef - -define Package/bpytop/install - $(call Py3Package/$(1)/install,$(PKG_INSTALL_DIR)) - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ - $(INSTALL_DIR) $(1)/usr/share - $(CP) $(PKG_BUILD_DIR)/bpytop-themes $(1)/usr/share/bpytop -endef - -$(eval $(call Py3Package,bpytop)) -$(eval $(call BuildPackage,bpytop)) -#$(eval $(call BuildPackage,bpytop-src)) diff --git a/package/ctcgfw/brook/Makefile b/package/ctcgfw/brook/Makefile deleted file mode 100644 index 0c1cc9d491..0000000000 --- a/package/ctcgfw/brook/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=brook -PKG_VERSION:=20210214 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/txthinking/brook/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a8e2e989f6d09e36c1fbe8593404d53a0615dc93e91a0be94dda898f0d55ff1d - -PKG_MAINTAINER:=CN_SZTL -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -PKG_CONFIG_DEPENDS:= \ - CONFIG_BROOK_COMPRESS_GOPROXY \ - CONFIG_BROOK_COMPRESS_UPX - -GO_PKG:=github.com/txthinking/brook -GO_PKG_BUILD_PKG:=github.com/txthinking/brook/cli/brook -GO_PKG_LDFLAGS:=-s -w - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/brook - SECTION:=net - CATEGORY:=Network - SUBMENU:=Web Servers/Proxies - TITLE:=A cross-platform proxy software - DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle - URL:=https://github.com/txthinking/brook -endef - -define Package/brook/description - Brook is a cross-platform strong encryption and not detectable proxy. - Zero-Configuration. -endef - -define Package/brook/config - config BROOK_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - - config BROOK_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_BROOK_COMPRESS_GOPROXY),y) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_BROOK_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/brook -endif -endef - -$(eval $(call GoBinPackage,brook)) -$(eval $(call BuildPackage,brook)) diff --git a/package/ctcgfw/brook/patches/100-cli-bump-to-v2.3.0.patch b/package/ctcgfw/brook/patches/100-cli-bump-to-v2.3.0.patch deleted file mode 100644 index 2324eb056c..0000000000 --- a/package/ctcgfw/brook/patches/100-cli-bump-to-v2.3.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bd7bc7ae9f46a8678c05dca78081033d6e2af497 Mon Sep 17 00:00:00 2001 -From: CN_SZTL -Date: Sat, 27 Feb 2021 15:05:31 +0800 -Subject: [PATCH] cli: bump to v2.3.0 - -Signed-off-by: CN_SZTL ---- - cli/brook/main.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cli/brook/main.go b/cli/brook/main.go -index 1f715ea..3c88eb2 100644 ---- a/cli/brook/main.go -+++ b/cli/brook/main.go -@@ -28,7 +28,7 @@ import ( - _ "net/http/pprof" - - "github.com/txthinking/brook" -- "github.com/urfave/cli" -+ "github.com/urfave/cli/v2" - ) - - var debug bool --- -2.17.1 - diff --git a/package/ctcgfw/brook/patches/110-go-init-go-modules.patch b/package/ctcgfw/brook/patches/110-go-init-go-modules.patch deleted file mode 100644 index 3a33309d5e..0000000000 --- a/package/ctcgfw/brook/patches/110-go-init-go-modules.patch +++ /dev/null @@ -1,139 +0,0 @@ -From d626d772dd2ab02678c62714885e388966f09f55 Mon Sep 17 00:00:00 2001 -From: CN_SZTL -Date: Sat, 27 Feb 2021 15:05:49 +0800 -Subject: [PATCH] go: init go modules - -Signed-off-by: CN_SZTL ---- - go.mod | 25 +++++++++++++++++ - go.sum | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 111 insertions(+) - create mode 100644 go.mod - create mode 100644 go.sum - -diff --git a/go.mod b/go.mod -new file mode 100644 -index 0000000..7354e7d ---- /dev/null -+++ b/go.mod -@@ -0,0 +1,25 @@ -+module github.com/txthinking/brook -+ -+go 1.16 -+ -+require ( -+ github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect -+ github.com/gorilla/mux v1.8.0 -+ github.com/gorilla/websocket v1.4.2 -+ github.com/mdp/qrterminal v1.0.1 -+ github.com/miekg/dns v1.1.40 -+ github.com/patrickmn/go-cache v2.1.0+incompatible -+ github.com/russross/blackfriday/v2 v2.1.0 // indirect -+ github.com/tdewolff/minify v2.3.6+incompatible -+ github.com/tdewolff/parse v2.3.4+incompatible // indirect -+ github.com/txthinking/encrypt v0.0.0-20210121062928-5ab4dd51a0e9 -+ github.com/txthinking/runnergroup v0.0.0-20200327135940-540a793bb997 -+ github.com/txthinking/socks5 v0.0.0-20210106113028-328af325654e -+ github.com/txthinking/x v0.0.0-20201210150116-a8015a742c8c -+ github.com/urfave/cli/v2 v2.3.0 -+ github.com/urfave/negroni v1.0.0 -+ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 -+ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 -+ golang.org/x/sys v0.0.0-20210227040730-b0d1d43c014d // indirect -+ golang.org/x/text v0.3.5 // indirect -+) -diff --git a/go.sum b/go.sum -new file mode 100644 -index 0000000..051ce2d ---- /dev/null -+++ b/go.sum -@@ -0,0 +1,86 @@ -+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= -+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -+github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= -+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -+github.com/mdp/qrterminal v1.0.1 h1:07+fzVDlPuBlXS8tB0ktTAyf+Lp1j2+2zK3fBOL5b7c= -+github.com/mdp/qrterminal v1.0.1/go.mod h1:Z33WhxQe9B6CdW37HaVqcRKzP+kByF3q/qLxOGe12xQ= -+github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs= -+github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -+github.com/miekg/dns v1.1.40 h1:pyyPFfGMnciYUk/mXpKkVmeMQjfXqt3FAJ2hy7tPiLA= -+github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= -+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= -+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= -+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= -+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -+github.com/tdewolff/minify v2.3.6+incompatible h1:2hw5/9ZvxhWLvBUnHE06gElGYz+Jv9R4Eys0XUzItYo= -+github.com/tdewolff/minify v2.3.6+incompatible/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs= -+github.com/tdewolff/parse v2.3.4+incompatible h1:x05/cnGwIMf4ceLuDMBOdQ1qGniMoxpP46ghf0Qzh38= -+github.com/tdewolff/parse v2.3.4+incompatible/go.mod h1:8oBwCsVmUkgHO8M5iCzSIDtpzXOT0WXX9cWhz+bIzJQ= -+github.com/txthinking/encrypt v0.0.0-20210121062928-5ab4dd51a0e9 h1:nqqcrK76wxumtdrYsK9dNRpBbXKk0DPGOe2sTPKu25k= -+github.com/txthinking/encrypt v0.0.0-20210121062928-5ab4dd51a0e9/go.mod h1:78N4pHirvbuhX3U2MJ3G0nxjmQtfaqHeYjvkHbw5Ho0= -+github.com/txthinking/runnergroup v0.0.0-20200327135940-540a793bb997 h1:vlDgnShahmE2XLslpr0hnzxfAmSj3JLX2CYi8Xct7G4= -+github.com/txthinking/runnergroup v0.0.0-20200327135940-540a793bb997/go.mod h1:CLUSJbazqETbaR+i0YAhXBICV9TrKH93pziccMhmhpM= -+github.com/txthinking/socks5 v0.0.0-20210106113028-328af325654e h1:SUWQViHyUHr766NlUKB1Wr8QRVTaxez9sLl3pwobiHw= -+github.com/txthinking/socks5 v0.0.0-20210106113028-328af325654e/go.mod h1:d3n8NJ6QMRb6I/WAlp4z5ZPAoaeqDmX5NgVZA0mhe+I= -+github.com/txthinking/x v0.0.0-20201210150116-a8015a742c8c h1:n3om7+DhvxNoBTcYul3jpeOTavBGKRjGW1GaLc8JsWc= -+github.com/txthinking/x v0.0.0-20201210150116-a8015a742c8c/go.mod h1:WgqbSEmUYSjEV3B1qmee/PpP2NYEz4bL9/+mF1ma+s4= -+github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= -+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -+github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= -+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= -+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= -+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee h1:WG0RUwxtNT4qqaXX3DPA8zHFNm/D9xaBpxzHt1WcA/E= -+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= -+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= -+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= -+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= -+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20210227040730-b0d1d43c014d h1:9fH9JvLNoSpsDWcXJ4dSE3lZW99Z3OCUZLr07g60U6o= -+golang.org/x/sys v0.0.0-20210227040730-b0d1d43c014d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= -+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= -+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -+golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= -+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA= -+golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= -+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -+gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI= -+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY= -+rsc.io/qr v0.2.0/go.mod h1:IF+uZjkb9fqyeF/4tlBoynqmQxUoPfWEKh921coOuXs= --- -2.17.1 - diff --git a/package/ctcgfw/cdnspeedtest/Makefile b/package/ctcgfw/cdnspeedtest/Makefile deleted file mode 100644 index b8afc7728f..0000000000 --- a/package/ctcgfw/cdnspeedtest/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=CloudflareSpeedTest -PKG_VERSION:=1.4.9 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/XIU2/CloudflareSpeedTest/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=7b7a18b54eae74d70f18105cc9c74822ce05336b2b894c59a388f46430733dcd - -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_CONFIG_DEPENDS:= \ - CONFIG_CDNSPEEDTEST_COMPRESS_GOPROXY \ - CONFIG_CDNSPEEDTEST_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=CloudflareSpeedTest -GO_PKG_LDFLAGS:=-s -w - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/cdnspeedtest - SECTION:=net - CATEGORY:=Network - TITLE:=Getting the fastest ips to your network of CDN - URL:=https://github.com/XIU2/CloudflareSpeedTest - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define Package/cdnspeedtest/config -config CDNSPEEDTEST_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config CDNSPEEDTEST_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_CDNSPEEDTEST_COMPRESS_GOPROXY),y) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_CDNSPEEDTEST_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/CloudflareSpeedTest -endif -endef - -define Package/cdnspeedtest/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/CloudflareSpeedTest $(1)/usr/bin/cdnspeedtest - - $(INSTALL_DIR) $(1)/usr/share/CloudflareSpeedTest - $(INSTALL_DATA) $(PKG_BUILD_DIR)/ip.txt $(1)/usr/share/CloudflareSpeedTest/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/ipv6.txt $(1)/usr/share/CloudflareSpeedTest/ -endef - -$(eval $(call BuildPackage,cdnspeedtest)) diff --git a/package/ctcgfw/chinadns-ng/Makefile b/package/ctcgfw/chinadns-ng/Makefile deleted file mode 100644 index 60d1a411d9..0000000000 --- a/package/ctcgfw/chinadns-ng/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=chinadns-ng -PKG_VERSION:=1.0-beta.24 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/zfl9/chinadns-ng.git -PKG_SOURCE_DATE:=2021-02-11 -PKG_SOURCE_VERSION:=df3bb7c6310df9b3c0f874b7a0c38ea5ce0996cb -PKG_MIRROR_HASH:=4b0a159e1ecd81392a67b31528b0430afa991bfceef5dd60d2d843edfccb6b12 - -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=pexcn - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/chinadns-ng - SECTION:=net - CATEGORY:=Network - TITLE:=ChinaDNS next generation, refactoring with epoll and ipset. - URL:=https://github.com/zfl9/chinadns-ng - DEPENDS:=+ipset -endef - -define Package/chinadns-ng/description - ChinaDNS next generation, refactoring with epoll and ipset. -endef - -define Package/chinadns-ng/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/chinadns-ng $(1)/usr/bin -endef - -$(eval $(call BuildPackage,chinadns-ng)) diff --git a/package/ctcgfw/cpp-httplib/Makefile b/package/ctcgfw/cpp-httplib/Makefile deleted file mode 100644 index 1855d9c1d3..0000000000 --- a/package/ctcgfw/cpp-httplib/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -#### - # File: /httplib/Makefile - # Project: ootoc-OpenWRT - # File Created: Sunday, 8th March 2020 10:45:13 pm - # Author: ElonH[EH](elonhhuang@gmail.com) - # License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) - # Copyright (C) 2020 [ElonH] -#### - -include $(TOPDIR)/rules.mk - -PKG_NAME:=cpp-httplib -PKG_VERSION:=0.5.7 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/yhirose/cpp-httplib/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=27b7f6346bdeb1ead9d17bd7cea89d9ad491f50f0479081053cc6e5742a89e64 - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=ElonH - -HOST_BUILD_PARALLEL:=1 -PKG_BUILD_PARALLEL:=1 -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/cpp-httplib - SECTION:=lib - CATEGORY:=Libraries - VARIANT:=lib - URL:=https://github.com/yhirose/cpp-httplib - TITLE:=A C++11 single-file header-only cross platform HTTP/HTTPS library. -endef - -define Package/cpp-httplib/description - A C++11 single-file header-only cross platform HTTP/HTTPS library. - It's extremely easy to setup. Just include `httplib.h` file in your code! -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,cpp-httplib)) diff --git a/package/ctcgfw/cups-bjnp/Makefile b/package/ctcgfw/cups-bjnp/Makefile deleted file mode 100644 index 74bea2cd8e..0000000000 --- a/package/ctcgfw/cups-bjnp/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=cups-bjnp -PKG_VERSION:=2.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/cups-bjnp -PKG_HASH:=2acb716680d66f1378cf8dcd45fedf7f72ccc9b66fa80214d6dcb042b5e3c9ab - -PKG_BUILD_DEPENDS:=cups - -include $(INCLUDE_DIR)/package.mk - -define Package/cups-bjnp - SECTION:=net - CATEGORY:=Network - TITLE:=BJNP protocol backend for CUPS - URL:=http://sourceforge.net/projects/cups-bjnp/ - DEPENDS:=cups - SUBMENU:=Printing -endef - -define Package/cups-bjnp/description - CUPS backend for the canon printers using the proprietary USB over - IP BJNP protocol. This backend allows Cups to print over the network - to a Canon printer. It currently supports Cups 1.2 and Cups 1.3 and - is designed by reverse engineering. -endef - -CONFIGURE_ARGS += --with-cupsbackenddir=$(STAGING_DIR)/usr/include/cups - -TARGET_CFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/cups-bjnp/install - $(INSTALL_DIR) $(1)/usr/lib/cups/backend - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bjnp $(1)/usr/lib/cups/backend -endef - - -$(eval $(call BuildPackage,cups-bjnp)) diff --git a/package/ctcgfw/cups/Makefile b/package/ctcgfw/cups/Makefile deleted file mode 100644 index 2f393d0e8a..0000000000 --- a/package/ctcgfw/cups/Makefile +++ /dev/null @@ -1,321 +0,0 @@ -# -# Copyright (C) 2006-2016 OpenWrt.org -# Copyright (C) 2016 lede-project.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=cups -PKG_VERSION:=2.1.4 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.gz -PKG_SOURCE_URL:=http://www.cups.org/software/$(PKG_VERSION) -PKG_HASH:=4b14fd833180ac529ebebea766a09094c2568bf8426e219cb3a1715304ef728d - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -include $(INCLUDE_DIR)/package.mk - -define Package/cups/Default - URL:=http://www.cups.org/ - SUBMENU:=Printing -endef - -define Package/cups - $(call Package/cups/Default) - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libcups +libcupsmime +libcupscgi +libcupsppdc +libusb-1.0 - TITLE:=Common UNIX Printing System (daemon) -endef - -define Package/cups/description - Common UNIX Printing System (daemon) -endef - -define Package/cups/conffiles -/etc/cups/classes.conf -/etc/cups/cupsd.conf -/etc/cups/printers.conf -endef - -define Package/cups-bsd - $(call Package/cups/Default) - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libcups - TITLE:=Common UNIX Printing System - BSD commands (old) -endef - -define Package/cups-bsd/description - Common UNIX Printing System - BSD commands (old) -endef - -define Package/cups-client -$(call Package/cups/Default) - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libcups +libcupsimage +libcupsmime - TITLE:=Common UNIX Printing System - Client commands -endef - -define Package/cups-client/conffiles -/etc/cups/client.conf -endef - -define Package/cups-client/description - Common UNIX Printing System - Client commands -endef - -define Package/cups-filters - $(call Package/cups/Default) - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libcupsimage - TITLE:=Common UNIX Printing System - Filter -endef - -define Package/cups-filters/description - Common UNIX Printing System - Filter -endef - -define Package/cups-ppdc - $(call Package/cups/Default) - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libcupsppdc - TITLE:=Common UNIX Printing System - PPDC utils -endef - -define Package/cups-ppdc/description - Common UNIX Printing System - PPDC utils -endef - -define Package/libcups - $(call Package/cups/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+zlib +libpthread +libpng +libjpeg - TITLE:=Common UNIX Printing System - Core library -endef - -define Package/libcups/description - Common UNIX Printing System - Core library -endef - -define Package/libcupscgi - $(call Package/cups/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libcups - TITLE:=Common UNIX Printing System - CGI library -endef - -define Package/libcupscgi/description - Common UNIX Printing System - CGI library -endef - -define Package/libcupsimage - $(call Package/cups/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libcups - TITLE:=Common UNIX Printing System - Image library -endef - -define Package/libcupsimage/description - Common UNIX Printing System - Image library -endef - -define Package/libcupsmime - $(call Package/cups/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libcups - TITLE:=Common UNIX Printing System - MIME library -endef - -define Package/libcupsmime/description - Common UNIX Printing System - MIME library -endef - -define Package/libcupsppdc - $(call Package/cups/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libcups +libstdcpp - TITLE:=Common UNIX Printing System - PPDC library -endef - -define Package/libcupsppdc/description - Common UNIX Printing System - PPDC library -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --with-cups-user="nobody" \ - --with-cups-group="nogroup" \ - --with-system-groups="root" \ - --with-pdftops="none" \ - --without-perl \ - --without-python \ - --without-php \ - --enable-default-shared \ - --enable-shared \ - --enable-image \ - --enable-libusb \ - --disable-acl \ - --disable-dnssd \ - --disable-dbus \ - --disable-avahi \ - --disable-launchd \ - --disable-ldap \ - --disable-pam \ - --disable-slp \ - --disable-gnutls \ - --disable-openssl \ - --disable-cdsassl \ - --disable-ssl \ - --disable-gssapi \ - --disable-tiff, \ - UNAME="Linux" \ - LIBS="$(TARGET_LDFLAGS) -lz -lpng -ljpeg" \ - ) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - DSTROOT="$(PKG_INSTALL_DIR)" \ - STRIP="/bin/true" \ - all install -endef - -define Package/cups/install - rm -rf $(1)/etc/cups - $(INSTALL_DIR) $(1)/etc/cups - $(CP) $(PKG_INSTALL_DIR)/etc/cups/* $(1)/etc/cups/ - rm -rf $(1)/etc/cups/certs - ln -sf /tmp $(1)/etc/cups/certs - rm -f $(1)/usr/bin/cups-config - $(INSTALL_DIR) $(1)/usr/lib/cups - $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/backend $(1)/usr/lib/cups - $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/cgi-bin $(1)/usr/lib/cups - $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/daemon $(1)/usr/lib/cups - $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/driver $(1)/usr/lib/cups - $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/monitor $(1)/usr/lib/cups - $(INSTALL_DIR) $(1)/usr/lib/cups/filter - $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/filter/{commandtops,pstops} \ - $(PKG_INSTALL_DIR)/usr/lib/cups/filter/gziptoany \ - $(1)/usr/lib/cups/filter - $(INSTALL_DIR) $(1)/usr/share/cups/templates - $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl \ - $(1)/usr/share/cups/templates/ - $(INSTALL_DIR) $(1)/usr/share/cups/mime - $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/mime/* $(1)/usr/share/cups/mime/ - ### Do install docs: cups web interface relies on them - $(INSTALL_DIR) $(1)/usr/share/doc/cups - $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/*.*html \ - $(1)/usr/share/doc/cups/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/*.css \ - $(1)/usr/share/doc/cups/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/*.txt \ - $(1)/usr/share/doc/cups/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images \ - $(1)/usr/share/doc/cups/ - $(INSTALL_DIR) $(1)/usr/sbin - # overwrite default config with our own - $(CP) ./files/etc/cups/* $(1)/etc/cups/ - # install initscript with priority 60 - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/cupsd.init $(1)/etc/init.d/cupsd - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/sbin/{cupsctl,cupsd} \ - $(1)/usr/sbin/ - # needed for cups to find usb printers per http://wiki.openwrt.org/doc/howto/cups.server - chmod 700 $(1)/usr/lib/cups/backend/usb -endef - -define Package/cups-bsd/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{lprm,lpq,lpr} $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lpc $(1)/usr/sbin/ -endef - -define Package/cups-client/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/{lp,cancel,cupstestppd,cupstestdsc} \ - $(PKG_INSTALL_DIR)/usr/bin/{ipptool,lpoptions,lpstat} \ - $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/sbin/{cupsaccept,cupsaddsmb,cupsfilter} \ - $(PKG_INSTALL_DIR)/usr/sbin/{lpadmin,lpinfo,lpmove} \ - $(1)/usr/sbin/ - (cd $(1)/usr/sbin; ln -sf cupsaccept accept; ln -sf cupsaccept cupsenable; ln -sf cupsaccept cupsdisable; ln -sf cupsaccept reject; ln -sf cupsaccept cupsreject;) -endef - -define Package/cups-filters/install - $(INSTALL_DIR) $(1)/usr/lib/cups/filter - $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/filter/{commandtops,gziptoany,pstops,rastertoepson,rastertohp,rastertolabel,rastertopwg} \ - $(1)/usr/lib/cups/filter - (cd $(1)/usr/lib/cups/filter; ln -sf rastertolabel rastertodymo;) -endef - -define Package/cups-ppdc/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/{ppdc,ppdhtml,ppdi,ppdmerge,ppdpo} \ - $(1)/usr/bin/ -endef - -define Package/libcups/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so* $(1)/usr/lib/ -endef - -define Package/libcupscgi/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupscgi.so* $(1)/usr/lib/ -endef - -define Package/libcupsimage/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsimage.so* $(1)/usr/lib/ -endef - -define Package/libcupsmime/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsmime.so* $(1)/usr/lib/ -endef - -define Package/libcupsppdc/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsppdc.so* $(1)/usr/lib/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(2)/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(2)/bin/ - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups*.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,cups)) -$(eval $(call BuildPackage,libcups)) -$(eval $(call BuildPackage,libcupscgi)) -$(eval $(call BuildPackage,libcupsimage)) -$(eval $(call BuildPackage,libcupsmime)) -$(eval $(call BuildPackage,libcupsppdc)) -$(eval $(call BuildPackage,cups-bsd)) -$(eval $(call BuildPackage,cups-client)) -$(eval $(call BuildPackage,cups-filters)) -$(eval $(call BuildPackage,cups-ppdc)) diff --git a/package/ctcgfw/cups/files/cupsd.init b/package/ctcgfw/cups/files/cupsd.init deleted file mode 100755 index e5f00da9a4..0000000000 --- a/package/ctcgfw/cups/files/cupsd.init +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - -START=50 - -start() { - mkdir -m 0755 -p /var/cache/cups - mkdir -m 0755 -p /var/cups - mkdir -m 0755 -p /var/spool/cups/tmp - service_start /usr/sbin/cupsd -} - -stop() { - service_stop /usr/sbin/cupsd -} - -reload() { - service_reload /usr/sbin/cupsd -} diff --git a/package/ctcgfw/cups/files/etc/cups/classes.conf b/package/ctcgfw/cups/files/etc/cups/classes.conf deleted file mode 100644 index 15afda75a2..0000000000 --- a/package/ctcgfw/cups/files/etc/cups/classes.conf +++ /dev/null @@ -1,7 +0,0 @@ -######################################################################## -# # -# This is a sample class configuration file. This file is included # -# from the main configuration file (cups.conf) and lists all of the # -# printer classes known to the system. # -# # -######################################################################## diff --git a/package/ctcgfw/cups/files/etc/cups/client.conf b/package/ctcgfw/cups/files/etc/cups/client.conf deleted file mode 100644 index c8d9f910ed..0000000000 --- a/package/ctcgfw/cups/files/etc/cups/client.conf +++ /dev/null @@ -1,9 +0,0 @@ -######################################################################## -# # -# This is the CUPS client configuration file. This file is used to # -# define client-specific parameters, such as the default server or # -# default encryption settings. # -# # -######################################################################## - -Encryption Never diff --git a/package/ctcgfw/cups/files/etc/cups/cupsd.conf b/package/ctcgfw/cups/files/etc/cups/cupsd.conf deleted file mode 100644 index 48c4188386..0000000000 --- a/package/ctcgfw/cups/files/etc/cups/cupsd.conf +++ /dev/null @@ -1,58 +0,0 @@ -######################################################################## -# # -# This is the CUPS configuration file. If you are familiar with # -# Apache or any of the other popular web servers, we've followed the # -# same format. Any configuration variable used here has the same # -# semantics as the corresponding variable in Apache. If we need # -# different functionality then a different name is used to avoid # -# confusion... # -# # -######################################################################## - - -AccessLog syslog -ErrorLog syslog -LogLevel info -PageLog syslog -PreserveJobHistory No -PreserveJobFiles No -AutoPurgeJobs Yes -MaxJobs 25 -MaxPrinterHistory 10 -#Printcap /etc/printcap -#PrintcapFormat BSD -RequestRoot /var/cups -#RemoteRoot remroot -#User nobody -#Group nogroup -# root permissions required to make cups work with the usb backend -User root -Group root -RIPCache auto -TempDir /var/cups -Port 631 -HostNameLookups On -KeepAlive On -# No: "BrowseOrder" "BrowseAllow" "BrowseRemoteProtocols" -Browsing Yes -BrowsingWebIF Yes -BrowseLocalProtocols DNSSD -DefaultShared Yes -WebInterface no -Listen /var/run/cups/cups.sock - -ServerAlias * - - -Order Allow,Deny -Allow From 127.0.0.1 -Allow From 192.168.1.0/24 - - - -AuthType Basic -AuthClass System -Order Allow,Deny -Allow From 127.0.0.1 -Allow From 192.168.1.0/24 - diff --git a/package/ctcgfw/cups/files/etc/cups/printers.conf b/package/ctcgfw/cups/files/etc/cups/printers.conf deleted file mode 100644 index 88bba1b133..0000000000 --- a/package/ctcgfw/cups/files/etc/cups/printers.conf +++ /dev/null @@ -1,23 +0,0 @@ - -Info USB Printer -Location -DeviceURI usb:/dev/usb/lp0 -State Idle -Accepting Yes -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 - - - -Info Parallel Port Printer -Location -DeviceURI parallel:/dev/printers/0 -State Idle -Accepting Yes -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 - diff --git a/package/ctcgfw/cups/patches/100-target.patch b/package/ctcgfw/cups/patches/100-target.patch deleted file mode 100644 index 571cce1a69..0000000000 --- a/package/ctcgfw/cups/patches/100-target.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure -+++ b/configure -@@ -5896,7 +5896,7 @@ fi - - case "$COMPONENTS" in - all) -- BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" -+ BUILDDIRS="filter backend berkeley cgi-bin monitor ppdc scheduler systemv conf data desktop locale doc examples templates" - ;; - - core) diff --git a/package/ctcgfw/cups/patches/140-uname.patch b/package/ctcgfw/cups/patches/140-uname.patch deleted file mode 100644 index 3261de6187..0000000000 --- a/package/ctcgfw/cups/patches/140-uname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure -+++ b/configure -@@ -1966,7 +1966,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - --uname=`uname` -+uname=${UNAME:-`uname`} - uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'` - uarch=`uname -m` - diff --git a/package/ctcgfw/cups/patches/150-64bit_host_fix.patch b/package/ctcgfw/cups/patches/150-64bit_host_fix.patch deleted file mode 100644 index db46c44268..0000000000 --- a/package/ctcgfw/cups/patches/150-64bit_host_fix.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/config-scripts/cups-directories.m4 -+++ b/config-scripts/cups-directories.m4 -@@ -104,7 +104,7 @@ if test "$libdir" = "\${exec_prefix}/lib - case "$uname" in - Linux*) - if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then -- libdir="$exec_prefix/lib64" -+ libdir="$exec_prefix/lib" - fi - ;; - esac ---- a/configure -+++ b/configure -@@ -5998,7 +5998,7 @@ if test "$libdir" = "\${exec_prefix}/lib - case "$uname" in - Linux*) - if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then -- libdir="$exec_prefix/lib64" -+ libdir="$exec_prefix/lib" - fi - ;; - esac ---- a/cups-config.in -+++ b/cups-config.in -@@ -50,7 +50,7 @@ else - CFLAGS="$CFLAGS -I$includedir" - fi - -- if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then -+ if test $libdir != /usr/lib -a $libdir != /usr/lib -a $libdir != /usr/lib; then - LDFLAGS="$LDFLAGS -L$libdir" - fi - fi diff --git a/package/ctcgfw/cups/patches/160-ppdc.patch b/package/ctcgfw/cups/patches/160-ppdc.patch deleted file mode 100644 index b92780a10b..0000000000 --- a/package/ctcgfw/cups/patches/160-ppdc.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/ppdc/Makefile -+++ b/ppdc/Makefile -@@ -238,13 +238,7 @@ framedhelp: - - genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ - sample.drv ../data/media.defs -- echo Linking $@... -- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ -- libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ -- $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) -- echo Generating localization strings... -- ./genstrings >sample.c -- -+ echo Not Linking $@... - - # - # ppdc, the PPD compiler. diff --git a/package/ctcgfw/cxxopts/Makefile b/package/ctcgfw/cxxopts/Makefile deleted file mode 100644 index cafea7bada..0000000000 --- a/package/ctcgfw/cxxopts/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# (https://immortalwrt.org) -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=cxxopts -PKG_VERSION:=2.2.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/jarro2783/cxxopts/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=984aa3c8917d649b14d7f6277104ce38dd142ce378a9198ec926f03302399681 - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_BUILD_PARALLEL:=1 -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -CMAKE_OPTIONS+= -DCXXOPTS_ENABLE_INSTALL=ON \ - -DCXXOPTS_BUILD_EXAMPLES=OFF \ - -DCXXOPTS_BUILD_TESTS=OFF - -define Package/cxxopts - SECTION:=lib - CATEGORY:=Libraries - URL:=https://github.com/jarro2783/cxxopts - TITLE:=Lightweight C++ command line option parser - DEPENDS:=+libc -endef - -define Package/cxxopts/description - This is a lightweight C++ option parser library, supporting the standard GNU style syntax for options. -endef - -$(eval $(call BuildPackage,cxxopts)) diff --git a/package/ctcgfw/duktape/Makefile b/package/ctcgfw/duktape/Makefile deleted file mode 100644 index 67ca1ae451..0000000000 --- a/package/ctcgfw/duktape/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -# -# Copyright (C) 2019 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=duktape -PKG_VERSION:=2.99.99-19cc8f5 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/svaarala/duktape.git -PKG_MIRROR_HASH:=7e9caaf9c7e82bc01f859019359b3a13fa038f0e5e82a6541687a30c1ccfa604 -PKG_SOURCE_VERSION:=19cc8f5bb855791ff55cbf60d2cea72df485e86f -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_BUILD_DEPENDS:=node/host - -PKG_FIXUP:=autoreconf -PKG_USE_MIPS16:=0 -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/duktape - SECTION:=utils - CATEGORY:=Utilities - URL:=https://github.com/svaarala/duktape - TITLE:=Duktape is an embeddable Javascript engine, with a focus on portability and compact footprint. -endef - -define Package/libduktape - $(call Package/duktape) - SECTION:=lib - CATEGORY:=Libraries - TITLE+= (Libraries) -endef - -define Package/duktape/description - Duktape is easy to integrate into a C/C++ project: add duktape.c, - duktape.h, and duk_config.h to your build, and use the Duktape API - to call ECMAScript functions from C code and vice versa. -endef - -define Package/libduktape/description - $(call Package/duktape/description) -endef - -define Build/Compile -( \ - cd $(PKG_BUILD_DIR); \ - make -C src-tools; \ - mkdir -p dist; \ - node src-tools/index.js dist --output-directory dist/source; \ - cd dist/source/src; \ - $(TARGET_CC) -c -O3 -o duktape.o duktape.c; \ - $(TARGET_CC) -c -O3 -o duk_module_node.o -I. ../extras/module-node/duk_module_node.c; \ - $(TARGET_AR) cr libduktape.a duktape.o; \ - $(TARGET_AR) cr libduktape_module.a duk_module_node.o; \ - env $(call Build/Compile/Default) \ -) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include - $(INSTALL_DATA) $(PKG_BUILD_DIR)/dist/source/src/*.a $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/dist/source/src/duk*.h $(1)/usr/include/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/dist/source/extras/module-node/duk_module_node.h $(1)/usr/include/ -endef - -define Package/duktape/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/build/duk $(1)/usr/bin/duk -endef - -define Package/libduktape/install - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/dist/source/src/*.a $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,duktape)) -$(eval $(call BuildPackage,libduktape)) \ No newline at end of file diff --git a/package/ctcgfw/duktape/patches/0001-Makefile-use-Node.js-tool-to-generate-files.patch b/package/ctcgfw/duktape/patches/0001-Makefile-use-Node.js-tool-to-generate-files.patch deleted file mode 100644 index a268dbd285..0000000000 --- a/package/ctcgfw/duktape/patches/0001-Makefile-use-Node.js-tool-to-generate-files.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 436c0a70d7fd4628f30b860f9f2f18f65982d72d Mon Sep 17 00:00:00 2001 -From: CN_SZTL -Date: Wed, 12 Aug 2020 08:31:27 +0000 -Subject: [PATCH] Makefile: use Node.js tool to generate files - ---- - Makefile | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/Makefile b/Makefile -index 92ec2110..9eba5234 100644 ---- a/Makefile -+++ b/Makefile -@@ -283,55 +283,55 @@ prep: - @mkdir -p prep - prep/nondebug: prep - @rm -rf ./prep/nondebug -- $(PYTHON) tools/configure.py --output-directory ./prep/nondebug --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/nondebug --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG) --line-directives - prep/nondebug-scanbuild: prep - @rm -rf ./prep/nondebug-scanbuild -- $(PYTHON) tools/configure.py --output-directory ./prep/nondebug-scanbuild --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_SCANBUILD) --separate-sources --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/nondebug-scanbuild --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_SCANBUILD) --separate-sources --line-directives - prep/nondebug-perf: prep - @rm -rf ./prep/nondebug-perf -- $(PYTHON) tools/configure.py --output-directory ./prep/nondebug-perf --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_PERF) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/nondebug-perf --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_PERF) --line-directives - prep/nondebug-size: prep - @rm -rf ./prep/nondebug-size -- $(PYTHON) tools/configure.py --output-directory ./prep/nondebug-size --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_SIZE) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/nondebug-size --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_SIZE) --line-directives - prep/nondebug-rom: prep - @rm -rf ./prep/nondebug-rom -- $(PYTHON) tools/configure.py --output-directory ./prep/nondebug-rom --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_ROM) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/nondebug-rom --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_ROM) --line-directives - prep/debug: prep - @rm -rf ./prep/debug -- $(PYTHON) tools/configure.py --output-directory ./prep/debug --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/debug --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG) --line-directives - prep/fuzz: prep - @rm -rf ./prep/fuzz -- $(PYTHON) tools/configure.py --output-directory ./prep/fuzz --source-directory src-input --config-metadata config $(CONFIGOPTS_FUZZ) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/fuzz --source-directory src-input --config-metadata config $(CONFIGOPTS_FUZZ) --line-directives - prep/debug-scanbuild: prep - @rm -rf ./prep/debug-scanbuild -- $(PYTHON) tools/configure.py --output-directory ./prep/debug-scanbuild --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG_SCANBUILD) --separate-sources --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/debug-scanbuild --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG_SCANBUILD) --separate-sources --line-directives - prep/debug-rom: prep - @rm -rf ./prep/debug-rom -- $(PYTHON) tools/configure.py --output-directory ./prep/debug-rom --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG_ROM) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/debug-rom --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG_ROM) --line-directives - prep/emduk: prep - @rm -rf ./prep/emduk -- $(PYTHON) tools/configure.py --output-directory ./prep/emduk --source-directory src-input --config-metadata config $(CONFIGOPTS_EMDUK) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/emduk --source-directory src-input --config-metadata config $(CONFIGOPTS_EMDUK) --line-directives - prep/dukweb: prep - @rm -rf ./prep/dukweb -- $(PYTHON) tools/configure.py --output-directory ./prep/dukweb --source-directory src-input --config-metadata config $(CONFIGOPTS_DUKWEB) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/dukweb --source-directory src-input --config-metadata config $(CONFIGOPTS_DUKWEB) --line-directives - prep/duklow-nondebug: prep - @rm -rf ./prep/duklow-nondebug -- $(PYTHON) tools/configure.py --output-directory ./prep/duklow-nondebug --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_DUKLOW) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/duklow-nondebug --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_DUKLOW) --line-directives - prep/duklow-debug: prep - @rm -rf ./prep/duklow-debug -- $(PYTHON) tools/configure.py --output-directory ./prep/duklow-debug --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG_DUKLOW) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/duklow-debug --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG_DUKLOW) --line-directives - prep/duklow-nondebug-rom: prep - @rm -rf ./prep/duklow-nondebug-rom -- $(PYTHON) tools/configure.py --output-directory ./prep/duklow-nondebug-rom --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_DUKLOW_ROM) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/duklow-nondebug-rom --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_DUKLOW_ROM) --line-directives - prep/duklow-debug-rom: prep - @rm -rf ./prep/duklow-debug-rom -- $(PYTHON) tools/configure.py --output-directory ./prep/duklow-debug-rom --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG_DUKLOW_ROM) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/duklow-debug-rom --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG_DUKLOW_ROM) --line-directives - prep/duklow-nondebug-norefc: prep - @rm -rf ./prep/duklow-nondebug-norefc -- $(PYTHON) tools/configure.py --output-directory ./prep/duklow-nondebug-norefc --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_DUKLOW_NOREFC) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/duklow-nondebug-norefc --source-directory src-input --config-metadata config $(CONFIGOPTS_NONDEBUG_DUKLOW_NOREFC) --line-directives - prep/duklow-debug-norefc: prep - @rm -rf ./prep/duklow-debug-norefc -- $(PYTHON) tools/configure.py --output-directory ./prep/duklow-debug-norefc --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG_DUKLOW_NOREFC) --line-directives -+ $(NODE) src-tools/index.js configure --output-directory ./prep/duklow-debug-norefc --source-directory src-input --config-metadata config $(CONFIGOPTS_DEBUG_DUKLOW_NOREFC) --line-directives - - # Library targets. - build/libduktape.so.1.0.0: prep/nondebug | build --- -2.17.1 - diff --git a/package/ctcgfw/filebrowser/Makefile b/package/ctcgfw/filebrowser/Makefile deleted file mode 100644 index 188d01a10d..0000000000 --- a/package/ctcgfw/filebrowser/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE.txt for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=filebrowser -PKG_VERSION:=2.13.0 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=e1f6586 -PKG_SOURCE_URL:=https://github.com/filebrowser/filebrowser -PKG_MIRROR_HASH:=d2b9af0b58442f2e214a957cef455b9852e34203e813870f6e2166ea7cf407c7 - -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_BUILD_DEPENDS:=golang/host node/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -PKG_CONFIG_DEPENDS:= \ - CONFIG_FILEBROWSER_COMPRESS_GOPROXY \ - CONFIG_FILEBROWSER_COMPRESS_UPX - -GO_PKG:=github.com/filebrowser/filebrowser -GO_PKG_LDFLAGS:=-s -w -GO_PKG_LDFLAGS_X:= \ - $(GO_PKG)/v2/version.CommitSHA=$(PKG_SOURCE_VERSION) \ - $(GO_PKG)/v2/version.Version=$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/filebrowser - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Web File Browser - URL:=https://github.com/filebrowser/filebrowser - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define Package/filebrowser/description - filebrowser provides a file managing interface within a specified directory - and it can be used to upload, delete, preview, rename and edit your files. - It allows the creation of multiple users and each user can have its own directory. - It can be used as a standalone app or as a middleware. -endef - -define Package/filebrowser/config -config FILEBROWSER_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config FILEBROWSER_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_FILEBROWSER_COMPRESS_GOPROXY),y) -export GO111MODULE=on -export GOPROXY=https://goproxy.io -endif - -define Build/Compile -( \ - cd $(PKG_BUILD_DIR)/frontend ; \ - npm ci; \ - npm run lint ; \ - npm run build ; \ - $(call GoPackage/Build/Compile) ; \ -) -ifeq ($(CONFIG_FILEBROWSER_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/filebrowser -endif -endef - -define Package/filebrowser/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - $(INSTALL_DIR) $(1)/etc/config/ $(1)/etc/init.d/ $(1)/usr/bin/ - $(INSTALL_CONF) $(CURDIR)/files/filebrowser.config $(1)/etc/config/filebrowser - $(INSTALL_BIN) $(CURDIR)/files/filebrowser.init $(1)/etc/init.d/filebrowser - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/filebrowser $(1)/usr/bin/filebrowser -endef - -$(eval $(call GoBinPackage,filebrowser)) -$(eval $(call BuildPackage,filebrowser)) diff --git a/package/ctcgfw/filebrowser/files/filebrowser.config b/package/ctcgfw/filebrowser/files/filebrowser.config deleted file mode 100644 index 85eb6ac44f..0000000000 --- a/package/ctcgfw/filebrowser/files/filebrowser.config +++ /dev/null @@ -1,9 +0,0 @@ - -config filebrowser 'config' - option addr_type 'lan' - option db_dir '/etc' - option db_name 'filebrowser.db' - option enabled '0' - option port '8989' - option root_dir '/' - diff --git a/package/ctcgfw/filebrowser/files/filebrowser.init b/package/ctcgfw/filebrowser/files/filebrowser.init deleted file mode 100755 index e6fa59218e..0000000000 --- a/package/ctcgfw/filebrowser/files/filebrowser.init +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2021 ImmortalWrt - -START=90 -STOP=10 - -addr_type="$(uci get filebrowser.config.addr_type)" -db_dir="$(uci get filebrowser.config.db_dir)" -[ "${db_dir}" == "/" ] || db_dir="${db_dir%*/}" -db_name="$(uci get filebrowser.config.db_name| sed 's#/##g')" -enabled="$(uci get filebrowser.config.enabled)" -port="$(uci get filebrowser.config.port)" -root_dir="$(uci get filebrowser.config.root_dir)" - -if [ "${addr_type}" == "local" ];then - addr="127.0.0.1" -elif [ "${addr_type}" == "lan" ];then - addr="$(uci get network.lan.ipaddr)" -elif [ "${addr_type}" == "wan" ];then - addr="0.0.0.0" -fi - -start() { - stop - [ "$enabled" == "1" ] || exit 0 - mkdir -p "${root_dir}" - mkdir -p "${db_dir}" - filebrowser -a "${addr}" -d "${db_dir}/${db_name}" -p "${port}" -r "${root_dir}" >/dev/null 2>&1 & -} - -stop() { - echo "${db_dir}/${db_name}" > "/lib/upgrade/keep.d/filebrowser" - killall -9 filebrowser >/dev/null 2>&1 -} diff --git a/package/ctcgfw/go-nats/Makefile b/package/ctcgfw/go-nats/Makefile deleted file mode 100644 index bd0f019d31..0000000000 --- a/package/ctcgfw/go-nats/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=go-nats -PKG_VERSION:=0.0.1 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/enobufs/go-nats.git -PKG_SOURCE_DATE:=2019-09-23 -PKG_SOURCE_VERSION:=4effc32e0f4006da0636b24f4468cf32ce494d71 -PKG_MIRROR_HASH:=52156d096ba21fdc18316040749b20868e500d7bd785a0d33533610ba7f7169b - -PKG_LICENSE:=MIT -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_CONFIG_DEPENDS:= \ - CONFIG_GO_NATS_COMPRESS_GOPROXY \ - CONFIG_GO_NATS_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/enobufs/go-nats -GO_PKG_LDFLAGS:=-s -w - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/go-nats - SECTION:=net - CATEGORY:=Network - TITLE:=A NAT type discovery tool - URL:=https://github.com/enobufs/go-nats - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define Package/go-nats/description - A NAT type discovery tool using STUN written purely in Go. -endef - -define Package/go-nats/config -config GO_NATS_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config GO_NATS_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_GO_NATS_COMPRESS_GOPROXY),y) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_GO_NATS_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/go-nats -endif -endef - -$(eval $(call GoBinPackage,go-nats)) -$(eval $(call BuildPackage,go-nats)) diff --git a/package/ctcgfw/gost/Makefile b/package/ctcgfw/gost/Makefile deleted file mode 100644 index b7bb98a2d7..0000000000 --- a/package/ctcgfw/gost/Makefile +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gost -PKG_VERSION:=2.11.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/ginuerzh/gost/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=d94b570a7a84094376b8c299d740528f51b540d9162f1db562247a15a89340bf - -PKG_LICENSE:=MIT -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_CONFIG_DEPENDS:= \ - CONFIG_GOST_COMPRESS_GOPROXY \ - CONFIG_GOST_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/ginuerzh/gost -GO_PKG_BUILD_PKG:=github.com/ginuerzh/gost/cmd/gost -GO_PKG_LDFLAGS:=-s -w - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/gost - SECTION:=net - CATEGORY:=Network - TITLE:=GO Simple Tunnel - URL:=https://github.com/ginuerzh/gost - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define Package/gost/description - A simple security tunnel written in Golang -endef - -define Package/gost/config -config GOST_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config GOST_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_GOST_COMPRESS_GOPROXY),y) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_GOST_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gost -endif -endef - -define Package/gost/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gost $(1)/usr/bin/gost - - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) $(CURDIR)/files/gost.config $(1)/etc/config/gost - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) $(CURDIR)/files/gost.init $(1)/etc/init.d/gost -endef - -$(eval $(call GoBinPackage,gost)) -$(eval $(call BuildPackage,gost)) diff --git a/package/ctcgfw/gost/files/gost.config b/package/ctcgfw/gost/files/gost.config deleted file mode 100644 index 6bea719670..0000000000 --- a/package/ctcgfw/gost/files/gost.config +++ /dev/null @@ -1,5 +0,0 @@ - -config gost - option enable '0' - option run_command '' - diff --git a/package/ctcgfw/gost/files/gost.init b/package/ctcgfw/gost/files/gost.init deleted file mode 100755 index fbb836ca27..0000000000 --- a/package/ctcgfw/gost/files/gost.init +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh /etc/rc.common -# Created By ImmortalWrt -# https://github.com/project-openwrt - -START=90 -STOP=10 - -enable="$(uci get gost.@gost[0].enable)" -run_command="$(uci get gost.@gost[0].run_command)" - -start() -{ - stop - - [ "${enable}" -ne "1" ] && exit 0 - /usr/bin/gost ${run_command} & -} - -stop() -{ - killall -9 "gost" > "/dev/null" 2>&1 -} diff --git a/package/ctcgfw/gotop/Makefile b/package/ctcgfw/gotop/Makefile deleted file mode 100644 index cd2c4484ad..0000000000 --- a/package/ctcgfw/gotop/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gotop -PKG_VERSION:=4.1.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/xxxserxxx/gotop/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed - -PKG_LICENSE:=MIT -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_CONFIG_DEPENDS:= \ - CONFIG_GOTOP_COMPRESS_GOPROXY \ - CONFIG_GOTOP_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/xxxserxxx/gotop -GO_PKG_LDFLAGS:=-s -w -GO_PKG_LDFLAGS_X:=main.Version=$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/gotop - SECTION:=admin - CATEGORY:=Administration - TITLE:=A terminal based graphical activity monitor - URL:=https://github.com/xxxserxxx/gotop - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define Package/gotop/description - Another terminal based graphical activity monitor, - inspired by gtop and vtop, this time written in Go! -endef - -define Package/gotop/config -config GOTOP_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config GOTOP_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_GOTOP_COMPRESS_GOPROXY),y) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_GOTOP_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gotop -endif -endef - -$(eval $(call GoBinPackage,gotop)) -$(eval $(call BuildPackage,gotop)) diff --git a/package/ctcgfw/gowebdav/Makefile b/package/ctcgfw/gowebdav/Makefile deleted file mode 100644 index 805b9a2a8e..0000000000 --- a/package/ctcgfw/gowebdav/Makefile +++ /dev/null @@ -1,83 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gowebdav -PKG_VERSION:=0.0.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/1715173329/gowebdav/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=0a6a2af4f24905ffea247b6044d01129d938af4b3a256bf19b42c52bb452f947 - -PKG_MAINTAINER:=CN_SZTL - -PKG_CONFIG_DEPENDS:= \ - CONFIG_GOWEBDAV_COMPRESS_GOPROXY \ - CONFIG_GOWEBDAV_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/1715173329/gowebdav -GO_PKG_LDFLAGS:=-s -w - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/gowebdav - SECTION:=net - CATEGORY:=Network - SUBMENU:=File Transfer - TITLE:=A simple WebDav server written in Golang. - URL:=https://github.com/1715173329/gowebdav - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define Package/gowebdav/description - A simple WebDav server written in Golang. -endef - -define Package/gowebdav/config -config GOWEBDAV_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config GOWEBDAV_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_GOWEBDAV_COMPRESS_GOPROXY),y) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_GOWEBDAV_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gowebdav -endif -endef - -define Package/gowebdav/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gowebdav $(1)/usr/bin/gowebdav - - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) $(CURDIR)/files/gowebdav.config $(1)/etc/config/gowebdav - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) $(CURDIR)/files/gowebdav.init $(1)/etc/init.d/gowebdav -endef - -$(eval $(call GoBinPackage,gowebdav)) -$(eval $(call BuildPackage,gowebdav)) diff --git a/package/ctcgfw/gowebdav/files/gowebdav.config b/package/ctcgfw/gowebdav/files/gowebdav.config deleted file mode 100644 index 33a3c4ae65..0000000000 --- a/package/ctcgfw/gowebdav/files/gowebdav.config +++ /dev/null @@ -1,12 +0,0 @@ - -config gowebdav 'config' - option enable '0' - option listen_port '6086' - option username 'user' - option password 'pass' - option root_dir '/mnt' - option read_only '0' - option allow_wan '0' - option use_https '0' - option cert_cer '' - option cert_key '' diff --git a/package/ctcgfw/gowebdav/files/gowebdav.init b/package/ctcgfw/gowebdav/files/gowebdav.init deleted file mode 100755 index d1e3e04260..0000000000 --- a/package/ctcgfw/gowebdav/files/gowebdav.init +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2021 ImmortalWrt - -START=99 -STOP=10 - -init_conf() { - config_load "gowebdav" - config_get "enable" "config" "enable" "0" - config_get "listen_port" "config" "listen_port" "6086" - config_get "username" "config" "username" - config_get "password" "config" "password" - config_get "root_dir" "config" "root_dir" "/mnt" - config_get "read_only" "config" "read_only" "0" - config_get "allow_wan" "config" "allow_wan" "0" - config_get "use_https" "config" "use_https" "0" - config_get "cert_cer" "config" "cert_cer" - config_get "cert_key" "config" "cert_key" - - config_load "network" - config_get "lan_addr" "lan" "ipaddr" "192.168.1.1" -} - -set_firewall() { - if [ "${set_type}" = "start" ]; then - mkdir -p "/var/etc/" - iptables -I INPUT -p tcp --dport "${listen_port}" -j ACCEPT - echo "iptables -I INPUT -p tcp --dport "${listen_port}" -j ACCEPT" > "/var/etc/gowebdav.include" - elif [ "${set_type}" = "stop" ]; then - iptables -D INPUT -p tcp --dport "${listen_port}" -j ACCEPT - echo "" > "/var/etc/gowebdav.include" - fi -} - -start() { - init_conf - - stop - - [ "${enable}" -ne "1" ] && exit 0 - - mkdir -p "${root_dir}" - - [ "${allow_wan}" -ne "1" ] && listen_addr="${lan_addr}" || { listen_addr="0.0.0.0"; set_type="start" && set_firewall 2>"/dev/null"; } - { [ -n "${username}" ] && [ -n "${password}" ]; } && auth_arg="-user ${username} -password ${password}" - [ "${read_only}" -eq "1" ] && readonly_arg="-read-only" - { [ "${use_https}" -eq "1" ] && [ -e "${cert_cer}" ] && [ -e "${cert_key}" ]; } && https_arg="-https-mode -https-cert-file ${cert_cer} -https-key-file ${cert_key}" - /usr/bin/gowebdav -dir "${root_dir}" -http "${listen_addr}:${listen_port}" ${auth_arg} ${readonly_arg} ${https_arg} & -} - -stop() { - init_conf - - set_type="stop" && set_firewall 2>"/dev/null" - killall "gowebdav" 2>"/dev/null" -} diff --git a/package/ctcgfw/ipt2socks-alt/Makefile b/package/ctcgfw/ipt2socks-alt/Makefile deleted file mode 100644 index 8b0c40a50a..0000000000 --- a/package/ctcgfw/ipt2socks-alt/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ipt2socks-alt -PKG_VERSION:=1.0.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/zfl9/ipt2socks/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=f247d72b61b1f40ce347904c43523bff257fc9f00ff269ecccf06f1d0f4b9d5e - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(firstword $(subst -, ,$(PKG_NAME)))-$(PKG_VERSION) -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -PKG_LICENSE:=AGPL-3.0 -PKG_LICENSE_FILE:=LICENSE - -include $(INCLUDE_DIR)/package.mk - -define Package/ipt2socks-alt - SECTION:=net - CATEGORY:=Network - TITLE:=Utility for converting iptables (REDIRECT/TPROXY) to SOCKS5 - URL:=https://github.com/zfl9/ipt2socks - DEPENDS:=+libpthread +libuv -endef - -TARGET_CFLAGS += $(FPIC) -flto -TARGET_LDFLAGS += -flto - -define Package/ipt2socks-alt/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/ipt2socks $(1)/usr/bin/ipt2socks-alt -endef - -$(eval $(call BuildPackage,ipt2socks-alt)) diff --git a/package/ctcgfw/jpcre2/Makefile b/package/ctcgfw/jpcre2/Makefile deleted file mode 100644 index ee3d9286f4..0000000000 --- a/package/ctcgfw/jpcre2/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# (https://immortalwrt.org) -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=jpcre2 -PKG_VERSION:=10.32.01 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/jpcre2/jpcre2/tar.gz/$(PKG_VERSION)? -PKG_HASH:=668cbc6d2c0a065bb6abe8494d5a1bb3549a14cd956a44a2df9095045623ea47 - -PKG_LICENSE:=BSD 3-Clause -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_BUILD_DEPENDS:=pcre2 -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/jpcre2 - SECTION:=lib - CATEGORY:=Libraries - TITLE:=C++ wrapper for PCRE2 Library - URL:=https://github.com/jpcre2/jpcre2 -endef - -define Package/jpcre2/description - This provides some C++ wrapper classes/functions to perform - regex operations such as regex match and regex replace. -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/jpcre2.hpp $(1)/usr/include/jpcre2.hpp -endef - -$(eval $(call BuildPackage,jpcre2)) diff --git a/package/ctcgfw/libtar/Makefile b/package/ctcgfw/libtar/Makefile deleted file mode 100644 index 10c50264f5..0000000000 --- a/package/ctcgfw/libtar/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -#### - # File: /Makefile - # Project: libtar - # File Created: Saturday, 7th March 2020 6:57:51 pm - # Author: ElonH[EH](elonhhuang@gmail.com) - # License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) - # Copyright (C) 2020 [ElonH] -#### - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libtar -PKG_VERSION:=1.2.20 -PKG_RELEASE:=4 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/ElonH/libtar.git -PKG_SOURCE_DATE:=2020-03-08 -PKG_SOURCE_VERSION:=987a29eaf8c68f8a502dd3880c58e0e1ef99d6a7 -PKG_MIRROR_HASH:=7d9d7d8d33d39ac1e6a586361247f53a33ad0063c3940521b431a7d9b6170eac - -PKG_LICENSE:=GPLv3 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=ElonH - -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -CONFIGURE_ARGS+= --enable-shared=yes --enable-static=no - -define Package/libtar - SECTION:=lib - CATEGORY:=Libraries - URL:=https://github.com/ElonH/libtar - TITLE:=libtar - C library for manipulating tar files - DEPENDS:=+zlib -endef - -define Package/libtar/description - libtar is a library for manipulating tar files from within C programs. - - Here are some of its features: - * Handles both POSIX tar file format and the GNU extensions. - * API provides functions for easy use, such as tar_extract_all(). - * Also provides functions for more granular use, such as - tar_append_regfile(). -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtar $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include -endef - -define Package/libtar/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtar $(1)/usr/bin - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib -endef - -$(eval $(call BuildPackage,libtar)) diff --git a/package/ctcgfw/libtar/patches/001-disable-fortity.patch b/package/ctcgfw/libtar/patches/001-disable-fortity.patch deleted file mode 100644 index 11ca520d08..0000000000 --- a/package/ctcgfw/libtar/patches/001-disable-fortity.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 3ebdf51..e8db2c2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -107,6 +107,7 @@ AC_FUNC_STRFTIME - COMPAT_FUNC_STRLCPY - COMPAT_FUNC_STRMODE - COMPAT_FUNC_STRSEP -+AC_DEFINE([_FORTIFY_STDIO_H], [1], [disable fortify]) - - dnl ### Check for libraries. ####################################### - AC_ARG_WITH([zlib], diff --git a/package/ctcgfw/libtar/patches/002-stderr-not-defined.patch b/package/ctcgfw/libtar/patches/002-stderr-not-defined.patch deleted file mode 100644 index 70e2c78b6e..0000000000 --- a/package/ctcgfw/libtar/patches/002-stderr-not-defined.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libtar/libtar.c b/libtar/libtar.c -index 23f8741..e8d9d73 100644 ---- a/libtar/libtar.c -+++ b/libtar/libtar.c -@@ -10,6 +10,9 @@ - ** University of Illinois at Urbana-Champaign - */ - -+#include -+#include -+ - #include - #include - diff --git a/package/ctcgfw/libtar/patches/003-disable-strip.patch b/package/ctcgfw/libtar/patches/003-disable-strip.patch deleted file mode 100644 index 8cfe277fe3..0000000000 --- a/package/ctcgfw/libtar/patches/003-disable-strip.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libtar/Makefile.in b/libtar/Makefile.in -index 7c6f1bc..80bb8d9 100644 ---- a/libtar/Makefile.in -+++ b/libtar/Makefile.in -@@ -20,7 +20,7 @@ SHELL = @SHELL@ - - ### Installation programs and flags - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - LN_S = @LN_S@ - MKDIR = @MKDIR@ diff --git a/package/ctcgfw/lua-maxminddb/Makefile b/package/ctcgfw/lua-maxminddb/Makefile deleted file mode 100644 index 20acc39214..0000000000 --- a/package/ctcgfw/lua-maxminddb/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (C) 2020 jerryk -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=lua-maxminddb -PKG_VERSION:=0.2 -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/fabled/lua-maxminddb.git -PKG_SOURCE_DATE:=2019-03-14 -PKG_SOURCE_VERSION:=93da9f4e6c814c3a23044dd2cdd22d4a6b4f665b -PKG_MIRROR_HASH:=b99ef18516b705b3e73b15a9d5ddc99add359299b52639fe3c81dd761591d9d9 - -PKG_LICENSE:=MIT -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=fabled - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/lua-maxminddb - SUBMENU:=Lua - SECTION:=lang - CATEGORY:=Languages - TITLE:=libmaxminddb bindings for lua - URL:=https://github.com/jerrykuku/lua-maxminddb - DEPENDS:=+lua +libmaxminddb -endef - -TARGET_CFLAGS += $(FPIC) - -define Package/lua-maxminddb/install - $(INSTALL_DIR) $(1)/usr/lib/lua - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/maxminddb.so $(1)/usr/lib/lua/ -endef - -$(eval $(call BuildPackage,lua-maxminddb)) diff --git a/package/ctcgfw/mentohust/Makefile b/package/ctcgfw/mentohust/Makefile deleted file mode 100644 index 6231796f33..0000000000 --- a/package/ctcgfw/mentohust/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (C) 2014-2015 KyleRicardo -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=mentohust -PKG_VERSION:=0.3.1 -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/KyleRicardo/MentoHUST-OpenWrt-ipk.git -PKG_SOURCE_DATE:=2018-11-27 -PKG_SOURCE_VERSION:=557cffca8032b6d8ac948be8a79255dc64a1915d -PKG_MIRROR_HASH:=1db6cd4402ea3e1fa2adc3adcc1490fffdac224ae83024d883429b8b67fb9c74 - -PKG_BUILD_PARALLEL:=1 - -MAKE_PATH:=src - -include $(INCLUDE_DIR)/package.mk - -define Package/mentohust - SECTION:=net - CATEGORY:=Network - TITLE:=A Ruijie Client Daemon - URL:=https://github.com/KyleRicardo/MentoHUST-OpenWrt-ipk - SUBMENU:=Campus Network - DEPENDS:=+libpcap -endef - -define Package/mentohust/description - A Ruijie Client Daemon, most usually used in China collages. -endef - -define Package/mentohust/conffiles -/etc/mentohust.conf -endef - -define Package/mentohust/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mentohust $(1)/usr/sbin/mentohust - $(INSTALL_DIR) $(1)/etc - $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/mentohust.conf $(1)/etc/mentohust.conf -endef - -$(eval $(call BuildPackage,mentohust)) diff --git a/package/ctcgfw/mentohust/patches/010-more-robust-in-makefile.patch b/package/ctcgfw/mentohust/patches/010-more-robust-in-makefile.patch deleted file mode 100644 index 0f56db9b16..0000000000 --- a/package/ctcgfw/mentohust/patches/010-more-robust-in-makefile.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 05c95ab..03ea7cd 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -1,11 +1,9 @@ - include $(TOPDIR)/rules.mk - include $(INCLUDE_DIR)/package.mk - --CC = mips-openwrt-linux-gcc - CFLAGS = -Wall -g -O2 --INC_DIR= $(STAGING_DIR)/usr/include -I$(BUILD_DIR)/libpcap-*/ipkg-install/usr/include --LINK_DIR= $(STAGING_DIR)/usr/lib -L$(BUILD_DIR)/libpcap-*/ipkg-install/usr/lib --LIBS= $(BUILD_DIR)/libpcap-*/ipkg-install/usr/lib/libpcap.a -+CFLAGS+= $(shell pkg-config --cflags libpcap) -+LIBPCAP_LIBS:= $(shell pkg-config --libs libpcap) - - OBJ = mentohust.o dlfunc.o md5.o mycheck.o myconfig.o myfunc.o strnormalize.o myini.o mystate.o - .PHONY: all -@@ -13,34 +11,34 @@ OBJ = mentohust.o dlfunc.o md5.o mycheck.o myconfig.o myfunc.o strnormalize.o m - all: mentohust - - mentohust: $(OBJ) -- $(CC) $(CFLAGS) -o $@ $(OBJ) $(LIBS) -I$(INC_DIR) -L$(LINK_DIR) $(LDFLAGS) -+ $(CC) $(CFLAGS) -o $@ $(OBJ) $(LIBPCAP_LIBS) $(LDFLAGS) - - mentohust.o : mentohust.c -- $(CC) $(CFLAGS) -c $< -I$(INC_DIR) -+ $(CC) $(CFLAGS) -c $< - - dlfunc.o : dlfunc.c -- $(CC) $(CFLAGS) -c $< -I$(INC_DIR) -+ $(CC) $(CFLAGS) -c $< - - md5.o : md5.c md5.h -- $(CC) $(CFLAGS) -c $< -I$(INC_DIR) -+ $(CC) $(CFLAGS) -c $< - - strnormalize.o: strnormalize.c strnormalize.h -- $(CC) $(CFLAGS) -c $< -I$(INC_DIR) -+ $(CC) $(CFLAGS) -c $< - - mycheck.o : mycheck.c -- $(CC) $(CFLAGS) -c $< -I$(INC_DIR) -+ $(CC) $(CFLAGS) -c $< - - myconfig.o : myconfig.c -- $(CC) $(CFLAGS) -c $< -I$(INC_DIR) -+ $(CC) $(CFLAGS) -c $< - - myfunc.o : myfunc.c -- $(CC) $(CFLAGS) -c $< -I$(INC_DIR) -+ $(CC) $(CFLAGS) -c $< - - myini.o : myini.c -- $(CC) $(CFLAGS) -c $< -I$(INC_DIR) -+ $(CC) $(CFLAGS) -c $< - - mystate.o : mystate.c -- $(CC) $(CFLAGS) -c $< -I$(INC_DIR) -+ $(CC) $(CFLAGS) -c $< - - clean : - rm -v $(OBJ) mentohust diff --git a/package/ctcgfw/microsocks11/Makefile b/package/ctcgfw/microsocks11/Makefile deleted file mode 100644 index 8b4843659b..0000000000 --- a/package/ctcgfw/microsocks11/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# (https://immortalwrt.org) -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=microsocks11 -PKG_VERSION:=2.3.0 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/EvanMcBroom/microsocks11/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=7b2f7c1fca9ba6cb135c9ec3f2f7304b6ccd790bc15318619f515b3b2e5e148e - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_BUILD_DEPENDS:=cxxopts -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/microsocks11 - SECTION:=net - CATEGORY:=Network - URL:=https://github.com/EvanMcBroom/microsocks11 - TITLE:=A cross-platform SOCKS5 server based on the microsocks project - DEPENDS:=+libc +libstdcpp +libpthread - CONFLICTS:=microsocks -endef - -define Package/libmicrosocks11 - SECTION:=lib - CATEGORY:=Libraries - URL:=https://github.com/EvanMcBroom/microsocks11 - TITLE:=A cross-platform SOCKS5 library based on the microsocks project - DEPENDS:=+libc +libstdcpp +libpthread -endef - -define Package/microsocks11/description - MicroSocks11 is a SOCKS5 library and server based on the microsocks project that uses - CMake and C++11 for cross-platform support. MicroSocks11 supports IPv4, IPv6, and DNS. -endef - -Package/libmicrosocks11/description = $(Package/microsocks11/description) - -define Build/Install - true -endef - -define Package/microsocks11/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/microsocks $(1)/usr/bin/microsocks -endef - -define Package/libmicrosocks11/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libsocks5.a $(1)/usr/lib/libsocks5.a -endef - -$(eval $(call BuildPackage,microsocks11)) -$(eval $(call BuildPackage,libmicrosocks11)) diff --git a/package/ctcgfw/microsocks11/patches/100-main.cpp-fix-typo-error-of-getting-password.patch b/package/ctcgfw/microsocks11/patches/100-main.cpp-fix-typo-error-of-getting-password.patch deleted file mode 100644 index 3228f505c7..0000000000 --- a/package/ctcgfw/microsocks11/patches/100-main.cpp-fix-typo-error-of-getting-password.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 74265362c4a44e2abe6594f263973634092d5c6d Mon Sep 17 00:00:00 2001 -From: CN_SZTL -Date: Fri, 29 Jan 2021 05:39:16 +0000 -Subject: [PATCH] main.cpp: fix typo error of getting password - -Signed-off-by: CN_SZTL ---- - main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/main.cpp b/main.cpp -index e7035be..47df5d0 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -25,7 +25,7 @@ int main(int argc, char** argv) { - - bool auth{ result["1"].count() != 0 }; - bool user{ result["u"].count() != 0 }; -- bool password{ result["p"].count() != 0 }; -+ bool password{ result["P"].count() != 0 }; - - if (user ^ password) { - fprintf(stderr, "error: user and password must be used together\n"); --- -2.17.1 - diff --git a/package/ctcgfw/mwol/Makefile b/package/ctcgfw/mwol/Makefile deleted file mode 100644 index f3fe846f9b..0000000000 --- a/package/ctcgfw/mwol/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (C) 2019 mleaf.org -# 微信公众号【WiFi物联网】 -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=mwol -PKG_VERSION:=1.0.0 -PKG_RELEASE=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/Mleaf/mwol.git -PKG_SOURCE_DATE:=2020-01-08 -PKG_SOURCE_VERSION:=59f9805901b4ac2916a0273ffbc29197fcd17a62 -PKG_MIRROR_HASH:=64f88b81ed88b1695f240fe4c0414bd32a5cf6e53ea008c67713ae8315ff3d0d - -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILES:=COPYING -PKG_MAINTAINER:=mleaf - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/mwol - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libpthread +libmosquitto-ssl +luci-lib-json +libopenssl - TITLE:=MQTT Wake On Lan - URL:=http://www.mleaf.org -endef - -define Package/mwol/description - mwol is a project that uses mqtt to implement reverse proxy and wake up the computer. -endef - -define Package/mwol/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mwol $(1)/usr/sbin/mwol - - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) files/mwol.config $(1)/etc/config/mwol - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) files/mwol.init $(1)/etc/init.d/mwol - - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) files/mwol_config_json $(1)/usr/sbin/mwol_config_json - $(INSTALL_DIR) $(1)/usr/share/mwol/ssl - $(CP) files/ssl/* $(1)/usr/share/mwol/ssl/ -endef - -$(eval $(call BuildPackage,mwol)) diff --git a/package/ctcgfw/mwol/files/mwol.config b/package/ctcgfw/mwol/files/mwol.config deleted file mode 100644 index 919c1935cc..0000000000 --- a/package/ctcgfw/mwol/files/mwol.config +++ /dev/null @@ -1,11 +0,0 @@ - -config mwol 'mwol_conf' - option enable '0' - option hostname 'www.mleaf.org' - option port '1999' - option sslenable '1' - option cafile '/usr/share/mwol/ssl/ca.crt' - option crtfile '/usr/share/mwol/ssl/client.crt' - option keyfile '/usr/share/mwol/ssl/client.key' - option encryptionenable '0' - diff --git a/package/ctcgfw/mwol/files/mwol.init b/package/ctcgfw/mwol/files/mwol.init deleted file mode 100755 index ab82d29603..0000000000 --- a/package/ctcgfw/mwol/files/mwol.init +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (c) 2019 www.mleaf.org. All rights reserved. -# 微信公众号【WiFi物联网】 - -START=99 -STOP=10 - -USE_PROCD=1 - -PROG=/usr/sbin/mwol - -generate_mwol_conf() -{ - logger "Generate /tmp/mwol.json" - lua /usr/sbin/mwol_config_json > /tmp/mwol.json -} - -start_service_real() { - local cfg="$1" - local enable - local id - config_get enable "$cfg" enable - config_get id "$cfg" id - if [ -z "$id" ]; then - mac=`cat /sys/class/net/eth0/address` - logger "mqtt id is not set to use eth0 by default: $mac" - uci set mwol.mwol_conf.id=$mac - uci commit mwol - fi - - if [ "$enable" -eq 1 ]; then - generate_mwol_conf - - procd_open_instance - - procd_set_param command $PROG -c /tmp/mwol.json - - procd_set_param respawn - - procd_set_param stdout 1 - procd_set_param stderr 1 - - procd_close_instance - fi - -} - -service_triggers() { - procd_add_reload_trigger "mwol" -} - -start_service() -{ - config_load mwol - - config_foreach start_service_real mwol -} diff --git a/package/ctcgfw/mwol/files/mwol_config_json b/package/ctcgfw/mwol/files/mwol_config_json deleted file mode 100644 index c10e42bf9b..0000000000 --- a/package/ctcgfw/mwol/files/mwol_config_json +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env lua ---Copyright (c) 2019 www.mleaf.org. All rights reserved. ---微信公众号【WiFi物联网】 - -ubus = require('ubus') - -local json = require "luci.json" - -local conn = ubus.connect() -if not conn then - error("Failed to connect to ubus") -end - -local mwol_ubus = conn:call("uci", "get", {config = "mwol"}) - -local mwol_table = mwol_ubus["values"] - -local mwol_conf = {} -local mwo_enable - -function get_mwol_conf(mTable) - - for key, val in pairs(mTable) do - if string.match(key, '%.[%a]*', 1) == nil then - if key == "enable" then - mwo_enable = val - elseif key == "sslenable" then - if val == "1" then - mwol_conf["ssl"] = true - else - mwol_conf["ssl"] = false - end - elseif key=="encryptionenable" then - if val == "1" then - mwol_conf["encryption"] = true - else - mwol_conf["encryption"] = false - end - elseif key == "port" then - mwol_conf[key] = tonumber(val) - else - mwol_conf[key] = val - end - end - end -end - -for key, val in pairs(mwol_table) do - - if key == "mwol_conf" then - get_mwol_conf(val) - end -end - -jsonStr = json.encode(mwol_conf) -print(jsonStr) diff --git a/package/ctcgfw/mwol/files/ssl/ca.crt b/package/ctcgfw/mwol/files/ssl/ca.crt deleted file mode 100644 index 0100bef370..0000000000 --- a/package/ctcgfw/mwol/files/ssl/ca.crt +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICljCCAX4CCQCKs4OCFSYhzjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDDAJj -YTAeFw0yMDAxMDcwNDEwMTJaFw0zMDAxMDQwNDEwMTJaMA0xCzAJBgNVBAMMAmNh -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3LwOkCJ1MDajCRK4jTgf -0cnapRPOs6xZFru0NgHMY7R6hlmBk8asHJIM+B9c3hGqEYERkRTR586lUWiE1n/i -VTTa5kblEb48p9dDaeUHtGB5FYvJQDgpdyy+dbqgFs/LbZ4mngz0rBeY4ukxu3lX -Zcs2DOGYnZd2uun7TSd5k6276tjzljcVfPigBN0U1YMyhPv+vo66bYBH+QFBXgd+ -8+Be5nCEY2IQjaeTbpobcnz1x9iyfrqDc1Xk+d+dnHoajdgIdWKgR6rTcKlMNwh+ -SVz1zU1GmzUtD+dfpB2mc8f1G3J1bXA2n8Jt568KH6Gx8KvX6NXpvK+vHcmFTaDv -CQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAwJ8xvUtSEhYuFOGCZ1fWz1Q8lLtC6 -tNARV4C+JmT63mBkwP2tHC5GjbgCQTtYA8bgiEAsZkYL7wDw4R6104xHVmpYSaoN -lZxSps2t7WfpwABzaHZaeIzlZ+7lkamLb5It9yAvJTEN2L3opdRFleumz+3mpouM -VjBN6g3xX1SUmPoWn8QW7NvK9KwZHdr6uALoZ8vGAaXg7OTZooHL4xlCyESLqnbA -p7Nr1iiqhbRRcVeplljFGoAEMBlrx1x3rwtJl2gCBQmN802P+Vh4TdoWTBbFhdNR -R3PeUvxu3rZYnFrcfmdiABnAzqAybxr8/GO/UHqooSD2PLwC/CiI4FjT ------END CERTIFICATE----- diff --git a/package/ctcgfw/mwol/files/ssl/client.crt b/package/ctcgfw/mwol/files/ssl/client.crt deleted file mode 100644 index a5f45c2a96..0000000000 --- a/package/ctcgfw/mwol/files/ssl/client.crt +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICmjCCAYICCQDPwW2AAN66QDANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDDAJj -YTAeFw0yMDAxMDcwNDEwMTJaFw0zMDAxMDQwNDEwMTJaMBExDzANBgNVBAMMBmNs -aWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPHfX5Eb6fEz/DSL -JwTC+ZoToYIi4Nw4n+MyTGzMrNRXGKCX52/h9DrWUNNpACZ2O3SVSdgTknv2g0oZ -wjr0xEhMILYwAauzA9N6IcLZcZ2RMvRXyY0KRvVluBEgrZty0oEHgFE2BSMENF6P -BWRmWJs8s91Ckt8JkHfkXR7ul8Wba9ETQldZ1Z9lHgawbxuQARq6IduqtrqHwId0 -LLYGF7bsYf/IL5ZtQs66+ldJUiUcRAwaR12X6kwn1dATpcgJlxiq4LCYP3wde3Ja -wqbW57S7FBoVInjboieGAGBV9Cd3jW19hLQCzAO5Y81N6GSBX5uxu4RkbgMEmWOw -/T7Wq30CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAz5let8l3UXdhVSim+ZT5Q+l9 -jTJxheSct5MnZ+68qkF7Aax0DY6eB2RTymv/uQ9TBOKPGnOQAW/c328t39XP2PRY -tqN30iyYsmxZ/AXVDykEnV4GlssgJKWPrC+oca80+FT8O+k0QjiAFbVdpRfkr/rh -IMBRt/E0vuaqEPfgS7b9SrE8cH+InZMvoeV1PKDBnMCnROO6jHo27iV1yJxJd0Eu -JmOBHnIcFh3SD8kh4boPO4IiHY6FS3rDgaVveITc6faZSDvyjkv5Yqvl+n79V3M9 -zISgdkNYkEG50dJiVPoVNq0SLt4kWTpRKs3WgZEN4wZVQCu9Ijtf+4hmqeWmTg== ------END CERTIFICATE----- diff --git a/package/ctcgfw/mwol/files/ssl/client.key b/package/ctcgfw/mwol/files/ssl/client.key deleted file mode 100644 index 41451e4c40..0000000000 --- a/package/ctcgfw/mwol/files/ssl/client.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA8d9fkRvp8TP8NIsnBML5mhOhgiLg3Dif4zJMbMys1FcYoJfn -b+H0OtZQ02kAJnY7dJVJ2BOSe/aDShnCOvTESEwgtjABq7MD03ohwtlxnZEy9FfJ -jQpG9WW4ESCtm3LSgQeAUTYFIwQ0Xo8FZGZYmzyz3UKS3wmQd+RdHu6XxZtr0RNC -V1nVn2UeBrBvG5ABGroh26q2uofAh3QstgYXtuxh/8gvlm1Czrr6V0lSJRxEDBpH -XZfqTCfV0BOlyAmXGKrgsJg/fB17clrCptbntLsUGhUieNuiJ4YAYFX0J3eNbX2E -tALMA7ljzU3oZIFfm7G7hGRuAwSZY7D9PtarfQIDAQABAoIBACkFdGTc8hlZcr3K -l+yD0OdjyvGSTsaqx9s1jaaqM+mzd9bMzJC6JrzP2ldwqHjddon4Q9TkxORHU87+ -fWWYW63TU3zyuWXQb6avQQiV7mIF3Tl5phJImu5FuSkWfLsvhyohBo8/dTGSJfuf -kA+OGBsD+ZFeGCDBs4HR9kUnvA/kTsXFL2XsrjNvPP4d1z90H2GtVujhhH4mfEO1 -E8BL1crNMmZFek+ETk7GfZ/GE4oLtno1jaBczbpEa9wekjtq6ffoAGaAd5/6ZjIw -tpC6bNSDGqL0fTd/6ss5WZc8hYLTdkcZxh08kpVP5WoWm5WSxh8osQ494w6upEuo -p9qpRrUCgYEA+eRBhfAC0Cal5qTZTX4nbKdO7gkmxefcNfMF6eNJZ/oxOANEnl/Q -sSyZvtzoxNPaPuYu4LrniaKqFKD6DqA2ZIKRf4o8ydfQeDMvz8Ly4rpzuIDi45kc -sZ2S3aRh8IpDM4KOFachmBcjpyf2CPhJxeYLlHCMfASN5T2cGdpBKMcCgYEA98jv -viDoDPRTglfNYWIvU4dHWel9zjySSey6L9Awpna22jdLVTcaplZQNVKJ7uajIj1A -DA2GNDtZXHnUJBx9avMaURXBGLh/0S9NBMaeCRoQeCI1249/3xPQzKCWscvv2hPW -vRUQMS+erfmSDxg8B5LOVqPXLagZ0QA33KkILZsCgYBEh+GkTrcmyIKU5z6k7uT2 -+kc+JopYmgadUQGdK/T0q/uVhefqmxJLlJSxcDnxyLvApjXS8c8Pwulr8N3C5xMj -q18loA6duC721+rTyn37yfB0d/xBOLtSxokBedRWOETHupUmwQgIgsgHToE94oGw -4S7pzZfpZwJXDPdja6SU/wKBgQDLHUG5HwxZIicaX5MR0wRseiX5BDeGSYy5YH43 -F3fp3MKDGnR8RBFqbLKPIzvCQ/lR5deMicGLK2NTNOK7P0dn1iOqeCSzePn9pcKC -ubVuTJlXgOOZOYZefMXaF4Gv+TaCE2Uh1hRR3XE7t6sNCJactrDBwMhwuq1+76jb -DwyPJQKBgQCGX/+wwPnAvmtaKu9EUegp2hbmPXqLCexGAME/npUn071CYRoXb1OM -+13f7zWxC+5AIbcbX1LC+GrafeJGT/9VPqivvntwU2PtxfdPJ+wGkLcV+10gxV2l -5+w86aMDefzlqvMCX6pp9SY8jtzYBYGhm5OFVQ4eRAkceHlpXtEf/w== ------END RSA PRIVATE KEY----- diff --git a/package/ctcgfw/naiveproxy/Makefile b/package/ctcgfw/naiveproxy/Makefile deleted file mode 100644 index c8ab4f30d2..0000000000 --- a/package/ctcgfw/naiveproxy/Makefile +++ /dev/null @@ -1,148 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=naiveproxy -PKG_VERSION:=89.0.4389.72-1 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=94b1c3f1e63ecab43eb8006a38ed1a76f1e510364ba651abaef0ec575449f687 - -PKG_LICENSE:=BSD 3-Clause -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_BUILD_DEPENDS:=ncurses/host ninja/host python3/host -PKG_USE_MIPS16:=0 -PKG_BUILD_PARALLEL:=1 - -ifneq ($(CONFIG_CPU_TYPE)," ") - CPU_TYPE:=$(word 1, $(subst +," ,$(CONFIG_CPU_TYPE))) - CPU_SUBTYPE:=$(word 2, $(subst +, ",$(CONFIG_CPU_TYPE))) - ifeq ($(CPU_SUBTYPE),) - CPU_SUBTYPE:="" - endif -else - CPU_TYPE:="" - CPU_SUBTYPE:="" -endif - -include $(INCLUDE_DIR)/package.mk - -define Package/naiveproxy/config - depends on !(arc||armeb||mips||mips64||powerpc) -endef - -define Package/naiveproxy - SECTION:=net - CATEGORY:=Network - SUBMENU:=Web Servers/Proxies - URL:=https://github.com/klzgrad/naiveproxy - TITLE:=Make a fortune quietly - DEPENDS:=+libatomic +libnss -endef - -define Package/naiveproxy/description - 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. -endef - -ifneq ($(CONFIG_CCACHE),) - export CCACHE_SLOPPINESS=time_macros - export CCACHE_BASEDIR=$(PKG_BUILD_DIR)/src - export CCACHE_CPP2=yes - export naive_ccache_flags=cc_wrapper="ccache" -endif - -AFDO_VER:=89.0.4389.65_rc-r1-merged -AFDO_FILE:=chromeos-chrome-amd64-$(AFDO_VER).afdo.bz2 -define Download/AFDO_PROF - URL:=https://storage.googleapis.com.cnpmjs.org/chromeos-prebuilt/afdo-job/llvm \ - https://storage.googleapis.com/chromeos-prebuilt/afdo-job/llvm - URL_FILE:=$(AFDO_FILE) - FILE:=$(AFDO_FILE) - HASH:=75a176d57c9b5fb12bff7e9442ddf21226df8aa25de19266f7ceb426eafd3421 -endef - -CLANG_VER:=llvmorg-12-init-16296-g5e476061-1 -CLANG_FILE:=clang-$(CLANG_VER).tgz -define Download/CLANG - URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64 - URL_FILE:=$(CLANG_FILE) - FILE:=$(CLANG_FILE) - HASH:=78729dfab39fb9d52ede2841e408cf505959b26a5d0b086ed7cf4f784f2b393a -endef - -GN_VER:=595e3be7c8381d4eeefce62a63ec12bae9ce5140 -GN_FILE:=gn-git_revision-$(GN_VER).zip -define Download/GN_TOOL - URL:=https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+ - URL_FILE:=git_revision:$(GN_VER) - FILE:=$(GN_FILE) - HASH:=9d61dcab3814868786768c9dfab71e0cd850a61dbad9a049536d2f1aae784fe4 -endef - -PGO_VER:=4389-1614333145-3fb545b30f8abc065d64d3b5af88abd66c7abb5e -PGO_FILE:=chrome-linux-$(PGO_VER).profdata -define Download/PGO_PROF - URL:=https://storage.googleapis.com.cnpmjs.org/chromium-optimization-profiles/pgo_profiles \ - https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles - URL_FILE:=$(PGO_FILE) - FILE:=$(PGO_FILE) - HASH:=2dafccee5abb30bcc2dc627cfd8af203cac17b522f66e3e4a90301a70d237ce1 -endef - -define Build/Prepare - $(call Build/Prepare/Default) - - ( \ - cd $(PKG_BUILD_DIR)/src ; \ - bzip2 -cd > "chrome/android/profiles/afdo.prof" < "$(DL_DIR)/$(AFDO_FILE)" ; \ - mkdir -p "chrome/build/pgo_profiles" ; \ - $(CP) "$(DL_DIR)/$(PGO_FILE)" "chrome/build/pgo_profiles" ; \ - mkdir -p "third_party/llvm-build/Release+Asserts" ; \ - $(TAR) -xzf "$(DL_DIR)/$(CLANG_FILE)" -C "third_party/llvm-build/Release+Asserts" ; \ - mkdir -p "gn/out" ; \ - unzip -o "$(DL_DIR)/$(GN_FILE)" -d "gn/out" ; \ - ) -endef - -define Build/Compile -( \ - cd "$(PKG_BUILD_DIR)/src" ; \ - . ../init_env.sh "$(ARCH)" "$(BOARD)" $(CPU_TYPE) $(CPU_SUBTYPE) "$(TOOLCHAIN_DIR)" ; \ - export naive_flags="$$$${naive_flags} pgo_data_path=\"$(PKG_BUILD_DIR)/src/chrome/build/pgo_profiles/$(PGO_FILE)\"" ; \ - export naive_flags="$$$${naive_flags} $$$${naive_ccache_flags}" ; \ - export OP_STAGING_DIR="$(STAGING_DIR)" ; \ - mkdir -p "out" ; \ - ./gn/out/gn gen "out/Release" --args="$$$${naive_flags}" --script-executable="$(STAGING_DIR_HOSTPKG)/bin/python3" ; \ - $(STAGING_DIR_HOSTPKG)/bin/ninja -C "out/Release" naive ; \ -) -endef - -define Package/naiveproxy/conffiles -/etc/config/naiveproxy -endef - -define Package/naiveproxy/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/out/Release/naive $(1)/usr/bin/naive - $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d - $(INSTALL_CONF) $(CURDIR)/files/naiveproxy.config $(1)/etc/config/naiveproxy - $(INSTALL_BIN) $(CURDIR)/files/naiveproxy.init $(1)/etc/init.d/naiveproxy -endef - -$(eval $(call Download,AFDO_PROF)) -$(eval $(call Download,CLANG)) -$(eval $(call Download,GN_TOOL)) -$(eval $(call Download,PGO_PROF)) - -$(eval $(call BuildPackage,naiveproxy)) diff --git a/package/ctcgfw/naiveproxy/files/naiveproxy.config b/package/ctcgfw/naiveproxy/files/naiveproxy.config deleted file mode 100644 index 439e30bef4..0000000000 --- a/package/ctcgfw/naiveproxy/files/naiveproxy.config +++ /dev/null @@ -1,6 +0,0 @@ - -config naiveproxy 'config' - option enable '0' - option listen_addr '' - option server_addr '' - option extra_argument '' diff --git a/package/ctcgfw/naiveproxy/files/naiveproxy.init b/package/ctcgfw/naiveproxy/files/naiveproxy.init deleted file mode 100644 index 651b72a990..0000000000 --- a/package/ctcgfw/naiveproxy/files/naiveproxy.init +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2021 ImmortalWrt - -. /lib/functions.sh -. /lib/functions/procd.sh - -USE_PROCD=1 - -START=99 -STOP=10 - -init_conf() { - config_load "naiveproxy" - config_get "enable" "config" "enable" "0" - config_get "listen_addr" "config" "listen_addr" - config_get "server_addr" "config" "server_addr" - config_get "extra_argument" "config" "extra_argument" -} - -start_service() { - init_conf - [ "${enable}" == "1" ] || exit 0 - - procd_open_instance naiveproxy - - procd_set_param command naive - procd_append_param command --listen="${listen_addr}" - procd_append_param command --proxy="${server_addr}" - [ -n "${extra_argument}" ] && procd_append_param command "${extra_argument}" - - procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5} - procd_set_param limits core="unlimited" - procd_set_param stdout 1 - procd_set_param stderr 1 - - procd_close_instance -} - -reload_service() -{ - stop - start -} - -service_triggers() { - procd_add_reload_trigger "naiveproxy" -} diff --git a/package/ctcgfw/naiveproxy/patches/001-Remove-concurrency-limit.patch b/package/ctcgfw/naiveproxy/patches/001-Remove-concurrency-limit.patch deleted file mode 100644 index 5ccb834d93..0000000000 --- a/package/ctcgfw/naiveproxy/patches/001-Remove-concurrency-limit.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f1a49736010170a70123db07ca41256ba92c0002 Mon Sep 17 00:00:00 2001 -From: klzgrad -Date: Sat, 3 Oct 2020 08:54:59 +0800 -Subject: [PATCH] Remove concurrency limit - ---- - src/net/tools/naive/naive_proxy.cc | 3 +-- - src/net/tools/naive/naive_proxy_bin.cc | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - ---- a/src/net/tools/naive/naive_proxy.cc -+++ b/src/net/tools/naive/naive_proxy.cc -@@ -5,7 +5,6 @@ - - #include "net/tools/naive/naive_proxy.h" - --#include - #include - - #include "base/bind.h" -@@ -35,7 +34,7 @@ NaiveProxy::NaiveProxy(std::unique_ptrconcurrency) || -- params->concurrency < 1 || params->concurrency > 4) { -+ params->concurrency < 1) { - std::cerr << "Invalid concurrency" << std::endl; - return false; - } diff --git a/package/ctcgfw/naiveproxy/patches/100-build-add-OpenWrt-staging-libraries.patch b/package/ctcgfw/naiveproxy/patches/100-build-add-OpenWrt-staging-libraries.patch deleted file mode 100644 index 5c71b09238..0000000000 --- a/package/ctcgfw/naiveproxy/patches/100-build-add-OpenWrt-staging-libraries.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5b476d92f8dbee8b83061faa8cd18a46e5ab4aae Mon Sep 17 00:00:00 2001 -From: CN_SZTL -Date: Tue, 18 Aug 2020 20:36:39 +0000 -Subject: [PATCH] build: add OpenWrt staging libraries - ---- - src/build/config/posix/BUILD.gn | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/src/build/config/posix/BUILD.gn -+++ b/src/build/config/posix/BUILD.gn -@@ -28,6 +28,9 @@ config("runtime_library") { - if (!is_apple && sysroot != "") { - # Pass the sysroot to all C compiler variants, the assembler, and linker. - sysroot_flags = [ "--sysroot=" + rebase_path(sysroot, root_build_dir) ] -+ sysroot_flags += [ "-I" + getenv("OP_STAGING_DIR") + "/usr/include" ] -+ sysroot_flags += [ "-I" + getenv("OP_STAGING_DIR") + "/usr/include/nss" ] -+ sysroot_flags += [ "-I" + getenv("OP_STAGING_DIR") + "/usr/include/nspr" ] - if (is_linux || is_chromeos) { - # This is here so that all files get recompiled after a sysroot roll and - # when turning the sysroot on or off. (defines are passed via the command -@@ -57,6 +60,7 @@ config("runtime_library") { - cflags_objcc += sysroot_flags - - # Need to get some linker flags out of the sysroot. -+ ldflags += [ "-L" + getenv("OP_STAGING_DIR") + "/usr/lib" ] - ld_paths = exec_script("sysroot_ld_path.py", - [ - rebase_path("//build/linux/sysroot_ld_path.sh", diff --git a/package/ctcgfw/naiveproxy/patches/101-build-drop-useless-deps-simd_asm.patch b/package/ctcgfw/naiveproxy/patches/101-build-drop-useless-deps-simd_asm.patch deleted file mode 100644 index aacf7059d6..0000000000 --- a/package/ctcgfw/naiveproxy/patches/101-build-drop-useless-deps-simd_asm.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dd07b78f561914ccc6cbe076ae66c380304bf92c Mon Sep 17 00:00:00 2001 -From: CN_SZTL -Date: Wed, 19 Aug 2020 12:42:45 +0000 -Subject: [PATCH] build: drop useless deps simd_asm - -libjpeg_turbo itself has alreadly set the dependency "simd_asm", -and this will cause cross-compile failed: -``` -ERROR Unresolved dependencies. -//:gn_all(//build/toolchain/linux:clang_arm64_openwrt) - needs //third_party/libjpeg_turbo:simd_asm(//build/toolchain/linux:clang_arm64_openwrt) -``` -So, let's drop it in global build file. ---- - src/BUILD.gn | 1 - - 1 file changed, 1 deletion(-) - ---- a/src/BUILD.gn -+++ b/src/BUILD.gn -@@ -746,7 +746,6 @@ group("gn_all") { - if (enable_nacl) { - deps += [ "//native_client/src/trusted/platform_qualify:vcpuid" ] - } -- deps += [ "//third_party/libjpeg_turbo:simd_asm" ] - } - if ((is_linux || is_chromeos) && current_toolchain == host_toolchain) { - deps += [ "//v8:v8_shell" ] diff --git a/package/ctcgfw/naiveproxy/src/init_env.sh b/package/ctcgfw/naiveproxy/src/init_env.sh deleted file mode 100755 index 0260616f02..0000000000 --- a/package/ctcgfw/naiveproxy/src/init_env.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -# Project ImmortalWrt -# Use it under GPLv3. -# -------------------------------------------------------- -# Init build dependencies for naiveproxy - -# Read args from shell -target_arch="$1" -target_board="$2" -cpu_type="$3" -cpu_subtype="$4" -toolchain_dir="$5" - -# Set arch info -naive_arch="${target_arch}" -[ "${target_arch}" == "i386" ] && naive_arch="x86" -[ "${target_arch}" == "x86_64" ] && naive_arch="x64" -[ "${target_arch}" == "aarch64" ] && naive_arch="arm64" -# ldso_path="/lib/$(find "${toolchain_dir}/" | grep -Eo "ld-musl-[a-z0-9_-]+\\.so\\.1")" - -# OS detection -[ "$(uname)" != "Linux" -o "$(uname -m)" != "x86_64" ] && { echo -e "Support Linux AMD64 only."; exit 1; } - -# Create TMP dir -mkdir -p "$PWD/tmp" -export TMPDIR="$PWD/tmp" - -# Set ENV -export DEPOT_TOOLS_WIN_TOOLCHAIN=0 -export naive_flags=" -is_official_build=true -exclude_unwind_tables=true -enable_resource_allowlist_generation=false -symbol_level=0 -is_clang=true -use_sysroot=false - -use_allocator=\"none\" -use_allocator_shim=false - -fatal_linker_warnings=false -treat_warnings_as_errors=false - -fieldtrial_testing_like_official_build=true - -enable_base_tracing=false -enable_nacl=false -enable_print_preview=false -enable_remoting=false -use_alsa=false -use_cups=false -use_dbus=false -use_gio=false -use_platform_icu_alternatives=true -use_gtk=false -use_system_libdrm=false -use_gnome_keyring=false -use_libpci=false -use_pangocairo=false -use_glib=false -use_pulseaudio=false -use_udev=false -use_x11=false - -disable_file_support=true -enable_websockets=false -disable_ftp_support=true -use_kerberos=false -enable_mdns=false -enable_reporting=false -include_transport_security_state_preload_list=false -rtc_use_pipewire=false - -use_xkbcommon=false -use_system_libdrm=false -use_ozone=true -ozone_auto_platforms=false -ozone_platform=\"headless\" -ozone_platform_headless=true - -current_os=\"linux\" -current_cpu=\"${naive_arch}\" -sysroot=\"${toolchain_dir}\" -custom_toolchain=\"//build/toolchain/linux:clang_${naive_arch}_openwrt\"" -# ldso_path=\"${ldso_path}\"" -[ "${target_arch}" == "arm" ] && { - naive_flags="${naive_flags} arm_version=0 arm_cpu=\"${cpu_type}\"" - [ -n "${cpu_subtype}" ] && { echo "${cpu_subtype}" | grep -q "neon" && neon_flag="arm_use_neon=true" || neon_flag="arm_use_neon=false"; naive_flags="${naive_flags} arm_fpu=\"${cpu_subtype}\" arm_float_abi=\"hard\" ${neon_flag}"; } || naive_flags="${naive_flags} arm_float_abi=\"soft\" arm_use_neon=false" -} -[[ "mips mips64 mipsel mips64el" =~ (^|[[:space:]])"${target_arch}"($|[[:space:]]) ]] && { - naive_flags="${naive_flags} use_gold=false is_cfi=false use_cfi_icall=false use_thin_lto=false mips_arch_variant=\"r2\"" - [[ "${target_arch}" =~ ^"mips"$|^"mipsel"$ ]] && naive_flags="${naive_flags} mips_float_abi=\"soft\" mips_tune=\"${cpu_type}\"" -} diff --git a/package/ctcgfw/node-request/Makefile b/package/ctcgfw/node-request/Makefile deleted file mode 100644 index 5906f80dfc..0000000000 --- a/package/ctcgfw/node-request/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NPM_NAME:=request -PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=2.88.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ - https://registry.npm.taobao.org/$(PKG_NPM_NAME)/-/ \ - https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=e86dae884084b90a300096972f5954c815ebe5877c590df7fd170e8b71724242 - -PKG_MAINTAINER:=Jerrykuku -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_DEPENDS:=node/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -include $(INCLUDE_DIR)/package.mk - -define Package/node-request - SUBMENU:=Node.js - SECTION:=lang - CATEGORY:=Languages - TITLE:=Request is designed to be the simplest way possible to make http calls - URL:=https://www.npmjs.org/package/request - DEPENDS:=+node -endef - -define Package/node-request/description - Request is designed to be the simplest way possible to make http calls. It supports HTTPS and follows redirects by default. -endef - -NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))) -TMPNPM:=$(shell mktemp -u XXXXXXXXXX) - -TARGET_CFLAGS+=$(FPIC) -TARGET_CPPFLAGS+=$(FPIC) - -define Build/Prepare - $(INSTALL_DIR) $(PKG_BUILD_DIR) -endef - -define Build/Compile - $(MAKE_VARS) \ - $(MAKE_FLAGS) \ - npm_config_arch=$(NODEJS_CPU) \ - npm_config_target_arch=$(NODEJS_CPU) \ - npm_config_build_from_source=true \ - npm_config_nodedir=$(STAGING_DIR)/usr/ \ - npm_config_prefix=$(PKG_INSTALL_DIR)/usr/ \ - npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \ - npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \ - npm install -g $(DL_DIR)/$(PKG_SOURCE) - rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM) - rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM) -endef - -define Package/node-request/install - $(INSTALL_DIR) $(1)/usr/lib/node - $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/* $(1)/usr/lib/node/ -endef - -$(eval $(call BuildPackage,node-request)) diff --git a/package/ctcgfw/nps/Makefile b/package/ctcgfw/nps/Makefile deleted file mode 100644 index b86001ef28..0000000000 --- a/package/ctcgfw/nps/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=nps -PKG_VERSION:=0.26.9 -PKG_RELEASE:=4 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/ehang-io/nps/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=7df414180ed4f0049dc08f0e3c625a6de4ebed34da591515f9514b3763dd578d - -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINTER:=CN_SZTL - -PKG_CONFIG_DEPENDS := \ - CONFIG_NPC_COMPRESS_UPX \ - CONFIG_NPS_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=ehang.io/nps -GO_PKG_BUILD_PKG:=ehang.io/nps/cmd/... -GO_PKG_LDFLAGS:=-s -w - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/nps/template - SECTION:=net - CATEGORY:=Network - TITLE:=A intranet penetration proxy server - DEPENDS:=$(GO_ARCH_DEPENDS) - URL:=https://ehang-io.github.io/nps -endef - -define Package/npc - $(call Package/nps/template) - TITLE+= (client) -endef - -define Package/nps - $(call Package/nps/template) - TITLE+= (server) -endef - -define Package/nps/description/template - NPS is a lightweight, high-performance, powerful intranet penetration proxy server, - with a powerful web management terminal. -endef - -Package/npc/description = $(Package/nps/description/template) -Package/nps/description = $(Package/nps/description/template) - -define Package/npc/config - config NPC_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -define Package/nps/config - config NPS_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_NPC_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/npc -endif -ifeq ($(CONFIG_NPS_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/nps -endif -endef - -define Package/nps/install/template - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $(1)/usr/bin/$(2) -endef - -Package/npc/install = $(call Package/nps/install/template,$(1),npc) -Package/nps/install = $(call Package/nps/install/template,$(1),nps) - -$(eval $(call GoBinPackage,npc)) -$(eval $(call GoBinPackage,nps)) -$(eval $(call BuildPackage,npc)) -$(eval $(call BuildPackage,nps)) diff --git a/package/ctcgfw/nps/patches/100-remove-useless-sdk-in-npc.patch b/package/ctcgfw/nps/patches/100-remove-useless-sdk-in-npc.patch deleted file mode 100644 index b96542fc41..0000000000 --- a/package/ctcgfw/nps/patches/100-remove-useless-sdk-in-npc.patch +++ /dev/null @@ -1,4 +0,0 @@ -diff --git a/cmd/npc/sdk.go b/cmd/npc/sdk.go.bak -similarity index 100% -rename from cmd/npc/sdk.go -rename to cmd/npc/sdk.go.bak diff --git a/package/ctcgfw/ootoc/Makefile b/package/ctcgfw/ootoc/Makefile deleted file mode 100644 index 04bbd77553..0000000000 --- a/package/ctcgfw/ootoc/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -#### - # File: /Makefile - # Project: ootoc - # File Created: Saturday, 7th March 2020 5:44:11 pm - # Author: ElonH[EH](elonhhuang@gmail.com) - # License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) - # Copyright (C) 2020 [ElonH] -#### - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ootoc -PKG_VERSION:=2.2.3 -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/ElonH/ootoc.git -PKG_SOURCE_DATE:=2020-03-21 -PKG_SOURCE_VERSION:=8e7495e49018a100043b2e013b65b589900ddabe -PKG_MIRROR_HASH:=9fe7b360241a070cfe623cd59330b7305a59d329056bbf04666f1840e3ec8988 - -PKG_MAINTAINER:=ElonH - -PKG_BUILD_PARALLEL:=1 -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -CMAKE_OPTIONS+= -DOOTOC_TEST:BOOL=OFF - -define Package/ootoc - SECTION:=base - CATEGORY:=Base system - URL:=https://github.com/msgpack/ootoc - TITLE:=opkg over tar over curl - DEPENDS:=+libcurl +libyaml-cpp +libtar +spdlog -endef - -define Package/ootoc/description - opkg over tar over curl -endef - -define Package/ootoc/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ootocCLI $(1)/usr/bin/ - - $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d - $(INSTALL_CONF) ./files/ootoc.conf $(1)/etc/config/ootoc - $(INSTALL_BIN) ./files/ootoc.init $(1)/etc/init.d/ootoc -endef - -$(eval $(call BuildPackage,ootoc)) \ No newline at end of file diff --git a/package/ctcgfw/ootoc/files/ootoc.conf b/package/ctcgfw/ootoc/files/ootoc.conf deleted file mode 100644 index c9dca4aa8b..0000000000 --- a/package/ctcgfw/ootoc/files/ootoc.conf +++ /dev/null @@ -1,16 +0,0 @@ - -config global 'global' - option enabled '0' - -config server 'server' - option addr '127.0.0.1' - option port '21730' - option tar_url 'https://github.com/ElonH/BuildOpenWRT/releases/download/snapshot/latest-Packages.tar' - option aux_url 'https://github.com/ElonH/BuildOpenWRT/releases/download/snapshot/latest-Packages.yml' - -config proxy 'proxy' - option enabled '0' - option proxy_addr 'socks5://127.0.0.1:1080' - -config log 'log' - option path '/var/log/ootoc' diff --git a/package/ctcgfw/ootoc/files/ootoc.init b/package/ctcgfw/ootoc/files/ootoc.init deleted file mode 100755 index 268a7843e1..0000000000 --- a/package/ctcgfw/ootoc/files/ootoc.init +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash /etc/rc.common - -START=83 -STOP=83 - -USE_PROCD=1 -PROG=/usr/bin/ootocCLI - -_info() { - logger -p daemon.info -t "ootoc" "$*" -} - -_err() { - logger -p daemon.err -t "ootoc" "$*" -} - -init_conf() { - config_load "ootoc" - - local LOG - config_get LOG log path - - [ -d "/etc/opkg/" ] || mkdir -p "/etc/opkg/" 2>/dev/null - [ -e "/etc/opkg/distfeeds.conf" ] || touch "/etc/opkg/distfeeds.conf" - - # backup opkg feeds conf - FEEDS="/etc/opkg/distfeeds.conf" - FEEDS_BAK="${FEEDS}.bak" - [ -d "${FEEDS%/*}" ] || mkdir -p "${FEEDS%/*}" 2>/dev/null - [ -e "$FEEDS_BAK" ] || { - _err "opkg feeds backup not exist '$FEEDS_BAK', backup now..." - [ -e "$FEEDS" ] || { - _err "not exist file: $FEEDS" - return 1 - } - cp -rf "$FEEDS" "$FEEDS_BAK" - } - - # create log path - [ -d "${LOG%/*}" ] || mkdir -p "${LOG%/*}" 2>/dev/null - - # disable signature - [ -e /etc/opkg.conf ] || { - _err "not exist file: /etc/opkg.conf" - return 1 - } - sed -i "s/^[ ]*option check_signature/# option check_signaturesign/" /etc/opkg.conf - return 0 -} - -start_service() { - config_load "ootoc" - - local ENABLED ADDR PORT TAR_URL PROXY_ENABLED PROXY_ADDR LOG - config_get ENABLED global enabled - config_get ADDR server addr - config_get PORT server port - config_get TAR_URL server tar_url - config_get AUX_URL server aux_url - config_get PROXY_ENABLED proxy enabled - config_get PROXY_ADDR proxy proxy_addr - config_get LOG log path - - [[ $ENABLED == 0 ]] && { - _info "Instance 'ootoc' disabled." - return 1 - } - _info "Instance 'ootoc' enabled." - init_conf || return 1; - - # _info "$PROG server --log \"$LOG\" --addr \"$ADDR\" --port \"$PORT\" --tar-url \"$TAR_URL\" --aux-url \"$AUX_URL\" --subscription \"/etc/opkg/distfeeds.conf\"" - procd_open_instance - procd_set_param command $PROG server - procd_append_param command --log "$LOG" - procd_append_param command --addr "$ADDR" - procd_append_param command --port "$PORT" - procd_append_param command --tar-url "$TAR_URL" - procd_append_param command --aux-url "$AUX_URL" - procd_append_param command --subscription "/etc/opkg/distfeeds.conf" - [[ $PROXY_ENABLED == 1 ]] && { - procd_set_param env all_proxy="$PROXY_ADDR" https_proxy="$PROXY_ADDR" http_proxy="$PROXY_ADDR" - procd_set_param env ALL_PROXY="$PROXY_ADDR" HTTPS_PROXY="$PROXY_ADDR" HTTP_PROXY="$PROXY_ADDR" - } - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_set_param file /etc/config/ootoc - procd_set_param pidfile /var/run/ootoc.pid - procd_set_param respawn retry=60 - procd_close_instance -} - -stop_service() -{ - service_stop ${PROG} -} - -service_triggers() -{ - procd_add_reload_trigger "ootoc" -} diff --git a/package/ctcgfw/parted/Makefile b/package/ctcgfw/parted/Makefile deleted file mode 100644 index c94dda99e7..0000000000 --- a/package/ctcgfw/parted/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=parted -PKG_VERSION:=3.3 -PKG_RELEASE:=2 - -PKG_SOURCE:=parted-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@GNU/parted -PKG_HASH:=57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/parted - SECTION:=utils - CATEGORY:=Utilities - TITLE:=parted Partition editor - URL:=http://www.gnu.org/software/parted/index.shtml - DEPENDS:=+libuuid +libreadline +libncurses +libblkid -endef - -define Package/parted/description - parted Partition editor - http://www.gnu.org/software/parted/index.shtml -endef - -CONFIGURE_ARGS += \ - --without-readline \ - --disable-device-mapper \ - --disable-nls - -define Package/parted/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/parted $(1)/usr/sbin/parted - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/partprobe $(1)/usr/sbin/partprobe - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,parted)) diff --git a/package/ctcgfw/quickjs/Makefile b/package/ctcgfw/quickjs/Makefile deleted file mode 100644 index 177812a20b..0000000000 --- a/package/ctcgfw/quickjs/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=quickjs -PKG_VERSION:=2020-11-08 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=https://bellard.org/quickjs/ -PKG_HASH:=2e9d63dab390a95ed365238f21d8e9069187f7ed195782027f0ab311bb64187b - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/quickjs - SECTION:=lib - CATEGORY:=Libraries - URL:=https://bellard.org/quickjs - TITLE:=A small and embeddable Javascript engine. - DEPENDS:=+libatomic +libpthread -endef - -define Package/quickjs/description - QuickJS is a small and embeddable Javascript engine. It supports the ES2020 specification including modules, asynchronous generators, proxies and BigInt. - It optionally supports mathematical extensions such as big decimal floating point numbers (BigDecimal), big binary floating point numbers (BigFloat) and operator overloading. -endef - -MAKE_FLAGS += \ - QJSC_CC="$(HOSTCC_NOCACHE)" \ - CROSS_PREFIX="$(TARGET_CROSS)" - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/quickjs $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/local/include/quickjs $(1)/usr/include -endef - -$(eval $(call BuildPackage,quickjs)) diff --git a/package/ctcgfw/rapidjson/Makefile b/package/ctcgfw/rapidjson/Makefile deleted file mode 100644 index 64d0ec5f6d..0000000000 --- a/package/ctcgfw/rapidjson/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# (https://immortalwrt.org) -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=rapidjson -PKG_VERSION:=1.1.0 -PKG_RELEASE:=4 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/Tencent/rapidjson.git -PKG_SOURCE_DATE:=2021-01-06 -PKG_SOURCE_VERSION:=585042c02ba6350e10fc43df8beee1bc097f4c5f -PKG_MIRROR_HASH:=ef7d015b91f58355b02ce8356214ec7d6bdc3807d01b220834faa00afbcd7a7f - -PKG_LICENSE:=BSD 3-Clause -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_BUILD_PARALLEL:=1 -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -CMAKE_OPTIONS+= -DRAPIDJSON_BUILD_DOC=OFF \ - -DRAPIDJSON_BUILD_EXAMPLES=OFF \ - -DRAPIDJSON_BUILD_TESTS=OFF - -define Package/rapidjson - SECTION:=lib - CATEGORY:=Libraries - URL:=https://github.com/Tencent/rapidjson - TITLE:=rapidjson JSON parser/generator for C++ -endef - -define Package/rapidjson/description - A fast JSON parser/generator for C++ with both SAX/DOM style API -endef - -$(eval $(call BuildPackage,rapidjson)) diff --git a/package/ctcgfw/rclone-ng/Makefile b/package/ctcgfw/rclone-ng/Makefile deleted file mode 100644 index 6f5424ca36..0000000000 --- a/package/ctcgfw/rclone-ng/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -#### - # File: /rclone-ng/Makefile - # Project: Rclone-OpenWrt - # File Created: Friday, 5th June 2020 12:37:26 am - # Author: ElonH[EH](elonhhuang@gmail.com) - # License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) - # Copyright (C) 2020 [ElonH] -#### - -include $(TOPDIR)/rules.mk - -PKG_NAME:=rclone-ng -PKG_VERSION:=0.5.0 -PKG_RELEASE:=2 - -PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=0b4916ddd0bacb5b358dc8d36b64c30f4182c0ace3eb06cda94b6578c419dcd9 - -PKG_LICENSE:=MIT -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=ElonH - -include $(INCLUDE_DIR)/package.mk - -TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) - -define Package/rclone-ng - SECTION:=net - CATEGORY:=Network - SUBMENU:=Cloud Manager - TITLE:=An angular web application for rclone - URL:=https://github.com/ElonH/RcloneNg - DEPENDS:=+rclone - PKGARCH:=all -endef - -define Build/Compile - true -endef - -define Package/rclone-ng/install - $(INSTALL_DIR) $(1)/www - $(CP) $(PKG_BUILD_DIR)/RcloneNg $(1)/www -endef - -$(eval $(call BuildPackage,rclone-ng)) diff --git a/package/ctcgfw/rclone-webui-react/Makefile b/package/ctcgfw/rclone-webui-react/Makefile deleted file mode 100644 index 8d193cba40..0000000000 --- a/package/ctcgfw/rclone-webui-react/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -#### - # File: /Makefile - # Project: rclone-webui-react - # File Created: Thursday, 10th October 2019 5:57:39 pm - # Author: ElonH[EH](elonhhuang@gmail.com) - # License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) - # Copyright (C) 2019 [ElonH] -#### - -include $(TOPDIR)/rules.mk - -PKG_NAME:=rclone-webui-react -PKG_VERSION:=2.0.3 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip -PKG_SOURCE_URL:=https://github.com/rclone/rclone-webui-react/releases/download/v$(PKG_VERSION)/currentbuild.zip? -PKG_HASH:=38ca0a73071b70d25ecc5995f0da912edd448669715c1b177a44fafa08460990 - -PKG_LICENSE:=MIT -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=ElonH - -include $(INCLUDE_DIR)/package.mk - -UNZIP_CMD:=unzip -q -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) - -define Package/rclone-webui-react - SECTION:=net - CATEGORY:=Network - SUBMENU:=Cloud Manager - TITLE:=A reactjs based web UI for rclone - URL:=https://github.com/rclone/rclone-webui-react - DEPENDS:=+rclone - PKGARCH:=all -endef - -define Package/rclone-webui-react/description - A full fledged UI for the rclone cloud sync tool. -endef - - -define Build/Compile - true -endef - -define Package/rclone-webui-react/install - $(INSTALL_DIR) $(1)/www/rclone-webui-react - $(CP) $(PKG_BUILD_DIR)/build/* $(1)/www/rclone-webui-react -endef - -$(eval $(call BuildPackage,rclone-webui-react)) diff --git a/package/ctcgfw/rclone/Makefile b/package/ctcgfw/rclone/Makefile deleted file mode 100644 index 20be645d38..0000000000 --- a/package/ctcgfw/rclone/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -#### - # File: /Makefile - # Project: rclone - # File Created: Friday, 11th October 2019 4:50:49 pm - # Author: ElonH[EH](elonhhuang@gmail.com) - # License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) - # Copyright (C) 2019 [ElonH] -#### - -include $(TOPDIR)/rules.mk - -PKG_NAME:=rclone -PKG_VERSION:=1.53.4 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/rclone/rclone/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=acb53ccef1c1e638e53ca24933510d9be3666145372e1163470aa38414af8d48 - -PKG_LICENSE:=MIT -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=ElonH - -PKG_CONFIG_DEPENDS:= \ - CONFIG_RCLONE_COMPRESS_GOPROXY \ - CONFIG_RCLONE_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/rclone/rclone -GO_PKG_EXCLUDES:=test -GO_PKG_LDFLAGS:=-s -w -GO_PKG_LDFLAGS_X:= \ - github.com/rclone/rclone/fs.Version=v$(PKG_VERSION) \ - main.Version=v$(PKG_VERSION) \ - main.BuildUser=openwrt \ - main.BuildHost=openwrt - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/rclone - SECTION:=utils - CATEGORY:=Utilities - TITLE:=rsync for cloud storage. - URL:=https://rclone.org - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define Package/rclone/description - Rclone ("rsync for cloud storage") is a command line program to sync root/usr/bin and - directories to and from different cloud storage providers. - Cloud storage providers: - 1Fichier, Alibaba Cloud (Aliyun) Object Storage System (OSS), Amazon Drive, Amazon S3, - Backblaze B2, Box, Ceph, C14, DigitalOcean Spaces, Dreamhost, Dropbox, FTP, - Google Cloud Storage, Google Drive, Google Photos, HTTP, Hubic, Jottacloud, - IBM COS S3, Koofr, Memset Memstore, Mega, Microsoft Azure Blob Storage, - Microsoft OneDrive, Minio, Nextcloud, OVH, OpenDrive, Openstack Swift, - Oracle Cloud Storage, ownCloud, pCloud, premiumize.me, put.io, QingStor, - Rackspace Cloud root/usr/bin, rsync.net, Scaleway, SFTP, Wasabi, WebDAV, - Yandex Disk, The local root/usr/binystem. -endef - -define Package/rclone/config -config RCLONE_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config RCLONE_COMPRESS_UPX - bool "Compress executable files with UPX" - default n -endef - -ifeq ($(CONFIG_RCLONE_COMPRESS_GOPROXY),y) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_RCLONE_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/rclone -endif -endef - -$(eval $(call GoBinPackage,rclone)) -$(eval $(call BuildPackage,rclone)) diff --git a/package/ctcgfw/rclone/patches/000-disable-plugins.patch b/package/ctcgfw/rclone/patches/000-disable-plugins.patch deleted file mode 100644 index 34b6486592..0000000000 --- a/package/ctcgfw/rclone/patches/000-disable-plugins.patch +++ /dev/null @@ -1,22 +0,0 @@ -## -# File: /patches/000-disable-plugins.patch -# Project: rclone -# Created Date: Wednesday, January 1st 2020, 1:49:43 pm -# Author: ElonH[EH](elonhhuang@gmail.com) -# License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) -# Copyright (C) 2019 [ElonH] -## -# refs: https://github.com/openwrt/packages/issues/10864#issuecomment-569921457 -diff --git a/rclone.go b/rclone.go -index 74fde16ab..9a9ba9150 100644 ---- a/rclone.go -+++ b/rclone.go -@@ -7,7 +7,7 @@ import ( - _ "github.com/rclone/rclone/backend/all" // import all backends - "github.com/rclone/rclone/cmd" - _ "github.com/rclone/rclone/cmd/all" // import all commands -- _ "github.com/rclone/rclone/lib/plugin" // import plugins -+ // _ "github.com/rclone/rclone/lib/plugin" // import plugins - ) - - func main() { diff --git a/package/ctcgfw/rclone/patches/010-change-default-config-path.patch b/package/ctcgfw/rclone/patches/010-change-default-config-path.patch deleted file mode 100644 index b1d381ecf2..0000000000 --- a/package/ctcgfw/rclone/patches/010-change-default-config-path.patch +++ /dev/null @@ -1,45 +0,0 @@ -## -# File: /patches/010-change-default-config-path.patch -# Project: rclone -# File Created: Friday, 1st May 2020 10:54:31 pm -# Author: ElonH[EH](elonhhuang@gmail.com) -# License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) -# Copyright (C) 2020 [ElonH] -## -# set /etc/rclone/rclone.conf as default configuration path -diff --git a/fs/config/config.go b/fs/config/config.go -index 53d67ef03..cc5d6436b 100644 ---- a/fs/config/config.go -+++ b/fs/config/config.go -@@ -25,7 +25,6 @@ import ( - "unicode/utf8" - - "github.com/Unknwon/goconfig" -- homedir "github.com/mitchellh/go-homedir" - "github.com/pkg/errors" - "github.com/rclone/rclone/fs" - "github.com/rclone/rclone/fs/accounting" -@@ -133,21 +132,10 @@ func makeConfigPath() string { - } - - // Find user's home directory -- homeDir, err := homedir.Dir() -+ homeDir := "/etc" - -- // Find user's configuration directory. -- // Prefer XDG config path, with fallback to $HOME/.config. -- // See XDG Base Directory specification -- // https://specifications.freedesktop.org/basedir-spec/latest/), -- xdgdir := os.Getenv("XDG_CONFIG_HOME") - var cfgdir string -- if xdgdir != "" { -- // User's configuration directory for rclone is $XDG_CONFIG_HOME/rclone -- cfgdir = filepath.Join(xdgdir, "rclone") -- } else if homeDir != "" { -- // User's configuration directory for rclone is $HOME/.config/rclone -- cfgdir = filepath.Join(homeDir, ".config", "rclone") -- } -+ cfgdir = filepath.Join(homeDir, "rclone") - - // Use rclone.conf from user's configuration directory if already existing - var cfgpath string diff --git a/package/ctcgfw/shadowsocks-rust/Makefile b/package/ctcgfw/shadowsocks-rust/Makefile deleted file mode 100644 index 4a3a0ae71b..0000000000 --- a/package/ctcgfw/shadowsocks-rust/Makefile +++ /dev/null @@ -1,98 +0,0 @@ -# -# Copyright (C) 2017-2020 Yousong Zhou -# -# 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:=shadowsocks-rust -PKG_VERSION:=1.9.2 -PKG_RELEASE:=1 - -PKG_SOURCE_HEADER:=shadowsocks-v$(PKG_VERSION) -PKG_SOURCE_BODY:=unknown-linux-musl -PKG_SOURCE_FOOTER:=tar.xz -PKG_SOURCE_URL:=https://github.com/shell-script/openwrt-shadowsocks-rust/releases/download/v$(PKG_VERSION)/ - -ifeq ($(ARCH),aarch64) - PKG_SOURCE:=$(PKG_SOURCE_HEADER).aarch64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) - PKG_HASH:=318e0538386e52025448e7dc1e67b71bd399981e386ba0a54802ff3c13b25016 -else ifeq ($(ARCH),arm) - # Referred to golang/golang-values.mk - ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) - ifeq ($(ARM_CPU_FEATURES),) - PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabi.$(PKG_SOURCE_FOOTER) - PKG_HASH:=38d15003799d91ebecb89be61eccb1f3b31ca4e11d6d5ecfcbd367e10cc42319 - else ifneq ($(filter $(ARM_CPU_FEATURES),vfp vfpv2),) - PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabihf.$(PKG_SOURCE_FOOTER) - PKG_HASH:=e31bfbba903ac171b133b897b2a0e183833002b141db74b95d94873d32c07d49 - else - PKG_SOURCE:=$(PKG_SOURCE_HEADER).armv7-$(PKG_SOURCE_BODY)eabihf.$(PKG_SOURCE_FOOTER) - PKG_HASH:=e1ed14d86b4e7f6b88da3ff5b99431a707eb7a23f0e063ada86e85e7e84a8ec1 - endif -else ifeq ($(ARCH),i386) - ifeq ($(CONFIG_TARGET_x86_geode)$(CONFIG_TARGET_x86_legacy),y) - PKG_SOURCE:=$(PKG_SOURCE_HEADER).i586-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) - PKG_HASH:=f08f6ab355495f5553e388b347f7bf70502ae3f53f3979267fcfe1dd6a7a565f - else - PKG_SOURCE:=$(PKG_SOURCE_HEADER).i686-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) - PKG_HASH:=a5021533dad53a877d6265677dea6f5a6f500f135d47327c98beeb85642180ce - endif -else ifeq ($(ARCH),mips) - PKG_SOURCE:=$(PKG_SOURCE_HEADER).mips-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) - PKG_HASH:=f76de3d0c4b2e3703faabfb730d817b5b5610ec3701827282c18ca44c84f6a28 -else ifeq ($(ARCH),mipsel) - PKG_SOURCE:=$(PKG_SOURCE_HEADER).mipsel-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) - PKG_HASH:=953d2feb430906edcb5ed6994510b3bded141ae8abb3b77dd6bfc80aac8740d1 -else ifeq ($(ARCH),x86_64) - PKG_SOURCE:=$(PKG_SOURCE_HEADER).x86_64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) - PKG_HASH:=adc68983961209cdf3c7a465911bdfabc52e7e08132a6dbcd0db77eaa924ec3f -# Set the default value to make OpenWrt Package Checker happy -else - PKG_SOURCE:=dummy - PKG_HASH:=dummy -endif - -PKG_MAINTAINER:=Tianling Shen -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE - -include $(INCLUDE_DIR)/package.mk - -TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) - -define Package/shadowsocks-rust/Default - define Package/shadowsocks-rust-$(1) - SECTION:=net - CATEGORY:=Network - SUBMENU:=Web Servers/Proxies - TITLE:=shadowsocks-rust $(1) - URL:=https://github.com/shadowsocks/shadowsocks-rust - DEPENDS:=@(aarch64||arm||i386||mips||mipsel||x86_64) @USE_MUSL - endef - - define Package/shadowsocks-rust-$(1)/install - $$(INSTALL_DIR) $$(1)/usr/bin - $$(INSTALL_BIN) $$(PKG_BUILD_DIR)/$(1) $$(1)/usr/bin - endef -endef - -SHADOWSOCKS_COMPONENTS:=sslocal ssmanager ssserver ssurl -define shadowsocks-rust/templates - $(foreach component,$(SHADOWSOCKS_COMPONENTS), - $(call Package/shadowsocks-rust/Default,$(component)) - ) -endef -$(eval $(call shadowsocks-rust/templates)) - -define Build/Compile -endef - -$(foreach component,$(SHADOWSOCKS_COMPONENTS), \ - $(eval $(call BuildPackage,shadowsocks-rust-$(component))) \ -) diff --git a/package/ctcgfw/simple-obfs/Makefile b/package/ctcgfw/simple-obfs/Makefile deleted file mode 100644 index a3482cb69a..0000000000 --- a/package/ctcgfw/simple-obfs/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (C) 2017-2019 Jian Chang -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=simple-obfs -PKG_VERSION:=0.0.5 -PKG_RELEASE:=6 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/shadowsocks/simple-obfs.git -PKG_SOURCE_DATE:=2019-08-17 -PKG_SOURCE_VERSION:=486bebd9208539058e57e23a12f23103016e09b4 -PKG_MIRROR_HASH:=b1ae62a6826616b35b6aea0c6b2d55b5f36da96be0cd1c229c263b508d1aeef0 - -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jian Chang - -PKG_BUILD_DEPENDS:=libev -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/simple-obfs/template - SECTION:=net - CATEGORY:=Network - TITLE:=Simple-obfs - URL:=https://github.com/shadowsocks/simple-obfs - DEPENDS:=+libpthread +libev -endef - -define Package/simple-obfs-client - $(call Package/simple-obfs/template) - TITLE+= (client) - PROVIDES:=simple-obfs -endef - -define Package/simple-obfs-server - $(call Package/simple-obfs/template) - TITLE+= (server) -endef - -define Package/simple-obfs/description - Simple-obfs is a simple obfusacting tool, designed as plugin server of shadowsocks. -endef - -Package/simple-obfs-client/description = $(Package/simple-obfs/description) -Package/simple-obfs-server/description = $(Package/simple-obfs/description) - -CONFIGURE_ARGS += \ - --disable-ssp \ - --disable-documentation \ - --disable-assert - -define Package/simple-obfs-client/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/obfs-local $(1)/usr/bin/obfs-local -endef - -define Package/simple-obfs-server/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/obfs-server $(1)/usr/bin/obfs-server -endef - -$(eval $(call BuildPackage,simple-obfs-client)) -$(eval $(call BuildPackage,simple-obfs-server)) diff --git a/package/ctcgfw/simple-torrent/Makefile b/package/ctcgfw/simple-torrent/Makefile deleted file mode 100644 index 92a5d4b45e..0000000000 --- a/package/ctcgfw/simple-torrent/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=simple-torrent -PKG_VERSION:=1.2.14 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/boypt/simple-torrent/tar.gz/$(PKG_VERSION)? -PKG_HASH:=e3b3357ab8eb9431ec7c22b2f453d219cfe0652c5c26bbf0a052c99271cbf6a5 - -PKG_LICENSE:=AGPL-3.0 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_CONFIG_DEPENDS:= \ - CONFIG_SIMPLE_TORRENT_COMPRESS_GOPROXY \ - CONFIG_SIMPLE_TORRENT_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=cloud-torrent -GO_PKG_LDFLAGS:=-s -w -GO_PKG_LDFLAGS_X:= \ - main.VERSION=$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/simple-torrent - SECTION:=net - CATEGORY:=Network - SUBMENU:=BitTorrent - TITLE:=A self-hosted remote torrent client - URL:=https://github.com/boypt/simple-torrent - DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle +libstdcpp -endef - -define Package/simple-torrent/description - SimpleTorrent is a a self-hosted remote torrent client, written in Go (golang). - Started torrents remotely, download sets of files on the local disk of the server, - which are then retrievable or streamable via HTTP. -endef - -define Package/simple-torrent/config -config SIMPLE_TORRENT_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config SIMPLE_TORRENT_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_SIMPLE_TORRENT_COMPRESS_GOPROXY),y) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_SIMPLE_TORRENT_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/cloud-torrent -endif -endef - -define Package/simple-torrent/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cloud-torrent $(1)/usr/bin/simple-torrent -endef - -$(eval $(call GoBinPackage,simple-torrent)) -$(eval $(call BuildPackage,simple-torrent)) diff --git a/package/ctcgfw/ssocks/Makefile b/package/ctcgfw/ssocks/Makefile deleted file mode 100644 index 29683b7953..0000000000 --- a/package/ctcgfw/ssocks/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# -# Copyright (C) 2017-2018 Jian Chang -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ssocks -PKG_VERSION:=0.0.14 -PKG_RELEASE:=3 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/tostercx/ssocks.git -PKG_SOURCE_DATE:=2020-07-09 -PKG_SOURCE_VERSION:=c2024789c1ee076d171fd6061d7c133302216ea7 -PKG_MIRROR_HASH:=3654e9f1fb54646e1e89c19e7aa3e105b84b2e20b5b634662c21c66691d1d22e - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/ssocks/template - SECTION:=net - CATEGORY:=Network - TITLE:=sSocks - URL:=https://github.com/tostercx/ssocks - DEPENDS:=+libopenssl -endef - -define Package/ssocks - $(call Package/ssocks/template) - TITLE+= Relay -endef - -define Package/ssocksd - $(call Package/ssocks/template) - TITLE+= Server -endef - -define Package/ssocks/description/template - sSocks is a package which contains: a socks5 server implements RFC 1928 (SOCKS V5) and - RFC 1929 (Authentication for SOCKS V5), a reverse socks server and client, a netcat like tool - and a socks5 relay. -endef - -Package/ssocks/description = $(Package/ssocks/description/template) -Package/ssocksd/description = $(Package/ssocks/description/template) - -define Build/Install - true -endef - -define Package/ssocks/install/template - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(2) $(1)/usr/bin/ -endef - -define Package/ssocks/install - $(call Package/ssocks/install/template,$(1),ssocks) -endef - -define Package/ssocksd/install - $(call Package/ssocks/install/template,$(1),ssocksd) -endef - -$(eval $(call BuildPackage,ssocks)) -$(eval $(call BuildPackage,ssocksd)) diff --git a/package/ctcgfw/ssocks/patches/002-gcc10.patch b/package/ctcgfw/ssocks/patches/002-gcc10.patch deleted file mode 100644 index 678c821ede..0000000000 --- a/package/ctcgfw/ssocks/patches/002-gcc10.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/configd-util.h 2020-07-09 05:30:54.000000000 +0800 -+++ b/src/configd-util.h 2020-09-08 19:35:11.000000000 +0800 -@@ -33,7 +33,7 @@ - - - --struct globalArgsServer_t { -+static struct globalArgsServer_t { - char fileauth[255]; // -a option - char fileconfig[255]; // -f option - char filelog[255]; // -l option diff --git a/package/ctcgfw/sub-web/Makefile b/package/ctcgfw/sub-web/Makefile deleted file mode 100644 index 424484f6bd..0000000000 --- a/package/ctcgfw/sub-web/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# (https://immortalwrt.org) -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=sub-web -PKG_VERSION:=1.0.0 -PKG_RELEASE:=6 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/CareyWang/sub-web.git -PKG_SOURCE_DATE:=2021-01-07 -PKG_SOURCE_VERSION:=26d278800cc42025f8ceecff64b26f47b9fc2d14 -PKG_MIRROR_HASH:=a83f49aeecfa086ad8da3503b1ff95f8505845588839ed569d22fb0ced417b9f - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_BUILD_DEPENDS:=node/host node-yarn/host - -include $(INCLUDE_DIR)/package.mk - -define Package/sub-web - SECTION:=net - CATEGORY:=Network - URL:=https://github.com/CareyWang/sub-web - TITLE:=A WebUI for generating proxy subscription url - DEPENDS:=+subconverter - PKGARCH:=all -endef - -define Package/sub-web/description - Based on vue-cli and subconverter, for generating proxy subscription - url automatically. -endef - -define Build/Compile - ( \ - cd $(PKG_BUILD_DIR); \ - yarn install; \ - yarn build; \ - ) -endef - -define Package/sub-web/install - $(INSTALL_DIR) $(1)/www - $(CP) $(PKG_BUILD_DIR)/dist $(1)/www/sub-web -endef - -$(eval $(call BuildPackage,sub-web)) diff --git a/package/ctcgfw/sub-web/patches/010-dist-support-run-in-curdir.patch b/package/ctcgfw/sub-web/patches/010-dist-support-run-in-curdir.patch deleted file mode 100644 index 750d2ef3c5..0000000000 --- a/package/ctcgfw/sub-web/patches/010-dist-support-run-in-curdir.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 4359c358bd434d1d0b182a13a743881ee21e7d27 Mon Sep 17 00:00:00 2001 -From: CN_SZTL -Date: Mon, 11 Jan 2021 11:22:43 +0000 -Subject: [PATCH] dist: support run in curdir - -As https://cli.vuejs.org/config/#vue-config-js said: -``` -By default, Vue CLI assumes your app will be deployed at the root of -a domain, e.g. https://www.my-app.com/. If your app is deployed at a -sub-path, you will need to specify that sub-path using this option. -For example, if your app is deployed at https://www.foobar.com/my-app/, -set publicPath to '/my-app/'. - -The value can also be set to an empty string ('') or a relative path (./) -so that all assets are linked using relative paths. This allows the built -bundle to be deployed under any public path, or used in a file system based -environment like a Cordova hybrid app. -``` - -Reference: - - CareyWang/sub-web#38 - - CareyWang/sub-web#43 - -Signed-off-by: CN_SZTL ---- - src/router/index.js | 2 +- - vue.config.js | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/router/index.js b/src/router/index.js -index 643aa66..583fdd9 100644 ---- a/src/router/index.js -+++ b/src/router/index.js -@@ -5,7 +5,7 @@ Vue.use(VueRouter); - - const routes = [ - { -- path: "/", -+ path: "*", - name: "SubConverter", - component: () => import("../views/Subconverter.vue") - } -diff --git a/vue.config.js b/vue.config.js -index c4b040b..89b25db 100644 ---- a/vue.config.js -+++ b/vue.config.js -@@ -5,6 +5,7 @@ function resolve(dir) { - } - - module.exports = { -+ publicPath: '', - css: { - loaderOptions: { - less: { --- -2.17.1 - diff --git a/package/ctcgfw/sub-web/patches/020-views-add-examples-from-ACL4SSR-and-Subconverter.patch b/package/ctcgfw/sub-web/patches/020-views-add-examples-from-ACL4SSR-and-Subconverter.patch deleted file mode 100644 index bcfe069766..0000000000 --- a/package/ctcgfw/sub-web/patches/020-views-add-examples-from-ACL4SSR-and-Subconverter.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 0092ddca7faa480e07184c157e992badd4eef633 Mon Sep 17 00:00:00 2001 -From: CN_SZTL -Date: Mon, 11 Jan 2021 11:57:19 +0000 -Subject: [PATCH] views: add examples from ACL4SSR and Subconverter - -Signed-off-by: CN_SZTL ---- - src/views/Subconverter.vue | 104 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 104 insertions(+) - ---- a/src/views/Subconverter.vue -+++ b/src/views/Subconverter.vue -@@ -257,6 +257,110 @@ export default { - }, - backendOptions: [{ value: "http://127.0.0.1:25500/sub?" }], - remoteConfig: [ -+ { -+ label: "默认", -+ options: [ -+ { -+ label: "不选，由接口提供方提供", -+ value: "" -+ } -+ ] -+ }, -+ { -+ label: "ACL4SSR", -+ options: [ -+ { -+ label: "ACL4SSR_Online 默认版 分组比较全 (与Github同步)", -+ value: -+ "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online.ini" -+ }, -+ { -+ label: "ACL4SSR_Online_AdblockPlus 更多去广告 (与Github同步)", -+ value: -+ "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_AdblockPlus.ini" -+ }, -+ { -+ label: "ACL4SSR_Online_NoAuto 无自动测速 (与Github同步)", -+ value: -+ "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_NoAuto.ini" -+ }, -+ { -+ label: "ACL4SSR_Online_Mini 精简版 (与Github同步)", -+ value: -+ "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini.ini" -+ }, -+ { -+ label: "ACL4SSR_Online_Mini_AdblockPlus.ini 精简版 更多去广告 (与Github同步)", -+ value: -+ "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_AdblockPlus.ini" -+ }, -+ { -+ label: "ACL4SSR_Online_Mini_NoAuto.ini 精简版 不带自动测速 (与Github同步)", -+ value: -+ "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_NoAuto.ini" -+ }, -+ { -+ label: "ACL4SSR_Online_Mini_Fallback.ini 精简版 带故障转移 (与Github同步)", -+ value: -+ "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_Fallback.ini" -+ }, -+ { -+ label: "ACL4SSR_Online_Mini_MultiMode.ini 精简版 自动测速、故障转移、负载均衡 (与Github同步)", -+ value: -+ "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_MultiMode.ini" -+ }, -+ { -+ label: "ACL4SSR_Online_Full 全分组 重度用户使用 (与Github同步)", -+ value: -+ "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full.ini" -+ }, -+ { -+ label: "ACL4SSR_Online_Full_AdblockPlus 全分组 重度用户使用 更多去广告 (与Github同步)", -+ value: -+ "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full_AdblockPlus.ini" -+ }, -+ { -+ label: "ACL4SSR 本地 默认版 分组比较全", -+ value: "config/ACL4SSR.ini" -+ }, -+ { -+ label: "ACL4SSR_Mini 本地 精简版", -+ value: "config/ACL4SSR_Mini.ini" -+ }, -+ { -+ label: "ACL4SSR_Mini_NoAuto.ini 本地 精简版+无自动测速", -+ value: "config/ACL4SSR_Mini_NoAuto.ini" -+ }, -+ { -+ label: "ACL4SSR_Mini_Fallback.ini 本地 精简版+fallback", -+ value: "config/ACL4SSR_Mini_Fallback.ini" -+ }, -+ { -+ label: "ACL4SSR_BackCN 本地 回国", -+ value: "config/ACL4SSR_BackCN.ini" -+ }, -+ { -+ label: "ACL4SSR_NoApple 本地 无苹果分流", -+ value: "config/ACL4SSR_NoApple.ini" -+ }, -+ { -+ label: "ACL4SSR_NoAuto 本地 无自动测速 ", -+ value: "config/ACL4SSR_NoAuto.ini" -+ }, -+ { -+ label: "ACL4SSR_NoAuto_NoApple 本地 无自动测速&无苹果分流", -+ value: "config/ACL4SSR_NoAuto_NoApple.ini" -+ }, -+ { -+ label: "ACL4SSR_NoMicrosoft 本地 无微软分流", -+ value: "config/ACL4SSR_NoMicrosoft.ini" -+ }, -+ { -+ label: "ACL4SSR_WithGFW 本地 GFW列表", -+ value: "config/ACL4SSR_WithGFW.ini" -+ } -+ ] -+ }, - { - label: "universal", - options: [ diff --git a/package/ctcgfw/subconverter/Makefile b/package/ctcgfw/subconverter/Makefile deleted file mode 100644 index 5fab9266d7..0000000000 --- a/package/ctcgfw/subconverter/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=subconverter -PKG_VERSION:=0.6.4 -PKG_RELEASE:=3 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/tindy2013/subconverter.git -PKG_SOURCE_DATE:=2020-12-19 -PKG_SOURCE_VERSION:=a57906c9a6edd04da869b12ffb88f397c3ea8af6 -PKG_MIRROR_HASH:=07815478cbfa1644ad016ea4b68a2edc9316f9aa23edf699d82c4c9026e17462 - -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=CN_SZTL - -PKG_BUILD_DEPENDS:=duktape jpcre2 rapidjson -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/subconverter - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Utility to convert between various subscription format - URL:=https://github.com/tindy2013/subconverter - DEPENDS:=+libpthread +libstdcpp +libevent2 +libyaml-cpp +libpcre2 +libcurl +zlib -endef - -define Package/subconverter/description - Utility to convert between various proxy subscription formats. -endef - -TARGET_CXXFLAGS := $(FPIC) $(filter-out -O%,$(TARGET_CXXFLAGS)) -O3 -TARGET_CXXFLAGS += -Wall -Wextra -ffunction-sections -fdata-sections -flto -TARGET_LDFLAGS += -Wl,--gc-sections -flto - -CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release - -define Package/subconverter/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/subconverter $(1)/usr/bin/subconverter - $(INSTALL_DIR) $(1)/etc/subconverter - $(CP) $(PKG_BUILD_DIR)/base/* $(1)/etc/subconverter/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/subconverter.init $(1)/etc/init.d/subconverter -endef - -$(eval $(call BuildPackage,subconverter)) diff --git a/package/ctcgfw/subconverter/files/subconverter.init b/package/ctcgfw/subconverter/files/subconverter.init deleted file mode 100755 index ff0d8e902d..0000000000 --- a/package/ctcgfw/subconverter/files/subconverter.init +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -USE_PROCD=1 - -BIN="/usr/bin/subconverter" -CONF="/etc/subconverter/pref.example.ini" -LOG_FILE="/tmp/subconverter.log" - -start_service() { - procd_open_instance - procd_set_param command "$BIN" - procd_append_param command -f "$CONF" - procd_append_param command -l "$LOG_FILE" - procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5} - procd_set_param limits core="unlimited" - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance - logger -t Subconverter 'Starting Subconverter service' -} - -stop_service() { - rm -f "$LOG_FILE" - logger -t Subconverter 'Shutting down Subconverter service' -} - -reload_service() { - logger -t Subconverter 'Restarting Subconverter service' - stop - sleep 2s - start -} diff --git a/package/ctcgfw/subweb/Makefile b/package/ctcgfw/subweb/Makefile deleted file mode 100644 index bfd6eff256..0000000000 --- a/package/ctcgfw/subweb/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=subweb -PKG_VERSION:=20200702 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/lzdnico/subweb.git -PKG_MIRROR_HASH:=61855d9412056f2f0eb588840bb35b9b47dea97db887e47c15c52fe897f8b7bd -PKG_SOURCE_VERSION:=9acc47d2e9cda1b16d7fe184a16f528848467810 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz - -PKG_LICENSE:=GPLv3 -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf -PKG_USE_MIPS16:=0 -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - TITLE:=(WebUI) Utility to convert between various subscription format. - URL:=https://github.com/lzdnico/subweb - DEPENDS:=+python3 +python3-flask +python3-flask-restful +python3-requests +subconverter -endef - -define Package/$(PKG_NAME)/description - (WebUI) Utility to convert between various subscription format. -endef - -define Build/Configure - $(RM) $(PKG_BUILD_DIR)/config/{subconverter,README.md,README-cn.md} - $(RM) -r $(PKG_BUILD_DIR)/api/__pycache__ - $(SED) 's/root/etc/g;s/ -ef//g' $(PKG_BUILD_DIR)/subweb.sh - $(SED) 's/10010/25500/g' $(PKG_BUILD_DIR)/api/aff.py -endef - -define Build/Compile -endef - -define Build/Install -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/etc/subweb - $(INSTALL_BIN) $(PKG_BUILD_DIR)/subweb.sh $(1)/etc/subweb/ - $(CP) $(PKG_BUILD_DIR)/{api,config,static,templates,api.py} $(1)/etc/subweb/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/subweb.init $(1)/etc/init.d/subweb -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/ctcgfw/subweb/files/subweb.init b/package/ctcgfw/subweb/files/subweb.init deleted file mode 100755 index f33baa0166..0000000000 --- a/package/ctcgfw/subweb/files/subweb.init +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -USE_PROCD=1 - -BIN=/etc/subweb/subweb.sh -PID= -getPid(){ - local pid=$(ps| grep /etc/subweb/api.py | grep python3 | sed "s/^[ \s]\{1,\}//g;s/[ \s]\{1,\}$//g" | cut -d ' ' -f1) - PID=$pid -} - -start_service() { - getPid - local pid=$PID - if [ ! -z "$pid" ]; then - echo "Subweb has already run, PID is "$pid - return 0 - fi - [ ! -e /etc/subweb/config/subconverter ] && ln -fs /usr/bin/subconverter /etc/subweb/config/subconverter - local ipInConf=$(cat /etc/subweb/api/aff.py| grep apiip | cut -d "'" -f2 | cut -d ":" -f2 | cut -d "/" -f3) - local ipOfLan=$(uci get network.lan.ipaddr) - echo IP in conf is $ipInConf, LAN ip is $ipOfLan - if [ "$ipOfLan" != "$ipInConf" ]; then - echo IP mismatch. Change ip in /etc/subweb/api/aff.py - sed -i 's/'$ipInConf'/'$ipOfLan'/' /etc/subweb/api/aff.py - fi - procd_open_instance - procd_set_param command $BIN - procd_set_param respawn - procd_set_param stderr 1 - procd_close_instance - echo Subweb started. -} - -stop_service() { - getPid - local pid=$PID - if [ ! -z "$pid" ]; then - echo Found subweb process, which PID is $pid - kill $pid - echo Subweb process has been terminated. - else - echo No subweb process found. - return 0 - fi -} - -reload_service() { - stop - start -} diff --git a/package/ctcgfw/tcping-simple/Makefile b/package/ctcgfw/tcping-simple/Makefile deleted file mode 100644 index 48376395d4..0000000000 --- a/package/ctcgfw/tcping-simple/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# -# Copyright (C) 2014-2018 OpenWrt-dist -# Copyright (C) 2021 ImmortalWrt -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=tcping-simple -PKG_VERSION:=1.3.5 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=https://raw.githubusercontent.com/MushrooM93/tcping/b9ee61a5c1d05f228aa70027331556f0c27dd4c2/ -PKG_SOURCE:=tcping.c -PKG_HASH:=3459b9f15621920dc632b5871da96c62c8a77ad15ee7bfdba4adee29f4eed089 -PKG_BUILD_DIR:=$(BUILD_DIR)/tcping-$(PKG_VERSION) - -PKG_LICENSE:=GPLv3 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=MushrooM93 <799163169@qq.com> - -PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf -PKG_USE_MIPS16:=0 -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - TITLE:=tcping support ipv4/ipv6 dual-stack in linux, the operation is similar to ping but it does not use the ICMP protocol. - URL:=https://github.com/MushrooM93/tcping -endef - -define Package/$(PKG_NAME)/description -tcping support ipv4/ipv6 dual-stack in linux, the operation is similar to ping but it does not use the ICMP protocol. -endef - -define Build/Prepare - cp -f $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)/$(PKG_SOURCE) -endef - -define Build/Compile - $(TARGET_CROSS)gcc $(PKG_BUILD_DIR)/$(PKG_SOURCE) -o $(PKG_BUILD_DIR)/tcping-simple -endef - -define Build/Install -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tcping-simple $(1)/usr/bin -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/ctcgfw/tinyfecvpn/Makefile b/package/ctcgfw/tinyfecvpn/Makefile deleted file mode 100644 index daa5aebd23..0000000000 --- a/package/ctcgfw/tinyfecvpn/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (c) 2017 Yu Wang -# -# This is free software, licensed under the MIT. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=tinyfecVPN -PKG_VERSION:=20210116.0 -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/wangyu-/tinyfecVPN.git -PKG_SOURCE_DATE:=2021-01-17 -PKG_SOURCE_VERSION:=c9b98721ea1d62ab8e1c4c9e2a0ed04394dfe0ae -PKG_MIRROR_HASH:=28cdadf0f162e52d3c6b10b6a6cdcd22e80783b36b33e341b5dea156bfb75b74 - -PKG_LICENSE:=MIT -PKG_MAINTAINER:=Yu Wang - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/tinyfecvpn - SECTION:=net - CATEGORY:=Network - SUBMENU:=VPN - TITLE:=A Network Improving Tool - URL:=https://github.com/wangyu-/tinyfecVPN - DEPENDS:=+libpthread +libstdcpp +kmod-tun -endef - -define Package/tinyfecvpn/description - A Lightweight VPN with Build-in Forward Error Correction Support (or A Network Improving Tool - which works at VPN mode). Improves your Network Quality on a High-latency Lossy Link. -endef - -MAKE_FLAGS += cross - -define Build/Configure - sed -i 's/cc_cross=.*/cc_cross=$(TARGET_CXX)/g' $(PKG_BUILD_DIR)/makefile - sed -i '/\*gitversion/d' $(PKG_BUILD_DIR)/makefile - echo 'const char *gitversion = "$(PKG_SOURCE_VERSION)";' > $(PKG_BUILD_DIR)/git_version.h - - $(call Build/Configure/Default) -endef - -define Package/tinyfecvpn/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tinyvpn_cross $(1)/usr/bin/tinyvpn -endef - -$(eval $(call BuildPackage,tinyfecvpn)) diff --git a/package/ctcgfw/tinymembench/Makefile b/package/ctcgfw/tinymembench/Makefile deleted file mode 100644 index 8d3a07c273..0000000000 --- a/package/ctcgfw/tinymembench/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=tinymembench -PKG_VERSION:=0.4 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/ssvb/tinymembench.git -PKG_SOURCE_VERSION:=a2cf6d7e382e3aea1eb39173174d9fa28cad15f3 -PKG_MIRROR_HASH:=b5b69e3d0c19e5a55bfebe386e29196c751612e30bd5aefc2ee1df11c18e0300 - -include $(INCLUDE_DIR)/package.mk - -define Package/tinymembench - SECTION:=utils - CATEGORY:=Utilities - URL:=https://github.com/ssvb/tinymembench - TITLE:=Simple benchmark for memory -endef - -define Package/tinymembench/description - Simple benchmark for memory throughput and latency. -endef - -define Package/tinymembench/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tinymembench $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,tinymembench)) diff --git a/package/ctcgfw/tinyportmapper/Makefile b/package/ctcgfw/tinyportmapper/Makefile deleted file mode 100644 index d56f66e21a..0000000000 --- a/package/ctcgfw/tinyportmapper/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (c) 2017 Yu Wang -# -# This is free software, licensed under the MIT. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=tinyPortMapper -PKG_VERSION:=20200818.0 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/wangyu-/tinyPortMapper/tar.gz/$(PKG_VERSION)? -PKG_HASH:=094aef3fa0646fe3d0418f87767c1dd24ba1a80518f1e8a7cae2783aed88e732 - -PKG_LICENSE:=MIT -PKG_MAINTAINER:=Yu Wang - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/tinyPortMapper - SECTION:=net - CATEGORY:=Network - TITLE:=A High-Performance Port Mapping/Forwarding Utility - URL:=https://github.com/wangyu-/tinyPortMapper - DEPENDS:=+libstdcpp +librt -endef - -define Package/tinyPortMapper/description - A Lightweight High-Performance Port Mapping/Forwarding Utility - using epoll/libev, supports IPv4 and IPv6 for both TCP and UDP. -endef - -MAKE_FLAGS += cross - -define Build/Configure - sed -i 's/cc_cross=.*/cc_cross=$(TARGET_CXX)/g' $(PKG_BUILD_DIR)/makefile - sed -i '/\*gitversion/d' $(PKG_BUILD_DIR)/makefile - echo 'const char *gitversion = "$(PKG_VERSION)";' > $(PKG_BUILD_DIR)/git_version.h -endef - -define Package/tinyPortMapper/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tinymapper_cross $(1)/usr/bin/tinymapper -endef - -$(eval $(call BuildPackage,tinyPortMapper)) diff --git a/package/ctcgfw/v2ray-plugin/Makefile b/package/ctcgfw/v2ray-plugin/Makefile deleted file mode 100644 index 236188f7ce..0000000000 --- a/package/ctcgfw/v2ray-plugin/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# -# Copyright (C) 2020 SharerMax -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=v2ray-plugin -PKG_VERSION:=4.36.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=70cf85958a5233c8798990f4b7de57ce6f2e9a4535345260df06a4962a21e85a - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=madeye - -PKG_CONFIG_DEPENDS:= \ - CONFIG_V2RAY_PLUGIN_COMPRESS_GOPROXY \ - CONFIG_V2RAY_PLUGIN_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/shadowsocks/v2ray-plugin -GO_PKG_LDFLAGS:=-s -w -GO_PKG_LDFLAGS_X:=main.VERSION=v$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/v2ray-plugin/config -config V2RAY_PLUGIN_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config V2RAY_PLUGIN_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_GOWEBDAV_COMPRESS_GOPROXY),y) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Package/v2ray-plugin - SECTION:=net - CATEGORY:=Network - TITLE:=SIP003 plugin for shadowsocks, based on v2ray - URL:=https://github.com/teddysun/v2ray-plugin - DEPENDS:=$(GO_ARCH_DEPENDS) +ca-certificates -endef - -define Package/v2ray-plugin/description - Yet another SIP003 plugin for shadowsocks, based on v2ray -endef - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_V2RAY_PLUGIN_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/v2ray-plugin -endif -endef - -$(eval $(call GoBinPackage,v2ray-plugin)) -$(eval $(call BuildPackage,v2ray-plugin)) diff --git a/package/ctcgfw/verysync/Makefile b/package/ctcgfw/verysync/Makefile deleted file mode 100644 index 283a5d82bb..0000000000 --- a/package/ctcgfw/verysync/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -ifeq ($(ARCH),x86_64) - PKG_ARCH_VERYSYNC:=amd64 -endif -ifeq ($(ARCH),mipsel) - PKG_ARCH_VERYSYNC:=mipsle -endif -ifeq ($(ARCH),mips) - PKG_ARCH_VERYSYNC:=mips -endif -ifeq ($(ARCH),i386) - PKG_ARCH_VERYSYNC:=386 -endif -ifeq ($(ARCH),arm) - PKG_ARCH_VERYSYNC:=arm -endif -ifeq ($(ARCH),aarch64) - PKG_ARCH_VERYSYNC:=arm64 -endif -ifeq ($(ARCH),powerpc64) - PKG_ARCH_VERYSYNC:=ppc64 -endif - -PKG_NAME:=verysync -PKG_VERSION:=v2.4.2 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://dl.verysync.com/releases/$(PKG_VERSION)/ -PKG_HASH:=skip - -include $(INCLUDE_DIR)/package.mk - -TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) - -define Package/verysync - SECTION:=net - CATEGORY:=Network - TITLE:=A efficient data transmission tool - URL:=http://www.verysync.com -endef - -define Package/verysync/description - Verysync is a efficient data transmission tool. -endef - -define Build/Compile - true -endef - -define Package/verysync/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/verysync-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION)/verysync $(1)/usr/bin/verysync -endef - -$(eval $(call BuildPackage,verysync)) diff --git a/package/ctcgfw/webdav-go/Makefile b/package/ctcgfw/webdav-go/Makefile deleted file mode 100644 index 09f02b72dd..0000000000 --- a/package/ctcgfw/webdav-go/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=webdav-go -PKG_VERSION:=4.0.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/hacdias/webdav/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3a6754933cc138623830944cb1ce9151baebe780b8111415c2e0044970586ca5 - -PKG_LICENSE:=MIT -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=ElonH - -PKG_CONFIG_DEPENDS:= \ - CONFIG_WEBDAV_GO_COMPRESS_GOPROXY \ - CONFIG_WEBDAV_GO_COMPRESS_UPX - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(firstword $(subst -, ,$(PKG_NAME)))-$(PKG_VERSION) -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/hacdias/webdav -GO_PKG_LDFLAGS:=-s -w - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/webdav-go - SECTION:=net - CATEGORY:=Network - SUBMENU:=File Transfer - TITLE:=A powerful WebDav server written in Golang. - URL:=https://github.com/hacdias/webdav - DEPENDS:=$(GO_ARCH_DEPENDS) -endef - -define Package/webdav-go/description - webdav command line interface is really easy to use so you can easily create a WebDAV server for your own user. - By default, it runs on a random free port and supports JSON, YAML and TOML configuration. -endef - -define Package/webdav-go/config -config WEBDAV_GO_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config WEBDAV_GO_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifeq ($(CONFIG_WEBDAV_GO_COMPRESS_GOPROXY),y) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_WEBDAV_GO_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/webdav -endif -endef - -define Package/webdav-go/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/webdav $(1)/usr/bin/webdav-go -endef - -$(eval $(call GoBinPackage,webdav-go)) -$(eval $(call BuildPackage,webdav-go)) diff --git a/package/ctcgfw/xray-plugin/Makefile b/package/ctcgfw/xray-plugin/Makefile deleted file mode 100644 index 447149f49a..0000000000 --- a/package/ctcgfw/xray-plugin/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xray-plugin -PKG_VERSION:=1.4.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/teddysun/xray-plugin/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=6247235aa8bf1ebb994032de932d8c41ab6641d68d0cb448b32a236494cc6c42 - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Tianling Shen - -PKG_CONFIG_DEPENDS:= \ - CONFIG_XRAY_PLUGIN_PROVIDE_V2RAY_PLUGIN \ - CONFIG_XRAY_PLUGIN_COMPRESS_GOPROXY \ - CONFIG_XRAY_PLUGIN_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/teddysun/xray-plugin -GO_PKG_LDFLAGS:=-s -w - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/xray-plugin/config -config XRAY_PLUGIN_PROVIDE_V2RAY_PLUGIN - bool "Provide v2ray-plugin binary using xray-plugin" - default n - -config XRAY_PLUGIN_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config XRAY_PLUGIN_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -ifneq ($(CONFIG_XRAY_PLUGIN_COMPRESS_GOPROXY),) - export GO111MODULE=on - export GOPROXY=https://goproxy.io -endif - -define Package/xray-plugin - SECTION:=net - CATEGORY:=Network - TITLE:=SIP003 plugin for Shadowsocks, based on Xray - URL:=https://github.com/teddysun/xray-plugin - DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle -endef - -define Package/xray-plugin/description - Yet another SIP003 plugin for Shadowsocks, based on Xray. -endef - -define Build/Compile - $(call GoPackage/Build/Compile) -ifneq ($(CONFIG_XRAY_PLUGIN_COMPRESS_UPX),) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/xray-plugin -endif -endef - -define Package/xray-plugin/install - $(call GoPackage/Package/Install/Bin,$(1)) -ifneq ($(CONFIG_XRAY_PLUGIN_PROVIDE_V2RAY_PLUGIN),) - $(LN) xray-plugin $(1)/usr/bin/v2ray-plugin -endif -endef - -$(eval $(call GoBinPackage,xray-plugin)) -$(eval $(call BuildPackage,xray-plugin))