Patch Refresh and mqtt details

This commit is contained in:
Hibby 2024-11-05 21:46:27 +00:00
parent 5767c5f6e8
commit 6b795ee1f6
Signed by: hibby
SSH Key Fingerprint: SHA256:8HEV3623pJdfvWusnu47MzoqVh1gWhYSDeGKQJYkqNA
7 changed files with 31 additions and 41 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.pc/

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
linbpq (6.0.24.49-1) UNRELEASED; urgency=medium
* New Upstream import
* Patches refreshed
* Add mqtt requirements
-- hibby <hibby@velox.tail0fd4.ts.net> Tue, 05 Nov 2024 21:03:31 +0000
linbpq (6.0.24.45-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
* New upstream import

2
debian/control vendored
View File

@ -6,7 +6,7 @@ Standards-Version: 4.7.0.0
Vcs-Browser: https://github.com/Online-Amateur-Radio-Club-M0OUK/oarc-bpqnode
Vcs-Git: https://github.com/Online-Amateur-Radio-Club-M0OUK/oarc-bpqnode.git
Homepage: https://www.cantab.net/users/john.wiseman/Documents/
Build-Depends: debhelper-compat (= 13), libssl-dev, libminiupnpc-dev, libpcap-dev, libconfig-dev, zlib1g-dev
Build-Depends: debhelper-compat (= 13), libssl-dev, libminiupnpc-dev, libpcap-dev, libconfig-dev, zlib1g-dev, libpaho-mqtt-dev, libjansson-dev
Rules-Requires-Root: no
Package: linbpq

View File

@ -33,23 +33,3 @@
int AGWDataSocket_Disconnect( struct AGWSocketConnectionInfo * sockptr);
int SendRawPacket(struct AGWSocketConnectionInfo * sockptr, char *txmsg, int Length);
int ShowApps();
--- a/AGWMoncode.c
+++ b/AGWMoncode.c
@@ -68,7 +68,7 @@
static UCHAR * DISPLAYARPDATAGRAM(UCHAR * Datagram, UCHAR * Output);
-int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, int Stamp, int * FrameType, int useLocalTime, int DoNodes)
+int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, time_t Stamp, int * FrameType, int useLocalTime, int DoNodes)
{
UCHAR * ptr;
int n;
@@ -364,7 +364,7 @@
}
if (Output == NULL)
- return NULL;
+ return 0;
if (Output[-1] != 13)
Output += sprintf((char *)Output, "\r");

View File

@ -35,13 +35,14 @@
BOOL CompareCalls(UCHAR * c1, UCHAR * c2);
VOID PostDataAvailable(TRANSPORTENTRY * Session);
@@ -427,4 +427,4 @@
extern int MinCounter[MaxBPQPortNo + 1]; // Interval Countdown
extern BOOL SendFromFile[MaxBPQPortNo + 1];
@@ -437,7 +437,6 @@
-DllExport uint64_t APIENTRY GetPortFrequency(int PortNo, char * FreqStringMhz);
\ No newline at end of file
+DllExport uint64_t APIENTRY GetPortFrequency(int PortNo, char * FreqStringMhz);
DllExport uint64_t APIENTRY GetPortFrequency(int PortNo, char * FreqStringMhz);
-
void hookL2SessionAccepted(int Port, char * remotecall, char * ourcall, struct _LINKTABLE * LINK);
void hookL2SessionDeleted(struct _LINKTABLE * LINK);
void hookL2SessionAttempt(int Port, char * ourcall, char * remotecall, struct _LINKTABLE * LINK);
--- a/WinRPR.c
+++ b/WinRPR.c
@@ -63,7 +63,6 @@
@ -106,7 +107,7 @@
static UCHAR * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen, int DoNodes);
--- a/Bpq32.c
+++ b/Bpq32.c
@@ -1411,7 +1411,6 @@
@@ -1415,7 +1415,6 @@
VOID FindLostBuffers();
BOOL InitializeTNCEmulator();
VOID TNCTimer();
@ -247,7 +248,7 @@
--- a/CommonCode.c
+++ b/CommonCode.c
@@ -570,7 +570,7 @@
@@ -571,7 +571,7 @@
return ptr;
}

View File

@ -1,21 +1,21 @@
--- a/makefile
+++ b/makefile
@@ -29,11 +29,15 @@
@@ -33,11 +33,14 @@
linbpq: $(OBJS)
gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz -lpthread -lconfig -lpcap -o linbpq
gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq
- sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
+# setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
+
+install:
+ install -b -m 755 -D -d debian/linbpq/usr/sbin
+ install -b -m 755 -s -p linbpq debian/linbpq/usr/sbin
+ # sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
-include *.d
clean :
-clean :
- rm *.d
- rm linbpq $(OBJS)
+install:
+ install -b -m 755 -D -d debian/linbpq/usr/sbin
+ install -b -m 755 -s -p linbpq debian/linbpq/usr/sbin
+clean:
+ $(RM) *.d
+ $(RM) linbpq $(OBJS)

View File

@ -86,7 +86,7 @@
--- a/config.c
+++ b/config.c
@@ -638,7 +638,7 @@
@@ -644,7 +644,7 @@
if (LOCATOR[0] == 0 && LocSpecified == 0 && RFOnly == 0)
{
Consoleprintf("");
@ -97,7 +97,7 @@
--- a/kiss.c
+++ b/kiss.c
@@ -1476,7 +1476,7 @@
@@ -1485,7 +1485,7 @@
}
}
else