From c26f6fe9d87b95a1b47c14f54108611813d7b498 Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Sun, 9 Jun 2024 22:10:25 +0100 Subject: [PATCH] Packaging updates round 2 --- debian/changelog | 24 ++--- debian/control | 11 +-- debian/lintian-overrides | 10 +++ debian/manpages/qsstv.1 | 21 ----- debian/patches/series | 1 + debian/patches/spelling-errors.patch | 128 +++++++++++++++++++++++++++ debian/source/include-binaries | 5 -- 7 files changed, 157 insertions(+), 43 deletions(-) delete mode 100644 debian/manpages/qsstv.1 create mode 100644 debian/patches/spelling-errors.patch diff --git a/debian/changelog b/debian/changelog index 67c9ecd..d70f1c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,19 +8,19 @@ linbpq (6.0.24.38-1) UNRELEASED; urgency=medium linbpq (6.0.24.34-2) unstable; urgency=medium - * Fix config permissions bug as reported by Alex 2E1PKY + * Fix config permissions bug as reported by Alex 2E1PKY -- Dave Hibberd Mon, 08 Apr 2024 22:27:02 +0100 linbpq (6.0.24.34-1) unstable; urgency=medium - * Upstream bump + * Upstream bump -- Dave Hibberd Sat, 06 Apr 2024 02:15:28 +0100 linbpq (6.0.24.33-1) unstable; urgency=medium - * Upstream bump + * Upstream bump * Moved config file to examples * Updated service to fail on no config * Added helpful README.Debian @@ -29,13 +29,13 @@ linbpq (6.0.24.33-1) unstable; urgency=medium linbpq (6.0.24.30-1) unstable; urgency=medium - * Upstream bump + * Upstream bump -- Dave Hibberd Fri, 23 Feb 2024 23:24:46 +0000 linbpq (6.0.24.29-1) unstable; urgency=medium - * Upstream bump + * Upstream bump * Added my new details * Tidied up some packaging errors @@ -43,13 +43,13 @@ linbpq (6.0.24.29-1) unstable; urgency=medium linbpq (6.0.24.27-2) unstable; urgency=medium - * Permissions fix for web-config-editor users + * Permissions fix for web-config-editor users -- Dave Hibberd Thu, 18 Jan 2024 10:31:56 +0000 linbpq (6.0.24.27-1) unstable; urgency=medium - * New Upstream Release + * New Upstream Release -- Dave Hibberd Tue, 16 Jan 2024 20:51:43 +0000 @@ -61,19 +61,19 @@ linbpq (6.0.24.25-1) unstable; urgency=medium linbpq (6.0.24.22-2) unstable; urgency=medium - * Moved config file home, caused chaos + * Moved config file home, caused chaos -- Dave Hibberd Sat, 16 Dec 2023 14:40:20 +0000 linbpq (6.0.24.22-1) unstable; urgency=medium - * New Upstream Release + * New Upstream Release -- Dave Hibberd Fri, 08 Dec 2023 12:29:40 +0000 linbpq (6.0.24.16-1) unstable; urgency=medium - * New Upstream release + * New Upstream release -- Dave Hibberd Tue, 31 Oct 2023 22:50:01 +0000 @@ -86,12 +86,12 @@ linbpq (6.0.24.15-2) unstable; urgency=medium linbpq (6.0.24.15-1) unstable; urgency=medium - * New upstream release + * New upstream release -- Dave Hibberd Tue, 10 Oct 2023 22:19:48 +0100 linbpq (6.0.24.2-1) unstable; urgency=medium - * Initial release. + * Initial release. -- Dave Hibberd Mon, 28 Aug 2023 23:20:45 +0100 diff --git a/debian/control b/debian/control index 5b54022..e879a32 100644 --- a/debian/control +++ b/debian/control @@ -1,12 +1,10 @@ Source: linbpq Section: hamradio Priority: optional -Maintainer: Debian Hamradio Maintainers -Uploaders: - Dave Hibberd , +Maintainer: Dave Hibberd Standards-Version: 4.7.0.0 -Vcs-Browser: -Vcs-Git: +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 Rules-Requires-Root: no @@ -16,3 +14,6 @@ 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. diff --git a/debian/lintian-overrides b/debian/lintian-overrides index a03b8a4..1e12a54 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -6,3 +6,13 @@ linbpq: embedded-library libminiupnpc [usr/sbin/linbpq] linbpq: embedded-library libpng [usr/sbin/linbpq] # i know! linbpq: no-manual-page [usr/sbin/linbpq] +# Build fails +linbpq: hardening-no-bindnow [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 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] diff --git a/debian/manpages/qsstv.1 b/debian/manpages/qsstv.1 deleted file mode 100644 index ae54783..0000000 --- a/debian/manpages/qsstv.1 +++ /dev/null @@ -1,21 +0,0 @@ -.TH QSSTV 1 - -.SH NAME -qsstv \- Qt based slow scan television and fax - -.SH SYNOPSIS -.B qsstv - -.SH DESCRIPTION -.B qsstv -is a program for sending and receiving slow-scan TV and fax. -These are modes used by hamradio operators. -Qsstv uses a soundcard to send and receive images. - -.SH SEE ALSO -The qsstv documentation is available from -http://users.telenet.be/on4qz/qsstv/manual - -.SH FILES -Settings for qsstv are saved in -.I $HOME/qsstv.conf diff --git a/debian/patches/series b/debian/patches/series index f0be4dd..5d2b07a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +spelling-errors.patch makefile diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch new file mode 100644 index 0000000..78f5260 --- /dev/null +++ b/debian/patches/spelling-errors.patch @@ -0,0 +1,128 @@ +--- a/APRSCode.c ++++ b/APRSCode.c +@@ -3674,7 +3674,7 @@ + if (ptr1) + *ptr1 = 0; + +-// Debugprintf("Duplicate Message supressed %s", Msg); ++// Debugprintf("Duplicate Message suppressed %s", Msg); + return TRUE; // Duplicate + } + } +--- a/BPQChat.rc ++++ b/BPQChat.rc +@@ -162,7 +162,7 @@ + WS_VSCROLL + DEFPUSHBUTTON "Save Welcome Message",SAVEWELCOME,140,296,91,14, + BS_CENTER | BS_VCENTER +- LTEXT " If the node is not directly connectable (ie is not in your NODES table) you can add a connect script. This consists of a series of commands seperared by |, eg NOTCHT:G8BPQ-4|C 3 GM8BPQ-9|CHAT", ++ LTEXT " If the node is not directly connectable (ie is not in your NODES table) you can add a connect script. This consists of a series of commands separated by |, eg NOTCHT:G8BPQ-4|C 3 GM8BPQ-9|CHAT", + IDC_STATIC,9,52,355,24 + END + +--- a/BPQMail.rc ++++ b/BPQMail.rc +@@ -1042,7 +1042,7 @@ + CONTROL "Delete Log and Message Files to Recycle Bin", + IDC_DELETETORECYCLE,"Button",BS_AUTOCHECKBOX | + BS_LEFTTEXT | BS_MULTILINE | WS_TABSTOP,5,142,115,20 +- CONTROL "Supress Mailing of Housekeeping Results", ++ CONTROL "Suppress Mailing of Housekeeping Results", + IDC_MAINTNOMAIL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | + BS_MULTILINE | WS_TABSTOP,5,182,115,20 + CONTROL "Generate Traffic Report",IDC_MAINTTRAFFIC,"Button", +--- a/HanksRT.c ++++ b/HanksRT.c +@@ -1186,7 +1186,7 @@ + // Duplicate, so discard, but save time + + DupInfo[i].DupTime = Now; +- Logprintf(LOG_CHAT, circuit, '?', "Duplicate Message From %s %s supressed", Call, Msg); ++ Logprintf(LOG_CHAT, circuit, '?', "Duplicate Message From %s %s suppressed", Call, Msg); + + return TRUE; // Duplicate + } +--- a/RigControl.c ++++ b/RigControl.c +@@ -8385,7 +8385,7 @@ + + switch (Msg[0]) + { +- case 'f': // Get Freqency ++ case 'f': // Get Frequency + + HLGetFreq(Sock, RIG, sep); + return 0; +--- a/UZ7HODrv.c ++++ b/UZ7HODrv.c +@@ -369,7 +369,7 @@ + { + // Read Freq + +- buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Modem Freqency %d\r", AGW->CenterFreq); ++ buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Modem Frequency %d\r", AGW->CenterFreq); + return 1; + } + +@@ -377,7 +377,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; + } + +--- a/WinRPRHelper.c ++++ b/WinRPRHelper.c +@@ -111,7 +111,7 @@ + + if (argc < 3) + { +- printf ("Missing paramters - you need COM port and IP Address and rigctl port of BPQ, eg \r\n" ++ printf ("Missing parameters - you need COM port and IP Address and rigctl port of BPQ, eg \r\n" + " WinRPRHelper com10 192.168.1.64:4532\r\n\r\n" + "Press any key to exit\r\n"); + +--- a/config.c ++++ b/config.c +@@ -638,7 +638,7 @@ + if (LOCATOR[0] == 0 && LocSpecified == 0 && RFOnly == 0) + { + Consoleprintf(""); +- Consoleprintf("Please enter a LOCATOR statment in your BPQ32.cfg"); ++ Consoleprintf("Please enter a LOCATOR statement in your BPQ32.cfg"); + Consoleprintf("If you really don't want to be on the Node Map you can enter LOCATOR=NONE"); + Consoleprintf(""); + +--- a/kiss.c ++++ b/kiss.c +@@ -1469,7 +1469,7 @@ + } + } + else +- Debugprintf("Polled KISS - response from wrong address - Polled %d Reponse %d", ++ Debugprintf("Polled KISS - response from wrong address - Polled %d Response %d", + KISS->POLLPOINTER->OURCTRL, (Port->RXMSG[0] & 0xf0)); + + goto SeeifMore; // SEE IF ANYTHING ELSE +--- a/templatedefs.c ++++ b/templatedefs.c +@@ -1158,7 +1158,7 @@ + "Send Non-delivery Notifications
\r\n" + "for P and T messages
\r\n" + "
\r\n" +- "Supress Mailing of
\r\n" ++ "Suppress Mailing of
\r\n" + "Housekeeping Result

\r\n" + "Generate Traffic Report

\r\n" + "
\r\n" +@@ -1446,7 +1446,7 @@ + "
The Nodes to link to box defines which other Chat Nodes should be connected to, or from which " + "connections may be accepted. The format is ALIAS:CALL, eg BPQCHT:G8BPQ-4. If the node is not directly " + "connectable (ie is not in your NODES table) you can add a connect script. This consists of a series of commands " +- "seperared by |, eg NOTCHT:G8BPQ-4|C 3 GM8BPQ-9|CHAT" ++ "separated by |, eg NOTCHT:G8BPQ-4|C 3 GM8BPQ-9|CHAT" + + "

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.
\r\n" + "
\n" diff --git a/debian/source/include-binaries b/debian/source/include-binaries index e5c9b0a..e69de29 100644 --- a/debian/source/include-binaries +++ b/debian/source/include-binaries @@ -1,5 +0,0 @@ -debian/templates/CQ_1.templ -debian/templates/simple_replay.templ -debian/templates/im_reply.templ -debian/templates/CQ_2.templ -debian/templates/comment.templ