From 58d2baad536a03c537c68c65776f3aed34a6d8ac Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Tue, 17 Dec 2024 16:45:51 +0000 Subject: [PATCH] New upstream and packaging tweaks --- debian/changelog | 9 ++ debian/patches/dynamic-links | 44 --------- debian/patches/ftbfs-gcc14.patch | 33 ------- debian/patches/series | 3 - debian/patches/spelling-errors.patch | 139 --------------------------- 5 files changed, 9 insertions(+), 219 deletions(-) delete mode 100644 debian/patches/dynamic-links delete mode 100644 debian/patches/ftbfs-gcc14.patch delete mode 100644 debian/patches/spelling-errors.patch diff --git a/debian/changelog b/debian/changelog index 84da6c6..d40ceee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +linbpq (6.0.24.54+repack-1) UNRELEASED; urgency=medium + + * New Upstream + * Drop AGW Patch + * Drop Spelling Patch + * Drop Dynamic Links patch + + -- Dave Hibberd Mon, 16 Dec 2024 17:57:40 +0000 + linbpq (6.0.24.53+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium * New upstream diff --git a/debian/patches/dynamic-links b/debian/patches/dynamic-links deleted file mode 100644 index d097a47..0000000 --- a/debian/patches/dynamic-links +++ /dev/null @@ -1,44 +0,0 @@ ---- a/LinBPQ.c -+++ b/LinBPQ.c -@@ -717,7 +717,7 @@ - - } - --#include "getopt.h" -+#include - - static struct option long_options[] = - { ---- a/DRATS.c -+++ b/DRATS.c -@@ -563,7 +563,7 @@ - #define ZEXPORT __stdcall - #endif - --#include "zlib.h" -+#include - - - int doinflate(unsigned char * source, unsigned char * dest, int Len, int destlen, int * outLen) ---- a/HTTPcode.c -+++ b/HTTPcode.c -@@ -38,7 +38,7 @@ - #define ZEXPORT __stdcall - #endif - --#include "zlib.h" -+#include - - #define CKernel - #include "httpconnectioninfo.h" ---- a/IPCode.c -+++ b/IPCode.c -@@ -97,8 +97,6 @@ - - #include "pcap.h" - --int pcap_sendpacket(pcap_t *p, u_char *buf, int size); -- - #ifndef LINBPQ - #include "kernelresource.h" - LRESULT CALLBACK ResWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); diff --git a/debian/patches/ftbfs-gcc14.patch b/debian/patches/ftbfs-gcc14.patch deleted file mode 100644 index e8586fb..0000000 --- a/debian/patches/ftbfs-gcc14.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/AGWAPI.c -+++ b/AGWAPI.c -@@ -128,7 +128,7 @@ - int AGWGetSessionKey(char * key, struct AGWSocketConnectionInfo * sockptr); - int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr); - int SendDataToAppl(int Stream, byte * Buffer, int Length); --int InternalAGWDecodeFrame(char * msg, char * buffer, int Stamp, int * FrameType, int useLocalTime, int doNodes); -+int InternalAGWDecodeFrame(char * msg, char * buffer, time_t Stamp, int * FrameType, int useLocalTime, int doNodes); - int AGWDataSocket_Disconnect( struct AGWSocketConnectionInfo * sockptr); - int SendRawPacket(struct AGWSocketConnectionInfo * sockptr, char *txmsg, int Length); - int ShowApps(); ---- a/bpqmail.h -+++ b/bpqmail.h -@@ -502,7 +502,7 @@ - char CMSPass[16]; // For Secure Signon - int WebSeqNo; - -- long long TimeLastConnected; //Last connection date */ -+ time_t TimeLastConnected; //Last connection date */ - - char Filler[44 - 8]; // So we can add a few fields wirhout another resize - }; -@@ -695,8 +695,8 @@ - unsigned char Type; - unsigned char changed; - unsigned short seen; -- long long last_modif; -- long long last_seen; -+ time_t last_modif; -+ time_t last_seen; - char first_homebbs[41]; - char secnd_homebbs[41]; - char first_zip[9]; diff --git a/debian/patches/series b/debian/patches/series index 08d12e7..f0be4dd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ -ftbfs-gcc14.patch -spelling-errors.patch makefile -dynamic-links diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch deleted file mode 100644 index cf1d89f..0000000 --- a/debian/patches/spelling-errors.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- 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 -@@ -1045,7 +1045,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 -@@ -374,7 +374,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; - } - -@@ -382,7 +382,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 -@@ -649,7 +649,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 -@@ -1485,7 +1485,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 -@@ -1165,7 +1165,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" -@@ -1454,7 +1454,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" ---- a/WebMail.c -+++ b/WebMail.c -@@ -2020,7 +2020,7 @@ - "document.getElementById('myform').action = '/WebMail/QuoteOriginal' + '?%s';" - " document.getElementById('myform').submit();}" - ""; -+ "value='Include Original Msg'>"; - - char Temp[1024]; - char ReplyAddr[128];