From c5b58047766e71c3b4956830fc7f7e02cdb8c7bf Mon Sep 17 00:00:00 2001
From: Dave Hibberd <d@vehibberd.com>
Date: Fri, 4 Aug 2023 22:34:55 +0100
Subject: [PATCH] We now have an MOTD and prompt on netrom, and mheard is
 reenabled

---
 debian/patches/netrom-motd.patch             | 19 ++++++++++++-------
 debian/patches/non-interactive-install.patch | 10 ++++++++++
 debian/rules                                 |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/debian/patches/netrom-motd.patch b/debian/patches/netrom-motd.patch
index d8243fa..8c53a1f 100644
--- a/debian/patches/netrom-motd.patch
+++ b/debian/patches/netrom-motd.patch
@@ -1,18 +1,23 @@
 --- a/node.c
 +++ b/node.c
-@@ -301,6 +301,7 @@
+@@ -301,6 +301,11 @@
    node_log(LOGLVL_LOGIN, "%s @ %s logged in", User.call, User.ul_name);
  #ifdef HAVEMOTD
    if (User.ul_type == AF_NETROM) {
-+	  axio_printf(NodeIo, "Fit like eh day Netrommie. \n");
++	node_msg("%s - Welcome to %s", VERSION, NodeId); 
++		if ((fp = fopen(HAVEMOTD, "r")) != NULL) {
++		while (fgets(buf, 256, fp) != NULL) axio_puts(buf,NodeIo);
++		axio_puts ("\n",NodeIo);
++	}
      /*		axio_printf(NodeIo, "%s} Welcome.\n", NodeId);  */
    } else 
      if ((User.ul_type == AF_INET) || (User.ul_type == AF_INET6)) {
-@@ -362,6 +363,7 @@
- 	  else if ((User.ul_type != AF_NETROM) && (User.ul_type != AF_ROSE)) {
- 	    node_prompt();
- 	  } else if ((User.ul_type == AF_NETROM) || (User.ul_type == AF_ROSE)) {
-+		  node_prompt();
+@@ -365,6 +370,8 @@
  	    axio_printf(NodeIo,"\n");
  	  }
  	}
++    } else {
++	    node_prompt();
+     }
+     if (check_perms(PERM_ANSI, 0L) != -1) {
+       /* Not needed from what I see so far.        */
diff --git a/debian/patches/non-interactive-install.patch b/debian/patches/non-interactive-install.patch
index 68a2d9b..c9f7252 100644
--- a/debian/patches/non-interactive-install.patch
+++ b/debian/patches/non-interactive-install.patch
@@ -16,3 +16,13 @@ Last-Update: 2018-02-10
  _sleep()
  {
    [ "$NON_INTERACTIVE" = 1 ] || sleep "$@"
+@@ -122,6 +116,9 @@
+ 	if [ $? -ne 1 ]
+ 	then
+ 		HAVEAX25="#define HAVE_AX25	1"
++		#These have been moved out of tcp-ip so I have an MOTD when I don't build telnet in
++		HAVEMOTD="#define HAVEMOTD"
++		MOTDPATH='"/etc/ax25/uronode.motd"'
+ 	fi
+ 	#
+ #        echo -n "Include support for the FlexNet protocol ? [Y/n]: "; read answer
diff --git a/debian/rules b/debian/rules
index 03ad947..39d8445 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export NON_INTERACTIVE=1
 # Remove things we aren't using in oarc. mheard is a bug awaiting a fix.
 
 override_dh_auto_configure:
-	dh_auto_configure -- --without-flexnet --without-tcpip --without-rose --without-autorouter --without-mheard
+	dh_auto_configure -- --without-flexnet --without-tcpip --without-rose --without-autorouter
 
 # Collapse upstream changes file into single file