Hello community,

here is the log from the commit of package NetworkManager-openswan for 
openSUSE:Factory checked in at 2015-09-09 20:21:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-openswan (Old)
 and      /work/SRC/openSUSE:Factory/.NetworkManager-openswan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "NetworkManager-openswan"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/NetworkManager-openswan/NetworkManager-openswan.changes
  2015-03-12 16:39:14.000000000 +0100
+++ 
/work/SRC/openSUSE:Factory/.NetworkManager-openswan.new/NetworkManager-openswan.changes
     2015-09-09 20:21:01.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Sep  1 10:33:50 UTC 2015 - [email protected]
+
+- Update to version 1.0.6:
+  + Libreswan startup robustness improvments.
+  + Build fixes.
+
+-------------------------------------------------------------------
+Wed May  6 07:59:03 UTC 2015 - [email protected]
+
+- Update to version 1.0.2:
+  + Out-of-tree build fixes.
+  + Updated translations.
+
+-------------------------------------------------------------------

Old:
----
  NetworkManager-openswan-1.0.0.tar.xz

New:
----
  NetworkManager-openswan-1.0.6.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ NetworkManager-openswan.spec ++++++
--- /var/tmp/diff_new_pack.Gv7HDL/_old  2015-09-09 20:21:01.000000000 +0200
+++ /var/tmp/diff_new_pack.Gv7HDL/_new  2015-09-09 20:21:01.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package NetworkManager-openconnect
+# spec file for package NetworkManager-openswan
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,18 +17,18 @@
 
 
 Name:           NetworkManager-openswan
-Version:        1.0.0
+Version:        1.0.6
 Release:        0
-License:        GPL-2.0+ and LGPL-2.1
 Summary:        NetworkManager VPN support for OpenConnect
-Url:            http://www.gnome.org/projects/NetworkManager
+License:        GPL-2.0+ and LGPL-2.1
 Group:          Productivity/Networking/System
+Url:            http://www.gnome.org/projects/NetworkManager
 Source0:        
http://download.gnome.org/sources/NetworkManager-openswan/1.0/%{name}-%{version}.tar.xz
 BuildRequires:  translation-update-upstream
 BuildRequires:  pkgconfig(NetworkManager)
 BuildRequires:  pkgconfig(dbus-glib-1) >= 0.74
-BuildRequires:  pkgconfig(gnome-keyring-1)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
+BuildRequires:  pkgconfig(gnome-keyring-1)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.4
 BuildRequires:  pkgconfig(libnl-3.0) >= 3.2.8
 BuildRequires:  pkgconfig(libnm-glib)

++++++ NetworkManager-openswan-1.0.0.tar.xz -> 
NetworkManager-openswan-1.0.6.tar.xz ++++++
++++ 3363 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/NEWS new/NetworkManager-openswan-1.0.6/NEWS
--- old/NetworkManager-openswan-1.0.0/NEWS      2014-12-18 22:34:58.000000000 
+0100
+++ new/NetworkManager-openswan-1.0.6/NEWS      2015-08-27 18:31:07.000000000 
+0200
@@ -1,4 +1,27 @@
 =======================================================
+network-manager-openswan-1.0.6
+Overview of changes since network-manager-openswan-1.0.2
+=======================================================
+
+This is a new stable release of network-manager-openswan.  Notable changes 
include:
+
+* Libreswan startup robustness improvments
+* Build fixes
+
+
+=======================================================
+network-manager-openswan-1.0.2
+Overview of changes since network-manager-openswan-1.0
+=======================================================
+
+This is a new stable release of network-manager-openswan.  Notable changes 
include:
+
+* Added Bosnian translation
+* Updated Greek, German, Basque, Serbian, Hungarian and Indonesian translations
+* Out-of-tree build fixes
+
+
+=======================================================
 network-manager-openswan-1.0
 Overview of changes since network-manager-openswan-0.9.8
 =======================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/auth-dialog/main.c 
new/NetworkManager-openswan-1.0.6/auth-dialog/main.c
--- old/NetworkManager-openswan-1.0.0/auth-dialog/main.c        2014-12-18 
22:34:58.000000000 +0100
+++ new/NetworkManager-openswan-1.0.6/auth-dialog/main.c        2015-08-27 
09:12:11.000000000 +0200
@@ -38,7 +38,7 @@
 #include <nm-vpn-plugin-utils.h>
 #include <nm-vpn-password-dialog.h>
 
-#include "src/nm-openswan-service.h"
+#include <../src/nm-openswan-service.h>
 
 #define KEYRING_UUID_TAG "connection-uuid"
 #define KEYRING_SN_TAG "setting-name"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/compile 
new/NetworkManager-openswan-1.0.6/compile
--- old/NetworkManager-openswan-1.0.0/compile   2014-09-10 13:53:59.000000000 
+0200
+++ new/NetworkManager-openswan-1.0.6/compile   2015-01-07 13:05:37.000000000 
+0100
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <[email protected]>.
 #
 # This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/config.h.in 
new/NetworkManager-openswan-1.0.6/config.h.in
--- old/NetworkManager-openswan-1.0.0/config.h.in       2014-12-18 
22:35:49.000000000 +0100
+++ new/NetworkManager-openswan-1.0.6/config.h.in       2015-08-27 
18:31:35.000000000 +0200
@@ -82,9 +82,6 @@
    */
 #undef LT_OBJDIR
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Name of package */
 #undef PACKAGE
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/configure.ac 
new/NetworkManager-openswan-1.0.6/configure.ac
--- old/NetworkManager-openswan-1.0.0/configure.ac      2014-12-18 
22:35:27.000000000 +0100
+++ new/NetworkManager-openswan-1.0.6/configure.ac      2015-08-27 
18:31:20.000000000 +0200
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(NetworkManager-openswan, 1.0.0, [email protected], 
NetworkManager-openswan)
+AC_INIT(NetworkManager-openswan, 1.0.6, [email protected], 
NetworkManager-openswan)
 AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-bzip2])
 AM_MAINTAINER_MODE
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/m4/intltool.m4 
new/NetworkManager-openswan-1.0.6/m4/intltool.m4
--- old/NetworkManager-openswan-1.0.0/m4/intltool.m4    2013-08-04 
01:09:55.000000000 +0200
+++ new/NetworkManager-openswan-1.0.6/m4/intltool.m4    2015-03-09 
02:39:54.000000000 +0100
@@ -155,31 +155,6 @@
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 AC_SUBST(ALL_LINGUAS)
 
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
 IT_PO_SUBDIR([po])
 
 ])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/missing 
new/NetworkManager-openswan-1.0.6/missing
--- old/NetworkManager-openswan-1.0.0/missing   2014-09-10 13:53:59.000000000 
+0200
+++ new/NetworkManager-openswan-1.0.6/missing   2015-01-07 13:05:37.000000000 
+0100
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <[email protected]>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@
       ;;
    autom4te*)
       echo "You might have modified some maintainer files that require"
-      echo "the 'automa4te' program to be rebuilt."
+      echo "the 'autom4te' program to be rebuilt."
       program_details 'autom4te'
       ;;
     bison*|yacc*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/po/LINGUAS 
new/NetworkManager-openswan-1.0.6/po/LINGUAS
--- old/NetworkManager-openswan-1.0.0/po/LINGUAS        2014-04-02 
17:29:46.000000000 +0200
+++ new/NetworkManager-openswan-1.0.6/po/LINGUAS        2015-08-27 
17:55:14.000000000 +0200
@@ -1,6 +1,7 @@
 # please keep this list sorted alphabetically
 ar
 bg
