diff options
Diffstat (limited to 'net-vpn')
19 files changed, 182 insertions, 326 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz Binary files differindex a1a9971d480e..fdda793b9f21 100644 --- a/net-vpn/Manifest.gz +++ b/net-vpn/Manifest.gz diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest index 6e283362d614..57c907708ee7 100644 --- a/net-vpn/networkmanager-openvpn/Manifest +++ b/net-vpn/networkmanager-openvpn/Manifest @@ -1,5 +1,5 @@ DIST NetworkManager-openvpn-1.8.12.tar.xz 597216 BLAKE2B 55ccb3139b1be9d1894d3651d60ce0f2167a24efbb24a9870eb4bb683a91603ae5f5149ed9aca8307cf608140c075a7b19bdfef68b1dbfe0729c117f084bb904 SHA512 1b8adf926426f866f7509a07c24203d6b584627aba4f8e2b1b00fa897bf0d7155009d566c3440565d1ee0e938694dd8d6746f37f62d493864d16eae007590b22 DIST NetworkManager-openvpn-1.8.14.tar.xz 611084 BLAKE2B c986f85a6af93b88bc73a0e111cf712948e1434aff35b1df5c86a7afa6092acfc637e0e9031f170107c2856cf4f907bcc36543769ee531a1407bef69a9fbd0a3 SHA512 6775be9667c722cb2eec23354b950ff29b739119615a3f8c9730ad597427def716e9911a4232d014df78e88f5e4968f359e0aecacd81183db65586e2bc6ca0e7 EBUILD networkmanager-openvpn-1.8.12-r1.ebuild 1285 BLAKE2B c4faf61c0046a69574c734cfa7d993f64e130ca57b18280b45595968b48cbafb99d38423c4faf2694b2fcda81fdf38ffab9489d390d6340c842444daf302f325 SHA512 94e87c8733b4295892a180afc3495a62834373a90ba18f3d19dade67cb4d2768413c59c01c0223c0133b518260cb595c098771b7b20c5524e908f7a1a67b5e6a -EBUILD networkmanager-openvpn-1.8.14.ebuild 1287 BLAKE2B b0d6874180cf20d3056168b930d5d3a50fec6b33f0e9ea05cd2ea513735fd7d9a82b199f3770bac163d8175d0d4ce85d9b8bd48e1504b0c1c769d38e1c3e65b2 SHA512 a3b13bf69560df4eea2aff2683ee30ec0a58a006563110f020ac57f4db0a8a469236322d32459b463b97a29e145f19e14fe772034390c4d7dbe54556f7bdc28f +EBUILD networkmanager-openvpn-1.8.14.ebuild 1286 BLAKE2B c8ea9f14328e79d512b1145e2a44930d037629e87ce0843fd81b1a4cb3155ae7a2a845506c8d080c1382cb047a1e9dc7d56fdd864313851a26d378040e8226c9 SHA512 819ca5504ac9b89e68732c18cb4aecab5da443c63a6f08a4da26b1ebced71363e46a8a77e4b14ae1f39bab59e24b4286b6a5a0a23d5fa546b546e1866b9c275c MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132 diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild index 1f43b0b4c2e5..817ffd23ee83 100644 --- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild +++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="gtk test" RESTRICT="!test? ( test )" 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 <<EOF +${password} +EOF + elif [ -n "${password_file}" ]; then + command_args="${command_args} --passwd-on-stdin" + default_start <"${password_file}" + else + default_start + fi +} diff --git a/net-vpn/openconnect/files/openconnect.initd.8.10 b/net-vpn/openconnect/files/openconnect.initd.8.10 deleted file mode 100644 index 020eeb91aa16..000000000000 --- a/net-vpn/openconnect/files/openconnect.initd.8.10 +++ /dev/null @@ -1,105 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VPN="${RC_SVCNAME#*.}" -VPNCONF=/etc/openconnect/${VPN}.conf -VPNDIR="/etc/openconnect/${VPN}" -VPNLOG="/var/log/openconnect/${VPN}" -VPNLOGFILE="${VPNLOG}/openconnect.log" -VPNERRFILE="${VPNLOG}/openconnect.err" - -command="/usr/sbin/openconnect" -name="OpenConnect: ${VPN}" -pidfile="/run/openconnect/${VPN}.pid" -stopsig="SIGINT" - -depend() { - before netmount -} - -checkconfig() { - if [ $VPN = "openconnect" ]; then - eerror "You cannot call openconnect directly. You must create a symbolic link to it with the vpn name:" - eerror - eerror "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0" - eerror - eerror "And then call it instead:" - eerror - eerror "/etc/init.d/openconnect.vpn0 start" - return 1 - fi - if [ ! -f "${VPNCONF}" ]; then - ewarn "The configuration file for ${VPN} does not exist." - ewarn "Please create ${VPNCONF}" - ewarn "This will become a fatal error in a future release." - fi - local server vpnopts password - eval server=\$server_${VPN} - eval vpnopts=\$vpnopts_${VPN} - eval password=\$password_${VPN} - if [ -n "$server" ] || [ -n "$vpnopts" ] || [ -n "password" ]; then - ewarn "server_${VPN}, vpnopts${VPN} and password_${VPN} are deprecated" - ewarn"Please move them to the appropriate settings in ${VPNCONF}" - ewarn "They will be ignored in the future." - fi - return 0 -} - -checktuntap() { - if [ "$RC_UNAME" = "Linux" -a ! -e /dev/net/tun ] ; then - if ! modprobe tun ; then - eerror "TUN/TAP support is not available in this kernel" - return 1 - fi - fi -} - -run_hook() { - if [ -x "$1" ]; then - "$@" - fi -} - -start_pre() { - checkconfig || return - checktuntap || return - checkpath -d "${VPNLOG}" || return - checkpath -d /run/openconnect || return - run_hook "${VPNDIR}/preup.sh" -} - -start() { - local server vpnopts password - eval server=\$server_${VPN} - eval vpnopts=\$vpnopts_${VPN} - eval password=\$password_${VPN} - - ebegin "Starting ${name}" - start-stop-daemon --start --exec "${command}" -- \ - --background \ - --config="${VPNCONF:-/dev/null}" \ - --interface="${VPN}" \ - --pid-file="${pidfile}" \ - ${vpnopts} \ - "${server}" \ - >> "${VPNLOGFILE}" \ - 2>> "${VPNERRFILE}" \ - <<EOF -${password} -EOF - eend $? -} - -start_post() { - run_hook "${VPNDIR}/postup.sh" -} - -stop_pre() { - checkconfig || return - run_hook "${VPNDIR}/predown.sh" -} - -stop_post() { - run_hook "${VPNDIR}/postdown.sh" -} diff --git a/net-vpn/openconnect/openconnect-8.09-r1.ebuild b/net-vpn/openconnect/openconnect-8.09-r1.ebuild deleted file mode 100644 index fee3227f1fb0..000000000000 --- a/net-vpn/openconnect/openconnect-8.09-r1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 2011-2020 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_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 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" - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/libxml2 - sys-libs/zlib - !gnutls? ( - >=dev-libs/openssl-1.0.1h:0=[static-libs?] - ) - gnutls? ( - app-crypt/trousers - app-misc/ca-certificates - dev-libs/nettle - >=net-libs/gnutls-3.6.13:0=[static-libs?] - ) - 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() { - local PATCHES=( - "${FILESDIR}"/8.09-gnutls-buffer-overflow.patch - ) - 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) - $(use_enable static-libs 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 - - 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-r4.ebuild index f4a03e951f4e..13c3da231bad 100644 --- a/net-vpn/openconnect/openconnect-8.10-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,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" + 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,23 +129,13 @@ 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 + + newconfd "${FILESDIR}"/openconnect.confd openconnect + newinitd "${FILESDIR}"/openconnect.initd openconnect + 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 -} 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 diff --git a/net-vpn/riseup-vpn/Manifest b/net-vpn/riseup-vpn/Manifest index 52a5060e572d..a90f3b40ae6a 100644 --- a/net-vpn/riseup-vpn/Manifest +++ b/net-vpn/riseup-vpn/Manifest @@ -1,4 +1,5 @@ AUX riseup-vpn-ip-location.patch 445 BLAKE2B d1b43da1c39baad62bca64c922ec5c2666e7be38db6e5402bc616f02e7faef4f3884dc8141c40d25edb147c27c2234d1b90e116696eac022d95066b527222f8c SHA512 051ffb1107d5d4c7fe0be9a158d7b2b5d90ff3aad60918449c56671e541662dfd0163f1d62eb88ac95ae3aed88917efcbc085ae9a41d27706a154b51dc24e82d +AUX riseup-vpn-parallel-make.patch 1556 BLAKE2B 9c7166ad5f00e565bc2fce21f5e4ca796d02003a14a4e51a0288a8aa2dbd9a1e38472b570b6f480c05d0be7c5b950bd0948b1e216722c26ef931ee550fb554de SHA512 0868fdfa2c8903f33fad4272f4701c63bb0b9b73d851d6e995f4fcc6685811e7de10f2f465bd485c4370bf6af799a2fe76f0eab9c850879a9ff8edb721b505c1 AUX riseup-vpn-respect-AR.patch 1700 BLAKE2B ec94095cc7e239add206595d7861260026f00d1c42ab01f2d8093c5f33b9e66bf9923bb4f526deccf92c798a2d3b565bcf159c76192983cbe4d058fa927f6faf SHA512 88b449abff3a015f499ff69d595421aa9c58d51d21b739c6c0532f889b822a07ec506c94ef5d05cd25b0165ec2c1f0056549069c18c8fd6d997db32e1ae2dd44 DIST 0xacab.org%2Fleap%2Fshapeshifter%2F@v%2Fv0.0.0-20191029173606-85d3e8ac43e2.mod 36 BLAKE2B 18848dd9ecba98ad55023c343e68149c2a86e1fb1cec95cfc36d58f304050b29c4a8a0b108392e8daca2f201b0a7bbc30b9e5f5ea54196433c9c6a37ed4c5522 SHA512 ce08c7ff89bfcf6d9e56cec299cb0befa012493384be6f1d6d6b0ab2875d91cce640cc8df51c660ab291cca52c53cbc98bfb465bf569fcad351fc5c126ccaa87 DIST 0xacab.org%2Fleap%2Fshapeshifter%2F@v%2Fv0.0.0-20191029173606-85d3e8ac43e2.zip 2199 BLAKE2B 7b996b10c73fec0c9cb1c038245bb3bc04b297443b853df62b1ca910476162cd984d52b62b4b0c76c35bb69aab3129f880602fc726af78a75990b4444f61ead6 SHA512 3f9d68dfc635253670f55a36e2257956eaf08c186ef4aa768e7d0e445885070ad39461b97a3fcef276df8bac31867a733c690e4cb32f52f59d5ab365f0473e66 @@ -43,5 +44,5 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.zip 1916451 BLAKE2B da323af18ec6dbb2c7cfcc267ceaeddb5e452789f3ed5797345020ccbf118992e9972fc652b20d8cd5a023c96613d5a770f71e6384b6576a271bc322d02a450b SHA512 13fcebd117456775d53483f713e5a090321ab1159048b92252aee953c294dc174d7f5695e8d09f272203786143bdd6b15ff32c979aef5a30b442a56aa09d1a7d DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d DIST riseup-vpn-0.21.6.tar.gz 5404265 BLAKE2B 2dcae7aaa3659fe9e8b9910a6c085ec49389551a6d2e404fb5520622e22adff98277fe3962f1dfd3b44d23b8c687855105196e74b89d4bb9890202e97033c5d9 SHA512 074dadcd24c1ecaa21504a26406c5f8f3cdbbe8dffc3679e1c1b62d1978b51b20154edd54d8887868c7458e4c184b8f16aa6ff21e71890fe6b84c0eb2e008deb -EBUILD riseup-vpn-0.21.6-r1.ebuild 4729 BLAKE2B 8ce437ecb9e9e09eec3410120fb570476424a73361371c06aa3ebf721bfe20d25b77d2a39360d2ecb4e563a195fb7d2181a44185c41c572983761a40ba97490c SHA512 91a0a27f33c47904fd557fc8da907060cfd1bd82df968d073d19f9de5389e96e6ceca5a99af5eb76ced43551956435d8b2c4330c2a99be2905e1d7d2e7e550a1 +EBUILD riseup-vpn-0.21.6-r1.ebuild 4758 BLAKE2B 232bd9c0149ed559ebd3f98371a48495f14c1779bea041e0ead313d36cb77dfa063a67c4cfca11e5953d992e5708455d49ac3e2680d2a26fad6f890c20f68cb7 SHA512 d34092842576ebf9c034a2ca1c93b49b4c34af8ef8e3d7384ef61c7adc3abac12b569b8c3bffb05dd5df8d61ba9f1630c115869fd39a3be523576c900cda2639 MISC metadata.xml 1044 BLAKE2B 28fd241b8a0a7cf97f52b56f854a1337272ddb652ed782448ccd71a3be6df07e4791cf1fcf21ee1750f6b498e1d9cd30e35c778427c04af2e4f60b709de7c8a9 SHA512 fc8e0f86bfbb7dd808f145284c81de8670341ec1ca8ce62e8dc4b9ef3aff0a8ff5c1bc72ea6946b0ec742adbd49d977e9a442dd7f075b3649ddf5304fc7fc735 diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch b/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch new file mode 100644 index 000000000000..2b0f188e4a57 --- /dev/null +++ b/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch @@ -0,0 +1,54 @@ +diff --git a/Makefile b/Makefile +index b9ddda5..500adb7 100644 +--- a/Makefile ++++ b/Makefile +@@ -108,7 +108,7 @@ PKGFILES = $(shell find pkg -type f -name '*.go') + endif + + lib/%.a: $(PKGFILES) +- @XBUILD=no ./gui/build.sh --just-golib ++ @XBUILD=no MAKE=${MAKE} ./gui/build.sh --just-golib + + relink_vendor: + @echo "============RELINK VENDOR=============" +@@ -136,14 +136,14 @@ endif + + build_golib: lib/libgoshim.a + +-build_gui: relink_vendor ++build_gui: build_golib relink_vendor + @echo "==============BUILD GUI===============" + @echo "TARGET: ${TARGET}" + @echo "VENDOR_PATH: ${VENDOR_PATH}" +- @XBUILD=no QMAKE=${QMAKE} LRELEASE=${LRELEASE} TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} gui/build.sh --skip-golib ++ @XBUILD=no MAKE=${MAKE} QMAKE=${QMAKE} LRELEASE=${LRELEASE} TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} gui/build.sh --skip-golib + @echo "============BUILD GUI=================" + +-build: build_golib build_helper build_gui ++build: build_helper build_gui + + build_helper: + ifeq ($(PLATFORM), linux) +diff --git a/gui/build.sh b/gui/build.sh +index 9e519a6..8aa0356 100755 +--- a/gui/build.sh ++++ b/gui/build.sh +@@ -17,6 +17,7 @@ PROJECT=bitmask.pro + TARGET_GOLIB=lib/libgoshim.a + SOURCE_GOLIB=gui/backend.go + ++MAKE=${MAKE:=make} + QTBUILD=build/qt + RELEASE=$QTBUILD/release + DEBUGP=$QTBUILD/debug +@@ -114,8 +115,8 @@ function buildDefault { + fi + buildQmake + +- make -C $QTBUILD clean +- make -C $QTBUILD $MAKEFLAGS all ++ $MAKE -C $QTBUILD clean ++ $MAKE -C $QTBUILD $MAKEFLAGS all + + renameOutput + echo "[+] Done." diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild index 91db3c978164..1f5d98d6c03e 100644 --- a/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild +++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild @@ -94,6 +94,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/${PN}-ip-location.patch" "${FILESDIR}/${PN}-respect-AR.patch" + "${FILESDIR}/${PN}-parallel-make.patch" ) S="${WORKDIR}/bitmask-vpn-${PV}" @@ -112,13 +113,13 @@ src_prepare() { src_compile() { # does not build with j>1 tc-export AR LD CC CXX - emake -j1 build + emake build docs_compile } src_test() { - emake -j1 test - virtx emake -j1 test_ui + emake test + virtx emake test_ui } src_install() { diff --git a/net-vpn/vpnc-scripts/Manifest b/net-vpn/vpnc-scripts/Manifest new file mode 100644 index 000000000000..5b0aeb256a5e --- /dev/null +++ b/net-vpn/vpnc-scripts/Manifest @@ -0,0 +1,4 @@ +DIST vpnc-scripts-20210402.tar.gz 39925 BLAKE2B 2bc8a274773e51ba48e402588fdf5b51d20360f610afe5608f91dfe2466644b68d891a60c27e4c6938b4ed5da1f193ddb7a8ac955c8f02e6bf91437dc5c47620 SHA512 5f9fc5ab1a5a2607f807700536c4a8e71c551052e72979c1cdd02b15906615be33a297b873b0806f269e51645f10f1c02a7acfed2501148bfa2797250582920d +EBUILD vpnc-scripts-20210402.ebuild 594 BLAKE2B fe8d8a629332563b792285af44ef9b4199200cba23471ee3deeb5dc748ca55f009cebf35d024a22b5b0b1a4b7ddaf9be3ea4b68bb1cafcbbfab0954957d54dbb SHA512 4dea57427a334d1c6a349c3461a6ee50e5202475e218435ba5d6fb4d6ca15cbdd2e8317fcde4a2aca8a4a766e4729c43caf552aa1d0e262b609fe688e8710630 +EBUILD vpnc-scripts-99999999.ebuild 594 BLAKE2B fe8d8a629332563b792285af44ef9b4199200cba23471ee3deeb5dc748ca55f009cebf35d024a22b5b0b1a4b7ddaf9be3ea4b68bb1cafcbbfab0954957d54dbb SHA512 4dea57427a334d1c6a349c3461a6ee50e5202475e218435ba5d6fb4d6ca15cbdd2e8317fcde4a2aca8a4a766e4729c43caf552aa1d0e262b609fe688e8710630 +MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b diff --git a/net-vpn/vpnc-scripts/metadata.xml b/net-vpn/vpnc-scripts/metadata.xml new file mode 100644 index 000000000000..de09ffd8b089 --- /dev/null +++ b/net-vpn/vpnc-scripts/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>floppym@gentoo.org</email> + <name>Mike Gilbert</name> + </maintainer> +</pkgmetadata> diff --git a/net-vpn/vpnc-scripts/vpnc-scripts-20210402.ebuild b/net-vpn/vpnc-scripts/vpnc-scripts-20210402.ebuild new file mode 100644 index 000000000000..83fa0467d1d8 --- /dev/null +++ b/net-vpn/vpnc-scripts/vpnc-scripts-20210402.ebuild @@ -0,0 +1,23 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 99999999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/openconnect/vpnc-scripts.git" +else + SRC_URI="ftp://ftp.infradead.org/pub/vpnc-scripts/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Connect scripts for use with vpnc and openconnect (and similar clients)" +HOMEPAGE="https://gitlab.com/openconnect/vpnc-scripts" + +LICENSE="GPL-2+" +SLOT="0" + +src_install() { + exeinto /etc/vpnc-scripts + doexe vpnc-script{,-{ptrtd,sshd}} +} diff --git a/net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild b/net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild new file mode 100644 index 000000000000..83fa0467d1d8 --- /dev/null +++ b/net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild @@ -0,0 +1,23 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 99999999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/openconnect/vpnc-scripts.git" +else + SRC_URI="ftp://ftp.infradead.org/pub/vpnc-scripts/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Connect scripts for use with vpnc and openconnect (and similar clients)" +HOMEPAGE="https://gitlab.com/openconnect/vpnc-scripts" + +LICENSE="GPL-2+" +SLOT="0" + +src_install() { + exeinto /etc/vpnc-scripts + doexe vpnc-script{,-{ptrtd,sshd}} +} |