fixes bug #317085 and bug #326907#c5

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 99 insertions, 3 deletions

diff --git a/net-misc/networkmanager-openvpn/ChangeLog b/net-misc/networkmanager-openvpn/ChangeLog
index 014a1504e28e..4ca24e1208a0 100644
--- a/net-misc/networkmanager-openvpn/ChangeLog
+++ b/net-misc/networkmanager-openvpn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager-openvpn
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/ChangeLog,v 1.14 2010/11/10 13:11:02 dagger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/ChangeLog,v 1.15 2011/02/19 17:46:00 ottxor Exp $
+
+*networkmanager-openvpn-0.8-r1 (19 Feb 2011)
+
+  19 Feb 2011; Christoph Junghans <ottxor@gentoo.org>
+  +networkmanager-openvpn-0.8-r1.ebuild,
+  +files/networkmanager-openvpn-secrets-for-tls.patch:
+  fixes bug #317085 and bug #326907#c5
 
 *networkmanager-openvpn-0.8.2 (10 Nov 2010)
 
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 41287b3b43b0..785fe670c8c1 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,8 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX networkmanager-openvpn-secrets-for-tls.patch 845 RMD160 bdbbf9895a0448d2e63431f42565833bca2c1fee SHA1 d0e5cb7c15e33ec0ad08b9a2b36f93df555b8430 SHA256 025437b48ca065f8c105d0e4a61df4187f47e3d1f83277826de3c0e9317b5c8d
 DIST NetworkManager-openvpn-0.8.1.tar.bz2 406698 RMD160 f2ef27fd724d039ca0ee6db69aa41c08192da59f SHA1 5369a5d2c5effd29991aab182ea1c792e4623cdc SHA256 7deac7c07da82292722f74135462e36a964ace7faf43e9a6d367dcefea721ecc
 DIST NetworkManager-openvpn-0.8.2.tar.bz2 404472 RMD160 da62be9dbbe5781920d2e0a2e990e783d6ea45e5 SHA1 3618555e141b9b770f8e7eeda7d6ef8315244645 SHA256 21d540b7e7cd88cff3173bb3574a88d4dd76da564fccc58dc436a68476d6d6fe
 DIST NetworkManager-openvpn-0.8.tar.bz2 400780 RMD160 801e63f12d2128438313c8b2f945eeae571b247e SHA1 f7bab5b53e332186b3e898200c07a8107381f982 SHA256 8fd6f25093ade66a98ce1327f24ef953351aabf02870c5dcf12500a6b7f08d43
+EBUILD networkmanager-openvpn-0.8-r1.ebuild 1272 RMD160 91e59a79c0c6e9db150ca68cbbeb03d5a95dc411 SHA1 ef82c308f1c7965a6e9d6760a415cb45d864726d SHA256 c4ec8366523559339cc2c2589c7a13555ac49576607af75f4d8b7704a5da81e6
 EBUILD networkmanager-openvpn-0.8.1.ebuild 1226 RMD160 20d245d9a2096497c800fad17bf39037941c30e6 SHA1 9c621f91ae1e4709cc9cf1f3ebf402a0f3d60d7a SHA256 0e92657db50c287b0bfe7690e49df0916712e26bbd79575c01c7b2f6747b6cf8
 EBUILD networkmanager-openvpn-0.8.2.ebuild 1226 RMD160 c9c739eea7ffee38e506fa70127497d97dfffc56 SHA1 0b040d1e0135df29520c5092d5868a343ca5e6be SHA256 561dbde869cedb283b97364f17ffe4c255651a3bfab8d9463869d61ef7937087
 EBUILD networkmanager-openvpn-0.8.ebuild 1224 RMD160 d3c1b204820efdbd21d8c3e46e301113d82fee0c SHA1 f2ea4236f2b8c05cbd8e96ffc6cc0b074c19e139 SHA256 bbea92555a3b4c298dc3219182d8ea664eabf8decc59cf57eedeae31eb2f3f68