+bs
 ca
 cs
 da
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/po/Makefile.in.in 
new/NetworkManager-openswan-1.0.6/po/Makefile.in.in
--- old/NetworkManager-openswan-1.0.0/po/Makefile.in.in 2013-08-04 
01:09:55.000000000 +0200
+++ new/NetworkManager-openswan-1.0.6/po/Makefile.in.in 2015-03-09 
02:39:54.000000000 +0100
@@ -33,8 +33,7 @@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
@@ -80,7 +79,7 @@
 
 .po.pox:
        $(MAKE) $(GETTEXT_PACKAGE).pot
-       $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+       $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
        $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -108,7 +107,7 @@
 install-data-yes: all
        linguas="$(USE_LINGUAS)"; \
        for lang in $$linguas; do \
-         dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+         dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
          $(mkdir_p) $$dir; \
          if test -r $$lang.gmo; then \
            $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
 uninstall:
        linguas="$(USE_LINGUAS)"; \
        for lang in $$linguas; do \
-         rm -f 
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-         rm -f 
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+         rm -f 
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+         rm -f 
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
        done
 
 check: all $(GETTEXT_PACKAGE).pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/po/POTFILES.skip 
new/NetworkManager-openswan-1.0.6/po/POTFILES.skip
--- old/NetworkManager-openswan-1.0.0/po/POTFILES.skip  2014-11-19 
14:28:11.000000000 +0100
+++ new/NetworkManager-openswan-1.0.6/po/POTFILES.skip  2015-08-27 
16:09:10.000000000 +0200
@@ -1,2 +1,3 @@
 auth-dialog/nm-openswan-auth-dialog.desktop.in
-
+# https://bugs.launchpad.net/intltool/+bug/1117944
+sub/auth-dialog/nm-openswan-auth-dialog.desktop.in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/po/bs.po 
new/NetworkManager-openswan-1.0.6/po/bs.po
--- old/NetworkManager-openswan-1.0.0/po/bs.po  1970-01-01 01:00:00.000000000 
+0100
+++ new/NetworkManager-openswan-1.0.6/po/bs.po  2015-08-27 16:09:10.000000000 
+0200
@@ -0,0 +1,151 @@
+# Bosnian translation for bosnianuniversetranslation
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the 
bosnianuniversetranslation package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bosnianuniversetranslation\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-02-26 23:32+0000\n"
+"PO-Revision-Date: 2015-02-05 00:27+0000\n"
+"Last-Translator: Dženana <[email protected]>\n"
+"Language-Team: Bosnian <[email protected]>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-02-05 06:55+0000\n"
+"X-Generator: Launchpad (build 17331)\n"
+
+#: ../auth-dialog/main.c:175
+#, c-format
+msgid "Authenticate VPN %s"
+msgstr "Autentificiraj VPN %s"
+
+#: ../auth-dialog/main.c:192
+msgid "Password:"
+msgstr "Lozinka:"
+
+#: ../auth-dialog/main.c:202
+msgid "Group Password:"
+msgstr "Šifra grupe:"
+
+#: ../auth-dialog/main.c:238
+msgid "Authenticate VPN"
+msgstr "Autentificiraj VPN"
+
+#: ../auth-dialog/main.c:247
+msgid "_Group Password:"
+msgstr "_Šifra grupe:"
+
+#: ../auth-dialog/main.c:496
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+"Trebate provjeriti atutentičnost za pristup virtuelnoj privatnoj mreži '%s'."
+
+#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+msgid "Network"
+msgstr "Mreža"
+
+#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+msgid "Request VPN authentication"
+msgstr "Zatraži VPN autentifikaciju"
+
+#: ../properties/nm-openswan.c:47
+msgid "IPsec based VPN"
+msgstr "IPsec VPN koji se temelji"
+
+#: ../properties/nm-openswan.c:48
+msgid "IPsec, IKEv1, IKEv2 based VPN"
+msgstr "IPsec, IKEv1, IKEv2 baziran VPN"
+
+#: ../properties/nm-openswan.c:303
+msgid "Saved"
+msgstr "Snimljeno"
+
+#: ../properties/nm-openswan.c:310
+msgid "Always Ask"
+msgstr "Uvijek pitaj"
+
+#: ../properties/nm-openswan.c:317
+msgid "Not Required"
+msgstr "Nije potrebno"
+
+#: ../properties/nm-openswan-dialog.ui.h:1
+msgid " "
+msgstr " "
+
+#: ../properties/nm-openswan-dialog.ui.h:2
+msgid "<b>General</b>"
+msgstr "<b>Opšte</b>"
+
+#: ../properties/nm-openswan-dialog.ui.h:3
+msgid "Show passwords"
+msgstr "Prikaži lozinke"
+
+#: ../properties/nm-openswan-dialog.ui.h:4
+msgid "Gro_up password:"
+msgstr "Lozinka gru_pe:"
+
+#: ../properties/nm-openswan-dialog.ui.h:5
+msgid "_Gateway:"
+msgstr "_Mrežni izlaz:"
+
+#: ../properties/nm-openswan-dialog.ui.h:6
+msgid "G_roup name:"
+msgstr "Ime g_rupe:"
+
+#: ../properties/nm-openswan-dialog.ui.h:7
+msgid "_User password:"
+msgstr "_Korisnička šifra:"
+
+#: ../properties/nm-openswan-dialog.ui.h:8
+msgid "<b>Optional</b>"
+msgstr "<b>Opciono</b>"
+
+#: ../properties/nm-openswan-dialog.ui.h:9
+msgid "User name:"
+msgstr "Korisničko ime:"
+
+#: ../properties/nm-openswan-dialog.ui.h:10
+msgid "Phase1 Algorithms:"
+msgstr "Faza1Algoritmi;:"
+
+#: ../properties/nm-openswan-dialog.ui.h:11
+msgid "Phase2 Algorithms:"
+msgstr "Faza2Algoritmi;:"
+
+#: ../properties/nm-openswan-dialog.ui.h:12
+msgid "Domain:"
+msgstr "Domena:"
+
+#: ../src/nm-openswan-service.c:831
+msgid "A password is required."
+msgstr "Lozinka je potrebna."
+
+#: ../src/nm-openswan-service.c:1197
+msgid ""
+"Could not process the request because the VPN connection settings were "
+"invalid."
+msgstr ""
+"Ne mogu obraditi zahtjev zato što postavke VPN konekcije su bile neispravne."
+
+#: ../src/nm-openswan-service.c:1211
+msgid "Unhandled pending authentication."
+msgstr "Neobrađena autentifikacija na čekanju."
+
+#: ../src/nm-openswan-service.c:1297
+msgid "Don't quit when VPN connection terminates"
+msgstr "Ne izlazi kada se VPN konekcija prekida"
+
+#: ../src/nm-openswan-service.c:1298
+msgid "Enable verbose debug logging (may expose passwords)"
+msgstr "Omogući detaljno praćenje grešaka (može otkriti lozinke)"
+
+#: ../src/nm-openswan-service.c:1321
+msgid ""
+"This service provides integrated IPsec VPN capability to NetworkManager."
+msgstr "Ova usluga obezbeđuje Upravniku mreže objedinjenu IPsec VPN mogućnost."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/po/de.po 
new/NetworkManager-openswan-1.0.6/po/de.po
--- old/NetworkManager-openswan-1.0.0/po/de.po  2013-09-11 20:27:35.000000000 
+0200
+++ new/NetworkManager-openswan-1.0.6/po/de.po  2015-08-27 17:55:14.000000000 
+0200
@@ -8,79 +8,72 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager HEAD\n"
+"Project-Id-Version: NetworkManager OpenSWAN\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-29 17:26+0000\n"
-"PO-Revision-Date: 2013-06-02 15:47+0200\n"
+"POT-Creation-Date: 2015-01-27 11:19+0000\n"
+"PO-Revision-Date: 2015-01-29 22:11+0100\n"
 "Last-Translator: Christian Kirbach <[email protected]>\n"
 "Language-Team: de <[email protected]>\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.5\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: ../auth-dialog/vpn-password-dialog.c:94
