Commit f333bed2 authored by Michael Biebl's avatar Michael Biebl

New upstream version 1.8.2

parent c5443195
......@@ -110,9 +110,7 @@ editor_sources = \
properties/resources.c \
properties/resources.h \
properties/nm-openvpn-editor.c \
properties/nm-openvpn-editor.h \
properties/auth-helpers.c \
properties/auth-helpers.h
properties/nm-openvpn-editor.h
properties_cppflags = \
-DICONDIR=\""$(datadir)/pixmaps"\" \
......@@ -302,12 +300,14 @@ EXTRA_DIST += \
properties/tests/conf/proxy-socks.ovpn \
properties/tests/conf/proxy-http-with-auth.ovpn \
properties/tests/conf/keysize.ovpn \
properties/tests/conf/connect-timeout.ovpn \
properties/tests/conf/device.ovpn \
properties/tests/conf/device-notype.ovpn \
properties/tests/conf/keepalive.ovpn \
properties/tests/conf/ping-with-exit.ovpn \
properties/tests/conf/ping-with-restart.ovpn \
properties/tests/conf/route.ovpn \
properties/tests/conf/server-poll-timeout.ovpn \
properties/tests/conf/tls-inline.ovpn \
properties/tests/conf/tls-inline-ca.pem \
properties/tests/conf/tls-inline-cert.pem \
......
This diff is collapsed.
=======================================================
NetworkManager-openvpn-1.8.2
Overview of changes since NetworkManager-openvpn-1.8.0
=======================================================
This is a new stable release of NetworkManager-openvpn. Notable changes include:
* Handle more then 255 routes (bgo #788137)
* Fix GUI for editing connection with static key (bgo #788226)
* Fix parsing gateway in helper script (bgo #788514)
* Fix parsing 2FA challenge for "PASSWORD:Verification Failed" (bgo #751842)
* Fix parsing remote hosts from configuration (bgo #792252)
* Fix assertion failure while quitting service (bgo #792252)
* Add support for connect-timeout (bgo #792252)
* Automatically lower connect-timeout if there are multiple remotes to try
at least 3 remotes (bgo #792252)
* Add support for extra-certs (bgo #793746)
* Various code cleanups
* Updated Brazilian Portuguese, Czech, Danish, Finnish, German, Hungarian,
Indonesian, Italian, Lithuanian, Polish, Serbian, Spanish translations.
=======================================================
NetworkManager-openvpn-1.8.0
Overview of changes since NetworkManager-openvpn-1.2.10
......
# generated automatically by aclocal 1.15 -*- Autoconf -*-
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -881,7 +881,7 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
])dnl PKG_HAVE_DEFINE_WITH_MODULES
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -896,7 +896,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.15], [],
m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -912,14 +912,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.15])dnl
[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -971,7 +971,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1002,7 +1002,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1193,7 +1193,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1269,7 +1269,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1466,7 +1466,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1487,7 +1487,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1509,7 +1509,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1544,7 +1544,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1594,7 +1594,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1633,7 +1633,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1662,7 +1662,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1709,7 +1709,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1728,7 +1728,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1809,7 +1809,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1869,7 +1869,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1897,7 +1897,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1916,7 +1916,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
......@@ -12,8 +12,10 @@
<name xml:lang="de">OpenVPN-Client</name>
<name xml:lang="el">Πελάτης OpenVPN</name>
<name xml:lang="es">Cliente de OpenVPN</name>
<name xml:lang="fi">OpenVPN-asiakasohjelmisto</name>
<name xml:lang="hu">OpenVPN kliens</name>
<name xml:lang="id">Klien OpenVPN</name>
<name xml:lang="it">Client OpenVPN</name>
<name xml:lang="lt">OpenVPN klientas</name>
<name xml:lang="pl">Klient OpenVPN</name>
<name xml:lang="pt_BR">Cliente OpenVPN</name>
......@@ -26,8 +28,10 @@
<summary xml:lang="da">Klient til virtuelle private OpenVPN-netværk</summary>
<summary xml:lang="de">Client für virtuelle private OpenVPN-Netzwerke</summary>
<summary xml:lang="es">Cliente para redes privadas virtuales OpenVPN</summary>
<summary xml:lang="fi">Asiakasohjelmisto OpenVPN-erillisverkkoihin</summary>
<summary xml:lang="hu">Kliens az OpenVPN virtuális magánhálózatokhoz</summary>
<summary xml:lang="id">Klien untuk virtual private network OpenVPN</summary>
<summary xml:lang="it">Client per reti private virtuali OpenVPN</summary>
<summary xml:lang="lt">Klientas OpenVPN virtualiems privatiems tinklams</summary>
<summary xml:lang="pl">Klient dla wirtualnych sieci prywatnych OpenVPN</summary>
<summary xml:lang="pt_BR">Cliente para redes privadas virtuais OpenVPN</summary>
......@@ -51,8 +55,10 @@
<p xml:lang="da">Understøttelse af konfigurering af virtuelle private OpenVPN-netværksforbindelser.</p>
<p xml:lang="de">Unterstützung für die Einrichtung virtueller privater OpenVPN-Netzwerkverbindungen.</p>
<p xml:lang="es">Soporte para configurar conexiones a redes privadas virtuales OpenVPN</p>
<p xml:lang="fi">Tuki OpenVPN-erillisverkkoyhteyksien määrittämiseen.</p>
<p xml:lang="hu">Az OpenVPN virtuális magánhálózati kapcsolatok beállításának támogatása.</p>
<p xml:lang="id">Dukungan untuk menata koneksi virtual private network OpenVPN.</p>
<p xml:lang="it">Supporta la configurazione di connessioni a reti private virtuali OpenVPN.</p>
<p xml:lang="lt">OpenVPN virtualių privačių tinklų ryšių konfigūracijos palaikymas.</p>
<p xml:lang="pl">Obsługa konfigurowania połączeń wirtualnych sieci prywatnych OpenVPN.</p>
<p xml:lang="pt_BR">Suporte a configuração conexões de rede privada virtual OpenVPN.</p>
......@@ -65,8 +71,10 @@
<p xml:lang="da">OpenVPN er en fri, populær og fleksibel VPN-løsning.</p>
<p xml:lang="de">OpenVPN ist eine populäre, flexible und auf freier Software basierende VPN-Lösung.</p>
<p xml:lang="es">OpenVPN es una solución VPN flexible y popular, y además es software libre.</p>
<p xml:lang="fi">OpenVPN on suosittu ja monipuolinen sekä avoin VPN-ratkaisu.</p>
<p xml:lang="hu">Az OpenVPN egy népszerű és rugalmas, szabad szoftveres VPN megoldás.</p>
<p xml:lang="id">OpenVPN adalah sebuah solusi VPN perangkat lunak bebas yang populer dan luwes.</p>
<p xml:lang="it">OpenVPN è una soluzione VPN basata su codice libero.</p>
<p xml:lang="lt">OpenVPN yra populiarus ir lankstus laisvos programinės įrangos VPN sprendimas.</p>
<p xml:lang="pl">OpenVPN to popularne i elastyczne oprogramowanie VPN na wolnej licencji.</p>
<p xml:lang="pt_BR">OpenVPN é uma solução VPN popular e flexível de software livre.</p>
......@@ -96,8 +104,10 @@
<developer_name xml:lang="de">Die NetworkManager-Entwickler</developer_name>
<developer_name xml:lang="el">Οι προγραμματιστές του NetworkManager</developer_name>
<developer_name xml:lang="es">Los desarrolladores de NetworkManager</developer_name>
<developer_name xml:lang="fi">NetworkManagerin kehittäjät</developer_name>
<developer_name xml:lang="hu">A Hálózatkezelő fejlesztői</developer_name>
<developer_name xml:lang="id">Para Pengembang NetworkManager</developer_name>
<developer_name xml:lang="it">Gli sviluppatori di NetworkManager</developer_name>
<developer_name xml:lang="lt">NetworkManager kūrėjai</developer_name>
<developer_name xml:lang="pl">Programiści projektu NetworkManager</developer_name>
<developer_name xml:lang="pt_BR">Os desenvolvedores NetworkManager</developer_name>
......
......@@ -371,7 +371,7 @@ get_existing_passwords (GHashTable *vpn_data,
static char *
get_passwords_required (GHashTable *data,
char **hints,
const char *const*hints,
gboolean *out_need_password,
gboolean *out_need_certpass,
gboolean *out_need_proxypass)
......@@ -379,10 +379,14 @@ get_passwords_required (GHashTable *data,
const char *ctype, *val;
NMSettingSecretFlags flags;
char *prompt = NULL;
char **iter;
const char *const*iter;
*out_need_password = FALSE;
*out_need_certpass = FALSE;
*out_need_proxypass = FALSE;
/* If hints are given, then always ask for what the hints require */
if (hints && g_strv_length (hints)) {
if (hints && hints[0]) {
for (iter = hints; iter && *iter; iter++) {
if (!prompt && g_str_has_prefix (*iter, VPN_MSG_TAG))
prompt = g_strdup (*iter + strlen (VPN_MSG_TAG));
......@@ -429,33 +433,31 @@ get_passwords_required (GHashTable *data,
return NULL;
}
static void
free_secret (char *p)
{
if (p) {
memset (p, 0, strlen (p));
g_free (p);
}
}
int
int
main (int argc, char *argv[])
{
gboolean retry = FALSE, allow_interaction = FALSE;
gchar *vpn_name = NULL;
gchar *vpn_uuid = NULL;
gchar *vpn_service = NULL;
GHashTable *data = NULL, *secrets = NULL;
gboolean need_password = FALSE, need_certpass = FALSE, need_proxypass = FALSE;
char *existing_password = NULL, *existing_certpass = NULL, *existing_proxypass = NULL;
char *new_password = NULL, *new_certpass = NULL, *new_proxypass = NULL;
char **hints = NULL;
char *prompt = NULL;
gboolean external_ui_mode = FALSE, canceled = FALSE, ask_user = FALSE;
NoSecretsRequiredFunc no_secrets_required_func = NULL;
AskUserFunc ask_user_func = NULL;
FinishFunc finish_func = NULL;
gs_unref_hashtable GHashTable *data = NULL;
gs_unref_hashtable GHashTable *secrets = NULL;
gboolean need_password = FALSE;
gboolean need_certpass = FALSE;
gboolean need_proxypass = FALSE;
gs_strfreev char **hints = NULL;
gs_free char *prompt = NULL;
nm_auto_free_secret char *new_password = NULL;
nm_auto_free_secret char *new_certpass = NULL;
nm_auto_free_secret char *new_proxypass = NULL;
nm_auto_free_secret char *existing_password = NULL;
nm_auto_free_secret char *existing_certpass = NULL;
nm_auto_free_secret char *existing_proxypass = NULL;
gboolean external_ui_mode = FALSE;
gboolean ask_user;
NoSecretsRequiredFunc no_secrets_required_func;
AskUserFunc ask_user_func;
FinishFunc finish_func;
GOptionContext *context;
GOptionEntry entries[] = {
......@@ -493,11 +495,12 @@ main (int argc, char *argv[])
if (!nm_vpn_service_plugin_read_vpn_details (0, &data, &secrets)) {
fprintf (stderr, "Failed to read '%s' (%s) data and secrets from stdin.\n",
vpn_name, vpn_uuid);
return 1;
return EXIT_FAILURE;
}
if (external_ui_mode) {
no_secrets_required_func = eui_no_secrets_required;
ask_user_func = NULL;
finish_func = eui_finish;
} else {
no_secrets_required_func = std_no_secrets_required;
......@@ -508,73 +511,62 @@ main (int argc, char *argv[])
/* Determine which passwords are actually required, either from hints or
* from looking at the VPN configuration.
*/
prompt = get_passwords_required (data, hints, &need_password, &need_certpass, &need_proxypass);
prompt = get_passwords_required (data, (const char *const*) hints, &need_password, &need_certpass, &need_proxypass);
if (!prompt)
prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network “%s”."), vpn_name);
/* Exit early if we don't need any passwords */
if (!need_password && !need_certpass && !need_proxypass)
if (!need_password && !need_certpass && !need_proxypass) {
no_secrets_required_func ();
else {
get_existing_passwords (data,
secrets,
vpn_uuid,
need_password,
need_certpass,
need_proxypass,
&existing_password,
&existing_certpass,
&existing_proxypass);
if (need_password && !existing_password)
ask_user = TRUE;
if (need_certpass && !existing_certpass)
ask_user = TRUE;
if (need_proxypass && !existing_proxypass)
ask_user = TRUE;
/* If interaction is allowed then ask the user, otherwise pass back
* whatever existing secrets we can find.
*/
if (ask_user_func && allow_interaction && (ask_user || retry)) {
canceled = !ask_user_func (vpn_name,
prompt,
need_password,
existing_password,
&new_password,
need_certpass,
existing_certpass,
&new_certpass,
need_proxypass,
existing_proxypass,
&new_proxypass);
}
if (!canceled) {
finish_func (vpn_name,
prompt,
allow_interaction,
need_password,
new_password ? new_password : existing_password,
need_certpass,
new_certpass ? new_certpass : existing_certpass,
need_proxypass,
new_proxypass ? new_proxypass : existing_proxypass);
}
return EXIT_SUCCESS;
}
free_secret (existing_password);
free_secret (existing_certpass);
free_secret (existing_proxypass);
free_secret (new_password);
free_secret (new_certpass);
free_secret (new_proxypass);
get_existing_passwords (data,
secrets,
vpn_uuid,
need_password,
need_certpass,
need_proxypass,
&existing_password,
&existing_certpass,
&existing_proxypass);
if (need_password && !existing_password)
ask_user = TRUE;
else if (need_certpass && !existing_certpass)
ask_user = TRUE;
else if (need_proxypass && !existing_proxypass)
ask_user = TRUE;
else
ask_user = FALSE;
/* If interaction is allowed then ask the user, otherwise pass back
* whatever existing secrets we can find.
*/
if ( ask_user_func
&& allow_interaction
&& (ask_user || retry)) {
if (!ask_user_func (vpn_name,
prompt,
need_password,
existing_password,
&new_password,
need_certpass,
existing_certpass,
&new_certpass,
need_proxypass,
existing_proxypass,
&new_proxypass))
return EXIT_FAILURE;
}
if (data)
g_hash_table_unref (data);
if (secrets)
g_hash_table_unref (secrets);
if (hints)
g_strfreev (hints);
g_free (prompt);
return canceled ? 1 : 0;
finish_func (vpn_name,
prompt,
allow_interaction,
need_password,
new_password ? new_password : existing_password,
need_certpass,
new_certpass ? new_certpass : existing_certpass,
need_proxypass,
new_proxypass ? new_proxypass : existing_proxypass);
return EXIT_SUCCESS;
}
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
......@@ -342,6 +343,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2016 Free Software Foundation, Inc.
# Copyright 1992-2017 Free Software Foundation, Inc.
timestamp='2016-10-02'
timestamp='2017-08-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright 1992-2016 Free Software Foundation, Inc.
Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -259,6 +259,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:Sortix:*:*)
echo ${UNAME_MACHINE}-unknown-sortix
exit ;;
*:Redox:*:*)
echo ${UNAME_MACHINE}-unknown-redox
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
......@@ -837,10 +840,11 @@ EOF
UNAME_PROCESSOR=`/usr/bin/uname -p`
case ${UNAME_PROCESSOR} in
amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
UNAME_PROCESSOR=x86_64 ;;
i386)
UNAME_PROCESSOR=i586 ;;
esac
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
......@@ -1303,14 +1307,21 @@ EOF
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_PPC >/dev/null
then
UNAME_PROCESSOR=powerpc
fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
......@@ -1334,15 +1345,18 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
NEO-?:NONSTOP_KERNEL:*:*)
NEO-*:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
NSR-*:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
NSX-*:NONSTOP_KERNEL:*:*)
echo nsx-tandem-nsk${UNAME_RELEASE}
exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
exit ;;
......@@ -1418,8 +1432,8 @@ cat >&2 <<EOF
$0: unable to guess system type
This script (version $timestamp), has failed to recognize the
operating system you are using. If your script is old, overwrite
config.guess and config.sub with the latest versions from:
operating system you are using. If your script is old, overwrite *all*
copies of config.guess and config.sub with the latest versions from:
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
......
......@@ -119,9 +119,41 @@
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Version number of package */
#undef VERSION
/* Define to 1 if on MINIX. */
#undef _MINIX
/* Define to 2 if the system does not provide POSIX.1 features except with
this defined. */
#undef _POSIX_1_SOURCE
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
/* Define to `int' if <sys/types.h> does not define. */
#undef mode_t
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2016 Free Software Foundation, Inc.
# Copyright 1992-2017 Free Software Foundation, Inc.
timestamp='2016-09-05'
timestamp='2017-04-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2016 Free Software Foundation, Inc.
Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -263,7 +263,7 @@ case $basic_machine in
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
| i370 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
......@@ -301,6 +301,7 @@ case $basic_machine in
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
......@@ -314,6 +315,7 @@ case $basic_machine in
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| wasm32 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
......@@ -387,7 +389,7 @@ case $basic_machine in
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
......@@ -428,6 +430,7 @@ case $basic_machine in
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
......@@ -444,6 +447,7 @@ case $basic_machine in
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
| wasm32-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
......@@ -946,6 +950,9 @@ case $basic_machine in
nsr-tandem)
basic_machine=nsr-tandem
;;
nsx-tandem)
basic_machine=nsx-tandem
;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki