gentoo resync : 22.01.2021

7 files changed, 168 insertions, 12 deletions

diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 2b84b01163eb..d67ade62dd37 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,3 +1,4 @@
+AUX varnish-6.5.1-autoconf-2.70.patch 1586 BLAKE2B d408e3d43a49a98bfd7c9e235548f30c042091d90ef943a38fc7d70b757764cb4579f8baefd31510229d8d926f1b2b6f9ca95b916592d463d6e9985b1fc2a727 SHA512 053383ad34d5f12ce47818101c2e9a7f82f6d480d51663bfba9e00bbaa40d7a159faede0d37d877e1c0fb15f57ab4a93447c88264250a7c7cd072250c5736372
 AUX varnishd.confd-r4 519 BLAKE2B 18d867add08324ad9ea8b829a747e21c450d6c1f724e18c4318d21ba1647250073d443ea63d721585dc2a274d490a9fb76f14d5e725cc62f483b45be45220463 SHA512 98c8901e53f3c6adb908b9eb01fd441ea53f3c54d4a79aecb1fb1eddfa2fc93de3d0de403a4464a9baff15873b3a20623837e3a37cb225e924a329e32b9e37d6
 AUX varnishd.initd-r4 1573 BLAKE2B 79a6583ea337857c58eafcf6dff5cd9646a871116adca6aa5a956bf25b8474394d850afb3c296cc5c920bad0176ca144a486b7202d3a94e7ab7e4688c552be5d SHA512 5ac7867e85cbd721f903c524ed4b524423d9dada4acfeefb0e543214a208828df5cc4efe2f012991bea6b38c2b223c24b17d3890ec4ed2c57d2b441b8e5a6900
 AUX varnishd.logrotate-r2 470 BLAKE2B c44ccd8198458031b977e3d0d1b6ef1a0c824554b7b1d9745e6bbbcddb7cf1c9ba23bd72472361bfda803f9691276433f3af422819aa3e6e8e5436f66cc47097 SHA512 51cc6d46ff7439de93977ab87dfb0af399458c1e446475696f73342ae7a0c1a8ca8fc6e79e593659f1af30716a5f8a1ee5e3b1f5e7b35df40b45d47e7b0f2ffd
@@ -10,8 +11,10 @@ DIST varnish-6.0.6.tgz 3136931 BLAKE2B 2ce379622b20a939a977a426cb842ba62e4fd5fd3
 DIST varnish-6.3.2.tgz 3323908 BLAKE2B 5bde1b2ececeb8aed884db22ed75bfd74f82d68416e71400a4c0d27483fcceb029fe8e724e30754899c872d7028da5cb759545f0743a11d0e90b0fd604af0ad7 SHA512 0f476c642df834737d446b3bc6ac8afa5981d1de5810dc6e8556eb22b2ca26d64eb531f4ad3332eb86e231a7443fe35393177ec6dbee97a837f405d1aa9d03cd
 DIST varnish-6.4.0.tgz 3404617 BLAKE2B 0ef0f7303f5c926bb1b80ec14cdd9755d65c1938fa8645240800ac2997f954022133625a74dd9c30ce21850674c3b00777fcc896309f528e6ba90d347333d7f7 SHA512 cda8f9e1d301a2b79db14685a23e25e36225f37065a1b7f37c5ae12fbb0483be51be9ffcc8ba72c1f65f5a022d1e408825694daed6780e206b9ba91feb2a07a1
 DIST varnish-6.5.0.tgz 3476969 BLAKE2B bafa8704f28dfa96f681805cc053dd6415e143016b1bbff7f8962f2c3ac5cd07be6dc2f4129a423ddfcbf9f9f8afc57388930685d0ed400f3c06ba03bd667d87 SHA512 43f8cd6429a903a353ac4448b6e9aff445b0d52178141a148d3b29b987c0974841820af0da4917731775b46899c12b0327d64d12e3ddbb8fd438e2802ac66a1c
