From 2ab1bc02f86acb08fb3dbe2ad2e74099fc445f91 Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Tue, 7 Sep 2010 15:00:07 -0400 Subject: [PATCH] - Modified import and export interfaces to import_from_file and export_to_file, respectively, due to changes in NMVpnPluginUiInterface struct in NM (bz 631159). --- NetworkManager-openswan.spec | 11 +++++++---- nm-changes.patch | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 nm-changes.patch diff --git a/NetworkManager-openswan.spec b/NetworkManager-openswan.spec index c563011..0308c51 100644 --- a/NetworkManager-openswan.spec +++ b/NetworkManager-openswan.spec @@ -6,7 +6,7 @@ Summary: NetworkManager VPN plug-in for openswan Name: NetworkManager-openswan Version: 0.8.0 -Release: 5%{snapshot}%{?dist} +Release: 6%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://people.redhat.com/avagarwa/files/NetworkManager-openswan/ @@ -17,9 +17,9 @@ URL: http://people.redhat.com/avagarwa/files/NetworkManager-openswan/ Source0: http://people.redhat.com/avagarwa/files/%{name}/%{name}-%{realversion}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - Patch1: nm-secret-whack.patch Patch2: nm-616910.patch +Patch3: nm-changes.patch BuildRequires: gtk2-devel #BuildRequires: dbus-devel @@ -34,7 +34,6 @@ Requires: NetworkManager Requires: gnome-keyring Requires: openswan >= %{openswan_version} - %description This package contains software for integrating the openswan VPN software with NetworkManager and the GNOME desktop @@ -44,6 +43,7 @@ with NetworkManager and the GNOME desktop %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure --disable-static --enable-more-warnings=yes @@ -61,7 +61,6 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %clean rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-, root, root,-) %config /etc/NetworkManager/VPN/nm-openswan-service.name @@ -78,6 +77,10 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/gnome-vpn-properties/openswan %changelog +* Tue Sep 7 2010 Avesh Agarwal - 0.8.0-6.20100411git +- Modified import and export interfaces to import_from_file and export_to_file, respectively, + due to changes in NMVpnPluginUiInterface struct in NM (bz 631159). + * Mon Jul 26 2010 Avesh Agarwal - 0.8.0-5.20100411git Resolves: #616910 - Support for reading phase1 and phase2 algorithms through GUI diff --git a/nm-changes.patch b/nm-changes.patch new file mode 100644 index 0000000..d23a241 --- /dev/null +++ b/nm-changes.patch @@ -0,0 +1,14 @@ +diff -urNp NetworkManager-openswan-0.8-cvs-patched/properties/nm-openswan.c NetworkManager-openswan-0.8-current/properties/nm-openswan.c +--- NetworkManager-openswan-0.8-cvs-patched/properties/nm-openswan.c 2010-09-07 14:21:00.719407075 -0400 ++++ NetworkManager-openswan-0.8-current/properties/nm-openswan.c 2010-09-07 14:51:04.925157229 -0400 +@@ -850,8 +850,8 @@ openswan_plugin_ui_interface_init (NMVpn + /* interface implementation */ + iface_class->ui_factory = ui_factory; + iface_class->get_capabilities = get_capabilities; +- iface_class->import = NULL; +- iface_class->export = NULL; ++ iface_class->import_from_file = NULL; ++ iface_class->export_to_file = NULL; + iface_class->get_suggested_name = NULL; + iface_class->delete_connection = delete_connection; + }