From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SEDYA-0004Yf-Fm for garchives@archives.gentoo.org; Sun, 01 Apr 2012 05:42:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08E96E1305; Sun, 1 Apr 2012 05:41:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B37B6E1305 for ; Sun, 1 Apr 2012 05:41:54 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E01741B4006 for ; Sun, 1 Apr 2012 05:41:53 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2264) id B7D752004B; Sun, 1 Apr 2012 05:41:52 +0000 (UTC) From: "Justin Lecher (jlec)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, jlec@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-misc/vpnc: vpnc-0.5.3_p514.ebuild vpnc-0.5.3_p457-r1.ebuild vpnc-0.5.3_p451.ebuild ChangeLog metadata.xml vpnc-0.5.3_p457-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: vpnc-0.5.3_p514.ebuild vpnc-0.5.3_p457-r1.ebuild vpnc-0.5.3_p451.ebuild ChangeLog metadata.xml vpnc-0.5.3_p457-r2.ebuild X-VCS-Directories: net-misc/vpnc X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher Content-Type: text/plain; charset=utf8 Message-Id: <20120401054152.B7D752004B@flycatcher.gentoo.org> Date: Sun, 1 Apr 2012 05:41:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9b2c341c-023c-435f-8966-edb26ec476db X-Archives-Hash: a5b6d005eaa40de9a1f8f9424ee02dc4 jlec 12/04/01 05:41:52 Modified: vpnc-0.5.3_p514.ebuild vpnc-0.5.3_p457-r1.ebuild vpnc-0.5.3_p451.ebuild ChangeLog metadata.xml vpnc-0.5.3_p457-r2.ebuild Log: Don't use openssl but gnutls to switch the SSL implementation; default = on gnutls; Move to EAPI=3D4 =20 (Portage version: 2.2.0_alpha96/cvs/Linux x86_64) Revision Changes Path 1.2 net-misc/vpnc/vpnc-0.5.3_p514.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p514.ebuild?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p514.ebuild?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p514.ebuild?r1=3D1.1&r2=3D1.2 Index: vpnc-0.5.3_p514.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vpnc-0.5.3_p514.ebuild 14 Feb 2012 19:14:11 -0000 1.1 +++ vpnc-0.5.3_p514.ebuild 1 Apr 2012 05:41:52 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild,= v 1.1 2012/02/14 19:14:11 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild,= v 1.2 2012/04/01 05:41:52 jlec Exp $ =20 EAPI=3D4 =20 @@ -18,7 +18,7 @@ LICENSE=3D"GPL-2 BSD" SLOT=3D"0" KEYWORDS=3D"~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE=3D"resolvconf openssl bindist" +IUSE=3D"resolvconf +gnutls bindist" =20 DEPEND=3D" dev-lang/perl @@ -26,14 +26,14 @@ >=3Dsys-apps/iproute2-2.6.19.20061214[-minimal] bindist? ( net-libs/gnutls ) !bindist? ( - openssl? ( dev-libs/openssl ) - !openssl? ( net-libs/gnutls ) + gnutls? ( net-libs/gnutls ) + !gnutls? ( dev-libs/openssl ) )" RDEPEND=3D"${DEPEND} resolvconf? ( net-dns/openresolv )" =20 src_prepare() { - if use openssl && ! use bindist; then + if ! use gnutls && ! use bindist; then sed -i -e '/^#OPENSSL_GPL_VIOLATION/s:#::g' "${S}"/Makefile || die ewarn "Building SSL support with OpenSSL instead of GnuTLS. This mean= s that" ewarn "you are not allowed to re-distibute the binaries due to conflic= ts between BSD license and GPL," 1.2 net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p457-r1.ebuild?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p457-r1.ebuild?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p457-r1.ebuild?r1=3D1.1&r2=3D1.2 Index: vpnc-0.5.3_p457-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild= ,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vpnc-0.5.3_p457-r1.ebuild 12 Feb 2011 23:57:06 -0000 1.1 +++ vpnc-0.5.3_p457-r1.ebuild 1 Apr 2012 05:41:52 -0000 1.2 @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebui= ld,v 1.1 2011/02/12 23:57:06 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebui= ld,v 1.2 2012/04/01 05:41:52 jlec Exp $ =20 -EAPI=3D3 +EAPI=3D4 =20 DESCRIPTION=3D"Free client for Cisco VPN routing software" HOMEPAGE=3D"http://www.unix-ag.uni-kl.de/~massar/vpnc/" @@ -15,20 +15,20 @@ LICENSE=3D"GPL-2 BSD" SLOT=3D"0" KEYWORDS=3D"~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE=3D"resolvconf openssl bindist" +IUSE=3D"resolvconf +gnutls bindist" =20 DEPEND=3D">=3Ddev-libs/libgcrypt-1.1.91 >=3Dsys-apps/iproute2-2.6.19.20061214 bindist? ( net-libs/gnutls ) - openssl? ( - !bindist? ( dev-libs/openssl ) + !bindist? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( dev-libs/openssl ) )" - RDEPEND=3D"${DEPEND} resolvconf? ( net-dns/openresolv )" =20 src_prepare() { - if use openssl && ! use bindist; then + if ! use gnutls && ! use bindist; then sed -i -e 's/#OPENSSL_GPL_VIOLATION=3Dyes/OPENSSL_GPL_VIOLATION=3Dyes/= ' "${S}"/Makefile \ || die ewarn "Building SSL support with OpenSSL instead of GnuTLS. This mean= s that" @@ -41,14 +41,14 @@ } =20 src_install() { - emake PREFIX=3D"/usr" DESTDIR=3D"${D}" install || die - dodoc README TODO VERSION || die + emake PREFIX=3D"/usr" DESTDIR=3D"${D}" install + dodoc README TODO VERSION keepdir /etc/vpnc/scripts.d - newinitd "${FILESDIR}/vpnc-3.init" vpnc || die - newconfd "${FILESDIR}/vpnc.confd" vpnc || die + newinitd "${FILESDIR}/vpnc-3.init" vpnc + newconfd "${FILESDIR}/vpnc.confd" vpnc sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die # COPYING file resides here, should not be installed - rm -rf "${D}"/usr/share/doc/vpnc/ + rm -rf "${D}"/usr/share/doc/vpnc/ || die } =20 pkg_postinst() { 1.3 net-misc/vpnc/vpnc-0.5.3_p451.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p451.ebuild?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p451.ebuild?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p451.ebuild?r1=3D1.2&r2=3D1.3 Index: vpnc-0.5.3_p451.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vpnc-0.5.3_p451.ebuild 4 Jan 2011 08:52:52 -0000 1.2 +++ vpnc-0.5.3_p451.ebuild 1 Apr 2012 05:41:52 -0000 1.3 @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild,= v 1.2 2011/01/04 08:52:52 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild,= v 1.3 2012/04/01 05:41:52 jlec Exp $ =20 -EAPI=3D3 +EAPI=3D4 =20 DESCRIPTION=3D"Free client for Cisco VPN routing software" HOMEPAGE=3D"http://www.unix-ag.uni-kl.de/~massar/vpnc/" @@ -15,20 +15,20 @@ LICENSE=3D"GPL-2 BSD" SLOT=3D"0" KEYWORDS=3D"~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE=3D"resolvconf openssl bindist" +IUSE=3D"resolvconf +gnutls bindist" =20 DEPEND=3D">=3Ddev-libs/libgcrypt-1.1.91 >=3Dsys-apps/iproute2-2.6.19.20061214 bindist? ( net-libs/gnutls ) - openssl? ( - !bindist? ( dev-libs/openssl ) + !bindist? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( dev-libs/openssl ) )" - RDEPEND=3D"${DEPEND} resolvconf? ( net-dns/openresolv )" =20 src_prepare() { - if use openssl && ! use bindist; then + if ! use gnutls && ! use bindist; then sed -i -e 's/#OPENSSL_GPL_VIOLATION=3Dyes/OPENSSL_GPL_VIOLATION=3Dyes/= ' "${S}"/Makefile \ || die ewarn "Building SSL support with OpenSSL instead of GnuTLS. This mean= s that" @@ -41,14 +41,14 @@ } =20 src_install() { - emake PREFIX=3D"/usr" DESTDIR=3D"${D}" install || die - dodoc README TODO VERSION || die + emake PREFIX=3D"/usr" DESTDIR=3D"${D}" install + dodoc README TODO VERSION keepdir /etc/vpnc/scripts.d - newinitd "${FILESDIR}/vpnc-3.init" vpnc || die - newconfd "${FILESDIR}/vpnc.confd" vpnc || die + newinitd "${FILESDIR}/vpnc-3.init" vpnc + newconfd "${FILESDIR}/vpnc.confd" vpnc sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die # COPYING file resides here, should not be installed - rm -rf "${D}"/usr/share/doc/vpnc/ + rm -rf "${D}"/usr/share/doc/vpnc/ || die } =20 pkg_postinst() { 1.100 net-misc/vpnc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/Chan= geLog?rev=3D1.100&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/Chan= geLog?rev=3D1.100&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/Chan= geLog?r1=3D1.99&r2=3D1.100 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- ChangeLog 14 Feb 2012 19:14:11 -0000 1.99 +++ ChangeLog 1 Apr 2012 05:41:52 -0000 1.100 @@ -1,6 +1,12 @@ # ChangeLog for net-misc/vpnc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.99 2012/0= 2/14 19:14:11 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.100 2012/= 04/01 05:41:52 jlec Exp $ + + 01 Apr 2012; Justin Lecher vpnc-0.5.3_p451.ebuild, + vpnc-0.5.3_p457-r1.ebuild, vpnc-0.5.3_p457-r2.ebuild, vpnc-0.5.3_p514.= ebuild, + metadata.xml: + Don't use openssl but gnutls to switch the SSL implementation; default= on + gnutls; Move to EAPI=3D4 =20 *vpnc-0.5.3_p514 (14 Feb 2012) =20 1.13 net-misc/vpnc/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/meta= data.xml?rev=3D1.13&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/meta= data.xml?rev=3D1.13&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/meta= data.xml?r1=3D1.12&r2=3D1.13 Index: metadata.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/metadata.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- metadata.xml 14 Feb 2012 19:14:11 -0000 1.12 +++ metadata.xml 1 Apr 2012 05:41:52 -0000 1.13 @@ -14,7 +14,6 @@ Christian Faulhammer - Use dev-libs/openssl for hybrid-auth= instead of net-libs/gnutls, may cause license issues when redistrib= uting. Enable hybrid authentication (certificates)= , only if not redistributed as compiled binary Enable support for DNS managing framework net-dns/openresolv 1.3 net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p457-r2.ebuild?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p457-r2.ebuild?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc= -0.5.3_p457-r2.ebuild?r1=3D1.2&r2=3D1.3 Index: vpnc-0.5.3_p457-r2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild= ,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vpnc-0.5.3_p457-r2.ebuild 14 Feb 2012 19:14:11 -0000 1.2 +++ vpnc-0.5.3_p457-r2.ebuild 1 Apr 2012 05:41:52 -0000 1.3 @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebui= ld,v 1.2 2012/02/14 19:14:11 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebui= ld,v 1.3 2012/04/01 05:41:52 jlec Exp $ =20 -EAPI=3D3 +EAPI=3D4 =20 DESCRIPTION=3D"Free client for Cisco VPN routing software" HOMEPAGE=3D"http://www.unix-ag.uni-kl.de/~massar/vpnc/" @@ -16,21 +16,20 @@ LICENSE=3D"GPL-2 BSD" SLOT=3D"0" KEYWORDS=3D"~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE=3D"resolvconf openssl bindist" +IUSE=3D"resolvconf +gnutls bindist" =20 DEPEND=3D">=3Ddev-libs/libgcrypt-1.1.91 >=3Dsys-apps/iproute2-2.6.19.20061214[-minimal] bindist? ( net-libs/gnutls ) !bindist? ( - openssl? ( dev-libs/openssl ) - !openssl? ( net-libs/gnutls ) + gnutls? ( net-libs/gnutls ) + !gnutls? ( dev-libs/openssl ) )" - RDEPEND=3D"${DEPEND} resolvconf? ( net-dns/openresolv )" =20 src_prepare() { - if use openssl && ! use bindist; then + if ! use gnutls && ! use bindist; then sed -i -e 's/#OPENSSL_GPL_VIOLATION=3Dyes/OPENSSL_GPL_VIOLATION=3Dyes/= ' "${S}"/Makefile \ || die ewarn "Building SSL support with OpenSSL instead of GnuTLS. This mean= s that" @@ -43,14 +42,14 @@ } =20 src_install() { - emake PREFIX=3D"/usr" DESTDIR=3D"${D}" install || die - dodoc README TODO VERSION || die + emake PREFIX=3D"/usr" DESTDIR=3D"${D}" install + dodoc README TODO VERSION keepdir /etc/vpnc/scripts.d - newinitd "${FILESDIR}/vpnc-3.init" vpnc || die - newconfd "${FILESDIR}/vpnc.confd" vpnc || die + newinitd "${FILESDIR}/vpnc-3.init" vpnc + newconfd "${FILESDIR}/vpnc.confd" vpnc sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die # COPYING file resides here, should not be installed - rm -rf "${D}"/usr/share/doc/vpnc/ + rm -rf "${D}"/usr/share/doc/vpnc/ || die } =20 pkg_postinst() {