-EBUILD varnish-6.0.6.ebuild 2230 BLAKE2B a3138959a81d665d620573d00a99c3b2f3c2ae1ef1f3859c6252135800c1ae57b6e581659afa2f299ded295fae57e5d4c8670a6083013ee1cbd47174099377b4 SHA512 fa82538ed6c1522e30c8256c7e60001c5a2143ed603ef89b4462fbbe74ed8cd9407b6d6d0ac0c2c1281cdf9021a0a754bf2bdad31a4e85e0a07f56cc3a91973f
-EBUILD varnish-6.3.2.ebuild 2147 BLAKE2B a9d41a75096d9567bec7eb2ecb232e06e4d9346816ede8a6327482bc1adc22db5b810468d2b45676ea65b8b098d49c0a784796fb3c6d1b40475efbf31ada6863 SHA512 9d5543eb22aed1a154355ef127f5cc553ccf54e77bd535cef9e52dfe843cc02de3feb6dce2766568fda5256d2c65aa025570c241db1a28e508caeba412b0a854
-EBUILD varnish-6.4.0.ebuild 2145 BLAKE2B 2f0aec0428b1fe2ebf852edb16c1b10ec0f9c7c7839188a54dfe1412e43ae65f0425d198f14e13fdd4d5e2a13a66da1c7e4fe2a4ebdfc87e560ef4eb27d9975d SHA512 90df906ce9a8d51a432d3077a86f14f103b44853eda277a27762a9c6e07c61f5f01ae13a0dff82b82181022aa53bf2040f48e292fbc4dc5d2cf4606bc8714ace
-EBUILD varnish-6.5.0.ebuild 2149 BLAKE2B f5679b3234678d5ef71f2133a01887f4e737018442feae869b2efc92c31c00352075ec3772dd5c39f5287a72f923e42b89436e05ef11ba125fc3ab36334f7f0d SHA512 18e5865e99e757782b0e3c387356739e230e53ec164906eca3e2d31eaeefa3ae0beac405630edff1b3b170991552c1bead11d425a488805373c5a4d5d444007c
+DIST varnish-6.5.1.tgz 3460024 BLAKE2B 20abebf1df826987623c951122dd8ab2b500c0a64aca192fb12db8846e60938c2f444cf5f471d02aee4f3aeea05f4074bec335e963ab8a2fd59bef47e77df501 SHA512 0f34f2c6fe68bfcdba488cda40cc387b3c10343923a75a6a1791c890d20e79c64069697c45720cd5f0cba666d506d3ab6bb814ef4f9120cf0c8519a01144844f
+EBUILD varnish-6.0.6.ebuild 2225 BLAKE2B 249e743756f2f4501a50afcc87437a1ec04b3b9577b25fab284c654dd5db98f04f6b7decfb8ea51b74fcb35548e6479ffbc6b37e2bf4a56f97f64bac88cdc47d SHA512 eb9f7b2f79514aa6bff832c026973e013e0046b4a3812f4b127e001a0da8fecdf2a75bb33ab0de8322ef32d79b728a30ff7009f9b69f4d3b35301a6c71e10bab
+EBUILD varnish-6.3.2.ebuild 2142 BLAKE2B 85823b3c09e5d02933e41370be406f9a703c212538e05365b6d2702f9fea583974a59087af16095fbca556b9b97eeb4f2fd99043a37269aaaf2b871fd8114baf SHA512 49b5556435468c9f74271738f4d3bc8db7e452f824eba530b0e8bef0cf78b8922704ba506e8c9ec12083a1f75e54376658137f72270841f3a4890e2f941b0fc9
+EBUILD varnish-6.4.0.ebuild 2144 BLAKE2B bd22b8f10e3abdafeddfa012824552e78e8d45a2253a2500a7d04ac9b274721d146cfec52a7852d112545c57195511cb54117c55899a8f5538ff0ce3de485d2f SHA512 f660dce32b7945e255edfa9dfb6528fa930943599458f94d1b2aee62222ef3d816148f5b41d19cd4e9ff05c723392fb5d1b55e6ba6c577c966060c8854b65800
+EBUILD varnish-6.5.0.ebuild 2148 BLAKE2B 58ec338a3f6bd0ac33e24f7d35f9b3a6e1bc47b129b7baf75938f3069d4d547ff5bb0b5abbb9aea893e73fc3406cb032d80455dc32d517197e9c79f1f390e500 SHA512 a7b39c3dbd132287044ebfc78a4cfd66fefea06565847525adb323190695bf085533c198f5deabf54789c72fa2eff263e345823feeb7735546e0094cba491d81
+EBUILD varnish-6.5.1.ebuild 2241 BLAKE2B a5255bc8cbdc7b8ad304f9a37f7674f3c9fa59e345d1e87d1bf9fa2868a649e634343bf5aadf24b160650902d322ad5c4bd369fece7a7ae4297035e717c29b5b SHA512 2f3339d19ecc1384e7f5de23e9330e666e96f17f14ba14a5d1f7d0d20e4401f92f2a16976d1f83be8567900cfccf0931e7d8be3f4b52ac4004ed7616be6c14af
 MISC metadata.xml 1154 BLAKE2B eef29e16772e06a4b08bb7c2de3c02570a698eafe1eb9f3d1d6708cbf4ea3ef2644642b3040ebea108477e331aff164e4e540dc7f5620f15643b385d1523fd7f SHA512 a429d2e7604fb1e1f1d3ef48c13ab2151f7e2adab6a81021f473d7b56bdc9fc8d7700370125908b0278c2b0621afb3cccb73c4f3284b288cbceac05294e70f99
