Commit 62034b08 authored by Michael Biebl's avatar Michael Biebl

New upstream version 1.2.6

parent 3f81cdf7
This diff is collapsed.
AUTOMAKE_OPTIONS = foreign
SUBDIRS = shared src properties po
if WITH_GNOME
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -195,8 +195,8 @@ CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = shared src properties po auth-dialog
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
COPYING ChangeLog NEWS README compile config.guess config.sub \
depcomp install-sh ltmain.sh missing
COPYING ChangeLog INSTALL NEWS README compile config.guess \
config.sub depcomp install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -293,6 +293,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBNMA_CFLAGS = @LIBNMA_CFLAGS@
......@@ -376,6 +377,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
has_file = @has_file@
has_find = @has_find@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
......@@ -406,7 +409,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = shared src properties po $(am__append_1)
dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-vpnc-service.conf
......@@ -442,15 +444,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
$(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
$(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
&& exit 0; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
$(AUTOMAKE) --gnu Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -728,7 +730,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
......@@ -753,7 +755,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
......@@ -771,7 +773,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -781,7 +783,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
=======================================================
NetworkManager-vpnc-1.2.6
Overview of changes since NetworkManager-vpnc-1.2.4
=======================================================
This is a new stable release of NetworkManager-vpnc. Notable changes include:
* Fix for a local authenticated privileged escalation bug (CVE-2018-10900)
All users are advised to upgrade.
* The CA file is now hidden from the configuration dialog if hybrid auth is
disabled.
* Updated Brazilian Portuguese, Czech, Danish, Dutch, Finnish, Friulian,
German, Hungarian, Indonesian, Italian, Latvian, Lithuanian, Polish,
Russian, Serbian, Spanish and Swedish translations.
=======================================================
NetworkManager-vpnc-1.2.4
Overview of changes since NetworkManager-vpnc-1.2.2
......
Client for Cisco IPsec virtual private networks
Support for configuring virtual private networks based on VPNC.
Compatible with Cisco VPN concentrators configured to use IPsec.
This diff is collapsed.
......@@ -8,28 +8,39 @@
<name>Legacy Cisco VPNC client</name>
<name xml:lang="ca">Client antic Cisco VPNC</name>
<name xml:lang="cs">Původní klient Cisco VPNC</name>
<name xml:lang="da">Ældre VPNC-klient fra Cisco</name>
<name xml:lang="de">VPNC-Client für veraltete Cisco-Systeme</name>
<name xml:lang="es">Cliente VPNC heredado de Cisco</name>
<name xml:lang="fur">Client VPNC Cisco vecje maniere</name>
<name xml:lang="hu">Örökölt Cisco VPNC kliens</name>
<name xml:lang="id">Klien legacy Cisco VPNC</name>
<name xml:lang="it">Vecchio client VPNC Cisco</name>
<name xml:lang="lt">Pasenęs Cisco VPNC klientas</name>
<name xml:lang="lv">Vecais Cisco VPNC klients</name>
<name xml:lang="nl">Verouderde Cisco VPNC-cliënt</name>
<name xml:lang="pl">Przestarzały klient Cisco VPNC</name>
<name xml:lang="pt_BR">Cliente legado para Cisco VPNC</name>
<name xml:lang="ru">Устаревший клиент Cisco VPNC</name>
<name xml:lang="sr">Стари Цисков ВПНЦ клијент</name>
<name xml:lang="sr@latin">Stari Ciskov VPNC klijent</name>
<name xml:lang="sv">Legacy Cisco VPNC-klient</name>
<summary>Client for Cisco IPsec virtual private networks</summary>
<summary xml:lang="ca">Client per a xarxes privades virtuals Cisco IPsec</summary>
<summary xml:lang="cs">Klient pro virtuální soukromé sítě Cisco IPSec</summary>
<summary xml:lang="da">Klient til virtuelle private IPsec-netværk fra Cisco</summary>
<summary xml:lang="de">Client für Cisco-IPsec virtuelle private Netze</summary>
<summary xml:lang="es">Cliente para redes privadas virtuales IPsec de Cisco</summary>
<summary xml:lang="fi">Asiakasohjelmisto Cisco IPsec -erillisverkoille</summary>
<summary xml:lang="fur">Client par rêts privadis virtuâls IPsec Cisco</summary>
<summary xml:lang="hu">Kliens a Cisco IPsec virtuális magánhálózatokhoz</summary>
<summary xml:lang="id">Klien untuk virtual private network IPsec Cisco</summary>
<summary xml:lang="it">Client per reti private virtuali IPsec Cisco</summary>
<summary xml:lang="lt">Cisco IPsec virtualių privačių tinklų klientas</summary>
<summary xml:lang="lv">Cisco IPsec virtuālā privātā tīkla klients</summary>
<summary xml:lang="nl">Cliënt voor Cisco IPsec-virtuele privénetwerken</summary>
<summary xml:lang="pl">Klient dla wirtualnych sieci prywatnych IPsec firmy Cisco</summary>
<summary xml:lang="pt_BR">Cliente para redes privadas virtuais IPsec da Cisco</summary>
<summary xml:lang="ru">Клиент для виртуальных приватных сетей Cisco IPsec</summary>
<summary xml:lang="sr">Клијент за Цискову ИПсец виртуелну приватну мрежу</summary>
<summary xml:lang="sr@latin">Klijent za Ciskovu IPsec virtuelnu privatnu mrežu</summary>
<summary xml:lang="sv">Klient för Cisco IPsec virtuella privata nätverk</summary>
......@@ -49,58 +60,74 @@
<p>Support for configuring virtual private networks based on VPNC.</p>
<p xml:lang="ca">Suport per configurar xarxes privades virtuals basades en VPNC.</p>
<p xml:lang="cs">Podpora nastavení sítí VPN založených na VPNC.</p>
<p xml:lang="da">Understøttelse af konfigurering af virtuelle private netværk baseret på VPNC.</p>
<p xml:lang="de">Unterstützung für die Konfiguration virtueller privater Netzverbindungen, die auf VPNC basieren.</p>
<p xml:lang="es">Soporte para configurar redes privadas virtuales basadas en VPNC.</p>
<p xml:lang="fur">Supuart par configurâ rêts privadis virtuâls basadis su VPNC.</p>
<p xml:lang="hu">A VPNC alapú virtuális magánhálózatok beállításának támogatása.</p>
<p xml:lang="id">Dukungan untuk menata virtual private network berbasis VPNC.</p>
<p xml:lang="it">Supporta la configurazione di connessioni private virtuali basate su VPNC.</p>
<p xml:lang="lt">VPNC pagrindo virtualių privačių tinklų konfigūracijos palaikymas.</p>
<p xml:lang="lv">Atbalsts uz bāzēto VPNC virtuālo privāto konfigurēšanai.</p>
<p xml:lang="nl">Ondersteuning voor configuratie van virtuele privénetwerken gebaseerd op VPNC.</p>
<p xml:lang="pl">Obsługa konfigurowania wirtualnych sieci prywatnych opartych na VPNC.</p>
<p xml:lang="pt_BR">Suporte a configuração de redes privadas virtuais baseadas em VPNC.</p>
<p xml:lang="ru">Поддержка настройки виртуальных частных сетей на основе VPNC.</p>
<p xml:lang="sr">Подршка за подешавање виртуелних приватних мрежа заснованих на ВПНЦ-у.</p>
<p xml:lang="sr@latin">Podrška za podešavanje virtuelnih privatnih mreža zasnovanih na VPNC-u.</p>
<p xml:lang="sv">Stöd för att konfigurera virtuella privata nätverk baserade på VPNC.</p>
<p>Compatible with Cisco VPN concentrators configured to use IPsec.</p>
<p xml:lang="ca">Compatible amb concentradors Cisco VPN configurats per usar IPsec.</p>
<p xml:lang="cs">Kompatibilní s koncentrátory Cisco VPN nastavenými pro použití IPsec.</p>
<p xml:lang="da">Kompatibel med Ciscos VPN-concentratorer konfigureret til at bruge IPsec.</p>
<p xml:lang="de">Kompatibel mit Cisco-VPN-Konzentratoren, die für den Einsatz von IPsec konfiguriert sind.</p>
<p xml:lang="es">Compatible con concentradores VPN de Cisco configurados para usar IPsec.</p>
<p xml:lang="fur">Compatibil cui concentradôrs VPN Cisco configurâts par doprâ IPsec.</p>
<p xml:lang="hu">Kompatibilis az IPsec használatára beállított Cisco VPN koncentrátorokkal</p>
<p xml:lang="id">Kompatibel dengan konsentrator VPN Cisco yang ditata memakai IPsec.</p>
<p xml:lang="it">Compatibile con i concentratori VPN Cisco configurati per utilizzare IPsec.</p>
<p xml:lang="lt">Suderinamas su Cisco VPN koncentratoriais, sukonfigūruotas IPsec naudojimui.</p>
<p xml:lang="lv">Savietojams ar Cisco VPN koncentratoriem, kas ir konfigurēti izmantot IPsec.</p>
<p xml:lang="nl">Compatibel met Cisco VPN-concentratoren geconfigureerd voor gebruik met IPsec.</p>
<p xml:lang="pl">Zgodne z koncentratorami VPN firmy Cisco skonfigurowanymi do używania IPsec.</p>
<p xml:lang="pt_BR">Compatível com concentradores VPN da Cisco configurados para usar IPsec.</p>
<p xml:lang="sr">Сагласно са Цисковим ВПН концентраторима подешеним за коришћење ИПсец-а</p>
<p xml:lang="sr@latin">Saglasno sa Ciskovim VPN koncentratorima podešenim za korišćenje IPsec-a</p>
<p xml:lang="ru">Совместимость с концентраторами Cisco VPN, настроенными на использование IPsec.</p>
<p xml:lang="sr">Сагласно са Цисковим ВПН концентраторима подешеним за коришћење ИПсец-а.</p>
<p xml:lang="sr@latin">Saglasno sa Ciskovim VPN koncentratorima podešenim za korišćenje IPsec-a.</p>
<p xml:lang="sv">Kompatibel med Cisco VPN-koncentratorer konfigurerade att använda IPsec.</p>
</description>
<screenshots>
<screenshot type="default">
<image width="800" height="572">https://git.gnome.org/browse/network-manager-vpnc/plain/appdata/vpnc.png</image>
<image width="800" height="572">https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/raw/master/appdata/vpnc.png</image>
</screenshot>
<screenshot>
<caption>The advanced options dialog</caption>
<image width="800" height="547">https://git.gnome.org/browse/network-manager-vpnc/plain/appdata/vpnc-advanced.png</image>
<image width="800" height="547">https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/raw/master/appdata/vpnc-advanced.png</image>
</screenshot>
</screenshots>
<url type="homepage">https://wiki.gnome.org/Projects/NetworkManager/VPN</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager</url>
<url type="bugtracker">https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/issues</url>
<update_contact>networkmanager-maint@gnome.bugs</update_contact>
<translation type="gettext">NetworkManager-vpnc</translation>
<developer_name>The NetworkManager Developers</developer_name>
<developer_name xml:lang="ca">Els desenvolupadors del NetworkManager</developer_name>
<developer_name xml:lang="cs">Vývojáři aplikace NetworkManager</developer_name>
<developer_name xml:lang="da">Udviklerne af Netværkshåndtering</developer_name>
<developer_name xml:lang="de">Die Entwickler von 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="fur">I svilupadôrs di NetworkManager</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="lv">NetworkManager izstrādātāji</developer_name>
<developer_name xml:lang="nl">De NetworkManager-ontwikkelaars</developer_name>
<developer_name xml:lang="pl">Programiści projektu NetworkManager</developer_name>
<developer_name xml:lang="pt_BR">Os desenvolvedores NetworkManager</developer_name>
<developer_name xml:lang="ru">Разработчики NetworkManager</developer_name>
<developer_name xml:lang="sr">Програмери Управника мреже</developer_name>
<developer_name xml:lang="sr@latin">Programeri Upravnika mreže</developer_name>
<developer_name xml:lang="sv">Utvecklarna av Nätverkshanteraren</developer_name>
......
......@@ -27,16 +27,16 @@
<screenshots>
<screenshot type="default">
<image width="800" height="572">https://git.gnome.org/browse/network-manager-vpnc/plain/appdata/vpnc.png</image>
<image width="800" height="572">https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/raw/master/appdata/vpnc.png</image>
</screenshot>
<screenshot>
<caption>The advanced options dialog</caption>
<image width="800" height="547">https://git.gnome.org/browse/network-manager-vpnc/plain/appdata/vpnc-advanced.png</image>
<image width="800" height="547">https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/raw/master/appdata/vpnc-advanced.png</image>
</screenshot>
</screenshots>
<url type="homepage">https://wiki.gnome.org/Projects/NetworkManager/VPN</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager</url>
<url type="bugtracker">https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/issues</url>
<update_contact>networkmanager-maint@gnome.bugs</update_contact>
<translation type="gettext">NetworkManager-vpnc</translation>
<_developer_name>The NetworkManager Developers</_developer_name>
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -232,6 +232,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBNMA_CFLAGS = @LIBNMA_CFLAGS@
......@@ -315,6 +316,8 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
has_file = @has_file@
has_find = @has_find@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
......
......@@ -488,7 +488,7 @@ main (int argc, char *argv[])
*/
prompt = get_passwords_required (data, hints, &need_password, &need_group_password);
if (!prompt)
prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name);
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_group_password)
......
#! /bin/sh
#!/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:
This diff is collapsed.
......@@ -12,6 +12,14 @@
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#undef HAVE_BIND_TEXTDOMAIN_CODESET
/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
#undef HAVE_CFLOCALECOPYCURRENT
/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
the CoreFoundation framework. */
#undef HAVE_CFPREFERENCESCOPYAPPVALUE
/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
......
#! /bin/sh
#!/bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
# Copyright 1992-2017 Free Software Foundation, Inc.
timestamp='2015-01-01'
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
......@@ -33,7 +33,7 @@ timestamp='2015-01-01'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
......@@ -53,8 +53,7 @@ timestamp='2015-01-01'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS
$0 [OPTION] ALIAS
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
......@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2015 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."
......@@ -117,8 +116,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
......@@ -255,15 +254,16 @@ case $basic_machine in
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
| e2k | epiphany \
| 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,11 +301,12 @@ case $basic_machine in
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
......@@ -314,6 +315,7 @@ case $basic_machine in
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| wasm32 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
......@@ -376,17 +378,18 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| 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-* \
......@@ -427,13 +430,15 @@ case $basic_machine in
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
......@@ -442,6 +447,7 @@ case $basic_machine in
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
| wasm32-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
......@@ -518,6 +524,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
asmjs)
basic_machine=asmjs-unknown
;;
aux)
basic_machine=m68k-apple
os=-aux
......@@ -638,6 +647,14 @@ case $basic_machine in
basic_machine=m68k-bull
os=-sysv3
;;
e500v[12])
basic_machine=powerpc-unknown
os=$os"spe"
;;
e500v[12]-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
os=$os"spe"
;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
......@@ -933,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
os=-proelf
......@@ -1017,7 +1037,7 @@ case $basic_machine in
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
......@@ -1027,7 +1047,7 @@ case $basic_machine in
;;
ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
......@@ -1228,6 +1248,9 @@ case $basic_machine in
basic_machine=a29k-wrs
os=-vxworks
;;
wasm32)
basic_machine=wasm32-unknown
;;
w65*)
basic_machine=w65-wdc
os=-none
......@@ -1373,18 +1396,18 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -bitrig* | -openbsd* | -solidbsd* \
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
......@@ -1393,7 +1416,8 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
| -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1525,6 +1549,8 @@ case $os in
;;
-nacl*)
;;
-ios)
;;
-none)
;;
*)
......@@ -1620,6 +1646,9 @@ case $basic_machine in
sparc-* | *-sun)
os=-sunos4.1.1
;;
pru-*)
os=-elf
;;
*-be)
os=-beos
;;
......
This diff is collapsed.
AC_PREREQ(2.52)
AC_INIT(NetworkManager-vpnc,
1.2.4,
https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager,
1.2.6,
https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/issues,
NetworkManager-vpnc)
AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
AM_MAINTAINER_MODE
......@@ -19,6 +19,16 @@ AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_CHECK_PROG([has_file], file, yes, no)
if test x$has_file = xno ; then
AC_MSG_ERROR(["file" utility not found.])
fi
AC_CHECK_PROG([has_find], find, yes, no)
if test x$has_find = xno ; then
AC_MSG_ERROR(["find" utility not found.])
fi
dnl
dnl Required headers
dnl
......@@ -91,11 +101,7 @@ if test x"$with_gnome" != xno; then
GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
PKG_CHECK_MODULES(LIBNMA, libnma >= 1.2.0)
PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18, [], [
dnl We use the secret service API that went stable in 0.18
PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
LIBSECRET_CFLAGS="$LIBSECRET_CFLAGS -DSECRET_API_SUBJECT_TO_CHANGE"
])
PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18)
if test x"$with_libnm_glib" != xno; then
PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.2.0)
......@@ -117,7 +123,7 @@ LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
NM_VPN_SERVICE_DIR=`$PKG_CONFIG --define-variable prefix='\${prefix}' --variable vpnservicedir libnm`
AC_SUBST(NM_VPN_SERVICE_DIR)
NM_COMPILER_WARNINGS
NM_COMPILER_WARNINGS([yes])
NM_PLUGIN_DIR="$libdir/NetworkManager"
AC_SUBST(NM_PLUGIN_DIR)
......
#! /bin/sh
#!/bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2013-05-30.07; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -786,6 +786,6 @@ exit 0
# 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
# install - install a program, script, or datafile
scriptversion=2013-12-25.23; # UTC
scriptversion=2016-01-11.22; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
......@@ -496,6 +496,6 @@ done
# 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:
......@@ -7272,10 +7272,12 @@ func_mode_link ()
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-specs=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
......
......@@ -37,7 +37,7 @@ AC_DEFUN([NM_COMPILER_WARNING], [
AC_DEFUN([NM_COMPILER_WARNINGS],
[AC_ARG_ENABLE(more-warnings,
AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]),
set_more_warnings="$enableval",set_more_warnings=yes)
set_more_warnings="$enableval",set_more_warnings=$1)
AC_MSG_CHECKING(for more warnings)
if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
AC_MSG_RESULT(yes)
......@@ -55,7 +55,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
dnl attach it to the CFLAGS.
NM_COMPILER_WARNING([unknown-warning-option], [])
CFLAGS_MORE_WARNINGS="-Wall -std=gnu89"
CFLAGS_MORE_WARNINGS="-Wall -std=gnu99"
if test "x$set_more_warnings" = xerror; then
CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS -Werror"
......
#! /bin/sh
#!/bin/sh
# Common wrapper for a few potentially missing GNU programs.
scriptversion=2013-10-28.13; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
......@@ -210,6 +210,6 @@ exit $st