From: Peter Powell <petpow@saberuk.com>
Date: Sun, 15 Oct 2017 01:15:35 +0000 (+0100)
Subject: Remove INSPIRCD_SOCKETENGINE_NAME and INSPIRCD_SYSTEM.
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=4743b23e5c15cd2a9cb86f857e1b7199533201bb;p=user%2Fhenk%2Fcode%2Finspircd.git

Remove INSPIRCD_SOCKETENGINE_NAME and INSPIRCD_SYSTEM.

- INSPIRCD_SOCKETENGINE_NAME is not really something that needs to
  be user facing. If opers want to know this kind of internal info
  then they can look at the build configuration.

- INSPIRCD_SYSTEM causes problems for reproducible builds and is
  only accurate for the state of the system when InspIRCd is built
  which is not useful in the slightest.
---

diff --git a/make/configure.pm b/make/configure.pm
index 82d14f564..baf67eb38 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -90,7 +90,6 @@ sub __get_template_settings($$$) {
 	$settings{CONFIGURE_DIRECTORY} = CONFIGURE_DIRECTORY;
 	$settings{CONFIGURE_CACHE_FILE} = CONFIGURE_CACHE_FILE;
 	$settings{SYSTEM_NAME} = lc $^O;
-	chomp($settings{SYSTEM_NAME_VERSION} = `uname -sr 2>/dev/null`);
 
 	return %settings;
 }
diff --git a/make/template/config.h b/make/template/config.h
index 660678b38..c1e8bd0fc 100644
--- a/make/template/config.h
+++ b/make/template/config.h
@@ -21,15 +21,12 @@
 
 #define INSPIRCD_BRANCH   "InspIRCd-@VERSION_MAJOR@.@VERSION_MINOR@"
 #define INSPIRCD_VERSION  "InspIRCd-@VERSION_FULL@"
-#define INSPIRCD_SYSTEM   "@SYSTEM_NAME_VERSION@"
 
 #define INSPIRCD_CONFIG_PATH "@CONFIG_DIR@"
 #define INSPIRCD_DATA_PATH   "@DATA_DIR@"
 #define INSPIRCD_LOG_PATH    "@LOG_DIR@"
 #define INSPIRCD_MODULE_PATH "@MODULE_DIR@"
 
-#define INSPIRCD_SOCKETENGINE_NAME "@SOCKETENGINE@"
-
 #ifndef _WIN32
  %target include/config.h
  %define HAS_CLOCK_GETTIME
diff --git a/src/logger.cpp b/src/logger.cpp
index e3e956325..6fa972c73 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -50,8 +50,7 @@
  */
 
 const char LogStream::LogHeader[] =
-	"Log started for " INSPIRCD_VERSION " (" MODULE_INIT_STR ")"
-	" - compiled on " INSPIRCD_SYSTEM;
+	"Log started for " INSPIRCD_VERSION " (" MODULE_INIT_STR ")";
 
 LogManager::LogManager()
 	: Logging(false)
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 41d85a3b4..de5a61e4d 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -105,7 +105,7 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener
 				data << "<usercount>" << ServerInstance->Users->GetUsers().size() << "</usercount>";
 				data << "<channelcount>" << ServerInstance->GetChans().size() << "</channelcount>";
 				data << "<opercount>" << ServerInstance->Users->all_opers.size() << "</opercount>";
-				data << "<socketcount>" << (SocketEngine::GetUsedFds()) << "</socketcount><socketmax>" << SocketEngine::GetMaxFds() << "</socketmax><socketengine>" INSPIRCD_SOCKETENGINE_NAME "</socketengine>";
+				data << "<socketcount>" << (SocketEngine::GetUsedFds()) << "</socketcount><socketmax>" << SocketEngine::GetMaxFds() << "</socketmax>";
 				data << "<uptime><boot_time_t>" << ServerInstance->startup_time << "</boot_time_t></uptime>";
 
 				data << "<isupport>";
diff --git a/src/server.cpp b/src/server.cpp
index f18c9c86c..1a92c13a0 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -64,8 +64,8 @@ void InspIRCd::Rehash(const std::string& uuid)
 std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
 	if (getFullVersion)
-		return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
-	return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
+		return INSPIRCD_VERSION ". " + Config->ServerName + " :[" + Config->sid + "] " + Config->CustomVersion;
+	return INSPIRCD_BRANCH ". " + Config->ServerName + " :" + Config->CustomVersion;
 }
 
 std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc)
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
index b5812b0c2..e53f6c6d3 100644
--- a/win/CMakeLists.txt
+++ b/win/CMakeLists.txt
@@ -12,9 +12,6 @@ set(EXTRA_LIBS "" CACHE PATH "Extra library paths")
 
 set(INSPIRCD_BASE "${CMAKE_CURRENT_SOURCE_DIR}/../")
 
-set(SYSTEM_NAME_VERSION ${CMAKE_SYSTEM})
-set(SOCKETENGINE "select")
-
 # Build with multiple processes
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")