From 975973d4ef050fc24f5a6b2945ced7e1496f6188 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Mon, 20 Apr 2020 20:38:17 +0800
Subject: [PATCH] mentohust: change to strnormalize version

---
 package/ctcgfw/mentohust/Makefile | 59 +++++++++++++++++++++++++
 package/ntlf9t/mentohust/Makefile | 71 -------------------------------
 2 files changed, 59 insertions(+), 71 deletions(-)
 create mode 100644 package/ctcgfw/mentohust/Makefile
 delete mode 100644 package/ntlf9t/mentohust/Makefile

diff --git a/package/ctcgfw/mentohust/Makefile b/package/ctcgfw/mentohust/Makefile
new file mode 100644
index 0000000000..3e49ed01c6
--- /dev/null
+++ b/package/ctcgfw/mentohust/Makefile
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2014-2015 KyleRicardo
+#
+# This is free software, licensed under the GNU General Public License v3.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mentohust
+PKG_VERSION:=0.3.1
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/KyleRicardo/MentoHUST-OpenWrt-ipk.git
+PKG_REV:=557cffca8032b6d8ac948be8a79255dc64a1915d
+
+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)
+
+MAKE_PATH:=src
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mentohust
+	SECTION:=net
+	CATEGORY:=Network
+	TITLE:=A Ruijie Client Daemon
+	URL:=https://github.com/KyleRicardo/MentoHUST-OpenWrt-ipk
+	SUBMENU:=Campus Network
+	DEPENDS:=+libpcap
+endef
+
+define Package/mentohust/description
+  A Ruijie Client Daemon, most usually used in China collages.
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR)/src \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)"  \
+		LDFLAGS="$(TARGET_LDFLAGS) -ldl"
+endef
+
+define Package/mentohust/conffiles
+/etc/mentohust.conf
+endef
+
+define Package/mentohust/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mentohust $(1)/usr/sbin/mentohust
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/mentohust.conf $(1)/etc/mentohust.conf
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/package/ntlf9t/mentohust/Makefile b/package/ntlf9t/mentohust/Makefile
deleted file mode 100644
index 73a201de36..0000000000
--- a/package/ntlf9t/mentohust/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (C) 2006-2011 Xmlad.com
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mentohust
-PKG_VERSION:=4.0
-PKG_RELEASE:=1
-PKG_REV=857f5a1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REV).tar.bz2
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_URL:=https://github.com/hyrathb/mentohust.git
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mentohust
-	SECTION:=net
-	CATEGORY:=Network
-	DEPENDS:=+libpcap +libintl-full
-	TITLE:=An CERNET client daemon
-	URL:=https://github.com/hyrathb/mentohust
-	SUBMENU:=CERNET
-endef
-
-define Package/mentohust/description
-An CERNET client daemon,
-Most usually used in China collages.
-endef
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	# $(SED) 's/dhclient/udhcpc -i/g' $(PKG_BUILD_DIR)/src/myconfig.c
-endef
-
-define Build/Configure
-	cd $(PKG_BUILD_DIR) && sh ./autogen.sh
-	$(call Build/Configure/Default)
-endef
-
-CONFIGURE_ARGS += \
-	--disable-encodepass \
-	--disable-notify
-
-# XXX: CFLAGS are already set by Build/Compile/Default
-MAKE_FLAGS+= \
-	OFLAGS=""
-
-define Package/mentohust/conffiles
-/etc/mentohust.conf
-endef
-
-define Package/mentohust/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mentohust $(1)/usr/sbin/
-	chmod 755 $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/mentohust.conf $(1)/etc/mentohust.conf.template
-endef
-
-$(eval $(call BuildPackage,mentohust))