-msgid "_Secondary Password:"
-msgstr "_Zweitpasswort:"
-
-#: ../auth-dialog/vpn-password-dialog.c:150
-msgid "_Password:"
-msgstr "_Passwort:"
-
-#: ../auth-dialog/vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "Passwörter an_zeigen"
-
-#: ../auth-dialog/main.c:178
+#: ../auth-dialog/main.c:175
 #, c-format
-msgid "You need to authenticate to access the Virtual Private Network '%s'."
-msgstr ""
-"Sie müssen sich legitimieren, um auf das Virtuelle private Netzwerk »%s« "
-"zugreifen zu können."
-
-#: ../auth-dialog/main.c:187 ../auth-dialog/main.c:211
-msgid "Authenticate VPN"
-msgstr "VPN legitimieren"
+msgid "Authenticate VPN %s"
+msgstr "VPN %s legitimieren"
 
-#: ../auth-dialog/main.c:190
+#: ../auth-dialog/main.c:192
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../auth-dialog/main.c:192
+#: ../auth-dialog/main.c:202
 msgid "Group Password:"
 msgstr "Gruppenpasswort:"
 
-#: ../auth-dialog/main.c:213
+#: ../auth-dialog/main.c:238
+msgid "Authenticate VPN"
+msgstr "VPN legitimieren"
+
+#: ../auth-dialog/main.c:247
 msgid "_Group Password:"
 msgstr "_Gruppenpasswort:"
 
-#: ../nm-openswan.desktop.in.h:1
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "Auf IPsec basierender VPN-Verbindungsmanager (openswan)"
-
-#: ../nm-openswan.desktop.in.h:2
-msgid "Add, Remove, and Edit VPN Connections"
-msgstr "VPN-Verbindungen hinzufügen, entfernen und bearbeiten"
+#: ../auth-dialog/main.c:496
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+"Sie müssen sich legitimieren, um auf das Virtuelle private Netzwerk »%s« "
+"zugreifen zu können."
+
+#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
+msgid "Network"
+msgstr "Netzwerk"
+
+#: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:2
+msgid "Request VPN authentication"
+msgstr "Legitimierung für VPN anfordern"
 
 #: ../properties/nm-openswan.c:47
 msgid "IPsec based VPN"
-msgstr "IPsec-basierendes VPN"
+msgstr "IPsec-basiertes VPN"
 
 #: ../properties/nm-openswan.c:48
 msgid "IPsec, IKEv1, IKEv2 based VPN"
-msgstr "IPsec, IKEv1, IKEv2-basierendes VPN"
+msgstr "IPsec, IKEv1, IKEv2-basiertes VPN"
 
-#: ../properties/nm-openswan.c:274
+#: ../properties/nm-openswan.c:303
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: ../properties/nm-openswan.c:281
+#: ../properties/nm-openswan.c:310
 msgid "Always Ask"
 msgstr "Immer fragen"
 
-#: ../properties/nm-openswan.c:288
+#: ../properties/nm-openswan.c:317
 msgid "Not Required"
 msgstr "Nicht notwendig"
 
@@ -132,20 +125,49 @@
 msgid "Domain:"
 msgstr "Domäne:"
 
-#: ../src/nm-openswan-service.c:877
+#: ../src/nm-openswan-service.c:831
+msgid "A password is required."
+msgstr "Ein Passwort ist notwendig."
+
+#: ../src/nm-openswan-service.c:1197
+msgid ""
+"Could not process the request because the VPN connection settings were "
+"invalid."
+msgstr ""
+"Die Anfrage konnte nicht verarbeitet werden, weil die VPN-"
+"Konfigurationseinstellungen ungültig waren."
+
+#: ../src/nm-openswan-service.c:1211
+msgid "Unhandled pending authentication."
+msgstr "Nicht verarbeitete, ausstehende Legitimierung."
+
+#: ../src/nm-openswan-service.c:1297
 msgid "Don't quit when VPN connection terminates"
 msgstr "Nicht bei Abbruch der VPN-Verbindung beenden"
 
-#: ../src/nm-openswan-service.c:878
+#: ../src/nm-openswan-service.c:1298
 msgid "Enable verbose debug logging (may expose passwords)"
 msgstr "Ausführliches Diagnoseprotokoll aktivieren (kann Passwörter enthalten)"
 
-#: ../src/nm-openswan-service.c:901
+#: ../src/nm-openswan-service.c:1321
 msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
-"NetworkManager."
-msgstr ""
-"nm-openswan-service bietet zugleich IPsec VPN-Fähigkeit für NetworkManager."
+"This service provides integrated IPsec VPN capability to NetworkManager."
+msgstr "Dieser Dienst bietet ein integriertes IPsec-VPN für NetworkManager."
+
+#~ msgid "_Secondary Password:"
+#~ msgstr "_Zweitpasswort:"
+
+#~ msgid "_Password:"
+#~ msgstr "_Passwort:"
+
+#~ msgid "Sh_ow passwords"
+#~ msgstr "Passwörter an_zeigen"
+
+#~ msgid "IPsec Based VPN Connection Manager (openswan)"
+#~ msgstr "Auf IPsec basierender VPN-Verbindungsmanager (openswan)"
+
+#~ msgid "Add, Remove, and Edit VPN Connections"
+#~ msgstr "VPN-Verbindungen hinzufügen, entfernen und bearbeiten"
 
 #~ msgid "_Remember passwords for this session"
 #~ msgstr "Passwo_rt für diese Sitzung behalten"
@@ -307,9 +329,6 @@
 #~ "Beachten Sie bitte, dass die Datei, die Sie importieren, keine Cisco VPN "
 #~ "oder VPNC-Konfigurationsdatei ist. Wenden Sie sich an Ihren Administrator."
 
-#~ msgid "Use _domain for authentication"
-#~ msgstr "_Domäne zur Authentifikation verwenden"
-
 #~ msgid "_Import Saved Configuration..."
 #~ msgstr "Gespeicherte Konfiguration importieren …"
 
@@ -335,12 +354,6 @@
 #~ "VPN-Server verbinden konnte."
 
 #~ msgid ""
-#~ "The VPN login failed because the VPN configuration options were invalid."
-#~ msgstr ""
-#~ "Die VPN-Anmeldung scheiterte, weil die VPN-Konfigurationsoptionen "
-#~ "ungültig waren."
-
-#~ msgid ""
 #~ "The VPN login failed because the VPN program received an invalid "
 #~ "configuration from the VPN server."
 #~ msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/po/el.po 
