diff --git a/BBSUtilities.c b/BBSUtilities.c
index 48f927a..2cb6ee5 100644
--- a/BBSUtilities.c
+++ b/BBSUtilities.c
@@ -6995,7 +6995,7 @@ VOID SendWarningToSYSOP(struct MsgInfo * Msg)
char * MailBuffer = malloc(100);
char Title[100];
- Length += sprintf(MailBuffer, "Warning - Message %d has nowhere to go", Msg->number);
+ Length += sprintf(MailBuffer, "Warning - Message %d has nowhere to go\r\n%s@%s", Msg->number, Msg->to, Msg->via);
sprintf(Title, "Warning - Message %d has nowhere to go", Msg->number);
SendMessageToSYSOP(Title, MailBuffer, Length);
}
diff --git a/BPQMail.c b/BPQMail.c
index a4015b1..8408217 100644
--- a/BPQMail.c
+++ b/BPQMail.c
@@ -1126,6 +1126,7 @@
// Implement New Message and Message Read Events (23)
// Start adding json api (25)
// Fix reading nested directories when loading Standard Templates and other template bugs (25)
+// Add TO and AT to "Message has nowhere to go" message (28)
#include "bpqmail.h"
#include "winstdint.h"
diff --git a/BPQMail.vcproj.NOTTSDESKTOP.John.user b/BPQMail.vcproj.NOTTSDESKTOP.John.user
new file mode 100644
index 0000000..fa82c00
--- /dev/null
+++ b/BPQMail.vcproj.NOTTSDESKTOP.John.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BPQMail.vcproj.SKIGACER.johnw.user b/BPQMail.vcproj.SKIGACER.johnw.user
new file mode 100644
index 0000000..b5b0536
--- /dev/null
+++ b/BPQMail.vcproj.SKIGACER.johnw.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Bpq32.c b/Bpq32.c
index bc76ca0..576f6be 100644
--- a/Bpq32.c
+++ b/Bpq32.c
@@ -1208,6 +1208,7 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
// Disable CTS check in WriteComBlock (26)
// Improvments to reporting to M0LTE Map (26)
// IPGateway fix from github user isavitsky (27)
+// Fix possible crash in SCSPactor PTCPORT code (29)
#define CKernel
diff --git a/CBPQ32.vcproj.SKIGACER.johnw.user b/CBPQ32.vcproj.SKIGACER.johnw.user
new file mode 100644
index 0000000..f8a6101
--- /dev/null
+++ b/CBPQ32.vcproj.SKIGACER.johnw.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MailNode.vcproj.NOTTSDESKTOP.John.user b/MailNode.vcproj.NOTTSDESKTOP.John.user
new file mode 100644
index 0000000..fa82c00
--- /dev/null
+++ b/MailNode.vcproj.NOTTSDESKTOP.John.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MailNode.vcproj.SKIGACER.johnw.user b/MailNode.vcproj.SKIGACER.johnw.user
new file mode 100644
index 0000000..b5b0536
--- /dev/null
+++ b/MailNode.vcproj.SKIGACER.johnw.user
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/RigControl.c b/RigControl.c
index b7e22d1..ea7b5c2 100644
--- a/RigControl.c
+++ b/RigControl.c
@@ -1222,11 +1222,12 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
char c;
int val;
char * ptr1;
+ char * ptr2;
int Len;
if (n < 3)
{
- strcpy(Command, "Sorry - Invalid Format - should be HEX Hexstring\r");
+ strcpy(Command, "Sorry - Invalid Format - should be CMD Params\r");
return FALSE;
}
@@ -1315,6 +1316,31 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
Len = 5;
break;
+ case FLRIG:
+
+ // Two string params - command and params eg rig.set_ptt 1"
+ // or maybe param could be format data - eg i 1
+
+ _strlwr(ptr1);
+
+ ptr2 = strlop(ptr1, ' ');
+
+ if (ptr2 == 0)
+ {
+ strcpy(Command, "Sorry - Invalid Format - should be CMD cmd params\r");
+ return FALSE;
+ }
+
+ strlop(ptr2, ' ');
+
+ FLRIGSendCommand(PORT, ptr1, ptr2);
+
+ return FALSE;
+
+
+
+
+
default:
sprintf(Command, "Sorry - CMD not supported on your Radio\r");
return FALSE;
diff --git a/SCSPactor.c b/SCSPactor.c
index 4ae57be..c5a5ab0 100644
--- a/SCSPactor.c
+++ b/SCSPactor.c
@@ -3189,14 +3189,16 @@ VOID ProcessDEDFrame(struct TNCINFO * TNC, UCHAR * Msg, int framelen)
// If using an FT847 on PTC Port it needa a "Cat On" Command. Send it here
- PORT = TNC->RIG->PORT;
-
- if (PORT->PTC && strcmp(PORT->Rigs[0].RigName, "FT847") == 0)
+ if (TNC->RIG->PORT && TNC->RIG->PORT->PTC)
{
- UCHAR CATON[6] = {0,0,0,0,0};
- SendPTCRadioCommand(PORT->PTC, CATON, 5);
- }
+ PORT = TNC->RIG->PORT;
+ if (strcmp(PORT->Rigs[0].RigName, "FT847") == 0)
+ {
+ UCHAR CATON[6] = {0,0,0,0,0};
+ SendPTCRadioCommand(PORT->PTC, CATON, 5);
+ }
+ }
}
Stream = RealStream = Msg[2];
diff --git a/Versions.h b/Versions.h
index d86948c..e3200b9 100644
--- a/Versions.h
+++ b/Versions.h
@@ -10,8 +10,8 @@
#endif
-#define KVers 6,0,24,27
-#define KVerstring "6.0.24.27\0"
+#define KVers 6,0,24,29
+#define KVerstring "6.0.24.29\0"
#ifdef CKernel
diff --git a/debian/NEWS b/debian/NEWS
index e0aefbc..594c2b1 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-linbpq (6.0.24.22-2) UNRELEASED; urgency=medium
+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
diff --git a/debian/changelog b/debian/changelog
index 5b74f55..53e49ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linbpq (6.0.24.29-1) unstable; urgency=medium
+
+ * Upstream bump
+ * Added my new details
+ * Tidied up some packaging errors
+
+ -- Dave Hibberd Tue, 13 Feb 2024 00:06:33 +0000
+
linbpq (6.0.24.27-2~bpo11+1) bullseye; urgency=medium
* Rebuild for bullseye.
diff --git a/debian/control b/debian/control
index a7ceee9..dca6453 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: hamradio
Priority: optional
Maintainer: Debian Hamradio Maintainers
Uploaders:
- Dave Hibberd ,
+ Dave Hibberd ,
Standards-Version: 4.6.2.0
Vcs-Browser:
Vcs-Git:
@@ -13,6 +13,6 @@ Rules-Requires-Root: no
Package: linbpq
Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+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.
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..a03b8a4
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,8 @@
+# weirdness from oarc packaging
+linbpq: dir-or-file-in-opt [opt/oarc/]
+linbpq: dir-or-file-in-opt [opt/oarc/bpq/]
+# these are ok, just held within the program
+linbpq: embedded-library libminiupnpc [usr/sbin/linbpq]
+linbpq: embedded-library libpng [usr/sbin/linbpq]
+# i know!
+linbpq: no-manual-page [usr/sbin/linbpq]
diff --git a/debian/postinst b/debian/postinst
index ea47392..f764177 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,5 +1,7 @@
#!/bin/sh
+set -e
+
if [ "$1" = configure ]; then
# if ! getent group linbpq >/dev/null; then
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index e69de29..a39267e 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# i don't care that much on this
+linbpq source: source-contains-prebuilt-windows-binary [PG/Loop.exe]
+linbpq source: source-contains-prebuilt-windows-binary [PG/PGTest.exe]