From 6c4ccc65fc5cb42d02f2447997c1063f9ae0625c Mon Sep 17 00:00:00 2001
From: LEAN-ESX <coolsnowwolf@gmail.com>
Date: Sat, 14 Dec 2019 06:44:27 -0800
Subject: [PATCH] trojan: reduce size

---
 package/lean/trojan/Makefile            | 15 ++++------
 package/lean/trojan/files/trojan.config |  4 ---
 package/lean/trojan/files/trojan.init   | 37 -------------------------
 3 files changed, 5 insertions(+), 51 deletions(-)
 delete mode 100644 package/lean/trojan/files/trojan.config
 delete mode 100755 package/lean/trojan/files/trojan.init

diff --git a/package/lean/trojan/Makefile b/package/lean/trojan/Makefile
index 9d74c81d5..c17c136ed 100644
--- a/package/lean/trojan/Makefile
+++ b/package/lean/trojan/Makefile
@@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=trojan
 PKG_VERSION:=1.13.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/trojan-gfw/trojan.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=842ad5bb07eb8bce035fb274571e586629a97c99
+PKG_SOURCE_VERSION:=98533aa1003979862763f4225266de78581e40bc
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 CMAKE_INSTALL:=1
@@ -45,8 +45,8 @@ CMAKE_OPTIONS += \
 	-DENABLE_NAT=ON \
 	-DFORCE_TCP_FASTOPEN=OFF \
 	-DSYSTEMD_SERVICE=OFF \
-	-DOPENSSL_USE_STATIC_LIBS=TRUE \
-	-DBoost_DEBUG=ON \
+	-DOPENSSL_USE_STATIC_LIBS=FALSE \
+	-DBoost_DEBUG=OFF \
 	-DBoost_NO_BOOST_CMAKE=ON
 
 define Package/trojan
@@ -54,18 +54,13 @@ define Package/trojan
 	CATEGORY:=Network
 	TITLE:=An unidentifiable mechanism that helps you bypass GFW
 	URL:=https://github.com/trojan-gfw/trojan
-	DEPENDS:=+libpthread +libstdcpp \
+	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
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/trojan.config $(1)/etc/config/trojan
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/trojan.init $(1)/etc/init.d/trojan
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/trojan/config.json $(1)/etc/trojan.json
 endef
 
 $(eval $(call BuildPackage,trojan))
diff --git a/package/lean/trojan/files/trojan.config b/package/lean/trojan/files/trojan.config
deleted file mode 100644
index b53fb62dd..000000000
--- a/package/lean/trojan/files/trojan.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-config trojan
-	option enabled     '0'
-
diff --git a/package/lean/trojan/files/trojan.init b/package/lean/trojan/files/trojan.init
deleted file mode 100755
index 0acff39cd..000000000
--- a/package/lean/trojan/files/trojan.init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2018 wongsyrone
-
-. /lib/functions.sh
-
-START=95
-USE_PROCD=1
-#PROCD_DEBUG=1
-
-PROG=/usr/sbin/trojan
-CONF=/etc/trojan.json
-
-config_load "trojan"
-
-parse_trojan() {
-	config_get ENABLED "$section" "enabled"
-}
-
-config_foreach parse_trojan 'trojan'
-
-
-start_service() {
-	if [ "1" = "$ENABLED" ] || [ "on" = "$ENABLED" ] || [ "true" = "$ENABLED" ]; then
-		procd_open_instance
-		procd_set_param command $PROG --config $CONF
-		procd_set_param user root # run service as user root
-		procd_set_param stdout 1 # forward stdout of the command to logd
-		procd_set_param stderr 1 # same for stderr
-		procd_set_param limits nofile="1048576 1048576" # max allowed value can be fetched via /proc/sys/fs/nr_open
-		[ -e /proc/sys/kernel/core_pattern ] && {
-			procd_append_param limits core="unlimited"
-		}
-		procd_close_instance
-	else
-		echo "trojan is disabled"
-	fi
-}