Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/
Date: Sun, 29 Aug 2021 11:34:32
Message-Id: 1630236854.ccfd579307bee163635cee3abbffae2511094af9.blueness@gentoo
1 commit: ccfd579307bee163635cee3abbffae2511094af9
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 29 11:34:14 2021 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 29 11:34:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccfd5793
7
8 www-servers/varnish: remove vulnerable versions, bug #802219
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
12
13 www-servers/varnish/Manifest | 2 -
14 www-servers/varnish/varnish-6.3.2.ebuild | 98 --------------------------------
15 www-servers/varnish/varnish-6.4.0.ebuild | 98 --------------------------------
16 3 files changed, 198 deletions(-)
17
18 diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
19 index 31c941ad80e..439384ec952 100644
20 --- a/www-servers/varnish/Manifest
21 +++ b/www-servers/varnish/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST varnish-6.3.2.tgz 3323908 BLAKE2B 5bde1b2ececeb8aed884db22ed75bfd74f82d68416e71400a4c0d27483fcceb029fe8e724e30754899c872d7028da5cb759545f0743a11d0e90b0fd604af0ad7 SHA512 0f476c642df834737d446b3bc6ac8afa5981d1de5810dc6e8556eb22b2ca26d64eb531f4ad3332eb86e231a7443fe35393177ec6dbee97a837f405d1aa9d03cd
24 -DIST varnish-6.4.0.tgz 3404617 BLAKE2B 0ef0f7303f5c926bb1b80ec14cdd9755d65c1938fa8645240800ac2997f954022133625a74dd9c30ce21850674c3b00777fcc896309f528e6ba90d347333d7f7 SHA512 cda8f9e1d301a2b79db14685a23e25e36225f37065a1b7f37c5ae12fbb0483be51be9ffcc8ba72c1f65f5a022d1e408825694daed6780e206b9ba91feb2a07a1
25 DIST varnish-6.5.2.tgz 3464372 BLAKE2B 68a7bca159ed9539126f66d21450c87780b49b66a2d45a5abc7db6fe9d68c8526aa059546fb1d865de753736793e700611f4f110edb1c649f4e9753c4dfedacc SHA512 31673eaa95e5d3413cd3a4a6fb324c1f0ad2efb22b75409fc0e02c61446787eb167bd530ee5b0a199da4fc76cc36f3603984d86781f856cc6a4aac48260fe4ef
26 DIST varnish-6.6.1.tgz 3518308 BLAKE2B 6a88165394c0578427de20588ac2c17f502242bf94f30e9284f7bc2c271b77c3d6511a9dfb8d1cb6d75e1fc4563360fb0bec762aa17481fa598cb5e9d9527705 SHA512 af3ee1743af2ede2d3efbb73e5aa9b42c7bbd5f86163ec338c8afd1989c3e51ff3e1b40bed6b72224b5d339a74f22d6e5f3c3faf2fedee8ab4715307ed5d871b
27
28 diff --git a/www-servers/varnish/varnish-6.3.2.ebuild b/www-servers/varnish/varnish-6.3.2.ebuild
29 deleted file mode 100644
30 index c4f40d68065..00000000000
31 --- a/www-servers/varnish/varnish-6.3.2.ebuild
32 +++ /dev/null
33 @@ -1,98 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="7"
38 -
39 -PYTHON_COMPAT=( python3_{7..9} )
40 -
41 -inherit autotools systemd python-r1
42 -
43 -DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
44 -HOMEPAGE="https://varnish-cache.org/"
45 -SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
46 -
47 -LICENSE="BSD-2 GPL-2"
48 -SLOT="0/2"
49 -KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
50 -IUSE="jemalloc jit static-libs"
51 -
52 -CDEPEND="
53 - sys-libs/readline:0=
54 - dev-libs/libpcre[jit?]
55 - jemalloc? ( dev-libs/jemalloc )
56 - sys-libs/ncurses:0="
57 -
58 -#varnish compiles stuff at run time
59 -RDEPEND="
60 - ${PYTHON_DEPS}
61 - ${CDEPEND}
62 - acct-user/varnish
63 - acct-group/varnish
64 - sys-devel/gcc"
65 -
66 -DEPEND="
67 - ${CDEPEND}
68 - dev-python/docutils
69 - dev-python/sphinx
70 - virtual/pkgconfig"
71 -
72 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
73 -
74 -RESTRICT="test" #315725
75 -
76 -src_prepare() {
77 - # Remove -Werror bug #528354
78 - sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
79 -
80 - # Upstream doesn't put varnish.m4 in the m4/ directory
81 - # We link because the Makefiles look for the file in
82 - # the original location
83 - ln -sf ../varnish.m4 m4/varnish.m4
84 -
85 - eapply_user
86 -
87 - eautoreconf
88 -}
89 -
90 -src_configure() {
91 - econf \
92 - $(use_enable static-libs static) \
93 - $(use_enable jit pcre-jit ) \
94 - $(use_with jemalloc)
95 -}
96 -
97 -src_install() {
98 - emake DESTDIR="${D}" install
99 -
100 - python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
101 -
102 - newinitd "${FILESDIR}"/varnishlog.initd varnishlog
103 - newconfd "${FILESDIR}"/varnishlog.confd varnishlog
104 -
105 - newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
106 - newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
107 -
108 - newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
109 - newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
110 -
111 - insinto /etc/logrotate.d/
112 - newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
113 -
114 - diropts -m750
115 -
116 - keepdir /var/lib/varnish
117 - keepdir /var/log/varnish
118 -
119 - systemd_dounit "${FILESDIR}/${PN}d.service"
120 -
121 - insinto /etc/varnish/
122 - doins lib/libvmod_std/vmod.vcc
123 - doins etc/example.vcl
124 -
125 - dodoc README.rst
126 - dodoc doc/changes.rst
127 -
128 - fowners root:varnish /etc/varnish/
129 - fowners varnish:varnish /var/lib/varnish/
130 - fperms 0750 /var/lib/varnish/ /etc/varnish/
131 -}
132
133 diff --git a/www-servers/varnish/varnish-6.4.0.ebuild b/www-servers/varnish/varnish-6.4.0.ebuild
134 deleted file mode 100644
135 index c4cd10de4e8..00000000000
136 --- a/www-servers/varnish/varnish-6.4.0.ebuild
137 +++ /dev/null
138 @@ -1,98 +0,0 @@
139 -# Copyright 1999-2021 Gentoo Authors
140 -# Distributed under the terms of the GNU General Public License v2
141 -
142 -EAPI="7"
143 -
144 -PYTHON_COMPAT=( python3_{7..9} )
145 -
146 -inherit autotools systemd python-r1
147 -
148 -DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
149 -HOMEPAGE="https://varnish-cache.org/"
150 -SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
151 -
152 -LICENSE="BSD-2 GPL-2"
153 -SLOT="0/2"
154 -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
155 -IUSE="jemalloc jit static-libs"
156 -
157 -CDEPEND="
158 - sys-libs/readline:0=
159 - dev-libs/libpcre[jit?]
160 - jemalloc? ( dev-libs/jemalloc )
161 - sys-libs/ncurses:0="
162 -
163 -#varnish compiles stuff at run time
164 -RDEPEND="
165 - ${PYTHON_DEPS}
166 - ${CDEPEND}
167 - acct-user/varnish
168 - acct-group/varnish
169 - sys-devel/gcc"
170 -
171 -DEPEND="
172 - ${CDEPEND}
173 - dev-python/docutils
174 - dev-python/sphinx
175 - virtual/pkgconfig"
176 -
177 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
178 -
179 -RESTRICT="test" #315725
180 -
181 -src_prepare() {
182 - # Remove -Werror bug #528354
183 - sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
184 -
185 - # Upstream doesn't put varnish.m4 in the m4/ directory
186 - # We link because the Makefiles look for the file in
187 - # the original location
188 - ln -sf ../varnish.m4 m4/varnish.m4
189 -
190 - eapply_user
191 -
192 - eautoreconf
193 -}
194 -
195 -src_configure() {
196 - econf \
197 - $(use_enable static-libs static) \
198 - $(use_enable jit pcre-jit ) \
199 - $(use_with jemalloc)
200 -}
201 -
202 -src_install() {
203 - emake DESTDIR="${D}" install
204 -
205 - python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
206 -
207 - newinitd "${FILESDIR}"/varnishlog.initd varnishlog
208 - newconfd "${FILESDIR}"/varnishlog.confd varnishlog
209 -
210 - newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
211 - newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
212 -
213 - newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
214 - newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
215 -
216 - insinto /etc/logrotate.d/
217 - newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
218 -
219 - diropts -m750
220 -
221 - keepdir /var/lib/varnish
222 - keepdir /var/log/varnish
223 -
224 - systemd_dounit "${FILESDIR}/${PN}d.service"
225 -
226 - insinto /etc/varnish/
227 - doins lib/libvmod_std/vmod.vcc
228 - doins etc/example.vcl
229 -
230 - dodoc README.rst
231 - dodoc doc/changes.rst
232 -
233 - fowners root:varnish /etc/varnish/
234 - fowners varnish:varnish /var/lib/varnish/
235 - fperms 0750 /var/lib/varnish/ /etc/varnish/
236 -}