rbnacl-libsodium 1.0.2 → 1.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (141) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGES.md +4 -0
  3. data/lib/rbnacl/libsodium/version.rb +1 -1
  4. data/vendor/libsodium/ChangeLog +20 -1
  5. data/vendor/libsodium/Makefile.in +39 -27
  6. data/vendor/libsodium/README.markdown +2 -2
  7. data/vendor/libsodium/THANKS +2 -0
  8. data/vendor/libsodium/aclocal.m4 +36 -33
  9. data/vendor/libsodium/autom4te.cache/output.1 +1118 -841
  10. data/vendor/libsodium/autom4te.cache/output.4 +17517 -0
  11. data/vendor/libsodium/autom4te.cache/requests +760 -531
  12. data/vendor/libsodium/autom4te.cache/traces.1 +13 -14
  13. data/vendor/libsodium/autom4te.cache/traces.4 +2951 -0
  14. data/vendor/libsodium/build-aux/compile +1 -1
  15. data/vendor/libsodium/build-aux/config.guess +13 -160
  16. data/vendor/libsodium/build-aux/config.sub +25 -11
  17. data/vendor/libsodium/build-aux/depcomp +1 -1
  18. data/vendor/libsodium/build-aux/install-sh +170 -196
  19. data/vendor/libsodium/build-aux/ltmain.sh +3459 -2026
  20. data/vendor/libsodium/build-aux/missing +1 -1
  21. data/vendor/libsodium/build-aux/test-driver +12 -3
  22. data/vendor/libsodium/builds/msvc/version.h +2 -2
  23. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj +1 -4
  24. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +3 -8
  25. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj +11 -2
  26. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj.filters +11 -2
  27. data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj +2 -5
  28. data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +3 -8
  29. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj +11 -2
  30. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj.filters +11 -2
  31. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj +1 -4
  32. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +3 -8
  33. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj +11 -2
  34. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj.filters +11 -2
  35. data/vendor/libsodium/builds/msvc/vs2015/libsodium.import.props +52 -0
  36. data/vendor/libsodium/{packaging/nuget/package.xml → builds/msvc/vs2015/libsodium.import.xml} +2 -7
  37. data/vendor/libsodium/builds/msvc/vs2015/libsodium.sln +81 -0
  38. data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.props +43 -0
  39. data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.vcxproj +352 -0
  40. data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters +1073 -0
  41. data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.xml +15 -0
  42. data/vendor/libsodium/builds/msvc/vs2015/test/test.props +43 -0
  43. data/vendor/libsodium/builds/msvc/vs2015/test/test.runner.bat +78 -0
  44. data/vendor/libsodium/builds/msvc/vs2015/test/test.vcxproj +241 -0
  45. data/vendor/libsodium/builds/msvc/vs2015/test/test.vcxproj.filters +189 -0
  46. data/vendor/libsodium/configure +1117 -840
  47. data/vendor/libsodium/configure.ac +4 -4
  48. data/vendor/libsodium/dist-build/Makefile.am +2 -2
  49. data/vendor/libsodium/dist-build/Makefile.in +19 -7
  50. data/vendor/libsodium/dist-build/android-arm.sh +3 -2
  51. data/vendor/libsodium/dist-build/android-armv7-a.sh +4 -0
  52. data/vendor/libsodium/dist-build/android-build.sh +4 -5
  53. data/vendor/libsodium/dist-build/android-mips32.sh +4 -0
  54. data/vendor/libsodium/dist-build/android-x86.sh +3 -2
  55. data/vendor/libsodium/dist-build/emscripten.sh +4 -5
  56. data/vendor/libsodium/dist-build/ios.sh +56 -25
  57. data/vendor/libsodium/dist-build/osx.sh +20 -0
  58. data/vendor/libsodium/libsodium.vcxproj +1 -0
  59. data/vendor/libsodium/libsodium.vcxproj.filters +3 -0
  60. data/vendor/libsodium/m4/libtool.m4 +1366 -1030
  61. data/vendor/libsodium/m4/ltoptions.m4 +90 -37
  62. data/vendor/libsodium/m4/ltsugar.m4 +4 -3
  63. data/vendor/libsodium/m4/ltversion.m4 +6 -6
  64. data/vendor/libsodium/m4/lt~obsolete.m4 +4 -3
  65. data/vendor/libsodium/msvc-scripts/Makefile.in +17 -5
  66. data/vendor/libsodium/msvc-scripts/process.bat +2 -2
  67. data/vendor/libsodium/packaging/nuget/package.config +1 -1
  68. data/vendor/libsodium/src/Makefile.in +17 -5
  69. data/vendor/libsodium/src/libsodium/Makefile.am +7 -2
  70. data/vendor/libsodium/src/libsodium/Makefile.in +83 -55
  71. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/auth_hmacsha256_api.c +5 -0
  72. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/cp/verify_hmacsha256.c +1 -1
  73. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512_api.c +5 -0
  74. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/cp/verify_hmacsha512.c +1 -1
  75. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/auth_hmacsha512256_api.c +5 -0
  76. data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c +1 -1
  77. data/vendor/libsodium/src/libsodium/crypto_box/crypto_box_seal.c +67 -0
  78. data/vendor/libsodium/src/libsodium/crypto_generichash/crypto_generichash.c +8 -1
  79. data/vendor/libsodium/src/libsodium/crypto_hash/sha256/hash_sha256_api.c +5 -0
  80. data/vendor/libsodium/src/libsodium/crypto_hash/sha512/hash_sha512_api.c +5 -0
  81. data/vendor/libsodium/src/libsodium/crypto_onetimeauth/crypto_onetimeauth.c +12 -6
  82. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h +11 -0
  83. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c +60 -25
  84. data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c +12 -12
  85. data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult_curve25519_donna_c64.c +11 -3
  86. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c +1 -1
  87. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c +1 -4
  88. data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/ref/api.h +1 -0
  89. data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c +13 -3
  90. data/vendor/libsodium/src/libsodium/include/Makefile.in +18 -6
  91. data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha256.h +9 -5
  92. data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha512.h +9 -5
  93. data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +6 -2
  94. data/vendor/libsodium/src/libsodium/include/sodium/crypto_box.h +15 -0
  95. data/vendor/libsodium/src/libsodium/include/sodium/crypto_generichash.h +2 -0
  96. data/vendor/libsodium/src/libsodium/include/sodium/crypto_generichash_blake2b.h +1 -1
  97. data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash_sha256.h +2 -0
  98. data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash_sha512.h +2 -0
  99. data/vendor/libsodium/src/libsodium/include/sodium/crypto_onetimeauth.h +2 -0
  100. data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_xsalsa20.h +6 -0
  101. data/vendor/libsodium/src/libsodium/include/sodium/randombytes.h +6 -6
  102. data/vendor/libsodium/src/libsodium/include/sodium/utils.h +2 -2
  103. data/vendor/libsodium/src/libsodium/randombytes/randombytes.c +82 -3
  104. data/vendor/libsodium/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c +85 -33
  105. data/vendor/libsodium/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c +80 -42
  106. data/vendor/libsodium/src/libsodium/sodium/utils.c +16 -13
  107. data/vendor/libsodium/test/Makefile.am +1 -1
  108. data/vendor/libsodium/test/Makefile.in +18 -6
  109. data/vendor/libsodium/test/default/Makefile.am +9 -3
  110. data/vendor/libsodium/test/default/Makefile.in +72 -38
  111. data/vendor/libsodium/test/default/auth.c +8 -0
  112. data/vendor/libsodium/test/default/auth5.c +0 -2
  113. data/vendor/libsodium/test/default/auth7.c +0 -2
  114. data/vendor/libsodium/test/default/box8.c +0 -2
  115. data/vendor/libsodium/test/default/box_easy2.c +1 -1
  116. data/vendor/libsodium/test/default/box_seal.c +43 -0
  117. data/vendor/libsodium/test/default/box_seal.exp +4 -0
  118. data/vendor/libsodium/test/default/cmptest.h +1 -0
  119. data/vendor/libsodium/test/default/generichash2.c +1 -0
  120. data/vendor/libsodium/test/default/hash.c +2 -0
  121. data/vendor/libsodium/test/default/onetimeauth.c +1 -0
  122. data/vendor/libsodium/test/default/onetimeauth7.c +0 -2
  123. data/vendor/libsodium/test/default/pre.js.inc +0 -27
  124. data/vendor/libsodium/test/default/pwhash.c +18 -5
  125. data/vendor/libsodium/test/default/randombytes.c +44 -2
  126. data/vendor/libsodium/test/default/secretbox8.c +0 -2
  127. data/vendor/libsodium/test/default/sodium_utils2.c +5 -1
  128. data/vendor/libsodium/test/default/sodium_utils3.c +1 -1
  129. data/vendor/libsodium/test/default/stream.c +13 -1
  130. data/vendor/libsodium/test/default/stream.exp +1 -0
  131. data/vendor/libsodium/test/default/stream2.c +13 -1
  132. data/vendor/libsodium/test/default/stream2.exp +1 -0
  133. data/vendor/libsodium/test/quirks/quirks.h +26 -0
  134. metadata +23 -12
  135. data/vendor/libsodium/builds/msvc/resource.h +0 -0
  136. data/vendor/libsodium/builds/msvc/resource.rc +0 -0
  137. data/vendor/libsodium/dist-build/android-armv7.sh +0 -3
  138. data/vendor/libsodium/dist-build/android-mips.sh +0 -3
  139. data/vendor/libsodium/packaging/nuget/package.nuspec +0 -95
  140. data/vendor/libsodium/packaging/nuget/package.targets +0 -128
  141. data/vendor/libsodium/test/quirks/windows/windows-quirks.h +0 -18
