1 diff -Nuar b/openvpn-2.3.3/aclocal.m4 a/openvpn-2.3.4/aclocal.m4
2 --- b/openvpn-2.3.3/aclocal.m4 2014-04-09 09:47:52.000000000 +0200
3 +++ a/openvpn-2.3.4/aclocal.m4 2014-05-01 13:13:11.000000000 +0200
5 -# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
6 +# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
8 +# Copyright (C) 1996-2013 Free Software Foundation, Inc.
10 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
11 -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
13 # This file is free software; the Free Software Foundation
14 # gives unlimited permission to copy and/or distribute it,
15 # with or without modifications, as long as this notice is preserved.
17 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
20 +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
21 m4_ifndef([AC_AUTOCONF_VERSION],
22 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
23 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
24 [m4_warning([this file was generated for autoconf 2.69.
25 You have another version of autoconf. It may work, but is not guaranteed to.
26 If you have problems, you may need to regenerate the build system entirely.
27 -To do so, use the procedure documented by the package, typically `autoreconf'.])])
28 +To do so, use the procedure documented by the package, typically 'autoreconf'.])])
30 -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
32 +# Copyright (C) 2002-2013 Free Software Foundation, Inc.
34 # This file is free software; the Free Software Foundation
35 # gives unlimited permission to copy and/or distribute it,
36 # with or without modifications, as long as this notice is preserved.
40 # AM_AUTOMAKE_VERSION(VERSION)
41 # ----------------------------
42 # Automake X.Y traces this macro to ensure aclocal.m4 has been
43 # generated from the m4 files accompanying Automake X.Y.
44 # (This private macro should not be called outside this file.)
45 AC_DEFUN([AM_AUTOMAKE_VERSION],
46 -[am__api_version='1.11'
47 +[am__api_version='1.14'
48 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
49 dnl require some minimum version. Point them to the right macro.
50 -m4_if([$1], [1.11.6], [],
51 +m4_if([$1], [1.14.1], [],
52 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
56 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
57 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
58 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
59 -[AM_AUTOMAKE_VERSION([1.11.6])dnl
60 +[AM_AUTOMAKE_VERSION([1.14.1])dnl
61 m4_ifndef([AC_AUTOCONF_VERSION],
62 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
63 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
65 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
67 -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
68 +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
70 # This file is free software; the Free Software Foundation
71 # gives unlimited permission to copy and/or distribute it,
72 # with or without modifications, as long as this notice is preserved.
76 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
77 -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
78 -# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
79 +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
80 +# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
82 # Of course, Automake must honor this variable whenever it calls a
83 # tool from the auxiliary directory. The problem is that $srcdir (and
86 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
87 # are both prefixed by $srcdir. In an in-source build this is usually
88 -# harmless because $srcdir is `.', but things will broke when you
89 +# harmless because $srcdir is '.', but things will broke when you
90 # start a VPATH build or use an absolute $srcdir.
92 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
95 # AM_CONDITIONAL -*- Autoconf -*-
97 -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
98 -# Free Software Foundation, Inc.
99 +# Copyright (C) 1997-2013 Free Software Foundation, Inc.
101 # This file is free software; the Free Software Foundation
102 # gives unlimited permission to copy and/or distribute it,
103 # with or without modifications, as long as this notice is preserved.
107 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
108 # -------------------------------------
109 # Define a conditional.
110 AC_DEFUN([AM_CONDITIONAL],
112 - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
113 - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
114 +[AC_PREREQ([2.52])dnl
115 + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
116 + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
117 AC_SUBST([$1_TRUE])dnl
118 AC_SUBST([$1_FALSE])dnl
119 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
120 @@ -150,16 +142,14 @@
121 Usually this means the macro was only invoked conditionally.]])
124 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
125 -# 2010, 2011 Free Software Foundation, Inc.
126 +# Copyright (C) 1999-2013 Free Software Foundation, Inc.
128 # This file is free software; the Free Software Foundation
129 # gives unlimited permission to copy and/or distribute it,
130 # with or without modifications, as long as this notice is preserved.
134 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
135 +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
136 # written in clear, in which case automake, when reading aclocal.m4,
137 # will think it sees a *use*, and therefore will trigger all it's
138 # C support machinery. Also note that it means that autoscan, seeing
140 # _AM_DEPENDENCIES(NAME)
141 # ----------------------
142 # See how the compiler implements dependency checking.
143 -# NAME is "CC", "CXX", "GCJ", or "OBJC".
144 +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
145 # We try a few techniques and use that to set a single cache variable.
147 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
148 @@ -182,12 +172,13 @@
149 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
150 AC_REQUIRE([AM_DEP_TRACK])dnl
152 -ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
153 - [$1], CXX, [depcc="$CXX" am_compiler_list=],
154 - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
155 - [$1], UPC, [depcc="$UPC" am_compiler_list=],
156 - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
157 - [depcc="$$1" am_compiler_list=])
158 +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
159 + [$1], [CXX], [depcc="$CXX" am_compiler_list=],
160 + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
161 + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
162 + [$1], [UPC], [depcc="$UPC" am_compiler_list=],
163 + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
164 + [depcc="$$1" am_compiler_list=])
166 AC_CACHE_CHECK([dependency style of $depcc],
167 [am_cv_$1_dependencies_compiler_type],
169 # We make a subdir and do the tests there. Otherwise we can end up
170 # making bogus files that we don't know about and never remove. For
171 # instance it was reported that on HP-UX the gcc test will end up
172 - # making a dummy file named `D' -- because `-MD' means `put the output
174 + # making a dummy file named 'D' -- because '-MD' means "put the output
178 # Copy depcomp to subdir because otherwise we won't find it if we're
179 @@ -236,16 +227,16 @@
181 for i in 1 2 3 4 5 6; do
182 echo '#include "conftst'$i'.h"' >> sub/conftest.c
183 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
184 - # Solaris 8's {/usr,}/bin/sh.
185 - touch sub/conftst$i.h
186 + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
187 + # Solaris 10 /bin/sh.
188 + echo '/* dummy */' > sub/conftst$i.h
190 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
192 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
193 + # We check with '-c' and '-o' for the sake of the "dashmstdout"
194 # mode. It turns out that the SunPro C++ compiler does not properly
195 - # handle `-M -o', and we need to detect this. Also, some Intel
196 - # versions had trouble with output in subdirs
197 + # handle '-M -o', and we need to detect this. Also, some Intel
198 + # versions had trouble with output in subdirs.
199 am__obj=sub/conftest.${OBJEXT-o}
200 am__minus_obj="-o $am__obj"
203 test "$am__universal" = false || continue
206 - # after this tag, mechanisms are not by side-effect, so they'll
207 - # only be used when explicitly requested
208 + # After this tag, mechanisms are not by side-effect, so they'll
209 + # only be used when explicitly requested.
210 if test "x$enable_dependency_tracking" = xyes; then
216 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
217 - # This compiler won't grok `-c -o', but also, the minuso test has
218 + # This compiler won't grok '-c -o', but also, the minuso test has
219 # not run yet. These depmodes are late enough in the game, and
220 # so weak that their functioning should not be impacted.
221 am__obj=conftest.${OBJEXT-o}
225 # Choose a directory name for dependency files.
226 -# This macro is AC_REQUIREd in _AM_DEPENDENCIES
227 +# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
228 AC_DEFUN([AM_SET_DEPDIR],
229 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
230 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
234 AC_DEFUN([AM_DEP_TRACK],
235 -[AC_ARG_ENABLE(dependency-tracking,
236 -[ --disable-dependency-tracking speeds up one-time build
237 - --enable-dependency-tracking do not reject slow dependency extractors])
238 +[AC_ARG_ENABLE([dependency-tracking], [dnl
240 + [--enable-dependency-tracking],
241 + [do not reject slow dependency extractors])
243 + [--disable-dependency-tracking],
244 + [speeds up one-time build])])
245 if test "x$enable_dependency_tracking" != xno; then
246 am_depcomp="$ac_aux_dir/depcomp"
248 @@ -338,20 +333,18 @@
250 # Generate code to set up dependency tracking. -*- Autoconf -*-
252 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
253 -# Free Software Foundation, Inc.
254 +# Copyright (C) 1999-2013 Free Software Foundation, Inc.
256 # This file is free software; the Free Software Foundation
257 # gives unlimited permission to copy and/or distribute it,
258 # with or without modifications, as long as this notice is preserved.
262 # _AM_OUTPUT_DEPENDENCY_COMMANDS
263 # ------------------------------
264 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
266 - # Autoconf 2.62 quotes --file arguments for eval, but not when files
267 + # Older Autoconf quotes --file arguments for eval, but not when files
268 # are listed without --file. Let's play safe and only enable the eval
269 # if we detect the quoting.
270 case $CONFIG_FILES in
272 # Strip MF so we end up with the name of the file.
273 mf=`echo "$mf" | sed -e 's/:.*$//'`
274 # Check whether this is an Automake generated Makefile or not.
275 - # We used to match only the files named `Makefile.in', but
276 + # We used to match only the files named 'Makefile.in', but
277 # some people rename them; so instead we look at the file content.
278 # Grep'ing the first line is not enough: some people post-process
279 # each Makefile.in and add a new line on top of each file to say so.
280 @@ -376,21 +369,19 @@
283 # Extract the definition of DEPDIR, am__include, and am__quote
284 - # from the Makefile without running `make'.
285 + # from the Makefile without running 'make'.
286 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
287 test -z "$DEPDIR" && continue
288 am__include=`sed -n 's/^am__include = //p' < "$mf"`
289 - test -z "am__include" && continue
290 + test -z "$am__include" && continue
291 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
292 - # When using ansi2knr, U may be empty or an underscore; expand it
293 - U=`sed -n 's/^U = //p' < "$mf"`
294 # Find all dependency output files, they are included files with
295 # $(DEPDIR) in their names. We invoke sed twice because it is the
296 # simplest approach to changing $(DEPDIR) to its actual value in the
298 for file in `sed -n "
299 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
300 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
301 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
302 # Make sure the directory exists.
303 test -f "$dirpart/$file" && continue
304 fdir=`AS_DIRNAME(["$file"])`
306 # This macro should only be invoked once -- use via AC_REQUIRE.
308 # This code is only required when automatic dependency tracking
309 -# is enabled. FIXME. This creates each `.P' file that we will
310 +# is enabled. FIXME. This creates each '.P' file that we will
311 # need in order to bootstrap the dependency handling code.
312 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
313 [AC_CONFIG_COMMANDS([depfiles],
314 @@ -418,18 +409,21 @@
316 # Do all the work for Automake. -*- Autoconf -*-
318 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
319 -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
320 +# Copyright (C) 1996-2013 Free Software Foundation, Inc.
322 # This file is free software; the Free Software Foundation
323 # gives unlimited permission to copy and/or distribute it,
324 # with or without modifications, as long as this notice is preserved.
328 # This macro actually does too much. Some checks are only needed if
329 # your package does certain things. But this isn't really a big deal.
331 +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
332 +m4_define([AC_PROG_CC],
333 +m4_defn([AC_PROG_CC])
337 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
338 # AM_INIT_AUTOMAKE([OPTIONS])
339 # -----------------------------------------------
341 # arguments mandatory, and then we can depend on a new Autoconf
342 # release and drop the old call support.
343 AC_DEFUN([AM_INIT_AUTOMAKE],
344 -[AC_PREREQ([2.62])dnl
345 +[AC_PREREQ([2.65])dnl
346 dnl Autoconf wants to disallow AM_ names. We explicitly allow
347 dnl the ones we care about.
348 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
349 @@ -471,31 +465,40 @@
350 # Define the identity of the package.
351 dnl Distinguish between old-style and new-style calls.
353 -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
354 +[AC_DIAGNOSE([obsolete],
355 + [$0: two- and three-arguments forms are deprecated.])
356 +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
357 AC_SUBST([PACKAGE], [$1])dnl
358 AC_SUBST([VERSION], [$2])],
359 [_AM_SET_OPTIONS([$1])dnl
360 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
361 -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
363 + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
365 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
366 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
367 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
369 _AM_IF_OPTION([no-define],,
370 -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
371 - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
372 +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
373 + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
375 # Some tools Automake needs.
376 AC_REQUIRE([AM_SANITY_CHECK])dnl
377 AC_REQUIRE([AC_ARG_PROGRAM])dnl
378 -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
379 -AM_MISSING_PROG(AUTOCONF, autoconf)
380 -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
381 -AM_MISSING_PROG(AUTOHEADER, autoheader)
382 -AM_MISSING_PROG(MAKEINFO, makeinfo)
383 +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
384 +AM_MISSING_PROG([AUTOCONF], [autoconf])
385 +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
386 +AM_MISSING_PROG([AUTOHEADER], [autoheader])
387 +AM_MISSING_PROG([MAKEINFO], [makeinfo])
388 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
389 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
390 -AC_REQUIRE([AM_PROG_MKDIR_P])dnl
391 +AC_REQUIRE([AC_PROG_MKDIR_P])dnl
392 +# For better backward compatibility. To be removed once Automake 1.9.x
393 +# dies out for good. For more background, see:
394 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
395 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
396 +AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
397 # We need awk for the "check" target. The system "awk" is bad on
399 AC_REQUIRE([AC_PROG_AWK])dnl
400 @@ -506,34 +509,78 @@
401 [_AM_PROG_TAR([v7])])])
402 _AM_IF_OPTION([no-dependencies],,
403 [AC_PROVIDE_IFELSE([AC_PROG_CC],
404 - [_AM_DEPENDENCIES(CC)],
405 - [define([AC_PROG_CC],
406 - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
407 + [_AM_DEPENDENCIES([CC])],
408 + [m4_define([AC_PROG_CC],
409 + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
410 AC_PROVIDE_IFELSE([AC_PROG_CXX],
411 - [_AM_DEPENDENCIES(CXX)],
412 - [define([AC_PROG_CXX],
413 - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
414 + [_AM_DEPENDENCIES([CXX])],
415 + [m4_define([AC_PROG_CXX],
416 + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
417 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
418 - [_AM_DEPENDENCIES(OBJC)],
419 - [define([AC_PROG_OBJC],
420 - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
422 -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
423 -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
424 -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
425 -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
426 + [_AM_DEPENDENCIES([OBJC])],
427 + [m4_define([AC_PROG_OBJC],
428 + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
429 +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
430 + [_AM_DEPENDENCIES([OBJCXX])],
431 + [m4_define([AC_PROG_OBJCXX],
432 + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
434 +AC_REQUIRE([AM_SILENT_RULES])dnl
435 +dnl The testsuite driver may need to know about EXEEXT, so add the
436 +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
437 +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
438 AC_CONFIG_COMMANDS_PRE(dnl
439 [m4_provide_if([_AM_COMPILER_EXEEXT],
440 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
443 -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
444 +# POSIX will say in a future version that running "rm -f" with no argument
445 +# is OK; and we want to be able to make that assumption in our Makefile
446 +# recipes. So use an aggressive probe to check that the usage we want is
447 +# actually supported "in the wild" to an acceptable degree.
448 +# See automake bug#10828.
449 +# To make any issue more visible, cause the running configure to be aborted
450 +# by default if the 'rm' program in use doesn't match our expectations; the
451 +# user can still override this though.
452 +if rm -f && rm -fr && rm -rf; then : OK; else
456 +Your 'rm' program seems unable to run without file operands specified
457 +on the command line, even when the '-f' option is present. This is contrary
458 +to the behaviour of most rm programs out there, and not conforming with
459 +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
461 +Please tell bug-automake@gnu.org about your system, including the value
462 +of your $PATH and any error possibly output before this message. This
463 +can help us improve future automake versions.
466 + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
467 + echo 'Configuration will proceed anyway, since you have set the' >&2
468 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
472 +Aborting the configuration process, to ensure you take notice of the issue.
474 +You can download and install GNU coreutils to get an 'rm' implementation
475 +that behaves properly: <http://www.gnu.org/software/coreutils/>.
477 +If you want to complete the configuration process using your problematic
478 +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
479 +to "yes", and re-run configure.
482 + AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
486 +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
487 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
488 dnl mangled by Autoconf and run in a shell conditional statement.
489 m4_define([_AC_COMPILER_EXEEXT],
490 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
493 # When config.status generates a header, we must update the stamp-h file.
494 # This file resides in the same directory as the config header
495 # that is generated. The stamp files are numbered to have different names.
496 @@ -555,15 +602,12 @@
498 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
500 -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
502 +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
504 # This file is free software; the Free Software Foundation
505 # gives unlimited permission to copy and/or distribute it,
506 # with or without modifications, as long as this notice is preserved.
512 # Define $install_sh.
513 @@ -577,16 +621,14 @@
514 install_sh="\${SHELL} $am_aux_dir/install-sh"
517 -AC_SUBST(install_sh)])
518 +AC_SUBST([install_sh])])
520 -# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
521 +# Copyright (C) 2003-2013 Free Software Foundation, Inc.
523 # This file is free software; the Free Software Foundation
524 # gives unlimited permission to copy and/or distribute it,
525 # with or without modifications, as long as this notice is preserved.
529 # Check whether the underlying file-system supports filenames
530 # with a leading dot. For instance MS-DOS doesn't.
531 AC_DEFUN([AM_SET_LEADING_DOT],
532 @@ -602,14 +644,12 @@
534 # Check to see how 'make' treats includes. -*- Autoconf -*-
536 -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
537 +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
539 # This file is free software; the Free Software Foundation
540 # gives unlimited permission to copy and/or distribute it,
541 # with or without modifications, as long as this notice is preserved.
547 # Check to see how make treats includes.
550 # First try GNU make style include.
551 echo "include confinc" > confmf
552 -# Ignore all kinds of additional output from `make'.
553 +# Ignore all kinds of additional output from 'make'.
554 case `$am_make -s -f confmf 2> /dev/null` in #(
555 *the\ am__doit\ target*)
557 @@ -654,15 +694,12 @@
559 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
561 -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
562 -# Free Software Foundation, Inc.
563 +# Copyright (C) 1997-2013 Free Software Foundation, Inc.
565 # This file is free software; the Free Software Foundation
566 # gives unlimited permission to copy and/or distribute it,
567 # with or without modifications, as long as this notice is preserved.
571 # AM_MISSING_PROG(NAME, PROGRAM)
572 # ------------------------------
573 AC_DEFUN([AM_MISSING_PROG],
574 @@ -670,11 +707,10 @@
575 $1=${$1-"${am_missing_run}$2"}
581 -# Define MISSING if not defined so far and test if it supports --run.
582 -# If it does, set am_missing_run to use it, otherwise, to nothing.
583 +# Define MISSING if not defined so far and test if it is modern enough.
584 +# If it is, set am_missing_run to use it, otherwise, to nothing.
585 AC_DEFUN([AM_MISSING_HAS_RUN],
586 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
587 AC_REQUIRE_AUX_FILE([missing])dnl
588 @@ -687,54 +723,22 @@
591 # Use eval to expand $SHELL
592 -if eval "$MISSING --run true"; then
593 - am_missing_run="$MISSING --run "
594 +if eval "$MISSING --is-lightweight"; then
595 + am_missing_run="$MISSING "
598 - AC_MSG_WARN([`missing' script is too old or missing])
599 + AC_MSG_WARN(['missing' script is too old or missing])
603 -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
606 -# This file is free software; the Free Software Foundation
607 -# gives unlimited permission to copy and/or distribute it,
608 -# with or without modifications, as long as this notice is preserved.
614 -# Check for `mkdir -p'.
615 -AC_DEFUN([AM_PROG_MKDIR_P],
616 -[AC_PREREQ([2.60])dnl
617 -AC_REQUIRE([AC_PROG_MKDIR_P])dnl
618 -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
619 -dnl while keeping a definition of mkdir_p for backward compatibility.
620 -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
621 -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
622 -dnl Makefile.ins that do not define MKDIR_P, so we do our own
623 -dnl adjustment using top_builddir (which is defined more often than
625 -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
627 - [[\\/$]]* | ?:[[\\/]]*) ;;
628 - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
632 # Helper functions for option handling. -*- Autoconf -*-
634 -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
636 +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
638 # This file is free software; the Free Software Foundation
639 # gives unlimited permission to copy and/or distribute it,
640 # with or without modifications, as long as this notice is preserved.
644 # _AM_MANGLE_OPTION(NAME)
645 # -----------------------
646 AC_DEFUN([_AM_MANGLE_OPTION],
648 # --------------------
649 # Set option NAME. Presently that only means defining a flag for this option.
650 AC_DEFUN([_AM_SET_OPTION],
651 -[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
652 +[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
654 # _AM_SET_OPTIONS(OPTIONS)
655 # ------------------------
656 @@ -758,24 +762,82 @@
657 AC_DEFUN([_AM_IF_OPTION],
658 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
660 -# Check to make sure that the build environment is sane. -*- Autoconf -*-
661 +# Copyright (C) 1999-2013 Free Software Foundation, Inc.
663 +# This file is free software; the Free Software Foundation
664 +# gives unlimited permission to copy and/or distribute it,
665 +# with or without modifications, as long as this notice is preserved.
669 +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
670 +# to automatically call this.
671 +AC_DEFUN([_AM_PROG_CC_C_O],
672 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
673 +AC_REQUIRE_AUX_FILE([compile])dnl
674 +AC_LANG_PUSH([C])dnl
676 + [whether $CC understands -c and -o together],
677 + [am_cv_prog_cc_c_o],
678 + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
679 + # Make sure it works both with $CC and with simple cc.
680 + # Following AC_PROG_CC_C_O, we do the test twice because some
681 + # compilers refuse to overwrite an existing .o file with -o,
682 + # though they will create one.
683 + am_cv_prog_cc_c_o=yes
684 + for am_i in 1 2; do
685 + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
686 + && test -f conftest2.$ac_objext; then
689 + am_cv_prog_cc_c_o=no
693 + rm -f core conftest*
695 +if test "$am_cv_prog_cc_c_o" != yes; then
696 + # Losing compiler, so override with the script.
697 + # FIXME: It is wrong to rewrite CC.
698 + # But if we don't then we get into trouble of one sort or another.
699 + # A longer-term fix would be to have automake use am__CC in this case,
700 + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
701 + CC="$am_aux_dir/compile $CC"
705 +# For backward compatibility.
706 +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
708 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
709 -# Free Software Foundation, Inc.
710 +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
712 # This file is free software; the Free Software Foundation
713 # gives unlimited permission to copy and/or distribute it,
714 # with or without modifications, as long as this notice is preserved.
717 +# AM_RUN_LOG(COMMAND)
718 +# -------------------
719 +# Run COMMAND, save the exit status in ac_status, and log it.
720 +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
721 +AC_DEFUN([AM_RUN_LOG],
722 +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
723 + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
725 + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
726 + (exit $ac_status); }])
728 +# Check to make sure that the build environment is sane. -*- Autoconf -*-
730 +# Copyright (C) 1996-2013 Free Software Foundation, Inc.
732 +# This file is free software; the Free Software Foundation
733 +# gives unlimited permission to copy and/or distribute it,
734 +# with or without modifications, as long as this notice is preserved.
738 AC_DEFUN([AM_SANITY_CHECK],
739 [AC_MSG_CHECKING([whether build environment is sane])
742 -echo timestamp > conftest.file
743 # Reject unsafe characters in $srcdir or the absolute working directory
744 # name. Accept space and tab only in the latter.
746 @@ -786,32 +848,40 @@
749 *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
750 - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
751 + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
754 -# Do `set' in a subshell so we don't clobber the current shell's
755 +# Do 'set' in a subshell so we don't clobber the current shell's
756 # arguments. Must try -L first in case configure is actually a
757 # symlink; some systems play weird games with the mod time of symlinks
758 # (eg FreeBSD returns the mod time of the symlink's containing
761 - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
762 - if test "$[*]" = "X"; then
764 - set X `ls -t "$srcdir/configure" conftest.file`
766 - rm -f conftest.file
767 - if test "$[*]" != "X $srcdir/configure conftest.file" \
768 - && test "$[*]" != "X conftest.file $srcdir/configure"; then
770 - # If neither matched, then we have a broken ls. This can happen
771 - # if, for instance, CONFIG_SHELL is bash and it inherits a
772 - # broken ls alias from the environment. This has actually
773 - # happened. Such a system could not be considered "sane".
774 - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
775 -alias in your environment])
779 + for am_try in 1 2; do
780 + echo "timestamp, slept: $am_has_slept" > conftest.file
781 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
782 + if test "$[*]" = "X"; then
784 + set X `ls -t "$srcdir/configure" conftest.file`
786 + if test "$[*]" != "X $srcdir/configure conftest.file" \
787 + && test "$[*]" != "X conftest.file $srcdir/configure"; then
789 + # If neither matched, then we have a broken ls. This can happen
790 + # if, for instance, CONFIG_SHELL is bash and it inherits a
791 + # broken ls alias from the environment. This has actually
792 + # happened. Such a system could not be considered "sane".
793 + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
794 + alias in your environment])
796 + if test "$[2]" = conftest.file || test $am_try -eq 2; then
803 test "$[2]" = conftest.file
806 @@ -821,46 +891,118 @@
807 AC_MSG_ERROR([newly created file is older than distributed files!
808 Check your system clock])
810 -AC_MSG_RESULT(yes)])
811 +AC_MSG_RESULT([yes])
812 +# If we didn't sleep, we still need to ensure time stamps of config.status and
813 +# generated files are strictly newer.
815 +if grep 'slept: no' conftest.file >/dev/null 2>&1; then
819 +AC_CONFIG_COMMANDS_PRE(
820 + [AC_MSG_CHECKING([that generated files are newer than configure])
821 + if test -n "$am_sleep_pid"; then
822 + # Hide warnings about reused PIDs.
823 + wait $am_sleep_pid 2>/dev/null
825 + AC_MSG_RESULT([done])])
829 -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
830 +# Copyright (C) 2009-2013 Free Software Foundation, Inc.
832 # This file is free software; the Free Software Foundation
833 # gives unlimited permission to copy and/or distribute it,
834 # with or without modifications, as long as this notice is preserved.
837 +# AM_SILENT_RULES([DEFAULT])
838 +# --------------------------
839 +# Enable less verbose build rules; with the default set to DEFAULT
840 +# ("yes" being less verbose, "no" or empty being verbose).
841 +AC_DEFUN([AM_SILENT_RULES],
842 +[AC_ARG_ENABLE([silent-rules], [dnl
844 + [--enable-silent-rules],
845 + [less verbose build output (undo: "make V=1")])
847 + [--disable-silent-rules],
848 + [verbose build output (undo: "make V=0")])dnl
850 +case $enable_silent_rules in @%:@ (((
851 + yes) AM_DEFAULT_VERBOSITY=0;;
852 + no) AM_DEFAULT_VERBOSITY=1;;
853 + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
856 +dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
857 +dnl do not support nested variable expansions.
858 +dnl See automake bug#9928 and bug#10237.
859 +am_make=${MAKE-make}
860 +AC_CACHE_CHECK([whether $am_make supports nested variables],
861 + [am_cv_make_support_nested_variables],
862 + [if AS_ECHO([['TRUE=$(BAR$(V))
868 +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
869 + am_cv_make_support_nested_variables=yes
871 + am_cv_make_support_nested_variables=no
873 +if test $am_cv_make_support_nested_variables = yes; then
874 + dnl Using '$V' instead of '$(V)' breaks IRIX make.
876 + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
878 + AM_V=$AM_DEFAULT_VERBOSITY
879 + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
882 +AM_SUBST_NOTMAKE([AM_V])dnl
883 +AC_SUBST([AM_DEFAULT_V])dnl
884 +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
885 +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
887 +AC_SUBST([AM_BACKSLASH])dnl
888 +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
891 +# Copyright (C) 2001-2013 Free Software Foundation, Inc.
893 +# This file is free software; the Free Software Foundation
894 +# gives unlimited permission to copy and/or distribute it,
895 +# with or without modifications, as long as this notice is preserved.
897 # AM_PROG_INSTALL_STRIP
898 # ---------------------
899 -# One issue with vendor `install' (even GNU) is that you can't
900 +# One issue with vendor 'install' (even GNU) is that you can't
901 # specify the program used to strip binaries. This is especially
902 # annoying in cross-compiling environments, where the build's strip
903 # is unlikely to handle the host's binaries.
904 # Fortunately install-sh will honor a STRIPPROG variable, so we
905 -# always use install-sh in `make install-strip', and initialize
906 +# always use install-sh in "make install-strip", and initialize
907 # STRIPPROG with the value of the STRIP variable (set by the user).
908 AC_DEFUN([AM_PROG_INSTALL_STRIP],
909 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
910 -# Installed binaries are usually stripped using `strip' when the user
911 -# run `make install-strip'. However `strip' might not be the right
912 +# Installed binaries are usually stripped using 'strip' when the user
913 +# run "make install-strip". However 'strip' might not be the right
914 # tool to use in cross-compilation environments, therefore Automake
915 -# will honor the `STRIP' environment variable to overrule this program.
916 -dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
917 +# will honor the 'STRIP' environment variable to overrule this program.
918 +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
919 if test "$cross_compiling" != no; then
920 AC_CHECK_TOOL([STRIP], [strip], :)
922 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
923 AC_SUBST([INSTALL_STRIP_PROGRAM])])
925 -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
926 +# Copyright (C) 2006-2013 Free Software Foundation, Inc.
928 # This file is free software; the Free Software Foundation
929 # gives unlimited permission to copy and/or distribute it,
930 # with or without modifications, as long as this notice is preserved.
934 # _AM_SUBST_NOTMAKE(VARIABLE)
935 # ---------------------------
936 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
937 @@ -874,18 +1016,16 @@
939 # Check how to create a tarball. -*- Autoconf -*-
941 -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
942 +# Copyright (C) 2004-2013 Free Software Foundation, Inc.
944 # This file is free software; the Free Software Foundation
945 # gives unlimited permission to copy and/or distribute it,
946 # with or without modifications, as long as this notice is preserved.
950 # _AM_PROG_TAR(FORMAT)
951 # --------------------
952 # Check how to create a tarball in format FORMAT.
953 -# FORMAT should be one of `v7', `ustar', or `pax'.
954 +# FORMAT should be one of 'v7', 'ustar', or 'pax'.
956 # Substitute a variable $(am__tar) that is a command
957 # writing to stdout a FORMAT-tarball containing the directory
958 @@ -895,76 +1035,114 @@
959 # Substitute a variable $(am__untar) that extract such
960 # a tarball read from stdin.
961 # $(am__untar) < result.tar
963 AC_DEFUN([_AM_PROG_TAR],
964 [# Always define AMTAR for backward compatibility. Yes, it's still used
965 # in the wild :-( We should find a proper way to deprecate it ...
966 AC_SUBST([AMTAR], ['$${TAR-tar}'])
968 - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
969 - [m4_case([$1], [ustar],, [pax],,
970 - [m4_fatal([Unknown tar format])])
971 -AC_MSG_CHECKING([how to create a $1 tar archive])
972 -# Loop over all known methods to create a tar archive until one works.
974 +# We'll loop over all known methods to create a tar archive until one works.
975 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
976 -_am_tools=${am_cv_prog_tar_$1-$_am_tools}
977 -# Do not fold the above two line into one, because Tru64 sh and
978 -# Solaris sh will not grok spaces in the rhs of `-'.
979 -for _am_tool in $_am_tools
983 - for _am_tar in tar gnutar gtar;
985 - AM_RUN_LOG([$_am_tar --version]) && break
987 - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
988 - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
989 - am__untar="$_am_tar -xf -"
992 - # Must skip GNU tar: if it does not support --format= it doesn't create
993 - # ustar tarball either.
994 - (tar --version) >/dev/null 2>&1 && continue
995 - am__tar='tar chf - "$$tardir"'
996 - am__tar_='tar chf - "$tardir"'
997 - am__untar='tar xf -'
1000 - am__tar='pax -L -x $1 -w "$$tardir"'
1001 - am__tar_='pax -L -x $1 -w "$tardir"'
1002 - am__untar='pax -r'
1005 - am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1006 - am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1007 - am__untar='cpio -i -H $1 -d'
1016 - # If the value was cached, stop now. We just wanted to have am__tar
1017 - # and am__untar set.
1018 - test -n "${am_cv_prog_tar_$1}" && break
1020 + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1022 - # tar/untar a dummy directory, and stop if the command works
1023 - rm -rf conftest.dir
1024 - mkdir conftest.dir
1025 - echo GrepMe > conftest.dir/file
1026 - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1029 + [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
1030 + # There is notably a 21 bits limit for the UID and the GID. In fact,
1031 + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
1033 + am_max_uid=2097151 # 2^21 - 1
1034 + am_max_gid=$am_max_uid
1035 + # The $UID and $GID variables are not portable, so we need to resort
1036 + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
1037 + # below are definitely unexpected, so allow the users to see them
1038 + # (that is, avoid stderr redirection).
1039 + am_uid=`id -u || echo unknown`
1040 + am_gid=`id -g || echo unknown`
1041 + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
1042 + if test $am_uid -le $am_max_uid; then
1043 + AC_MSG_RESULT([yes])
1045 + AC_MSG_RESULT([no])
1048 + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
1049 + if test $am_gid -le $am_max_gid; then
1050 + AC_MSG_RESULT([yes])
1052 + AC_MSG_RESULT([no])
1059 + [m4_fatal([Unknown tar format])])
1061 + AC_MSG_CHECKING([how to create a $1 tar archive])
1063 + # Go ahead even if we have the value already cached. We do so because we
1064 + # need to set the values for the 'am__tar' and 'am__untar' variables.
1065 + _am_tools=${am_cv_prog_tar_$1-$_am_tools}
1067 + for _am_tool in $_am_tools; do
1070 + for _am_tar in tar gnutar gtar; do
1071 + AM_RUN_LOG([$_am_tar --version]) && break
1073 + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1074 + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1075 + am__untar="$_am_tar -xf -"
1078 + # Must skip GNU tar: if it does not support --format= it doesn't create
1079 + # ustar tarball either.
1080 + (tar --version) >/dev/null 2>&1 && continue
1081 + am__tar='tar chf - "$$tardir"'
1082 + am__tar_='tar chf - "$tardir"'
1083 + am__untar='tar xf -'
1086 + am__tar='pax -L -x $1 -w "$$tardir"'
1087 + am__tar_='pax -L -x $1 -w "$tardir"'
1088 + am__untar='pax -r'
1091 + am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1092 + am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1093 + am__untar='cpio -i -H $1 -d'
1102 + # If the value was cached, stop now. We just wanted to have am__tar
1103 + # and am__untar set.
1104 + test -n "${am_cv_prog_tar_$1}" && break
1106 + # tar/untar a dummy directory, and stop if the command works.
1107 + rm -rf conftest.dir
1108 + mkdir conftest.dir
1109 + echo GrepMe > conftest.dir/file
1110 + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1111 + rm -rf conftest.dir
1112 + if test -s conftest.tar; then
1113 + AM_RUN_LOG([$am__untar <conftest.tar])
1114 + AM_RUN_LOG([cat conftest.dir/file])
1115 + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1119 - if test -s conftest.tar; then
1120 - AM_RUN_LOG([$am__untar <conftest.tar])
1121 - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1124 -rm -rf conftest.dir
1126 -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1127 -AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1128 + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1129 + AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1132 AC_SUBST([am__untar])
1134 diff -Nuar b/openvpn-2.3.3/build/Makefile.in a/openvpn-2.3.4/build/Makefile.in
1135 --- b/openvpn-2.3.3/build/Makefile.in 2014-04-09 09:51:26.000000000 +0200
1136 +++ a/openvpn-2.3.4/build/Makefile.in 2014-05-02 09:16:39.000000000 +0200
1138 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
1139 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
1142 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1143 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
1145 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
1147 # This Makefile.in is free software; the Free Software Foundation
1148 # gives unlimited permission to copy and/or distribute it,
1149 # with or without modifications, as long as this notice is preserved.
1151 # Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
1154 -am__make_dryrun = \
1157 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
1158 +am__make_running_with_option = \
1159 + case $${target_option-} in \
1161 + *) echo "am__make_running_with_option: internal error: invalid" \
1162 + "target option '$${target_option-}' specified" >&2; \
1166 + sane_makeflags=$$MAKEFLAGS; \
1167 + if $(am__is_gnu_make); then \
1168 + sane_makeflags=$$MFLAGS; \
1170 case $$MAKEFLAGS in \
1172 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
1173 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
1175 - for am__flg in $$MAKEFLAGS; do \
1176 - case $$am__flg in \
1178 - *n*) am__dry=yes; break;; \
1182 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
1183 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
1187 + strip_trailopt () \
1189 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
1191 + for flg in $$sane_makeflags; do \
1192 + test $$skip_next = yes && { skip_next=no; continue; }; \
1194 + *=*|--*) continue;; \
1195 + -*I) strip_trailopt 'I'; skip_next=yes;; \
1196 + -*I?*) strip_trailopt 'I';; \
1197 + -*O) strip_trailopt 'O'; skip_next=yes;; \
1198 + -*O?*) strip_trailopt 'O';; \
1199 + -*l) strip_trailopt 'l'; skip_next=yes;; \
1200 + -*l?*) strip_trailopt 'l';; \
1201 + -[dEDm]) skip_next=yes;; \
1202 + -[JT]) skip_next=yes;; \
1205 + *$$target_option*) has_opt=yes; break;; \
1207 - test $$am__dry = yes; \
1210 + test $$has_opt = yes
1211 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
1212 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
1213 pkgdatadir = $(datadir)/@PACKAGE@
1214 pkgincludedir = $(includedir)/@PACKAGE@
1215 pkglibdir = $(libdir)/@PACKAGE@
1217 build_triplet = @build@
1218 host_triplet = @host@
1220 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
1221 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
1222 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1223 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
1224 $(top_srcdir)/m4/ax_socklen_t.m4 \
1225 @@ -76,15 +103,28 @@
1226 CONFIG_HEADER = $(top_builddir)/config.h
1227 CONFIG_CLEAN_FILES =
1228 CONFIG_CLEAN_VPATH_FILES =
1229 +AM_V_P = $(am__v_P_@AM_V@)
1230 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
1233 +AM_V_GEN = $(am__v_GEN_@AM_V@)
1234 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
1235 +am__v_GEN_0 = @echo " GEN " $@;
1237 +AM_V_at = $(am__v_at_@AM_V@)
1238 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
1243 -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
1244 - html-recursive info-recursive install-data-recursive \
1245 - install-dvi-recursive install-exec-recursive \
1246 - install-html-recursive install-info-recursive \
1247 - install-pdf-recursive install-ps-recursive install-recursive \
1248 - installcheck-recursive installdirs-recursive pdf-recursive \
1249 - ps-recursive uninstall-recursive
1250 +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
1251 + ctags-recursive dvi-recursive html-recursive info-recursive \
1252 + install-data-recursive install-dvi-recursive \
1253 + install-exec-recursive install-html-recursive \
1254 + install-info-recursive install-pdf-recursive \
1255 + install-ps-recursive install-recursive installcheck-recursive \
1256 + installdirs-recursive pdf-recursive ps-recursive \
1257 + tags-recursive uninstall-recursive
1258 am__can_run_installinfo = \
1259 case $$AM_UPDATE_INFO_DIR in \
1263 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
1264 distclean-recursive maintainer-clean-recursive
1265 -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
1266 - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
1267 +am__recursive_targets = \
1268 + $(RECURSIVE_TARGETS) \
1269 + $(RECURSIVE_CLEAN_TARGETS) \
1270 + $(am__extra_recursive_targets)
1271 +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
1273 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
1274 +# Read a list of newline-separated strings from the standard input,
1275 +# and print each of them once, without duplicates. Input order is
1277 +am__uniquify_input = $(AWK) '\
1278 + BEGIN { nonempty = 0; } \
1279 + { items[$$0] = 1; nonempty = 1; } \
1280 + END { if (nonempty) { for (i in items) print i; }; } \
1282 +# Make sure the list of sources is unique. This is necessary because,
1283 +# e.g., the same source file might be shared among _SOURCES variables
1284 +# for different programs/libraries.
1285 +am__define_uniq_tagged_files = \
1286 + list='$(am__tagged_files)'; \
1287 + unique=`for i in $$list; do \
1288 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1289 + done | $(am__uniquify_input)`
1292 DIST_SUBDIRS = $(SUBDIRS)
1297 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
1300 AUTOCONF = @AUTOCONF@
1301 @@ -327,22 +388,25 @@
1304 # This directory's subdirectories are mostly independent; you can cd
1305 -# into them and run `make' without going through this Makefile.
1306 -# To change the values of `make' variables: instead of editing Makefiles,
1307 -# (1) if the variable is set in `config.status', edit `config.status'
1308 -# (which will cause the Makefiles to be regenerated when you run `make');
1309 -# (2) otherwise, pass the desired values on the `make' command line.
1310 -$(RECURSIVE_TARGETS):
1311 - @fail= failcom='exit 1'; \
1312 - for f in x $$MAKEFLAGS; do \
1314 - *=* | --[!k]*);; \
1315 - *k*) failcom='fail=yes';; \
1318 +# into them and run 'make' without going through this Makefile.
1319 +# To change the values of 'make' variables: instead of editing Makefiles,
1320 +# (1) if the variable is set in 'config.status', edit 'config.status'
1321 +# (which will cause the Makefiles to be regenerated when you run 'make');
1322 +# (2) otherwise, pass the desired values on the 'make' command line.
1323 +$(am__recursive_targets):
1325 + if $(am__make_keepgoing); then \
1326 + failcom='fail=yes'; \
1328 + failcom='exit 1'; \
1331 target=`echo $@ | sed s/-recursive//`; \
1332 - list='$(SUBDIRS)'; for subdir in $$list; do \
1334 + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
1335 + *) list='$(SUBDIRS)' ;; \
1337 + for subdir in $$list; do \
1338 echo "Making $$target in $$subdir"; \
1339 if test "$$subdir" = "."; then \
1341 @@ -357,57 +421,12 @@
1342 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
1343 fi; test -z "$$fail"
1345 -$(RECURSIVE_CLEAN_TARGETS):
1346 - @fail= failcom='exit 1'; \
1347 - for f in x $$MAKEFLAGS; do \
1349 - *=* | --[!k]*);; \
1350 - *k*) failcom='fail=yes';; \
1355 - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
1356 - *) list='$(SUBDIRS)' ;; \
1358 - rev=''; for subdir in $$list; do \
1359 - if test "$$subdir" = "."; then :; else \
1360 - rev="$$subdir $$rev"; \
1364 - target=`echo $@ | sed s/-recursive//`; \
1365 - for subdir in $$rev; do \
1366 - echo "Making $$target in $$subdir"; \
1367 - if test "$$subdir" = "."; then \
1368 - local_target="$$target-am"; \
1370 - local_target="$$target"; \
1372 - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1373 - || eval $$failcom; \
1374 - done && test -z "$$fail"
1376 - list='$(SUBDIRS)'; for subdir in $$list; do \
1377 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1380 - list='$(SUBDIRS)'; for subdir in $$list; do \
1381 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1384 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1385 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1386 - unique=`for i in $$list; do \
1387 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1389 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1390 - END { if (nonempty) { for (i in files) print i; }; }'`; \
1391 - mkid -fID $$unique
1393 +ID: $(am__tagged_files)
1394 + $(am__define_uniq_tagged_files); mkid -fID $$unique
1395 +tags: tags-recursive
1398 -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1399 - $(TAGS_FILES) $(LISP)
1400 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
1403 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
1404 @@ -423,12 +442,7 @@
1405 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
1408 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1409 - unique=`for i in $$list; do \
1410 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1412 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1413 - END { if (nonempty) { for (i in files) print i; }; }'`; \
1414 + $(am__define_uniq_tagged_files); \
1416 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
1417 test -n "$$unique" || unique=$$empty_fix; \
1418 @@ -440,15 +454,11 @@
1423 -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1424 - $(TAGS_FILES) $(LISP)
1425 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1426 - unique=`for i in $$list; do \
1427 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1429 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1430 - END { if (nonempty) { for (i in files) print i; }; }'`; \
1431 +ctags: ctags-recursive
1434 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
1435 + $(am__define_uniq_tagged_files); \
1436 test -z "$(CTAGS_ARGS)$$unique" \
1437 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1439 @@ -457,6 +467,21 @@
1440 here=`$(am__cd) $(top_builddir) && pwd` \
1441 && $(am__cd) $(top_srcdir) \
1442 && gtags -i $(GTAGS_ARGS) "$$here"
1443 +cscopelist: cscopelist-recursive
1445 +cscopelist-am: $(am__tagged_files)
1446 + list='$(am__tagged_files)'; \
1447 + case "$(srcdir)" in \
1448 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
1449 + *) sdir=$(subdir)/$(srcdir) ;; \
1451 + for i in $$list; do \
1452 + if test -f "$$i"; then \
1453 + echo "$(subdir)/$$i"; \
1455 + echo "$$sdir/$$i"; \
1457 + done >> $(top_builddir)/cscope.files
1460 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1461 @@ -618,22 +643,20 @@
1465 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
1466 - install-am install-strip tags-recursive
1467 +.MAKE: $(am__recursive_targets) install-am install-strip
1469 -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1470 - all all-am check check-am clean clean-generic clean-libtool \
1471 - ctags ctags-recursive distclean distclean-generic \
1472 - distclean-libtool distclean-tags distdir dvi dvi-am html \
1473 - html-am info info-am install install-am install-data \
1474 - install-data-am install-dvi install-dvi-am install-exec \
1475 - install-exec-am install-html install-html-am install-info \
1476 - install-info-am install-man install-pdf install-pdf-am \
1477 - install-ps install-ps-am install-strip installcheck \
1478 - installcheck-am installdirs installdirs-am maintainer-clean \
1479 - maintainer-clean-generic mostlyclean mostlyclean-generic \
1480 - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
1481 - uninstall uninstall-am
1482 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
1483 + check-am clean clean-generic clean-libtool cscopelist-am ctags \
1484 + ctags-am distclean distclean-generic distclean-libtool \
1485 + distclean-tags distdir dvi dvi-am html html-am info info-am \
1486 + install install-am install-data install-data-am install-dvi \
1487 + install-dvi-am install-exec install-exec-am install-html \
1488 + install-html-am install-info install-info-am install-man \
1489 + install-pdf install-pdf-am install-ps install-ps-am \
1490 + install-strip installcheck installcheck-am installdirs \
1491 + installdirs-am maintainer-clean maintainer-clean-generic \
1492 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
1493 + ps ps-am tags tags-am uninstall uninstall-am
1496 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1497 diff -Nuar b/openvpn-2.3.3/build/msvc/Makefile.in a/openvpn-2.3.4/build/msvc/Makefile.in
1498 --- b/openvpn-2.3.3/build/msvc/Makefile.in 2014-04-09 09:51:26.000000000 +0200
1499 +++ a/openvpn-2.3.4/build/msvc/Makefile.in 2014-05-02 09:16:39.000000000 +0200
1501 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
1502 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
1505 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1506 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
1508 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
1510 # This Makefile.in is free software; the Free Software Foundation
1511 # gives unlimited permission to copy and/or distribute it,
1512 # with or without modifications, as long as this notice is preserved.
1514 # Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
1517 -am__make_dryrun = \
1520 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
1521 +am__make_running_with_option = \
1522 + case $${target_option-} in \
1524 + *) echo "am__make_running_with_option: internal error: invalid" \
1525 + "target option '$${target_option-}' specified" >&2; \
1529 + sane_makeflags=$$MAKEFLAGS; \
1530 + if $(am__is_gnu_make); then \
1531 + sane_makeflags=$$MFLAGS; \
1533 case $$MAKEFLAGS in \
1535 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
1536 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
1538 - for am__flg in $$MAKEFLAGS; do \
1539 - case $$am__flg in \
1541 - *n*) am__dry=yes; break;; \
1545 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
1546 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
1550 + strip_trailopt () \
1552 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
1554 + for flg in $$sane_makeflags; do \
1555 + test $$skip_next = yes && { skip_next=no; continue; }; \
1557 + *=*|--*) continue;; \
1558 + -*I) strip_trailopt 'I'; skip_next=yes;; \
1559 + -*I?*) strip_trailopt 'I';; \
1560 + -*O) strip_trailopt 'O'; skip_next=yes;; \
1561 + -*O?*) strip_trailopt 'O';; \
1562 + -*l) strip_trailopt 'l'; skip_next=yes;; \
1563 + -*l?*) strip_trailopt 'l';; \
1564 + -[dEDm]) skip_next=yes;; \
1565 + -[JT]) skip_next=yes;; \
1568 + *$$target_option*) has_opt=yes; break;; \
1570 - test $$am__dry = yes; \
1573 + test $$has_opt = yes
1574 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
1575 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
1576 pkgdatadir = $(datadir)/@PACKAGE@
1577 pkgincludedir = $(includedir)/@PACKAGE@
1578 pkglibdir = $(libdir)/@PACKAGE@
1580 build_triplet = @build@
1581 host_triplet = @host@
1583 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
1584 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
1585 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1586 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
1587 $(top_srcdir)/m4/ax_socklen_t.m4 \
1588 @@ -77,15 +104,28 @@
1589 CONFIG_HEADER = $(top_builddir)/config.h
1590 CONFIG_CLEAN_FILES =
1591 CONFIG_CLEAN_VPATH_FILES =
1592 +AM_V_P = $(am__v_P_@AM_V@)
1593 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
1596 +AM_V_GEN = $(am__v_GEN_@AM_V@)
1597 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
1598 +am__v_GEN_0 = @echo " GEN " $@;
1600 +AM_V_at = $(am__v_at_@AM_V@)
1601 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
1606 -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
1607 - html-recursive info-recursive install-data-recursive \
1608 - install-dvi-recursive install-exec-recursive \
1609 - install-html-recursive install-info-recursive \
1610 - install-pdf-recursive install-ps-recursive install-recursive \
1611 - installcheck-recursive installdirs-recursive pdf-recursive \
1612 - ps-recursive uninstall-recursive
1613 +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
1614 + ctags-recursive dvi-recursive html-recursive info-recursive \
1615 + install-data-recursive install-dvi-recursive \
1616 + install-exec-recursive install-html-recursive \
1617 + install-info-recursive install-pdf-recursive \
1618 + install-ps-recursive install-recursive installcheck-recursive \
1619 + installdirs-recursive pdf-recursive ps-recursive \
1620 + tags-recursive uninstall-recursive
1621 am__can_run_installinfo = \
1622 case $$AM_UPDATE_INFO_DIR in \
1626 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
1627 distclean-recursive maintainer-clean-recursive
1628 -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
1629 - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
1630 +am__recursive_targets = \
1631 + $(RECURSIVE_TARGETS) \
1632 + $(RECURSIVE_CLEAN_TARGETS) \
1633 + $(am__extra_recursive_targets)
1634 +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
1636 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
1637 +# Read a list of newline-separated strings from the standard input,
1638 +# and print each of them once, without duplicates. Input order is
1640 +am__uniquify_input = $(AWK) '\
1641 + BEGIN { nonempty = 0; } \
1642 + { items[$$0] = 1; nonempty = 1; } \
1643 + END { if (nonempty) { for (i in items) print i; }; } \
1645 +# Make sure the list of sources is unique. This is necessary because,
1646 +# e.g., the same source file might be shared among _SOURCES variables
1647 +# for different programs/libraries.
1648 +am__define_uniq_tagged_files = \
1649 + list='$(am__tagged_files)'; \
1650 + unique=`for i in $$list; do \
1651 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1652 + done | $(am__uniquify_input)`
1655 DIST_SUBDIRS = $(SUBDIRS)
1660 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
1663 AUTOCONF = @AUTOCONF@
1664 @@ -325,22 +386,25 @@
1667 # This directory's subdirectories are mostly independent; you can cd
1668 -# into them and run `make' without going through this Makefile.
1669 -# To change the values of `make' variables: instead of editing Makefiles,
1670 -# (1) if the variable is set in `config.status', edit `config.status'
1671 -# (which will cause the Makefiles to be regenerated when you run `make');
1672 -# (2) otherwise, pass the desired values on the `make' command line.
1673 -$(RECURSIVE_TARGETS):
1674 - @fail= failcom='exit 1'; \
1675 - for f in x $$MAKEFLAGS; do \
1677 - *=* | --[!k]*);; \
1678 - *k*) failcom='fail=yes';; \
1681 +# into them and run 'make' without going through this Makefile.
1682 +# To change the values of 'make' variables: instead of editing Makefiles,
1683 +# (1) if the variable is set in 'config.status', edit 'config.status'
1684 +# (which will cause the Makefiles to be regenerated when you run 'make');
1685 +# (2) otherwise, pass the desired values on the 'make' command line.
1686 +$(am__recursive_targets):
1688 + if $(am__make_keepgoing); then \
1689 + failcom='fail=yes'; \
1691 + failcom='exit 1'; \
1694 target=`echo $@ | sed s/-recursive//`; \
1695 - list='$(SUBDIRS)'; for subdir in $$list; do \
1697 + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
1698 + *) list='$(SUBDIRS)' ;; \
1700 + for subdir in $$list; do \
1701 echo "Making $$target in $$subdir"; \
1702 if test "$$subdir" = "."; then \
1704 @@ -355,57 +419,12 @@
1705 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
1706 fi; test -z "$$fail"
1708 -$(RECURSIVE_CLEAN_TARGETS):
1709 - @fail= failcom='exit 1'; \
1710 - for f in x $$MAKEFLAGS; do \
1712 - *=* | --[!k]*);; \
1713 - *k*) failcom='fail=yes';; \
1718 - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
1719 - *) list='$(SUBDIRS)' ;; \
1721 - rev=''; for subdir in $$list; do \
1722 - if test "$$subdir" = "."; then :; else \
1723 - rev="$$subdir $$rev"; \
1727 - target=`echo $@ | sed s/-recursive//`; \
1728 - for subdir in $$rev; do \
1729 - echo "Making $$target in $$subdir"; \
1730 - if test "$$subdir" = "."; then \
1731 - local_target="$$target-am"; \
1733 - local_target="$$target"; \
1735 - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1736 - || eval $$failcom; \
1737 - done && test -z "$$fail"
1739 - list='$(SUBDIRS)'; for subdir in $$list; do \
1740 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1743 - list='$(SUBDIRS)'; for subdir in $$list; do \
1744 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1747 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1748 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1749 - unique=`for i in $$list; do \
1750 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1752 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1753 - END { if (nonempty) { for (i in files) print i; }; }'`; \
1754 - mkid -fID $$unique
1756 +ID: $(am__tagged_files)
1757 + $(am__define_uniq_tagged_files); mkid -fID $$unique
1758 +tags: tags-recursive
1761 -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1762 - $(TAGS_FILES) $(LISP)
1763 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
1766 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
1767 @@ -421,12 +440,7 @@
1768 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
1771 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1772 - unique=`for i in $$list; do \
1773 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1775 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1776 - END { if (nonempty) { for (i in files) print i; }; }'`; \
1777 + $(am__define_uniq_tagged_files); \
1779 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
1780 test -n "$$unique" || unique=$$empty_fix; \
1781 @@ -438,15 +452,11 @@
1786 -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
1787 - $(TAGS_FILES) $(LISP)
1788 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1789 - unique=`for i in $$list; do \
1790 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1792 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1793 - END { if (nonempty) { for (i in files) print i; }; }'`; \
1794 +ctags: ctags-recursive
1797 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
1798 + $(am__define_uniq_tagged_files); \
1799 test -z "$(CTAGS_ARGS)$$unique" \
1800 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1802 @@ -455,6 +465,21 @@
1803 here=`$(am__cd) $(top_builddir) && pwd` \
1804 && $(am__cd) $(top_srcdir) \
1805 && gtags -i $(GTAGS_ARGS) "$$here"
1806 +cscopelist: cscopelist-recursive
1808 +cscopelist-am: $(am__tagged_files)
1809 + list='$(am__tagged_files)'; \
1810 + case "$(srcdir)" in \
1811 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
1812 + *) sdir=$(subdir)/$(srcdir) ;; \
1814 + for i in $$list; do \
1815 + if test -f "$$i"; then \
1816 + echo "$(subdir)/$$i"; \
1818 + echo "$$sdir/$$i"; \
1820 + done >> $(top_builddir)/cscope.files
1823 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1824 @@ -616,22 +641,20 @@
1828 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
1829 - install-am install-strip tags-recursive
1830 +.MAKE: $(am__recursive_targets) install-am install-strip
1832 -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1833 - all all-am check check-am clean clean-generic clean-libtool \
1834 - ctags ctags-recursive distclean distclean-generic \
1835 - distclean-libtool distclean-tags distdir dvi dvi-am html \
1836 - html-am info info-am install install-am install-data \
1837 - install-data-am install-dvi install-dvi-am install-exec \
1838 - install-exec-am install-html install-html-am install-info \
1839 - install-info-am install-man install-pdf install-pdf-am \
1840 - install-ps install-ps-am install-strip installcheck \
1841 - installcheck-am installdirs installdirs-am maintainer-clean \
1842 - maintainer-clean-generic mostlyclean mostlyclean-generic \
1843 - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
1844 - uninstall uninstall-am
1845 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
1846 + check-am clean clean-generic clean-libtool cscopelist-am ctags \
1847 + ctags-am distclean distclean-generic distclean-libtool \
1848 + distclean-tags distdir dvi dvi-am html html-am info info-am \
1849 + install install-am install-data install-data-am install-dvi \
1850 + install-dvi-am install-exec install-exec-am install-html \
1851 + install-html-am install-info install-info-am install-man \
1852 + install-pdf install-pdf-am install-ps install-ps-am \
1853 + install-strip installcheck installcheck-am installdirs \
1854 + installdirs-am maintainer-clean maintainer-clean-generic \
1855 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
1856 + ps ps-am tags tags-am uninstall uninstall-am
1859 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1860 diff -Nuar b/openvpn-2.3.3/build/msvc/msvc-generate/Makefile.in a/openvpn-2.3.4/build/msvc/msvc-generate/Makefile.in
1861 --- b/openvpn-2.3.3/build/msvc/msvc-generate/Makefile.in 2014-04-09 09:51:26.000000000 +0200
1862 +++ a/openvpn-2.3.4/build/msvc/msvc-generate/Makefile.in 2014-05-02 09:16:39.000000000 +0200
1864 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
1865 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
1868 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1869 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
1871 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
1873 # This Makefile.in is free software; the Free Software Foundation
1874 # gives unlimited permission to copy and/or distribute it,
1875 # with or without modifications, as long as this notice is preserved.
1880 -am__make_dryrun = \
1883 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
1884 +am__make_running_with_option = \
1885 + case $${target_option-} in \
1887 + *) echo "am__make_running_with_option: internal error: invalid" \
1888 + "target option '$${target_option-}' specified" >&2; \
1892 + sane_makeflags=$$MAKEFLAGS; \
1893 + if $(am__is_gnu_make); then \
1894 + sane_makeflags=$$MFLAGS; \
1896 case $$MAKEFLAGS in \
1898 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
1899 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
1901 - for am__flg in $$MAKEFLAGS; do \
1902 - case $$am__flg in \
1904 - *n*) am__dry=yes; break;; \
1908 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
1909 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
1913 + strip_trailopt () \
1915 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
1917 + for flg in $$sane_makeflags; do \
1918 + test $$skip_next = yes && { skip_next=no; continue; }; \
1920 + *=*|--*) continue;; \
1921 + -*I) strip_trailopt 'I'; skip_next=yes;; \
1922 + -*I?*) strip_trailopt 'I';; \
1923 + -*O) strip_trailopt 'O'; skip_next=yes;; \
1924 + -*O?*) strip_trailopt 'O';; \
1925 + -*l) strip_trailopt 'l'; skip_next=yes;; \
1926 + -*l?*) strip_trailopt 'l';; \
1927 + -[dEDm]) skip_next=yes;; \
1928 + -[JT]) skip_next=yes;; \
1930 - test $$am__dry = yes; \
1933 + *$$target_option*) has_opt=yes; break;; \
1936 + test $$has_opt = yes
1937 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
1938 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
1939 pkgdatadir = $(datadir)/@PACKAGE@
1940 pkgincludedir = $(includedir)/@PACKAGE@
1941 pkglibdir = $(libdir)/@PACKAGE@
1943 build_triplet = @build@
1944 host_triplet = @host@
1945 subdir = build/msvc/msvc-generate
1946 -DIST_COMMON = $(dist_noinst_DATA) $(srcdir)/Makefile.am \
1947 - $(srcdir)/Makefile.in
1948 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
1949 + $(dist_noinst_DATA)
1950 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1951 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
1952 $(top_srcdir)/m4/ax_socklen_t.m4 \
1954 CONFIG_HEADER = $(top_builddir)/config.h
1955 CONFIG_CLEAN_FILES =
1956 CONFIG_CLEAN_VPATH_FILES =
1957 +AM_V_P = $(am__v_P_@AM_V@)
1958 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
1961 +AM_V_GEN = $(am__v_GEN_@AM_V@)
1962 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
1963 +am__v_GEN_0 = @echo " GEN " $@;
1965 +AM_V_at = $(am__v_at_@AM_V@)
1966 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
1971 am__can_run_installinfo = \
1973 *) (install-info --version) >/dev/null 2>&1;; \
1975 DATA = $(dist_noinst_DATA)
1976 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
1977 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1980 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
1983 AUTOCONF = @AUTOCONF@
1984 @@ -290,11 +331,11 @@
1999 distdir: $(DISTFILES)
2000 @@ -431,15 +472,16 @@
2001 .MAKE: install-am install-strip
2003 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
2004 - distclean distclean-generic distclean-libtool distdir dvi \
2005 - dvi-am html html-am info info-am install install-am \
2006 - install-data install-data-am install-dvi install-dvi-am \
2007 - install-exec install-exec-am install-html install-html-am \
2008 - install-info install-info-am install-man install-pdf \
2009 - install-pdf-am install-ps install-ps-am install-strip \
2010 - installcheck installcheck-am installdirs maintainer-clean \
2011 - maintainer-clean-generic mostlyclean mostlyclean-generic \
2012 - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
2013 + cscopelist-am ctags-am distclean distclean-generic \
2014 + distclean-libtool distdir dvi dvi-am html html-am info info-am \
2015 + install install-am install-data install-data-am install-dvi \
2016 + install-dvi-am install-exec install-exec-am install-html \
2017 + install-html-am install-info install-info-am install-man \
2018 + install-pdf install-pdf-am install-ps install-ps-am \
2019 + install-strip installcheck installcheck-am installdirs \
2020 + maintainer-clean maintainer-clean-generic mostlyclean \
2021 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
2022 + tags-am uninstall uninstall-am
2025 # Tell versions [3.59,3.63) of GNU make to not export all variables.
2026 diff -Nuar b/openvpn-2.3.3/ChangeLog a/openvpn-2.3.4/ChangeLog
2027 --- b/openvpn-2.3.3/ChangeLog 2014-04-09 09:47:37.000000000 +0200
2028 +++ a/openvpn-2.3.4/ChangeLog 2014-05-01 13:12:22.000000000 +0200
2031 Copyright (C) 2002-2012 OpenVPN Technologies, Inc. <sales@openvpn.net>
2033 +2014.04.30 -- Version 2.3.4
2035 + Fix man page and OSCP script: tls_serial_{n} is decimal
2037 +Dmitrij Tejblum (1):
2038 + Fix is_ipv6 in case of tap interface.
2041 + IPv6 address/route delete fix for Win8
2042 + Add SSL library version reporting.
2043 + Minor t_client.sh cleanups
2044 + Repair --multihome on FreeBSD for IPv4 sockets.
2045 + Rewrite manpage section about --multihome
2046 + More IPv6-related updates to the openvpn man page.
2047 + Conditionalize calls to print_default_gateway on !ENABLE_SMALL
2050 + Use native strtoull() with MSVC 2013.
2051 + When tls-version-min is unspecified, revert to original versioning approach.
2053 +Steffan Karger (4):
2054 + Change signedness of hash in x509_get_sha1_hash(), fixes compiler warning.
2055 + Fix OCSP_check.sh to also use decimal for stdout verification.
2056 + Fix build system to accept non-system crypto library locations for plugins.
2057 + Make serial env exporting consistent amongst OpenSSL and PolarSSL builds.
2060 + Fix SOCKSv5 method selection
2063 + Fix typo in sample build script to use LDFLAGS
2066 2014.04.08 -- Version 2.3.3
2068 pkcs11: use generic evp key instead of rsa
2069 diff -Nuar b/openvpn-2.3.3/compile a/openvpn-2.3.4/compile
2070 --- b/openvpn-2.3.3/compile 1970-01-01 01:00:00.000000000 +0100
2071 +++ a/openvpn-2.3.4/compile 2014-05-01 12:35:46.000000000 +0200
2074 +# Wrapper for compilers which do not understand '-c -o'.
2076 +scriptversion=2012-10-14.11; # UTC
2078 +# Copyright (C) 1999-2013 Free Software Foundation, Inc.
2079 +# Written by Tom Tromey <tromey@cygnus.com>.
2081 +# This program is free software; you can redistribute it and/or modify
2082 +# it under the terms of the GNU General Public License as published by
2083 +# the Free Software Foundation; either version 2, or (at your option)
2084 +# any later version.
2086 +# This program is distributed in the hope that it will be useful,
2087 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
2088 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2089 +# GNU General Public License for more details.
2091 +# You should have received a copy of the GNU General Public License
2092 +# along with this program. If not, see <http://www.gnu.org/licenses/>.
2094 +# As a special exception to the GNU General Public License, if you
2095 +# distribute this file as part of a program that contains a
2096 +# configuration script generated by Autoconf, you may include it under
2097 +# the same distribution terms that you use for the rest of that program.
2099 +# This file is maintained in Automake, please report
2100 +# bugs to <bug-automake@gnu.org> or send patches to
2101 +# <automake-patches@gnu.org>.
2106 +# We need space, tab and new line, in precisely that order. Quoting is
2107 +# there to prevent tools from complaining about whitespace usage.
2112 +# func_file_conv build_file lazy
2113 +# Convert a $build file to $host form and store it in $file
2114 +# Currently only supports Windows hosts. If the determined conversion
2115 +# type is listed in (the comma separated) LAZY, no conversion will
2121 + / | /[!/]*) # absolute file, and not a UNC file
2122 + if test -z "$file_conv"; then
2123 + # lazily determine how to convert abs files
2124 + case `uname -s` in
2136 + case $file_conv/,$2, in
2140 + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
2143 + file=`cygpath -m "$file" || echo "$file"`
2146 + file=`winepath -w "$file" || echo "$file"`
2153 +# func_cl_dashL linkdir
2154 +# Make cl look for libraries in LINKDIR
2157 + func_file_conv "$1"
2158 + if test -z "$lib_path"; then
2161 + lib_path="$lib_path;$file"
2163 + linker_opts="$linker_opts -LIBPATH:$file"
2166 +# func_cl_dashl library
2167 +# Do a library search-path lookup for cl
2174 + for dir in $lib_path $LIB
2177 + if $shared && test -f "$dir/$lib.dll.lib"; then
2179 + lib=$dir/$lib.dll.lib
2182 + if test -f "$dir/$lib.lib"; then
2187 + if test -f "$dir/lib$lib.a"; then
2189 + lib=$dir/lib$lib.a
2195 + if test "$found" != yes; then
2200 +# func_cl_wrapper cl arg...
2201 +# Adjust compile command to suit cl
2204 + # Assume a capable shell
2210 + if test -n "$eat"; then
2215 + # configure might choose to run compile as 'compile cc -o foo foo.c'.
2218 + *.o | *.[oO][bB][jJ])
2219 + func_file_conv "$2"
2220 + set x "$@" -Fo"$file"
2224 + func_file_conv "$2"
2225 + set x "$@" -Fe"$file"
2232 + func_file_conv "$2" mingw
2233 + set x "$@" -I"$file"
2237 + func_file_conv "${1#-I}" mingw
2238 + set x "$@" -I"$file"
2243 + func_cl_dashl "$2"
2248 + func_cl_dashl "${1#-l}"
2254 + func_cl_dashL "$2"
2257 + func_cl_dashL "${1#-L}"
2264 + save_ifs="$IFS"; IFS=','
2265 + for flag in $arg; do
2267 + linker_opts="$linker_opts $flag"
2273 + linker_opts="$linker_opts $2"
2279 + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
2280 + func_file_conv "$1"
2281 + set x "$@" -Tp"$file"
2284 + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
2285 + func_file_conv "$1" mingw
2286 + set x "$@" "$file"
2297 + if test -n "$linker_opts"; then
2298 + linker_opts="-link$linker_opts"
2300 + exec "$@" $linker_opts
2308 + echo "$0: No command. Try '$0 --help' for more information." 1>&2
2313 +Usage: compile [--help] [--version] PROGRAM [ARGS]
2315 +Wrapper for compilers which do not understand '-c -o'.
2316 +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
2317 +arguments, and rename the output as expected.
2319 +If you are trying to build a whole package this is not the
2320 +right script to run: please start by reading the file 'INSTALL'.
2322 +Report bugs to <bug-automake@gnu.org>.
2327 + echo "compile $scriptversion"
2330 + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
2331 + func_cl_wrapper "$@" # Doesn't return...
2340 + if test -n "$eat"; then
2345 + # configure might choose to run compile as 'compile cc -o foo foo.c'.
2346 + # So we strip '-o arg' only if arg is an object.
2353 + set x "$@" -o "$2"
2372 +if test -z "$ofile" || test -z "$cfile"; then
2373 + # If no '-o' option was seen then we might have been invoked from a
2374 + # pattern rule where we don't need one. That is ok -- this is a
2375 + # normal compilation that the losing compiler can handle. If no
2376 + # '.c' file was seen then we are probably linking. That is also
2381 +# Name of file we expect compiler to create.
2382 +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
2384 +# Create the lock directory.
2385 +# Note: use '[/\\:.-]' here to ensure that we don't use the same name
2386 +# that we are using for the .o file. Also, base the name on the expected
2387 +# object file name, since that is what matters with a parallel build.
2388 +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
2390 + if mkdir "$lockdir" >/dev/null 2>&1; then
2395 +# FIXME: race condition here if user kills between mkdir and trap.
2396 +trap "rmdir '$lockdir'; exit 1" 1 2 15
2402 +if test -f "$cofile"; then
2403 + test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
2404 +elif test -f "${cofile}bj"; then
2405 + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
2412 +# mode: shell-script
2413 +# sh-indentation: 2
2414 +# eval: (add-hook 'write-file-hooks 'time-stamp)
2415 +# time-stamp-start: "scriptversion="
2416 +# time-stamp-format: "%:y-%02m-%02d.%02H"
2417 +# time-stamp-time-zone: "UTC"
2418 +# time-stamp-end: "; # UTC"
2420 diff -Nuar b/openvpn-2.3.3/config.guess a/openvpn-2.3.4/config.guess
2421 --- b/openvpn-2.3.3/config.guess 2014-04-09 09:43:40.000000000 +0200
2422 +++ a/openvpn-2.3.4/config.guess 2014-05-01 12:35:46.000000000 +0200
2425 # Attempt to guess a canonical system name.
2426 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2427 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
2428 -# 2011, 2012 Free Software Foundation, Inc.
2429 +# Copyright 1992-2013 Free Software Foundation, Inc.
2431 -timestamp='2012-02-10'
2432 +timestamp='2013-06-10'
2434 # This file is free software; you can redistribute it and/or modify it
2435 # under the terms of the GNU General Public License as published by
2436 -# the Free Software Foundation; either version 2 of the License, or
2437 +# the Free Software Foundation; either version 3 of the License, or
2438 # (at your option) any later version.
2440 # This program is distributed in the hope that it will be useful, but
2442 # As a special exception to the GNU General Public License, if you
2443 # distribute this file as part of a program that contains a
2444 # configuration script generated by Autoconf, you may include it under
2445 -# the same distribution terms that you use for the rest of that program.
2448 -# Originally written by Per Bothner. Please send patches (context
2449 -# diff format) to <config-patches@gnu.org> and include a ChangeLog
2451 +# the same distribution terms that you use for the rest of that
2452 +# program. This Exception is an additional permission under section 7
2453 +# of the GNU General Public License, version 3 ("GPLv3").
2455 -# This script attempts to guess a canonical system name similar to
2456 -# config.sub. If it succeeds, it prints the system name on stdout, and
2457 -# exits with 0. Otherwise, it exits with 1.
2458 +# Originally written by Per Bothner.
2460 # You can get the latest version of this script from:
2461 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
2463 +# Please send patches with a ChangeLog entry to config-patches@gnu.org.
2466 me=`echo "$0" | sed -e 's,.*/,,'`
2469 GNU config.guess ($timestamp)
2471 Originally written by Per Bothner.
2472 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2473 -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
2474 -Free Software Foundation, Inc.
2475 +Copyright 1992-2013 Free Software Foundation, Inc.
2477 This is free software; see the source for copying conditions. There is NO
2478 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
2479 @@ -138,6 +132,27 @@
2480 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
2481 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
2483 +case "${UNAME_SYSTEM}" in
2485 + # If the system lacks a compiler, then just pick glibc.
2486 + # We could probably try harder.
2489 + eval $set_cc_for_build
2490 + cat <<-EOF > $dummy.c
2491 + #include <features.h>
2492 + #if defined(__UCLIBC__)
2494 + #elif defined(__dietlibc__)
2500 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
2504 # Note: order is significant - the case branches are not exclusive.
2506 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
2507 @@ -200,6 +215,10 @@
2508 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
2509 echo "${machine}-${os}${release}"
2512 + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
2513 + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
2516 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
2517 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
2519 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
2520 echo arm-acorn-riscix${UNAME_RELEASE}
2522 - arm:riscos:*:*|arm:RISCOS:*:*)
2523 + arm*:riscos:*:*|arm*:RISCOS:*:*)
2524 echo arm-unknown-riscos
2526 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
2529 echo ${UNAME_MACHINE}-pc-cygwin
2532 + echo ${UNAME_MACHINE}-pc-mingw64
2535 echo ${UNAME_MACHINE}-pc-mingw32
2537 @@ -852,21 +874,21 @@
2541 - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
2542 + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
2545 # other systems with GNU libc and userland
2546 - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
2547 + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
2550 echo ${UNAME_MACHINE}-pc-minix
2553 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2554 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2556 aarch64_be:Linux:*:*)
2557 UNAME_MACHINE=aarch64_be
2558 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2559 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2562 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
2563 @@ -879,59 +901,54 @@
2564 EV68*) UNAME_MACHINE=alphaev68 ;;
2566 objdump --private-headers /bin/sh | grep -q ld.so.1
2567 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
2568 - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
2569 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
2570 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2572 + arc:Linux:*:* | arceb:Linux:*:*)
2573 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2576 eval $set_cc_for_build
2577 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
2578 | grep -q __ARM_EABI__
2580 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2581 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2583 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
2584 | grep -q __ARM_PCS_VFP
2586 - echo ${UNAME_MACHINE}-unknown-linux-gnueabi
2587 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
2589 - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
2590 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
2595 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2596 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2599 - echo ${UNAME_MACHINE}-axis-linux-gnu
2600 + echo ${UNAME_MACHINE}-axis-linux-${LIBC}
2603 - echo ${UNAME_MACHINE}-axis-linux-gnu
2604 + echo ${UNAME_MACHINE}-axis-linux-${LIBC}
2607 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2608 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2611 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2612 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2616 - eval $set_cc_for_build
2617 - sed 's/^ //' << EOF >$dummy.c
2618 - #ifdef __dietlibc__
2622 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
2623 - echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
2624 + echo ${UNAME_MACHINE}-pc-linux-${LIBC}
2627 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2628 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2631 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2632 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2635 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2636 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2638 mips:Linux:*:* | mips64:Linux:*:*)
2639 eval $set_cc_for_build
2640 @@ -950,54 +967,63 @@
2643 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
2644 - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
2645 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
2648 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2651 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2652 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2655 - echo sparc-unknown-linux-gnu
2656 + echo sparc-unknown-linux-${LIBC}
2658 parisc64:Linux:*:* | hppa64:Linux:*:*)
2659 - echo hppa64-unknown-linux-gnu
2660 + echo hppa64-unknown-linux-${LIBC}
2662 parisc:Linux:*:* | hppa:Linux:*:*)
2663 # Look for CPU level
2664 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
2665 - PA7*) echo hppa1.1-unknown-linux-gnu ;;
2666 - PA8*) echo hppa2.0-unknown-linux-gnu ;;
2667 - *) echo hppa-unknown-linux-gnu ;;
2668 + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
2669 + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
2670 + *) echo hppa-unknown-linux-${LIBC} ;;
2674 - echo powerpc64-unknown-linux-gnu
2675 + echo powerpc64-unknown-linux-${LIBC}
2678 - echo powerpc-unknown-linux-gnu
2679 + echo powerpc-unknown-linux-${LIBC}
2681 + ppc64le:Linux:*:*)
2682 + echo powerpc64le-unknown-linux-${LIBC}
2685 + echo powerpcle-unknown-linux-${LIBC}
2687 s390:Linux:*:* | s390x:Linux:*:*)
2688 - echo ${UNAME_MACHINE}-ibm-linux
2689 + echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
2692 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2693 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2696 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2697 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2699 sparc:Linux:*:* | sparc64:Linux:*:*)
2700 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2701 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2704 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2705 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2708 - echo ${UNAME_MACHINE}-dec-linux-gnu
2709 + echo ${UNAME_MACHINE}-dec-linux-${LIBC}
2712 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2713 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2716 - echo ${UNAME_MACHINE}-unknown-linux-gnu
2717 + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
2719 i*86:DYNIX/ptx:4*:*)
2720 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
2721 @@ -1201,6 +1227,9 @@
2722 BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
2726 + echo x86_64-unknown-haiku
2729 echo sx4-nec-superux${UNAME_RELEASE}
2731 @@ -1227,19 +1256,21 @@
2734 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
2735 - case $UNAME_PROCESSOR in
2737 - eval $set_cc_for_build
2738 - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
2739 - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
2740 - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
2741 - grep IS_64BIT_ARCH >/dev/null
2743 - UNAME_PROCESSOR="x86_64"
2746 - unknown) UNAME_PROCESSOR=powerpc ;;
2748 + eval $set_cc_for_build
2749 + if test "$UNAME_PROCESSOR" = unknown ; then
2750 + UNAME_PROCESSOR=powerpc
2752 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
2753 + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
2754 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
2755 + grep IS_64BIT_ARCH >/dev/null
2757 + case $UNAME_PROCESSOR in
2758 + i386) UNAME_PROCESSOR=x86_64 ;;
2759 + powerpc) UNAME_PROCESSOR=powerpc64 ;;
2763 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
2765 *:procnto*:*:* | *:QNX:[0123456789]*:*)
2766 @@ -1256,7 +1287,7 @@
2767 NEO-?:NONSTOP_KERNEL:*:*)
2768 echo neo-tandem-nsk${UNAME_RELEASE}
2770 - NSE-?:NONSTOP_KERNEL:*:*)
2771 + NSE-*:NONSTOP_KERNEL:*:*)
2772 echo nse-tandem-nsk${UNAME_RELEASE}
2774 NSR-?:NONSTOP_KERNEL:*:*)
2775 @@ -1330,9 +1361,6 @@
2779 -#echo '(No uname command or uname output not recognized.)' 1>&2
2780 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
2782 eval $set_cc_for_build
2785 diff -Nuar b/openvpn-2.3.3/config-msvc.h a/openvpn-2.3.4/config-msvc.h
2786 --- b/openvpn-2.3.3/config-msvc.h 2014-04-09 09:42:15.000000000 +0200
2787 +++ a/openvpn-2.3.4/config-msvc.h 2014-05-01 12:35:20.000000000 +0200
2789 #define strncasecmp strnicmp
2790 #define strcasecmp _stricmp
2791 #define snprintf _snprintf
2793 +#if _MSC_VER < 1800
2794 #define strtoull strtoul
2797 #define in_addr_t uint32_t
2798 #define ssize_t SSIZE_T
2799 diff -Nuar b/openvpn-2.3.3/config.sub a/openvpn-2.3.4/config.sub
2800 --- b/openvpn-2.3.3/config.sub 2014-04-09 09:43:40.000000000 +0200
2801 +++ a/openvpn-2.3.4/config.sub 2014-05-01 12:35:46.000000000 +0200
2804 # Configuration validation subroutine script.
2805 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2806 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
2807 -# 2011, 2012 Free Software Foundation, Inc.
2809 -timestamp='2012-04-18'
2811 -# This file is (in principle) common to ALL GNU software.
2812 -# The presence of a machine in this file suggests that SOME GNU software
2813 -# can handle that machine. It does not imply ALL GNU software can.
2815 -# This file is free software; you can redistribute it and/or modify
2816 -# it under the terms of the GNU General Public License as published by
2817 -# the Free Software Foundation; either version 2 of the License, or
2818 +# Copyright 1992-2013 Free Software Foundation, Inc.
2820 +timestamp='2013-08-10'
2822 +# This file is free software; you can redistribute it and/or modify it
2823 +# under the terms of the GNU General Public License as published by
2824 +# the Free Software Foundation; either version 3 of the License, or
2825 # (at your option) any later version.
2827 -# This program is distributed in the hope that it will be useful,
2828 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
2829 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2830 -# GNU General Public License for more details.
2831 +# This program is distributed in the hope that it will be useful, but
2832 +# WITHOUT ANY WARRANTY; without even the implied warranty of
2833 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2834 +# General Public License for more details.
2836 # You should have received a copy of the GNU General Public License
2837 # along with this program; if not, see <http://www.gnu.org/licenses/>.
2839 # As a special exception to the GNU General Public License, if you
2840 # distribute this file as part of a program that contains a
2841 # configuration script generated by Autoconf, you may include it under
2842 -# the same distribution terms that you use for the rest of that program.
2843 +# the same distribution terms that you use for the rest of that
2844 +# program. This Exception is an additional permission under section 7
2845 +# of the GNU General Public License, version 3 ("GPLv3").
2848 -# Please send patches to <config-patches@gnu.org>. Submit a context
2849 -# diff and a properly formatted GNU ChangeLog entry.
2850 +# Please send patches with a ChangeLog entry to config-patches@gnu.org.
2852 # Configuration subroutine to validate and canonicalize a configuration type.
2853 # Supply the specified configuration type as an argument.
2856 GNU config.sub ($timestamp)
2858 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2859 -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
2860 -Free Software Foundation, Inc.
2861 +Copyright 1992-2013 Free Software Foundation, Inc.
2863 This is free software; see the source for copying conditions. There is NO
2864 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
2866 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
2868 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
2869 - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
2870 + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
2871 knetbsd*-gnu* | netbsd*-gnu* | \
2872 kopensolaris*-gnu* | \
2873 storm-chaos* | os2-emx* | rtmk-nova*)
2875 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
2876 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
2877 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
2878 - -apple | -axis | -knuth | -cray | -microblaze)
2879 + -apple | -axis | -knuth | -cray | -microblaze*)
2883 @@ -259,10 +252,12 @@
2884 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
2885 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
2887 - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
2890 + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
2895 + | c4x | c8051 | clipper \
2896 | d10v | d30v | dlx | dsp16xx \
2898 | fido | fr30 | frv \
2902 | m32c | m32r | m32rle | m68000 | m68k | m88k \
2903 - | maxq | mb | microblaze | mcore | mep | metag \
2904 + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
2905 | mips | mipsbe | mipseb | mipsel | mipsle \
2907 | mips64 | mips64el \
2908 @@ -291,16 +286,17 @@
2909 | mipsisa64r2 | mipsisa64r2el \
2910 | mipsisa64sb1 | mipsisa64sb1el \
2911 | mipsisa64sr71k | mipsisa64sr71kel \
2912 + | mipsr5900 | mipsr5900el \
2913 | mipstx39 | mipstx39el \
2914 | mn10200 | mn10300 \
2918 | nds32 | nds32le | nds32be \
2920 + | nios | nios2 | nios2eb | nios2el \
2925 | pdp10 | pdp11 | pj | pjl \
2926 | powerpc | powerpc64 | powerpc64le | powerpcle \
2928 @@ -370,13 +366,13 @@
2929 | aarch64-* | aarch64_be-* \
2930 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
2931 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
2932 - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
2933 + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
2934 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
2937 | bfin-* | bs2000-* \
2938 | c[123]* | c30-* | [cjt]90-* | c4x-* \
2939 - | clipper-* | craynv-* | cydra-* \
2940 + | c8051-* | clipper-* | craynv-* | cydra-* \
2941 | d10v-* | d30v-* | dlx-* \
2943 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
2946 | m32c-* | m32r-* | m32rle-* \
2947 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
2948 - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
2949 + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
2950 + | microblaze-* | microblazeel-* \
2951 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
2953 | mips64-* | mips64el-* \
2954 @@ -407,12 +404,13 @@
2955 | mipsisa64r2-* | mipsisa64r2el-* \
2956 | mipsisa64sb1-* | mipsisa64sb1el-* \
2957 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
2958 + | mipsr5900-* | mipsr5900el-* \
2959 | mipstx39-* | mipstx39el-* \
2963 | nds32-* | nds32le-* | nds32be-* \
2964 - | nios-* | nios2-* \
2965 + | nios-* | nios2-* | nios2eb-* | nios2el-* \
2966 | none-* | np1-* | ns16k-* | ns32k-* \
2969 @@ -788,11 +786,15 @@
2970 basic_machine=ns32k-utek
2975 basic_machine=microblaze-xilinx
2978 + basic_machine=x86_64-pc
2982 - basic_machine=i386-pc
2983 + basic_machine=i686-pc
2988 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
2991 - basic_machine=i386-pc
2992 + basic_machine=i686-pc
2996 @@ -1019,7 +1021,11 @@
2997 basic_machine=i586-unknown
3002 + basic_machine=x86_64-pc
3006 basic_machine=i386-pc
3009 @@ -1346,21 +1352,21 @@
3010 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
3011 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
3012 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
3013 - | -sym* | -kopensolaris* \
3014 + | -sym* | -kopensolaris* | -plan9* \
3015 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
3017 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
3018 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
3019 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
3020 - | -openbsd* | -solidbsd* \
3021 + | -bitrig* | -openbsd* | -solidbsd* \
3022 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
3023 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
3024 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
3025 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
3026 | -chorusos* | -chorusrdb* | -cegcc* \
3027 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
3028 - | -mingw32* | -linux-gnu* | -linux-android* \
3029 - | -linux-newlib* | -linux-uclibc* \
3030 + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
3031 + | -linux-newlib* | -linux-musl* | -linux-uclibc* \
3032 | -uxpv* | -beos* | -mpeix* | -udk* \
3033 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
3034 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
3035 @@ -1492,9 +1498,6 @@
3045 @@ -1543,6 +1546,9 @@
3055 @@ -1586,6 +1592,9 @@
3065 diff -Nuar b/openvpn-2.3.3/configure a/openvpn-2.3.4/configure
3066 --- b/openvpn-2.3.3/configure 2014-04-09 09:48:01.000000000 +0200
3067 +++ a/openvpn-2.3.4/configure 2014-05-01 13:13:13.000000000 +0200
3070 # Guess values for system-dependent variables and create Makefiles.
3071 -# Generated by GNU Autoconf 2.69 for OpenVPN 2.3.3.
3072 +# Generated by GNU Autoconf 2.69 for OpenVPN 2.3.4.
3074 # Report bugs to <openvpn-users@lists.sourceforge.net>.
3077 # Identity of this package.
3078 PACKAGE_NAME='OpenVPN'
3079 PACKAGE_TARNAME='openvpn'
3080 -PACKAGE_VERSION='2.3.3'
3081 -PACKAGE_STRING='OpenVPN 2.3.3'
3082 +PACKAGE_VERSION='2.3.4'
3083 +PACKAGE_STRING='OpenVPN 2.3.4'
3084 PACKAGE_BUGREPORT='openvpn-users@lists.sourceforge.net'
3087 @@ -733,6 +733,10 @@
3092 +AM_DEFAULT_VERBOSITY
3101 enable_option_checking
3102 +enable_silent_rules
3103 enable_dependency_tracking
3106 @@ -1410,7 +1415,7 @@
3107 # Omit some internal or obsolete options to make the list less imposing.
3108 # This message is too long to be a string in the A/UX 3.1 sh.
3110 -\`configure' configures OpenVPN 2.3.3 to adapt to many kinds of systems.
3111 +\`configure' configures OpenVPN 2.3.4 to adapt to many kinds of systems.
3113 Usage: $0 [OPTION]... [VAR=VALUE]...
3115 @@ -1480,7 +1485,7 @@
3117 if test -n "$ac_init_help"; then
3118 case $ac_init_help in
3119 - short | recursive ) echo "Configuration of OpenVPN 2.3.3:";;
3120 + short | recursive ) echo "Configuration of OpenVPN 2.3.4:";;
3124 @@ -1488,8 +1493,12 @@
3125 --disable-option-checking ignore unrecognized --enable/--with options
3126 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
3127 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
3128 - --disable-dependency-tracking speeds up one-time build
3129 - --enable-dependency-tracking do not reject slow dependency extractors
3130 + --enable-silent-rules less verbose build output (undo: "make V=1")
3131 + --disable-silent-rules verbose build output (undo: "make V=0")
3132 + --enable-dependency-tracking
3133 + do not reject slow dependency extractors
3134 + --disable-dependency-tracking
3135 + speeds up one-time build
3136 --disable-lzo disable LZO compression support [default=yes]
3137 --enable-lzo-stub don't compile LZO compression support but still
3138 allow limited interoperability with LZO-enabled
3139 @@ -1669,7 +1678,7 @@
3140 test -n "$ac_init_help" && exit $ac_status
3141 if $ac_init_version; then
3143 -OpenVPN configure 2.3.3
3144 +OpenVPN configure 2.3.4
3145 generated by GNU Autoconf 2.69
3147 Copyright (C) 2012 Free Software Foundation, Inc.
3148 @@ -2451,7 +2460,7 @@
3149 This file contains any messages produced by compilers while
3150 running configure, to aid debugging if configure makes a mistake.
3152 -It was created by OpenVPN $as_me 2.3.3, which was
3153 +It was created by OpenVPN $as_me 2.3.4, which was
3154 generated by GNU Autoconf 2.69. Invocation command line was
3157 @@ -2815,7 +2824,7 @@
3161 -$as_echo "#define OPENVPN_VERSION_RESOURCE 2,3,3,0" >>confdefs.h
3162 +$as_echo "#define OPENVPN_VERSION_RESOURCE 2,3,4,0" >>confdefs.h
3166 @@ -2851,7 +2860,7 @@
3170 -am__api_version='1.11'
3171 +am__api_version='1.14'
3173 # Find a good install program. We prefer a C program (faster),
3174 # so one script is as good as another. But avoid the broken or
3175 @@ -2948,9 +2957,6 @@
3177 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
3178 $as_echo_n "checking whether build environment is sane... " >&6; }
3181 -echo timestamp > conftest.file
3182 # Reject unsafe characters in $srcdir or the absolute working directory
3183 # name. Accept space and tab only in the latter.
3185 @@ -2961,32 +2967,40 @@
3188 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
3189 - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
3190 + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
3193 -# Do `set' in a subshell so we don't clobber the current shell's
3194 +# Do 'set' in a subshell so we don't clobber the current shell's
3195 # arguments. Must try -L first in case configure is actually a
3196 # symlink; some systems play weird games with the mod time of symlinks
3197 # (eg FreeBSD returns the mod time of the symlink's containing
3200 - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
3201 - if test "$*" = "X"; then
3203 - set X `ls -t "$srcdir/configure" conftest.file`
3205 - rm -f conftest.file
3206 - if test "$*" != "X $srcdir/configure conftest.file" \
3207 - && test "$*" != "X conftest.file $srcdir/configure"; then
3209 - # If neither matched, then we have a broken ls. This can happen
3210 - # if, for instance, CONFIG_SHELL is bash and it inherits a
3211 - # broken ls alias from the environment. This has actually
3212 - # happened. Such a system could not be considered "sane".
3213 - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
3214 -alias in your environment" "$LINENO" 5
3217 + for am_try in 1 2; do
3218 + echo "timestamp, slept: $am_has_slept" > conftest.file
3219 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
3220 + if test "$*" = "X"; then
3222 + set X `ls -t "$srcdir/configure" conftest.file`
3224 + if test "$*" != "X $srcdir/configure conftest.file" \
3225 + && test "$*" != "X conftest.file $srcdir/configure"; then
3227 + # If neither matched, then we have a broken ls. This can happen
3228 + # if, for instance, CONFIG_SHELL is bash and it inherits a
3229 + # broken ls alias from the environment. This has actually
3230 + # happened. Such a system could not be considered "sane".
3231 + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
3232 + alias in your environment" "$LINENO" 5
3234 + if test "$2" = conftest.file || test $am_try -eq 2; then
3241 test "$2" = conftest.file
3244 @@ -2998,6 +3012,16 @@
3246 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3247 $as_echo "yes" >&6; }
3248 +# If we didn't sleep, we still need to ensure time stamps of config.status and
3249 +# generated files are strictly newer.
3251 +if grep 'slept: no' conftest.file >/dev/null 2>&1; then
3256 +rm -f conftest.file
3258 test "$program_prefix" != NONE &&
3259 program_transform_name="s&^&$program_prefix&;$program_transform_name"
3260 # Use a double $ so make ignores it.
3261 @@ -3020,12 +3044,12 @@
3264 # Use eval to expand $SHELL
3265 -if eval "$MISSING --run true"; then
3266 - am_missing_run="$MISSING --run "
3267 +if eval "$MISSING --is-lightweight"; then
3268 + am_missing_run="$MISSING "
3271 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
3272 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
3273 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
3274 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
3277 if test x"${install_sh}" != xset; then
3278 @@ -3037,10 +3061,10 @@
3282 -# Installed binaries are usually stripped using `strip' when the user
3283 -# run `make install-strip'. However `strip' might not be the right
3284 +# Installed binaries are usually stripped using 'strip' when the user
3285 +# run "make install-strip". However 'strip' might not be the right
3286 # tool to use in cross-compilation environments, therefore Automake
3287 -# will honor the `STRIP' environment variable to overrule this program.
3288 +# will honor the 'STRIP' environment variable to overrule this program.
3289 if test "$cross_compiling" != no; then
3290 if test -n "$ac_tool_prefix"; then
3291 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
3292 @@ -3179,12 +3203,6 @@
3293 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
3294 $as_echo "$MKDIR_P" >&6; }
3298 - [\\/$]* | ?:[\\/]*) ;;
3299 - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3302 for ac_prog in gawk mawk nawk awk
3304 # Extract the first word of "$ac_prog", so it can be a program name with args.
3305 @@ -3267,6 +3285,45 @@
3307 rmdir .tst 2>/dev/null
3309 +# Check whether --enable-silent-rules was given.
3310 +if test "${enable_silent_rules+set}" = set; then :
3311 + enableval=$enable_silent_rules;
3314 +case $enable_silent_rules in # (((
3315 + yes) AM_DEFAULT_VERBOSITY=0;;
3316 + no) AM_DEFAULT_VERBOSITY=1;;
3317 + *) AM_DEFAULT_VERBOSITY=1;;
3319 +am_make=${MAKE-make}
3320 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
3321 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
3322 +if ${am_cv_make_support_nested_variables+:} false; then :
3323 + $as_echo_n "(cached) " >&6
3325 + if $as_echo 'TRUE=$(BAR$(V))
3331 +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
3332 + am_cv_make_support_nested_variables=yes
3334 + am_cv_make_support_nested_variables=no
3337 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
3338 +$as_echo "$am_cv_make_support_nested_variables" >&6; }
3339 +if test $am_cv_make_support_nested_variables = yes; then
3341 + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
3343 + AM_V=$AM_DEFAULT_VERBOSITY
3344 + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
3348 if test "`cd $srcdir && pwd`" != "`pwd`"; then
3349 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
3350 # is not polluted with repeated "-I."
3351 @@ -3289,7 +3346,7 @@
3353 # Define the identity of the package.
3359 cat >>confdefs.h <<_ACEOF
3360 @@ -3317,18 +3374,70 @@
3362 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3364 +# For better backward compatibility. To be removed once Automake 1.9.x
3365 +# dies out for good. For more background, see:
3366 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
3367 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
3368 +mkdir_p='$(MKDIR_P)'
3370 # We need awk for the "check" target. The system "awk" is bad on
3372 # Always define AMTAR for backward compatibility. Yes, it's still used
3373 # in the wild :-( We should find a proper way to deprecate it ...
3377 +# We'll loop over all known methods to create a tar archive until one works.
3378 +_am_tools='gnutar pax cpio none'
3380 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
3387 +# POSIX will say in a future version that running "rm -f" with no argument
3388 +# is OK; and we want to be able to make that assumption in our Makefile
3389 +# recipes. So use an aggressive probe to check that the usage we want is
3390 +# actually supported "in the wild" to an acceptable degree.
3391 +# See automake bug#10828.
3392 +# To make any issue more visible, cause the running configure to be aborted
3393 +# by default if the 'rm' program in use doesn't match our expectations; the
3394 +# user can still override this though.
3395 +if rm -f && rm -fr && rm -rf; then : OK; else
3399 +Your 'rm' program seems unable to run without file operands specified
3400 +on the command line, even when the '-f' option is present. This is contrary
3401 +to the behaviour of most rm programs out there, and not conforming with
3402 +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
3404 +Please tell bug-automake@gnu.org about your system, including the value
3405 +of your $PATH and any error possibly output before this message. This
3406 +can help us improve future automake versions.
3409 + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
3410 + echo 'Configuration will proceed anyway, since you have set the' >&2
3411 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
3415 +Aborting the configuration process, to ensure you take notice of the issue.
3417 +You can download and install GNU coreutils to get an 'rm' implementation
3418 +that behaves properly: <http://www.gnu.org/software/coreutils/>.
3420 +If you want to complete the configuration process using your problematic
3421 +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
3422 +to "yes", and re-run configure.
3425 + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
3428 # Make sure we can run config.sub.
3429 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
3430 as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
3431 @@ -3419,7 +3528,7 @@
3433 # First try GNU make style include.
3434 echo "include confinc" > confmf
3435 -# Ignore all kinds of additional output from `make'.
3436 +# Ignore all kinds of additional output from 'make'.
3437 case `$am_make -s -f confmf 2> /dev/null` in #(
3438 *the\ am__doit\ target*)
3440 @@ -4252,6 +4361,65 @@
3441 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3442 ac_compiler_gnu=$ac_cv_c_compiler_gnu
3445 +ac_cpp='$CPP $CPPFLAGS'
3446 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3447 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3448 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
3449 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
3450 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
3451 +if ${am_cv_prog_cc_c_o+:} false; then :
3452 + $as_echo_n "(cached) " >&6
3454 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3455 +/* end confdefs.h. */
3465 + # Make sure it works both with $CC and with simple cc.
3466 + # Following AC_PROG_CC_C_O, we do the test twice because some
3467 + # compilers refuse to overwrite an existing .o file with -o,
3468 + # though they will create one.
3469 + am_cv_prog_cc_c_o=yes
3470 + for am_i in 1 2; do
3471 + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
3472 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
3474 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3475 + (exit $ac_status); } \
3476 + && test -f conftest2.$ac_objext; then
3479 + am_cv_prog_cc_c_o=no
3483 + rm -f core conftest*
3486 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
3487 +$as_echo "$am_cv_prog_cc_c_o" >&6; }
3488 +if test "$am_cv_prog_cc_c_o" != yes; then
3489 + # Losing compiler, so override with the script.
3490 + # FIXME: It is wrong to rewrite CC.
3491 + # But if we don't then we get into trouble of one sort or another.
3492 + # A longer-term fix would be to have automake use am__CC in this case,
3493 + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
3494 + CC="$am_aux_dir/compile $CC"
3497 +ac_cpp='$CPP $CPPFLAGS'
3498 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3499 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3500 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
3503 depcc="$CC" am_compiler_list=
3505 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
3506 @@ -4263,8 +4431,8 @@
3507 # We make a subdir and do the tests there. Otherwise we can end up
3508 # making bogus files that we don't know about and never remove. For
3509 # instance it was reported that on HP-UX the gcc test will end up
3510 - # making a dummy file named `D' -- because `-MD' means `put the output
3512 + # making a dummy file named 'D' -- because '-MD' means "put the output
3516 # Copy depcomp to subdir because otherwise we won't find it if we're
3517 @@ -4299,16 +4467,16 @@
3519 for i in 1 2 3 4 5 6; do
3520 echo '#include "conftst'$i'.h"' >> sub/conftest.c
3521 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
3522 - # Solaris 8's {/usr,}/bin/sh.
3523 - touch sub/conftst$i.h
3524 + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
3525 + # Solaris 10 /bin/sh.
3526 + echo '/* dummy */' > sub/conftst$i.h
3528 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
3530 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
3531 + # We check with '-c' and '-o' for the sake of the "dashmstdout"
3532 # mode. It turns out that the SunPro C++ compiler does not properly
3533 - # handle `-M -o', and we need to detect this. Also, some Intel
3534 - # versions had trouble with output in subdirs
3535 + # handle '-M -o', and we need to detect this. Also, some Intel
3536 + # versions had trouble with output in subdirs.
3537 am__obj=sub/conftest.${OBJEXT-o}
3538 am__minus_obj="-o $am__obj"
3540 @@ -4317,8 +4485,8 @@
3541 test "$am__universal" = false || continue
3544 - # after this tag, mechanisms are not by side-effect, so they'll
3545 - # only be used when explicitly requested
3546 + # After this tag, mechanisms are not by side-effect, so they'll
3547 + # only be used when explicitly requested.
3548 if test "x$enable_dependency_tracking" = xyes; then
3551 @@ -4326,7 +4494,7 @@
3554 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
3555 - # This compiler won't grok `-c -o', but also, the minuso test has
3556 + # This compiler won't grok '-c -o', but also, the minuso test has
3557 # not run yet. These depmodes are late enough in the game, and
3558 # so weak that their functioning should not be impacted.
3559 am__obj=conftest.${OBJEXT-o}
3560 @@ -6601,7 +6769,8 @@
3563 lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
3564 - if test -n "$lt_cv_sys_max_cmd_len"; then
3565 + if test -n "$lt_cv_sys_max_cmd_len" && \
3566 + test undefined != "$lt_cv_sys_max_cmd_len"; then
3567 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
3568 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
3570 @@ -8115,7 +8284,7 @@
3574 -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
3575 +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
3576 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
3577 # Find out which ABI we are using.
3578 echo 'int i;' > conftest.$ac_ext
3579 @@ -8131,9 +8300,19 @@
3580 LD="${LD-ld} -m elf_i386_fbsd"
3583 - LD="${LD-ld} -m elf_i386"
3584 + case `/usr/bin/file conftest.o` in
3586 + LD="${LD-ld} -m elf32_x86_64"
3589 + LD="${LD-ld} -m elf_i386"
3594 + LD="${LD-ld} -m elf32lppclinux"
3596 - ppc64-*linux*|powerpc64-*linux*)
3598 LD="${LD-ld} -m elf32ppclinux"
3601 @@ -8152,7 +8331,10 @@
3603 LD="${LD-ld} -m elf_x86_64"
3605 - ppc*-*linux*|powerpc*-*linux*)
3607 + LD="${LD-ld} -m elf64lppc"
3610 LD="${LD-ld} -m elf64ppc"
3612 s390*-*linux*|s390*-*tpf*)
3613 @@ -16395,6 +16577,14 @@
3614 LTLIBOBJS=$ac_ltlibobjs
3617 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
3618 +$as_echo_n "checking that generated files are newer than configure... " >&6; }
3619 + if test -n "$am_sleep_pid"; then
3620 + # Hide warnings about reused PIDs.
3621 + wait $am_sleep_pid 2>/dev/null
3623 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
3624 +$as_echo "done" >&6; }
3625 if test -n "$EXEEXT"; then
3627 am__EXEEXT_FALSE='#'
3628 @@ -16824,7 +17014,7 @@
3629 # report actual input values of CONFIG_FILES etc. instead of their
3630 # values after options handling.
3632 -This file was extended by OpenVPN $as_me 2.3.3, which was
3633 +This file was extended by OpenVPN $as_me 2.3.4, which was
3634 generated by GNU Autoconf 2.69. Invocation command line was
3636 CONFIG_FILES = $CONFIG_FILES
3637 @@ -16890,7 +17080,7 @@
3638 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3639 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
3641 -OpenVPN config.status 2.3.3
3642 +OpenVPN config.status 2.3.4
3643 configured by $0, generated by GNU Autoconf 2.69,
3644 with options \\"\$ac_cs_config\\"
3646 @@ -17991,7 +18181,7 @@
3648 case $ac_file$ac_mode in
3649 "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
3650 - # Autoconf 2.62 quotes --file arguments for eval, but not when files
3651 + # Older Autoconf quotes --file arguments for eval, but not when files
3652 # are listed without --file. Let's play safe and only enable the eval
3653 # if we detect the quoting.
3654 case $CONFIG_FILES in
3655 @@ -18004,7 +18194,7 @@
3656 # Strip MF so we end up with the name of the file.
3657 mf=`echo "$mf" | sed -e 's/:.*$//'`
3658 # Check whether this is an Automake generated Makefile or not.
3659 - # We used to match only the files named `Makefile.in', but
3660 + # We used to match only the files named 'Makefile.in', but
3661 # some people rename them; so instead we look at the file content.
3662 # Grep'ing the first line is not enough: some people post-process
3663 # each Makefile.in and add a new line on top of each file to say so.
3664 @@ -18038,21 +18228,19 @@
3667 # Extract the definition of DEPDIR, am__include, and am__quote
3668 - # from the Makefile without running `make'.
3669 + # from the Makefile without running 'make'.
3670 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
3671 test -z "$DEPDIR" && continue
3672 am__include=`sed -n 's/^am__include = //p' < "$mf"`
3673 - test -z "am__include" && continue
3674 + test -z "$am__include" && continue
3675 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
3676 - # When using ansi2knr, U may be empty or an underscore; expand it
3677 - U=`sed -n 's/^U = //p' < "$mf"`
3678 # Find all dependency output files, they are included files with
3679 # $(DEPDIR) in their names. We invoke sed twice because it is the
3680 # simplest approach to changing $(DEPDIR) to its actual value in the
3682 for file in `sed -n "
3683 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
3684 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
3685 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
3686 # Make sure the directory exists.
3687 test -f "$dirpart/$file" && continue
3688 fdir=`$as_dirname -- "$file" ||
3689 diff -Nuar b/openvpn-2.3.3/contrib/OCSP_check/OCSP_check.sh a/openvpn-2.3.4/contrib/OCSP_check/OCSP_check.sh
3690 --- b/openvpn-2.3.3/contrib/OCSP_check/OCSP_check.sh 2014-04-09 09:42:15.000000000 +0200
3691 +++ a/openvpn-2.3.4/contrib/OCSP_check/OCSP_check.sh 2014-05-01 12:35:20.000000000 +0200
3693 # - The serial number must not be empty
3694 # - The exit status of "openssl ocsp" must be zero
3695 # - The output of the above command must contain the line
3696 - # "0x${serial}: good"
3697 + # "${serial}: good"
3699 # Everything else fails with exit status 1.
3702 # Sample output that is assumed here:
3704 # Response verify OK
3705 - # 0x428740A5: good
3707 # This Update: Apr 24 19:38:49 2010 GMT
3708 # Next Update: May 2 14:23:42 2010 GMT
3714 - -serial "0x${serial}" 2>/dev/null)
3715 + -serial "${serial}" 2>/dev/null)
3717 if [ $? -eq 0 ]; then
3718 # check that it's good
3719 - if echo "$status" | grep -Fq "0x${serial}: good"; then
3720 + if echo "$status" | grep -Fq "^${serial}: good"; then
3724 diff -Nuar b/openvpn-2.3.3/depcomp a/openvpn-2.3.4/depcomp
3725 --- b/openvpn-2.3.3/depcomp 2014-04-09 09:43:42.000000000 +0200
3726 +++ a/openvpn-2.3.4/depcomp 2014-05-01 12:35:46.000000000 +0200
3729 # depcomp - compile a program generating dependencies as side-effects
3731 -scriptversion=2012-03-27.16; # UTC
3732 +scriptversion=2013-05-30.07; # UTC
3734 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
3735 -# 2011, 2012 Free Software Foundation, Inc.
3736 +# Copyright (C) 1999-2013 Free Software Foundation, Inc.
3738 # This program is free software; you can redistribute it and/or modify
3739 # it under the terms of the GNU General Public License as published by
3744 - echo "$0: No command. Try '$0 --help' for more information." 1>&2
3747 + echo "$0: No command. Try '$0 --help' for more information." 1>&2
3752 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
3757 +# Get the directory component of the given path, and save it in the
3758 +# global variables '$dir'. Note that this directory component will
3759 +# be either empty or ending with a '/' character. This is deliberate.
3763 + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
3768 +# Get the suffix-stripped basename of the given path, and save it the
3769 +# global variable '$base'.
3772 + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
3775 +# If no dependency file was actually created by the compiler invocation,
3776 +# we still have to create a dummy depfile, to avoid errors with the
3777 +# Makefile "include basename.Plo" scheme.
3778 +make_dummy_depfile ()
3780 + echo "#dummy" > "$depfile"
3783 +# Factor out some common post-processing of the generated depfile.
3784 +# Requires the auxiliary global variable '$tmpdepfile' to be set.
3785 +aix_post_process_depfile ()
3787 + # If the compiler actually managed to produce a dependency file,
3788 + # post-process it.
3789 + if test -f "$tmpdepfile"; then
3790 + # Each line is of the form 'foo.o: dependency.h'.
3791 + # Do two passes, one to just change these to
3792 + # $object: dependency.h
3793 + # and one to simply output
3795 + # which is needed to avoid the deleted-header problem.
3796 + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
3797 + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
3799 + rm -f "$tmpdepfile"
3801 + make_dummy_depfile
3805 # A tabulation character.
3807 # A newline character.
3810 +# Character ranges might be problematic outside the C locale.
3811 +# These definitions help.
3812 +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
3813 +lower=abcdefghijklmnopqrstuvwxyz
3815 +alpha=${upper}${lower}
3817 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
3818 echo "depcomp: Variables source, object and depmode must be set" 1>&2
3823 +# Avoid interferences from the environment.
3824 +gccflag= dashmflag=
3826 # Some modes work just like other modes, but use different flags. We
3827 # parameterize here, but still list the modes in the big case below,
3828 # to make depend.m4 easier to write. Note that we *cannot* use a case
3829 @@ -86,32 +142,32 @@
3832 if test "$depmode" = dashXmstdout; then
3833 - # This is just like dashmstdout with a different argument.
3835 - depmode=dashmstdout
3836 + # This is just like dashmstdout with a different argument.
3838 + depmode=dashmstdout
3841 cygpath_u="cygpath -u -f -"
3842 if test "$depmode" = msvcmsys; then
3843 - # This is just like msvisualcpp but w/o cygpath translation.
3844 - # Just convert the backslash-escaped backslashes to single forward
3845 - # slashes to satisfy depend.m4
3846 - cygpath_u='sed s,\\\\,/,g'
3847 - depmode=msvisualcpp
3848 + # This is just like msvisualcpp but w/o cygpath translation.
3849 + # Just convert the backslash-escaped backslashes to single forward
3850 + # slashes to satisfy depend.m4
3851 + cygpath_u='sed s,\\\\,/,g'
3852 + depmode=msvisualcpp
3855 if test "$depmode" = msvc7msys; then
3856 - # This is just like msvc7 but w/o cygpath translation.
3857 - # Just convert the backslash-escaped backslashes to single forward
3858 - # slashes to satisfy depend.m4
3859 - cygpath_u='sed s,\\\\,/,g'
3861 + # This is just like msvc7 but w/o cygpath translation.
3862 + # Just convert the backslash-escaped backslashes to single forward
3863 + # slashes to satisfy depend.m4
3864 + cygpath_u='sed s,\\\\,/,g'
3868 if test "$depmode" = xlc; then
3869 - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
3870 - gccflag=-qmakedep=gcc,-MF
3872 + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
3873 + gccflag=-qmakedep=gcc,-MF
3882 - if test $stat -eq 0; then :
3884 + if test $stat -ne 0; then
3888 @@ -143,13 +198,17 @@
3892 +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
3893 +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
3894 +## (see the conditional assignment to $gccflag above).
3895 ## There are various ways to get dependency output from gcc. Here's
3896 ## why we pick this rather obscure method:
3897 ## - Don't want to use -MD because we'd like the dependencies to end
3898 ## up in a subdir. Having to rename by hand is ugly.
3899 ## (We might end up doing this anyway to support other compilers.)
3900 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
3901 -## -MM, not -M (despite what the docs say).
3902 +## -MM, not -M (despite what the docs say). Also, it might not be
3903 +## supported by the other compilers which use the 'gcc' depmode.
3904 ## - Using -M directly means running the compiler twice (even worse
3906 if test -z "$gccflag"; then
3907 @@ -157,15 +216,14 @@
3909 "$@" -Wp,"$gccflag$tmpdepfile"
3911 - if test $stat -eq 0; then :
3913 + if test $stat -ne 0; then
3918 echo "$object : \\" > "$depfile"
3919 - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
3920 -## The second -e expression handles DOS-style file names with drive letters.
3921 + # The second -e expression handles DOS-style file names with drive
3923 sed -e 's/^[^:]*: / /' \
3924 -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
3925 ## This next piece of magic avoids the "deleted header file" problem.
3926 @@ -174,15 +232,15 @@
3927 ## typically no way to rebuild the header). We avoid this by adding
3928 ## dummy dependencies for each header file. Too bad gcc doesn't do
3929 ## this for us directly.
3930 - tr ' ' "$nl" < "$tmpdepfile" |
3931 ## Some versions of gcc put a space before the ':'. On the theory
3932 ## that the space means something, we add a space to the output as
3933 ## well. hp depmode also adds that space, but also prefixes the VPATH
3934 ## to the object. Take care to not repeat it in the output.
3935 ## Some versions of the HPUX 10.20 sed can't process this invocation
3936 ## correctly. Breaking it into two sed invocations is a workaround.
3937 - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
3938 - | sed -e 's/$/ :/' >> "$depfile"
3939 + tr ' ' "$nl" < "$tmpdepfile" \
3940 + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
3941 + | sed -e 's/$/ :/' >> "$depfile"
3946 "$@" -MDupdate "$tmpdepfile"
3949 - if test $stat -eq 0; then :
3951 + if test $stat -ne 0; then
3957 if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
3958 echo "$object : \\" > "$depfile"
3960 # Clip off the initial element (the dependent). Don't try to be
3961 # clever and replace this with sed code, as IRIX sed won't handle
3962 # lines with more than a fixed number of characters (4096 in
3963 @@ -217,19 +273,15 @@
3964 # the IRIX cc adds comments like '#:fec' to the end of the
3966 tr ' ' "$nl" < "$tmpdepfile" \
3967 - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
3968 - tr "$nl" ' ' >> "$depfile"
3969 + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
3970 + | tr "$nl" ' ' >> "$depfile"
3973 # The second pass generates a dummy entry for each header file.
3974 tr ' ' "$nl" < "$tmpdepfile" \
3975 - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
3977 + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
3980 - # The sourcefile does not contain any dependencies, so just
3981 - # store a dummy comment line, to avoid errors with the Makefile
3982 - # "include basename.Plo" scheme.
3983 - echo "#dummy" > "$depfile"
3984 + make_dummy_depfile
3989 # current directory. Also, the AIX compiler puts '$object:' at the
3990 # start of each line; $object doesn't have directory information.
3991 # Version 6 uses the directory in both cases.
3992 - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
3993 - test "x$dir" = "x$object" && dir=
3994 - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
3995 + set_dir_from "$object"
3996 + set_base_from "$object"
3997 if test "$libtool" = yes; then
3998 tmpdepfile1=$dir$base.u
4005 - if test $stat -eq 0; then :
4007 + if test $stat -ne 0; then
4008 rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
4011 @@ -273,65 +322,113 @@
4013 test -f "$tmpdepfile" && break
4015 - if test -f "$tmpdepfile"; then
4016 - # Each line is of the form 'foo.o: dependent.h'.
4017 - # Do two passes, one to just change these to
4018 - # '$object: dependent.h' and one to simply 'dependent.h:'.
4019 - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
4020 - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
4022 - # The sourcefile does not contain any dependencies, so just
4023 - # store a dummy comment line, to avoid errors with the Makefile
4024 - # "include basename.Plo" scheme.
4025 - echo "#dummy" > "$depfile"
4026 + aix_post_process_depfile
4030 + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
4031 + # FIXME: That version still under development at the moment of writing.
4032 + # Make that this statement remains true also for stable, released
4034 + # It will wrap lines (doesn't matter whether long or short) with a
4035 + # trailing '\', as in:
4041 + # It will put a trailing '\' even on the last line, and will use leading
4042 + # spaces rather than leading tabs (at least since its commit 0394caf7
4043 + # "Emit spaces for -MD").
4044 + "$@" -MD -MF "$tmpdepfile"
4046 + if test $stat -ne 0; then
4047 + rm -f "$tmpdepfile"
4051 + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
4052 + # We have to change lines of the first kind to '$object: \'.
4053 + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
4054 + # And for each line of the second kind, we have to emit a 'dep.h:'
4055 + # dummy dependency, to avoid the deleted-header problem.
4056 + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
4061 - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
4063 - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
4064 - # ICC 7.0 will fill foo.d with something like
4065 - # foo.o: sub/foo.c
4066 - # foo.o: sub/foo.h
4067 - # which is wrong. We want
4068 - # sub/foo.o: sub/foo.c
4069 - # sub/foo.o: sub/foo.h
4072 - # ICC 7.1 will output
4073 +## The order of this option in the case statement is important, since the
4074 +## shell code in configure will try each of these formats in the order
4075 +## listed in this file. A plain '-MD' option would be understood by many
4076 +## compilers, so we must ensure this comes after the gcc and icc options.
4078 + # Portland's C compiler understands '-MD'.
4079 + # Will always output deps to 'file.d' where file is the root name of the
4080 + # source file under compilation, even if file resides in a subdirectory.
4081 + # The object file name does not affect the name of the '.d' file.
4082 + # pgcc 10.2 will output
4083 # foo.o: sub/foo.c sub/foo.h
4084 - # and will wrap long lines using '\':
4085 + # and will wrap long lines using '\' :
4086 # foo.o: sub/foo.c ... \
4089 - # tcc 0.9.26 (FIXME still under development at the moment of writing)
4090 - # will emit a similar output, but also prepend the continuation lines
4091 - # with horizontal tabulation characters.
4092 - "$@" -MD -MF "$tmpdepfile"
4094 - if test $stat -eq 0; then :
4096 + set_dir_from "$object"
4097 + # Use the source, not the object, to determine the base name, since
4098 + # that's sadly what pgcc will do too.
4099 + set_base_from "$source"
4100 + tmpdepfile=$base.d
4102 + # For projects that build the same source file twice into different object
4103 + # files, the pgcc approach of using the *source* file root name can cause
4104 + # problems in parallel builds. Use a locking strategy to avoid stomping on
4105 + # the same $tmpdepfile.
4106 + lockdir=$base.d-lock
4108 + echo '$0: caught signal, cleaning up...' >&2
4114 + while test $i -gt 0; do
4115 + # mkdir is a portable test-and-set.
4116 + if mkdir "$lockdir" 2>/dev/null; then
4117 + # This process acquired the lock.
4120 + # Release the lock.
4124 + # If the lock is being held by a different process, wait
4125 + # until the winning process is done or we timeout.
4126 + while test -d "$lockdir" && test $i -gt 0; do
4134 + if test $i -le 0; then
4135 + echo "$0: failed to acquire lock after $numtries attempts" >&2
4136 + echo "$0: check lockdir '$lockdir'" >&2
4140 + if test $stat -ne 0; then
4145 - # Each line is of the form 'foo.o: dependent.h',
4146 - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
4147 + # Each line is of the form `foo.o: dependent.h',
4148 + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
4149 # Do two passes, one to just change these to
4150 - # '$object: dependent.h' and one to simply 'dependent.h:'.
4151 - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
4152 - < "$tmpdepfile" > "$depfile"
4154 - s/[ '"$tab"'][ '"$tab"']*/ /g
4161 - ' < "$tmpdepfile" >> "$depfile"
4162 + # `$object: dependent.h' and one to simply `dependent.h:'.
4163 + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
4164 + # Some versions of the HPUX 10.20 sed can't process this invocation
4165 + # correctly. Breaking it into two sed invocations is a workaround.
4166 + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
4167 + | sed -e 's/$/ :/' >> "$depfile"
4172 # 'foo.d', which lands next to the object file, wherever that
4174 # Much of this is similar to the tru64 case; see comments there.
4175 - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
4176 - test "x$dir" = "x$object" && dir=
4177 - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
4178 + set_dir_from "$object"
4179 + set_base_from "$object"
4180 if test "$libtool" = yes; then
4181 tmpdepfile1=$dir$base.d
4182 tmpdepfile2=$dir.libs/$base.d
4187 - if test $stat -eq 0; then :
4189 + if test $stat -ne 0; then
4190 rm -f "$tmpdepfile1" "$tmpdepfile2"
4193 @@ -366,76 +461,61 @@
4194 test -f "$tmpdepfile" && break
4196 if test -f "$tmpdepfile"; then
4197 - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
4198 + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
4199 # Add 'dependent.h:' lines.
4205 - }' "$tmpdepfile" >> "$depfile"
4210 + }' "$tmpdepfile" >> "$depfile"
4212 - echo "#dummy" > "$depfile"
4213 + make_dummy_depfile
4215 rm -f "$tmpdepfile" "$tmpdepfile2"
4219 - # The Tru64 compiler uses -MD to generate dependencies as a side
4220 - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
4221 - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
4222 - # dependencies in 'foo.d' instead, so we check for that too.
4223 - # Subdirectories are respected.
4224 - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
4225 - test "x$dir" = "x$object" && dir=
4226 - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
4228 - if test "$libtool" = yes; then
4229 - # With Tru64 cc, shared objects can also be used to make a
4230 - # static library. This mechanism is used in libtool 1.4 series to
4231 - # handle both shared and static libraries in a single compilation.
4232 - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
4234 - # With libtool 1.5 this exception was removed, and libtool now
4235 - # generates 2 separate objects for the 2 libraries. These two
4236 - # compilations output dependencies in $dir.libs/$base.o.d and
4237 - # in $dir$base.o.d. We have to check for both files, because
4238 - # one of the two compilations can be disabled. We should prefer
4239 - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
4240 - # automatically cleaned when .libs/ is deleted, while ignoring
4241 - # the former would cause a distcleancheck panic.
4242 - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
4243 - tmpdepfile2=$dir$base.o.d # libtool 1.5
4244 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
4245 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
4248 - tmpdepfile1=$dir$base.o.d
4249 - tmpdepfile2=$dir$base.d
4250 - tmpdepfile3=$dir$base.d
4251 - tmpdepfile4=$dir$base.d
4254 + # The Tru64 compiler uses -MD to generate dependencies as a side
4255 + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
4256 + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
4257 + # dependencies in 'foo.d' instead, so we check for that too.
4258 + # Subdirectories are respected.
4259 + set_dir_from "$object"
4260 + set_base_from "$object"
4262 + if test "$libtool" = yes; then
4263 + # Libtool generates 2 separate objects for the 2 libraries. These
4264 + # two compilations output dependencies in $dir.libs/$base.o.d and
4265 + # in $dir$base.o.d. We have to check for both files, because
4266 + # one of the two compilations can be disabled. We should prefer
4267 + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
4268 + # automatically cleaned when .libs/ is deleted, while ignoring
4269 + # the former would cause a distcleancheck panic.
4270 + tmpdepfile1=$dir$base.o.d # libtool 1.5
4271 + tmpdepfile2=$dir.libs/$base.o.d # Likewise.
4272 + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
4275 + tmpdepfile1=$dir$base.d
4276 + tmpdepfile2=$dir$base.d
4277 + tmpdepfile3=$dir$base.d
4282 + if test $stat -ne 0; then
4283 + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
4288 - if test $stat -eq 0; then :
4290 - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
4294 - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
4296 - test -f "$tmpdepfile" && break
4298 - if test -f "$tmpdepfile"; then
4299 - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
4300 - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
4302 - echo "#dummy" > "$depfile"
4304 - rm -f "$tmpdepfile"
4306 + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
4308 + test -f "$tmpdepfile" && break
4310 + # Same post-processing that is required for AIX mode.
4311 + aix_post_process_depfile
4315 if test "$libtool" = yes; then
4317 "$@" $showIncludes > "$tmpdepfile"
4319 grep -v '^Note: including file: ' "$tmpdepfile"
4320 - if test "$stat" = 0; then :
4322 + if test $stat -ne 0; then
4330 + echo >> "$depfile" # make sure the fragment doesn't end with a backslash
4334 @@ -524,13 +604,14 @@
4335 # in the target name. This is to cope with DOS-style filenames:
4336 # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
4338 - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
4339 + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
4341 cat < "$tmpdepfile" > "$depfile"
4342 - tr ' ' "$nl" < "$tmpdepfile" | \
4343 -## Some versions of the HPUX 10.20 sed can't process this invocation
4344 -## correctly. Breaking it into two sed invocations is a workaround.
4345 - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
4346 + # Some versions of the HPUX 10.20 sed can't process this sed invocation
4347 + # correctly. Breaking it into two sed invocations is a workaround.
4348 + tr ' ' "$nl" < "$tmpdepfile" \
4349 + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
4350 + | sed -e 's/$/ :/' >> "$depfile"
4354 @@ -583,10 +664,12 @@
4355 # makedepend may prepend the VPATH from the source file name to the object.
4356 # No need to regex-escape $object, excess matching of '.' is harmless.
4357 sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
4358 - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
4359 -## Some versions of the HPUX 10.20 sed can't process this invocation
4360 -## correctly. Breaking it into two sed invocations is a workaround.
4361 - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
4362 + # Some versions of the HPUX 10.20 sed can't process the last invocation
4363 + # correctly. Breaking it into two sed invocations is a workaround.
4364 + sed '1,2d' "$tmpdepfile" \
4366 + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
4367 + | sed -e 's/$/ :/' >> "$depfile"
4368 rm -f "$tmpdepfile" "$tmpdepfile".bak
4371 @@ -622,10 +705,10 @@
4376 - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
4377 - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
4378 - sed '$ s: \\$::' > "$tmpdepfile"
4380 + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
4381 + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
4382 + | sed '$ s: \\$::' > "$tmpdepfile"
4384 echo "$object : \\" > "$depfile"
4385 cat < "$tmpdepfile" >> "$depfile"
4386 @@ -657,15 +740,15 @@
4389 "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
4399 - set fnord "$@" "$arg"
4403 + set fnord "$@" "$arg"
4409 "$@" -E 2>/dev/null |
4410 diff -Nuar b/openvpn-2.3.3/distro/Makefile.in a/openvpn-2.3.4/distro/Makefile.in
4411 --- b/openvpn-2.3.3/distro/Makefile.in 2014-04-09 09:51:26.000000000 +0200
4412 +++ a/openvpn-2.3.4/distro/Makefile.in 2014-05-02 09:16:39.000000000 +0200
4414 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
4415 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
4418 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4419 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
4421 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4423 # This Makefile.in is free software; the Free Software Foundation
4424 # gives unlimited permission to copy and/or distribute it,
4425 # with or without modifications, as long as this notice is preserved.
4427 # Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
4430 -am__make_dryrun = \
4433 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
4434 +am__make_running_with_option = \
4435 + case $${target_option-} in \
4437 + *) echo "am__make_running_with_option: internal error: invalid" \
4438 + "target option '$${target_option-}' specified" >&2; \
4442 + sane_makeflags=$$MAKEFLAGS; \
4443 + if $(am__is_gnu_make); then \
4444 + sane_makeflags=$$MFLAGS; \
4446 case $$MAKEFLAGS in \
4448 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
4449 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
4451 - for am__flg in $$MAKEFLAGS; do \
4452 - case $$am__flg in \
4454 - *n*) am__dry=yes; break;; \
4458 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
4459 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
4463 + strip_trailopt () \
4465 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
4467 + for flg in $$sane_makeflags; do \
4468 + test $$skip_next = yes && { skip_next=no; continue; }; \
4470 + *=*|--*) continue;; \
4471 + -*I) strip_trailopt 'I'; skip_next=yes;; \
4472 + -*I?*) strip_trailopt 'I';; \
4473 + -*O) strip_trailopt 'O'; skip_next=yes;; \
4474 + -*O?*) strip_trailopt 'O';; \
4475 + -*l) strip_trailopt 'l'; skip_next=yes;; \
4476 + -*l?*) strip_trailopt 'l';; \
4477 + -[dEDm]) skip_next=yes;; \
4478 + -[JT]) skip_next=yes;; \
4481 + *$$target_option*) has_opt=yes; break;; \
4483 - test $$am__dry = yes; \
4486 + test $$has_opt = yes
4487 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
4488 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
4489 pkgdatadir = $(datadir)/@PACKAGE@
4490 pkgincludedir = $(includedir)/@PACKAGE@
4491 pkglibdir = $(libdir)/@PACKAGE@
4493 build_triplet = @build@
4494 host_triplet = @host@
4496 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4497 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
4498 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
4499 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
4500 $(top_srcdir)/m4/ax_socklen_t.m4 \
4501 @@ -77,15 +104,28 @@
4502 CONFIG_HEADER = $(top_builddir)/config.h
4503 CONFIG_CLEAN_FILES =
4504 CONFIG_CLEAN_VPATH_FILES =
4505 +AM_V_P = $(am__v_P_@AM_V@)
4506 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
4509 +AM_V_GEN = $(am__v_GEN_@AM_V@)
4510 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
4511 +am__v_GEN_0 = @echo " GEN " $@;
4513 +AM_V_at = $(am__v_at_@AM_V@)
4514 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
4519 -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
4520 - html-recursive info-recursive install-data-recursive \
4521 - install-dvi-recursive install-exec-recursive \
4522 - install-html-recursive install-info-recursive \
4523 - install-pdf-recursive install-ps-recursive install-recursive \
4524 - installcheck-recursive installdirs-recursive pdf-recursive \
4525 - ps-recursive uninstall-recursive
4526 +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
4527 + ctags-recursive dvi-recursive html-recursive info-recursive \
4528 + install-data-recursive install-dvi-recursive \
4529 + install-exec-recursive install-html-recursive \
4530 + install-info-recursive install-pdf-recursive \
4531 + install-ps-recursive install-recursive installcheck-recursive \
4532 + installdirs-recursive pdf-recursive ps-recursive \
4533 + tags-recursive uninstall-recursive
4534 am__can_run_installinfo = \
4535 case $$AM_UPDATE_INFO_DIR in \
4539 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
4540 distclean-recursive maintainer-clean-recursive
4541 -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
4542 - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
4543 +am__recursive_targets = \
4544 + $(RECURSIVE_TARGETS) \
4545 + $(RECURSIVE_CLEAN_TARGETS) \
4546 + $(am__extra_recursive_targets)
4547 +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
4549 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
4550 +# Read a list of newline-separated strings from the standard input,
4551 +# and print each of them once, without duplicates. Input order is
4553 +am__uniquify_input = $(AWK) '\
4554 + BEGIN { nonempty = 0; } \
4555 + { items[$$0] = 1; nonempty = 1; } \
4556 + END { if (nonempty) { for (i in items) print i; }; } \
4558 +# Make sure the list of sources is unique. This is necessary because,
4559 +# e.g., the same source file might be shared among _SOURCES variables
4560 +# for different programs/libraries.
4561 +am__define_uniq_tagged_files = \
4562 + list='$(am__tagged_files)'; \
4563 + unique=`for i in $$list; do \
4564 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4565 + done | $(am__uniquify_input)`
4568 DIST_SUBDIRS = $(SUBDIRS)
4573 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
4576 AUTOCONF = @AUTOCONF@
4577 @@ -325,22 +386,25 @@
4580 # This directory's subdirectories are mostly independent; you can cd
4581 -# into them and run `make' without going through this Makefile.
4582 -# To change the values of `make' variables: instead of editing Makefiles,
4583 -# (1) if the variable is set in `config.status', edit `config.status'
4584 -# (which will cause the Makefiles to be regenerated when you run `make');
4585 -# (2) otherwise, pass the desired values on the `make' command line.
4586 -$(RECURSIVE_TARGETS):
4587 - @fail= failcom='exit 1'; \
4588 - for f in x $$MAKEFLAGS; do \
4590 - *=* | --[!k]*);; \
4591 - *k*) failcom='fail=yes';; \
4594 +# into them and run 'make' without going through this Makefile.
4595 +# To change the values of 'make' variables: instead of editing Makefiles,
4596 +# (1) if the variable is set in 'config.status', edit 'config.status'
4597 +# (which will cause the Makefiles to be regenerated when you run 'make');
4598 +# (2) otherwise, pass the desired values on the 'make' command line.
4599 +$(am__recursive_targets):
4601 + if $(am__make_keepgoing); then \
4602 + failcom='fail=yes'; \
4604 + failcom='exit 1'; \
4607 target=`echo $@ | sed s/-recursive//`; \
4608 - list='$(SUBDIRS)'; for subdir in $$list; do \
4610 + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
4611 + *) list='$(SUBDIRS)' ;; \
4613 + for subdir in $$list; do \
4614 echo "Making $$target in $$subdir"; \
4615 if test "$$subdir" = "."; then \
4617 @@ -355,57 +419,12 @@
4618 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
4619 fi; test -z "$$fail"
4621 -$(RECURSIVE_CLEAN_TARGETS):
4622 - @fail= failcom='exit 1'; \
4623 - for f in x $$MAKEFLAGS; do \
4625 - *=* | --[!k]*);; \
4626 - *k*) failcom='fail=yes';; \
4631 - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
4632 - *) list='$(SUBDIRS)' ;; \
4634 - rev=''; for subdir in $$list; do \
4635 - if test "$$subdir" = "."; then :; else \
4636 - rev="$$subdir $$rev"; \
4640 - target=`echo $@ | sed s/-recursive//`; \
4641 - for subdir in $$rev; do \
4642 - echo "Making $$target in $$subdir"; \
4643 - if test "$$subdir" = "."; then \
4644 - local_target="$$target-am"; \
4646 - local_target="$$target"; \
4648 - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
4649 - || eval $$failcom; \
4650 - done && test -z "$$fail"
4652 - list='$(SUBDIRS)'; for subdir in $$list; do \
4653 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
4656 - list='$(SUBDIRS)'; for subdir in $$list; do \
4657 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
4660 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
4661 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
4662 - unique=`for i in $$list; do \
4663 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4665 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
4666 - END { if (nonempty) { for (i in files) print i; }; }'`; \
4667 - mkid -fID $$unique
4669 +ID: $(am__tagged_files)
4670 + $(am__define_uniq_tagged_files); mkid -fID $$unique
4671 +tags: tags-recursive
4674 -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
4675 - $(TAGS_FILES) $(LISP)
4676 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
4679 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
4680 @@ -421,12 +440,7 @@
4681 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
4684 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
4685 - unique=`for i in $$list; do \
4686 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4688 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
4689 - END { if (nonempty) { for (i in files) print i; }; }'`; \
4690 + $(am__define_uniq_tagged_files); \
4692 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
4693 test -n "$$unique" || unique=$$empty_fix; \
4694 @@ -438,15 +452,11 @@
4699 -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
4700 - $(TAGS_FILES) $(LISP)
4701 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
4702 - unique=`for i in $$list; do \
4703 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4705 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
4706 - END { if (nonempty) { for (i in files) print i; }; }'`; \
4707 +ctags: ctags-recursive
4710 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
4711 + $(am__define_uniq_tagged_files); \
4712 test -z "$(CTAGS_ARGS)$$unique" \
4713 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
4715 @@ -455,6 +465,21 @@
4716 here=`$(am__cd) $(top_builddir) && pwd` \
4717 && $(am__cd) $(top_srcdir) \
4718 && gtags -i $(GTAGS_ARGS) "$$here"
4719 +cscopelist: cscopelist-recursive
4721 +cscopelist-am: $(am__tagged_files)
4722 + list='$(am__tagged_files)'; \
4723 + case "$(srcdir)" in \
4724 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
4725 + *) sdir=$(subdir)/$(srcdir) ;; \
4727 + for i in $$list; do \
4728 + if test -f "$$i"; then \
4729 + echo "$(subdir)/$$i"; \
4731 + echo "$$sdir/$$i"; \
4733 + done >> $(top_builddir)/cscope.files
4736 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
4737 @@ -616,22 +641,20 @@
4741 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
4742 - install-am install-strip tags-recursive
4743 +.MAKE: $(am__recursive_targets) install-am install-strip
4745 -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
4746 - all all-am check check-am clean clean-generic clean-libtool \
4747 - ctags ctags-recursive distclean distclean-generic \
4748 - distclean-libtool distclean-tags distdir dvi dvi-am html \
4749 - html-am info info-am install install-am install-data \
4750 - install-data-am install-dvi install-dvi-am install-exec \
4751 - install-exec-am install-html install-html-am install-info \
4752 - install-info-am install-man install-pdf install-pdf-am \
4753 - install-ps install-ps-am install-strip installcheck \
4754 - installcheck-am installdirs installdirs-am maintainer-clean \
4755 - maintainer-clean-generic mostlyclean mostlyclean-generic \
4756 - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
4757 - uninstall uninstall-am
4758 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
4759 + check-am clean clean-generic clean-libtool cscopelist-am ctags \
4760 + ctags-am distclean distclean-generic distclean-libtool \
4761 + distclean-tags distdir dvi dvi-am html html-am info info-am \
4762 + install install-am install-data install-data-am install-dvi \
4763 + install-dvi-am install-exec install-exec-am install-html \
4764 + install-html-am install-info install-info-am install-man \
4765 + install-pdf install-pdf-am install-ps install-ps-am \
4766 + install-strip installcheck installcheck-am installdirs \
4767 + installdirs-am maintainer-clean maintainer-clean-generic \
4768 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
4769 + ps ps-am tags tags-am uninstall uninstall-am
4772 # Tell versions [3.59,3.63) of GNU make to not export all variables.
4773 diff -Nuar b/openvpn-2.3.3/distro/rpm/Makefile.in a/openvpn-2.3.4/distro/rpm/Makefile.in
4774 --- b/openvpn-2.3.3/distro/rpm/Makefile.in 2014-04-09 09:51:26.000000000 +0200
4775 +++ a/openvpn-2.3.4/distro/rpm/Makefile.in 2014-05-02 09:16:39.000000000 +0200
4777 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
4778 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
4781 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4782 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
4784 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4786 # This Makefile.in is free software; the Free Software Foundation
4787 # gives unlimited permission to copy and/or distribute it,
4788 # with or without modifications, as long as this notice is preserved.
4793 -am__make_dryrun = \
4796 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
4797 +am__make_running_with_option = \
4798 + case $${target_option-} in \
4800 + *) echo "am__make_running_with_option: internal error: invalid" \
4801 + "target option '$${target_option-}' specified" >&2; \
4805 + sane_makeflags=$$MAKEFLAGS; \
4806 + if $(am__is_gnu_make); then \
4807 + sane_makeflags=$$MFLAGS; \
4809 case $$MAKEFLAGS in \
4811 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
4812 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
4814 - for am__flg in $$MAKEFLAGS; do \
4815 - case $$am__flg in \
4817 - *n*) am__dry=yes; break;; \
4821 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
4822 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
4826 + strip_trailopt () \
4828 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
4830 + for flg in $$sane_makeflags; do \
4831 + test $$skip_next = yes && { skip_next=no; continue; }; \
4833 + *=*|--*) continue;; \
4834 + -*I) strip_trailopt 'I'; skip_next=yes;; \
4835 + -*I?*) strip_trailopt 'I';; \
4836 + -*O) strip_trailopt 'O'; skip_next=yes;; \
4837 + -*O?*) strip_trailopt 'O';; \
4838 + -*l) strip_trailopt 'l'; skip_next=yes;; \
4839 + -*l?*) strip_trailopt 'l';; \
4840 + -[dEDm]) skip_next=yes;; \
4841 + -[JT]) skip_next=yes;; \
4844 + *$$target_option*) has_opt=yes; break;; \
4846 - test $$am__dry = yes; \
4849 + test $$has_opt = yes
4850 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
4851 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
4852 pkgdatadir = $(datadir)/@PACKAGE@
4853 pkgincludedir = $(includedir)/@PACKAGE@
4854 pkglibdir = $(libdir)/@PACKAGE@
4856 build_triplet = @build@
4857 host_triplet = @host@
4859 -DIST_COMMON = $(dist_noinst_DATA) $(srcdir)/Makefile.am \
4860 - $(srcdir)/Makefile.in $(srcdir)/openvpn.spec.in
4861 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
4862 + $(srcdir)/openvpn.spec.in $(dist_noinst_DATA)
4863 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
4864 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
4865 $(top_srcdir)/m4/ax_socklen_t.m4 \
4867 CONFIG_HEADER = $(top_builddir)/config.h
4868 CONFIG_CLEAN_FILES = openvpn.spec
4869 CONFIG_CLEAN_VPATH_FILES =
4870 +AM_V_P = $(am__v_P_@AM_V@)
4871 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
4874 +AM_V_GEN = $(am__v_GEN_@AM_V@)
4875 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
4876 +am__v_GEN_0 = @echo " GEN " $@;
4878 +AM_V_at = $(am__v_at_@AM_V@)
4879 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
4884 am__can_run_installinfo = \
4886 *) (install-info --version) >/dev/null 2>&1;; \
4888 DATA = $(dist_noinst_DATA)
4889 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
4890 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
4893 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
4896 AUTOCONF = @AUTOCONF@
4897 @@ -292,11 +333,11 @@
4912 distdir: $(DISTFILES)
4913 @@ -433,15 +474,16 @@
4914 .MAKE: install-am install-strip
4916 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
4917 - distclean distclean-generic distclean-libtool distdir dvi \
4918 - dvi-am html html-am info info-am install install-am \
4919 - install-data install-data-am install-dvi install-dvi-am \
4920 - install-exec install-exec-am install-html install-html-am \
4921 - install-info install-info-am install-man install-pdf \
4922 - install-pdf-am install-ps install-ps-am install-strip \
4923 - installcheck installcheck-am installdirs maintainer-clean \
4924 - maintainer-clean-generic mostlyclean mostlyclean-generic \
4925 - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
4926 + cscopelist-am ctags-am distclean distclean-generic \
4927 + distclean-libtool distdir dvi dvi-am html html-am info info-am \
4928 + install install-am install-data install-data-am install-dvi \
4929 + install-dvi-am install-exec install-exec-am install-html \
4930 + install-html-am install-info install-info-am install-man \
4931 + install-pdf install-pdf-am install-ps install-ps-am \
4932 + install-strip installcheck installcheck-am installdirs \
4933 + maintainer-clean maintainer-clean-generic mostlyclean \
4934 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
4935 + tags-am uninstall uninstall-am
4938 # Tell versions [3.59,3.63) of GNU make to not export all variables.
4939 diff -Nuar b/openvpn-2.3.3/distro/rpm/openvpn.spec a/openvpn-2.3.4/distro/rpm/openvpn.spec
4940 --- b/openvpn-2.3.3/distro/rpm/openvpn.spec 2014-04-09 09:53:13.000000000 +0200
4941 +++ a/openvpn-2.3.4/distro/rpm/openvpn.spec 2014-05-02 09:17:02.000000000 +0200
4944 Summary: OpenVPN is a robust and highly flexible VPN daemon by James Yonan.
4949 URL: http://openvpn.net/
4950 Source0: http://prdownloads.sourceforge.net/openvpn/%{name}-%{version}.tar.gz
4951 diff -Nuar b/openvpn-2.3.3/doc/Makefile.in a/openvpn-2.3.4/doc/Makefile.in
4952 --- b/openvpn-2.3.3/doc/Makefile.in 2014-04-09 09:51:26.000000000 +0200
4953 +++ a/openvpn-2.3.4/doc/Makefile.in 2014-05-02 09:16:39.000000000 +0200
4955 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
4956 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
4959 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4960 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
4962 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4964 # This Makefile.in is free software; the Free Software Foundation
4965 # gives unlimited permission to copy and/or distribute it,
4966 # with or without modifications, as long as this notice is preserved.
4971 -am__make_dryrun = \
4974 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
4975 +am__make_running_with_option = \
4976 + case $${target_option-} in \
4978 + *) echo "am__make_running_with_option: internal error: invalid" \
4979 + "target option '$${target_option-}' specified" >&2; \
4983 + sane_makeflags=$$MAKEFLAGS; \
4984 + if $(am__is_gnu_make); then \
4985 + sane_makeflags=$$MFLAGS; \
4987 case $$MAKEFLAGS in \
4989 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
4990 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
4992 - for am__flg in $$MAKEFLAGS; do \
4993 - case $$am__flg in \
4995 - *n*) am__dry=yes; break;; \
4999 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
5000 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
5002 - test $$am__dry = yes; \
5006 + strip_trailopt () \
5008 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
5010 + for flg in $$sane_makeflags; do \
5011 + test $$skip_next = yes && { skip_next=no; continue; }; \
5013 + *=*|--*) continue;; \
5014 + -*I) strip_trailopt 'I'; skip_next=yes;; \
5015 + -*I?*) strip_trailopt 'I';; \
5016 + -*O) strip_trailopt 'O'; skip_next=yes;; \
5017 + -*O?*) strip_trailopt 'O';; \
5018 + -*l) strip_trailopt 'l'; skip_next=yes;; \
5019 + -*l?*) strip_trailopt 'l';; \
5020 + -[dEDm]) skip_next=yes;; \
5021 + -[JT]) skip_next=yes;; \
5024 + *$$target_option*) has_opt=yes; break;; \
5027 + test $$has_opt = yes
5028 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
5029 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
5030 pkgdatadir = $(datadir)/@PACKAGE@
5031 pkgincludedir = $(includedir)/@PACKAGE@
5032 pkglibdir = $(libdir)/@PACKAGE@
5034 host_triplet = @host@
5035 @WIN32_TRUE@am__append_1 = openvpn.8
5037 -DIST_COMMON = $(am__dist_noinst_DATA_DIST) $(dist_doc_DATA) \
5038 - $(dist_man_MANS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in
5039 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
5040 + $(dist_man_MANS) $(dist_doc_DATA) $(am__dist_noinst_DATA_DIST)
5041 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
5042 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
5043 $(top_srcdir)/m4/ax_socklen_t.m4 \
5045 CONFIG_HEADER = $(top_builddir)/config.h
5046 CONFIG_CLEAN_FILES =
5047 CONFIG_CLEAN_VPATH_FILES =
5048 +AM_V_P = $(am__v_P_@AM_V@)
5049 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
5052 +AM_V_GEN = $(am__v_GEN_@AM_V@)
5053 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
5054 +am__v_GEN_0 = @echo " GEN " $@;
5056 +AM_V_at = $(am__v_at_@AM_V@)
5057 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
5062 am__can_run_installinfo = \
5063 @@ -121,9 +160,11 @@
5064 MANS = $(dist_man_MANS)
5065 am__dist_noinst_DATA_DIST = README.plugins openvpn.8
5066 DATA = $(dist_doc_DATA) $(dist_noinst_DATA) $(nodist_html_DATA)
5067 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
5068 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
5071 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
5074 AUTOCONF = @AUTOCONF@
5075 @@ -411,27 +452,14 @@
5076 @list='$(nodist_html_DATA)'; test -n "$(htmldir)" || list=; \
5077 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
5078 dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
5090 distdir: $(DISTFILES)
5091 - @list='$(MANS)'; if test -n "$$list"; then \
5092 - list=`for p in $$list; do \
5093 - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
5094 - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
5095 - if test -n "$$list" && \
5096 - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
5097 - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
5098 - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
5099 - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
5100 - echo " typically \`make maintainer-clean' will remove them" >&2; \
5104 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
5105 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
5106 list='$(DISTFILES)'; \
5107 @@ -573,18 +601,18 @@
5108 .MAKE: install-am install-strip
5110 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
5111 - distclean distclean-generic distclean-libtool distdir dvi \
5112 - dvi-am html html-am info info-am install install-am \
5113 - install-data install-data-am install-dist_docDATA install-dvi \
5114 - install-dvi-am install-exec install-exec-am install-html \
5115 - install-html-am install-info install-info-am install-man \
5116 - install-man8 install-nodist_htmlDATA install-pdf \
5117 - install-pdf-am install-ps install-ps-am install-strip \
5118 - installcheck installcheck-am installdirs maintainer-clean \
5119 - maintainer-clean-generic mostlyclean mostlyclean-generic \
5120 - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
5121 - uninstall-dist_docDATA uninstall-man uninstall-man8 \
5122 - uninstall-nodist_htmlDATA
5123 + cscopelist-am ctags-am distclean distclean-generic \
5124 + distclean-libtool distdir dvi dvi-am html html-am info info-am \
5125 + install install-am install-data install-data-am \
5126 + install-dist_docDATA install-dvi install-dvi-am install-exec \
5127 + install-exec-am install-html install-html-am install-info \
5128 + install-info-am install-man install-man8 \
5129 + install-nodist_htmlDATA install-pdf install-pdf-am install-ps \
5130 + install-ps-am install-strip installcheck installcheck-am \
5131 + installdirs maintainer-clean maintainer-clean-generic \
5132 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
5133 + ps ps-am tags-am uninstall uninstall-am uninstall-dist_docDATA \
5134 + uninstall-man uninstall-man8 uninstall-nodist_htmlDATA
5136 @WIN32_TRUE@openvpn.8.html: $(srcdir)/openvpn.8
5137 @WIN32_TRUE@ $(MAN2HTML) < $(srcdir)/openvpn.8 > openvpn.8.html
5138 diff -Nuar b/openvpn-2.3.3/doc/openvpn.8 a/openvpn-2.3.4/doc/openvpn.8
5139 --- b/openvpn-2.3.3/doc/openvpn.8 2014-04-09 09:47:37.000000000 +0200
5140 +++ a/openvpn-2.3.4/doc/openvpn.8 2014-05-01 13:12:22.000000000 +0200
5141 @@ -2322,18 +2322,23 @@
5142 .\"*********************************************************
5145 -Configure a multi-homed UDP server. This option can be used when
5146 -OpenVPN has been configured to listen on all interfaces, and will
5147 -attempt to bind client sessions to the interface on which packets
5148 -are being received, so that outgoing packets will be sent out
5149 -of the same interface. Note that this option is only relevant for
5150 -UDP servers and currently is only implemented on Linux.
5152 -Note: clients connecting to a
5154 -server should always use the
5157 +Configure a multi-homed UDP server. This option needs to be used when
5158 +a server has more than one IP address (e.g. multiple interfaces, or
5159 +secondary IP addresses), and is not using
5161 +to force binding to one specific address only. This option will
5162 +add some extra lookups to the packet path to ensure that the UDP reply
5163 +packets are always sent from the address that the client is
5164 +talking to. This is not supported on all platforms, and it adds more
5165 +processing, so it's not enabled by default.
5167 +Note: this option is only relevant for UDP servers.
5169 +Note 2: if you do an IPv6+IPv4 dual-stack bind on a Linux machine with
5170 +multiple IPv4 address, connections to IPv4 addresses will not work
5171 +right on kernels before 3.15, due to missing kernel support for the
5172 +IPv4-mapped case (some distributions have ported this to earlier kernel
5174 .\"*********************************************************
5176 .B \-\-echo [parms...]
5177 @@ -4270,12 +4275,18 @@
5178 .\"*********************************************************
5180 .B \-\-tls-version-min version ['or-highest']
5182 +Enable TLS version negotiation, and set the minimum
5183 TLS version we will accept from the peer (default is "1.0").
5184 Examples for version
5185 include "1.0", "1.1", or "1.2". If 'or-highest' is specified
5186 and version is not recognized, we will only accept the highest TLS
5187 version supported by the local SSL implementation.
5189 +If this options is not set, the code in OpenVPN 2.3.4 will default
5190 +to using TLS 1.0 only, without any version negotiation. This reverts
5191 +the beaviour to what OpenVPN versions up to 2.3.2 did, as it turned
5192 +out that TLS version negotiation can lead to handshake problems due
5193 +to new signature algorithms in TLS 1.2.
5194 .\"*********************************************************
5197 @@ -5409,9 +5420,11 @@
5198 .SS IPv6 Related Options
5199 .\"*********************************************************
5200 The following options exist to support IPv6 tunneling in peer-to-peer
5201 -and client-server mode. As of now, this is just very basic
5202 -documentation of the IPv6-related options. More documentation can be
5203 -found on http://www.greenie.net/ipv6/openvpn.html.
5204 +and client-server mode. All options are modeled after their IPv4
5205 +counterparts, so more detailed explanations given there apply here
5206 +as well (except for
5208 +, which has no effect on IPv6).
5210 .B --ifconfig-ipv6 ipv6addr/bits ipv6remote
5211 configure IPv6 address
5212 @@ -5438,7 +5451,8 @@
5214 and increments by +1 for every new client (linear mode). The
5216 -setting controls the size of the pool.
5217 +setting controls the size of the pool. Due to implementation details,
5218 +the pool size must be between /64 and /112.
5220 .B --ifconfig-ipv6-push ipv6addr/bits ipv6remote
5221 for ccd/ per-client static IPv6 interface configuration, see
5222 @@ -6032,14 +6046,20 @@
5223 is the verification level. Only set for TLS connections. Set prior
5226 -script. This is in the form of a hex string like "37AB46E0", which is
5227 -suitable for doing serial-based OCSP queries (with OpenSSL, you have
5228 -to prepend "0x" to the string). If something goes wrong while reading
5229 +script. This is in the form of a decimal string like "933971680", which is
5230 +suitable for doing serial-based OCSP queries (with OpenSSL, do not
5231 +prepend "0x" to the string) If something goes wrong while reading
5232 the value from the certificate it will be an empty string, so your
5233 code should check that.
5234 See the contrib/OCSP_check/OCSP_check.sh script for an example.
5235 .\"*********************************************************
5237 +.B tls_serial_hex_{n}
5239 +.B tls_serial_{n}\fR,
5240 +but in hex form (e.g. "12:34:56:78:9A").
5241 +.\"*********************************************************
5244 The MTU of the TUN/TAP device.
5246 diff -Nuar b/openvpn-2.3.3/include/Makefile.in a/openvpn-2.3.4/include/Makefile.in
5247 --- b/openvpn-2.3.3/include/Makefile.in 2014-04-09 09:51:26.000000000 +0200
5248 +++ a/openvpn-2.3.4/include/Makefile.in 2014-05-02 09:16:40.000000000 +0200
5250 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
5251 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
5254 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5255 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5257 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5259 # This Makefile.in is free software; the Free Software Foundation
5260 # gives unlimited permission to copy and/or distribute it,
5261 # with or without modifications, as long as this notice is preserved.
5266 -am__make_dryrun = \
5269 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
5270 +am__make_running_with_option = \
5271 + case $${target_option-} in \
5273 + *) echo "am__make_running_with_option: internal error: invalid" \
5274 + "target option '$${target_option-}' specified" >&2; \
5278 + sane_makeflags=$$MAKEFLAGS; \
5279 + if $(am__is_gnu_make); then \
5280 + sane_makeflags=$$MFLAGS; \
5282 case $$MAKEFLAGS in \
5284 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
5285 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
5287 - for am__flg in $$MAKEFLAGS; do \
5288 - case $$am__flg in \
5290 - *n*) am__dry=yes; break;; \
5294 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
5295 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
5297 - test $$am__dry = yes; \
5301 + strip_trailopt () \
5303 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
5305 + for flg in $$sane_makeflags; do \
5306 + test $$skip_next = yes && { skip_next=no; continue; }; \
5308 + *=*|--*) continue;; \
5309 + -*I) strip_trailopt 'I'; skip_next=yes;; \
5310 + -*I?*) strip_trailopt 'I';; \
5311 + -*O) strip_trailopt 'O'; skip_next=yes;; \
5312 + -*O?*) strip_trailopt 'O';; \
5313 + -*l) strip_trailopt 'l'; skip_next=yes;; \
5314 + -*l?*) strip_trailopt 'l';; \
5315 + -[dEDm]) skip_next=yes;; \
5316 + -[JT]) skip_next=yes;; \
5319 + *$$target_option*) has_opt=yes; break;; \
5322 + test $$has_opt = yes
5323 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
5324 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
5325 pkgdatadir = $(datadir)/@PACKAGE@
5326 pkgincludedir = $(includedir)/@PACKAGE@
5327 pkglibdir = $(libdir)/@PACKAGE@
5329 build_triplet = @build@
5330 host_triplet = @host@
5332 -DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
5333 - $(srcdir)/Makefile.in
5334 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
5335 + $(include_HEADERS)
5336 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
5337 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
5338 $(top_srcdir)/m4/ax_socklen_t.m4 \
5340 CONFIG_HEADER = $(top_builddir)/config.h
5341 CONFIG_CLEAN_FILES =
5342 CONFIG_CLEAN_VPATH_FILES =
5343 +AM_V_P = $(am__v_P_@AM_V@)
5344 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
5347 +AM_V_GEN = $(am__v_GEN_@AM_V@)
5348 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
5349 +am__v_GEN_0 = @echo " GEN " $@;
5351 +AM_V_at = $(am__v_at_@AM_V@)
5352 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
5357 am__can_run_installinfo = \
5358 @@ -115,11 +154,29 @@
5360 am__installdirs = "$(DESTDIR)$(includedir)"
5361 HEADERS = $(include_HEADERS)
5362 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
5363 +# Read a list of newline-separated strings from the standard input,
5364 +# and print each of them once, without duplicates. Input order is
5366 +am__uniquify_input = $(AWK) '\
5367 + BEGIN { nonempty = 0; } \
5368 + { items[$$0] = 1; nonempty = 1; } \
5369 + END { if (nonempty) { for (i in items) print i; }; } \
5371 +# Make sure the list of sources is unique. This is necessary because,
5372 +# e.g., the same source file might be shared among _SOURCES variables
5373 +# for different programs/libraries.
5374 +am__define_uniq_tagged_files = \
5375 + list='$(am__tagged_files)'; \
5376 + unique=`for i in $$list; do \
5377 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5378 + done | $(am__uniquify_input)`
5381 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
5384 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
5387 AUTOCONF = @AUTOCONF@
5388 @@ -338,26 +395,15 @@
5389 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
5390 dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
5392 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
5393 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5394 - unique=`for i in $$list; do \
5395 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5397 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5398 - END { if (nonempty) { for (i in files) print i; }; }'`; \
5399 - mkid -fID $$unique
5401 +ID: $(am__tagged_files)
5402 + $(am__define_uniq_tagged_files); mkid -fID $$unique
5406 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5407 - $(TAGS_FILES) $(LISP)
5408 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
5411 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5412 - unique=`for i in $$list; do \
5413 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5415 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5416 - END { if (nonempty) { for (i in files) print i; }; }'`; \
5417 + $(am__define_uniq_tagged_files); \
5419 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
5420 test -n "$$unique" || unique=$$empty_fix; \
5421 @@ -369,15 +415,11 @@
5426 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
5427 - $(TAGS_FILES) $(LISP)
5428 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5429 - unique=`for i in $$list; do \
5430 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5432 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5433 - END { if (nonempty) { for (i in files) print i; }; }'`; \
5437 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
5438 + $(am__define_uniq_tagged_files); \
5439 test -z "$(CTAGS_ARGS)$$unique" \
5440 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5442 @@ -386,6 +428,21 @@
5443 here=`$(am__cd) $(top_builddir) && pwd` \
5444 && $(am__cd) $(top_srcdir) \
5445 && gtags -i $(GTAGS_ARGS) "$$here"
5446 +cscopelist: cscopelist-am
5448 +cscopelist-am: $(am__tagged_files)
5449 + list='$(am__tagged_files)'; \
5450 + case "$(srcdir)" in \
5451 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
5452 + *) sdir=$(subdir)/$(srcdir) ;; \
5454 + for i in $$list; do \
5455 + if test -f "$$i"; then \
5456 + echo "$(subdir)/$$i"; \
5458 + echo "$$sdir/$$i"; \
5460 + done >> $(top_builddir)/cscope.files
5463 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
5464 @@ -526,18 +583,19 @@
5466 .MAKE: install-am install-strip
5468 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
5469 - clean-libtool ctags distclean distclean-generic \
5470 - distclean-libtool distclean-tags distdir dvi dvi-am html \
5471 - html-am info info-am install install-am install-data \
5472 - install-data-am install-dvi install-dvi-am install-exec \
5473 - install-exec-am install-html install-html-am \
5474 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
5475 + clean-libtool cscopelist-am ctags ctags-am distclean \
5476 + distclean-generic distclean-libtool distclean-tags distdir dvi \
5477 + dvi-am html html-am info info-am install install-am \
5478 + install-data install-data-am install-dvi install-dvi-am \
5479 + install-exec install-exec-am install-html install-html-am \
5480 install-includeHEADERS install-info install-info-am \
5481 install-man install-pdf install-pdf-am install-ps \
5482 install-ps-am install-strip installcheck installcheck-am \
5483 installdirs maintainer-clean maintainer-clean-generic \
5484 mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
5485 - ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
5486 + ps ps-am tags tags-am uninstall uninstall-am \
5487 + uninstall-includeHEADERS
5490 # Tell versions [3.59,3.63) of GNU make to not export all variables.
5491 diff -Nuar b/openvpn-2.3.3/install-sh a/openvpn-2.3.4/install-sh
5492 --- b/openvpn-2.3.3/install-sh 2014-04-09 09:43:40.000000000 +0200
5493 +++ a/openvpn-2.3.4/install-sh 2014-05-01 12:35:46.000000000 +0200
5496 # install - install a program, script, or datafile
5498 -scriptversion=2011-01-19.21; # UTC
5499 +scriptversion=2011-11-20.07; # UTC
5501 # This originates from X11R5 (mit/util/scripts/install.sh), which was
5502 # later released in X11R6 (xc/config/util/install.sh) with the
5504 # FSF changes to this file are in the public domain.
5506 # Calling this script install-sh is preferred over install.sh, to prevent
5507 -# `make' implicit rules from creating a file called install from it
5508 +# 'make' implicit rules from creating a file called install from it
5509 # when there is no Makefile.
5511 # This script is compatible with the BSD install script, but was written
5513 -s) stripcmd=$stripprog;;
5516 - # Protect names problematic for `test' and other utilities.
5517 + # Protect names problematic for 'test' and other utilities.
5519 -* | [=\(\)!]) dst_arg=./$dst_arg;;
5525 - # Protect names problematic for `test' and other utilities.
5526 + # Protect names problematic for 'test' and other utilities.
5528 -* | [=\(\)!]) dst_arg=./$dst_arg;;
5531 echo "$0: no input file specified." >&2
5534 - # It's OK to call `install-sh -d' without argument.
5535 + # It's OK to call 'install-sh -d' without argument.
5536 # This can happen when creating conditional directories.
5543 - # Protect names problematic for `test' and other utilities.
5544 + # Protect names problematic for 'test' and other utilities.
5546 -* | [=\(\)!]) src=./$src;;
5549 if test -z "$dir_arg" || {
5550 # Check for POSIX incompatibilities with -m.
5551 # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
5552 - # other-writeable bit of parent directory when it shouldn't.
5553 + # other-writable bit of parent directory when it shouldn't.
5554 # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
5555 ls_ld_tmpdir=`ls -ld "$tmpdir"`
5556 case $ls_ld_tmpdir in
5557 diff -Nuar b/openvpn-2.3.3/ltmain.sh a/openvpn-2.3.4/ltmain.sh
5558 --- b/openvpn-2.3.3/ltmain.sh 2014-04-09 09:43:19.000000000 +0200
5559 +++ a/openvpn-2.3.4/ltmain.sh 2014-05-01 12:35:41.000000000 +0200
5562 # compiler flags: $LTCFLAGS
5563 # linker: $LD (gnu? $with_gnu_ld)
5564 -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.1
5565 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
5566 # automake: $automake_version
5567 # autoconf: $autoconf_version
5573 -VERSION="2.4.2 Debian-2.4.2-1.1"
5574 +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
5576 package_revision=1.3337
5578 diff -Nuar b/openvpn-2.3.3/m4/libtool.m4 a/openvpn-2.3.4/m4/libtool.m4
5579 --- b/openvpn-2.3.3/m4/libtool.m4 2014-04-09 09:43:20.000000000 +0200
5580 +++ a/openvpn-2.3.4/m4/libtool.m4 2014-05-01 12:35:41.000000000 +0200
5581 @@ -1312,7 +1312,7 @@
5585 -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
5586 +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
5587 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
5588 # Find out which ABI we are using.
5589 echo 'int i;' > conftest.$ac_ext
5590 @@ -1324,9 +1324,19 @@
5591 LD="${LD-ld} -m elf_i386_fbsd"
5594 - LD="${LD-ld} -m elf_i386"
5595 + case `/usr/bin/file conftest.o` in
5597 + LD="${LD-ld} -m elf32_x86_64"
5600 + LD="${LD-ld} -m elf_i386"
5604 - ppc64-*linux*|powerpc64-*linux*)
5606 + LD="${LD-ld} -m elf32lppclinux"
5609 LD="${LD-ld} -m elf32ppclinux"
5612 @@ -1345,7 +1355,10 @@
5614 LD="${LD-ld} -m elf_x86_64"
5616 - ppc*-*linux*|powerpc*-*linux*)
5618 + LD="${LD-ld} -m elf64lppc"
5621 LD="${LD-ld} -m elf64ppc"
5623 s390*-*linux*|s390*-*tpf*)
5624 @@ -1688,7 +1701,8 @@
5627 lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
5628 - if test -n "$lt_cv_sys_max_cmd_len"; then
5629 + if test -n "$lt_cv_sys_max_cmd_len" && \
5630 + test undefined != "$lt_cv_sys_max_cmd_len"; then
5631 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
5632 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
5634 diff -Nuar b/openvpn-2.3.3/Makefile.am a/openvpn-2.3.4/Makefile.am
5635 --- b/openvpn-2.3.3/Makefile.am 2014-04-09 09:47:37.000000000 +0200
5636 +++ a/openvpn-2.3.4/Makefile.am 2014-05-01 13:12:22.000000000 +0200
5638 $(srcdir)/config.guess $(srcdir)/config.sub
5642 + config-version.h tests/t_client.sh
5646 diff -Nuar b/openvpn-2.3.3/Makefile.in a/openvpn-2.3.4/Makefile.in
5647 --- b/openvpn-2.3.3/Makefile.in 2014-04-09 09:47:59.000000000 +0200
5648 +++ a/openvpn-2.3.4/Makefile.in 2014-05-01 13:13:12.000000000 +0200
5650 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
5651 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
5654 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5655 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5657 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5659 # This Makefile.in is free software; the Free Software Foundation
5660 # gives unlimited permission to copy and/or distribute it,
5661 # with or without modifications, as long as this notice is preserved.
5666 -am__make_dryrun = \
5669 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
5670 +am__make_running_with_option = \
5671 + case $${target_option-} in \
5673 + *) echo "am__make_running_with_option: internal error: invalid" \
5674 + "target option '$${target_option-}' specified" >&2; \
5678 + sane_makeflags=$$MAKEFLAGS; \
5679 + if $(am__is_gnu_make); then \
5680 + sane_makeflags=$$MFLAGS; \
5682 case $$MAKEFLAGS in \
5684 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
5685 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
5687 - for am__flg in $$MAKEFLAGS; do \
5688 - case $$am__flg in \
5690 - *n*) am__dry=yes; break;; \
5694 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
5695 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
5697 - test $$am__dry = yes; \
5701 + strip_trailopt () \
5703 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
5705 + for flg in $$sane_makeflags; do \
5706 + test $$skip_next = yes && { skip_next=no; continue; }; \
5708 + *=*|--*) continue;; \
5709 + -*I) strip_trailopt 'I'; skip_next=yes;; \
5710 + -*I?*) strip_trailopt 'I';; \
5711 + -*O) strip_trailopt 'O'; skip_next=yes;; \
5712 + -*O?*) strip_trailopt 'O';; \
5713 + -*l) strip_trailopt 'l'; skip_next=yes;; \
5714 + -*l?*) strip_trailopt 'l';; \
5715 + -[dEDm]) skip_next=yes;; \
5716 + -[JT]) skip_next=yes;; \
5719 + *$$target_option*) has_opt=yes; break;; \
5722 + test $$has_opt = yes
5723 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
5724 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
5725 pkgdatadir = $(datadir)/@PACKAGE@
5726 pkgincludedir = $(includedir)/@PACKAGE@
5727 pkglibdir = $(libdir)/@PACKAGE@
5728 @@ -81,12 +108,13 @@
5729 @WIN32_TRUE@am__append_1 = INSTALL-win32.txt
5730 @WIN32_FALSE@am__append_2 = INSTALL-win32.txt
5732 -DIST_COMMON = README $(am__configure_deps) $(am__dist_doc_DATA_DIST) \
5733 - $(am__dist_noinst_DATA_DIST) $(dist_noinst_HEADERS) \
5734 - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
5735 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
5736 + $(top_srcdir)/configure $(am__configure_deps) \
5737 $(srcdir)/config.h.in $(srcdir)/version.sh.in \
5738 - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
5739 - config.guess config.sub depcomp install-sh ltmain.sh missing
5740 + $(am__dist_doc_DATA_DIST) $(am__dist_noinst_DATA_DIST) \
5741 + $(dist_noinst_HEADERS) AUTHORS COPYING ChangeLog INSTALL NEWS \
5742 + README compile config.guess config.sub depcomp install-sh \
5744 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
5745 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
5746 $(top_srcdir)/m4/ax_socklen_t.m4 \
5747 @@ -103,15 +131,28 @@
5748 CONFIG_HEADER = config.h
5749 CONFIG_CLEAN_FILES = version.sh
5750 CONFIG_CLEAN_VPATH_FILES =
5751 +AM_V_P = $(am__v_P_@AM_V@)
5752 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
5755 +AM_V_GEN = $(am__v_GEN_@AM_V@)
5756 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
5757 +am__v_GEN_0 = @echo " GEN " $@;
5759 +AM_V_at = $(am__v_at_@AM_V@)
5760 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
5765 -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
5766 - html-recursive info-recursive install-data-recursive \
5767 - install-dvi-recursive install-exec-recursive \
5768 - install-html-recursive install-info-recursive \
5769 - install-pdf-recursive install-ps-recursive install-recursive \
5770 - installcheck-recursive installdirs-recursive pdf-recursive \
5771 - ps-recursive uninstall-recursive
5772 +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
5773 + ctags-recursive dvi-recursive html-recursive info-recursive \
5774 + install-data-recursive install-dvi-recursive \
5775 + install-exec-recursive install-html-recursive \
5776 + install-info-recursive install-pdf-recursive \
5777 + install-ps-recursive install-recursive installcheck-recursive \
5778 + installdirs-recursive pdf-recursive ps-recursive \
5779 + tags-recursive uninstall-recursive
5780 am__can_run_installinfo = \
5781 case $$AM_UPDATE_INFO_DIR in \
5783 @@ -155,11 +196,33 @@
5784 HEADERS = $(dist_noinst_HEADERS)
5785 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
5786 distclean-recursive maintainer-clean-recursive
5787 -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
5788 - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
5789 - distdir dist dist-all distcheck
5790 +am__recursive_targets = \
5791 + $(RECURSIVE_TARGETS) \
5792 + $(RECURSIVE_CLEAN_TARGETS) \
5793 + $(am__extra_recursive_targets)
5794 +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
5795 + cscope distdir dist dist-all distcheck
5796 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
5797 + $(LISP)config.h.in
5798 +# Read a list of newline-separated strings from the standard input,
5799 +# and print each of them once, without duplicates. Input order is
5801 +am__uniquify_input = $(AWK) '\
5802 + BEGIN { nonempty = 0; } \
5803 + { items[$$0] = 1; nonempty = 1; } \
5804 + END { if (nonempty) { for (i in items) print i; }; } \
5806 +# Make sure the list of sources is unique. This is necessary because,
5807 +# e.g., the same source file might be shared among _SOURCES variables
5808 +# for different programs/libraries.
5809 +am__define_uniq_tagged_files = \
5810 + list='$(am__tagged_files)'; \
5811 + unique=`for i in $$list; do \
5812 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5813 + done | $(am__uniquify_input)`
5817 DIST_SUBDIRS = $(SUBDIRS)
5818 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
5819 distdir = $(PACKAGE)-$(VERSION)
5821 && rm -rf "$(distdir)" \
5822 || { sleep 5 && rm -rf "$(distdir)"; }; \
5824 +am__post_remove_distdir = $(am__remove_distdir)
5827 sed_first='s,^\([^/]*\)/.*$$,\1,'; \
5828 @@ -197,12 +261,14 @@
5830 DIST_ARCHIVES = $(distdir).tar.gz
5832 +DIST_TARGETS = dist-gzip
5833 distuninstallcheck_listfiles = find . -type f -print
5834 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
5835 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
5836 distcleancheck_listfiles = find . -type f -print
5839 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
5842 AUTOCONF = @AUTOCONF@
5844 $(srcdir)/config.guess $(srcdir)/config.sub
5848 + config-version.h tests/t_client.sh
5853 $(am__aclocal_m4_deps):
5856 - @if test ! -f $@; then rm -f stamp-h1; else :; fi
5857 - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
5858 + @test -f $@ || rm -f stamp-h1
5859 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
5861 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
5863 @@ -502,22 +568,25 @@
5864 dir='$(DESTDIR)$(rootdir)'; $(am__uninstall_files_from_dir)
5866 # This directory's subdirectories are mostly independent; you can cd
5867 -# into them and run `make' without going through this Makefile.
5868 -# To change the values of `make' variables: instead of editing Makefiles,
5869 -# (1) if the variable is set in `config.status', edit `config.status'
5870 -# (which will cause the Makefiles to be regenerated when you run `make');
5871 -# (2) otherwise, pass the desired values on the `make' command line.
5872 -$(RECURSIVE_TARGETS):
5873 - @fail= failcom='exit 1'; \
5874 - for f in x $$MAKEFLAGS; do \
5876 - *=* | --[!k]*);; \
5877 - *k*) failcom='fail=yes';; \
5880 +# into them and run 'make' without going through this Makefile.
5881 +# To change the values of 'make' variables: instead of editing Makefiles,
5882 +# (1) if the variable is set in 'config.status', edit 'config.status'
5883 +# (which will cause the Makefiles to be regenerated when you run 'make');
5884 +# (2) otherwise, pass the desired values on the 'make' command line.
5885 +$(am__recursive_targets):
5887 + if $(am__make_keepgoing); then \
5888 + failcom='fail=yes'; \
5890 + failcom='exit 1'; \
5893 target=`echo $@ | sed s/-recursive//`; \
5894 - list='$(SUBDIRS)'; for subdir in $$list; do \
5896 + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
5897 + *) list='$(SUBDIRS)' ;; \
5899 + for subdir in $$list; do \
5900 echo "Making $$target in $$subdir"; \
5901 if test "$$subdir" = "."; then \
5903 @@ -532,57 +601,12 @@
5904 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
5905 fi; test -z "$$fail"
5907 -$(RECURSIVE_CLEAN_TARGETS):
5908 - @fail= failcom='exit 1'; \
5909 - for f in x $$MAKEFLAGS; do \
5911 - *=* | --[!k]*);; \
5912 - *k*) failcom='fail=yes';; \
5917 - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
5918 - *) list='$(SUBDIRS)' ;; \
5920 - rev=''; for subdir in $$list; do \
5921 - if test "$$subdir" = "."; then :; else \
5922 - rev="$$subdir $$rev"; \
5926 - target=`echo $@ | sed s/-recursive//`; \
5927 - for subdir in $$rev; do \
5928 - echo "Making $$target in $$subdir"; \
5929 - if test "$$subdir" = "."; then \
5930 - local_target="$$target-am"; \
5932 - local_target="$$target"; \
5934 - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
5935 - || eval $$failcom; \
5936 - done && test -z "$$fail"
5938 - list='$(SUBDIRS)'; for subdir in $$list; do \
5939 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
5942 - list='$(SUBDIRS)'; for subdir in $$list; do \
5943 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
5946 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
5947 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5948 - unique=`for i in $$list; do \
5949 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5951 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5952 - END { if (nonempty) { for (i in files) print i; }; }'`; \
5953 - mkid -fID $$unique
5955 +ID: $(am__tagged_files)
5956 + $(am__define_uniq_tagged_files); mkid -fID $$unique
5957 +tags: tags-recursive
5960 -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
5961 - $(TAGS_FILES) $(LISP)
5962 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
5965 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
5966 @@ -598,12 +622,7 @@
5967 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
5970 - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
5971 - unique=`for i in $$list; do \
5972 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5974 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5975 - END { if (nonempty) { for (i in files) print i; }; }'`; \
5976 + $(am__define_uniq_tagged_files); \
5978 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
5979 test -n "$$unique" || unique=$$empty_fix; \
5980 @@ -615,15 +634,11 @@
5985 -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
5986 - $(TAGS_FILES) $(LISP)
5987 - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
5988 - unique=`for i in $$list; do \
5989 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5991 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5992 - END { if (nonempty) { for (i in files) print i; }; }'`; \
5993 +ctags: ctags-recursive
5996 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
5997 + $(am__define_uniq_tagged_files); \
5998 test -z "$(CTAGS_ARGS)$$unique" \
5999 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
6001 @@ -632,9 +647,31 @@
6002 here=`$(am__cd) $(top_builddir) && pwd` \
6003 && $(am__cd) $(top_srcdir) \
6004 && gtags -i $(GTAGS_ARGS) "$$here"
6005 +cscope: cscope.files
6006 + test ! -s cscope.files \
6007 + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
6009 + -rm -f cscope.files
6010 +cscope.files: clean-cscope cscopelist
6011 +cscopelist: cscopelist-recursive
6013 +cscopelist-am: $(am__tagged_files)
6014 + list='$(am__tagged_files)'; \
6015 + case "$(srcdir)" in \
6016 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
6017 + *) sdir=$(subdir)/$(srcdir) ;; \
6019 + for i in $$list; do \
6020 + if test -f "$$i"; then \
6021 + echo "$(subdir)/$$i"; \
6023 + echo "$$sdir/$$i"; \
6025 + done >> $(top_builddir)/cscope.files
6028 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
6029 + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
6031 distdir: $(DISTFILES)
6032 $(am__remove_distdir)
6033 @@ -702,40 +739,42 @@
6034 || chmod -R a+r "$(distdir)"
6036 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
6037 - $(am__remove_distdir)
6038 + $(am__post_remove_distdir)
6041 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
6042 - $(am__remove_distdir)
6043 + $(am__post_remove_distdir)
6046 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
6047 - $(am__remove_distdir)
6050 - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
6051 - $(am__remove_distdir)
6052 + $(am__post_remove_distdir)
6055 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
6056 - $(am__remove_distdir)
6057 + $(am__post_remove_distdir)
6060 + @echo WARNING: "Support for shar distribution archives is" \
6062 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
6063 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
6064 - $(am__remove_distdir)
6065 + $(am__post_remove_distdir)
6068 + @echo WARNING: "Support for distribution archives compressed with" \
6069 + "legacy program 'compress' is deprecated." >&2
6070 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
6071 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
6072 - $(am__remove_distdir)
6073 + $(am__post_remove_distdir)
6076 -rm -f $(distdir).zip
6077 zip -rq $(distdir).zip $(distdir)
6078 - $(am__remove_distdir)
6079 + $(am__post_remove_distdir)
6081 -dist dist-all: distdir
6082 - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
6083 - $(am__remove_distdir)
6085 + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
6086 + $(am__post_remove_distdir)
6088 # This target untars the dist file and tries a VPATH configuration. Then
6089 # it guarantees that the distribution is self-contained by making another
6091 GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
6093 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
6095 - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
6097 lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
6099 @@ -759,18 +796,19 @@
6101 unzip $(distdir).zip ;;\
6103 - chmod -R a-w $(distdir); chmod u+w $(distdir)
6104 - mkdir $(distdir)/_build
6105 - mkdir $(distdir)/_inst
6106 + chmod -R a-w $(distdir)
6107 + chmod u+w $(distdir)
6108 + mkdir $(distdir)/_build $(distdir)/_inst
6109 chmod a-w $(distdir)
6110 test -d $(distdir)/_build || exit 0; \
6111 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
6112 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
6114 && $(am__cd) $(distdir)/_build \
6115 - && ../configure --srcdir=.. --prefix="$$dc_install_base" \
6117 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
6118 $(DISTCHECK_CONFIGURE_FLAGS) \
6119 + --srcdir=.. --prefix="$$dc_install_base" \
6120 && $(MAKE) $(AM_MAKEFLAGS) \
6121 && $(MAKE) $(AM_MAKEFLAGS) dvi \
6122 && $(MAKE) $(AM_MAKEFLAGS) check \
6124 && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
6127 - $(am__remove_distdir)
6128 + $(am__post_remove_distdir)
6129 @(echo "$(distdir) archives ready for distribution: "; \
6130 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
6131 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
6132 @@ -936,18 +974,17 @@
6134 uninstall-am: uninstall-dist_docDATA uninstall-rootDATA
6136 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
6137 - ctags-recursive install install-am install-strip \
6140 -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
6141 - all all-am am--refresh check check-am clean clean-generic \
6142 - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
6143 - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
6144 - dist-zip distcheck distclean distclean-generic distclean-hdr \
6145 - distclean-libtool distclean-tags distcleancheck distdir \
6146 - distuninstallcheck dvi dvi-am html html-am info info-am \
6147 - install install-am install-data install-data-am \
6148 +.MAKE: $(am__recursive_targets) all check install install-am \
6151 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
6152 + am--refresh check check-am clean clean-cscope clean-generic \
6153 + clean-libtool cscope cscopelist-am ctags ctags-am dist \
6154 + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
6155 + dist-xz dist-zip distcheck distclean distclean-generic \
6156 + distclean-hdr distclean-libtool distclean-tags distcleancheck \
6157 + distdir distuninstallcheck dvi dvi-am html html-am info \
6158 + info-am install install-am install-data install-data-am \
6159 install-dist_docDATA install-dvi install-dvi-am install-exec \
6160 install-exec-am install-html install-html-am install-info \
6161 install-info-am install-man install-pdf install-pdf-am \
6163 installcheck installcheck-am installdirs installdirs-am \
6164 maintainer-clean maintainer-clean-generic mostlyclean \
6165 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
6166 - tags tags-recursive uninstall uninstall-am \
6167 - uninstall-dist_docDATA uninstall-rootDATA
6168 + tags tags-am uninstall uninstall-am uninstall-dist_docDATA \
6169 + uninstall-rootDATA
6172 .PHONY: config-version.h
6173 diff -Nuar b/openvpn-2.3.3/missing a/openvpn-2.3.4/missing
6174 --- b/openvpn-2.3.3/missing 2014-04-09 09:43:40.000000000 +0200
6175 +++ a/openvpn-2.3.4/missing 2014-05-01 12:35:46.000000000 +0200
6178 -# Common stub for a few missing GNU programs while installing.
6179 +# Common wrapper for a few potentially missing GNU programs.
6181 -scriptversion=2012-01-06.13; # UTC
6182 +scriptversion=2013-10-28.13; # UTC
6184 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
6185 -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
6186 -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
6187 +# Copyright (C) 1996-2013 Free Software Foundation, Inc.
6188 +# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
6190 # This program is free software; you can redistribute it and/or modify
6191 # it under the terms of the GNU General Public License as published by
6193 # the same distribution terms that you use for the rest of that program.
6195 if test $# -eq 0; then
6196 - echo 1>&2 "Try \`$0 --help' for more information"
6197 + echo 1>&2 "Try '$0 --help' for more information"
6202 -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
6203 -sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
6205 -# In the cases where this matters, `missing' is being run in the
6207 -if test -f configure.ac; then
6208 - configure_ac=configure.ac
6210 - configure_ac=configure.in
6214 -msg="missing on your system"
6216 + # Used by our autoconf macros to check whether the available missing
6217 + # script is modern enough.
6223 - # Try to run requested program, and just exit if it succeeds.
6227 - # Exit code 63 means version mismatch. This often happens
6228 - # when the user try to use an ancient version of a tool on
6229 - # a file that requires a minimum version. In this case we
6230 - # we should proceed has if the program had been absent, or
6231 - # if --run hadn't been passed.
6232 - if test $? = 63; then
6234 - msg="probably too old"
6238 + # Back-compat with the calling convention used by older automake.
6242 -h|--h|--he|--hel|--help)
6244 $0 [OPTION]... PROGRAM [ARGUMENT]...
6246 -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
6247 -error status if there is no known handling for PROGRAM.
6248 +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
6249 +to PROGRAM being missing or too old.
6252 -h, --help display this help and exit
6253 -v, --version output version information and exit
6254 - --run try to run the given command, and emulate it if it fails
6256 Supported PROGRAM values:
6257 - aclocal touch file \`aclocal.m4'
6258 - autoconf touch file \`configure'
6259 - autoheader touch file \`config.h.in'
6260 - autom4te touch the output file, or create a stub one
6261 - automake touch all \`Makefile.in' files
6262 - bison create \`y.tab.[ch]', if possible, from existing .[ch]
6263 - flex create \`lex.yy.c', if possible, from existing .c
6264 - help2man touch the output file
6265 - lex create \`lex.yy.c', if possible, from existing .c
6266 - makeinfo touch the output file
6267 - yacc create \`y.tab.[ch]', if possible, from existing .[ch]
6268 + aclocal autoconf autoheader autom4te automake makeinfo
6269 + bison yacc flex lex help2man
6271 -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
6272 -\`g' are ignored when checking the name.
6273 +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
6274 +'g' are ignored when checking the name.
6276 Send bug reports to <bug-automake@gnu.org>."
6278 @@ -99,228 +70,141 @@
6282 - echo 1>&2 "$0: Unknown \`$1' option"
6283 - echo 1>&2 "Try \`$0 --help' for more information"
6284 + echo 1>&2 "$0: unknown '$1' option"
6285 + echo 1>&2 "Try '$0 --help' for more information"
6291 -# normalize program name to check for.
6292 -program=`echo "$1" | sed '
6297 -# Now exit if we have it, but it failed. Also exit now if we
6298 -# don't have it and --version was passed (most likely to detect
6299 -# the program). This is about non-GNU programs, so use $1 not
6303 - # Not GNU programs, they don't have --version.
6305 +# Run the given program, remember its exit status.
6309 - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
6310 - # We have it, but it failed.
6312 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
6313 - # Could not run --version or --help. This is probably someone
6314 - # running `$TOOL --version' or `$TOOL --help' to check whether
6315 - # $TOOL exists and not knowing $TOOL uses missing.
6321 -# If it does not exist, or fails to run (possibly an outdated version),
6322 -# try to emulate it.
6326 -WARNING: \`$1' is $msg. You should only need it if
6327 - you modified \`acinclude.m4' or \`${configure_ac}'. You might want
6328 - to install the \`Automake' and \`Perl' packages. Grab them from
6329 - any GNU archive site."
6335 -WARNING: \`$1' is $msg. You should only need it if
6336 - you modified \`${configure_ac}'. You might want to install the
6337 - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
6344 -WARNING: \`$1' is $msg. You should only need it if
6345 - you modified \`acconfig.h' or \`${configure_ac}'. You might want
6346 - to install the \`Autoconf' and \`GNU m4' packages. Grab them
6347 - from any GNU archive site."
6348 - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
6349 - test -z "$files" && files="config.h"
6351 - for f in $files; do
6353 - *:*) touch_files="$touch_files "`echo "$f" |
6354 - sed -e 's/^[^:]*://' -e 's/:.*//'`;;
6355 - *) touch_files="$touch_files $f.in";;
6358 - touch $touch_files
6360 +# If it succeeded, we are done.
6361 +test $st -eq 0 && exit 0
6365 -WARNING: \`$1' is $msg. You should only need it if
6366 - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
6367 - You might want to install the \`Automake' and \`Perl' packages.
6368 - Grab them from any GNU archive site."
6369 - find . -type f -name Makefile.am -print |
6370 - sed 's/\.am$/.in/' |
6371 - while read f; do touch "$f"; done
6376 -WARNING: \`$1' is needed, but is $msg.
6377 - You might have modified some files without having the
6378 - proper tools for further handling them.
6379 - You can get \`$1' as part of \`Autoconf' from any GNU
6382 - file=`echo "$*" | sed -n "$sed_output"`
6383 - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
6384 - if test -f "$file"; then
6387 - test -z "$file" || exec >$file
6389 - echo "# Created by GNU Automake missing as a replacement of"
6399 -WARNING: \`$1' $msg. You should only need it if
6400 - you modified a \`.y' file. You may need the \`Bison' package
6401 - in order for those modifications to take effect. You can get
6402 - \`Bison' from any GNU archive site."
6403 - rm -f y.tab.c y.tab.h
6404 - if test $# -ne 1; then
6405 - eval LASTARG=\${$#}
6408 - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
6409 - if test -f "$SRCFILE"; then
6410 - cp "$SRCFILE" y.tab.c
6412 - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
6413 - if test -f "$SRCFILE"; then
6414 - cp "$SRCFILE" y.tab.h
6419 - if test ! -f y.tab.h; then
6422 - if test ! -f y.tab.c; then
6423 - echo 'main() { return 0; }' >y.tab.c
6429 -WARNING: \`$1' is $msg. You should only need it if
6430 - you modified a \`.l' file. You may need the \`Flex' package
6431 - in order for those modifications to take effect. You can get
6432 - \`Flex' from any GNU archive site."
6434 - if test $# -ne 1; then
6435 - eval LASTARG=\${$#}
6438 - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
6439 - if test -f "$SRCFILE"; then
6440 - cp "$SRCFILE" lex.yy.c
6445 - if test ! -f lex.yy.c; then
6446 - echo 'main() { return 0; }' >lex.yy.c
6452 -WARNING: \`$1' is $msg. You should only need it if
6453 - you modified a dependency of a manual page. You may need the
6454 - \`Help2man' package in order for those modifications to take
6455 - effect. You can get \`Help2man' from any GNU archive site."
6457 - file=`echo "$*" | sed -n "$sed_output"`
6458 - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
6459 - if test -f "$file"; then
6462 - test -z "$file" || exec >$file
6463 - echo ".ab help2man is required to generate this page"
6470 -WARNING: \`$1' is $msg. You should only need it if
6471 - you modified a \`.texi' or \`.texinfo' file, or any other file
6472 - indirectly affecting the aspect of the manual. The spurious
6473 - call might also be the consequence of using a buggy \`make' (AIX,
6474 - DU, IRIX). You might want to install the \`Texinfo' package or
6475 - the \`GNU make' package. Grab either from any GNU archive site."
6476 - # The file to touch is that specified with -o ...
6477 - file=`echo "$*" | sed -n "$sed_output"`
6478 - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
6479 - if test -z "$file"; then
6480 - # ... or it is the one specified with @setfilename ...
6481 - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
6484 - s/.* \([^ ]*\) *$/\1/
6488 - # ... or it is derived from the source name (dir/f.texi becomes f.info)
6489 - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
6491 - # If the file does not exist, the user really needs makeinfo;
6492 - # let's fail without touching anything.
6493 - test -f $file || exit 1
6499 -WARNING: \`$1' is needed, and is $msg.
6500 - You might have modified some files without having the
6501 - proper tools for further handling them. Check the \`README' file,
6502 - it often tells you about the needed prerequisites for installing
6503 - this package. You may also peek at any GNU archive site, in case
6504 - some other package would contain this missing \`$1' program."
6508 +# Also exit now if we it failed (or wasn't found), and '--version' was
6509 +# passed; such an option is passed most likely to detect whether the
6510 +# program is present and works.
6511 +case $2 in --version|--help) exit $st;; esac
6513 +# Exit code 63 means version mismatch. This often happens when the user
6514 +# tries to use an ancient version of a tool on a file that requires a
6516 +if test $st -eq 63; then
6517 + msg="probably too old"
6518 +elif test $st -eq 127; then
6519 + # Program was missing.
6520 + msg="missing on your system"
6522 + # Program was found and executed, but failed. Give up.
6527 +perl_URL=http://www.perl.org/
6528 +flex_URL=http://flex.sourceforge.net/
6529 +gnu_software_URL=http://www.gnu.org/software
6535 + echo "The '$1' program is part of the GNU Automake package:"
6536 + echo "<$gnu_software_URL/automake>"
6537 + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
6538 + echo "<$gnu_software_URL/autoconf>"
6539 + echo "<$gnu_software_URL/m4/>"
6540 + echo "<$perl_URL>"
6542 + autoconf|autom4te|autoheader)
6543 + echo "The '$1' program is part of the GNU Autoconf package:"
6544 + echo "<$gnu_software_URL/autoconf/>"
6545 + echo "It also requires GNU m4 and Perl in order to run:"
6546 + echo "<$gnu_software_URL/m4/>"
6547 + echo "<$perl_URL>"
6554 + # Normalize program name to check for.
6555 + normalized_program=`echo "$1" | sed '
6560 + printf '%s\n' "'$1' is $msg."
6562 + configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
6563 + case $normalized_program in
6565 + echo "You should only need it if you modified 'configure.ac',"
6566 + echo "or m4 files included by it."
6567 + program_details 'autoconf'
6570 + echo "You should only need it if you modified 'acconfig.h' or"
6571 + echo "$configure_deps."
6572 + program_details 'autoheader'
6575 + echo "You should only need it if you modified 'Makefile.am' or"
6576 + echo "$configure_deps."
6577 + program_details 'automake'
6580 + echo "You should only need it if you modified 'acinclude.m4' or"
6581 + echo "$configure_deps."
6582 + program_details 'aclocal'
6585 + echo "You might have modified some maintainer files that require"
6586 + echo "the 'autom4te' program to be rebuilt."
6587 + program_details 'autom4te'
6590 + echo "You should only need it if you modified a '.y' file."
6591 + echo "You may want to install the GNU Bison package:"
6592 + echo "<$gnu_software_URL/bison/>"
6595 + echo "You should only need it if you modified a '.l' file."
6596 + echo "You may want to install the Fast Lexical Analyzer package:"
6597 + echo "<$flex_URL>"
6600 + echo "You should only need it if you modified a dependency" \
6602 + echo "You may want to install the GNU Help2man package:"
6603 + echo "<$gnu_software_URL/help2man/>"
6606 + echo "You should only need it if you modified a '.texi' file, or"
6607 + echo "any other file indirectly affecting the aspect of the manual."
6608 + echo "You might want to install the Texinfo package:"
6609 + echo "<$gnu_software_URL/texinfo/>"
6610 + echo "The spurious makeinfo call might also be the consequence of"
6611 + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
6612 + echo "want to install GNU make:"
6613 + echo "<$gnu_software_URL/make/>"
6616 + echo "You might have modified some files without having the proper"
6617 + echo "tools for further handling them. Check the 'README' file, it"
6618 + echo "often tells you about the needed prerequisites for installing"
6619 + echo "this package. You may also peek at any GNU archive site, in"
6620 + echo "case some other package contains this missing '$1' program."
6625 +give_advice "$1" | sed -e '1s/^/WARNING: /' \
6626 + -e '2,$s/^/ /' >&2
6628 +# Propagate the correct exit status (expected to be 127 for a program
6629 +# not found, 63 for a program that failed due to version mismatch).
6633 # eval: (add-hook 'write-file-hooks 'time-stamp)
6634 diff -Nuar b/openvpn-2.3.3/sample/Makefile.in a/openvpn-2.3.4/sample/Makefile.in
6635 --- b/openvpn-2.3.3/sample/Makefile.in 2014-04-09 09:51:26.000000000 +0200
6636 +++ a/openvpn-2.3.4/sample/Makefile.in 2014-05-02 09:16:40.000000000 +0200
6638 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
6639 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
6642 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
6643 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6645 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
6647 # This Makefile.in is free software; the Free Software Foundation
6648 # gives unlimited permission to copy and/or distribute it,
6649 # with or without modifications, as long as this notice is preserved.
6654 -am__make_dryrun = \
6657 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
6658 +am__make_running_with_option = \
6659 + case $${target_option-} in \
6661 + *) echo "am__make_running_with_option: internal error: invalid" \
6662 + "target option '$${target_option-}' specified" >&2; \
6666 + sane_makeflags=$$MAKEFLAGS; \
6667 + if $(am__is_gnu_make); then \
6668 + sane_makeflags=$$MFLAGS; \
6670 case $$MAKEFLAGS in \
6672 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
6673 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
6675 - for am__flg in $$MAKEFLAGS; do \
6676 - case $$am__flg in \
6678 - *n*) am__dry=yes; break;; \
6682 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
6683 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
6685 - test $$am__dry = yes; \
6689 + strip_trailopt () \
6691 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
6693 + for flg in $$sane_makeflags; do \
6694 + test $$skip_next = yes && { skip_next=no; continue; }; \
6696 + *=*|--*) continue;; \
6697 + -*I) strip_trailopt 'I'; skip_next=yes;; \
6698 + -*I?*) strip_trailopt 'I';; \
6699 + -*O) strip_trailopt 'O'; skip_next=yes;; \
6700 + -*O?*) strip_trailopt 'O';; \
6701 + -*l) strip_trailopt 'l'; skip_next=yes;; \
6702 + -*l?*) strip_trailopt 'l';; \
6703 + -[dEDm]) skip_next=yes;; \
6704 + -[JT]) skip_next=yes;; \
6707 + *$$target_option*) has_opt=yes; break;; \
6710 + test $$has_opt = yes
6711 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
6712 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
6713 pkgdatadir = $(datadir)/@PACKAGE@
6714 pkgincludedir = $(includedir)/@PACKAGE@
6715 pkglibdir = $(libdir)/@PACKAGE@
6717 build_triplet = @build@
6718 host_triplet = @host@
6720 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
6721 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
6722 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
6723 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
6724 $(top_srcdir)/m4/ax_socklen_t.m4 \
6726 CONFIG_HEADER = $(top_builddir)/config.h
6727 CONFIG_CLEAN_FILES =
6728 CONFIG_CLEAN_VPATH_FILES =
6729 +AM_V_P = $(am__v_P_@AM_V@)
6730 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
6733 +AM_V_GEN = $(am__v_GEN_@AM_V@)
6734 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
6735 +am__v_GEN_0 = @echo " GEN " $@;
6737 +AM_V_at = $(am__v_at_@AM_V@)
6738 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
6743 am__can_run_installinfo = \
6744 @@ -114,9 +153,11 @@
6746 am__installdirs = "$(DESTDIR)$(sampledir)"
6747 DATA = $(sample_DATA)
6748 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
6749 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
6752 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
6755 AUTOCONF = @AUTOCONF@
6756 @@ -345,11 +386,11 @@
6757 @list='$(sample_DATA)'; test -n "$(sampledir)" || list=; \
6758 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
6759 dir='$(DESTDIR)$(sampledir)'; $(am__uninstall_files_from_dir)
6771 distdir: $(DISTFILES)
6772 @@ -489,16 +530,16 @@
6773 .MAKE: install-am install-strip
6775 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
6776 - distclean distclean-generic distclean-libtool distdir dvi \
6777 - dvi-am html html-am info info-am install install-am \
6778 - install-data install-data-am install-dvi install-dvi-am \
6779 - install-exec install-exec-am install-html install-html-am \
6780 - install-info install-info-am install-man install-pdf \
6781 - install-pdf-am install-ps install-ps-am install-sampleDATA \
6782 - install-strip installcheck installcheck-am installdirs \
6783 - maintainer-clean maintainer-clean-generic mostlyclean \
6784 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
6785 - uninstall uninstall-am uninstall-sampleDATA
6786 + cscopelist-am ctags-am distclean distclean-generic \
6787 + distclean-libtool distdir dvi dvi-am html html-am info info-am \
6788 + install install-am install-data install-data-am install-dvi \
6789 + install-dvi-am install-exec install-exec-am install-html \
6790 + install-html-am install-info install-info-am install-man \
6791 + install-pdf install-pdf-am install-ps install-ps-am \
6792 + install-sampleDATA install-strip installcheck installcheck-am \
6793 + installdirs maintainer-clean maintainer-clean-generic \
6794 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
6795 + ps ps-am tags-am uninstall uninstall-am uninstall-sampleDATA
6798 @WIN32_TRUE@client.ovpn: sample-config-files/client.conf
6799 diff -Nuar b/openvpn-2.3.3/sample/sample-plugins/defer/build a/openvpn-2.3.4/sample/sample-plugins/defer/build
6800 --- b/openvpn-2.3.3/sample/sample-plugins/defer/build 2014-04-09 09:42:15.000000000 +0200
6801 +++ a/openvpn-2.3.4/sample/sample-plugins/defer/build 2014-05-01 12:35:20.000000000 +0200
6803 CFLAGS="${CFLAGS:--O2 -Wall -g}"
6805 $CC $CPPFLAGS $CFLAGS -fPIC -c $1.c && \
6806 -$CC $CFLAGS -fPIC -shared ${LDFLAS} -Wl,-soname,$1.so -o $1.so $1.o -lc
6807 +$CC $CFLAGS -fPIC -shared ${LDFLAGS} -Wl,-soname,$1.so -o $1.so $1.o -lc
6808 diff -Nuar b/openvpn-2.3.3/src/compat/Makefile.in a/openvpn-2.3.4/src/compat/Makefile.in
6809 --- b/openvpn-2.3.3/src/compat/Makefile.in 2014-04-09 09:51:27.000000000 +0200
6810 +++ a/openvpn-2.3.4/src/compat/Makefile.in 2014-05-02 09:16:40.000000000 +0200
6812 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
6813 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
6816 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
6817 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6819 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
6821 # This Makefile.in is free software; the Free Software Foundation
6822 # gives unlimited permission to copy and/or distribute it,
6823 # with or without modifications, as long as this notice is preserved.
6828 -am__make_dryrun = \
6831 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
6832 +am__make_running_with_option = \
6833 + case $${target_option-} in \
6835 + *) echo "am__make_running_with_option: internal error: invalid" \
6836 + "target option '$${target_option-}' specified" >&2; \
6840 + sane_makeflags=$$MAKEFLAGS; \
6841 + if $(am__is_gnu_make); then \
6842 + sane_makeflags=$$MFLAGS; \
6844 case $$MAKEFLAGS in \
6846 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
6847 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
6849 - for am__flg in $$MAKEFLAGS; do \
6850 - case $$am__flg in \
6852 - *n*) am__dry=yes; break;; \
6856 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
6857 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
6861 + strip_trailopt () \
6863 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
6865 + for flg in $$sane_makeflags; do \
6866 + test $$skip_next = yes && { skip_next=no; continue; }; \
6868 + *=*|--*) continue;; \
6869 + -*I) strip_trailopt 'I'; skip_next=yes;; \
6870 + -*I?*) strip_trailopt 'I';; \
6871 + -*O) strip_trailopt 'O'; skip_next=yes;; \
6872 + -*O?*) strip_trailopt 'O';; \
6873 + -*l) strip_trailopt 'l'; skip_next=yes;; \
6874 + -*l?*) strip_trailopt 'l';; \
6875 + -[dEDm]) skip_next=yes;; \
6876 + -[JT]) skip_next=yes;; \
6879 + *$$target_option*) has_opt=yes; break;; \
6881 - test $$am__dry = yes; \
6884 + test $$has_opt = yes
6885 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
6886 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
6887 pkgdatadir = $(datadir)/@PACKAGE@
6888 pkgincludedir = $(includedir)/@PACKAGE@
6889 pkglibdir = $(libdir)/@PACKAGE@
6891 build_triplet = @build@
6892 host_triplet = @host@
6894 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
6895 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
6896 + $(top_srcdir)/depcomp
6897 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
6898 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
6899 $(top_srcdir)/m4/ax_socklen_t.m4 \
6900 @@ -84,19 +112,44 @@
6901 compat-gettimeofday.lo compat-daemon.lo compat-inet_ntop.lo \
6903 libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS)
6904 +AM_V_lt = $(am__v_lt_@AM_V@)
6905 +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
6906 +am__v_lt_0 = --silent
6908 +AM_V_P = $(am__v_P_@AM_V@)
6909 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
6912 +AM_V_GEN = $(am__v_GEN_@AM_V@)
6913 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
6914 +am__v_GEN_0 = @echo " GEN " $@;
6916 +AM_V_at = $(am__v_at_@AM_V@)
6917 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
6920 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
6921 depcomp = $(SHELL) $(top_srcdir)/depcomp
6922 am__depfiles_maybe = depfiles
6924 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
6925 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
6926 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
6927 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
6928 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
6929 +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
6930 + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
6931 + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
6932 + $(AM_CFLAGS) $(CFLAGS)
6933 +AM_V_CC = $(am__v_CC_@AM_V@)
6934 +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
6935 +am__v_CC_0 = @echo " CC " $@;
6938 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
6939 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
6941 +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
6942 + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
6943 + $(AM_LDFLAGS) $(LDFLAGS) -o $@
6944 +AM_V_CCLD = $(am__v_CCLD_@AM_V@)
6945 +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
6946 +am__v_CCLD_0 = @echo " CCLD " $@;
6948 SOURCES = $(libcompat_la_SOURCES)
6949 DIST_SOURCES = $(libcompat_la_SOURCES)
6950 am__can_run_installinfo = \
6951 @@ -104,11 +157,29 @@
6953 *) (install-info --version) >/dev/null 2>&1;; \
6955 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
6956 +# Read a list of newline-separated strings from the standard input,
6957 +# and print each of them once, without duplicates. Input order is
6959 +am__uniquify_input = $(AWK) '\
6960 + BEGIN { nonempty = 0; } \
6961 + { items[$$0] = 1; nonempty = 1; } \
6962 + END { if (nonempty) { for (i in items) print i; }; } \
6964 +# Make sure the list of sources is unique. This is necessary because,
6965 +# e.g., the same source file might be shared among _SOURCES variables
6966 +# for different programs/libraries.
6967 +am__define_uniq_tagged_files = \
6968 + list='$(am__tagged_files)'; \
6969 + unique=`for i in $$list; do \
6970 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6971 + done | $(am__uniquify_input)`
6974 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
6977 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
6980 AUTOCONF = @AUTOCONF@
6981 @@ -317,14 +388,17 @@
6983 clean-noinstLTLIBRARIES:
6984 -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
6985 - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
6986 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
6987 - test "$$dir" != "$$p" || dir=.; \
6988 - echo "rm -f \"$${dir}/so_locations\""; \
6989 - rm -f "$${dir}/so_locations"; \
6991 + @list='$(noinst_LTLIBRARIES)'; \
6992 + locs=`for p in $$list; do echo $$p; done | \
6993 + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
6995 + test -z "$$locs" || { \
6996 + echo rm -f $${locs}; \
7000 libcompat.la: $(libcompat_la_OBJECTS) $(libcompat_la_DEPENDENCIES) $(EXTRA_libcompat_la_DEPENDENCIES)
7001 - $(LINK) $(libcompat_la_OBJECTS) $(libcompat_la_LIBADD) $(LIBS)
7002 + $(AM_V_CCLD)$(LINK) $(libcompat_la_OBJECTS) $(libcompat_la_LIBADD) $(LIBS)
7004 mostlyclean-compile:
7006 @@ -340,25 +414,25 @@
7007 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat-inet_pton.Plo@am__quote@
7010 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
7011 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
7012 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
7013 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
7014 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
7015 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
7016 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7017 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
7018 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
7021 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
7022 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
7023 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
7024 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
7025 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
7026 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
7027 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7028 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
7029 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
7032 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
7033 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
7034 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
7035 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
7036 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
7037 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
7038 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7039 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
7040 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
7042 mostlyclean-libtool:
7044 @@ -366,26 +440,15 @@
7048 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
7049 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
7050 - unique=`for i in $$list; do \
7051 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7053 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
7054 - END { if (nonempty) { for (i in files) print i; }; }'`; \
7055 - mkid -fID $$unique
7057 +ID: $(am__tagged_files)
7058 + $(am__define_uniq_tagged_files); mkid -fID $$unique
7062 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
7063 - $(TAGS_FILES) $(LISP)
7064 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
7067 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
7068 - unique=`for i in $$list; do \
7069 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7071 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
7072 - END { if (nonempty) { for (i in files) print i; }; }'`; \
7073 + $(am__define_uniq_tagged_files); \
7075 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
7076 test -n "$$unique" || unique=$$empty_fix; \
7077 @@ -397,15 +460,11 @@
7082 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
7083 - $(TAGS_FILES) $(LISP)
7084 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
7085 - unique=`for i in $$list; do \
7086 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7088 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
7089 - END { if (nonempty) { for (i in files) print i; }; }'`; \
7093 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
7094 + $(am__define_uniq_tagged_files); \
7095 test -z "$(CTAGS_ARGS)$$unique" \
7096 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
7098 @@ -414,6 +473,21 @@
7099 here=`$(am__cd) $(top_builddir) && pwd` \
7100 && $(am__cd) $(top_srcdir) \
7101 && gtags -i $(GTAGS_ARGS) "$$here"
7102 +cscopelist: cscopelist-am
7104 +cscopelist-am: $(am__tagged_files)
7105 + list='$(am__tagged_files)'; \
7106 + case "$(srcdir)" in \
7107 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
7108 + *) sdir=$(subdir)/$(srcdir) ;; \
7110 + for i in $$list; do \
7111 + if test -f "$$i"; then \
7112 + echo "$(subdir)/$$i"; \
7114 + echo "$$sdir/$$i"; \
7116 + done >> $(top_builddir)/cscope.files
7119 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
7120 @@ -556,18 +630,19 @@
7122 .MAKE: install-am install-strip
7124 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
7125 - clean-libtool clean-noinstLTLIBRARIES ctags distclean \
7126 - distclean-compile distclean-generic distclean-libtool \
7127 - distclean-tags distdir dvi dvi-am html html-am info info-am \
7128 - install install-am install-data install-data-am install-dvi \
7129 - install-dvi-am install-exec install-exec-am install-html \
7130 - install-html-am install-info install-info-am install-man \
7131 - install-pdf install-pdf-am install-ps install-ps-am \
7132 - install-strip installcheck installcheck-am installdirs \
7133 - maintainer-clean maintainer-clean-generic mostlyclean \
7134 - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
7135 - pdf pdf-am ps ps-am tags uninstall uninstall-am
7136 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
7137 + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
7138 + ctags-am distclean distclean-compile distclean-generic \
7139 + distclean-libtool distclean-tags distdir dvi dvi-am html \
7140 + html-am info info-am install install-am install-data \
7141 + install-data-am install-dvi install-dvi-am install-exec \
7142 + install-exec-am install-html install-html-am install-info \
7143 + install-info-am install-man install-pdf install-pdf-am \
7144 + install-ps install-ps-am install-strip installcheck \
7145 + installcheck-am installdirs maintainer-clean \
7146 + maintainer-clean-generic mostlyclean mostlyclean-compile \
7147 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
7148 + tags tags-am uninstall uninstall-am
7151 # Tell versions [3.59,3.63) of GNU make to not export all variables.
7152 diff -Nuar b/openvpn-2.3.3/src/Makefile.in a/openvpn-2.3.4/src/Makefile.in
7153 --- b/openvpn-2.3.3/src/Makefile.in 2014-04-09 09:51:26.000000000 +0200
7154 +++ a/openvpn-2.3.4/src/Makefile.in 2014-05-02 09:16:40.000000000 +0200
7156 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
7157 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
7160 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7161 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
7163 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
7165 # This Makefile.in is free software; the Free Software Foundation
7166 # gives unlimited permission to copy and/or distribute it,
7167 # with or without modifications, as long as this notice is preserved.
7169 # Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
7172 -am__make_dryrun = \
7175 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
7176 +am__make_running_with_option = \
7177 + case $${target_option-} in \
7179 + *) echo "am__make_running_with_option: internal error: invalid" \
7180 + "target option '$${target_option-}' specified" >&2; \
7184 + sane_makeflags=$$MAKEFLAGS; \
7185 + if $(am__is_gnu_make); then \
7186 + sane_makeflags=$$MFLAGS; \
7188 case $$MAKEFLAGS in \
7190 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
7191 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
7193 - for am__flg in $$MAKEFLAGS; do \
7194 - case $$am__flg in \
7196 - *n*) am__dry=yes; break;; \
7200 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
7201 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
7205 + strip_trailopt () \
7207 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
7209 + for flg in $$sane_makeflags; do \
7210 + test $$skip_next = yes && { skip_next=no; continue; }; \
7212 + *=*|--*) continue;; \
7213 + -*I) strip_trailopt 'I'; skip_next=yes;; \
7214 + -*I?*) strip_trailopt 'I';; \
7215 + -*O) strip_trailopt 'O'; skip_next=yes;; \
7216 + -*O?*) strip_trailopt 'O';; \
7217 + -*l) strip_trailopt 'l'; skip_next=yes;; \
7218 + -*l?*) strip_trailopt 'l';; \
7219 + -[dEDm]) skip_next=yes;; \
7220 + -[JT]) skip_next=yes;; \
7223 + *$$target_option*) has_opt=yes; break;; \
7225 - test $$am__dry = yes; \
7228 + test $$has_opt = yes
7229 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
7230 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
7231 pkgdatadir = $(datadir)/@PACKAGE@
7232 pkgincludedir = $(includedir)/@PACKAGE@
7233 pkglibdir = $(libdir)/@PACKAGE@
7235 build_triplet = @build@
7236 host_triplet = @host@
7238 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
7239 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
7240 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
7241 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
7242 $(top_srcdir)/m4/ax_socklen_t.m4 \
7243 @@ -77,15 +104,28 @@
7244 CONFIG_HEADER = $(top_builddir)/config.h
7245 CONFIG_CLEAN_FILES =
7246 CONFIG_CLEAN_VPATH_FILES =
7247 +AM_V_P = $(am__v_P_@AM_V@)
7248 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
7251 +AM_V_GEN = $(am__v_GEN_@AM_V@)
7252 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
7253 +am__v_GEN_0 = @echo " GEN " $@;
7255 +AM_V_at = $(am__v_at_@AM_V@)
7256 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
7261 -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
7262 - html-recursive info-recursive install-data-recursive \
7263 - install-dvi-recursive install-exec-recursive \
7264 - install-html-recursive install-info-recursive \
7265 - install-pdf-recursive install-ps-recursive install-recursive \
7266 - installcheck-recursive installdirs-recursive pdf-recursive \
7267 - ps-recursive uninstall-recursive
7268 +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
7269 + ctags-recursive dvi-recursive html-recursive info-recursive \
7270 + install-data-recursive install-dvi-recursive \
7271 + install-exec-recursive install-html-recursive \
7272 + install-info-recursive install-pdf-recursive \
7273 + install-ps-recursive install-recursive installcheck-recursive \
7274 + installdirs-recursive pdf-recursive ps-recursive \
7275 + tags-recursive uninstall-recursive
7276 am__can_run_installinfo = \
7277 case $$AM_UPDATE_INFO_DIR in \
7281 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
7282 distclean-recursive maintainer-clean-recursive
7283 -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
7284 - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
7285 +am__recursive_targets = \
7286 + $(RECURSIVE_TARGETS) \
7287 + $(RECURSIVE_CLEAN_TARGETS) \
7288 + $(am__extra_recursive_targets)
7289 +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
7291 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
7292 +# Read a list of newline-separated strings from the standard input,
7293 +# and print each of them once, without duplicates. Input order is
7295 +am__uniquify_input = $(AWK) '\
7296 + BEGIN { nonempty = 0; } \
7297 + { items[$$0] = 1; nonempty = 1; } \
7298 + END { if (nonempty) { for (i in items) print i; }; } \
7300 +# Make sure the list of sources is unique. This is necessary because,
7301 +# e.g., the same source file might be shared among _SOURCES variables
7302 +# for different programs/libraries.
7303 +am__define_uniq_tagged_files = \
7304 + list='$(am__tagged_files)'; \
7305 + unique=`for i in $$list; do \
7306 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7307 + done | $(am__uniquify_input)`
7310 DIST_SUBDIRS = $(SUBDIRS)
7315 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
7318 AUTOCONF = @AUTOCONF@
7319 @@ -325,22 +386,25 @@
7322 # This directory's subdirectories are mostly independent; you can cd
7323 -# into them and run `make' without going through this Makefile.
7324 -# To change the values of `make' variables: instead of editing Makefiles,
7325 -# (1) if the variable is set in `config.status', edit `config.status'
7326 -# (which will cause the Makefiles to be regenerated when you run `make');
7327 -# (2) otherwise, pass the desired values on the `make' command line.
7328 -$(RECURSIVE_TARGETS):
7329 - @fail= failcom='exit 1'; \
7330 - for f in x $$MAKEFLAGS; do \
7332 - *=* | --[!k]*);; \
7333 - *k*) failcom='fail=yes';; \
7336 +# into them and run 'make' without going through this Makefile.
7337 +# To change the values of 'make' variables: instead of editing Makefiles,
7338 +# (1) if the variable is set in 'config.status', edit 'config.status'
7339 +# (which will cause the Makefiles to be regenerated when you run 'make');
7340 +# (2) otherwise, pass the desired values on the 'make' command line.
7341 +$(am__recursive_targets):
7343 + if $(am__make_keepgoing); then \
7344 + failcom='fail=yes'; \
7346 + failcom='exit 1'; \
7349 target=`echo $@ | sed s/-recursive//`; \
7350 - list='$(SUBDIRS)'; for subdir in $$list; do \
7352 + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
7353 + *) list='$(SUBDIRS)' ;; \
7355 + for subdir in $$list; do \
7356 echo "Making $$target in $$subdir"; \
7357 if test "$$subdir" = "."; then \
7359 @@ -355,57 +419,12 @@
7360 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
7361 fi; test -z "$$fail"
7363 -$(RECURSIVE_CLEAN_TARGETS):
7364 - @fail= failcom='exit 1'; \
7365 - for f in x $$MAKEFLAGS; do \
7367 - *=* | --[!k]*);; \
7368 - *k*) failcom='fail=yes';; \
7373 - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
7374 - *) list='$(SUBDIRS)' ;; \
7376 - rev=''; for subdir in $$list; do \
7377 - if test "$$subdir" = "."; then :; else \
7378 - rev="$$subdir $$rev"; \
7382 - target=`echo $@ | sed s/-recursive//`; \
7383 - for subdir in $$rev; do \
7384 - echo "Making $$target in $$subdir"; \
7385 - if test "$$subdir" = "."; then \
7386 - local_target="$$target-am"; \
7388 - local_target="$$target"; \
7390 - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
7391 - || eval $$failcom; \
7392 - done && test -z "$$fail"
7394 - list='$(SUBDIRS)'; for subdir in $$list; do \
7395 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
7398 - list='$(SUBDIRS)'; for subdir in $$list; do \
7399 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
7402 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
7403 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
7404 - unique=`for i in $$list; do \
7405 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7407 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
7408 - END { if (nonempty) { for (i in files) print i; }; }'`; \
7409 - mkid -fID $$unique
7411 +ID: $(am__tagged_files)
7412 + $(am__define_uniq_tagged_files); mkid -fID $$unique
7413 +tags: tags-recursive
7416 -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
7417 - $(TAGS_FILES) $(LISP)
7418 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
7421 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
7422 @@ -421,12 +440,7 @@
7423 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
7426 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
7427 - unique=`for i in $$list; do \
7428 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7430 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
7431 - END { if (nonempty) { for (i in files) print i; }; }'`; \
7432 + $(am__define_uniq_tagged_files); \
7434 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
7435 test -n "$$unique" || unique=$$empty_fix; \
7436 @@ -438,15 +452,11 @@
7441 -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
7442 - $(TAGS_FILES) $(LISP)
7443 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
7444 - unique=`for i in $$list; do \
7445 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7447 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
7448 - END { if (nonempty) { for (i in files) print i; }; }'`; \
7449 +ctags: ctags-recursive
7452 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
7453 + $(am__define_uniq_tagged_files); \
7454 test -z "$(CTAGS_ARGS)$$unique" \
7455 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
7457 @@ -455,6 +465,21 @@
7458 here=`$(am__cd) $(top_builddir) && pwd` \
7459 && $(am__cd) $(top_srcdir) \
7460 && gtags -i $(GTAGS_ARGS) "$$here"
7461 +cscopelist: cscopelist-recursive
7463 +cscopelist-am: $(am__tagged_files)
7464 + list='$(am__tagged_files)'; \
7465 + case "$(srcdir)" in \
7466 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
7467 + *) sdir=$(subdir)/$(srcdir) ;; \
7469 + for i in $$list; do \
7470 + if test -f "$$i"; then \
7471 + echo "$(subdir)/$$i"; \
7473 + echo "$$sdir/$$i"; \
7475 + done >> $(top_builddir)/cscope.files
7478 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
7479 @@ -616,22 +641,20 @@
7483 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
7484 - install-am install-strip tags-recursive
7485 +.MAKE: $(am__recursive_targets) install-am install-strip
7487 -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
7488 - all all-am check check-am clean clean-generic clean-libtool \
7489 - ctags ctags-recursive distclean distclean-generic \
7490 - distclean-libtool distclean-tags distdir dvi dvi-am html \
7491 - html-am info info-am install install-am install-data \
7492 - install-data-am install-dvi install-dvi-am install-exec \
7493 - install-exec-am install-html install-html-am install-info \
7494 - install-info-am install-man install-pdf install-pdf-am \
7495 - install-ps install-ps-am install-strip installcheck \
7496 - installcheck-am installdirs installdirs-am maintainer-clean \
7497 - maintainer-clean-generic mostlyclean mostlyclean-generic \
7498 - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
7499 - uninstall uninstall-am
7500 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
7501 + check-am clean clean-generic clean-libtool cscopelist-am ctags \
7502 + ctags-am distclean distclean-generic distclean-libtool \
7503 + distclean-tags distdir dvi dvi-am html html-am info info-am \
7504 + install install-am install-data install-data-am install-dvi \
7505 + install-dvi-am install-exec install-exec-am install-html \
7506 + install-html-am install-info install-info-am install-man \
7507 + install-pdf install-pdf-am install-ps install-ps-am \
7508 + install-strip installcheck installcheck-am installdirs \
7509 + installdirs-am maintainer-clean maintainer-clean-generic \
7510 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
7511 + ps ps-am tags tags-am uninstall uninstall-am
7514 # Tell versions [3.59,3.63) of GNU make to not export all variables.
7515 diff -Nuar b/openvpn-2.3.3/src/openvpn/Makefile.in a/openvpn-2.3.4/src/openvpn/Makefile.in
7516 --- b/openvpn-2.3.3/src/openvpn/Makefile.in 2014-04-09 09:51:27.000000000 +0200
7517 +++ a/openvpn-2.3.4/src/openvpn/Makefile.in 2014-05-02 09:16:40.000000000 +0200
7519 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
7520 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
7523 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7524 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
7526 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
7528 # This Makefile.in is free software; the Free Software Foundation
7529 # gives unlimited permission to copy and/or distribute it,
7530 # with or without modifications, as long as this notice is preserved.
7532 # Required to build Windows resource file
7535 -am__make_dryrun = \
7538 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
7539 +am__make_running_with_option = \
7540 + case $${target_option-} in \
7542 + *) echo "am__make_running_with_option: internal error: invalid" \
7543 + "target option '$${target_option-}' specified" >&2; \
7547 + sane_makeflags=$$MAKEFLAGS; \
7548 + if $(am__is_gnu_make); then \
7549 + sane_makeflags=$$MFLAGS; \
7551 case $$MAKEFLAGS in \
7553 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
7554 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
7556 - for am__flg in $$MAKEFLAGS; do \
7557 - case $$am__flg in \
7559 - *n*) am__dry=yes; break;; \
7563 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
7564 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
7568 + strip_trailopt () \
7570 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
7572 + for flg in $$sane_makeflags; do \
7573 + test $$skip_next = yes && { skip_next=no; continue; }; \
7575 + *=*|--*) continue;; \
7576 + -*I) strip_trailopt 'I'; skip_next=yes;; \
7577 + -*I?*) strip_trailopt 'I';; \
7578 + -*O) strip_trailopt 'O'; skip_next=yes;; \
7579 + -*O?*) strip_trailopt 'O';; \
7580 + -*l) strip_trailopt 'l'; skip_next=yes;; \
7581 + -*l?*) strip_trailopt 'l';; \
7582 + -[dEDm]) skip_next=yes;; \
7583 + -[JT]) skip_next=yes;; \
7586 + *$$target_option*) has_opt=yes; break;; \
7588 - test $$am__dry = yes; \
7591 + test $$has_opt = yes
7592 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
7593 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
7594 pkgdatadir = $(datadir)/@PACKAGE@
7595 pkgincludedir = $(includedir)/@PACKAGE@
7596 pkglibdir = $(libdir)/@PACKAGE@
7599 build_triplet = @build@
7600 host_triplet = @host@
7601 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
7602 - $(top_srcdir)/build/ltrc.inc
7603 +DIST_COMMON = $(top_srcdir)/build/ltrc.inc $(srcdir)/Makefile.in \
7604 + $(srcdir)/Makefile.am $(top_srcdir)/depcomp
7605 # we want unicode entry point but not the macro
7606 @WIN32_TRUE@am__append_1 = -municode -UUNICODE
7607 sbin_PROGRAMS = openvpn$(EXEEXT)
7608 @@ -155,19 +182,44 @@
7609 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
7610 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
7611 $(am__DEPENDENCIES_1)
7612 +AM_V_lt = $(am__v_lt_@AM_V@)
7613 +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
7614 +am__v_lt_0 = --silent
7616 +AM_V_P = $(am__v_P_@AM_V@)
7617 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
7620 +AM_V_GEN = $(am__v_GEN_@AM_V@)
7621 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
7622 +am__v_GEN_0 = @echo " GEN " $@;
7624 +AM_V_at = $(am__v_at_@AM_V@)
7625 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
7628 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
7629 depcomp = $(SHELL) $(top_srcdir)/depcomp
7630 am__depfiles_maybe = depfiles
7632 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
7633 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
7634 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
7635 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
7636 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
7637 +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
7638 + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
7639 + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
7640 + $(AM_CFLAGS) $(CFLAGS)
7641 +AM_V_CC = $(am__v_CC_@AM_V@)
7642 +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
7643 +am__v_CC_0 = @echo " CC " $@;
7646 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
7647 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
7649 +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
7650 + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
7651 + $(AM_LDFLAGS) $(LDFLAGS) -o $@
7652 +AM_V_CCLD = $(am__v_CCLD_@AM_V@)
7653 +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
7654 +am__v_CCLD_0 = @echo " CCLD " $@;
7656 SOURCES = $(openvpn_SOURCES)
7657 DIST_SOURCES = $(am__openvpn_SOURCES_DIST)
7658 am__can_run_installinfo = \
7659 @@ -175,11 +227,29 @@
7661 *) (install-info --version) >/dev/null 2>&1;; \
7663 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
7664 +# Read a list of newline-separated strings from the standard input,
7665 +# and print each of them once, without duplicates. Input order is
7667 +am__uniquify_input = $(AWK) '\
7668 + BEGIN { nonempty = 0; } \
7669 + { items[$$0] = 1; nonempty = 1; } \
7670 + END { if (nonempty) { for (i in items) print i; }; } \
7672 +# Make sure the list of sources is unique. This is necessary because,
7673 +# e.g., the same source file might be shared among _SOURCES variables
7674 +# for different programs/libraries.
7675 +am__define_uniq_tagged_files = \
7676 + list='$(am__tagged_files)'; \
7677 + unique=`for i in $$list; do \
7678 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7679 + done | $(am__uniquify_input)`
7682 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
7685 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
7688 AUTOCONF = @AUTOCONF@
7689 @@ -426,10 +496,12 @@
7691 for p in $$list; do echo "$$p $$p"; done | \
7692 sed 's/$(EXEEXT)$$//' | \
7693 - while read p p1; do if test -f $$p || test -f $$p1; \
7694 - then echo "$$p"; echo "$$p"; else :; fi; \
7695 + while read p p1; do if test -f $$p \
7697 + ; then echo "$$p"; echo "$$p"; else :; fi; \
7699 - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
7700 + sed -e 'p;s,.*/,,;n;h' \
7702 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
7703 sed 'N;N;N;s,\n, ,g' | \
7704 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
7706 @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
7707 files=`for p in $$list; do echo "$$p"; done | \
7708 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
7709 - -e 's/$$/$(EXEEXT)/' `; \
7710 + -e 's/$$/$(EXEEXT)/' \
7712 test -n "$$list" || exit 0; \
7713 echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
7714 cd "$(DESTDIR)$(sbindir)" && rm -f $$files
7715 @@ -463,9 +536,10 @@
7716 list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
7717 echo " rm -f" $$list; \
7720 openvpn$(EXEEXT): $(openvpn_OBJECTS) $(openvpn_DEPENDENCIES) $(EXTRA_openvpn_DEPENDENCIES)
7721 @rm -f openvpn$(EXEEXT)
7722 - $(LINK) $(openvpn_OBJECTS) $(openvpn_LDADD) $(LIBS)
7723 + $(AM_V_CCLD)$(LINK) $(openvpn_OBJECTS) $(openvpn_LDADD) $(LIBS)
7725 mostlyclean-compile:
7727 @@ -543,25 +617,25 @@
7728 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Po@am__quote@
7731 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
7732 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
7733 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
7734 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
7735 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
7736 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
7737 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7738 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
7739 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
7742 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
7743 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
7744 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
7745 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
7746 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
7747 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
7748 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7749 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
7750 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
7753 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
7754 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
7755 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
7756 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
7757 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
7758 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
7759 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7760 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
7761 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
7763 mostlyclean-libtool:
7765 @@ -569,26 +643,15 @@
7769 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
7770 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
7771 - unique=`for i in $$list; do \
7772 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7774 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
7775 - END { if (nonempty) { for (i in files) print i; }; }'`; \
7776 - mkid -fID $$unique
7778 +ID: $(am__tagged_files)
7779 + $(am__define_uniq_tagged_files); mkid -fID $$unique
7783 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
7784 - $(TAGS_FILES) $(LISP)
7785 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
7788 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
7789 - unique=`for i in $$list; do \
7790 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7792 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
7793 - END { if (nonempty) { for (i in files) print i; }; }'`; \
7794 + $(am__define_uniq_tagged_files); \
7796 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
7797 test -n "$$unique" || unique=$$empty_fix; \
7798 @@ -600,15 +663,11 @@
7803 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
7804 - $(TAGS_FILES) $(LISP)
7805 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
7806 - unique=`for i in $$list; do \
7807 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
7809 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
7810 - END { if (nonempty) { for (i in files) print i; }; }'`; \
7814 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
7815 + $(am__define_uniq_tagged_files); \
7816 test -z "$(CTAGS_ARGS)$$unique" \
7817 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
7819 @@ -617,6 +676,21 @@
7820 here=`$(am__cd) $(top_builddir) && pwd` \
7821 && $(am__cd) $(top_srcdir) \
7822 && gtags -i $(GTAGS_ARGS) "$$here"
7823 +cscopelist: cscopelist-am
7825 +cscopelist-am: $(am__tagged_files)
7826 + list='$(am__tagged_files)'; \
7827 + case "$(srcdir)" in \
7828 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
7829 + *) sdir=$(subdir)/$(srcdir) ;; \
7831 + for i in $$list; do \
7832 + if test -f "$$i"; then \
7833 + echo "$(subdir)/$$i"; \
7835 + echo "$$sdir/$$i"; \
7837 + done >> $(top_builddir)/cscope.files
7840 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
7841 @@ -762,19 +836,19 @@
7843 .MAKE: install-am install-strip
7845 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
7846 - clean-libtool clean-sbinPROGRAMS ctags distclean \
7847 - distclean-compile distclean-generic distclean-libtool \
7848 - distclean-tags distdir dvi dvi-am html html-am info info-am \
7849 - install install-am install-data install-data-am install-dvi \
7850 - install-dvi-am install-exec install-exec-am install-html \
7851 - install-html-am install-info install-info-am install-man \
7852 - install-pdf install-pdf-am install-ps install-ps-am \
7853 - install-sbinPROGRAMS install-strip installcheck \
7854 - installcheck-am installdirs maintainer-clean \
7855 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
7856 + clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \
7857 + distclean distclean-compile distclean-generic \
7858 + distclean-libtool distclean-tags distdir dvi dvi-am html \
7859 + html-am info info-am install install-am install-data \
7860 + install-data-am install-dvi install-dvi-am install-exec \
7861 + install-exec-am install-html install-html-am install-info \
7862 + install-info-am install-man install-pdf install-pdf-am \
7863 + install-ps install-ps-am install-sbinPROGRAMS install-strip \
7864 + installcheck installcheck-am installdirs maintainer-clean \
7865 maintainer-clean-generic mostlyclean mostlyclean-compile \
7866 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
7867 - tags uninstall uninstall-am uninstall-sbinPROGRAMS
7868 + tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS
7872 diff -Nuar b/openvpn-2.3.3/src/openvpn/openvpn.c a/openvpn-2.3.4/src/openvpn/openvpn.c
7873 --- b/openvpn-2.3.3/src/openvpn/openvpn.c 2014-04-09 09:42:15.000000000 +0200
7874 +++ a/openvpn-2.3.4/src/openvpn/openvpn.c 2014-05-01 12:35:20.000000000 +0200
7877 /* print version number */
7878 msg (M_INFO, "%s", title_string);
7879 + show_library_versions(M_INFO);
7882 pre_setup (&c.options);
7883 diff -Nuar b/openvpn-2.3.3/src/openvpn/options.c a/openvpn-2.3.4/src/openvpn/options.c
7884 --- b/openvpn-2.3.3/src/openvpn/options.c 2014-04-09 09:47:37.000000000 +0200
7885 +++ a/openvpn-2.3.4/src/openvpn/options.c 2014-05-01 13:12:22.000000000 +0200
7886 @@ -3436,10 +3436,28 @@
7887 openvpn_exit (OPENVPN_EXIT_STATUS_USAGE); /* exit point */
7891 +show_library_versions(const unsigned int flags)
7893 + msg (flags, "library versions: %s%s%s",
7895 + get_ssl_library_version(),
7900 + ", LZO ", lzo_version_string()
7908 usage_version (void)
7910 msg (M_INFO|M_NOPREFIX, "%s", title_string);
7911 + show_library_versions( M_INFO|M_NOPREFIX );
7912 msg (M_INFO|M_NOPREFIX, "Originally developed by James Yonan");
7913 msg (M_INFO|M_NOPREFIX, "Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>");
7914 #ifndef ENABLE_SMALL
7915 @@ -4129,7 +4147,7 @@
7917 read_config_file (options, p[1], level, file, line, msglevel, permission_mask, option_types_found, es);
7919 -#ifdef ENABLE_DEBUG
7920 +#if defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL)
7921 else if (streq (p[0], "show-gateway"))
7923 struct route_gateway_info rgi;
7924 diff -Nuar b/openvpn-2.3.3/src/openvpn/proto.c a/openvpn-2.3.4/src/openvpn/proto.c
7925 --- b/openvpn-2.3.3/src/openvpn/proto.c 2014-04-09 09:42:15.000000000 +0200
7926 +++ a/openvpn-2.3.4/src/openvpn/proto.c 2014-05-01 12:35:20.000000000 +0200
7928 + sizeof (struct openvpn_iphdr)))
7930 eh = (const struct openvpn_ethhdr *) BPTR (buf);
7931 - if (ntohs (eh->proto) != OPENVPN_ETH_P_IPV4)
7932 + if (ntohs (eh->proto) != (ip_ver == 6 ? OPENVPN_ETH_P_IPV6 : OPENVPN_ETH_P_IPV4))
7934 offset = sizeof (struct openvpn_ethhdr);
7936 diff -Nuar b/openvpn-2.3.3/src/openvpn/route.c a/openvpn-2.3.4/src/openvpn/route.c
7937 --- b/openvpn-2.3.3/src/openvpn/route.c 2014-04-09 09:47:37.000000000 +0200
7938 +++ a/openvpn-2.3.4/src/openvpn/route.c 2014-05-01 13:12:22.000000000 +0200
7940 if (rl->rgi.flags & RGI_ADDR_DEFINED)
7942 setenv_route_addr (es, "net_gateway", rl->rgi.gateway.addr, -1);
7943 -#ifdef ENABLE_DEBUG
7944 +#if defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL)
7945 print_default_gateway (D_ROUTE, &rl->rgi);
7948 @@ -1974,10 +1974,16 @@
7949 argv_printf_cat (&argv, "METRIC %d", r->metric);
7952 + /* Windows XP to 7 "just delete" routes, wherever they came from, but
7953 + * in Windows 8(.1?), if you create them with "store=active", this is
7954 + * how you should delete them as well (pointed out by Cedric Tabary)
7956 + argv_printf_cat( &argv, " store=active" );
7958 argv_msg (D_ROUTE, &argv);
7960 netcmd_semaphore_lock ();
7961 - openvpn_execve_check (&argv, es, 0, "ERROR: Windows route add ipv6 command failed");
7962 + openvpn_execve_check (&argv, es, 0, "ERROR: Windows route delete ipv6 command failed");
7963 netcmd_semaphore_release ();
7965 #elif defined (TARGET_SOLARIS)
7966 diff -Nuar b/openvpn-2.3.3/src/openvpn/socket.c a/openvpn-2.3.4/src/openvpn/socket.c
7967 --- b/openvpn-2.3.3/src/openvpn/socket.c 2014-04-09 09:47:37.000000000 +0200
7968 +++ a/openvpn-2.3.4/src/openvpn/socket.c 2014-05-01 13:12:22.000000000 +0200
7969 @@ -2801,11 +2801,11 @@
7970 mesg.msg_name = &to->dest.addr.sa;
7971 mesg.msg_namelen = sizeof (struct sockaddr_in);
7972 mesg.msg_control = &opi;
7973 - mesg.msg_controllen = sizeof (struct openvpn_in4_pktinfo);
7975 +#ifdef HAVE_IN_PKTINFO
7976 + mesg.msg_controllen = sizeof (struct openvpn_in4_pktinfo);
7977 cmsg = CMSG_FIRSTHDR (&mesg);
7978 cmsg->cmsg_len = sizeof (struct openvpn_in4_pktinfo);
7979 -#ifdef HAVE_IN_PKTINFO
7980 cmsg->cmsg_level = SOL_IP;
7981 cmsg->cmsg_type = IP_PKTINFO;
7983 @@ -2816,6 +2816,10 @@
7984 pkti->ipi_addr.s_addr = 0;
7986 #elif defined(IP_RECVDSTADDR)
7987 + ASSERT( CMSG_SPACE(sizeof (struct in_addr)) <= sizeof(opi) );
7988 + mesg.msg_controllen = CMSG_SPACE(sizeof (struct in_addr));
7989 + cmsg = CMSG_FIRSTHDR (&mesg);
7990 + cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
7991 cmsg->cmsg_level = IPPROTO_IP;
7992 cmsg->cmsg_type = IP_RECVDSTADDR;
7993 *(struct in_addr *) CMSG_DATA (cmsg) = to->pi.in4;
7994 diff -Nuar b/openvpn-2.3.3/src/openvpn/socks.c a/openvpn-2.3.4/src/openvpn/socks.c
7995 --- b/openvpn-2.3.3/src/openvpn/socks.c 2014-04-09 09:47:37.000000000 +0200
7996 +++ a/openvpn-2.3.4/src/openvpn/socks.c 2014-05-01 13:12:22.000000000 +0200
7997 @@ -189,10 +189,15 @@
8000 const int timeout_sec = 5;
8003 - /* VER = 5, NMETHODS = 2, METHODS = [0 (no auth), 2 (plain login)] */
8004 - const ssize_t size = send (sd, "\x05\x02\x00\x02", 4, MSG_NOSIGNAL);
8006 + /* VER = 5, NMETHODS = 1, METHODS = [0 (no auth)] */
8007 + char method_sel[3] = { 0x05, 0x01, 0x00 };
8008 + if (p->authfile[0])
8009 + method_sel[2] = 0x02; /* METHODS = [2 (plain login)] */
8011 + size = send (sd, method_sel, sizeof (method_sel), MSG_NOSIGNAL);
8012 + if (size != sizeof (method_sel))
8014 msg (D_LINK_ERRORS | M_ERRNO, "socks_handshake: TCP port write failed on send()");
8016 @@ -252,6 +257,13 @@
8020 + /* validate that the auth method returned is the one sent */
8021 + if (buf[1] != method_sel[2])
8023 + msg (D_LINK_ERRORS, "socks_handshake: Socks proxy returned unexpected auth");
8027 /* select the appropriate authentication method */
8030 diff -Nuar b/openvpn-2.3.3/src/openvpn/ssl_backend.h a/openvpn-2.3.4/src/openvpn/ssl_backend.h
8031 --- b/openvpn-2.3.3/src/openvpn/ssl_backend.h 2014-04-09 09:47:37.000000000 +0200
8032 +++ a/openvpn-2.3.4/src/openvpn/ssl_backend.h 2014-05-01 13:12:22.000000000 +0200
8033 @@ -109,10 +109,11 @@
8034 * @return One of the TLS_VER_x constants or TLS_VER_BAD
8035 * if a parse error should be flagged.
8037 -#define TLS_VER_BAD -1
8038 -#define TLS_VER_1_0 0 /* default */
8039 -#define TLS_VER_1_1 1
8040 -#define TLS_VER_1_2 2
8041 +#define TLS_VER_BAD -1
8042 +#define TLS_VER_UNSPEC 0 /* default */
8043 +#define TLS_VER_1_0 1
8044 +#define TLS_VER_1_1 2
8045 +#define TLS_VER_1_2 3
8046 int tls_version_min_parse(const char *vstr, const char *extra);
8049 @@ -127,15 +128,17 @@
8050 * Initialise a library-specific TLS context for a server.
8052 * @param ctx TLS context to initialise
8053 + * @param ssl_flags SSLF_x flags from ssl_common.h
8055 -void tls_ctx_server_new(struct tls_root_ctx *ctx);
8056 +void tls_ctx_server_new(struct tls_root_ctx *ctx, unsigned int ssl_flags);
8059 * Initialises a library-specific TLS context for a client.
8061 * @param ctx TLS context to initialise
8062 + * @param ssl_flags SSLF_x flags from ssl_common.h
8064 -void tls_ctx_client_new(struct tls_root_ctx *ctx);
8065 +void tls_ctx_client_new(struct tls_root_ctx *ctx, unsigned int ssl_flags);
8068 * Frees the library-specific TLSv1 context
8069 @@ -465,4 +468,10 @@
8071 void get_highest_preference_tls_cipher (char *buf, int size);
8074 + * return a pointer to a static memory area containing the
8075 + * name and version number of the SSL library in use
8077 +char * get_ssl_library_version(void);
8079 #endif /* SSL_BACKEND_H_ */
8080 diff -Nuar b/openvpn-2.3.3/src/openvpn/ssl.c a/openvpn-2.3.4/src/openvpn/ssl.c
8081 --- b/openvpn-2.3.3/src/openvpn/ssl.c 2014-04-09 09:47:37.000000000 +0200
8082 +++ a/openvpn-2.3.4/src/openvpn/ssl.c 2014-05-01 13:12:22.000000000 +0200
8083 @@ -486,12 +486,12 @@
8085 if (options->tls_server)
8087 - tls_ctx_server_new(new_ctx);
8088 + tls_ctx_server_new(new_ctx, options->ssl_flags);
8089 tls_ctx_load_dh_params(new_ctx, options->dh_file, options->dh_file_inline);
8091 else /* if client */
8093 - tls_ctx_client_new(new_ctx);
8094 + tls_ctx_client_new(new_ctx, options->ssl_flags);
8097 tls_ctx_set_options(new_ctx, options->ssl_flags);
8098 @@ -1836,6 +1836,7 @@
8099 get_default_gateway (&rgi);
8100 if (rgi.flags & RGI_HWADDR_DEFINED)
8101 buf_printf (&out, "IV_HWADDR=%s\n", format_hex_ex (rgi.hwaddr, 6, 0, 1, ":", &gc));
8102 + buf_printf (&out, "IV_SSL=%s\n", get_ssl_library_version() );
8105 /* push env vars that begin with UV_ and IV_GUI_VER */
8106 diff -Nuar b/openvpn-2.3.3/src/openvpn/ssl_openssl.c a/openvpn-2.3.4/src/openvpn/ssl_openssl.c
8107 --- b/openvpn-2.3.3/src/openvpn/ssl_openssl.c 2014-04-09 09:47:37.000000000 +0200
8108 +++ a/openvpn-2.3.4/src/openvpn/ssl_openssl.c 2014-05-01 13:12:22.000000000 +0200
8109 @@ -119,11 +119,16 @@
8113 -tls_ctx_server_new(struct tls_root_ctx *ctx)
8114 +tls_ctx_server_new(struct tls_root_ctx *ctx, unsigned int ssl_flags)
8116 + const int tls_version_min = (ssl_flags >> SSLF_TLS_VERSION_SHIFT) & SSLF_TLS_VERSION_MASK;
8118 ASSERT(NULL != ctx);
8120 - ctx->ctx = SSL_CTX_new (SSLv23_server_method ());
8121 + if (tls_version_min > TLS_VER_UNSPEC)
8122 + ctx->ctx = SSL_CTX_new (SSLv23_server_method ());
8124 + ctx->ctx = SSL_CTX_new (TLSv1_server_method ());
8126 if (ctx->ctx == NULL)
8127 msg (M_SSLERR, "SSL_CTX_new SSLv23_server_method");
8128 @@ -132,11 +137,16 @@
8132 -tls_ctx_client_new(struct tls_root_ctx *ctx)
8133 +tls_ctx_client_new(struct tls_root_ctx *ctx, unsigned int ssl_flags)
8135 + const int tls_version_min = (ssl_flags >> SSLF_TLS_VERSION_SHIFT) & SSLF_TLS_VERSION_MASK;
8137 ASSERT(NULL != ctx);
8139 - ctx->ctx = SSL_CTX_new (SSLv23_client_method ());
8140 + if (tls_version_min > TLS_VER_UNSPEC)
8141 + ctx->ctx = SSL_CTX_new (SSLv23_client_method ());
8143 + ctx->ctx = SSL_CTX_new (TLSv1_client_method ());
8145 if (ctx->ctx == NULL)
8146 msg (M_SSLERR, "SSL_CTX_new SSLv23_client_method");
8147 @@ -1345,4 +1355,10 @@
8152 +get_ssl_library_version(void)
8154 + return SSLeay_version(SSLEAY_VERSION);
8157 #endif /* defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_OPENSSL) */
8158 diff -Nuar b/openvpn-2.3.3/src/openvpn/ssl_polarssl.c a/openvpn-2.3.4/src/openvpn/ssl_polarssl.c
8159 --- b/openvpn-2.3.3/src/openvpn/ssl_polarssl.c 2014-04-09 09:47:37.000000000 +0200
8160 +++ a/openvpn-2.3.4/src/openvpn/ssl_polarssl.c 2014-05-01 13:12:22.000000000 +0200
8165 -tls_ctx_server_new(struct tls_root_ctx *ctx)
8166 +tls_ctx_server_new(struct tls_root_ctx *ctx, unsigned int ssl_flags)
8168 ASSERT(NULL != ctx);
8174 -tls_ctx_client_new(struct tls_root_ctx *ctx)
8175 +tls_ctx_client_new(struct tls_root_ctx *ctx, unsigned int ssl_flags)
8177 ASSERT(NULL != ctx);
8179 @@ -1068,4 +1068,14 @@
8180 strncpynt (buf, cipher_name, size);
8184 +get_ssl_library_version(void)
8186 + static char polar_version[30];
8187 + unsigned int pv = version_get_number();
8188 + sprintf( polar_version, "PolarSSL %d.%d.%d",
8189 + (pv>>24)&0xff, (pv>>16)&0xff, (pv>>8)&0xff );
8190 + return polar_version;
8193 #endif /* defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_POLARSSL) */
8194 diff -Nuar b/openvpn-2.3.3/src/openvpn/ssl_verify_backend.h a/openvpn-2.3.4/src/openvpn/ssl_verify_backend.h
8195 --- b/openvpn-2.3.3/src/openvpn/ssl_verify_backend.h 2014-04-09 09:47:37.000000000 +0200
8196 +++ a/openvpn-2.3.4/src/openvpn/ssl_verify_backend.h 2014-05-01 13:12:22.000000000 +0200
8197 @@ -113,16 +113,31 @@
8198 char * x509_username_field, openvpn_x509_cert_t *peer_cert);
8201 - * Return the certificate's serial number.
8202 + * Return the certificate's serial number in decimal string representation.
8204 * The serial number is returned as a string, since it might be a bignum.
8206 * @param cert Certificate to retrieve the serial number from.
8207 * @param gc Garbage collection arena to use when allocating string.
8209 - * @return The certificate's serial number.
8210 + * @return String representation of the certificate's serial number
8211 + * in decimal notation, or NULL on error.
8213 -char *x509_get_serial (openvpn_x509_cert_t *cert, struct gc_arena *gc);
8214 +char *backend_x509_get_serial (openvpn_x509_cert_t *cert, struct gc_arena *gc);
8217 + * Return the certificate's serial number in hex string representation.
8219 + * The serial number is returned as a string, since it might be a bignum.
8221 + * @param cert Certificate to retrieve the serial number from.
8222 + * @param gc Garbage collection arena to use when allocating string.
8224 + * @return String representation of the certificate's serial number
8225 + * in hex notation, or NULL on error.
8227 +char *backend_x509_get_serial_hex (openvpn_x509_cert_t *cert,
8228 + struct gc_arena *gc);
8231 * Save X509 fields to environment, using the naming convention:
8232 diff -Nuar b/openvpn-2.3.3/src/openvpn/ssl_verify.c a/openvpn-2.3.4/src/openvpn/ssl_verify.c
8233 --- b/openvpn-2.3.3/src/openvpn/ssl_verify.c 2014-04-09 09:47:37.000000000 +0200
8234 +++ a/openvpn-2.3.4/src/openvpn/ssl_verify.c 2014-05-01 13:12:22.000000000 +0200
8235 @@ -435,10 +435,15 @@
8238 /* export serial number as environmental variable */
8239 - serial = x509_get_serial(peer_cert, &gc);
8240 + serial = backend_x509_get_serial(peer_cert, &gc);
8241 openvpn_snprintf (envname, sizeof(envname), "tls_serial_%d", cert_depth);
8242 setenv_str (es, envname, serial);
8244 + /* export serial number in hex as environmental variable */
8245 + serial = backend_x509_get_serial_hex(peer_cert, &gc);
8246 + openvpn_snprintf (envname, sizeof(envname), "tls_serial_hex_%d", cert_depth);
8247 + setenv_str (es, envname, serial);
8254 struct gc_arena gc = gc_new();
8256 - char *serial = x509_get_serial(cert, &gc);
8257 + char *serial = backend_x509_get_serial(cert, &gc);
8259 if (!openvpn_snprintf(fn, sizeof(fn), "%s%c%s", crl_dir, OS_SPECIFIC_DIRSEP, serial))
8261 diff -Nuar b/openvpn-2.3.3/src/openvpn/ssl_verify_openssl.c a/openvpn-2.3.4/src/openvpn/ssl_verify_openssl.c
8262 --- b/openvpn-2.3.3/src/openvpn/ssl_verify_openssl.c 2014-04-09 09:47:37.000000000 +0200
8263 +++ a/openvpn-2.3.4/src/openvpn/ssl_verify_openssl.c 2014-05-01 13:12:22.000000000 +0200
8268 -x509_get_serial (openvpn_x509_cert_t *cert, struct gc_arena *gc)
8269 +backend_x509_get_serial (openvpn_x509_cert_t *cert, struct gc_arena *gc)
8271 ASN1_INTEGER *asn1_i;
8273 @@ -238,10 +238,18 @@
8278 +backend_x509_get_serial_hex (openvpn_x509_cert_t *cert, struct gc_arena *gc)
8280 + const ASN1_INTEGER *asn1_i = X509_get_serialNumber(cert);
8282 + return format_hex_ex(asn1_i->data, asn1_i->length, 0, 1, ":", gc);
8286 x509_get_sha1_hash (X509 *cert, struct gc_arena *gc)
8288 - char *hash = gc_malloc(SHA_DIGEST_LENGTH, false, gc);
8289 + unsigned char *hash = gc_malloc(SHA_DIGEST_LENGTH, false, gc);
8290 memcpy(hash, cert->sha1_hash, SHA_DIGEST_LENGTH);
8293 diff -Nuar b/openvpn-2.3.3/src/openvpn/ssl_verify_polarssl.c a/openvpn-2.3.4/src/openvpn/ssl_verify_polarssl.c
8294 --- b/openvpn-2.3.3/src/openvpn/ssl_verify_polarssl.c 2014-04-09 09:47:37.000000000 +0200
8295 +++ a/openvpn-2.3.4/src/openvpn/ssl_verify_polarssl.c 2014-05-01 13:12:22.000000000 +0200
8297 #if defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_POLARSSL)
8299 #include "ssl_verify.h"
8300 +#include <polarssl/error.h>
8301 +#include <polarssl/bignum.h>
8302 #include <polarssl/sha1.h>
8304 #define MAX_SUBJECT_LENGTH 256
8305 @@ -123,11 +125,49 @@
8309 -x509_get_serial (x509_cert *cert, struct gc_arena *gc)
8310 +backend_x509_get_serial (openvpn_x509_cert_t *cert, struct gc_arena *gc)
8315 + size_t buflen = 0;
8316 + mpi serial_mpi = { 0 };
8319 + /* Transform asn1 integer serial into PolarSSL MPI */
8320 + mpi_init(&serial_mpi);
8321 + retval = mpi_read_binary(&serial_mpi, cert->serial.p, cert->serial.len);
8325 + error_strerror(retval, errbuf, sizeof(errbuf));
8327 + msg(M_WARN, "Failed to retrieve serial from certificate: %s.", errbuf);
8331 + /* Determine decimal representation length, allocate buffer */
8332 + mpi_write_string(&serial_mpi, 10, buf, &buflen);
8333 + buf = gc_malloc(buflen, true, gc);
8335 + /* Write MPI serial as decimal string into buffer */
8336 + retval = mpi_write_string(&serial_mpi, 10, buf, &buflen);
8340 + error_strerror(retval, errbuf, sizeof(errbuf));
8342 + msg(M_WARN, "Failed to write serial to string: %s.", errbuf);
8350 +backend_x509_get_serial_hex (openvpn_x509_cert_t *cert, struct gc_arena *gc)
8353 size_t len = cert->serial.len * 3 + 1;
8355 buf = gc_malloc(len, true, gc);
8356 diff -Nuar b/openvpn-2.3.3/src/openvpn/tun.c a/openvpn-2.3.4/src/openvpn/tun.c
8357 --- b/openvpn-2.3.3/src/openvpn/tun.c 2014-04-09 09:47:37.000000000 +0200
8358 +++ a/openvpn-2.3.4/src/openvpn/tun.c 2014-05-01 13:12:22.000000000 +0200
8359 @@ -5196,10 +5196,14 @@
8360 /* remove route pointing to interface */
8361 delete_route_connected_v6_net(tt, NULL);
8363 + /* "store=active" is needed in Windows 8(.1) to delete the
8364 + * address we added (pointed out by Cedric Tabary).
8367 /* netsh interface ipv6 delete address \"%s\" %s */
8368 ifconfig_ipv6_local = print_in6_addr (tt->local_ipv6, 0, &gc);
8370 - "%s%sc interface ipv6 delete address %s %s",
8371 + "%s%sc interface ipv6 delete address %s %s store=active",
8375 diff -Nuar b/openvpn-2.3.3/src/openvpnserv/Makefile.in a/openvpn-2.3.4/src/openvpnserv/Makefile.in
8376 --- b/openvpn-2.3.3/src/openvpnserv/Makefile.in 2014-04-09 09:51:27.000000000 +0200
8377 +++ a/openvpn-2.3.4/src/openvpnserv/Makefile.in 2014-05-02 09:16:40.000000000 +0200
8379 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
8380 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
8383 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
8384 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
8386 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
8388 # This Makefile.in is free software; the Free Software Foundation
8389 # gives unlimited permission to copy and/or distribute it,
8390 # with or without modifications, as long as this notice is preserved.
8392 # Required to build Windows resource file
8395 -am__make_dryrun = \
8398 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
8399 +am__make_running_with_option = \
8400 + case $${target_option-} in \
8402 + *) echo "am__make_running_with_option: internal error: invalid" \
8403 + "target option '$${target_option-}' specified" >&2; \
8407 + sane_makeflags=$$MAKEFLAGS; \
8408 + if $(am__is_gnu_make); then \
8409 + sane_makeflags=$$MFLAGS; \
8411 case $$MAKEFLAGS in \
8413 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
8414 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
8416 - for am__flg in $$MAKEFLAGS; do \
8417 - case $$am__flg in \
8419 - *n*) am__dry=yes; break;; \
8423 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
8424 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
8428 + strip_trailopt () \
8430 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
8432 + for flg in $$sane_makeflags; do \
8433 + test $$skip_next = yes && { skip_next=no; continue; }; \
8435 + *=*|--*) continue;; \
8436 + -*I) strip_trailopt 'I'; skip_next=yes;; \
8437 + -*I?*) strip_trailopt 'I';; \
8438 + -*O) strip_trailopt 'O'; skip_next=yes;; \
8439 + -*O?*) strip_trailopt 'O';; \
8440 + -*l) strip_trailopt 'l'; skip_next=yes;; \
8441 + -*l?*) strip_trailopt 'l';; \
8442 + -[dEDm]) skip_next=yes;; \
8443 + -[JT]) skip_next=yes;; \
8446 + *$$target_option*) has_opt=yes; break;; \
8448 - test $$am__dry = yes; \
8451 + test $$has_opt = yes
8452 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
8453 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
8454 pkgdatadir = $(datadir)/@PACKAGE@
8455 pkgincludedir = $(includedir)/@PACKAGE@
8456 pkglibdir = $(libdir)/@PACKAGE@
8459 build_triplet = @build@
8460 host_triplet = @host@
8461 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
8462 - $(top_srcdir)/build/ltrc.inc
8463 +DIST_COMMON = $(top_srcdir)/build/ltrc.inc $(srcdir)/Makefile.in \
8464 + $(srcdir)/Makefile.am $(top_srcdir)/depcomp
8465 @WIN32_TRUE@sbin_PROGRAMS = openvpnserv$(EXEEXT)
8466 subdir = src/openvpnserv
8467 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8468 @@ -97,19 +124,44 @@
8469 openvpnserv_resources.$(OBJEXT)
8470 openvpnserv_OBJECTS = $(am_openvpnserv_OBJECTS)
8471 openvpnserv_LDADD = $(LDADD)
8472 +AM_V_lt = $(am__v_lt_@AM_V@)
8473 +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
8474 +am__v_lt_0 = --silent
8476 +AM_V_P = $(am__v_P_@AM_V@)
8477 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
8480 +AM_V_GEN = $(am__v_GEN_@AM_V@)
8481 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
8482 +am__v_GEN_0 = @echo " GEN " $@;
8484 +AM_V_at = $(am__v_at_@AM_V@)
8485 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
8488 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
8489 depcomp = $(SHELL) $(top_srcdir)/depcomp
8490 am__depfiles_maybe = depfiles
8492 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
8493 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
8494 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
8495 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
8496 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
8497 +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
8498 + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
8499 + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
8500 + $(AM_CFLAGS) $(CFLAGS)
8501 +AM_V_CC = $(am__v_CC_@AM_V@)
8502 +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
8503 +am__v_CC_0 = @echo " CC " $@;
8506 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
8507 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
8509 +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
8510 + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
8511 + $(AM_LDFLAGS) $(LDFLAGS) -o $@
8512 +AM_V_CCLD = $(am__v_CCLD_@AM_V@)
8513 +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
8514 +am__v_CCLD_0 = @echo " CCLD " $@;
8516 SOURCES = $(openvpnserv_SOURCES)
8517 DIST_SOURCES = $(openvpnserv_SOURCES)
8518 am__can_run_installinfo = \
8519 @@ -117,11 +169,29 @@
8521 *) (install-info --version) >/dev/null 2>&1;; \
8523 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
8524 +# Read a list of newline-separated strings from the standard input,
8525 +# and print each of them once, without duplicates. Input order is
8527 +am__uniquify_input = $(AWK) '\
8528 + BEGIN { nonempty = 0; } \
8529 + { items[$$0] = 1; nonempty = 1; } \
8530 + END { if (nonempty) { for (i in items) print i; }; } \
8532 +# Make sure the list of sources is unique. This is necessary because,
8533 +# e.g., the same source file might be shared among _SOURCES variables
8534 +# for different programs/libraries.
8535 +am__define_uniq_tagged_files = \
8536 + list='$(am__tagged_files)'; \
8537 + unique=`for i in $$list; do \
8538 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
8539 + done | $(am__uniquify_input)`
8542 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
8545 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
8548 AUTOCONF = @AUTOCONF@
8549 @@ -333,10 +403,12 @@
8551 for p in $$list; do echo "$$p $$p"; done | \
8552 sed 's/$(EXEEXT)$$//' | \
8553 - while read p p1; do if test -f $$p || test -f $$p1; \
8554 - then echo "$$p"; echo "$$p"; else :; fi; \
8555 + while read p p1; do if test -f $$p \
8557 + ; then echo "$$p"; echo "$$p"; else :; fi; \
8559 - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
8560 + sed -e 'p;s,.*/,,;n;h' \
8562 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
8563 sed 'N;N;N;s,\n, ,g' | \
8564 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
8566 @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
8567 files=`for p in $$list; do echo "$$p"; done | \
8568 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
8569 - -e 's/$$/$(EXEEXT)/' `; \
8570 + -e 's/$$/$(EXEEXT)/' \
8572 test -n "$$list" || exit 0; \
8573 echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
8574 cd "$(DESTDIR)$(sbindir)" && rm -f $$files
8575 @@ -370,9 +443,10 @@
8576 list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
8577 echo " rm -f" $$list; \
8580 openvpnserv$(EXEEXT): $(openvpnserv_OBJECTS) $(openvpnserv_DEPENDENCIES) $(EXTRA_openvpnserv_DEPENDENCIES)
8581 @rm -f openvpnserv$(EXEEXT)
8582 - $(LINK) $(openvpnserv_OBJECTS) $(openvpnserv_LDADD) $(LIBS)
8583 + $(AM_V_CCLD)$(LINK) $(openvpnserv_OBJECTS) $(openvpnserv_LDADD) $(LIBS)
8585 mostlyclean-compile:
8587 @@ -384,25 +458,25 @@
8588 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/service.Po@am__quote@
8591 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
8592 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
8593 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
8594 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
8595 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
8596 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
8597 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
8598 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
8599 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
8602 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
8603 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
8604 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
8605 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
8606 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
8607 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
8608 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
8609 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
8610 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
8613 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
8614 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
8615 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
8616 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
8617 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
8618 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
8619 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
8620 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
8621 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
8623 mostlyclean-libtool:
8625 @@ -410,26 +484,15 @@
8629 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
8630 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
8631 - unique=`for i in $$list; do \
8632 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
8634 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
8635 - END { if (nonempty) { for (i in files) print i; }; }'`; \
8636 - mkid -fID $$unique
8638 +ID: $(am__tagged_files)
8639 + $(am__define_uniq_tagged_files); mkid -fID $$unique
8643 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
8644 - $(TAGS_FILES) $(LISP)
8645 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
8648 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
8649 - unique=`for i in $$list; do \
8650 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
8652 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
8653 - END { if (nonempty) { for (i in files) print i; }; }'`; \
8654 + $(am__define_uniq_tagged_files); \
8656 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
8657 test -n "$$unique" || unique=$$empty_fix; \
8658 @@ -441,15 +504,11 @@
8663 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
8664 - $(TAGS_FILES) $(LISP)
8665 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
8666 - unique=`for i in $$list; do \
8667 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
8669 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
8670 - END { if (nonempty) { for (i in files) print i; }; }'`; \
8674 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
8675 + $(am__define_uniq_tagged_files); \
8676 test -z "$(CTAGS_ARGS)$$unique" \
8677 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
8679 @@ -458,6 +517,21 @@
8680 here=`$(am__cd) $(top_builddir) && pwd` \
8681 && $(am__cd) $(top_srcdir) \
8682 && gtags -i $(GTAGS_ARGS) "$$here"
8683 +cscopelist: cscopelist-am
8685 +cscopelist-am: $(am__tagged_files)
8686 + list='$(am__tagged_files)'; \
8687 + case "$(srcdir)" in \
8688 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
8689 + *) sdir=$(subdir)/$(srcdir) ;; \
8691 + for i in $$list; do \
8692 + if test -f "$$i"; then \
8693 + echo "$(subdir)/$$i"; \
8695 + echo "$$sdir/$$i"; \
8697 + done >> $(top_builddir)/cscope.files
8700 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
8701 @@ -603,19 +677,19 @@
8703 .MAKE: install-am install-strip
8705 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
8706 - clean-libtool clean-sbinPROGRAMS ctags distclean \
8707 - distclean-compile distclean-generic distclean-libtool \
8708 - distclean-tags distdir dvi dvi-am html html-am info info-am \
8709 - install install-am install-data install-data-am install-dvi \
8710 - install-dvi-am install-exec install-exec-am install-html \
8711 - install-html-am install-info install-info-am install-man \
8712 - install-pdf install-pdf-am install-ps install-ps-am \
8713 - install-sbinPROGRAMS install-strip installcheck \
8714 - installcheck-am installdirs maintainer-clean \
8715 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
8716 + clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \
8717 + distclean distclean-compile distclean-generic \
8718 + distclean-libtool distclean-tags distdir dvi dvi-am html \
8719 + html-am info info-am install install-am install-data \
8720 + install-data-am install-dvi install-dvi-am install-exec \
8721 + install-exec-am install-html install-html-am install-info \
8722 + install-info-am install-man install-pdf install-pdf-am \
8723 + install-ps install-ps-am install-sbinPROGRAMS install-strip \
8724 + installcheck installcheck-am installdirs maintainer-clean \
8725 maintainer-clean-generic mostlyclean mostlyclean-compile \
8726 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
8727 - tags uninstall uninstall-am uninstall-sbinPROGRAMS
8728 + tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS
8732 diff -Nuar b/openvpn-2.3.3/src/plugins/auth-pam/Makefile.am a/openvpn-2.3.4/src/plugins/auth-pam/Makefile.am
8733 --- b/openvpn-2.3.3/src/plugins/auth-pam/Makefile.am 2014-04-09 09:42:15.000000000 +0200
8734 +++ a/openvpn-2.3.4/src/plugins/auth-pam/Makefile.am 2014-05-01 12:35:20.000000000 +0200
8736 $(srcdir)/Makefile.in
8739 - -I$(top_srcdir)/include
8740 - $(PLUGIN_AUTH_PAM_CFLAGS)
8741 + -I$(top_srcdir)/include \
8742 + $(PLUGIN_AUTH_PAM_CFLAGS) \
8743 + $(OPTIONAL_CRYPTO_CFLAGS)
8745 if ENABLE_PLUGIN_AUTH_PAM
8746 plugin_LTLIBRARIES = openvpn-plugin-auth-pam.la
8747 diff -Nuar b/openvpn-2.3.3/src/plugins/auth-pam/Makefile.in a/openvpn-2.3.4/src/plugins/auth-pam/Makefile.in
8748 --- b/openvpn-2.3.3/src/plugins/auth-pam/Makefile.in 2014-04-09 09:51:27.000000000 +0200
8749 +++ a/openvpn-2.3.4/src/plugins/auth-pam/Makefile.in 2014-05-02 09:16:40.000000000 +0200
8751 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
8752 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
8755 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
8756 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
8758 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
8760 # This Makefile.in is free software; the Free Software Foundation
8761 # gives unlimited permission to copy and/or distribute it,
8762 # with or without modifications, as long as this notice is preserved.
8767 -am__make_dryrun = \
8770 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
8771 +am__make_running_with_option = \
8772 + case $${target_option-} in \
8774 + *) echo "am__make_running_with_option: internal error: invalid" \
8775 + "target option '$${target_option-}' specified" >&2; \
8779 + sane_makeflags=$$MAKEFLAGS; \
8780 + if $(am__is_gnu_make); then \
8781 + sane_makeflags=$$MFLAGS; \
8783 case $$MAKEFLAGS in \
8785 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
8786 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
8788 - for am__flg in $$MAKEFLAGS; do \
8789 - case $$am__flg in \
8791 - *n*) am__dry=yes; break;; \
8795 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
8796 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
8798 - test $$am__dry = yes; \
8802 + strip_trailopt () \
8804 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
8806 + for flg in $$sane_makeflags; do \
8807 + test $$skip_next = yes && { skip_next=no; continue; }; \
8809 + *=*|--*) continue;; \
8810 + -*I) strip_trailopt 'I'; skip_next=yes;; \
8811 + -*I?*) strip_trailopt 'I';; \
8812 + -*O) strip_trailopt 'O'; skip_next=yes;; \
8813 + -*O?*) strip_trailopt 'O';; \
8814 + -*l) strip_trailopt 'l'; skip_next=yes;; \
8815 + -*l?*) strip_trailopt 'l';; \
8816 + -[dEDm]) skip_next=yes;; \
8817 + -[JT]) skip_next=yes;; \
8820 + *$$target_option*) has_opt=yes; break;; \
8823 + test $$has_opt = yes
8824 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
8825 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
8826 pkgdatadir = $(datadir)/@PACKAGE@
8827 pkgincludedir = $(includedir)/@PACKAGE@
8828 pkglibdir = $(libdir)/@PACKAGE@
8830 build_triplet = @build@
8831 host_triplet = @host@
8832 subdir = src/plugins/auth-pam
8833 -DIST_COMMON = $(am__dist_doc_DATA_DIST) $(srcdir)/Makefile.am \
8834 - $(srcdir)/Makefile.in
8835 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
8836 + $(top_srcdir)/depcomp $(am__dist_doc_DATA_DIST)
8837 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8838 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
8839 $(top_srcdir)/m4/ax_socklen_t.m4 \
8840 @@ -109,25 +136,50 @@
8841 am_openvpn_plugin_auth_pam_la_OBJECTS = auth-pam.lo pamdl.lo
8842 openvpn_plugin_auth_pam_la_OBJECTS = \
8843 $(am_openvpn_plugin_auth_pam_la_OBJECTS)
8844 -openvpn_plugin_auth_pam_la_LINK = $(LIBTOOL) --tag=CC \
8845 +AM_V_lt = $(am__v_lt_@AM_V@)
8846 +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
8847 +am__v_lt_0 = --silent
8849 +openvpn_plugin_auth_pam_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
8850 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
8851 $(AM_CFLAGS) $(CFLAGS) $(openvpn_plugin_auth_pam_la_LDFLAGS) \
8853 @ENABLE_PLUGIN_AUTH_PAM_TRUE@am_openvpn_plugin_auth_pam_la_rpath = \
8854 @ENABLE_PLUGIN_AUTH_PAM_TRUE@ -rpath $(plugindir)
8855 +AM_V_P = $(am__v_P_@AM_V@)
8856 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
8859 +AM_V_GEN = $(am__v_GEN_@AM_V@)
8860 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
8861 +am__v_GEN_0 = @echo " GEN " $@;
8863 +AM_V_at = $(am__v_at_@AM_V@)
8864 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
8867 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
8868 depcomp = $(SHELL) $(top_srcdir)/depcomp
8869 am__depfiles_maybe = depfiles
8871 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
8872 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
8873 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
8874 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
8875 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
8876 +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
8877 + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
8878 + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
8879 + $(AM_CFLAGS) $(CFLAGS)
8880 +AM_V_CC = $(am__v_CC_@AM_V@)
8881 +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
8882 +am__v_CC_0 = @echo " CC " $@;
8885 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
8886 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
8888 +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
8889 + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
8890 + $(AM_LDFLAGS) $(LDFLAGS) -o $@
8891 +AM_V_CCLD = $(am__v_CCLD_@AM_V@)
8892 +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
8893 +am__v_CCLD_0 = @echo " CCLD " $@;
8895 SOURCES = $(openvpn_plugin_auth_pam_la_SOURCES)
8896 DIST_SOURCES = $(openvpn_plugin_auth_pam_la_SOURCES)
8897 am__can_run_installinfo = \
8898 @@ -137,11 +189,29 @@
8900 am__dist_doc_DATA_DIST = README.auth-pam
8901 DATA = $(dist_doc_DATA)
8902 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
8903 +# Read a list of newline-separated strings from the standard input,
8904 +# and print each of them once, without duplicates. Input order is
8906 +am__uniquify_input = $(AWK) '\
8907 + BEGIN { nonempty = 0; } \
8908 + { items[$$0] = 1; nonempty = 1; } \
8909 + END { if (nonempty) { for (i in items) print i; }; } \
8911 +# Make sure the list of sources is unique. This is necessary because,
8912 +# e.g., the same source file might be shared among _SOURCES variables
8913 +# for different programs/libraries.
8914 +am__define_uniq_tagged_files = \
8915 + list='$(am__tagged_files)'; \
8916 + unique=`for i in $$list; do \
8917 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
8918 + done | $(am__uniquify_input)`
8921 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
8924 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
8927 AUTOCONF = @AUTOCONF@
8929 $(srcdir)/Makefile.in
8932 - -I$(top_srcdir)/include
8933 + -I$(top_srcdir)/include \
8934 + $(PLUGIN_AUTH_PAM_CFLAGS) \
8935 + $(OPTIONAL_CRYPTO_CFLAGS)
8937 @ENABLE_PLUGIN_AUTH_PAM_TRUE@plugin_LTLIBRARIES = openvpn-plugin-auth-pam.la
8938 @ENABLE_PLUGIN_AUTH_PAM_TRUE@dist_doc_DATA = README.auth-pam
8940 $(ACLOCAL_M4): $(am__aclocal_m4_deps)
8941 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
8942 $(am__aclocal_m4_deps):
8944 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
8946 @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
8947 @@ -375,14 +448,17 @@
8949 clean-pluginLTLIBRARIES:
8950 -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
8951 - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
8952 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
8953 - test "$$dir" != "$$p" || dir=.; \
8954 - echo "rm -f \"$${dir}/so_locations\""; \
8955 - rm -f "$${dir}/so_locations"; \
8957 + @list='$(plugin_LTLIBRARIES)'; \
8958 + locs=`for p in $$list; do echo $$p; done | \
8959 + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
8961 + test -z "$$locs" || { \
8962 + echo rm -f $${locs}; \
8966 openvpn-plugin-auth-pam.la: $(openvpn_plugin_auth_pam_la_OBJECTS) $(openvpn_plugin_auth_pam_la_DEPENDENCIES) $(EXTRA_openvpn_plugin_auth_pam_la_DEPENDENCIES)
8967 - $(openvpn_plugin_auth_pam_la_LINK) $(am_openvpn_plugin_auth_pam_la_rpath) $(openvpn_plugin_auth_pam_la_OBJECTS) $(openvpn_plugin_auth_pam_la_LIBADD) $(LIBS)
8968 + $(AM_V_CCLD)$(openvpn_plugin_auth_pam_la_LINK) $(am_openvpn_plugin_auth_pam_la_rpath) $(openvpn_plugin_auth_pam_la_OBJECTS) $(openvpn_plugin_auth_pam_la_LIBADD) $(LIBS)
8970 mostlyclean-compile:
8972 @@ -394,25 +470,25 @@
8973 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pamdl.Plo@am__quote@
8976 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
8977 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
8978 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
8979 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
8980 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
8981 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
8982 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
8983 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
8984 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
8987 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
8988 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
8989 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
8990 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
8991 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
8992 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
8993 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
8994 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
8995 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
8998 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
8999 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
9000 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
9001 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
9002 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
9003 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
9004 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
9005 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
9006 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
9008 mostlyclean-libtool:
9010 @@ -441,26 +517,15 @@
9011 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
9012 dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
9014 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
9015 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9016 - unique=`for i in $$list; do \
9017 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9019 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9020 - END { if (nonempty) { for (i in files) print i; }; }'`; \
9021 - mkid -fID $$unique
9023 +ID: $(am__tagged_files)
9024 + $(am__define_uniq_tagged_files); mkid -fID $$unique
9028 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
9029 - $(TAGS_FILES) $(LISP)
9030 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
9033 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9034 - unique=`for i in $$list; do \
9035 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9037 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9038 - END { if (nonempty) { for (i in files) print i; }; }'`; \
9039 + $(am__define_uniq_tagged_files); \
9041 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
9042 test -n "$$unique" || unique=$$empty_fix; \
9043 @@ -472,15 +537,11 @@
9048 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
9049 - $(TAGS_FILES) $(LISP)
9050 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9051 - unique=`for i in $$list; do \
9052 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9054 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9055 - END { if (nonempty) { for (i in files) print i; }; }'`; \
9059 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
9060 + $(am__define_uniq_tagged_files); \
9061 test -z "$(CTAGS_ARGS)$$unique" \
9062 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
9064 @@ -489,6 +550,21 @@
9065 here=`$(am__cd) $(top_builddir) && pwd` \
9066 && $(am__cd) $(top_srcdir) \
9067 && gtags -i $(GTAGS_ARGS) "$$here"
9068 +cscopelist: cscopelist-am
9070 +cscopelist-am: $(am__tagged_files)
9071 + list='$(am__tagged_files)'; \
9072 + case "$(srcdir)" in \
9073 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
9074 + *) sdir=$(subdir)/$(srcdir) ;; \
9076 + for i in $$list; do \
9077 + if test -f "$$i"; then \
9078 + echo "$(subdir)/$$i"; \
9080 + echo "$$sdir/$$i"; \
9082 + done >> $(top_builddir)/cscope.files
9085 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
9086 @@ -634,22 +710,22 @@
9088 .MAKE: install-am install-strip
9090 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
9091 - clean-libtool clean-pluginLTLIBRARIES ctags distclean \
9092 - distclean-compile distclean-generic distclean-libtool \
9093 - distclean-tags distdir dvi dvi-am html html-am info info-am \
9094 - install install-am install-data install-data-am \
9095 - install-dist_docDATA install-dvi install-dvi-am install-exec \
9096 - install-exec-am install-html install-html-am install-info \
9097 - install-info-am install-man install-pdf install-pdf-am \
9098 - install-pluginLTLIBRARIES install-ps install-ps-am \
9099 - install-strip installcheck installcheck-am installdirs \
9100 - maintainer-clean maintainer-clean-generic mostlyclean \
9101 - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
9102 - pdf pdf-am ps ps-am tags uninstall uninstall-am \
9103 - uninstall-dist_docDATA uninstall-pluginLTLIBRARIES
9104 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
9105 + clean-libtool clean-pluginLTLIBRARIES cscopelist-am ctags \
9106 + ctags-am distclean distclean-compile distclean-generic \
9107 + distclean-libtool distclean-tags distdir dvi dvi-am html \
9108 + html-am info info-am install install-am install-data \
9109 + install-data-am install-dist_docDATA install-dvi \
9110 + install-dvi-am install-exec install-exec-am install-html \
9111 + install-html-am install-info install-info-am install-man \
9112 + install-pdf install-pdf-am install-pluginLTLIBRARIES \
9113 + install-ps install-ps-am install-strip installcheck \
9114 + installcheck-am installdirs maintainer-clean \
9115 + maintainer-clean-generic mostlyclean mostlyclean-compile \
9116 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
9117 + tags tags-am uninstall uninstall-am uninstall-dist_docDATA \
9118 + uninstall-pluginLTLIBRARIES
9120 - $(PLUGIN_AUTH_PAM_CFLAGS)
9122 # Tell versions [3.59,3.63) of GNU make to not export all variables.
9123 # Otherwise a system limit (for SysV at least) may be exceeded.
9124 diff -Nuar b/openvpn-2.3.3/src/plugins/down-root/Makefile.am a/openvpn-2.3.4/src/plugins/down-root/Makefile.am
9125 --- b/openvpn-2.3.3/src/plugins/down-root/Makefile.am 2014-04-09 09:42:15.000000000 +0200
9126 +++ a/openvpn-2.3.4/src/plugins/down-root/Makefile.am 2014-05-01 12:35:20.000000000 +0200
9128 $(srcdir)/Makefile.in
9131 - -I$(top_srcdir)/include
9132 + -I$(top_srcdir)/include \
9133 + $(OPTIONAL_CRYPTO_CFLAGS)
9135 if ENABLE_PLUGIN_DOWN_ROOT
9136 plugin_LTLIBRARIES = openvpn-plugin-down-root.la
9137 diff -Nuar b/openvpn-2.3.3/src/plugins/down-root/Makefile.in a/openvpn-2.3.4/src/plugins/down-root/Makefile.in
9138 --- b/openvpn-2.3.3/src/plugins/down-root/Makefile.in 2014-04-09 09:51:27.000000000 +0200
9139 +++ a/openvpn-2.3.4/src/plugins/down-root/Makefile.in 2014-05-02 09:16:40.000000000 +0200
9141 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
9142 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
9145 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
9146 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
9148 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
9150 # This Makefile.in is free software; the Free Software Foundation
9151 # gives unlimited permission to copy and/or distribute it,
9152 # with or without modifications, as long as this notice is preserved.
9157 -am__make_dryrun = \
9160 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
9161 +am__make_running_with_option = \
9162 + case $${target_option-} in \
9164 + *) echo "am__make_running_with_option: internal error: invalid" \
9165 + "target option '$${target_option-}' specified" >&2; \
9169 + sane_makeflags=$$MAKEFLAGS; \
9170 + if $(am__is_gnu_make); then \
9171 + sane_makeflags=$$MFLAGS; \
9173 case $$MAKEFLAGS in \
9175 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
9176 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
9178 - for am__flg in $$MAKEFLAGS; do \
9179 - case $$am__flg in \
9181 - *n*) am__dry=yes; break;; \
9185 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
9186 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
9188 - test $$am__dry = yes; \
9192 + strip_trailopt () \
9194 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
9196 + for flg in $$sane_makeflags; do \
9197 + test $$skip_next = yes && { skip_next=no; continue; }; \
9199 + *=*|--*) continue;; \
9200 + -*I) strip_trailopt 'I'; skip_next=yes;; \
9201 + -*I?*) strip_trailopt 'I';; \
9202 + -*O) strip_trailopt 'O'; skip_next=yes;; \
9203 + -*O?*) strip_trailopt 'O';; \
9204 + -*l) strip_trailopt 'l'; skip_next=yes;; \
9205 + -*l?*) strip_trailopt 'l';; \
9206 + -[dEDm]) skip_next=yes;; \
9207 + -[JT]) skip_next=yes;; \
9210 + *$$target_option*) has_opt=yes; break;; \
9213 + test $$has_opt = yes
9214 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
9215 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
9216 pkgdatadir = $(datadir)/@PACKAGE@
9217 pkgincludedir = $(includedir)/@PACKAGE@
9218 pkglibdir = $(libdir)/@PACKAGE@
9220 build_triplet = @build@
9221 host_triplet = @host@
9222 subdir = src/plugins/down-root
9223 -DIST_COMMON = $(am__dist_doc_DATA_DIST) $(srcdir)/Makefile.am \
9224 - $(srcdir)/Makefile.in
9225 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
9226 + $(top_srcdir)/depcomp $(am__dist_doc_DATA_DIST)
9227 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9228 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
9229 $(top_srcdir)/m4/ax_socklen_t.m4 \
9230 @@ -108,25 +135,50 @@
9231 am_openvpn_plugin_down_root_la_OBJECTS = down-root.lo
9232 openvpn_plugin_down_root_la_OBJECTS = \
9233 $(am_openvpn_plugin_down_root_la_OBJECTS)
9234 -openvpn_plugin_down_root_la_LINK = $(LIBTOOL) --tag=CC \
9235 +AM_V_lt = $(am__v_lt_@AM_V@)
9236 +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
9237 +am__v_lt_0 = --silent
9239 +openvpn_plugin_down_root_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
9240 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
9241 $(AM_CFLAGS) $(CFLAGS) $(openvpn_plugin_down_root_la_LDFLAGS) \
9243 @ENABLE_PLUGIN_DOWN_ROOT_TRUE@am_openvpn_plugin_down_root_la_rpath = \
9244 @ENABLE_PLUGIN_DOWN_ROOT_TRUE@ -rpath $(plugindir)
9245 +AM_V_P = $(am__v_P_@AM_V@)
9246 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
9249 +AM_V_GEN = $(am__v_GEN_@AM_V@)
9250 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
9251 +am__v_GEN_0 = @echo " GEN " $@;
9253 +AM_V_at = $(am__v_at_@AM_V@)
9254 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
9257 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
9258 depcomp = $(SHELL) $(top_srcdir)/depcomp
9259 am__depfiles_maybe = depfiles
9261 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
9262 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
9263 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
9264 - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
9265 - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
9266 +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
9267 + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
9268 + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
9269 + $(AM_CFLAGS) $(CFLAGS)
9270 +AM_V_CC = $(am__v_CC_@AM_V@)
9271 +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
9272 +am__v_CC_0 = @echo " CC " $@;
9275 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
9276 - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
9278 +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
9279 + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
9280 + $(AM_LDFLAGS) $(LDFLAGS) -o $@
9281 +AM_V_CCLD = $(am__v_CCLD_@AM_V@)
9282 +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
9283 +am__v_CCLD_0 = @echo " CCLD " $@;
9285 SOURCES = $(openvpn_plugin_down_root_la_SOURCES)
9286 DIST_SOURCES = $(openvpn_plugin_down_root_la_SOURCES)
9287 am__can_run_installinfo = \
9288 @@ -136,11 +188,29 @@
9290 am__dist_doc_DATA_DIST = README.down-root
9291 DATA = $(dist_doc_DATA)
9292 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
9293 +# Read a list of newline-separated strings from the standard input,
9294 +# and print each of them once, without duplicates. Input order is
9296 +am__uniquify_input = $(AWK) '\
9297 + BEGIN { nonempty = 0; } \
9298 + { items[$$0] = 1; nonempty = 1; } \
9299 + END { if (nonempty) { for (i in items) print i; }; } \
9301 +# Make sure the list of sources is unique. This is necessary because,
9302 +# e.g., the same source file might be shared among _SOURCES variables
9303 +# for different programs/libraries.
9304 +am__define_uniq_tagged_files = \
9305 + list='$(am__tagged_files)'; \
9306 + unique=`for i in $$list; do \
9307 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9308 + done | $(am__uniquify_input)`
9311 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
9314 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
9317 AUTOCONF = @AUTOCONF@
9319 $(srcdir)/Makefile.in
9322 - -I$(top_srcdir)/include
9323 + -I$(top_srcdir)/include \
9324 + $(OPTIONAL_CRYPTO_CFLAGS)
9326 @ENABLE_PLUGIN_DOWN_ROOT_TRUE@plugin_LTLIBRARIES = openvpn-plugin-down-root.la
9327 @ENABLE_PLUGIN_DOWN_ROOT_TRUE@dist_doc_DATA = README.down-root
9329 $(ACLOCAL_M4): $(am__aclocal_m4_deps)
9330 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
9331 $(am__aclocal_m4_deps):
9333 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
9335 @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
9336 @@ -370,14 +442,17 @@
9338 clean-pluginLTLIBRARIES:
9339 -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
9340 - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
9341 - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
9342 - test "$$dir" != "$$p" || dir=.; \
9343 - echo "rm -f \"$${dir}/so_locations\""; \
9344 - rm -f "$${dir}/so_locations"; \
9346 + @list='$(plugin_LTLIBRARIES)'; \
9347 + locs=`for p in $$list; do echo $$p; done | \
9348 + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
9350 + test -z "$$locs" || { \
9351 + echo rm -f $${locs}; \
9355 openvpn-plugin-down-root.la: $(openvpn_plugin_down_root_la_OBJECTS) $(openvpn_plugin_down_root_la_DEPENDENCIES) $(EXTRA_openvpn_plugin_down_root_la_DEPENDENCIES)
9356 - $(openvpn_plugin_down_root_la_LINK) $(am_openvpn_plugin_down_root_la_rpath) $(openvpn_plugin_down_root_la_OBJECTS) $(openvpn_plugin_down_root_la_LIBADD) $(LIBS)
9357 + $(AM_V_CCLD)$(openvpn_plugin_down_root_la_LINK) $(am_openvpn_plugin_down_root_la_rpath) $(openvpn_plugin_down_root_la_OBJECTS) $(openvpn_plugin_down_root_la_LIBADD) $(LIBS)
9359 mostlyclean-compile:
9361 @@ -388,25 +463,25 @@
9362 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/down-root.Plo@am__quote@
9365 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
9366 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
9367 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
9368 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
9369 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
9370 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
9371 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
9372 -@am__fastdepCC_FALSE@ $(COMPILE) -c $<
9373 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
9376 -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
9377 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
9378 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
9379 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
9380 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
9381 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
9382 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
9383 -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
9384 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
9387 -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
9388 -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
9389 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
9390 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
9391 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
9392 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
9393 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
9394 -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
9395 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
9397 mostlyclean-libtool:
9399 @@ -435,26 +510,15 @@
9400 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
9401 dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
9403 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
9404 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9405 - unique=`for i in $$list; do \
9406 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9408 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9409 - END { if (nonempty) { for (i in files) print i; }; }'`; \
9410 - mkid -fID $$unique
9412 +ID: $(am__tagged_files)
9413 + $(am__define_uniq_tagged_files); mkid -fID $$unique
9417 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
9418 - $(TAGS_FILES) $(LISP)
9419 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
9422 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9423 - unique=`for i in $$list; do \
9424 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9426 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9427 - END { if (nonempty) { for (i in files) print i; }; }'`; \
9428 + $(am__define_uniq_tagged_files); \
9430 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
9431 test -n "$$unique" || unique=$$empty_fix; \
9432 @@ -466,15 +530,11 @@
9437 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
9438 - $(TAGS_FILES) $(LISP)
9439 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9440 - unique=`for i in $$list; do \
9441 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9443 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9444 - END { if (nonempty) { for (i in files) print i; }; }'`; \
9448 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
9449 + $(am__define_uniq_tagged_files); \
9450 test -z "$(CTAGS_ARGS)$$unique" \
9451 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
9453 @@ -483,6 +543,21 @@
9454 here=`$(am__cd) $(top_builddir) && pwd` \
9455 && $(am__cd) $(top_srcdir) \
9456 && gtags -i $(GTAGS_ARGS) "$$here"
9457 +cscopelist: cscopelist-am
9459 +cscopelist-am: $(am__tagged_files)
9460 + list='$(am__tagged_files)'; \
9461 + case "$(srcdir)" in \
9462 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
9463 + *) sdir=$(subdir)/$(srcdir) ;; \
9465 + for i in $$list; do \
9466 + if test -f "$$i"; then \
9467 + echo "$(subdir)/$$i"; \
9469 + echo "$$sdir/$$i"; \
9471 + done >> $(top_builddir)/cscope.files
9474 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
9475 @@ -628,20 +703,21 @@
9477 .MAKE: install-am install-strip
9479 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
9480 - clean-libtool clean-pluginLTLIBRARIES ctags distclean \
9481 - distclean-compile distclean-generic distclean-libtool \
9482 - distclean-tags distdir dvi dvi-am html html-am info info-am \
9483 - install install-am install-data install-data-am \
9484 - install-dist_docDATA install-dvi install-dvi-am install-exec \
9485 - install-exec-am install-html install-html-am install-info \
9486 - install-info-am install-man install-pdf install-pdf-am \
9487 - install-pluginLTLIBRARIES install-ps install-ps-am \
9488 - install-strip installcheck installcheck-am installdirs \
9489 - maintainer-clean maintainer-clean-generic mostlyclean \
9490 - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
9491 - pdf pdf-am ps ps-am tags uninstall uninstall-am \
9492 - uninstall-dist_docDATA uninstall-pluginLTLIBRARIES
9493 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
9494 + clean-libtool clean-pluginLTLIBRARIES cscopelist-am ctags \
9495 + ctags-am distclean distclean-compile distclean-generic \
9496 + distclean-libtool distclean-tags distdir dvi dvi-am html \
9497 + html-am info info-am install install-am install-data \
9498 + install-data-am install-dist_docDATA install-dvi \
9499 + install-dvi-am install-exec install-exec-am install-html \
9500 + install-html-am install-info install-info-am install-man \
9501 + install-pdf install-pdf-am install-pluginLTLIBRARIES \
9502 + install-ps install-ps-am install-strip installcheck \
9503 + installcheck-am installdirs maintainer-clean \
9504 + maintainer-clean-generic mostlyclean mostlyclean-compile \
9505 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
9506 + tags tags-am uninstall uninstall-am uninstall-dist_docDATA \
9507 + uninstall-pluginLTLIBRARIES
9510 # Tell versions [3.59,3.63) of GNU make to not export all variables.
9511 diff -Nuar b/openvpn-2.3.3/src/plugins/Makefile.in a/openvpn-2.3.4/src/plugins/Makefile.in
9512 --- b/openvpn-2.3.3/src/plugins/Makefile.in 2014-04-09 09:51:27.000000000 +0200
9513 +++ a/openvpn-2.3.4/src/plugins/Makefile.in 2014-05-02 09:16:40.000000000 +0200
9515 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
9516 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
9519 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
9520 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
9522 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
9524 # This Makefile.in is free software; the Free Software Foundation
9525 # gives unlimited permission to copy and/or distribute it,
9526 # with or without modifications, as long as this notice is preserved.
9528 # Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
9531 -am__make_dryrun = \
9534 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
9535 +am__make_running_with_option = \
9536 + case $${target_option-} in \
9538 + *) echo "am__make_running_with_option: internal error: invalid" \
9539 + "target option '$${target_option-}' specified" >&2; \
9543 + sane_makeflags=$$MAKEFLAGS; \
9544 + if $(am__is_gnu_make); then \
9545 + sane_makeflags=$$MFLAGS; \
9547 case $$MAKEFLAGS in \
9549 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
9550 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
9552 - for am__flg in $$MAKEFLAGS; do \
9553 - case $$am__flg in \
9555 - *n*) am__dry=yes; break;; \
9559 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
9560 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
9564 + strip_trailopt () \
9566 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
9568 + for flg in $$sane_makeflags; do \
9569 + test $$skip_next = yes && { skip_next=no; continue; }; \
9571 + *=*|--*) continue;; \
9572 + -*I) strip_trailopt 'I'; skip_next=yes;; \
9573 + -*I?*) strip_trailopt 'I';; \
9574 + -*O) strip_trailopt 'O'; skip_next=yes;; \
9575 + -*O?*) strip_trailopt 'O';; \
9576 + -*l) strip_trailopt 'l'; skip_next=yes;; \
9577 + -*l?*) strip_trailopt 'l';; \
9578 + -[dEDm]) skip_next=yes;; \
9579 + -[JT]) skip_next=yes;; \
9582 + *$$target_option*) has_opt=yes; break;; \
9584 - test $$am__dry = yes; \
9587 + test $$has_opt = yes
9588 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
9589 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
9590 pkgdatadir = $(datadir)/@PACKAGE@
9591 pkgincludedir = $(includedir)/@PACKAGE@
9592 pkglibdir = $(libdir)/@PACKAGE@
9594 build_triplet = @build@
9595 host_triplet = @host@
9596 subdir = src/plugins
9597 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
9598 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
9599 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9600 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
9601 $(top_srcdir)/m4/ax_socklen_t.m4 \
9602 @@ -77,15 +104,28 @@
9603 CONFIG_HEADER = $(top_builddir)/config.h
9604 CONFIG_CLEAN_FILES =
9605 CONFIG_CLEAN_VPATH_FILES =
9606 +AM_V_P = $(am__v_P_@AM_V@)
9607 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
9610 +AM_V_GEN = $(am__v_GEN_@AM_V@)
9611 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
9612 +am__v_GEN_0 = @echo " GEN " $@;
9614 +AM_V_at = $(am__v_at_@AM_V@)
9615 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
9620 -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
9621 - html-recursive info-recursive install-data-recursive \
9622 - install-dvi-recursive install-exec-recursive \
9623 - install-html-recursive install-info-recursive \
9624 - install-pdf-recursive install-ps-recursive install-recursive \
9625 - installcheck-recursive installdirs-recursive pdf-recursive \
9626 - ps-recursive uninstall-recursive
9627 +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
9628 + ctags-recursive dvi-recursive html-recursive info-recursive \
9629 + install-data-recursive install-dvi-recursive \
9630 + install-exec-recursive install-html-recursive \
9631 + install-info-recursive install-pdf-recursive \
9632 + install-ps-recursive install-recursive installcheck-recursive \
9633 + installdirs-recursive pdf-recursive ps-recursive \
9634 + tags-recursive uninstall-recursive
9635 am__can_run_installinfo = \
9636 case $$AM_UPDATE_INFO_DIR in \
9640 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
9641 distclean-recursive maintainer-clean-recursive
9642 -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
9643 - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
9644 +am__recursive_targets = \
9645 + $(RECURSIVE_TARGETS) \
9646 + $(RECURSIVE_CLEAN_TARGETS) \
9647 + $(am__extra_recursive_targets)
9648 +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
9650 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
9651 +# Read a list of newline-separated strings from the standard input,
9652 +# and print each of them once, without duplicates. Input order is
9654 +am__uniquify_input = $(AWK) '\
9655 + BEGIN { nonempty = 0; } \
9656 + { items[$$0] = 1; nonempty = 1; } \
9657 + END { if (nonempty) { for (i in items) print i; }; } \
9659 +# Make sure the list of sources is unique. This is necessary because,
9660 +# e.g., the same source file might be shared among _SOURCES variables
9661 +# for different programs/libraries.
9662 +am__define_uniq_tagged_files = \
9663 + list='$(am__tagged_files)'; \
9664 + unique=`for i in $$list; do \
9665 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9666 + done | $(am__uniquify_input)`
9669 DIST_SUBDIRS = $(SUBDIRS)
9674 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
9677 AUTOCONF = @AUTOCONF@
9678 @@ -325,22 +386,25 @@
9681 # This directory's subdirectories are mostly independent; you can cd
9682 -# into them and run `make' without going through this Makefile.
9683 -# To change the values of `make' variables: instead of editing Makefiles,
9684 -# (1) if the variable is set in `config.status', edit `config.status'
9685 -# (which will cause the Makefiles to be regenerated when you run `make');
9686 -# (2) otherwise, pass the desired values on the `make' command line.
9687 -$(RECURSIVE_TARGETS):
9688 - @fail= failcom='exit 1'; \
9689 - for f in x $$MAKEFLAGS; do \
9691 - *=* | --[!k]*);; \
9692 - *k*) failcom='fail=yes';; \
9695 +# into them and run 'make' without going through this Makefile.
9696 +# To change the values of 'make' variables: instead of editing Makefiles,
9697 +# (1) if the variable is set in 'config.status', edit 'config.status'
9698 +# (which will cause the Makefiles to be regenerated when you run 'make');
9699 +# (2) otherwise, pass the desired values on the 'make' command line.
9700 +$(am__recursive_targets):
9702 + if $(am__make_keepgoing); then \
9703 + failcom='fail=yes'; \
9705 + failcom='exit 1'; \
9708 target=`echo $@ | sed s/-recursive//`; \
9709 - list='$(SUBDIRS)'; for subdir in $$list; do \
9711 + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
9712 + *) list='$(SUBDIRS)' ;; \
9714 + for subdir in $$list; do \
9715 echo "Making $$target in $$subdir"; \
9716 if test "$$subdir" = "."; then \
9718 @@ -355,57 +419,12 @@
9719 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
9720 fi; test -z "$$fail"
9722 -$(RECURSIVE_CLEAN_TARGETS):
9723 - @fail= failcom='exit 1'; \
9724 - for f in x $$MAKEFLAGS; do \
9726 - *=* | --[!k]*);; \
9727 - *k*) failcom='fail=yes';; \
9732 - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
9733 - *) list='$(SUBDIRS)' ;; \
9735 - rev=''; for subdir in $$list; do \
9736 - if test "$$subdir" = "."; then :; else \
9737 - rev="$$subdir $$rev"; \
9741 - target=`echo $@ | sed s/-recursive//`; \
9742 - for subdir in $$rev; do \
9743 - echo "Making $$target in $$subdir"; \
9744 - if test "$$subdir" = "."; then \
9745 - local_target="$$target-am"; \
9747 - local_target="$$target"; \
9749 - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
9750 - || eval $$failcom; \
9751 - done && test -z "$$fail"
9753 - list='$(SUBDIRS)'; for subdir in $$list; do \
9754 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
9757 - list='$(SUBDIRS)'; for subdir in $$list; do \
9758 - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
9761 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
9762 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9763 - unique=`for i in $$list; do \
9764 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9766 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9767 - END { if (nonempty) { for (i in files) print i; }; }'`; \
9768 - mkid -fID $$unique
9770 +ID: $(am__tagged_files)
9771 + $(am__define_uniq_tagged_files); mkid -fID $$unique
9772 +tags: tags-recursive
9775 -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
9776 - $(TAGS_FILES) $(LISP)
9777 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
9780 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
9781 @@ -421,12 +440,7 @@
9782 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
9785 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9786 - unique=`for i in $$list; do \
9787 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9789 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9790 - END { if (nonempty) { for (i in files) print i; }; }'`; \
9791 + $(am__define_uniq_tagged_files); \
9793 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
9794 test -n "$$unique" || unique=$$empty_fix; \
9795 @@ -438,15 +452,11 @@
9800 -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
9801 - $(TAGS_FILES) $(LISP)
9802 - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
9803 - unique=`for i in $$list; do \
9804 - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
9806 - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
9807 - END { if (nonempty) { for (i in files) print i; }; }'`; \
9808 +ctags: ctags-recursive
9811 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
9812 + $(am__define_uniq_tagged_files); \
9813 test -z "$(CTAGS_ARGS)$$unique" \
9814 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
9816 @@ -455,6 +465,21 @@
9817 here=`$(am__cd) $(top_builddir) && pwd` \
9818 && $(am__cd) $(top_srcdir) \
9819 && gtags -i $(GTAGS_ARGS) "$$here"
9820 +cscopelist: cscopelist-recursive
9822 +cscopelist-am: $(am__tagged_files)
9823 + list='$(am__tagged_files)'; \
9824 + case "$(srcdir)" in \
9825 + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
9826 + *) sdir=$(subdir)/$(srcdir) ;; \
9828 + for i in $$list; do \
9829 + if test -f "$$i"; then \
9830 + echo "$(subdir)/$$i"; \
9832 + echo "$$sdir/$$i"; \
9834 + done >> $(top_builddir)/cscope.files
9837 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
9838 @@ -616,22 +641,20 @@
9842 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
9843 - install-am install-strip tags-recursive
9844 +.MAKE: $(am__recursive_targets) install-am install-strip
9846 -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
9847 - all all-am check check-am clean clean-generic clean-libtool \
9848 - ctags ctags-recursive distclean distclean-generic \
9849 - distclean-libtool distclean-tags distdir dvi dvi-am html \
9850 - html-am info info-am install install-am install-data \
9851 - install-data-am install-dvi install-dvi-am install-exec \
9852 - install-exec-am install-html install-html-am install-info \
9853 - install-info-am install-man install-pdf install-pdf-am \
9854 - install-ps install-ps-am install-strip installcheck \
9855 - installcheck-am installdirs installdirs-am maintainer-clean \
9856 - maintainer-clean-generic mostlyclean mostlyclean-generic \
9857 - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
9858 - uninstall uninstall-am
9859 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
9860 + check-am clean clean-generic clean-libtool cscopelist-am ctags \
9861 + ctags-am distclean distclean-generic distclean-libtool \
9862 + distclean-tags distdir dvi dvi-am html html-am info info-am \
9863 + install install-am install-data install-data-am install-dvi \
9864 + install-dvi-am install-exec install-exec-am install-html \
9865 + install-html-am install-info install-info-am install-man \
9866 + install-pdf install-pdf-am install-ps install-ps-am \
9867 + install-strip installcheck installcheck-am installdirs \
9868 + installdirs-am maintainer-clean maintainer-clean-generic \
9869 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
9870 + ps ps-am tags tags-am uninstall uninstall-am
9873 # Tell versions [3.59,3.63) of GNU make to not export all variables.
9874 diff -Nuar b/openvpn-2.3.3/test-driver a/openvpn-2.3.4/test-driver
9875 --- b/openvpn-2.3.3/test-driver 1970-01-01 01:00:00.000000000 +0100
9876 +++ a/openvpn-2.3.4/test-driver 2014-05-01 12:35:47.000000000 +0200
9879 +# test-driver - basic testsuite driver script.
9881 +scriptversion=2013-07-13.22; # UTC
9883 +# Copyright (C) 2011-2013 Free Software Foundation, Inc.
9885 +# This program is free software; you can redistribute it and/or modify
9886 +# it under the terms of the GNU General Public License as published by
9887 +# the Free Software Foundation; either version 2, or (at your option)
9888 +# any later version.
9890 +# This program is distributed in the hope that it will be useful,
9891 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
9892 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9893 +# GNU General Public License for more details.
9895 +# You should have received a copy of the GNU General Public License
9896 +# along with this program. If not, see <http://www.gnu.org/licenses/>.
9898 +# As a special exception to the GNU General Public License, if you
9899 +# distribute this file as part of a program that contains a
9900 +# configuration script generated by Autoconf, you may include it under
9901 +# the same distribution terms that you use for the rest of that program.
9903 +# This file is maintained in Automake, please report
9904 +# bugs to <bug-automake@gnu.org> or send patches to
9905 +# <automake-patches@gnu.org>.
9907 +# Make unconditional expansion of undefined variables an error. This
9908 +# helps a lot in preventing typo-related bugs.
9922 + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
9923 + [--expect-failure={yes|no}] [--color-tests={yes|no}]
9924 + [--enable-hard-errors={yes|no}] [--]
9925 + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
9926 +The '--test-name', '--log-file' and '--trs-file' options are mandatory.
9930 +test_name= # Used for reporting.
9931 +log_file= # Where to save the output of the test script.
9932 +trs_file= # Where to save the metadata of the test run.
9935 +enable_hard_errors=yes
9936 +while test $# -gt 0; do
9938 + --help) print_usage; exit $?;;
9939 + --version) echo "test-driver $scriptversion"; exit $?;;
9940 + --test-name) test_name=$2; shift;;
9941 + --log-file) log_file=$2; shift;;
9942 + --trs-file) trs_file=$2; shift;;
9943 + --color-tests) color_tests=$2; shift;;
9944 + --expect-failure) expect_failure=$2; shift;;
9945 + --enable-hard-errors) enable_hard_errors=$2; shift;;
9946 + --) shift; break;;
9947 + -*) usage_error "invalid option: '$1'";;
9954 +test x"$test_name" = x && missing_opts="$missing_opts --test-name"
9955 +test x"$log_file" = x && missing_opts="$missing_opts --log-file"
9956 +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file"
9957 +if test x"$missing_opts" != x; then
9958 + usage_error "the following mandatory options are missing:$missing_opts"
9961 +if test $# -eq 0; then
9962 + usage_error "missing argument"
9965 +if test $color_tests = yes; then
9966 + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
9967 + red='
\e[0;31m' # Red.
9968 + grn='
\e[0;32m' # Green.
9969 + lgn='
\e[1;32m' # Light green.
9970 + blu='
\e[1;34m' # Blue.
9971 + mgn='
\e[0;35m' # Magenta.
9972 + std='
\e[m' # No color.
9974 + red= grn= lgn= blu= mgn= std=
9977 +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
9978 +trap "st=129; $do_exit" 1
9979 +trap "st=130; $do_exit" 2
9980 +trap "st=141; $do_exit" 13
9981 +trap "st=143; $do_exit" 15
9983 +# Test script is run here.
9984 +"$@" >$log_file 2>&1
9986 +if test $enable_hard_errors = no && test $estatus -eq 99; then
9990 +case $estatus:$expect_failure in
9991 + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
9992 + 0:*) col=$grn res=PASS recheck=no gcopy=no;;
9993 + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
9994 + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
9995 + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
9996 + *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
9999 +# Report outcome to console.
10000 +echo "${col}${res}${std}: $test_name"
10002 +# Register the test result, and other relevant metadata.
10003 +echo ":test-result: $res" > $trs_file
10004 +echo ":global-test-result: $res" >> $trs_file
10005 +echo ":recheck: $recheck" >> $trs_file
10006 +echo ":copy-in-global-log: $gcopy" >> $trs_file
10008 +# Local Variables:
10009 +# mode: shell-script
10010 +# sh-indentation: 2
10011 +# eval: (add-hook 'write-file-hooks 'time-stamp)
10012 +# time-stamp-start: "scriptversion="
10013 +# time-stamp-format: "%:y-%02m-%02d.%02H"
10014 +# time-stamp-time-zone: "UTC"
10015 +# time-stamp-end: "; # UTC"
10017 diff -Nuar b/openvpn-2.3.3/tests/Makefile.in a/openvpn-2.3.4/tests/Makefile.in
10018 --- b/openvpn-2.3.3/tests/Makefile.in 2014-04-09 09:51:28.000000000 +0200
10019 +++ a/openvpn-2.3.4/tests/Makefile.in 2014-05-02 09:16:40.000000000 +0200
10021 -# Makefile.in generated by automake 1.11.6 from Makefile.am.
10022 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
10023 # @configure_input@
10025 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
10026 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10027 -# Foundation, Inc.
10028 +# Copyright (C) 1994-2013 Free Software Foundation, Inc.
10030 # This Makefile.in is free software; the Free Software Foundation
10031 # gives unlimited permission to copy and/or distribute it,
10032 # with or without modifications, as long as this notice is preserved.
10033 @@ -27,23 +26,51 @@
10037 -am__make_dryrun = \
10040 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
10041 +am__make_running_with_option = \
10042 + case $${target_option-} in \
10044 + *) echo "am__make_running_with_option: internal error: invalid" \
10045 + "target option '$${target_option-}' specified" >&2; \
10049 + sane_makeflags=$$MAKEFLAGS; \
10050 + if $(am__is_gnu_make); then \
10051 + sane_makeflags=$$MFLAGS; \
10053 case $$MAKEFLAGS in \
10055 - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
10056 - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
10058 - for am__flg in $$MAKEFLAGS; do \
10059 - case $$am__flg in \
10061 - *n*) am__dry=yes; break;; \
10065 + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
10066 + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
10068 - test $$am__dry = yes; \
10072 + strip_trailopt () \
10074 + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
10076 + for flg in $$sane_makeflags; do \
10077 + test $$skip_next = yes && { skip_next=no; continue; }; \
10079 + *=*|--*) continue;; \
10080 + -*I) strip_trailopt 'I'; skip_next=yes;; \
10081 + -*I?*) strip_trailopt 'I';; \
10082 + -*O) strip_trailopt 'O'; skip_next=yes;; \
10083 + -*O?*) strip_trailopt 'O';; \
10084 + -*l) strip_trailopt 'l'; skip_next=yes;; \
10085 + -*l?*) strip_trailopt 'l';; \
10086 + -[dEDm]) skip_next=yes;; \
10087 + -[JT]) skip_next=yes;; \
10090 + *$$target_option*) has_opt=yes; break;; \
10093 + test $$has_opt = yes
10094 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
10095 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
10096 pkgdatadir = $(datadir)/@PACKAGE@
10097 pkgincludedir = $(includedir)/@PACKAGE@
10098 pkglibdir = $(libdir)/@PACKAGE@
10100 build_triplet = @build@
10101 host_triplet = @host@
10103 -DIST_COMMON = $(dist_noinst_SCRIPTS) $(srcdir)/Makefile.am \
10104 - $(srcdir)/Makefile.in $(srcdir)/t_client.sh.in
10105 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
10106 + $(srcdir)/t_client.sh.in $(dist_noinst_SCRIPTS) \
10107 + $(top_srcdir)/test-driver
10108 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
10109 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_emptyarray.m4 \
10110 $(top_srcdir)/m4/ax_socklen_t.m4 \
10111 @@ -80,6 +108,18 @@
10112 CONFIG_CLEAN_FILES = t_client.sh
10113 CONFIG_CLEAN_VPATH_FILES =
10114 SCRIPTS = $(dist_noinst_SCRIPTS)
10115 +AM_V_P = $(am__v_P_@AM_V@)
10116 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
10119 +AM_V_GEN = $(am__v_GEN_@AM_V@)
10120 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
10121 +am__v_GEN_0 = @echo " GEN " $@;
10123 +AM_V_at = $(am__v_at_@AM_V@)
10124 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
10129 am__can_run_installinfo = \
10130 @@ -87,11 +127,215 @@
10132 *) (install-info --version) >/dev/null 2>&1;; \
10134 -am__tty_colors = \
10135 -red=; grn=; lgn=; blu=; std=
10136 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
10137 +am__tty_colors_dummy = \
10138 + mgn= red= grn= lgn= blu= brg= std=; \
10139 + am__color_tests=no
10140 +am__tty_colors = { \
10141 + $(am__tty_colors_dummy); \
10142 + if test "X$(AM_COLOR_TESTS)" = Xno; then \
10143 + am__color_tests=no; \
10144 + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
10145 + am__color_tests=yes; \
10146 + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
10147 + am__color_tests=yes; \
10149 + if test $$am__color_tests = yes; then \
10150 + red='
\e[0;31m'; \
10151 + grn='
\e[0;32m'; \
10152 + lgn='
\e[1;32m'; \
10153 + blu='
\e[1;34m'; \
10154 + mgn='
\e[0;35m'; \
10159 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
10160 +am__vpath_adj = case $$p in \
10161 + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
10164 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
10165 +am__install_max = 40
10166 +am__nobase_strip_setup = \
10167 + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
10168 +am__nobase_strip = \
10169 + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
10170 +am__nobase_list = $(am__nobase_strip_setup); \
10171 + for p in $$list; do echo "$$p $$p"; done | \
10172 + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
10173 + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
10174 + if (++n[$$2] == $(am__install_max)) \
10175 + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
10176 + END { for (dir in files) print dir, files[dir] }'
10178 + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
10179 + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
10180 +am__uninstall_files_from_dir = { \
10181 + test -z "$$files" \
10182 + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
10183 + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
10184 + $(am__cd) "$$dir" && rm -f $$files; }; \
10186 +am__recheck_rx = ^[ ]*:recheck:[ ]*
10187 +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
10188 +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
10189 +# A command that, given a newline-separated list of test names on the
10190 +# standard input, print the name of the tests that are to be re-run
10191 +# upon "make recheck".
10192 +am__list_recheck_tests = $(AWK) '{ \
10194 + while ((rc = (getline line < ($$0 ".trs"))) != 0) \
10198 + if ((getline line2 < ($$0 ".log")) < 0) \
10202 + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
10207 + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
10214 + close ($$0 ".trs"); \
10215 + close ($$0 ".log"); \
10217 +# A command that, given a newline-separated list of test names on the
10218 +# standard input, create the global log from their .trs and .log files.
10219 +am__create_global_log = $(AWK) ' \
10220 +function fatal(msg) \
10222 + print "fatal: making $@: " msg | "cat >&2"; \
10225 +function rst_section(header) \
10228 + len = length(header); \
10229 + for (i = 1; i <= len; i = i + 1) \
10234 + copy_in_global_log = 1; \
10235 + global_test_result = "RUN"; \
10236 + while ((rc = (getline line < ($$0 ".trs"))) != 0) \
10239 + fatal("failed to read from " $$0 ".trs"); \
10240 + if (line ~ /$(am__global_test_result_rx)/) \
10242 + sub("$(am__global_test_result_rx)", "", line); \
10243 + sub("[ ]*$$", "", line); \
10244 + global_test_result = line; \
10246 + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
10247 + copy_in_global_log = 0; \
10249 + if (copy_in_global_log) \
10251 + rst_section(global_test_result ": " $$0); \
10252 + while ((rc = (getline line < ($$0 ".log"))) != 0) \
10255 + fatal("failed to read from " $$0 ".log"); \
10260 + close ($$0 ".trs"); \
10261 + close ($$0 ".log"); \
10263 +# Restructured Text title.
10264 +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
10265 +# Solaris 10 'make', and several other traditional 'make' implementations,
10266 +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
10267 +# by disabling -e (using the XSI extension "set +e") if it's set.
10268 +am__sh_e_setup = case $$- in *e*) set +e;; esac
10269 +# Default flags passed to test drivers.
10270 +am__common_driver_flags = \
10271 + --color-tests "$$am__color_tests" \
10272 + --enable-hard-errors "$$am__enable_hard_errors" \
10273 + --expect-failure "$$am__expect_failure"
10274 +# To be inserted before the command running the test. Creates the
10275 +# directory for the log if needed. Stores in $dir the directory
10276 +# containing $f, in $tst the test, in $log the log. Executes the
10277 +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
10278 +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
10279 +# will run the test scripts (or their associated LOG_COMPILER, if
10282 +$(am__sh_e_setup); \
10283 +$(am__vpath_adj_setup) $(am__vpath_adj) \
10284 +$(am__tty_colors); \
10285 +srcdir=$(srcdir); export srcdir; \
10287 + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \
10288 + *) am__odir=.;; \
10290 +test "x$$am__odir" = x"." || test -d "$$am__odir" \
10291 + || $(MKDIR_P) "$$am__odir" || exit $$?; \
10292 +if test -f "./$$f"; then dir=./; \
10293 +elif test -f "$$f"; then dir=; \
10294 +else dir="$(srcdir)/"; fi; \
10295 +tst=$$dir$$f; log='$@'; \
10296 +if test -n '$(DISABLE_HARD_ERRORS)'; then \
10297 + am__enable_hard_errors=no; \
10299 + am__enable_hard_errors=yes; \
10301 +case " $(XFAIL_TESTS) " in \
10302 + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
10303 + am__expect_failure=yes;; \
10305 + am__expect_failure=no;; \
10307 +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
10308 +# A shell command to get the names of the tests scripts with any registered
10309 +# extension removed (i.e., equivalently, the names of the test logs, with
10310 +# the '.log' extension removed). The result is saved in the shell variable
10311 +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly,
10312 +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
10313 +# since that might cause problem with VPATH rewrites for suffix-less tests.
10314 +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
10315 +am__set_TESTS_bases = \
10316 + bases='$(TEST_LOGS)'; \
10317 + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
10318 + bases=`echo $$bases`
10319 +RECHECK_LOGS = $(TEST_LOGS)
10320 +AM_RECURSIVE_TARGETS = check recheck
10321 +TEST_SUITE_LOG = test-suite.log
10322 +TEST_EXTENSIONS = @EXEEXT@ .test
10323 +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
10324 +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
10330 + *) b=`echo '$@' | sed 's/\.log$$//'`; \
10335 +am__test_logs1 = $(TESTS:=.log)
10336 +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
10337 +TEST_LOGS = $(am__test_logs2:.test.log=.log)
10338 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
10339 +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
10340 + $(TEST_LOG_FLAGS)
10341 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
10342 ACLOCAL = @ACLOCAL@
10344 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
10347 AUTOCONF = @AUTOCONF@
10348 @@ -258,6 +502,7 @@
10352 +.SUFFIXES: .log .test .test$(EXEEXT) .trs
10353 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
10354 @for dep in $?; do \
10355 case '$(am__configure_deps)' in \
10356 @@ -296,105 +541,189 @@
10359 -rm -rf .libs _libs
10368 +cscope cscopelist:
10370 -check-TESTS: $(TESTS)
10371 - @failed=0; all=0; xfail=0; xpass=0; skip=0; \
10372 - srcdir=$(srcdir); export srcdir; \
10373 - list=' $(TESTS) '; \
10374 - $(am__tty_colors); \
10375 - if test -n "$$list"; then \
10376 - for tst in $$list; do \
10377 - if test -f ./$$tst; then dir=./; \
10378 - elif test -f $$tst; then dir=; \
10379 - else dir="$(srcdir)/"; fi; \
10380 - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
10381 - all=`expr $$all + 1`; \
10382 - case " $(XFAIL_TESTS) " in \
10383 - *[\ \ ]$$tst[\ \ ]*) \
10384 - xpass=`expr $$xpass + 1`; \
10385 - failed=`expr $$failed + 1`; \
10386 - col=$$red; res=XPASS; \
10389 - col=$$grn; res=PASS; \
10392 - elif test $$? -ne 77; then \
10393 - all=`expr $$all + 1`; \
10394 - case " $(XFAIL_TESTS) " in \
10395 - *[\ \ ]$$tst[\ \ ]*) \
10396 - xfail=`expr $$xfail + 1`; \
10397 - col=$$lgn; res=XFAIL; \
10400 - failed=`expr $$failed + 1`; \
10401 - col=$$red; res=FAIL; \
10405 - skip=`expr $$skip + 1`; \
10406 - col=$$blu; res=SKIP; \
10408 - echo "$${col}$$res$${std}: $$tst"; \
10410 - if test "$$all" -eq 1; then \
10417 +# Recover from deleted '.trs' file; this should ensure that
10418 +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
10419 +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells
10420 +# to avoid problems with "make -n".
10423 + $(MAKE) $(AM_MAKEFLAGS) $<
10425 +# Leading 'am--fnord' is there to ensure the list of targets does not
10426 +# expand to empty, as could happen e.g. with make check TESTS=''.
10427 +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
10428 +am--force-recheck:
10431 +$(TEST_SUITE_LOG): $(TEST_LOGS)
10432 + @$(am__set_TESTS_bases); \
10433 + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
10434 + redo_bases=`for i in $$bases; do \
10435 + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
10437 + if test -n "$$redo_bases"; then \
10438 + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
10439 + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
10440 + if $(am__make_dryrun); then :; else \
10441 + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
10443 - if test "$$failed" -eq 0; then \
10444 - if test "$$xfail" -eq 0; then \
10445 - banner="$$All$$all $$tests passed"; \
10447 - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
10448 - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
10451 - if test "$$xpass" -eq 0; then \
10452 - banner="$$failed of $$all $$tests failed"; \
10454 + if test -n "$$am__remaking_logs"; then \
10455 + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
10456 + "recursion detected" >&2; \
10458 + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
10460 + if $(am__make_dryrun); then :; else \
10462 + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
10463 + for i in $$redo_bases; do \
10464 + test -f $$i.trs && test -r $$i.trs \
10465 + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
10466 + test -f $$i.log && test -r $$i.log \
10467 + || { echo "$$errmsg $$i.log" >&2; st=1; }; \
10469 + test $$st -eq 0 || exit 1; \
10471 + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
10473 + results=`for b in $$bases; do echo $$b.trs; done`; \
10474 + test -n "$$results" || results=/dev/null; \
10475 + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \
10476 + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \
10477 + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \
10478 + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \
10479 + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
10480 + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
10481 + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
10482 + if test `expr $$fail + $$xpass + $$error` -eq 0; then \
10487 + br='==================='; br=$$br$$br$$br$$br; \
10488 + result_count () \
10490 + if test x"$$1" = x"--maybe-color"; then \
10491 + maybe_colorize=yes; \
10492 + elif test x"$$1" = x"--no-color"; then \
10493 + maybe_colorize=no; \
10495 - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
10496 - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
10497 + echo "$@: invalid 'result_count' usage" >&2; exit 4; \
10500 - dashes="$$banner"; \
10502 - if test "$$skip" -ne 0; then \
10503 - if test "$$skip" -eq 1; then \
10504 - skipped="($$skip test was not run)"; \
10506 + desc=$$1 count=$$2; \
10507 + if test $$maybe_colorize = yes && test $$count -gt 0; then \
10508 + color_start=$$3 color_end=$$std; \
10510 - skipped="($$skip tests were not run)"; \
10511 + color_start= color_end=; \
10513 - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
10514 - dashes="$$skipped"; \
10517 - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
10518 - report="Please report to $(PACKAGE_BUGREPORT)"; \
10519 - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
10520 - dashes="$$report"; \
10522 - dashes=`echo "$$dashes" | sed s/./=/g`; \
10523 - if test "$$failed" -eq 0; then \
10528 - echo "$${col}$$dashes$${std}"; \
10529 - echo "$${col}$$banner$${std}"; \
10530 - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
10531 - test -z "$$report" || echo "$${col}$$report$${std}"; \
10532 - echo "$${col}$$dashes$${std}"; \
10533 - test "$$failed" -eq 0; \
10535 + echo "$${color_start}# $$desc $$count$${color_end}"; \
10537 + create_testsuite_report () \
10539 + result_count $$1 "TOTAL:" $$all "$$brg"; \
10540 + result_count $$1 "PASS: " $$pass "$$grn"; \
10541 + result_count $$1 "SKIP: " $$skip "$$blu"; \
10542 + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
10543 + result_count $$1 "FAIL: " $$fail "$$red"; \
10544 + result_count $$1 "XPASS:" $$xpass "$$red"; \
10545 + result_count $$1 "ERROR:" $$error "$$mgn"; \
10548 + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
10549 + $(am__rst_title); \
10550 + create_testsuite_report --no-color; \
10552 + echo ".. contents:: :depth: 2"; \
10554 + for b in $$bases; do echo $$b; done \
10555 + | $(am__create_global_log); \
10556 + } >$(TEST_SUITE_LOG).tmp || exit 1; \
10557 + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
10558 + if $$success; then \
10562 + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
10564 + echo "$${col}$$br$${std}"; \
10565 + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
10566 + echo "$${col}$$br$${std}"; \
10567 + create_testsuite_report --maybe-color; \
10568 + echo "$$col$$br$$std"; \
10569 + if $$success; then :; else \
10570 + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
10571 + if test -n "$(PACKAGE_BUGREPORT)"; then \
10572 + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
10574 + echo "$$col$$br$$std"; \
10576 + $$success || exit 1
10579 + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
10580 + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
10581 + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
10582 + @set +e; $(am__set_TESTS_bases); \
10583 + log_list=`for i in $$bases; do echo $$i.log; done`; \
10584 + trs_list=`for i in $$bases; do echo $$i.trs; done`; \
10585 + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
10586 + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
10589 + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
10590 + @set +e; $(am__set_TESTS_bases); \
10591 + bases=`for i in $$bases; do echo $$i; done \
10592 + | $(am__list_recheck_tests)` || exit 1; \
10593 + log_list=`for i in $$bases; do echo $$i.log; done`; \
10594 + log_list=`echo $$log_list`; \
10595 + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
10596 + am__force_recheck=am--force-recheck \
10597 + TEST_LOGS="$$log_list"; \
10599 +t_client.sh.log: t_client.sh
10600 + @p='t_client.sh'; \
10601 + b='t_client.sh'; \
10602 + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
10603 + --log-file $$b.log --trs-file $$b.trs \
10604 + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
10605 + "$$tst" $(AM_TESTS_FD_REDIRECT)
10606 +t_lpback.sh.log: t_lpback.sh
10607 + @p='t_lpback.sh'; \
10608 + b='t_lpback.sh'; \
10609 + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
10610 + --log-file $$b.log --trs-file $$b.trs \
10611 + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
10612 + "$$tst" $(AM_TESTS_FD_REDIRECT)
10613 +t_cltsrv.sh.log: t_cltsrv.sh
10614 + @p='t_cltsrv.sh'; \
10615 + b='t_cltsrv.sh'; \
10616 + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
10617 + --log-file $$b.log --trs-file $$b.trs \
10618 + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
10619 + "$$tst" $(AM_TESTS_FD_REDIRECT)
10623 + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
10624 + --log-file $$b.log --trs-file $$b.trs \
10625 + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
10626 + "$$tst" $(AM_TESTS_FD_REDIRECT)
10627 +@am__EXEEXT_TRUE@.test$(EXEEXT).log:
10628 +@am__EXEEXT_TRUE@ @p='$<'; \
10629 +@am__EXEEXT_TRUE@ $(am__set_b); \
10630 +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
10631 +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
10632 +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
10633 +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
10635 distdir: $(DISTFILES)
10636 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
10637 @@ -451,6 +780,9 @@
10638 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
10640 mostlyclean-generic:
10641 + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
10642 + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
10643 + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
10647 @@ -531,15 +863,16 @@
10648 .MAKE: check-am install-am install-strip
10650 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
10651 - clean-libtool distclean distclean-generic distclean-libtool \
10652 - distdir dvi dvi-am html html-am info info-am install \
10653 - install-am install-data install-data-am install-dvi \
10654 - install-dvi-am install-exec install-exec-am install-html \
10655 - install-html-am install-info install-info-am install-man \
10656 - install-pdf install-pdf-am install-ps install-ps-am \
10657 - install-strip installcheck installcheck-am installdirs \
10658 - maintainer-clean maintainer-clean-generic mostlyclean \
10659 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
10660 + clean-libtool cscopelist-am ctags-am distclean \
10661 + distclean-generic distclean-libtool distdir dvi dvi-am html \
10662 + html-am info info-am install install-am install-data \
10663 + install-data-am install-dvi install-dvi-am install-exec \
10664 + install-exec-am install-html install-html-am install-info \
10665 + install-info-am install-man install-pdf install-pdf-am \
10666 + install-ps install-ps-am install-strip installcheck \
10667 + installcheck-am installdirs maintainer-clean \
10668 + maintainer-clean-generic mostlyclean mostlyclean-generic \
10669 + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \
10670 uninstall uninstall-am
10673 diff -Nuar b/openvpn-2.3.3/tests/t_client.sh a/openvpn-2.3.4/tests/t_client.sh
10674 --- b/openvpn-2.3.3/tests/t_client.sh 2014-04-09 09:53:16.000000000 +0200
10675 +++ a/openvpn-2.3.4/tests/t_client.sh 2014-05-02 09:17:02.000000000 +0200
10676 @@ -86,12 +86,12 @@
10677 get_ifconfig_route()
10679 # linux / iproute2? (-> if configure got a path)
10680 - if [ -n "/bin/ip" ]
10681 + if [ -n "/sbin/ip" ]
10683 echo "-- linux iproute2 --"
10684 - /bin/ip addr show | grep -v valid_lft
10685 - /bin/ip route show
10686 - /bin/ip -o -6 route show | grep -v ' cache' | sed -E -e 's/ expires [0-9]*sec//' -e 's/ (mtu|hoplimit|cwnd) [0-9]+//g' -e 's/ (rtt|rttvar) [0-9]+ms//g'
10687 + /sbin/ip addr show | grep -v valid_lft
10688 + /sbin/ip route show
10689 + /sbin/ip -o -6 route show | grep -v ' cache' | sed -E -e 's/ expires [0-9]*sec//' -e 's/ (mtu|hoplimit|cwnd|ssthresh) [0-9]+//g' -e 's/ (rtt|rttvar) [0-9]+ms//g'
10693 diff -Nuar b/openvpn-2.3.3/tests/t_client.sh.in a/openvpn-2.3.4/tests/t_client.sh.in
10694 --- b/openvpn-2.3.3/tests/t_client.sh.in 2014-04-09 09:47:37.000000000 +0200
10695 +++ a/openvpn-2.3.4/tests/t_client.sh.in 2014-05-01 13:12:22.000000000 +0200
10697 echo "-- linux iproute2 --"
10698 @IPROUTE@ addr show | grep -v valid_lft
10699 @IPROUTE@ route show
10700 - @IPROUTE@ -o -6 route show | grep -v ' cache' | sed -E -e 's/ expires [0-9]*sec//' -e 's/ (mtu|hoplimit|cwnd) [0-9]+//g' -e 's/ (rtt|rttvar) [0-9]+ms//g'
10701 + @IPROUTE@ -o -6 route show | grep -v ' cache' | sed -E -e 's/ expires [0-9]*sec//' -e 's/ (mtu|hoplimit|cwnd|ssthresh) [0-9]+//g' -e 's/ (rtt|rttvar) [0-9]+ms//g'
10705 diff -Nuar b/openvpn-2.3.3/version.m4 a/openvpn-2.3.4/version.m4
10706 --- b/openvpn-2.3.3/version.m4 2014-04-09 09:47:37.000000000 +0200
10707 +++ a/openvpn-2.3.4/version.m4 2014-05-01 13:12:22.000000000 +0200
10709 dnl define the OpenVPN version
10710 define([PRODUCT_NAME], [OpenVPN])
10711 define([PRODUCT_TARNAME], [openvpn])
10712 -define([PRODUCT_VERSION], [2.3.3])
10713 +define([PRODUCT_VERSION], [2.3.4])
10714 define([PRODUCT_BUGREPORT], [openvpn-users@lists.sourceforge.net])
10715 -define([PRODUCT_VERSION_RESOURCE], [2,3,3,0])
10716 +define([PRODUCT_VERSION_RESOURCE], [2,3,4,0])
10717 dnl define the TAP version
10718 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
10719 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])