From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1325929-garchives=archives.gentoo.org@lists.gentoo.org>
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 72CAF158018
for <garchives@archives.gentoo.org>; Sat, 2 Oct 2021 06:02:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3CEDEE08ED;
Sat, 2 Oct 2021 06:02:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id F018DE08ED
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Oct 2021 06:02:02 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B5C32342DBC
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Oct 2021 06:02:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DF986116
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Oct 2021 06:01:59 +0000 (UTC)
From: "Mike Gilbert" <floppym@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, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1633154408.873102d5cd839fd4efe00b9336a03341d36ab8fb.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-vpn/openconnect/openconnect-8.10-r1.ebuild net-vpn/openconnect/openconnect-8.10-r2.ebuild net-vpn/openconnect/openconnect-9999.ebuild
X-VCS-Directories: net-vpn/openconnect/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 873102d5cd839fd4efe00b9336a03341d36ab8fb
X-VCS-Branch: master
Date: Sat, 2 Oct 2021 06:01:59 +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: 87db108d-6916-4fbc-8b15-162651d67912
X-Archives-Hash: 1f14e8c934462c7f4d752a534a43708f
commit: 873102d5cd839fd4efe00b9336a03341d36ab8fb
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 2 03:55:18 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Oct 2 06:00:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873102d5
net-vpn/openconnect: depend on net-vpn/vpnc-scripts
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
...t-8.10-r1.ebuild => openconnect-8.10-r2.ebuild} | 13 +++-----
net-vpn/openconnect/openconnect-9999.ebuild | 37 +++++++++++-----------
2 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/net-vpn/openconnect/openconnect-8.10-r1.ebuild b/net-vpn/openconnect/openconnect-8.10-r2.ebuild
similarity index 87%
rename from net-vpn/openconnect/openconnect-8.10-r1.ebuild
rename to net-vpn/openconnect/openconnect-8.10-r2.ebuild
index f4a03e951f4..bd7b218a022 100644
--- a/net-vpn/openconnect/openconnect-8.10-r1.ebuild
+++ b/net-vpn/openconnect/openconnect-8.10-r2.ebuild
@@ -12,12 +12,9 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
inherit git-r3 autotools
else
- ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
+ SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
fi
-VPNC_VER=20200930
-SRC_URI="${ARCHIVE_URI}
- ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
HOMEPAGE="http://www.infradead.org/openconnect.html"
@@ -50,6 +47,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
sys-apps/iproute2
+ net-vpn/vpnc-scripts
"
BDEPEND="
virtual/pkgconfig
@@ -107,7 +105,7 @@ src_configure() {
$(use_with gssapi)
$(use_with smartcard libpcsclite)
$(use_with stoken)
- --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
+ --with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script"
--without-java
)
@@ -131,10 +129,7 @@ src_install() {
default
find "${ED}" -name '*.la' -delete || die
- exeinto /etc/openconnect
- newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-
- newinitd "${FILESDIR}"/openconnect.initd.${PV} openconnect
+ newinitd "${FILESDIR}"/openconnect.initd.8.10 openconnect
dodoc "${FILESDIR}"/README.OpenRC
insinto /etc/logrotate.d
newins "${FILESDIR}"/openconnect.logrotate openconnect
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index 347a0d59793..bd7b218a022 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="xml"
inherit linux-info python-any-r1
@@ -12,12 +12,9 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
inherit git-r3 autotools
else
- ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
fi
-VPNC_VER=20200226
-SRC_URI="${ARCHIVE_URI}
- ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
HOMEPAGE="http://www.infradead.org/openconnect.html"
@@ -50,6 +47,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
sys-apps/iproute2
+ net-vpn/vpnc-scripts
"
BDEPEND="
virtual/pkgconfig
@@ -107,7 +105,7 @@ src_configure() {
$(use_with gssapi)
$(use_with smartcard libpcsclite)
$(use_with stoken)
- --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
+ --with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script"
--without-java
)
@@ -129,21 +127,22 @@ src_test() {
src_install() {
default
-
find "${ED}" -name '*.la' -delete || die
- dodoc "${FILESDIR}"/README.OpenRC.txt
-
- newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
- insinto /etc/openconnect
-
- newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-
- exeinto /etc/openconnect
- newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-
+ newinitd "${FILESDIR}"/openconnect.initd.8.10 openconnect
+ dodoc "${FILESDIR}"/README.OpenRC
insinto /etc/logrotate.d
newins "${FILESDIR}"/openconnect.logrotate openconnect
keepdir /var/log/openconnect
}
+
+pkg_postinst() {
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ ver_test $v -ge 8.10-r1 && continue
+ ewarn "openconnect tunnel-specific configurations stored in ${EROOT}/etc/conf.d"
+ ewarn "should be migrated to ${EROOT}/etc/openconnect/<tunnel>.conf"
+ ewarn "For more information see ${EROOT}/usr/share/doc/${PF}/README.OpenRC"
+ done
+}