Control: tags 1097928 + pending
Dear maintainer, I have prepared an NMU for squidguard (versioned as 1.6.0-6.1). The diff is attached to this message. I require a sponsor to have it uploaded. Regards. diffstat for squidguard-1.6.0 squidguard-1.6.0 changelog | 9 +++++++++ patches/12_fix-ftbfs-gcc15.patch | 39 +++++++++++++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 49 insertions(+) diff -Nru squidguard-1.6.0/debian/changelog squidguard-1.6.0/debian/changelog --- squidguard-1.6.0/debian/changelog 2024-04-04 03:25:49.000000000 +0530 +++ squidguard-1.6.0/debian/changelog 2026-05-23 00:00:00.000000000 +0530 @@ -1,3 +1,12 @@ +squidguard (1.6.0-6.1) unstable; urgency=medium + + * Non-maintainer upload. + * Patch src/sg.h.in: + - Fix FTBFS with GCC-15 by giving sgAlarm and sgDbInit real + prototypes. Closes: #1097928 + + -- Azeez Syed <[email protected]> Sat, 23 May 2026 00:00:00 +0530 + squidguard (1.6.0-6) unstable; urgency=medium * debian/control: diff -Nru squidguard-1.6.0/debian/patches/12_fix-ftbfs-gcc15.patch squidguard-1.6.0/debian/patches/12_fix-ftbfs-gcc15.patch --- squidguard-1.6.0/debian/patches/12_fix-ftbfs-gcc15.patch 1970-01-01 05:30:00.000000000 +0530 +++ squidguard-1.6.0/debian/patches/12_fix-ftbfs-gcc15.patch 2026-05-23 00:00:00.000000000 +0530 @@ -0,0 +1,39 @@ +Description: Fix FTBFS with GCC-15 due to C23 empty parameter list semantics + GCC-15 defaults to C23, where an empty parameter list "()" in a function + declaration means "(void)" rather than the historical "unspecified + parameters". The __P(()) macro in sg.h.in therefore conflicts with two + function definitions that take real arguments, causing build failures: + . + sgDb.c:30: error: conflicting types for 'sgDbInit'; + have 'void(struct sgDb *, char *)' + sg.h:434: note: previous declaration with type 'void(void)' + . + Align the declarations of sgAlarm and sgDbInit with their definitions. + The same two-line change is shipped by Fedora rawhide and openSUSE + Factory. +Author: Azeez Syed <[email protected]> +Bug-Debian: https://bugs.debian.org/1097928 +Origin: vendor, https://src.fedoraproject.org/rpms/squidGuard/c/0dadeebd5fc3a6efae2666989e1ec545fe4fc02a +Forwarded: no +Last-Update: 2026-05-23 +--- +diff -urN s11/src/sg.h.in s12/src/sg.h.in +--- s11/src/sg.h.in 2019-02-02 18:00:40.000000000 +0100 ++++ s12/src/sg.h.in 2026-05-23 00:00:00.000000000 +0000 +@@ -360,7 +360,7 @@ char *sgStripUrl __P((char *)); + void sgEmergency __P(()); + void sgReloadConfig __P(()); + void sgHandlerSigHUP __P((int)); +-void sgAlarm __P(()); ++void sgAlarm __P((int)); + int sgStrRcmp __P((char *, char *)); + int sgStrRncmp __P((char *, char *, int)); + int sgDomStrRncmp __P((char *, char *, int)); +@@ -431,7 +431,7 @@ void sgFreePatternBuffer __P((struct s + int sgRegExpMatch __P((struct sgRegExp *, char *)); + char *sgRegExpSubst __P((struct sgRegExp *, char *)); + +-void sgDbInit __P(()); ++void sgDbInit __P((struct sgDb *, char *)); + void sgDbLoadTextFile __P((struct sgDb *, char *, int)); + void sgDbUpdate __P((struct sgDb *, char *, char *, size_t)); diff -Nru squidguard-1.6.0/debian/patches/series squidguard-1.6.0/debian/patches/series --- squidguard-1.6.0/debian/patches/series 2024-04-04 03:07:15.000000000 +0530 +++ squidguard-1.6.0/debian/patches/series 2026-05-22 22:01:20.000000000 +0530 @@ -1,2 +1,3 @@ 10_fix-ftbfs-for-gcc10.patch 11_fix-configure-check.patch +12_fix-ftbfs-gcc15.patch
