Hello community,
here is the log from the commit of package NetworkManager-pptp for openSUSE:Factory checked in at 2018-10-17 08:19:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-pptp (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-pptp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-pptp"
Wed Oct 17 08:19:41 2018 rev:51 rq:639950 version:1.2.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/NetworkManager-pptp/NetworkManager-pptp.changes 2018-04-30 22:50:18.403358706 +0200
+++ /work/SRC/openSUSE:Factory/.NetworkManager-pptp.new/NetworkManager-pptp.changes 2018-10-17 08:19:45.714904358 +0200
@@ -1,0 +2,7 @@
+Thu Oct 4 10:08:17 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 1.2.8:
+ + Fix build without GTK/Gnome.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-pptp-1.2.6.tar.xz
New:
----
NetworkManager-pptp-1.2.8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-pptp.spec ++++++
--- /var/tmp/diff_new_pack.AHddJY/_old 2018-10-17 08:19:46.118904177 +0200
+++ /var/tmp/diff_new_pack.AHddJY/_new 2018-10-17 08:19:46.122904175 +0200
@@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define pppd_plugin_dir %(rpm -ql ppp | grep -m1 pppd/[0-9]*)
Name: NetworkManager-pptp
-Version: 1.2.6
+Version: 1.2.8
Release: 0
Summary: NetworkManager VPN support for PPTP
License: GPL-2.0-or-later
++++++ NetworkManager-pptp-1.2.6.tar.xz -> NetworkManager-pptp-1.2.8.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/INSTALL new/NetworkManager-pptp-1.2.8/INSTALL
--- old/NetworkManager-pptp-1.2.6/INSTALL 2015-03-28 21:25:20.000000000 +0100
+++ new/NetworkManager-pptp-1.2.8/INSTALL 2018-02-09 09:27:34.000000000 +0100
@@ -1,81 +1,109 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Installation Instructions
+*************************
+
+ Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
Foundation, Inc.
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Basic Installation
==================
- These are generic installation instructions.
+ Briefly, the shell command './configure && make && make install'
+should configure, build, and install this package. The following
+more-detailed instructions are generic; see the 'README' file for
+instructions specific to this package. Some packages provide this
+'INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
- The `configure' shell script attempts to guess correct values for
+ The 'configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions. Finally, it creates a shell script 'config.status' that
you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
+ It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring. Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
may remove or edit it.
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
+ The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'. You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
+
+ The simplest way to compile this package is:
+
+ 1. 'cd' to the directory containing the package's source code and type
+ './configure' to configure the package for your system.
+
+ Running 'configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type 'make' to compile the package.
+
+ 3. Optionally, type 'make check' to run any self-tests that come with
+ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type 'make install' to install the programs and any data files and
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the 'make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type 'make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior 'make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
+ source code directory by typing 'make clean'. To also remove the
+ files that 'configure' created (so you can compile the package for
+ a different kind of computer), type 'make distclean'. There is
+ also a 'make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 7. Often, you can also type 'make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide 'make
+ distcheck', which can by used by developers to test that all other
+ targets like 'make install' and 'make uninstall' work correctly.
+ This target is generally not run by end users.
+
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
+the 'configure' script does not know about. Run './configure --help'
for details on some of the pertinent environment variables.
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
+ You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here is
+an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -84,146 +112,257 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU 'make'. 'cd' to the
directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+the 'configure' script. 'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'. This is known
+as a "VPATH" build.
+
+ With a non-GNU 'make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use 'make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the 'lipo' tool if you have problems.
Installation Names
==================
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+ By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc. You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+options like '--bindir=DIR' to specify different values for particular
+kinds of files. Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them. In general, the default
+for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to 'configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+'make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, 'make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+'${prefix}'. Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install time
+for the entire installation to be relocated. The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation. However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the 'DESTDIR' variable. For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names. The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.
Optional Features
=================
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+
+ Some packages pay attention to '--enable-FEATURE' options to
+'configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
+is something like 'gnu-as' or 'x' (for the X Window System). The
+'README' should mention any '--enable-' and '--with-' options that the
package recognizes.
- For packages that use the X Window System, `configure' can usually
+ For packages that use the X Window System, 'configure' can usually
find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.
+
+ Some packages offer the ability to configure how verbose the
+execution of 'make' will be. For these packages, running './configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with 'make V=1'; while running './configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with 'make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC
+is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ HP-UX 'make' updates targets which have the same time stamps as their
+prerequisites, which makes it generally unusable when shipped generated
+files such as 'configure' are involved. Use GNU 'make' instead.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its '' header file. The option '-nodtk' can be used as a
+workaround. If GNU CC is not installed, it is therefore recommended to
+try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put '/usr/ucb' early in your 'PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in '/usr/bin'. So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.
+
+ On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
Specifying the System Type
==========================
- There may be some features `configure' cannot figure out
+ There may be some features 'configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
+_same_ architectures, 'configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+'--build=TYPE' option. TYPE can either be a short name for the system
+type, such as 'sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ OS
+ KERNEL-OS
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
+ See the file 'config.sub' for the possible values of each field. If
+'config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option '--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+eventually be run) with '--host=TYPE'.
Sharing Defaults
================
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
+ If you want to set default values for 'configure' scripts to share,
+you can create a site shell script called 'config.site' that gives
+default values for variables like 'CC', 'cache_file', and 'prefix'.
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
+'PREFIX/etc/config.site' if it exists. Or, you can set the
+'CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all 'configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
+environment passed to 'configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
+them in the 'configure' command line, using 'VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
+causes the specified 'gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
-`configure' Invocation
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Autoconf limitation. Until the limitation is lifted, you can use this
+workaround:
+
+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+'configure' Invocation
======================
- `configure' recognizes the following options to control how it
+ 'configure' recognizes the following options to control how it
operates.
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
+'--help'
+'-h'
+ Print a summary of all of the options to 'configure', and exit.
+
+'--help=short'
+'--help=recursive'
+ Print a summary of the options unique to this package's
+ 'configure', and exit. The 'short' variant lists options used only
+ in the top level, while the 'recursive' variant lists options also
+ present in any nested packages.
+
+'--version'
+'-V'
+ Print the version of Autoconf used to generate the 'configure'
script, and exit.
-`--cache-file=FILE'
+'--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
+ traditionally 'config.cache'. FILE defaults to '/dev/null' to
disable caching.
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
+'--config-cache'
+'-C'
+ Alias for '--cache-file=config.cache'.
+
+'--quiet'
+'--silent'
+'-q'
Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
+ suppress all normal output, redirect it to '/dev/null' (any error
messages will still be shown).
-`--srcdir=DIR'
+'--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
+ 'configure' can determine that directory automatically.
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
+'--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names:: for
+ more details, including other options available for fine-tuning the
+ installation locations.
+
+'--no-create'
+'-n'
+ Run the configure checks, but stop before creating any output
+ files.
+'configure' also accepts some other, not widely useful, options. Run
+'configure --help' for more details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/Makefile.am new/NetworkManager-pptp-1.2.8/Makefile.am
--- old/NetworkManager-pptp-1.2.6/Makefile.am 2017-09-20 17:03:48.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/Makefile.am 2018-09-30 13:14:02.000000000 +0200
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = foreign subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects
DISTCHECK_CONFIGURE_FLAGS = \
--enable-more-warnings=yes
@@ -175,7 +175,9 @@
###############################################################################
+if WITH_GNOME
plugin_LTLIBRARIES += properties/libnm-vpn-plugin-pptp-editor.la
+endif
properties_libnm_vpn_plugin_pptp_editor_la_SOURCES = \
$(editor_sources)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/Makefile.in new/NetworkManager-pptp-1.2.8/Makefile.in
--- old/NetworkManager-pptp-1.2.6/Makefile.in 2018-03-29 10:03:45.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/Makefile.in 2018-10-04 11:11:35.000000000 +0200
@@ -94,10 +94,13 @@
noinst_PROGRAMS =
###############################################################################
-@WITH_LIBNM_GLIB_TRUE@am__append_1 = properties/libnm-pptp-properties.la
+@WITH_GNOME_TRUE@am__append_1 = properties/libnm-vpn-plugin-pptp-editor.la
###############################################################################
-@WITH_GNOME_TRUE@am__append_2 = auth-dialog/nm-pptp-auth-dialog
+@WITH_LIBNM_GLIB_TRUE@am__append_2 = properties/libnm-pptp-properties.la
+
+###############################################################################
+@WITH_GNOME_TRUE@am__append_3 = auth-dialog/nm-pptp-auth-dialog
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_options.m4 \
@@ -193,6 +196,8 @@
$(properties_libnm_vpn_plugin_pptp_editor_la_CFLAGS) $(CFLAGS) \
$(properties_libnm_vpn_plugin_pptp_editor_la_LDFLAGS) \
$(LDFLAGS) -o $@
+@WITH_GNOME_TRUE@am_properties_libnm_vpn_plugin_pptp_editor_la_rpath = \
+@WITH_GNOME_TRUE@ -rpath $(plugindir)
properties_libnm_vpn_plugin_pptp_la_DEPENDENCIES = \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am__objects_6 = properties/properties_libnm_vpn_plugin_pptp_la-nm-pptp-editor-plugin.lo
@@ -519,6 +524,8 @@
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@
@@ -549,7 +556,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects
DISTCHECK_CONFIGURE_FLAGS = \
--enable-more-warnings=yes
@@ -574,10 +581,8 @@
plugindir = $(libdir)/NetworkManager
###############################################################################
-
-###############################################################################
plugin_LTLIBRARIES = properties/libnm-vpn-plugin-pptp.la \
- properties/libnm-vpn-plugin-pptp-editor.la $(am__append_1)
+ $(am__append_1) $(am__append_2)
dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-pptp-service.conf
nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
@@ -772,15 +777,15 @@
@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*) \
@@ -939,7 +944,7 @@
properties/$(DEPDIR)/$(am__dirstamp)
properties/libnm-vpn-plugin-pptp-editor.la: $(properties_libnm_vpn_plugin_pptp_editor_la_OBJECTS) $(properties_libnm_vpn_plugin_pptp_editor_la_DEPENDENCIES) $(EXTRA_properties_libnm_vpn_plugin_pptp_editor_la_DEPENDENCIES) properties/$(am__dirstamp)
- $(AM_V_CCLD)$(properties_libnm_vpn_plugin_pptp_editor_la_LINK) -rpath $(plugindir) $(properties_libnm_vpn_plugin_pptp_editor_la_OBJECTS) $(properties_libnm_vpn_plugin_pptp_editor_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(properties_libnm_vpn_plugin_pptp_editor_la_LINK) $(am_properties_libnm_vpn_plugin_pptp_editor_la_rpath) $(properties_libnm_vpn_plugin_pptp_editor_la_OBJECTS) $(properties_libnm_vpn_plugin_pptp_editor_la_LIBADD) $(LIBS)
shared/nm-utils/properties_libnm_vpn_plugin_pptp_la-nm-vpn-plugin-utils.lo: \
shared/nm-utils/$(am__dirstamp) \
shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/NEWS new/NetworkManager-pptp-1.2.8/NEWS
--- old/NetworkManager-pptp-1.2.6/NEWS 2018-03-29 07:59:58.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/NEWS 2018-10-04 11:10:11.000000000 +0200
@@ -1,4 +1,17 @@
=======================================================
+NetworkManager-pptp-1.2.8
+Overview of changes since NetworkManager-pptp-1.2.6
+=======================================================
+
+This is a new stable release of NetworkManager-pptp. Notable changes include:
+
+* Migrate project home to gitlab (https://gitlab.gnome.org/GNOME/NetworkManager-pptp)
+* Improve project description in doap file.
+* Fix build without GTK/Gnome.
+* Build fixes for CI integration.
+* Update Catalan translation.
+
+=======================================================
NetworkManager-pptp-1.2.6
Overview of changes since network-manager-pptp-1.2.4
=======================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/README new/NetworkManager-pptp-1.2.8/README
--- old/NetworkManager-pptp-1.2.6/README 2015-03-28 21:25:20.000000000 +0100
+++ new/NetworkManager-pptp-1.2.8/README 2018-06-21 07:40:55.000000000 +0200
@@ -9,9 +9,3 @@
0.6.x version:
(C) 2005 - 2007 Antony Mee http://www.students.ncl.ac.uk/a.j.mee
Based entirely on OpenVPN support by Tim Niemueller http://www.niemueller.de
-
-
-Theory of operation
-------------------------------
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/aclocal.m4 new/NetworkManager-pptp-1.2.8/aclocal.m4
--- old/NetworkManager-pptp-1.2.6/aclocal.m4 2018-03-29 10:03:44.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/aclocal.m4 2018-10-04 11:11:35.000000000 +0200
@@ -47,7 +47,10 @@
#
# Modified to require ngettext
# Matthias Clasen 08/06/2004
-#
+
+# Increment this whenever this file is changed.
+#serial 1
+
# We need this here as well, since someone might use autoconf-2.5x
# to configure GLib then an older version to configure a package
# using AM_GLIB_GNU_GETTEXT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/appdata/network-manager-pptp.metainfo.xml new/NetworkManager-pptp-1.2.8/appdata/network-manager-pptp.metainfo.xml
--- old/NetworkManager-pptp-1.2.6/appdata/network-manager-pptp.metainfo.xml 2018-03-29 10:03:48.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/appdata/network-manager-pptp.metainfo.xml 2018-10-04 11:12:52.000000000 +0200
@@ -100,16 +100,16 @@
<screenshots>
<screenshot type="default">
- <image width="800" height="498">https://git.gnome.org/browse/network-manager-pptp/plain/appdata/pptp.png</image>
+ <image width="800" height="498">https://gitlab.gnome.org/GNOME/NetworkManager-pptp/raw/master/appdata/pptp.p...</image>
</screenshot>
<screenshot>
<caption>The advanced options dialog</caption>
- <image width="800" height="619">https://git.gnome.org/browse/network-manager-pptp/plain/appdata/pptp-advance...</image>
+ <image width="800" height="619">https://gitlab.gnome.org/GNOME/NetworkManager-pptp/raw/master/appdata/pptp-a...</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-pptp/issues</url>
networkmanager-maint@gnome.bugs
<translation type="gettext">NetworkManager-pptp</translation>
The NetworkManager Developers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/appdata/network-manager-pptp.metainfo.xml.in new/NetworkManager-pptp-1.2.8/appdata/network-manager-pptp.metainfo.xml.in
--- old/NetworkManager-pptp-1.2.6/appdata/network-manager-pptp.metainfo.xml.in 2016-05-18 12:15:43.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/appdata/network-manager-pptp.metainfo.xml.in 2018-06-21 07:40:55.000000000 +0200
@@ -25,16 +25,16 @@
<screenshots>
<screenshot type="default">
- <image width="800" height="498">https://git.gnome.org/browse/network-manager-pptp/plain/appdata/pptp.png</image>
+ <image width="800" height="498">https://gitlab.gnome.org/GNOME/NetworkManager-pptp/raw/master/appdata/pptp.p...</image>
</screenshot>
<screenshot>
<caption>The advanced options dialog</caption>
- <image width="800" height="619">https://git.gnome.org/browse/network-manager-pptp/plain/appdata/pptp-advance...</image>
+ <image width="800" height="619">https://gitlab.gnome.org/GNOME/NetworkManager-pptp/raw/master/appdata/pptp-a...</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-pptp/issues</url>
networkmanager-maint@gnome.bugs
<translation type="gettext">NetworkManager-pptp</translation>
<_developer_name>The NetworkManager Developers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/compile new/NetworkManager-pptp-1.2.8/compile
--- old/NetworkManager-pptp-1.2.6/compile 2017-08-15 09:25:07.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/compile 2018-02-09 09:27:34.000000000 +0100
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2016-01-11.22; # UTC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/config.guess new/NetworkManager-pptp-1.2.8/config.guess
--- old/NetworkManager-pptp-1.2.6/config.guess 2017-08-15 09:25:07.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/config.guess 2018-02-09 09:27:34.000000000 +0100
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2017 Free Software Foundation, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/config.sub new/NetworkManager-pptp-1.2.8/config.sub
--- old/NetworkManager-pptp-1.2.6/config.sub 2017-08-15 09:25:07.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/config.sub 2018-02-09 09:27:34.000000000 +0100
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2017 Free Software Foundation, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/configure new/NetworkManager-pptp-1.2.8/configure
--- old/NetworkManager-pptp-1.2.6/configure 2018-03-29 10:03:45.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/configure 2018-10-04 11:11:35.000000000 +0200
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NetworkManager-pptp 1.2.6.
+# Generated by GNU Autoconf 2.69 for NetworkManager-pptp 1.2.8.
#
-# Report bugs to https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager.
+# Report bugs to https://gitlab.gnome.org/GNOME/NetworkManager-pptp/issues.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -275,7 +275,7 @@
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager
+$0: https://gitlab.gnome.org/GNOME/NetworkManager-pptp/issues
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
@@ -591,9 +591,9 @@
# Identity of this package.
PACKAGE_NAME='NetworkManager-pptp'
PACKAGE_TARNAME='NetworkManager-pptp'
-PACKAGE_VERSION='1.2.6'
-PACKAGE_STRING='NetworkManager-pptp 1.2.6'
-PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
+PACKAGE_VERSION='1.2.8'
+PACKAGE_STRING='NetworkManager-pptp 1.2.8'
+PACKAGE_BUGREPORT='https://gitlab.gnome.org/GNOME/NetworkManager-pptp/issues'
PACKAGE_URL=''
# Factoring default headers for most tests.
@@ -711,6 +711,8 @@
DL_LIBS
LIBOBJS
PPPD_PLUGIN_DIR
+has_find
+has_file
GLIB_COMPILE_RESOURCES
CPP
LT_SYS_LIBRARY_PATH
@@ -1417,7 +1419,7 @@
# 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-pptp 1.2.6 to adapt to many kinds of systems.
+\`configure' configures NetworkManager-pptp 1.2.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1488,7 +1490,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NetworkManager-pptp 1.2.6:";;
+ short | recursive ) echo "Configuration of NetworkManager-pptp 1.2.8:";;
esac
cat <<\_ACEOF
@@ -1578,7 +1580,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager.
+Report bugs to https://gitlab.gnome.org/GNOME/NetworkManager-pptp/issues.
_ACEOF
ac_status=$?
fi
@@ -1641,7 +1643,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NetworkManager-pptp configure 1.2.6
+NetworkManager-pptp configure 1.2.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1986,9 +1988,9 @@
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------------------------------------------------------ ##
-## Report this to https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager ##
-## ------------------------------------------------------------------------------ ##"
+( $as_echo "## ------------------------------------------------------------------------ ##
+## Report this to https://gitlab.gnome.org/GNOME/NetworkManager-pptp/issues ##
+## ------------------------------------------------------------------------ ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -2064,7 +2066,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by NetworkManager-pptp $as_me 1.2.6, which was
+It was created by NetworkManager-pptp $as_me 1.2.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2927,7 +2929,7 @@
# Define the identity of the package.
PACKAGE='NetworkManager-pptp'
- VERSION='1.2.6'
+ VERSION='1.2.8'
cat >>confdefs.h <<_ACEOF
@@ -12242,6 +12244,90 @@
+# Extract the first word of "file", so it can be a program name with args.
+set dummy file; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_has_file+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$has_file"; then
+ ac_cv_prog_has_file="$has_file" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_has_file="yes"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_prog_has_file" && ac_cv_prog_has_file="no"
+fi
+fi
+has_file=$ac_cv_prog_has_file
+if test -n "$has_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_file" >&5
+$as_echo "$has_file" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test x$has_file = xno ; then
+ as_fn_error $? "\"file\" utility not found." "$LINENO" 5
+fi
+
+# Extract the first word of "find", so it can be a program name with args.
+set dummy find; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_has_find+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$has_find"; then
+ ac_cv_prog_has_find="$has_find" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_has_find="yes"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_prog_has_find" && ac_cv_prog_has_find="no"
+fi
+fi
+has_find=$ac_cv_prog_has_find
+if test -n "$has_find"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_find" >&5
+$as_echo "$has_find" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test x$has_find = xno ; then
+ as_fn_error $? "\"find\" utility not found." "$LINENO" 5
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
if ${ac_cv_header_stdc+:} false; then :
@@ -12574,7 +12660,7 @@
-NM_GIT_SHA=66994efab0164862b35f66665c197517ea2c4a2b
+NM_GIT_SHA=baacc757de8c3f49516ceeae1ca9748c077116a5
if test """" != "no-config-h" ; then
@@ -15783,7 +15869,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by NetworkManager-pptp $as_me 1.2.6, which was
+This file was extended by NetworkManager-pptp $as_me 1.2.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15843,13 +15929,13 @@
Configuration commands:
$config_commands
-Report bugs to https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager."
+Report bugs to https://gitlab.gnome.org/GNOME/NetworkManager-pptp/issues."
_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-pptp config.status 1.2.6
+NetworkManager-pptp config.status 1.2.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/configure.ac new/NetworkManager-pptp-1.2.8/configure.ac
--- old/NetworkManager-pptp-1.2.6/configure.ac 2018-03-29 10:00:27.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/configure.ac 2018-10-04 11:11:08.000000000 +0200
@@ -1,10 +1,10 @@
AC_PREREQ(2.59)
AC_INIT(NetworkManager-pptp,
- 1.2.6,
- https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager,
+ 1.2.8,
+ https://gitlab.gnome.org/GNOME/NetworkManager-pptp/issues,
NetworkManager-pptp)
-AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz -Wno-portability])
AM_MAINTAINER_MODE
AM_SILENT_RULES([yes])
@@ -21,6 +21,16 @@
AC_PROG_LIBTOOL
AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
+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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/depcomp new/NetworkManager-pptp-1.2.8/depcomp
--- old/NetworkManager-pptp-1.2.6/depcomp 2017-08-15 09:25:07.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/depcomp 2018-02-09 09:27:34.000000000 +0100
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2016-01-11.22; # UTC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/ltmain.sh new/NetworkManager-pptp-1.2.8/ltmain.sh
--- old/NetworkManager-pptp-1.2.6/ltmain.sh 2017-08-03 22:26:40.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/ltmain.sh 2018-04-20 14:52:48.000000000 +0200
@@ -7272,10 +7272,12 @@
# -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"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/missing new/NetworkManager-pptp-1.2.8/missing
--- old/NetworkManager-pptp-1.2.6/missing 2017-08-15 09:25:07.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/missing 2018-02-09 09:27:34.000000000 +0100
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# Common wrapper for a few potentially missing GNU programs.
scriptversion=2016-01-11.22; # UTC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/po/ca.po new/NetworkManager-pptp-1.2.8/po/ca.po
--- old/NetworkManager-pptp-1.2.6/po/ca.po 2017-09-20 17:03:48.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/po/ca.po 2018-09-30 13:01:37.000000000 +0200
@@ -10,9 +10,10 @@
msgid ""
msgstr ""
"Project-Id-Version: NetworkManager-pptp\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 21:39+0200\n"
-"PO-Revision-Date: 2016-09-07 11:47+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/NetworkManager-pptp/"
+"issues\n"
+"POT-Creation-Date: 2018-06-04 12:32+0000\n"
+"PO-Revision-Date: 2018-07-22 16:23+0200\n"
"Last-Translator: Walter Garcia-Fontes \n"
"Language-Team: Catalan \n"
"Language: ca\n"
@@ -20,6 +21,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 1.8.11\n"
#: ../appdata/network-manager-pptp.metainfo.xml.in.h:1
msgid "PPTP VPN client"
@@ -46,7 +48,7 @@
#.
#: ../auth-dialog/main.c:146
#, c-format
-msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgid "You need to authenticate to access the Virtual Private Network “%s”."
msgstr ""
"Cal que us autentiqueu per a poder accedir a la xarxa privada virtual «%s»."
@@ -98,6 +100,46 @@
msgid "Compatible with Microsoft and other PPTP VPN servers."
msgstr "Compatible amb els servidors PPTP VPN de Microsoft i d'altres."
+#: ../shared/nm-utils/nm-shared-utils.c:264
+#, c-format
+msgid "object class '%s' has no property named '%s'"
+msgstr "la classe d'objecte «%s» no té cap propietat anomenada «%s»"
+
+#: ../shared/nm-utils/nm-shared-utils.c:271
+#, c-format
+msgid "property '%s' of object class '%s' is not writable"
+msgstr "no es pot escriure la propietat «%s» de la classe d'objecte «%s»"
+
+#: ../shared/nm-utils/nm-shared-utils.c:278
+#, c-format
+msgid ""
+"construct property \"%s\" for object '%s' can't be set after construction"
+msgstr ""
+"la propietat «%s» de construcció per a l'objecte «%s» no es pot establir "
+"després de la construcció"
+
+#: ../shared/nm-utils/nm-shared-utils.c:286
+#, c-format
+msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
+msgstr ""
+"«%s::%s» no és un nom vàlid de propietat: «%s» no és un subtipus de GObject"
+
+#: ../shared/nm-utils/nm-shared-utils.c:295
+#, c-format
+msgid "unable to set property '%s' of type '%s' from value of type '%s'"
+msgstr ""
+"no s'ha pogut establir la propietat «%s» de tipus «%s» a partir del valor de "
+"tipus «%s»"
+
+#: ../shared/nm-utils/nm-shared-utils.c:306
+#, c-format
+msgid ""
+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
+"type '%s'"
+msgstr ""
+"el valor «%s» de tipus «%s» no és vàlid o està fora de rang per a la "
+"propietat «%s» de tipus «%s»"
+
#: ../shared/nm-utils/nm-vpn-plugin-utils.c:80
#, c-format
msgid "missing plugin file \"%s\""
@@ -118,99 +160,99 @@
msgstr ""
"s'ha produït un error desconegut quan es creava la instància de l'editor"
-#: ../src/nm-pptp-service.c:164
+#: ../src/nm-pptp-service.c:193
#, c-format
-msgid "invalid gateway '%s'"
+msgid "invalid gateway “%s”"
msgstr "passarel·la «%s» no vàlida"
-#: ../src/nm-pptp-service.c:178
+#: ../src/nm-pptp-service.c:207
#, c-format
-msgid "invalid integer property '%s'"
+msgid "invalid integer property “%s”"
msgstr "propietat «%s» d'enter no vàlida"
-#: ../src/nm-pptp-service.c:188
+#: ../src/nm-pptp-service.c:217
#, c-format
-msgid "invalid boolean property '%s' (not yes or no)"
+msgid "invalid boolean property “%s” (not yes or no)"
msgstr "propietat booleana «%s» no vàlida (no és sí o no)"
-#: ../src/nm-pptp-service.c:195
+#: ../src/nm-pptp-service.c:224
#, c-format
-msgid "unhandled property '%s' type %s"
+msgid "unhandled property “%s” type %s"
msgstr "propietat «%s» no gestionada de tipus %s"
-#: ../src/nm-pptp-service.c:206
+#: ../src/nm-pptp-service.c:235
#, c-format
-msgid "property '%s' invalid or not supported"
+msgid "property “%s” invalid or not supported"
msgstr "la propietat «%s» no és vàlida o no està suportada"
-#: ../src/nm-pptp-service.c:224
+#: ../src/nm-pptp-service.c:253
msgid "No VPN configuration options."
msgstr "No hi ha opcions de configuració de la VPN."
-#: ../src/nm-pptp-service.c:244
+#: ../src/nm-pptp-service.c:273
#, c-format
-msgid "Missing required option '%s'."
+msgid "Missing required option “%s”."
msgstr "Falta l'opció requerida «%s»."
-#: ../src/nm-pptp-service.c:264
+#: ../src/nm-pptp-service.c:293
msgid "No VPN secrets!"
msgstr "No hi ha secrets de la VPN!"
-#: ../src/nm-pptp-service.c:419
+#: ../src/nm-pptp-service.c:447
msgid "Could not find pptp client binary."
msgstr "No s'ha pogut trobar el binari del client pptp."
-#: ../src/nm-pptp-service.c:432
+#: ../src/nm-pptp-service.c:460
msgid "Missing VPN gateway."
msgstr "Falta la passarel·la de la VPN."
-#: ../src/nm-pptp-service.c:594
+#: ../src/nm-pptp-service.c:635
msgid "Could not find the pppd binary."
msgstr "No s'ha pogut trobar el binari pppd."
-#: ../src/nm-pptp-service.c:654
+#: ../src/nm-pptp-service.c:695
msgid "Missing VPN username."
msgstr "Falta el nom d'usuari de la VPN."
-#: ../src/nm-pptp-service.c:663
+#: ../src/nm-pptp-service.c:704
msgid "Missing or invalid VPN password."
msgstr "Falta la contrasenya de la VPN o no és vàlida."
-#: ../src/nm-pptp-service.c:769
+#: ../src/nm-pptp-service.c:810
#, c-format
-msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)"
+msgid "couldn’t convert PPTP VPN gateway IP address “%s” (%d)"
msgstr ""
"no s'ha pogut convertir l'adreça IP de la passarel·la PPTP VPN «%s» (%d)"
-#: ../src/nm-pptp-service.c:787
+#: ../src/nm-pptp-service.c:828
#, c-format
-msgid "couldn't look up PPTP VPN gateway IP address '%s' (%d)"
+msgid "couldn’t look up PPTP VPN gateway IP address “%s” (%d)"
msgstr "no s'ha pogut buscar l'adreça ID de la passarel·la PPTP VPN «%s» (%d)"
-#: ../src/nm-pptp-service.c:811
+#: ../src/nm-pptp-service.c:852
#, c-format
-msgid "no usable addresses returned for PPTP VPN gateway '%s'"
+msgid "no usable addresses returned for PPTP VPN gateway “%s”"
msgstr "no s'han retornat adreces usables per a la passarel·la PPTP VPN «%s»"
-#: ../src/nm-pptp-service.c:840
+#: ../src/nm-pptp-service.c:881
msgid "Invalid or missing PPTP gateway."
msgstr "Passarel·la PPTP no vàlida o faltant."
-#: ../src/nm-pptp-service.c:1085
-msgid "Don't quit when VPN connection terminates"
+#: ../src/nm-pptp-service.c:1129
+msgid "Don’t quit when VPN connection terminates"
msgstr "No surtis quan acabi la connexió de la VPN"
-#: ../src/nm-pptp-service.c:1086
+#: ../src/nm-pptp-service.c:1130
msgid "Enable verbose debug logging (may expose passwords)"
msgstr ""
"Habilita el registre de depuració amb missatges (potser s'exposaran les "
"contrasenyes)"
-#: ../src/nm-pptp-service.c:1087
+#: ../src/nm-pptp-service.c:1131
msgid "D-Bus name to use for this instance"
msgstr "Nom del D-Bus a usar en aquesta instància"
-#: ../src/nm-pptp-service.c:1110
+#: ../src/nm-pptp-service.c:1152
msgid ""
"nm-pptp-service provides integrated PPTP VPN capability (compatible with "
"Microsoft and other implementations) to NetworkManager."
@@ -412,8 +454,8 @@
msgstr "Nom d'usuari:"
#: ../properties/nm-pptp-dialog.ui.h:47
-msgid "Ad_vanced..."
-msgstr "A_vançat..."
+msgid "Ad_vanced…"
+msgstr "A_vançat…"
#~ msgid "no usable addresses returned for PPTP VPN gateway '%s' (%d)"
#~ msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-pptp-1.2.6/src/nm-pptp-pppd-plugin.c new/NetworkManager-pptp-1.2.8/src/nm-pptp-pppd-plugin.c
--- old/NetworkManager-pptp-1.2.6/src/nm-pptp-pppd-plugin.c 2016-10-03 12:46:02.000000000 +0200
+++ new/NetworkManager-pptp-1.2.8/src/nm-pptp-pppd-plugin.c 2018-06-21 07:43:36.000000000 +0200
@@ -253,7 +253,6 @@
{
const char *my_username = NULL;
const char *my_password = NULL;
- size_t len;
GVariant *ret;
GError *error = NULL;
@@ -284,21 +283,11 @@
g_variant_get (ret, "(&s&s)", &my_username, &my_password);
- if (my_username) {
- len = strlen (my_username) + 1;
- len = len < MAXNAMELEN ? len : MAXNAMELEN;
+ if (my_username)
+ g_strlcpy (username, my_username, MAXNAMELEN);
- strncpy (username, my_username, len);
- username[len - 1] = '\0';
- }
-
- if (my_password) {
- len = strlen (my_password) + 1;
- len = len < MAXSECRETLEN ? len : MAXSECRETLEN;
-
- strncpy (password, my_password, len);
- password[len - 1] = '\0';
- }
+ if (my_password)
+ g_strlcpy (password, my_password, MAXSECRETLEN);
g_variant_unref (ret);