-MISC ChangeLog 2924 RMD160 1721ea7b7fc80fb509d15579e650d5a8c740ebc1 SHA1 607e369ca442a361ae4352f28e32bc44326f1ef2 SHA256 a6564b89d5c412a502c016859b4004aa43fcd1ebbf25dc73f3cdab1ba09cc43e
+MISC ChangeLog 3160 RMD160 1ee93430a2688c65ea57063304ddc88e9afdf460 SHA1 0c02949a38ed93223ed2f72f02685e2a5904d818 SHA256 2320d1331f724ab381994fe97dca7ea7121a51a7bb0aae880690545af10ed5e0
 MISC metadata.xml 345 RMD160 ec997e2e73c5ca50e8897573c0bdfb2fdc94856c SHA1 52ac7bff5bf42f503753a3210693cd12b62c8524 SHA256 c67b239bb6bd0bcc037cfadec88de3c90eb88a9a01404f1d72e7e4e967cfcda8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNYAR5AAoJEOeBhlrCAAWGm2sH/j75OloyLCfobw71obG+Bf23
+oI31H+lOpKdAMpvOsQdMZ1Tr1oYrp8fC/CqE2W5mfrAwqudWMV8Di9XUUpkE4sor
+DCxsRUeFQp8cRfZ6VE3ofVvkh18ko1/u4ga0ycu+C3wyaCoB88xu6N4+sCsas930
+ULQhDPmE/q8t+WlhaiT7+NWY9RcFerX80BnhKwJT+lEVPGAdBXnjq7RqI0dNw2uj
+ZSyqMQDsDrmZH3lcna8cDsR1jjqja53UqUS2VE8TKlrvqllU4Xr6to9GepB1Mni5
+CeWM51PgJV/wQmMsd9ntw1IXV4uvxTgUVJSz6osK1wQtuBaNh6M+J7hl3dCoTLY=
+=BLty
+-----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-secrets-for-tls.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-secrets-for-tls.patch
new file mode 100644
index 000000000000..defcd01d89e8
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-secrets-for-tls.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/show_bug.cgi?id=317085
+https://bugs.launchpad.net/ubuntu/+source/network-manager-vpnc/+bug/360818
+--- network-manager-openvpn-0.8~a~git.20091008t123607.7c184a9/src/nm-openvpn-service.c-orig	2009-12-20 13:34:48.000000000 -0300
++++ network-manager-openvpn-0.8~a~git.20091008t123607.7c184a9/src/nm-openvpn-service.c	2009-12-20 13:36:24.000000000 -0300
+@@ -1000,8 +1000,9 @@
+ 	if (!nm_openvpn_properties_validate (s_vpn, error))
+ 		return FALSE;
+ 
+-	/* Static Key doesn't need secrets; the rest do */
+-	if (strcmp (connection_type, NM_OPENVPN_CONTYPE_STATIC_KEY)) {
++	/* Only PASSWORD_* connection types need secrets */
++	if (   !strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD)
++		|| !strcmp (connection_type, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) {
+ 		if (!nm_openvpn_secrets_validate (s_vpn, error))
+ 			return FALSE;
+ 	}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8-r1.ebuild
new file mode 100644
index 000000000000..758c5f6da424
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8-r1.ebuild,v 1.1 2011/02/19 17:46:00 ottxor Exp $
+
+EAPI="2"
+
+inherit eutils gnome.org
+
+# NetworkManager likes itself with capital letters
+MY_PN=${PN/networkmanager/NetworkManager}
+
+DESCRIPTION="NetworkManager OpenVPN plugin."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome"
+
+RDEPEND="
+	>=net-misc/networkmanager-${PV}
+	>=net-misc/openvpn-2.1_rc9
+	>=dev-libs/dbus-glib-0.74
+	gnome? (
+		>=x11-libs/gtk+-2.6
+		gnome-base/gconf:2
+		gnome-base/gnome-keyring
+		gnome-base/libglade:2.0
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# FAIL: (tls-import-data) unexpected 'ca' secret value
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-secrets-for-tls.patch"
+}
+
+src_configure() {
+	ECONF="--disable-more-warnings
+		$(use_with gnome)"
+
+	econf ${ECONF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+}