rpms/NetworkManager-openvpn/F-9 NetworkManager-openvpn-0.7.0-remote-ip.patch, 1.1, 1.2 NetworkManager-openvpn.spec, 1.19, 1.20
Christoph Höger (choeger)
fedora-extras-commits at redhat.com
Tue Jun 24 10:07:44 UTC 2008
- Previous message: rpms/perl-File-Find-Rule-Perl/F-9 perl-File-Find-Rule-Perl.spec, 1.4, 1.5
- Next message: rpms/policycoreutils/F-9 policycoreutils-gui.patch, 1.65, 1.66 policycoreutils-rhat.patch, 1.366, 1.367 policycoreutils-sepolgen.patch, 1.11, 1.12 policycoreutils.spec, 1.524, 1.525
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: choeger
Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12673
Modified Files:
NetworkManager-openvpn-0.7.0-remote-ip.patch
NetworkManager-openvpn.spec
Log Message:
* changed the patch to get at least some remote ip if it is possible
NetworkManager-openvpn-0.7.0-remote-ip.patch:
Index: NetworkManager-openvpn-0.7.0-remote-ip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/NetworkManager-openvpn-0.7.0-remote-ip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NetworkManager-openvpn-0.7.0-remote-ip.patch 13 Jun 2008 11:34:17 -0000 1.1
+++ NetworkManager-openvpn-0.7.0-remote-ip.patch 24 Jun 2008 10:06:23 -0000 1.2
@@ -1,13 +1,22 @@
-Index: nm-openvpn-service-openvpn-helper.c
+Index: src/nm-openvpn-service-openvpn-helper.c
===================================================================
---- upstream-svn/src/nm-openvpn-service-openvpn-helper.c (Revision 3632)
-+++ upstream-svn/src/nm-openvpn-service-openvpn-helper.c (Arbeitskopie)
-@@ -199,7 +199,7 @@
- config = g_hash_table_new (g_str_hash, g_str_equal);
-
- /* Gateway */
-- val = addr_to_gvalue (getenv ("trusted_ip"));
-+ val = addr_to_gvalue (getenv ("remote_1"));
+--- src/nm-openvpn-service-openvpn-helper.c (Revision 3632)
++++ src/nm-openvpn-service-openvpn-helper.c (Arbeitskopie)
+@@ -202,8 +202,15 @@
+ val = addr_to_gvalue (getenv ("trusted_ip"));
if (val)
g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, val);
- else
+- else
+- helper_failed (connection, "VPN Gateway");
++ else {
++ /* workaround, it looks like openvpn
++ sometimes uses remote_1, and sometimes trusted_ip */
++ val = addr_to_gvalue (getenv ("remote_1"));
++ if (val)
++ g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, val);
++ else
++ helper_failed (connection, "VPN Gateway");
++ }
+
+ /* Tunnel device */
+ val = str_to_gvalue (getenv ("dev"), FALSE);
Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/NetworkManager-openvpn.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- NetworkManager-openvpn.spec 13 Jun 2008 11:43:03 -0000 1.19
+++ NetworkManager-openvpn.spec 24 Jun 2008 10:06:23 -0000 1.20
@@ -10,7 +10,7 @@
Name: NetworkManager-openvpn
Epoch: 1
Version: 0.7.0
-Release: 13%{svn_snapshot}%{?dist}
+Release: 14%{svn_snapshot}%{?dist}
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Group: System Environment/Base
@@ -57,7 +57,7 @@
%prep
%setup -q -n %{name}-%{version}
-%patch -p1 -b .buildroot
+%patch -p0 -b .buildroot
%build
if [ ! -f configure ]; then
@@ -107,6 +107,10 @@
%{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
%changelog
+* Tue Jun 24 2008 Christoph Höger <choeger at cs.tu-berlin.de> 1:0.7.0-14.svn3632
+- revoke last change
+- openvpn seems to be buggy itself
+
* Fri Jun 13 2008 Christoph Höger <choeger at cs.tu-berlin.de> 1:0.7.0-13.svn3632
- Fix getting remote ip
- fixes #446335
- Previous message: rpms/perl-File-Find-Rule-Perl/F-9 perl-File-Find-Rule-Perl.spec, 1.4, 1.5
- Next message: rpms/policycoreutils/F-9 policycoreutils-gui.patch, 1.65, 1.66 policycoreutils-rhat.patch, 1.366, 1.367 policycoreutils-sepolgen.patch, 1.11, 1.12 policycoreutils.spec, 1.524, 1.525
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list