From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6B158158086 for ; Sat, 6 Nov 2021 04:41:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9577EE0907; Sat, 6 Nov 2021 04:41:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08F0EE08F3 for ; Sat, 6 Nov 2021 04:41:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D2693430D2 for ; Sat, 6 Nov 2021 04:41:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D6361A3 for ; Sat, 6 Nov 2021 04:41:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1636173456.94d7465f40784afb9ac634314540a327a69a443a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/openvpn/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/openvpn/openvpn-2.5.2-r2.ebuild net-vpn/openvpn/openvpn-9999.ebuild X-VCS-Directories: net-vpn/openvpn/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 94d7465f40784afb9ac634314540a327a69a443a X-VCS-Branch: master Date: Sat, 6 Nov 2021 04:41:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3716dee7-b51f-4821-8eb2-cea2f5d4ce9a X-Archives-Hash: e2e7907efa545fd76d20b2af13245725 commit: 94d7465f40784afb9ac634314540a327a69a443a Author: Sam James gentoo org> AuthorDate: Sat Nov 6 04:37:36 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 6 04:37:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d7465f net-vpn/openvpn: use 'emake', not 'make' Signed-off-by: Sam James gentoo.org> net-vpn/openvpn/openvpn-2.5.2-r2.ebuild | 14 ++++++++++---- net-vpn/openvpn/openvpn-9999.ebuild | 15 +++++++++++---- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild b/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild index e09e6ac634d..f3520516410 100644 --- a/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild +++ b/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild @@ -72,6 +72,7 @@ pkg_setup() { src_prepare() { default + eautoreconf } @@ -83,6 +84,7 @@ src_configure() { $(use_enable pkcs11) ) fi + myeconfargs+=( $(use_enable inotify async-push) --with-crypto-library=$(usex mbedtls mbedtls openssl) @@ -94,6 +96,7 @@ src_configure() { $(use_enable down-root plugin-down-root) $(use_enable systemd) ) + SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ IPROUTE=$(usex iproute2 '/bin/ip' '') \ @@ -103,9 +106,12 @@ src_configure() { src_test() { local -x RUN_SUDO=false - make check || die "top-level tests failed" + elog "Running top-level tests" + emake check + pushd tests/unit_tests &>/dev/null || die - make check || die "unit tests failed" + elog "Running unit tests" + emake check popd &>/dev/null || die } @@ -142,12 +148,12 @@ src_install() { pkg_postinst() { tmpfiles_process openvpn.conf - if use x64-macos; then + if use x64-macos ; then elog "You might want to install tuntaposx for TAP interface support:" elog "http://tuntaposx.sourceforge.net" fi - if systemd_is_booted || has_version sys-apps/systemd; then + if systemd_is_booted || has_version sys-apps/systemd ; then elog "In order to use OpenVPN with systemd please use the correct systemd service file." elog "" elog "server:" diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild index d5d643edb2f..1dfab6f2d9f 100644 --- a/net-vpn/openvpn/openvpn-9999.ebuild +++ b/net-vpn/openvpn/openvpn-9999.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" @@ -72,6 +72,7 @@ pkg_setup() { src_prepare() { default + eautoreconf } @@ -83,6 +84,7 @@ src_configure() { $(use_enable pkcs11) ) fi + myeconfargs+=( $(use_enable inotify async-push) --with-crypto-library=$(usex mbedtls mbedtls openssl) @@ -94,6 +96,7 @@ src_configure() { $(use_enable down-root plugin-down-root) $(use_enable systemd) ) + SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ IPROUTE=$(usex iproute2 '/bin/ip' '') \ @@ -103,9 +106,12 @@ src_configure() { src_test() { local -x RUN_SUDO=false - make check || die "top-level tests failed" + elog "Running top-level tests" + emake check + pushd tests/unit_tests &>/dev/null || die - make check || die "unit tests failed" + elog "Running unit tests" + emake check popd &>/dev/null || die } @@ -129,7 +135,8 @@ src_install() { # install examples, controlled by the respective useflag if use examples ; then - # dodoc does not supportly support directory traversal, #15193 + # (is the below comment relevant anymore?) + ## dodoc does not supportly support directory traversal, #15193 docinto examples dodoc -r sample contrib fi