Hello community,
here is the log from the commit of package NetworkManager-strongswan for
openSUSE:Factory checked in at 2017-09-12 19:53:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-strongswan (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-strongswan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-strongswan"
Tue Sep 12 19:53:48 2017 rev:16 rq:522154 version:1.4.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/NetworkManager-strongswan/NetworkManager-strongswan.changes
2016-11-02 12:47:55.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.NetworkManager-strongswan.new/NetworkManager-strongswan.changes
2017-09-12 19:53:50.452187590 +0200
@@ -1,0 +2,7 @@
+Thu Sep 7 19:57:20 UTC 2017 - [email protected]
+
+- Update to version 1.4.2:
+ + Add support to configure IKE/ESP proposals.
+ + Explicitly prevent PIN from getting stored.
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-strongswan-1.4.1.tar.bz2
New:
----
NetworkManager-strongswan-1.4.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-strongswan.spec ++++++
--- /var/tmp/diff_new_pack.gn8x2o/_old 2017-09-12 19:53:52.491900794 +0200
+++ /var/tmp/diff_new_pack.gn8x2o/_new 2017-09-12 19:53:52.495900232 +0200
@@ -1,7 +1,7 @@
#
# spec file for package NetworkManager-strongswan
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: NetworkManager-strongswan
-Version: 1.4.1
+Version: 1.4.2
Release: 0
Summary: NetworkManager VPN support for strongSwan
License: GPL-2.0+
++++++ NetworkManager-strongswan-1.4.1.tar.bz2 ->
NetworkManager-strongswan-1.4.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-strongswan-1.4.1/Makefile.in
new/NetworkManager-strongswan-1.4.2/Makefile.in
--- old/NetworkManager-strongswan-1.4.1/Makefile.in 2016-10-21
09:44:53.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.2/Makefile.in 2017-05-30
14:42:21.000000000 +0200
@@ -193,8 +193,7 @@
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in NEWS \
- compile config.guess config.sub depcomp install-sh ltmain.sh \
- missing
+ compile config.guess config.sub install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-strongswan-1.4.1/NEWS
new/NetworkManager-strongswan-1.4.2/NEWS
--- old/NetworkManager-strongswan-1.4.1/NEWS 2016-10-21 09:44:33.000000000
+0200
+++ new/NetworkManager-strongswan-1.4.2/NEWS 2017-05-30 14:41:41.000000000
+0200
@@ -1,3 +1,9 @@
+NetworkManager-strongswan-1.4.2
+-------------------------------
+
+- Add support to configure IKE/ESP proposals
+- Explicitly prevent PIN from getting stored
+
NetworkManager-strongswan-1.4.1
-------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/NetworkManager-strongswan-1.4.1/auth-dialog/Makefile.in
new/NetworkManager-strongswan-1.4.2/auth-dialog/Makefile.in
--- old/NetworkManager-strongswan-1.4.1/auth-dialog/Makefile.in 2016-10-21
09:44:53.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.2/auth-dialog/Makefile.in 2017-05-30
14:42:21.000000000 +0200
@@ -376,9 +376,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auth-dialog/Makefile';
\
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu auth-dialog/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign auth-dialog/Makefile
+ $(AUTOMAKE) --gnu auth-dialog/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-strongswan-1.4.1/configure
new/NetworkManager-strongswan-1.4.2/configure
--- old/NetworkManager-strongswan-1.4.1/configure 2016-10-21
09:44:54.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.2/configure 2017-05-30
14:42:19.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NetworkManager-strongswan 1.4.1.
+# Generated by GNU Autoconf 2.69 for NetworkManager-strongswan 1.4.2.
#
# Report bugs to <[email protected]>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='NetworkManager-strongswan'
PACKAGE_TARNAME='NetworkManager-strongswan'
-PACKAGE_VERSION='1.4.1'
-PACKAGE_STRING='NetworkManager-strongswan 1.4.1'
+PACKAGE_VERSION='1.4.2'
+PACKAGE_STRING='NetworkManager-strongswan 1.4.2'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''
@@ -1413,7 +1413,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures NetworkManager-strongswan 1.4.1 to adapt to many kinds
of systems.
+\`configure' configures NetworkManager-strongswan 1.4.2 to adapt to many kinds
of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1485,7 +1485,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NetworkManager-strongswan
1.4.1:";;
+ short | recursive ) echo "Configuration of NetworkManager-strongswan
1.4.2:";;
esac
cat <<\_ACEOF
@@ -1630,7 +1630,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NetworkManager-strongswan configure 1.4.1
+NetworkManager-strongswan configure 1.4.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2053,7 +2053,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by NetworkManager-strongswan $as_me 1.4.1, which was
+It was created by NetworkManager-strongswan $as_me 1.4.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2916,7 +2916,7 @@
# Define the identity of the package.
PACKAGE='NetworkManager-strongswan'
- VERSION='1.4.1'
+ VERSION='1.4.2'
cat >>confdefs.h <<_ACEOF
@@ -15012,7 +15012,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by NetworkManager-strongswan $as_me 1.4.1, which was
+This file was extended by NetworkManager-strongswan $as_me 1.4.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15078,7 +15078,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-NetworkManager-strongswan config.status 1.4.1
+NetworkManager-strongswan config.status 1.4.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-strongswan-1.4.1/configure.ac
new/NetworkManager-strongswan-1.4.2/configure.ac
--- old/NetworkManager-strongswan-1.4.1/configure.ac 2016-10-21
09:44:33.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.2/configure.ac 2017-05-30
14:41:41.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.52)
-AC_INIT(NetworkManager-strongswan, 1.4.1, [email protected],
NetworkManager-strongswan)
+AC_INIT(NetworkManager-strongswan, 1.4.2, [email protected],
NetworkManager-strongswan)
AM_INIT_AUTOMAKE([subdir-objects])
AM_MAINTAINER_MODE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/NetworkManager-strongswan-1.4.1/properties/Makefile.in
new/NetworkManager-strongswan-1.4.2/properties/Makefile.in
--- old/NetworkManager-strongswan-1.4.1/properties/Makefile.in 2016-10-21
09:44:53.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.2/properties/Makefile.in 2017-05-30
14:42:21.000000000 +0200
@@ -445,9 +445,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign properties/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu properties/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign properties/Makefile
+ $(AUTOMAKE) --gnu properties/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/NetworkManager-strongswan-1.4.1/properties/nm-strongswan-dialog.ui
new/NetworkManager-strongswan-1.4.2/properties/nm-strongswan-dialog.ui
--- old/NetworkManager-strongswan-1.4.1/properties/nm-strongswan-dialog.ui
2016-10-21 09:44:33.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.2/properties/nm-strongswan-dialog.ui
2017-05-30 14:41:41.000000000 +0200
@@ -426,5 +426,150 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkVBox" id="proposals-vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="proposals-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Cipher
proposals</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="proposal-alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton" id="proposal-check">
+ <property name="label" translatable="yes">_Enable custom
proposals</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="proposal-table">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="ike-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="ypad">1</property>
+ <property name="label"
translatable="yes">_IKE:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">ike-entry</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="ike-entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">A
list of proposals for IKE separated by ";". (A suffix of ! enforces strict
mode)</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="esp-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">_ESP:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">address-entry</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="esp-entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">A
list of proposals for ESP separated by ";". (A suffix of ! enforces strict
mode)</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
</interface>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/NetworkManager-strongswan-1.4.1/properties/nm-strongswan.c
new/NetworkManager-strongswan-1.4.2/properties/nm-strongswan.c
--- old/NetworkManager-strongswan-1.4.1/properties/nm-strongswan.c
2016-10-21 09:44:33.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.2/properties/nm-strongswan.c
2017-05-30 14:41:41.000000000 +0200
@@ -229,6 +229,15 @@
}
static void
+toggle_proposal_cb(GtkCheckButton *button, StrongswanPluginUiWidget *self)
+{
+ StrongswanPluginUiWidgetPrivate *priv =
STRONGSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
+ gboolean visible =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
+
gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(priv->builder,
"ike-entry")), visible);
+
gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(priv->builder,
"esp-entry")), visible);
+}
+
+static void
password_storage_changed_cb (GObject *entry, GParamSpec *pspec, gpointer
user_data)
{
settings_changed_cb (NULL, STRONGSWAN_PLUGIN_UI_WIDGET (user_data));
@@ -372,6 +381,34 @@
}
g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK
(settings_changed_cb), self);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"proposal-check"));
+ value = nm_setting_vpn_get_data_item(settings, "proposal");
+ if (value && strcmp(value, "yes") == 0)
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
+ else
+ toggle_proposal_cb(GTK_CHECK_BUTTON(widget), self);
+ g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK
(toggle_proposal_cb), self);
+
+ widget = GTK_WIDGET(gtk_builder_get_object(priv->builder, "ike-entry"));
+ value = nm_setting_vpn_get_data_item(settings, "ike");
+ if (value)
+ {
+ value = g_strdelimit (g_strdup (value), ";", ',');
+ gtk_entry_set_text (GTK_ENTRY (widget), value);
+ g_free ((char*)value);
+ }
+ g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK
(settings_changed_cb), self);
+
+ widget = GTK_WIDGET(gtk_builder_get_object(priv->builder, "esp-entry"));
+ value = nm_setting_vpn_get_data_item(settings, "esp");
+ if (value)
+ {
+ value = g_strdelimit (g_strdup (value), ";", ',');
+ gtk_entry_set_text (GTK_ENTRY (widget), value);
+ g_free ((char*)value);
+ }
+ g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK
(settings_changed_cb), self);
+
return TRUE;
}
@@ -472,6 +509,8 @@
str = "agent";
break;
case 2:
+ nm_setting_set_secret_flags (NM_SETTING (settings),
"password",
+
NM_SETTING_SECRET_FLAG_NOT_SAVED, NULL);
str = "smartcard";
break;
case 3:
@@ -507,6 +546,26 @@
active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
nm_setting_vpn_add_data_item (settings, "ipcomp", active ? "yes" :
"no");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"proposal-check"));
+ active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+ nm_setting_vpn_add_data_item (settings, "proposal", active ? "yes" :
"no");
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"ike-entry"));
+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
+ if (str && strlen (str)) {
+ str = g_strdelimit (g_strdup (str), ",", ';');
+ nm_setting_vpn_add_data_item (settings, "ike", str);
+ g_free (str);
+ }
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"esp-entry"));
+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
+ if (str && strlen (str)) {
+ str = g_strdelimit (g_strdup (str), ",", ';');
+ nm_setting_vpn_add_data_item (settings, "esp", str);
+ g_free (str);
+ }
+
nm_connection_add_setting (connection, NM_SETTING (settings));
return TRUE;
}
