From f224d6dbc6403c39c3adcc1d79f46e7df72b249b Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sun, 12 Oct 2008 17:47:57 +0000 Subject: [PATCH] - Rebuild for updated NetworkManager - Allow changing passwords from the connection editor - Honor OpenVPN's 'route-vpn-gateway' option --- .cvsignore | 1 + NetworkManager-openvpn.spec | 13 +++++++------ nm-openvpn-fix-pw-tls-entries.patch | 21 --------------------- nm-openvpn-script-security.patch | 17 ----------------- sources | 2 +- 5 files changed, 9 insertions(+), 45 deletions(-) delete mode 100644 nm-openvpn-fix-pw-tls-entries.patch delete mode 100644 nm-openvpn-script-security.patch diff --git a/.cvsignore b/.cvsignore index cb1ff9a..b8faa58 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,4 @@ NetworkManager-openvpn-0.7.0.svn3801.tar.gz NetworkManager-openvpn-0.7.0.svn3832.tar.gz NetworkManager-openvpn-0.7.0.svn3846.tar.gz NetworkManager-openvpn-0.7.0.svn3930.tar.gz +NetworkManager-openvpn-0.7.0.svn4175.tar.gz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 6600a64..3171111 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,10 +1,10 @@ -%define nm_version 1:0.7.0-0.11.svn4022 +%define nm_version 1:0.7.0-0.11.svn4174 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define svn_snapshot svn4027 +%define svn_snapshot svn4175 Summary: NetworkManager VPN integration for OpenVPN Name: NetworkManager-openvpn @@ -21,8 +21,6 @@ Group: System Environment/Base # - make distcheck # - use generated NetworkManager-openvpn-0.7.0.tar.gz Source: %{name}-%{version}.%{svn_snapshot}.tar.gz -Patch0: nm-openvpn-fix-pw-tls-entries.patch -Patch10: nm-openvpn-script-security.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -58,8 +56,6 @@ with NetworkManager and the GNOME desktop. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .pw-tls-entries -%patch10 -p1 -b .script-security %build if [ ! -f configure ]; then @@ -110,6 +106,11 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %changelog +* Sun Oct 12 2008 Dan Williams 1:0.7.0-16.svn4175 +- Rebuild for updated NetworkManager +- Allow changing passwords from the connection editor +- Honor OpenVPN's 'route-vpn-gateway' option + * Tue Sep 30 2008 Dan Williams 1:0.7.0-16.svn4027 - Fix order of Password TLS certificate choosers (rh #464765) - Use %find_lang for locale-specific files (rh #448551) diff --git a/nm-openvpn-fix-pw-tls-entries.patch b/nm-openvpn-fix-pw-tls-entries.patch deleted file mode 100644 index a8f1bd0..0000000 --- a/nm-openvpn-fix-pw-tls-entries.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade ---- NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries 2008-09-30 15:59:39.000000000 -0400 -+++ NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade 2008-09-30 16:01:37.000000000 -0400 -@@ -426,7 +426,7 @@ - - True - 0 -- CA Certificate: -+ User Certificate: - - - 1 -@@ -438,7 +438,7 @@ - - True - 0 -- User Certificate: -+ CA Certificate: - - - 2 diff --git a/nm-openvpn-script-security.patch b/nm-openvpn-script-security.patch deleted file mode 100644 index 4342d9a..0000000 --- a/nm-openvpn-script-security.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c.script-security NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c ---- NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c.script-security 2008-09-30 15:56:42.000000000 -0400 -+++ NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c 2008-09-30 15:57:03.000000000 -0400 -@@ -611,6 +611,13 @@ nm_openvpn_start_openvpn_binary (NMOpenv - add_openvpn_arg (args, "--syslog"); - add_openvpn_arg (args, "nm-openvpn"); - -+ /* Punch script security in the face; this option was added to OpenVPN 2.1-rc9 -+ * and defaults to disallowing any scripts, a behavior change from previous -+ * versions. -+ */ -+ add_openvpn_arg (args, "--script-security"); -+ add_openvpn_arg (args, "2"); -+ - /* Up script, called when connection has been established or has been restarted */ - add_openvpn_arg (args, "--up"); - add_openvpn_arg (args, NM_OPENVPN_HELPER_PATH); diff --git a/sources b/sources index d198046..1dd965d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cbf3db7e4e3d14ad2ec1b2689b4bc7a3 NetworkManager-openvpn-0.7.0.svn4027.tar.gz +50ce22b0cd278d48e4118f1b9de57162 NetworkManager-openvpn-0.7.0.svn4175.tar.gz