| 1 |
commit: 94d7465f40784afb9ac634314540a327a69a443a |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 6 04:37:36 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 6 04:37:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d7465f |
| 7 |
|
| 8 |
net-vpn/openvpn: use 'emake', not 'make' |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-vpn/openvpn/openvpn-2.5.2-r2.ebuild | 14 ++++++++++---- |
| 13 |
net-vpn/openvpn/openvpn-9999.ebuild | 15 +++++++++++---- |
| 14 |
2 files changed, 21 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild b/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild |
| 17 |
index e09e6ac634d..f3520516410 100644 |
| 18 |
--- a/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild |
| 19 |
+++ b/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild |
| 20 |
@@ -72,6 +72,7 @@ pkg_setup() { |
| 21 |
|
| 22 |
src_prepare() { |
| 23 |
default |
| 24 |
+ |
| 25 |
eautoreconf |
| 26 |
} |
| 27 |
|
| 28 |
@@ -83,6 +84,7 @@ src_configure() { |
| 29 |
$(use_enable pkcs11) |
| 30 |
) |
| 31 |
fi |
| 32 |
+ |
| 33 |
myeconfargs+=( |
| 34 |
$(use_enable inotify async-push) |
| 35 |
--with-crypto-library=$(usex mbedtls mbedtls openssl) |
| 36 |
@@ -94,6 +96,7 @@ src_configure() { |
| 37 |
$(use_enable down-root plugin-down-root) |
| 38 |
$(use_enable systemd) |
| 39 |
) |
| 40 |
+ |
| 41 |
SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ |
| 42 |
TMPFILES_DIR="/usr/lib/tmpfiles.d" \ |
| 43 |
IPROUTE=$(usex iproute2 '/bin/ip' '') \ |
| 44 |
@@ -103,9 +106,12 @@ src_configure() { |
| 45 |
src_test() { |
| 46 |
local -x RUN_SUDO=false |
| 47 |
|
| 48 |
- make check || die "top-level tests failed" |
| 49 |
+ elog "Running top-level tests" |
| 50 |
+ emake check |
| 51 |
+ |
| 52 |
pushd tests/unit_tests &>/dev/null || die |
| 53 |
- make check || die "unit tests failed" |
| 54 |
+ elog "Running unit tests" |
| 55 |
+ emake check |
| 56 |
popd &>/dev/null || die |
| 57 |
} |
| 58 |
|
| 59 |
@@ -142,12 +148,12 @@ src_install() { |
| 60 |
pkg_postinst() { |
| 61 |
tmpfiles_process openvpn.conf |
| 62 |
|
| 63 |
- if use x64-macos; then |
| 64 |
+ if use x64-macos ; then |
| 65 |
elog "You might want to install tuntaposx for TAP interface support:" |
| 66 |
elog "http://tuntaposx.sourceforge.net" |
| 67 |
fi |
| 68 |
|
| 69 |
- if systemd_is_booted || has_version sys-apps/systemd; then |
| 70 |
+ if systemd_is_booted || has_version sys-apps/systemd ; then |
| 71 |
elog "In order to use OpenVPN with systemd please use the correct systemd service file." |
| 72 |
elog "" |
| 73 |
elog "server:" |
| 74 |
|
| 75 |
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild |
| 76 |
index d5d643edb2f..1dfab6f2d9f 100644 |
| 77 |
--- a/net-vpn/openvpn/openvpn-9999.ebuild |
| 78 |
+++ b/net-vpn/openvpn/openvpn-9999.ebuild |
| 79 |
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then |
| 80 |
inherit git-r3 |
| 81 |
else |
| 82 |
SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz" |
| 83 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 84 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 85 |
fi |
| 86 |
|
| 87 |
LICENSE="GPL-2" |
| 88 |
@@ -72,6 +72,7 @@ pkg_setup() { |
| 89 |
|
| 90 |
src_prepare() { |
| 91 |
default |
| 92 |
+ |
| 93 |
eautoreconf |
| 94 |
} |
| 95 |
|
| 96 |
@@ -83,6 +84,7 @@ src_configure() { |
| 97 |
$(use_enable pkcs11) |
| 98 |
) |
| 99 |
fi |
| 100 |
+ |
| 101 |
myeconfargs+=( |
| 102 |
$(use_enable inotify async-push) |
| 103 |
--with-crypto-library=$(usex mbedtls mbedtls openssl) |
| 104 |
@@ -94,6 +96,7 @@ src_configure() { |
| 105 |
$(use_enable down-root plugin-down-root) |
| 106 |
$(use_enable systemd) |
| 107 |
) |
| 108 |
+ |
| 109 |
SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ |
| 110 |
TMPFILES_DIR="/usr/lib/tmpfiles.d" \ |
| 111 |
IPROUTE=$(usex iproute2 '/bin/ip' '') \ |
| 112 |
@@ -103,9 +106,12 @@ src_configure() { |
| 113 |
src_test() { |
| 114 |
local -x RUN_SUDO=false |
| 115 |
|
| 116 |
- make check || die "top-level tests failed" |
| 117 |
+ elog "Running top-level tests" |
| 118 |
+ emake check |
| 119 |
+ |
| 120 |
pushd tests/unit_tests &>/dev/null || die |
| 121 |
- make check || die "unit tests failed" |
| 122 |
+ elog "Running unit tests" |
| 123 |
+ emake check |
| 124 |
popd &>/dev/null || die |
| 125 |
} |
| 126 |
|
| 127 |
@@ -129,7 +135,8 @@ src_install() { |
| 128 |
|
| 129 |
# install examples, controlled by the respective useflag |
| 130 |
if use examples ; then |
| 131 |
- # dodoc does not supportly support directory traversal, #15193 |
| 132 |
+ # (is the below comment relevant anymore?) |
| 133 |
+ ## dodoc does not supportly support directory traversal, #15193 |
| 134 |
docinto examples |
| 135 |
dodoc -r sample contrib |
| 136 |
fi |
Archives