| 1 |
jlec 15/03/06 15:38:45 |
| 2 |
|
| 3 |
Modified: vpnc-0.5.3_p550.ebuild vpnc-0.5.3_p527-r1.ebuild |
| 4 |
metadata.xml ChangeLog |
| 5 |
Log: |
| 6 |
Adopt to recent aggreemant about how to handle bindist, #541450 |
| 7 |
|
| 8 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 net-misc/vpnc/vpnc-0.5.3_p550.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild?rev=1.2&view=markup |
| 14 |
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 |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: vpnc-0.5.3_p550.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- vpnc-0.5.3_p550.ebuild 27 Feb 2015 08:05:58 -0000 1.1 |
| 24 |
+++ vpnc-0.5.3_p550.ebuild 6 Mar 2015 15:38:45 -0000 1.2 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
@@ -13,34 +13,32 @@ |
| 34 |
LICENSE="GPL-2 BSD" |
| 35 |
SLOT="0" |
| 36 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" |
| 37 |
-IUSE="resolvconf +gnutls bindist selinux" |
| 38 |
- |
| 39 |
-REQUIRED_USE="bindist? ( gnutls )" |
| 40 |
+IUSE="resolvconf +gnutls selinux" |
| 41 |
|
| 42 |
DEPEND=" |
| 43 |
dev-lang/perl |
| 44 |
dev-libs/libgcrypt:0= |
| 45 |
>=sys-apps/iproute2-2.6.19.20061214[-minimal] |
| 46 |
- gnutls? ( net-libs/gnutls:= ) |
| 47 |
- !gnutls? ( dev-libs/openssl )" |
| 48 |
+ gnutls? ( net-libs/gnutls ) |
| 49 |
+ !gnutls? ( dev-libs/openssl:0= )" |
| 50 |
RDEPEND="${DEPEND} |
| 51 |
resolvconf? ( net-dns/openresolv ) |
| 52 |
selinux? ( sec-policy/selinux-vpn ) |
| 53 |
" |
| 54 |
|
| 55 |
-RESTRICT="!bindist? ( bindist )" |
| 56 |
+RESTRICT="!gnutls? ( bindist )" |
| 57 |
|
| 58 |
CONFIG_CHECK="~TUN" |
| 59 |
|
| 60 |
src_prepare() { |
| 61 |
- if ! use gnutls && ! use bindist; then |
| 62 |
+ if use gnutls; then |
| 63 |
+ elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries." |
| 64 |
+ elog "See the Makefile itself and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318" |
| 65 |
+ else |
| 66 |
sed -i -e '/^#OPENSSL_GPL_VIOLATION/s:#::g' "${S}"/Makefile || die |
| 67 |
ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that" |
| 68 |
ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL," |
| 69 |
ewarn "see the vpnc Makefile and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318" |
| 70 |
- else |
| 71 |
- elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries." |
| 72 |
- elog "See the Makefile itself and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318" |
| 73 |
fi |
| 74 |
|
| 75 |
sed -e 's:test/cert0.pem::g' -i Makefile || die |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.15 net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild?rev=1.15&view=markup |
| 82 |
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 |
| 83 |
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 |
| 84 |
|
| 85 |
Index: vpnc-0.5.3_p527-r1.ebuild |
| 86 |
=================================================================== |
| 87 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild,v |
| 88 |
retrieving revision 1.14 |
| 89 |
retrieving revision 1.15 |
| 90 |
diff -u -r1.14 -r1.15 |
| 91 |
--- vpnc-0.5.3_p527-r1.ebuild 27 Feb 2015 08:05:58 -0000 1.14 |
| 92 |
+++ vpnc-0.5.3_p527-r1.ebuild 6 Mar 2015 15:38:45 -0000 1.15 |
| 93 |
@@ -1,6 +1,6 @@ |
| 94 |
# Copyright 1999-2015 Gentoo Foundation |
| 95 |
# Distributed under the terms of the GNU General Public License v2 |
| 96 |
-# $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 $ |
| 97 |
+# $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 $ |
| 98 |
|
| 99 |
EAPI=5 |
| 100 |
|
| 101 |
@@ -13,34 +13,32 @@ |
| 102 |
LICENSE="GPL-2 BSD" |
| 103 |
SLOT="0" |
| 104 |
KEYWORDS="amd64 arm ppc ppc64 sparc x86" |
| 105 |
-IUSE="resolvconf +gnutls bindist selinux" |
| 106 |
- |
| 107 |
-REQUIRED_USE="bindist? ( gnutls )" |
| 108 |
+IUSE="resolvconf +gnutls selinux" |
| 109 |
|
| 110 |
DEPEND=" |
| 111 |
dev-lang/perl |
| 112 |
dev-libs/libgcrypt:0= |
| 113 |
>=sys-apps/iproute2-2.6.19.20061214[-minimal] |
| 114 |
- gnutls? ( net-libs/gnutls:= ) |
| 115 |
- !gnutls? ( dev-libs/openssl )" |
| 116 |
+ gnutls? ( net-libs/gnutls ) |
| 117 |
+ !gnutls? ( dev-libs/openssl:0= )" |
| 118 |
RDEPEND="${DEPEND} |
| 119 |
resolvconf? ( net-dns/openresolv ) |
| 120 |
selinux? ( sec-policy/selinux-vpn ) |
| 121 |
" |
| 122 |
|
| 123 |
-RESTRICT="!bindist? ( bindist )" |
| 124 |
+RESTRICT="!gnutls? ( bindist )" |
| 125 |
|
| 126 |
CONFIG_CHECK="~TUN" |
| 127 |
|
| 128 |
src_prepare() { |
| 129 |
- if ! use gnutls && ! use bindist; then |
| 130 |
+ if use gnutls; then |
| 131 |
+ elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries." |
| 132 |
+ elog "See the Makefile itself and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318" |
| 133 |
+ else |
| 134 |
sed -i -e '/^#OPENSSL_GPL_VIOLATION/s:#::g' "${S}"/Makefile || die |
| 135 |
ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that" |
| 136 |
ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL," |
| 137 |
ewarn "see the vpnc Makefile and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318" |
| 138 |
- else |
| 139 |
- elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries." |
| 140 |
- elog "See the Makefile itself and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318" |
| 141 |
fi |
| 142 |
|
| 143 |
epatch "${FILESDIR}"/${PN}-0.5.3_p514-as-needed.patch |
| 144 |
|
| 145 |
|
| 146 |
|
| 147 |
1.21 net-misc/vpnc/metadata.xml |
| 148 |
|
| 149 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?rev=1.21&view=markup |
| 150 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?rev=1.21&content-type=text/plain |
| 151 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/metadata.xml?r1=1.20&r2=1.21 |
| 152 |
|
| 153 |
Index: metadata.xml |
| 154 |
=================================================================== |
| 155 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/metadata.xml,v |
| 156 |
retrieving revision 1.20 |
| 157 |
retrieving revision 1.21 |
| 158 |
diff -u -r1.20 -r1.21 |
| 159 |
--- metadata.xml 29 Jul 2014 11:01:27 -0000 1.20 |
| 160 |
+++ metadata.xml 6 Mar 2015 15:38:45 -0000 1.21 |
| 161 |
@@ -15,7 +15,6 @@ |
| 162 |
<name>Justin Lecher</name> |
| 163 |
</maintainer> |
| 164 |
<use> |
| 165 |
- <flag name="bindist">Using GnuTLS for SSL support as redistribution with OpenSSL as provider violates GPL</flag> |
| 166 |
<flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag> |
| 167 |
</use> |
| 168 |
</pkgmetadata> |
| 169 |
|
| 170 |
|
| 171 |
|
| 172 |
1.134 net-misc/vpnc/ChangeLog |
| 173 |
|
| 174 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?rev=1.134&view=markup |
| 175 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?rev=1.134&content-type=text/plain |
| 176 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/vpnc/ChangeLog?r1=1.133&r2=1.134 |
| 177 |
|
| 178 |
Index: ChangeLog |
| 179 |
=================================================================== |
| 180 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v |
| 181 |
retrieving revision 1.133 |
| 182 |
retrieving revision 1.134 |
| 183 |
diff -u -r1.133 -r1.134 |
| 184 |
--- ChangeLog 27 Feb 2015 08:05:58 -0000 1.133 |
| 185 |
+++ ChangeLog 6 Mar 2015 15:38:45 -0000 1.134 |
| 186 |
@@ -1,6 +1,10 @@ |
| 187 |
# ChangeLog for net-misc/vpnc |
| 188 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 189 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.133 2015/02/27 08:05:58 jlec Exp $ |
| 190 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.134 2015/03/06 15:38:45 jlec Exp $ |
| 191 |
+ |
| 192 |
+ 06 Mar 2015; Justin Lecher <jlec@g.o> metadata.xml, |
| 193 |
+ vpnc-0.5.3_p527-r1.ebuild, vpnc-0.5.3_p550.ebuild: |
| 194 |
+ Adopt to recent aggreemant about how to handle bindist, #541450 |
| 195 |
|
| 196 |
*vpnc-0.5.3_p550 (27 Feb 2015) |
Archives