new/NetworkManager-openswan-1.0.6/po/el.po
--- old/NetworkManager-openswan-1.0.0/po/el.po  2014-09-04 17:06:45.000000000 
+0200
+++ new/NetworkManager-openswan-1.0.6/po/el.po  2015-08-27 16:09:10.000000000 
+0200
@@ -9,41 +9,44 @@
 "Project-Id-Version: NetworkManager-vpnc.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-05 18:28+0000\n"
-"PO-Revision-Date: 2014-04-24 15:57+0200\n"
+"POT-Creation-Date: 2014-12-13 11:12+0000\n"
+"PO-Revision-Date: 2015-02-25 15:19+0200\n"
 "Last-Translator: Tom Tryfonidis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.7.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../auth-dialog/main.c:188
+#: ../auth-dialog/main.c:175
 #, c-format
-msgid "You need to authenticate to access the Virtual Private Network '%s'."
-msgstr ""
-"Χρειάζεστε πιστοποίηση για να αποκτήσετε πρόσβαση στο Ιδιωτικό Εικονικό "
-"Δίκτυο (VPN) '%s'."
-
-#: ../auth-dialog/main.c:197 ../auth-dialog/main.c:221
-msgid "Authenticate VPN"
-msgstr "Πιστοποίηση VPN"
+msgid "Authenticate VPN %s"
+msgstr "Πιστοποίηση VPN %s"
 
-#: ../auth-dialog/main.c:200
-#| msgid "_Password:"
+#: ../auth-dialog/main.c:192
 msgid "Password:"
-msgstr "Συνθηματικό:"
+msgstr "Κωδικός πρόσβασης:"
 
 #: ../auth-dialog/main.c:202
-#| msgid "_Group Password:"
 msgid "Group Password:"
-msgstr "Συνθηματικό ομάδας:"
+msgstr "Κωδικός πρόσβασης ομάδας:"
 
-#: ../auth-dialog/main.c:223
+#: ../auth-dialog/main.c:238
+msgid "Authenticate VPN"
+msgstr "Πιστοποίηση VPN"
+
+#: ../auth-dialog/main.c:247
 msgid "_Group Password:"
-msgstr "Συνθηματικό ο_μάδας:"
+msgstr "Κωδικός πρόσβασης ο_μάδας:"
+
+#: ../auth-dialog/main.c:496
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+"Χρειάζεστε πιστοποίηση για να αποκτήσετε πρόσβαση στο Ιδιωτικό Εικονικό "
+"Δίκτυο (VPN) '%s'."
 
 #: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
 msgid "Network"
@@ -53,15 +56,6 @@
 msgid "Request VPN authentication"
 msgstr "Απαιτεί VPN πιστοποίηση"
 
-#: ../nm-openswan.desktop.in.h:1
-#| msgid "VPN Connection Manager (vpnc)"
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "Διαχειριστής σύνδεσης IPsec βασισμένο στο VPN (openswan)"
-
-#: ../nm-openswan.desktop.in.h:2
-msgid "Add, Remove, and Edit VPN Connections"
-msgstr "Προσθήκη, απομάκρυνση και επεξεργασία συνδέσεων VPN"
-
 #: ../properties/nm-openswan.c:47
 msgid "IPsec based VPN"
 msgstr "IPsec βασισμένο στο VPN"
@@ -70,15 +64,15 @@
 msgid "IPsec, IKEv1, IKEv2 based VPN"
 msgstr "IPsec, IKEv1, IKEv2 βασισμένο στο VPN"
 
-#: ../properties/nm-openswan.c:304
+#: ../properties/nm-openswan.c:303
 msgid "Saved"
 msgstr "Αποθηκευμένη"
 
-#: ../properties/nm-openswan.c:311
+#: ../properties/nm-openswan.c:310
 msgid "Always Ask"
 msgstr "Να γίνεται πάντα ερώτηση"
 
-#: ../properties/nm-openswan.c:318
+#: ../properties/nm-openswan.c:317
 msgid "Not Required"
 msgstr "Δεν απαιτείται"
 
@@ -92,11 +86,11 @@
 
 #: ../properties/nm-openswan-dialog.ui.h:3
 msgid "Show passwords"
-msgstr "Εμφάνιση συνθηματικών"
+msgstr "Εμφάνιση κωδικών πρόσβασης"
 
 #: ../properties/nm-openswan-dialog.ui.h:4
 msgid "Gro_up password:"
-msgstr "Συνθηματικό ο_μάδας:"
+msgstr "Κωδικός πρόσβασης ο_μάδας:"
 
 #: ../properties/nm-openswan-dialog.ui.h:5
 msgid "_Gateway:"
@@ -108,7 +102,7 @@
 
 #: ../properties/nm-openswan-dialog.ui.h:7
 msgid "_User password:"
-msgstr "_Συνθηματικό χρήστη:"
+msgstr "Κωδικός πρόσβασης χ_ρήστη:"
 
 #: ../properties/nm-openswan-dialog.ui.h:8
 msgid "<b>Optional</b>"
@@ -130,23 +124,43 @@
 msgid "Domain:"
 msgstr "Τομέας:"
 
-#: ../src/nm-openswan-service.c:846
+#: ../src/nm-openswan-service.c:831
+msgid "A password is required."
+msgstr "Απαιτείται κωδικός πρόσβασης"
+
+#: ../src/nm-openswan-service.c:1197
+msgid ""
+"Could not process the request because the VPN connection settings were "
+"invalid."
+msgstr ""
+"Αδύνατη η επεξεργασία του αιτήματος διότι οι ρυθμίσεις της σύνδεσης VPN ήταν "
+"άκυρες."
+
+#: ../src/nm-openswan-service.c:1211
+msgid "Unhandled pending authentication."
+msgstr "Ανεπίλυτη αναμονή πιστοποίησης."
+
+#: ../src/nm-openswan-service.c:1297
 msgid "Don't quit when VPN connection terminates"
-msgstr "Μην βγεις όταν τερματιστούν οι VPN συνδέσεις"
+msgstr "Να μην γίνει έξοδος όταν η σύνδεση VPN τερματίζει"
 
-#: ../src/nm-openswan-service.c:847
+#: ../src/nm-openswan-service.c:1298
 msgid "Enable verbose debug logging (may expose passwords)"
 msgstr ""
-"Ενεργοποίηση καταγραφής εντοπισμού σφαλμάτων (μπορεί να εκθέσει τα "
-"συνθηματικά)"
+"Ενεργοποίηση καταγραφής εντοπισμού σφαλμάτων (μπορεί να εκθέσει τους "
+"κωδικούς πρόσβασης)"
 
-#: ../src/nm-openswan-service.c:870
+#: ../src/nm-openswan-service.c:1321
 msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
-"NetworkManager."
-msgstr ""
-"Το nm-openswan-service παρέχει ενσωματωμένες δυνατότητες IPsec VPN στον "
-"NetworkManager."
+"This service provides integrated IPsec VPN capability to NetworkManager."
+msgstr "Αυτή η υπηρεσία παρέχει δυνατότητες IPsec VPN στον NetworkManager."
+
+#~| msgid "VPN Connection Manager (vpnc)"
+#~ msgid "IPsec Based VPN Connection Manager (openswan)"
+#~ msgstr "Διαχειριστής σύνδεσης IPsec βασισμένο στο VPN (openswan)"
+
+#~ msgid "Add, Remove, and Edit VPN Connections"
+#~ msgstr "Προσθήκη, απομάκρυνση και επεξεργασία συνδέσεων VPN"
 
 #~ msgid "_Secondary Password:"
 #~ msgstr "_Δευτερεύον συνθηματικό:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/po/eu.po 
new/NetworkManager-openswan-1.0.6/po/eu.po
--- old/NetworkManager-openswan-1.0.0/po/eu.po  2014-09-04 17:06:45.000000000 
+0200
+++ new/NetworkManager-openswan-1.0.6/po/eu.po  2015-08-27 17:55:14.000000000 
+0200
@@ -1,14 +1,17 @@
-# Basque translation of network-manager-openswan.
+# Basque translation for network-manager-openswan.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Iñaki Larrañaga Murgoitio <[email protected]>, 2008, 2009, 2014.
+# Iñaki Larrañaga Murgoitio <[email protected]>, 2008, 2009, 2014, 2015.
+# Edurne Labaka <[email protected]>, 2015.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-openswan master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-04 12:35+0200\n"
-"PO-Revision-Date: 2014-05-04 12:38+0200\n"
+"Project-Id-Version: network-manager-openswan nm-1-0\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-02-07 17:55+0100\n"
+"PO-Revision-Date: 2015-02-07 17:55+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <[email protected]>\n"
 "Language-Team: Basque <[email protected]>\n"
 "Language: eu\n"
@@ -18,16 +21,12 @@
 "X-Generator: Lokalize 1.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../auth-dialog/main.c:188
+#: ../auth-dialog/main.c:175
 #, c-format
-msgid "You need to authenticate to access the Virtual Private Network '%s'."
-msgstr "Autentifikatu egin behar zara '%s' VPN-ra sarbidetzeko."
-
-#: ../auth-dialog/main.c:197 ../auth-dialog/main.c:221
-msgid "Authenticate VPN"
-msgstr "Autentifikatu VPN"
+msgid "Authenticate VPN %s"
+msgstr "Autentifikatu %s VPN"
 
-#: ../auth-dialog/main.c:200
+#: ../auth-dialog/main.c:192
 msgid "Password:"
 msgstr "Pasahitza:"
 
@@ -35,10 +34,19 @@
 msgid "Group Password:"
 msgstr "Taldearen pasahitza:"
 
-#: ../auth-dialog/main.c:223
+#: ../auth-dialog/main.c:238
+msgid "Authenticate VPN"
+msgstr "Autentifikatu VPN"
+
+#: ../auth-dialog/main.c:247
 msgid "_Group Password:"
 msgstr "_Taldearen pasahitza:"
 
+#: ../auth-dialog/main.c:496
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr "Autentifikatu egin behar zara '%s' VPN-ra sarbidetzeko."
+
 #: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
 msgid "Network"
 msgstr "Sarea"
@@ -47,14 +55,6 @@
 msgid "Request VPN authentication"
 msgstr "Eskatu VPNren autentifikazioa"
 
-#: ../nm-openswan.desktop.in.h:1
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "IPsec-en oinarritutako VPN konexioen kudeatzailea (openswan)"
-
-#: ../nm-openswan.desktop.in.h:2
-msgid "Add, Remove, and Edit VPN Connections"
-msgstr "Gehitu, kendu eta editatu VPN konexioak"
-
 #: ../properties/nm-openswan.c:47
 msgid "IPsec based VPN"
 msgstr "IPsec-en oinarritutako VPN-a"
@@ -63,15 +63,15 @@
 msgid "IPsec, IKEv1, IKEv2 based VPN"
 msgstr "IPsec, IKEv1, IKEv2 oinarritutako VPN-a"
 
-#: ../properties/nm-openswan.c:304
+#: ../properties/nm-openswan.c:303
 msgid "Saved"
 msgstr "Gordeta"
 
-#: ../properties/nm-openswan.c:311
+#: ../properties/nm-openswan.c:310
 msgid "Always Ask"
 msgstr "Galdetu beti"
 
-#: ../properties/nm-openswan.c:318
+#: ../properties/nm-openswan.c:317
 msgid "Not Required"
 msgstr "Ez da beharrezkoa"
 
@@ -123,28 +123,52 @@
 msgid "Domain:"
 msgstr "Domeinua:"
 
-#: ../src/nm-openswan-service.c:846
+#: ../src/nm-openswan-service.c:831
+msgid "A password is required."
+msgstr "Pasahitza behar da."
+
+#: ../src/nm-openswan-service.c:1197
+msgid ""
+"Could not process the request because the VPN connection settings were "
+"invalid."
+msgstr ""
+"Ezin izan da eskaera prozesatu VPN konexioaren ezarpenak baliogabekoak "
+"direlako."
+
+#: ../src/nm-openswan-service.c:1211
+msgid "Unhandled pending authentication."
+msgstr "Autentifikatzea falta dena kudeatu gabe."
+
+#: ../src/nm-openswan-service.c:1297
 msgid "Don't quit when VPN connection terminates"
 msgstr "Ez irten VPNaren konexioa amaitzean"
 
-#: ../src/nm-openswan-service.c:847
+#: ../src/nm-openswan-service.c:1298
 msgid "Enable verbose debug logging (may expose passwords)"
 msgstr "Gaitu arazketaren erregistro xehea (pasahitzak erakuts ditzake)"
 
-#: ../src/nm-openswan-service.c:870
+#: ../src/nm-openswan-service.c:1321
 msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
-"NetworkManager."
+"This service provides integrated IPsec VPN capability to NetworkManager."
 msgstr ""
-"'nm-openswan-service' zerbitzuak VPN IPsec gaitasuna "
-"erabiltzea baimentzen dio NetworkManager-i."
+"Zerbitzu honek VPN IPsec gaitasuna erabiltzea baimentzen "
+"dio NetworkManager-i."
 
 #~ msgid "_Secondary Password:"
 #~ msgstr "_Bigarren pasahitza:"
 
+#~ msgid "_Password:"
+#~ msgstr "_Pasahitza:"
+
 #~ msgid "Sh_ow passwords"
 #~ msgstr "_Erakutsi pasahitzak"
 
+#~ msgid "IPsec Based VPN Connection Manager (openswan)"
+#~ msgstr "IPsec-en oinarritutako VPN konexioen kudeatzailea (openswan)"
+
+#~ msgid "Add, Remove, and Edit VPN Connections"
+#~ msgstr "Gehitu, kendu eta editatu VPN konexioak"
+
 #~ msgid "_Remember passwords for this session"
 #~ msgstr "_Gogoratu pasahitza saio honetan"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/po/hu.po 
new/NetworkManager-openswan-1.0.6/po/hu.po
--- old/NetworkManager-openswan-1.0.0/po/hu.po  2014-12-18 22:34:58.000000000 
+0100
+++ new/NetworkManager-openswan-1.0.6/po/hu.po  2015-08-27 17:55:14.000000000 
+0200
@@ -9,8 +9,8 @@
 "Project-Id-Version: network-manager-openswan master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-12-07 11:13+0000\n"
-"PO-Revision-Date: 2014-12-07 16:23+0100\n"
+"POT-Creation-Date: 2014-12-13 08:29+0000\n"
+"PO-Revision-Date: 2014-12-20 00:02+0100\n"
 "Last-Translator: Balázs Úr <[email protected]>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\n"
@@ -22,7 +22,6 @@
 
 #: ../auth-dialog/main.c:175
 #, c-format
-#| msgid "Authenticate VPN"
 msgid "Authenticate VPN %s"
 msgstr "VPN-hitelesítés: %s"
 
