From f0b639bb51872173b057978279f26cfa0b4ac7ea Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 22 Oct 2021 23:16:53 +0800 Subject: [PATCH] simple-obfs/trojan: move to helloworld (#8106) * simple-obfs: remove package Signed-off-by: Tianling Shen * trojan: remove package Signed-off-by: Tianling Shen --- package/lean/simple-obfs/Makefile | 76 ------------------------------- package/lean/trojan/Makefile | 68 --------------------------- 2 files changed, 144 deletions(-) delete mode 100644 package/lean/simple-obfs/Makefile delete mode 100644 package/lean/trojan/Makefile diff --git a/package/lean/simple-obfs/Makefile b/package/lean/simple-obfs/Makefile deleted file mode 100644 index bb6cab027..000000000 --- a/package/lean/simple-obfs/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (C) 2017-2019 Jian Chang -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=simple-obfs -PKG_VERSION:=0.0.5 -PKG_RELEASE:=$(AUTORELEASE) - -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-or-later -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)) \ No newline at end of file diff --git a/package/lean/trojan/Makefile b/package/lean/trojan/Makefile deleted file mode 100644 index b75a18a5c..000000000 --- a/package/lean/trojan/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (C) 2018-2019 wongsyrone -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=trojan -PKG_VERSION:=1.16.0 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/trojan-gfw/trojan/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=86cdb2685bb03a63b62ce06545c41189952f1ec4a0cd9147450312ed70956cbc - -PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=openssl - -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=GreaterFire - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -TARGET_CXXFLAGS += -Wall -Wextra -TARGET_CXXFLAGS += $(FPIC) - -# LTO -TARGET_CXXFLAGS += -flto -TARGET_LDFLAGS += -flto - -# CXX standard -TARGET_CXXFLAGS += -std=c++11 -TARGET_CXXFLAGS := $(filter-out -O%,$(TARGET_CXXFLAGS)) -O3 -TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -TARGET_LDFLAGS += -Wl,--gc-sections - -CMAKE_OPTIONS += \ - -DENABLE_MYSQL=OFF \ - -DENABLE_NAT=ON \ - -DENABLE_REUSE_PORT=ON \ - -DENABLE_SSL_KEYLOG=ON \ - -DENABLE_TLS13_CIPHERSUITES=ON \ - -DFORCE_TCP_FASTOPEN=OFF \ - -DSYSTEMD_SERVICE=OFF \ - -DOPENSSL_USE_STATIC_LIBS=FALSE \ - -DBoost_DEBUG=ON \ - -DBoost_NO_BOOST_CMAKE=ON - -define Package/trojan - SECTION:=net - CATEGORY:=Network - SUBMENU:=Web Servers/Proxies - TITLE:=An unidentifiable mechanism that helps you bypass GFW - URL:=https://github.com/trojan-gfw/trojan - DEPENDS:= \ - +libpthread +libstdcpp +libopenssl \ - +boost +boost-system +boost-program_options +boost-date_time -endef - -define Package/trojan/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/trojan $(1)/usr/sbin/trojan -endef - -$(eval $(call BuildPackage,trojan))