diff options
Diffstat (limited to 'www-servers/varnish')
-rw-r--r-- | www-servers/varnish/Manifest | 10 | ||||
-rw-r--r-- | www-servers/varnish/files/fix-build-x86.patch | 25 | ||||
-rw-r--r-- | www-servers/varnish/files/varnish-5.2.0-fix-import.patch | 66 | ||||
-rw-r--r-- | www-servers/varnish/files/varnish-7.1.2-disable-tests.patch | 27 | ||||
-rw-r--r-- | www-servers/varnish/metadata.xml | 10 | ||||
-rw-r--r-- | www-servers/varnish/varnish-4.0.5.ebuild | 97 | ||||
-rw-r--r-- | www-servers/varnish/varnish-4.1.8.ebuild | 103 | ||||
-rw-r--r-- | www-servers/varnish/varnish-5.1.3.ebuild | 101 | ||||
-rw-r--r-- | www-servers/varnish/varnish-5.2.1.ebuild | 103 | ||||
-rw-r--r-- | www-servers/varnish/varnish-6.0.1.ebuild | 102 | ||||
-rw-r--r-- | www-servers/varnish/varnish-6.1.1.ebuild | 103 | ||||
-rw-r--r-- | www-servers/varnish/varnish-6.3.0.ebuild | 98 | ||||
-rw-r--r-- | www-servers/varnish/varnish-6.3.1.ebuild | 98 | ||||
-rw-r--r-- | www-servers/varnish/varnish-7.1.2-r2.ebuild (renamed from www-servers/varnish/varnish-6.2.2-r1.ebuild) | 56 |
14 files changed, 66 insertions, 933 deletions
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest index 8ba57c9585c2..414d994e17c3 100644 --- a/www-servers/varnish/Manifest +++ b/www-servers/varnish/Manifest @@ -1,9 +1 @@ -DIST varnish-4.0.5.tgz 1947888 BLAKE2B d921dc6f2abae7b0bd1816470fd41f8555c02a02607b49bf8f36a0b778dd926ea0f5e8cf8a60aaceb097bd4193e22fc7d718c1f13a4f8502b57b797277c66f5a SHA512 a08259f6f9c6fffa188b26c1f8c630de5e6d2f6d52f6efa9d5d8239cdd8721c53e2be3379f8100efb537e74416eadd6c865f4cc687db1c5a9f757bb3f73abeda -DIST varnish-4.1.8.tgz 2254772 BLAKE2B acadf4079d58bb8f0dc5e24713aba7f2786ca6f06a683465b1564bacd986e209d858f9a3100cfb7586fa5d17f7e5f4d8425ece10c609bb3412d3adafa6ad0d05 SHA512 c642359118d87e8713d2ccf817da317a454a0f9ae6f7a07da1d10b5076aa7e5d7dcc203ef71ae19d56b7592db0c66b4ca96cb43d5fa0e6aa588d1dc8e03e026e -DIST varnish-5.1.3.tgz 2643223 BLAKE2B 85bae87785da1284d7d916b8948a0984eea9cf07e96012255435ba04c28e8078e5dad893946bbc12da6cbe9326699458f0e3af6be55cb5e7bba4e622724ddac2 SHA512 a10c317dc38ddff139ca8153f6388955df449c3abeb4d4f069b632ba2b32064a2827ab05fa8515994b251a68507fc3a7bf4e08eacc991fc03283ab234b9efd0a -DIST varnish-5.2.1.tgz 2827676 BLAKE2B 6f50a55a9b16d137eaec59aea98a0179b808bb67fc3de26c9b0924b9937a3688b7f9db45d2f0a71be2b7c6f77bfd47cd22e7b898348b5236114572b5bb33ff22 SHA512 2e979983c7f2325e289768752cc474dc3032c3420de65ccfd5871098c076aecf18e962b04308ecb1860f542fd6f6418dc79220fdd6cf4a75f7476a733faa589c -DIST varnish-6.0.1.tgz 3065822 BLAKE2B b99d0d50444872353367007f2ee97c5d5f0e60031ece7b07f8b2c3a7a84b31be88fe2b850304b1f2e47a35f35c2c41f43888bee1d1874721a72ad078acfddfa1 SHA512 057cb69ae6a4d980401effb7561d3a9b537216d8626fdf4e7bcc75971958517f51b6bd7f7af86c11bc92a2e77876831c577736dfcd11447ad0128f222c5ad138 -DIST varnish-6.1.1.tgz 3135623 BLAKE2B c39904fe2745ab601e7c1f6d85850fe1a83c19e8d80e8af5a60ac5f134817b26b3274ba62c78c3839fd7e6c2da3e58b6c211a7452d37dd864f0f658d500a6138 SHA512 67e546e5fee2d10ec038d7b011a3f61a0a056ce8a4813556526c8fce23bb1fe4e29952a773e6cbc2433c0228971a5e90693d5ce61f6cb5f2242e055e0ce13d18 -DIST varnish-6.2.2.tgz 3208447 BLAKE2B 051efacf5b956a0f83723e4a0dd69291fa2215378e2c8b7ca653a87f7b10871b323ed0ee9bc1ed4d1602526b882c2a94b981f3b194584c463d6a7fba18055845 SHA512 cc03fd1833b86e74ca275797da5e16b8ce754c7a9d232d5825c876eacc632d7e4edfae0a15e49b36cb551aea1e72a0d054da06433321498a3c74789c545f6c7a -DIST varnish-6.3.0.tgz 3308117 BLAKE2B ee9a1ab87ceb96fbfeaa4130da6043f2474cfc6a29ab9f8d74cc66e28003467b63916f7fe498be4cd63fe80ac347bf02e2a5434afab381da32bcb821c9bb5404 SHA512 887c27b498bdac1ddb01759569078e2394a0a754ab3842f866fd06724f154950accebe80c5412b0ba5dd70ff9f687ce4bad3161d1bd32448e0d50aa01c6f96b1 -DIST varnish-6.3.1.tgz 3306392 BLAKE2B d34e52567fc0a9c57ac894c79155b43279a7b1549651494053f3eca3ddf83d234e41cffa4fed4833535b3c07e2a62ec0f54a1cc69c1bd689fee4ab90252f6588 SHA512 2fee11bcd01f53464b53e8271c2aec08233af078f2e9a2600cd82efbf646b3fd48160ebb2add09e1fb4f43e18e61f21a2408e351eeb2a567179733a3efbc3ddc +DIST varnish-7.1.2.tgz 3758689 BLAKE2B a5c05d9dd7c5f0cd4dc0cae8cc365b658a15d017c7fb19cbe17088f009304375eb123f35935045c35c61ec3dfd7d8858774c2bbc918cc436415bd50b8894bb3b SHA512 e16a4b75ede25f3812dfc4e95545e39a80022835b9155a4e42118f911e41b691cbedd296db48d307ba4a4d0d01df1149306d752de07cabe459ccbf5bcdd49238 diff --git a/www-servers/varnish/files/fix-build-x86.patch b/www-servers/varnish/files/fix-build-x86.patch deleted file mode 100644 index acacd3b9d610..000000000000 --- a/www-servers/varnish/files/fix-build-x86.patch +++ /dev/null @@ -1,25 +0,0 @@ -See https://bugs.gentoo.org/show_bug.cgi?id=620952 - -From 54b5a09f00c027da280361b30d32a4ff309ba3ab Mon Sep 17 00:00:00 2001 -From: Poul-Henning Kamp <phk@FreeBSD.org> -Date: Tue, 28 Mar 2017 18:44:12 +0000 -Subject: [PATCH] Try to confuse GCC to not doing FP brain-damage. - -Fixes #1875 (maybe) ---- - bin/varnishd/mgt/mgt_param_tweak.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/varnishd/mgt/mgt_param_tweak.c b/bin/varnishd/mgt/mgt_param_tweak.c -index 12a7a52ef..b26581e2e 100644 ---- a/bin/varnishd/mgt/mgt_param_tweak.c -+++ b/bin/varnishd/mgt/mgt_param_tweak.c -@@ -52,7 +52,7 @@ static int - tweak_generic_double(struct vsb *vsb, volatile double *dest, - const char *arg, const char *min, const char *max, const char *fmt) - { -- double u, minv = 0, maxv = 0; -+ volatile double u, minv = 0, maxv = 0; - - if (arg != NULL) { - if (min != NULL) { diff --git a/www-servers/varnish/files/varnish-5.2.0-fix-import.patch b/www-servers/varnish/files/varnish-5.2.0-fix-import.patch deleted file mode 100644 index f83385a3f8e7..000000000000 --- a/www-servers/varnish/files/varnish-5.2.0-fix-import.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 17c92e43fda114bf5341e51d752e882238b8fe8c Mon Sep 17 00:00:00 2001 -From: Nils Goroll <nils.goroll@uplex.de> -Date: Thu, 5 Oct 2017 13:39:23 +0200 -Subject: [PATCH] hack up vsctool to work with python 2 and 3 - -StringIO does not exist any more in python3, yet requiring 2.7 would -not pave the path forward, so try to be compatible with both. - -Works for me on Python 2.7.9 and Python 3.4 - -I would appreciate if someone more fluent in serpentinous programming -language reviewed and/or rewrote this. ---- - lib/libvcc/vsctool.py | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - -diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py -index 854968e3b..829c6e518 100644 ---- a/lib/libvcc/vsctool.py -+++ b/lib/libvcc/vsctool.py -@@ -37,7 +37,10 @@ - import json - import sys - import gzip --import StringIO -+try: -+ import StringIO -+except ImportError: -+ import io - import collections - import struct - -@@ -54,9 +57,22 @@ - "format": [ "integer", FORMATS], - } - -+# http://python3porting.com/problems.html#bytes-strings-and-unicode -+if sys.version_info < (3,): -+ def b(x): -+ return x -+else: -+ import codecs -+ def b(x): -+ return codecs.latin_1_encode(x)[0] -+ - def gzip_str(s): -- out = StringIO.StringIO() -- gzip.GzipFile(fileobj=out, mode="w").write(s) -+ try: -+ out = StringIO.StringIO() -+ except NameError: -+ out = io.BytesIO() -+ -+ gzip.GzipFile(fileobj=out, mode="w").write(b(s)) - out.seek(4) - out.write(struct.pack("<L", 0x12bfd58)) - return out.getvalue() -@@ -285,7 +301,7 @@ class rst_vsc(directive): - def __init__(self, s): - super(rst_vsc, self).__init__(s) - -- for i,v in PARAMS.iteritems(): -+ for i,v in PARAMS.items(): - if v is not True: - self.do_default(i, v[0], v[1]) - 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 d2fb18c34590..68b3f15283e1 100644 --- a/www-servers/varnish/metadata.xml +++ b/www-servers/varnish/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> Varnish is an HTTP accelerator. An HTTP accelerator (often called Reverse Proxy) is an application that stores (caches) documents that have been requested over @@ -22,4 +19,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-4.0.5.ebuild b/www-servers/varnish/varnish-4.0.5.ebuild deleted file mode 100644 index a5a0a6d2194f..000000000000 --- a/www-servers/varnish/varnish-4.0.5.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 ) - -inherit user 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" -KEYWORDS="amd64 ~mips 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} - sys-devel/gcc" - -DEPEND=" - ${CDEPEND} - dev-python/docutils - virtual/pkgconfig" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" #315725 - -pkg_setup() { - ebegin "Creating varnish user and group" - enewgroup varnish - enewuser varnish -1 -1 /var/lib/varnish varnish - eend $? -} - -src_prepare() { - # Remove bundled libjemalloc. We also fix - # automagic dep in our patches, bug #461638 - rm -rf lib/libjemalloc - - eapply_user - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable jit pcre-jit ) \ - $(use_with jemalloc) -} - -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 - - dodir /var/log/varnish/ - - systemd_dounit "${FILESDIR}/${PN}d.service" - - insinto /etc/varnish/ - doins lib/libvmod_std/vmod.vcc - doins etc/example.vcl - - dodoc README - dodoc doc/changes.rst - - fowners root:varnish /etc/varnish/ - fowners varnish:varnish /var/lib/varnish/ - fperms 0750 /var/lib/varnish/ /etc/varnish/ -} diff --git a/www-servers/varnish/varnish-4.1.8.ebuild b/www-servers/varnish/varnish-4.1.8.ebuild deleted file mode 100644 index 770a0ea24b3e..000000000000 --- a/www-servers/varnish/varnish-4.1.8.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 ) - -inherit user 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" -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} - sys-devel/gcc" - -DEPEND=" - ${CDEPEND} - dev-python/docutils - virtual/pkgconfig" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" #315725 - -pkg_setup() { - ebegin "Creating varnish user and group" - enewgroup varnish - enewuser varnish -1 -1 /var/lib/varnish varnish - eend $? -} - -src_prepare() { - # Remove bundled libjemalloc. We also fix - # automagic dep in our patches, bug #461638 - rm -rf lib/libjemalloc - - # Fix bug #620952 - eapply "${FILESDIR}"/fix-build-x86.patch - - # Remove -Werror bug #528354 - sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac - - eapply_user - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable jit pcre-jit ) \ - $(use_with jemalloc) -} - -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 - - dodir /var/log/varnish/ - - systemd_dounit "${FILESDIR}/${PN}d.service" - - insinto /etc/varnish/ - doins lib/libvmod_std/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/ -} diff --git a/www-servers/varnish/varnish-5.1.3.ebuild b/www-servers/varnish/varnish-5.1.3.ebuild deleted file mode 100644 index 08be389bf7b0..000000000000 --- a/www-servers/varnish/varnish-5.1.3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python{2_7,3_6} ) - -inherit user 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" -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} - sys-devel/gcc" - -DEPEND=" - ${CDEPEND} - dev-python/docutils - virtual/pkgconfig" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" #315725 - -pkg_setup() { - ebegin "Creating varnish user and group" - enewgroup varnish - enewuser varnish -1 -1 /var/lib/varnish varnish - eend $? -} - -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 - - eapply_user - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable jit pcre-jit ) \ - $(use_with jemalloc) -} - -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 - - dodir /var/log/varnish/ - - systemd_dounit "${FILESDIR}/${PN}d.service" - - insinto /etc/varnish/ - doins lib/libvmod_std/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/ -} diff --git a/www-servers/varnish/varnish-5.2.1.ebuild b/www-servers/varnish/varnish-5.2.1.ebuild deleted file mode 100644 index e0015d83aff2..000000000000 --- a/www-servers/varnish/varnish-5.2.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python{2_7,3_6} ) - -inherit user 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" -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} - sys-devel/gcc" - -DEPEND=" - ${CDEPEND} - dev-python/docutils - virtual/pkgconfig" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" #315725 - -pkg_setup() { - ebegin "Creating varnish user and group" - enewgroup varnish - enewuser varnish -1 -1 /var/lib/varnish varnish - eend $? -} - -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 - - eapply "${FILESDIR}"/${PN}-5.2.0-fix-import.patch - - eapply_user - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable jit pcre-jit ) \ - $(use_with jemalloc) -} - -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 - - dodir /var/log/varnish/ - - systemd_dounit "${FILESDIR}/${PN}d.service" - - insinto /etc/varnish/ - doins lib/libvmod_std/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/ -} diff --git a/www-servers/varnish/varnish-6.0.1.ebuild b/www-servers/varnish/varnish-6.0.1.ebuild deleted file mode 100644 index 8f8ce746c0ba..000000000000 --- a/www-servers/varnish/varnish-6.0.1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python{2_7,3_6} ) - -inherit user 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/1" -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} - sys-devel/gcc" - -DEPEND=" - ${CDEPEND} - dev-python/docutils - virtual/pkgconfig" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" #315725 - -pkg_setup() { - ebegin "Creating varnish user and group" - enewgroup varnish - enewuser varnish -1 -1 /var/lib/varnish varnish - eend $? -} - -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 - - eapply_user - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable jit pcre-jit ) \ - $(use_with jemalloc) -} - -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.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/ -} diff --git a/www-servers/varnish/varnish-6.1.1.ebuild b/www-servers/varnish/varnish-6.1.1.ebuild deleted file mode 100644 index 01cc35179636..000000000000 --- a/www-servers/varnish/varnish-6.1.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python{2_7,3_6} ) - -inherit user 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} - sys-devel/gcc" - -DEPEND=" - ${CDEPEND} - dev-python/docutils - dev-python/sphinx - virtual/pkgconfig" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" #315725 - -pkg_setup() { - ebegin "Creating varnish user and group" - enewgroup varnish - enewuser varnish -1 -1 /var/lib/varnish varnish - eend $? -} - -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 - - eapply_user - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable jit pcre-jit ) \ - $(use_with jemalloc) -} - -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.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/ -} diff --git a/www-servers/varnish/varnish-6.3.0.ebuild b/www-servers/varnish/varnish-6.3.0.ebuild deleted file mode 100644 index 87e7399056bc..000000000000 --- a/www-servers/varnish/varnish-6.3.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python{3_6,3_7} ) - -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 - -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 - - eapply_user - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable jit pcre-jit ) \ - $(use_with jemalloc) -} - -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.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/ -} diff --git a/www-servers/varnish/varnish-6.3.1.ebuild b/www-servers/varnish/varnish-6.3.1.ebuild deleted file mode 100644 index 87e7399056bc..000000000000 --- a/www-servers/varnish/varnish-6.3.1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python{3_6,3_7} ) - -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 - -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 - - eapply_user - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable jit pcre-jit ) \ - $(use_with jemalloc) -} - -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.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/ -} diff --git a/www-servers/varnish/varnish-6.2.2-r1.ebuild b/www-servers/varnish/varnish-7.1.2-r2.ebuild index 87e7399056bc..f6ae9129df5f 100644 --- a/www-servers/varnish/varnish-6.2.2-r1.ebuild +++ b/www-servers/varnish/varnish-7.1.2-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools systemd python-r1 @@ -13,52 +13,60 @@ 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" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="jemalloc jit selinux static-libs unwind" CDEPEND=" - sys-libs/readline:0= - dev-libs/libpcre[jit?] - jemalloc? ( dev-libs/jemalloc ) - sys-libs/ncurses:0=" - -#varnish compiles stuff at run time + sys-libs/readline:= + dev-libs/libedit + dev-libs/libpcre2[jit?] + sys-libs/ncurses:= + jemalloc? ( dev-libs/jemalloc:= ) + unwind? ( sys-libs/libunwind:= ) +" + +# varnish compiles stuff at run time RDEPEND=" ${PYTHON_DEPS} ${CDEPEND} acct-user/varnish acct-group/varnish - sys-devel/gcc" - + sys-devel/gcc + selinux? ( sec-policy/selinux-varnishd ) +" DEPEND=" ${CDEPEND} dev-python/docutils dev-python/sphinx - virtual/pkgconfig" + virtual/pkgconfig +" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="test" #315725 +PATCHES=( "${FILESDIR}/${PN}-7.1.2-disable-tests.patch" ) src_prepare() { + default + # Remove -Werror bug #528354 - sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac + sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac || die # 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 - - eapply_user + ln -sf ../varnish.m4 m4/varnish.m4 || die eautoreconf } src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable jit pcre-jit ) \ + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable jit pcre2-jit) $(use_with jemalloc) + $(use_with unwind) + ) + econf "${myeconfargs[@]}" } src_install() { @@ -86,7 +94,7 @@ src_install() { systemd_dounit "${FILESDIR}/${PN}d.service" insinto /etc/varnish/ - doins lib/libvmod_std/vmod.vcc + doins vmod/vmod_*.vcc doins etc/example.vcl dodoc README.rst @@ -95,4 +103,6 @@ src_install() { fowners root:varnish /etc/varnish/ fowners varnish:varnish /var/lib/varnish/ fperms 0750 /var/lib/varnish/ /etc/varnish/ + + find "${ED}" -name "*.la" -delete || die } |