passenger 5.0.30 → 5.1.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of passenger might be problematic. Click here for more details.

Files changed (131) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +30 -1
  3. data/CONTRIBUTING.md +1 -1
  4. data/CONTRIBUTORS +2 -0
  5. data/bin/passenger-install-nginx-module +18 -13
  6. data/build/agent.rb +1 -0
  7. data/build/basics.rb +1 -0
  8. data/build/cxx_tests.rb +6 -1
  9. data/build/misc.rb +3 -0
  10. data/build/packaging.rb +5 -17
  11. data/build/support/cxx_dependency_map.rb +100 -0
  12. data/build/support/vendor/cxxcodebuilder/lib/cxxcodebuilder/builder.rb +4 -1
  13. data/build/test_basics.rb +12 -2
  14. data/dev/ci/run_travis.sh +6 -2
  15. data/doc/Users guide Apache.html +7 -2
  16. data/doc/Users guide Apache.txt +4 -0
  17. data/resources/templates/error_layout.css +70 -84
  18. data/resources/templates/error_layout.html.template +84 -93
  19. data/resources/templates/standalone/http.erb +17 -13
  20. data/resources/templates/standalone/server.erb +2 -1
  21. data/resources/templates/undisclosed_error.html.template +52 -51
  22. data/resources/update_check_client_cert.p12 +0 -0
  23. data/resources/update_check_client_cert.pem +89 -0
  24. data/resources/update_check_server_pubkey.pem +14 -0
  25. data/src/agent/Core/ApplicationPool/ErrorRenderer.h +15 -1
  26. data/src/agent/Core/Controller.h +3 -2
  27. data/src/agent/Core/Controller/CheckoutSession.cpp +5 -4
  28. data/src/agent/Core/Controller/ForwardResponse.cpp +1 -1
  29. data/src/agent/Core/Controller/InitRequest.cpp +2 -0
  30. data/src/agent/Core/Controller/InitializationAndShutdown.cpp +1 -0
  31. data/src/agent/Core/Controller/Request.h +1 -0
  32. data/src/agent/Core/CoreMain.cpp +99 -2
  33. data/src/agent/Core/OptionParser.h +18 -1
  34. data/src/agent/Core/SecurityUpdateChecker.h +559 -0
  35. data/src/agent/Shared/Base.cpp +6 -1
  36. data/src/agent/TempDirToucher/TempDirToucherMain.cpp +52 -0
  37. data/src/agent/Watchdog/InstanceDirToucher.cpp +1 -2
  38. data/src/agent/Watchdog/WatchdogMain.cpp +31 -40
  39. data/src/apache2_module/Configuration.cpp +12 -0
  40. data/src/apache2_module/Configuration.hpp +5 -0
  41. data/src/apache2_module/ConfigurationCommands.cpp +19 -19
  42. data/src/apache2_module/ConfigurationCommands.cpp.cxxcodebuilder +2 -2
  43. data/src/apache2_module/ConfigurationFields.hpp +19 -19
  44. data/src/apache2_module/ConfigurationFields.hpp.cxxcodebuilder +2 -2
  45. data/src/apache2_module/ConfigurationSetters.cpp +19 -19
  46. data/src/apache2_module/ConfigurationSetters.cpp.cxxcodebuilder +2 -2
  47. data/src/apache2_module/CreateDirConfig.cpp +19 -19
  48. data/src/apache2_module/CreateDirConfig.cpp.cxxcodebuilder +2 -2
  49. data/src/apache2_module/Hooks.cpp +10 -1
  50. data/src/apache2_module/MergeDirConfig.cpp +19 -19
  51. data/src/apache2_module/MergeDirConfig.cpp.cxxcodebuilder +2 -2
  52. data/src/apache2_module/SetHeaders.cpp +19 -19
  53. data/src/apache2_module/SetHeaders.cpp.cxxcodebuilder +2 -2
  54. data/src/cxx_supportlib/Constants.h +22 -22
  55. data/src/cxx_supportlib/Constants.h.cxxcodebuilder +4 -1
  56. data/src/cxx_supportlib/Crypto.cpp +977 -0
  57. data/src/cxx_supportlib/Crypto.h +147 -0
  58. data/src/cxx_supportlib/InstanceDirectory.h +55 -2
  59. data/src/cxx_supportlib/Utils/Curl.h +24 -10
  60. data/src/cxx_supportlib/Utils/JsonUtils.h +1 -1
  61. data/src/cxx_supportlib/oxt/detail/spin_lock_darwin.hpp +2 -0
  62. data/src/cxx_supportlib/vendor-modified/boost/system/error_code.hpp +3 -3
  63. data/src/cxx_supportlib/vendor-modified/jsoncpp/json-forwards.h +167 -92
  64. data/src/cxx_supportlib/vendor-modified/jsoncpp/json.h +1827 -1542
  65. data/src/cxx_supportlib/vendor-modified/jsoncpp/jsoncpp.cpp +4705 -3652
  66. data/src/cxx_supportlib/vendor-modified/libev/Changes +46 -15
  67. data/src/cxx_supportlib/vendor-modified/libev/LICENSE +1 -1
  68. data/src/cxx_supportlib/vendor-modified/libev/Makefile.in +215 -128
  69. data/src/cxx_supportlib/vendor-modified/libev/aclocal.m4 +466 -275
  70. data/src/cxx_supportlib/vendor-modified/libev/config.guess +312 -418
  71. data/src/cxx_supportlib/vendor-modified/libev/config.sub +246 -105
  72. data/src/cxx_supportlib/vendor-modified/libev/configure +276 -72
  73. data/src/cxx_supportlib/vendor-modified/libev/configure.ac +2 -1
  74. data/src/cxx_supportlib/vendor-modified/libev/depcomp +346 -185
  75. data/src/cxx_supportlib/vendor-modified/libev/ev++.h +1 -1
  76. data/src/cxx_supportlib/vendor-modified/libev/ev.c +530 -190
  77. data/src/cxx_supportlib/vendor-modified/libev/ev.h +23 -14
  78. data/src/cxx_supportlib/vendor-modified/libev/ev_epoll.c +12 -6
  79. data/src/cxx_supportlib/vendor-modified/libev/ev_kqueue.c +9 -5
  80. data/src/cxx_supportlib/vendor-modified/libev/ev_poll.c +6 -3
  81. data/src/cxx_supportlib/vendor-modified/libev/ev_port.c +8 -4
  82. data/src/cxx_supportlib/vendor-modified/libev/ev_select.c +4 -2
  83. data/src/cxx_supportlib/vendor-modified/libev/ev_vars.h +3 -2
  84. data/src/cxx_supportlib/vendor-modified/libev/ev_win32.c +3 -4
  85. data/src/cxx_supportlib/vendor-modified/libev/install-sh +433 -219
  86. data/src/cxx_supportlib/vendor-modified/libev/libev.m4 +6 -6
  87. data/src/cxx_supportlib/vendor-modified/libev/ltmain.sh +2 -2
  88. data/src/cxx_supportlib/vendor-modified/libev/missing +167 -288
  89. data/src/cxx_supportlib/vendor-modified/libev/mkinstalldirs +72 -21
  90. data/src/cxx_supportlib/vendor-modified/modp_b64.cpp +4 -106
  91. data/src/cxx_supportlib/vendor-modified/modp_b64_data.h +37 -1
  92. data/src/cxx_supportlib/vendor-modified/modp_b64_strict_aliasing.cpp +119 -0
  93. data/src/helper-scripts/node-loader.js +72 -1
  94. data/src/nginx_module/CacheLocationConfig.c +52 -19
  95. data/src/nginx_module/CacheLocationConfig.c.cxxcodebuilder +2 -2
  96. data/src/nginx_module/Configuration.c +26 -1
  97. data/src/nginx_module/Configuration.h +2 -0
  98. data/src/nginx_module/ConfigurationCommands.c +35 -19
  99. data/src/nginx_module/ConfigurationCommands.c.cxxcodebuilder +2 -2
  100. data/src/nginx_module/ContentHandler.c +1 -1
  101. data/src/nginx_module/CreateLocationConfig.c +22 -19
  102. data/src/nginx_module/CreateLocationConfig.c.cxxcodebuilder +2 -2
  103. data/src/nginx_module/LocationConfig.h +21 -19
  104. data/src/nginx_module/LocationConfig.h.cxxcodebuilder +2 -2
  105. data/src/nginx_module/MergeLocationConfig.c +25 -19
  106. data/src/nginx_module/MergeLocationConfig.c.cxxcodebuilder +2 -2
  107. data/src/nginx_module/ngx_http_passenger_module.c +8 -4
  108. data/src/ruby_supportlib/phusion_passenger.rb +9 -4
  109. data/src/ruby_supportlib/phusion_passenger/admin_tools/instance.rb +2 -2
  110. data/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb +1 -1
  111. data/src/ruby_supportlib/phusion_passenger/common_library.rb +13 -0
  112. data/src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb +5 -2
  113. data/src/ruby_supportlib/phusion_passenger/constants.rb +1 -1
  114. data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb +15 -3
  115. data/src/ruby_supportlib/phusion_passenger/platform_info/crypto.rb +51 -0
  116. data/src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/apache2.rb +7 -0
  117. data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb +17 -0
  118. data/src/ruby_supportlib/phusion_passenger/standalone/start_command.rb +4 -2
  119. data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb +4 -0
  120. data/src/ruby_supportlib/phusion_passenger/standalone/start_command/nginx_engine.rb +5 -0
  121. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/app.rb +19 -10
  122. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/base.rb +25 -0
  123. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/gdb_controller.rb +38 -103
  124. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/lldb_controller.rb +178 -0
  125. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/utils.rb +94 -0
  126. data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/version.rb +2 -2
  127. data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core.rb +2 -2
  128. data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/lib/union_station_hooks_core/version_data.rb +2 -2
  129. data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/ruby_versions.yml.travis +5 -3
  130. data/src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core/ruby_versions.yml.travis-with-sudo +9 -7
  131. metadata +14 -4
