08f137fc11
- Fixed 926225 - Fixed dependency to libreswan. - Created a new sub package NetworkManager-openswan-gnome - Various other spec file fixes. - Additional code changes are as follows: - Fixed an issue where proper network stack is not loaded unless _stackmanager is run before starting pluto daemon service. - Fixed the termination operation of pluto daemon to comply with libreswan changes. - Fixed various debug messages. - Fixed initiation of pluto daemon by this plugin to reflect the changes in libreaswan. - Fixed defaults values for more parameters to help the VPN connection stay more reliable. - Rewrote pluto watch API which watches the pluto process for its status. Fixed memory leak issues as not all child processes were reaped correctly. Also g_spwan_close_pid was not being called after children were reaped. Also modified debugs and added more to help with debugging in the future. - Fixed an issue where nm-openswan service is searching for ipsec binary in both /sbin and /usr/sbin leading to same operation twice, as /sbin is just symlink to /usr/sbin, so removed /sbin from the search paths. - Fixed some libreswan related macro changes. - Fixed netmask issue when sending IP information to the nm openswan plugin service. - Fixed the current code as it does not set the default route field NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT when sending VPN information to nm-openswan plugin. This fix sets the field to TRUE. - Fixed some issues found by coverity scan. - Fixed an issue where writing configuration on stdin should not end with \n as it gives error. It used to work previously, but not with latest NetworkManager versions. - libreswan related fixes, as some macros have been modified after forking to libreswan from openswan. - openswan/libreswan does not provide tun0 interface, so fixed the code where it sends tun0 interface. - Fix prcoessing of nm-openswan-dialog.ui file and added more error notifications. - Fixed dead code based on coverity scan. - Fixed gnomekeyring lib dependencies. - Fixed Networkmanager and related lib dependencies. - Fixed gtk label max width issue by setting it to 35. - NM-openswan was missing support for nm-openswan-auth-dialog.desktop.in.in. So added a new nm-openswan-auth-dialog.desktop.in.in, and modified related Makefile and configure.ac files.
35 lines
921 B
Diff
35 lines
921 B
Diff
From 41fd9ad25736659b3a465630bca7da294b1204e5 Mon Sep 17 00:00:00 2001
|
|
From: Avesh Agarwal <avagarwa@redhat.com>
|
|
Date: Tue, 10 Dec 2013 13:42:50 -0500
|
|
Subject: [PATCH 04/20] Fixed gnomekeyring lib dependencies.
|
|
|
|
---
|
|
properties/Makefile.am | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/properties/Makefile.am b/properties/Makefile.am
|
|
index f599e21..abbf208 100644
|
|
--- a/properties/Makefile.am
|
|
+++ b/properties/Makefile.am
|
|
@@ -12,6 +12,7 @@ ui_DATA = nm-openswan-dialog.ui
|
|
|
|
libnm_openswan_properties_la_CPPFLAGS = \
|
|
$(GTK_CFLAGS) \
|
|
+ $(GNOMEKEYRING_CFLAGS) \
|
|
$(NM_CFLAGS) \
|
|
-DICONDIR=\""$(datadir)/pixmaps"\" \
|
|
-DUIDIR=\""$(uidir)"\" \
|
|
@@ -22,7 +23,8 @@ libnm_openswan_properties_la_CPPFLAGS = \
|
|
|
|
libnm_openswan_properties_la_LIBADD = \
|
|
$(GTK_LIBS) \
|
|
- $(NM_LIBS)
|
|
+ $(NM_LIBS) \
|
|
+ $(GNOMEKEYRING_LIBS)
|
|
|
|
libnm_openswan_properties_la_LDFLAGS = \
|
|
-avoid-version
|
|
--
|
|
1.8.3.1
|
|
|