gentoo auto-resync : 17:01:2023 - 01:13:38

3 files changed, 98 insertions, 2 deletions

diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index c8b604b1d109..8ef8cc5aa8fb 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,5 +1,6 @@
 AUX squid-4.17-fix-libxml2-2.10.0.patch 1343 BLAKE2B a3af97f3951dc84c1fe7d1aee4cba3e51d56204fe02b6c457e67bc80dd8d1f51f9dff7fffce91836034f64fc3f6b602d68cd5d8207f262a2b92a4900c8beb192 SHA512 130b2918b2fc55f13d50d501b343ab741a8ae1b081ef569d1935a655246e30ff8e0109fdc79277ed15473b6e87bca7ed8f4ebab2dba724d66fb32b08e6722327
 AUX squid-4.17-use-system-libltdl.patch 497 BLAKE2B 38dbd734d7a56c2d5acb508ac5ab348c81247ce20f2bb9b7a278c9b480c15b2d29f106647d58aa2abb290b864bb103f2d11deeb7a50f7574e3f619b9392353a7 SHA512 754c41b03e5627ead2b824fc9ed6e91463b51308833e4c7ad6f4e35b0cfb5e58af1a8db9a6a5f3157933f408f7d5127214efbf91db4f74a7176f2dcb8ae87ad9
+AUX squid-4.3-gentoo.patch 2767 BLAKE2B fbf424bec42a8bd29f54431107e73db1d1acd7612c8acc4d38022419a72ccabc9d0287fb34cbd26e96df2b6e2aaceae929c1005ef2ad4f731cf28edf66ac569a SHA512 eaf076cef4b60c1f5e9985a69f5ae674082b04a6f70d5b484ad13e9e397a8c67cb1780960a11fd943dc2500ec9f0590192b276bf36451d3063537661200487bf
 AUX squid-5.3-gentoo.patch 2765 BLAKE2B 0260544df7ed59b99e6fb030b277330ad6d9ffc3130b550a8b3aee7386ba635b9848cdf655bf264fe83614c00772921eaaa5e66ed3ccefddc23a8b8f1fedfc62 SHA512 d68c1fd82a2a65cfc7bf257b7305827cfead3e37361952171cb6f5e933c607ba82025434b1430e4210ff937d58200019d66b4869a4c0d0291d19192e76105770
 AUX squid.confd-r2 707 BLAKE2B 9fce12f6c6d395448b1e70c95ef75418d1844e7409738df60bee7c1adab786ca7e504070eacdd2b6e30a35df8a7322cccdfb950e60bcde352d35d090d55c6be9 SHA512 37435f808b1dab1ca3ceecafd6cd9007c44e10d257f135ba6baf1a51b1e3408f2a76b71d85a08ce6dcb7f86b9841b7bfcd870b0d312a2365699290e28f72314a
 AUX squid.cron 143 BLAKE2B 17b1bccea20771a481a5b4745c9832a4b762132a500eaeb091349a59b870c14b680d8ea97e03bb7a0b2d67e1ca1d4ee1db31dc43b9dbf02be8953d15f214b033 SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749
@@ -9,5 +10,5 @@ AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdb
 DIST squid-4.17.tar.xz 2464204 BLAKE2B e227dfbac846dff66f04c6c72d81d667076107653721d14804f079518cef68efc53f5404fbe3306efb0c775a10638661c300a8e7cd3d7ab43c0e57a344387674 SHA512 cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a
 DIST squid-5.7.tar.xz 2566560 BLAKE2B 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299 SHA512 624a39041a6ceda6c470dc0937616f1aa67200f3db02b4d74095d8d706ed31d6df5e0417dcacde45f6be40b617bee018849793d52c96a626aab32a2b182972aa
 EBUILD squid-4.17-r1.ebuild 8183 BLAKE2B ca1794b42ea7605d0fc0dae80a5d6071fc7929528d1619848fccd1a05c600057695596026d96efa21a3076b543ac8df20fecbba054a41182cdf317ca2059317b SHA512 7a94968e331c85dd6028d9c958c016c214d936176fae3c2453e8caab31df24bc2b3fa558934b2dc88ceec157af63323fb3ab7e10f893984414f49674fe5b1f6e
-EBUILD squid-5.7.ebuild 8972 BLAKE2B edca31d0e88a4eaa12730743e1ee91e28e64b83dab321131dfa240e7e20d6ae99f4c857d870321c85b072a0aa06e8ad17bdc14c6269c02d0ebf12612a14ff916 SHA512 58709e9ec5e2b17529c7fcd9285a36af2a1017a9765caa87602a598e5f0a49f141fcc42ee958785c87a17668871b22aa5e751b8aef750e63d01cfe2a5d63a616
+EBUILD squid-5.7.ebuild 9353 BLAKE2B 1571184bcc6091ac561a412d08955bd4b7c5f0a5acb162b2d7d5bd38df8210374d5f464e3ba085954732f93121dd26672f57c967122fc038e184c5dfc1c5e6c8 SHA512 9243053440aec5cb5a4f937e3482665379f644f957f635e199031dcb8c0a0c4cc35ce2842136a8d356b9431f198a961c99714e65bc1347353dadafcc84e73406
 MISC metadata.xml 1351 BLAKE2B 8a6ea8bc939b5900572bd323fb3be78e0dfa9b4d7436f2d5e27fa59905f57af5cd9b7fe9a2903f8f57859a88176aab17c1a5d507a69765aab0f5320ceec69c96 SHA512 db7a47668d220a16f10d25319ffc4cd33270209d7d00f488d45680150f094d70776c4bf3c7b203b6ec8c69be18e5ac3a78d3d4367ec90a9ffb91ffd29f66890f