@@ -1,14 +1,14 @@
1
1
  # Helper functions for option handling. -*- Autoconf -*-
2
2
  #
3
- # Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
4
- # Inc.
3
+ # Copyright (C) 2004-2005, 2007-2009, 2011-2014 Free Software
4
+ # Foundation, Inc.
5
5
  # Written by Gary V. Vaughan, 2004
6
6
  #
7
7
  # This file is free software; the Free Software Foundation gives
8
8
  # unlimited permission to copy and/or distribute it, with or without
9
9
  # modifications, as long as this notice is preserved.
10
10
 
11
- # serial 7 ltoptions.m4
11
+ # serial 8 ltoptions.m4
12
12
 
13
13
  # This is to help aclocal find these macros, as it can't see m4_define.
14
14
  AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION],
29
29
  [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
30
30
  m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
31
31
  _LT_MANGLE_DEFUN([$1], [$2]),
32
- [m4_warning([Unknown $1 option `$2'])])[]dnl
32
+ [m4_warning([Unknown $1 option '$2'])])[]dnl
33
33
  ])
34
34
 
35
35
 
@@ -75,13 +75,15 @@ m4_if([$1],[LT_INIT],[
75
75
  dnl
76
76
  dnl If no reference was made to various pairs of opposing options, then
77
77
  dnl we run the default mode handler for the pair. For example, if neither
78
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
78
+ dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
79
79
  dnl archives by default:
80
80
  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
81
81
  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
82
82
  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
83
83
  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
84
- [_LT_ENABLE_FAST_INSTALL])
84
+ [_LT_ENABLE_FAST_INSTALL])
85
+ _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
86
+ [_LT_WITH_AIX_SONAME([aix])])
85
87
  ])
86
88
  ])# _LT_SET_OPTIONS
87
89
 
@@ -112,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
112
114
  [_LT_SET_OPTION([LT_INIT], [dlopen])
113
115
  AC_DIAGNOSE([obsolete],
114
116
  [$0: Remove this warning and the call to _LT_SET_OPTION when you
115
- put the `dlopen' option into LT_INIT's first parameter.])
117
+ put the 'dlopen' option into LT_INIT's first parameter.])
116
118
  ])
