From 9d4eae4a8e4626f139520ac26751ad0b132fc52c Mon Sep 17 00:00:00 2001
From: Beginner <70857188+Beginner-Go@users.noreply.github.com>
Date: Mon, 3 Jan 2022 12:50:04 +0800
Subject: [PATCH] `ipt2socks` `microsocks`: cleanup makefile (#8578)

Co-authored-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 package/lean/ipt2socks/Makefile  | 18 +++++++++---------
 package/lean/microsocks/Makefile | 20 +++++++++++++-------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/package/lean/ipt2socks/Makefile b/package/lean/ipt2socks/Makefile
index 56b98a477..75ee85640 100644
--- a/package/lean/ipt2socks/Makefile
+++ b/package/lean/ipt2socks/Makefile
@@ -1,10 +1,6 @@
+# SPDX-License-Identifier: GPL-3.0-only
 #
-# Copyright (C) 2021 ImmortalWrt
-# <https://immortalwrt.org>
-#
-# This is free software, licensed under the GNU General Public License v3.
-# See /LICENSE for more information.
-#
+# Copyright (C) 2021 ImmortalWrt.org
 
 include $(TOPDIR)/rules.mk
 
@@ -27,9 +23,13 @@ include $(INCLUDE_DIR)/package.mk
 define Package/ipt2socks
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=Utility for converting iptables (REDIRECT/TPROXY) to SOCKS5
+  TITLE:=Convert iptables to socks5
   URL:=https://github.com/zfl9/ipt2socks
-  DEPENDS:=+libpthread
+  DEPENDS:=+libpthread +libuv
+endef
+
+define Package/ipt2socks/description
+  Utility for converting iptables (redirect/tproxy) to socks5.
 endef
 
 TARGET_CFLAGS += $(FPIC) -flto
@@ -40,4 +40,4 @@ define Package/ipt2socks/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/ipt2socks $(1)/usr/bin
 endef
 
-$(eval $(call BuildPackage,ipt2socks))
\ No newline at end of file
+$(eval $(call BuildPackage,ipt2socks))
diff --git a/package/lean/microsocks/Makefile b/package/lean/microsocks/Makefile
index cbf4fc11f..9a56e4f94 100644
--- a/package/lean/microsocks/Makefile
+++ b/package/lean/microsocks/Makefile
@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) 2021 ImmortalWrt.org
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=microsocks
@@ -18,20 +22,22 @@ PKG_INSTALL:=1
 include $(INCLUDE_DIR)/package.mk
 
 define Package/microsocks
-	SECTION:=net
-	CATEGORY:=Network
-	SUBMENU:=Web Servers/Proxies
-	TITLE:=microsocks for OpenWRT
-	DEPENDS:=+libpthread
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
+  TITLE:=Tiny, portable SOCKS5 server
+  URL:=https://github.com/rofl0r/microsocks
+  DEPENDS:=+libpthread
 endef
 
 define Package/microsocks/description
-	microsocks is a Tiny Proxy in C.
+  A SOCKS5 service that you can run on your remote boxes to tunnel connections
+  through them, if for some reason SSH doesn't cut it for you.
 endef
 
 define Package/microsocks/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/microsocks $(1)/usr/bin/microsocks
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/microsocks $(1)/usr/bin/microsocks
 endef
 
 $(eval $(call BuildPackage,microsocks))