diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index a92d692121..32de3cc93e 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -232,13 +232,13 @@ $(_endef) ( \ echo "#!/bin/sh"; \ echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \ - echo "[ -x "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ + echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ echo "default_postinst \$$$$0 \$$$$@"; \ ) > postinst; \ ( \ echo "#!/bin/sh"; \ - echo "[ -x "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ + echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ echo "default_prerm \$$$$0 \$$$$@"; \ ) > prerm; \ diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh old mode 100755 new mode 100644 index 5c4ca58ccd..9561bd0502 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006-2014 OpenWrt.org # Copyright (C) 2006 Fokus Fraunhofer # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/functions/leds.sh b/package/base-files/files/lib/functions/leds.sh index 14baeb37b4..a7532faa2f 100755 --- a/package/base-files/files/lib/functions/leds.sh +++ b/package/base-files/files/lib/functions/leds.sh @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2013 OpenWrt.org get_dt_led_path() { diff --git a/package/base-files/files/lib/functions/migrations.sh b/package/base-files/files/lib/functions/migrations.sh index d2f1bc19aa..d43ea35051 100644 --- a/package/base-files/files/lib/functions/migrations.sh +++ b/package/base-files/files/lib/functions/migrations.sh @@ -1,5 +1,3 @@ -#!/bin/sh - . /lib/functions.sh migrate_led_sysfs() { diff --git a/package/base-files/files/lib/functions/preinit.sh b/package/base-files/files/lib/functions/preinit.sh index 57862a11f3..591e810af9 100755 --- a/package/base-files/files/lib/functions/preinit.sh +++ b/package/base-files/files/lib/functions/preinit.sh @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006-2013 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh old mode 100755 new mode 100644 index 0872cd5490..f3834ce97b --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -1,5 +1,3 @@ -#!/bin/ash - . /lib/functions.sh . /usr/share/libubox/jshn.sh diff --git a/package/base-files/files/lib/preinit/02_default_set_state b/package/base-files/files/lib/preinit/02_default_set_state index df43395726..28d5f1d9f9 100755 --- a/package/base-files/files/lib/preinit/02_default_set_state +++ b/package/base-files/files/lib/preinit/02_default_set_state @@ -1,5 +1,3 @@ -#!/bin/sh - define_default_set_state() { . /etc/diag.sh } diff --git a/package/base-files/files/lib/preinit/10_indicate_failsafe b/package/base-files/files/lib/preinit/10_indicate_failsafe index 27b94c140f..7bf5e029e4 100755 --- a/package/base-files/files/lib/preinit/10_indicate_failsafe +++ b/package/base-files/files/lib/preinit/10_indicate_failsafe @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit index 423c425223..3c59929790 100755 --- a/package/base-files/files/lib/preinit/10_indicate_preinit +++ b/package/base-files/files/lib/preinit/10_indicate_preinit @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait index 7dc29540b2..db5ddb6d86 100755 --- a/package/base-files/files/lib/preinit/30_failsafe_wait +++ b/package/base-files/files/lib/preinit/30_failsafe_wait @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/40_run_failsafe_hook b/package/base-files/files/lib/preinit/40_run_failsafe_hook index 533b0a9771..e3f769a858 100755 --- a/package/base-files/files/lib/preinit/40_run_failsafe_hook +++ b/package/base-files/files/lib/preinit/40_run_failsafe_hook @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/50_indicate_regular_preinit b/package/base-files/files/lib/preinit/50_indicate_regular_preinit index 5b7523f6fd..f4afcddb44 100755 --- a/package/base-files/files/lib/preinit/50_indicate_regular_preinit +++ b/package/base-files/files/lib/preinit/50_indicate_regular_preinit @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/70_initramfs_test b/package/base-files/files/lib/preinit/70_initramfs_test index 8504e34db0..c5aae983c7 100755 --- a/package/base-files/files/lib/preinit/70_initramfs_test +++ b/package/base-files/files/lib/preinit/70_initramfs_test @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root index 265a3f18df..f1b0afeb03 100755 --- a/package/base-files/files/lib/preinit/80_mount_root +++ b/package/base-files/files/lib/preinit/80_mount_root @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/99_10_failsafe_login b/package/base-files/files/lib/preinit/99_10_failsafe_login index 728c63b2e8..abeb21fda4 100755 --- a/package/base-files/files/lib/preinit/99_10_failsafe_login +++ b/package/base-files/files/lib/preinit/99_10_failsafe_login @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/preinit/99_10_run_init b/package/base-files/files/lib/preinit/99_10_run_init index b4f0ec203d..ebf77b0896 100755 --- a/package/base-files/files/lib/preinit/99_10_run_init +++ b/package/base-files/files/lib/preinit/99_10_run_init @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index fbf2280385..1da87b975d 100755 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -1,5 +1,3 @@ -#!/bin/sh - RAM_ROOT=/tmp/root [ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; } diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh index 267b2c8a7d..b7719dc229 100755 --- a/package/base-files/files/lib/upgrade/nand.sh +++ b/package/base-files/files/lib/upgrade/nand.sh @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2014 OpenWrt.org # diff --git a/package/ctcgfw/ChinaDNS/Makefile b/package/ctcgfw/ChinaDNS/Makefile index c2af9664e9..7fd72b7fff 100644 --- a/package/ctcgfw/ChinaDNS/Makefile +++ b/package/ctcgfw/ChinaDNS/Makefile @@ -2,6 +2,9 @@ # Copyright (C) 2014-2018 OpenWrt-dist # Copyright (C) 2014-2018 Jian Chang # +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # @@ -13,19 +16,16 @@ 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_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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_INSTALL:=1 PKG_FIXUP:=autoreconf -PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -37,18 +37,18 @@ define Package/ChinaDNS endef define Package/ChinaDNS/description -Protect yourself against DNS poisoning in China. + Protect yourself against DNS poisoning in China. endef define Package/ChinaDNS/conffiles -/etc/chinadns_chnroute.txt + /etc/chinadns_chnroute.txt endef define Package/ChinaDNS/install $(INSTALL_DIR) $(1)/etc - $(INSTALL_CONF) $(PKG_BUILD_DIR)/chnroute.txt $(1)/etc/chinadns_chnroute.txt + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/usr/share/chnroute.txt $(1)/etc/chinadns_chnroute.txt $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/chinadns $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/chinadns $(1)/usr/sbin endef $(eval $(call BuildPackage,ChinaDNS)) diff --git a/package/ctcgfw/annie/Makefile b/package/ctcgfw/annie/Makefile index 40aaa2aa90..b881ed8fa5 100644 --- a/package/ctcgfw/annie/Makefile +++ b/package/ctcgfw/annie/Makefile @@ -1,5 +1,7 @@ # -# Copyright (C) 2020 Project OpenWrt +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# # This is free software, licensed under the GNU General Public License v3. # See /LICENSE.txt for more information. # @@ -7,22 +9,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=annie -PKG_VERSION:=0.10.3-abc3c9d -PKG_RELEASE:=1 +PKG_VERSION:=0.10.3 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-12-15 PKG_SOURCE_URL:=https://github.com/iawia002/annie.git -PKG_MIRROR_HASH:=7ee175f0dec4ca2efbaaca746f33ab3f138d70c76eca1f87d1e3950478f4e110 +PKG_SOURCE_DATE:=2020-12-15 PKG_SOURCE_VERSION:=abc3c9df18173c91a5ca7a77fecc0665dea01aa1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) +PKG_MIRROR_HASH:=d49d79c342377a1edbf6870f7dd49cb4de70718934151793298004db72fc538a PKG_MAINTAINER:=CN_SZTL PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_CONFIG_DEPENDS := \ +PKG_CONFIG_DEPENDS:= \ CONFIG_ANNIE_COMPRESS_GOPROXY \ CONFIG_ANNIE_COMPRESS_UPX @@ -31,6 +31,7 @@ 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 @@ -63,26 +64,12 @@ ifeq ($(CONFIG_ANNIE_COMPRESS_GOPROXY),y) export GOPROXY=https://goproxy.io endif -define Build/Prepare - tar -zxf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip-components 1 -endef - -define Build/Configure -endef - define Build/Compile - $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)) - $(call GoPackage/Build/Configure) $(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 -define Package/annie/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/annie $(1)/usr/bin/annie -endef - $(eval $(call GoBinPackage,annie)) $(eval $(call BuildPackage,annie)) diff --git a/package/ctcgfw/brook/Makefile b/package/ctcgfw/brook/Makefile new file mode 100644 index 0000000000..24f6503ac1 --- /dev/null +++ b/package/ctcgfw/brook/Makefile @@ -0,0 +1,74 @@ +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# This is free software, licensed under the GNU General Public License v3. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=brook +PKG_VERSION:=20210101 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/txthinking/brook/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=2848b6ef06867268ba4a6495cbf700d80145f023ddafb3e92943aed1f88eeb5a + +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 new file mode 100644 index 0000000000..00d57ac183 --- /dev/null +++ b/package/ctcgfw/brook/patches/100-cli-bump-to-v2.3.0.patch @@ -0,0 +1,126 @@ +From 4b60c0151ef9e0b5901ba3825033c78269c1442f Mon Sep 17 00:00:00 2001 +From: CN_SZTL +Date: Fri, 29 Jan 2021 06:43:12 +0000 +Subject: [PATCH] cli: bump to v2.3.0 + +Signed-off-by: CN_SZTL +--- + cli/brook/main.go | 2 +- + go.mod | 21 ++++++++++++++++ + go.sum | 63 +++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 85 insertions(+), 1 deletion(-) + create mode 100644 go.mod + create mode 100644 go.sum + +diff --git a/cli/brook/main.go b/cli/brook/main.go +index 54d3f5f..4360eb2 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 +diff --git a/go.mod b/go.mod +new file mode 100644 +index 0000000..2740019 +--- /dev/null ++++ b/go.mod +@@ -0,0 +1,21 @@ ++module github.com/txthinking/brook ++ ++go 1.15 ++ ++require ( ++ 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.35 ++ github.com/patrickmn/go-cache v2.1.0+incompatible ++ 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-20201221181555-eec23a3978ad ++ golang.org/x/net v0.0.0-20210119194325-5f4716e94777 ++) +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..69b0435 +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,63 @@ ++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/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/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/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/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/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/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/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= ++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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= ++golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++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/openwrt-chinadns-ng/Makefile b/package/ctcgfw/chinadns-ng/Makefile similarity index 61% rename from package/ctcgfw/openwrt-chinadns-ng/Makefile rename to package/ctcgfw/chinadns-ng/Makefile index 2faf933659..beeb887ce9 100644 --- a/package/ctcgfw/openwrt-chinadns-ng/Makefile +++ b/package/ctcgfw/chinadns-ng/Makefile @@ -1,24 +1,30 @@ +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# 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.23 PKG_RELEASE:=1 -PKG_USE_MIPS16:=0 -PKG_BUILD_PARALLEL:=1 - PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/zfl9/chinadns-ng.git -PKG_MIRROR_HASH:=52b31de1a0790d9b0c8a0118152c4b1a44013a8cfdeed16e5437052744886607 +PKG_SOURCE_DATE:=2019-08-30 PKG_SOURCE_VERSION:=748a043dd7fb7ec71efbb7306f9dd21db5ce560f -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) +PKG_MIRROR_HASH:=c36b8f45e332f95279c67e3c367c5dd92edacd47759ab7be1ab52c325a21821b PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=pexcn +PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/chinadns-ng @@ -30,12 +36,12 @@ define Package/chinadns-ng endef define Package/chinadns-ng/description -ChinaDNS next generation, refactoring with epoll and ipset. + ChinaDNS next generation, refactoring with epoll and ipset. endef define Package/chinadns-ng/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/chinadns-ng $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/chinadns-ng $(1)/usr/bin endef $(eval $(call BuildPackage,chinadns-ng)) diff --git a/package/ctcgfw/httplib/Makefile b/package/ctcgfw/cpp-httplib/Makefile similarity index 66% rename from package/ctcgfw/httplib/Makefile rename to package/ctcgfw/cpp-httplib/Makefile index 8505321312..1855d9c1d3 100644 --- a/package/ctcgfw/httplib/Makefile +++ b/package/ctcgfw/cpp-httplib/Makefile @@ -9,28 +9,27 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=httplib +PKG_NAME:=cpp-httplib PKG_VERSION:=0.5.7 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/yhirose/cpp-httplib.git -PKG_MIRROR_HASH:=7b04f20cbb27f6e11120c9b185ee6b425d464cd0566b03b907b9881f1642594d -PKG_SOURCE_VERSION:=bf7700d1924e12a27faa5d346a5b8a9f8e163b61 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +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:=GPLv3 +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/httplib +define Package/cpp-httplib SECTION:=lib CATEGORY:=Libraries VARIANT:=lib @@ -38,11 +37,10 @@ define Package/httplib TITLE:=A C++11 single-file header-only cross platform HTTP/HTTPS library. endef -define Package/httplib/description +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,httplib)) +$(eval $(call BuildPackage,cpp-httplib)) diff --git a/package/ctcgfw/cups-bjnp/Makefile b/package/ctcgfw/cups-bjnp/Makefile index 4075a7d7ec..74bea2cd8e 100644 --- a/package/ctcgfw/cups-bjnp/Makefile +++ b/package/ctcgfw/cups-bjnp/Makefile @@ -29,10 +29,10 @@ define Package/cups-bjnp 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. + 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 diff --git a/package/ctcgfw/cups/Makefile b/package/ctcgfw/cups/Makefile index e256cc26c4..2f393d0e8a 100644 --- a/package/ctcgfw/cups/Makefile +++ b/package/ctcgfw/cups/Makefile @@ -26,7 +26,7 @@ define Package/cups/Default endef define Package/cups -$(call Package/cups/Default) + $(call Package/cups/Default) SECTION:=net CATEGORY:=Network DEPENDS:=+libcups +libcupsmime +libcupscgi +libcupsppdc +libusb-1.0 @@ -34,7 +34,7 @@ $(call Package/cups/Default) endef define Package/cups/description - Common UNIX Printing System (daemon) + Common UNIX Printing System (daemon) endef define Package/cups/conffiles @@ -44,7 +44,7 @@ define Package/cups/conffiles endef define Package/cups-bsd -$(call Package/cups/Default) + $(call Package/cups/Default) SECTION:=net CATEGORY:=Network DEPENDS:=+libcups @@ -52,7 +52,7 @@ $(call Package/cups/Default) endef define Package/cups-bsd/description - Common UNIX Printing System - BSD commands (old) + Common UNIX Printing System - BSD commands (old) endef define Package/cups-client @@ -68,11 +68,11 @@ define Package/cups-client/conffiles endef define Package/cups-client/description - Common UNIX Printing System - Client commands + Common UNIX Printing System - Client commands endef define Package/cups-filters -$(call Package/cups/Default) + $(call Package/cups/Default) SECTION:=net CATEGORY:=Network DEPENDS:=+libcupsimage @@ -80,11 +80,11 @@ $(call Package/cups/Default) endef define Package/cups-filters/description - Common UNIX Printing System - Filter + Common UNIX Printing System - Filter endef define Package/cups-ppdc -$(call Package/cups/Default) + $(call Package/cups/Default) SECTION:=net CATEGORY:=Network DEPENDS:=+libcupsppdc @@ -92,11 +92,11 @@ $(call Package/cups/Default) endef define Package/cups-ppdc/description - Common UNIX Printing System - PPDC utils + Common UNIX Printing System - PPDC utils endef define Package/libcups -$(call Package/cups/Default) + $(call Package/cups/Default) SECTION:=libs CATEGORY:=Libraries DEPENDS:=+zlib +libpthread +libpng +libjpeg @@ -104,11 +104,11 @@ $(call Package/cups/Default) endef define Package/libcups/description - Common UNIX Printing System - Core library + Common UNIX Printing System - Core library endef define Package/libcupscgi -$(call Package/cups/Default) + $(call Package/cups/Default) SECTION:=libs CATEGORY:=Libraries DEPENDS:=+libcups @@ -116,11 +116,11 @@ $(call Package/cups/Default) endef define Package/libcupscgi/description - Common UNIX Printing System - CGI library + Common UNIX Printing System - CGI library endef define Package/libcupsimage -$(call Package/cups/Default) + $(call Package/cups/Default) SECTION:=libs CATEGORY:=Libraries DEPENDS:=+libcups @@ -128,11 +128,11 @@ $(call Package/cups/Default) endef define Package/libcupsimage/description - Common UNIX Printing System - Image library + Common UNIX Printing System - Image library endef define Package/libcupsmime -$(call Package/cups/Default) + $(call Package/cups/Default) SECTION:=libs CATEGORY:=Libraries DEPENDS:=+libcups @@ -140,11 +140,11 @@ $(call Package/cups/Default) endef define Package/libcupsmime/description - Common UNIX Printing System - MIME library + Common UNIX Printing System - MIME library endef define Package/libcupsppdc -$(call Package/cups/Default) + $(call Package/cups/Default) SECTION:=libs CATEGORY:=Libraries DEPENDS:=+libcups +libstdcpp @@ -152,7 +152,7 @@ $(call Package/cups/Default) endef define Package/libcupsppdc/description - Common UNIX Printing System - PPDC library + Common UNIX Printing System - PPDC library endef define Build/Configure diff --git a/package/ctcgfw/cxxopts/Makefile b/package/ctcgfw/cxxopts/Makefile new file mode 100644 index 0000000000..af1f3d5b20 --- /dev/null +++ b/package/ctcgfw/cxxopts/Makefile @@ -0,0 +1,44 @@ +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# (https://project-openwrt.eu.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/gost/Makefile b/package/ctcgfw/gost/Makefile index fa41612f77..c2a2fd86c1 100644 --- a/package/ctcgfw/gost/Makefile +++ b/package/ctcgfw/gost/Makefile @@ -1,30 +1,41 @@ +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# 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_PROTO:=git -PKG_SOURCE_URL:=https://github.com/ginuerzh/gost.git -PKG_MIRROR_HASH:=dfe0d9b548a71b1d476cecf434cce094594ee46a7b0563284c902bec4fc01a3f -PKG_SOURCE_VERSION:=2707a8f0a90e111fc009791a6a911405939a25fb -PKG_MAINTAINER:=[CTCGFW] Project OpenWrt +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_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) +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/cmd/gost +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/$(PKG_NAME) +define Package/gost SECTION:=net CATEGORY:=Network TITLE:=GO Simple Tunnel @@ -32,32 +43,43 @@ define Package/$(PKG_NAME) DEPENDS:=$(GO_ARCH_DEPENDS) endef -define Package/$(PKG_NAME)/description +define Package/gost/description A simple security tunnel written in Golang endef -define Build/Prepare - tar -zxf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip-components 1 +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 -define Build/Configure -endef +ifeq ($(CONFIG_GOST_COMPRESS_GOPROXY),y) + export GO111MODULE=on + export GOPROXY=https://goproxy.io +endif define Build/Compile - $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)) - $(call GoPackage/Build/Configure) $(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/$(PKG_NAME)/install +define Package/gost/install + $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) + $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/gost $(1)/usr/bin/gost + $(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,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call GoBinPackage,gost)) +$(eval $(call BuildPackage,gost)) \ No newline at end of file diff --git a/package/ctcgfw/gotop/Makefile b/package/ctcgfw/gotop/Makefile index 3c6e4250d6..e3bb14b0d2 100644 --- a/package/ctcgfw/gotop/Makefile +++ b/package/ctcgfw/gotop/Makefile @@ -1,24 +1,35 @@ +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# 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.0.1 +PKG_VERSION:=4.1.0 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/xxxserxxx/gotop.git -PKG_MIRROR_HASH:=b4de9c3fdd144f57dfd713471c9ac7e99ff82b110e1dc0d7ecf1e3d0aaf5058d -PKG_SOURCE_VERSION:=a8a238ac18725e377addae8a23bf08cf476b404c -PKG_MAINTAINER:=[CTCGFW] Project OpenWrt +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/xxxserxxx/gotop/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=e61375feb183cc2c73764aaac92e164ea77f073206f7dbbfd4997c0efd38bfc0 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) +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_BUILD_PKG:=github.com/xxxserxxx/gotop/cmd/gotop GO_PKG_LDFLAGS:=-s -w GO_PKG_LDFLAGS_X:= \ main.Version=$(PKG_VERSION) @@ -26,7 +37,7 @@ GO_PKG_LDFLAGS_X:= \ include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk -define Package/$(PKG_NAME) +define Package/gotop SECTION:=admin CATEGORY:=Administration TITLE:=A terminal based graphical activity monitor @@ -34,29 +45,32 @@ define Package/$(PKG_NAME) DEPENDS:=$(GO_ARCH_DEPENDS) endef -define Package/$(PKG_NAME)/description +define Package/gotop/description Another terminal based graphical activity monitor, inspired by gtop and vtop, this time written in Go! endef -define Build/Prepare - tar -zxf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip-components 1 +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 -define Build/Configure -endef +ifeq ($(CONFIG_GOTOP_COMPRESS_GOPROXY),y) + export GO111MODULE=on + export GOPROXY=https://goproxy.io +endif define Build/Compile - $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/gotop) - $(call GoPackage/Build/Configure) $(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 -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/gotop $(1)/usr/bin/gotop -endef - -$(eval $(call GoBinPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call GoBinPackage,gotop)) +$(eval $(call BuildPackage,gotop)) \ No newline at end of file diff --git a/package/ctcgfw/gowebdav/Makefile b/package/ctcgfw/gowebdav/Makefile index 0c8ecba84c..c5d2124956 100644 --- a/package/ctcgfw/gowebdav/Makefile +++ b/package/ctcgfw/gowebdav/Makefile @@ -1,18 +1,26 @@ +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# 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.1 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/1715173329/gowebdav.git -PKG_MIRROR_HASH:=6917c641ede5edc31de16b38686c8d42b1d327fe99d744972eafc544750c4c0f -PKG_SOURCE_VERSION:=8b30e5453e959fd9911a90f2d4f7421616285ffa +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/1715173329/gowebdav/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=64867ab2925c79d8d8ff9851729bafd1270cd72b981e422136fdd4d82dc75506 + PKG_MAINTAINER:=CN_SZTL -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) +PKG_CONFIG_DEPENDS:= \ + CONFIG_GOWEBDAV_COMPRESS_GOPROXY \ + CONFIG_GOWEBDAV_COMPRESS_UPX PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 @@ -24,7 +32,7 @@ GO_PKG_LDFLAGS:=-s -w include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk -define Package/$(PKG_NAME) +define Package/gowebdav SECTION:=net CATEGORY:=Network SUBMENU:=File Transfer @@ -33,32 +41,43 @@ define Package/$(PKG_NAME) DEPENDS:=$(GO_ARCH_DEPENDS) endef -define Package/$(PKG_NAME)/description +define Package/gowebdav/description A simple WebDav server written in Golang. endef -define Build/Prepare - tar -zxf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip-components 1 +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 -define Build/Configure -endef +ifeq ($(CONFIG_GOWEBDAV_COMPRESS_GOPROXY),y) + export GO111MODULE=on + export GOPROXY=https://goproxy.io +endif define Build/Compile - $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)) - $(call GoPackage/Build/Configure) $(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/$(PKG_NAME)/install +define Package/gowebdav/install + $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) + $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/gowebdav $(1)/usr/bin/gowebdav + $(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,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call GoBinPackage,gowebdav)) +$(eval $(call BuildPackage,gowebdav)) \ No newline at end of file diff --git a/package/ctcgfw/iptvhelper/Makefile b/package/ctcgfw/iptvhelper/Makefile index 7ecad4eedd..df31101c33 100644 --- a/package/ctcgfw/iptvhelper/Makefile +++ b/package/ctcgfw/iptvhelper/Makefile @@ -1,4 +1,5 @@ # Copyright 2019 Shun Li +# # Licensed to the public under the GNU General Public License v3. include $(TOPDIR)/rules.mk @@ -6,6 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iptvhelper PKG_VERSION:=0.1.1 PKG_RELEASE:=1 + PKG_MAINTAINER:=Shun Li PKG_LICENSE:=GPL-3.0 @@ -15,16 +17,14 @@ define Package/iptvhelper SECTION:=net CATEGORY:=Network SUBMENU:=Routing and Redirection - DEPENDS:= \ - +ipset \ - +iptables + DEPENDS:= +ipset +iptables TITLE:=Scripts for configure IPTV easily MAINTAINER:=Shun Li PKGARCH:=all endef define Package/iptvhelper/description -Scripts for configure IPTV easily + Scripts for configure IPTV easily endef define Package/iptvhelper/conffiles @@ -35,16 +35,8 @@ endef define Build/Compile endef -define Package/iptvhelper/postinst -#!/bin/sh -endef - -define Package/iptvhelper/postrm -#!/bin/sh -endef - define Package/iptvhelper/install -$(CP) ./files/* $(1) + $(CP) ./files/* $(1) endef -$(eval $(call BuildPackage,iptvhelper)) \ No newline at end of file +$(eval $(call BuildPackage,iptvhelper)) diff --git a/package/ctcgfw/libtar/Makefile b/package/ctcgfw/libtar/Makefile index e5ad9fc11f..10c50264f5 100644 --- a/package/ctcgfw/libtar/Makefile +++ b/package/ctcgfw/libtar/Makefile @@ -11,25 +11,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtar PKG_VERSION:=1.2.20 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ElonH/libtar.git -PKG_MIRROR_HASH:=6ba99fe56d83ec6a8f8be0448383f49426a6a9290c3296f3f7d5b2d2c71cdb45 +PKG_SOURCE_DATE:=2020-03-08 PKG_SOURCE_VERSION:=987a29eaf8c68f8a502dd3880c58e0e1ef99d6a7 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_MIRROR_HASH:=7d9d7d8d33d39ac1e6a586361247f53a33ad0063c3940521b431a7d9b6170eac PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=ElonH -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_INSTALL:=1 PKG_FIXUP:=autoreconf -PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -44,29 +40,27 @@ define Package/libtar endef define Package/libtar/description -libtar is a library for manipulating tar files from within C programs. -Here are some of its features: + 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 - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include + $(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 - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib endef - $(eval $(call BuildPackage,libtar)) diff --git a/package/ctcgfw/lua-maxminddb/Makefile b/package/ctcgfw/lua-maxminddb/Makefile index de2b3bd89e..af1f98e3c1 100644 --- a/package/ctcgfw/lua-maxminddb/Makefile +++ b/package/ctcgfw/lua-maxminddb/Makefile @@ -1,7 +1,10 @@ # # Copyright (C) 2020 jerryk # -# This is free software, licensed under the GNU General Public License v2. +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # @@ -9,46 +12,37 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua-maxminddb PKG_VERSION:=0.2 -PKG_RELEASE:=1 -PKG_MAINTAINER:=fabled -PKG_LICENSE:=MIT +PKG_RELEASE:=2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MIRROR_HASH:=8aff0958546e4082d48854fdeb32f4fd1ef6a9f78ef066a1886f4d9569898d0e -PKG_SOURCE_URL:=https://github.com/fabled/lua-maxminddb.git 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_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +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 -include $(INCLUDE_DIR)/cmake.mk define Package/lua-maxminddb SUBMENU:=Lua SECTION:=lang CATEGORY:=Languages - TITLE:=Lua-Maxminddb + TITLE:=libmaxminddb bindings for lua URL:=https://github.com/jerrykuku/lua-maxminddb DEPENDS:=+lua +libmaxminddb endef -define Package/lua-maxminddb/description - libmaxminddb bindings for lua -endef - TARGET_CFLAGS += $(FPIC) -# add make variable overrides here -MAKE_FLAGS += - -define Build/Configure -endef - define Package/lua-maxminddb/install $(INSTALL_DIR) $(1)/usr/lib/lua - $(INSTALL_BIN) $(PKG_BUILD_DIR)/maxminddb.so $(1)/usr/lib/lua/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/maxminddb.so $(1)/usr/lib/lua/ endef -$(eval $(call BuildPackage,lua-maxminddb)) \ No newline at end of file +$(eval $(call BuildPackage,lua-maxminddb)) diff --git a/package/ctcgfw/mentohust/Makefile b/package/ctcgfw/mentohust/Makefile index e587bb86d8..ac0781fb03 100644 --- a/package/ctcgfw/mentohust/Makefile +++ b/package/ctcgfw/mentohust/Makefile @@ -1,6 +1,9 @@ # # Copyright (C) 2014-2015 KyleRicardo # +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # @@ -9,17 +12,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mentohust PKG_VERSION:=0.3.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/KyleRicardo/MentoHUST-OpenWrt-ipk.git -PKG_MIRROR_HASH:=ac39a84247b2b976430b39a29667d136611252afbb32ac16d4f21831ce07c871 -PKG_REV:=557cffca8032b6d8ac948be8a79255dc64a1915d +PKG_SOURCE_DATE:=2018-11-27 +PKG_SOURCE_VERSION:=557cffca8032b6d8ac948be8a79255dc64a1915d +PKG_MIRROR_HASH:=1db6cd4402ea3e1fa2adc3adcc1490fffdac224ae83024d883429b8b67fb9c74 -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) +PKG_BUILD_PARALLEL:=1 MAKE_PATH:=src @@ -35,18 +36,18 @@ define Package/mentohust endef define Package/mentohust/description - A Ruijie Client Daemon, most usually used in China collages. + A Ruijie Client Daemon, most usually used in China collages. endef define Package/mentohust/conffiles -/etc/mentohust.conf + /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_DATA) $(PKG_BUILD_DIR)/src/mentohust.conf $(1)/etc/mentohust.conf + $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/mentohust.conf $(1)/etc/mentohust.conf endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,mentohust)) diff --git a/package/ctcgfw/microsocks11/Makefile b/package/ctcgfw/microsocks11/Makefile new file mode 100644 index 0000000000..db34388e10 --- /dev/null +++ b/package/ctcgfw/microsocks11/Makefile @@ -0,0 +1,68 @@ +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# (https://project-openwrt.eu.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 new file mode 100644 index 0000000000..3228f505c7 --- /dev/null +++ b/package/ctcgfw/microsocks11/patches/100-main.cpp-fix-typo-error-of-getting-password.patch @@ -0,0 +1,26 @@ +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/msgpack-c/Makefile b/package/ctcgfw/msgpack-c/Makefile index f59ef59ad6..c78d7688da 100644 --- a/package/ctcgfw/msgpack-c/Makefile +++ b/package/ctcgfw/msgpack-c/Makefile @@ -1,14 +1,16 @@ # -# Copyright (C) 2019 OpenWrt.org +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # + include $(TOPDIR)/rules.mk PKG_NAME:=msgpack-c PKG_VERSION:=3.3.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/msgpack/msgpack-c/tar.gz/cpp-$(PKG_VERSION)? @@ -17,11 +19,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-cpp-$(PKG_VERSION) PKG_LICENSE:=BSL-1.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=[CTCGFW]Project OpenWrt +PKG_MAINTAINER:=CN_SZTL -PKG_INSTALL:=1 -PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 +CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -39,16 +40,6 @@ define Package/libmsgpack-c/description MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller. Small integers are encoded into a single byte and short strings require only one extra byte in addition to the strings themselves. endef -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include $(1)/usr/lib/pkgconfig $(1)/usr/lib/cmake - $(INSTALL_BIN) $(PKG_BUILD_DIR)/libmsgpackc.* $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/include/msgpack.h $(1)/usr/include/msgpack.h - $(INSTALL_DATA) $(PKG_BUILD_DIR)/include/msgpack.hpp $(1)/usr/include/msgpack.hpp - $(INSTALL_DATA) $(PKG_BUILD_DIR)/msgpack.pc $(1)/usr/lib/pkgconfig/msgpack.pc - $(CP) $(PKG_BUILD_DIR)/include/msgpack $(1)/usr/include/msgpack - $(CP) $(PKG_BUILD_DIR)/CMakeFiles/Export/lib/cmake/msgpack $(1)/usr/lib/cmake/msgpack -endef - define Package/libmsgpack-c/install $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_BIN) $(PKG_BUILD_DIR)/libmsgpackc.* $(1)/usr/lib/ diff --git a/package/ctcgfw/mwol/Makefile b/package/ctcgfw/mwol/Makefile index cb0565b068..c2345a02c6 100644 --- a/package/ctcgfw/mwol/Makefile +++ b/package/ctcgfw/mwol/Makefile @@ -1,58 +1,60 @@ -# -# Copyright (C) 2019 mleaf.org -# 微信公众号【WiFi物联网】 -# -# 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=1 - - -PKG_LICENSE:=GPL-3.0 -PKG_MAINTAINER:=mleaf -PKG_LICENSE_FILES:=COPYING - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/Mleaf/mwol.git -PKG_MIRROR_HASH:=7684645b84abc1339d84bc0b87dd72ca99c501d1c77b10f7bd5379e6b49833e9 -PKG_SOURCE_VERSION:=59f9805901b4ac2916a0273ffbc29197fcd17a62 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz - - -PKG_INSTALL:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) - -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/share/mwol/ssl - $(CP) files/ssl/* $(1)/usr/share/mwol/ssl/ - $(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 -endef - -$(eval $(call BuildPackage,mwol)) +# +# Copyright (C) 2019 mleaf.org +# 微信公众号【WiFi物联网】 +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# 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/naiveproxy/Makefile b/package/ctcgfw/naiveproxy/Makefile index 59853b5885..910b92ccdb 100644 --- a/package/ctcgfw/naiveproxy/Makefile +++ b/package/ctcgfw/naiveproxy/Makefile @@ -1,5 +1,6 @@ # -# Copyright (C) 2020 Project OpenWrt +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. diff --git a/package/ctcgfw/nps/Makefile b/package/ctcgfw/nps/Makefile new file mode 100644 index 0000000000..e4a3cc7967 --- /dev/null +++ b/package/ctcgfw/nps/Makefile @@ -0,0 +1,98 @@ +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# 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:=2 + +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_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 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/ +endef + +define Package/npc/install + $(call Package/nps/install/template,$(1),npc) +ifeq ($(CONFIG_NPC_COMPRESS_UPX),y) + $(STAGING_DIR_HOST)/bin/upx --lzma --best $(1)/usr/bin/* +endif +endef + +define Package/nps/install + $(call Package/nps/install/template,$(1),nps) +ifeq ($(CONFIG_NPS_COMPRESS_UPX),y) + $(STAGING_DIR_HOST)/bin/upx --lzma --best $(1)/usr/bin/* +endif +endef + +$(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 new file mode 100644 index 0000000000..b96542fc41 --- /dev/null +++ b/package/ctcgfw/nps/patches/100-remove-useless-sdk-in-npc.patch @@ -0,0 +1,4 @@ +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 index 59783f8700..04bbd77553 100644 --- a/package/ctcgfw/ootoc/Makefile +++ b/package/ctcgfw/ootoc/Makefile @@ -11,24 +11,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ootoc PKG_VERSION:=2.2.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ElonH/ootoc.git -PKG_MIRROR_HASH:=17572c37581e1b931490c185f3809586406f7fc14d8e4a1b795db950e65245d1 +PKG_SOURCE_DATE:=2020-03-21 PKG_SOURCE_VERSION:=8e7495e49018a100043b2e013b65b589900ddabe -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_MIRROR_HASH:=9fe7b360241a070cfe623cd59330b7305a59d329056bbf04666f1840e3ec8988 -PKG_LICENSE:=GPLv3 -PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=ElonH -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_INSTALL:=1 -PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 +CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -41,25 +35,19 @@ define Package/ootoc URL:=https://github.com/msgpack/ootoc TITLE:=opkg over tar over curl DEPENDS:=+libcurl +libyaml-cpp +libtar +spdlog - MENU:=1 endef define Package/ootoc/description opkg over tar over curl endef -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include $(1)/usr/share - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share -endef - define Package/ootoc/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config + $(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 - $(INSTALL_DATA) ./files/ootoc.conf $(1)/etc/config/ootoc endef -$(eval $(call BuildPackage,ootoc)) +$(eval $(call BuildPackage,ootoc)) \ No newline at end of file diff --git a/package/ctcgfw/openwrt-simple-obfs/Makefile b/package/ctcgfw/openwrt-simple-obfs/Makefile deleted file mode 100644 index 731763d473..0000000000 --- a/package/ctcgfw/openwrt-simple-obfs/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# -# Copyright (C) 2017-2019 Jian Chang -# -# 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:=5 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/shadowsocks/simple-obfs.git -PKG_MIRROR_HASH:=ea8f2b9825bbb87d5d860524e29bade265141687338db2dbf7ecd32690cf02fc -PKG_SOURCE_VERSION:=486bebd9208539058e57e23a12f23103016e09b4 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz - -PKG_LICENSE:=GPLv3 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jian Chang - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION) - -PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf -PKG_USE_MIPS16:=0 -PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=libev - -PKG_CONFIG_DEPENDS:= CONFIG_SIMPLE_OBFS_STATIC_LINK - -include $(INCLUDE_DIR)/package.mk - -define Package/simple-obfs - SECTION:=net - CATEGORY:=Network - TITLE:=Simple-obfs - URL:=https://github.com/shadowsocks/simple-obfs - DEPENDS:=+libpthread +!SIMPLE_OBFS_STATIC_LINK:libev -endef - -Package/simple-obfs-server = $(Package/simple-obfs) - -define Package/simple-obfs-server/config -menu "Simple-obfs Compile Configuration" - depends on PACKAGE_simple-obfs || PACKAGE_simple-obfs-server - config SIMPLE_OBFS_STATIC_LINK - bool "enable static link libraries." - default n -endmenu -endef - -define Package/simple-obfs/description -Simple-obfs is a simple obfusacting tool, designed as plugin server of shadowsocks. -endef - -Package/simple-obfs-server/description = $(Package/simple-obfs/description) - -CONFIGURE_ARGS += \ - --disable-ssp \ - --disable-documentation \ - --disable-assert - -ifeq ($(CONFIG_SIMPLE_OBFS_STATIC_LINK),y) - CONFIGURE_ARGS += \ - --with-ev="$(STAGING_DIR)/usr" \ - LDFLAGS="-Wl,-static -static -static-libgcc" -endif - -define Package/simple-obfs/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/obfs-local $(1)/usr/bin -endef - -define Package/simple-obfs-server/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/obfs-server $(1)/usr/bin -endef - -$(eval $(call BuildPackage,simple-obfs)) -$(eval $(call BuildPackage,simple-obfs-server)) diff --git a/package/ctcgfw/parted/Makefile b/package/ctcgfw/parted/Makefile index 8ce84b8acc..9f597d27db 100644 --- a/package/ctcgfw/parted/Makefile +++ b/package/ctcgfw/parted/Makefile @@ -1,27 +1,31 @@ # -# Copyright (C) 2019 OpenWrt.org +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # include $(TOPDIR)/rules.mk PKG_NAME:=parted PKG_VERSION:=3.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_BUILD_DIR:=$(BUILD_DIR)/parted-$(PKG_VERSION) 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 + DEPENDS:=+libuuid +libreadline +libncurses +libblkid endef define Package/parted/description @@ -29,21 +33,18 @@ define Package/parted/description http://www.gnu.org/software/parted/index.shtml endef -define Build/Configure - $(call Build/Configure/Default, \ - --without-readline \ - --disable-device-mapper \ - --disable-nls \ - ) -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 - $(INSTALL_BIN) $(PKG_BUILD_DIR)/libparted/.libs/*.so* $(1)/usr/lib/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/libparted/fs/.libs/*.so* $(1)/usr/lib/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/parted/.libs/parted $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/partprobe/.libs/partprobe $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,parted)) diff --git a/package/ctcgfw/phicomm-k3screenctrl/Makefile b/package/ctcgfw/phicomm-k3screenctrl/Makefile index d3249279c6..9366893917 100644 --- a/package/ctcgfw/phicomm-k3screenctrl/Makefile +++ b/package/ctcgfw/phicomm-k3screenctrl/Makefile @@ -1,24 +1,36 @@ +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# + include $(TOPDIR)/rules.mk PKG_NAME:=phicomm-k3screenctrl PKG_VERSION:=1.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/lwz322/k3screenctrl.git -PKG_MIRROR_HASH:=88ca32df297bb7a0e730c2e445909bb9ab37f7144433302e0e7f929c1074b108 -PKG_SOURCE_VERSION:=7b81497bb3719d7f3a741307417e39a4505d309d -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.xz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) +PKG_SOURCE_DATE:=2020-09-18 +PKG_SOURCE_VERSION:=d8896cfad4bdf39f58999f9420807f986300bada +PKG_MIRROR_HASH:=9eab074f5ac366013d394be2c57905a8585439d1ca2a8b602a09a098a8aa8fb7 +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILE:=LICENSE PKG_MAINTAINER:=Hamster Tian +PKG_FIXUP:=autoreconf +PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk TARGET_CFLAGS+= -D_GNU_SOURCE -define Package/$(PKG_NAME) +define Package/phicomm-k3screenctrl SECTION:=utils CATEGORY:=Utilities DEPENDS:=@TARGET_bcm53xx_generic_DEVICE_phicomm-k3 +@KERNEL_DEVMEM +@BUSYBOX_CONFIG_ARPING +bc +bash +curl +coreutils +coreutils-od +jq @@ -26,14 +38,14 @@ define Package/$(PKG_NAME) URL:=https://github.com/lwz322/k3screenctrl.git endef -define Package/$(PKG_NAME)/description - K3 Screen Controller (k3screenctrl) is a program utilizing -the LCD screen on PHICOMM K3 to display some stats. +define Package/phicomm-k3screenctrl/description + K3 Screen Controller (k3screenctrl) is a program utilizing + the LCD screen on PHICOMM K3 to display some stats. endef -define Package/$(PKG_NAME)/install +define Package/phicomm-k3screenctrl/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/k3screenctrl $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/k3screenctrl $(1)/usr/bin/k3screenctrl $(INSTALL_DIR) $(1)/lib/k3screenctrl $(1)/lib/k3screenctrl/oui $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/k3screenctrl/*.sh $(1)/lib/k3screenctrl/ @@ -44,4 +56,4 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) $(CURDIR)/files/k3screenctrl.init $(1)/etc/init.d/k3screenctrl endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,phicomm-k3screenctrl)) diff --git a/package/ctcgfw/quickjs/Makefile b/package/ctcgfw/quickjs/Makefile index 4e8ae331c3..f4a7bb1239 100644 --- a/package/ctcgfw/quickjs/Makefile +++ b/package/ctcgfw/quickjs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 CTCGFW Project-OpenWrt # # # This is free software, licensed under the GNU General Public License v3. @@ -19,8 +19,8 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=CN_SZTL -PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/ctcgfw/r8152/Makefile b/package/ctcgfw/r8152/Makefile index 396bfa526e..a8f0c45f66 100644 --- a/package/ctcgfw/r8152/Makefile +++ b/package/ctcgfw/r8152/Makefile @@ -30,7 +30,7 @@ define KernelPackage/usb-net-rtl8152-vendor endef define KernelPackage/usb-net-rtl8152-vendor/description - Kernel module for Realtek RTL8152/RTL8153 Based USB Ethernet Adapters + Kernel module for Realtek RTL8152/RTL8153 Based USB Ethernet Adapters endef R8152_MAKEOPTS= -C $(PKG_BUILD_DIR) \ diff --git a/package/ctcgfw/r8168/Makefile b/package/ctcgfw/r8168/Makefile index 02cf885c9b..bcb6af5045 100644 --- a/package/ctcgfw/r8168/Makefile +++ b/package/ctcgfw/r8168/Makefile @@ -11,9 +11,6 @@ PKG_NAME:=r8168 PKG_VERSION:=8.048.03 PKG_RELEASE:=3 -#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -#PKG_CAT:=bzcat - PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk @@ -27,25 +24,20 @@ define KernelPackage/r8168 endef define Package/r8168/description - This package contains a driver for Realtek r8168 chipsets. + This package contains a driver for Realtek r8168 chipsets. endef R8168_MAKEOPTS= -C $(PKG_BUILD_DIR) \ - PATH="$(TARGET_PATH)" \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - TARGET="$(HAL_TARGET)" \ - TOOLPREFIX="$(KERNEL_CROSS)" \ - TOOLPATH="$(KERNEL_CROSS)" \ - KERNELPATH="$(LINUX_DIR)" \ - KERNELDIR="$(LINUX_DIR)" \ - LDOPTS=" " \ - DOMULTI=1 - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR) -endef + PATH="$(TARGET_PATH)" \ + ARCH="$(LINUX_KARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + TARGET="$(HAL_TARGET)" \ + TOOLPREFIX="$(KERNEL_CROSS)" \ + TOOLPATH="$(KERNEL_CROSS)" \ + KERNELPATH="$(LINUX_DIR)" \ + KERNELDIR="$(LINUX_DIR)" \ + LDOPTS=" " \ + DOMULTI=1 define Build/Compile $(MAKE) $(R8168_MAKEOPTS) modules diff --git a/package/ctcgfw/rclone-ng/Makefile b/package/ctcgfw/rclone-ng/Makefile index 5279d752cc..6f5424ca36 100644 --- a/package/ctcgfw/rclone-ng/Makefile +++ b/package/ctcgfw/rclone-ng/Makefile @@ -11,47 +11,37 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone-ng PKG_VERSION:=0.5.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_LICENSE:=GPLv3 +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 -PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/ -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=0b4916ddd0bacb5b358dc8d36b64c30f4182c0ace3eb06cda94b6578c419dcd9 +TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) -define Package/$(PKG_NAME) +define Package/rclone-ng SECTION:=net CATEGORY:=Network - SUBMENU:=File Transfer SUBMENU:=Cloud Manager TITLE:=An angular web application for rclone URL:=https://github.com/ElonH/RcloneNg + DEPENDS:=+rclone PKGARCH:=all endef -define Package/$(PKG_NAME)/description - An angular web application for rclone -endef - -define Build/Prepare - mkdir -vp $(PKG_BUILD_DIR) - tar -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - define Build/Compile - echo "$(PKG_NAME) Compile Skiped!" + true endef -define Package/$(PKG_NAME)/install +define Package/rclone-ng/install $(INSTALL_DIR) $(1)/www $(CP) $(PKG_BUILD_DIR)/RcloneNg $(1)/www endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,rclone-ng)) diff --git a/package/ctcgfw/rclone-webui-react/Makefile b/package/ctcgfw/rclone-webui-react/Makefile index 0e359d5873..8d193cba40 100644 --- a/package/ctcgfw/rclone-webui-react/Makefile +++ b/package/ctcgfw/rclone-webui-react/Makefile @@ -10,49 +10,43 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone-webui-react -PKG_VERSION:=0.1.0 +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:=GPLv3 +PKG_LICENSE:=MIT +PKG_LICENSE_FILE:=LICENSE PKG_MAINTAINER:=ElonH include $(INCLUDE_DIR)/package.mk -PKG_SOURCE:=currentbuild.zip -PKG_SOURCE_URL:=https://github.com/rclone/rclone-webui-react/releases/download/v$(PKG_VERSION)/ -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=06b9401779f82ef62fd22a9688549664228797d094b645a68a098c2310461fc5 +UNZIP_CMD:=unzip -q -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) -define Package/$(PKG_NAME) +define Package/rclone-webui-react SECTION:=net CATEGORY:=Network - SUBMENU:=File Transfer 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/$(PKG_NAME)/description +define Package/rclone-webui-react/description A full fledged UI for the rclone cloud sync tool. endef -define Build/Prepare - mkdir -vp $(PKG_BUILD_DIR) - unzip -od $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) -endef - -define Build/Configure -endef define Build/Compile - echo "$(PKG_NAME) Compile Skiped!" + true endef -define Package/$(PKG_NAME)/install +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,$(PKG_NAME))) +$(eval $(call BuildPackage,rclone-webui-react)) diff --git a/package/ctcgfw/rclone/Makefile b/package/ctcgfw/rclone/Makefile index c2e0cf57b7..20be645d38 100644 --- a/package/ctcgfw/rclone/Makefile +++ b/package/ctcgfw/rclone/Makefile @@ -10,68 +10,80 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone -PKG_VERSION:=1.53.0 +PKG_VERSION:=1.53.4 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/rclone/rclone.git -PKG_SOURCE_DATE:=2020-09-02 -PKG_SOURCE_VERSION:=510ac341e193976171d29b8aeb81a30a37cfd2a1 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=c179138e0e8e5e54d4742622b61a22ec16f393f5a441dad02b8cb8f39de2f5a3 +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:=GPLv3 +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 # https://github.com/openwrt/packages/issues/8498 +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 -# GO_PKG_LDFLAGS:= -GO_PKG_LDFLAGS_X:=\ - github.com/rclone/rclone/fs.Version=v$(PKG_VERSION)_$(PKG_SOURCE_DATE)\ - main.Version=v$(PKG_VERSION) \ - main.BuildUser=openwrt \ - main.BuildHost=openwrt \ - main.BuildStamp=$(SOURCE_DATE_EPOCH) - -define Package/$(PKG_NAME) +define Package/rclone SECTION:=utils CATEGORY:=Utilities TITLE:=rsync for cloud storage. URL:=https://rclone.org - DEPENDS:=$(GO_ARCH_DEPENDS) + DEPENDS:=$(GO_ARCH_DEPENDS) endef -define Package/$(PKG_NAME)/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. +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/$(PKG_NAME)/install - # echo "++++++++++++++++++" - # echo "$(PKG_INSTALL_DIR)" - # echo "$(1)" - # echo "$(GO_PKG_BUILD_BIN_DIR)" - # echo "++++++++++++++++++" +define Package/rclone/config +config RCLONE_COMPRESS_GOPROXY + bool "Compiling with GOPROXY proxy" + default n - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/rclone $(1)/usr/bin/ +config RCLONE_COMPRESS_UPX + bool "Compress executable files with UPX" + default n endef -$(eval $(call GoBinPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +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/rtl8812au-ac/Makefile b/package/ctcgfw/rtl8812au-ac/Makefile index 4912a0af4a..259f95c7a2 100644 --- a/package/ctcgfw/rtl8812au-ac/Makefile +++ b/package/ctcgfw/rtl8812au-ac/Makefile @@ -1,3 +1,13 @@ +# +# Copyright (C) 2020 Marty Jones +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# + include $(TOPDIR)/rules.mk PKG_NAME:=rtl8812au-ac @@ -9,11 +19,11 @@ PKG_SOURCE_DATE:=2020-06-26 PKG_SOURCE_VERSION:=58f6be25f7c86d7ba67b0ccc638cf667755e6e1b PKG_MIRROR_HASH:=60359df8b49fa433d38b968b0df7eaddaca10f13cdd57471394bac1f6e5a162e -PKG_BUILD_PARALLEL:=1 - PKG_LICENSE:=GPLv2 PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_PARALLEL:=1 + STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h include $(INCLUDE_DIR)/kernel.mk diff --git a/package/ctcgfw/rtl8821cu/Makefile b/package/ctcgfw/rtl8821cu/Makefile index f3b71d58ba..e6b87c5ca7 100644 --- a/package/ctcgfw/rtl8821cu/Makefile +++ b/package/ctcgfw/rtl8821cu/Makefile @@ -1,7 +1,8 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # @@ -16,12 +17,11 @@ PKG_SOURCE_DATE:=2020-07-27 PKG_SOURCE_VERSION:=93b04bfcd293fdd7d98d5a7c964ae9416a40159c PKG_MIRROR_HASH:=e3d798355625bd71596ce08741e1f7f3523951e91be775edf2a936ab260bd5de -PKG_MAINTAINER:=[CTCGFW] Project OpenWrt -PKG_BUILD_PARALLEL:=1 - PKG_LICENSE:=GPLv2 PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_PARALLEL:=1 + STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h include $(INCLUDE_DIR)/kernel.mk diff --git a/package/ctcgfw/rtl88x2bu/Makefile b/package/ctcgfw/rtl88x2bu/Makefile index 13165d4ba8..1bbdb13e9c 100644 --- a/package/ctcgfw/rtl88x2bu/Makefile +++ b/package/ctcgfw/rtl88x2bu/Makefile @@ -1,7 +1,8 @@ # -# Copyright (C) 2020 CTCGFW Project-OpenWrt +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # @@ -16,12 +17,11 @@ PKG_SOURCE_DATE:=2020-07-21 PKG_SOURCE_VERSION:=a2abcaf523dfab2afeda8cc2cdb5e3c9510fc5f3 PKG_MIRROR_HASH:=26d5504c9323c9c133265f2c2e4213acca0ddf390b1b4399d1003e9fd45f9368 -PKG_MAINTAINER:=[CTCGFW] Project OpenWrt -PKG_BUILD_PARALLEL:=1 - PKG_LICENSE:=GPLv2 PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_PARALLEL:=1 + STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h include $(INCLUDE_DIR)/kernel.mk diff --git a/package/ctcgfw/simple-obfs/Makefile b/package/ctcgfw/simple-obfs/Makefile new file mode 100644 index 0000000000..d422eba70a --- /dev/null +++ b/package/ctcgfw/simple-obfs/Makefile @@ -0,0 +1,76 @@ +# +# Copyright (C) 2017-2019 Jian Chang +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# 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 index 419f0aaed2..d83596b975 100644 --- a/package/ctcgfw/simple-torrent/Makefile +++ b/package/ctcgfw/simple-torrent/Makefile @@ -1,22 +1,29 @@ +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# 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.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/boypt/simple-torrent.git -PKG_MIRROR_HASH:=2eefc27ca66e2e2bad9950cd6059b5b4f25f3565319e22ac6b8d00e7cbd27938 -PKG_SOURCE_VERSION:=7d2662c35ac0a566b39b56c0d42de81067cc1670 - -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/boypt/simple-torrent/tar.gz/$(PKG_VERSION)? +PKG_HASH:=82cfa9cd9e9dca839ad542a24ecf67073fbcb703f9d890381148be99e8689716 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 @@ -29,39 +36,49 @@ GO_PKG_LDFLAGS_X:= \ include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk -define Package/$(PKG_NAME) +define Package/simple-torrent SECTION:=net CATEGORY:=Network SUBMENU:=BitTorrent - TITLE:=a self-hosted remote torrent client + TITLE:=A self-hosted remote torrent client URL:=https://github.com/ginuerzh/gost - DEPENDS:=$(GO_ARCH_DEPENDS) + DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle +libstdcpp endef -define Package/$(PKG_NAME)/description +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 Build/Prepare - tar -zxf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip-components 1 +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 -define Build/Configure -endef +ifeq ($(CONFIG_SIMPLE_TORRENT_COMPRESS_GOPROXY),y) + export GO111MODULE=on + export GOPROXY=https://goproxy.io +endif define Build/Compile - $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)) - $(call GoPackage/Build/Configure) $(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/$(PKG_NAME)/install +define Package/simple-torrent/install + $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) + $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/cloud-torrent $(1)/usr/bin/simple-torrent + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cloud-torrent $(1)/usr/bin/simple-torrent endef -$(eval $(call GoBinPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call GoBinPackage,simple-torrent)) +$(eval $(call BuildPackage,simple-torrent)) diff --git a/package/ctcgfw/ssocks/Makefile b/package/ctcgfw/ssocks/Makefile index 86cae414fe..6d1b30048b 100644 --- a/package/ctcgfw/ssocks/Makefile +++ b/package/ctcgfw/ssocks/Makefile @@ -1,6 +1,9 @@ # # Copyright (C) 2017-2018 Jian Chang # +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # @@ -9,57 +12,65 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ssocks PKG_VERSION:=0.0.14 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/tostercx/ssocks.git -PKG_MIRROR_HASH:=f9447b08d99ffeb2cac3eba1a7b07f5397935db7b7fa4a4e404fb695f13b76f9 -PKG_SOURCE_VERSION:=8d9a5d2f89e507c9ffebd838b3c7430f07a0f36c -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2020-07-09 +PKG_SOURCE_VERSION:=c2024789c1ee076d171fd6061d7c133302216ea7 +PKG_MIRROR_HASH:=3654e9f1fb54646e1e89c19e7aa3e105b84b2e20b5b634662c21c66691d1d22e -PKG_LICENSE:=GPLv3 +PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=[CTCGFW]Project OpenWrt +PKG_MAINTAINER:=CN_SZTL -PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf -PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk -define Package/ssocks +define Package/ssocks/template SECTION:=net CATEGORY:=Network - TITLE:=sSocks Relay - URL:=https://github.com/david378/ssocks + TITLE:=sSocks + URL:=https://github.com/tostercx/ssocks DEPENDS:=+libopenssl endef -define Package/ssocks/description -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. +define Package/ssocks + $(call Package/ssocks/template) + TITLE+= Relay endef define Package/ssocksd - $(call Package/ssocks) - TITLE:=sSocks Server + $(call Package/ssocks/template) + TITLE+= Server endef -define Package/ssocksd/description - $(call Package/ssocks/description) +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 - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ssocks $(1)/usr/bin/ + $(call Package/ssocks/install/template,$(1),ssocks) endef define Package/ssocksd/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ssocksd $(1)/usr/bin/ + $(call Package/ssocks/install/template,$(1),ssocksd) endef $(eval $(call BuildPackage,ssocks)) diff --git a/package/ctcgfw/tmate/Makefile b/package/ctcgfw/tmate/Makefile index 2a295a4f66..cc65b77105 100644 --- a/package/ctcgfw/tmate/Makefile +++ b/package/ctcgfw/tmate/Makefile @@ -1,37 +1,35 @@ # -# Copyright (C) 2019 OpenWrt.org +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # + include $(TOPDIR)/rules.mk PKG_NAME:=tmate -PKG_VERSION:=2.4.0-cbec43f -PKG_RELEASE:=1 +PKG_VERSION:=2.4.0 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/tmate-io/tmate.git +PKG_SOURCE_DATE:=2020-04-25 PKG_SOURCE_VERSION:=cbec43f56dfb48c2fb6e00faa2cb85443d4b7d8f -PKG_MIRROR_HASH:=a553810a740bed3770ff94237a982c0dbddaf2efec61c61f3660f6674e8320b5 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_MIRROR_HASH:=8622869c8acfa147275d4658fbc2c9afdc9dde45d5d07fc4a4cb51ec740a8ac7 PKG_LICENSE:=ISC PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=[CTCGFW]Project OpenWrt +PKG_MAINTAINER:=CN_SZTL -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=ncurses PKG_FIXUP:=autoreconf -PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=msgpack-c ncurses +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME) +define Package/tmate SECTION:=net CATEGORY:=Network SUBMENU:=SSH @@ -40,17 +38,20 @@ define Package/$(PKG_NAME) DEPENDS:=+libpthread +libevent2 +libssh +libmsgpack-c +libncurses endef -CONFIGURE_ARGS+=--oldincludedir=$(STAGING_DIR) +CONFIGURE_ARGS+= \ + --oldincludedir=$(STAGING_DIR) -CONFIGURE_VARS+=LIBSSH_CFLAGS="-I$(STAGING_DIR)/usr/include " LIBSSH_LIBS="-lssh" +CONFIGURE_VARS+= \ + LIBSSH_CFLAGS="-I$(STAGING_DIR)/usr/include" \ + LIBSSH_LIBS="-lssh" -define Package/$(PKG_NAME)/description +define Package/tmate/description Tmate is a fork of tmux. It provides an instant pairing solution. endef -define Package/$(PKG_NAME)/install +define Package/tmate/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tmate $(1)/usr/bin/tmate + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tmate $(1)/usr/bin/tmate endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,tmate)) diff --git a/package/ctcgfw/openwrt-v2ray-plugin/Makefile b/package/ctcgfw/v2ray-plugin/Makefile similarity index 64% rename from package/ctcgfw/openwrt-v2ray-plugin/Makefile rename to package/ctcgfw/v2ray-plugin/Makefile index 5d3350d812..fbbdfeed5e 100644 --- a/package/ctcgfw/openwrt-v2ray-plugin/Makefile +++ b/package/ctcgfw/v2ray-plugin/Makefile @@ -1,7 +1,10 @@ # # Copyright (C) 2020 SharerMax # -# This is free software, licensed under the GNU General Public License v2. +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # @@ -9,7 +12,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-plugin PKG_VERSION:=1.8.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)? @@ -19,31 +22,36 @@ 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 -PKG_CONFIG_DEPENDS := CONFIG_$(PKG_NAME)_INCLUDE_GOPROXY include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk -define Package/$(PKG_NAME)/config -config $(PKG_NAME)_INCLUDE_GOPROXY +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_$(PKG_NAME)_INCLUDE_GOPROXY),y) -export GO111MODULE=on -export GOPROXY=https://goproxy.io -#export GOPROXY=https://mirrors.aliyun.com/goproxy/ +ifeq ($(CONFIG_GOWEBDAV_COMPRESS_GOPROXY),y) + export GO111MODULE=on + export GOPROXY=https://goproxy.io endif -define Package/$(PKG_NAME) +define Package/v2ray-plugin SECTION:=net CATEGORY:=Network TITLE:=SIP003 plugin for shadowsocks, based on v2ray @@ -51,18 +59,16 @@ define Package/$(PKG_NAME) DEPENDS:=$(GO_ARCH_DEPENDS) +ca-certificates endef -define Package/$(PKG_NAME)/description +define Package/v2ray-plugin/description Yet another SIP003 plugin for shadowsocks, based on v2ray endef -define Build/Prepare - $(call Build/Prepare/Default) -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,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call GoBinPackage,v2ray-plugin)) +$(eval $(call BuildPackage,v2ray-plugin)) diff --git a/package/ctcgfw/verysync/Makefile b/package/ctcgfw/verysync/Makefile index 0e86683e19..d22823754c 100644 --- a/package/ctcgfw/verysync/Makefile +++ b/package/ctcgfw/verysync/Makefile @@ -1,7 +1,9 @@ # -# Copyright (C) 2015-2016 OpenWrt.org +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# # # This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. # include $(TOPDIR)/rules.mk @@ -28,10 +30,9 @@ ifeq ($(ARCH),powerpc64) PKG_ARCH_VERYSYNC:=ppc64 endif - PKG_NAME:=verysync PKG_VERSION:=v2.4.2 -PKG_RELEASE:=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)/ @@ -39,31 +40,26 @@ PKG_HASH:=skip include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME) +TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + +define Package/verysync SECTION:=net CATEGORY:=Network TITLE:=A efficient data transmission tool - DEPENDS:= URL:=http://www.verysync.com endef -define Package/$(PKG_NAME)/description - Verysync is a efficient data transmission tool. -endef - -define Build/Prepare - tar -xzvf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) -endef - -define Build/Configure +define Package/verysync/description + Verysync is a efficient data transmission tool. endef define Build/Compile + true endef -define Package/$(PKG_NAME)/install +define Package/verysync/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION)/verysync $(1)/usr/bin/verysync + $(INSTALL_BIN) $(PKG_BUILD_DIR)/verysync-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION)/verysync $(1)/usr/bin/verysync endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,verysync)) diff --git a/package/ctcgfw/webdav-go/Makefile b/package/ctcgfw/webdav-go/Makefile index 9d76e4bc14..46ee6c27e3 100644 --- a/package/ctcgfw/webdav-go/Makefile +++ b/package/ctcgfw/webdav-go/Makefile @@ -1,5 +1,6 @@ # -# Copyright (C) 2019 OpenWrt.org +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# # # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. @@ -8,30 +9,33 @@ include $(TOPDIR)/rules.mk PKG_NAME:=webdav-go -PKG_VERSION:=3.2.0 +PKG_VERSION:=4.0.0 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/hacdias/webdav.git -PKG_SOURCE_DATE:=2020-12-18 -PKG_SOURCE_VERSION:=fca4e548391e8198d0a651a3f22af1ceee966d5c -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=9462c77b95fee8f09391b3d88b196ec0232242486b181bb45e366963ae6bd7e5 +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/$(PKG_NAME) +define Package/webdav-go SECTION:=net CATEGORY:=Network SUBMENU:=File Transfer @@ -40,15 +44,39 @@ define Package/$(PKG_NAME) DEPENDS:=$(GO_ARCH_DEPENDS) endef -define Package/$(PKG_NAME)/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. +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/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/webdav $(1)/usr/bin/ +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 -$(eval $(call GoBinPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +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/lean/npc/Makefile b/package/lean/npc/Makefile deleted file mode 100644 index af5d5ef5d4..0000000000 --- a/package/lean/npc/Makefile +++ /dev/null @@ -1,80 +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:=npc -PKG_VERSION:=0.26.9 -PKG_RELEASE:=1 - -ifeq ($(ARCH),mipsel) - NPC_ARCH:=mipsle -endif -ifeq ($(ARCH),mips) - NPC_ARCH:=mips -endif -ifeq ($(ARCH),i386) - NPC_ARCH:=386 -endif -ifeq ($(ARCH),x86_64) - NPC_ARCH:=amd64 -endif -ifeq ($(ARCH),arm) - NPC_ARCH:=arm_v7 - ifeq ($(BOARD),bcm53xx) - NPC_ARCH:=arm_v5 - endif - ifeq ($(BOARD),kirkwood) - NPC_ARCH:=arm_v5 - endif -endif -ifeq ($(ARCH),aarch64) - NPC_ARCH:=arm64 -endif - -PKG_LICENSE:=Apache-2.0 - -PKG_BUILD_DIR:=$(BUILD_DIR)/npc-$(PKG_VERSION) -PKG_URL:=https://github.com/ehang-io/nps/releases/download/v$(PKG_VERSION)/linux_$(NPC_ARCH)_client.tar.gz -PKG_FILE:=nps_linux_$(NPC_ARCH)_client-$(PKG_VERSION).tar.gz - -include $(INCLUDE_DIR)/package.mk - -define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - TITLE:=NPC Client - DEPENDS:=@(aarch64||arm||i386||mips||mipsel||x86_64) - URL:=https://github.com/ehang-io/nps/releases -endef - -define Package/$(PKG_NAME)/description -npc is a fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet -endef - -define Build/Download - if [ ! -f $(DL_DIR)/$(PKG_FILE) ] ; then \ - wget -c -t 5 -O $(DL_DIR)/$(PKG_FILE) $(PKG_URL); \ - fi -endef - -define Build/Prepare - $(Build/Download) - tar -zxvf $(DL_DIR)/$(PKG_FILE) -C $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/npc $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lienol/brook/Makefile b/package/lienol/brook/Makefile deleted file mode 100644 index 4ee64934ee..0000000000 --- a/package/lienol/brook/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# -# Copyright (C) 2015-2016 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v3. -# - -include $(TOPDIR)/rules.mk -ifeq ($(ARCH),i386) - PKG_ARCH_BROOK:=386 -endif -ifeq ($(ARCH),x86_64) - PKG_ARCH_BROOK:=amd64 -endif -ifeq ($(ARCH),arm) - PKG_ARCH_BROOK:=arm7 -endif -ifeq ($(BOARD),bcm53xx) - PKG_ARCH_BROOK:=arm6 -ifeq ($(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))),) - PKG_ARCH_BROOK:=arm5 -endif -endif -ifeq ($(BOARD),kirkwood) - PKG_ARCH_BROOK:=arm5 -endif -ifeq ($(ARCH),aarch64) - PKG_ARCH_BROOK:=arm64 -endif -ifeq ($(ARCH),mips) - PKG_ARCH_BROOK:=mips_softfloat -endif -ifeq ($(ARCH),mipsel) - PKG_ARCH_BROOK:=mipsle_softfloat -endif -ifeq ($(ARCH),mips64) - PKG_ARCH_BROOK:=mips64 -endif -ifeq ($(ARCH),mips64el) - PKG_ARCH_BROOK:=mips64le -endif - -PKG_NAME:=brook -PKG_VERSION:=20210101 -PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=brook_linux_$(PKG_ARCH_BROOK) -PKG_SOURCE_URL:=https://github.com/txthinking/brook/releases/download/v$(PKG_VERSION) -PKG_HASH:=skip - -include $(INCLUDE_DIR)/package.mk - -define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - TITLE:=Brook is a cross-platform proxy software - DEPENDS:=@!(arc||armeb||powerpc) - URL:=https://github.com/txthinking/brook -endef - -define Package/$(PKG_NAME)/description - Brook is a cross-platform proxy software -endef - -define Build/Prepare - $(CP) $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)/ -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_SOURCE) $(1)/usr/bin/brook -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lienol/dns-forwarder/Makefile b/package/lienol/dns-forwarder/Makefile index 36b9c957c3..ebde8b3618 100644 --- a/package/lienol/dns-forwarder/Makefile +++ b/package/lienol/dns-forwarder/Makefile @@ -2,6 +2,9 @@ # Copyright (C) 2015 OpenWrt-dist # Copyright (C) 2015 Jian Chang # +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# # This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # @@ -10,21 +13,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dns-forwarder PKG_VERSION:=1.2.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/aa65535/hev-dns-forwarder.git -PKG_MIRROR_HASH:=b2f104d563881be9e9f744d631af23fd0b1f088cd6813f90e3851bb0bd5aab1a -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE) +PKG_SOURCE_DATE:=2017-07-21 PKG_SOURCE_VERSION:=289e8c9c7167200668dff83b1e0cbce258665387 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_MIRROR_HASH:=a06f61c2b87f61cf68517d3b4a23439366f3c806dd736594a814ee0245adca43 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Jian Chang -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_SOURCE_SUBDIR) - PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -37,11 +37,11 @@ define Package/dns-forwarder endef define Package/dns-forwarder/description -Forwarding DNS queries on TCP transport. + Forwarding DNS queries on TCP transport. endef define Package/dns-forwarder/conffiles -/etc/config/dns-forwarder + /etc/config/dns-forwarder endef define Package/dns-forwarder/install diff --git a/package/lienol/dns2socks/Makefile b/package/lienol/dns2socks/Makefile index dedda7bad3..ef8cec73f6 100644 --- a/package/lienol/dns2socks/Makefile +++ b/package/lienol/dns2socks/Makefile @@ -1,26 +1,29 @@ +# +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# + include $(TOPDIR)/rules.mk PKG_NAME:=dns2socks PKG_VERSION:=2.1 -PKG_RELEASE:=20200218 +PKG_RELEASE:=2 PKG_SOURCE:=SourceCode.zip -PKG_SOURCE_SUBDIR:=DNS2SOCKS PKG_SOURCE_URL:=@SF/dns2socks +PKG_SOURCE_DATE:=2020-02-18 PKG_HASH:=406b5003523577d39da66767adfe54f7af9b701374363729386f32f6a3a995f4 PKG_MAINTAINER:=ghostmaker PKG_LICENSE:=BSD-3-Clause - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_INSTALL:=1 -PKG_USE_MIPS16:=0 -PKG_BUILD_PARALLEL:=1 +PKG_LICENSE_FILE:=LICENSE include $(INCLUDE_DIR)/package.mk -define Package/dns2socks/Default +define Package/dns2socks SECTION:=net CATEGORY:=Network SUBMENU:=IP Addresses and Names @@ -30,35 +33,25 @@ define Package/dns2socks/Default DEPENDS:=+libpthread endef -define Package/dns2socks - $(call Package/dns2socks/Default) -endef - define Package/dns2socks/description This is a utility to resolve DNS requests via a SOCKS5 tunnel and caches the answers. endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - unzip $(DL_DIR)/$(PKG_SOURCE) -d $(PKG_BUILD_DIR) -endef +UNZIP_CMD:=unzip -q -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) define Build/Compile $(TARGET_CC) \ $(TARGET_CFLAGS) \ $(TARGET_CPPFLAGS) \ $(FPIC) \ - -o $(PKG_BUILD_DIR)/$(PKG_SOURCE_SUBDIR)/$(PKG_NAME) \ - $(PKG_BUILD_DIR)/$(PKG_SOURCE_SUBDIR)/DNS2SOCKS.c \ + -o $(PKG_BUILD_DIR)/DNS2SOCKS/dns2socks \ + $(PKG_BUILD_DIR)/DNS2SOCKS/DNS2SOCKS.c \ $(TARGET_LDFLAGS) -pthread endef -define Build/Install -endef - define Package/dns2socks/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_SOURCE_SUBDIR)/$(PKG_NAME) $(1)/usr/bin/dns2socks + $(INSTALL_BIN) $(PKG_BUILD_DIR)/DNS2SOCKS/dns2socks $(1)/usr/bin/dns2socks endef $(eval $(call BuildPackage,dns2socks)) diff --git a/package/lienol/redsocks2/Makefile b/package/lienol/redsocks2/Makefile index 1037781c7c..029bc90104 100644 --- a/package/lienol/redsocks2/Makefile +++ b/package/lienol/redsocks2/Makefile @@ -1,26 +1,28 @@ # -# Copyright (C) 2014 OpenWrt-dist +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # include $(TOPDIR)/rules.mk - PKG_NAME:=redsocks2 PKG_VERSION:=0.67 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/semigodking/redsocks.git -PKG_MIRROR_HASH:=938f859d1b55a91aa5cbcda3ddff1d04ccab292f784b0434060c73acab12c457 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2020-05-10 PKG_SOURCE_VERSION:=d94c245ea47859cda5b4b7373308589206b97bdc -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_MIRROR_HASH:=5ca32b2f849af7ebda2cab90bbe286bfd97a69de1a85dac09c8df2fbdd8c947c PKG_MAINTAINER:=semigodking +PKG_LICENSE:=Apache-2.0 +PKG_LICENSE_FILE:=LICENSE + +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -33,18 +35,12 @@ define Package/redsocks2 endef define Package/redsocks2/description -This is a modified version of original redsocks. \ -The name is changed to be REDSOCKS2 since this release to distinguish with original redsocks. \ -This variant is useful for anti-GFW (Great Fire Wall). + This is a modified version of original redsocks. + The name is changed to be REDSOCKS2 since this release to distinguish with original redsocks. + This variant is useful for anti-GFW (Great Fire Wall). endef -define Package/redsocks2/conffiles -/etc/config/redsocks2 -endef - -define Build/Compile - $(call Build/Compile/Default,DISABLE_SHADOWSOCKS=true) -endef +MAKE_VARS += DISABLE_SHADOWSOCKS=true define Package/redsocks2/install $(INSTALL_DIR) $(1)/usr/sbin diff --git a/package/lienol/tcping/Makefile b/package/lienol/tcping/Makefile index e6a9e6e4f5..749cabd4b8 100644 --- a/package/lienol/tcping/Makefile +++ b/package/lienol/tcping/Makefile @@ -1,7 +1,8 @@ # -# Copyright (C) 2014 OpenWrt-dist +# Copyright (C) 2021 CTCGFW Project-OpenWrt +# # -# This is free software, licensed under the GNU General Public License v2. +# This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. # @@ -13,11 +14,14 @@ PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Mattraks/tcping.git -PKG_MIRROR_HASH:=2af5100ba3ab1a6a4460da3a21d16a96d3b08b656276a9fa321d58ef95bb57b0 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2020-11-18 PKG_SOURCE_VERSION:=de2b709f8c386507678041d11102c671d470fea7 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_MIRROR_HASH:=07359ac47f0da4fb30215e5160f7c0c942f0a4af4e7b2e2d2b4ffd9769823054 + +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILE:=LICENSE + +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -28,12 +32,6 @@ define Package/tcping URL:=https://github.com/jlyo/tcping endef -define Package/tcping/description -endef - -define Package/tcping/conffiles -endef - define Package/tcping/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/tcping $(1)/usr/sbin diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index ce39c94370..fcba34c7fe 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.84test3 +PKG_VERSION:=2.84 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases -PKG_HASH:=20d1109c991ca08778ea20322b8f3245f2e974688d494b59b2e6ae096ec592b1 +PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq +PKG_HASH:=603195c64b73137609b07e1024ae0b37f652b2f5fe467dce66985b3d1850050c PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/package/ntlf9t/smartdns/Makefile b/package/ntlf9t/smartdns/Makefile deleted file mode 100644 index d361a52249..0000000000 --- a/package/ntlf9t/smartdns/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# -# Copyright (C) 2018-2020 Ruilin Peng (Nick) . -# -# smartdns is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# smartdns is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -include $(TOPDIR)/rules.mk - -PKG_NAME:=smartdns -PKG_VERSION:=9.2020.08 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/pymumu/smartdns.git -PKG_MIRROR_HASH:=af2bd04cda2676330cb4e3f5ab3d5a200f22b2dc2463d6c7800412b29e0ff09c -PKG_SOURCE_VERSION:=Release33 - -PKG_MAINTAINER:=Nick Peng -PKG_LICENSE:=GPL-3.0-or-later -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -MAKE_VARS += VER=$(PKG_VERSION) -MAKE_PATH:=src - -define Package/smartdns - SECTION:=net - CATEGORY:=Network - TITLE:=smartdns server - DEPENDS:=+libpthread +libopenssl - URL:=https://www.github.com/pymumu/smartdns/ -endef - -define Package/smartdns/description -SmartDNS is a local DNS server which accepts DNS query requests from local network clients, -get DNS query results from multiple upstream DNS servers concurrently, and returns the fastest IP to clients. -Unlike dnsmasq's all-servers, smartdns returns the fastest IP. -endef - -define Package/smartdns/conffiles -/etc/config/smartdns -/etc/smartdns/address.conf -/etc/smartdns/blacklist-ip.conf -/etc/smartdns/custom.conf -endef - -define Package/smartdns/install - $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d $(1)/etc/smartdns - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/smartdns $(1)/usr/sbin/smartdns - $(INSTALL_BIN) $(PKG_BUILD_DIR)/package/openwrt/files/etc/init.d/smartdns $(1)/etc/init.d/smartdns - $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/address.conf $(1)/etc/smartdns/address.conf - $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/blacklist-ip.conf $(1)/etc/smartdns/blacklist-ip.conf - $(INSTALL_CONF) $(CURDIR)/conf/custom.conf $(1)/etc/smartdns/custom.conf - $(INSTALL_CONF) $(CURDIR)/conf/smartdns.conf $(1)/etc/config/smartdns -endef - -$(eval $(call BuildPackage,smartdns)) diff --git a/package/ntlf9t/smartdns/conf/custom.conf b/package/ntlf9t/smartdns/conf/custom.conf deleted file mode 100644 index 39e7a94619..0000000000 --- a/package/ntlf9t/smartdns/conf/custom.conf +++ /dev/null @@ -1,50 +0,0 @@ -# Add custom settings here. - -# set log level -# log-level [level], level=fatal, error, warn, notice, info, debug -# log-level error - -# log-size k,m,g -# log-size 128k - -# log-file /var/log/smartdns.log -# log-num 2 - -# List of hosts that supply bogus NX domain results -# bogus-nxdomain [ip/subnet] - -speed-check-mode tcp:80,ping - -server 202.141.178.13:5353 -server 202.38.93.153:5353 -server 202.141.162.123:5353 -server 2001:da8::666 - -server-tcp 9.9.9.9 -group fq_dns -exclude-default-group -server-tcp 8.8.8.8 -group fq_dns -exclude-default-group -server-tcp 1.0.0.1 -group fq_dns -exclude-default-group - -server-tls 115.159.131.230 -host-name dns.rubyfish.cn -server-tls dns.rubyfish.cn -server-tls dns.233py.com -server-tls 8.8.8.8 -host-name dns.google -group fq_dns -exclude-default-group -server-tls dns.google -group fq_dns -exclude-default-group -server-tls 1.0.0.1 -host-name 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -exclude-default-group -server-tls 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -exclude-default-group - -server-https https://202.141.178.13/resolve -host-name neatdns.ustclug.org -http-host neatdns.ustclug.org -server-https https://202.38.93.153/resolve -host-name neatdns.ustclug.org -http-host neatdns.ustclug.org -server-https https://neatdns.ustclug.org/resolve -server-https https://115.159.131.230/resolve -host-name dns.rubyfish.cn -http-host dns.rubyfish.cn -server-https https://dns.rubyfish.cn/dns-query -server-https https://45.77.180.10/resolve -host-name dns.containerpi.com -http-host dns.containerpi.com -server-https https://dns.containerpi.com/dns-query -server-https https://210.17.9.228/dns-query -host-name dns.twnic.tw -http-host dns.twnic.tw -server-https https://dns.twnic.tw/dns-query -server-https https://i.233py.com/dns-query -server-https https://9.9.9.9/dns-query -host-name dns9.quad9.net -http-host dns9.quad9.net -group fq_dns -exclude-default-group -server-https https://dns9.quad9.net/dns-query -group fq_dns -exclude-default-group -server-https https://1.0.0.1/dns-query -group fq_dns -exclude-default-group -server-https https://cloudflare-dns.com/dns-query -group fq_dns -exclude-default-group -server-https https://146.112.41.2/dns-query -host-name doh.opendns.com -http-host doh.opendns.com -group fq_dns -exclude-default-group -server-https https://doh.opendns.com/dns-query -group fq_dns -exclude-default-group diff --git a/package/ntlf9t/smartdns/conf/smartdns.conf b/package/ntlf9t/smartdns/conf/smartdns.conf deleted file mode 100644 index 3af0356942..0000000000 --- a/package/ntlf9t/smartdns/conf/smartdns.conf +++ /dev/null @@ -1,28 +0,0 @@ -config smartdns - option server_name 'smartdns' - option dualstack_ip_selection '1' - option prefetch_domain '1' - option serve_expired '1' - option seconddns_no_speed_check '0' - option seconddns_no_dualstack_selection '0' - option seconddns_no_cache '0' - option tcp_server '0' - option seconddns_tcp_server '0' - option coredump '0' - option port '6053' - option ipv6_server '0' - option redirect 'dnsmasq-upstream' - option seconddns_port '5335' - option seconddns_server_group 'fq_dns' - option seconddns_enabled '1' - option seconddns_no_rule_addr '0' - option seconddns_no_rule_nameserver '0' - option seconddns_no_rule_ipset '0' - option seconddns_no_rule_soa '0' - option enabled '0' - option cache_size '20000' - option rr_ttl '3600' - option rr_ttl_min '5' - list old_redirect 'dnsmasq-upstream' - list old_port '6053' - list old_enabled '0' diff --git a/package/ntlf9t/smartdns/patches/010-fix-a-stack-buffer-overflow-in-the-dns_decode_opt_ecs.patch b/package/ntlf9t/smartdns/patches/010-fix-a-stack-buffer-overflow-in-the-dns_decode_opt_ecs.patch deleted file mode 100644 index fc72b92756..0000000000 --- a/package/ntlf9t/smartdns/patches/010-fix-a-stack-buffer-overflow-in-the-dns_decode_opt_ecs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1a1347f337532ee3f53752c0c85e04edce26183d Mon Sep 17 00:00:00 2001 -From: Punk -Date: Wed, 6 Jan 2021 18:33:50 +0800 -Subject: [PATCH] fix a stack-buffer-overflow in the _dns_decode_opt_ecs() - function - -https://github.com/pymumu/smartdns/issues/670 ---- - src/dns.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dns.c b/src/dns.c -index 0e43992..83b15dc 100644 ---- a/src/dns.c -+++ b/src/dns.c -@@ -1363,7 +1363,7 @@ static int _dns_decode_opt_ecs(struct dns_context *context, struct dns_opt_ecs * - len = (ecs->source_prefix / 8); - len += (ecs->source_prefix % 8 > 0) ? 1 : 0; - -- if (_dns_left_len(context) < len) { -+ if (_dns_left_len(context) < len || len > sizeof(ecs->addr)) { - return -1; - } - diff --git a/package/ntlf9t/smartdns/patches/020-fix-a-Out-Of-Bounds-Read-in-the_dns_decode_domain-function.patch b/package/ntlf9t/smartdns/patches/020-fix-a-Out-Of-Bounds-Read-in-the_dns_decode_domain-function.patch deleted file mode 100644 index 138605da02..0000000000 --- a/package/ntlf9t/smartdns/patches/020-fix-a-Out-Of-Bounds-Read-in-the_dns_decode_domain-function.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1bb8f8887c65543ccd9f6664a23001d72fec24a6 Mon Sep 17 00:00:00 2001 -From: Punk -Date: Wed, 6 Jan 2021 18:34:47 +0800 -Subject: [PATCH] fix a Out-Of-Bounds Read in the _dns_decode_domain() function - -https://github.com/pymumu/smartdns/issues/669 ---- - src/dns.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dns.c b/src/dns.c -index 83b15dc..fa45577 100644 ---- a/src/dns.c -+++ b/src/dns.c -@@ -940,7 +940,7 @@ static int _dns_decode_domain(struct dns_context *context, char *output, int siz - - /*[len]string[len]string...[0]0 */ - while (1) { -- if (ptr > context->data + context->maxsize || ptr < context->data || output_len >= size - 1 || ptr_jump > 4) { -+ if (ptr >= context->data + context->maxsize || ptr < context->data || output_len >= size - 1 || ptr_jump > 4) { - return -1; - } - diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index 75c67e792d..47abd320d8 100644 --- a/package/system/uci/Makefile +++ b/package/system/uci/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uci -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git PKG_SOURCE_PROTO:=git diff --git a/package/system/uci/files/lib/config/uci.sh b/package/system/uci/files/lib/config/uci.sh index 78ec277669..c1dee7a5d3 100644 --- a/package/system/uci/files/lib/config/uci.sh +++ b/package/system/uci/files/lib/config/uci.sh @@ -1,4 +1,3 @@ -#!/bin/sh # Shell script compatibility wrappers for /sbin/uci # # Copyright (C) 2008-2010 OpenWrt.org diff --git a/package/system/urandom-seed/Makefile b/package/system/urandom-seed/Makefile index 7cb7c72038..7c5524a9db 100644 --- a/package/system/urandom-seed/Makefile +++ b/package/system/urandom-seed/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=urandom-seed -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=GPL-2.0-only include $(INCLUDE_DIR)/package.mk diff --git a/package/system/urandom-seed/files/lib/preinit/81_urandom_seed b/package/system/urandom-seed/files/lib/preinit/81_urandom_seed index 26212c60b5..2adc6c47f0 100644 --- a/package/system/urandom-seed/files/lib/preinit/81_urandom_seed +++ b/package/system/urandom-seed/files/lib/preinit/81_urandom_seed @@ -1,5 +1,3 @@ -#!/bin/sh - log_urandom_seed() { echo "urandom-seed: $1" > /dev/kmsg } diff --git a/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq b/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq index 4f7dc6673c..5f059ee974 100644 --- a/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq +++ b/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq @@ -1,8 +1,5 @@ -#!/bin/sh - set_preinit_iface() { ifname=eth0 } boot_hook_add preinit_main set_preinit_iface - diff --git a/target/linux/tegra/base-files/lib/preinit/79_move_config b/target/linux/tegra/base-files/lib/preinit/79_move_config index 64ea55e5f6..32586e3576 100644 --- a/target/linux/tegra/base-files/lib/preinit/79_move_config +++ b/target/linux/tegra/base-files/lib/preinit/79_move_config @@ -1,5 +1,3 @@ -#!/bin/sh - move_config() { local partdev diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 964671a478..efad9782b3 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -9,6 +9,8 @@ include $(INCLUDE_DIR)/image.mk export PATH=$(TARGET_PATH):/sbin +SUPPORTED_DEVICES := + GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga GRUB2_MODULES_LEGACY = $(GRUB2_MODULES) GRUB2_MODULES_LEGACY += part_gpt search fat exfat