Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/
Date: Wed, 09 Aug 2017 15:10:14
Message-Id: 1502291402.62bc5fe1546ef6cd315c1f064ec81f67b82e6ae1.marecki@gentoo
1 commit: 62bc5fe1546ef6cd315c1f064ec81f67b82e6ae1
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 9 15:09:06 2017 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 9 15:10:02 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62bc5fe1
7
8 net-p2p/syncthing: remove versions vulnerable to the symlink attack
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 net-p2p/syncthing/Manifest | 3 -
13 net-p2p/syncthing/syncthing-0.14.28.ebuild | 123 -----------------------------
14 net-p2p/syncthing/syncthing-0.14.30.ebuild | 123 -----------------------------
15 net-p2p/syncthing/syncthing-0.14.32.ebuild | 123 -----------------------------
16 4 files changed, 372 deletions(-)
17
18 diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
19 index 6d67eaa639f..320318280fb 100644
20 --- a/net-p2p/syncthing/Manifest
21 +++ b/net-p2p/syncthing/Manifest
22 @@ -1,4 +1 @@
23 -DIST syncthing-0.14.28.tar.gz 4616581 SHA256 ef0a9916f82cf99e31deb5ae75127b8440abcb3b293c30c0c72d3a4ffb3d3d20 SHA512 0163d894080f7591536e78f7c50a5faf3ee63e62517c4c6989c084b8c7f6406bc221f1e4bdb3831cf1a93292d942942efa240bbe7592ec7c4436e1a6b7f6121b WHIRLPOOL d603dcf2fe2d8f82ffd0a9047a44ca9f5baa710e5e1212e9b8f0648bca5b13b199fcca9d9b7b0e978788bd9e59718fb3680e1c64a17b37428dfc2e91954238f8
24 -DIST syncthing-0.14.30.tar.gz 4616400 SHA256 e3f03ad6421e8832ea1b0f3363490e2eefb241e037016e5c87e72c20a8995a57 SHA512 fd2745595657f27f1ad157b685374b8671694ff9ab47a94e9c613aa1662146db78c31d93abf35b8c336948affb3dd2e3d54184b41996bfab9db204f380a6a3f0 WHIRLPOOL db0d0099a641b13b8bc1e27d576a0636b6e63c28308ebaa1e52bfec43103897538ac3c09f263e34e6598438ff5f9d6e47459d0460d34939df7570fe70865811c
25 -DIST syncthing-0.14.32.tar.gz 6943444 SHA256 d5b5d5bcb1b13f47d7889d9dbe7e13fed6080750fb4a93241a7fb7cf6324a463 SHA512 1db8939c0d7b5d6d1d21ed32a19bc8bc5832407a04546af88e36f8ad82113cf73909789531a2d39b670eebbfc799cdd9ac81bc1e1d42ba4702341f98b875b786 WHIRLPOOL 1e2ece603568f4deb5373bfa2ecc0bc115b12856be8520b66bbc122ed9c4ead7093f85a1346204622e0c43a9f9704ab5c99eb0fe705912ace5fddfb3a4182208
26 DIST syncthing-0.14.35.tar.gz 8235883 SHA256 58509294a150d137fbd005b5629d2859cce661d25e8063505813c4e7faa62fae SHA512 2a3de76e7118be6e91b8bc6bc69b10e250755836b378fa762e0feaed280bb2206d2e4552f09fd230d51e246633108fd8cff343ac355742ebb1bd06c2145fe086 WHIRLPOOL bdc971896378fe04576273cab23432f3dfdd96f77d464c0ea0bc8143771a40a15520d20ce2e76ccd790e78c04421f92e31ce1af04f66760a4f101b8b67b6c852
27
28 diff --git a/net-p2p/syncthing/syncthing-0.14.28.ebuild b/net-p2p/syncthing/syncthing-0.14.28.ebuild
29 deleted file mode 100644
30 index 27a867b3aba..00000000000
31 --- a/net-p2p/syncthing/syncthing-0.14.28.ebuild
32 +++ /dev/null
33 @@ -1,123 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -EGO_PN="github.com/${PN}/${PN}"
40 -
41 -inherit golang-vcs-snapshot systemd user versionator
42 -
43 -DESCRIPTION="Open Source Continuous File Synchronization"
44 -HOMEPAGE="https://syncthing.net"
45 -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
46 -
47 -LICENSE="MPL-2.0"
48 -SLOT="0"
49 -KEYWORDS="~amd64 ~x86 ~arm"
50 -IUSE="selinux tools"
51 -
52 -RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
53 -
54 -DOCS=( README.md AUTHORS CONTRIBUTING.md )
55 -
56 -pkg_setup() {
57 - enewgroup ${PN}
58 - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
59 -
60 - if use tools ; then
61 - # separate user for the relay server
62 - enewgroup strelaysrv
63 - enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
64 - # and his home folder
65 - keepdir /var/lib/strelaysrv
66 - fowners strelaysrv:strelaysrv /var/lib/strelaysrv
67 - fi
68 -}
69 -
70 -src_prepare() {
71 - default
72 - sed -i \
73 - 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
74 - src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
75 - || die
76 -}
77 -
78 -src_compile() {
79 - export GOPATH="${S}:$(get_golibdir_gopath)"
80 - cd src/${EGO_PN} || die
81 - go run build.go -version "v${PV}" -no-upgrade install \
82 - $(usex tools "all" "") || die "build failed"
83 -}
84 -
85 -src_test() {
86 - cd src/${EGO_PN} || die
87 - go run build.go test || die "test failed"
88 -}
89 -
90 -src_install() {
91 - pushd src/${EGO_PN} >& /dev/null || die
92 - doman man/*.[157]
93 - einstalldocs
94 -
95 - dobin bin/syncthing
96 - if use tools ; then
97 - exeinto /usr/libexec/syncthing
98 - local exe
99 - for exe in bin/* ; do
100 - [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
101 - done
102 - fi
103 - popd >& /dev/null || die
104 -
105 - # openrc and systemd service files
106 - systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
107 - systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
108 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
109 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
110 -
111 - keepdir /var/{lib,log}/${PN}
112 - fowners ${PN}:${PN} /var/{lib,log}/${PN}
113 - insinto /etc/logrotate.d
114 - newins "${FILESDIR}/${PN}.logrotate" ${PN}
115 -
116 - if use tools ; then
117 - # openrc and systemd service files
118 - systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
119 - newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
120 - newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
121 -
122 - insinto /etc/logrotate.d
123 - newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
124 - fi
125 -}
126 -
127 -pkg_postinst() {
128 - local v
129 - for v in ${REPLACING_VERSIONS}; do
130 - if [[ $(get_version_component_range 2) -gt \
131 - $(get_version_component_range 2 ${v}) ]]; then
132 - ewarn "Version ${PV} is not protocol-compatible with version" \
133 - "0.$(($(get_version_component_range 2) - 1)).x or lower."
134 - ewarn "Make sure all your devices are running at least version" \
135 - "0.$(get_version_component_range 2).0."
136 - fi
137 - ewarn "Syncthing OpenRC init script now uses the upstream default of"
138 - ewarn ""
139 - ewarn " /var/lib/${PN}/.config/${PN}"
140 - ewarn ""
141 - ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR"
142 - ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue"
143 - ewarn "using the old Gentoo default. Systemd users are not affected."
144 - done
145 -
146 - # check if user syncthing-relaysrv exists
147 - # if yes, warn that it has been moved to strelaysrv
148 - if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
149 - ewarn
150 - ewarn "The user and group for the relay server have been changed"
151 - ewarn "from syncthing-relaysrv to strelaysrv"
152 - ewarn "The old user and group are not deleted automatically. Delete them by running:"
153 - ewarn " userdel -r syncthing-relaysrv"
154 - ewarn " groupdel syncthing-relaysrv"
155 - fi
156 -}
157
158 diff --git a/net-p2p/syncthing/syncthing-0.14.30.ebuild b/net-p2p/syncthing/syncthing-0.14.30.ebuild
159 deleted file mode 100644
160 index 27a867b3aba..00000000000
161 --- a/net-p2p/syncthing/syncthing-0.14.30.ebuild
162 +++ /dev/null
163 @@ -1,123 +0,0 @@
164 -# Copyright 1999-2017 Gentoo Foundation
165 -# Distributed under the terms of the GNU General Public License v2
166 -
167 -EAPI=6
168 -
169 -EGO_PN="github.com/${PN}/${PN}"
170 -
171 -inherit golang-vcs-snapshot systemd user versionator
172 -
173 -DESCRIPTION="Open Source Continuous File Synchronization"
174 -HOMEPAGE="https://syncthing.net"
175 -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
176 -
177 -LICENSE="MPL-2.0"
178 -SLOT="0"
179 -KEYWORDS="~amd64 ~x86 ~arm"
180 -IUSE="selinux tools"
181 -
182 -RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
183 -
184 -DOCS=( README.md AUTHORS CONTRIBUTING.md )
185 -
186 -pkg_setup() {
187 - enewgroup ${PN}
188 - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
189 -
190 - if use tools ; then
191 - # separate user for the relay server
192 - enewgroup strelaysrv
193 - enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
194 - # and his home folder
195 - keepdir /var/lib/strelaysrv
196 - fowners strelaysrv:strelaysrv /var/lib/strelaysrv
197 - fi
198 -}
199 -
200 -src_prepare() {
201 - default
202 - sed -i \
203 - 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
204 - src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
205 - || die
206 -}
207 -
208 -src_compile() {
209 - export GOPATH="${S}:$(get_golibdir_gopath)"
210 - cd src/${EGO_PN} || die
211 - go run build.go -version "v${PV}" -no-upgrade install \
212 - $(usex tools "all" "") || die "build failed"
213 -}
214 -
215 -src_test() {
216 - cd src/${EGO_PN} || die
217 - go run build.go test || die "test failed"
218 -}
219 -
220 -src_install() {
221 - pushd src/${EGO_PN} >& /dev/null || die
222 - doman man/*.[157]
223 - einstalldocs
224 -
225 - dobin bin/syncthing
226 - if use tools ; then
227 - exeinto /usr/libexec/syncthing
228 - local exe
229 - for exe in bin/* ; do
230 - [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
231 - done
232 - fi
233 - popd >& /dev/null || die
234 -
235 - # openrc and systemd service files
236 - systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
237 - systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
238 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
239 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
240 -
241 - keepdir /var/{lib,log}/${PN}
242 - fowners ${PN}:${PN} /var/{lib,log}/${PN}
243 - insinto /etc/logrotate.d
244 - newins "${FILESDIR}/${PN}.logrotate" ${PN}
245 -
246 - if use tools ; then
247 - # openrc and systemd service files
248 - systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
249 - newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
250 - newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
251 -
252 - insinto /etc/logrotate.d
253 - newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
254 - fi
255 -}
256 -
257 -pkg_postinst() {
258 - local v
259 - for v in ${REPLACING_VERSIONS}; do
260 - if [[ $(get_version_component_range 2) -gt \
261 - $(get_version_component_range 2 ${v}) ]]; then
262 - ewarn "Version ${PV} is not protocol-compatible with version" \
263 - "0.$(($(get_version_component_range 2) - 1)).x or lower."
264 - ewarn "Make sure all your devices are running at least version" \
265 - "0.$(get_version_component_range 2).0."
266 - fi
267 - ewarn "Syncthing OpenRC init script now uses the upstream default of"
268 - ewarn ""
269 - ewarn " /var/lib/${PN}/.config/${PN}"
270 - ewarn ""
271 - ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR"
272 - ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue"
273 - ewarn "using the old Gentoo default. Systemd users are not affected."
274 - done
275 -
276 - # check if user syncthing-relaysrv exists
277 - # if yes, warn that it has been moved to strelaysrv
278 - if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
279 - ewarn
280 - ewarn "The user and group for the relay server have been changed"
281 - ewarn "from syncthing-relaysrv to strelaysrv"
282 - ewarn "The old user and group are not deleted automatically. Delete them by running:"
283 - ewarn " userdel -r syncthing-relaysrv"
284 - ewarn " groupdel syncthing-relaysrv"
285 - fi
286 -}
287
288 diff --git a/net-p2p/syncthing/syncthing-0.14.32.ebuild b/net-p2p/syncthing/syncthing-0.14.32.ebuild
289 deleted file mode 100644
290 index 27a867b3aba..00000000000
291 --- a/net-p2p/syncthing/syncthing-0.14.32.ebuild
292 +++ /dev/null
293 @@ -1,123 +0,0 @@
294 -# Copyright 1999-2017 Gentoo Foundation
295 -# Distributed under the terms of the GNU General Public License v2
296 -
297 -EAPI=6
298 -
299 -EGO_PN="github.com/${PN}/${PN}"
300 -
301 -inherit golang-vcs-snapshot systemd user versionator
302 -
303 -DESCRIPTION="Open Source Continuous File Synchronization"
304 -HOMEPAGE="https://syncthing.net"
305 -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
306 -
307 -LICENSE="MPL-2.0"
308 -SLOT="0"
309 -KEYWORDS="~amd64 ~x86 ~arm"
310 -IUSE="selinux tools"
311 -
312 -RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
313 -
314 -DOCS=( README.md AUTHORS CONTRIBUTING.md )
315 -
316 -pkg_setup() {
317 - enewgroup ${PN}
318 - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
319 -
320 - if use tools ; then
321 - # separate user for the relay server
322 - enewgroup strelaysrv
323 - enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
324 - # and his home folder
325 - keepdir /var/lib/strelaysrv
326 - fowners strelaysrv:strelaysrv /var/lib/strelaysrv
327 - fi
328 -}
329 -
330 -src_prepare() {
331 - default
332 - sed -i \
333 - 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
334 - src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
335 - || die
336 -}
337 -
338 -src_compile() {
339 - export GOPATH="${S}:$(get_golibdir_gopath)"
340 - cd src/${EGO_PN} || die
341 - go run build.go -version "v${PV}" -no-upgrade install \
342 - $(usex tools "all" "") || die "build failed"
343 -}
344 -
345 -src_test() {
346 - cd src/${EGO_PN} || die
347 - go run build.go test || die "test failed"
348 -}
349 -
350 -src_install() {
351 - pushd src/${EGO_PN} >& /dev/null || die
352 - doman man/*.[157]
353 - einstalldocs
354 -
355 - dobin bin/syncthing
356 - if use tools ; then
357 - exeinto /usr/libexec/syncthing
358 - local exe
359 - for exe in bin/* ; do
360 - [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
361 - done
362 - fi
363 - popd >& /dev/null || die
364 -
365 - # openrc and systemd service files
366 - systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
367 - systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
368 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
369 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
370 -
371 - keepdir /var/{lib,log}/${PN}
372 - fowners ${PN}:${PN} /var/{lib,log}/${PN}
373 - insinto /etc/logrotate.d
374 - newins "${FILESDIR}/${PN}.logrotate" ${PN}
375 -
376 - if use tools ; then
377 - # openrc and systemd service files
378 - systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
379 - newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
380 - newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
381 -
382 - insinto /etc/logrotate.d
383 - newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
384 - fi
385 -}
386 -
387 -pkg_postinst() {
388 - local v
389 - for v in ${REPLACING_VERSIONS}; do
390 - if [[ $(get_version_component_range 2) -gt \
391 - $(get_version_component_range 2 ${v}) ]]; then
392 - ewarn "Version ${PV} is not protocol-compatible with version" \
393 - "0.$(($(get_version_component_range 2) - 1)).x or lower."
394 - ewarn "Make sure all your devices are running at least version" \
395 - "0.$(get_version_component_range 2).0."
396 - fi
397 - ewarn "Syncthing OpenRC init script now uses the upstream default of"
398 - ewarn ""
399 - ewarn " /var/lib/${PN}/.config/${PN}"
400 - ewarn ""
401 - ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR"
402 - ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue"
403 - ewarn "using the old Gentoo default. Systemd users are not affected."
404 - done
405 -
406 - # check if user syncthing-relaysrv exists
407 - # if yes, warn that it has been moved to strelaysrv
408 - if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
409 - ewarn
410 - ewarn "The user and group for the relay server have been changed"
411 - ewarn "from syncthing-relaysrv to strelaysrv"
412 - ewarn "The old user and group are not deleted automatically. Delete them by running:"
413 - ewarn " userdel -r syncthing-relaysrv"
414 - ewarn " groupdel syncthing-relaysrv"
415 - fi
416 -}