From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1523209-garchives=archives.gentoo.org@lists.gentoo.org>
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 B530F15806E
for <garchives@archives.gentoo.org>; Mon, 29 May 2023 23:32:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D4E95E0A90;
Mon, 29 May 2023 23:32:08 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 9B751E0A90
for <gentoo-commits@lists.gentoo.org>; Mon, 29 May 2023 23:32:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 7DFB534111B
for <gentoo-commits@lists.gentoo.org>; Mon, 29 May 2023 23:32:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BCBE6A7C
for <gentoo-commits@lists.gentoo.org>; Mon, 29 May 2023 23:32:05 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" <williamh@gentoo.org>
Message-ID: <1685403107.59877ebce3b218c415651c7b93dbc57806be3a5e.williamh@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: williamh
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: 59877ebce3b218c415651c7b93dbc57806be3a5e
X-VCS-Branch: master
Date: Mon, 29 May 2023 23:32:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bc22fdac-e251-4402-a5df-e08e1b089d09
X-Archives-Hash: b36d05690164c16af3e25e04e212c3a7
commit: 59877ebce3b218c415651c7b93dbc57806be3a5e
Author: Timo Rothenpieler <timo <AT> rothenpieler <DOT> org>
AuthorDate: Mon May 1 17:04:00 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon May 29 23:31:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59877ebc
net-vpn/openvpn-9999: Sync with 2.6.4
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
net-vpn/openvpn/openvpn-9999.ebuild | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index b8189f16f79b..6dc536051832 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools flag-o-matic systemd linux-info tmpfiles
+inherit autotools systemd linux-info tmpfiles
DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
HOMEPAGE="https://openvpn.net/"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
- EGIT_SUBMODULES=(-cmocka)
-
inherit git-r3
else
- SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
+IUSE="dco down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
IUSE+=" pam pkcs11 +plugins selinux systemd test"
RESTRICT="!test? ( test )"
@@ -30,6 +28,7 @@ REQUIRED_USE="
pkcs11? ( !mbedtls )
!plugins? ( !pam !down-root )
inotify? ( plugins )
+ dco? ( !iproute2 )
"
CDEPEND="
@@ -39,10 +38,12 @@ CDEPEND="
lz4? ( app-arch/lz4 )
lzo? ( >=dev-libs/lzo-1.07 )
mbedtls? ( net-libs/mbedtls:= )
- openssl? ( >=dev-libs/openssl-0.9.8:0= )
+ openssl? ( >=dev-libs/openssl-1.0.2:0= )
pam? ( sys-libs/pam )
pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
systemd? ( sys-apps/systemd )
+ dco? ( >=net-vpn/ovpn-dco-0.2 >=dev-libs/libnl-3.2.29:= )
+ sys-libs/libcap-ng:=
"
BDEPEND="virtual/pkgconfig"
@@ -60,11 +61,6 @@ if [[ ${PV} = "9999" ]]; then
BDEPEND+=" dev-python/docutils"
fi
-PATCHES=(
- "${FILESDIR}"/openvpn-2.5.0-auth-pam-missing-header.patch
- "${FILESDIR}"/openvpn-2.5.2-detect-python-rst2man.patch
-)
-
pkg_setup() {
local CONFIG_CHECK="~TUN"
linux-info_pkg_setup
@@ -95,6 +91,7 @@ src_configure() {
$(use_enable pam plugin-auth-pam)
$(use_enable down-root plugin-down-root)
$(use_enable systemd)
+ $(use_enable dco)
)
SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
@@ -121,7 +118,7 @@ src_install() {
find "${ED}/usr" -name '*.la' -delete || die
# install documentation
- dodoc AUTHORS ChangeLog PORTS README README.IPv6
+ dodoc AUTHORS ChangeLog PORTS README
# Install some helper scripts
keepdir /etc/openvpn