diff -pruN 3.24-1/debian/changelog 3.24-1ubuntu4/debian/changelog --- 3.24-1/debian/changelog 2023-01-05 21:35:00.000000000 +0000 +++ 3.24-1ubuntu4/debian/changelog 2025-09-22 09:01:22.000000000 +0000 @@ -1,3 +1,36 @@ +procmail (3.24-1ubuntu4) questing; urgency=medium + + * Fix FTBFS with GCC-15 (LP: #2125339), thanks to Santiago Vila. + - Fix src/autoconf for gcc-15. + + d/p/autoconf-fix-for-gcc-15.patch + + d/p/skip-const-probe.patch + - Do not "fix" prototype for uname(). + + d/p/do-not-fix-uname.patch + - d/rules: Build using C17 standard with GNU extensions. + + -- Lukas Märdian Mon, 22 Sep 2025 11:01:22 +0200 + +procmail (3.24-1ubuntu3) oracular; urgency=medium + + * d/p/fix-gcc-14-build.patch: Fix build with gcc-14. + Forward-port of ftbfs fix from 3.24+really3.22-3 to 3.24. + (LP: #2078301) + + -- Bryce Harrington Fri, 30 Aug 2024 12:03:04 -0700 + +procmail (3.24-1ubuntu2) noble; urgency=high + + * No change rebuild for 64-bit time_t and frame pointers. + + -- Julian Andres Klode Mon, 08 Apr 2024 18:16:20 +0200 + +procmail (3.24-1ubuntu1) noble; urgency=medium + + * d/t/basic: Add basic DEP8 packaging/integration test cases. + (LP: #1679365) + + -- Bryce Harrington Thu, 07 Dec 2023 09:18:34 -0800 + procmail (3.24-1) unstable; urgency=medium * New upstream release, now hosted on github. Closes: #1006633. diff -pruN 3.24-1/debian/control 3.24-1ubuntu4/debian/control --- 3.24-1/debian/control 2023-01-05 20:00:00.000000000 +0000 +++ 3.24-1ubuntu4/debian/control 2025-09-22 07:48:24.000000000 +0000 @@ -1,7 +1,8 @@ Source: procmail Section: mail Priority: optional -Maintainer: Santiago Vila +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Santiago Vila Build-Depends: debhelper-compat (= 13) Rules-Requires-Root: binary-targets Standards-Version: 4.6.2 diff -pruN 3.24-1/debian/patches/autoconf-fix-for-gcc-15.patch 3.24-1ubuntu4/debian/patches/autoconf-fix-for-gcc-15.patch --- 3.24-1/debian/patches/autoconf-fix-for-gcc-15.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.24-1ubuntu4/debian/patches/autoconf-fix-for-gcc-15.patch 2025-09-22 09:01:22.000000000 +0000 @@ -0,0 +1,45 @@ +From: Santiago Vila +Subject: Fixes for gcc-15 +Bug-Debian: https://bugs.debian.org/1097653 +X-Debian-version: 3.24+really3.22-5 + +--- a/src/autoconf ++++ b/src/autoconf +@@ -422,12 +422,12 @@ + int sfdlock(int fd); + int fdunlock(); + +-void stimeout() ++void stimeout(int sig) + { timeout=1;close(fdcollect);killchildren(); + } + +-void Terminate() +-{ stimeout();exit(1); ++void Terminate(int sig) ++{ stimeout(sig);exit(1); + } + + static unsigned long seed; +@@ -1039,8 +1039,8 @@ + #ifndef NO_COMSAT + #include "network.h" + #endif +-int setrgid(); +-int setresgid(); ++int setrgid(int dummy); ++int setresgid(int dummy1, int dummy2, int dummy3); + int main(){char a[2]; + endpwent();endgrent();memmove(a,"0",1);bcopy("0",a,1);strcspn(a,"0"); + strtol("0",(char**)0,10);strchr("0",'0');strpbrk(a,"0");rename(a,"0"); +@@ -1200,8 +1200,8 @@ + #ifdef BENCHSIZE + #undef strstr /* from includes.h */ + #undef free /* from shell.h */ +-unsigned long dobench(strstr,iter,haystack)char*(*const strstr)(); +- unsigned long iter;const char*const haystack; ++unsigned long dobench(char* (*const strstr)(const char*, const char*), ++ unsigned long iter, const char* const haystack) + { unsigned long to; + to=(unsigned long)clock(); + do (*strstr)(haystack,FROM_EXPR); diff -pruN 3.24-1/debian/patches/do-not-fix-uname.patch 3.24-1ubuntu4/debian/patches/do-not-fix-uname.patch --- 3.24-1/debian/patches/do-not-fix-uname.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.24-1ubuntu4/debian/patches/do-not-fix-uname.patch 2025-09-22 09:01:22.000000000 +0000 @@ -0,0 +1,16 @@ +From: Santiago Vila +Subject: Do not "fix" prototype for uname() +Bug-Debian: https://bugs.debian.org/1097653 +X-Debian-version: 3.24+really3.22-5 + +--- procmail-3.24+really3.22.orig/src/includes.h ++++ procmail-3.24+really3.22/src/includes.h +@@ -331,7 +331,7 @@ extern int errno; + + #ifndef NOuname + #ifndef P /* SINIX V5.23 has the wrong prototype for uname() */ +-extern int uname(); /* so we fix it :-) */ ++/* extern int uname(); /* so we fix it :-) */ + #define Uname(name) ((int(*)(struct utsname*))uname)(name) + #else + #define Uname(name) uname(name) /* no fix needed */ diff -pruN 3.24-1/debian/patches/fix-gcc-14-build.patch 3.24-1ubuntu4/debian/patches/fix-gcc-14-build.patch --- 3.24-1/debian/patches/fix-gcc-14-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.24-1ubuntu4/debian/patches/fix-gcc-14-build.patch 2025-09-22 07:48:24.000000000 +0000 @@ -0,0 +1,129 @@ +Description: Fix build with gcc-14 + Forward-port of FTBFS fix from Debian 3.24+really3.22-3 +Author: Santiago Vila +Origin: backport, https://snapshot.debian.org/package/procmail/3.24%2Breally3.22-3/ +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/procmail/+bug/2078301 +Bug-Debian: https://bugs.debian.org/1075398 + + +--- a/initmake ++++ b/initmake +@@ -124,7 +124,7 @@ + fi + + cat >_autotst.c < + #include + #include +-main() ++int main() + { struct stat buf;return!&buf; + } + HERE +--- a/src/autoconf ++++ b/src/autoconf +@@ -416,6 +416,12 @@ + int dolock,child[NR_of_forks],timeout,fdcollect; + char dirlocktest[]="_locktest"; + ++#include ++int killchildren(); ++int fdlock(int fd); ++int sfdlock(int fd); ++int fdunlock(); ++ + void stimeout() + { timeout=1;close(fdcollect);killchildren(); + } +@@ -437,7 +443,7 @@ + return pid; + } + +-int main(argc,argv)char*argv[]; ++int main(int argc,char*argv[]) + { int goodlock,testlock,i,pip[2],pipw[2];time_t otimet;unsigned dtimet; + static char filename[]="_locktst.l0"; + close(0);goodlock=0;testlock=FIRST_lock;signal(SIGPIPE,SIG_DFL); +@@ -587,13 +593,13 @@ + return 0; + } + +-int sfdlock(fd) ++int sfdlock(int fd) + { int i;unsigned gobble[GOBBLE>>2]; + for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */ + return fdlock(fd); + } + +-static oldfdlock; ++static int oldfdlock; + #ifdef F_SETLKW + static struct flock flck; /* why can't it be a local variable? */ + #endif +@@ -601,7 +607,7 @@ + static off_t oldlockoffset; + #endif + +-int fdlock(fd) ++int fdlock(int fd) + { int i;unsigned gobble[GOBBLE>>2]; + for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */ + oldfdlock=fd;fd=0; +@@ -997,11 +1003,11 @@ + i+=WIFEXITED(i); + i+=WIFSTOPPED(i); + i+=WEXITSTATUS(i); +- i+=WSIGTERM(i); ++ i+=WTERMSIG(i); + return i;} + HERE + +-echo 'Testing for WIFEXITED(), WIFSTOPPED(), WEXITSTATUS() & WSIGTERM()' ++echo 'Testing for WIFEXITED(), WIFSTOPPED(), WEXITSTATUS() & WTERMSIG()' + if $MAKE _autotst.$O >_autotst.rrr 2>&1 + then + $FGREP -v include/ <_autotst.rrr >_autotst.$O +@@ -1033,6 +1039,8 @@ + #ifndef NO_COMSAT + #include "network.h" + #endif ++int setrgid(); ++int setresgid(); + int main(){char a[2]; + endpwent();endgrent();memmove(a,"0",1);bcopy("0",a,1);strcspn(a,"0"); + strtol("0",(char**)0,10);strchr("0",'0');strpbrk(a,"0");rename(a,"0"); +@@ -1059,7 +1067,7 @@ + echo ' rename, setrgid, setegid, pow, opendir, mkdir, waitpid, fsync,' + echo ' ftruncate, strtod, strncasecmp, strerror, strlcat,' + echo ' memset, bzero, and _exit' +-if $MAKE _autotst.$O >$DEVNULL 2>&1 ++if $MAKE _autotst.$O >_autotst.rrr 2>&1 + then + : + else +@@ -1201,7 +1209,7 @@ + return (unsigned long)clock()-to; + } + #endif +-int main(argc,argv)int argc;const char*argv[]; ++int main(int argc,const char*argv[]) + { if(argc==1) + { char*haystack; + #ifdef BENCHSIZE +--- a/src/mailfold.c ++++ b/src/mailfold.c +@@ -373,7 +373,7 @@ + } + } + +-int readmail(rhead,tobesent)int rhead;const long tobesent; ++int readmail(int rhead,const long tobesent) + { char*chp,*pastend;static size_t contlengthoffset; + ;{ long dfilled; + if(rhead==2) /* already read, just examine what we have */ diff -pruN 3.24-1/debian/patches/series 3.24-1ubuntu4/debian/patches/series --- 3.24-1/debian/patches/series 2023-01-05 20:00:00.000000000 +0000 +++ 3.24-1ubuntu4/debian/patches/series 2025-09-22 09:01:22.000000000 +0000 @@ -8,3 +8,7 @@ define-default-path.patch define-defaultdotlock-to-follow-locking-policy.patch do-not-search-for-var-mail.patch hardcode-things-for-biff.patch +fix-gcc-14-build.patch +autoconf-fix-for-gcc-15.patch +skip-const-probe.patch +do-not-fix-uname.patch diff -pruN 3.24-1/debian/patches/skip-const-probe.patch 3.24-1ubuntu4/debian/patches/skip-const-probe.patch --- 3.24-1/debian/patches/skip-const-probe.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.24-1ubuntu4/debian/patches/skip-const-probe.patch 2025-09-22 09:01:22.000000000 +0000 @@ -0,0 +1,63 @@ +From: Santiago Vila +Subject: Skip probe for const +Bug-Debian: https://bugs.debian.org/1097653 +X-Debian-version: 3.24+really3.22-5 + +--- a/src/autoconf ++++ b/src/autoconf +@@ -703,55 +703,6 @@ + + + cat >_autotst.c < /* execvp() */ +-#endif +-int a(b)const int b[]; +-{ return *++b; /* watcom 10.6 on QNX refuses this */ +-} +-int main() +-{ char r[]="",*const*p;char*q="";const char*s=""; +- static const char*const nullp=0,*const*d= &nullp; /* AIX 3.2.3 failure */ +- static struct{const int a;int b;}c[2]={{0,0},{0,0}};/* IRIX 7.3.1 compiler */ +- /* requires initializers on static const objects */ +- --(c+1)->b; /* AIX 3.1.5 machines can't do this */ +- p= &q; +- ;{ int pip[2]; +- pipe(pip); +- if(fork()) /* this should hide core dumps from the shell */ +- { close(pip[1]); /* close the writing end */ +- return 1==read(pip[0],r,1)?0:1; /* wait for the rendevouz */ +- } +- close(pip[0]); /* close the writing end */ +- if(!*d&&c[1].b) /* some magic to confuse the optimiser */ +- d=(const char*const*)p; /* core dumps Ultrix 4.3 ANSI C */ +- else /* so that it can't complain about the uselessness of this program */ +- execvp(q,p); /* IRIX 4.0.1 system-includes are wrong on this point */ +- if(write(pip[1],r,1)!=1) /* notify mam that we survived */ +- return 1; /* oops, lost mam somehow */ +- } +- return r==s; /* Domain/OS warns here, not about "r==s" though */ +-} +-HERE +- +-echo 'Testing for const' +-if $MAKE _autotst.$O 2>&1 | $FGREP -v include/ >_autotst.rrr +- test -f _autotst.$O && $MAKE _autotst >$DEVNULL 2>&1 && _autotst +-then +- grepfor const '#define NO_const' +-else +- echo '#define NO_const' >>$ACONF +- set dummy *core* +- if test -f $2 -a $nocore = yes +- then +- echo "Removing core file (bogus readonly segment)" +- $RM *core* +- fi +-fi +-$RM _autotst.$O _autotst +- +-cat >_autotst.c < "${rcfile}" < "${rcfile}" < "${rcfile}" <