From e6a88e13ed87905418fc0db13fade551f2a00c84 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Thu, 2 Aug 2018 23:02:49 +0200
Subject: [PATCH] Replace version.h with auto-generated version from configure
 script

Also, remove DEBRELEASE, no longer a package with Debian focus, and add
'v' before version number in logs/usage text.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 src/klogd.c   | 26 ++++++++------------------
 src/syslogd.c | 22 ++++++----------------
 version.h     |  2 --
 3 files changed, 14 insertions(+), 36 deletions(-)
 delete mode 100644 version.h

diff --git a/src/klogd.c b/src/klogd.c
index 6cc80ed..448c850 100644
--- a/src/klogd.c
+++ b/src/klogd.c
@@ -273,7 +273,7 @@
 #ifndef TESTING
 #include "pidfile.h"
 #endif
-#include "version.h"
+#include "config.h"
 
 #define __LIBRARY__
 #include <linux/unistd.h>
@@ -481,8 +481,8 @@ static void ChangeLogging(void)
 		Terminate();
 
 	/* Indicate that something is happening. */
-	Syslog(LOG_INFO, "klogd %s.%s, ---------- state change ----------\n", \
-	       VERSION, PATCHLEVEL);
+	Syslog(LOG_INFO, "klogd v%s, ---------- state change ----------\n",
+	       PACKAGE_VERSION);
 
 	/* Reload symbols. */
 	if ( reload_symbols > 0 )
@@ -552,13 +552,8 @@ static enum LOGSRC GetKernelLogSrc(void)
 	{
 	  	/* Initialize kernel logging. */
 	  	ksyslog(1, NULL, 0);
-#ifdef DEBRELEASE
-		Syslog(LOG_INFO, "klogd %s.%s#%s, log source = ksyslog "
-		       "started.", VERSION, PATCHLEVEL, DEBRELEASE);
-#else
-		Syslog(LOG_INFO, "klogd %s.%s, log source = ksyslog "
-		       "started.", VERSION, PATCHLEVEL);
-#endif
+		Syslog(LOG_INFO, "klogd v%s, log source = ksyslog "
+		       "started.", PACKAGE_VERSION);
 		return(kernel);
 	}
 
@@ -574,13 +569,8 @@ static enum LOGSRC GetKernelLogSrc(void)
 	kmsg = fileno(stdin);
 #endif
 
-#ifdef DEBRELEASE
-	Syslog(LOG_INFO, "klogd %s.%s#%s, log source = %s started.", \
-	       VERSION, PATCHLEVEL, DEBRELEASE, _PATH_KLOG);
-#else
-	Syslog(LOG_INFO, "klogd %s.%s, log source = %s started.", \
-	       VERSION, PATCHLEVEL, _PATH_KLOG);
-#endif
+	Syslog(LOG_INFO, "klogd v%s, log source = %s started.",
+	       VERSION, _PATH_KLOG);
 	return(proc);
 }
 
@@ -1028,7 +1018,7 @@ int main(argc, argv)
 			use_syscall = 1;
 			break;
 		    case 'v':
-			printf("klogd %s.%s\n", VERSION, PATCHLEVEL);
+			printf("klogd v%s\n", VERSION);
 			exit (1);
 		    case 'x':
 			symbol_lookup = 0;
diff --git a/src/syslogd.c b/src/syslogd.c
index 322cad7..8d35695 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -563,7 +563,7 @@ static char sccsid[] = "@(#)syslogd.c	5.27 (Berkeley) 10/10/88";
 #ifndef TESTING
 #include "pidfile.h"
 #endif
-#include "version.h"
+#include "config.h"
 
 #if defined(__linux__)
 #include <paths.h>
@@ -979,7 +979,7 @@ int main(argc, argv)
 			StripDomains = crunch_list(optarg);
 			break;
 		case 'v':
-			printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
+			printf("syslogd v%s\n", VERSION);
 			exit (0);
 		case '?':
 		default:
@@ -2747,23 +2747,13 @@ void init()
 	}
 
 	if ( AcceptRemote )
-#ifdef DEBRELEASE
-		logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL "#" DEBRELEASE \
-		       ": restart (remote reception)." , LocalHostName, \
+		logmsg(LOG_SYSLOG|LOG_INFO, "syslogd v" VERSION
+		       ": restart (remote reception)." , LocalHostName,
 		       	ADDDATE);
-#else
-		logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL \
-		       ": restart (remote reception)." , LocalHostName, \
-		       	ADDDATE);
-#endif
 	else
-#ifdef DEBRELEASE
-		logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL "#" DEBRELEASE \
+		logmsg(LOG_SYSLOG|LOG_INFO, "syslogd v" VERSION
 		       ": restart." , LocalHostName, ADDDATE);
-#else
-		logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL \
-		       ": restart." , LocalHostName, ADDDATE);
-#endif
+
 	(void) signal(SIGHUP, sighup_handler);
 	dprintf("syslogd: restarted.\n");
 }
diff --git a/version.h b/version.h
deleted file mode 100644
index a3257ae..0000000
--- a/version.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define VERSION "1.5"
-#define PATCHLEVEL "0"