* [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
@ 2012-04-01 5:41 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2012-04-01 5:41 UTC (permalink / raw
To: gentoo-commits
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=4
(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=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild?r1=1.1&r2=1.2
Index: vpnc-0.5.3_p514.ebuild
===================================================================
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 $
EAPI=4
@@ -18,7 +18,7 @@
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="resolvconf openssl bindist"
+IUSE="resolvconf +gnutls bindist"
DEPEND="
dev-lang/perl
@@ -26,14 +26,14 @@
>=sys-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="${DEPEND}
resolvconf? ( net-dns/openresolv )"
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 means that"
ewarn "you are not allowed to re-distibute the binaries due to conflicts 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=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild?r1=1.1&r2=1.2
Index: vpnc-0.5.3_p457-r1.ebuild
===================================================================
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.ebuild,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.ebuild,v 1.2 2012/04/01 05:41:52 jlec Exp $
-EAPI=3
+EAPI=4
DESCRIPTION="Free client for Cisco VPN routing software"
HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -15,20 +15,20 @@
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="resolvconf openssl bindist"
+IUSE="resolvconf +gnutls bindist"
DEPEND=">=dev-libs/libgcrypt-1.1.91
>=sys-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="${DEPEND}
resolvconf? ( net-dns/openresolv )"
src_prepare() {
- if use openssl && ! use bindist; then
+ if ! use gnutls && ! use bindist; then
sed -i -e 's/#OPENSSL_GPL_VIOLATION=yes/OPENSSL_GPL_VIOLATION=yes/' "${S}"/Makefile \
|| die
ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
@@ -41,14 +41,14 @@
}
src_install() {
- emake PREFIX="/usr" DESTDIR="${D}" install || die
- dodoc README TODO VERSION || die
+ emake PREFIX="/usr" DESTDIR="${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
}
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=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild?r1=1.2&r2=1.3
Index: vpnc-0.5.3_p451.ebuild
===================================================================
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 $
-EAPI=3
+EAPI=4
DESCRIPTION="Free client for Cisco VPN routing software"
HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -15,20 +15,20 @@
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="resolvconf openssl bindist"
+IUSE="resolvconf +gnutls bindist"
DEPEND=">=dev-libs/libgcrypt-1.1.91
>=sys-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="${DEPEND}
resolvconf? ( net-dns/openresolv )"
src_prepare() {
- if use openssl && ! use bindist; then
+ if ! use gnutls && ! use bindist; then
sed -i -e 's/#OPENSSL_GPL_VIOLATION=yes/OPENSSL_GPL_VIOLATION=yes/' "${S}"/Makefile \
|| die
ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
@@ -41,14 +41,14 @@
}
src_install() {
- emake PREFIX="/usr" DESTDIR="${D}" install || die
- dodoc README TODO VERSION || die
+ emake PREFIX="/usr" DESTDIR="${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
}
pkg_postinst() {
1.100 net-misc/vpnc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?r1=1.99&r2=1.100
Index: ChangeLog
===================================================================
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/02/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 <jlec@gentoo.org> 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=4
*vpnc-0.5.3_p514 (14 Feb 2012)
1.13 net-misc/vpnc/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?r1=1.12&r2=1.13
Index: metadata.xml
===================================================================
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 @@
<name>Christian Faulhammer</name>
</maintainer>
<use>
- <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hybrid-auth instead of <pkg>net-libs/gnutls, may cause license issues when redistributing</pkg>.</flag>
<flag name="hybrid-auth">Enable hybrid authentication (certificates), only if not redistributed as compiled binary</flag>
<flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
</use>
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=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild?r1=1.2&r2=1.3
Index: vpnc-0.5.3_p457-r2.ebuild
===================================================================
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.ebuild,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.ebuild,v 1.3 2012/04/01 05:41:52 jlec Exp $
-EAPI=3
+EAPI=4
DESCRIPTION="Free client for Cisco VPN routing software"
HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -16,21 +16,20 @@
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="resolvconf openssl bindist"
+IUSE="resolvconf +gnutls bindist"
DEPEND=">=dev-libs/libgcrypt-1.1.91
>=sys-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="${DEPEND}
resolvconf? ( net-dns/openresolv )"
src_prepare() {
- if use openssl && ! use bindist; then
+ if ! use gnutls && ! use bindist; then
sed -i -e 's/#OPENSSL_GPL_VIOLATION=yes/OPENSSL_GPL_VIOLATION=yes/' "${S}"/Makefile \
|| die
ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
@@ -43,14 +42,14 @@
}
src_install() {
- emake PREFIX="/usr" DESTDIR="${D}" install || die
- dodoc README TODO VERSION || die
+ emake PREFIX="/usr" DESTDIR="${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
}
pkg_postinst() {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-04-01 5:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-01 5:41 [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 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox