From 37bacc31783a3066dabbdf8824157791e6cc8735 Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Fri, 29 Nov 2024 19:56:04 +0000 Subject: [PATCH] Update required for build on trixie - I knew there was weirdness somewhere! --- debian/changelog | 6 ++++++ debian/patches/ftbfs-gcc14.patch | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8f95ed5..b62b4c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linbpq (6.0.24.51.1+repack-1~hibbian+2) bookworm-hibbian-unstable; urgency=medium + + * Iron out an issue with time... + + -- Dave Hibberd Fri, 29 Nov 2024 19:57:28 +0000 + linbpq (6.0.24.51.1+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium * New upstream import after bug report diff --git a/debian/patches/ftbfs-gcc14.patch b/debian/patches/ftbfs-gcc14.patch index d2a6f76..88f2812 100644 --- a/debian/patches/ftbfs-gcc14.patch +++ b/debian/patches/ftbfs-gcc14.patch @@ -20,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];