rpms/NetworkManager-libreswan
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixes 1035786 (and its duplicate 1040924)

Browse Source
This commit is contained in:
Avesh Agarwal 2013-12-12 15:01:25 -05:00
parent 08f137fc11
commit 2d9f888955
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NetworkManager-openswan.spec
View File

@ -5,7 +5,7 @@
Summary: NetworkManager VPN plug-in for openswan
Name: NetworkManager-openswan
Version: 0.9.8.4
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openswan/0.9/
@ -31,6 +31,7 @@ Patch17: 0017-Fixed-initiation-of-pluto-daemon-by-this-plugin-to-r.patch
Patch18: 0018-Fixed-various-debug-messages.patch
Patch19: 0019-Fixed-the-termination-operation-of-pluto-daemon-to-c.patch
Patch20: 0020-Fixed-an-issue-where-proper-network-stack-is-not-loa.patch
Patch21: nm-openswan-1035786-1040924.patch
BuildRequires: gtk3-devel
BuildRequires: dbus-devel
@ -94,6 +95,7 @@ the openswan/libreswan server with NetworkManager (GNOME files).
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%build
autoreconf
@ -138,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Dec 12 2013 Avesh Agarwal <avagarwa@redhat.com> - 0.9.8.4-2
- Fixes 1035786 (and its duplicate 1040924)
* Tue Dec 10 2013 Avesh Agarwal <avagarwa@redhat.com> - 0.9.8.4-1
- New upstream release 0.9.8.4
- Fixed 926225

30
nm-openswan-1035786-1040924.patch Normal file
View File

@ -0,0 +1,30 @@
commit 044bd7593961389f24b1fdab7849f86da9f96246
Author: Avesh Agarwal <avagarwa@redhat.com>
Date: Thu Dec 12 14:55:26 2013 -0500
Fixes for rhbz#1035786 (and its duplicate: rhbz#1040924).
The patch is from here:
https://bug720319.bugzilla-attachments.gnome.org/attachment.cgi?id=264063
Just did minor modifcation.
diff --git a/properties/nm-openswan.c b/properties/nm-openswan.c
index e164e85..7bb1413 100644
--- a/properties/nm-openswan.c
+++ b/properties/nm-openswan.c
@@ -580,6 +580,7 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
char *ui_file;
NMSettingVPN *s_vpn;
gboolean is_new = TRUE;
+ const char *object_ids[] = { "openswan-vbox", "model1", "model2", NULL };
if (error)
g_return_val_if_fail (*error == NULL, NULL);
@@ -598,7 +599,7 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
- if (!gtk_builder_add_from_file (priv->builder, ui_file, error)) {
+ if (!gtk_builder_add_objects_from_file (priv->builder, ui_file, object_ids, error)) {
g_warning ("Couldn't load builder file: %s",
error && *error ? (*error)->message : "(unknown)");
g_clear_error (error);