diff --git a/nps/Makefile b/nps/Makefile deleted file mode 100644 index addd53f65..000000000 --- a/nps/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-only -# -# Copyright (C) 2021 ImmortalWrt.org - -include $(TOPDIR)/rules.mk - -PKG_NAME:=nps -PKG_VERSION:=0.26.10 -PKG_RELEASE:=$(AUTORELEASE) - -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:=1b2fe9d251f55105d65027a1cee464f65d2f6ab3bd4a20e4655e5135db68aee7 - -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINTER:=Tianling Shen - -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 ($(1)) - DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle - URL:=https://ehang-io.github.io/nps -endef - -Package/npc = $(call Package/nps/template,client) -Package/nps = $(call Package/nps/template,server) - -define Package/nps/description/template - NPS is a lightweight, high-performance, powerful intranet penetration proxy server, - with a powerful web management terminal. -endef - -Package/npc/description = $(Package/nps/description/template) -Package/nps/description = $(Package/nps/description/template) - -define Package/npc/config - config NPC_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -define Package/nps/config - config NPS_COMPRESS_UPX - bool "Compress executable files with UPX" - default y -endef - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_NPC_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/npc -endif -ifeq ($(CONFIG_NPS_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/nps -endif -endef - -define Package/nps/install/template - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $(1)/usr/bin/$(2) -endef - -Package/npc/install = $(call Package/nps/install/template,$(1),npc) -Package/nps/install = $(call Package/nps/install/template,$(1),nps) - -$(eval $(call GoBinPackage,npc)) -$(eval $(call GoBinPackage,nps)) -$(eval $(call BuildPackage,npc)) -$(eval $(call BuildPackage,nps)) diff --git a/nps/patches/100-remove-useless-sdk-in-npc.patch b/nps/patches/100-remove-useless-sdk-in-npc.patch deleted file mode 100644 index b96542fc4..000000000 --- a/nps/patches/100-remove-useless-sdk-in-npc.patch +++ /dev/null @@ -1,4 +0,0 @@ -diff --git a/cmd/npc/sdk.go b/cmd/npc/sdk.go.bak -similarity index 100% -rename from cmd/npc/sdk.go -rename to cmd/npc/sdk.go.bak diff --git a/openwrt-fullconenat/Makefile b/openwrt-fullconenat/Makefile deleted file mode 100644 index b04afda75..000000000 --- a/openwrt-fullconenat/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (C) 2018 Chion Tang -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=fullconenat -PKG_RELEASE:=5 - -PKG_SOURCE_DATE:=2021-12-04 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/llccd/netfilter-full-cone-nat.git -PKG_SOURCE_VERSION:=7fe02604e073945a3b081c18efbb4d3c799a31f6 -PKG_MIRROR_HASH:=857062e07606d00ef9ce1b6c5d457ffc1ccfb7667694c1958bc59f1d7c4f08a4 - -PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILES:=LICENSE - -include $(INCLUDE_DIR)/package.mk - -define Package/iptables-mod-fullconenat - SUBMENU:=Firewall - SECTION:=net - CATEGORY:=Network - TITLE:=FULLCONENAT iptables extension - DEPENDS:=+iptables +kmod-ipt-fullconenat - MAINTAINER:=Chion Tang -endef - -define Package/iptables-mod-fullconenat/install - $(INSTALL_DIR) $(1)/usr/lib/iptables - $(INSTALL_BIN) $(PKG_BUILD_DIR)/libipt_FULLCONENAT.so $(1)/usr/lib/iptables -endef - -define KernelPackage/ipt-fullconenat - SUBMENU:=Netfilter Extensions - TITLE:=FULLCONENAT netfilter module - DEPENDS:=+kmod-nf-ipt +kmod-nf-nat - MAINTAINER:=Chion Tang - KCONFIG:=CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y - FILES:=$(PKG_BUILD_DIR)/xt_FULLCONENAT.ko -endef - -include $(INCLUDE_DIR)/kernel-defaults.mk - -define Build/Prepare - $(call Build/Prepare/Default) - $(CP) ./files/Makefile $(PKG_BUILD_DIR)/ -endef - -define Build/Compile - +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - ARCH="$(LINUX_KARCH)" \ - M="$(PKG_BUILD_DIR)" \ - EXTRA_CFLAGS="$(BUILDFLAGS)" \ - modules - $(call Build/Compile/Default) -endef - -$(eval $(call BuildPackage,iptables-mod-fullconenat)) -$(eval $(call KernelPackage,ipt-fullconenat)) diff --git a/openwrt-fullconenat/files/Makefile b/openwrt-fullconenat/files/Makefile deleted file mode 100644 index b2f88db33..000000000 --- a/openwrt-fullconenat/files/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -libipt_FULLCONENAT.so: libipt_FULLCONENAT.o - $(CC) -shared -lxtables -o $@ $^; -libipt_FULLCONENAT.o: libipt_FULLCONENAT.c - $(CC) ${CFLAGS} -fPIC -D_INIT=$*_init -c -o $@ $<; - -obj-m += xt_FULLCONENAT.o