From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- net-vpn/openconnect/Manifest | 8 +- net-vpn/openconnect/files/README.OpenRC.txt | 25 +++++ net-vpn/openconnect/openconnect-8.05.ebuild | 16 ++-- net-vpn/openconnect/openconnect-8.06.ebuild | 141 ++++++++++++++++++++++++++++ net-vpn/openconnect/openconnect-9999.ebuild | 85 +++++++---------- 5 files changed, 213 insertions(+), 62 deletions(-) create mode 100644 net-vpn/openconnect/files/README.OpenRC.txt create mode 100644 net-vpn/openconnect/openconnect-8.06.ebuild (limited to 'net-vpn/openconnect') diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index 319f444cbf5e..c895e1c8c546 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,8 +1,12 @@ +AUX README.OpenRC.txt 715 BLAKE2B 1f76faac7bf705fc3a4adbb8902e0fbd3354e654f0af59cb59b92fc4188400c9dfeef0267ebe39c8eb4842df8a6421aaf472e7bd20097cdc0d620e10fbafd28a SHA512 172b845cc46465119d14e304a0ea9a13d28497bc9e80688eab3ccce0e14ee17917fb6b8a06dd7e9a4657ef4f51a023045ac45bc5d8823e29b2d0cb9854425f66 AUX openconnect.conf.in 941 BLAKE2B 8cfa197edfe3b3754e45281b33d51bee0dd80746ac129b071710ca9d6f5aa5da16a3c3ad5fa52c6bfdc0ae4a9b1e3cfea2c20909c6164e67e0dba880cf08fc8a SHA512 a689df7141621c80bca77fdd1e01397b98882c7fd8db79b2fe1495916656522234e3af739538002533c003e4243e9af4bf80cd73bae961e15568997ce89ef6d5 AUX openconnect.init.in-r4 1775 BLAKE2B 2237238a2d149532e90c96190829e9ef51afa50487a0fd45c3c4d2e983fb8755bdf0de3eca44df740b286f4d353b03d71fcd2c2a27129f18031b2bd01989f738 SHA512 7b832550ef21ddb4b1c0eae7f3838b925745a5ebbdb74f1583fb8710b75175ebcbc7b1558ce95f59cd78542bec8bc01f7ab6d32ec4a5b168bb8a516a8907d362 AUX openconnect.logrotate 116 BLAKE2B 308d088f7c06239ec68831e415df420362c1825ae279fa6f736f36df0bf2e7efc8ea6a4ab43d9b53680dd0ab5028c92bf70a0597b56a20da06b302457e7d5f07 SHA512 ea1b6caf6278fea515c299072ee799ab3676014784703d7fa8e4f4d7bfc4599650c386d9706a3e6d92c195c9e5e1628fa6efc1124e1ae72875cc9eaab73cb077 DIST openconnect-8.05.tar.gz 1922100 BLAKE2B e12a5eccb471dc61c6f3af7492cb753fedcc52bfdb4155c934ca9c0c95da5e8037c0ede4f89345134fee8a09102f797690e101b8f4edba612ac265779feab19a SHA512 3ac9f1fa5a87b06d45c316897c69470264f2fde7525b5b3ef1352041dd0c8ae5eaf5dd325de1bdcf1e5b82e688fec9c36d531da1b75ac3f49896d4186d83aa15 +DIST openconnect-8.06.tar.gz 2030905 BLAKE2B d9659e4f027e11a0348c1c4358831e5f470f0305e04c22716010c68810ae300a7062ab8f57e3fc80b7d90caf855ce2f1c0af1b04eb7032b70486eee2eacc47e5 SHA512 6319aa6b20bf16994b376c2cc2a7cbf2b26a36f35e9607c1886e8fa7a2e1fe111bfb37f9349693ef52a3d2ce718c37e15fe263664e6c0bcbd33ced5ddb9e31b2 DIST vpnc-scripts-20190611.tar.gz 21439 BLAKE2B 8388cc3f4b795588bed146cf5e6be33f20de010e39ddbc2bebea3680df9f304bc64db9d14c42cb0b0cb3c053376929476f4b52bf3c8da3fb4153d058eb6bab2b SHA512 91f84cf1881916160e26ec48195583ab79e084cc7b7918721581f25dfb5b1504e8073b0eed50c1a15800824d5a4454e9b99cb4fdffe2539e5968909fafdda87a -EBUILD openconnect-8.05.ebuild 3646 BLAKE2B 1bfc20c5d07eb65d532aa9b19f5adb2efec2e7ad437889e8cceb3f9e7663029e685e6c2a94169b2f186756ba2780c01340f08350e7a123b568a612fa66d8a499 SHA512 9a5448779a59408c1e1921ce81c9c8d1cd04700097d629c9aee196a88d7bb43f11e73c6481438bc7fc1413b4c84a5239a4883d59d641dc45edc9f771739a52f9 -EBUILD openconnect-9999.ebuild 3651 BLAKE2B ef5b36ef7d60ac67ce4f2bcb218d6b013c6b1dc55ad725f5933ed1dd7876b64f92cadba0e1e04f0108916e2ee9093c5b194bb301d33958a54db258e8bc5df0bf SHA512 ec166100beb3151e09d23efd0fd61d3e593bcc0f7ddf0790d81c3dd598010ab32ad231a34562d3b7653a57605b8739b1871620c3bfe8441e4c56f48018b57157 +DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a +EBUILD openconnect-8.05.ebuild 3526 BLAKE2B 275749496727f11b0081de08172e115e5fd98fd1d49911d005a658d6322ff088ad3ea7871202a9470862fec51663c43f14be495d9a26b3ad96d6b23be5370f23 SHA512 a2134380e7af33d8f4217ed3a21a1e8902b5cdb78ba819be06181f9c599d9f410d05f245d8c9ed9f5a954ea381129edc3038aecd85666f7027ed8721ec2e0456 +EBUILD openconnect-8.06.ebuild 2907 BLAKE2B 0faa06469102958596aa0ed08c2e6fb70d6ff57831f59c52c3d088b7c0d39745cdac9a452a625d9d12fed341f2ba81d5eec1fd9036b823efc3de94f0160e661d SHA512 571293b2e5c60a918943dc65d387b6845a01a6526ef7984b35a2e63ac9390f00697cead66d1a13b4ccc336c55e1a7edabddfb1ba27857f46990e7e579ffc3518 +EBUILD openconnect-9999.ebuild 2907 BLAKE2B 0faa06469102958596aa0ed08c2e6fb70d6ff57831f59c52c3d088b7c0d39745cdac9a452a625d9d12fed341f2ba81d5eec1fd9036b823efc3de94f0160e661d SHA512 571293b2e5c60a918943dc65d387b6845a01a6526ef7984b35a2e63ac9390f00697cead66d1a13b4ccc336c55e1a7edabddfb1ba27857f46990e7e579ffc3518 MISC metadata.xml 523 BLAKE2B c4a4ebc18284b99d3b983740180460ad1c83933860c4d8df14886a740cad0a1dbf363881ffd430adb24feaf49a2a9d02f6d3a80d5bcd96fc36f2cdb1aea2bff5 SHA512 7701ea4b9ed4d0051d915700fbd20eb28ca03024f8c4beecd8e0192e8cfd82c136cec32f29cd1e76a3059913f1b04af8066ee2700cab393bb270a8cbe18214c8 diff --git a/net-vpn/openconnect/files/README.OpenRC.txt b/net-vpn/openconnect/files/README.OpenRC.txt new file mode 100644 index 000000000000..6bd43e62dfbc --- /dev/null +++ b/net-vpn/openconnect/files/README.OpenRC.txt @@ -0,0 +1,25 @@ +The init script for openconnect supports multiple vpn tunnels. + +You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d +instead of calling it directly: + +ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0 + +You can then start the vpn tunnel like this: + +/etc/init.d/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/openconnect-8.05.ebuild b/net-vpn/openconnect/openconnect-8.05.ebuild index e737caa85672..7ca60ca5159f 100644 --- a/net-vpn/openconnect/openconnect-8.05.ebuild +++ b/net-vpn/openconnect/openconnect-8.05.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2011-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,14 +24,13 @@ HOMEPAGE="http://www.infradead.org/openconnect.html" LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy libressl lz4 nls smartcard static-libs stoken" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken" DEPEND=" dev-libs/libxml2 sys-libs/zlib !gnutls? ( - !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) - libressl? ( dev-libs/libressl:0=[static-libs?] ) + >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers @@ -44,14 +43,16 @@ DEPEND=" lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken )" + stoken? ( app-crypt/stoken ) +" RDEPEND="${DEPEND} sys-apps/iproute2 - !/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-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild index 16e3dcc31c8a..4442fa5bf4d3 100644 --- a/net-vpn/openconnect/openconnect-9999.ebuild +++ b/net-vpn/openconnect/openconnect-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2011-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7} ) PYTHON_REQ_USE="xml" -inherit eutils linux-info python-any-r1 readme.gentoo-r1 +inherit linux-info python-any-r1 if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git" @@ -15,7 +15,7 @@ else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi -VPNC_VER=20190611 +VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI} ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz" @@ -24,14 +24,13 @@ HOMEPAGE="http://www.infradead.org/openconnect.html" LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy libressl lz4 nls smartcard static-libs stoken" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken" DEPEND=" dev-libs/libxml2 sys-libs/zlib !gnutls? ( - !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) - libressl? ( dev-libs/libressl:0=[static-libs?] ) + >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers @@ -44,14 +43,16 @@ DEPEND=" lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken )" + stoken? ( app-crypt/stoken ) +" RDEPEND="${DEPEND} sys-apps/iproute2 - !/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 - dodir /etc/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 - - find "${ED}" -name '*.la' -delete || die - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - elog "You may want to consider installing the following optional packages." - optfeature "resolvconf support" virtual/resolvconf - fi + keepdir /var/log/openconnect } -- cgit v1.2.3