From 5ff7681180a549875aa82a9950426dc3ba2e9a50 Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Mar 22 2007 08:33:17 +0000 Subject: Added patch to improve configuration GUI, add NAT traversal and single DES options --- diff --git a/NetworkManager-vpnc-0.6.4-options.patch b/NetworkManager-vpnc-0.6.4-options.patch new file mode 100644 index 0000000..165d260 --- /dev/null +++ b/NetworkManager-vpnc-0.6.4-options.patch @@ -0,0 +1,1550 @@ +--- NetworkManager-vpnc-0.6.4.orig/properties/nm-vpnc.c 2007-03-19 14:24:15.000000000 +0100 ++++ NetworkManager-vpnc-0.6.4/properties/nm-vpnc.c 2007-03-19 14:27:12.000000000 +0100 +@@ -55,8 +55,11 @@ + GtkCheckButton *w_use_domain; + GtkEntry *w_domain; + GtkCheckButton *w_use_routes; ++ GtkCheckButton *w_use_keepalive; ++ GtkEntry *w_keepalive; ++ GtkCheckButton *w_disable_natt; ++ GtkCheckButton *w_enable_singledes; + GtkEntry *w_routes; +- GtkExpander *w_opt_info_expander; + GtkButton *w_import_button; + }; + +@@ -68,14 +71,18 @@ + gtk_entry_set_text (impl->w_group_name, ""); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username), FALSE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), FALSE); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt), FALSE); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes), FALSE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), FALSE); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_keepalive), FALSE); + gtk_entry_set_text (impl->w_username, ""); + gtk_entry_set_text (impl->w_routes, ""); + gtk_entry_set_text (impl->w_domain, ""); ++ gtk_entry_set_text (impl->w_keepalive, ""); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_username), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), FALSE); +- gtk_expander_set_expanded (impl->w_opt_info_expander, FALSE); ++ gtk_widget_set_sensitive (GTK_WIDGET (impl->w_keepalive), FALSE); + } + + static const char * +@@ -95,12 +102,9 @@ + { + GSList *i; + NetworkManagerVpnUIImpl *impl = (NetworkManagerVpnUIImpl *) self->data; +- gboolean should_expand; + + vpnc_clear_widget (impl); + +- should_expand = FALSE; +- + if (connection_name != NULL) + gtk_entry_set_text (impl->w_connection_name, connection_name); + +@@ -119,12 +123,18 @@ + gtk_entry_set_text (impl->w_username, value); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_username), TRUE); +- should_expand = TRUE; + } else if (strcmp (key, "Domain") == 0) { + gtk_entry_set_text (impl->w_domain, value); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), TRUE); +- should_expand = TRUE; ++ } else if (strcmp (key, "NAT-Keepalive packet interval") == 0) { ++ gtk_entry_set_text (impl->w_keepalive, value); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_keepalive), TRUE); ++ gtk_widget_set_sensitive (GTK_WIDGET (impl->w_keepalive), TRUE); ++ } else if (strcmp (key, "Disable NAT Traversal") == 0) { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt), TRUE); ++ } else if (strcmp (key, "Enable Single DES") == 0) { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes), TRUE); + } + } + +@@ -149,12 +159,8 @@ + g_free (str); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), TRUE); +- +- should_expand = TRUE; + } + +- gtk_expander_set_expanded (impl->w_opt_info_expander, should_expand); +- + gtk_container_resize_children (GTK_CONTAINER (impl->widget)); + + return impl->widget; +@@ -171,7 +177,11 @@ + const char *secret; + gboolean use_alternate_username; + const char *username; ++ gboolean use_keepalive; ++ const char *keepalive; + gboolean use_domain; ++ gboolean disable_natt; ++ gboolean enable_singledes; + const char *domain; + + connectionname = gtk_entry_get_text (impl->w_connection_name); +@@ -180,6 +190,10 @@ + use_alternate_username = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username)); + username = gtk_entry_get_text (impl->w_username); + use_domain = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_domain)); ++ keepalive = gtk_entry_get_text (impl->w_keepalive); ++ use_keepalive = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_keepalive)); ++ disable_natt = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt)); ++ enable_singledes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes)); + domain = gtk_entry_get_text (impl->w_domain); + + data = NULL; +@@ -195,6 +209,18 @@ + data = g_slist_append (data, g_strdup ("Domain")); + data = g_slist_append (data, g_strdup (domain)); + } ++ if (use_keepalive) { ++ data = g_slist_append (data, g_strdup ("NAT-Keepalive packet interval")); ++ data = g_slist_append (data, g_strdup (keepalive)); ++ } ++ if (enable_singledes) { ++ data = g_slist_append (data, g_strdup ("Enable Single DES")); ++ data = g_slist_append (data, g_strdup ("")); ++ } ++ if (disable_natt) { ++ data = g_slist_append (data, g_strdup ("Disable NAT Traversal")); ++ data = g_slist_append (data, g_strdup ("")); ++ } + + return data; + } +@@ -266,6 +292,10 @@ + gboolean use_routes; + const char *routes_entry; + gboolean use_domain; ++ gboolean use_keepalive; ++ const char* keepalive; ++ gboolean disable_natt; ++ gboolean enable_singledes; + const char *domain_entry; + + is_valid = FALSE; +@@ -276,9 +306,13 @@ + use_alternate_username = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username)); + username = gtk_entry_get_text (impl->w_username); + use_routes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_routes)); ++ disable_natt = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt)); ++ enable_singledes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes)); + routes_entry = gtk_entry_get_text (impl->w_routes); + use_domain = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_domain)); + domain_entry = gtk_entry_get_text (impl->w_domain); ++ use_keepalive = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_keepalive)); ++ keepalive = gtk_entry_get_text (impl->w_keepalive); + + /* initial sanity checking */ + if (strlen (connectionname) > 0 && +@@ -286,6 +320,7 @@ + strlen (groupname) > 0 && + ((!use_alternate_username) || (use_alternate_username && strlen (username) > 0)) && + ((!use_routes) || (use_routes && strlen (routes_entry) > 0)) && ++ ((!use_keepalive) || (use_keepalive && strlen (keepalive) > 0)) && + ((!use_domain) || (use_domain && strlen (domain_entry) > 0))) + is_valid = TRUE; + +@@ -296,6 +331,11 @@ + is_valid = FALSE; + } + ++ /* validate keepalive: must be non-zero */ ++ if (use_keepalive && atoi(keepalive) == 0) { ++ is_valid = FALSE; ++ } ++ + /* validate groupname; can be anything */ + + /* validate user; can be anything */ +@@ -394,6 +434,22 @@ + } + + static void ++use_keepalive_toggled (GtkToggleButton *togglebutton, gpointer user_data) ++{ ++ NetworkManagerVpnUIImpl *impl = (NetworkManagerVpnUIImpl *) user_data; ++ ++ gtk_widget_set_sensitive (GTK_WIDGET (impl->w_keepalive), ++ gtk_toggle_button_get_active (togglebutton)); ++ ++ if (impl->callback != NULL) { ++ gboolean is_valid; ++ ++ is_valid = impl_is_valid (&(impl->parent)); ++ impl->callback (&(impl->parent), is_valid, impl->callback_user_data); ++ } ++} ++ ++static void + editable_changed (GtkEditable *editable, gpointer user_data) + { + NetworkManagerVpnUIImpl *impl = (NetworkManagerVpnUIImpl *) user_data; +@@ -429,9 +485,13 @@ + gboolean use_alternate_username; + const char *username; + gboolean use_routes; ++ gboolean disable_natt; ++ gboolean enable_singledes; + const char *routes; + gboolean use_domain; + const char *domain; ++ gboolean use_keepalive; ++ const char *keepalive; + + connectionname = gtk_entry_get_text (impl->w_connection_name); + gateway = gtk_entry_get_text (impl->w_gateway); +@@ -439,11 +499,15 @@ + use_alternate_username = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username)); + username = gtk_entry_get_text (impl->w_username); + use_routes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_routes)); ++ disable_natt = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt)); ++ enable_singledes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes)); + routes = gtk_entry_get_text (impl->w_routes); + use_domain = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_domain)); + domain = gtk_entry_get_text (impl->w_domain); ++ use_keepalive = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_keepalive)); ++ keepalive = gtk_entry_get_text (impl->w_keepalive); + +- buf = g_string_sized_new (512); ++ buf = g_string_sized_new (1024); + + g_string_append (buf, _("The following vpnc VPN connection will be created:")); + g_string_append (buf, "\n\n\t"); +@@ -468,6 +532,18 @@ + g_string_append (buf, "\n\t"); + g_string_append_printf (buf, _("Routes: %s"), routes); + } ++ if (use_keepalive) { ++ g_string_append (buf, "\n\t"); ++ g_string_append_printf (buf, _("NAT-Keepalive packet interval: %s"), keepalive); ++ } ++ if (enable_singledes) { ++ g_string_append (buf, "\n\t"); ++ g_string_append_printf (buf, _("Enable Single DES")); ++ } ++ if (disable_natt) { ++ g_string_append (buf, "\n\t"); ++ g_string_append_printf (buf, _("Disable NAT Traversal")); ++ } + + g_string_append (buf, "\n\n"); + g_string_append (buf, _("The connection details can be changed using the \"Edit\" button.")); +@@ -483,7 +559,6 @@ + const char *buf; + gboolean have_value; + char *basename = NULL; +- gboolean expand = FALSE; + gboolean success = FALSE; + + pcf = pcf_file_load (path); +@@ -510,26 +585,36 @@ + if ((buf = pcf_file_lookup_value (pcf, "main", "UserName"))) + gtk_entry_set_text (impl->w_username, buf); + have_value = buf == NULL ? FALSE : strlen (buf) > 0; +- expand |= have_value; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username), have_value); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_username), have_value); +- gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), have_value); + + if ((buf = pcf_file_lookup_value (pcf, "main", "NTDomain"))) + gtk_entry_set_text (impl->w_domain, buf); + have_value = buf == NULL ? FALSE : strlen (buf) > 0; +- expand |= have_value; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), have_value); ++ gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), have_value); ++ ++ buf = pcf_file_lookup_value (pcf, "main", "ForceKeepAlives"); ++ have_value = (buf == NULL ? FALSE : strcmp (buf, "0") != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_keepalive), have_value); ++ gtk_widget_set_sensitive (GTK_WIDGET (impl->w_keepalive), have_value); ++ gtk_entry_set_text (impl->w_keepalive, have_value ? buf : ""); ++ ++ buf = pcf_file_lookup_value (pcf, "main", "SingleDES"); ++ have_value = (buf ? strncmp (buf, "1", 1) == 0 : FALSE); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes), have_value); ++ ++ /* Default is enabled, only disabled if explicit EnableNat=0 exists */ ++ buf = pcf_file_lookup_value (pcf, "main", "EnableNat"); ++ have_value = (buf ? strncmp (buf, "0", 1) == 0 : FALSE); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt), have_value); + + if ((buf = pcf_file_lookup_value (pcf, "main", "X-NM-Routes"))) + gtk_entry_set_text (impl->w_routes, buf); + have_value = buf == NULL ? FALSE : strlen (buf) > 0; +- expand |= have_value; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), have_value); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), have_value); + +- gtk_expander_set_expanded (impl->w_opt_info_expander, expand); +- + if ((buf = pcf_file_lookup_value (pcf, "main", "TunnelingMode"))) { + /* If applicable, put up warning that TCP tunneling will be disabled */ + +@@ -625,6 +710,9 @@ + FILE *f; + GSList *i; + const char *gateway = NULL; ++ const char *keepalive = "0"; ++ const char *enablenat = "1"; ++ const char *singledes = "0"; + const char *groupname = NULL; + const char *username = NULL; + const char *domain = NULL; +@@ -648,6 +736,12 @@ + username = value; + } else if (strcmp (key, "Domain") == 0) { + domain = value; ++ } else if (strcmp (key, "Disable NAT Traversal") == 0) { ++ enablenat = "0"; ++ } else if (strcmp (key, "Enable Single DES") == 0) { ++ singledes = "1"; ++ } else if (strcmp (key, "NAT-Keepalive packet interval") == 0) { ++ keepalive = value; + } + } + +@@ -693,14 +787,14 @@ + "SaveUserPassword=0\n" + "EnableBackup=0\n" + "BackupServer=\n" +- "EnableNat=1\n" ++ "EnableNat=%s\n" + "CertStore=0\n" + "CertName=\n" + "CertPath=\n" + "CertSubjectName=\n" + "CertSerialHash=\n" + "DHGroup=2\n" +- "ForceKeepAlives=0\n" ++ "ForceKeepAlives=%s\n" + "enc_GroupPwd=\n" + "UserPassword=\n" + "enc_UserPassword=\n" +@@ -714,13 +808,17 @@ + "SendCertChain=0\n" + "VerifyCertDN=\n" + "EnableSplitDNS=1\n" ++ "SingleDES=%s\n" + "SPPhonebook=\n" + "%s", + /* Description */ connection_name, + /* Host */ gateway, + /* GroupName */ groupname, + /* Username */ username != NULL ? username : "", ++ /* EnableNat */ enablenat, ++ /* KeepAlive */ keepalive != NULL ? keepalive : "", + /* NTDomain */ domain != NULL ? domain : "", ++ /* SingleDES */ singledes, + /* X-NM-Routes */ routes_str != NULL ? routes_str : ""); + + fclose (f); +@@ -825,11 +923,13 @@ + impl->w_use_alternate_username = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-use-alternate-username")); + impl->w_username = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-username")); + impl->w_use_routes = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-use-routes")); ++ impl->w_use_keepalive = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-use-keepalive")); ++ impl->w_keepalive = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-keepalive")); ++ impl->w_disable_natt = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-disable-natt")); ++ impl->w_enable_singledes = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-enable-singledes")); + impl->w_routes = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-routes")); + impl->w_use_domain = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-use-domain")); + impl->w_domain = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-domain")); +- impl->w_opt_info_expander = GTK_EXPANDER (glade_xml_get_widget (impl->xml, +- "vpnc-optional-information-expander")); + impl->w_import_button = GTK_BUTTON (glade_xml_get_widget (impl->xml, + "vpnc-import-button")); + impl->callback = NULL; +@@ -842,6 +942,8 @@ + + gtk_signal_connect (GTK_OBJECT (impl->w_use_domain), + "toggled", GTK_SIGNAL_FUNC (use_domain_toggled), impl); ++ gtk_signal_connect (GTK_OBJECT (impl->w_use_keepalive), ++ "toggled", GTK_SIGNAL_FUNC (use_keepalive_toggled), impl); + + gtk_signal_connect (GTK_OBJECT (impl->w_connection_name), + "changed", GTK_SIGNAL_FUNC (editable_changed), impl); +@@ -855,6 +957,8 @@ + "changed", GTK_SIGNAL_FUNC (editable_changed), impl); + gtk_signal_connect (GTK_OBJECT (impl->w_domain), + "changed", GTK_SIGNAL_FUNC (editable_changed), impl); ++ gtk_signal_connect (GTK_OBJECT (impl->w_keepalive), ++ "changed", GTK_SIGNAL_FUNC (editable_changed), impl); + + gtk_signal_connect (GTK_OBJECT (impl->w_import_button), + "clicked", GTK_SIGNAL_FUNC (import_button_clicked), impl); +--- NetworkManager-vpnc-0.6.4.orig/src/nm-vpnc-service.c 2007-03-19 14:24:15.000000000 +0100 ++++ NetworkManager-vpnc-0.6.4/src/nm-vpnc-service.c 2007-03-19 14:05:48.000000000 +0100 +@@ -504,6 +504,8 @@ + { "Application Version", OPT_TYPE_ASCII }, + { "Rekeying interval", OPT_TYPE_ASCII }, + { "NAT-Keepalive packet interval", OPT_TYPE_ASCII }, ++ { "Disable NAT Traversal", OPT_TYPE_NONE }, ++ { "Enable Single DES", OPT_TYPE_NONE }, + { NULL, OPT_TYPE_UNKNOWN } + }; + +--- NetworkManager-vpnc-0.6.4.orig/properties/nm-vpnc-dialog.glade 2006-05-29 04:56:33.000000000 +0200 ++++ NetworkManager-vpnc-0.6.4/properties/nm-vpnc-dialog.glade 2007-03-19 13:53:37.000000000 +0100 +@@ -5,11 +5,12 @@ + + + ++ 5 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False +- False ++ True + False + True + False +@@ -26,22 +27,36 @@ + 6 + + +- ++ + True +- Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting. +- False +- False +- GTK_JUSTIFY_LEFT +- True +- False +- 0 ++ 0.5 + 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 ++ 1 ++ 1 ++ 2 ++ 2 ++ 4 ++ 4 ++ ++ ++ ++ True ++ Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting. ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ True ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ + + + 0 +@@ -52,9 +67,10 @@ + + + ++ 2 + True + False +- 18 ++ 6 + + + +@@ -73,7 +89,7 @@ + False + 0 + 0.5 +- 0 ++ 3 + 0 + PANGO_ELLIPSIZE_NONE + -1 +@@ -95,8 +111,8 @@ + 1 + 1 + 0 +- 0 +- 12 ++ 8 ++ 6 + 0 + + +@@ -106,42 +122,35 @@ + 6 + + +- ++ + True +- _Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" +- True +- False +- GTK_JUSTIFY_LEFT +- True +- False +- 0 ++ 0.5 + 0.5 +- 0 +- 0 +- vpnc-connection-name +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- False +- True +- +- ++ 1 ++ 1 ++ 0 ++ 0 ++ 0 ++ 6 + +- +- +- True +- True +- True +- True +- 0 +- +- True +- * +- False ++ ++ ++ True ++ Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" ++ True ++ True ++ True ++ 0 ++ ++ True ++ • ++ False ++ ++ Connection Name ++ Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" ++ ++ ++ + + + 0 +@@ -167,15 +176,184 @@ + + + +- ++ + True +- False +- 6 ++ <b>Connection Information</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 3 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ 4 ++ True ++ True ++ True ++ True ++ GTK_POS_TOP ++ False ++ False + + +- ++ ++ 12 + True +- <b>Required Information</b> ++ False ++ 6 ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 3 ++ 0 ++ 5 ++ 3 ++ ++ ++ ++ True ++ 2 ++ 2 ++ False ++ 6 ++ 12 ++ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ ++ True ++ • ++ False ++ ++ ++ 1 ++ 2 ++ 0 ++ 1 ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ ++ True ++ • ++ False ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ True ++ _Gateway: ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 1 ++ 0.5 ++ 0 ++ 0 ++ vpnc-gateway ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 0 ++ 1 ++ ++ ++ ++ ++ ++ ++ True ++ G_roup Name: ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 1 ++ 0.5 ++ 0 ++ 0 ++ vpnc-group-name ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ ++ ++ 0 ++ False ++ True ++ ++ ++ ++ ++ False ++ True ++ ++ ++ ++ ++ ++ True ++ <b>Required</b> + False + True + GTK_JUSTIFY_LEFT +@@ -191,35 +369,50 @@ + 0 + + +- 0 +- False +- True ++ tab + + + + +- ++ ++ 12 + True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 12 +- 0 ++ False ++ 6 + + +- ++ + True +- 2 +- 2 +- False +- 6 +- 12 ++ True ++ Override _user name ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 3 ++ True ++ True ++ ++ ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 0 ++ 12 ++ 3 + + +- ++ + True + True + True +@@ -227,19 +420,51 @@ + 0 + + True +- * ++ • + False + +- +- 1 +- 2 +- 0 +- 1 +- + ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ True ++ True ++ Use _domain for authentication ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 0 ++ 12 ++ 3 + + +- ++ + True + True + True +@@ -247,147 +472,82 @@ + 0 + + True +- * ++ • + False + +- +- 1 +- 2 +- 1 +- 2 +- +- +- +- +- +- True +- _Gateway: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- vpnc-gateway +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- 1 +- 0 +- 1 +- fill +- +- +- +- +- +- True +- G_roup Name: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- vpnc-group-name +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- 1 +- 1 +- 2 +- fill +- + + ++ ++ 0 ++ True ++ True ++ + +- +- +- 0 +- False +- True +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- True +- False +- 6 + +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 12 +- 0 ++ ++ ++ True ++ True ++ _Only use VPN connection for these addresses ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ + + +- ++ + True +- False +- 6 ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 3 ++ 12 ++ 3 + + +- ++ + True +- True +- Override _user name +- True +- GTK_RELIEF_NORMAL +- True +- False +- False +- True +- +- +- 0 +- True +- True +- +- ++ False ++ 6 + +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 12 +- 0 ++ ++ ++ True ++ <i>example: 172.16.0.0/16 10.11.12.0/24</i> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ True ++ ++ + + +- ++ + True + True + True +@@ -395,51 +555,89 @@ + 0 + + True +- * ++ • + False + ++ ++ 0 ++ True ++ True ++ + + +- +- 0 +- True +- True +- + ++ ++ ++ 0 ++ True ++ True ++ ++ + +- +- +- True +- True +- Use _domain for authentication +- True +- GTK_RELIEF_NORMAL +- True +- False +- False +- True +- +- +- 0 +- False +- False +- +- ++ ++ ++ True ++ True ++ Use NAT _keepalive packets ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 0 ++ 12 ++ 3 + + +- ++ + True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 12 +- 0 ++ False ++ 12 + + +- ++ ++ True ++ Interval: ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 1 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ + True + True + True +@@ -447,122 +645,77 @@ + 0 + + True +- * ++ • + False + ++ ++ 0 ++ True ++ True ++ + + +- +- 0 +- True +- True +- +- +- +- +- +- True +- True +- _Only use VPN connection for these addresses +- True +- GTK_RELIEF_NORMAL +- True +- False +- False +- True +- +- +- 0 +- False +- False +- + ++ ++ ++ 0 ++ True ++ True ++ ++ + +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 12 +- 0 +- +- +- +- True +- False +- 6 +- +- +- +- True +- <i>example: 172.16.0.0/16 10.11.12.0/24</i> +- False +- True +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- False +- True +- +- ++ ++ ++ True ++ Disable NAT Traversal ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ True ++ True ++ ++ + +- +- +- True +- True +- True +- True +- 0 +- +- True +- * +- False +- +- +- 0 +- True +- True +- +- +- +- +- +- +- 0 +- True +- True +- +- ++ ++ ++ True ++ Enable weak single DES encryption ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True + ++ ++ 0 ++ True ++ True ++ + + ++ ++ False ++ True ++ + + + +- ++ + True +- O_ptional Information +- True ++ Optional ++ False + True + GTK_JUSTIFY_LEFT + False + False +- 0.5 ++ 0 + 0.5 + 0 + 0 +@@ -570,9 +723,12 @@ + -1 + False + 0 ++ ++ Optional ++ + + +- label_item ++ tab + + + +@@ -590,71 +746,89 @@ + 0 + + +- ++ + True +- True +- True +- GTK_RELIEF_NORMAL +- True ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 3 ++ 0 ++ 3 + + +- ++ + True +- 0.5 +- 0.5 +- 0 +- 0 +- 0 +- 0 +- 0 +- 0 ++ Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file. ++ True ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file. ++ + + +- ++ + True +- False +- 2 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 + + +- ++ + True +- gtk-add +- 4 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- False +- False +- +- ++ False ++ 2 + +- +- +- True +- _Import Saved Configuration... +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 ++ ++ ++ True ++ gtk-add ++ 4 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ _Import Saved Configuration... ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ + +- +- 0 +- False +- False +- + + + diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec index b62e663..fdc0817 100644 --- a/NetworkManager-vpnc.spec +++ b/NetworkManager-vpnc.spec @@ -8,13 +8,14 @@ Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc Epoch: 1 Version: 0.6.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}.tar.gz Patch0: NetworkManager-vpnc-0.7.0-gppasswd.patch Patch1: NetworkManager-vpnc-0.6.4-keepalive.patch +Patch2: NetworkManager-vpnc-0.6.4-options.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -46,6 +47,7 @@ with NetworkManager and the GNOME desktop %setup -q %patch0 -p1 -b .gppasswd %patch1 -p1 -b .keepalive +%patch2 -p1 -b .options %build @@ -97,6 +99,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Mon Mar 19 2007 Denis Leroy - 1:0.6.4-3 +- Added patch to improve configuration GUI, add NAT traversal and single DES options + * Sat Feb 17 2007 Denis Leroy - 1:0.6.4-2 - Readded NAT-keepalive support patch from SVN branch