From: Eivind Næss <eivnaes@yahoo.com>
Date: Sat, 7 Aug 2021 21:15:01 +0000 (-0700)
Subject: Removing patchlevel.h
X-Git-Tag: ppp-2.5.0~36^2~9
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=e8605bcddbad7e47277b86f2ce0b28f6ca951fa2

Removing patchlevel.h

The significance of this headerfile has now been reduced as pppd now provides
pppd.pc (pkgconfig) and autotools to configure the project. Other projects can
now also configure the correct path variable:

   e.g. /usr/lib/x86_64-linux-gnu/pppd/2.4.10/...

To both consider the architecture and version via pkg-tool. The only consideration
would be the missing DATE directive. But I am less worried about that as the entire
release process has now been changed with the introduction of autotools.

Also fixing up pppd/pppdconf.h.in to remove quotes around the defines

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
---

diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index d0dcf8a..2336853 100644
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -37,7 +37,7 @@ pppd_include_HEADERS = \
     md4.h \
     md5.h \
     mppe.h \
-    patchlevel.h \
+    pppdconf.h \
     pathnames.h \
     peap.h \
     pppcrypt.h \
diff --git a/pppd/patchlevel.h b/pppd/patchlevel.h
deleted file mode 100644
index 1ecdb82..0000000
--- a/pppd/patchlevel.h
+++ /dev/null
@@ -1 +0,0 @@
-#define DATE		"5 January 2021"
diff --git a/pppd/pppd.h b/pppd/pppd.h
index 8d896bd..9dc6d71 100644
--- a/pppd/pppd.h
+++ b/pppd/pppd.h
@@ -60,7 +60,6 @@
 #include <sys/time.h>		/* for struct timeval */
 #include <net/ppp_defs.h>
 #include <net/if.h>
-#include "patchlevel.h"
 
 #ifdef PPP_WITH_IPV6CP
 #include "eui64.h"
diff --git a/pppd/pppdconf.h.in b/pppd/pppdconf.h.in
index c0b2328..bb3a58c 100644
--- a/pppd/pppdconf.h.in
+++ b/pppd/pppdconf.h.in
@@ -3,34 +3,34 @@
  *   in pppd when configured.
  */
 
-/* "Have Microsoft CHAP support" */
+/* Have Microsoft CHAP support */
 #undef PPP_WITH_CHAPMS
 
-/* "Have Microsoft LAN Manager support" */
+/* Have Microsoft LAN Manager support */
 #undef PPP_WITH_MSLANMAN
 
-/* "Have Microsoft MPPE support" */
+/* Have Microsoft MPPE support */
 #undef PPP_WITH_MPPE
 
-/* "Have multilink support" */
+/* Have multilink support */
 #undef PPP_WITH_MULTILINK
 
 /* Have packet activity filter support */
 #undef PPP_WITH_FILTER
 
-/* "Have support for loadable plugins" */
+/* Have support for loadable plugins */
 #undef PPP_WITH_PLUGINS
 
 /* Limit sessions by maximum number of octets */
 #undef PPP_WITH_MAXOCTETS
 
-/* Have Microsoft Callback Protocol support */
+/* Have Callback Protocol support */
 #undef PPP_WITH_CBCP
 
-/* "Include Trivial Database support" */
+/* Include TDB support */
 #undef PPP_WITH_TDB
 
-/* "Have IPv6 support" */
+/* Have IPv6 Control Protocol */
 #undef PPP_WITH_IPV6CP
 
 /* Support for Pluggable Authentication Modules */