Control: tags 957841 + patch Control: tags 957841 + pending Dear maintainer,
I've prepared an NMU for squidguard (versioned as 1.6.0-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. -- Regards Sudip diff -Nru squidguard-1.6.0/debian/changelog squidguard-1.6.0/debian/changelog --- squidguard-1.6.0/debian/changelog 2019-02-02 17:13:22.000000000 +0000 +++ squidguard-1.6.0/debian/changelog 2020-08-06 22:42:00.000000000 +0100 @@ -1,3 +1,10 @@ +squidguard (1.6.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix ftbfs with GCC-10. (Closes: #957841) + + -- Sudip Mukherjee <sudipm.mukher...@gmail.com> Thu, 06 Aug 2020 22:42:00 +0100 + squidguard (1.6.0-1) unstable; urgency=medium * New upstream release with many fixes and updates (see CHANGELOG). diff -Nru squidguard-1.6.0/debian/patches/fix_ftbfs.patch squidguard-1.6.0/debian/patches/fix_ftbfs.patch --- squidguard-1.6.0/debian/patches/fix_ftbfs.patch 1970-01-01 01:00:00.000000000 +0100 +++ squidguard-1.6.0/debian/patches/fix_ftbfs.patch 2020-08-06 22:41:24.000000000 +0100 @@ -0,0 +1,50 @@ +Description: Fix ftbfs with GCC-10 + +Author: Sudip Mukherjee <sudipm.mukher...@gmail.com> +Bug-Debian: https://bugs.debian.org/957841 +Forwarded: no + +--- + +--- squidguard-1.6.0.orig/src/main.c.in ++++ squidguard-1.6.0/src/main.c.in +@@ -71,6 +71,8 @@ int sgtime = 0; + char *globalLogDir = NULL; + int globalSyslog = 0; + ++char *progname; ++int lineno; + + #if __STDC__ + int main(int argc, +--- squidguard-1.6.0.orig/src/sg.h.in ++++ squidguard-1.6.0/src/sg.h.in +@@ -115,7 +115,7 @@ int tolower(); + #define REDIRECT_PERMANENT "301:" + #define REDIRECT_TEMPORARILY "302:" + +-char *progname; ++extern char *progname; + + struct LogFileStat { + char *name; +@@ -337,7 +337,7 @@ struct AclDest { + struct AclDest *next; + }; + +-int lineno; ++extern int lineno; + + char *sgParseRedirect __P((char *, struct SquidInfo *, struct Acl *, struct AclDest *)); + char *sgAclAccess __P((struct Source *, struct Acl *, struct SquidInfo *)); +--- squidguard-1.6.0.orig/src/sg.y.in ++++ squidguard-1.6.0/src/sg.y.in +@@ -35,7 +35,7 @@ extern int globalSyslog; + + #include "sgEx.h" + +-FILE *yyin, *yyout; ++extern FILE *yyin, *yyout; + char *configFile; + + int numTimeElements; diff -Nru squidguard-1.6.0/debian/patches/series squidguard-1.6.0/debian/patches/series --- squidguard-1.6.0/debian/patches/series 2019-02-02 17:13:22.000000000 +0000 +++ squidguard-1.6.0/debian/patches/series 2020-08-06 22:39:49.000000000 +0100 @@ -1 +1 @@ - +fix_ftbfs.patch