@@ -683,6 +683,10 @@ CC
683
683
  MAINT
684
684
  MAINTAINER_MODE_FALSE
685
685
  MAINTAINER_MODE_TRUE
686
+ AM_BACKSLASH
687
+ AM_DEFAULT_VERBOSITY
688
+ AM_DEFAULT_V
689
+ AM_V
686
690
  am__untar
687
691
  am__tar
688
692
  AMTAR
@@ -725,6 +729,7 @@ infodir
725
729
  docdir
726
730
  oldincludedir
727
731
  includedir
732
+ runstatedir
728
733
  localstatedir
729
734
  sharedstatedir
730
735
  sysconfdir
@@ -747,6 +752,7 @@ SHELL'
747
752
  ac_subst_files=''
748
753
  ac_user_opts='
749
754
  enable_option_checking
755
+ enable_silent_rules
750
756
  enable_maintainer_mode
751
757
  enable_dependency_tracking
752
758
  enable_shared
@@ -804,6 +810,7 @@ datadir='${datarootdir}'
804
810
  sysconfdir='${prefix}/etc'
805
811
  sharedstatedir='${prefix}/com'
806
812
  localstatedir='${prefix}/var'
813
+ runstatedir='${localstatedir}/run'
807
814
  includedir='${prefix}/include'
