jlec 15/03/06 15:38:45
Modified: vpnc-0.5.3_p550.ebuild vpnc-0.5.3_p527-r1.ebuild
metadata.xml ChangeLog
Log:
Adopt to recent aggreemant about how to handle bindist, #541450
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.2 net-misc/vpnc/vpnc-0.5.3_p550.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild?r1=1.1&r2=1.2
Index: vpnc-0.5.3_p550.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vpnc-0.5.3_p550.ebuild 27 Feb 2015 08:05:58 -0000 1.1
+++ vpnc-0.5.3_p550.ebuild 6 Mar 2015 15:38:45 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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_p550.ebuild,v 1.1
2015/02/27 08:05:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild,v 1.2
2015/03/06 15:38:45 jlec Exp $
EAPI=5
@@ -13,34 +13,32 @@
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="resolvconf +gnutls bindist selinux"
-
-REQUIRED_USE="bindist? ( gnutls )"
+IUSE="resolvconf +gnutls selinux"
DEPEND="
dev-lang/perl
dev-libs/libgcrypt:0=
>=sys-apps/iproute2-2.6.19.20061214[-minimal]
- gnutls? ( net-libs/gnutls:= )
- !gnutls? ( dev-libs/openssl )"
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( dev-libs/openssl:0= )"
RDEPEND="${DEPEND}
resolvconf? ( net-dns/openresolv )
selinux? ( sec-policy/selinux-vpn )
"
-RESTRICT="!bindist? ( bindist )"
+RESTRICT="!gnutls? ( bindist )"
CONFIG_CHECK="~TUN"
src_prepare() {
- if ! use gnutls && ! use bindist; then
+ if use gnutls; then
+ elog "Will build with GnuTLS (default) instead of OpenSSL so
you may even redistribute binaries."
+ elog "See the Makefile itself and
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318";
+ else
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,"
ewarn "see the vpnc Makefile and
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318";
- else
- elog "Will build with GnuTLS (default) instead of OpenSSL so
you may even redistribute binaries."
- elog "See the Makefile itself and
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318";
fi
sed -e 's:test/cert0.pem::g' -i Makefile || die
1.15 net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild?rev=1.15&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild?rev=1.15&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild?r1=1.14&r2=1.15
Index: vpnc-0.5.3_p527-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vpnc-0.5.3_p527-r1.ebuild 27 Feb 2015 08:05:58 -0000 1.14
+++ vpnc-0.5.3_p527-r1.ebuild 6 Mar 2015 15:38:45 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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_p527-r1.ebuild,v
1.14 2015/02/27 08:05:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild,v
1.15 2015/03/06 15:38:45 jlec Exp $
EAPI=5
@@ -13,34 +13,32 @@
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="amd64 arm ppc ppc64 sparc x86"
-IUSE="resolvconf +gnutls bindist selinux"
-
-REQUIRED_USE="bindist? ( gnutls )"
+IUSE="resolvconf +gnutls selinux"
DEPEND="
dev-lang/perl
dev-libs/libgcrypt:0=
>=sys-apps/iproute2-2.6.19.20061214[-minimal]
- gnutls? ( net-libs/gnutls:= )
- !gnutls? ( dev-libs/openssl )"
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( dev-libs/openssl:0= )"
RDEPEND="${DEPEND}
resolvconf? ( net-dns/openresolv )
selinux? ( sec-policy/selinux-vpn )
"
-RESTRICT="!bindist? ( bindist )"
+RESTRICT="!gnutls? ( bindist )"
CONFIG_CHECK="~TUN"
src_prepare() {
- if ! use gnutls && ! use bindist; then
+ if use gnutls; then
+ elog "Will build with GnuTLS (default) instead of OpenSSL so
you may even redistribute binaries."
+ elog "See the Makefile itself and
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318";
+ else
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,"
ewarn "see the vpnc Makefile and
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318";
- else
- elog "Will build with GnuTLS (default) instead of OpenSSL so
you may even redistribute binaries."
- elog "See the Makefile itself and
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318";
fi
epatch "${FILESDIR}"/${PN}-0.5.3_p514-as-needed.patch
1.21 net-misc/vpnc/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?rev=1.21&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?rev=1.21&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?r1=1.20&r2=1.21
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/metadata.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- metadata.xml 29 Jul 2014 11:01:27 -0000 1.20
+++ metadata.xml 6 Mar 2015 15:38:45 -0000 1.21
@@ -15,7 +15,6 @@
<name>Justin Lecher</name>
</maintainer>
<use>
- <flag name="bindist">Using GnuTLS for SSL support as redistribution with
OpenSSL as provider violates GPL</flag>
<flag name="resolvconf">Enable support for DNS managing framework
<pkg>net-dns/openresolv</pkg></flag>
</use>
</pkgmetadata>
1.134 net-misc/vpnc/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?rev=1.134&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?rev=1.134&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?r1=1.133&r2=1.134
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- ChangeLog 27 Feb 2015 08:05:58 -0000 1.133
+++ ChangeLog 6 Mar 2015 15:38:45 -0000 1.134
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/vpnc
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.133 2015/02/27
08:05:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.134 2015/03/06
15:38:45 jlec Exp $
+
+ 06 Mar 2015; Justin Lecher <[email protected]> metadata.xml,
+ vpnc-0.5.3_p527-r1.ebuild, vpnc-0.5.3_p550.ebuild:
+ Adopt to recent aggreemant about how to handle bindist, #541450
*vpnc-0.5.3_p550 (27 Feb 2015)
