hasufell 14/03/17 17:05:14 Modified: ChangeLog openconnect-5.99.ebuild Added: openconnect-5.99-r1.ebuild Log: fix bug #481978 and bug #503644 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Revision Changes Path 1.29 net-misc/openconnect/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openconnect/ChangeLog?rev=1.29&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openconnect/ChangeLog?rev=1.29&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openconnect/ChangeLog?r1=1.28&r2=1.29 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/openconnect/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- ChangeLog 6 Mar 2014 00:23:40 -0000 1.28 +++ ChangeLog 17 Mar 2014 17:05:14 -0000 1.29 @@ -1,6 +1,12 @@ # ChangeLog for net-misc/openconnect # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/ChangeLog,v 1.28 2014/03/06 00:23:40 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/ChangeLog,v 1.29 2014/03/17 17:05:14 hasufell Exp $ + +*openconnect-5.99-r1 (17 Mar 2014) + + 17 Mar 2014; Julian Ospald <hasuf...@gentoo.org> openconnect-5.99.ebuild, + +openconnect-5.99-r1.ebuild, +files/openconnect.init.in-r2: + fix bug #481978 and bug #503644 06 Mar 2014; Julian Ospald <hasuf...@gentoo.org> openconnect-5.99.ebuild: update linguas 1.3 net-misc/openconnect/openconnect-5.99.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openconnect/openconnect-5.99.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openconnect/openconnect-5.99.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openconnect/openconnect-5.99.ebuild?r1=1.2&r2=1.3 Index: openconnect-5.99.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-5.99.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openconnect-5.99.ebuild 6 Mar 2014 00:23:40 -0000 1.2 +++ openconnect-5.99.ebuild 17 Mar 2014 17:05:14 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-5.99.ebuild,v 1.2 2014/03/06 00:23:40 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-5.99.ebuild,v 1.3 2014/03/17 17:05:14 hasufell Exp $ EAPI="5" @@ -38,11 +38,7 @@ ) ) gnutls? ( - || ( - ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) - ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) - ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt:0[static-libs?] ) - ) + >=net-libs/gnutls-3[static-libs?] dev-libs/nettle app-misc/ca-certificates ) libproxy? ( net-libs/libproxy ) 1.1 net-misc/openconnect/openconnect-5.99-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openconnect/openconnect-5.99-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openconnect/openconnect-5.99-r1.ebuild?rev=1.1&content-type=text/plain Index: openconnect-5.99-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-5.99-r1.ebuild,v 1.1 2014/03/17 17:05:14 hasufell Exp $ EAPI="5" PYTHON_COMPAT=( python2_{6,7} ) PYTHON_REQ_USE="xml" inherit eutils linux-info python-any-r1 DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" HOMEPAGE="http://www.infradead.org/openconnect.html"; # New versions of openconnect-script can be found here: # http://git.infradead.org/users/dwmw2/vpnc-scripts.git/history/HEAD:/vpnc-script SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz http://dev.gentoo.org/~hasufell/distfiles/openconnect-script-20130310115608.tar.xz"; LICENSE="LGPL-2.1 GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="doc +gnutls java libproxy nls static-libs" ILINGUAS="ar cs de el en_GB en_US es fi fr gl id lt nl pa pl pt pt_BR sk sl ug uk zh_CN zh_TW" for lang in $ILINGUAS; do IUSE="${IUSE} linguas_${lang}" done DEPEND="dev-libs/libxml2 sys-libs/zlib !gnutls? ( || ( >=dev-libs/openssl-1.0.1f:0[static-libs?] ( >=dev-libs/openssl-1.0.1:0[static-libs?] <dev-libs/openssl-1.0.1d:0[static-libs?] ) <dev-libs/openssl-1.0.0k:0[static-libs?] ) ) gnutls? ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle app-misc/ca-certificates ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl )" RDEPEND="${DEPEND} sys-apps/iproute2 java? ( virtual/jre )" DEPEND="${DEPEND} virtual/pkgconfig doc? ( ${PYTHON_DEPS} ) java? ( virtual/jdk ) nls? ( sys-devel/gettext )" tun_tap_check() { ebegin "Checking for TUN/TAP support" if { ! linux_chkconfig_present TUN; }; then eerror "Please enable TUN/TAP support in your kernel config, found at:" eerror eerror " Device Drivers --->" eerror " [*] Network device support --->" eerror " <*> Universal TUN/TAP device driver support" eerror eerror "and recompile your kernel ..." die "no CONFIG_TUN support detected!" fi eend $? } pkg_setup() { if use doc; then python-any-r1_pkg_setup fi if use kernel_linux; then get_version if linux_config_exists; then tun_tap_check else ewarn "Was unable to determine your kernel .config" ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your" ewarn "kernel .config, Without it, it will not work correctly." # We don't die here, so it's possible to compile this package without # kernel sources available. Required for cross-compilation. fi fi } src_configure() { strip-linguas $ILINGUAS echo ${LINGUAS} > po/LINGUAS # Override vpn-script test since the build system violates the sandbox and # needs the path set to the real default path after it's installed sed -e "s#-x \"\$with_vpnc_script\"#-n \"${WORKDIR}/openconnect-script\"#" \ -i configure || die if ! use doc; then # If the python cannot be found, the docs will not build sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die fi # stoken and liboath not in portage econf \ --with-vpnc-script=/etc/openconnect/openconnect.sh \ $(use_enable static-libs static) \ $(use_enable nls ) \ $(use_with !gnutls openssl) \ $(use_with gnutls ) \ $(use_with libproxy) \ --without-stoken \ --without-liboath \ $(use_with java) } src_install() { emake DESTDIR="${D}" install dodoc AUTHORS TODO newinitd "${FILESDIR}"/openconnect.init.in-r2 openconnect dodir /etc/openconnect insinto /etc/openconnect newconfd "${FILESDIR}"/openconnect.conf.in openconnect exeinto /etc/openconnect newexe "${WORKDIR}"/openconnect-script openconnect.sh insinto /etc/logrotate.d newins "${FILESDIR}"/openconnect.logrotate openconnect keepdir /var/log/openconnect # Remove useless .la files find "${D}" -name '*.la' -delete || die "la file removal failed" } pkg_postinst() { elog "The init script for openconnect has changed and now supports multiple vpn tunnels." elog elog "You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d" elog "instead of calling it directly:" elog elog "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0" elog elog "You can then start the vpn tunnel like this:" elog elog "/etc/init.d/openconnect.vpn0 start" elog elog "If you would like to run preup, postup, predown, and/or postdown scripts," elog "You need to create a directory in /etc/openconnect with the name of the vpn:" elog elog "mkdir /etc/openconnect/vpn0" elog elog "Then add executable shell files:" elog elog "mkdir /etc/openconnect/vpn0" elog "cd /etc/openconnect/vpn0" elog "echo '#!/bin/sh' > preup.sh" elog "cp preup.sh predown.sh" elog "cp preup.sh postup.sh" elog "cp preup.sh postdown.sh" elog "chmod 755 /etc/openconnect/vpn0/*" }