808
815
  oldincludedir='/usr/include'
809
816
  docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1056,6 +1063,15 @@ do
1056
1063
  | -silent | --silent | --silen | --sile | --sil)
1057
1064
  silent=yes ;;
1058
1065
 
1066
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
1067
+ | --runstate | --runstat | --runsta | --runst | --runs \
1068
+ | --run | --ru | --r)
1069
+ ac_prev=runstatedir ;;
1070
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1071
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1072
+ | --run=* | --ru=* | --r=*)
1073
+ runstatedir=$ac_optarg ;;
1074
+
1059
1075
  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
1060
1076
  ac_prev=sbindir ;;
1061
1077
  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1193,7 +1209,7 @@ fi
1193
1209
  for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
1194
1210
  datadir sysconfdir sharedstatedir localstatedir includedir \
1195
1211
  oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1196
- libdir localedir mandir
1212
+ libdir localedir mandir runstatedir
1197
1213
  do
1198
1214
  eval ac_val=\$$ac_var
1199
1215
  # Remove trailing slashes.
@@ -1346,6 +1362,7 @@ Fine tuning of the installation directories:
1346
1362
  --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1347
1363
  --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1348
1364
  --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1365
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
1349
1366
  --libdir=DIR object code libraries [EPREFIX/lib]
1350
1367
  --includedir=DIR C header files [PREFIX/include]
1351
1368
  --oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1382,10 +1399,15 @@ Optional Features:
1382
1399
  --disable-option-checking ignore unrecognized --enable/--with options
1383
1400
  --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1384
1401
  --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1385
- --enable-maintainer-mode enable make rules and dependencies not useful
1386
- (and sometimes confusing) to the casual installer
1387
- --disable-dependency-tracking speeds up one-time build
1388
- --enable-dependency-tracking do not reject slow dependency extractors
1402
+ --enable-silent-rules less verbose build output (undo: "make V=1")
1403
+ --disable-silent-rules verbose build output (undo: "make V=0")
1404
+ --enable-maintainer-mode
1405
+ enable make rules and dependencies not useful (and
1406
+ sometimes confusing) to the casual installer
1407
+ --enable-dependency-tracking
1408
+ do not reject slow dependency extractors
1409
+ --disable-dependency-tracking
1410
+ speeds up one-time build
1389
1411
  --enable-shared[=PKGS] build shared libraries [default=yes]
