From bfc519687cdd6eff0e8ed345c90e068c51c259c9 Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Sat, 30 Nov 2024 11:19:28 +0000 Subject: [PATCH] pre-import updates --- debian/changelog | 2 +- debian/copyright | 2 ++ debian/patches/ftbfs-gcc14.patch | 48 +++++++++++++++++++++++--------- debian/watch | 3 ++ 4 files changed, 41 insertions(+), 14 deletions(-) create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index 36df7e2..fe83791 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linbpq (6.0.24.50-1~hibbian+2) UNRELEASED; urgency=medium +linbpq (6.0.24.51.1+repack-1~hibbian+2+really50) UNRELEASED; urgency=medium * Try building and working with the new build system diff --git a/debian/copyright b/debian/copyright index c50170a..2b7b7ac 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,6 +3,8 @@ Upstream-Name: linBPQ Upstream-Contact: John Wiseman G8BPQ Source: https://www.cantab.net/users/john.wiseman/Documents/ Files-Excluded: *.vcproj* *.bak *.lib *.dll *.wav *.asm *.vcxproj* *.pdb *.exe + .gitignore XAprs zlib.h zconf.h MQTT* pcap.h miniupnpc.h upnpdev.h + igd_desc_parse.h upnpcommands.h upnperrors.h miniupnpctypes.h Files: * Copyright: 1990-2024 John Wiseman G8BPQ diff --git a/debian/patches/ftbfs-gcc14.patch b/debian/patches/ftbfs-gcc14.patch index 4c0e8d1..88f2812 100644 --- a/debian/patches/ftbfs-gcc14.patch +++ b/debian/patches/ftbfs-gcc14.patch @@ -9,19 +9,6 @@ memcpy(&rlen, &Decoded[5], 4); ---- a/bpqmail.h -+++ b/bpqmail.h -@@ -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]; --- a/AGWAPI.c +++ b/AGWAPI.c @@ -128,7 +128,7 @@ @@ -33,3 +20,38 @@ 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 + }; +@@ -643,9 +643,9 @@ + // For 64 bit time_t compatibility define as long long + // (so struct is same with 32 or 64 bit time_t) + +- long long datereceived; +- long long datecreated; +- long long datechanged; ++ time_t datereceived; ++ time_t datecreated; ++ time_t datechanged; + + char Spare[61 - 24]; // For future use + } ; +@@ -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/watch b/debian/watch new file mode 100644 index 0000000..c624871 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +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)))