117
119
 
118
120
  dnl aclocal-1.4 backwards compatibility:
@@ -148,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
148
150
  _LT_SET_OPTION([LT_INIT], [win32-dll])
149
151
  AC_DIAGNOSE([obsolete],
150
152
  [$0: Remove this warning and the call to _LT_SET_OPTION when you
151
- put the `win32-dll' option into LT_INIT's first parameter.])
153
+ put the 'win32-dll' option into LT_INIT's first parameter.])
152
154
  ])
153
155
 
154
156
  dnl aclocal-1.4 backwards compatibility:
@@ -157,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
157
159
 
158
160
  # _LT_ENABLE_SHARED([DEFAULT])
159
161
  # ----------------------------
160
- # implement the --enable-shared flag, and supports the `shared' and
161
- # `disable-shared' LT_INIT options.
162
- # DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
162
+ # implement the --enable-shared flag, and supports the 'shared' and
163
+ # 'disable-shared' LT_INIT options.
164
+ # DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
163
165
  m4_define([_LT_ENABLE_SHARED],
164
166
  [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
165
167
  AC_ARG_ENABLE([shared],
@@ -172,14 +174,14 @@ AC_ARG_ENABLE([shared],
172
174
  *)
173
175
  enable_shared=no
174
176
  # Look at the argument we got. We use all the common list separators.
175
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
177
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
176
178
  for pkg in $enableval; do
177
- IFS="$lt_save_ifs"
179
+ IFS=$lt_save_ifs
178
180
  if test "X$pkg" = "X$p"; then
179
181
  enable_shared=yes
180
182
  fi
181
183
  done
182
- IFS="$lt_save_ifs"
184
+ IFS=$lt_save_ifs
183
185
  ;;
184
186
  esac],
185
187
  [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -211,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
211
213
 
212
214
  # _LT_ENABLE_STATIC([DEFAULT])
213
215
  # ----------------------------
214
- # implement the --enable-static flag, and support the `static' and
215
- # `disable-static' LT_INIT options.
216
- # DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
216
+ # implement the --enable-static flag, and support the 'static' and
217
+ # 'disable-static' LT_INIT options.
218
+ # DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
217
219
  m4_define([_LT_ENABLE_STATIC],
218
220
  [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
219
221
  AC_ARG_ENABLE([static],
@@ -226,14 +228,14 @@ AC_ARG_ENABLE([static],
226
228
  *)
227
229
  enable_static=no
228
230
  # Look at the argument we got. We use all the common list separators.
229
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
231
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
230
232
  for pkg in $enableval; do
231
- IFS="$lt_save_ifs"
233
+ IFS=$lt_save_ifs
232
234
  if test "X$pkg" = "X$p"; then
233
235
  enable_static=yes
234
236
  fi
235
237
  done
236
- IFS="$lt_save_ifs"
238
+ IFS=$lt_save_ifs
237
239
  ;;
238
240
  esac],
239
241
  [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -265,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
265
267
 
266
268
  # _LT_ENABLE_FAST_INSTALL([DEFAULT])
267
269
  # ----------------------------------
268
- # implement the --enable-fast-install flag, and support the `fast-install'
269
- # and `disable-fast-install' LT_INIT options.
270
- # DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
270
+ # implement the --enable-fast-install flag, and support the 'fast-install'
271
+ # and 'disable-fast-install' LT_INIT options.
272
+ # DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
271
273
  m4_define([_LT_ENABLE_FAST_INSTALL],
272
274
  [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
273
275
  AC_ARG_ENABLE([fast-install],
@@ -280,14 +282,14 @@ AC_ARG_ENABLE([fast-install],
280
282
  *)
281
283
  enable_fast_install=no
282
284
  # Look at the argument we got. We use all the common list separators.
283
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
285
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
284
286
  for pkg in $enableval; do
285
- IFS="$lt_save_ifs"
287
+ IFS=$lt_save_ifs
286
288
  if test "X$pkg" = "X$p"; then
287
289
  enable_fast_install=yes
288
290
  fi
289
291
  done
290
- IFS="$lt_save_ifs"
292
+ IFS=$lt_save_ifs
291
293
  ;;
292
294
  esac],
293
295
  [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -304,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
304
306
  [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
305
307
  AC_DIAGNOSE([obsolete],
306
308
  [$0: Remove this warning and the call to _LT_SET_OPTION when you put
307
- the `fast-install' option into LT_INIT's first parameter.])
309
+ the 'fast-install' option into LT_INIT's first parameter.])
308
310
  ])
309
311
 
310
312
  AU_DEFUN([AC_DISABLE_FAST_INSTALL],
311
313
  [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
312
314
  AC_DIAGNOSE([obsolete],
313
315
  [$0: Remove this warning and the call to _LT_SET_OPTION when you put
314
- the `disable-fast-install' option into LT_INIT's first parameter.])
316
+ the 'disable-fast-install' option into LT_INIT's first parameter.])
315
317
  ])
316
318
 
317
319
  dnl aclocal-1.4 backwards compatibility:
@@ -319,11 +321,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
319
321
  dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
320
322
 
321
323
 
324
+ # _LT_WITH_AIX_SONAME([DEFAULT])
325
+ # ----------------------------------
326
+ # implement the --with-aix-soname flag, and support the `aix-soname=aix'
327
+ # and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
328
+ # is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
329
+ m4_define([_LT_WITH_AIX_SONAME],
330
+ [m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
331
+ shared_archive_member_spec=
332
+ case $host,$enable_shared in
333
+ power*-*-aix[[5-9]]*,yes)
334
+ AC_MSG_CHECKING([which variant of shared library versioning to provide])
335
+ AC_ARG_WITH([aix-soname],
336
+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
337
+ [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
338
+ [case $withval in
339
+ aix|svr4|both)
340
+ ;;
341
+ *)
342
+ AC_MSG_ERROR([Unknown argument to --with-aix-soname])
343
+ ;;
344
+ esac
345
+ lt_cv_with_aix_soname=$with_aix_soname],
346
+ [AC_CACHE_VAL([lt_cv_with_aix_soname],
347
+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
348
+ with_aix_soname=$lt_cv_with_aix_soname])
349
+ AC_MSG_RESULT([$with_aix_soname])
350
+ if test aix != "$with_aix_soname"; then
351
+ # For the AIX way of multilib, we name the shared archive member
352
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
353
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
354
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
355
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
356
+ if test 64 = "${OBJECT_MODE-32}"; then
357
+ shared_archive_member_spec=shr_64
358
+ else
359
+ shared_archive_member_spec=shr
360
+ fi
361
+ fi
362
+ ;;
363
+ *)
364
+ with_aix_soname=aix
365
+ ;;
366
+ esac
367
+
368
+ _LT_DECL([], [shared_archive_member_spec], [0],
369
+ [Shared archive member basename, for filename based shared library versioning on AIX])dnl
370
+ ])# _LT_WITH_AIX_SONAME
371
+
372
+ LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
373
+ LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
374
+ LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
375
+
376
+
322
377
  # _LT_WITH_PIC([MODE])
323
378
  # --------------------
324
- # implement the --with-pic flag, and support the `pic-only' and `no-pic'
379
+ # implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
325
380
  # LT_INIT options.
326
- # MODE is either `yes' or `no'. If omitted, it defaults to `both'.
381
+ # MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
327
382
  m4_define([_LT_WITH_PIC],
328
383
  [AC_ARG_WITH([pic],
329
384
  [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@@ -334,19 +389,17 @@ m4_define([_LT_WITH_PIC],
334
389
  *)
335
390
  pic_mode=default
336
391
  # Look at the argument we got. We use all the common list separators.
337
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
392
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
338
393
  for lt_pkg in $withval; do
339
- IFS="$lt_save_ifs"
394
+ IFS=$lt_save_ifs
340
395
  if test "X$lt_pkg" = "X$lt_p"; then
341
396
  pic_mode=yes
342
397
  fi
343
398
  done
344
- IFS="$lt_save_ifs"
399
+ IFS=$lt_save_ifs
345
400
  ;;
346
401
  esac],
347
- [pic_mode=default])
348
-
349
- test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
402
+ [pic_mode=m4_default([$1], [default])])
350
403
 
351
404
  _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
352
405
  ])# _LT_WITH_PIC
@@ -359,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
359
412
  [_LT_SET_OPTION([LT_INIT], [pic-only])
360
413
  AC_DIAGNOSE([obsolete],
361
414
  [$0: Remove this warning and the call to _LT_SET_OPTION when you
362
- put the `pic-only' option into LT_INIT's first parameter.])
415
+ put the 'pic-only' option into LT_INIT's first parameter.])
363
416
  ])
364
417
 
365
418
  dnl aclocal-1.4 backwards compatibility:
@@ -1,6 +1,7 @@
1
1
  # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
2
2
  #
3
- # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
3
+ # Copyright (C) 2004-2005, 2007-2008, 2011-2014 Free Software
4
+ # Foundation, Inc.
4
5
  # Written by Gary V. Vaughan, 2004
5
6
  #
6
7
  # This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@ m4_define([_lt_join],
33
34
  # ------------
34
35
  # Manipulate m4 lists.
35
36
  # These macros are necessary as long as will still need to support
36
- # Autoconf-2.59 which quotes differently.
37
+ # Autoconf-2.59, which quotes differently.
37
38
  m4_define([lt_car], [[$1]])
38
39
  m4_define([lt_cdr],
39
40
  [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@ m4_define([lt_unquote], $1)
44
45
 
45
46
  # lt_append(MACRO-NAME, STRING, [SEPARATOR])
46
47
  # ------------------------------------------
47
- # Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
48
+ # Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
48
49
  # Note that neither SEPARATOR nor STRING are expanded; they are appended
49
50
  # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
50
51
  # No SEPARATOR is output if MACRO-NAME was previously undefined (different
@@ -1,6 +1,6 @@
1
1
  # ltversion.m4 -- version numbers -*- Autoconf -*-
2
2
  #
3
- # Copyright (C) 2004 Free Software Foundation, Inc.
3
+ # Copyright (C) 2004, 2011-2014 Free Software Foundation, Inc.
4
4
  # Written by Scott James Remnant, 2004
5
5
  #
6
6
  # This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
9
9
 
10
10
  # @configure_input@
11
11
 
12
- # serial 3337 ltversion.m4
12
+ # serial 4151 ltversion.m4
13
13
  # This file is part of GNU Libtool
14
14
 
15
- m4_define([LT_PACKAGE_VERSION], [2.4.2])
16
- m4_define([LT_PACKAGE_REVISION], [1.3337])
15
+ m4_define([LT_PACKAGE_VERSION], [2.4.4])
16
+ m4_define([LT_PACKAGE_REVISION], [2.4.4])
17
17
 
18
18
  AC_DEFUN([LTVERSION_VERSION],
19
- [macro_version='2.4.2'
20
- macro_revision='1.3337'
19
+ [macro_version='2.4.4'
20
+ macro_revision='2.4.4'
21
21
  _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
22
22
  _LT_DECL(, macro_revision, 0)
23
23
  ])
@@ -1,6 +1,7 @@
1
1
  # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
2
2
  #
3
- # Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
3
+ # Copyright (C) 2004-2005, 2007, 2009, 2011-2014 Free Software
4
+ # Foundation, Inc.
4
5
  # Written by Scott James Remnant, 2004.
5
6
  #
6
7
  # This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
11
12
 
12
13
  # These exist entirely to fool aclocal when bootstrapping libtool.
13
14
  #
14
- # In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
15
+ # In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
15
16
  # which have later been changed to m4_define as they aren't part of the
16
17
  # exported API, or moved to Autoconf or Automake where they belong.
17
18
  #
@@ -25,7 +26,7 @@
25
26
  # included after everything else. This provides aclocal with the
26
27
  # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
27
28
  # because those macros already exist, or will be overwritten later.
28
- # We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
29
+ # We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
29
30
  #
30
31
  # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
31
32
  # Yes, that means every name once taken will need to remain here until
@@ -1,7 +1,7 @@
1
- # Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+ # Makefile.in generated by automake 1.15 from Makefile.am.
2
2
  # @configure_input@
3
3
 
4
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+ # Copyright (C) 1994-2014 Free Software Foundation, Inc.
5
5
 
6
6
  # This Makefile.in is free software; the Free Software Foundation
7
7
  # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
14
14
 
15
15
  @SET_MAKE@
16
16
  VPATH = @srcdir@
17
- am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
17
+ am__is_gnu_make = { \
18
+ if test -z '$(MAKELEVEL)'; then \
19
+ false; \
20
+ elif test -n '$(MAKE_HOST)'; then \
21
+ true; \
22
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23
+ true; \
24
+ else \
25
+ false; \
26
+ fi; \
27
+ }
18
28
  am__make_running_with_option = \
19
29
  case $${target_option-} in \
20
30
  ?) ;; \
@@ -78,7 +88,6 @@ POST_UNINSTALL = :
78
88
  build_triplet = @build@
79
89
  host_triplet = @host@
80
90
  subdir = msvc-scripts
81
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
82
91
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
83
92
  am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
84
93
  $(top_srcdir)/m4/ax_check_link_flag.m4 \
@@ -88,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
88
97
  $(top_srcdir)/configure.ac
89
98
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
90
99
  $(ACLOCAL_M4)
100
+ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
91
101
  mkinstalldirs = $(install_sh) -d
92
102
  CONFIG_CLEAN_FILES =
93
103
  CONFIG_CLEAN_VPATH_FILES =
@@ -111,6 +121,7 @@ am__can_run_installinfo = \
111
121
  *) (install-info --version) >/dev/null 2>&1;; \
112
122
  esac
113
123
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
124
+ am__DIST_COMMON = $(srcdir)/Makefile.in
114
125
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
115
126
  ACLOCAL = @ACLOCAL@
116
127
  AMTAR = @AMTAR@
@@ -264,7 +275,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
264
275
  echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign msvc-scripts/Makefile'; \
265
276
  $(am__cd) $(top_srcdir) && \
266
277
  $(AUTOMAKE) --foreign msvc-scripts/Makefile
267
- .PRECIOUS: Makefile
268
278
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
269
279
  @case '$?' in \
270
280
  *config.status*) \
@@ -439,6 +449,8 @@ uninstall-am:
439
449
  mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
440
450
  tags-am uninstall uninstall-am
441
451
 
452
+ .PRECIOUS: Makefile
453
+
442
454
 
443
455
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
444
456
  # Otherwise a system limit (for SysV at least) may be exceeded.
@@ -1,4 +1,4 @@
1
- cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.2/ < src\libsodium\include\sodium\version.h.in > tmp
1
+ cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.3/ < src\libsodium\include\sodium\version.h.in > tmp
2
2
  cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/7/ < tmp > tmp2
3
- cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/4/ < tmp2 > src\libsodium\include\sodium\version.h
3
+ cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/5/ < tmp2 > src\libsodium\include\sodium\version.h
4
4
  del tmp tmp2
@@ -1,4 +1,4 @@
1
1
  <?xml version="1.0" encoding="utf-8"?>
2
2
  <!-- These values are populated into the package.gsl templates by package.bat. -->
3
3
  <!-- The target attribute controls path and file name only, id controls package naming. -->
4
- <package id="libsodium_vc120" target="libsodium" version = "1.0.0.0" pathversion="1_0_0_0" platformtoolset="v120" />
4
+ <package id="libsodium_vc120" target="libsodium" version = "1.0.3.0" pathversion="1_0_3_0" platformtoolset="v120" />
@@ -1,7 +1,7 @@
1
- # Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+ # Makefile.in generated by automake 1.15 from Makefile.am.
2
2
  # @configure_input@
3
3
 
4
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+ # Copyright (C) 1994-2014 Free Software Foundation, Inc.
5
5
 
6
6
  # This Makefile.in is free software; the Free Software Foundation
7
7
  # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
14
14
 
15
15
  @SET_MAKE@
16
16
  VPATH = @srcdir@
17
- am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
17
+ am__is_gnu_make = { \
18
+ if test -z '$(MAKELEVEL)'; then \
19
+ false; \
20
+ elif test -n '$(MAKE_HOST)'; then \
21
+ true; \
22
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23
+ true; \
24
+ else \
25
+ false; \
26
+ fi; \
27
+ }
18
28
  am__make_running_with_option = \
19
29
  case $${target_option-} in \
20
30
  ?) ;; \
@@ -78,7 +88,6 @@ POST_UNINSTALL = :
78
88
  build_triplet = @build@
79
89
  host_triplet = @host@
80
90
  subdir = src
81
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
82
91
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
83
92
  am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
84
93
  $(top_srcdir)/m4/ax_check_link_flag.m4 \
@@ -88,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
88
97
  $(top_srcdir)/configure.ac
89
98
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
90
99
  $(ACLOCAL_M4)
100
+ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
91
101
  mkinstalldirs = $(install_sh) -d
92
102
  CONFIG_CLEAN_FILES =
93
103
  CONFIG_CLEAN_VPATH_FILES =
@@ -146,6 +156,7 @@ am__define_uniq_tagged_files = \
146
156
  ETAGS = etags
147
157
  CTAGS = ctags
148
158
  DIST_SUBDIRS = $(SUBDIRS)
159
+ am__DIST_COMMON = $(srcdir)/Makefile.in
149
160
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
150
161
  am__relativize = \
151
162
  dir0=`pwd`; \
@@ -322,7 +333,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
322
333
  echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
323
334
  $(am__cd) $(top_srcdir) && \
324
335
  $(AUTOMAKE) --foreign src/Makefile
325
- .PRECIOUS: Makefile
326
336
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
327
337
  @case '$?' in \
328
338
  *config.status*) \
@@ -617,6 +627,8 @@ uninstall-am:
617
627
  mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
618
628
  ps ps-am tags tags-am uninstall uninstall-am
619
629
 
630
+ .PRECIOUS: Makefile
631
+
620
632
 
621
633
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
622
634
  # Otherwise a system limit (for SysV at least) may be exceeded.