1390
1412
  --enable-static[=PKGS] build static libraries [default=yes]
1391
1413
  --enable-fast-install[=PKGS]
@@ -2195,7 +2217,7 @@ orig_CFLAGS="$CFLAGS"
2195
2217
 
2196
2218
 
2197
2219
 
2198
- am__api_version='1.11'
2220
+ am__api_version='1.15'
2199
2221
 
2200
2222
  ac_aux_dir=
2201
2223
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2321,9 +2343,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2321
2343
 
2322
2344
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2323
2345
  $as_echo_n "checking whether build environment is sane... " >&6; }
2324
- # Just in case
2325
- sleep 1
2326
- echo timestamp > conftest.file
2327
2346
  # Reject unsafe characters in $srcdir or the absolute working directory
2328
2347
  # name. Accept space and tab only in the latter.
2329
2348
  am_lf='
@@ -2334,32 +2353,40 @@ case `pwd` in
2334
2353
  esac
2335
2354
  case $srcdir in
2336
2355
  *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2337
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2356
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
2338
2357
  esac
2339
2358
 
2340
- # Do `set' in a subshell so we don't clobber the current shell's
2359
+ # Do 'set' in a subshell so we don't clobber the current shell's
2341
2360
  # arguments. Must try -L first in case configure is actually a
2342
2361
  # symlink; some systems play weird games with the mod time of symlinks
2343
2362
  # (eg FreeBSD returns the mod time of the symlink's containing
2344
2363
  # directory).
2345
2364
  if (
2346
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2347
- if test "$*" = "X"; then
2348
- # -L didn't work.
2349
- set X `ls -t "$srcdir/configure" conftest.file`
2350
- fi
2351
- rm -f conftest.file
2352
- if test "$*" != "X $srcdir/configure conftest.file" \
2353
- && test "$*" != "X conftest.file $srcdir/configure"; then
2354
-
2355
- # If neither matched, then we have a broken ls. This can happen
2356
- # if, for instance, CONFIG_SHELL is bash and it inherits a
2357
- # broken ls alias from the environment. This has actually
2358
- # happened. Such a system could not be considered "sane".
2359
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
2360
- alias in your environment" "$LINENO" 5
2361
- fi
2362
-
2365
+ am_has_slept=no
2366
+ for am_try in 1 2; do
2367
+ echo "timestamp, slept: $am_has_slept" > conftest.file
2368
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2369
+ if test "$*" = "X"; then
2370
+ # -L didn't work.
2371
+ set X `ls -t "$srcdir/configure" conftest.file`
2372
+ fi
2373
+ if test "$*" != "X $srcdir/configure conftest.file" \
2374
+ && test "$*" != "X conftest.file $srcdir/configure"; then
2375
+
2376
+ # If neither matched, then we have a broken ls. This can happen
2377
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
2378
+ # broken ls alias from the environment. This has actually
2379
+ # happened. Such a system could not be considered "sane".
2380
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
2381
+ alias in your environment" "$LINENO" 5
2382
+ fi
2383
+ if test "$2" = conftest.file || test $am_try -eq 2; then
2384
+ break
2385
+ fi
2386
+ # Just in case.
2387
+ sleep 1
2388
+ am_has_slept=yes
2389
+ done
2363
2390
  test "$2" = conftest.file
2364
2391
  )
2365
2392
  then
@@ -2371,6 +2398,16 @@ Check your system clock" "$LINENO" 5
2371
2398
  fi
2372
2399
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2373
2400
  $as_echo "yes" >&6; }
2401
+ # If we didn't sleep, we still need to ensure time stamps of config.status and
2402
+ # generated files are strictly newer.
2403
+ am_sleep_pid=
2404
+ if grep 'slept: no' conftest.file >/dev/null 2>&1; then
2405
+ ( sleep 1 ) &
2406
+ am_sleep_pid=$!
2407
+ fi
2408
+
2409
+ rm -f conftest.file
2410
+
2374
2411
  test "$program_prefix" != NONE &&
2375
2412
  program_transform_name="s&^&$program_prefix&;$program_transform_name"
2376
2413
  # Use a double $ so make ignores it.
@@ -2381,8 +2418,8 @@ test "$program_suffix" != NONE &&
2381
2418
  ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
2382
2419
  program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
2383
2420
 
