From 967c1fb9a56d4cd216f4516d7acf8a136a827565 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 11 Sep 2016 20:50:29 -0400 Subject: net-misc/openconnect: use vpnc-scripts-20160829 Bug: https://bugs.gentoo.org/591774 Package-Manager: portage-2.3.0_p24 --- net-misc/openconnect/Manifest | 1 + net-misc/openconnect/openconnect-7.07-r1.ebuild | 159 ++++++++++++++++++++++++ net-misc/openconnect/openconnect-7.07.ebuild | 159 ------------------------ net-misc/openconnect/openconnect-9999.ebuild | 2 +- 4 files changed, 161 insertions(+), 160 deletions(-) create mode 100644 net-misc/openconnect/openconnect-7.07-r1.ebuild delete mode 100644 net-misc/openconnect/openconnect-7.07.ebuild diff --git a/net-misc/openconnect/Manifest b/net-misc/openconnect/Manifest index 3d6d856a88f..74b9bd6defe 100644 --- a/net-misc/openconnect/Manifest +++ b/net-misc/openconnect/Manifest @@ -2,3 +2,4 @@ DIST openconnect-7.06.tar.gz 1343870 SHA256 facf695368dc4537a6a30e2147be90b1d77e DIST openconnect-7.06_p20160614.tar.gz 2332148 SHA256 dcba2a087d66e0cf27c087c74ee64ae6b747b2191dfbf5fa2729ec2b156aee4a SHA512 7832251180e9c738c84ee89d0ad35144318f90cc9ede48e0cdb73747e64b2a3fbf4ad8175d0d755cb5629fbfc37c76a131a1b54a03c4249727102b572cbdfd66 WHIRLPOOL 2f25ef9a09c1efb88f5439a8f55b05d68adf868d108c7378e7a4d2889e092838b245ac2660ffc6234846a34a320971fce99ce1f0519be1426a8b2c3be371fbf4 DIST openconnect-7.07.tar.gz 1557283 SHA256 f3ecfcd487dcd916748db38b4138c1e72c86347d6328b11dfe1d0af2821b8366 SHA512 fcce82419a058f5210f8b6167a10e52eb572c93cda3ec941bf11e5bfcf8395ce2f816cba4f5f9a02920eb023fe7dfbd8192d5664ce5bab29bf88506b67ec34e3 WHIRLPOOL 188d5117c1b669e1ab6c11d4d66431e3c59e50b21b39db5e6e9df3d3e3f1905c75be46e101e10483f4de2547a40e894b474eef35e001744bfdeb4a7f4c128dd1 DIST vpnc-scripts-20140806.tar.gz 20070 SHA256 1f61a6c5ec8a2dab7d5f12c9b438d931e41c6c1c258801ee978d5ed460f4d35f SHA512 bfa230d6eb2db0696a23228cef6e742dcf5e609c25de725c23e2c7bee96d00045ea656d6c7025cdf7785f70baeb8a8d79af6aec93d7285bcb3c029dc744e5380 WHIRLPOOL 78d0c5e23f408167904639a7804859a1d6b89668feab6834a589a3d9f7abf4f9d1da984553a8871b6a16af39a03e5a6f3f6506dd77f7f960c7fcdd56f0683e27 +DIST vpnc-scripts-20160829.tar.gz 20297 SHA256 b737cbfbd2a0c9339ad108f8f2f02269981f0236ff350ce675b0391a08f861bc SHA512 0edd0e5184ac4a705f213a87fa8afa2e2cd54c9bd1aa01955a3a5107c42da8eae7b639896daceecc556a63b0663ee47e25fc21e77f0f74774330d546584fd2c1 WHIRLPOOL 0afe6e9ec1fb952bdad319d65f2353e7a8812e3301bc94ad3c472081ec9673506c9a52d8c4bd4f1035cfacca9f30494b9822034a6d468ce4357277ede2330d1e diff --git a/net-misc/openconnect/openconnect-7.07-r1.ebuild b/net-misc/openconnect/openconnect-7.07-r1.ebuild new file mode 100644 index 00000000000..b490e176530 --- /dev/null +++ b/net-misc/openconnect/openconnect-7.07-r1.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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=20160829 +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 libressl libproxy 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[static-libs?] ) + ) + gnutls? ( + >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle + app-misc/ca-certificates + ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + nls? ( virtual/libintl ) + smartcard? ( sys-apps/pcsc-lite:0= ) + stoken? ( app-crypt/stoken )" +RDEPEND="${DEPEND} + sys-apps/iproute2 + ! po/LINGUAS || die + fi + + if use doc; then + python_setup + else + # If the python cannot be found, the docs will not build + sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die + fi + + # liboath not in portage + econf \ + --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \ + $(use_enable static-libs static) \ + $(use_enable nls ) \ + $(use_with !gnutls openssl) \ + $(use_with gnutls ) \ + $(use_with libproxy) \ + $(use_with gssapi) \ + $(use_with smartcard libpcsclite) \ + $(use_with stoken) \ + $(use_with java) +} + +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() { + emake DESTDIR="${D}" install + + dodoc AUTHORS TODO + 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 + + # Remove useless .la files + prune_libtool_files --all + + 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-misc/openconnect/openconnect-7.07.ebuild b/net-misc/openconnect/openconnect-7.07.ebuild deleted file mode 100644 index 20c579a47cb..00000000000 --- a/net-misc/openconnect/openconnect-7.07.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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=20140806 -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 libressl libproxy 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[static-libs?] ) - ) - gnutls? ( - >=net-libs/gnutls-3:0=[static-libs?] dev-libs/nettle - app-misc/ca-certificates - ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - nls? ( virtual/libintl ) - smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken )" -RDEPEND="${DEPEND} - sys-apps/iproute2 - ! po/LINGUAS || die - fi - - if use doc; then - python_setup - else - # If the python cannot be found, the docs will not build - sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die - fi - - # liboath not in portage - econf \ - --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \ - $(use_enable static-libs static) \ - $(use_enable nls ) \ - $(use_with !gnutls openssl) \ - $(use_with gnutls ) \ - $(use_with libproxy) \ - $(use_with gssapi) \ - $(use_with smartcard libpcsclite) \ - $(use_with stoken) \ - $(use_with java) -} - -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() { - emake DESTDIR="${D}" install - - dodoc AUTHORS TODO - 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 - - # Remove useless .la files - prune_libtool_files --all - - 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-misc/openconnect/openconnect-9999.ebuild b/net-misc/openconnect/openconnect-9999.ebuild index 20c579a47cb..b490e176530 100644 --- a/net-misc/openconnect/openconnect-9999.ebuild +++ b/net-misc/openconnect/openconnect-9999.ebuild @@ -16,7 +16,7 @@ else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi -VPNC_VER=20140806 +VPNC_VER=20160829 SRC_URI="${ARCHIVE_URI} ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz" -- cgit v1.2.1