diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | squidguard-1.6.0-gcc10.patch | 54 |
3 files changed, 64 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = squidguard pkgdesc = Filter and redirector plugin for Squid. SquidGuard is a free, flexible and ultra fast filter, redirector and access controller plugin for squid. pkgver = 1.6.0 - pkgrel = 7 + pkgrel = 8 url = http://www.squidguard.org install = squidguard.install arch = x86_64 @@ -19,7 +19,9 @@ pkgbase = squidguard backup = etc/logrotate.d/squidguard backup = etc/squidguard/squidGuard.conf.default source = https://launchpad.net/debian/+archive/primary/+sourcefiles/squidguard/1.6.0-1/squidguard_1.6.0.orig.tar.gz + source = squidguard-1.6.0-gcc10.patch sha512sums = d6e934f550cd777d58abda5f4fd905ccc396afc28e1ddb0bb842a9a3364cbe43db5c30834fe1ed7d93623a361dde50362a79ac2b660382c7e81b4f067f2ac65e + sha512sums = c7852acd56b0282f8496619e2e01a9d0916f879641f35c618d4dc2798c60ef260c56dbf23d13b7eeb95c13aceea649001b089688183f3f9cfdebfcea3a3f5e9b pkgname = squidguard @@ -3,7 +3,7 @@ pkgname=squidguard pkgver=1.6.0 -pkgrel=7 +pkgrel=8 pkgdesc="Filter and redirector plugin for Squid. SquidGuard is a free, flexible and ultra fast filter, redirector and access controller plugin for squid." arch=('x86_64' 'i686') url="http://www.squidguard.org" @@ -15,13 +15,17 @@ optdepends=('openldap' backup=('etc/logrotate.d/squidguard' 'etc/squidguard/squidGuard.conf.default') options=('!strip' '!emptydirs') install=${pkgname}.install -source=("https://launchpad.net/debian/+archive/primary/+sourcefiles/squidguard/$pkgver-1/squidguard_$pkgver.orig.tar.gz") -sha512sums=('d6e934f550cd777d58abda5f4fd905ccc396afc28e1ddb0bb842a9a3364cbe43db5c30834fe1ed7d93623a361dde50362a79ac2b660382c7e81b4f067f2ac65e') +source=("https://launchpad.net/debian/+archive/primary/+sourcefiles/squidguard/$pkgver-1/squidguard_$pkgver.orig.tar.gz" + "squidguard-1.6.0-gcc10.patch") +sha512sums=('d6e934f550cd777d58abda5f4fd905ccc396afc28e1ddb0bb842a9a3364cbe43db5c30834fe1ed7d93623a361dde50362a79ac2b660382c7e81b4f067f2ac65e' + 'c7852acd56b0282f8496619e2e01a9d0916f879641f35c618d4dc2798c60ef260c56dbf23d13b7eeb95c13aceea649001b089688183f3f9cfdebfcea3a3f5e9b') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i '19,24 s/@[se]/$(DESTDIR)&/; /SQUIDUSER/d; 51d' Makefile.in + patch -p0 -i "$srcdir/squidguard-1.6.0-gcc10.patch" + } build() { diff --git a/squidguard-1.6.0-gcc10.patch b/squidguard-1.6.0-gcc10.patch new file mode 100644 index 000000000000..fd41a0f3da9f --- /dev/null +++ b/squidguard-1.6.0-gcc10.patch @@ -0,0 +1,54 @@ +--- src/y.tab.c.bison 2020-03-08 20:05:00.750000000 +0300 ++++ src/y.tab.c.bison 2020-03-08 20:04:42.160000000 +0300 +@@ -217,7 +217,7 @@ + + #include "sgEx.h" + +-FILE *yyin, *yyout; ++extern FILE *yyin, *yyout; + char *configFile; + + int numTimeElements; +--- src/sg.h.in 2020-03-08 20:02:46.900000000 +0300 ++++ src/sg.h.in 2020-03-08 20:03:22.110000000 +0300 +@@ -115,7 +115,7 @@ + #define REDIRECT_PERMANENT "301:" + #define REDIRECT_TEMPORARILY "302:" + +-char *progname; ++extern char *progname; + + struct LogFileStat { + char *name; +@@ -337,7 +337,7 @@ + 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 *)); +--- src/main.c.in 2020-03-08 20:10:55.650000000 +0300 ++++ src/main.c.in 2020-03-08 20:11:13.590000000 +0300 +@@ -21,6 +21,9 @@ + #include <syslog.h> + #endif + ++char *progname; ++int lineno; ++ + struct Setting *lastSetting = NULL; + struct Setting *Setting = NULL; /* linked list, Calloc */ + +--- src/sg.y.in 2020-03-08 20:14:46.180000000 +0300 ++++ src/sg.y.in 2020-03-08 20:14:57.110000000 +0300 +@@ -35,7 +35,7 @@ + + #include "sgEx.h" + +-FILE *yyin, *yyout; ++extern FILE *yyin, *yyout; + char *configFile; + + int numTimeElements; |