2384
- # expand $ac_aux_dir to an absolute path
2385
- am_aux_dir=`cd $ac_aux_dir && pwd`
2421
+ # Expand $ac_aux_dir to an absolute path.
2422
+ am_aux_dir=`cd "$ac_aux_dir" && pwd`
2386
2423
 
2387
2424
  if test x"${MISSING+set}" != xset; then
2388
2425
  case $am_aux_dir in
@@ -2393,15 +2430,15 @@ if test x"${MISSING+set}" != xset; then
2393
2430
  esac
2394
2431
  fi
2395
2432
  # Use eval to expand $SHELL
2396
- if eval "$MISSING --run true"; then
2397
- am_missing_run="$MISSING --run "
2433
+ if eval "$MISSING --is-lightweight"; then
2434
+ am_missing_run="$MISSING "
2398
2435
  else
2399
2436
  am_missing_run=
2400
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
2401
- $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
2437
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
2438
+ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
2402
2439
  fi
2403
2440
 
2404
- if test x"${install_sh}" != xset; then
2441
+ if test x"${install_sh+set}" != xset; then
2405
2442
  case $am_aux_dir in
2406
2443
  *\ * | *\ *)
2407
2444
  install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2410,10 +2447,10 @@ if test x"${install_sh}" != xset; then
2410
2447
  esac
2411
2448
  fi
2412
2449
 
2413
- # Installed binaries are usually stripped using `strip' when the user
2414
- # run `make install-strip'. However `strip' might not be the right
2450
+ # Installed binaries are usually stripped using 'strip' when the user
2451
+ # run "make install-strip". However 'strip' might not be the right
2415
2452
  # tool to use in cross-compilation environments, therefore Automake
2416
- # will honor the `STRIP' environment variable to overrule this program.
2453
+ # will honor the 'STRIP' environment variable to overrule this program.
2417
2454
  if test "$cross_compiling" != no; then
2418
2455
  if test -n "$ac_tool_prefix"; then
2419
2456
  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2552,12 +2589,6 @@ fi
2552
2589
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2553
2590
  $as_echo "$MKDIR_P" >&6; }
2554
2591
 
2555
- mkdir_p="$MKDIR_P"
2556
- case $mkdir_p in
2557
- [\\/$]* | ?:[\\/]*) ;;
2558
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
2559
- esac
2560
-
2561
2592
  for ac_prog in gawk mawk nawk awk
2562
2593
  do
2563
2594
  # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2640,6 +2671,45 @@ else
2640
2671
  fi
2641
2672
  rmdir .tst 2>/dev/null
2642
2673
 
2674
+ # Check whether --enable-silent-rules was given.
2675
+ if test "${enable_silent_rules+set}" = set; then :
2676
+ enableval=$enable_silent_rules;
2677
+ fi
2678
+
2679
+ case $enable_silent_rules in # (((
2680
+ yes) AM_DEFAULT_VERBOSITY=0;;
2681
+ no) AM_DEFAULT_VERBOSITY=1;;
2682
+ *) AM_DEFAULT_VERBOSITY=1;;
2683
+ esac
2684
+ am_make=${MAKE-make}
2685
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
2686
+ $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
2687
+ if ${am_cv_make_support_nested_variables+:} false; then :
2688
+ $as_echo_n "(cached) " >&6
2689
+ else
2690
+ if $as_echo 'TRUE=$(BAR$(V))
2691
+ BAR0=false
2692
+ BAR1=true
2693
+ V=1
2694
+ am__doit:
2695
+ @$(TRUE)
2696
+ .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
2697
+ am_cv_make_support_nested_variables=yes
2698
+ else
2699
+ am_cv_make_support_nested_variables=no
2700
+ fi
2701
+ fi
2702
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
2703
+ $as_echo "$am_cv_make_support_nested_variables" >&6; }
2704
+ if test $am_cv_make_support_nested_variables = yes; then
2705
+ AM_V='$(V)'
2706
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
2707
+ else
2708
+ AM_V=$AM_DEFAULT_VERBOSITY
2709
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
2710
+ fi
2711
+ AM_BACKSLASH='\'
2712
+
2643
2713
  if test "`cd $srcdir && pwd`" != "`pwd`"; then
2644
2714
  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2645
2715
  # is not polluted with repeated "-I."
@@ -2661,8 +2731,9 @@ fi
2661
2731
 
2662
2732
 
2663
2733
  # Define the identity of the package.
2734
+
2664
2735
  PACKAGE=libev
2665
- VERSION=4.15
2736
+ VERSION=4.23
2666
2737
 
2667
2738
 
2668
2739
  cat >>confdefs.h <<_ACEOF
