rpms/NetworkManager-openvpn/F-8 NetworkManager-openvpn-0.7.0.svn3140-fixes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 NetworkManager-openvpn.spec, 1.9, 1.10 sources, 1.4, 1.5 NetworkManager-openvpn-0.7.0.svn3047-fixes.patch, 1.1, NONE
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Thu Dec 6 10:02:58 UTC 2007
Author: dcbw
Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2255
Modified Files:
.cvsignore NetworkManager-openvpn.spec sources
Added Files:
NetworkManager-openvpn-0.7.0.svn3140-fixes.patch
Removed Files:
NetworkManager-openvpn-0.7.0.svn3047-fixes.patch
Log Message:
* Thu Dec 6 2007 Dan Williams <dcbw at redhat.com> 1:0.7.0-5.svn3140
- Update to latest SVN snapshot to get stuff working
NetworkManager-openvpn-0.7.0.svn3140-fixes.patch:
--- NEW FILE NetworkManager-openvpn-0.7.0.svn3140-fixes.patch ---
diff -urN NetworkManager-openvpn-0.7.0.svn3047/nm-openvpn.desktop.in NetworkManager-openvpn-0.7.0.svn3047_patched/nm-openvpn.desktop.in
--- NetworkManager-openvpn-0.7.0.svn3047/nm-openvpn.desktop.in 2007-11-23 12:32:14.000000000 +0100
+++ NetworkManager-openvpn-0.7.0.svn3047_patched/nm-openvpn.desktop.in 2007-11-23 13:02:19.000000000 +0100
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
_Name=VPN Connection Manager (OpenVPN)
_GenericName=VPN Connection Manager (OpenVPN)
_Comment=Add, Remove, and Edit VPN Connections
@@ -7,7 +6,6 @@
Icon=gnome-mime-application-x-openvpn-settings
Terminal=false
Type=Application
-DocPath=
Categories=GNOME;Application;Network;
-MimeType=application/x-openvpn-settings
+MimeType=application/x-openvpn-settings;
NoDisplay=true
diff -urN NetworkManager-openvpn-0.7.0.svn3047/properties/nm-openvpn.c NetworkManager-openvpn-0.7.0.svn3047_patched/properties/nm-openvpn.c
--- NetworkManager-openvpn-0.7.0.svn3047/properties/nm-openvpn.c 2007-11-23 12:41:14.000000000 +0100
+++ NetworkManager-openvpn-0.7.0.svn3047_patched/properties/nm-openvpn.c 2007-11-23 12:37:46.000000000 +0100
@@ -544,24 +544,26 @@
const char *connectionname;
const char *remote;
const char *port;
- gint connection_type = gtk_combo_box_get_active (GTK_COMBO_BOX (impl->w_connection_type));
+ gint connection_type = gtk_combo_box_get_active (GTK_COMBO_BOX (impl->w_connection_type));
- connectionname = gtk_entry_get_text (impl->w_connection_name);
- remote = gtk_entry_get_text (impl->w_remote);
- port = gtk_entry_get_text (impl->w_port);
- use_routes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_routes));
- routes_entry = gtk_entry_get_text (impl->w_routes);
+ connectionname = gtk_entry_get_text (impl->w_connection_name);
+ remote = gtk_entry_get_text (impl->w_remote);
+ port = gtk_entry_get_text (impl->w_port);
+ use_routes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_routes));
+ routes_entry = gtk_entry_get_text (impl->w_routes);
is_valid = FALSE;
- if ( (strlen (connectionname) == 0) ||
- (strlen (remote) == 0) ||
- (strstr (remote, " ") != NULL) ||
- (strstr (remote, "\t") != NULL) ||
- (strlen (port) == 0) ||
- (strstr (port, " ") != NULL) ||
- (strstr (port, "\t") != NULL) ||
- (!check_port (port)) ) {
+ if ( ((connectionname != NULL) && (strlen (connectionname) == 0)) ||
+ ((remote != NULL) &&
+ ((strlen (remote) == 0) ||
+ (strstr (remote, " ") != NULL) ||
+ (strstr (remote, "\t") != NULL))) ||
+ ((port != NULL) &&
+ ((strlen (port) == 0) ||
+ (strstr (port, " ") != NULL) ||
+ (strstr (port, "\t") != NULL) ||
+ (!check_port (port)))) ) {
is_valid = FALSE;
@@ -574,9 +576,9 @@
local_ip = gtk_entry_get_text (impl->w_local_ip);
remote_ip = gtk_entry_get_text (impl->w_remote_ip);
- if ( (strlen (shared_key) > 0) &&
- (strlen (local_ip) > 0) &&
- (strlen (remote_ip) > 0) &&
+ if ( shared_key && (strlen (shared_key) > 0) &&
+ local_ip && (strlen (local_ip) > 0) &&
+ remote_ip && (strlen (remote_ip) > 0) &&
check_ip (local_ip) &&
check_ip (remote_ip) &&
g_file_test( shared_key, G_FILE_TEST_IS_REGULAR) ) {
@@ -593,8 +595,8 @@
ca = gtk_entry_get_text (impl->w_password_ca);
- if (strlen (username) > 0 &&
- strlen (ca) > 0 &&
+ if (username && strlen (username) > 0 &&
+ ca && strlen (ca) > 0 &&
g_file_test( ca, G_FILE_TEST_IS_REGULAR) ) {
is_valid = TRUE;
@@ -612,10 +614,10 @@
key = gtk_entry_get_text (impl->w_x509userpass_key);
username = gtk_entry_get_text (impl->w_x509userpass_username);
- if (strlen (username) > 0 &&
- strlen (ca) > 0 &&
- strlen (cert) > 0 &&
- strlen (key) > 0 &&
+ if ( username && strlen (username) > 0 &&
+ ca && strlen (ca) > 0 &&
+ cert && strlen (cert) > 0 &&
+ key && strlen (key) > 0 &&
((!use_routes) || (use_routes && strlen (routes_entry) > 0)) &&
/* validate ca/cert/key files */
g_file_test( ca, G_FILE_TEST_IS_REGULAR) &&
@@ -636,9 +638,9 @@
key = gtk_entry_get_text (impl->w_key);
/* initial sanity checking */
- if (strlen (ca) > 0 &&
- strlen (cert) > 0 &&
- strlen (key) > 0 &&
+ if (ca && strlen (ca) > 0 &&
+ cert && strlen (cert) > 0 &&
+ key && strlen (key) > 0 &&
((!use_routes) || (use_routes && strlen (routes_entry) > 0)) &&
/* validate ca/cert/key files */
g_file_test( ca, G_FILE_TEST_IS_REGULAR) &&
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 30 Oct 2007 22:50:28 -0000 1.3
+++ .cvsignore 6 Dec 2007 10:02:24 -0000 1.4
@@ -1 +1,2 @@
NetworkManager-openvpn-0.7.0.svn3047.tar.gz
+NetworkManager-openvpn-0.7.0.svn3140.tar.gz
Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-8/NetworkManager-openvpn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NetworkManager-openvpn.spec 23 Nov 2007 13:41:13 -0000 1.9
+++ NetworkManager-openvpn.spec 6 Dec 2007 10:02:24 -0000 1.10
@@ -1,16 +1,16 @@
-%define nm_version 1:0.7.0-0.4.svn3030
+%define nm_version 1:0.7.0-0.6.6.svn3130
%define dbus_version 1.0
%define gtk2_version 2.10.0
%define openvpn_version 2.1
%define shared_mime_version 0.16-3
-%define svn_snapshot .svn3047
+%define svn_snapshot .svn3140
Summary: NetworkManager VPN integration for OpenVPN
Name: NetworkManager-openvpn
Epoch: 1
Version: 0.7.0
-Release: 4%{svn_snapshot}%{?dist}
+Release: 5%{svn_snapshot}%{?dist}
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Group: System Environment/Base
@@ -57,7 +57,7 @@
with NetworkManager and the GNOME desktop.
%prep
-%setup -q -n %{name}-%{version}%{svn_snapshot}
+%setup -q -n %{name}-%{version}
%patch0 -p1
%build
@@ -106,6 +106,9 @@
%{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
%changelog
+* Thu Dec 6 2007 Dan Williams <dcbw at redhat.com> 1:0.7.0-5.svn3140
+- Update to latest SVN snapshot to get stuff working
+
* Fri Nov 23 2007 Tim Niemueller <tim at niemueller.de> 1:0.7.0-4.svn3047
- BuildRequire libtool and glib2-devel since we call autogen.sh now
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 23 Nov 2007 13:01:35 -0000 1.4
+++ sources 6 Dec 2007 10:02:24 -0000 1.5
@@ -1 +1 @@
-8a1d12330eb203d7d1e3cc68912dc112 NetworkManager-openvpn-0.7.0.svn3047.tar.gz
+46ec79047cc5a1a1f76ca5582bd71ec6 NetworkManager-openvpn-0.7.0.svn3140.tar.gz
--- NetworkManager-openvpn-0.7.0.svn3047-fixes.patch DELETED ---
More information about the fedora-extras-commits
mailing list