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: Wed, 02 Aug 2017 14:59:55
Message-Id: 1501685986.54fbdbac61bb262e50b4761d7feccb21170c8cc2.blueness@gentoo
1 commit: 54fbdbac61bb262e50b4761d7feccb21170c8cc2
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 2 14:59:26 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 2 14:59:46 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54fbdbac
7
8 www-servers/varnish: remove vulnerable unstable versions
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 www-servers/varnish/Manifest | 2 -
13 www-servers/varnish/varnish-4.1.7.ebuild | 102 -------------------------------
14 www-servers/varnish/varnish-5.1.2.ebuild | 99 ------------------------------
15 3 files changed, 203 deletions(-)
16
17 diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
18 index 45a266590b6..9bd74616458 100644
19 --- a/www-servers/varnish/Manifest
20 +++ b/www-servers/varnish/Manifest
21 @@ -1,7 +1,5 @@
22 DIST varnish-4.0.3.tar.gz 1866760 SHA256 94b9a174097f47db2286acd2c35f235e49a2b7a9ddfdbd6eb7aa4da9ae8f8206 SHA512 db7bb141afd4617ac95573983dc30591b0eb9bc1af06df1094f2c1eeac539da936afb4a239d2f446d3c3a51b88a781b7f9f6d9a0b2028eaf0e7049ea2159d883 WHIRLPOOL 942456e19be427859283959dabe5522667519d36decbc598c8ee1e949767ea7435469393289d4373db6abac5275e50a95fc3799a837dc17740a490b4912bfe6f
23 DIST varnish-4.0.5.tar.gz 1947888 SHA256 d90ffa33902d3ac40742cbb50588a37f467f23797f93e67a261724f4a7fb0aff SHA512 a08259f6f9c6fffa188b26c1f8c630de5e6d2f6d52f6efa9d5d8239cdd8721c53e2be3379f8100efb537e74416eadd6c865f4cc687db1c5a9f757bb3f73abeda WHIRLPOOL feea23e932e4bb422885679f15ddfed8d87976ab129f9658a96a01c81de8b3cd92e747739ad96693477b09025aecc9a5da9ce9170fdb9fdfc04c1d7c4ef8d3f4
24 DIST varnish-4.1.6.tar.gz 2201975 SHA256 c7ac460b521bebf772868b2f5aefc2f2508a1e133809cd52d3ba1b312226e849 SHA512 c97b6245d467472dc61d1471cbfbefc1cca0839abbca73940efb800e7751437a64437a0c68e2c65e6f4dc039f25bb51ef4d9f3da4e50ccb854646457fb147927 WHIRLPOOL 6b10fc7c2b19f8ba6e8b89cad41b034ce1ab126db510f239a725fa3e1319e2b130c872c3a88b2f3f9c1a5bf9a926540b0fa4aa8238b92eb5174722bee8d307c4
25 -DIST varnish-4.1.7.tar.gz 2210417 SHA256 c52ee2f5d052a496f3700d8ac8eb4da45144779c863f09f7be70daec3cfed105 SHA512 668e69430163600fad34031593d6144a52b113f9aea01d5ba51c7dac0ecf10606610a1d96393f07329e4f6af9a71b4ce668284f7c49b2c5871817707326036fd WHIRLPOOL cede0f86e86b55a312535aa76bd6b6bb0ec27c688ae65ee0b8953b238f4172202237ed97af3278dc77611773a7b29253037a4ebe9ef47bddf01832adefac9ac5
26 DIST varnish-4.1.8.tar.gz 2254772 SHA256 908e7fbfa0325498717686b2050181134aa0a69d1495c02b2625cd34d35a4ff1 SHA512 c642359118d87e8713d2ccf817da317a454a0f9ae6f7a07da1d10b5076aa7e5d7dcc203ef71ae19d56b7592db0c66b4ca96cb43d5fa0e6aa588d1dc8e03e026e WHIRLPOOL 2e04466f2a7a60cb788177b6328f47a4929767c927c0083da33ccb30bfa2fa39b220ddab965c1093e77c2b222f959798f91090a37e809476781c45e23601fb3e
27 -DIST varnish-5.1.2.tar.gz 2597817 SHA256 39d858137e26948a7c85f07363f13f0778da61d234126e03a160a0cb9ba4fce3 SHA512 6ee71c2678a34f7e3963547d8e79bd83e3b326ffe703ad60f0d6f8f218a3801849c870aa00e407008ef22cd2b2baf4cbe02625ce77018279afdb8208d43a743b WHIRLPOOL 4c824fbb00d79fd1a6287bf08e26d9e9074e986d63d37a305f2f0dca320766e694aa8eaf81d723280f207e9b3fb528d2f917ee6fa21c3f24ba84b83acd367e86
28 DIST varnish-5.1.3.tar.gz 2643223 SHA256 7439c93ca581340f3722b8c790160f46dc6c5328188e4c0bc233c42f3f04a54e SHA512 a10c317dc38ddff139ca8153f6388955df449c3abeb4d4f069b632ba2b32064a2827ab05fa8515994b251a68507fc3a7bf4e08eacc991fc03283ab234b9efd0a WHIRLPOOL 7dbd0da80bb9b8de194da83c6e8d198ec2652ae8d17105196b0af76d9df1129cecc67b3fd47a73c53d0f175872782478ee836ec6a75738b343b444ecb1dd1f19
29
30 diff --git a/www-servers/varnish/varnish-4.1.7.ebuild b/www-servers/varnish/varnish-4.1.7.ebuild
31 deleted file mode 100644
32 index abb3177963a..00000000000
33 --- a/www-servers/varnish/varnish-4.1.7.ebuild
34 +++ /dev/null
35 @@ -1,102 +0,0 @@
36 -# Copyright 1999-2017 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI="6"
40 -
41 -PYTHON_COMPAT=( python{2_7,3_4} pypy )
42 -
43 -inherit user autotools systemd python-r1
44 -
45 -DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
46 -HOMEPAGE="http://www.varnish-cache.org/"
47 -SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
48 -
49 -LICENSE="BSD-2 GPL-2"
50 -SLOT="0"
51 -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
52 -IUSE="jemalloc jit static-libs"
53 -
54 -CDEPEND="
55 - sys-libs/readline:0=
56 - dev-libs/libpcre[jit?]
57 - jemalloc? ( dev-libs/jemalloc )
58 - sys-libs/ncurses:0="
59 -
60 -#varnish compiles stuff at run time
61 -RDEPEND="
62 - ${PYTHON_DEPS}
63 - ${CDEPEND}
64 - sys-devel/gcc"
65 -
66 -DEPEND="
67 - ${CDEPEND}
68 - dev-python/docutils
69 - virtual/pkgconfig"
70 -
71 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
72 -
73 -RESTRICT="test" #315725
74 -
75 -DOCS=( README.rst doc/changes.rst )
76 -
77 -pkg_setup() {
78 - ebegin "Creating varnish user and group"
79 - enewgroup varnish
80 - enewuser varnish -1 -1 /var/lib/varnish varnish
81 - eend $?
82 -}
83 -
84 -src_prepare() {
85 - # Remove bundled libjemalloc. We also fix
86 - # automagic dep in our patches, bug #461638
87 - rm -rf lib/libjemalloc
88 -
89 - # Fix bug #620952
90 - eapply "${FILESDIR}"/fix-build-x86.patch
91 -
92 - # Remove -Werror bug #528354
93 - sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
94 -
95 - eapply_user
96 -
97 - eautoreconf
98 -}
99 -
100 -src_configure() {
101 - econf \
102 - $(use_enable static-libs static) \
103 - $(use_enable jit pcre-jit ) \
104 - $(use_with jemalloc)
105 -}
106 -
107 -src_install() {
108 - emake DESTDIR="${D}" install
109 -
110 - python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
111 -
112 - newinitd "${FILESDIR}"/varnishlog.initd varnishlog
113 - newconfd "${FILESDIR}"/varnishlog.confd varnishlog
114 -
115 - newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
116 - newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
117 -
118 - newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
119 - newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
120 -
121 - insinto /etc/logrotate.d/
122 - newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
123 -
124 - diropts -m750
125 -
126 - dodir /var/log/varnish/
127 -
128 - systemd_dounit "${FILESDIR}/${PN}d.service"
129 -
130 - insinto /etc/varnish/
131 - doins lib/libvmod_std/vmod.vcc
132 - doins etc/example.vcl
133 -
134 - fowners root:varnish /etc/varnish/
135 - fowners varnish:varnish /var/lib/varnish/
136 - fperms 0750 /var/lib/varnish/ /etc/varnish/
137 -}
138
139 diff --git a/www-servers/varnish/varnish-5.1.2.ebuild b/www-servers/varnish/varnish-5.1.2.ebuild
140 deleted file mode 100644
141 index e9d0fe5bb05..00000000000
142 --- a/www-servers/varnish/varnish-5.1.2.ebuild
143 +++ /dev/null
144 @@ -1,99 +0,0 @@
145 -# Copyright 1999-2017 Gentoo Foundation
146 -# Distributed under the terms of the GNU General Public License v2
147 -
148 -EAPI="6"
149 -
150 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
151 -
152 -inherit user autotools eutils systemd python-r1
153 -
154 -DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
155 -HOMEPAGE="http://www.varnish-cache.org/"
156 -SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
157 -
158 -LICENSE="BSD-2 GPL-2"
159 -SLOT="0"
160 -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
161 -IUSE="jemalloc jit static-libs"
162 -
163 -CDEPEND="
164 - sys-libs/readline:0=
165 - dev-libs/libpcre[jit?]
166 - jemalloc? ( dev-libs/jemalloc )
167 - sys-libs/ncurses:0="
168 -
169 -#varnish compiles stuff at run time
170 -RDEPEND="
171 - ${PYTHON_DEPS}
172 - ${CDEPEND}
173 - sys-devel/gcc"
174 -
175 -DEPEND="
176 - ${CDEPEND}
177 - dev-python/docutils
178 - virtual/pkgconfig"
179 -
180 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
181 -
182 -RESTRICT="test" #315725
183 -
184 -DOCS=( README.rst doc/changes.rst )
185 -
186 -pkg_setup() {
187 - ebegin "Creating varnish user and group"
188 - enewgroup varnish
189 - enewuser varnish -1 -1 /var/lib/varnish varnish
190 - eend $?
191 -}
192 -
193 -src_prepare() {
194 - # Remove -Werror bug #528354
195 - sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
196 -
197 - # Upstream doesn't put varnish.m4 in the m4/ directory
198 - # We link because the Makefiles look for the file in
199 - # the original location
200 - ln -sf ../varnish.m4 m4/varnish.m4
201 -
202 - eapply_user
203 -
204 - eautoreconf
205 -}
206 -
207 -src_configure() {
208 - econf \
209 - $(use_enable static-libs static) \
210 - $(use_enable jit pcre-jit ) \
211 - $(use_with jemalloc)
212 -}
213 -
214 -src_install() {
215 - default
216 -
217 - python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
218 -
219 - newinitd "${FILESDIR}"/varnishlog.initd varnishlog
220 - newconfd "${FILESDIR}"/varnishlog.confd varnishlog
221 -
222 - newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
223 - newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
224 -
225 - newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
226 - newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
227 -
228 - insinto /etc/logrotate.d/
229 - newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
230 -
231 - diropts -m750
232 - dodir /var/log/varnish/
233 -
234 - systemd_dounit "${FILESDIR}/${PN}d.service"
235 -
236 - insinto /etc/varnish/
237 - doins lib/libvmod_std/vmod.vcc
238 - doins etc/example.vcl
239 -
240 - fowners root:varnish /etc/varnish/
241 - fowners varnish:varnish /var/lib/varnish/
242 - fperms 0750 /var/lib/varnish/ /etc/varnish/
243 -}