@@ -2690,18 +2761,72 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
2690
2761
 
2691
2762
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
2692
2763
 
2693
- # We need awk for the "check" target. The system "awk" is bad on
2694
- # some platforms.
2764
+ # For better backward compatibility. To be removed once Automake 1.9.x
2765
+ # dies out for good. For more background, see:
2766
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
2767
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
2768
+ mkdir_p='$(MKDIR_P)'
2769
+
2770
+ # We need awk for the "check" target (and possibly the TAP driver). The
2771
+ # system "awk" is bad on some platforms.
2695
2772
  # Always define AMTAR for backward compatibility. Yes, it's still used
2696
2773
  # in the wild :-( We should find a proper way to deprecate it ...
2697
2774
  AMTAR='$${TAR-tar}'
2698
2775
 
2776
+
2777
+ # We'll loop over all known methods to create a tar archive until one works.
2778
+ _am_tools='gnutar pax cpio none'
2779
+
2699
2780
  am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
2700
2781
 
2701
2782
 
2702
2783
 
2703
2784
 
2704
- ac_config_headers="$ac_config_headers config.h"
2785
+
2786
+
2787
+ # POSIX will say in a future version that running "rm -f" with no argument
2788
+ # is OK; and we want to be able to make that assumption in our Makefile
2789
+ # recipes. So use an aggressive probe to check that the usage we want is
2790
+ # actually supported "in the wild" to an acceptable degree.
2791
+ # See automake bug#10828.
2792
+ # To make any issue more visible, cause the running configure to be aborted
2793
+ # by default if the 'rm' program in use doesn't match our expectations; the
2794
+ # user can still override this though.
2795
+ if rm -f && rm -fr && rm -rf; then : OK; else
2796
+ cat >&2 <<'END'
2797
+ Oops!
2798
+
2799
+ Your 'rm' program seems unable to run without file operands specified
2800
+ on the command line, even when the '-f' option is present. This is contrary
2801
+ to the behaviour of most rm programs out there, and not conforming with
2802
+ the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
2803
+
2804
+ Please tell bug-automake@gnu.org about your system, including the value
2805
+ of your $PATH and any error possibly output before this message. This
2806
+ can help us improve future automake versions.
2807
+
2808
+ END
2809
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
2810
+ echo 'Configuration will proceed anyway, since you have set the' >&2
2811
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
2812
+ echo >&2
2813
+ else
2814
+ cat >&2 <<'END'
2815
+ Aborting the configuration process, to ensure you take notice of the issue.
2816
+
2817
+ You can download and install GNU coreutils to get an 'rm' implementation
2818
+ that behaves properly: <http://www.gnu.org/software/coreutils/>.
2819
+
2820
+ If you want to complete the configuration process using your problematic
2821
+ 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
2822
+ to "yes", and re-run configure.
2823
+
2824
+ END
2825
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
2826
+ fi
2827
+ fi
2828
+
2829
+ ac_config_headers="$ac_config_headers config.h"
2705
2830
 
2706
2831
 
2707
2832
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -3515,6 +3640,65 @@ ac_cpp='$CPP $CPPFLAGS'
3515
3640
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3516
3641
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3517
3642
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
3643
+
3644
+ ac_ext=c
3645
+ ac_cpp='$CPP $CPPFLAGS'
3646
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3647
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3648
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
3649
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
3650
+ $as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
3651
+ if ${am_cv_prog_cc_c_o+:} false; then :
3652
+ $as_echo_n "(cached) " >&6
3653
+ else
3654
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3655
+ /* end confdefs.h. */
3656
+
3657
+ int
3658
+ main ()
3659
+ {
3660
+
3661
+ ;
3662
+ return 0;
3663
+ }
3664
+ _ACEOF
3665
+ # Make sure it works both with $CC and with simple cc.
3666
+ # Following AC_PROG_CC_C_O, we do the test twice because some
3667
+ # compilers refuse to overwrite an existing .o file with -o,
3668
+ # though they will create one.
3669
+ am_cv_prog_cc_c_o=yes
3670
+ for am_i in 1 2; do
3671
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
3672
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
3673
+ ac_status=$?
3674
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3675
+ (exit $ac_status); } \
3676
+ && test -f conftest2.$ac_objext; then
3677
+ : OK
3678
+ else
3679
+ am_cv_prog_cc_c_o=no
3680
+ break
3681
+ fi
3682
+ done
3683
+ rm -f core conftest*
3684
+ unset am_i
3685
+ fi
3686
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
3687
+ $as_echo "$am_cv_prog_cc_c_o" >&6; }
3688
+ if test "$am_cv_prog_cc_c_o" != yes; then
3689
+ # Losing compiler, so override with the script.
3690
+ # FIXME: It is wrong to rewrite CC.
3691
+ # But if we don't then we get into trouble of one sort or another.
3692
+ # A longer-term fix would be to have automake use am__CC in this case,
3693
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
3694
+ CC="$am_aux_dir/compile $CC"
3695
+ fi
3696
+ ac_ext=c
3697
+ ac_cpp='$CPP $CPPFLAGS'
3698
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3699
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3700
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
3701
+
3518
3702
  DEPDIR="${am__leading_dot}deps"
3519
3703
 
3520
3704
  ac_config_commands="$ac_config_commands depfiles"
@@ -3534,7 +3718,7 @@ am__quote=
3534
3718
  _am_result=none
3535
3719
  # First try GNU make style include.
3536
3720
  echo "include confinc" > confmf
3537
- # Ignore all kinds of additional output from `make'.
3721
+ # Ignore all kinds of additional output from 'make'.
3538
3722
  case `$am_make -s -f confmf 2> /dev/null` in #(
3539
3723
  *the\ am__doit\ target*)
3540
3724
  am__include=include
@@ -3590,8 +3774,8 @@ else
3590
3774
  # We make a subdir and do the tests there. Otherwise we can end up
3591
3775
  # making bogus files that we don't know about and never remove. For
3592
3776
  # instance it was reported that on HP-UX the gcc test will end up
3593
- # making a dummy file named `D' -- because `-MD' means `put the output
3594
- # in D'.
3777
+ # making a dummy file named 'D' -- because '-MD' means "put the output
3778
+ # in D".
3595
3779
  rm -rf conftest.dir
3596
3780
  mkdir conftest.dir
3597
3781
  # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -3626,16 +3810,16 @@ else
3626
3810
  : > sub/conftest.c
3627
3811
  for i in 1 2 3 4 5 6; do
3628
3812
  echo '#include "conftst'$i'.h"' >> sub/conftest.c
3629
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
3630
- # Solaris 8's {/usr,}/bin/sh.
3631
- touch sub/conftst$i.h
3813
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
3814
+ # Solaris 10 /bin/sh.
3815
+ echo '/* dummy */' > sub/conftst$i.h
3632
3816
  done
3633
3817
  echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
3634
3818
 
3635
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
3819
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
3636
3820
  # mode. It turns out that the SunPro C++ compiler does not properly
3637
- # handle `-M -o', and we need to detect this. Also, some Intel
3638
- # versions had trouble with output in subdirs
3821
+ # handle '-M -o', and we need to detect this. Also, some Intel
3822
+ # versions had trouble with output in subdirs.
3639
3823
  am__obj=sub/conftest.${OBJEXT-o}
3640
3824
  am__minus_obj="-o $am__obj"
3641
3825
  case $depmode in
@@ -3644,8 +3828,8 @@ else
3644
3828
  test "$am__universal" = false || continue
3645
3829
  ;;
3646
3830
  nosideeffect)
3647
- # after this tag, mechanisms are not by side-effect, so they'll
3648
- # only be used when explicitly requested
3831
+ # After this tag, mechanisms are not by side-effect, so they'll
3832
+ # only be used when explicitly requested.
3649
3833
  if test "x$enable_dependency_tracking" = xyes; then
3650
3834
  continue
3651
3835
  else
@@ -3653,7 +3837,7 @@ else
3653
3837
  fi
3654
3838
  ;;
3655
3839
  msvc7 | msvc7msys | msvisualcpp | msvcmsys)
3656
- # This compiler won't grok `-c -o', but also, the minuso test has
3840
+ # This compiler won't grok '-c -o', but also, the minuso test has
3657
3841
  # not run yet. These depmodes are late enough in the game, and
3658
3842
  # so weak that their functioning should not be impacted.
3659
3843
  am__obj=conftest.${OBJEXT-o}
@@ -4600,7 +4784,8 @@ else
4600
4784
  ;;
4601
4785
  *)
4602
4786
  lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
4603
- if test -n "$lt_cv_sys_max_cmd_len"; then
4787
+ if test -n "$lt_cv_sys_max_cmd_len" && \
4788
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
4604
4789
  lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
4605
4790
  lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
4606
4791
  else
@@ -6121,7 +6306,7 @@ ia64-*-hpux*)
6121
6306
  rm -rf conftest*
6122
6307
  ;;
6123
6308
 
6124
- x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
6309
+ x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
6125
6310
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
6126
6311
  # Find out which ABI we are using.
