Hibbian
/
linbpq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'debian/latest' into ubuntu/jammy

This commit is contained in:
Hibby 2024-02-13 00:15:44 +00:00
parent 9ab44dc753 ee7345ce92
commit b5ff5e0f73
Signed by: hibby
SSH Key Fingerprint: SHA256:Y6XbnzN0FEB1R/exPF5hUbHUgE/Nn7M1uT566fxo6pE
17 changed files with 389 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BBSUtilities.c
View File

@ -6995,7 +6995,7 @@ VOID SendWarningToSYSOP(struct MsgInfo * Msg)
char * MailBuffer = malloc(100); char * MailBuffer = malloc(100);
char Title[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); sprintf(Title, "Warning - Message %d has nowhere to go", Msg->number);
SendMessageToSYSOP(Title, MailBuffer, Length); SendMessageToSYSOP(Title, MailBuffer, Length);
} }

1
BPQMail.c
View File

@ -1126,6 +1126,7 @@
// Implement New Message and Message Read Events (23) // Implement New Message and Message Read Events (23)
// Start adding json api (25) // Start adding json api (25)
// Fix reading nested directories when loading Standard Templates and other template bugs (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 "bpqmail.h"
#include "winstdint.h" #include "winstdint.h"

65
BPQMail.vcproj.NOTTSDESKTOP.John.user Normal file
View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
BPQMail.vcproj.SKIGACER.johnw.user Normal file
View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

1
Bpq32.c
View File

@ -1208,6 +1208,7 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
// Disable CTS check in WriteComBlock (26) // Disable CTS check in WriteComBlock (26)
// Improvments to reporting to M0LTE Map (26) // Improvments to reporting to M0LTE Map (26)
// IPGateway fix from github user isavitsky (27) // IPGateway fix from github user isavitsky (27)
// Fix possible crash in SCSPactor PTCPORT code (29)
#define CKernel #define CKernel

65
CBPQ32.vcproj.SKIGACER.johnw.user Normal file
View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="C:\DevProgs\BPQ32\bpq32.exe"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command=""
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
MailNode.vcproj.NOTTSDESKTOP.John.user Normal file
View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="NOTTSDESKTOP"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

65
MailNode.vcproj.SKIGACER.johnw.user Normal file
View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
Version="8.00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
Name="Debug|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
>
<DebugSettings
Command="$(TargetPath)"
WorkingDirectory=""
CommandArguments=""
Attach="false"
DebuggerType="3"
Remote="1"
RemoteMachine="SKIGACER"
RemoteCommand=""
HttpUrl=""
PDBPath=""
SQLDebugging=""
Environment=""
EnvironmentMerge="true"
DebuggerFlavor=""
MPIRunCommand=""
MPIRunArguments=""
MPIRunWorkingDirectory=""
ApplicationCommand=""
ApplicationArguments=""
ShimCommand=""
MPIAcceptMode=""
MPIAcceptFilter=""
/>
</Configuration>
</Configurations>
</VisualStudioUserFile>

28
RigControl.c
View File

@ -1222,11 +1222,12 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
char c; char c;
int val; int val;
char * ptr1; char * ptr1;
char * ptr2;
int Len; int Len;
if (n < 3) 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; return FALSE;
} }
@ -1315,6 +1316,31 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
Len = 5; Len = 5;
break; break;
case FLRIG:
// Two string params - command and params eg rig.set_ptt <i4>1</i4>"
// 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: default:
sprintf(Command, "Sorry - CMD not supported on your Radio\r"); sprintf(Command, "Sorry - CMD not supported on your Radio\r");
return FALSE; return FALSE;

14
SCSPactor.c
View File

@ -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 // If using an FT847 on PTC Port it needa a "Cat On" Command. Send it here
PORT = TNC->RIG->PORT; if (TNC->RIG->PORT && TNC->RIG->PORT->PTC)
if (PORT->PTC && strcmp(PORT->Rigs[0].RigName, "FT847") == 0)
{ {
UCHAR CATON[6] = {0,0,0,0,0}; PORT = TNC->RIG->PORT;
SendPTCRadioCommand(PORT->PTC, CATON, 5);
}
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]; Stream = RealStream = Msg[2];

4
Versions.h
View File

@ -10,8 +10,8 @@
#endif #endif
#define KVers 6,0,24,27 #define KVers 6,0,24,29
#define KVerstring "6.0.24.27\0" #define KVerstring "6.0.24.29\0"
#ifdef CKernel #ifdef CKernel

2
debian/NEWS vendored
View File

@ -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 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 /etc/bpq32.cfg. The system shall do this automatically for you, however

8
debian/changelog vendored
View File

@ -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 <hibby@debian.org> Tue, 13 Feb 2024 00:08:00 +0000
linbpq (6.0.24.27-jammy2) jammy; urgency=medium linbpq (6.0.24.27-jammy2) jammy; urgency=medium
* Permissions fix for web-config-editor users * Permissions fix for web-config-editor users

4
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: hamradio
Priority: optional Priority: optional
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org> Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Uploaders: Uploaders:
Dave Hibberd <d@vehibberd.com>, Dave Hibberd <hibby@debian.org>,
Standards-Version: 4.6.2.0 Standards-Version: 4.6.2.0
Vcs-Browser: Vcs-Browser:
Vcs-Git: Vcs-Git:
@ -13,6 +13,6 @@ Rules-Requires-Root: no
Package: linbpq Package: linbpq
Architecture: linux-any Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
Description: Packet node and ax25 stack Description: Packet node and ax25 stack
LINBPQ is a Linux version of the BPQ32 Node, BBS and Chat Server components. LINBPQ is a Linux version of the BPQ32 Node, BBS and Chat Server components.

8
debian/lintian-overrides vendored Normal file
View File

@ -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]

2
debian/postinst vendored
View File

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
set -e
if [ "$1" = configure ]; then if [ "$1" = configure ]; then
# if ! getent group linbpq >/dev/null; then # if ! getent group linbpq >/dev/null; then

3
debian/source/lintian-overrides vendored
View File

@ -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]