diff --git a/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch b/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch
new file mode 100644
index 000000000000..beb400620fad
--- /dev/null
+++ b/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch
@@ -0,0 +1,50 @@
+From c6f70f8ca126b34a218248109b78a540d3a4989a Mon Sep 17 00:00:00 2001
+From: Simon Stridsberg <simon@devsn.se>
+Date: Tue, 12 Jan 2021 15:34:33 +0000
+Subject: [PATCH] Fix autoconf error in version 2.70
+
+Fixes #3491
+---
+ configure.ac | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e44b61fffe..3763b3f34d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,9 +40,9 @@ AC_PROG_INSTALL
+ AC_ARG_WITH([rst2man],
+   AS_HELP_STRING([--with-rst2man=PATH], [Location of rst2man (auto)]),
+   [RST2MAN="$withval"],
+-  AC_CHECK_PROGS(RST2MAN,
++  [AC_CHECK_PROGS(RST2MAN,
+     [rst2man-3.6 rst2man-3 rst2man rst2man.py],
+-    [no]))
++    [no])])
+ if test "x$RST2MAN" = "xno"; then
+   AC_MSG_ERROR(
+     [rst2man is needed to build Varnish, please install python3-docutils.])
+@@ -51,9 +51,9 @@ fi
+ AC_ARG_WITH([sphinx-build],
+   AS_HELP_STRING([--with-sphinx-build=PATH], [Location of sphinx-build (auto)]),
+   [SPHINX="$withval"],
+-  AC_CHECK_PROGS(SPHINX,
++  [AC_CHECK_PROGS(SPHINX,
+     [sphinx-build-3.6 sphinx-build-3 sphinx-build],
+-    [no]))
++    [no])])
+ if test "x$SPHINX" = "xno"; then
+   AC_MSG_ERROR(
+     [sphinx-build is needed to build Varnish, please install python3-sphinx.])
+@@ -62,9 +62,9 @@ fi
+ AC_ARG_WITH([rst2html],
+   AS_HELP_STRING([--with-rst2html=PATH], [Location of rst2html (auto)]),
+   [RST2HTML="$withval"],
+-  AC_CHECK_PROGS(RST2HTML,
++  [AC_CHECK_PROGS(RST2HTML,
+      [rst2html-3.6 rst2html-3 rst2html rst2html.py],
+-     "no"))
++     "no")])
+ 
+ if test "x$RST2HTML" = "xno"; then
+    AC_MSG_ERROR(
diff --git a/www-servers/varnish/varnish-6.0.6.ebuild b/www-servers/varnish/varnish-6.0.6.ebuild
index b2aedc3e93d1..01e91deeec75 100644
--- a/www-servers/varnish/varnish-6.0.6.ebuild
+++ b/www-servers/varnish/varnish-6.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit user autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-6.3.2.ebuild b/www-servers/varnish/varnish-6.3.2.ebuild
index 5d12afb64590..97e5bcec56d2 100644
--- a/www-servers/varnish/varnish-6.3.2.ebuild
+++ b/www-servers/varnish/varnish-6.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-6.4.0.ebuild b/www-servers/varnish/varnish-6.4.0.ebuild
index 87e7399056bc..231c5d30ac3a 100644
--- a/www-servers/varnish/varnish-6.4.0.ebuild
+++ b/www-servers/varnish/varnish-6.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-6.5.0.ebuild b/www-servers/varnish/varnish-6.5.0.ebuild
index cd7753a43dbf..0612b2f99d5d 100644
--- a/www-servers/varnish/varnish-6.5.0.ebuild
+++ b/www-servers/varnish/varnish-6.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-6.5.1.ebuild b/www-servers/varnish/varnish-6.5.1.ebuild
new file mode 100644
index 000000000000..02d9937423c0
--- /dev/null
+++ b/www-servers/varnish/varnish-6.5.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="https://varnish-cache.org/"
+SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+	sys-libs/readline:0=
+	dev-libs/libpcre[jit?]
+	jemalloc? ( dev-libs/jemalloc )
+	sys-libs/ncurses:0="
+
+#varnish compiles stuff at run time
+RDEPEND="
+	${PYTHON_DEPS}
+	${CDEPEND}
+	acct-user/varnish
+	acct-group/varnish
+	sys-devel/gcc"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	dev-python/sphinx
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+PATCHES=(
+	"${FILESDIR}/${P}-autoconf-2.70.patch" #751190
+)
+
+src_prepare() {
+	# Remove -Werror bug #528354
+	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
+
+	# Upstream doesn't put varnish.m4 in the m4/ directory
+	# We link because the Makefiles look for the file in
+	# the original location
+	ln -sf ../varnish.m4 m4/varnish.m4
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable jit pcre-jit)
+		$(use_with jemalloc)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
+	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+	diropts -m750
+
+	keepdir /var/lib/varnish
+	keepdir /var/log/varnish
+
+	systemd_dounit "${FILESDIR}/${PN}d.service"
+
+	insinto /etc/varnish/
+	doins lib/libvmod_std/vmod_std.vcc
+	doins etc/example.vcl
+
+	dodoc README.rst
+	dodoc doc/changes.rst
+
+	fowners root:varnish /etc/varnish/
+	fowners varnish:varnish /var/lib/varnish/
+	fperms 0750 /var/lib/varnish/ /etc/varnish/
+}