Commit 6f0c674f authored by Michael Biebl's avatar Michael Biebl

Imported Upstream version 1.2.4

parent 485462bc
AUTOMAKE_OPTIONS = foreign
SUBDIRS = shared src
SUBDIRS = shared src properties po
if WITH_GNOME
SUBDIRS += auth-dialog properties po
SUBDIRS += auth-dialog
endif
dbusservicedir = $(sysconfdir)/dbus-1/system.d
......@@ -19,7 +19,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-openvpn-service.name.in \
>$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-openvpn-service.name
......@@ -28,29 +28,31 @@ uninstall-hook:
endif
appdatadir = $(datadir)/appdata
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_files = $(appdata_in_files:.xml.in=.xml)
if WITH_GNOME
appdata_DATA = $(appdata_files)
endif
appdata_in_files = appdata/network-manager-openvpn.metainfo.xml.in
@INTLTOOL_XML_RULE@
nm-openvpn-service.name: $(srcdir)/nm-openvpn-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 = \
--with-tests=yes \
--enable-more-warnings=yes
EXTRA_DIST = nm-openvpn-service.name.in \
$(dbusservice_DATA) \
$(appdata_in_files) \
$(appdata_DATA) \
$(appdata_files) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
CLEANFILES = $(nmvpnservice_DATA) \
$(appdata_DATA)
$(appdata_files)
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
......
......@@ -88,7 +88,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@WITH_GNOME_TRUE@am__append_1 = auth-dialog properties po
@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 \
......@@ -192,7 +192,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = shared src auth-dialog properties po
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
......@@ -321,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,28 +405,28 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = shared src $(am__append_1)
SUBDIRS = shared src properties po $(am__append_1)
dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-openvpn-service.conf
nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
nmvpnservice_DATA = nm-openvpn-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_files)
appdata_in_files = appdata/network-manager-openvpn.metainfo.xml.in
DISTCHECK_CONFIGURE_FLAGS = \
--with-tests=yes \
--enable-more-warnings=yes
EXTRA_DIST = nm-openvpn-service.name.in \
$(dbusservice_DATA) \
$(appdata_in_files) \
$(appdata_DATA) \
$(appdata_files) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
CLEANFILES = $(nmvpnservice_DATA) \
$(appdata_DATA)
$(appdata_files)
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
all: config.h
......@@ -994,7 +995,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-openvpn-service.name.in \
@WITH_LIBNM_GLIB_TRUE@ >$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-openvpn-service.name
......@@ -1004,7 +1005,7 @@ uninstall-am: uninstall-appdataDATA uninstall-dbusserviceDATA \
nm-openvpn-service.name: $(srcdir)/nm-openvpn-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.
......
=======================================================
NetworkManagerg-openvpn-1.2.4
Overview of changes since NetworkManager-openvpn-1.2.2
=======================================================
This is a new stable release of NetworkManager-openvpn. Notable changes include:
* Prefer building against stable libsecret API
* Split libnm-vpn-plugin-openvpn.so into a GTK-free core plugin
usable by nmcli and a UI plugin for nm-applet and gnome components.
* Support NM_VPN_PLUGIN_DEBUG environment variable to control debug
logging from NetworkManager.
* Updated Catalan, German, Spanish, Indonesian, Polish, Brazilian Portuguese,
Swedish, Serbian, Serbian Latin translations
* Fix handling comp-lzo option
* Add support for tls-cipher option
* Add support for IPv6 DNS servers
* Fix handling quotes and comments when parsing ovpn files
* Hide internal ABI from properties libraries
* Preserve IP routing configuration on restart
* Various cleanups
=======================================================
NetworkManagerg-openvpn-1.2.2
Overview of changes since NetworkManager-openvpn-1.2
......
This diff is collapsed.
......@@ -6,15 +6,25 @@
<extends>nm-connection-editor.desktop</extends>
<extends>gnome-control-center.desktop</extends>
<name>OpenVPN client</name>
<name xml:lang="de">OpenVPN-Client</name>
<name xml:lang="el">Πελάτης OpenVPN</name>
<name xml:lang="es">Cliente de OpenVPN</name>
<name xml:lang="hu">OpenVPN kliens</name>
<name xml:lang="id">Klien OpenVPN</name>
<name xml:lang="pl">Klient OpenVPN</name>
<name xml:lang="pt_BR">Cliente OpenVPN</name>
<name xml:lang="sr">ОпенВПН клијент</name>
<name xml:lang="sr@latin">OpenVPN klijent</name>
<name xml:lang="sv">OpenVPN-klient</name>
<summary>Client for OpenVPN virtual private networks</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="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="pl">Klient dla wirtualnych sieci prywatnych OpenVPN</summary>
<summary xml:lang="pt_BR">Cliente para redes privadas virtuais OpenVPN</summary>
<summary xml:lang="sr">Клијент за виртуелне приватне мреже кроз ОпенВПН</summary>
<summary xml:lang="sr@latin">Klijent za virtuelne privatne mreže kroz OpenVPN</summary>
<summary xml:lang="sv">Klient för OpenVPN virtuella privata nätverk</summary>
<keywords>
......@@ -28,14 +38,24 @@
<description>
<p>Support for configuring OpenVPN virtual private network connections.</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="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="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>
<p xml:lang="sr">Подршка за подешавање повезивања у виртуелним приватним мрежама кроз ОпенВПН.</p>
<p xml:lang="sr@latin">Podrška za podešavanje povezivanja u virtuelnim privatnim mrežama kroz OpenVPN.</p>
<p xml:lang="sv">Stöd för att konfigurera OpenVPN virtuella privata nätverksanslutningar.</p>
<p>OpenVPN is a popular and flexible free-software VPN solution.</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="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="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>
<p xml:lang="sr">ОпенВПН је популаран, прилагодљив и слободан програм за ВПН.</p>
<p xml:lang="sr@latin">OpenVPN je popularan, prilagodljiv i slobodan program za VPN.</p>
<p xml:lang="sv">OpenVPN är en populär och flexibel VPN-lösning som är fri programvara.</p>
</description>
......@@ -54,9 +74,14 @@
<update_contact>networkmanager-maint@gnome.bugs</update_contact>
<translation type="gettext">NetworkManager-openvpn</translation>
<developer_name>The NetworkManager Developers</developer_name>
<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="hu">A Hálózatkezelő fejlesztői</developer_name>
<developer_name xml:lang="id">Para Pengembang NetworkManager</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">Razvojni tim Upravnika mreže</developer_name>
<developer_name xml:lang="sv">Utvecklarna av Nätverkshanteraren</developer_name>
</component>
\ No newline at end of file
......@@ -13,13 +13,14 @@ nm_openvpn_auth_dialog_CPPFLAGS = \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
nm_openvpn_auth_dialog_SOURCES = \
$(top_srcdir)/shared/utils.c \
$(top_srcdir)/shared/utils.h \
main.c
nm_openvpn_auth_dialog_LDADD = \
$(GTK_LIBS) \
$(LIBNM_LIBS) \
$(LIBNMA_LIBS) \
$(LIBSECRET_LIBS) \
$(top_builddir)/shared/libnm-vpn-plugin-openvpn-shared.la
$(LIBSECRET_LIBS)
CLEANFILES = *~
......@@ -106,13 +106,13 @@ CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(libexecdir)"
PROGRAMS = $(libexec_PROGRAMS)
am_nm_openvpn_auth_dialog_OBJECTS = \
nm_openvpn_auth_dialog-utils.$(OBJEXT) \
nm_openvpn_auth_dialog-main.$(OBJEXT)
nm_openvpn_auth_dialog_OBJECTS = $(am_nm_openvpn_auth_dialog_OBJECTS)
am__DEPENDENCIES_1 =
nm_openvpn_auth_dialog_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) \
$(top_builddir)/shared/libnm-vpn-plugin-openvpn-shared.la
$(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
......@@ -262,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@
......@@ -357,14 +358,15 @@ nm_openvpn_auth_dialog_CPPFLAGS = \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
nm_openvpn_auth_dialog_SOURCES = \
$(top_srcdir)/shared/utils.c \
$(top_srcdir)/shared/utils.h \
main.c
nm_openvpn_auth_dialog_LDADD = \
$(GTK_LIBS) \
$(LIBNM_LIBS) \
$(LIBNMA_LIBS) \
$(LIBSECRET_LIBS) \
$(top_builddir)/shared/libnm-vpn-plugin-openvpn-shared.la
$(LIBSECRET_LIBS)
CLEANFILES = *~
all: all-am
......@@ -461,31 +463,43 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm_openvpn_auth_dialog-main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm_openvpn_auth_dialog-utils.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 $@ $<
nm_openvpn_auth_dialog-utils.o: $(top_srcdir)/shared/utils.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(nm_openvpn_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm_openvpn_auth_dialog-utils.o -MD -MP -MF $(DEPDIR)/nm_openvpn_auth_dialog-utils.Tpo -c -o nm_openvpn_auth_dialog-utils.o `test -f '$(top_srcdir)/shared/utils.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/utils.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nm_openvpn_auth_dialog-utils.Tpo $(DEPDIR)/nm_openvpn_auth_dialog-utils.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/shared/utils.c' object='nm_openvpn_auth_dialog-utils.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(nm_openvpn_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm_openvpn_auth_dialog-utils.o `test -f '$(top_srcdir)/shared/utils.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/utils.c
nm_openvpn_auth_dialog-utils.obj: $(top_srcdir)/shared/utils.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(nm_openvpn_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm_openvpn_auth_dialog-utils.obj -MD -MP -MF $(DEPDIR)/nm_openvpn_auth_dialog-utils.Tpo -c -o nm_openvpn_auth_dialog-utils.obj `if test -f '$(top_srcdir)/shared/utils.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/utils.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/utils.c'; fi`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nm_openvpn_auth_dialog-utils.Tpo $(DEPDIR)/nm_openvpn_auth_dialog-utils.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/shared/utils.c' object='nm_openvpn_auth_dialog-utils.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(nm_openvpn_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm_openvpn_auth_dialog-utils.obj `if test -f '$(top_srcdir)/shared/utils.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/utils.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/utils.c'; fi`
nm_openvpn_auth_dialog-main.o: main.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(nm_openvpn_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm_openvpn_auth_dialog-main.o -MD -MP -MF $(DEPDIR)/nm_openvpn_auth_dialog-main.Tpo -c -o nm_openvpn_auth_dialog-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nm_openvpn_auth_dialog-main.Tpo $(DEPDIR)/nm_openvpn_auth_dialog-main.Po
......
......@@ -22,23 +22,18 @@
* 2005 Tim Niemueller [www.niemueller.de]
*/
#include "config.h"
#include "nm-default.h"
#include <errno.h>
#include <string.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#define SECRET_API_SUBJECT_TO_CHANGE
#include <libsecret/secret.h>
#include "nm-default.h"
#include <nm-vpn-service-plugin.h>
#include <nma-vpn-password-dialog.h>
#include "utils.h"
#include "nm-openvpn-service-defines.h"
#define KEYRING_UUID_TAG "connection-uuid"
#define KEYRING_SN_TAG "setting-name"
......
......@@ -81,9 +81,6 @@
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define if more asserts are enabled */
#undef NM_MORE_ASSERTS
/* Name of package */
#undef PACKAGE
......
This diff is collapsed.
AC_PREREQ(2.52)
AC_INIT(NetworkManager-openvpn,
1.2.2,
1.2.4,
https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager,
NetworkManager-openvpn)
AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-xz])
AM_INIT_AUTOMAKE([1.9 tar-ustar no-dist-gzip dist-xz])
AM_MAINTAINER_MODE
AC_CONFIG_MACRO_DIR([m4])
......@@ -50,10 +50,25 @@ AC_SUBST([ACLOCAL_AMFLAGS])
dnl
dnl GNOME support
dnl
AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]))
AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]))
AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno)
AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn 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-openvpn 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_ENABLE(absolute-paths, AS_HELP_STRING([--enable-absolute-paths], [Use absolute paths to in .name files. Useful for development. (default is no)]))
GETTEXT_PACKAGE=NetworkManager-openvpn
......@@ -71,7 +86,11 @@ 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-unstable)
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_GTK, libnm-gtk >= 1.2.0)
......@@ -90,27 +109,20 @@ 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_2"
NM_VPN_SERVICE_DIR=`$PKG_CONFIG pkg-config --define-variable prefix='\${prefix}' --variable vpnservicedir libnm`
NM_VPN_SERVICE_DIR=`$PKG_CONFIG --define-variable prefix='\${prefix}' --variable vpnservicedir libnm`
AC_SUBST(NM_VPN_SERVICE_DIR)
NM_COMPILER_WARNINGS
test x"$enable_absolute_paths" = x"yes" && NM_PLUGIN_DIR='$(libdir)/NetworkManager/'
NM_PLUGIN_DIR="$libdir/NetworkManager"
AC_SUBST(NM_PLUGIN_DIR)
dnl
dnl Tests
dnl
AC_ARG_WITH(tests, AS_HELP_STRING([--with-tests], [Build NetworkManager tests]))
AM_CONDITIONAL(WITH_TESTS, test "x$with_tests" = "xyes")
case $with_tests in
yes)
with_tests=yes
;;
*)
with_tests=no
;;
esac
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
......@@ -120,19 +132,6 @@ if ! test x"$ac_distver" = x""; then
AC_DEFINE_UNQUOTED(DIST_VERSION, "$ac_distver", [Define the distribution version string])
fi
AC_ARG_WITH(more-asserts,
AS_HELP_STRING([--with-more-asserts=level], [Enable more assertions for debugging (default: 0)]),
[more_asserts=${with_more_asserts}],
[more_asserts=no])
if test "${more_asserts}" = "no"; then
more_asserts=0
else
if test "${more_asserts}" = "yes"; then
more_asserts=100
fi
fi
AC_DEFINE_UNQUOTED(NM_MORE_ASSERTS, $more_asserts, [Define if more asserts are enabled])
AC_CONFIG_FILES([
Makefile
src/Makefile
......@@ -144,3 +143,10 @@ po/Makefile.in
shared/Makefile
])
AC_OUTPUT
echo ""
echo "Build configuration: "
echo " --with-gnome=$with_gnome"
echo " --with-libnm-glib=$with_libnm_glib"
echo " --enable-absolute-paths=$enable_absolute_paths"
echo " --enable-more-warnings=$set_more_warnings"
dnl Check whether a particular compiler flag works with code provided,
dnl disable it in CFLAGS if the check fails.
AC_DEFUN([NM_COMPILER_WARNING], [
CFLAGS_SAVED="$CFLAGS"
CFLAGS="$CFLAGS -Werror -W$1"
AC_MSG_CHECKING(whether -W$1 works)
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[$2]])], [
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS_SAVED -W$1"
],[
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS_SAVED -Wno-$1"
])
],[
AC_MSG_RESULT(not supported)
CFLAGS="$CFLAGS_SAVED"
])
])
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)
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)
CFLAGS="-Wall -std=gnu89 $CFLAGS"
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_SAVED="$CFLAGS"
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 -Wstrict-prototypes \
-Wdeclaration-after-statement -Wformat-security \
-Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
-fno-strict-aliasing -Wno-unused-but-set-variable; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
AC_MSG_CHECKING([whether gcc understands $option])
-Wno-duplicate-decl-specifier \
-Wstrict-prototypes \
-fno-strict-aliasing -Wno-unused-but-set-variable \
-Wundef -Wimplicit-function-declaration \
-Wpointer-arith -Winit-self \
-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)
CFLAGS="-Werror $CFLAGS_MORE_WARNINGS $(printf '%s' "$option" | sed 's/^-Wno-/-W/') $CFLAGS_SAVED"
AC_MSG_CHECKING([whether compiler understands $option])
AC_TRY_COMPILE([], [],
has_option=yes,
has_option=no,)
if test $has_option = no; then
CFLAGS="$SAVE_CFLAGS"
if test $has_option != no; then
CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option"
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
CFLAGS="$CFLAGS_SAVED"
unset CFLAGS_SAVED
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
......
......@@ -4,8 +4,10 @@ appdata/network-manager-openvpn.metainfo.xml.in
auth-dialog/main.c
properties/auth-helpers.c
properties/import-export.c
properties/nm-openvpn.c
shared/nm-shared-utils.c
properties/nm-openvpn-editor-plugin.c
properties/nm-openvpn-editor.c
shared/nm-utils/nm-shared-utils.c
shared/nm-utils/nm-vpn-plugin-utils.c
src/nm-openvpn-service.c
src/nm-openvpn-service-openvpn-helper.c
[type: gettext/glade]properties/nm-openvpn-dialog.ui
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -2,63 +2,140 @@ SUBDIRS = . tests
plugindir = $(libdir)/NetworkManager
plugin_LTLIBRARIES = libnm-vpn-plugin-openvpn.la
if WITH_GNOME
plugin_LTLIBRARIES += libnm-vpn-plugin-openvpn-editor.la
if WITH_LIBNM_GLIB
plugin_LTLIBRARIES += libnm-openvpn-properties.la
endif
endif
shared_sources = \
$(top_srcdir)/shared/nm-utils/nm-shared-utils.c \
$(top_srcdir)/shared/nm-utils/nm-shared-utils.h \
$(top_srcdir)/shared/utils.c \
$(top_srcdir)/shared/utils.h \
$(top_srcdir)/shared/nm-service-defines.h \
$(NULL)
libnm_vpn_plugin_openvpn_la_SOURCES = \
nm-openvpn.c \
nm-openvpn.h \
auth-helpers.c \
auth-helpers.h \
import-export.c \
plugin_sources = \
nm-openvpn-editor-plugin.c \
nm-openvpn-editor-plugin.h \
import-export.c \
import-export.h
libnm_openvpn_properties_la_SOURCES = \
$(libnm_vpn_plugin_openvpn_la_SOURCES)
editor_sources = \
nm-openvpn-editor.c \
nm-openvpn-editor.h \
auth-helpers.c \
auth-helpers.h
uidir = $(datadir)/gnome-vpn-properties/openvpn
if WITH_GNOME
ui_DATA = nm-openvpn-dialog.ui
endif
common_CFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
-I$(top_srcdir)/shared \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DLOCALEDIR=\"$(datadir)/locale\"
###############################################################################
libnm_vpn_plugin_openvpn_la_SOURCES = \
$(shared_sources) \
$(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.c \
$(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.h \
$(top_srcdir)/shared/nm-utils/nm-vpn-plugin-macros.h \
$(plugin_sources)
libnm_vpn_plugin_openvpn_la_CFLAGS = \
$(common_CFLAGS) \
$(LIBNM_CFLAGS) \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
-DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
$(LIBNM_CFLAGS)
libnm_vpn_plugin_openvpn_la_LIBADD = \
$(LIBNM_LIBS)
libnm_vpn_plugin_openvpn_la_LDFLAGS = \
-avoid-version \
-Wl,--version-script=$(srcdir)/libnm-vpn-plugin-openvpn.ver
###############################################################################
libnm_vpn_plugin_openvpn_editor_la_SOURCES = \
$(shared_sources) \
$(editor_sources)
libnm_vpn_plugin_openvpn_editor_la_CFLAGS = \
$(common_CFLAGS) \
$(GTK_CFLAGS) \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR \
$(LIBNM_CFLAGS) \
$(LIBNMA_CFLAGS)
libnm_vpn_plugin_openvpn_editor_la_LIBADD = \
$(GTK_LIBS) \
$(LIBNM_LIBS) \
$(LIBNMA_LIBS)
libnm_vpn_plugin_openvpn_editor_la_LDFLAGS = \
-avoid-version \
-Wl,--version-script=$(srcdir)/libnm-vpn-plugin-openvpn-editor.ver
###############################################################################
libnm_openvpn_properties_la_SOURCES = \
$(shared_sources) \