6127
6312
  echo 'int i;' > conftest.$ac_ext
@@ -6137,9 +6322,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
6137
6322
  LD="${LD-ld} -m elf_i386_fbsd"
6138
6323
  ;;
6139
6324
  x86_64-*linux*)
6140
- LD="${LD-ld} -m elf_i386"
6325
+ case `/usr/bin/file conftest.o` in
6326
+ *x86-64*)
6327
+ LD="${LD-ld} -m elf32_x86_64"
6328
+ ;;
6329
+ *)
6330
+ LD="${LD-ld} -m elf_i386"
6331
+ ;;
6332
+ esac
6333
+ ;;
6334
+ powerpc64le-*)
6335
+ LD="${LD-ld} -m elf32lppclinux"
6141
6336
  ;;
6142
- ppc64-*linux*|powerpc64-*linux*)
6337
+ powerpc64-*)
6143
6338
  LD="${LD-ld} -m elf32ppclinux"
6144
6339
  ;;
6145
6340
  s390x-*linux*)
@@ -6158,7 +6353,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
6158
6353
  x86_64-*linux*)
6159
6354
  LD="${LD-ld} -m elf_x86_64"
6160
6355
  ;;
6161
- ppc*-*linux*|powerpc*-*linux*)
6356
+ powerpcle-*)
6357
+ LD="${LD-ld} -m elf64lppc"
6358
+ ;;
6359
+ powerpc-*)
6162
6360
  LD="${LD-ld} -m elf64ppc"
6163
6361
  ;;
6164
6362
  s390*-*linux*|s390*-*tpf*)
@@ -11676,6 +11874,14 @@ LIBOBJS=$ac_libobjs
11676
11874
  LTLIBOBJS=$ac_ltlibobjs
11677
11875
 
11678
11876
 
11877
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
11878
+ $as_echo_n "checking that generated files are newer than configure... " >&6; }
11879
+ if test -n "$am_sleep_pid"; then
11880
+ # Hide warnings about reused PIDs.
11881
+ wait $am_sleep_pid 2>/dev/null
11882
+ fi
11883
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
11884
+ $as_echo "done" >&6; }
11679
11885
  if test -n "$EXEEXT"; then
11680
11886
  am__EXEEXT_TRUE=
11681
11887
  am__EXEEXT_FALSE='#'
@@ -13165,7 +13371,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
13165
13371
 
13166
13372
  case $ac_file$ac_mode in
13167
13373
  "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
13168
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
13374
+ # Older Autoconf quotes --file arguments for eval, but not when files
13169
13375
  # are listed without --file. Let's play safe and only enable the eval
13170
13376
  # if we detect the quoting.
13171
13377
  case $CONFIG_FILES in
@@ -13178,7 +13384,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
13178
13384
  # Strip MF so we end up with the name of the file.
13179
13385
  mf=`echo "$mf" | sed -e 's/:.*$//'`
13180
13386
  # Check whether this is an Automake generated Makefile or not.
13181
- # We used to match only the files named `Makefile.in', but
13387
+ # We used to match only the files named 'Makefile.in', but
13182
13388
  # some people rename them; so instead we look at the file content.
13183
13389
  # Grep'ing the first line is not enough: some people post-process
13184
13390
  # each Makefile.in and add a new line on top of each file to say so.
@@ -13212,21 +13418,19 @@ $as_echo X"$mf" |
13212
13418
  continue
13213
13419
  fi
13214
13420
  # Extract the definition of DEPDIR, am__include, and am__quote
13215
- # from the Makefile without running `make'.
13421
+ # from the Makefile without running 'make'.
13216
13422
  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
13217
13423
  test -z "$DEPDIR" && continue
13218
13424
  am__include=`sed -n 's/^am__include = //p' < "$mf"`
13219
- test -z "am__include" && continue
13425
+ test -z "$am__include" && continue
13220
13426
  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
13221
- # When using ansi2knr, U may be empty or an underscore; expand it
13222
- U=`sed -n 's/^U = //p' < "$mf"`
13223
13427
  # Find all dependency output files, they are included files with
13224
13428
  # $(DEPDIR) in their names. We invoke sed twice because it is the
13225
13429
  # simplest approach to changing $(DEPDIR) to its actual value in the
13226
13430
  # expansion.
13227
13431
  for file in `sed -n "
13228
13432
  s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
13229
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
13433
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
13230
13434
  # Make sure the directory exists.
13231
13435
  test -f "$dirpart/$file" && continue
13232
13436
  fdir=`$as_dirname -- "$file" ||