rpms/NetworkManager-vpnc/EL-5 NetworkManager-vpnc-0.7.0.99-desc.patch, NONE, 1.1 NetworkManager-vpnc.spec, 1.26, 1.27

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23801

Modified Files:
	NetworkManager-vpnc.spec 
Added Files:
	NetworkManager-vpnc-0.7.0.99-desc.patch 
Log Message:
* Mon May 4 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.4
- Accept Description-less PCF files (#497992)


NetworkManager-vpnc-0.7.0.99-desc.patch:

--- NEW FILE NetworkManager-vpnc-0.7.0.99-desc.patch ---
Tolerate PCF file with no Description.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c NetworkManager-vpnc-0.7.0.99.desc/properties/nm-vpnc.c
--- NetworkManager-vpnc-0.7.0.99/properties/nm-vpnc.c	2009-04-30 20:23:58.000000000 +0200
+++ NetworkManager-vpnc-0.7.0.99.desc/properties/nm-vpnc.c	2009-04-30 20:19:05.000000000 +0200
@@ -986,7 +986,7 @@ import (NMVpnPluginUiInterface *iface, c
 
 	pcf = pcf_file_load (path);
 	if (!pcf) {
-		g_set_error (error, 0, 0, "does not look like a %s VPN connection",
+		g_set_error (error, 0, 0, "does not look like a %s VPN connection (parse failed)",
 		             VPNC_PLUGIN_NAME);
 		return NULL;
 	}
@@ -1002,16 +1002,6 @@ import (NMVpnPluginUiInterface *iface, c
 	s_ip4 = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ());
 	nm_connection_add_setting (connection, NM_SETTING (s_ip4));
 
-	/* Connection name */
-	if (pcf_file_lookup_string (pcf, "main", "Description", &buf))
-		g_object_set (s_con, NM_SETTING_CONNECTION_ID, buf, NULL);
-	else {
-		g_set_error (error, 0, 0, "does not look like a %s VPN connection (parse failed)",
-		             VPNC_PLUGIN_NAME);
-		g_object_unref (connection);
-		return NULL;
-	}
-
 	/* Gateway */
 	if (pcf_file_lookup_string (pcf, "main", "Host", &buf))
 		nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_GATEWAY, buf);
@@ -1034,6 +1024,10 @@ import (NMVpnPluginUiInterface *iface, c
 
 	/* Optional settings */
 
+	/* Connection name */
+	if (pcf_file_lookup_string (pcf, "main", "Description", &buf))
+		g_object_set (s_con, NM_SETTING_CONNECTION_ID, buf, NULL);
+
 	if (pcf_file_lookup_string (pcf, "main", "UserName", &buf))
 		nm_setting_vpn_add_data_item (s_vpn, NM_VPNC_KEY_XAUTH_USER, buf);
 
diff -urp NetworkManager-vpnc-0.7.0.99/properties/pcf-file.c NetworkManager-vpnc-0.7.0.99.desc/properties/pcf-file.c
--- NetworkManager-vpnc-0.7.0.99/properties/pcf-file.c	2009-02-06 01:00:18.000000000 +0100
+++ NetworkManager-vpnc-0.7.0.99.desc/properties/pcf-file.c	2009-04-30 20:23:27.000000000 +0200
@@ -125,6 +125,10 @@ pcf_file_load (const char *fname)
 			g_hash_table_insert (group, entry->key, entry);
         }
     }
+
+    /* Contains a main section? */ 
+    if (!g_hash_table_lookup (pcf, "main"))
+        goto fail;
     
     fclose (fo);
         


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/EL-5/NetworkManager-vpnc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- NetworkManager-vpnc.spec	10 Apr 2009 12:28:36 -0000	1.26
+++ NetworkManager-vpnc.spec	4 May 2009 17:32:47 -0000	1.27
@@ -10,13 +10,14 @@ Summary:   NetworkManager VPN plugin for
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.0.99
-Release:   1%{svn_snapshot}%{?dist}.3
+Release:   1%{svn_snapshot}%{?dist}.4
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{version}%{svn_snapshot}.tar.gz
 Patch0:    NetworkManager-vpnc-0.7.0.99-keyring.patch
 Patch1:    NetworkManager-vpnc-0.7.0.99-null.patch
+Patch2:    NetworkManager-vpnc-0.7.0.99-desc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -49,6 +50,7 @@ with NetworkManager and the GNOME deskto
 %setup -q
 %patch0 -p1 -b .keyring
 %patch1 -p1 -b .null
+%patch2 -p1 -b .desc
 
 
 %build
@@ -103,6 +105,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Mon May 4 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.4
+- Accept Description-less PCF files (#497992)
+
 * Fri Apr 10 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0.99-1.3
 - Fix keyring NULL dereference