Last batch of changes, ready for release!

This commit is contained in:
Hibby 2024-11-29 13:23:18 +00:00
parent 3a840054a7
commit c0637b3841
No known key found for this signature in database
10 changed files with 23 additions and 20 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
.pc/
*.swp

BIN
XAprs

Binary file not shown.

8
debian/changelog vendored
View File

@ -1,9 +1,13 @@
linbpq (6.0.24.51-1~hibbian+1) UNRELEASED; urgency=medium linbpq (6.0.24.51+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
* New upstream import * New upstream import
- Patches refreshed - 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
-- Dave Hibberd <hibby@debian.org> Thu, 28 Nov 2024 22:34:23 +0000 -- 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 linbpq (6.0.24.50-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium

1
debian/copyright vendored
View File

@ -3,6 +3,7 @@ Upstream-Name: linBPQ
Upstream-Contact: John Wiseman G8BPQ <john.wiseman@cantab.net> Upstream-Contact: John Wiseman G8BPQ <john.wiseman@cantab.net>
Source: https://www.cantab.net/users/john.wiseman/Documents/ Source: https://www.cantab.net/users/john.wiseman/Documents/
Files-Excluded: *.vcproj* *.bak *.lib *.dll *.wav *.asm *.vcxproj* *.pdb *.exe Files-Excluded: *.vcproj* *.bak *.lib *.dll *.wav *.asm *.vcxproj* *.pdb *.exe
.gitignore XAprs
Files: * Files: *
Copyright: 1990-2024 John Wiseman G8BPQ <john.wiseman@cantab.net> Copyright: 1990-2024 John Wiseman G8BPQ <john.wiseman@cantab.net>

View File

@ -8,6 +8,4 @@ linbpq: package-contains-empty-directory [opt/oarc/bpq/]
# Code convenience # Code convenience
linbpq: spelling-error-in-binary Dont Don't [usr/sbin/linbpq] 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 Paramters Parameters [usr/sbin/linbpq]
linbpq: spelling-error-in-binary WiH With [usr/sbin/linbpq]
linbpq: spelling-error-in-binary lable label [usr/sbin/linbpq]
linbpq: spelling-error-in-binary lon long [usr/sbin/linbpq] linbpq: spelling-error-in-binary lon long [usr/sbin/linbpq]

View File

@ -22,7 +22,7 @@
linbpq: $(OBJS) linbpq: $(OBJS)
- gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz $(LDFLAGS) -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 - sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
+ gcc $(OBJS) $(LDFLAGS) $(LIBS) -o linbpq + gcc $(OBJS) $(CLFAGS) $(LDFLAGS) $(LIBS) -o linbpq
+ # sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq + # sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
-include *.d -include *.d
@ -33,7 +33,7 @@
- -
+install: +install:
+ install -b -m 755 -D -d debian/linbpq/usr/sbin + install -b -m 755 -D -d debian/linbpq/usr/sbin
+ install -b -m 755 -s -p linbpq debian/linbpq/usr/sbin + install -b -m 755 -p linbpq debian/linbpq/usr/sbin
+ +
+clean: +clean:
+ $(RM) *.d + $(RM) *.d

View File

@ -1,10 +0,0 @@
--- a/TelnetV6.c
+++ b/TelnetV6.c
@@ -427,6 +427,7 @@
TCP->IPV4 = TRUE;
TCP->SecureTelnet = 1;
strcpy(TCP->CMSServer, "cms.winlink.org");
+ TCP->SecureTelnet = 1;
}
TNC = TNCInfo[Port];

View File

@ -126,3 +126,14 @@
"<br><br>The Callsign of the Chat Node is not defined here - it is obtained from the bpq32.cfg APPLICATION line corresponding to the Chat Appl Number.<br>\r\n" "<br><br>The Callsign of the Chat Node is not defined here - it is obtained from the bpq32.cfg APPLICATION line corresponding to the Chat Appl Number.<br>\r\n"
"<br></div>\n" "<br></div>\n"
--- a/WebMail.c
+++ b/WebMail.c
@@ -2020,7 +2020,7 @@
"document.getElementById('myform').action = '/WebMail/QuoteOriginal' + '?%s';"
" document.getElementById('myform').submit();}</script>"
"<input type=button class='btn' onclick='myfunc()' "
- "value='Include Orignal Msg'>";
+ "value='Include Original Msg'>";
char Temp[1024];
char ReplyAddr[128];

View File

@ -1,3 +0,0 @@
# 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]

2
debian/watch vendored
View File

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