gentoo resync : 29.03.2018

3 files changed, 167 insertions, 3 deletions

diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 8237acc06506..bb47726eb5d9 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -10,12 +10,14 @@ DIST openconnect-7.07.tar.gz 1557283 BLAKE2B 15b5470fdb1a497d9b238b4eee5ba9a8cb1
 DIST openconnect-7.08.tar.gz 1686133 BLAKE2B 265c43982b475ef1e49d7bf16e782c82b9ac48fbfbe61b5b8fe250505391edea8e5050e8cc3dc9b3cadb349f3842e13c05e431172e8c7488d9052ad15c93e87e SHA512 22f9b0bd4bd17e2ab91ff42b2464c89abba035fe705c037ba4d1042ace460c8738e20481783a1edc3b7dd6503fe9fcc7fdd188552811fb1525310e25a4c2f400
 DIST vpnc-scripts-20140806.tar.gz 20070 BLAKE2B 8a53bb0794a6eb2c121fd3a9e7068e998d9386a9a8ee4f0670baca0ef11411f351c8beb7791fd9e31cef63734a1b3ce9a1c426ba2792c75b002c718c124f1ebd SHA512 bfa230d6eb2db0696a23228cef6e742dcf5e609c25de725c23e2c7bee96d00045ea656d6c7025cdf7785f70baeb8a8d79af6aec93d7285bcb3c029dc744e5380
 DIST vpnc-scripts-20160829.tar.gz 20297 BLAKE2B 42d107669c938e020f10ebd332ea5a27f93c3ec461c4b03c0885b96df1330d7b071d78ec61be08d53425b779edbb2b98222cc9313f89905c68d8ae7e44efc283 SHA512 0edd0e5184ac4a705f213a87fa8afa2e2cd54c9bd1aa01955a3a5107c42da8eae7b639896daceecc556a63b0663ee47e25fc21e77f0f74774330d546584fd2c1
+DIST vpnc-scripts-20180227.tar.gz 21241 BLAKE2B 2ba4c76121ba9c5d307233d6f8c91db03c8da4882b8f6dfeed335f7fcc30438df8fe0657a1177e7e551566b597e195cf41bb6e27e13b757a0c931e8574de9a5e SHA512 9a508426e9307213078ce57b59d25168647fa5d2e823b1085e93401259b0a52269e948c8292e4055babf3e8b3c087a23475b5caa2a43c11feb2df8b0d8843972
 EBUILD openconnect-7.06-r1.ebuild 3486 BLAKE2B 0939f656dfca55c414884c6f09c3ae221617872d229a2e9f03fd35dd70e0767581eed4b8d30e5571d37ac5d8c8f859c0b67bc2e879ecabfeb31d5607fd88e22e SHA512 80fb50f87efba75d3d25945b0f5956cf8c13984bedf9b2e5e4367f53655cd2ae2431c3efd751f05fae140f20b60c83b258c6f0727dcfe382f3922cd8a27f230d
 EBUILD openconnect-7.06-r4.ebuild 3599 BLAKE2B a2c10819815da62a7380bb7b77f818d4ea6a93273650dbfc5d824a187340b253559dbbd4c507d12e7cad6412910cf8a25914adc9b66511680293015b21378389 SHA512 ef0b4e2d0fe07a197701103b6df7d3b3ba52a683b7d1d5de8a3ab7a87a29dd9e24fec5b990ae0d433048832f7d8629e15903e0a4c479a47588c6596a79a9d14e
 EBUILD openconnect-7.06_p20160614.ebuild 3735 BLAKE2B 7ea20a35fe2c8e2f6a6271b49701f39b4ad0a9dc2b6044761bb05792440f7d2d1d09e91f71a65b44cc3b8aaa1e5f93d21b6bdc7eb520a2736766642507662806 SHA512 0102c424e2acf55e886071fa3fa7b0102634e18177ffed6ab2be065c9749b3d10647ce775e877e6df6a14555817645ed2bb766bbe8b2c856fbaa68ddf875a31e
 EBUILD openconnect-7.07-r1.ebuild 3746 BLAKE2B b19e7ef12f15a1f8b958c8ec459ef12cc16846ba333239628c2dcd395003015b8a7545279cbb32a7674ed437f970a219e1da4a5247d10e5eee93cefd60f8645a SHA512 e1caea75bad3efb24f2461742b0203ceb34d931541133d922586fc5a40cb280868d1676cedcb9cea0c0487fee835340f8146afccc334146380b377a9c427afce
 EBUILD openconnect-7.07-r2.ebuild 3850 BLAKE2B aea4f41c17d356eca03df60934911ffccf4c6af6cf297c631da35878d21291db5b0bd83eb1ed2ee664452c3f1f3704c0bc6ef0e7431508fb6114cd5f07248ad8 SHA512 e2a6699904d0da2251cad7b99f8490f606bc816e3d9ae762eaa8f4e5af6143cf9784d5a1bfa717f5cf323901b6be031c7d5ad76577e07c77ce186dd265e93628
 EBUILD openconnect-7.07-r3.ebuild 3969 BLAKE2B 644f5ea0cb09e757a186ca06a8ee0231dd30bef87cbeaa134b175f85956ef76045e6ed666796f110f67f4dac9f25a479d1a1730de63ea9f72b40ccd2d61ed162 SHA512 09e12f6b2037e2cd7110fd81fdfe8b517d82712ac27e5c9079c73c3b107a8fb9c06c5a368bdabe496b3ed501acbc6d752197d033308a69471acd747e2949e19b
