Commit 63f6cae7 authored by Michael Biebl's avatar Michael Biebl

Imported Upstream version 1.2.0

parent 2d6bff0a
......@@ -13,13 +13,28 @@ nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
nmvpnservice_DATA = nm-openvpn-service.name
if WITH_LIBNM_GLIB
nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnoldservice_DATA = nm-openvpn-service.name
# Install a file with full path to plugins for an old gnome-shell
# https://bugzilla.gnome.org/show_bug.cgi?id=693590
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' \
<$(srcdir)/nm-openvpn-service.name.in \
>$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-openvpn-service.name
uninstall-hook:
rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-openvpn-service.name
endif
appdatadir = $(datadir)/appdata
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = appdata/network-manager-openvpn.appdata.xml.in
@INTLTOOL_XML_RULE@
nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
-e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR@|g' \
$^ >$@
DISTCHECK_CONFIGURE_FLAGS = \
......@@ -28,11 +43,15 @@ DISTCHECK_CONFIGURE_FLAGS = \
EXTRA_DIST = nm-openvpn-service.name.in \
$(dbusservice_DATA) \
$(appdata_in_files) \
$(appdata_DATA) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
CLEANFILES = $(nmvpnservice_DATA) *~
CLEANFILES = $(nmvpnservice_DATA) \
$(appdata_DATA)
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
ACLOCAL_AMFLAGS = -I m4
......@@ -160,11 +160,9 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(dbusservicedir)" \
"$(DESTDIR)$(nmvpnoldservicedir)" \
"$(DESTDIR)$(nmvpnservicedir)"
DATA = $(dbusservice_DATA) $(nmvpnoldservice_DATA) \
$(nmvpnservice_DATA)
am__installdirs = "$(DESTDIR)$(appdatadir)" \
"$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(nmvpnservicedir)"
DATA = $(appdata_DATA) $(dbusservice_DATA) $(nmvpnservice_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
......@@ -322,6 +320,7 @@ MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NM_PLUGIN_DIR = @NM_PLUGIN_DIR@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
......@@ -410,19 +409,24 @@ dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-openvpn-service.conf
nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
nmvpnservice_DATA = nm-openvpn-service.name
@WITH_LIBNM_GLIB_TRUE@nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN
@WITH_LIBNM_GLIB_TRUE@nmvpnoldservice_DATA = nm-openvpn-service.name
appdatadir = $(datadir)/appdata
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = appdata/network-manager-openvpn.appdata.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) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
CLEANFILES = $(nmvpnservice_DATA) *~
CLEANFILES = $(nmvpnservice_DATA) \
$(appdata_DATA)
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
......@@ -485,48 +489,48 @@ clean-libtool:
distclean-libtool:
-rm -f libtool config.lt
install-dbusserviceDATA: $(dbusservice_DATA)
install-appdataDATA: $(appdata_DATA)
@$(NORMAL_INSTALL)
@list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \
@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(dbusservicedir)'"; \
$(MKDIR_P) "$(DESTDIR)$(dbusservicedir)" || exit 1; \
echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
$(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusservicedir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(dbusservicedir)" || exit $$?; \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
done
uninstall-dbusserviceDATA:
uninstall-appdataDATA:
@$(NORMAL_UNINSTALL)
@list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \
@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(dbusservicedir)'; $(am__uninstall_files_from_dir)
install-nmvpnoldserviceDATA: $(nmvpnoldservice_DATA)
dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
install-dbusserviceDATA: $(dbusservice_DATA)
@$(NORMAL_INSTALL)
@list='$(nmvpnoldservice_DATA)'; test -n "$(nmvpnoldservicedir)" || list=; \
@list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(nmvpnoldservicedir)'"; \
$(MKDIR_P) "$(DESTDIR)$(nmvpnoldservicedir)" || exit 1; \
echo " $(MKDIR_P) '$(DESTDIR)$(dbusservicedir)'"; \
$(MKDIR_P) "$(DESTDIR)$(dbusservicedir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nmvpnoldservicedir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(nmvpnoldservicedir)" || exit $$?; \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusservicedir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(dbusservicedir)" || exit $$?; \
done
uninstall-nmvpnoldserviceDATA:
uninstall-dbusserviceDATA:
@$(NORMAL_UNINSTALL)
@list='$(nmvpnoldservice_DATA)'; test -n "$(nmvpnoldservicedir)" || list=; \
@list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(nmvpnoldservicedir)'; $(am__uninstall_files_from_dir)
dir='$(DESTDIR)$(dbusservicedir)'; $(am__uninstall_files_from_dir)
install-nmvpnserviceDATA: $(nmvpnservice_DATA)
@$(NORMAL_INSTALL)
@list='$(nmvpnservice_DATA)'; test -n "$(nmvpnservicedir)" || list=; \
......@@ -847,7 +851,7 @@ check: check-recursive
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(nmvpnoldservicedir)" "$(DESTDIR)$(nmvpnservicedir)"; do \
for dir in "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(nmvpnservicedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
......@@ -882,6 +886,8 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@WITH_LIBNM_GLIB_FALSE@install-data-hook:
@WITH_LIBNM_GLIB_FALSE@uninstall-hook:
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
......@@ -904,9 +910,10 @@ info: info-recursive
info-am:
install-data-am: install-dbusserviceDATA install-nmvpnoldserviceDATA \
install-data-am: install-appdataDATA install-dbusserviceDATA \
install-nmvpnserviceDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-dvi: install-dvi-recursive
install-dvi-am:
......@@ -951,10 +958,12 @@ ps: ps-recursive
ps-am:
uninstall-am: uninstall-dbusserviceDATA uninstall-nmvpnoldserviceDATA \
uninstall-am: uninstall-appdataDATA uninstall-dbusserviceDATA \
uninstall-nmvpnserviceDATA
.MAKE: $(am__recursive_targets) all install-am install-strip
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: $(am__recursive_targets) all install-am install-data-am \
install-strip uninstall-am
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
am--refresh check check-am clean clean-cscope clean-generic \
......@@ -963,25 +972,39 @@ uninstall-am: uninstall-dbusserviceDATA uninstall-nmvpnoldserviceDATA \
dist-xz dist-zip distcheck distclean distclean-generic \
distclean-hdr distclean-libtool distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-data install-data-am \
install-dbusserviceDATA install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man \
install-nmvpnoldserviceDATA install-nmvpnserviceDATA \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-am uninstall uninstall-am \
uninstall-dbusserviceDATA uninstall-nmvpnoldserviceDATA \
info-am install install-am install-appdataDATA install-data \
install-data-am install-data-hook install-dbusserviceDATA \
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
install-man install-nmvpnserviceDATA install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-appdataDATA \
uninstall-dbusserviceDATA uninstall-hook \
uninstall-nmvpnserviceDATA
.PRECIOUS: Makefile
# Install a file with full path to plugins for an old gnome-shell
# https://bugzilla.gnome.org/show_bug.cgi?id=693590
@WITH_LIBNM_GLIB_TRUE@install-data-hook:
@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@ <$(srcdir)/nm-openvpn-service.name.in \
@WITH_LIBNM_GLIB_TRUE@ >$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-openvpn-service.name
@WITH_LIBNM_GLIB_TRUE@uninstall-hook:
@WITH_LIBNM_GLIB_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-openvpn-service.name
@INTLTOOL_XML_RULE@
nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
-e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR@|g' \
$^ >$@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
......
<?xml version="1.0" encoding="UTF-8"?>
<component type="addon">
<id>network-manager-openvpn</id>
<project_license>GPL-2.0+</project_license>
<metadata_license>CC0-1.0</metadata_license>
<extends>nm-connection-editor.desktop</extends>
<extends>gnome-control-center.desktop</extends>
<name>OpenVPN client</name>
<name xml:lang="el">Πελάτης OpenVPN</name>
<name xml:lang="pl">Klient OpenVPN</name>
<name xml:lang="pt_BR">Cliente OpenVPN</name>
<name xml:lang="sv">OpenVPN-klient</name>
<summary>Client for OpenVPN virtual private networks</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="sv">Klient för OpenVPN virtuella privata nätverk</summary>
<keywords>
<keyword>network</keyword>
<keyword>manager</keyword>
<keyword>NetworkManager</keyword>
<keyword>connection</keyword>
<keyword>VPN</keyword>
<keyword>OpenVPN</keyword>
</keywords>
<description>
<p>Support for configuring OpenVPN virtual private network connections.</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="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="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="sv">OpenVPN är en populär och flexibel VPN-lösning som är fri programvara.</p>
</description>
<screenshots>
<screenshot type="default">
<image width="800" height="658">https://git.gnome.org/browse/network-manager-openvpn/plain/appdata/openvpn.png</image>
</screenshot>
<screenshot>
<caption>The advanced options dialog</caption>
<image width="800" height="604">https://git.gnome.org/browse/network-manager-openvpn/plain/appdata/openvpn-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>
<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="el">Οι προγραμματιστές του 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="sv">Utvecklarna av Nätverkshanteraren</developer_name>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright Lubomir Rintel 2016 -->
<component type="addon">
<id>network-manager-openvpn</id>
<project_license>GPL-2.0+</project_license>
<metadata_license>CC0-1.0</metadata_license>
<extends>nm-connection-editor.desktop</extends>
<extends>gnome-control-center.desktop</extends>
<_name>OpenVPN client</_name>
<_summary>Client for OpenVPN virtual private networks</_summary>
<keywords>
<keyword>network</keyword>
<keyword>manager</keyword>
<keyword>NetworkManager</keyword>
<keyword>connection</keyword>
<keyword>VPN</keyword>
<keyword>OpenVPN</keyword>
</keywords>
<description>
<_p>Support for configuring OpenVPN virtual private network connections.</_p>
<_p>OpenVPN is a popular and flexible free-software VPN solution.</_p>
</description>
<screenshots>
<screenshot type="default">
<image width="800" height="658">https://git.gnome.org/browse/network-manager-openvpn/plain/appdata/openvpn.png</image>
</screenshot>
<screenshot>
<caption>The advanced options dialog</caption>
<image width="800" height="604">https://git.gnome.org/browse/network-manager-openvpn/plain/appdata/openvpn-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>
<update_contact>networkmanager-maint@gnome.bugs</update_contact>
<translation type="gettext">NetworkManager-openvpn</translation>
<_developer_name>The NetworkManager Developers</_developer_name>
</component>
......@@ -261,6 +261,7 @@ MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NM_PLUGIN_DIR = @NM_PLUGIN_DIR@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
......@@ -379,9 +380,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auth-dialog/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu auth-dialog/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign auth-dialog/Makefile
$(AUTOMAKE) --gnu auth-dialog/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for NetworkManager-openvpn 1.1.93.
# Generated by GNU Autoconf 2.69 for NetworkManager-openvpn 1.2.0.
#
# Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
#
......@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='NetworkManager-openvpn'
PACKAGE_TARNAME='NetworkManager-openvpn'
PACKAGE_VERSION='1.1.93'
PACKAGE_STRING='NetworkManager-openvpn 1.1.93'
PACKAGE_VERSION='1.2.0'
PACKAGE_STRING='NetworkManager-openvpn 1.2.0'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
PACKAGE_URL=''
......@@ -637,6 +637,7 @@ am__EXEEXT_TRUE
LTLIBOBJS
WITH_TESTS_FALSE
WITH_TESTS_TRUE
NM_PLUGIN_DIR
NM_VPN_SERVICE_DIR
LIBNM_LIBS
LIBNM_CFLAGS
......@@ -841,6 +842,7 @@ with_sysroot
enable_libtool_lock
with_gnome
with_libnm_glib
enable_absolute_paths
enable_nls
enable_more_warnings
with_tests
......@@ -1414,7 +1416,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures NetworkManager-openvpn 1.1.93 to adapt to many kinds of systems.
\`configure' configures NetworkManager-openvpn 1.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1485,7 +1487,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of NetworkManager-openvpn 1.1.93:";;
short | recursive ) echo "Configuration of NetworkManager-openvpn 1.2.0:";;
esac
cat <<\_ACEOF
......@@ -1507,6 +1509,8 @@ Optional Features:
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-absolute-paths Use absolute paths to in .name files. Useful for
development. (default is no)
--disable-nls do not use Native Language Support
--enable-more-warnings Possible values: no/yes/error
......@@ -1637,7 +1641,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
NetworkManager-openvpn configure 1.1.93
NetworkManager-openvpn configure 1.2.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2060,7 +2064,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by NetworkManager-openvpn $as_me 1.1.93, which was
It was created by NetworkManager-openvpn $as_me 1.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2923,7 +2927,7 @@ fi
# Define the identity of the package.
PACKAGE='NetworkManager-openvpn'
VERSION='1.1.93'
VERSION='1.2.0'
cat >>confdefs.h <<_ACEOF
......@@ -12610,6 +12614,11 @@ else
WITH_LIBNM_GLIB_FALSE=
fi
# Check whether --enable-absolute-paths was given.
if test "${enable_absolute_paths+set}" = set; then :
enableval=$enable_absolute_paths;
fi
GETTEXT_PACKAGE=NetworkManager-openvpn
......@@ -14729,6 +14738,9 @@ $as_echo "no" >&6; }
fi
test x"$enable_absolute_paths" = x"yes" && NM_PLUGIN_DIR='$(libdir)/NetworkManager/'
# Check whether --with-tests was given.
if test "${with_tests+set}" = set; then :
......@@ -15341,7 +15353,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by NetworkManager-openvpn $as_me 1.1.93, which was
This file was extended by NetworkManager-openvpn $as_me 1.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -15407,7 +15419,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
NetworkManager-openvpn config.status 1.1.93
NetworkManager-openvpn config.status 1.2.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
AC_PREREQ(2.52)
AC_INIT(NetworkManager-openvpn,
1.1.93,
1.2.0,
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])
......@@ -54,6 +54,7 @@ AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openv
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_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
AC_SUBST(GETTEXT_PACKAGE)
......@@ -94,6 +95,9 @@ AC_SUBST(NM_VPN_SERVICE_DIR)
NM_COMPILER_WARNINGS
test x"$enable_absolute_paths" = x"yes" && NM_PLUGIN_DIR='$(libdir)/NetworkManager/'
AC_SUBST(NM_PLUGIN_DIR)
dnl
dnl Tests
dnl
......
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
appdata/network-manager-openvpn.appdata.xml.in
auth-dialog/main.c
properties/auth-helpers.c
properties/import-export.c
properties/nm-openvpn.c
[type: gettext/glade]properties/nm-openvpn-dialog.ui
shared/nm-shared-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.
......@@ -355,6 +355,7 @@ MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NM_PLUGIN_DIR = @NM_PLUGIN_DIR@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
......@@ -508,9 +509,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign properties/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu properties/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign properties/Makefile
$(AUTOMAKE) --gnu properties/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
......@@ -932,7 +932,7 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_RENEG_SEC)) {
if (!args_params_check_nargs_n (params, 1, &line_error))
goto handle_line_error;
if (!args_params_parse_int64 (params, 1, 0, 0xffff, &v_int64, &line_error))
if (!args_params_parse_int64 (params, 1, 0, 604800, &v_int64, &line_error))
goto handle_line_error;
setting_vpn_add_data_item_int64 (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, v_int64);
continue;
......
......@@ -518,6 +518,7 @@ MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NM_PLUGIN_DIR = @NM_PLUGIN_DIR@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
......@@ -653,9 +654,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign properties/tests/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu properties/tests/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign properties/tests/Makefile
$(AUTOMAKE) --gnu properties/tests/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
......@@ -205,6 +205,7 @@ MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NM_PLUGIN_DIR = @NM_PLUGIN_DIR@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
......@@ -326,9 +327,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign properties/tests/conf/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu properties/tests/conf/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign properties/tests/conf/Makefile
$(AUTOMAKE) --gnu properties/tests/conf/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
......@@ -269,6 +269,7 @@ MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NM_PLUGIN_DIR = @NM_PLUGIN_DIR@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
......@@ -399,9 +400,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign shared/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu shared/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign shared/Makefile
$(AUTOMAKE) --gnu shared/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
......@@ -267,6 +267,7 @@ MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NM_PLUGIN_DIR = @NM_PLUGIN_DIR@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
......@@ -392,9 +393,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/Makefile
$(AUTOMAKE) --gnu src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
......@@ -1951,6 +1951,7 @@ nm_openvpn_plugin_new (const char *bus_name)
plugin = (NMOpenvpnPlugin *) g_initable_new (NM_TYPE_OPENVPN_PLUGIN, NULL, &error,
NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME, bus_name,
NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER, !gl.debug,
NULL);
if (plugin) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment