rpms/NetworkManager-openvpn/EL-6 import-export.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.21, 1.22 NetworkManager-openvpn.spec, 1.42, 1.43 sources, 1.26, 1.27

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28140/EL-6

Modified Files:
	.cvsignore NetworkManager-openvpn.spec sources 
Added Files:
	import-export.patch import.log 
Log Message:
Pull from devel


import-export.patch:
 nm-openvpn.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE import-export.patch ---
diff -up NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c.foo NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c
--- NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c.foo	2010-06-09 22:15:22.095413377 -0700
+++ NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c	2010-06-09 22:15:31.771412470 -0700
@@ -767,8 +767,8 @@ openvpn_plugin_ui_interface_init (NMVpnP
 	/* interface implementation */
 	iface_class->ui_factory = ui_factory;
 	iface_class->get_capabilities = get_capabilities;
-	iface_class->import_from_file = import;
-	iface_class->export_to_file = export;
+	iface_class->import = import;
+	iface_class->export = export;
 	iface_class->get_suggested_name = get_suggested_name;
 	iface_class->delete_connection = delete_connection;
 }


--- NEW FILE import.log ---
NetworkManager-openvpn-0_8_1-0_1_git20100609_fc14:EL-6:NetworkManager-openvpn-0.8.1-0.1.git20100609.fc14.src.rpm:1278623505


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/EL-6/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	23 Sep 2009 09:33:47 -0000	1.21
+++ .cvsignore	8 Jul 2010 21:12:32 -0000	1.22
@@ -1,18 +1 @@
-NetworkManager-openvpn-0.7.0.svn3302.tar.gz
-NetworkManager-openvpn-0.7.0.svn3549.tar.gz
-NetworkManager-openvpn-0.7.0.svn3801.tar.gz
-NetworkManager-openvpn-0.7.0.svn3832.tar.gz
-NetworkManager-openvpn-0.7.0.svn3846.tar.gz
-NetworkManager-openvpn-0.7.0.svn3930.tar.gz
-NetworkManager-openvpn-0.7.0.svn4175.tar.gz
-NetworkManager-openvpn-0.7.0.svn4229.tar.gz
-NetworkManager-openvpn-0.7.0.svn4326.tar.gz
-NetworkManager-openvpn-0.7.0.svn11.tar.gz
-NetworkManager-openvpn-0.7.0.97.tar.gz
-NetworkManager-openvpn-0.7.0.99.tar.gz
-NetworkManager-openvpn-0.7.1.tar.bz2
-NetworkManager-openvpn-0.7.1.git20090713.tar.bz2
-NetworkManager-openvpn-0.7.1.git20090714.tar.bz2
-NetworkManager-openvpn-0.7.996.git20090828.tar.bz2
-NetworkManager-openvpn-0.7.996.git20090921.tar.bz2
-NetworkManager-openvpn-0.7.996.git20090923.tar.bz2
+NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/EL-6/NetworkManager-openvpn.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- NetworkManager-openvpn.spec	12 Apr 2010 06:12:26 -0000	1.42
+++ NetworkManager-openvpn.spec	8 Jul 2010 21:12:32 -0000	1.43
@@ -4,13 +4,14 @@
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define snapshot .git20100411
+%define snapshot .git20100609
+%define realversion 0.8.0.997
 
 Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
-Version: 0.8
-Release: 2%{snapshot}%{?dist}
+Version: 0.8.1
+Release: 0.1%{snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -19,7 +20,8 @@ Group: System Environment/Base
 # - ./autogen.sh --prefix=/usr --sysconfdir=/etc
 # - make distcheck
 # - use generated NetworkManager-openvpn-0.8.tar.bz2
-Source: %{name}-%{version}%{snapshot}.tar.bz2
+Source: %{name}-%{realversion}%{snapshot}.tar.bz2
+Patch0: import-export.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
@@ -50,8 +52,8 @@ This package contains software for integ
 with NetworkManager and the GNOME desktop.
 
 %prep
-%setup -q -n %{name}-%{version}
-
+%setup -q -n %{name}-%{realversion}
+%patch0 -p1 -b .importexport
 
 %build
 if [ ! -f configure ]; then
@@ -103,6 +105,10 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Wed Jun  9 2010 Dan Williams <dcbw at redhat.com> - 1:0.8.1-0.1.git20100609
+- Add support for PKCS#8 private keys
+- Add support for unencrypted private keys (rh #497454)
+
 * Sun Apr 11 2010 Dan Williams <dcbw at redhat.com> - 1:0.8-2
 - Add support for more HMAC authentication algorithms
 - Fix requests for private key passwords for certificates (rh #549961)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/EL-6/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	12 Apr 2010 05:48:37 -0000	1.26
+++ sources	8 Jul 2010 21:12:32 -0000	1.27
@@ -1 +1 @@
-8bec68b1d862154282e360808778717d  NetworkManager-openvpn-0.8.git20100411.tar.bz2
+b8a571e5594765b7a412d560afc16396  NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2