gentoo auto-resync : 09:11:2022 - 21:26:40

5 files changed, 136 insertions, 1 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index b2de91f7e40d..f303a0d697a0 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index f798a0581e42..a402247377b8 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,3 +1,4 @@
+AUX varnish-7.1.2-disable-tests.patch 1167 BLAKE2B eac4c2e32e956ddfe9e0c9917e68702953d049f260ef8810f4edad3c2d9534ea32b55817b6a47b3320fad7976f47f454024774280d3d00d72680f8a297a8748f SHA512 07b0bc126becea1decc60ae0b2c1bcd9343709e7c670c7eefa0823edc5c2397aff5783c287d575ba1ab1fa53b20aa3691d2a48950dd360becf3588e0524e0467
 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
@@ -7,5 +8,7 @@ AUX varnishlog.initd 707 BLAKE2B 90e75e267a2ad8688ace41d4eff20e8601e0b20abc9b73e
 AUX varnishncsa.confd 84 BLAKE2B fbb338ec2163562d7679a7371cda3cd297449186bfcaa668e3924d944dc78eae8d8bf5c60230202fee4093119ccc74d67ad8f3e6774091c6c2b5c9b184d4b5eb SHA512 a5426ff66b89d2afb6273f05e4117b3eec5ce0162a624d52c92b418960f72e58bd01224165613221af76ec241bd98e1eb985b2ef7b83a5b615e9ece67234dcc8
 AUX varnishncsa.initd 716 BLAKE2B 33fd6b044ab50aef629fa4501eb4a78bd3d690db52b86a33d1d4e87c1da28088b9f25ce917d16a9ed777b1d6e1ece5a916af0c4ff293db82b94d264fd5baafa9 SHA512 1d0c781675ecba5adce02c37a02c431c4b44d64310a0945bff4f6f57f7d0c87cb7dda874311e44d667317d5beda113b62f4ba49c81534a0c078314b3fa15a512
 DIST varnish-7.1.1.tgz 3742869 BLAKE2B d41e7214c3b51ac18b1a89012b48d3db58f4f777df675fa93d6ac75d3cf14b78af23f9d6e8b8686fdfa82add70a1a42e5e54f382506444ec81ad6d121a99e447 SHA512 7c3c081bd37c63b429337a25ebc0c14d780b0c4fd235d18b9ac1004e0bb2f65e70664c5bd25c5d941deeb6bc078f344fa2629cf0d641a0149fe29dcfa07ffcd2
+DIST varnish-7.1.2.tgz 3758689 BLAKE2B a5c05d9dd7c5f0cd4dc0cae8cc365b658a15d017c7fb19cbe17088f009304375eb123f35935045c35c61ec3dfd7d8858774c2bbc918cc436415bd50b8894bb3b SHA512 e16a4b75ede25f3812dfc4e95545e39a80022835b9155a4e42118f911e41b691cbedd296db48d307ba4a4d0d01df1149306d752de07cabe459ccbf5bcdd49238
 EBUILD varnish-7.1.1.ebuild 2234 BLAKE2B 751a1ee4b19575d5965b507f20318b6fd203030cf0dd6a19090ee4989871bff9bd5f2a1fc6af5f0d4e36dccb57603bf446bd45ac0e82411a4dfdc4c6679ae5b8 SHA512 6c10b0d06a27c735c886de7545e0df562ba17b0880c710ca9ea569c1eef61893e4d1808639e21633d6a6962b5e8538ac8318beb6f0e917e27752a09760839ebf
