[network-manager-libreswan/th/tmp: 67/68] all: merge the stable branch 'nm-1-2' into master

[Thomas Haller <thaller src gnome org>]

commit 6eb181c48168c595e9f24e3b766f0fba35f8e1b9
Merge: 125e1a2 380d117
Author: Thomas Haller <thaller redhat com>
Date:   Fri Jun 24 11:36:04 2016 +0200

    all: merge the stable branch 'nm-1-2' into master
    
    For the moment, don't maintain a separate stable branch in upstream, until
    'master' bumps the required NetworkManager API to 1.3. Until then, 'master'
    and 'nm-1-2' shall be identical.
    
    For NetworkManager-core (which provides libnm) and network-manager-applet
    (which provides libnma) we maintain stable branches like 'nm-1-0', 'nm-1-2'.
    This is useful, because those branches have different, backward-compatible
    API that is used by other projects. But what is best for NetworkManager core,
    is not necesarily best for the plugins.
    
    For the VPN plugins, with the release of 1.2.0 we also branched 'nm-1-2' off
    'master' and since then maintained a stable branch upstream.
    
    This either means, we eagerly backport from 'master' to 'nm-1.2', in
    which case it's a lot of work with the effect of having two mostly
    identical branches. In this form 'nm-1-2' isn't very useful.
    Or we don't backport eagerly, which may or may not result in 'nm-1-2'
    being more stable. Especially since upstream NetworkManager does releases
    infrequently, it can take a rather long time until we release 1.4.0 and
    improvements on master don't reach users for a long time.
    
    'master' still doesn't require >= 1.3 API from NetworkManager, libnm or libnma.
    The VPN plugins are rather simple, and there is no strong enough justification
    to maintain two separate branches both based on 1.2 NetworkManager API.
    'master' shall always be in a decent shape. So, it's not clear that the
    outcome of this is actually less stable. And there is no guarantee that any
    branch, stable or not, is perfect. Downstream must be prepared to backport
    necessary patches.
    
    This merge, resets the version number from 1.3.0 to 1.2.3.
    
    Also, on master we implemented the GTK plugin split, so the next release
    1.2.4 (or 1.4.0, whichever happens first), will bring that too. This
    will affects packaging due to new files. But I consider this a worthy
    feature to have on 1.2 anyway and without this merge I'd alose like to see
    it backported.
    
    The same was done for nm-openvpn [1] [2].
    
    [1] 
https://git.gnome.org/browse/network-manager-openvpn/commit/?id=ccd275d266f92524d9ef5ebd48d66845daa8b5c5
    [2] https://mail.gnome.org/archives/networkmanager-list/2016-May/msg00085.html

 .gitignore                                         |    2 +
 Makefile.am                                        |   18 +-
 auth-dialog/Makefile.am                            |    1 +
 auth-dialog/main.c                                 |   11 +-
 common/Makefile.am                                 |   24 -
 common/utils.c                                     |  164 ------
 configure.ac                                       |  111 +++-
 nm-test-helpers.h                                  |   51 --
 po/POTFILES.in                                     |    6 +-
 po/cs.po                                           |    2 +-
 po/de.po                                           |  124 +++--
 po/es.po                                           |  205 ++++++--
 po/pl.po                                           |  128 ++++-
 properties/Makefile.am                             |  121 +++--
 properties/libnm-libreswan-properties.ver          |    6 +
 properties/libnm-vpn-plugin-libreswan-editor.ver   |    6 +
 properties/libnm-vpn-plugin-libreswan.ver          |    6 +
 properties/nm-libreswan-editor-plugin.c            |  289 ++++++++++
 ...nm-libreswan.h => nm-libreswan-editor-plugin.h} |   36 +-
 .../{nm-libreswan.c => nm-libreswan-editor.c}      |  205 +-------
 .../{nm-libreswan.h => nm-libreswan-editor.h}      |   33 +-
 shared/Makefile.am                                 |   15 +
 shared/README                                      |    9 +
 shared/nm-default.h                                |  108 ++++
 .../nm-service-defines.h                           |    6 +-
 shared/nm-utils/gsystem-local-alloc.h              |  208 +++++++
 shared/nm-utils/nm-glib.h                          |  395 ++++++++++++++
 shared/nm-utils/nm-macros-internal.h               |  573 ++++++++++++++++++++
 shared/nm-utils/nm-shared-utils.c                  |  239 ++++++++
 shared/nm-utils/nm-shared-utils.h                  |   66 +++
 shared/nm-utils/nm-vpn-plugin-macros.h             |   43 ++
 shared/nm-utils/nm-vpn-plugin-utils.c              |  130 +++++
 shared/nm-utils/nm-vpn-plugin-utils.h              |   40 ++
 shared/utils.c                                     |  173 ++++++
 {common => shared}/utils.h                         |   42 +-
 src/Makefile.am                                    |   79 ++-
 src/nm-libreswan-service-helper.c                  |   77 ++-
 src/nm-libreswan-service.c                         |  434 +++++++++-------
 src/show-xfrm.c                                    |    3 +-
 39 files changed, 3247 insertions(+), 942 deletions(-)
---
diff --cc configure.ac
index 39120c2,a794c38..ce9ba6d
--- a/configure.ac
+++ b/configure.ac
@@@ -1,10 -1,10 +1,10 @@@
  AC_PREREQ(2.52)
  
  AC_INIT(NetworkManager-libreswan,
 -        1.3.0,
 +        1.2.3,
          https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager,
          NetworkManager-libreswan)
- AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-xz])
+ AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
  AM_MAINTAINER_MODE
  
  AC_CONFIG_MACRO_DIR([m4])