AGWMoncode.c

@@ -49,7 +49,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #define	DM	0x0F
 #define	UA	0x63
 #define	FRMR 0x87
-#define XID     0xAF
+#define XID     0xAF
 #define TEST    0xE3
 #define	RR	1
 #define	RNR	5
@@ -267,16 +267,16 @@ int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, time_t Stamp, int * Fra
 			FRMRFLAG = 1;
 			break;
 
-		case XID:
-
-			strcpy(SUP, "XID");
-			XIDFLAG = 1;
-			break;
-
-		case TEST:
-
-			strcpy(SUP, "TEST");
-			TESTFLAG = 1;
+		case XID:
+
+			strcpy(SUP, "XID");
+			XIDFLAG = 1;
+			break;
+
+		case TEST:
+
+			strcpy(SUP, "TEST");
+			TESTFLAG = 1;
 			break;
 		}
 

BPQMail.c

@@ -1154,7 +1154,6 @@
 //	Add Send and Receive byte counts to status displays (69)
 //	Validate Mode and Frequency and fix formatting in Connected Message (71)
 //	Fix using OpenBCM on other than Telnet connections (75)
-//	Fix sending + in Webmail (80)
 
 #include "bpqmail.h"
 #include "winstdint.h"

BPQTermMDI.c

@@ -2973,30 +2973,6 @@ LRESULT APIENTRY InputProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 			return 0; 
 		}
-
-		if (wParam == 0x7)  // BEL (Ctrl/G)
-		{
-			// Get buffer, append 07 and write back
-
-			Cinfo->kbptr = SendMessage(Cinfo->hwndInput, WM_GETTEXT, INPUTLEN-1, 
-				(LPARAM) (LPCSTR)Cinfo->kbbuf);
-
-
-			Cinfo->kbbuf[Cinfo->kbptr++] = 7;
-			Cinfo->kbbuf[Cinfo->kbptr] = 0;
-
-			SendMessage(Cinfo->hwndInput,WM_SETTEXT,0,(LPARAM)(LPCSTR) Cinfo->kbbuf);
-
-			// Send cursor right
-
-			for (i = 0; i < strlen(Cinfo->kbbuf); i++)
-			{
-				SendMessage(Cinfo->hwndInput, WM_KEYDOWN, VK_RIGHT, 0);
-				SendMessage(Cinfo->hwndInput, WM_KEYUP, VK_RIGHT, 0);
-			}
-
-			return 0;
-		}
  
 	}
 

Bpq32.c

@@ -1279,9 +1279,6 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	Fix to L4Compress from Steve G7TAJ (77)
 //	Fix possible FRMR when RNR is cleared by SREJ (78)
 //	Fix error in .77 L4Compress fix (mine, not Steve's!) (78)
-//	Fix possible stuck L2 session when handling SREJ (79)
-//	Allow sending CTRL/G From console (Windows) (80)
-//	Fix Webmail autorefresh extra threads problem (websock connection lost handling) (82)
 
 #define CKernel
 

ChatMultiConsole.c

@@ -983,30 +983,7 @@ LRESULT APIENTRY InputProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 			return 0; 
 		}
-
-		if (wParam == 0x7)  // BEL (Ctrl/G)
-		{
-			// Get buffer, append 07 and write back
-
-			Cinfo->kbptr = SendMessage(Cinfo->hwndInput, WM_GETTEXT, INPUTLEN-1, 
-				(LPARAM) (LPCSTR)Cinfo->kbbuf);
-
-
-			Cinfo->kbbuf[Cinfo->kbptr++] = 7;
-			Cinfo->kbbuf[Cinfo->kbptr] = 0;
-
-			SendMessage(Cinfo->hwndInput,WM_SETTEXT,0,(LPARAM)(LPCSTR) Cinfo->kbbuf);
-
-			// Send cursor right
-
-			for (i = 0; i < strlen(Cinfo->kbbuf); i++)
-			{
-				SendMessage(Cinfo->hwndInput, WM_KEYDOWN, VK_RIGHT, 0);
-				SendMessage(Cinfo->hwndInput, WM_KEYUP, VK_RIGHT, 0);
-			}
-
-			return 0;
-		}
+ 
 	}
 
     return CallWindowProc(Cinfo->wpOrigInputProc, hwnd, uMsg, wParam, lParam); 

ChatUsers.txt

@@ -1,2 +0,0 @@
-GM8BPQ 0 John ?_qthｬ26ｬ0
-G8BPQ 0 John ?_qthｬ26ｬ0

HTTPcode.c

@@ -4839,14 +4839,7 @@ void ProcessWebmailWebSockThread(void * conn)
 
 	Sent = send(sockptr->socket, _REPLYBUFFER, ReplyLen, 0);
 