+EBUILD openconnect-7.08-r1.ebuild 3728 BLAKE2B 19f238774a67f117e8f8ce98a904b46d782aba095f20c8b6cd6c8ba95727ef34191a0b32ea83ef86e37f5a827708079cfc4de01d6ef5f5b1c277b78c2603f71f SHA512 faddf72a3109b5393b90ef3bc9e72e7943ef5149c54d3a3029ffe92dd70b07270e982c4a21087544832b2f368d550935f7d511193f1b6d12fb55a540ada500f3
 EBUILD openconnect-7.08.ebuild 3724 BLAKE2B aa4953ed9d9b31045bcd16415a637114509ba401bb64b1f224de69260f6bf6ab90378ae377a005dd02221afbc14615abb13971949ff30d42c8f5a7c8f57a782b SHA512 64bac40b9d4caf55cb2a37a26ff292e8120c95d254beff1df9e85371eb2d97e90d1e7a00de30110431fa86f2f22130db43e1b5f02c367f083023a5e49b53665f
-EBUILD openconnect-9999.ebuild 3728 BLAKE2B e46d2ae183caacf7abed5528e3c9822abf20402ecf16c7f4c3a3543ba38230bae02fce455036478d37be553f231fb461a3456312cb881b69f1ae2ed0dbdc729b SHA512 0a80340fd8dd2e01c132baccc9288a0f1ba85ceb522ab060b0a611deea9199b4a000d32563ab3d5efd0e8546e0e6f9b17c1455f2835d28c04f3d55919636eacc
+EBUILD openconnect-9999.ebuild 3728 BLAKE2B 19f238774a67f117e8f8ce98a904b46d782aba095f20c8b6cd6c8ba95727ef34191a0b32ea83ef86e37f5a827708079cfc4de01d6ef5f5b1c277b78c2603f71f SHA512 faddf72a3109b5393b90ef3bc9e72e7943ef5149c54d3a3029ffe92dd70b07270e982c4a21087544832b2f368d550935f7d511193f1b6d12fb55a540ada500f3
 MISC metadata.xml 642 BLAKE2B 57e9e1e2bdbbac2deaa1419dd84f793b9e6adfedddb04a57813633d1a552e13d392648782ed642bf6602b1e48b47432aa3bd05588f9e410ed67d775d34adca80 SHA512 3a6b08e9258161af07ff47a0c52fe294185a2dd41bb7786500bfc35d56a1c1e366d013979a3bba6a80d8350e5765cb06876e9f4270c1e504445224a308de185f
diff --git a/net-vpn/openconnect/openconnect-7.08-r1.ebuild b/net-vpn/openconnect/openconnect-7.08-r1.ebuild
new file mode 100644
index 000000000000..2eae9776f6ac
--- /dev/null
+++ b/net-vpn/openconnect/openconnect-7.08-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo-r1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="git://git.infradead.org/users/dwmw2/${PN}.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=20180227
+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 java libproxy libressl 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?] )
+	)
+	gnutls? (
+		app-misc/ca-certificates
+		dev-libs/nettle
+		>=net-libs/gnutls-3: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
+	!<sys-apps/openrc-0.13"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	doc? ( ${PYTHON_DEPS} sys-apps/groff )
+	java? ( >=virtual/jdk-1.6 )
+	nls? ( sys-devel/gettext )"
+
+CONFIG_CHECK="~TUN"
+
+pkg_pretend() {
+	check_extra_config
+}
+
+pkg_setup() {
+	java-pkg-opt-2_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 [[ ${LINGUAS+set} == set ]]; then
+		strip-linguas -u po
+		echo "${LINGUAS}" > po/LINGUAS || die
+	fi
+
+	if use doc; then
+		python_setup
+	else
+		export PYTHON=/bin/false
+	fi
+
+	local myconf=(
+		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
+		--without-openssl-version-check
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		$(use_with !gnutls openssl)
+		$(use_with gnutls)
+		$(use_with libproxy)
+		$(use_with lz4)
+		$(use_with gssapi)
+		$(use_with smartcard libpcsclite)
+		$(use_with stoken)
+		$(use_with 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_install() {
+	default
+
+	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
+
+	prune_libtool_files
+
+	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" net-dns/openresolv
+	fi
+}
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index bb489f015356..2eae9776f6ac 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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=20160829
+VPNC_VER=20180227
 SRC_URI="${ARCHIVE_URI}
 	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"