Commit d8239505 authored by Mike Miller's avatar Mike Miller

New upstream version 1.2.4

parent 9e13e87f
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src
SUBDIRS = shared properties src po
if WITH_GNOME
SUBDIRS += properties po
if WITH_AUTHDLG
SUBDIRS += auth-dialog
endif
......@@ -23,7 +21,7 @@ install-data-hook:
mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \
-e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
-e 's|[@]PLUGINDIR[@]|@NM_PLUGIN_DIR@|g' \
<$(srcdir)/nm-openconnect-service.name.in \
>$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-openconnect-service.name
......@@ -32,13 +30,16 @@ uninstall-hook:
endif
appdatadir = $(datadir)/appdata
appdata_files = $(appdata_in_files:.xml.in=.xml)
if WITH_GNOME
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
endif
appdata_in_files = appdata/network-manager-openconnect.metainfo.xml.in
@INTLTOOL_XML_RULE@
nm-openconnect-service.name: $(srcdir)/nm-openconnect-service.name.in
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR@|g' \
-e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR_NAME_FILE@|g' \
$< >$@
DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
......@@ -48,7 +49,7 @@ EXTRA_DIST = nm-openconnect-service.name.in \
$(desktop_in_files) \
$(icon_DATA) \
$(appdata_in_files) \
$(appdata_DATA) \
$(appdata_files) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
......@@ -56,7 +57,7 @@ EXTRA_DIST = nm-openconnect-service.name.in \
CLEANFILES = $(nmvpnservice_DATA) \
$(desktop_DATA) \
$(appdata_DATA)
$(appdata_files)
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
......
......@@ -88,11 +88,11 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@WITH_GNOME_TRUE@am__append_1 = properties po
@WITH_AUTHDLG_TRUE@@WITH_GNOME_TRUE@am__append_2 = auth-dialog
@WITH_AUTHDLG_TRUE@@WITH_GNOME_TRUE@am__append_1 = auth-dialog
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_options.m4 \
$(top_srcdir)/m4/git-sha-record.m4 \
$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
......@@ -193,7 +193,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = src properties po auth-dialog
DIST_SUBDIRS = shared properties src po auth-dialog
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
COPYING ChangeLog NEWS compile config.guess config.sub depcomp \
install-sh ltmain.sh missing
......@@ -240,6 +240,7 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = -I m4
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
......@@ -260,6 +261,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DL_LIBS = @DL_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
......@@ -319,6 +321,7 @@ MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NM_PLUGIN_DIR = @NM_PLUGIN_DIR@
NM_PLUGIN_DIR_NAME_FILE = @NM_PLUGIN_DIR_NAME_FILE@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
......@@ -404,13 +407,14 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src $(am__append_1) $(am__append_2)
SUBDIRS = shared properties src po $(am__append_1)
dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-openconnect-service.conf
nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
nmvpnservice_DATA = nm-openconnect-service.name
appdatadir = $(datadir)/appdata
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_files = $(appdata_in_files:.xml.in=.xml)
@WITH_GNOME_TRUE@appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = appdata/network-manager-openconnect.metainfo.xml.in
DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
EXTRA_DIST = nm-openconnect-service.name.in \
......@@ -418,7 +422,7 @@ EXTRA_DIST = nm-openconnect-service.name.in \
$(desktop_in_files) \
$(icon_DATA) \
$(appdata_in_files) \
$(appdata_DATA) \
$(appdata_files) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
......@@ -426,10 +430,9 @@ EXTRA_DIST = nm-openconnect-service.name.in \
CLEANFILES = $(nmvpnservice_DATA) \
$(desktop_DATA) \
$(appdata_DATA)
$(appdata_files)
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
ACLOCAL_AMFLAGS = -I m4
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
......@@ -726,7 +729,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
......@@ -751,7 +754,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
......@@ -769,7 +772,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*) \
......@@ -779,7 +782,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
......@@ -996,7 +999,7 @@ uninstall-am: uninstall-appdataDATA uninstall-dbusserviceDATA \
@WITH_LIBNM_GLIB_TRUE@ mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
@WITH_LIBNM_GLIB_TRUE@ sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \
@WITH_LIBNM_GLIB_TRUE@ -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
@WITH_LIBNM_GLIB_TRUE@ -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
@WITH_LIBNM_GLIB_TRUE@ -e 's|[@]PLUGINDIR[@]|@NM_PLUGIN_DIR@|g' \
@WITH_LIBNM_GLIB_TRUE@ <$(srcdir)/nm-openconnect-service.name.in \
@WITH_LIBNM_GLIB_TRUE@ >$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-openconnect-service.name
......@@ -1006,7 +1009,7 @@ uninstall-am: uninstall-appdataDATA uninstall-dbusserviceDATA \
nm-openconnect-service.name: $(srcdir)/nm-openconnect-service.name.in
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR@|g' \
-e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR_NAME_FILE@|g' \
$< >$@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
......
=======================================================
NetworkManager-openconnect-1.2.4
Overview of changes since NetworkManager-openconnect-1.2.2
=======================================================
This is a new stable release of NetworkManager-openconnect. Notable changes include:
* Split libnm-vpn-plugin-openconnect.so into a GTK-free core plugin
usable by nmcli and a UI plugin for nm-applet and GNOME components.
* Support NM_VPN_LOG_LEVEL environment variable to control debug
logging from NetworkManager.
* Support Juniper Network Connect / Junos Pulse Secure VPN
* Add Yubikey OATH support
* Translation updates
* Added support for automatic login when all needed data is known
* Fixed support for IPv6-only VPNs
=======================================================
NetworkManager-openconnect-1.2.2
Overview of changes since NetworkManager-openconnect-1.2
......
This diff is collapsed.
......@@ -6,14 +6,30 @@
<extends>nm-connection-editor.desktop</extends>
<extends>gnome-control-center.desktop</extends>
<name>OpenConnect VPN client</name>
<name xml:lang="ca">Client VPN OpenConnect</name>
<name xml:lang="cs">VPN klient OpenConnect</name>
<name xml:lang="de">OpenConnect VPN-Client</name>
<name xml:lang="es">Cliente de VPN OpenConnect</name>
<name xml:lang="hu">OpenConnect VPN kliens</name>
<name xml:lang="id">Klien VPN OpenConnect</name>
<name xml:lang="lt">OpenConnect VPN klientas</name>
<name xml:lang="pl">Klient VPN OpenConnect</name>
<name xml:lang="pt_BR">Cliente VPN OpenConnect</name>
<name xml:lang="sr">ВПН клијент Отореног повезивања</name>
<name xml:lang="sr@latin">VPN klijent Otorenog povezivanja</name>
<name xml:lang="sv">OpenConnect VPN-klient</name>
<summary>Client for Cisco AnyConnect SSL VPN virtual private networks</summary>
<summary xml:lang="ca">Client per a xarxes privades virtuals Cisco AnyConnect SSL VPN</summary>
<summary xml:lang="cs">Klient pro virtuální privátní sítě Cisco AnyConnect SLL VPN</summary>
<summary xml:lang="de">Client für SSL VPN virtuelle private Netze mit Cisco AnyConnect</summary>
<summary xml:lang="es">Cliente para redes privadas virtuales de Cisco VPN AnyConnect SSL</summary>
<summary xml:lang="hu">Kliens a Cisco AnyConnect SSL VPN virtuális magánhálózatokhoz</summary>
<summary xml:lang="id">Klien bagi virtual private network VPN SSL AnyConnect Cisco</summary>
<summary xml:lang="lt">Klientas Cisco AnyConnect SSL VPN virtualiems privatiems tinklams</summary>
<summary xml:lang="pl">Klient dla wirtualnych sieci prywatnych Cisco AnyConnect SSL VPN</summary>
<summary xml:lang="pt_BR">Cliente para redes privadas virtuais Cisco AnyConnect SSL VPN</summary>
<summary xml:lang="sr">Клијент за Цискове Ени конект ССЛ ВПН виртуелне приватне мреже</summary>
<summary xml:lang="sr@latin">Klijent za Ciskove Eni konekt SSL VPN virtuelne privatne mreže</summary>
<summary xml:lang="sv">Klient för Cisco AnyConnect SSL VPN virtuella privata nätverk</summary>
<keywords>
......@@ -31,14 +47,30 @@
<description>
<p>Support for configuring SSL VPN virtual private network connections using OpenConnect.</p>
<p xml:lang="ca">Suport per configurar connexions de xarxes privades virtuals SSL VPN usant l'OpenConnect.</p>
<p xml:lang="cs">Podpora pro nastavení připojení k virtuálním privátním sítím SSL VPN pomocí OpenConnect.</p>
<p xml:lang="de">Unterstützung zum Einrichten von SSL VPN virtuellen privaten Netzverbindungen mit Hilfe von OpenConnect.</p>
<p xml:lang="es">Soporte para configurar conexiones a redes privadas virtuales SSL VPN usando OpenConnect.</p>
<p xml:lang="hu">Az SSL VPN virtuális magánhálózati kapcsolatok beállításának támogatása az OpenConnect használatával.</p>
<p xml:lang="pl">Obsługa konfigurowania wirtualnych sieci prywatnych SSL VPN używając OpenConnect.</p>
<p xml:lang="id">Dukungan untuk melakukan konfigurasi koneksi virtual private network SSL VPN memakai OpenConnect.</p>
<p xml:lang="lt">SSL VPN virtualių privačių tinklų ryšių naudojant OpenConnect konfigūravimo palaikymas.</p>
<p xml:lang="pl">Obsługa konfigurowania wirtualnych sieci prywatnych SSL VPN za pomocą OpenConnect.</p>
<p xml:lang="pt_BR">Suporte para configuração de conexões de rede privada virtual SSL VPN usando OpenConnect.</p>
<p xml:lang="sr">Подршка за подешавање веза ССЛ ВПН виртуелних приватних мрежа које користе Отворено повезивање.</p>
<p xml:lang="sr@latin">Podrška za podešavanje veza SSL VPN virtuelnih privatnih mreža koje koriste Otvoreno povezivanje.</p>
<p xml:lang="sv">Stöd för att konfigurera SSL VPN virtuella privata nätverksanslutningar med OpenConnect.</p>
<p>Compatible with Cisco AnyConnect, Juniper and ocserv based networks.</p>
<p xml:lang="ca">Compatible amb xarxes basades en Cisco AnyConnect, Juniper o ocserv.</p>
<p xml:lang="cs">Kompatibilní s Cisco AnyConnect, Juniper a sítěmi založenými na ocserv.</p>
<p xml:lang="de">Kompatibel zu Cisco AnyConnect, Juniper und auf ocserv basierenden Netzen.</p>
<p xml:lang="es">Compatible con Cisco AnyConnect, Juniper y redes basadas en ocserv.</p>
<p xml:lang="hu">Kompatibilis a Cisco AnyConnect, Juniper és ocserv alapú hálózatokkal.</p>
<p xml:lang="pl">Zgodne z sieciami opartymi na Cisco AnyConnect, Juniper i ocserv.</p>
<p xml:lang="id">Kompatibel dengan AnyConnect Cisco, Juniper, dan jaringan berbasis ocserv.</p>
<p xml:lang="lt">Suderinamas su Cisco AnyConnect, Juniper ir ocserv pagrindo tinklais.</p>
<p xml:lang="pl">Zgodne z sieciami opartymi na Cisco AnyConnect, Juniper i ocserv.</p>
<p xml:lang="pt_BR">Compatível com redes baseadas em Cisco AnyConnect, Juniper e ocserv.</p>
<p xml:lang="sr">Сагласно са мрежама заснованим на Цисковом Ени конекту, Џаниперу и оцсерв-у.</p>
<p xml:lang="sr@latin">Saglasno sa mrežama zasnovanim na Ciskovom Eni konektu, Džaniperu i ocserv-u.</p>
<p xml:lang="sv">Kompatibel med Cisco AnyConnect, Juniper och ocserv-baserade nätverk.</p>
</description>
......@@ -53,8 +85,16 @@
<update_contact>networkmanager-maint@gnome.bugs</update_contact>
<translation type="gettext">NetworkManager-openconnect</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 NetworkManageru</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="hu">A Hálózatkezelő fejlesztői</developer_name>
<developer_name xml:lang="id">Para Pengembang 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>
<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>
</component>
\ No newline at end of file
......@@ -9,7 +9,9 @@ nm_openconnect_auth_dialog_CPPFLAGS = \
$(LIBSECRET_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DBINDIR=\""$(bindir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-I"$(top_srcdir)/shared" \
$(NULL)
nm_openconnect_auth_dialog_SOURCES = \
main.c \
......
......@@ -91,7 +91,8 @@ host_triplet = @host@
libexec_PROGRAMS = nm-openconnect-auth-dialog$(EXEEXT)
subdir = auth-dialog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_options.m4 \
$(top_srcdir)/m4/git-sha-record.m4 \
$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
......@@ -180,6 +181,7 @@ CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
......@@ -200,6 +202,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DL_LIBS = @DL_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
......@@ -259,6 +262,7 @@ MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NM_PLUGIN_DIR = @NM_PLUGIN_DIR@
NM_PLUGIN_DIR_NAME_FILE = @NM_PLUGIN_DIR_NAME_FILE@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
......@@ -352,7 +356,9 @@ nm_openconnect_auth_dialog_CPPFLAGS = \
$(LIBSECRET_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DBINDIR=\""$(bindir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-I"$(top_srcdir)/shared" \
$(NULL)
nm_openconnect_auth_dialog_SOURCES = \
main.c \
......@@ -462,25 +468,22 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm_openconnect_auth_dialog-main.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
......
This diff is collapsed.
......@@ -81,6 +81,9 @@
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* git commit id of the original source code version */
#undef NM_GIT_SHA
/* Name of package */
#undef PACKAGE
......
This diff is collapsed.
AC_PREREQ(2.52)
AC_INIT(NetworkManager-openconnect,
1.2.2,
1.2.4,
https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager,
NetworkManager-openconnect)
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])
......@@ -39,19 +39,43 @@ AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP
AC_CHECK_FUNCS(select socket uname)
GIT_SHA_RECORD(NM_GIT_SHA)
AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
dnl ensure that when the Automake generated makefile calls aclocal,
dnl it honours the $ACLOCAL_FLAGS environment variable
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
if test -n "$ac_macro_dir"; then
ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
fi
AC_SUBST([ACLOCAL_AMFLAGS])
dnl
dnl GNOME support
dnl
AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openconnect without GNOME support, e.g. vpn service only]))
AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openconnect without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openconnect without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
fi
fi
if test "$with_gnome" != no; then
with_gnome=yes
fi
if test "$with_libnm_glib_specified" == no; then
with_libnm_glib="$with_gnome"
fi
if test "$with_libnm_glib" != no; then
with_libnm_glib=yes
fi
AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openconnect without libnm-glib comatibility]))
AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno)
AC_ARG_ENABLE(absolute-paths, AS_HELP_STRING([--enable-absolute-paths], [Use absolute paths to in .name files. Useful for development. (default is no)]))
AC_ARG_WITH(authdlg, AS_HELP_STRING([--without-authdlg], [Build NetworkManager-openconnect without authentication dialog]))
AM_CONDITIONAL(WITH_AUTHDLG, test x"$with_authdlg" != xno)
GETTEXT_PACKAGE=NetworkManager-openconnect
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
......@@ -68,23 +92,58 @@ if test x"$with_gnome" != xno; then
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
if test x"$with_authdlg" != xno; then
PKG_CHECK_MODULES(OPENCONNECT, openconnect >= 3.02)
fi
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"
])
if test x"$with_libnm_glib" != xno; then
PKG_CHECK_MODULES(LIBNM_GLIB,
NetworkManager >= 1.1.0
libnm-util >= 1.1.0
libnm-glib >= 1.1.0
libnm-glib-vpn >= 1.1.0)
NetworkManager >= 1.2.0
libnm-util >= 1.2.0
libnm-glib >= 1.2.0
libnm-glib-vpn >= 1.2.0);
LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4"
fi
fi
test x"$enable_absolute_paths" = x"yes" && NM_PLUGIN_DIR='$(libdir)/NetworkManager/'
PKG_CHECK_MODULES(LIBNM, libnm >= 1.2.0)
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4"
AC_ARG_WITH(authdlg, AS_HELP_STRING([--without-authdlg], [Build NetworkManager-openconnect without authentication dialog]), [], [with_authdlg_specified=no])
if test x"$with_authdlg_specified" == xno; then
with_authdlg="$with_gnome"
else
if test x"$with_authdlg" != xno; then
if test x"$with_gnome" == xno; then
AC_MSG_ERROR(Building --with-authdlg requires --with-gnome)
fi
with_authdlg=yes
fi
fi
if test x"$with_authdlg" != xno; then
PKG_CHECK_MODULES(OPENCONNECT, openconnect >= 3.02)
fi
AM_CONDITIONAL(WITH_AUTHDLG, test x"$with_authdlg" != xno)
NM_VPN_SERVICE_DIR=`$PKG_CONFIG --define-variable prefix='\${prefix}' --variable vpnservicedir libnm`
AC_SUBST(NM_VPN_SERVICE_DIR)
NM_COMPILER_WARNINGS
NM_PLUGIN_DIR="$libdir/NetworkManager"
AC_SUBST(NM_PLUGIN_DIR)
if test x"$enable_absolute_paths" == x"yes"; then
NM_PLUGIN_DIR_NAME_FILE="$NM_PLUGIN_DIR/"
else
enable_absolute_paths=no
NM_PLUGIN_DIR_NAME_FILE=""
fi
AC_SUBST(NM_PLUGIN_DIR_NAME_FILE)
dnl
dnl Distribution version string
......@@ -94,20 +153,20 @@ if ! test x"$ac_distver" = x""; then
AC_DEFINE_UNQUOTED(DIST_VERSION, "$ac_distver", [Define the distribution version string])
fi
PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.0)
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
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
AC_CONFIG_FILES([
Makefile
src/Makefile
auth-dialog/Makefile
properties/Makefile
po/Makefile.in
shared/Makefile
])
AC_OUTPUT
echo ""
echo "Build configuration: "
echo " --with-gnome=$with_gnome"
echo " --with-libnm-glib=$with_libnm_glib"
echo " --with-authdlg=$with_authdlg"
echo " --enable-absolute-paths=$enable_absolute_paths"
echo " --enable-more-warnings=$set_more_warnings"
AC_DEFUN([_NM_COMPILER_FLAG], [
CFLAGS_SAVED="$CFLAGS"
CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror $1"
AC_MSG_CHECKING([whether $1 works as expected])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[$2]])], [
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS_SAVED"
$3
],[
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS_SAVED"
$4
])
],[
AC_MSG_RESULT(not supported)
CFLAGS="$CFLAGS_SAVED"
])
])
dnl Check whether a particular compiler flag is supported,
dnl add it to CFLAGS if it is
AC_DEFUN([NM_COMPILER_FLAG], [
_NM_COMPILER_FLAG([$1], [], [
CFLAGS="$CFLAGS $1"
$2
], [$3])
])
dnl Check whether a particular warning is not emitted with code provided,
dnl disable it in CFLAGS if the check fails.
AC_DEFUN([NM_COMPILER_WARNING], [
_NM_COMPILER_FLAG([-W$1], [$2], [CFLAGS="$CFLAGS -W$1"], [CFLAGS="$CFLAGS -Wno-$1"])
])
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)
AC_MSG_CHECKING(for more warnings)
if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
AC_MSG_RESULT(yes)
dnl This is enabled in clang by default, makes little sense,
dnl and causes the build to abort with -Werror.
CFLAGS_SAVED="$CFLAGS"
CFLAGS="$CFLAGS -Qunused-arguments"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [], CFLAGS="$CFLAGS_SAVED")
unset CFLAGS_SAVED
dnl clang only warns about unknown warnings, unless
dnl called with "-Werror=unknown-warning-option"
dnl Test if the compiler supports that, and if it does
dnl attach it to the CFLAGS.
NM_COMPILER_WARNING([unknown-warning-option], [])
CFLAGS_MORE_WARNINGS="-Wall -std=gnu89"
if test "x$set_more_warnings" = xerror; then
CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS -Werror"
fi
for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
-Wdeclaration-after-statement -Wformat-security \
-Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
-Wno-duplicate-decl-specifier \
-Wstrict-prototypes \
-Wno-unused-but-set-variable \
-Wno-format-y2k \
-Wundef -Wimplicit-function-declaration \
-Wpointer-arith -Winit-self -Wformat-nonliteral \
-Wmissing-include-dirs -Wno-pragmas; do
dnl GCC 4.4 does not warn when checking for -Wno-* flags (https://gcc.gnu.org/wiki/FAQ#wnowarning)
_NM_COMPILER_FLAG([$(printf '%s' "$option" | sed 's/^-Wno-/-W/')], [],
[CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option"], [])
done
unset option
dnl Disable warnings triggered by known compiler problems
dnl https://bugzilla.gnome.org/show_bug.cgi?id=745821
NM_COMPILER_WARNING([unknown-attributes], [#include <glib.h>])
dnl https://bugzilla.gnome.org/show_bug.cgi?id=744473
NM_COMPILER_WARNING([typedef-redefinition], [#include <gio/gio.h>])
dnl https://llvm.org/bugs/show_bug.cgi?id=21614
NM_COMPILER_WARNING([array-bounds],
[#include <string.h>]
[void f () { strcmp ("something", "0"); }]
)
dnl https://llvm.org/bugs/show_bug.cgi?id=22949
NM_COMPILER_WARNING([parentheses-equality],
[#include <sys/wait.h>]
[void f () { if (WIFCONTINUED(0)) return; }]
)
dnl systemd-dhcp's log_internal macro and our handle_warn are sometimes
dnl used in void context,u sometimes in int. Makes clang unhappy.
NM_COMPILER_WARNING([unused-value],
[#define yolo ({ (666 + 666); })]
[int f () { int i = yolo; yolo; return i; }]
)
CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS"
else
AC_MSG_RESULT(no)
fi
])
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=error)
AC_MSG_CHECKING(for more warnings)
if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
AC_MSG_RESULT(yes)
CFLAGS="-Wall -std=gnu89 $CFLAGS"
for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
-Wdeclaration-after-statement -Wstrict-prototypes \
-Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
-fno-strict-aliasing; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
AC_MSG_CHECKING([whether gcc understands $option])
AC_TRY_COMPILE([], [],
has_option=yes,
has_option=no,)
if test $has_option = no; then
CFLAGS="$SAVE_CFLAGS"
fi
AC_MSG_RESULT($has_option)
unset has_option
unset SAVE_CFLAGS
done
unset option
if test "x$set_more_warnings" = xerror; then
CFLAGS="$CFLAGS -Werror"
fi
else
AC_MSG_RESULT(no)
fi
])
dnl GIT_SHA_RECORD($1, $2)
dnl
dnl $1: the name of the assigned variable. For example NM_GIT_SHA,
dnl NMA_GIT_SHA, LIBNL_GIT_SHA.
dnl $2: by default, a define to config.h is added. This can be
dnl suppressed by passing "no-config-h".
dnl
AC_DEFUN([GIT_SHA_RECORD], [
m4_define([git_sha_record_v],
[m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
$1=git_sha_record_v
if test ""$2"" != "no-config-h" ; then
AC_DEFINE_UNQUOTED($1,"$$1",[git commit id of the original source code version])
fi
])
......@@ -10,3 +10,6 @@ plugin=@PLUGINDIR@/libnm-vpn-plugin-openconnect.so
[GNOME]
auth-dialog=@LIBEXECDIR@/nm-openconnect-auth-dialog
properties=@PLUGINDIR@/libnm-openconnect-properties
[openconnect]
supported-protocols=anyconnect,nc
This diff is collapsed.
......@@ -2,8 +2,11 @@
# Please keep this file sorted alphabetically.
appdata/network-manager-openconnect.metainfo.xml.in
auth-dialog/main.c
openconnect-strings.txt
properties/auth-helpers.c
properties/nm-openconnect.c
src/nm-openconnect-service.c
[type: gettext/glade]properties/nm-openconnect-dialog.ui
properties/nm-openconnect-editor.c