diff --git a/net-proxy/squid/files/squid-4.3-gentoo.patch b/net-proxy/squid/files/squid-4.3-gentoo.patch
new file mode 100644
index 000000000000..f5152b898852
--- /dev/null
+++ b/net-proxy/squid/files/squid-4.3-gentoo.patch
@@ -0,0 +1,79 @@
+--- a/configure.ac	2018-10-14 17:22:35.000000000 +0300
++++ b/configure.ac	2018-10-17 21:27:24.806986467 +0300
+@@ -32,9 +32,9 @@ PRESET_CXXFLAGS="$CXXFLAGS"
+ PRESET_LDFLAGS="$LDFLAGS"
+ 
+ dnl Set default LDFLAGS
+-if test "x$LDFLAGS" = "x" ; then
+-  LDFLAGS="-g"
+-fi
++dnl if test "x$LDFLAGS" = "x" ; then
++dnl   LDFLAGS="-g"
++dnl fi
+ 
+ # Check for GNU cc
+ AC_PROG_CC
+--- a/src/cf.data.pre	2018-10-14 08:25:34.000000000 +0300
++++ b/src/cf.data.pre	2018-10-17 21:27:24.809986705 +0300
+@@ -1520,6 +1520,7 @@ acl Safe_ports port 280		# http-mgmt
+ acl Safe_ports port 488		# gss-http
+ acl Safe_ports port 591		# filemaker
+ acl Safe_ports port 777		# multiling http
++acl Safe_ports port 901		# SWAT
+ acl CONNECT method CONNECT
+ NOCOMMENT_END
+ DOC_END
+@@ -6819,11 +6820,11 @@ COMMENT_END
+ 
+ NAME: cache_mgr
+ TYPE: string
+-DEFAULT: webmaster
++DEFAULT: root
+ LOC: Config.adminEmail
+ DOC_START
+ 	Email-address of local cache manager who will receive
+-	mail if the cache dies.  The default is "webmaster".
++	mail if the cache dies.  The default is "root".
+ DOC_END
+ 
+ NAME: mail_from
+--- a/src/debug.cc	2018-10-14 08:25:34.000000000 +0300
++++ b/src/debug.cc	2018-10-17 21:27:24.807986546 +0300
+@@ -490,7 +490,7 @@ _db_init(const char *logfile, const char
+ #if HAVE_SYSLOG && defined(LOG_LOCAL4)
+ 
+     if (Debug::log_syslog)
+-        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
++        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
+ 
+ #endif /* HAVE_SYSLOG */
+ 
+--- a/src/main.cc	2018-10-14 08:25:34.000000000 +0300
++++ b/src/main.cc	2018-10-17 21:28:28.632044541 +0300
+@@ -1912,7 +1912,7 @@ watch_child(const CommandLine &masterCom
+ 
+     enter_suid();
+ 
+-    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
+ 
+     if (!opt_foreground)
+         GoIntoBackground();
+@@ -2012,7 +2012,7 @@ watch_child(const CommandLine &masterCom
+ 
+             if ((pid = fork()) == 0) {
+                 /* child */
+-                openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++                openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
+                 (void)execvp(masterCommand.arg0(), kidCommand.argv());
+                 int xerrno = errno;
+                 syslog(LOG_ALERT, "execvp failed: %s", xstrerr(xerrno));
+@@ -2024,7 +2024,7 @@ watch_child(const CommandLine &masterCom
+         }
+ 
+         /* parent */
+-        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
+ 
+         // If Squid received a signal while checking for dying kids (below) or
+         // starting new kids (above), then do a fast check for a new dying kid
diff --git a/net-proxy/squid/squid-5.7.ebuild b/net-proxy/squid/squid-5.7.ebuild
index 92400122c91f..60bc862ec71f 100644
--- a/net-proxy/squid/squid-5.7.ebuild
+++ b/net-proxy/squid/squid-5.7.ebuild
@@ -59,7 +59,6 @@ DEPEND="
 	systemd? ( sys-apps/systemd:= )
 "
 RDEPEND="
-	!!<net-proxy/squid-5
 	${DEPEND}
 	mysql? ( dev-perl/DBD-mysql )
 	postgres? ( dev-perl/DBD-Pg )
@@ -86,6 +85,19 @@ pkg_pretend() {
 	fi
 }
 
+pkg_setup() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 5; then
+				ewarn "Moving ${EROOT}/usr/share/squid/errors out of the way (bug 834503)"
+				mv -v "${EROOT}"/usr/share/squid/errors{,.bak}
+				break
+			fi
+		done
+	fi
+}
+
 src_prepare() {
 	default
 
@@ -359,6 +371,10 @@ src_install() {
 }
 
 pkg_postinst() {
+	if [[ -e ${EROOT}/usr/share/squid/errors.bak ]]; then
+		rm -rv "${EROOT}"/usr/share/squid/errors.bak
+	fi
+
 	elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
 
 	if [[ ${#r} -gt 0 ]]; then