From d09db428ccb493e7fbe6a39026de5e1025007a1a Mon Sep 17 00:00:00 2001
From: Dave Hibberd <hibby@debian.org>
Date: Wed, 6 Nov 2024 01:35:43 +0000
Subject: [PATCH] Add ax25_l2 fix too

---
 debian/patches/build-fix.patch | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/debian/patches/build-fix.patch b/debian/patches/build-fix.patch
index a769df8..0249689 100644
--- a/debian/patches/build-fix.patch
+++ b/debian/patches/build-fix.patch
@@ -11,6 +11,15 @@
  
 --- a/ax25.c
 +++ b/ax25.c
+@@ -1758,7 +1758,7 @@
+ 
+ 
+ 
+-get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi)
++int get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi)
+ {
+ 	Byte * digiptr = digi;
+ 
 @@ -1780,6 +1780,8 @@
  				*(digi++) = '*';
  	}
@@ -20,3 +29,32 @@
  }
  
  
+--- a/ax25_l2.c
++++ b/ax25_l2.c
+@@ -374,7 +374,7 @@
+ void delete_I_FRM_port(TAX25Port * AX25Sess)
+ {
+ 	string * frame;
+-	string path = { 0 }; 
++	Byte path[80];
+ 	string data= { 0 };
+ 
+ 	Byte pid, nr, ns, f_type, f_id, rpt, cr, pf;
+@@ -386,7 +386,7 @@
+ 		optimize = TRUE;
+ 		frame = Strings(&AX25Sess->frame_buf, i);
+ 
+-		decode_frame(frame->Data, frame->Length, &path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr);
++		decode_frame(frame->Data, frame->Length, path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr);
+ 
+ 		if (f_id == I_I)
+ 		{
+@@ -916,7 +916,7 @@
+ 	
+ 		while (i != AX25Sess->hi_vs)
+ 		{
+-			i = (i++) & 7;
++			i = (i + 1) & 7;
+ 			need_frame[index++] = i + '0';
+ 			if (index > 10)
+ 			{