1 |
commit: a627297e675af58ff38009ff59fa790275334868 |
2 |
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 7 22:49:32 2019 +0000 |
4 |
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 7 22:49:32 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a627297e |
7 |
|
8 |
net-irc/znc: remove versions vulnerable to CVE-2019-9917 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/681864 |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
12 |
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org> |
13 |
|
14 |
net-irc/znc/Manifest | 3 - |
15 |
net-irc/znc/znc-1.7.1.ebuild | 182 ------------------------------------------- |
16 |
net-irc/znc/znc-1.7.2.ebuild | 182 ------------------------------------------- |
17 |
3 files changed, 367 deletions(-) |
18 |
|
19 |
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest |
20 |
index a57a86eff9b..015aae3862b 100644 |
21 |
--- a/net-irc/znc/Manifest |
22 |
+++ b/net-irc/znc/Manifest |
23 |
@@ -1,5 +1,2 @@ |
24 |
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 |
25 |
-DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600 |
26 |
-DIST znc-1.7.1.tar.gz 2041669 BLAKE2B 57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6 SHA512 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902 |
27 |
-DIST znc-1.7.2.tar.gz 2083306 BLAKE2B 907581df536d9bab15964f6fcecbbf660403c39368b984ab1d2957bd43c4a90ca0694844b41786dab5495a4f4dccd675eaa54189782d47683e013d1faf9cc368 SHA512 fcc67bf676e066db64d62584ff8ecfd63280b3237e88dcbe18ab0b78a9b5f4dc202b589876b6fc14c6092ca5509937bc170a54fba44df2aeb1645cca02afe577 |
28 |
DIST znc-1.7.3.tar.gz 2084575 BLAKE2B 4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530 SHA512 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8 |
29 |
|
30 |
diff --git a/net-irc/znc/znc-1.7.1.ebuild b/net-irc/znc/znc-1.7.1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 1de5e05761e..00000000000 |
33 |
--- a/net-irc/znc/znc-1.7.1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,182 +0,0 @@ |
36 |
-# Copyright 1999-2018 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
- |
41 |
-PYTHON_COMPAT=( python3_{4,5,6,7} ) |
42 |
- |
43 |
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user |
44 |
- |
45 |
-GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but newer version not released yet |
46 |
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" |
47 |
-DESCRIPTION="An advanced IRC Bouncer" |
48 |
- |
49 |
-if [[ ${PV} == *9999* ]]; then |
50 |
- inherit git-r3 |
51 |
- EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"} |
52 |
- SRC_URI="" |
53 |
-else |
54 |
- MY_PV=${PV/_/-} |
55 |
- MY_P=${PN}-${MY_PV} |
56 |
- SRC_URI=" |
57 |
- https://znc.in/releases/archive/${MY_P}.tar.gz |
58 |
- test? ( ${GTEST_URL} ) |
59 |
- " |
60 |
- KEYWORDS="amd64 arm x86" |
61 |
- S=${WORKDIR}/${MY_P} |
62 |
-fi |
63 |
- |
64 |
-HOMEPAGE="https://znc.in" |
65 |
-LICENSE="Apache-2.0" |
66 |
-SLOT="0" |
67 |
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib" |
68 |
- |
69 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" |
70 |
- |
71 |
-RDEPEND=" |
72 |
- icu? ( dev-libs/icu:= ) |
73 |
- nls? ( dev-libs/boost:=[nls] ) |
74 |
- perl? ( >=dev-lang/perl-5.10:= ) |
75 |
- python? ( ${PYTHON_DEPS} ) |
76 |
- sasl? ( >=dev-libs/cyrus-sasl-2 ) |
77 |
- ssl? ( |
78 |
- !libressl? ( dev-libs/openssl:0= ) |
79 |
- libressl? ( dev-libs/libressl:0= ) |
80 |
- ) |
81 |
- tcl? ( dev-lang/tcl:0= ) |
82 |
- zlib? ( sys-libs/zlib:0= ) |
83 |
-" |
84 |
-DEPEND=" |
85 |
- ${RDEPEND} |
86 |
- virtual/pkgconfig |
87 |
- nls? ( sys-devel/gettext ) |
88 |
- perl? ( >=dev-lang/swig-3.0.0 ) |
89 |
- python? ( >=dev-lang/swig-3.0.0 ) |
90 |
- test? ( dev-qt/qtnetwork:5 ) |
91 |
-" |
92 |
- |
93 |
-PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch ) |
94 |
- |
95 |
-pkg_setup() { |
96 |
- if use python; then |
97 |
- python-single-r1_pkg_setup |
98 |
- fi |
99 |
- |
100 |
- enewgroup ${PN} |
101 |
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} |
102 |
- # The home directory was previously set to /dev/null |
103 |
- # This caused a bug with the systemd unit |
104 |
- # https://bugs.gentoo.org/521916 |
105 |
- esethome ${PN} /var/lib/${PN} |
106 |
-} |
107 |
- |
108 |
-src_prepare() { |
109 |
- # Let SWIG rebuild modperl/modpython to make user patching easier. |
110 |
- if [[ ${PV} != *9999* ]]; then |
111 |
- rm modules/modperl/generated.tar.gz || die |
112 |
- rm modules/modpython/generated.tar.gz || die |
113 |
- fi |
114 |
- |
115 |
- sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \ |
116 |
- test/CMakeLists.txt || die |
117 |
- |
118 |
- cmake-utils_src_prepare |
119 |
-} |
120 |
- |
121 |
-src_configure() { |
122 |
- local mycmakeargs=( |
123 |
- -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. |
124 |
- -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" |
125 |
- -DWANT_ICU="$(usex icu)" |
126 |
- -DWANT_IPV6="$(usex ipv6)" |
127 |
- -DWANT_I18N="$(usex nls)" |
128 |
- -DWANT_PERL="$(usex perl)" |
129 |
- -DWANT_PYTHON="$(usex python)" |
130 |
- -DWANT_CYRUS="$(usex sasl)" |
131 |
- -DWANT_OPENSSL="$(usex ssl)" |
132 |
- -DWANT_TCL="$(usex tcl)" |
133 |
- -DWANT_ZLIB="$(usex zlib)" |
134 |
- ) |
135 |
- |
136 |
- if [[ ${PV} != *9999* ]] && use test; then |
137 |
- export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest" |
138 |
- export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock" |
139 |
- fi |
140 |
- |
141 |
- cmake-utils_src_configure |
142 |
-} |
143 |
- |
144 |
-src_test() { |
145 |
- cmake-utils_src_make unittest |
146 |
- if has network-sandbox ${FEATURES}; then |
147 |
- cmake-utils_src_make install DESTDIR="${T}/inttest" |
148 |
- local filter='-' |
149 |
- if ! use perl; then |
150 |
- filter="${filter}:ZNCTest.Modperl*" |
151 |
- fi |
152 |
- if ! use python; then |
153 |
- filter="${filter}:ZNCTest.Modpython*" |
154 |
- fi |
155 |
- # CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod |
156 |
- # invocations from inside the test |
157 |
- GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \ |
158 |
- CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \ |
159 |
- CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \ |
160 |
- cmake-utils_src_make inttest |
161 |
- else |
162 |
- # TODO: don't require sandbox after |
163 |
- # https://github.com/znc/znc/pull/1363 is implemented |
164 |
- ewarn "FEATURES=-network-sandbox; skipping integration tests which" |
165 |
- ewarn "temporary open local ports." |
166 |
- fi |
167 |
-} |
168 |
- |
169 |
-src_install() { |
170 |
- cmake-utils_src_install |
171 |
- |
172 |
- dodoc NOTICE |
173 |
- newinitd "${FILESDIR}"/znc.initd-r2 znc |
174 |
- newconfd "${FILESDIR}"/znc.confd-r1 znc |
175 |
- |
176 |
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die |
177 |
- DISABLE_AUTOFORMATTING=1 |
178 |
- readme.gentoo_create_doc |
179 |
-} |
180 |
- |
181 |
-pkg_postinst() { |
182 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
183 |
- # This is a new installation |
184 |
- readme.gentoo_print_elog |
185 |
- fi |
186 |
- |
187 |
- if [[ -d "${EROOT%/}"/etc/znc ]]; then |
188 |
- ewarn "${EROOT%/}/etc/znc exists on your system." |
189 |
- ewarn "Due to the nature of the contents of that folder," |
190 |
- ewarn "we have changed the default configuration to use" |
191 |
- ewarn " ${EROOT%/}/var/lib/znc" |
192 |
- ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc" |
193 |
- ewarn "or adjust your service configuration." |
194 |
- fi |
195 |
-} |
196 |
- |
197 |
-pkg_config() { |
198 |
- if [[ -e "${EROOT%/}/var/lib/znc" ]]; then |
199 |
- ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging" |
200 |
- ewarn "any existing configuration. If you are sure you want" |
201 |
- ewarn "to generate a new configuration, remove the folder" |
202 |
- ewarn "and try again." |
203 |
- else |
204 |
- einfo "Press enter to interactively create a new configuration file for znc." |
205 |
- einfo "To abort, press Control-C" |
206 |
- read |
207 |
- mkdir -p "${EROOT%/}/var/lib/znc" || die |
208 |
- chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" || |
209 |
- die "Setting permissions failed" |
210 |
- start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ |
211 |
- "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" || |
212 |
- die "Config failed" |
213 |
- einfo |
214 |
- einfo "You can now start the znc service using the init system of your choice." |
215 |
- einfo "Don't forget to enable it if you want to use znc at boot." |
216 |
- fi |
217 |
-} |
218 |
|
219 |
diff --git a/net-irc/znc/znc-1.7.2.ebuild b/net-irc/znc/znc-1.7.2.ebuild |
220 |
deleted file mode 100644 |
221 |
index b8d5eb3df8f..00000000000 |
222 |
--- a/net-irc/znc/znc-1.7.2.ebuild |
223 |
+++ /dev/null |
224 |
@@ -1,182 +0,0 @@ |
225 |
-# Copyright 1999-2019 Gentoo Authors |
226 |
-# Distributed under the terms of the GNU General Public License v2 |
227 |
- |
228 |
-EAPI=7 |
229 |
- |
230 |
-PYTHON_COMPAT=( python3_{4,5,6,7} ) |
231 |
- |
232 |
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user |
233 |
- |
234 |
-GTEST_VER="1.8.1" |
235 |
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" |
236 |
-DESCRIPTION="An advanced IRC Bouncer" |
237 |
- |
238 |
-if [[ ${PV} == *9999* ]]; then |
239 |
- inherit git-r3 |
240 |
- EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"} |
241 |
- SRC_URI="" |
242 |
-else |
243 |
- MY_PV=${PV/_/-} |
244 |
- MY_P=${PN}-${MY_PV} |
245 |
- SRC_URI=" |
246 |
- https://znc.in/releases/archive/${MY_P}.tar.gz |
247 |
- test? ( ${GTEST_URL} ) |
248 |
- " |
249 |
- KEYWORDS="~amd64 ~arm ~x86" |
250 |
- S=${WORKDIR}/${MY_P} |
251 |
-fi |
252 |
- |
253 |
-HOMEPAGE="https://znc.in" |
254 |
-LICENSE="Apache-2.0" |
255 |
-SLOT="0" |
256 |
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib" |
257 |
- |
258 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" |
259 |
- |
260 |
-RDEPEND=" |
261 |
- icu? ( dev-libs/icu:= ) |
262 |
- nls? ( dev-libs/boost:=[nls] ) |
263 |
- perl? ( >=dev-lang/perl-5.10:= ) |
264 |
- python? ( ${PYTHON_DEPS} ) |
265 |
- sasl? ( >=dev-libs/cyrus-sasl-2 ) |
266 |
- ssl? ( |
267 |
- !libressl? ( dev-libs/openssl:0= ) |
268 |
- libressl? ( dev-libs/libressl:0= ) |
269 |
- ) |
270 |
- tcl? ( dev-lang/tcl:0= ) |
271 |
- zlib? ( sys-libs/zlib:0= ) |
272 |
-" |
273 |
-DEPEND=" |
274 |
- ${RDEPEND} |
275 |
- virtual/pkgconfig |
276 |
- nls? ( sys-devel/gettext ) |
277 |
- perl? ( >=dev-lang/swig-3.0.0 ) |
278 |
- python? ( >=dev-lang/swig-3.0.0 ) |
279 |
- test? ( dev-qt/qtnetwork:5 ) |
280 |
-" |
281 |
- |
282 |
-PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch ) |
283 |
- |
284 |
-pkg_setup() { |
285 |
- if use python; then |
286 |
- python-single-r1_pkg_setup |
287 |
- fi |
288 |
- |
289 |
- enewgroup ${PN} |
290 |
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} |
291 |
- # The home directory was previously set to /dev/null |
292 |
- # This caused a bug with the systemd unit |
293 |
- # https://bugs.gentoo.org/521916 |
294 |
- esethome ${PN} /var/lib/${PN} |
295 |
-} |
296 |
- |
297 |
-src_prepare() { |
298 |
- # Let SWIG rebuild modperl/modpython to make user patching easier. |
299 |
- if [[ ${PV} != *9999* ]]; then |
300 |
- rm modules/modperl/generated.tar.gz || die |
301 |
- rm modules/modpython/generated.tar.gz || die |
302 |
- fi |
303 |
- |
304 |
- sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \ |
305 |
- test/CMakeLists.txt || die |
306 |
- |
307 |
- cmake-utils_src_prepare |
308 |
-} |
309 |
- |
310 |
-src_configure() { |
311 |
- local mycmakeargs=( |
312 |
- -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. |
313 |
- -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" |
314 |
- -DWANT_ICU="$(usex icu)" |
315 |
- -DWANT_IPV6="$(usex ipv6)" |
316 |
- -DWANT_I18N="$(usex nls)" |
317 |
- -DWANT_PERL="$(usex perl)" |
318 |
- -DWANT_PYTHON="$(usex python)" |
319 |
- -DWANT_CYRUS="$(usex sasl)" |
320 |
- -DWANT_OPENSSL="$(usex ssl)" |
321 |
- -DWANT_TCL="$(usex tcl)" |
322 |
- -DWANT_ZLIB="$(usex zlib)" |
323 |
- ) |
324 |
- |
325 |
- if [[ ${PV} != *9999* ]] && use test; then |
326 |
- export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest" |
327 |
- export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock" |
328 |
- fi |
329 |
- |
330 |
- cmake-utils_src_configure |
331 |
-} |
332 |
- |
333 |
-src_test() { |
334 |
- cmake-utils_src_make unittest |
335 |
- if has network-sandbox ${FEATURES}; then |
336 |
- DESTDIR="${T}/inttest" cmake-utils_src_make install |
337 |
- local filter='-' |
338 |
- if ! use perl; then |
339 |
- filter="${filter}:ZNCTest.Modperl*" |
340 |
- fi |
341 |
- if ! use python; then |
342 |
- filter="${filter}:ZNCTest.Modpython*" |
343 |
- fi |
344 |
- # CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod |
345 |
- # invocations from inside the test |
346 |
- GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \ |
347 |
- CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \ |
348 |
- CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \ |
349 |
- cmake-utils_src_make inttest |
350 |
- else |
351 |
- # TODO: don't require sandbox after |
352 |
- # https://github.com/znc/znc/pull/1363 is implemented |
353 |
- ewarn "FEATURES=-network-sandbox; skipping integration tests which" |
354 |
- ewarn "temporary open local ports." |
355 |
- fi |
356 |
-} |
357 |
- |
358 |
-src_install() { |
359 |
- cmake-utils_src_install |
360 |
- |
361 |
- dodoc NOTICE |
362 |
- newinitd "${FILESDIR}"/znc.initd-r2 znc |
363 |
- newconfd "${FILESDIR}"/znc.confd-r1 znc |
364 |
- |
365 |
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die |
366 |
- DISABLE_AUTOFORMATTING=1 |
367 |
- readme.gentoo_create_doc |
368 |
-} |
369 |
- |
370 |
-pkg_postinst() { |
371 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
372 |
- # This is a new installation |
373 |
- readme.gentoo_print_elog |
374 |
- fi |
375 |
- |
376 |
- if [[ -d "${EROOT%/}"/etc/znc ]]; then |
377 |
- ewarn "${EROOT%/}/etc/znc exists on your system." |
378 |
- ewarn "Due to the nature of the contents of that folder," |
379 |
- ewarn "we have changed the default configuration to use" |
380 |
- ewarn " ${EROOT%/}/var/lib/znc" |
381 |
- ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc" |
382 |
- ewarn "or adjust your service configuration." |
383 |
- fi |
384 |
-} |
385 |
- |
386 |
-pkg_config() { |
387 |
- if [[ -e "${EROOT%/}/var/lib/znc" ]]; then |
388 |
- ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging" |
389 |
- ewarn "any existing configuration. If you are sure you want" |
390 |
- ewarn "to generate a new configuration, remove the folder" |
391 |
- ewarn "and try again." |
392 |
- else |
393 |
- einfo "Press enter to interactively create a new configuration file for znc." |
394 |
- einfo "To abort, press Control-C" |
395 |
- read |
396 |
- mkdir -p "${EROOT%/}/var/lib/znc" || die |
397 |
- chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" || |
398 |
- die "Setting permissions failed" |
399 |
- start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ |
400 |
- "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" || |
401 |
- die "Config failed" |
402 |
- einfo |
403 |
- einfo "You can now start the znc service using the init system of your choice." |
404 |
- einfo "Don't forget to enable it if you want to use znc at boot." |
405 |
- fi |
406 |
-} |