- Rebuild for updated NetworkManager

- Allow changing passwords from the connection editor - Honor OpenVPN's 'route-vpn-gateway' option
16 years ago · f224d6dbc6
parent 7e465dbdda
commit f224d6dbc6
5 changed files with 9 additions and 45 deletions
--- 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
--- 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 <dcbw@redhat.com> 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 <dcbw@redhat.com> 1:0.7.0-16.svn4027
 - Fix order of Password TLS certificate choosers (rh #464765)
 - Use %find_lang for locale-specific files (rh #448551)
--- a/nm-openvpn-fix-pw-tls-entries.patch
+++ b/nm-openvpn-fix-pw-tls-entries.patch
@ -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 @@
-                               <widget class="GtkLabel" id="label8">
-                                 <property name="visible">True</property>
-                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">CA Certificate:</property>
-+                                <property name="label" translatable="yes">User Certificate:</property>
-                               </widget>
-                               <packing>
-                                 <property name="top_attach">1</property>
-@@ -438,7 +438,7 @@
-                               <widget class="GtkLabel" id="label6">
-                                 <property name="visible">True</property>
-                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">User Certificate:</property>
-+                                <property name="label" translatable="yes">CA Certificate:</property>
-                               </widget>
-                               <packing>
-                                 <property name="top_attach">2</property>
--- a/nm-openvpn-script-security.patch
+++ b/nm-openvpn-script-security.patch
@ -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);
--- a/2
+++ b/2
@ -1 +1 @@
-cbf3db7e4e3d14ad2ec1b2689b4bc7a3  NetworkManager-openvpn-0.7.0.svn4027.tar.gz
+50ce22b0cd278d48e4118f1b9de57162  NetworkManager-openvpn-0.7.0.svn4175.tar.gz