1 |
commit: 873102d5cd839fd4efe00b9336a03341d36ab8fb |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 2 03:55:18 2021 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 2 06:00:08 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873102d5 |
7 |
|
8 |
net-vpn/openconnect: depend on net-vpn/vpnc-scripts |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
...t-8.10-r1.ebuild => openconnect-8.10-r2.ebuild} | 13 +++----- |
13 |
net-vpn/openconnect/openconnect-9999.ebuild | 37 +++++++++++----------- |
14 |
2 files changed, 22 insertions(+), 28 deletions(-) |
15 |
|
16 |
diff --git a/net-vpn/openconnect/openconnect-8.10-r1.ebuild b/net-vpn/openconnect/openconnect-8.10-r2.ebuild |
17 |
similarity index 87% |
18 |
rename from net-vpn/openconnect/openconnect-8.10-r1.ebuild |
19 |
rename to net-vpn/openconnect/openconnect-8.10-r2.ebuild |
20 |
index f4a03e951f4..bd7b218a022 100644 |
21 |
--- a/net-vpn/openconnect/openconnect-8.10-r1.ebuild |
22 |
+++ b/net-vpn/openconnect/openconnect-8.10-r2.ebuild |
23 |
@@ -12,12 +12,9 @@ if [[ ${PV} == 9999 ]]; then |
24 |
EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git" |
25 |
inherit git-r3 autotools |
26 |
else |
27 |
- ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz" |
28 |
+ SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz" |
29 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
30 |
fi |
31 |
-VPNC_VER=20200930 |
32 |
-SRC_URI="${ARCHIVE_URI} |
33 |
- ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz" |
34 |
|
35 |
DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" |
36 |
HOMEPAGE="http://www.infradead.org/openconnect.html" |
37 |
@@ -50,6 +47,7 @@ DEPEND=" |
38 |
" |
39 |
RDEPEND="${DEPEND} |
40 |
sys-apps/iproute2 |
41 |
+ net-vpn/vpnc-scripts |
42 |
" |
43 |
BDEPEND=" |
44 |
virtual/pkgconfig |
45 |
@@ -107,7 +105,7 @@ src_configure() { |
46 |
$(use_with gssapi) |
47 |
$(use_with smartcard libpcsclite) |
48 |
$(use_with stoken) |
49 |
- --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" |
50 |
+ --with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script" |
51 |
--without-java |
52 |
) |
53 |
|
54 |
@@ -131,10 +129,7 @@ src_install() { |
55 |
default |
56 |
find "${ED}" -name '*.la' -delete || die |
57 |
|
58 |
- exeinto /etc/openconnect |
59 |
- newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh |
60 |
- |
61 |
- newinitd "${FILESDIR}"/openconnect.initd.${PV} openconnect |
62 |
+ newinitd "${FILESDIR}"/openconnect.initd.8.10 openconnect |
63 |
dodoc "${FILESDIR}"/README.OpenRC |
64 |
insinto /etc/logrotate.d |
65 |
newins "${FILESDIR}"/openconnect.logrotate openconnect |
66 |
|
67 |
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild |
68 |
index 347a0d59793..bd7b218a022 100644 |
69 |
--- a/net-vpn/openconnect/openconnect-9999.ebuild |
70 |
+++ b/net-vpn/openconnect/openconnect-9999.ebuild |
71 |
@@ -1,9 +1,9 @@ |
72 |
-# Copyright 2011-2020 Gentoo Authors |
73 |
+# Copyright 2011-2021 Gentoo Authors |
74 |
# Distributed under the terms of the GNU General Public License v2 |
75 |
|
76 |
EAPI=7 |
77 |
|
78 |
-PYTHON_COMPAT=( python{3_7,3_8,3_9} ) |
79 |
+PYTHON_COMPAT=( python3_{8,9} ) |
80 |
PYTHON_REQ_USE="xml" |
81 |
|
82 |
inherit linux-info python-any-r1 |
83 |
@@ -12,12 +12,9 @@ if [[ ${PV} == 9999 ]]; then |
84 |
EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git" |
85 |
inherit git-r3 autotools |
86 |
else |
87 |
- ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz" |
88 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
89 |
+ SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz" |
90 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
91 |
fi |
92 |
-VPNC_VER=20200226 |
93 |
-SRC_URI="${ARCHIVE_URI} |
94 |
- ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz" |
95 |
|
96 |
DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" |
97 |
HOMEPAGE="http://www.infradead.org/openconnect.html" |
98 |
@@ -50,6 +47,7 @@ DEPEND=" |
99 |
" |
100 |
RDEPEND="${DEPEND} |
101 |
sys-apps/iproute2 |
102 |
+ net-vpn/vpnc-scripts |
103 |
" |
104 |
BDEPEND=" |
105 |
virtual/pkgconfig |
106 |
@@ -107,7 +105,7 @@ src_configure() { |
107 |
$(use_with gssapi) |
108 |
$(use_with smartcard libpcsclite) |
109 |
$(use_with stoken) |
110 |
- --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" |
111 |
+ --with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script" |
112 |
--without-java |
113 |
) |
114 |
|
115 |
@@ -129,21 +127,22 @@ src_test() { |
116 |
|
117 |
src_install() { |
118 |
default |
119 |
- |
120 |
find "${ED}" -name '*.la' -delete || die |
121 |
|
122 |
- dodoc "${FILESDIR}"/README.OpenRC.txt |
123 |
- |
124 |
- newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect |
125 |
- insinto /etc/openconnect |
126 |
- |
127 |
- newconfd "${FILESDIR}"/openconnect.conf.in openconnect |
128 |
- |
129 |
- exeinto /etc/openconnect |
130 |
- newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh |
131 |
- |
132 |
+ newinitd "${FILESDIR}"/openconnect.initd.8.10 openconnect |
133 |
+ dodoc "${FILESDIR}"/README.OpenRC |
134 |
insinto /etc/logrotate.d |
135 |
newins "${FILESDIR}"/openconnect.logrotate openconnect |
136 |
|
137 |
keepdir /var/log/openconnect |
138 |
} |
139 |
+ |
140 |
+pkg_postinst() { |
141 |
+ local v |
142 |
+ for v in ${REPLACING_VERSIONS}; do |
143 |
+ ver_test $v -ge 8.10-r1 && continue |
144 |
+ ewarn "openconnect tunnel-specific configurations stored in ${EROOT}/etc/conf.d" |
145 |
+ ewarn "should be migrated to ${EROOT}/etc/openconnect/<tunnel>.conf" |
146 |
+ ewarn "For more information see ${EROOT}/usr/share/doc/${PF}/README.OpenRC" |
147 |
+ done |
148 |
+} |