@@ -55,14 +54,6 @@
 msgid "Request VPN authentication"
 msgstr "VPN-azonosítás kérése"
 
-#: ../nm-openswan.desktop.in.h:1
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "IPsec alapú VPN kapcsolatkezelő (openswan)"
-
-#: ../nm-openswan.desktop.in.h:2
-msgid "Add, Remove, and Edit VPN Connections"
-msgstr "VPN kapcsolatok hozzáadása, szerkesztése és eltávolítása"
-
 #: ../properties/nm-openswan.c:47
 msgid "IPsec based VPN"
 msgstr "IPsec alapú VPN"
@@ -131,11 +122,11 @@
 msgid "Domain:"
 msgstr "Tartomány:"
 
-#: ../src/nm-openswan-service.c:764
+#: ../src/nm-openswan-service.c:831
 msgid "A password is required."
 msgstr "Jelszó szükséges."
 
-#: ../src/nm-openswan-service.c:1077
+#: ../src/nm-openswan-service.c:1197
 msgid ""
 "Could not process the request because the VPN connection settings were "
 "invalid."
@@ -143,27 +134,34 @@
 "A kérés feldolgozása sikertelen, mivel a VPN-kapcsolat beállításai "
 "érvénytelenek."
 
-#: ../src/nm-openswan-service.c:1091
+#: ../src/nm-openswan-service.c:1211
 msgid "Unhandled pending authentication."
 msgstr "Kezeletlen várakozó hitelesítés."
 
-#: ../src/nm-openswan-service.c:1177
+#: ../src/nm-openswan-service.c:1297
 msgid "Don't quit when VPN connection terminates"
 msgstr "Ne lépjen ki, ha a VPN-kapcsolat megszakad"
 
-#: ../src/nm-openswan-service.c:1178
+#: ../src/nm-openswan-service.c:1298
 msgid "Enable verbose debug logging (may expose passwords)"
 msgstr ""
 "Részletes hibakeresési naplózás engedélyezése (jelszavak is  a naplóba "
 "kerülhetnek)"
 
-#: ../src/nm-openswan-service.c:1201
+#: ../src/nm-openswan-service.c:1321
+#| msgid ""
+#| "nm-openswan-service provides integrated IPsec VPN capability to "
+#| "NetworkManager."
 msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
-"NetworkManager."
+"This service provides integrated IPsec VPN capability to NetworkManager."
 msgstr ""
-"Az nm-openswan-service integrált IPsec VPN képességet biztosít a "
-"Hálózatkezelőnek."
+"Ez a szolgáltatás integrált IPsec VPN képességet biztosít a Hálózatkezelőnek."
+
+#~ msgid "IPsec Based VPN Connection Manager (openswan)"
+#~ msgstr "IPsec alapú VPN kapcsolatkezelő (openswan)"
+
+#~ msgid "Add, Remove, and Edit VPN Connections"
+#~ msgstr "VPN kapcsolatok hozzáadása, szerkesztése és eltávolítása"
 
 #~ msgid "_Secondary Password:"
 #~ msgstr "Jelszó _még egyszer:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/po/id.po 
new/NetworkManager-openswan-1.0.6/po/id.po
--- old/NetworkManager-openswan-1.0.0/po/id.po  2014-09-04 17:06:45.000000000 
+0200
+++ new/NetworkManager-openswan-1.0.6/po/id.po  2015-08-27 17:55:14.000000000 
+0200
@@ -5,30 +5,25 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-openswan master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=network-manager-openswan&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-05 18:28+0000\n"
-"PO-Revision-Date: 2014-03-30 10:33+0700\n"
+"Project-Id-Version: network-manager-openswan nm-1-0\n"
+"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=network-manager-";
+"openswan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-12-13 08:29+0000\n"
+"PO-Revision-Date: 2014-12-19 18:24+0700\n"
 "Last-Translator: Andika Triwidada <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.7.1\n"
 
-#: ../auth-dialog/main.c:188
+#: ../auth-dialog/main.c:175
 #, c-format
-msgid "You need to authenticate to access the Virtual Private Network '%s'."
-msgstr ""
-"Anda perlu mengotentikasi untuk mengakses Virtual Private Network '%s'."
-
-#: ../auth-dialog/main.c:197 ../auth-dialog/main.c:221
-msgid "Authenticate VPN"
-msgstr "Otentikasikan VPN"
+msgid "Authenticate VPN %s"
+msgstr "Otentikasikan VPN %s"
 
-#: ../auth-dialog/main.c:200
+#: ../auth-dialog/main.c:192
 msgid "Password:"
 msgstr "Sandi:"
 
@@ -36,10 +31,19 @@
 msgid "Group Password:"
 msgstr "Sandi Grup:"
 
-#: ../auth-dialog/main.c:223
+#: ../auth-dialog/main.c:238
+msgid "Authenticate VPN"
+msgstr "Otentikasikan VPN"
+
+#: ../auth-dialog/main.c:247
 msgid "_Group Password:"
 msgstr "Sandi _Grup:"
 
+#: ../auth-dialog/main.c:496
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr "Anda perlu mengotentikasi untuk mengakses Virtual Private Network 
'%s'."
+
 #: ../auth-dialog/nm-openswan-auth-dialog.desktop.in.in.h:1
 msgid "Network"
 msgstr "Jaringan"
@@ -48,14 +52,6 @@
 msgid "Request VPN authentication"
 msgstr "Minta otentikasi VPN"
 
-#: ../nm-openswan.desktop.in.h:1
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "Manajer Koneksi VPN Berbasis IPsec (openswan)"
-
-#: ../nm-openswan.desktop.in.h:2
-msgid "Add, Remove, and Edit VPN Connections"
-msgstr "Tambah, Hapus, dan Sunting Koneksi VPN"
-
 #: ../properties/nm-openswan.c:47
 msgid "IPsec based VPN"
 msgstr "VPN berbasis IPsec"
@@ -64,15 +60,15 @@
 msgid "IPsec, IKEv1, IKEv2 based VPN"
 msgstr "VPN berbasis IPsec, IKEv1, IKEv2"
 
-#: ../properties/nm-openswan.c:304
+#: ../properties/nm-openswan.c:303
 msgid "Saved"
 msgstr "Disimpan"
 
-#: ../properties/nm-openswan.c:311
+#: ../properties/nm-openswan.c:310
 msgid "Always Ask"
 msgstr "Selalu Tanyakan"
 
-#: ../properties/nm-openswan.c:318
+#: ../properties/nm-openswan.c:317
 msgid "Not Required"
 msgstr "Tak Diperlukan"
 
@@ -124,18 +120,26 @@
 msgid "Domain:"
 msgstr "Domain:"
 
-#: ../src/nm-openswan-service.c:846
+#: ../src/nm-openswan-service.c:831
+msgid "A password is required."
+msgstr "Diperlukan sebuah kata sandi."
+
+#: ../src/nm-openswan-service.c:1197
+msgid "Could not process the request because the VPN connection settings were 
invalid."
+msgstr "Tak dapat memroses permintaan karena pengaturan koneksi VPN tak valid."
+
+#: ../src/nm-openswan-service.c:1211
+msgid "Unhandled pending authentication."
+msgstr "Otentikasi tertunda yang tak tertangani."
+
+#: ../src/nm-openswan-service.c:1297
 msgid "Don't quit when VPN connection terminates"
 msgstr "Jangan keluar ketika koneksi VPN berakhir"
 
