Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/badvpn/, net-vpn/badvpn/files/
Date: Sat, 01 Jan 2022 02:01:21
Message-Id: 1641002307.b7207472b68bb07923d94297fdad9f7b0205c3a1.williamh@gentoo
1 commit: b7207472b68bb07923d94297fdad9f7b0205c3a1
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 1 01:51:07 2022 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 1 01:58:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7207472
7
8 net-vpn/badvpn: remove for lastrites
9
10 Bug: https://bugs.gentoo.org/770619
11 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
12
13 net-vpn/badvpn/Manifest | 3 -
14 net-vpn/badvpn/badvpn-1.999.127-r1.ebuild | 87 --------------------------
15 net-vpn/badvpn/badvpn-1.999.129-r1.ebuild | 87 --------------------------
16 net-vpn/badvpn/badvpn-1.999.130-r1.ebuild | 84 -------------------------
17 net-vpn/badvpn/files/badvpn-1.999.127-ncd.init | 24 -------
18 net-vpn/badvpn/files/badvpn-ncd.conf | 11 ----
19 net-vpn/badvpn/files/badvpn-ncd.service | 11 ----
20 net-vpn/badvpn/files/badvpn-server.conf | 11 ----
21 net-vpn/badvpn/files/badvpn-server.init | 48 --------------
22 net-vpn/badvpn/metadata.xml | 35 -----------
23 10 files changed, 401 deletions(-)
24
25 diff --git a/net-vpn/badvpn/Manifest b/net-vpn/badvpn/Manifest
26 deleted file mode 100644
27 index 645088e6e493..000000000000
28 --- a/net-vpn/badvpn/Manifest
29 +++ /dev/null
30 @@ -1,3 +0,0 @@
31 -DIST badvpn-1.999.127.tar.bz2 962224 BLAKE2B c0fc22aa56f59d9273797df9a1687509d1502ada2c92a308b8bd7368b50a4151f1ef8a8d91c720fee85c6f92497a421372eec3dd2160d53e3f3345041ce35f9b SHA512 7484a817795392a52b44d3bf68765652739029aae8c16965b433bbfb4ca67ea70048f76376ba445196aac07a8f19f97696917ad24fe2bcb34025adda1f18a9fb
32 -DIST badvpn-1.999.129.tar.gz 1327123 BLAKE2B 640b4bc3252d0aadaf9a8ce42da7bbead7c0d371a1f536e994a4d26897d8fbee9a0c9738b31b1ce308b3b08b6a661d9dad0ea012ff08ec6349ee67063e402084 SHA512 7a305198d7b4aaa31e567ff1f1bf23e0a65070d8eae78e7ed6be1a3a3b7bce7fcba32c0eb8ae549ef1851a61675afc1770f52dedf131658036b7b6414fdd4e4e
33 -DIST badvpn-1.999.130.tar.gz 1340372 BLAKE2B d13d5fdda487418ba8d93ba49736f2b68c1b5054636b5cf9120f32f6de5b9d0240502d68824a194c18074b5de86227ad6412c969d91b0ff1ee0ff016bb4c1fb4 SHA512 958d6f3b7a8074fa7ba2f26812c9b2c39272b75d762a12a821ad2d0db9cdc9b9307338d77ca0dcadcf57b81fa4632362e67524de4246d01829951e8924a89770
34
35 diff --git a/net-vpn/badvpn/badvpn-1.999.127-r1.ebuild b/net-vpn/badvpn/badvpn-1.999.127-r1.ebuild
36 deleted file mode 100644
37 index ce494c984ecd..000000000000
38 --- a/net-vpn/badvpn/badvpn-1.999.127-r1.ebuild
39 +++ /dev/null
40 @@ -1,87 +0,0 @@
41 -# Copyright 1999-2021 Gentoo Authors
42 -# Distributed under the terms of the GNU General Public License v2
43 -
44 -EAPI=5
45 -inherit cmake-utils user toolchain-funcs systemd
46 -
47 -MY_P=${PN}-${PV/_rc/rc}
48 -DESCRIPTION="Peer-to-peer VPN, NCD scripting language, tun2socks proxifier"
49 -HOMEPAGE="https://code.google.com/p/badvpn/"
50 -SRC_URI="https://badvpn.googlecode.com/files/${MY_P}.tar.bz2"
51 -
52 -LICENSE="BSD"
53 -KEYWORDS="amd64 arm x86"
54 -SLOT="0"
55 -TARGETS="+client +ncd +server +tun2socks +udpgw"
56 -IUSE="${TARGETS} debug"
57 -# tests are only ncd related
58 -RESTRICT="!ncd? ( test )"
59 -
60 -COMMON_DEPEND="
61 - client? (
62 - dev-libs/nspr
63 - dev-libs/nss
64 - dev-libs/openssl:=
65 - )
66 - server? (
67 - dev-libs/nspr
68 - dev-libs/nss
69 - dev-libs/openssl:=
70 - )
71 - ncd? (
72 - dev-libs/openssl
73 - )"
74 -RDEPEND="${COMMON_DEPEND}
75 - ncd? (
76 - sys-apps/iproute2
77 - >=virtual/udev-171
78 - )"
79 -DEPEND="${COMMON_DEPEND}
80 - virtual/pkgconfig"
81 -# we need at least one target
82 -REQUIRED_USE="|| ( ${TARGETS//+/} )"
83 -
84 -S=${WORKDIR}/${MY_P}
85 -
86 -pkg_setup() {
87 - enewuser ${PN}
88 -}
89 -
90 -src_configure() {
91 - local mycmakeargs=(
92 - -DBUILD_NOTHING_BY_DEFAULT=1
93 - $(cmake-utils_use_build client CLIENT)
94 - $(cmake-utils_use_build server SERVER)
95 - $(cmake-utils_use_build ncd NCD)
96 - $(cmake-utils_use_build tun2socks TUN2SOCKS)
97 - $(cmake-utils_use_build udpgw UDPGW)
98 - )
99 -
100 - cmake-utils_src_configure
101 -}
102 -
103 -src_test() {
104 - # OOHMSA: do this on portage level?
105 - tc-is-cross-compiler && die "these tests do not work when cross compiling!"
106 -
107 - einfo "Running NCD tests"
108 - cd "${S}"/ncd/tests || die
109 - bash ./run_tests "${CMAKE_BUILD_DIR}/ncd/badvpn-ncd" \
110 - || die "one or more tests failed"
111 -}
112 -
113 -src_install() {
114 - cmake-utils_src_install
115 - dodoc ChangeLog
116 -
117 - if use server; then
118 - newinitd "${FILESDIR}"/${PN}-server.init ${PN}-server
119 - newconfd "${FILESDIR}"/${PN}-server.conf ${PN}-server
120 - fi
121 -
122 - if use ncd; then
123 - newinitd "${FILESDIR}"/${P}-ncd.init ${PN}-ncd
124 - newconfd "${FILESDIR}"/${PN}-ncd.conf ${PN}-ncd
125 - systemd_dounit "${FILESDIR}"/badvpn-ncd.service
126 - fi
127 -}
128
129 diff --git a/net-vpn/badvpn/badvpn-1.999.129-r1.ebuild b/net-vpn/badvpn/badvpn-1.999.129-r1.ebuild
130 deleted file mode 100644
131 index d3bdf113740f..000000000000
132 --- a/net-vpn/badvpn/badvpn-1.999.129-r1.ebuild
133 +++ /dev/null
134 @@ -1,87 +0,0 @@
135 -# Copyright 1999-2021 Gentoo Authors
136 -# Distributed under the terms of the GNU General Public License v2
137 -
138 -EAPI=5
139 -inherit cmake-utils user toolchain-funcs systemd
140 -
141 -MY_P=${PN}-${PV/_rc/rc}
142 -DESCRIPTION="Peer-to-peer VPN, NCD scripting language, tun2socks proxifier"
143 -HOMEPAGE="https://github.com/ambrop72/badvpn https://code.google.com/p/badvpn/"
144 -SRC_URI="https://github.com/ambrop72/badvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
145 -
146 -LICENSE="BSD"
147 -KEYWORDS="amd64 arm x86"
148 -SLOT="0"
149 -TARGETS="+client +ncd +server +tun2socks +udpgw"
150 -IUSE="${TARGETS} debug"
151 -# tests are only ncd related
152 -RESTRICT="!ncd? ( test )"
153 -
154 -COMMON_DEPEND="
155 - client? (
156 - dev-libs/nspr
157 - dev-libs/nss
158 - dev-libs/openssl:=
159 - )
160 - server? (
161 - dev-libs/nspr
162 - dev-libs/nss
163 - dev-libs/openssl:=
164 - )
165 - ncd? (
166 - dev-libs/openssl
167 - )"
168 -RDEPEND="${COMMON_DEPEND}
169 - ncd? (
170 - sys-apps/iproute2
171 - >=virtual/udev-171
172 - )"
173 -DEPEND="${COMMON_DEPEND}
174 - virtual/pkgconfig"
175 -# we need at least one target
176 -REQUIRED_USE="|| ( ${TARGETS//+/} )"
177 -
178 -S=${WORKDIR}/${MY_P}
179 -
180 -pkg_setup() {
181 - enewuser ${PN}
182 -}
183 -
184 -src_configure() {
185 - local mycmakeargs=(
186 - -DBUILD_NOTHING_BY_DEFAULT=1
187 - $(cmake-utils_use_build client CLIENT)
188 - $(cmake-utils_use_build server SERVER)
189 - $(cmake-utils_use_build ncd NCD)
190 - $(cmake-utils_use_build tun2socks TUN2SOCKS)
191 - $(cmake-utils_use_build udpgw UDPGW)
192 - )
193 -
194 - cmake-utils_src_configure
195 -}
196 -
197 -src_test() {
198 - # OOHMSA: do this on portage level?
199 - tc-is-cross-compiler && die "these tests do not work when cross compiling!"
200 -
201 - einfo "Running NCD tests"
202 - cd "${S}"/ncd/tests || die
203 - bash ./run_tests "${CMAKE_BUILD_DIR}/ncd/badvpn-ncd" \
204 - || die "one or more tests failed"
205 -}
206 -
207 -src_install() {
208 - cmake-utils_src_install
209 - dodoc ChangeLog
210 -
211 - if use server; then
212 - newinitd "${FILESDIR}"/${PN}-server.init ${PN}-server
213 - newconfd "${FILESDIR}"/${PN}-server.conf ${PN}-server
214 - fi
215 -
216 - if use ncd; then
217 - newinitd "${FILESDIR}"/${PN}-1.999.127-ncd.init ${PN}-ncd
218 - newconfd "${FILESDIR}"/${PN}-ncd.conf ${PN}-ncd
219 - systemd_dounit "${FILESDIR}"/badvpn-ncd.service
220 - fi
221 -}
222
223 diff --git a/net-vpn/badvpn/badvpn-1.999.130-r1.ebuild b/net-vpn/badvpn/badvpn-1.999.130-r1.ebuild
224 deleted file mode 100644
225 index 6066c2526cf3..000000000000
226 --- a/net-vpn/badvpn/badvpn-1.999.130-r1.ebuild
227 +++ /dev/null
228 @@ -1,84 +0,0 @@
229 -# Copyright 1999-2021 Gentoo Authors
230 -# Distributed under the terms of the GNU General Public License v2
231 -
232 -EAPI=5
233 -inherit cmake-utils user toolchain-funcs systemd
234 -
235 -MY_P=${PN}-${PV/_rc/rc}
236 -DESCRIPTION="Peer-to-peer VPN, NCD scripting language, tun2socks proxifier"
237 -HOMEPAGE="https://github.com/ambrop72/badvpn https://code.google.com/p/badvpn/"
238 -SRC_URI="https://github.com/ambrop72/badvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
239 -
240 -LICENSE="BSD"
241 -KEYWORDS="~amd64 ~arm ~x86"
242 -SLOT="0"
243 -TARGETS="+client +ncd +server +tun2socks +udpgw"
244 -IUSE="${TARGETS} debug"
245 -# tests are only ncd related
246 -RESTRICT="!ncd? ( test )"
247 -
248 -COMMON_DEPEND="
249 - client? (
250 - dev-libs/nspr
251 - dev-libs/nss
252 - dev-libs/openssl:0=
253 - )
254 - server? (
255 - dev-libs/nspr
256 - dev-libs/nss
257 - dev-libs/openssl:0=
258 - )"
259 -RDEPEND="${COMMON_DEPEND}
260 - ncd? (
261 - sys-apps/iproute2
262 - >=virtual/udev-171
263 - )"
264 -DEPEND="${COMMON_DEPEND}
265 - virtual/pkgconfig"
266 -# we need at least one target
267 -REQUIRED_USE="|| ( ${TARGETS//+/} )"
268 -
269 -S=${WORKDIR}/${MY_P}
270 -
271 -pkg_setup() {
272 - enewuser ${PN}
273 -}
274 -
275 -src_configure() {
276 - local mycmakeargs=(
277 - -DBUILD_NOTHING_BY_DEFAULT=1
278 - $(cmake-utils_use_build client CLIENT)
279 - $(cmake-utils_use_build server SERVER)
280 - $(cmake-utils_use_build ncd NCD)
281 - $(cmake-utils_use_build tun2socks TUN2SOCKS)
282 - $(cmake-utils_use_build udpgw UDPGW)
283 - )
284 -
285 - cmake-utils_src_configure
286 -}
287 -
288 -src_test() {
289 - # OOHMSA: do this on portage level?
290 - tc-is-cross-compiler && die "these tests do not work when cross compiling!"
291 -
292 - einfo "Running NCD tests"
293 - cd "${S}"/ncd/tests || die
294 - bash ./run_tests "${CMAKE_BUILD_DIR}/ncd/badvpn-ncd" \
295 - || die "one or more tests failed"
296 -}
297 -
298 -src_install() {
299 - cmake-utils_src_install
300 - dodoc ChangeLog
301 -
302 - if use server; then
303 - newinitd "${FILESDIR}"/${PN}-server.init ${PN}-server
304 - newconfd "${FILESDIR}"/${PN}-server.conf ${PN}-server
305 - fi
306 -
307 - if use ncd; then
308 - newinitd "${FILESDIR}"/${PN}-1.999.127-ncd.init ${PN}-ncd
309 - newconfd "${FILESDIR}"/${PN}-ncd.conf ${PN}-ncd
310 - systemd_dounit "${FILESDIR}"/badvpn-ncd.service
311 - fi
312 -}
313
314 diff --git a/net-vpn/badvpn/files/badvpn-1.999.127-ncd.init b/net-vpn/badvpn/files/badvpn-1.999.127-ncd.init
315 deleted file mode 100644
316 index 69f7ba45992a..000000000000
317 --- a/net-vpn/badvpn/files/badvpn-1.999.127-ncd.init
318 +++ /dev/null
319 @@ -1,24 +0,0 @@
320 -#!/sbin/openrc-run
321 -# Copyright 1999-2013 Gentoo Foundation
322 -# Released under the 3-clause BSD license.
323 -
324 -command="${ncd_exec:-"/usr/bin/badvpn-ncd"}"
325 -command_args="${ncd_args} --config-file ${ncd_config:-/etc/ncd.conf}"
326 -command_background="YES"
327 -description="Network Configuration Daemon"
328 -pidfile="/var/run/${RC_SVCNAME}.pid"
329 -
330 -depend() {
331 - need localmount
332 - after bootmisc
333 - before netmount
334 -}
335 -
336 -start_pre() {
337 - if yesno "${ncd_syslog:-NO}"; then
338 - command_args="${command_args}
339 - --logger syslog
340 - --syslog-ident \"${ncd_syslog_ident:-${RC_SVCNAME}}\"
341 - --channel-loglevel ncd_log_msg info"
342 - fi
343 -}
344
345 diff --git a/net-vpn/badvpn/files/badvpn-ncd.conf b/net-vpn/badvpn/files/badvpn-ncd.conf
346 deleted file mode 100644
347 index ad34c66f7ca3..000000000000
348 --- a/net-vpn/badvpn/files/badvpn-ncd.conf
349 +++ /dev/null
350 @@ -1,11 +0,0 @@
351 -# NCD program file.
352 -#ncd_config="/etc/ncd.conf"
353 -
354 -# enable or disable syslog.
355 -#ncd_syslog="NO"
356 -
357 -# Syslog identification.
358 -#ncd_syslog_ident="ncd"
359 -
360 -# Additional arguments.
361 -#ncd_args=""
362
363 diff --git a/net-vpn/badvpn/files/badvpn-ncd.service b/net-vpn/badvpn/files/badvpn-ncd.service
364 deleted file mode 100644
365 index 6ca7aa515e00..000000000000
366 --- a/net-vpn/badvpn/files/badvpn-ncd.service
367 +++ /dev/null
368 @@ -1,11 +0,0 @@
369 -[Unit]
370 -Description=Network Configuation Daemon
371 -After=syslog.target
372 -
373 -[Service]
374 -ExecStart=/usr/bin/badvpn-ncd --logger syslog --syslog-ident ncd --loglevel warning --channel-loglevel ncd_log_msg info /etc/ncd.conf
375 -Restart=always
376 -
377 -[Install]
378 -WantedBy=multi-user.target
379 -
380
381 diff --git a/net-vpn/badvpn/files/badvpn-server.conf b/net-vpn/badvpn/files/badvpn-server.conf
382 deleted file mode 100644
383 index ed5103d3d0ef..000000000000
384 --- a/net-vpn/badvpn/files/badvpn-server.conf
385 +++ /dev/null
386 @@ -1,11 +0,0 @@
387 -# User account to run server as.
388 -#vpn_user="badvpn"
389 -
390 -# Enable or disable syslog.
391 -#vpn_syslog="NO"
392 -
393 -# Syslog identification.
394 -#vpn_syslog_ident="badvpn-server"
395 -
396 -# Arguments to badvpn-server.
397 -vpn_args="--listen-addr 0.0.0.0:7179"
398
399 diff --git a/net-vpn/badvpn/files/badvpn-server.init b/net-vpn/badvpn/files/badvpn-server.init
400 deleted file mode 100644
401 index 32ee7fefe33e..000000000000
402 --- a/net-vpn/badvpn/files/badvpn-server.init
403 +++ /dev/null
404 @@ -1,48 +0,0 @@
405 -#!/sbin/openrc-run
406 -# Copyright 1999-2012 Gentoo Foundation
407 -# Released under the 3-clause BSD license.
408 -
409 -command="${vpn_exec:-/usr/bin/badvpn-server}"
410 -command_args="${vpn_args}"
411 -command_background="YES"
412 -description="BadVPN server"
413 -pidfile="/var/run/${RC_SVCNAME}.pid"
414 -start_stop_daemon_args="--user \"${vpn_user:-badvpn}\""
415 -
416 -depend() {
417 - need localmount
418 - after bootmisc
419 - if yesno "${vpn_syslog:-NO}"; then
420 - use logger
421 - fi
422 -}
423 -
424 -start_pre() {
425 - if yesno "${vpn_syslog:-NO}"; then
426 - command_args="${command_args}
427 - --logger syslog
428 - --syslog-ident \"${vpn_syslog_ident:-${RC_SVCNAME}}\""
429 - fi
430 -}
431 -
432 -start()
433 -{
434 - [ -n "$command" ] || return 0
435 - local _background=
436 - ebegin "Starting ${name:-$RC_SVCNAME}"
437 - if yesno "${command_background}"; then
438 - if [ -z "${pidfile}" ]; then
439 - eend 1 "command_background option used but no pidfile specified"
440 - return 1
441 - fi
442 - _background="--background --make-pidfile"
443 - fi
444 - eval start-stop-daemon --start \
445 - --exec $command \
446 - ${procname:+--name} $procname \
447 - ${pidfile:+--pidfile} $pidfile \
448 - $_background $start_stop_daemon_args \
449 - -- $command_args
450 - eend $? "Failed to start $RC_SVCNAME"
451 - return $?
452 -}
453
454 diff --git a/net-vpn/badvpn/metadata.xml b/net-vpn/badvpn/metadata.xml
455 deleted file mode 100644
456 index fbeee899ea8e..000000000000
457 --- a/net-vpn/badvpn/metadata.xml
458 +++ /dev/null
459 @@ -1,35 +0,0 @@
460 -<?xml version="1.0" encoding="UTF-8"?>
461 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
462 -<pkgmetadata>
463 - <maintainer type="person">
464 - <email>williamh@g.o</email>
465 - </maintainer>
466 - <upstream>
467 - <maintainer status="active">
468 - <email>ambrop7@×××××.com</email>
469 - <name>Ambroz Bizjak</name>
470 - </maintainer>
471 - <doc lang="en">https://code.google.com/p/badvpn/w/list</doc>
472 - <bugs-to>https://github.com/ambrop72/badvpn/issues</bugs-to>
473 - <remote-id type="github">ambrop72/badvpn</remote-id>
474 - <remote-id type="google-code">badvpn</remote-id>
475 - </upstream>
476 - <use>
477 - <flag name="client">Build the badvpn-client program, a daemon that runs on endpoints of the VPN.</flag>
478 - <flag name="server">Build the badvpn-server program, a central server that manages the VPN network.</flag>
479 - <flag name="ncd">Build NCD, a lightweight scripting language especially suited for network configurations.</flag>
480 - <flag name="tun2socks">Build tun2socks, a program which implements a TUN device that forwards TCP traffic through a SOCKS5 server.</flag>
481 - <flag name="udpgw">Build udpgw, a small daemon which allows tun2socks to forward UDP traffic.</flag>
482 - </use>
483 - <longdescription lang="en">
484 - BadVPN is an open-source peer-to-peer VPN system. It provides a
485 - Layer 2 (Ethernet) network between the peers (VPN nodes). The peers
486 - connect to a central server which acts as a chat server for them to
487 - establish direct connections between each other (data connections).
488 - These connections are used for transferring network data (Ethernet
489 - frames), and can be secured with a multitude of mechanisms.
490 -
491 - The BadVPN package also includes other network-related software,
492 - like tun2socks and NCD.
493 - </longdescription>
494 -</pkgmetadata>