From 916cd5d7ca35f37e2db81da7db07e12fa96ab373 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 21 Oct 2015 12:55:03 +0200 Subject: [PATCH 01/10] nm: Move the D-Bus policy to charon-nm It's needed for useful use of charon-nm, unlike the GUI. --- src/charon-nm/Makefile.am | 3 +++ .../gnome => charon-nm}/nm-strongswan-service.conf | 0 src/frontends/gnome/Makefile.am | 7 ++----- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/{frontends/gnome => charon-nm}/nm-strongswan-service.conf (100%) diff --git a/src/charon-nm/Makefile.am b/src/charon-nm/Makefile.am index 6ab7f27c5..5c1591bab 100644 --- a/src/charon-nm/Makefile.am +++ b/src/charon-nm/Makefile.am @@ -22,3 +22,6 @@ charon_nm_LDADD = \ $(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libcharon/libcharon.la \ -lm $(PTHREADLIB) $(ATOMICLIB) $(DLLIB) ${nm_LIBS} + +dbusservicedir = $(sysconfdir)/dbus-1/system.d +dbusservice_DATA = nm-strongswan-service.conf diff --git a/src/frontends/gnome/nm-strongswan-service.conf b/src/charon-nm/nm-strongswan-service.conf similarity index 100% rename from src/frontends/gnome/nm-strongswan-service.conf rename to src/charon-nm/nm-strongswan-service.conf diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am index 6ea29e0b4..a101995b2 100644 --- a/src/frontends/gnome/Makefile.am +++ b/src/frontends/gnome/Makefile.am @@ -2,9 +2,6 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = properties auth-dialog po -dbusservicedir = $(sysconfdir)/dbus-1/system.d -dbusservice_DATA = nm-strongswan-service.conf - nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN nmvpnservice_DATA = nm-strongswan-service.name @@ -20,8 +17,8 @@ nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \ -e 's|[@]CHARON[@]|$(charon)|' $< >$@ -EXTRA_DIST = nm-strongswan-service.name.in \ - $(dbusservice_DATA) \ +EXTRA_DIST = \ + nm-strongswan-service.name.in \ $(appdata_in_files) \ $(appdata_DATA) \ intltool-extract.in \ From 15797791199a325977fb6b6108175c6bb086c7da Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 16 Apr 2016 20:39:45 +0200 Subject: [PATCH 02/10] nm: Don't do in dbus service file It does more than intended; apart from denying messages to that particular interface it also denies all messages non-qualified with an interface globally. This blocks messages completely unrelated to strongSwan's VPN plugin, such as NetworkManager communication with the VPN plugins. From the dbus-daemon manual: Be careful with send_interface/receive_interface, because the interface field in messages is optional. In particular, do NOT specify ! This will cause no-interface messages to be blocked for all services, which is almost certainly not what you intended. Always use rules of the form: We can just safely remove those rules, since we're sufficiently protected by the send_destination matches and method calls are disallowed by default anyway. Closes strongswan/strongswan#42. --- src/charon-nm/nm-strongswan-service.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/src/charon-nm/nm-strongswan-service.conf b/src/charon-nm/nm-strongswan-service.conf index dccc19af9..a630f3407 100644 --- a/src/charon-nm/nm-strongswan-service.conf +++ b/src/charon-nm/nm-strongswan-service.conf @@ -10,7 +10,6 @@ - From 97939530e028cae15b723b3fe023a16208788173 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 23 Apr 2016 10:51:43 +0200 Subject: [PATCH 03/10] nm: Automatically determine path to the auth dialog --- src/frontends/gnome/Makefile.am | 2 +- src/frontends/gnome/auth-dialog/Makefile.am | 2 +- src/frontends/gnome/configure.ac | 3 +++ src/frontends/gnome/nm-strongswan-service.name.in | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am index a101995b2..2fc793ebe 100644 --- a/src/frontends/gnome/Makefile.am +++ b/src/frontends/gnome/Makefile.am @@ -14,7 +14,7 @@ appdata_in_files = NetworkManager-strongswan.appdata.xml.in nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in $(AM_V_GEN) \ - sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \ + sed -e 's|[@]NM_LIBEXECDIR[@]|$(nm_libexecdir)|' \ -e 's|[@]CHARON[@]|$(charon)|' $< >$@ EXTRA_DIST = \ diff --git a/src/frontends/gnome/auth-dialog/Makefile.am b/src/frontends/gnome/auth-dialog/Makefile.am index c91c6249c..9e3065206 100644 --- a/src/frontends/gnome/auth-dialog/Makefile.am +++ b/src/frontends/gnome/auth-dialog/Makefile.am @@ -1,4 +1,4 @@ -libexec_PROGRAMS = nm-strongswan-auth-dialog +nm_libexec_PROGRAMS = nm-strongswan-auth-dialog nm_strongswan_auth_dialog_CPPFLAGS = \ $(GTHREAD_CFLAGS) \ diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac index 047772d94..13c357911 100644 --- a/src/frontends/gnome/configure.ac +++ b/src/frontends/gnome/configure.ac @@ -14,6 +14,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_INSTALL AC_PROG_LIBTOOL +PKG_PROG_PKG_CONFIG dnl dnl Required headers @@ -75,6 +76,8 @@ AC_ARG_WITH( [AC_SUBST(charon, "$withval")], [AC_SUBST(charon, "${libexecdir}/ipsec/charon-nm")] ) +nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager) +AC_SUBST(nm_libexecdir) NM_COMPILER_WARNINGS diff --git a/src/frontends/gnome/nm-strongswan-service.name.in b/src/frontends/gnome/nm-strongswan-service.name.in index 4120e55ae..ccba0b7b9 100644 --- a/src/frontends/gnome/nm-strongswan-service.name.in +++ b/src/frontends/gnome/nm-strongswan-service.name.in @@ -4,5 +4,5 @@ service=org.freedesktop.NetworkManager.strongswan program=@CHARON@ [GNOME] -auth-dialog=@LIBEXECDIR@/nm-strongswan-auth-dialog +auth-dialog=@NM_LIBEXECDIR@/nm-strongswan-auth-dialog properties=libnm-strongswan-properties From 49b3d818eaede7fd8fd6f8500e8d3a856c40dd7a Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 29 Jul 2016 18:22:19 +0200 Subject: [PATCH 04/10] nm: Automatically determine NM plugin directory --- src/frontends/gnome/configure.ac | 2 ++ src/frontends/gnome/properties/Makefile.am | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac index 13c357911..1a7df205a 100644 --- a/src/frontends/gnome/configure.ac +++ b/src/frontends/gnome/configure.ac @@ -78,6 +78,8 @@ AC_ARG_WITH( ) nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager) AC_SUBST(nm_libexecdir) +nm_plugindir=$($PKG_CONFIG --variable=plugindir NetworkManager) +AC_SUBST(nm_plugindir) NM_COMPILER_WARNINGS diff --git a/src/frontends/gnome/properties/Makefile.am b/src/frontends/gnome/properties/Makefile.am index 1b7fbb9a1..66f2d5124 100644 --- a/src/frontends/gnome/properties/Makefile.am +++ b/src/frontends/gnome/properties/Makefile.am @@ -1,5 +1,4 @@ -plugindir = $(libdir)/NetworkManager -plugin_LTLIBRARIES = libnm-strongswan-properties.la +nm_plugin_LTLIBRARIES = libnm-strongswan-properties.la libnm_strongswan_properties_la_SOURCES = \ nm-strongswan.c \ From 1cddc4da77ebf82141c158c294f750f2427141b9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 23 Oct 2015 11:29:42 +0200 Subject: [PATCH 05/10] nm: Install the .name file into /usr/lib/NetworkManager/VPN It's the preferred location for system-provided plugins. A compatible file in /etc is still kept. Also, the compatibility /etc file needs to use a full path due to a bug in GNOME Shell. The full path to a arch-dependent file in a supposedly arch-independent file is a sin and a multilib violation in some distributions. However. some pre-release versions of NetworkManager-1.2 as shipped by distributions require a full path. Let's keep a configure-time option for that. --- src/frontends/gnome/Makefile.am | 19 +++++++++++++++++-- src/frontends/gnome/configure.ac | 7 +++++++ .../gnome/nm-strongswan-service.name.in | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am index 2fc793ebe..12fa6cfb2 100644 --- a/src/frontends/gnome/Makefile.am +++ b/src/frontends/gnome/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = properties auth-dialog po -nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN +nmvpnservicedir = $(prefix)/lib/NetworkManager/VPN nmvpnservice_DATA = nm-strongswan-service.name @INTLTOOL_DESKTOP_RULE@ @@ -12,9 +12,24 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml) appdata_in_files = NetworkManager-strongswan.appdata.xml.in @INTLTOOL_XML_RULE@ +# Install a file with full path to plugins for an old gnome-shell +# https://bugzilla.gnome.org/show_bug.cgi?id=693590 +install-data-hook: + mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN + sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \ + -e 's|[@]NM_LIBEXECDIR[@]|$(nm_libexecdir)|g' \ + -e 's|[@]NM_PLUGINDIR[@]|$(nm_plugindir)|g' \ + -e 's|[@]CHARON[@]|$(charon)|' \ + <$(srcdir)/nm-strongswan-service.name.in \ + >$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-strongswan-service.name + +uninstall-hook: + rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-strongswan-service.name + nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in $(AM_V_GEN) \ sed -e 's|[@]NM_LIBEXECDIR[@]|$(nm_libexecdir)|' \ + -e 's|[@]NM_PLUGINDIR[@]/|$(nm_plugindir_abs)|g' \ -e 's|[@]CHARON[@]|$(charon)|' $< >$@ EXTRA_DIST = \ @@ -25,7 +40,7 @@ EXTRA_DIST = \ intltool-merge.in \ intltool-update.in -CLEANFILES = $(nmvpnservice_DATA) $(appdata_DATA) *~ +CLEANFILES = $(appdata_DATA) *~ DISTCLEANFILES = intltool-extract intltool-merge intltool-update ACLOCAL_AMFLAGS = -I m4 diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac index 1a7df205a..bf73d1d2e 100644 --- a/src/frontends/gnome/configure.ac +++ b/src/frontends/gnome/configure.ac @@ -76,10 +76,17 @@ AC_ARG_WITH( [AC_SUBST(charon, "$withval")], [AC_SUBST(charon, "${libexecdir}/ipsec/charon-nm")] ) +AC_ARG_ENABLE( + [nm-absolute-paths], + AS_HELP_STRING([--enable-nm-absolute-paths],[use absolute paths for NM plugins in the .name file]) +) + nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager) AC_SUBST(nm_libexecdir) nm_plugindir=$($PKG_CONFIG --variable=plugindir NetworkManager) AC_SUBST(nm_plugindir) +test x"$enable_nm_absolute_paths" = x"yes" && nm_plugindir_abs="$(nm_plugindir)/" +AC_SUBST(nm_plugindir_abs) NM_COMPILER_WARNINGS diff --git a/src/frontends/gnome/nm-strongswan-service.name.in b/src/frontends/gnome/nm-strongswan-service.name.in index ccba0b7b9..eb64a22ff 100644 --- a/src/frontends/gnome/nm-strongswan-service.name.in +++ b/src/frontends/gnome/nm-strongswan-service.name.in @@ -5,4 +5,4 @@ program=@CHARON@ [GNOME] auth-dialog=@NM_LIBEXECDIR@/nm-strongswan-auth-dialog -properties=libnm-strongswan-properties +properties=@NM_PLUGINDIR@/libnm-strongswan-properties From 7f45e70ba12672b3916d42b1864820fa2a7f8952 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 21 Oct 2015 12:35:59 +0200 Subject: [PATCH 06/10] nm: Drop some unneeded dependencies --- src/frontends/gnome/auth-dialog/Makefile.am | 1 - src/frontends/gnome/configure.ac | 8 -------- src/frontends/gnome/debian/control | 1 - 3 files changed, 10 deletions(-) diff --git a/src/frontends/gnome/auth-dialog/Makefile.am b/src/frontends/gnome/auth-dialog/Makefile.am index 9e3065206..7bbd71d58 100644 --- a/src/frontends/gnome/auth-dialog/Makefile.am +++ b/src/frontends/gnome/auth-dialog/Makefile.am @@ -1,7 +1,6 @@ nm_libexec_PROGRAMS = nm-strongswan-auth-dialog nm_strongswan_auth_dialog_CPPFLAGS = \ - $(GTHREAD_CFLAGS) \ $(GTK_CFLAGS) \ $(LIBGNOMEUI_CFLAGS) \ $(GNOMEKEYRING_CFLAGS) \ diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac index bf73d1d2e..7f342d535 100644 --- a/src/frontends/gnome/configure.ac +++ b/src/frontends/gnome/configure.ac @@ -43,14 +43,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) IT_PROG_INTLTOOL([0.35]) AM_GLIB_GNU_GETTEXT -PKG_CHECK_MODULES(GTHREAD, gthread-2.0) -AC_SUBST(GTHREAD_CFLAGS) -AC_SUBST(GTHREAD_LIBS) - -PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.30) -AC_SUBST(DBUS_CFLAGS) -AC_SUBST(DBUS_LIBS) - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) diff --git a/src/frontends/gnome/debian/control b/src/frontends/gnome/debian/control index 4ab004c8b..d756434f6 100644 --- a/src/frontends/gnome/debian/control +++ b/src/frontends/gnome/debian/control @@ -8,7 +8,6 @@ Build-Depends: cdbs, libnm-util-dev (>= 0.9), libnm-glib-dev (>= 0.9), libnm-glib-vpn-dev (>= 0.9), - libdbus-glib-1-dev, libgnomeui-dev, automake, gnome-common, From b86b6b828297aae20232d37955109a1beaafccae Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 21 Oct 2015 10:54:18 +0200 Subject: [PATCH 07/10] nm: Drop useless calls to AC_SUBST PKG_CHECK_MODULES does the substitutions. --- src/frontends/gnome/configure.ac | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac index 7f342d535..0aee4a5d5 100644 --- a/src/frontends/gnome/configure.ac +++ b/src/frontends/gnome/configure.ac @@ -44,23 +44,12 @@ IT_PROG_INTLTOOL([0.35]) AM_GLIB_GNU_GETTEXT PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6) -AC_SUBST(GTK_CFLAGS) -AC_SUBST(GTK_LIBS) - PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) -AC_SUBST(LIBGNOMEUI_CFLAGS) -AC_SUBST(LIBGNOMEUI_LIBS) - PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1) -AC_SUBST(GNOMEKEYRING_CFLAGS) -AC_SUBST(GNOMEKEYRING_LIBS) - PKG_CHECK_EXISTS([libnm-glib], [PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.9.0 libnm-util libnm-glib libnm-glib-vpn)], [PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.9.0 libnm-util libnm_glib libnm_glib_vpn)] ) -AC_SUBST(NM_UTILS_CFLAGS) -AC_SUBST(NM_UTILS_LIBS) AC_ARG_WITH( [charon], From a88831a01858bf0b76cf4d0d612071e94d9e26db Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 29 Mar 2016 19:33:26 +0200 Subject: [PATCH 08/10] nm: Replace libgnomekeyring with libsecret The former is deprecated and the newer API is nicer anyway. --- src/frontends/gnome/auth-dialog/Makefile.am | 5 +- src/frontends/gnome/auth-dialog/main.c | 52 +++++++-------------- src/frontends/gnome/configure.ac | 2 +- src/frontends/gnome/debian/control | 1 + 4 files changed, 20 insertions(+), 40 deletions(-) diff --git a/src/frontends/gnome/auth-dialog/Makefile.am b/src/frontends/gnome/auth-dialog/Makefile.am index 7bbd71d58..9c9f7d6a0 100644 --- a/src/frontends/gnome/auth-dialog/Makefile.am +++ b/src/frontends/gnome/auth-dialog/Makefile.am @@ -3,7 +3,7 @@ nm_libexec_PROGRAMS = nm-strongswan-auth-dialog nm_strongswan_auth_dialog_CPPFLAGS = \ $(GTK_CFLAGS) \ $(LIBGNOMEUI_CFLAGS) \ - $(GNOMEKEYRING_CFLAGS) \ + $(LIBSECRET_CFLAGS) \ $(NETWORK_MANAGER_CFLAGS) \ $(NM_UTILS_CFLAGS) \ -DG_DISABLE_DEPRECATED \ @@ -17,6 +17,5 @@ nm_strongswan_auth_dialog_SOURCES = \ nm_strongswan_auth_dialog_LDADD = \ $(GTK_LIBS) \ $(LIBGNOMEUI_LIBS) \ - $(GNOMEKEYRING_LIBS) \ + $(LIBSECRET_LIBS) \ $(NM_UTILS_LIBS) - diff --git a/src/frontends/gnome/auth-dialog/main.c b/src/frontends/gnome/auth-dialog/main.c index b9fd886d5..3d5d84390 100644 --- a/src/frontends/gnome/auth-dialog/main.c +++ b/src/frontends/gnome/auth-dialog/main.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -31,35 +31,6 @@ #define NM_DBUS_SERVICE_STRONGSWAN "org.freedesktop.NetworkManager.strongswan" -/** - * lookup a password in the keyring - */ -static char *lookup_password(char *name, char *service) -{ - GList *list; - GList *iter; - char *pass = NULL; - - if (gnome_keyring_find_network_password_sync(g_get_user_name(), NULL, name, - NULL, service, NULL, 0, &list) != GNOME_KEYRING_RESULT_OK) - { - return NULL; - } - - for (iter = list; iter; iter = iter->next) - { - GnomeKeyringNetworkPasswordData *data = iter->data; - - if (strcmp(data->object, "password") == 0 && data->password) - { - pass = g_strdup(data->password); - break; - } - } - gnome_keyring_network_password_list_free(list); - return pass; -} - /** * Wait for quit input */ @@ -118,7 +89,7 @@ int main (int argc, char *argv[]) gchar *name = NULL, *uuid = NULL, *service = NULL, *keyring = NULL, *pass; GOptionContext *context; char *agent, *type; - guint32 itemid, minlen = 0; + guint32 minlen = 0; GtkWidget *dialog; GOptionEntry entries[] = { { "reprompt", 'r', 0, G_OPTION_ARG_NONE, &retry, "Reprompt for passwords", NULL}, @@ -162,7 +133,12 @@ int main (int argc, char *argv[]) if (!strcmp(type, "eap") || !strcmp(type, "key") || !strcmp(type, "psk") || !strcmp(type, "smartcard")) { - pass = lookup_password(name, service); + pass = secret_password_lookup_sync(SECRET_SCHEMA_COMPAT_NETWORK, NULL, NULL, + "user", g_get_user_name(), + "server", name, + "protocol", service, + NULL); + if ((!pass || retry) && allow_interaction) { if (!strcmp(type, "eap")) @@ -216,12 +192,15 @@ too_short_retry: case GNOME_PASSWORD_DIALOG_REMEMBER_NOTHING: break; case GNOME_PASSWORD_DIALOG_REMEMBER_SESSION: - keyring = "session"; + keyring = SECRET_COLLECTION_SESSION; /* FALL */ case GNOME_PASSWORD_DIALOG_REMEMBER_FOREVER: - if (gnome_keyring_set_network_password_sync(keyring, - g_get_user_name(), NULL, name, "password", service, NULL, 0, - pass, &itemid) != GNOME_KEYRING_RESULT_OK) + if (!secret_password_store_sync(SECRET_SCHEMA_COMPAT_NETWORK, + keyring, "", pass, NULL, NULL, + "user", g_get_user_name(), + "server", name, + "protocol", service, + NULL)) { g_warning ("storing password in keyring failed"); } @@ -231,6 +210,7 @@ too_short_retry: if (pass) { printf("password\n%s\n", pass); + g_free(pass); } } else diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac index 0aee4a5d5..f9da6c01c 100644 --- a/src/frontends/gnome/configure.ac +++ b/src/frontends/gnome/configure.ac @@ -45,7 +45,7 @@ AM_GLIB_GNU_GETTEXT PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6) PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) -PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1) +PKG_CHECK_MODULES(LIBSECRET, libsecret-1) PKG_CHECK_EXISTS([libnm-glib], [PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.9.0 libnm-util libnm-glib libnm-glib-vpn)], [PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.9.0 libnm-util libnm_glib libnm_glib_vpn)] diff --git a/src/frontends/gnome/debian/control b/src/frontends/gnome/debian/control index d756434f6..be60bcf14 100644 --- a/src/frontends/gnome/debian/control +++ b/src/frontends/gnome/debian/control @@ -9,6 +9,7 @@ Build-Depends: cdbs, libnm-glib-dev (>= 0.9), libnm-glib-vpn-dev (>= 0.9), libgnomeui-dev, + libsecret-1-dev, automake, gnome-common, Standards-Version: 3.8.3 From ab01ae3cae9936991b08ec602c32f56f0ce71c03 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 6 Apr 2016 18:18:29 +0200 Subject: [PATCH 09/10] nm: Remove incorrect top-level GtkWindow Fixes #1013. --- .../gnome/properties/nm-strongswan-dialog.ui | 636 +++++++++--------- 1 file changed, 315 insertions(+), 321 deletions(-) diff --git a/src/frontends/gnome/properties/nm-strongswan-dialog.ui b/src/frontends/gnome/properties/nm-strongswan-dialog.ui index c90b64542..6aea549fb 100644 --- a/src/frontends/gnome/properties/nm-strongswan-dialog.ui +++ b/src/frontends/gnome/properties/nm-strongswan-dialog.ui @@ -1,113 +1,24 @@ - + + True False - window1 + start + 12 + 16 - + True False - start - 12 - 16 + 6 - + True False - 6 - - - True - False - 0 - <b>Gateway</b> - True - - - False - False - 0 - - - - - True - False - 12 - - - True - False - 2 - 2 - 6 - 6 - - - True - False - 0 - _Address: - True - address-entry - - - GTK_FILL - - - - - - True - True - True - An IP address or hostname the Gateway can be contacted. - - - 1 - 2 - - - - - - True - False - 0 - C_ertificate: - True - certificate-button - - - 1 - 2 - GTK_FILL - - - - - - True - False - Gateway or CA certificate to use for gateway authentication. If none is specified, pre-installed CA certificates are used. - - - 1 - 2 - 1 - 2 - - - - - - - True - True - 1 - - + 0 + <b>Gateway</b> + True False @@ -116,264 +27,347 @@ - + True False - 6 + 12 - + True False - 0 - <b>Client</b> - True - - - False - False - 0 - - - - - True - False - 12 + 2 + 2 + 6 + 6 - + True False - 4 - 2 - 6 - 6 - - - True - False - Private key to use for client authentication. This key has to match the certificates public key and may be encrypted. - - - 1 - 2 - 3 - 4 - - - - - True - False - 0 - Private _key: - True - userkey-button - - - 3 - 4 - GTK_FILL - - - - - - True - False - 0 - Au_thentication: - True - - - GTK_FILL - - - - - - True - False - 0 - _Username: - True - user-entry - - - 1 - 2 - GTK_FILL - - - - - - True - True - True - The username (identity) to use for authentication against the gateway. - - - 1 - 2 - 1 - 2 - - - - - - True - False - 0 - Ce_rtificate: - True - usercert-button - - - 2 - 3 - GTK_FILL - - - - - - True - False - Client certificate to use for client authentication. - - - 1 - 2 - 2 - 3 - - - - - True - False - - - 1 - 2 - - + 0 + _Address: + True + address-entry + + GTK_FILL + + + + + + True + True + True + An IP address or hostname the Gateway can be contacted. + + + 1 + 2 + + + + + + True + False + 0 + C_ertificate: + True + certificate-button + + + 1 + 2 + GTK_FILL + + + + + + True + False + Gateway or CA certificate to use for gateway authentication. If none is specified, pre-installed CA certificates are used. + + + 1 + 2 + 1 + 2 + - - True - True - 1 - + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + <b>Client</b> + True + False False - 1 + 0 - + True False - 6 + 12 - + True False - 0 - <b>Options</b> - True - - - False - False - 0 - - - - - True - False - 12 + 4 + 2 + 6 + 6 - + True False - - - Request an _inner IP address - True - True - False - True - The Gateway may provide addresses from a pool to use for communication in the Gateways network. Check to request such an address. - False - True - True - - - True - True - 0 - - - - - En_force UDP encapsulation - True - True - False - True - Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT situation is detected might help in such cases. - False - True - True - - - True - True - 1 - - - - - Use IP c_ompression - True - True - False - True - IPComp compresses raw IP packets before they get encrypted. This saves some bandwidth, but uses more processing power. - False - True - True - - - True - True - 2 - - + Private key to use for client authentication. This key has to match the certificates public key and may be encrypted. + + 1 + 2 + 3 + 4 + + + + + True + False + 0 + Private _key: + True + userkey-button + + + 3 + 4 + GTK_FILL + + + + + + True + False + 0 + Au_thentication: + True + + + GTK_FILL + + + + + + True + False + 0 + _Username: + True + user-entry + + + 1 + 2 + GTK_FILL + + + + + + True + True + True + The username (identity) to use for authentication against the gateway. + + + 1 + 2 + 1 + 2 + + + + + + True + False + 0 + Ce_rtificate: + True + usercert-button + + + 2 + 3 + GTK_FILL + + + + + + True + False + Client certificate to use for client authentication. + + + 1 + 2 + 2 + 3 + + + + + True + False + + + 1 + 2 + - - True - True - 1 - - False + True True - 2 + 1 + + False + False + 1 + + + + + True + False + 6 + + + True + False + 0 + <b>Options</b> + True + + + False + False + 0 + + + + + True + False + 12 + + + True + False + + + Request an _inner IP address + True + True + False + True + The Gateway may provide addresses from a pool to use for communication in the Gateways network. Check to request such an address. + False + True + True + + + True + True + 0 + + + + + En_force UDP encapsulation + True + True + False + True + Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT situation is detected might help in such cases. + False + True + True + + + True + True + 1 + + + + + Use IP c_ompression + True + True + False + True + IPComp compresses raw IP packets before they get encrypted. This saves some bandwidth, but uses more processing power. + False + True + True + + + True + True + 2 + + + + + + + True + True + 1 + + + + + False + True + 2 + From 8504d31a864b6fa6bf280e202a604d2cf9859b19 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 6 Apr 2016 18:20:12 +0200 Subject: [PATCH 10/10] nm: Version bumb to 1.3.2 --- src/frontends/gnome/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac index f9da6c01c..a2e3beef3 100644 --- a/src/frontends/gnome/configure.ac +++ b/src/frontends/gnome/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.52) -AC_INIT(NetworkManager-strongswan, 1.3.1, martin@strongswan.org, NetworkManager-strongswan) +AC_INIT(NetworkManager-strongswan, 1.3.2, martin@strongswan.org, NetworkManager-strongswan) AM_INIT_AUTOMAKE([subdir-objects]) AM_MAINTAINER_MODE