fixes bug #317085 and bug #326907#c5

(Portage version: 2.1.9.25/cvs/Linux i686)

3 files changed, 82 insertions, 2 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/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"
+}