diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /net-vpn/openconnect | |
parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) |
gentoo resync : 25.04.2020
Diffstat (limited to 'net-vpn/openconnect')
-rw-r--r-- | net-vpn/openconnect/Manifest | 9 | ||||
-rw-r--r-- | net-vpn/openconnect/openconnect-8.06.ebuild | 2 | ||||
-rw-r--r-- | net-vpn/openconnect/openconnect-8.08.ebuild (renamed from net-vpn/openconnect/openconnect-8.05.ebuild) | 79 | ||||
-rw-r--r-- | net-vpn/openconnect/openconnect-9999.ebuild | 10 |
4 files changed, 46 insertions, 54 deletions
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index c895e1c8c546..02c9069843b3 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -2,11 +2,10 @@ AUX README.OpenRC.txt 715 BLAKE2B 1f76faac7bf705fc3a4adbb8902e0fbd3354e654f0af59 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 +DIST openconnect-8.08.tar.gz 2038269 BLAKE2B 78e76aee1d22179dc1e8fff03e57ee5df0d7a04cf88c5f844ba5b87c9b8a0f89766489e0dcc6b1023c07ea8b2e4da8ea2723470423b3c0c8d4bc47ed1c1e3fa4 SHA512 3bf42e194b88f06bbc6c385002e7b76952964e230fc86ee1d803be72204073ffe41286a3d8e189456fd7b905fa63577e6adc64137e893eccada80419c114eeb8 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 +EBUILD openconnect-8.06.ebuild 2902 BLAKE2B e35780d945d40094ab41e08aa27f026432561734b16bb705f5472e7c8ed20e26e3adfb4c7326aceb8b57244cb7a7c7a34f908e225bdab20b4d6596c921016bd5 SHA512 06960353039c6ae6827c4f661ea32848395ba12dcea7c3067a33ef9a492cfc639a8724cf2282b45a79c0040ac25098998239f5efd41b4d0edb384b90798b37ab +EBUILD openconnect-8.08.ebuild 2993 BLAKE2B 15b25c5bfc81538da3d0107f8b5636a6485221bc9365b48d815c5843070130e35f406ff0f2cdf7b8dd02ef6f4172e27935a0e654d066f0a99b3aaeb5342e05d0 SHA512 a920129fb6bddd45ea4903720676f3536d398a1609818a29c721b96290a07573a1733a8b13b6dcdf6f5af67e6df93a58b9ff13d4ef633fae44ecca2e4365c9c2 +EBUILD openconnect-9999.ebuild 2993 BLAKE2B 15b25c5bfc81538da3d0107f8b5636a6485221bc9365b48d815c5843070130e35f406ff0f2cdf7b8dd02ef6f4172e27935a0e654d066f0a99b3aaeb5342e05d0 SHA512 a920129fb6bddd45ea4903720676f3536d398a1609818a29c721b96290a07573a1733a8b13b6dcdf6f5af67e6df93a58b9ff13d4ef633fae44ecca2e4365c9c2 MISC metadata.xml 523 BLAKE2B c4a4ebc18284b99d3b983740180460ad1c83933860c4d8df14886a740cad0a1dbf363881ffd430adb24feaf49a2a9d02f6d3a80d5bcd96fc36f2cdb1aea2bff5 SHA512 7701ea4b9ed4d0051d915700fbd20eb28ca03024f8c4beecd8e0192e8cfd82c136cec32f29cd1e76a3059913f1b04af8066ee2700cab393bb270a8cbe18214c8 diff --git a/net-vpn/openconnect/openconnect-8.06.ebuild b/net-vpn/openconnect/openconnect-8.06.ebuild index 4442fa5bf4d3..dc435746805f 100644 --- a/net-vpn/openconnect/openconnect-8.06.ebuild +++ b/net-vpn/openconnect/openconnect-8.06.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 arm arm64 ppc64 x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI} diff --git a/net-vpn/openconnect/openconnect-8.05.ebuild b/net-vpn/openconnect/openconnect-8.08.ebuild index 7ca60ca5159f..85ac062266be 100644 --- a/net-vpn/openconnect/openconnect-8.05.ebuild +++ b/net-vpn/openconnect/openconnect-8.08.ebuild @@ -6,16 +6,16 @@ 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" inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ppc64 x86" + KEYWORDS="~amd64" 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,7 +24,8 @@ 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" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test" +RESTRICT="!test? ( test )" DEPEND=" dev-libs/libxml2 @@ -52,6 +53,11 @@ 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" @@ -89,10 +95,9 @@ src_configure() { addwrite /run/netns local myconf=( - --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" - --without-openssl-version-check - $(use_enable static-libs static) + --disable-dsa-tests $(use_enable nls) + $(use_enable static-libs static) $(use_with !gnutls openssl) $(use_with gnutls) $(use_with libproxy) @@ -100,61 +105,43 @@ src_configure() { $(use_with gssapi) $(use_with smartcard libpcsclite) $(use_with stoken) + --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" --without-java ) econf "${myconf[@]}" } -DOC_CONTENTS="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/* -" +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 - - 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 } diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild index 4442fa5bf4d3..85ac062266be 100644 --- a/net-vpn/openconnect/openconnect-9999.ebuild +++ b/net-vpn/openconnect/openconnect-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI} @@ -24,7 +24,8 @@ 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" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test" +RESTRICT="!test? ( test )" DEPEND=" dev-libs/libxml2 @@ -52,6 +53,11 @@ 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" |