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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 92BDE138351 for ; Thu, 12 Mar 2020 00:26:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B82B3E0AFC; Thu, 12 Mar 2020 00:26:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92855E0AFC for ; Thu, 12 Mar 2020 00:26:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B21E34F15E for ; Thu, 12 Mar 2020 00:26:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B103177 for ; Thu, 12 Mar 2020 00:26:02 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1583972755.8e3b4abba8e585c09b9fcc1146fb2b6cfa49a0c4.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/openvpn/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/openvpn/openvpn-9999.ebuild X-VCS-Directories: net-vpn/openvpn/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 8e3b4abba8e585c09b9fcc1146fb2b6cfa49a0c4 X-VCS-Branch: master Date: Thu, 12 Mar 2020 00:26:02 +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: 363be932-48c9-4184-913d-b88698db6490 X-Archives-Hash: 92d4bc030dcd0d6fe655c49ea62f8dcb commit: 8e3b4abba8e585c09b9fcc1146fb2b6cfa49a0c4 Author: Patrick McLean sony com> AuthorDate: Thu Mar 12 00:25:37 2020 +0000 Commit: Patrick McLean gentoo org> CommitDate: Thu Mar 12 00:25:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e3b4abb net-vpn/openvpn-9999: Sync with 2.4.8 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Patrick McLean gentoo.org> net-vpn/openvpn/openvpn-9999.ebuild | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild index 19122b752be..8ea466d6754 100644 --- a/net-vpn/openvpn/openvpn-9999.ebuild +++ b/net-vpn/openvpn/openvpn-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools flag-o-matic user systemd linux-info git-r3 +inherit autotools flag-o-matic systemd linux-info git-r3 DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes" EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git" @@ -18,14 +18,15 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" RESTRICT="!test? ( test )" -REQUIRED_USE="lzo? ( !lz4 ) +REQUIRED_USE="pkcs11? ( ssl ) !plugins? ( !pam !down-root ) - inotify? ( plugins )" + inotify? ( plugins ) +" CDEPEND=" kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) - !iproute2? ( sys-apps/net-tools ) + !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) ) pam? ( sys-libs/pam ) ssl? ( @@ -38,18 +39,19 @@ CDEPEND=" lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) - systemd? ( sys-apps/systemd )" + systemd? ( sys-apps/systemd ) +" DEPEND="${CDEPEND} - test? ( dev-util/cmocka )" + test? ( dev-util/cmocka ) +" RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-openvpn )" + acct-group/openvpn + acct-user/openvpn + selinux? ( sec-policy/selinux-openvpn ) +" CONFIG_CHECK="~TUN" -PATCHES=( - "${FILESDIR}/${PN}-2.5-external-cmocka.patch" -) - pkg_setup() { linux-info_pkg_setup } @@ -74,7 +76,6 @@ src_configure() { $(use_enable iproute2) \ $(use_enable pam plugin-auth-pam) \ $(use_enable down-root plugin-down-root) \ - $(use_enable test tests) \ $(use_enable systemd) } @@ -104,17 +105,16 @@ src_install() { # install examples, controlled by the respective useflag if use examples ; then # dodoc does not supportly support directory traversal, #15193 - insinto /usr/share/doc/${PF}/examples - doins -r sample contrib + docinto /usr/share/doc/${PF}/examples + dodoc -r sample contrib fi } pkg_postinst() { - # Add openvpn user so openvpn servers can drop privs - # Clients should run as root so they can change ip addresses, - # dns information and other such things. - enewgroup openvpn - enewuser openvpn "" "" "" openvpn + if use x64-macos; then + elog "You might want to install tuntaposx for TAP interface support:" + elog "http://tuntaposx.sourceforge.net" + fi elog "The openvpn init script expects to find the configuration file" elog "openvpn.conf in /etc/openvpn along with any extra files it may need." @@ -140,7 +140,7 @@ pkg_postinst() { if use plugins ; then einfo "" - einfo "plugins have been installed into /usr/$(get_libdir)/${PN}" + einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins" fi ewarn ""