From 277801dcfd70c86c28df36707ebde2c63246cf42 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Fri, 8 Jan 2021 11:28:10 +0800
Subject: [PATCH] minieap: improve output log format

---
 .../luci-app-minieap/root/etc/init.d/minieap       |  0
 .../luci-app-minieap/root/usr/sbin/minieap-conver  |  0
 .../luci-app-minieap/root/usr/sbin/minieap-ping    |  0
 package/ntlf9t/minieap/Makefile                    | 14 +++++---------
 .../ntlf9t/minieap/patches/001-enable-gbconv.patch | 13 +++++++++++++
 .../patches/002-disable-hdd-serial-query.patch     | 12 ++++++++++++
 6 files changed, 30 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 package/ctcgfw/luci-app-minieap/root/etc/init.d/minieap
 mode change 100644 => 100755 package/ctcgfw/luci-app-minieap/root/usr/sbin/minieap-conver
 mode change 100644 => 100755 package/ctcgfw/luci-app-minieap/root/usr/sbin/minieap-ping
 create mode 100644 package/ntlf9t/minieap/patches/001-enable-gbconv.patch
 create mode 100644 package/ntlf9t/minieap/patches/002-disable-hdd-serial-query.patch

diff --git a/package/ctcgfw/luci-app-minieap/root/etc/init.d/minieap b/package/ctcgfw/luci-app-minieap/root/etc/init.d/minieap
old mode 100644
new mode 100755
diff --git a/package/ctcgfw/luci-app-minieap/root/usr/sbin/minieap-conver b/package/ctcgfw/luci-app-minieap/root/usr/sbin/minieap-conver
old mode 100644
new mode 100755
diff --git a/package/ctcgfw/luci-app-minieap/root/usr/sbin/minieap-ping b/package/ctcgfw/luci-app-minieap/root/usr/sbin/minieap-ping
old mode 100644
new mode 100755
diff --git a/package/ntlf9t/minieap/Makefile b/package/ntlf9t/minieap/Makefile
index 14a0d96a7d..df10cb9912 100644
--- a/package/ntlf9t/minieap/Makefile
+++ b/package/ntlf9t/minieap/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 Xmlad.com
+# Copyright (C) 2016 Openwrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -13,38 +13,34 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/updateing/minieap.git
+PKG_SOURCE_VERSION:=9e10f320a9fce46c8f4286324a0fc70e572f61dc
 PKG_MIRROR_HASH:=41c976810c994d6125f6fe3cb1d978f7e257aa587ee32229364942a82621b273
-PKG_REV=9e10f320a9fce46c8f4286324a0fc70e572f61dc
 
-PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
-PKG_INSTALL:=1
+PKG_LICENSE:=GPLv3
+PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/minieap
 	SECTION:=net
 	CATEGORY:=Network
-	DEPENDS:=+libpcap
 	TITLE:=Extendable 802.1x client
 	URL:=https://github.com/updateing/minieap
 	SUBMENU:=Campus Network
 endef
 
 define Package/minieap/description
-Extendable 802.1x client
+Extendable 802.1x client with Ruijie v3 (v4) plugin.
 endef
 
 define Package/minieap/conffiles
 /etc/minieap.conf
 endef
 
-define Build/Install
-endef
-
 define Package/minieap/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/minieap $(1)/usr/sbin/
diff --git a/package/ntlf9t/minieap/patches/001-enable-gbconv.patch b/package/ntlf9t/minieap/patches/001-enable-gbconv.patch
new file mode 100644
index 0000000000..bc9cd49799
--- /dev/null
+++ b/package/ntlf9t/minieap/patches/001-enable-gbconv.patch
@@ -0,0 +1,13 @@
+--- a/config.mk
++++ b/config.mk
+@@ -17,8 +17,8 @@ PLUGIN_MODULES += if_impl_sockraw
+ # PLUGIN_MODULES += ifaddrs
+ 
+ ENABLE_DEBUG  := false
+-ENABLE_ICONV  := true
+-ENABLE_GBCONV := false
++ENABLE_ICONV  := false
++ENABLE_GBCONV := true
+ STATIC_BUILD  := false
+ 
+ # If your platform has iconv_* integrated into libc, change to false
diff --git a/package/ntlf9t/minieap/patches/002-disable-hdd-serial-query.patch b/package/ntlf9t/minieap/patches/002-disable-hdd-serial-query.patch
new file mode 100644
index 0000000000..d4072618d8
--- /dev/null
+++ b/package/ntlf9t/minieap/patches/002-disable-hdd-serial-query.patch
@@ -0,0 +1,12 @@
+--- a/packet_plugin/rjv3/packet_plugin_rjv3_priv.c
++++ b/packet_plugin/rjv3/packet_plugin_rjv3_priv.c
+@@ -132,7 +132,8 @@ static void rjv3_set_hdd_serial(uint8_t* serial_buf, char* fake_serial) {
+         memmove(serial_buf, fake_serial, strnlen(fake_serial, MAX_PROP_LEN));
+         return;
+     }
+-#ifdef __linux__
++    PR_WARN("请使用 --fake-serial 选项手动指定硬盘序列号");
++#if 0
+     FILE* _fp = fopen("/etc/mtab", "r");
+     char _line_buf[MAX_LINE_LEN] = {0};
+     char* _line_buf_dev, *_line_buf_mountpoint;