From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Oct 2021 23:06:07 +0100 Subject: gentoo resync : 08.10.2021 --- net-vpn/openconnect/Manifest | 12 +- net-vpn/openconnect/files/README.OpenRC | 25 +--- net-vpn/openconnect/files/openconnect.conf.in | 2 +- net-vpn/openconnect/files/openconnect.confd | 6 + net-vpn/openconnect/files/openconnect.initd | 28 +++++ net-vpn/openconnect/files/openconnect.initd.8.10 | 105 ---------------- net-vpn/openconnect/openconnect-8.09-r1.ebuild | 150 ---------------------- net-vpn/openconnect/openconnect-8.10-r1.ebuild | 153 ----------------------- net-vpn/openconnect/openconnect-8.10-r4.ebuild | 141 +++++++++++++++++++++ net-vpn/openconnect/openconnect-9999.ebuild | 26 ++-- 10 files changed, 195 insertions(+), 453 deletions(-) create mode 100644 net-vpn/openconnect/files/openconnect.confd create mode 100644 net-vpn/openconnect/files/openconnect.initd delete mode 100644 net-vpn/openconnect/files/openconnect.initd.8.10 delete mode 100644 net-vpn/openconnect/openconnect-8.09-r1.ebuild delete mode 100644 net-vpn/openconnect/openconnect-8.10-r1.ebuild create mode 100644 net-vpn/openconnect/openconnect-8.10-r4.ebuild (limited to 'net-vpn/openconnect') diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index ffefc61f4707..1e14ba2ba9bd 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,17 +1,17 @@ AUX 8.09-gnutls-buffer-overflow.patch 2172 BLAKE2B 6c1251936ad2606c9b68036820e930efc392132b365faa14e690a6df4daa339c24614f856423a2d7d04bcbb3b799e96486dfb18430a6b9d8016eaeaf60a19ee5 SHA512 d74920e6eb5f8ef6ca4dcf03cf8d47a5e2ed480573dfd0c8742851e9b830fc6b379b24e945c5b429a50919a7a5041f007ba76ba93dc22eaecb27e84a84a89011 -AUX README.OpenRC 957 BLAKE2B f390ce810ce550d0456f1885224edbe578106464d448ec3181cb152f61bc2f951ba3e21a79555d2edbff88414d09ead2598808350e7584b97cd03abab5f642de SHA512 8a94e74fd2fbcce0f5959f6565ec9f4fd63da8fea7126f69ed4812b1002cbc55435c533d0827ac3989534e32e5cf42beef954e22ce0276b224e3629e7641d12d +AUX README.OpenRC 416 BLAKE2B a7dcfde210b217d521fcb7c54eb41d07b0e32321aa9c6cc47c78ad7952ee5b6ceede5850de4c4e30891e29e2c4b631b99f65c2c696a9d4fa01ddd190346363bf SHA512 fed0a786466736cd891de7783994e86bb2a20bdb8aa2f9a18f55bc892be0e50d514855b120def151b6fac7e3d2b819510d7dbf496deca65579fea9b42206c49a AUX README.OpenRC.txt 715 BLAKE2B 1f76faac7bf705fc3a4adbb8902e0fbd3354e654f0af59cb59b92fc4188400c9dfeef0267ebe39c8eb4842df8a6421aaf472e7bd20097cdc0d620e10fbafd28a SHA512 172b845cc46465119d14e304a0ea9a13d28497bc9e80688eab3ccce0e14ee17917fb6b8a06dd7e9a4657ef4f51a023045ac45bc5d8823e29b2d0cb9854425f66 -AUX openconnect.conf.in 941 BLAKE2B 8cfa197edfe3b3754e45281b33d51bee0dd80746ac129b071710ca9d6f5aa5da16a3c3ad5fa52c6bfdc0ae4a9b1e3cfea2c20909c6164e67e0dba880cf08fc8a SHA512 a689df7141621c80bca77fdd1e01397b98882c7fd8db79b2fe1495916656522234e3af739538002533c003e4243e9af4bf80cd73bae961e15568997ce89ef6d5 +AUX openconnect.conf.in 900 BLAKE2B d72a595e6292655a759d3cbc5daf18b2f5d4d2a4ce65e852742e9f4f816cb370566fc03be8958fcf579c1822d5fa098cdcbc2b3300764d22625f8bd62f0c2d03 SHA512 5c49123d5389426ad419415c036a076cec6993729624ee90b77bc570c6bb32579e862845fa79d12ff586e570fbbda16cbe55421d7b4ee39b5bca1ebdd84d9fc7 +AUX openconnect.confd 230 BLAKE2B 6013d6e415ad37f5c4b0d31df011c207978c2f266d94bc081b64c2950ef2a14fd80606abe0f950f443323b43811198838252f2a80e1f3812aed9397ca9809053 SHA512 d773926cf787c5f819f4bdd750ccc6de84a287ce7e0f7322b748a2fb1d88dc4822f8ea0f41c14c60054a54b69caeffe0fc9db76021667b44f0db013ed28cee1b AUX openconnect.init.in-r4 1775 BLAKE2B 2237238a2d149532e90c96190829e9ef51afa50487a0fd45c3c4d2e983fb8755bdf0de3eca44df740b286f4d353b03d71fcd2c2a27129f18031b2bd01989f738 SHA512 7b832550ef21ddb4b1c0eae7f3838b925745a5ebbdb74f1583fb8710b75175ebcbc7b1558ce95f59cd78542bec8bc01f7ab6d32ec4a5b168bb8a516a8907d362 -AUX openconnect.initd.8.10 2428 BLAKE2B 06fe0d95e5249bbd7e737fb81a8c4b4de76b9e5a817414c79028072aacf0a494c6702d372766b6023ce480a3c65a979800f6d7af9182acb84386a33fc33c2a6b SHA512 2371b16a9e823ddb52e7449c21379fe80d578c28c0f68f34dd7445c12d33d7a94b7c8b083f70e1be4b97705aff88cb8565d853d26e8cc301c61955e31db4e11b +AUX openconnect.initd 664 BLAKE2B 5fcf983c474ccb10c2b785f1af161e6f85efcb19fe13abc9710a797633496a48ced470cac73cb9c51e3ad66f5efc9e5c559961cfb4213b12684133410614203c SHA512 5c75143e61fd215e13888b647357cf5626902b74cc4af2a8c147c95412ef9393572a8eb34cd5d86babedf2674ca5c3aa35991101a730a033b5af5c8ee9cc4ad9 AUX openconnect.logrotate 116 BLAKE2B 308d088f7c06239ec68831e415df420362c1825ae279fa6f736f36df0bf2e7efc8ea6a4ab43d9b53680dd0ab5028c92bf70a0597b56a20da06b302457e7d5f07 SHA512 ea1b6caf6278fea515c299072ee799ab3676014784703d7fa8e4f4d7bfc4599650c386d9706a3e6d92c195c9e5e1628fa6efc1124e1ae72875cc9eaab73cb077 DIST openconnect-8.09.tar.gz 2083279 BLAKE2B 4588c693a7a641faad271b034e8713f00fda04a872641e45a8ce3e1a236b8d2f4e1b8d973d20e7a9fc656f9460a0e990cbaada008d4ecf9a46353f20c25ac87a SHA512 f6890f5bce4b36b162e4590bce8a61d65fc0ae803d62a3dd408fbb13e96ce41b6443740132808491093032545aea919f9076e34bc11160c503c5e3c46457e7bd DIST openconnect-8.10.tar.gz 2084534 BLAKE2B 98ad0e24e09bc565f359139540f60eb9b6b5ed2239a9c46c56889b8554fc3de3605c10f1bb4fa0b0b206ba35404ae90a389ab8dcee54cf05a24d984529d24c2a SHA512 a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356 DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a DIST vpnc-scripts-20200930.tar.gz 22305 BLAKE2B 5db809ef674cb3cb8f1c775adc1e83debbda28fdcf47e0b0527efe6d1cea09781ef02b2827d9704140b884a85e7ec51fba497f47f6793520b471a7bba0dde6b6 SHA512 5f42bc7b168b5fdfc3ebd4bae52a42a654f102982852cc74240972e16e77fe0b54d82175e2a067e1d7e408bd14c3f465f7eb82b23b41885cb25a813d9587fd3d -EBUILD openconnect-8.09-r1.ebuild 3091 BLAKE2B be3ecad6c44152576a3fafccf3a95c239bbf0cd91bc900886f2c7b74e067c81a2bd7145537fc38ceb2ef01af180824df62f5c73ee4a4f2b351eab766c5f7e9f3 SHA512 090bb94bc9f9250ee867e73d20a5b265997ddf1820ed54c1068c33e9822e50f48420134966b3ba6309b628708b4ad0270aa44e94d4e699a510a906a5c3948f01 EBUILD openconnect-8.09-r3.ebuild 3079 BLAKE2B 030c6f46ebb04966924f6e51487608660e4d2157ae5364d413db5f8cf6c12d50b7b771c640a60047f14a2df1a33dbfc97ff6bf8e07916c496a844d47766aaef0 SHA512 5eabd5db4a6fff49744f8005a98f91f7b9eb0e1ad704cb63451fbd49b6564b294a2c39b3d8c887ebaaacfdaac780f4f255f0f46bba24186e31d9880524a156f1 -EBUILD openconnect-8.10-r1.ebuild 3267 BLAKE2B ba110d6dd75ef47853187715c5ffed7b9f74c83e72e63d99003e952672a0ac31867f747e3e77b58d1c7f33cdbfb6cff28672d21df950eb11e73cadb4c89414dc SHA512 94963df2eae26626c77f95eda31bbd36dc59bb57e2d7de8609c248c9bd978cdce681a719ffaff5894fc6a2b1b8b57765e8b7ed197945201373ca79c7ca3134ac +EBUILD openconnect-8.10-r4.ebuild 2777 BLAKE2B d621381a1a18c76e2276a5e5b6a18e4e1aa5bb95d0feca1ad6dc4a893e0a5b17943393ba25ca618be3f317b96f487b0de0c6db78c1f46d7a2b58542424437ebc SHA512 d200381113555b49deb99600df0e99c6c568ecb4b532c6e34fdf10fa76c78a9abc0d79f1858cdba6e6d080fb791cd653c3e6f4d49e0b26305ddf1d1b7236c469 EBUILD openconnect-8.10.ebuild 3014 BLAKE2B ef2a3c2d603c2bfc155fc502009d49e0b6240e625ad7655dba2efb807531767d49ffdbc258ea24ebbd1654b36b36d156c52e3c9e900e1baad942243b74e686f7 SHA512 4c5afe5f42e3befa0aa5e5fc8a788ab1c7c637f1e7981102df9b51aff685f18a9302164edc8c2b5365ed439d2f605a3b74ec6392b61f2c19b0f4fe8c54ed8ae8 -EBUILD openconnect-9999.ebuild 3014 BLAKE2B 8ce4ad4153574a92bd68293e583130ace309499062831d422232814c99f09010359b03490837f2d7d18dd46f0212209704d23dc8d676b3255719fce6dfa80b48 SHA512 b794d2d95f897e0f451b2478759339deb64d38da5d1591fb39cd3686bdaf868521fdab8eb1ca71f5409b7715956d4014dd3e7faa586a3967148b300e8b81f52e +EBUILD openconnect-9999.ebuild 2777 BLAKE2B d621381a1a18c76e2276a5e5b6a18e4e1aa5bb95d0feca1ad6dc4a893e0a5b17943393ba25ca618be3f317b96f487b0de0c6db78c1f46d7a2b58542424437ebc SHA512 d200381113555b49deb99600df0e99c6c568ecb4b532c6e34fdf10fa76c78a9abc0d79f1858cdba6e6d080fb791cd653c3e6f4d49e0b26305ddf1d1b7236c469 MISC metadata.xml 524 BLAKE2B 8c9fc21b88e3dac2cd58d754d25dca9f12c835937c6265536767d242670ed6e12240ba2d9fc54e87ea265edd637c923eb97d03414f5846733076535126748cf4 SHA512 08d9d5104712ad4c311e87b18013868168f8fe5fc46f555c70e1bbfd8c066918ec1fa7f46ecd09b3b40db485da7f0155b1dde336e8baf48eccd5ea95abeabe79 diff --git a/net-vpn/openconnect/files/README.OpenRC b/net-vpn/openconnect/files/README.OpenRC index baa617d94eaa..488533e87e31 100644 --- a/net-vpn/openconnect/files/README.OpenRC +++ b/net-vpn/openconnect/files/README.OpenRC @@ -1,30 +1,13 @@ -The service script for openconnect supports multiple vpn tunnels. +The service script for openconnect supports multiple VPN tunnels. -You need to create a symbolic link to /etc/init.d/openconnect in +To enable this, create a symbolic link to /etc/init.d/openconnect in /etc/init.d for each tunnel instead of calling it directly: ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0 -Also, create a configuration file for the tunnel in /etc/openconnect. To -follow this example, the configuration file would be called -/etc/openconnect/vpn0.conf. See man openconnect for the options that can -go in this file. +To define per-VPN settings, copy /etc/conf.d/openconnect to +openconnect.vpn0. You can then start the vpn tunnel like this: rc-service openconnect.vpn0 start - -If you would like to run preup, postup, predown, and/or postdown scripts, -You need to create a directory in /etc/openconnect with the name of the vpn: - -mkdir /etc/openconnect/vpn0 - -Then add executable shell files: - -mkdir /etc/openconnect/vpn0 -cd /etc/openconnect/vpn0 -echo '#!/bin/sh' > preup.sh -cp preup.sh predown.sh -cp preup.sh postup.sh -cp preup.sh postdown.sh -chmod 755 /etc/openconnect/vpn0/* diff --git a/net-vpn/openconnect/files/openconnect.conf.in b/net-vpn/openconnect/files/openconnect.conf.in index 53b14e61378e..7e44f569c0c4 100644 --- a/net-vpn/openconnect/files/openconnect.conf.in +++ b/net-vpn/openconnect/files/openconnect.conf.in @@ -23,4 +23,4 @@ server_vpn0="vpn.server.tld" password_vpn0="YOUR_PASSWORD" # Any OPENCONNECT options my go here (see openconnect --help) -vpnopts_vpn0="-l --passwd-on-stdin --user=YOUR_USERNAME --script=/etc/openconnect/openconnect.sh" +vpnopts_vpn0="-l --passwd-on-stdin --user=YOUR_USERNAME" diff --git a/net-vpn/openconnect/files/openconnect.confd b/net-vpn/openconnect/files/openconnect.confd new file mode 100644 index 000000000000..5c00518a6937 --- /dev/null +++ b/net-vpn/openconnect/files/openconnect.confd @@ -0,0 +1,6 @@ +# Arguments to pass to openconnect +#command_args="--authgroup AUTHGROUP --user USER SERVERNAME" + +# For non-interactive use, set either password or password_file +#password="PASSWORD" +#password_file="/etc/openconnect/vpn0.password" diff --git a/net-vpn/openconnect/files/openconnect.initd b/net-vpn/openconnect/files/openconnect.initd new file mode 100644 index 000000000000..69f9999f6ad9 --- /dev/null +++ b/net-vpn/openconnect/files/openconnect.initd @@ -0,0 +1,28 @@ +#!/sbin/openrc-run +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +vpn=${RC_SVCNAME#*.} +command="/usr/sbin/openconnect" +pidfile="/run/openconnect/${vpn}.pid" +command_args="--syslog ${command_args}" +command_args_background="--background --pid-file \"${pidfile}\"" +stopsig="SIGINT" + +start_pre() { + checkpath -d /run/openconnect +} + +start() { + if [ -n "${password}" ]; then + command_args="${command_args} --passwd-on-stdin" + default_start <> "${VPNLOGFILE}" \ - 2>> "${VPNERRFILE}" \ - </dev/null) != ${charset} ]]; then - # If we don't have valid cs_CZ locale data, auth-nonascii will fail. - # Force a test skip by exiting with status 77. - sed -i -e '2i exit 77' tests/auth-nonascii || die - break - fi - done - default -} - -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 - - insinto /etc/logrotate.d - newins "${FILESDIR}"/openconnect.logrotate openconnect - - keepdir /var/log/openconnect -} diff --git a/net-vpn/openconnect/openconnect-8.10-r1.ebuild b/net-vpn/openconnect/openconnect-8.10-r1.ebuild deleted file mode 100644 index f4a03e951f4e..000000000000 --- a/net-vpn/openconnect/openconnect-8.10-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 2011-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) -PYTHON_REQ_USE="xml" - -inherit linux-info python-any-r1 - -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 ~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" - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/libxml2 - sys-libs/zlib - !gnutls? ( - >=dev-libs/openssl-1.0.1h:0= - ) - gnutls? ( - app-crypt/trousers - app-misc/ca-certificates - dev-libs/nettle - >=net-libs/gnutls-3.6.13:0= - dev-libs/libtasn1:0= - app-crypt/tpm2-tss - ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - lz4? ( app-arch/lz4:= ) - nls? ( virtual/libintl ) - smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken ) -" -RDEPEND="${DEPEND} - sys-apps/iproute2 -" -BDEPEND=" - virtual/pkgconfig - doc? ( ${PYTHON_DEPS} sys-apps/groff ) - nls? ( sys-devel/gettext ) - test? ( - net-libs/socket_wrapper - net-vpn/ocserv - sys-libs/uid_wrapper - ) -" - -CONFIG_CHECK="~TUN" - -pkg_pretend() { - check_extra_config -} - -pkg_setup() { - : -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi - default -} - -src_prepare() { - default - if [[ ${PV} == 9999 ]]; then - eautoreconf - fi -} - -src_configure() { - if use doc; then - python_setup - else - export ac_cv_path_PYTHON= - fi - - # Used by tests if userpriv is disabled - addwrite /run/netns - - local myconf=( - --disable-dsa-tests - $(use_enable nls) - --disable-static - $(use_with !gnutls openssl) - $(use_with gnutls) - $(use_with libproxy) - $(use_with lz4) - $(use_with gssapi) - $(use_with smartcard libpcsclite) - $(use_with stoken) - --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" - --without-java - ) - - econf "${myconf[@]}" -} - -src_test() { - local charset - for charset in UTF-8 ISO8859-2; do - if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then - # If we don't have valid cs_CZ locale data, auth-nonascii will fail. - # Force a test skip by exiting with status 77. - sed -i -e '2i exit 77' tests/auth-nonascii || die - break - fi - done - default -} - -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 - 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/.conf" - ewarn "For more information see ${EROOT}/usr/share/doc/${PF}/README.OpenRC" - done -} diff --git a/net-vpn/openconnect/openconnect-8.10-r4.ebuild b/net-vpn/openconnect/openconnect-8.10-r4.ebuild new file mode 100644 index 000000000000..13c3da231bad --- /dev/null +++ b/net-vpn/openconnect/openconnect-8.10-r4.ebuild @@ -0,0 +1,141 @@ +# Copyright 2011-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="xml" + +inherit linux-info python-any-r1 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git" + inherit git-r3 autotools +else + SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" +HOMEPAGE="http://www.infradead.org/openconnect.html" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/libxml2 + sys-libs/zlib + !gnutls? ( + >=dev-libs/openssl-1.0.1h:0= + ) + gnutls? ( + app-crypt/trousers + app-misc/ca-certificates + dev-libs/nettle + >=net-libs/gnutls-3.6.13:0= + dev-libs/libtasn1:0= + app-crypt/tpm2-tss + ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + lz4? ( app-arch/lz4:= ) + nls? ( virtual/libintl ) + smartcard? ( sys-apps/pcsc-lite:0= ) + stoken? ( app-crypt/stoken ) +" +RDEPEND="${DEPEND} + sys-apps/iproute2 + net-vpn/vpnc-scripts +" +BDEPEND=" + virtual/pkgconfig + doc? ( ${PYTHON_DEPS} sys-apps/groff ) + nls? ( sys-devel/gettext ) + test? ( + net-libs/socket_wrapper + net-vpn/ocserv + sys-libs/uid_wrapper + ) +" + +CONFIG_CHECK="~TUN" + +pkg_pretend() { + check_extra_config +} + +pkg_setup() { + : +} + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + fi + default +} + +src_prepare() { + default + if [[ ${PV} == 9999 ]]; then + eautoreconf + fi +} + +src_configure() { + if use doc; then + python_setup + else + export ac_cv_path_PYTHON= + fi + + # Used by tests if userpriv is disabled + addwrite /run/netns + + local myconf=( + --disable-dsa-tests + $(use_enable nls) + --disable-static + $(use_with !gnutls openssl) + $(use_with gnutls) + $(use_with libproxy) + $(use_with lz4) + $(use_with gssapi) + $(use_with smartcard libpcsclite) + $(use_with stoken) + --with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script" + --without-java + ) + + econf "${myconf[@]}" +} + +src_test() { + local charset + for charset in UTF-8 ISO8859-2; do + if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then + # If we don't have valid cs_CZ locale data, auth-nonascii will fail. + # Force a test skip by exiting with status 77. + sed -i -e '2i exit 77' tests/auth-nonascii || die + break + fi + done + default +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + dodoc "${FILESDIR}"/README.OpenRC + + newconfd "${FILESDIR}"/openconnect.confd openconnect + newinitd "${FILESDIR}"/openconnect.initd openconnect + + insinto /etc/logrotate.d + newins "${FILESDIR}"/openconnect.logrotate openconnect + + keepdir /var/log/openconnect +} diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild index 347a0d597937..13c3da231bad 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..10} ) 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,18 +127,12 @@ 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 + dodoc "${FILESDIR}"/README.OpenRC - exeinto /etc/openconnect - newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh + newconfd "${FILESDIR}"/openconnect.confd openconnect + newinitd "${FILESDIR}"/openconnect.initd openconnect insinto /etc/logrotate.d newins "${FILESDIR}"/openconnect.logrotate openconnect -- cgit v1.2.3