Gentoo Archives: gentoo-commits

From: Jason Donenfeld <zx2c4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard/, net-vpn/wireguard/files/
Date: Tue, 10 Jul 2018 21:20:40
Message-Id: 1531257630.84747f9cd8674344adc0215795e994899ed2ff3f.zx2c4@gentoo
1 commit: 84747f9cd8674344adc0215795e994899ed2ff3f
2 Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 10 21:18:03 2018 +0000
4 Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 10 21:20:30 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84747f9c
7
8 net-vpn/wireguard: these have moved to netifrc
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 net-vpn/wireguard/files/wireguard-openrc.sh | 45 -------------------------
13 net-vpn/wireguard/wireguard-0.0.20180708.ebuild | 2 --
14 net-vpn/wireguard/wireguard-9999.ebuild | 2 --
15 3 files changed, 49 deletions(-)
16
17 diff --git a/net-vpn/wireguard/files/wireguard-openrc.sh b/net-vpn/wireguard/files/wireguard-openrc.sh
18 deleted file mode 100644
19 index 9c53ef0ffa7..00000000000
20 --- a/net-vpn/wireguard/files/wireguard-openrc.sh
21 +++ /dev/null
22 @@ -1,45 +0,0 @@
23 -# Copyright (c) 2016 Gentoo Foundation
24 -# All rights reserved. Released under the 2-clause BSD license.
25 -
26 -wireguard_depend()
27 -{
28 - program /usr/bin/wg
29 - after interface
30 - before dhcp
31 -}
32 -
33 -wireguard_pre_start()
34 -{
35 - [[ $IFACE == wg* ]] || return 0
36 - ip link delete dev "$IFACE" type wireguard 2>/dev/null
37 - ebegin "Creating WireGuard interface $IFACE"
38 - if ! ip link add dev "$IFACE" type wireguard; then
39 - eend $?
40 - return $?
41 - fi
42 - eend 0
43 -
44 - ebegin "Configuring WireGuard interface $IFACE"
45 - set -- $(_get_array "wireguard_$IFVAR")
46 - if [[ -f $1 && $# -eq 1 ]]; then
47 - /usr/bin/wg setconf "$IFACE" "$1"
48 - else
49 - eval /usr/bin/wg set "$IFACE" "$@"
50 - fi
51 - if [ $? -eq 0 ]; then
52 - _up
53 - eend 0
54 - return
55 - fi
56 - e=$?
57 - ip link delete dev "$IFACE" type wireguard 2>/dev/null
58 - eend $e
59 -}
60 -
61 -wireguard_post_stop()
62 -{
63 - [[ $IFACE == wg* ]] || return 0
64 - ebegin "Removing WireGuard interface $IFACE"
65 - ip link delete dev "$IFACE" type wireguard
66 - eend $?
67 -}
68
69 diff --git a/net-vpn/wireguard/wireguard-0.0.20180708.ebuild b/net-vpn/wireguard/wireguard-0.0.20180708.ebuild
70 index 3a4681c656a..e7bf51b60e9 100644
71 --- a/net-vpn/wireguard/wireguard-0.0.20180708.ebuild
72 +++ b/net-vpn/wireguard/wireguard-0.0.20180708.ebuild
73 @@ -57,8 +57,6 @@ src_install() {
74 BASHCOMPDIR="$(get_bashcompdir)" \
75 PREFIX="${EPREFIX}/usr" \
76 -C src/tools install
77 - insinto /$(get_libdir)/netifrc/net
78 - newins "${FILESDIR}"/wireguard-openrc.sh wireguard.sh
79 fi
80 use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
81 }
82
83 diff --git a/net-vpn/wireguard/wireguard-9999.ebuild b/net-vpn/wireguard/wireguard-9999.ebuild
84 index 3a4681c656a..e7bf51b60e9 100644
85 --- a/net-vpn/wireguard/wireguard-9999.ebuild
86 +++ b/net-vpn/wireguard/wireguard-9999.ebuild
87 @@ -57,8 +57,6 @@ src_install() {
88 BASHCOMPDIR="$(get_bashcompdir)" \
89 PREFIX="${EPREFIX}/usr" \
90 -C src/tools install
91 - insinto /$(get_libdir)/netifrc/net
92 - newins "${FILESDIR}"/wireguard-openrc.sh wireguard.sh
93 fi
94 use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
95 }