-#: ../src/nm-openswan-service.c:847
+#: ../src/nm-openswan-service.c:1298
 msgid "Enable verbose debug logging (may expose passwords)"
 msgstr "Fungsikan log awakutu cerewet (mungkin mengungkap sandi)"
 
-#: ../src/nm-openswan-service.c:870
-msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
-"NetworkManager."
-msgstr ""
-"nm-openswan-service menyediakan kapabilitas VPN IPsec terintegrasi ke "
-"NetworkManager."
+#: ../src/nm-openswan-service.c:1321
+msgid "This service provides integrated IPsec VPN capability to 
NetworkManager."
+msgstr "Layanan ini menyediakan kapabilitas VPN IPsec terintegrasi ke 
NetworkManager."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/po/sr.po 
new/NetworkManager-openswan-1.0.6/po/sr.po
--- old/NetworkManager-openswan-1.0.0/po/sr.po  2014-11-19 14:28:11.000000000 
+0100
+++ new/NetworkManager-openswan-1.0.6/po/sr.po  2015-08-27 17:55:14.000000000 
+0200
@@ -8,8 +8,8 @@
 "Project-Id-Version: network-manager-openswan master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product";
 "=network-manager-openswan&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-10-28 11:06+0000\n"
-"PO-Revision-Date: 2014-10-28 21:48+0200\n"
+"POT-Creation-Date: 2014-12-13 08:29+0000\n"
+"PO-Revision-Date: 2014-12-25 13:56+0200\n"
 "Last-Translator: Мирослав Николић <[email protected]>\n"
 "Language-Team: Serbian <[email protected]>\n"
 "Language: sr\n"
@@ -22,7 +22,6 @@
 
 #: ../auth-dialog/main.c:175
 #, c-format
-#| msgid "Authenticate VPN"
 msgid "Authenticate VPN %s"
 msgstr "Потврди ВПН %s"
 
@@ -57,14 +56,6 @@
 msgid "Request VPN authentication"
 msgstr "Захтевај ВПН потврђивање идентитета"
 
-#: ../nm-openswan.desktop.in.h:1
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "Управник ВПН везе заснован на ИПсец-у (openswan)"
-
-#: ../nm-openswan.desktop.in.h:2
-msgid "Add, Remove, and Edit VPN Connections"
-msgstr "Додајте, уклањајте и уређујте ВПН везе"
-
 #: ../properties/nm-openswan.c:47
 msgid "IPsec based VPN"
 msgstr "ВПН заснован на ИПсец-у"
@@ -133,35 +124,42 @@
 msgid "Domain:"
 msgstr "Домен:"
 
-#: ../src/nm-openswan-service.c:764
+#: ../src/nm-openswan-service.c:831
 msgid "A password is required."
 msgstr "Потребна је лозинка."
 
-#: ../src/nm-openswan-service.c:1077
+#: ../src/nm-openswan-service.c:1197
 msgid ""
 "Could not process the request because the VPN connection settings were "
 "invalid."
 msgstr "Не могу да обрадим захтев зато што су подешавања ВПН везе неисправна."
 
-#: ../src/nm-openswan-service.c:1091
+#: ../src/nm-openswan-service.c:1211
 msgid "Unhandled pending authentication."
 msgstr "Заказано потврђивање идентитета није исправно."
 
-#: ../src/nm-openswan-service.c:1177
+#: ../src/nm-openswan-service.c:1297
 msgid "Don't quit when VPN connection terminates"
 msgstr "Не прекида када се завршава ВПН веза"
 
-#: ../src/nm-openswan-service.c:1178
+#: ../src/nm-openswan-service.c:1298
 msgid "Enable verbose debug logging (may expose passwords)"
 msgstr ""
 "Укључује опширно записивање зарад исправљања грешака (може да изложи лозинке)"
 
-#: ../src/nm-openswan-service.c:1201
+#: ../src/nm-openswan-service.c:1321
+#| msgid ""
+#| "nm-openswan-service provides integrated IPsec VPN capability to "
+#| "NetworkManager."
 msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
-"NetworkManager."
-msgstr ""
-"нм-опенсван-услуга обезбеђује Управнику мреже обједињену ИПсец ВПН могућност."
+"This service provides integrated IPsec VPN capability to NetworkManager."
+msgstr "Ова услуга обезбеђује Управнику мреже обједињену ИПсец ВПН могућност."
+
+#~ msgid "IPsec Based VPN Connection Manager (openswan)"
+#~ msgstr "Управник ВПН везе заснован на ИПсец-у (openswan)"
+
+#~ msgid "Add, Remove, and Edit VPN Connections"
+#~ msgstr "Додајте, уклањајте и уређујте ВПН везе"
 
 #~ msgid "_Secondary Password:"
 #~ msgstr "_Секундарна лозинка:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/po/[email protected] 
new/NetworkManager-openswan-1.0.6/po/[email protected]
--- old/NetworkManager-openswan-1.0.0/po/[email protected]  2014-11-19 
14:28:11.000000000 +0100
+++ new/NetworkManager-openswan-1.0.6/po/[email protected]  2015-08-27 
17:55:14.000000000 +0200
@@ -8,8 +8,8 @@
 "Project-Id-Version: network-manager-openswan master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product";
 "=network-manager-openswan&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-10-28 11:06+0000\n"
-"PO-Revision-Date: 2014-10-28 21:48+0200\n"
+"POT-Creation-Date: 2014-12-13 08:29+0000\n"
+"PO-Revision-Date: 2014-12-25 13:56+0200\n"
 "Last-Translator: Miroslav Nikolić <[email protected]>\n"
 "Language-Team: Serbian <[email protected]>\n"
 "Language: sr\n"
@@ -22,7 +22,6 @@
 
 #: ../auth-dialog/main.c:175
 #, c-format
-#| msgid "Authenticate VPN"
 msgid "Authenticate VPN %s"
 msgstr "Potvrdi VPN %s"
 
@@ -57,14 +56,6 @@
 msgid "Request VPN authentication"
 msgstr "Zahtevaj VPN potvrđivanje identiteta"
 
-#: ../nm-openswan.desktop.in.h:1
-msgid "IPsec Based VPN Connection Manager (openswan)"
-msgstr "Upravnik VPN veze zasnovan na IPsec-u (openswan)"
-
-#: ../nm-openswan.desktop.in.h:2
-msgid "Add, Remove, and Edit VPN Connections"
-msgstr "Dodajte, uklanjajte i uređujte VPN veze"
-
 #: ../properties/nm-openswan.c:47
 msgid "IPsec based VPN"
 msgstr "VPN zasnovan na IPsec-u"
@@ -133,35 +124,42 @@
 msgid "Domain:"
 msgstr "Domen:"
 
-#: ../src/nm-openswan-service.c:764
+#: ../src/nm-openswan-service.c:831
 msgid "A password is required."
 msgstr "Potrebna je lozinka."
 
-#: ../src/nm-openswan-service.c:1077
+#: ../src/nm-openswan-service.c:1197
 msgid ""
 "Could not process the request because the VPN connection settings were "
 "invalid."
 msgstr "Ne mogu da obradim zahtev zato što su podešavanja VPN veze neispravna."
 
-#: ../src/nm-openswan-service.c:1091
+#: ../src/nm-openswan-service.c:1211
 msgid "Unhandled pending authentication."
 msgstr "Zakazano potvrđivanje identiteta nije ispravno."
 
