From 6405f612aaec1d7255d056d38e7ced38a2a28569 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 10 Apr 2021 14:26:35 +0800 Subject: [PATCH] lienol: move packages to `packages` feed Signed-off-by: Tianling Shen --- package/lienol/dns-forwarder/Makefile | 56 -------------- .../dns-forwarder/files/dns-forwarder.config | 6 -- .../dns-forwarder/files/dns-forwarder.init | 46 ------------ package/lienol/dns2socks/Makefile | 57 -------------- package/lienol/ipt2socks/Makefile | 43 ----------- package/lienol/redsocks2/Makefile | 52 ------------- .../lienol/redsocks2/files/redsocks2.template | 33 -------- package/lienol/tcping/Makefile | 40 ---------- .../tcping/patches/001-Restone-staff.patch | 10 --- .../tcping/patches/002-Remove-strip.patch | 13 ---- package/lienol/trojan-go/Makefile | 75 ------------------- package/lienol/trojan-plus/Makefile | 70 ----------------- package/lienol/trojan/Makefile | 68 ----------------- .../patches/001-force-openssl-version.patch | 11 --- 14 files changed, 580 deletions(-) delete mode 100644 package/lienol/dns-forwarder/Makefile delete mode 100644 package/lienol/dns-forwarder/files/dns-forwarder.config delete mode 100755 package/lienol/dns-forwarder/files/dns-forwarder.init delete mode 100644 package/lienol/dns2socks/Makefile delete mode 100644 package/lienol/ipt2socks/Makefile delete mode 100644 package/lienol/redsocks2/Makefile delete mode 100644 package/lienol/redsocks2/files/redsocks2.template delete mode 100644 package/lienol/tcping/Makefile delete mode 100644 package/lienol/tcping/patches/001-Restone-staff.patch delete mode 100644 package/lienol/tcping/patches/002-Remove-strip.patch delete mode 100644 package/lienol/trojan-go/Makefile delete mode 100644 package/lienol/trojan-plus/Makefile delete mode 100644 package/lienol/trojan/Makefile delete mode 100644 package/lienol/trojan/patches/001-force-openssl-version.patch diff --git a/package/lienol/dns-forwarder/Makefile b/package/lienol/dns-forwarder/Makefile deleted file mode 100644 index 95e744f3f8..0000000000 --- a/package/lienol/dns-forwarder/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (C) 2015 OpenWrt-dist -# Copyright (C) 2015 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:=dns-forwarder -PKG_VERSION:=1.2.1 -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/aa65535/hev-dns-forwarder.git -PKG_SOURCE_DATE:=2017-07-21 -PKG_SOURCE_VERSION:=289e8c9c7167200668dff83b1e0cbce258665387 -PKG_MIRROR_HASH:=a06f61c2b87f61cf68517d3b4a23439366f3c806dd736594a814ee0245adca43 - -PKG_LICENSE:=GPLv3 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jian Chang - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/dns-forwarder - SECTION:=net - CATEGORY:=Network - TITLE:=Forwarding DNS queries on TCP transport - URL:=https://github.com/aa65535/hev-dns-forwarder -endef - -define Package/dns-forwarder/description - Forwarding DNS queries on TCP transport. -endef - -define Package/dns-forwarder/conffiles -/etc/config/dns-forwarder -endef - -define Package/dns-forwarder/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hev-dns-forwarder $(1)/usr/bin/dns-forwarder - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/dns-forwarder.config $(1)/etc/config/dns-forwarder - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/dns-forwarder.init $(1)/etc/init.d/dns-forwarder -endef - -$(eval $(call BuildPackage,dns-forwarder)) diff --git a/package/lienol/dns-forwarder/files/dns-forwarder.config b/package/lienol/dns-forwarder/files/dns-forwarder.config deleted file mode 100644 index 852fec2870..0000000000 --- a/package/lienol/dns-forwarder/files/dns-forwarder.config +++ /dev/null @@ -1,6 +0,0 @@ - -config dns-forwarder - option enable '0' - option listen_addr '0.0.0.0' - option listen_port '5300' - option dns_servers '8.8.8.8' diff --git a/package/lienol/dns-forwarder/files/dns-forwarder.init b/package/lienol/dns-forwarder/files/dns-forwarder.init deleted file mode 100755 index e6fbb5d3a6..0000000000 --- a/package/lienol/dns-forwarder/files/dns-forwarder.init +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh /etc/rc.common -# -# Copyright (C) 2016 Jian Chang -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -START=75 - -USE_PROCD=1 - -append_parm() { - local section="$1" - local option="$2" - local switch="$3" - local default="$4" - local _loctmp - config_get _loctmp "$section" "$option" - [ -n "$_loctmp" -o -n "$default" ] || return 0 - procd_append_param command "$switch" "${_loctmp:-$default}" -} - -start_instance() { - local enable - config_get_bool enable $1 enable - [ "$enable" = 1 ] || return 0 - - procd_open_instance - procd_set_param respawn - procd_set_param stderr 1 - procd_set_param command /usr/bin/dns-forwarder - append_parm $1 listen_addr "-b" - append_parm $1 listen_port "-p" - append_parm $1 dns_servers "-s" - procd_close_instance -} - -start_service() { - config_load dns-forwarder - config_foreach start_instance dns-forwarder -} - -service_triggers() { - procd_add_reload_trigger "dns-forwarder" -} diff --git a/package/lienol/dns2socks/Makefile b/package/lienol/dns2socks/Makefile deleted file mode 100644 index 29f1258a22..0000000000 --- a/package/lienol/dns2socks/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=dns2socks -PKG_VERSION:=2.1 -PKG_RELEASE:=2 - -PKG_SOURCE:=SourceCode.zip -PKG_SOURCE_URL:=@SF/dns2socks -PKG_SOURCE_DATE:=2020-02-18 -PKG_HASH:=406b5003523577d39da66767adfe54f7af9b701374363729386f32f6a3a995f4 - -PKG_MAINTAINER:=ghostmaker -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILE:=LICENSE - -include $(INCLUDE_DIR)/package.mk - -define Package/dns2socks - SECTION:=net - CATEGORY:=Network - SUBMENU:=IP Addresses and Names - TITLE:=The utility to resolve DNS requests via a SOCKS5 tunnel. - URL:=http://dns2socks.sourceforge.net/ - MAINTAINER:=ghostmaker - DEPENDS:=+libpthread -endef - -define Package/dns2socks/description - This is a utility to resolve DNS requests via a SOCKS5 tunnel and caches the answers. -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)/DNS2SOCKS/dns2socks \ - $(PKG_BUILD_DIR)/DNS2SOCKS/DNS2SOCKS.c \ - $(TARGET_LDFLAGS) -pthread -endef - -define Package/dns2socks/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/DNS2SOCKS/dns2socks $(1)/usr/bin/dns2socks -endef - -$(eval $(call BuildPackage,dns2socks)) diff --git a/package/lienol/ipt2socks/Makefile b/package/lienol/ipt2socks/Makefile deleted file mode 100644 index 2ec3b31bf3..0000000000 --- a/package/lienol/ipt2socks/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ipt2socks -PKG_VERSION:=1.1.3 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/zfl9/ipt2socks/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=73a2498dc95934c225d358707e7f7d060b5ce81aa45260ada09cbd15207d27d1 - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -PKG_LICENSE:=AGPL-3.0 -PKG_LICENSE_FILE:=LICENSE - -include $(INCLUDE_DIR)/package.mk - -define Package/ipt2socks - SECTION:=net - CATEGORY:=Network - TITLE:=Utility for converting iptables (REDIRECT/TPROXY) to SOCKS5 - URL:=https://github.com/zfl9/ipt2socks - DEPENDS:=+libpthread -endef - -TARGET_CFLAGS += $(FPIC) -flto -TARGET_LDFLAGS += -flto - -define Package/ipt2socks/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/ipt2socks $(1)/usr/bin -endef - -$(eval $(call BuildPackage,ipt2socks)) \ No newline at end of file diff --git a/package/lienol/redsocks2/Makefile b/package/lienol/redsocks2/Makefile deleted file mode 100644 index 2bbcd8f072..0000000000 --- a/package/lienol/redsocks2/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=redsocks2 -PKG_VERSION:=0.67 -PKG_RELEASE:=5 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/semigodking/redsocks.git -PKG_SOURCE_DATE:=2020-05-10 -PKG_SOURCE_VERSION:=d94c245ea47859cda5b4b7373308589206b97bdc -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 - -define Package/redsocks2 - SECTION:=net - CATEGORY:=Network - TITLE:=Redirect any TCP connection to a SOCKS or HTTPS proxy server - URL:=https://github.com/semigodking/redsocks - DEPENDS:=+libevent2 +libopenssl -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). -endef - -MAKE_VARS += DISABLE_SHADOWSOCKS=true - -define Package/redsocks2/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/redsocks2 $(1)/usr/sbin - $(INSTALL_DIR) $(1)/etc/redsocks2 - $(INSTALL_DATA) ./files/redsocks2.template $(1)/etc/redsocks2/config.template -endef - -$(eval $(call BuildPackage,redsocks2)) diff --git a/package/lienol/redsocks2/files/redsocks2.template b/package/lienol/redsocks2/files/redsocks2.template deleted file mode 100644 index ba494267e8..0000000000 --- a/package/lienol/redsocks2/files/redsocks2.template +++ /dev/null @@ -1,33 +0,0 @@ -base { - log_debug = off; - redirector = iptables; - reuseport = on; -} -redsocks { - local_ip = 192.168.1.1; - local_port = 1081; - ip = 192.168.1.1; - port = 9050; - type = socks5; // I use socks5 proxy for GFW'ed IP - autoproxy = 1; // I want autoproxy feature enabled on this section. - // timeout is meaningful when 'autoproxy' is non-zero. - // It specified timeout value when trying to connect to destination - // directly. Default is 10 seconds. When it is set to 0, default - // timeout value will be used. - // NOTE: decreasing the timeout value may lead increase of chance for - // normal IP to be misjudged. - timeout = 13; - //type = http-connect; - //login = username; - //password = passwd; -} -tcpdns { - // Transform UDP DNS requests into TCP DNS requests. - // You can also redirect connections to external TCP DNS server to - // REDSOCKS transparent proxy via iptables. - local_ip = 192.168.1.1; // Local server to act as DNS server - local_port = 1053; // UDP port to receive UDP DNS requests - tcpdns1 = 8.8.4.4; // DNS server that supports TCP DNS requests - tcpdns2 = 8.8.8.8; // DNS server that supports TCP DNS requests - timeout = 4; // Timeout value for TCP DNS requests -} diff --git a/package/lienol/tcping/Makefile b/package/lienol/tcping/Makefile deleted file mode 100644 index ff9ab1a42e..0000000000 --- a/package/lienol/tcping/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=tcping -PKG_VERSION:=0.3 -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/Mattraks/tcping.git -PKG_SOURCE_DATE:=2020-11-18 -PKG_SOURCE_VERSION:=de2b709f8c386507678041d11102c671d470fea7 -PKG_MIRROR_HASH:=07359ac47f0da4fb30215e5160f7c0c942f0a4af4e7b2e2d2b4ffd9769823054 - -PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILE:=LICENSE - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/tcping - SECTION:=net - CATEGORY:=Network - TITLE:=tcping measures the latency of a tcp-connection - URL:=https://github.com/jlyo/tcping -endef - -define Package/tcping/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tcping $(1)/usr/sbin -endef - -$(eval $(call BuildPackage,tcping)) diff --git a/package/lienol/tcping/patches/001-Restone-staff.patch b/package/lienol/tcping/patches/001-Restone-staff.patch deleted file mode 100644 index 36e8f25d1b..0000000000 --- a/package/lienol/tcping/patches/001-Restone-staff.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/main.c -+++ b/main.c -@@ -14,6 +14,7 @@ static volatile int stop = 0; - - void usage(void) - { -+ fprintf(stderr, "tcping, (C) 2003 folkert@vanheusden.com\n\n"); - fprintf(stderr, "Usage\n"); - fprintf(stderr, "tcping [options] \n\n"); - fprintf(stderr, "Options:\n"); diff --git a/package/lienol/tcping/patches/002-Remove-strip.patch b/package/lienol/tcping/patches/002-Remove-strip.patch deleted file mode 100644 index 16881fce8a..0000000000 --- a/package/lienol/tcping/patches/002-Remove-strip.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 1778ebf..e44119e 100644 ---- a/Makefile -+++ b/Makefile -@@ -9,7 +9,7 @@ all: tcping - - tcping: $(OBJS) - $(CC) $(OBJS) $(LDFLAGS) -o tcping -- strip tcping -+ - - install: tcping - cp tcping $(DESTDIR)/usr/bin diff --git a/package/lienol/trojan-go/Makefile b/package/lienol/trojan-go/Makefile deleted file mode 100644 index b57b08a939..0000000000 --- a/package/lienol/trojan-go/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright (C) 2020 Lienol -# -# This is free software, licensed under the GNU General Public License v3. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=trojan-go -PKG_VERSION:=0.8.3 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/p4gefau1t/trojan-go/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=dbfb536328327bcbbd310b7289ece47d40dcc6aaf7996b563f0e1041e120fb89 - -PKG_CONFIG_DEPENDS:= \ - CONFIG_TROJAN_GO_COMPRESS_GOPROXY \ - CONFIG_TROJAN_GO_COMPRESS_UPX - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/p4gefau1t/trojan-go -GO_PKG_BUILD_PKG:=$$(GO_PKG) - -GO_PKG_TAGS:=full -GO_PKG_LDFLAGS:=-s -w -GO_PKG_LDFLAGS_X:= \ - $(GO_PKG)/constant.Version=$(PKG_VERSION) \ - $(GO_PKG)/constant.Commit=v$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk - -define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - SUBMENU:=Web Servers/Proxies - DEPENDS:=$$(GO_ARCH_DEPENDS) - TITLE:=An unidentifiable mechanism that helps you bypass GFW. It's compatible with original trojan with experimental features. - URL:=https://github.com/p4gefau1t/trojan-go -endef - -define Package/$(PKG_NAME)/config - -menu "Configuration" - depends on PACKAGE_$(PKG_NAME) - -config TROJAN_GO_COMPRESS_GOPROXY - bool "Compiling with GOPROXY proxy" - default n - -config TROJAN_GO_COMPRESS_UPX - bool "Compress executable files with UPX" - default y - -endmenu - -endef - -ifeq ($(CONFIG_TROJAN_GO_COMPRESS_GOPROXY),y) -export GO111MODULE=on -export GOPROXY=https://goproxy.io -endif - -define Build/Compile - $(call GoPackage/Build/Compile) -ifeq ($(CONFIG_TROJAN_GO_COMPRESS_UPX),y) - $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/$(PKG_NAME) -endif -endef - -$(eval $(call GoBinPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lienol/trojan-plus/Makefile b/package/lienol/trojan-plus/Makefile deleted file mode 100644 index c394a4fe32..0000000000 --- a/package/lienol/trojan-plus/Makefile +++ /dev/null @@ -1,70 +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-plus -PKG_VERSION:=10.0.3 -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/peter-tank/trojan-plus.git -PKG_SOURCE_DATE:=2020-09-06 -PKG_SOURCE_VERSION:=a6394cdd718669b0c7491493a78e61f6f0f899b3 -PKG_MIRROR_HASH:=2d37d09fe6d39d7981116ad387706f58f2b30b74a34e27fc5608f267dacc9208 - -PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=openssl - -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=Trojan-Plus-Group - -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-plus - SECTION:=net - CATEGORY:=Network - TITLE:=An unidentifiable mechanism that helps you bypass GFW. It's compatible with original trojan with experimental features. - URL:=https://github.com/Trojan-Plus-Group/trojan-plus - DEPENDS:= \ - +libpthread +libstdcpp +libopenssl \ - +boost +boost-system +boost-program_options -endef - -define Package/trojan-plus/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/trojan $(1)/usr/sbin/trojan-plus -endef - -$(eval $(call BuildPackage,trojan-plus)) - diff --git a/package/lienol/trojan/Makefile b/package/lienol/trojan/Makefile deleted file mode 100644 index 4c8bddcbd1..0000000000 --- a/package/lienol/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 - 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)) - diff --git a/package/lienol/trojan/patches/001-force-openssl-version.patch b/package/lienol/trojan/patches/001-force-openssl-version.patch deleted file mode 100644 index 7ee8f631cc..0000000000 --- a/package/lienol/trojan/patches/001-force-openssl-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -43,7 +43,7 @@ if(MSVC) - add_definitions(-DBOOST_DATE_TIME_NO_LIB) - endif() - --find_package(OpenSSL 1.1.0 REQUIRED) -+find_package(OpenSSL 1.1.1 REQUIRED) - include_directories(${OPENSSL_INCLUDE_DIR}) - target_link_libraries(trojan ${OPENSSL_LIBRARIES}) - if(OPENSSL_VERSION VERSION_GREATER_EQUAL 1.1.1)