gentoo Easter resync : 12.04.2020

3 files changed, 64 insertions, 10 deletions

diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index 6a80d17b5aef..62cbd813b7b1 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -3,9 +3,10 @@ AUX squidGuard.conf.blocksites 192 BLAKE2B 0bbb4b05d91bc2ca78a5ba52213967bb5e428
 AUX squidGuard.conf.minimal 61 BLAKE2B ddc399b51d396868be42a7dd1709e0b2df372dc95696da06916542c12a19ec15a7e596e04aa6454fc81315ee27dc1fddb4bb23fe1d31fcde3ca8c4b42298f85b SHA512 301263fcfaf345c34b5a988ce237bc578fb48f63ab2187b5dd2f146e4cf914bf823fcce49c27f8282e745f3125e32455d9c5a5f425d40ce7785f492663eb959c
 AUX squidguard-1.5_beta-gentoo.patch 1562 BLAKE2B 38d0623b8f1f621a3522695966ab1aca26bc939d366f2e586962640164391a93d5834d4ba994a9d8d9a6ce8ed0bcfe846dfdb1edd7e2ed050ba5e51c74bb9a67 SHA512 bdeb6b5a526200f290ce39e3e9c7f4142eb168ec3c47cf4ec2c6dc713fd9c5915c92ca4188c9bfc8c6795f6f170ade62bca3ace0ccfa5149addb0ae932064f8a
 AUX squidguard-1.5_beta-protocol.patch 4489 BLAKE2B 13b406850f20c41a0cb07c95cf241d7f0b4eb8e879e0afc0abcc62a09c067338c60b9fb44bfdb6053c483b944295abbfde7111d8807af9ad3a9ceeaa6e7e81dc SHA512 f8828d10b7ca55debf5aa80ef7e88741b10e9c566921fc2fd38652080fef025bff91851a14c1ee610fabce2562b1c8ca797dd9ae924a1fcc62ab95cb365ff8b1
+AUX squidguard-1.6.0-gcc-10.patch 1351 BLAKE2B f13224eb35e98fb5ec83d286016404fcbb55976f4616d0dfea52472a29ca2ea8686d5450d32fee99c8198d0d3804bfa07624228c3d843294f34357edf5ddaed7 SHA512 906b8ad819f043115958aac90e88c1c8b17ea1a330d6fd734403bee67b4d7e6bf448ff14cd012df893ae5f5e58e126d8ac31c77e4f1b9447e7317c7cc5f749be
 AUX squidguard-1.6.0-gentoo.patch 982 BLAKE2B 9858c7778fbf52573061fd12d3c3941c4f5b5011c09e7cd54859d6fdd9e969f9e7033abd8cfafa019000309aad50ceac63cc082f5b394ea9ee67c30561376879 SHA512 58b8f9a469fe1ca563f1e9e9425362a594eb7a472f0c019f54d42c06dcee2b6a207ee6dded297c86e06288e78ed62879170b8305b20aa29b37d0b658ef843288
 DIST squidGuard-1.5-beta.tar.gz 1983030 BLAKE2B 60405e097babb15eb099649d4ffe23a798207c6d3ac490b8c0c7da777a0136fecb867537214aa90c58ff246a86a0cf7ce59b021e29071ecc43ad002f3a0e3def SHA512 37ddc2ac82596e9d24aac6a610763f2eeb7c15b3a2d7babb85948e1da912aebb1dc85309766f7d8c3d7c22713e24a51f4cdef4520117a03d839662ef2494b6e7
 DIST squidguard-1.6.0.tar.gz 1902233 BLAKE2B 36b422fb2424c79532e0d9dc237b4a60b7817190a45de3646a50031b341c5e94540f55adea7b3e8241b8d87fdec551c5c40d1f60ea90e25347305ef9e473b5d3 SHA512 d6e934f550cd777d58abda5f4fd905ccc396afc28e1ddb0bb842a9a3364cbe43db5c30834fe1ed7d93623a361dde50362a79ac2b660382c7e81b4f067f2ac65e
 EBUILD squidguard-1.5_beta-r2.ebuild 2276 BLAKE2B 10cb29c4b29f3bffe7e9c67a2af09c744ee317b0231fac54f0e577554e47b263014ed4b0f620f46a27be7c191d76447603acb1d885279a52871f9b01879101c5 SHA512 fcfce62692dc0d9cac271cca6cf4a344e4c67d1e9bee780fc508ed46f84ed5ff42098ea929f72b7161f57b4f6165d1e9f45f5ed4ee886861d22e3b82c4ac6391
-EBUILD squidguard-1.6.0.ebuild 2252 BLAKE2B 61ccbbe8d0465a99477c93f98f8fa0c6165e8438925c39a80ee28081ae42e178fd72f9ff97b01e43720ebd0a6988943d4da9c7966bf247753e2e19638157d716 SHA512 5496a2a296836d16a4d601e6062bb5bdc3a0be6d38feb1a5613d19ff0f0993890fcf194aae113d8e403120082e7d8459ef5fe43c33642186856a2e0c223fe6f4
+EBUILD squidguard-1.6.0.ebuild 2237 BLAKE2B b2cd2d511739a44dca912478c9f08990d9a096c4ceefbcf53083c033e9faf630ca56c3e7b9934663bf5661ecdd00693c349e2d8fb23516d309adf0ee0caba228 SHA512 d08aa81e2d95cc3b1d4916b8c7b548df6c3560532b71770b11b4fb558472eeb0968f6838aae1d7a70749c924911ce993aee403fcbc532e551855d7f48fbbe697
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/net-proxy/squidguard/files/squidguard-1.6.0-gcc-10.patch b/net-proxy/squidguard/files/squidguard-1.6.0-gcc-10.patch
new file mode 100644
index 000000000000..650153f28011
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.6.0-gcc-10.patch
@@ -0,0 +1,54 @@
+--- a/src/y.tab.c.bison	2020-03-08 20:05:00.750000000 +0300
++++ b/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;
+--- a/src/sg.h.in	2020-03-08 20:02:46.900000000 +0300
++++ b/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 *));
+--- a/src/main.c.in	2020-03-08 20:10:55.650000000 +0300
++++ b/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 */
+ 
+--- a/src/sg.y.in	2020-03-08 20:14:46.180000000 +0300
++++ b/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;
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild b/net-proxy/squidguard/squidguard-1.6.0.ebuild
index 30193a1ef08d..c4bce1009a7e 100644
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools db-use user
+inherit autotools db-use
 
 DESCRIPTION="Combined filter, redirector and access controller plugin for Squid"
 HOMEPAGE="http://www.squidguard.org"
@@ -11,11 +11,14 @@ SRC_URI="mirror://debian/pool/main/s/squidguard/${PN}_${PV}.orig.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86"
 
 IUSE="ldap"
 
-RDEPEND="|| (
+RDEPEND="
+	acct-group/squid
+	acct-user/squid
+	|| (
 		sys-libs/db:5.3
 		sys-libs/db:4.8
 	)
@@ -36,14 +39,10 @@ suitable_db_version() {
 	die "No suitable BerkDB versions found, aborting"
 }
 
-pkg_setup() {
-	enewgroup squid
-	enewuser squid -1 -1 /var/cache/squid squid
-}
-
 src_prepare() {
 	eapply \
-		"${FILESDIR}/${P}-gentoo.patch"
+		"${FILESDIR}/${P}-gentoo.patch" \
+		"${FILESDIR}/${P}-gcc-10.patch"
 
 	# Link only with specific BerkDB versions
 	db_version="$(suitable_db_version)"