-#: ../src/nm-openswan-service.c:1177
+#: ../src/nm-openswan-service.c:1297
 msgid "Don't quit when VPN connection terminates"
 msgstr "Ne prekida kada se završava VPN veza"
 
-#: ../src/nm-openswan-service.c:1178
+#: ../src/nm-openswan-service.c:1298
 msgid "Enable verbose debug logging (may expose passwords)"
 msgstr ""
 "Uključuje opširno zapisivanje zarad ispravljanja grešaka (može da izloži 
lozinke)"
 
-#: ../src/nm-openswan-service.c:1201
+#: ../src/nm-openswan-service.c:1321
+#| msgid ""
+#| "nm-openswan-service provides integrated IPsec VPN capability to "
+#| "NetworkManager."
 msgid ""
-"nm-openswan-service provides integrated IPsec VPN capability to "
-"NetworkManager."
-msgstr ""
-"nm-opensvan-usluga obezbeđuje Upravniku mreže objedinjenu IPsec VPN 
mogućnost."
+"This service provides integrated IPsec VPN capability to NetworkManager."
+msgstr "Ova usluga obezbeđuje Upravniku mreže objedinjenu IPsec VPN mogućnost."
+
+#~ msgid "IPsec Based VPN Connection Manager (openswan)"
+#~ msgstr "Upravnik VPN veze zasnovan na IPsec-u (openswan)"
+
+#~ msgid "Add, Remove, and Edit VPN Connections"
+#~ msgstr "Dodajte, uklanjajte i uređujte VPN veze"
 
 #~ msgid "_Secondary Password:"
 #~ msgstr "_Sekundarna lozinka:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/src/nm-openswan-service-helper.c 
new/NetworkManager-openswan-1.0.6/src/nm-openswan-service-helper.c
--- old/NetworkManager-openswan-1.0.0/src/nm-openswan-service-helper.c  
2014-12-18 22:34:58.000000000 +0100
+++ new/NetworkManager-openswan-1.0.6/src/nm-openswan-service-helper.c  
2015-08-27 17:55:14.000000000 +0200
@@ -34,6 +34,8 @@
 
 #include <netlink/netlink.h>
 #include <netlink/msg.h>
+
+#define _LINUX_IN6_H 1
 #include <linux/xfrm.h>
 
 #include <dbus/dbus.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/src/nm-openswan-service.c 
new/NetworkManager-openswan-1.0.6/src/nm-openswan-service.c
--- old/NetworkManager-openswan-1.0.0/src/nm-openswan-service.c 2014-12-18 
22:34:58.000000000 +0100
+++ new/NetworkManager-openswan-1.0.6/src/nm-openswan-service.c 2015-08-27 
17:55:14.000000000 +0200
@@ -88,6 +88,8 @@
 
        GPid pid;
        guint watch_id;
+       guint retry_id;
+       guint retries;
        ConnectStep connect_step;
        NMConnection *connection;
 
@@ -367,6 +369,11 @@
                priv->pid = 0;
        }
 
+       if (priv->watch_id) {
+               g_source_remove (priv->watch_id);
+               priv->watch_id = 0;
+       }
+
        if (priv->io_id) {
                g_source_remove (priv->io_id);
                priv->io_id = 0;
@@ -441,6 +448,23 @@
        if (do_stop)
                ipsec_stop (self, NULL);
        nm_vpn_plugin_failure (NM_VPN_PLUGIN (self), reason);
+       nm_vpn_plugin_set_state (NM_VPN_PLUGIN (self), 
NM_VPN_SERVICE_STATE_STOPPED);
+}
+
+static gboolean
+retry_cb (gpointer user_data)
+{
+       NMOpenSwanPlugin *self = NM_OPENSWAN_PLUGIN (user_data);
+       NMOpenSwanPluginPrivate *priv = NM_OPENSWAN_PLUGIN_GET_PRIVATE (self);
+       GError *error = NULL;
+
+       priv->retry_id = 0;
+
+       if (!connect_step (self, &error))
+               connect_failed (self, TRUE, error, 
NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED);
+       g_clear_error (&error);
+
+       return FALSE;
 }
 
 static void
@@ -466,17 +490,25 @@
        if (WIFEXITED (status)) {
                ret = WEXITSTATUS (status);
                if (ret)
-                       g_warning ("Spawn: child %d exited with error code %d", 
pid, ret);
+                       g_message ("Spawn: child %d exited with error code %d", 
pid, ret);
        } else
                g_warning ("Spawn: child %d died unexpectedly", pid);
 
        /* Reap child */
        waitpid (pid, NULL, WNOHANG);
 
+       if (ret != 0 && priv->retries) {
+               priv->retries--;
+               g_message ("Spawn: %d more tries...", priv->retries);
+               priv->retry_id = g_timeout_add (100, retry_cb, self);
+               return;
+       }
+
        if (ret == 0) {
                /* Success; do the next connect step */
                do_stop = TRUE;
                priv->connect_step++;
+               priv->retries = 0;
                if (!connect_step (self, &error))
                        ret = 1;
        }
@@ -623,6 +655,8 @@
        write_config_option (fd, " salifetime=24h\n");
        write_config_option (fd, " ikelifetime=24h\n");
        write_config_option (fd, " keyingtries=1\n");
+       if (libreswan)
+               write_config_option (fd, " cisco-unity=yes\n");
        write_config_option (fd, " auto=add");
 
        /* openswan requires a terminating \n (otherwise it segfaults) while
@@ -745,7 +779,6 @@
                g_error ("PTY spawn: cannot exec '%s'", (char *) 
argv->pdata[0]);
                _exit (-1);
        }
-       g_ptr_array_free (argv, TRUE);
 
        /* Close child side's pipes */
        close (stderr_pipe[1]);
@@ -758,8 +791,10 @@
                g_set_error (error, NM_VPN_PLUGIN_ERROR, 
NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,
                             "PTY spawn failed for '%s' (%d)",
                             (char *) argv->pdata[0], child_pid);
+               g_ptr_array_free (argv, TRUE);
                return FALSE;
        }
+       g_ptr_array_free (argv, TRUE);
 
        /*  Set pipes non-blocking, so we can read big buffers
         *  in the callback without having to use FIONREAD
@@ -1007,6 +1042,8 @@
                return TRUE;
 
        case CONNECT_STEP_WAIT_READY:
+               if (!priv->retries)
+                       priv->retries = 30;
                if (!do_spawn (&priv->pid, NULL, NULL, error, priv->ipsec_path, 
"auto", "--ready", NULL))
                        return FALSE;
                priv->watch_id = g_child_watch_add (priv->pid, child_watch_cb, 
self);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/NetworkManager-openswan-1.0.0/src/show-xfrm.c 
new/NetworkManager-openswan-1.0.6/src/show-xfrm.c
--- old/NetworkManager-openswan-1.0.0/src/show-xfrm.c   2014-11-19 
14:28:11.000000000 +0100
+++ new/NetworkManager-openswan-1.0.6/src/show-xfrm.c   2015-08-27 
17:55:14.000000000 +0200
@@ -20,10 +20,12 @@
 #define _GNU_SOURCE 1
 #include <netlink/netlink.h>
 #include <netlink/msg.h>
-#include <linux/xfrm.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
+#define _LINUX_IN6_H 1
+#include <linux/xfrm.h>
+
 #include <glib.h>
 
 static int


Reply via email to