-	if (Sent == -1)		// Connecton lost
-	{
-		closesocket(sockptr->socket);
-		free(conn);
-		return;
-	}
-
-	while (Sent != ReplyLen && Loops++ < 3000)					// 90 secs max
+	while (Sent != ReplyLen && Loops++ < 3000)					// 100 secs max
 	{	
 		if (Sent > 0)					// something sent
 		{
@@ -4892,16 +4885,11 @@ void ProcessWebmailWebSockThread(void * conn)
 
 	CloseHandle(hPipe);
 
+	// ?? do we need a thread to handle write which may block
+
 	Sent = send(sockptr->socket, Reply, ReplyLen, 0);
 
-	if (Sent == -1)		// Connecton lost
-	{
-		free(conn);
-		closesocket(sockptr->socket);
-		return;
-	}
-
-	while (Sent != ReplyLen && Loops++ < 3000)					// 90 secs max
+	while (Sent != ReplyLen && Loops++ < 3000)					// 100 secs max
 	{	
 		//			Debugprintf("%d out of %d sent %d Loops", Sent, InputLen, Loops);
 

HanksRT.c

@@ -1229,7 +1229,7 @@ void chkctl(ChatCIRCUIT *ckt_from, char * Buffer, int Len)
 
 	for (i = 1; i < (Len - 1); i++)
 	{
-		if (Buffer[i] < 32 && Buffer[i] != 7)		// Accept BELL
+		if (Buffer[i] < 32)
 		{
 			if (Buffer[i] == 9)
 			{

L2Code.c

@@ -2176,9 +2176,7 @@ VOID SFRAME(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, UCHAR CTL, UCHA
 				int count;
 				MESSAGE * Msg;
 				MESSAGE * Buffer;
-
-				LINK->L2FLAGS &= ~POLLSENT;			// CLEAR I(P) or RR(P) SET
-				
+						
 				Msg = LINK->FRAMES[NS];	// is frame available?
 
 				if (Msg == NULL)
@@ -2979,43 +2977,6 @@ VOID SDETX(struct _LINKTABLE * LINK)
 //	if (LINK->L2RESEQ_Q)
 //		return;
 	
-	// **** Debug code **** look for stuck links
-
-	if (LINK->LASTFRAMESENT && (time(NULL) - LINK->LASTFRAMESENT) > 60)			// No send for 60 secs
-	{
-		if (COUNT_AT_L2(LINK) > 16)
-		{
-			// Dump Link State
-
-			char Normcall[11] = "";
-			char Normcall2[11] = "";
-
-			int Count = COUNT_AT_L2(LINK);
-			int secs = time(NULL) - LINK->LASTFRAMESENT;
-				
-			ConvFromAX25(LINK->LINKCALL, Normcall);
-			ConvFromAX25(LINK->OURCALL, Normcall2);
-
-			Debugprintf("*** Stuck L2 Session for %d Secs %s %s %d", secs, Normcall, Normcall2, Count);
-			Debugprintf("LINK->LINKNS %d LINK->LINKOWS %d SDTSLOT %d LINKWINDOW %d L2FLAGS %d", LINK->LINKNS, LINK->LINKOWS, LINK->SDTSLOT, LINK->LINKWINDOW, LINK->L2FLAGS);
-			Debugprintf("Slots %x %x %x %x %x %x %x %x", LINK->FRAMES[0], LINK->FRAMES[1], LINK->FRAMES[2], LINK->FRAMES[3],
-				LINK->FRAMES[4], LINK->FRAMES[5], LINK->FRAMES[6], LINK->FRAMES[7]);
-
-			// Reset Link
-
-
-			InformPartner(LINK, NORMALCLOSE);	// TELL OTHER END ITS GONE
-
-			LINK->L2RETRIES -= 1;		// Just send one DISC
-			LINK->L2STATE = 4;			// CLOSING
-
-			L2SENDCOMMAND(LINK, DISC | PFBIT);
-
-			return;
-		}
-	}
-
-
 	Outstanding = LINK->LINKNS - LINK->LINKOWS;			// Was WS not NS
 
 	if (Outstanding < 0)
@@ -3033,10 +2994,6 @@ VOID SDETX(struct _LINKTABLE * LINK)
 		Msg = Q_REM(&LINK->TX_Q);
 		Msg->CHAIN = NULL;
 
-		LINK->LASTFRAMESENT = time(NULL);
-		LINK->LASTSENTQCOUNT = COUNT_AT_L2(LINK);
-
-
 		if (LINK->AllowCompress && Msg->LENGTH > 20  && LINK->TX_Q && Msg->PID == 240)			// if short and no more not worth trying compression
 		{
 			int complen = 0;
@@ -3061,7 +3018,6 @@ VOID SDETX(struct _LINKTABLE * LINK)
 			// I think I need to know how many slots are available, so I don't compress too much
 			// Then collect data, compressing after each frame to make sure will fit in available space
 
-
 			while (LINK->FRAMES[n] == NULL && slots < 8)
 			{
 				slots++;

MultiConsole.c

@@ -944,30 +944,6 @@ LRESULT APIENTRY InputProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 			return 0; 
 		}
-
-		if (wParam == 0x7)  // BEL (Ctrl/G)
-		{
-			// Get buffer, append 07 and write back
-
-			Cinfo->kbptr = SendMessage(Cinfo->hwndInput, WM_GETTEXT, INPUTLEN-1, 
-				(LPARAM) (LPCSTR)Cinfo->kbbuf);
-
-
-			Cinfo->kbbuf[Cinfo->kbptr++] = 7;
-			Cinfo->kbbuf[Cinfo->kbptr] = 0;
-
-			SendMessage(Cinfo->hwndInput,WM_SETTEXT,0,(LPARAM)(LPCSTR) Cinfo->kbbuf);
-
-			// Send cursor right
-
-			for (i = 0; i < strlen(Cinfo->kbbuf); i++)
-			{
-				SendMessage(Cinfo->hwndInput, WM_KEYDOWN, VK_RIGHT, 0);
-				SendMessage(Cinfo->hwndInput, WM_KEYUP, VK_RIGHT, 0);
-			}
-
-			return 0;
-		}
  
 	}
 

RTKnown.txt

@@ -1 +0,0 @@
-G8BPQ-1 1754642136

TelnetV6.c

@@ -5018,20 +5018,23 @@ int DataSocket_ReadHTTP(struct TNCINFO * TNC, struct ConnectionInfo * sockptr, S
 	{
 		// Failed or closed - clear connection
 
-		// if Websock connection tell app
+		// if Websock connection till app
 
 		if (sockptr->WebSocks)
 		{
 			if (memcmp(sockptr->WebURL, "rhp", 3) == 0)
+			{
 				ProcessRHPWebSockClosed(sockptr->socket);	
-
+				DataSocket_Disconnect(TNC, sockptr);
+				return 0;
+			}
+		}
+		else
+		{
+			TNC->Streams[sockptr->Number].ReportDISC = TRUE;		//Tell Node
 			DataSocket_Disconnect(TNC, sockptr);
 			return 0;
 		}
-
-		TNC->Streams[sockptr->Number].ReportDISC = TRUE;		//Tell Node
-		DataSocket_Disconnect(TNC, sockptr);
-		return 0;
 	}
 
 	MsgPtr = &sockptr->InputBuffer[0];

Versions.h

@@ -10,15 +10,15 @@
 
 #endif
 
-#define KVers 6,0,24,82
-#define KVerstring "6.0.24.82\0"
+#define KVers 6,0,24,78
+#define KVerstring "6.0.24.78\0"
 
 
 #ifdef CKernel
 
 #define Vers KVers
 #define Verstring KVerstring
-#define Datestring "August 2025"
+#define Datestring "July 2025"
 #define VerComments "G8BPQ Packet Switch (C Version)" KVerstring
 #define VerCopyright "Copyright © 2001-2025 John Wiseman G8BPQ\0"
 #define VerDesc "BPQ32 Switch\0"

WebMail.c

@@ -2662,10 +2662,10 @@ VOID SaveNewMessage(struct HTTPConnectionInfo * Session, char * MsgPtr, char * R
 	if (strlen(WebMail->BID) > 12)
 		WebMail->BID[12] = 0;
 
-//	UndoTransparency(WebMail->BID);
-//	UndoTransparency(WebMail->To);
-//	UndoTransparency(WebMail->Subject);
-//	UndoTransparency(WebMail->Body);
+	UndoTransparency(WebMail->BID);
+	UndoTransparency(WebMail->To);
+	UndoTransparency(WebMail->Subject);
+	UndoTransparency(WebMail->Body);
 
 	MsgLen = strlen(WebMail->Body);
 

asmstrucs.h

@@ -930,9 +930,6 @@ typedef struct _LINKTABLE
 	VOID *	FRAMES[8];		// FRAMES WAITING ACK
 	VOID *	RXFRAMES[8];	// Frames received out of sequence
 
-	time_t	LASTFRAMESENT;	// For detecting stuck links
-	int		LASTSENTQCOUNT;	//
-
 	UCHAR	L2STATE;		// PROCESSING STATE
 	UCHAR	Ver2point2;		// Set if running 2.2
 	USHORT	L2TIMER;		// FRAME RETRY TIMER

bpqchat.c

@@ -73,9 +73,6 @@
 //.25
 
 //  Increase size of status display buffers (7)
-//	Allow sending BEL (CTRL/G) (79)
-//	Fix sending BEL (CTRL/G) (81)
-
 
 #include "BPQChat.h"
 #include "Dbghelp.h"

cMain.c

@@ -52,9 +52,6 @@ int CanPortDigi(int Port);
 int	KissEncode(UCHAR * inbuff, UCHAR * outbuff, int len);
 void MQTTTimer();
 void SaveMH();
-VOID InformPartner(struct _LINKTABLE * LINK, int Reason);
-VOID L2SENDCOMMAND(struct _LINKTABLE * LINK, int CMD);
-
 
 #include "configstructs.h"
 
@@ -65,7 +62,6 @@ extern int needADSB;
 struct PORTCONFIG * PortRec;
 
 #define RNRSET 0x2				// RNR RECEIVED FROM OTHER END
-#define	PFBIT 0x10		// POLL/FINAL BIT IN CONTROL BYTE
 
 //	STATION INFORMATION
 
@@ -2510,47 +2506,6 @@ ENDOFLIST:
 
 				if ((LINK->L2FLAGS & RNRSET) == 0)
 					SDETX(LINK);
-				else
-				{
-					// Stuck link debug check
-
-					if (LINK->LASTFRAMESENT && (time(NULL) - LINK->LASTFRAMESENT) > 60)			// No send for 60 secs
-					{
-						if (COUNT_AT_L2(LINK) > 16)
-						{
-							// Dump Link State
-
-							char Normcall[11] = "";
-							char Normcall2[11] = "";
-
-							int Count = COUNT_AT_L2(LINK);
-							int secs = time(NULL) - LINK->LASTFRAMESENT;
-
-
-							ConvFromAX25(LINK->LINKCALL, Normcall);
-							ConvFromAX25(LINK->OURCALL, Normcall2);
-
-							Debugprintf("*** Stuck L2 Session for %d Secs RNR Set %s %s %d", secs, Normcall, Normcall2, Count);
-							Debugprintf("LINK->LINKNS %d LINK->LINKOWS %d SDTSLOT %d LINKWINDOW %d L2FLAGS %d", LINK->LINKNS, LINK->LINKOWS, LINK->SDTSLOT, LINK->LINKWINDOW, LINK->L2FLAGS);
-							Debugprintf("Slots %x %x %x %x %x %x %x %x", LINK->FRAMES[0], LINK->FRAMES[1], LINK->FRAMES[2], LINK->FRAMES[3],
-								LINK->FRAMES[4], LINK->FRAMES[5], LINK->FRAMES[6], LINK->FRAMES[7]);
-
-							// Reset Link
-
-
-							InformPartner(LINK, NORMALCLOSE);	// TELL OTHER END ITS GONE
-
-							LINK->L2RETRIES -= 1;		// Just send one DISC
-							LINK->L2STATE = 4;			// CLOSING
-
-							L2SENDCOMMAND(LINK, DISC | PFBIT);
-
-							return;
-						}
-					}
-
-				}
-
 			}
 		}
 		LINK++;

chatconfig.cfg

@@ -18,5 +18,5 @@ Chat :
   MonitorSize = "828,1644,148,770";
   DebugSize = "0,0,0,0";
   WindowSize = "231,835,254,602";
-  Version = "6,0,24,81";
+  Version = "6,0,24,32";
 };

debian/NEWS

@@ -1,11 +0,0 @@
-linbpq (6.0.24.22-2) unstable; urgency=medium
-
-  This is quite a big update, with config moving from /opt/oarc/bpq/bpq32.cfg to
-  /etc/bpq32.cfg. The system shall do this automatically for you, however
-  computers and their programmers are not perfect.
-
-  I strongly recommend at this point backing up your entire
-  /opt/oarc/bpq/ directory (cp -r /opt/oarc/bpq/ ~/bpq-backup/) before
-  proceeding with the upgrade
-
- -- Dave Hibberd <d@vehibberd.com>  Sat, 16 Dec 2023 13:30:06 +0000

debian/README.Debian

@@ -1,23 +0,0 @@
-README for linbpq on Debian
-===========================
-
-Please see https://wiki.oarc.uk/packet:linbpq-apt-installation for this guide
-
-# Set config
-Copy the config, edit it & set permissions.
-The permissions are so linbpq web interface can edit the config. 
-
-sudo mv /usr/share/doc/linbpq/examples/bpq32.cfg /etc/bpq32.cfg
-sudo nano /etc/bpq32.cfg
-sudo chown :linbpq /etc/bpq32.cfg
-sudo chmod 644 /etc/bpq32.cfg
-
-# Start linbpq
-
-sudo systemctl start linbpq
-
-# Access your node
-
-It shall be available by accessing http://localhost:8008 in the browser or telnet localhost 8010
-
--- Dave Hibberd <hibby@debian.org>  Tue, 26 Mar 2024 00:53:42 +0000

debian/bpq32.cfg

@@ -1,50 +0,0 @@
-SIMPLE
-NODECALL=MB7NAA
-NODEALIAS=AANODE
-LOCATOR=AA00aa
-PASSWORD=xxxxxxxx
-AUTOSAVE=1
-NODESINTERVAL=10
-MINQUAL=10
-CTEXT:
-Thanks for connecting.
-Type ? for help.
-***
-PORT
-  PORTNUM=1
-  ID=VHF
-  TYPE=ASYNC
-  PROTOCOL=KISS
-  KISSOPTIONS=ACKMODE
-  COMPORT=/dev/ttyACM0
-  SPEED=57600
-  FRACK=4000
-  PACLEN=150
-  DIGIFLAG=0
-  QUALITY=192
-  MINQUAL=20
-ENDPORT
-
-
-PORT
-  PORTNUM=9
-  ID=Telnet
-  DRIVER=Telnet
-  CONFIG
-    LOGGING=1
-    CMS=1
-    DisconnectOnClose=1
-    SECURETELNET=1
-    TCPPORT=8010
-    FBBPORT=8011
-    HTTPPORT=8008
-    LOGINPROMPT=user:
-    PASSWORDPROMPT=password:
-    MAXSESSIONS=10
-    CTEXT=Thanks for connecting\n Enter ? for list of commands\n\n
-    USER=username,xxxxxxxx,m0aaa,,SYSOP
-ENDPORT
-
-LINCHAT
-
-APPLICATION 2,CHAT,,MB7NAA-9,AACHAT,255

debian/changelog

@@ -1,297 +0,0 @@
-linbpq (6.0.24.82+repack-1~hibbian13+1) trixie-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.24.82+repack
-  * MINI_BUILDD_OPTION: auto-ports=trixie-packetrepo-unstable,bookworm-packetrepo-unstable,bullseye-packetrepo-unstable,noble-packetrepo-unstable,jammy-packetrepo-unstable
-
- -- Dave Hibberd <hibby@debian.org>  Sun, 17 Aug 2025 22:36:49 +0100
-
-linbpq (6.0.24.78+repack-1~hibbian~TRIXIE+1) trixie-hibbian-unstable; urgency=medium
-
-  * New Upstream
-  * New files excluded
-    - No binaries in this release at all maybe!
-  * MINI_BUILDD_OPTION: auto-ports=trixie-packetrepo-unstable,bookworm-packetrepo-unstable,bullseye-packetrepo-unstable,noble-packetrepo-unstable,jammy-packetrepo-unstable
-
- -- Dave Hibberd <hibby@debian.org>  Thu, 31 Jul 2025 01:31:38 +0100
-
-linbpq (6.0.24.77+repack-1~hibbian~TRIXIE+1) trixie-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.24.77+repack
-  * MINI_BUILDD_OPTION: auto-ports=trixie-packetrepo-unstable,bookworm-packetrepo-unstable,bullseye-packetrepo-unstable,noble-packetrepo-unstable,jammy-packetrepo-unstable
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 22 Jul 2025 21:46:13 +0100
-
-linbpq (6.0.24.75+repack-1~hibbian~TRIXIE+2) trixie-hibbian-unstable; urgency=medium
-
-  * First trixie release
-  * Drop hard-dep on hibbian-archive-keyring
-
- -- Dave Hibberd <hibby@debian.org>  Wed, 16 Jul 2025 19:10:33 +0100
-
-linbpq (6.0.24.75+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.25.75+repack
-  * MINI_BUILDD_OPTION: auto-ports=trixie-packetrepo-unstable,bookworm-packetrepo-unstable,bullseye-packetrepo-unstable,noble-packetrepo-unstable,jammy-packetrepo-unstable
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 15 Jul 2025 01:10:43 +0100
-
-linbpq (6.0.24.71+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.24.67+repack
-  * New upstream version 6.0.24.69+repack
-  * New upstream version 6.0.24.69.1+repack
-  * New upstream version 6.0.24.71+repack
-  * Okay that's a lot of updates.
-  * Refreshed d/p/makefile to reflect new CFLAG
-  * MINI_BUILDD_OPTION: auto-ports=trixie-packetrepo-unstable,bookworm-packetrepo-unstable,bullseye-packetrepo-unstable,noble-packetrepo-unstable,jammy-packetrepo-unstable
-
- -- Dave Hibberd <hibby@debian.org>  Wed, 21 May 2025 21:45:59 +0100
-
-linbpq (6.0.24.66+repack-1~hibbian+2) bookworm-hibbian-unstable; urgency=medium
-
-  * Update postinst script to be a little quieter
-  * MINI_BUILDD_OPTION:
-    auto-ports=trixie-packetrepo-unstable,bookworm-packetrepo-unstable,bullseye-packetrepo-unstable,noble-packetrepo-unstable,jammy-packetrepo-unstable
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 11 Mar 2025 00:51:35 +0000
-
-linbpq (6.0.24.66+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.24.66+repack
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 04 Mar 2025 22:50:09 +0000
-
-linbpq (6.0.24.65+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 25 Feb 2025 09:33:24 +0000
-
-linbpq (6.0.24.59a+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream
-  * Little tweaks to makefile patch to account for new -rdynamic
-
- -- Dave Hibberd <hibby@debian.org>  Mon, 03 Feb 2025 22:32:11 +0000
-
-linbpq (6.0.24.56+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream
-
- -- Dave Hibberd <hibby@debian.org>  Mon, 06 Jan 2025 21:37:44 +0000
-
-linbpq (6.0.24.55+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream
-  * d/rules
-    - Increased hardening
-
- -- Dave Hibberd <hibby@debian.org>  Sun, 05 Jan 2025 23:35:06 +0000
-
-linbpq (6.0.24.54+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream
-  * Drop AGW Patch
-  * Drop Spelling Patch
-  * Drop Dynamic Links patch
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 17 Dec 2024 16:46:05 +0000
-
-linbpq (6.0.24.53+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream
-    - Patches refreshed
-    - dropped some edits in ftbfs-gcc14
-    - dropped d/patches/headers.patch
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 03 Dec 2024 00:57:57 +0000
-
-linbpq (6.0.24.52+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream
-    - Patches happy
-
- -- Dave Hibberd <hibby@debian.org>  Sat, 30 Nov 2024 21:47:17 +0000
-
-linbpq (6.0.24.51.1+repack-1~hibbian+2) bookworm-hibbian-unstable; urgency=medium
-
-  * Iron out an issue with time...
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 29 Nov 2024 19:57:28 +0000
-
-linbpq (6.0.24.51.1+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream import after bug report
-  * Roll back some ftbfs-gcc14 edits
-  * Remove some more lib headers
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 29 Nov 2024 19:30:22 +0000
-
-linbpq (6.0.24.51+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream import
-    - Patches refreshed
-  * Upstream is now repacked to include less files
-  * Big build system review, now using Debian CFLAGS and LDFLAGS
-    - Hardening enabled, mostly
-    - A debug symbols package is now available
-  * Oh yeah, everything is now dynamic linking
-    - libpng
-    - libpaho-mqtt
-    - libjansson
-    - libminiupnpc
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 29 Nov 2024 13:08:38 +0000
-
-linbpq (6.0.24.50-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream import
-  * Files excluded at origtargz generation time for cleanliness
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 12 Nov 2024 21:56:38 +0000
-
-linbpq (6.0.24.49-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream import
-  * Patches refreshed
-  * Add mqtt requirements
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 05 Nov 2024 21:52:29 +0000
-
-linbpq (6.0.24.45-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream import
-  * Patches refreshed
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 11 Oct 2024 15:48:41 +0100
-
-linbpq (6.0.24.42-1~hibbian+3) bookworm-hibbian-unstable; urgency=medium
-
-  * 32bit build error
-    - Patch updated to fix hopefully
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 30 Aug 2024 12:21:57 +0100
-
-linbpq (6.0.24.42-1~hibbian+2) bookworm-hibbian-unstable; urgency=medium
-
-  * Forgot to fix the ninotnc-smt issue, fixed now
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 30 Aug 2024 12:05:54 +0100
-
-linbpq (6.0.24.42-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * Install config to /etc
-  * New upstream update
-  * Patches refreshed
-  * Debian hardening enabled
-    - 2 new patches created that touch almost every file
-    - Considered experimental.
-    - gcc14 builds for Debian Trixie!
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 30 Aug 2024 10:15:11 +0100
-
-linbpq (6.0.24.40-1) unstable; urgency=medium
-
-  * Fresh upstream release
-    - Patches refreshed
-  * Secure by default patch
-
- -- Dave Hibberd <hibby@debian.org>  Sun, 07 Jul 2024 16:09:28 +0100
-
-linbpq (6.0.24.38-1) unstable; urgency=medium
-
-  * New Upstream
-  * Tweak config file per recommendation from 2M0MQN to make first start simple
-  * Bump standards to 4.7.0.0
-
- -- Dave Hibberd <hibby@debian.org>  Sun, 09 Jun 2024 22:38:40 +0100
-
-linbpq (6.0.24.34-2) unstable; urgency=medium
-
-  * Fix config permissions bug as reported by Alex 2E1PKY
-
- -- Dave Hibberd <hibby@debian.org>  Mon, 08 Apr 2024 22:27:02 +0100
-
-linbpq (6.0.24.34-1) unstable; urgency=medium
-
-  * Upstream bump
-
- -- Dave Hibberd <hibby@debian.org>  Sat, 06 Apr 2024 02:15:28 +0100
-
-linbpq (6.0.24.33-1) unstable; urgency=medium
-
-  * Upstream bump
-  * Moved config file to examples
-  * Updated service to fail on no config
-  * Added helpful README.Debian
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 26 Mar 2024 20:24:08 +0000
-
-linbpq (6.0.24.30-1) unstable; urgency=medium
-
-  * Upstream bump
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 23 Feb 2024 23:24:46 +0000
-
-linbpq (6.0.24.29-1) unstable; urgency=medium
-
-  * Upstream bump
-  * Added my new details
-  * Tidied up some packaging errors
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 13 Feb 2024 00:06:33 +0000
-
-linbpq (6.0.24.27-2) unstable; urgency=medium
-
-  * Permissions fix for web-config-editor users
-
- -- Dave Hibberd <d@vehibberd.com>  Thu, 18 Jan 2024 10:31:56 +0000
-
-linbpq (6.0.24.27-1) unstable; urgency=medium
-
-  * New Upstream Release
-
- -- Dave Hibberd <d@vehibberd.com>  Tue, 16 Jan 2024 20:51:43 +0000
-
-linbpq (6.0.24.25-1) unstable; urgency=medium
-
-  * New Upstream Release
-
- -- Dave Hibberd <d@vehibberd.com>  Thu, 28 Dec 2023 10:44:47 +0000
-
-linbpq (6.0.24.22-2) unstable; urgency=medium
-
-  * Moved config file home, caused chaos
-
- -- Dave Hibberd <d@vehibberd.com>  Sat, 16 Dec 2023 14:40:20 +0000
-
-linbpq (6.0.24.22-1) unstable; urgency=medium
-
-  * New Upstream Release
-
- -- Dave Hibberd <d@vehibberd.com>  Fri, 08 Dec 2023 12:29:40 +0000
-
-linbpq (6.0.24.16-1) unstable; urgency=medium
-
-  * New Upstream release
-
- -- Dave Hibberd <d@vehibberd.com>  Tue, 31 Oct 2023 22:50:01 +0000
-
-linbpq (6.0.24.15-2) unstable; urgency=medium
-
-  * debian/conffiles introduced to stop linbpq overwriting config files
-    - Thanks to Mark 2M0IIG for raising concern about this bug!
-
- -- Dave Hibberd <d@vehibberd.com>  Sun, 15 Oct 2023 21:45:24 +0100
-
-linbpq (6.0.24.15-1) unstable; urgency=medium
-
-  * New upstream release
-
- -- Dave Hibberd <d@vehibberd.com>  Tue, 10 Oct 2023 22:19:48 +0100
-
-linbpq (6.0.24.2-1) unstable; urgency=medium
-
-  * Initial release.
-
- -- Dave Hibberd <d@vehibberd.com>  Mon, 28 Aug 2023 23:20:45 +0100

debian/control

@@ -1,20 +0,0 @@
-Source: linbpq
-Section: hamradio
-Priority: optional
-Maintainer: Dave Hibberd <hibby@debian.org>
-Standards-Version: 4.7.2
-Vcs-Browser: https://git.hibbian.org/Hibbian/linbpq
-Vcs-Git: https://git.hibbian.org/Hibbian/linbpq.git
-Homepage: https://www.cantab.net/users/john.wiseman/Documents/
-Build-Depends: debhelper-compat (= 13)
-Build-Depends-Arch: libssl-dev, libminiupnpc-dev, libpcap-dev, libconfig-dev, zlib1g-dev, libpaho-mqtt-dev, libjansson-dev, libpng-dev
-Rules-Requires-Root: no
-
-Package: linbpq
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Description: Packet node and ax25 stack
- LINBPQ is a Linux version of the BPQ32 Node, BBS and Chat Server components.
- It is actively developed by John G8BPQ and contains a complete, independent
- implementation of ax.25 and net/rom as well as BBS and Chat applications and
- can be used either as a packet switch or as a full featured node.

debian/copyright

@@ -1,37 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: linBPQ
-Upstream-Contact: John Wiseman G8BPQ <john.wiseman@cantab.net>
-Source: https://www.cantab.net/users/john.wiseman/Documents/
-Files-Excluded: *.vcproj* *.bak *.lib *.dll *.wav *.asm *.vcxproj* *.pdb *.exe
-	.gitignore XAprs zlib.h zconf.h MQTT* pcap.h miniupnpc.h upnpdev.h
-	igd_desc_parse.h upnpcommands.h upnperrors.h miniupnpctypes.h
-	*.svn-base *.db *.obj
-
-Files: *
-Copyright: 1990-2025 John Wiseman G8BPQ <john.wiseman@cantab.net>
-License: GPL-3
-
-Files: debian/*
-Copyright: 2016-2025 Dave Hibberd <d@vehibberd.com>
-License: GPL-3
-
-Files: debian/linbpq.service
-Copyright: 2024-2025 Tom Fanning M0LTE
-License: GPL-3
-
-License: GPL-3
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- . 
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- The GPL License which applies to this package can be found on your Debian
- system at /usr/share/common-licenses/GPL-3. 

debian/dirs

@@ -1,2 +0,0 @@
-usr/sbin
-opt/oarc/bpq

debian/gbp.conf

@@ -1,3 +0,0 @@
-[DEFAULT]
-debian-branch = hibbian/latest
-upstream-branch = upstream/latest

debian/gitlab-ci.yml

@@ -1,6 +0,0 @@
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-
-reprotest:
-  extends: .test-reprotest-diffoscope

debian/install

@@ -1 +0,0 @@
-debian/bpq32.cfg etc/

debian/linbpq.examples

@@ -1 +0,0 @@
-debian/bpq32.cfg

debian/linbpq.service

@@ -1,14 +0,0 @@
-[Unit]
-Description=Linbpq systemd service file
-After=network.target
-ConditionPathExists=/etc/bpq32.cfg
-
-[Service]
-ExecStart=/usr/sbin/linbpq -c /etc -d /opt/oarc/bpq -l /opt/oarc/bpq
-WorkingDirectory=/opt/oarc/bpq
-Restart=always
-User=linbpq
-Group=linbpq
-
-[Install]
-WantedBy=multi-user.target

debian/lintian-overrides

@@ -1,11 +0,0 @@
-# weirdness from oarc packaging
-linbpq: dir-or-file-in-opt [opt/oarc/]
-linbpq: dir-or-file-in-opt [opt/oarc/bpq/]
-# i know!
-linbpq: no-manual-page [usr/sbin/linbpq]
-# Directory is populated on first run
-linbpq: package-contains-empty-directory [opt/oarc/bpq/]
-# Code convenience
-linbpq: spelling-error-in-binary Dont Don't [usr/sbin/linbpq]
-linbpq: spelling-error-in-binary Paramters Parameters [usr/sbin/linbpq]
-linbpq: spelling-error-in-binary lon long [usr/sbin/linbpq]

debian/patches/makefile

@@ -1,47 +0,0 @@
---- a/makefile
-+++ b/makefile
-@@ -2,8 +2,7 @@
- 
- #	To exclude i2c support run make noi2c
- 
--OBJS = pngwtran.o pngrtran.o pngset.o pngrio.o pngwio.o pngtrans.o pngrutil.o pngwutil.o\
-- pngread.o pngwrite.o png.o pngerror.o pngget.o pngmem.o APRSIconData.o AISCommon.o\
-+OBJS = APRSIconData.o AISCommon.o\
-  upnp.o APRSStdPages.o HSMODEM.o WinRPR.o KISSHF.o TNCEmulators.o bpqhdlc.o SerialPort.o\
-  adif.o WebMail.o utf8Routines.o VARA.o LzFind.o Alloc.o LzmaDec.o LzmaEnc.o LzmaLib.o \
-  Multicast.o ARDOP.o IPCode.o FLDigi.o linether.o CMSAuth.o APRSCode.o BPQtoAGW.o KAMPactor.o\
-@@ -17,12 +16,12 @@
- 
- # Configuration:
- 
--#Default to Linux
--	CC = gcc    
--	LDFLAGS = -Xlinker -Map=output.map -lrt 
-+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-+CFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS)
-+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
- 
--all: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)	
--all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lm -lz -lpthread -lconfig -lpcap                       
-+all: CFLAGS += -DLINBPQ -MMD -g -rdynamic -fcommon -fasynchronous-unwind-tables
-+all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lrt -lm -lz -lpthread -lconfig -lpcap -lpng
- all: linbpq
- 
- #other OS
-@@ -74,12 +73,11 @@
- 
- 
- linbpq: $(OBJS)
--	cc $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS) -o linbpq
--	sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq		
-+	$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS) -o linbpq
- 
- -include *.d
- 
--clean :
--	rm *.d
--	rm linbpq $(OBJS)
-+install:
-+	install -b -m 755  -D -d                debian/linbpq/usr/sbin
-+	install -b -m 755  -p linbpq            debian/linbpq/usr/sbin
- 

debian/patches/series

@@ -1,2 +0,0 @@
-spelling-fixes.patch
-makefile

debian/patches/spelling-fixes.patch

@@ -1,11 +0,0 @@
---- a/UZ7HODrv.c
-+++ b/UZ7HODrv.c
-@@ -382,7 +382,7 @@
- 
- 	if (AGW->CenterFreq == 0)
- 	{
--		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Invalid Modem Freqency\r");
-+		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Invalid Modem Frequency\r");
- 		return 1;
- 	}
- 

debian/postinst

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = configure ]; then     
-
-#	if ! getent group linbpq >/dev/null; then
-#		addgroup --system --force-badname linbpq || true
-#	fi
-
-	echo "Creating/updating linbpq user account..."
-	adduser --system --group --home /opt/oarc/bpq \
-            --gecos "linbpq system user" --shell /bin/false \
-            --quiet --disabled-password linbpq || {
-        # adduser failed. Why?
-        if getent passwd linbpq >/dev/null ; then
-            echo "Non-system user linbpq found. I will not overwrite a non-system" >&2
-            echo "user.  Remove the user and reinstall linbpq." >&2
-            exit 1
-        fi
-        # unknown adduser error, simply exit
-        exit 1
-    } 
-    	if ! id -nGz linbpq | grep -qzxF 'dialout' ; then
-		adduser linbpq dialout
-	fi
-    	if ! id -nGz linbpq | grep -qzxF 'plugdev' ; then
-    		adduser linbpq plugdev
-	fi
-	chown :linbpq /opt/oarc/bpq
-	chmod 775 /opt/oarc/bpq
-
-# If we have setcap is installed, set the requirements
-# which allows us to install our binaries without the setuid
-# bit.     
-	if command -v setcap > /dev/null; then         
-			setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" /usr/sbin/linbpq
-		else
-			echo "Setcap failed on /usr/sbin/linbpq, Features may be limited" >&2
-	fi
-	else
-		echo "Setcap is not installed,  Features may be limited" >&2     
-
-
-fi 
-
-#DEBHELPER#

debian/preinst

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-confile="/etc/bpq32.cfg"
-node="/opt/oarc/bpq/bpq32.cfg"
-
-if [ -L $confile ]; then
-	rm $confile
-	cp $node $confile
-	mv $node $node.bak
-fi
-
-#DEBHELPER#

debian/rules

@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-%:
-	dh $@

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

debian/watch

@@ -1,3 +0,0 @@
-version=4
-opts="pgpmode=none,dversionmangle=s/\+repack//,repacksuffix=+repack,repack,compression=xz" \
-http://127.0.0.1:8000/linbpq-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))