-MISC metadata.xml 1155 BLAKE2B 84875f3204cf314d1cb22e323ae8edb4e439e11d165c019bdf959925236ee4df671a9dbfd5a98d4c8841f8ec19cf8e602b703052d9a864d7e3c652ffe40054f0 SHA512 34bad8011b4530abc02f35b1bacb3d632ea5d57da41162a246d5601d766f192448efb31445536e02485fa195ab5f5eb564b4a1886632d0fd32626184d1173db7
+EBUILD varnish-7.1.2.ebuild 2268 BLAKE2B b646826375a8dd66256f9df609ff9b09aaebfd3fdb67afb71edc742ab1b2832f7c99da0baac6088ac4d8f9317f61943a2d432171084ba7bcd467ce7f4e95c8bf SHA512 6254bacdc2148e1c6577acfe35713f9daa9e7735082449ec3e5b06f8e3587bf0ea5d144f5cc2d06b1e93ada5023d66d4a1984f84e1847c71f9fb4e7f57b5fe0d
+MISC metadata.xml 1246 BLAKE2B a0b1e7aebb8a984e49c46460840ef4a984b285a49d0f8095a6252ac072c65588d4f7fae4b40c0b33b1d14bae1dfb887f94bbcd5acf3dacd7708cdf5ad0124d72 SHA512 0e4f1f2ec351e97fdfe31e6fe3f7b5b1f5c5d984b3313e84feed76c4d99a2f4e1825ffe971f4acf44498efbc4aa9bf80c2756ad4d0f96adf834b0ea4f2ecd1a2
diff --git a/www-servers/varnish/files/varnish-7.1.2-disable-tests.patch b/www-servers/varnish/files/varnish-7.1.2-disable-tests.patch
new file mode 100644
index 000000000000..81f0a989353b
--- /dev/null
+++ b/www-servers/varnish/files/varnish-7.1.2-disable-tests.patch
@@ -0,0 +1,27 @@
+commit 24bedea4085a41130b13934acb4946d456976dfb (HEAD -> master)
+Author: John Helmert III <ajak@gentoo.org>
+Date:   Wed Nov 9 12:33:17 2022 -0600
+
+    disable tests which time out
+
+    These tests time out, but can't reproduce when running manually
+    (outside of sandbox).
+
+    Signed-off-by: John Helmert III <ajak@gentoo.org>
+
+diff --git a/bin/varnishtest/tests/r02686.vtc b/bin/varnishtest/tests.disabled/r02686.vtc
+similarity index 100%
+rename from bin/varnishtest/tests/r02686.vtc
+rename to bin/varnishtest/tests.disabled/r02686.vtc
+diff --git a/bin/varnishtest/tests/r02990.vtc b/bin/varnishtest/tests.disabled/r02990.vtc
+similarity index 100%
+rename from bin/varnishtest/tests/r02990.vtc
+rename to bin/varnishtest/tests.disabled/r02990.vtc
+diff --git a/bin/varnishtest/tests/u00008.vtc b/bin/varnishtest/tests.disabled/u00008.vtc
+similarity index 100%
+rename from bin/varnishtest/tests/u00008.vtc
+rename to bin/varnishtest/tests.disabled/u00008.vtc
+diff --git a/bin/varnishtest/tests/u00009.vtc b/bin/varnishtest/tests.disabled/u00009.vtc
+similarity index 100%
+rename from bin/varnishtest/tests/u00009.vtc
+rename to bin/varnishtest/tests.disabled/u00009.vtc
diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml
index 857c9c66cfbf..6663d482b16c 100644
--- a/www-servers/varnish/metadata.xml
+++ b/www-servers/varnish/metadata.xml
@@ -22,4 +22,7 @@
 	<slots>
 		<subslots>Reflect ABI compatibility for libvarnishapi.so.</subslots>
 	</slots>
+	<upstream>
+		<remote-id type="github">varnishcache/varnish-cache</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-servers/varnish/varnish-7.1.2.ebuild b/www-servers/varnish/varnish-7.1.2.ebuild
new file mode 100644
index 000000000000..6fe4beac2068
--- /dev/null
+++ b/www-servers/varnish/varnish-7.1.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+	sys-libs/readline:0=
+	dev-libs/libedit
+	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}"
+
+PATCHES=( "${FILESDIR}/${PN}-7.1.2-disable-tests.patch" )
+
+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 pcre2-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 vmod/vmod_*.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/
+
+	find "${ED}" -name "*.la" -delete || die
+}