rpms/NetworkManager-openvpn/F-8 NetworkManager-openvpn-0.7.0.svn3047-fixes.patch, NONE, 1.1 NetworkManager-openvpn.spec, 1.7, 1.8 sources, 1.3, 1.4

Tim Niemueller (timn) fedora-extras-commits at redhat.com
Fri Nov 23 13:02:10 UTC 2007 

Author: timn

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3323

Modified Files:
	NetworkManager-openvpn.spec sources 
Added Files:
	NetworkManager-openvpn-0.7.0.svn3047-fixes.patch 
Log Message:
- Fixes for #320941
- Moved all changes to patch to svn3047

Tim


NetworkManager-openvpn-0.7.0.svn3047-fixes.patch:

--- NEW FILE NetworkManager-openvpn-0.7.0.svn3047-fixes.patch ---
diff -urN NetworkManager-openvpn-0.7.0.svn3047/ChangeLog NetworkManager-openvpn-0.7.0.svn3047_patched/ChangeLog
--- NetworkManager-openvpn-0.7.0.svn3047/ChangeLog	2007-11-23 12:41:14.000000000 +0100
+++ NetworkManager-openvpn-0.7.0.svn3047_patched/ChangeLog	2007-11-23 12:39:37.000000000 +0100
@@ -1,3 +1,9 @@
+2007-11-23  Tim Niemueller <tim at niemueller.de>
+
+	* configure.in: raise version number to 0.7.0 to reflect the
+	        dependency on the new NM and to separate it from the 0.6
+		branch.
+
 2007-10-26  Dan Williams  <dcbw at redhat.com>
 
 	* properties/nm-openvpn.c
diff -urN NetworkManager-openvpn-0.7.0.svn3047/configure.in NetworkManager-openvpn-0.7.0.svn3047_patched/configure.in
--- NetworkManager-openvpn-0.7.0.svn3047/configure.in	2007-11-23 12:41:14.000000000 +0100
+++ NetworkManager-openvpn-0.7.0.svn3047_patched/configure.in	2007-11-23 12:39:08.000000000 +0100
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(NetworkManager-openvpn, 0.3.2, tim at niemueller.de, NetworkManager-openvpn)
+AC_INIT(NetworkManager-openvpn, 0.7.0, tim at niemueller.de, NetworkManager-openvpn)
 AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE
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,6 +6,5 @@
 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;
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) &&
diff -urN NetworkManager-openvpn-0.7.0.svn3047/properties/.svn/entries NetworkManager-openvpn-0.7.0.svn3047_patched/properties/.svn/entries
--- NetworkManager-openvpn-0.7.0.svn3047/properties/.svn/entries	2007-11-23 12:41:14.000000000 +0100
+++ NetworkManager-openvpn-0.7.0.svn3047_patched/properties/.svn/entries	2007-11-23 12:32:14.000000000 +0100
@@ -68,7 +68,7 @@
 
 
 
-2007-11-23T11:41:14.000000Z
+2007-11-23T11:32:14.000000Z
 c254cfb3957432950996f4e00409d2c2
 2007-10-26T16:32:55.320129Z
 3023
diff -urN NetworkManager-openvpn-0.7.0.svn3047/.svn/entries NetworkManager-openvpn-0.7.0.svn3047_patched/.svn/entries
--- NetworkManager-openvpn-0.7.0.svn3047/.svn/entries	2007-11-23 12:41:14.000000000 +0100
+++ NetworkManager-openvpn-0.7.0.svn3047_patched/.svn/entries	2007-11-23 12:32:14.000000000 +0100
@@ -68,7 +68,7 @@
 
 
 
-2007-11-23T11:41:14.000000Z
+2007-11-23T11:32:14.000000Z
 d115e566bb6fee9d04236d3322040102
 2007-10-08T14:45:32.827558Z
 2952
@@ -80,7 +80,7 @@
 
 
 
-2007-11-23T11:41:14.000000Z
+2007-11-23T11:32:14.000000Z
 204cdf17dfd3ac729fc450b351f7f8e6
 2007-10-26T16:32:55.320129Z
 3023


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-8/NetworkManager-openvpn.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NetworkManager-openvpn.spec	30 Oct 2007 23:14:16 -0000	1.7
+++ NetworkManager-openvpn.spec	23 Nov 2007 13:01:35 -0000	1.8
@@ -4,13 +4,13 @@
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn3047
+%define svn_snapshot .svn3047
 
 Summary: NetworkManager VPN integration for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 2.%{svn_snapshot}%{?dist}
+Release: 3%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -18,12 +18,13 @@
 # - Check out NetworkManager from Gnome CVS, use the right tag,
 #   e.g. NETWORKMANAGER_0_6_4_RELEASE
 # - cd NetworkManager/vpn-daemons/openvpn
-# - ./augogen.sh --prefix=/usr --sysconfdir=/etc
+# - ./autogen.sh --prefix=/usr --sysconfdir=/etc
 # - make distclean
 # - cd ..
 # - mv openvpn NetworkManager-openvpn-%{version}
 # - tar cvfz NetworkManager-openvpn-%{version}.tar.gz NetworkManager-openvpn-%{version}
-Source: %{name}-%{version}.%{svn_snapshot}.tar.gz
+Source: %{name}-%{version}%{svn_snapshot}.tar.gz
+Patch0: %{name}-%{version}%{svn_snapshot}-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
 BuildRequires: dbus-devel                 >= %{dbus_version}
@@ -37,6 +38,7 @@
 BuildRequires: perl-XML-Parser
 BuildRequires: intltool gettext
 BuildRequires: perl
+BuildRequires: gnome-common
 Requires(post): %{_bindir}/update-desktop-database
 Requires(postun): %{_bindir}/update-desktop-database
 Requires(post): /sbin/ldconfig
@@ -54,7 +56,8 @@
 with NetworkManager and the GNOME desktop.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{svn_snapshot}
+%patch0 -p1
 
 %build
 if [ ! -f configure ]; then
@@ -102,6 +105,12 @@
 %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
 
 %changelog
+* Fri Nov 23 2007 Tim Niemueller <tim at niemueller.de> 1:0.7.0-3.svn3047
+- Fixed #320941
+- Call autogen, therefore BuildRequire gnome-common
+- Use plain 3047 from repo and use a patch, we cannot use trunk at the
+  moment since it is in flux and incompatible with NM available for F8
+
 * Wed Oct 31 2007 Tim Niemueller <tim at niemueller.de> 1:0.7.0-2.svn3047.fc8
 - BuildRequire gettext
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Oct 2007 22:50:28 -0000	1.3
+++ sources	23 Nov 2007 13:01:35 -0000	1.4
@@ -1 +1 @@
-6cc65cd5e4b4afda8be5412d8dc3534b  NetworkManager-openvpn-0.7.0.svn3047.tar.gz
+8a1d12330eb203d7d1e3cc68912dc112  NetworkManager-openvpn-0.7.0.svn3047.tar.gz

More information about the fedora-extras-commits mailing list