commit: 406b807647871177f09835c21748cacd717c3cca
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 13:42:45 2022 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 13:42:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406b8076
www-servers/varnish: clean up vulnerable versions, bug #832207
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
www-servers/varnish/Manifest | 2 -
www-servers/varnish/varnish-6.5.2.ebuild | 103 -----------------------------
www-servers/varnish/varnish-6.6.1.ebuild | 107 -------------------------------
3 files changed, 212 deletions(-)
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index b752e226122b..99f0cf57858d 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,3 +1 @@
-DIST varnish-6.5.2.tgz 3464372 BLAKE2B
68a7bca159ed9539126f66d21450c87780b49b66a2d45a5abc7db6fe9d68c8526aa059546fb1d865de753736793e700611f4f110edb1c649f4e9753c4dfedacc
SHA512
31673eaa95e5d3413cd3a4a6fb324c1f0ad2efb22b75409fc0e02c61446787eb167bd530ee5b0a199da4fc76cc36f3603984d86781f856cc6a4aac48260fe4ef
-DIST varnish-6.6.1.tgz 3518308 BLAKE2B
6a88165394c0578427de20588ac2c17f502242bf94f30e9284f7bc2c271b77c3d6511a9dfb8d1cb6d75e1fc4563360fb0bec762aa17481fa598cb5e9d9527705
SHA512
af3ee1743af2ede2d3efbb73e5aa9b42c7bbd5f86163ec338c8afd1989c3e51ff3e1b40bed6b72224b5d339a74f22d6e5f3c3faf2fedee8ab4715307ed5d871b
DIST varnish-7.1.0.tgz 3787588 BLAKE2B
1a019b140c467063861460b529c253361975826cee797c304c7c096645c315b67ad20400467ecf11711abae5354134ac29a934793691283e12e3fbe29921943b
SHA512
ad9ce0cdc759976fcb7044914d28863edd197167f583fab2d1bc57f4e5b86c224b7c948faf1f7364a2a16bde9c415375d011462bdc43026c5f7a60e65bd21f73
diff --git a/www-servers/varnish/varnish-6.5.2.ebuild
b/www-servers/varnish/varnish-6.5.2.ebuild
deleted file mode 100644
index 159da1164758..000000000000
--- a/www-servers/varnish/varnish-6.5.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-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 ~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}/varnish-6.5.1-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/
-}
diff --git a/www-servers/varnish/varnish-6.6.1.ebuild
b/www-servers/varnish/varnish-6.6.1.ebuild
deleted file mode 100644
index 490d4d852608..000000000000
--- a/www-servers/varnish/varnish-6.6.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-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 ~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
-
- 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 vmod/vmod_vtc.vcc
- doins vmod/vmod_directors.vcc
- doins vmod/vmod_blob.vcc
- doins vmod/vmod_proxy.vcc
- doins vmod/vmod_debug.vcc
- doins vmod/vmod_std.vcc
- doins vmod/vmod_unix.vcc
- doins vmod/vmod_cookie.vcc
- doins vmod/vmod_purge.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/
-}
