mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 14:49:30 -07:00
www-servers/vinyl-cache: drop 8.0.1, 9.0.0
Bug: https://bugs.gentoo.org/982653 Bug: https://bugs.gentoo.org/975350 Signed-off-by: Brett A C Sheffield <bacs@librecast.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/1863 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Brett A C Sheffield
committed by
Sam James
Sam James
parent
497b7bfa90
commit
efd92f6074
@@ -1,4 +1,2 @@
|
||||
DIST varnish-8.0.1.tgz 4309436 BLAKE2B 802368affb3706968d2a5538bcf560d5875e9856046fb2a0e6cd2d110394ec6e2efd111d0284eb5f40b09eaac9686e249ae9a140b8ddea06e3e188db1842a0ec SHA512 6ca63160e068d4ae6aca9c7f2e848aabc5fe327bae18b3a008e573a27c0ed2ac958740fe129477cb384dded94b1c93cbd54efec5fd6f17098c23263d11ffc9ff
|
||||
DIST varnish-8.0.2.tgz 4314061 BLAKE2B df9505c54815ae86d07e997ead7af5608969dccd3b91bf154fa6fa0591a3deee94b7cf4446c4c0d1e77ed5d2cb02d9ec812046f1f6db65a9df46cde911088fd4 SHA512 2eaac96d7121a750e6f18a271728d1fc7f7e8f079af38d450c8d395d6653942ac8cf970fa3c64f2ee7ea056617ebb5092cfe58b255dece6e948ce1308f602065
|
||||
DIST vinyl-cache-9.0.0.tgz 6353519 BLAKE2B 6cf36a66e74037a9b11d5048e0797fa2b4d6665d9463363d7d9816854d2a58744c00f684f6e274600459e8c124cfeff8405015e378c7ce12497ba65051331adb SHA512 c7be55b13609a0842bb938af39203b77a1ed17257e18f7ea29b89760687317c135dee48b8b2936561c00aeabe321e503b209b5b9af876588dd824c6c6847d17e
|
||||
DIST vinyl-cache-9.0.1.tgz 6355153 BLAKE2B 4bb7b6003197be7e6363ae8e7523bc5242802a6a8b84a0782f7e4bea929ec8fb6c8ac5e849a717b650844a30ef446f07b3b83fca981af9c7a3a83d79eacb7ad4 SHA512 6aaa936e3bce6e195d469642949bf35a76cd04e6bcdc6ff1bc608ce2b37c871cab50f779918331658aefb853e78a71336ac5cf95e49524807a2929337940ab8e
|
||||
|
||||
@@ -1,134 +0,0 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
|
||||
inherit autotools systemd python-r1
|
||||
|
||||
DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
|
||||
HOMEPAGE="https://vinyl-cache.org/"
|
||||
SRC_URI="https://vinyl-cache.org/downloads/varnish-${PV}.tgz"
|
||||
S="${WORKDIR}/varnish-${PV}"
|
||||
|
||||
LICENSE="BSD-2 GPL-2"
|
||||
SLOT="0/2"
|
||||
KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
|
||||
IUSE="jit selinux static-libs unwind"
|
||||
|
||||
COMMON_DEPEND="
|
||||
sys-libs/readline:=
|
||||
dev-libs/libedit
|
||||
dev-libs/libpcre2[jit?]
|
||||
sys-libs/ncurses:=
|
||||
unwind? ( sys-libs/libunwind:= )
|
||||
"
|
||||
|
||||
# varnish compiles stuff at run time
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
${COMMON_DEPEND}
|
||||
acct-user/varnish
|
||||
acct-group/varnish
|
||||
sys-devel/gcc
|
||||
selinux? ( sec-policy/selinux-varnishd )
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
dev-python/docutils
|
||||
dev-python/sphinx
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/varnish-8.0.0-configure-make-python-output-match-autotools.patch" # Bug: 882725
|
||||
)
|
||||
|
||||
# Upstream acknowledge that a small number of tests fail sporadically, including on their
|
||||
# test boxes. We SKIP problematic tests here. Check https://vinyl-cache.org/vtest/
|
||||
SKIP_TESTS=(
|
||||
"u00021.vtc" # Commit: 83d9fbb2961c
|
||||
"r02686.vtc" # Bug: 880627
|
||||
"r02990.vtc" # Bug: 880627
|
||||
"u00008.vtc" # Bug: 880627
|
||||
"u00009.vtc" # Bug: 880627
|
||||
"t02014.vtc" # Bug: 964041
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix python shebangs for python-exec[-native-symlinks], #909330
|
||||
# skip vmodtool, as that gets installed by python_replicate_script later
|
||||
local shebangs=($(grep -rl "#!/usr/bin/env python3"|grep -v vmodtool || die))
|
||||
python_setup
|
||||
python_fix_shebang -q ${shebangs[*]}
|
||||
|
||||
# SKIP unreliable tests
|
||||
local t
|
||||
for t in ${SKIP_TESTS[*]}; do
|
||||
sed -i -e '/^varnishtest.*$/a feature cmd false' bin/varnishtest/tests/${t} || die
|
||||
done
|
||||
|
||||
# Remove -Werror bug #528354
|
||||
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 || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
--with-contrib
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable jit pcre2-jit)
|
||||
$(use_with unwind)
|
||||
--without-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}/varnishd.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
|
||||
}
|
||||
@@ -1,129 +0,0 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
|
||||
inherit autotools systemd python-r1
|
||||
|
||||
DESCRIPTION="A high-performance caching HTTP reverse proxy"
|
||||
HOMEPAGE="https://vinyl-cache.org/"
|
||||
SRC_URI="https://vinyl-cache.org/downloads/${P}.tgz"
|
||||
|
||||
LICENSE="BSD-2 GPL-2"
|
||||
SLOT="0/9"
|
||||
KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
|
||||
IUSE="jit selinux static-libs unwind"
|
||||
|
||||
COMMON_DEPEND="
|
||||
sys-libs/readline:=
|
||||
dev-libs/libedit
|
||||
dev-libs/libpcre2[jit?]
|
||||
sys-libs/ncurses:=
|
||||
unwind? ( sys-libs/libunwind:= )
|
||||
"
|
||||
|
||||
# varnish compiles stuff at run time
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
${COMMON_DEPEND}
|
||||
acct-user/vinyl
|
||||
acct-group/vinyl
|
||||
sys-devel/gcc
|
||||
selinux? ( sec-policy/selinux-varnishd )
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
dev-python/docutils
|
||||
dev-python/sphinx
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
# Upstream acknowledge that a small number of tests fail sporadically, including on their
|
||||
# test boxes. We SKIP problematic tests here. Check https://vinyl-cache.org/vtest/
|
||||
SKIP_TESTS=(
|
||||
"u00021.vtc" # Commit: 83d9fbb2961c
|
||||
"r02686.vtc" # Bug: 880627
|
||||
"r02990.vtc" # Bug: 880627
|
||||
"u00008.vtc" # Bug: 880627
|
||||
"u00009.vtc" # Bug: 880627
|
||||
"t02014.vtc" # Bug: 964041
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix python shebangs for python-exec[-native-symlinks], #909330
|
||||
# skip vmodtool, as that gets installed by python_replicate_script later
|
||||
local shebangs=($(grep -rl "#!/usr/bin/env python3"|grep -v vmodtool || die))
|
||||
python_setup
|
||||
python_fix_shebang -q ${shebangs[*]}
|
||||
|
||||
# SKIP unreliable tests
|
||||
local t
|
||||
for t in ${SKIP_TESTS[*]}; do
|
||||
sed -i -e '/^vtest.*$/a feature cmd false' bin/vinyltest/tests/${t} || die
|
||||
done
|
||||
|
||||
# Remove -Werror bug #528354
|
||||
sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac || die
|
||||
|
||||
# Upstream doesn't put vinyl.m4 in the m4/ directory
|
||||
# We link because the Makefiles look for the file in
|
||||
# the original location
|
||||
ln -sf ../vinyl.m4 m4/vinyl.m4 || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
--with-contrib
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable jit pcre2-jit)
|
||||
$(use_with unwind)
|
||||
--without-jemalloc
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
python_replicate_script "${D}/usr/share/vinyl-cache/vmodtool.py"
|
||||
|
||||
newinitd "${FILESDIR}"/vinyllog.initd vinyllog
|
||||
newconfd "${FILESDIR}"/vinyllog.confd vinyllog
|
||||
|
||||
newinitd "${FILESDIR}"/vinylncsa.initd vinylncsa
|
||||
newconfd "${FILESDIR}"/vinylncsa.confd vinylncsa
|
||||
|
||||
newinitd "${FILESDIR}"/vinyld.initd vinyld
|
||||
newconfd "${FILESDIR}"/vinyld.confd vinyld
|
||||
|
||||
insinto /etc/logrotate.d/
|
||||
newins "${FILESDIR}/vinyld.logrotate" vinyld
|
||||
|
||||
diropts -m750
|
||||
|
||||
keepdir /var/lib/vinyl-cache
|
||||
keepdir /var/log/vinyl-cache
|
||||
|
||||
systemd_dounit "${FILESDIR}/vinyld.service"
|
||||
|
||||
insinto /etc/vinyl-cache/
|
||||
doins vmod/vmod_*.vcc
|
||||
doins etc/example.vcl
|
||||
|
||||
dodoc README.md
|
||||
dodoc doc/changes.rst
|
||||
|
||||
fowners root:vinyl /etc/vinyl-cache/
|
||||
fowners vinyl:vinyl /var/lib/vinyl-cache/
|
||||
fperms 0750 /var/lib/vinyl-cache/ /etc/vinyl-cache/
|
||||
|
||||
find "${ED}" -name "*.la" -delete || die
|
||||
}
|
||||
Reference in New Issue
Block a user