Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Import libarchive-2.8.4:

- Improved reliability of hash function detection
- Fix issues on ancient FreeBSD, QNX, ancient NetBSD and Minix
  • Loading branch information...
commit e262c40f17c1b70c0dc69c5078a3815c9aaa5bca 1 parent d44d1be
joerg authored

Showing 101 changed files with 28,454 additions and 30,948 deletions. Show diff stats Hide diff stats

  1. +176 68 archivers/libarchive/files/CMakeLists.txt
  2. +4 0 archivers/libarchive/files/Makefile.am
  3. +802 706 archivers/libarchive/files/Makefile.in
  4. +4 0 archivers/libarchive/files/NEWS
  5. +195 111 archivers/libarchive/files/aclocal.m4
  6. +11 10 archivers/libarchive/files/build/autoconf/compile
  7. +477 382 archivers/libarchive/files/build/autoconf/config.guess
  8. +277 73 archivers/libarchive/files/build/autoconf/config.sub
  9. +64 23 archivers/libarchive/files/build/autoconf/depcomp
  10. +251 479 archivers/libarchive/files/build/autoconf/install-sh
  11. +10 61 archivers/libarchive/files/build/autoconf/ltmain.sh
  12. +29 20 archivers/libarchive/files/build/autoconf/missing
  13. +1 0  archivers/libarchive/files/build/autogen.sh
  14. +101 68 archivers/libarchive/files/build/cmake/config.h.in
  15. +1 1  archivers/libarchive/files/build/version
  16. +6 4 archivers/libarchive/files/build/windows/mvcpp.nt
  17. +6 4 archivers/libarchive/files/build/windows/wccpp.nt
  18. +122 97 archivers/libarchive/files/config.h.in
  19. +10,724 20,194 archivers/libarchive/files/configure
  20. +69 51 archivers/libarchive/files/configure.ac
  21. +5 3 archivers/libarchive/files/contrib/libarchive.1aix53.spec
  22. +5 3 archivers/libarchive/files/contrib/libarchive.spec
  23. +16 0 archivers/libarchive/files/cpio/test/main.c
  24. +2 3 archivers/libarchive/files/cpio/test/test.h
  25. +15 0 archivers/libarchive/files/cpio/test/test_gcpio_compat_ref_nosym.bin.uu
  26. +15 0 archivers/libarchive/files/cpio/test/test_gcpio_compat_ref_nosym.crc.uu
  27. +15 0 archivers/libarchive/files/cpio/test/test_gcpio_compat_ref_nosym.newc.uu
  28. +72 0 archivers/libarchive/files/cpio/test/test_gcpio_compat_ref_nosym.ustar.uu
  29. +2 1  archivers/libarchive/files/cpio/test/test_owner_parse.c
  30. +14 14 archivers/libarchive/files/doc/html/Makefile
  31. +1,065 694 archivers/libarchive/files/doc/html/archive_entry.3.html
  32. +1,509 820 archivers/libarchive/files/doc/html/archive_read.3.html
  33. +765 341 archivers/libarchive/files/doc/html/archive_read_disk.3.html
  34. +495 210 archivers/libarchive/files/doc/html/archive_util.3.html
  35. +1,348 845 archivers/libarchive/files/doc/html/archive_write.3.html
  36. +892 421 archivers/libarchive/files/doc/html/archive_write_disk.3.html
  37. +890 519 archivers/libarchive/files/doc/html/bsdcpio.1.html
  38. +1,838 1,014 archivers/libarchive/files/doc/html/bsdtar.1.html
  39. +769 422 archivers/libarchive/files/doc/html/cpio.5.html
  40. +895 375 archivers/libarchive/files/doc/html/libarchive-formats.5.html
  41. +801 329 archivers/libarchive/files/doc/html/libarchive.3.html
  42. +890 381 archivers/libarchive/files/doc/html/libarchive_internals.3.html
  43. +622 339 archivers/libarchive/files/doc/html/mtree.5.html
  44. +1,657 1,400 archivers/libarchive/files/doc/html/tar.5.html
  45. +1 1  archivers/libarchive/files/doc/man/archive_read.3
  46. +4 4 archivers/libarchive/files/doc/man/bsdtar.1
  47. +0 2  archivers/libarchive/files/doc/man/libarchive_internals.3
  48. BIN  archivers/libarchive/files/doc/pdf/archive_entry.3.pdf
  49. BIN  archivers/libarchive/files/doc/pdf/archive_read.3.pdf
  50. BIN  archivers/libarchive/files/doc/pdf/archive_read_disk.3.pdf
  51. BIN  archivers/libarchive/files/doc/pdf/archive_util.3.pdf
  52. BIN  archivers/libarchive/files/doc/pdf/archive_write.3.pdf
  53. BIN  archivers/libarchive/files/doc/pdf/archive_write_disk.3.pdf
  54. BIN  archivers/libarchive/files/doc/pdf/bsdcpio.1.pdf
  55. BIN  archivers/libarchive/files/doc/pdf/bsdtar.1.pdf
  56. BIN  archivers/libarchive/files/doc/pdf/cpio.5.pdf
  57. BIN  archivers/libarchive/files/doc/pdf/libarchive-formats.5.pdf
  58. BIN  archivers/libarchive/files/doc/pdf/libarchive.3.pdf
  59. BIN  archivers/libarchive/files/doc/pdf/libarchive_internals.3.pdf
  60. BIN  archivers/libarchive/files/doc/pdf/mtree.5.pdf
  61. BIN  archivers/libarchive/files/doc/pdf/tar.5.pdf
  62. +6 6 archivers/libarchive/files/doc/text/archive_entry.3.txt
  63. +8 8 archivers/libarchive/files/doc/text/archive_read.3.txt
  64. +3 3 archivers/libarchive/files/doc/text/archive_read_disk.3.txt
  65. +4 4 archivers/libarchive/files/doc/text/archive_util.3.txt
  66. +8 8 archivers/libarchive/files/doc/text/archive_write.3.txt
  67. +10 10 archivers/libarchive/files/doc/text/archive_write_disk.3.txt
  68. +36 36 archivers/libarchive/files/doc/text/bsdcpio.1.txt
  69. +57 57 archivers/libarchive/files/doc/text/bsdtar.1.txt
  70. +33 33 archivers/libarchive/files/doc/text/cpio.5.txt
  71. +17 17 archivers/libarchive/files/doc/text/libarchive-formats.5.txt
  72. +19 19 archivers/libarchive/files/doc/text/libarchive.3.txt
  73. +10 11 archivers/libarchive/files/doc/text/libarchive_internals.3.txt
  74. +7 7 archivers/libarchive/files/doc/text/mtree.5.txt
  75. +21 21 archivers/libarchive/files/doc/text/tar.5.txt
  76. +1 1  archivers/libarchive/files/doc/update.sh
  77. +1 1  archivers/libarchive/files/doc/wiki/ManPageArchiveRead3.wiki
  78. +3 3 archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki
  79. +0 1  archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki
  80. +2 2 archivers/libarchive/files/libarchive/archive.h
  81. +125 40 archivers/libarchive/files/libarchive/archive_hash.h
  82. +1 1  archivers/libarchive/files/libarchive/archive_read.3
  83. +2 1  archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
  84. +31 0 archivers/libarchive/files/libarchive/archive_read_disk_set_standard_lookup.c
  85. +8 4 archivers/libarchive/files/libarchive/archive_read_open_fd.c
  86. +12 8 archivers/libarchive/files/libarchive/archive_read_open_filename.c
  87. +4 4 archivers/libarchive/files/libarchive/archive_read_support_compression_bzip2.c
  88. +1 1  archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c
  89. +7 6 archivers/libarchive/files/libarchive/archive_read_support_format_xar.c
  90. +11 55 archivers/libarchive/files/libarchive/archive_windows.c
  91. +0 75 archivers/libarchive/files/libarchive/archive_windows.h
  92. +1 1  archivers/libarchive/files/libarchive/archive_write_disk.c
  93. +20 0 archivers/libarchive/files/libarchive/archive_write_disk_set_standard_lookup.c
  94. +2 2 archivers/libarchive/files/libarchive/archive_write_set_compression_bzip2.c
  95. +2 2 archivers/libarchive/files/libarchive/filter_fork.c
  96. +0 1  archivers/libarchive/files/libarchive/libarchive_internals.3
  97. +16 0 archivers/libarchive/files/libarchive/test/main.c
  98. +12 0 archivers/libarchive/files/libarchive/test/test_entry.c
  99. +3 3 archivers/libarchive/files/tar/bsdtar.1
  100. +16 0 archivers/libarchive/files/tar/test/main.c
  101. +2 3 archivers/libarchive/files/tar/test/test.h
244 archivers/libarchive/files/CMakeLists.txt
@@ -205,13 +205,11 @@ MACRO (LA_CHECK_INCLUDE_FILE header var)
205 205 ENDIF (${var})
206 206 ENDMACRO (LA_CHECK_INCLUDE_FILE)
207 207
208   -# Few headers that must precede other headers
209   -# Must precede sys/extattr.h on FreeBSD
  208 +# Some FreeBSD headers assume sys/types.h was already included.
210 209 LA_CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
211 210
212 211 # Alphabetize the rest unless there's a compelling reason
213 212 LA_CHECK_INCLUDE_FILE("acl/libacl.h" HAVE_ACL_LIBACL_H)
214   -LA_CHECK_INCLUDE_FILE("attr/xattr.h" HAVE_ATTR_XATTR_H)
215 213 LA_CHECK_INCLUDE_FILE("ctype.h" HAVE_CTYPE_H)
216 214 LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H)
217 215 LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
@@ -239,7 +237,6 @@ LA_CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
239 237 LA_CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
240 238 LA_CHECK_INCLUDE_FILE("sys/acl.h" HAVE_SYS_ACL_H)
241 239 LA_CHECK_INCLUDE_FILE("sys/cdefs.h" HAVE_SYS_CDEFS_H)
242   -LA_CHECK_INCLUDE_FILE("sys/extattr.h" HAVE_SYS_EXTATTR_H)
243 240 LA_CHECK_INCLUDE_FILE("sys/ioctl.h" HAVE_SYS_IOCTL_H)
244 241 LA_CHECK_INCLUDE_FILE("sys/mkdev.h" HAVE_SYS_MKDEV_H)
245 242 LA_CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
@@ -266,72 +263,176 @@ LA_CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
266 263 #
267 264 IF(ENABLE_OPENSSL)
268 265 FIND_PACKAGE(OpenSSL)
269   -ELSE()
270   - SET(OPENSSL_FOUND 0)
271   -ENDIF()
272   -IF(OPENSSL_FOUND)
273   - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
274   - LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES})
275   -ELSE()
276   - # Block OpenSSL checks and override cached results.
277   - SET(HAVE_OPENSSL_MD5_H 0)
278   - SET(HAVE_OPENSSL_RIPEMD_H 0)
279   - SET(HAVE_OPENSSL_SHA_H 0)
280   - SET(HAVE_OPENSSL_SHA256_INIT 0)
281   - SET(HAVE_OPENSSL_SHA384_INIT 0)
282   - SET(HAVE_OPENSSL_SHA512_INIT 0)
283 266 ENDIF()
  267 +
284 268 #
285   -# Check MD5/RMD160/SHA headers
286   -#
287   -LA_CHECK_INCLUDE_FILE("md5.h" HAVE_MD5_H)
288   -LA_CHECK_INCLUDE_FILE("openssl/md5.h" HAVE_OPENSSL_MD5_H)
289   -LA_CHECK_INCLUDE_FILE("openssl/ripemd.h" HAVE_OPENSSL_RIPEMD_H)
290   -LA_CHECK_INCLUDE_FILE("openssl/sha.h" HAVE_OPENSSL_SHA_H)
291   -LA_CHECK_INCLUDE_FILE("ripemd.h" HAVE_RIPEMD_H)
292   -LA_CHECK_INCLUDE_FILE("rmd160.h" HAVE_RMD160_H)
293   -LA_CHECK_INCLUDE_FILE("sha.h" HAVE_SHA_H)
294   -LA_CHECK_INCLUDE_FILE("sha1.h" HAVE_SHA1_H)
295   -LA_CHECK_INCLUDE_FILE("sha2.h" HAVE_SHA2_H)
296   -LA_CHECK_INCLUDE_FILE("sha256.h" HAVE_SHA256_H)
297   -
298   -#
299   -# Find MD5/RMD160/SHA library
300   -#
301   -FIND_LIBRARY(CRYPTO_LIBRARY NAMES crypto)
302   -IF(CRYPTO_LIBRARY)
303   - LIST(APPEND ADDITIONAL_LIBS ${CRYPTO_LIBRARY})
304   -ELSE(CRYPTO_LIBRARY)
305   - IF(NOT OPENSSL_FOUND)
306   - FIND_LIBRARY(MD_LIBRARY NAMES md)
307   - IF(MD_LIBRARY)
308   - LIST(APPEND ADDITIONAL_LIBS ${MD_LIBRARY})
309   - ENDIF(MD_LIBRARY)
310   - ENDIF(NOT OPENSSL_FOUND)
311   -ENDIF(CRYPTO_LIBRARY)
312   -#
313   -# Check MD5/RMD160/SHA functions
314   -#
315   -SET(CMAKE_REQUIRED_LIBRARIES ${ADDITIONAL_LIBS})
316   -IF(HAVE_MD5_H)
317   - CHECK_SYMBOL_EXISTS(MD5Init "md5.h" HAVE_MD5INIT)
318   -ENDIF(HAVE_MD5_H)
319   -IF(HAVE_RMD160_H)
320   - CHECK_SYMBOL_EXISTS(RMD160Init "rmd160.h" HAVE_RMD160INIT)
321   -ENDIF(HAVE_RMD160_H)
322   -IF(HAVE_SHA2_H)
323   - CHECK_SYMBOL_EXISTS(SHA256Init "sha2.h" HAVE_SHA256INIT)
324   - CHECK_SYMBOL_EXISTS(SHA384Init "sha2.h" HAVE_SHA384INIT)
325   - CHECK_SYMBOL_EXISTS(SHA512Init "sha2.h" HAVE_SHA512INIT)
326   - CHECK_SYMBOL_EXISTS(SHA256_Init "sha2.h" HAVE_SHA256_INIT)
327   - CHECK_SYMBOL_EXISTS(SHA384_Init "sha2.h" HAVE_SHA384_INIT)
328   - CHECK_SYMBOL_EXISTS(SHA512_Init "sha2.h" HAVE_SHA512_INIT)
329   -ELSEIF(HAVE_OPENSSL_SHA_H)
330   - CHECK_SYMBOL_EXISTS(SHA256_Init "openssl/sha.h" HAVE_OPENSSL_SHA256_INIT)
331   - CHECK_SYMBOL_EXISTS(SHA384_Init "openssl/sha.h" HAVE_OPENSSL_SHA384_INIT)
332   - CHECK_SYMBOL_EXISTS(SHA512_Init "openssl/sha.h" HAVE_OPENSSL_SHA512_INIT)
333   -ENDIF()
334   -SET(CMAKE_REQUIRED_LIBRARIES "")
  269 +# How to prove that HASH functions, which have several names on various
  270 +# platforms, can be mapped to archive_{hash name}_init,
  271 +# archive_{hash name}_update and archive_{hash name}_final through
  272 +# archive_hash.h
  273 +#
  274 +MACRO(CHECK_MD HASH IMPLEMENTATIONS)
  275 + IF(HAVE_SYS_TYPES_H)
  276 + SET(HASH_HEADER_CONFIG "#define HAVE_SYS_TYPES_H 1\n")
  277 + ELSE(HAVE_SYS_TYPES_H)
  278 + SET(HASH_HEADER_CONFIG "")
  279 + ENDIF(HAVE_SYS_TYPES_H)
  280 +
  281 + FOREACH(IMPLEMENTATION ${IMPLEMENTATIONS})
  282 + IF(NOT DEFINED ARCHIVE_HASH_${HASH}_${IMPLEMENTATION})
  283 + STRING(TOLOWER "${HASH}" lower_hash)
  284 + STRING(TOUPPER "${HASH}" hash)
  285 +
  286 + SET(HASH_REQUIRED_INCLUDES)
  287 + SET(TRY_HASH_REQUIRED_INCLUDES
  288 + "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_CURRENT_SOURCE_DIR}/libarchive")
  289 + SET(HASH_REQUIRED_LIBS)
  290 + SET(TRY_HASH_REQUIRED_LIBS)
  291 + IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
  292 + SET(HASH_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
  293 + SET(TRY_HASH_REQUIRED_INCLUDES
  294 + "${TRY_HASH_REQUIRED_INCLUDES};${OPENSSL_INCLUDE_DIR}")
  295 + SET(HASH_REQUIRED_LIBS ${OPENSSL_LIBRARIES})
  296 + SET(TRY_HASH_REQUIRED_LIBS
  297 + "-DLINK_LIBRARIES:STRING=${OPENSSL_LIBRARIES}")
  298 + ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
  299 +
  300 + SET(SOURCE "#define ${hash}_COMPILE_TEST
  301 +#define ARCHIVE_HASH_${hash}_${IMPLEMENTATION}
  302 +#define __LIBARCHIVE_BUILD
  303 +${HASH_HEADER_CONFIG}
  304 +#include \"archive_hash.h\"
  305 +
  306 +int
  307 +main(int argc, char **argv)
  308 +{
  309 + archive_${lower_hash}_ctx ctx;
  310 +
  311 + archive_${lower_hash}_init(&ctx);
  312 + archive_${lower_hash}_update(&ctx, *argv, argc);
  313 + archive_${lower_hash}_final(&ctx, *argv);
  314 + return 0;
  315 +}
  316 +")
  317 +
  318 + FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_hash_md.c" "${SOURCE}")
  319 + MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}")
  320 +
  321 + TRY_COMPILE(ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}
  322 + ${CMAKE_BINARY_DIR}
  323 + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_hash_md.c
  324 + CMAKE_FLAGS
  325 + "${TRY_HASH_REQUIRED_LIBS}"
  326 + "${TRY_HASH_REQUIRED_INCLUDES}"
  327 + OUTPUT_VARIABLE OUTPUT)
  328 +
  329 + IF (ARCHIVE_HASH_${HASH}_${IMPLEMENTATION})
  330 + MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} -- found")
  331 + IF (HASH_REQUIRED_INCLUDES)
  332 + INCLUDE_DIRECTORIES(${HASH_REQUIRED_INCLUDES})
  333 + ENDIF (HASH_REQUIRED_INCLUDES)
  334 + IF (HASH_REQUIRED_LIBS)
  335 + LIST(APPEND ADDITIONAL_LIBS ${HASH_REQUIRED_LIBS})
  336 + LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS)
  337 + ENDIF (HASH_REQUIRED_LIBS)
  338 + BREAK()
  339 + ENDIF (ARCHIVE_HASH_${HASH}_${IMPLEMENTATION})
  340 +
  341 + MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} -- not found")
  342 + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
  343 + "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} failed with the following output:\n"
  344 + "${OUTPUT}\n"
  345 + "Source file was:\n${SOURCE}\n")
  346 + ELSE(NOT DEFINED ARCHIVE_HASH_${HASH}_${IMPLEMENTATION})
  347 + IF(ARCHIVE_HASH_${HASH}_${IMPLEMENTATION})
  348 + BREAK()
  349 + ENDIF(ARCHIVE_HASH_${HASH}_${IMPLEMENTATION})
  350 + ENDIF(NOT DEFINED ARCHIVE_HASH_${HASH}_${IMPLEMENTATION})
  351 + ENDFOREACH(IMPLEMENTATION)
  352 +ENDMACRO(CHECK_MD HASH IMPLEMENTATIONS)
  353 +
  354 +#
  355 +# HASH functions on Windows is defined at archive_windows.c, thus we do not
  356 +# need the test what the functions can be mapped to archive_{hash name}_init,
  357 +# archive_{hash name}_update and archive_{hash name}_final.
  358 +# The functions on Windows use CALG_{hash name} macro to create a crypt object
  359 +# and then we need to know what CALG_{hash name} macros is available to show
  360 +# ARCHIVE_HASH_{hash name}_WIN macros because Windows 2000 and earlier version
  361 +# of Windows XP do not support SHA256, SHA384 and SHA512.
  362 +#
  363 +MACRO(CHECK_HASH_WIN HASH_LIST)
  364 + IF(WIN32 AND NOT CYGWIN)
  365 + FOREACH(HASH ${HASH_LIST})
  366 + IF(NOT DEFINED ARCHIVE_HASH_${HASH}_WIN)
  367 + STRING(TOUPPER "${HASH}" hash)
  368 + SET(ALGID "")
  369 + IF ("${HASH}" MATCHES "^MD5$")
  370 + SET(ALGID "CALG_MD5")
  371 + ENDIF ("${HASH}" MATCHES "^MD5$")
  372 + IF ("${HASH}" MATCHES "^SHA1$")
  373 + SET(ALGID "CALG_SHA1")
  374 + ENDIF ("${HASH}" MATCHES "^SHA1$")
  375 + IF ("${HASH}" MATCHES "^SHA256$")
  376 + SET(ALGID "CALG_SHA_256")
  377 + ENDIF ("${HASH}" MATCHES "^SHA256$")
  378 + IF ("${HASH}" MATCHES "^SHA384$")
  379 + SET(ALGID "CALG_SHA_384")
  380 + ENDIF ("${HASH}" MATCHES "^SHA384$")
  381 + IF ("${HASH}" MATCHES "^SHA512$")
  382 + SET(ALGID "CALG_SHA_512")
  383 + ENDIF ("${HASH}" MATCHES "^SHA512$")
  384 +
  385 + SET(SOURCE "#define ${hash}_COMPILE_TEST
  386 +#define _WIN32_WINNT ${_WIN32_WINNT}
  387 +#define WINVER ${WINVER}
  388 +#include <windows.h>
  389 +#include <wincrypt.h>
  390 +
  391 +int
  392 +main(int argc, char **argv)
  393 +{
  394 + return ${ALGID};
  395 +}
  396 +")
  397 + SET(SOURCE_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_hash_win.c")
  398 +
  399 + FILE(WRITE "${SOURCE_FILE}" "${SOURCE}")
  400 + MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_WIN")
  401 +
  402 + TRY_COMPILE(ARCHIVE_HASH_${HASH}_WIN
  403 + ${CMAKE_BINARY_DIR}
  404 + ${SOURCE_FILE}
  405 + CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_CURRENT_SOURCE_DIR}/libarchive"
  406 + OUTPUT_VARIABLE OUTPUT)
  407 +
  408 + IF (ARCHIVE_HASH_${HASH}_WIN)
  409 + MESSAGE(STATUS
  410 + "Checking support for ARCHIVE_HASH_${HASH}_WIN -- found")
  411 + ELSE (ARCHIVE_HASH_${HASH}_WIN)
  412 + MESSAGE(STATUS
  413 + "Checking support for ARCHIVE_HASH_${HASH}_WIN -- not found")
  414 + FILE(APPEND
  415 + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
  416 + "Checking support for ARCHIVE_HASH_${HASH}_WIN failed with the following output:\n"
  417 + "${OUTPUT}\n"
  418 + "Source file was:\n${SOURCE}\n")
  419 + ENDIF (ARCHIVE_HASH_${HASH}_WIN)
  420 +
  421 + ENDIF(NOT DEFINED ARCHIVE_HASH_${HASH}_WIN)
  422 + ENDFOREACH(HASH)
  423 + ENDIF(WIN32 AND NOT CYGWIN)
  424 +ENDMACRO(CHECK_HASH_WIN HASH_LIST)
  425 +
  426 +#
  427 +# Check MD5/RMD160/SHA support
  428 +#
  429 +CHECK_MD(MD5 "LIBC;LIBSYSTEM;OPENSSL")
  430 +CHECK_MD(RMD160 "LIBC;OPENSSL")
  431 +CHECK_MD(SHA1 "LIBC;LIBSYSTEM;OPENSSL")
  432 +CHECK_MD(SHA256 "LIBC;LIBC2;LIBC3;LIBSYSTEM;OPENSSL")
  433 +CHECK_MD(SHA384 "LIBC;LIBC2;LIBC3;LIBSYSTEM;OPENSSL")
  434 +CHECK_MD(SHA512 "LIBC;LIBC2;LIBC3;LIBSYSTEM;OPENSSL")
  435 +CHECK_HASH_WIN("MD5;SHA1;SHA256;SHA384;SHA512")
335 436
336 437 #
337 438 # Find Libxml2
@@ -382,6 +483,10 @@ CHECK_FUNCTION_EXISTS_GLIBC(ftruncate HAVE_FTRUNCATE)
382 483 CHECK_FUNCTION_EXISTS_GLIBC(futimens HAVE_FUTIMENS)
383 484 CHECK_FUNCTION_EXISTS_GLIBC(futimes HAVE_FUTIMES)
384 485 CHECK_FUNCTION_EXISTS_GLIBC(geteuid HAVE_GETEUID)
  486 +CHECK_FUNCTION_EXISTS_GLIBC(getgrgid_r HAVE_GETGRGID_R)
  487 +CHECK_FUNCTION_EXISTS_GLIBC(getgrnam_r HAVE_GETGRNAM_R)
  488 +CHECK_FUNCTION_EXISTS_GLIBC(getpwnam_r HAVE_GETPWNAM_R)
  489 +CHECK_FUNCTION_EXISTS_GLIBC(getpwuid_r HAVE_GETPWUID_R)
385 490 CHECK_FUNCTION_EXISTS_GLIBC(getpid HAVE_GETPID)
386 491 CHECK_FUNCTION_EXISTS_GLIBC(lchflags HAVE_LCHFLAGS)
387 492 CHECK_FUNCTION_EXISTS_GLIBC(lchmod HAVE_LCHMOD)
@@ -415,6 +520,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES)
415 520 CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT)
416 521 CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK)
417 522 CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB)
  523 +CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP)
418 524 CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
419 525 CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
420 526 CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
@@ -647,10 +753,12 @@ CHECK_FILE_OFFSET_BITS()
647 753 IF(ENABLE_XATTR)
648 754 LA_CHECK_INCLUDE_FILE(attr/xattr.h HAVE_ATTR_XATTR_H)
649 755 LA_CHECK_INCLUDE_FILE(sys/xattr.h HAVE_SYS_XATTR_H)
  756 + LA_CHECK_INCLUDE_FILE(sys/extattr.h HAVE_SYS_EXTATTR_H)
650 757 CHECK_LIBRARY_EXISTS(attr "setxattr" "" HAVE_ATTR_LIB)
651 758 IF(HAVE_ATTR_LIB)
652 759 SET(CMAKE_REQUIRED_LIBRARIES "attr")
653 760 ENDIF(HAVE_ATTR_LIB)
  761 + CHECK_SYMBOL_EXISTS(EXTATTR_NAMESPACE_USER "sys/types.h;sys/extattr.h" HAVE_DECL_EXTATTR_NAMESPACE_USER)
654 762 CHECK_FUNCTION_EXISTS_GLIBC(extattr_get_file HAVE_EXTATTR_GET_FILE)
655 763 CHECK_FUNCTION_EXISTS_GLIBC(extattr_list_file HAVE_EXTATTR_LIST_FILE)
656 764 CHECK_FUNCTION_EXISTS_GLIBC(extattr_set_fd HAVE_EXTATTR_SET_FD)
4 archivers/libarchive/files/Makefile.am
@@ -617,6 +617,10 @@ bsdcpio_test_EXTRA_DIST= \
617 617 cpio/test/test_gcpio_compat_ref.crc.uu \
618 618 cpio/test/test_gcpio_compat_ref.newc.uu \
619 619 cpio/test/test_gcpio_compat_ref.ustar.uu \
  620 + cpio/test/test_gcpio_compat_ref_nosym.bin.uu \
  621 + cpio/test/test_gcpio_compat_ref_nosym.crc.uu \
  622 + cpio/test/test_gcpio_compat_ref_nosym.newc.uu \
  623 + cpio/test/test_gcpio_compat_ref_nosym.ustar.uu \
620 624 cpio/test/test_option_f.cpio.uu \
621 625 cpio/test/test_option_m.cpio.uu \
622 626 cpio/test/test_option_t.cpio.uu \
1,508 archivers/libarchive/files/Makefile.in
802 additions, 706 deletions not shown
4 archivers/libarchive/files/NEWS
... ... @@ -1,3 +1,7 @@
  1 +Jun 30, 2010: libarchive 2.8.4 released
  2 +Jun 30, 2010: Improved reliability of hash function detection
  3 +Jun 30, 2010: Fix issues on ancient FreeBSD, QNX, ancient NetBSD and Minux
  4 +
1 5 Mar 14, 2010: libarchive 2.8.3 released
2 6 Mar 14, 2010: Symlink dereference fix for Linux broke the build there; corrected.
3 7
306 archivers/libarchive/files/aclocal.m4
... ... @@ -1,7 +1,7 @@
1   -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
  1 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
2 2
3 3 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4   -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  4 +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
5 5 # This file is free software; the Free Software Foundation
6 6 # gives unlimited permission to copy and/or distribute it,
7 7 # with or without modifications, as long as this notice is preserved.
@@ -13,8 +13,8 @@
13 13
14 14 m4_ifndef([AC_AUTOCONF_VERSION],
15 15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16   -m4_if(AC_AUTOCONF_VERSION, [2.62],,
17   -[m4_warning([this file was generated for autoconf 2.62.
  16 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
  17 +[m4_warning([this file was generated for autoconf 2.65.
18 18 You have another version of autoconf. It may work, but is not guaranteed to.
19 19 If you have problems, you may need to regenerate the build system entirely.
20 20 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -7965,7 +7965,7 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
7965 7965 m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
7966 7966 m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
7967 7967
7968   -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
  7968 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
7969 7969 #
7970 7970 # This file is free software; the Free Software Foundation
7971 7971 # gives unlimited permission to copy and/or distribute it,
@@ -7977,10 +7977,10 @@ m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
7977 7977 # generated from the m4 files accompanying Automake X.Y.
7978 7978 # (This private macro should not be called outside this file.)
7979 7979 AC_DEFUN([AM_AUTOMAKE_VERSION],
7980   -[am__api_version='1.10'
  7980 +[am__api_version='1.11'
7981 7981 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
7982 7982 dnl require some minimum version. Point them to the right macro.
7983   -m4_if([$1], [1.10.1], [],
  7983 +m4_if([$1], [1.11.1], [],
7984 7984 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
7985 7985 ])
7986 7986
@@ -7994,12 +7994,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
7994 7994 # AM_SET_CURRENT_AUTOMAKE_VERSION
7995 7995 # -------------------------------
7996 7996 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
7997   -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  7997 +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
7998 7998 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
7999   -[AM_AUTOMAKE_VERSION([1.10.1])dnl
  7999 +[AM_AUTOMAKE_VERSION([1.11.1])dnl
8000 8000 m4_ifndef([AC_AUTOCONF_VERSION],
8001 8001 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
8002   -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
  8002 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
8003 8003
8004 8004 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
8005 8005
@@ -8056,14 +8056,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
8056 8056
8057 8057 # AM_CONDITIONAL -*- Autoconf -*-
8058 8058
8059   -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
  8059 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
8060 8060 # Free Software Foundation, Inc.
8061 8061 #
8062 8062 # This file is free software; the Free Software Foundation
8063 8063 # gives unlimited permission to copy and/or distribute it,
8064 8064 # with or without modifications, as long as this notice is preserved.
8065 8065
8066   -# serial 8
  8066 +# serial 9
8067 8067
8068 8068 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
8069 8069 # -------------------------------------
@@ -8076,6 +8076,7 @@ AC_SUBST([$1_TRUE])dnl
8076 8076 AC_SUBST([$1_FALSE])dnl
8077 8077 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
8078 8078 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
  8079 +m4_define([_AM_COND_VALUE_$1], [$2])dnl
8079 8080 if $2; then
8080 8081 $1_TRUE=
8081 8082 $1_FALSE='#'
@@ -8089,14 +8090,14 @@ AC_CONFIG_COMMANDS_PRE(
8089 8090 Usually this means the macro was only invoked conditionally.]])
8090 8091 fi])])
8091 8092
8092   -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
  8093 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
8093 8094 # Free Software Foundation, Inc.
8094 8095 #
8095 8096 # This file is free software; the Free Software Foundation
8096 8097 # gives unlimited permission to copy and/or distribute it,
8097 8098 # with or without modifications, as long as this notice is preserved.
8098 8099
8099   -# serial 9
  8100 +# serial 10
8100 8101
8101 8102 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
8102 8103 # written in clear, in which case automake, when reading aclocal.m4,
@@ -8153,6 +8154,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
8153 8154 if test "$am_compiler_list" = ""; then
8154 8155 am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
8155 8156 fi
  8157 + am__universal=false
  8158 + m4_case([$1], [CC],
  8159 + [case " $depcc " in #(
  8160 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
  8161 + esac],
  8162 + [CXX],
  8163 + [case " $depcc " in #(
  8164 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
  8165 + esac])
  8166 +
8156 8167 for depmode in $am_compiler_list; do
8157 8168 # Setup a source with many dependencies, because some compilers
8158 8169 # like to wrap large dependency lists on column 80 (with \), and
@@ -8170,7 +8181,17 @@ AC_CACHE_CHECK([dependency style of $depcc],
8170 8181 done
8171 8182 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
8172 8183
  8184 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
  8185 + # mode. It turns out that the SunPro C++ compiler does not properly
  8186 + # handle `-M -o', and we need to detect this. Also, some Intel
  8187 + # versions had trouble with output in subdirs
  8188 + am__obj=sub/conftest.${OBJEXT-o}
  8189 + am__minus_obj="-o $am__obj"
8173 8190 case $depmode in
  8191 + gcc)
  8192 + # This depmode causes a compiler race in universal mode.
  8193 + test "$am__universal" = false || continue
  8194 + ;;
8174 8195 nosideeffect)
8175 8196 # after this tag, mechanisms are not by side-effect, so they'll
8176 8197 # only be used when explicitly requested
@@ -8180,19 +8201,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
8180 8201 break
8181 8202 fi
8182 8203 ;;
  8204 + msvisualcpp | msvcmsys)
  8205 + # This compiler won't grok `-c -o', but also, the minuso test has
  8206 + # not run yet. These depmodes are late enough in the game, and
  8207 + # so weak that their functioning should not be impacted.
  8208 + am__obj=conftest.${OBJEXT-o}
  8209 + am__minus_obj=
  8210 + ;;
8183 8211 none) break ;;
8184 8212 esac
8185   - # We check with `-c' and `-o' for the sake of the "dashmstdout"
8186   - # mode. It turns out that the SunPro C++ compiler does not properly
8187   - # handle `-M -o', and we need to detect this.
8188 8213 if depmode=$depmode \
8189   - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
  8214 + source=sub/conftest.c object=$am__obj \
8190 8215 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
8191   - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
  8216 + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
8192 8217 >/dev/null 2>conftest.err &&
8193 8218 grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
8194 8219 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
8195   - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
  8220 + grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
8196 8221 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
8197 8222 # icc doesn't choke on unknown options, it will just issue warnings
8198 8223 # or remarks (even with -Werror). So we grep stderr for any message
@@ -8249,57 +8274,68 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
8249 8274
8250 8275 # Generate code to set up dependency tracking. -*- Autoconf -*-
8251 8276
8252   -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
  8277 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
8253 8278 # Free Software Foundation, Inc.
8254 8279 #
8255 8280 # This file is free software; the Free Software Foundation
8256 8281 # gives unlimited permission to copy and/or distribute it,
8257 8282 # with or without modifications, as long as this notice is preserved.
8258 8283
8259   -#serial 3
  8284 +#serial 5
8260 8285
8261 8286 # _AM_OUTPUT_DEPENDENCY_COMMANDS
8262 8287 # ------------------------------
8263 8288 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
8264   -[for mf in $CONFIG_FILES; do
8265   - # Strip MF so we end up with the name of the file.
8266   - mf=`echo "$mf" | sed -e 's/:.*$//'`
8267   - # Check whether this is an Automake generated Makefile or not.
8268   - # We used to match only the files named `Makefile.in', but
8269   - # some people rename them; so instead we look at the file content.
8270   - # Grep'ing the first line is not enough: some people post-process
8271   - # each Makefile.in and add a new line on top of each file to say so.
8272   - # Grep'ing the whole file is not good either: AIX grep has a line
8273   - # limit of 2048, but all sed's we know have understand at least 4000.
8274   - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
8275   - dirpart=`AS_DIRNAME("$mf")`
8276   - else
8277   - continue
8278   - fi
8279   - # Extract the definition of DEPDIR, am__include, and am__quote
8280   - # from the Makefile without running `make'.
8281   - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
8282   - test -z "$DEPDIR" && continue
8283   - am__include=`sed -n 's/^am__include = //p' < "$mf"`
8284   - test -z "am__include" && continue
8285   - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
8286   - # When using ansi2knr, U may be empty or an underscore; expand it
8287   - U=`sed -n 's/^U = //p' < "$mf"`
8288   - # Find all dependency output files, they are included files with
8289   - # $(DEPDIR) in their names. We invoke sed twice because it is the
8290   - # simplest approach to changing $(DEPDIR) to its actual value in the
8291   - # expansion.
8292   - for file in `sed -n "
8293   - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
8294   - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
8295   - # Make sure the directory exists.
8296   - test -f "$dirpart/$file" && continue
8297   - fdir=`AS_DIRNAME(["$file"])`
8298   - AS_MKDIR_P([$dirpart/$fdir])
8299   - # echo "creating $dirpart/$file"
8300   - echo '# dummy' > "$dirpart/$file"
  8289 +[{
  8290 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
  8291 + # are listed without --file. Let's play safe and only enable the eval
  8292 + # if we detect the quoting.
  8293 + case $CONFIG_FILES in
  8294 + *\'*) eval set x "$CONFIG_FILES" ;;
  8295 + *) set x $CONFIG_FILES ;;
  8296 + esac
  8297 + shift
  8298 + for mf
  8299 + do
  8300 + # Strip MF so we end up with the name of the file.
  8301 + mf=`echo "$mf" | sed -e 's/:.*$//'`
  8302 + # Check whether this is an Automake generated Makefile or not.
  8303 + # We used to match only the files named `Makefile.in', but
  8304 + # some people rename them; so instead we look at the file content.
  8305 + # Grep'ing the first line is not enough: some people post-process
  8306 + # each Makefile.in and add a new line on top of each file to say so.
  8307 + # Grep'ing the whole file is not good either: AIX grep has a line
  8308 + # limit of 2048, but all sed's we know have understand at least 4000.
  8309 + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
  8310 + dirpart=`AS_DIRNAME("$mf")`
  8311 + else
  8312 + continue
  8313 + fi
  8314 + # Extract the definition of DEPDIR, am__include, and am__quote
  8315 + # from the Makefile without running `make'.
  8316 + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
  8317 + test -z "$DEPDIR" && continue
  8318 + am__include=`sed -n 's/^am__include = //p' < "$mf"`
  8319 + test -z "am__include" && continue
  8320 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
  8321 + # When using ansi2knr, U may be empty or an underscore; expand it
  8322 + U=`sed -n 's/^U = //p' < "$mf"`
  8323 + # Find all dependency output files, they are included files with
  8324 + # $(DEPDIR) in their names. We invoke sed twice because it is the
  8325 + # simplest approach to changing $(DEPDIR) to its actual value in the
  8326 + # expansion.
  8327 + for file in `sed -n "
  8328 + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
  8329 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
  8330 + # Make sure the directory exists.
  8331 + test -f "$dirpart/$file" && continue
  8332 + fdir=`AS_DIRNAME(["$file"])`
  8333 + AS_MKDIR_P([$dirpart/$fdir])
  8334 + # echo "creating $dirpart/$file"
  8335 + echo '# dummy' > "$dirpart/$file"
  8336 + done
8301 8337 done
8302   -done
  8338 +}
8303 8339 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
8304 8340
8305 8341
@@ -8319,13 +8355,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
8319 8355 # Do all the work for Automake. -*- Autoconf -*-
8320 8356
8321 8357 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
8322   -# 2005, 2006, 2008 Free Software Foundation, Inc.
  8358 +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
8323 8359 #
8324 8360 # This file is free software; the Free Software Foundation
8325 8361 # gives unlimited permission to copy and/or distribute it,
8326 8362 # with or without modifications, as long as this notice is preserved.
8327 8363
8328   -# serial 13
  8364 +# serial 16
8329 8365
8330 8366 # This macro actually does too much. Some checks are only needed if
8331 8367 # your package does certain things. But this isn't really a big deal.
@@ -8342,7 +8378,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
8342 8378 # arguments mandatory, and then we can depend on a new Autoconf
8343 8379 # release and drop the old call support.
8344 8380 AC_DEFUN([AM_INIT_AUTOMAKE],
8345   -[AC_PREREQ([2.60])dnl
  8381 +[AC_PREREQ([2.62])dnl
8346 8382 dnl Autoconf wants to disallow AM_ names. We explicitly allow
8347 8383 dnl the ones we care about.
8348 8384 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -8393,8 +8429,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
8393 8429 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
8394 8430 AM_MISSING_PROG(AUTOHEADER, autoheader)
8395 8431 AM_MISSING_PROG(MAKEINFO, makeinfo)
8396   -AM_PROG_INSTALL_SH
8397   -AM_PROG_INSTALL_STRIP
  8432 +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
  8433 +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
8398 8434 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
8399 8435 # We need awk for the "check" target. The system "awk" is bad on
8400 8436 # some platforms.
@@ -8402,24 +8438,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
8402 8438 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
8403 8439 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
8404 8440 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
8405   - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
8406   - [_AM_PROG_TAR([v7])])])
  8441 + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
  8442 + [_AM_PROG_TAR([v7])])])
8407 8443 _AM_IF_OPTION([no-dependencies],,
8408 8444 [AC_PROVIDE_IFELSE([AC_PROG_CC],
8409   - [_AM_DEPENDENCIES(CC)],
8410   - [define([AC_PROG_CC],
8411   - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
  8445 + [_AM_DEPENDENCIES(CC)],
  8446 + [define([AC_PROG_CC],
  8447 + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
8412 8448 AC_PROVIDE_IFELSE([AC_PROG_CXX],
8413   - [_AM_DEPENDENCIES(CXX)],
8414   - [define([AC_PROG_CXX],
8415   - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
  8449 + [_AM_DEPENDENCIES(CXX)],
  8450 + [define([AC_PROG_CXX],
  8451 + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
8416 8452 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
8417   - [_AM_DEPENDENCIES(OBJC)],
8418   - [define([AC_PROG_OBJC],
8419   - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
  8453 + [_AM_DEPENDENCIES(OBJC)],
  8454 + [define([AC_PROG_OBJC],
  8455 + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
8420 8456 ])
  8457 +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
  8458 +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
  8459 +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
  8460 +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
  8461 +AC_CONFIG_COMMANDS_PRE(dnl
  8462 +[m4_provide_if([_AM_COMPILER_EXEEXT],
  8463 + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
8421 8464 ])
8422 8465
  8466 +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
  8467 +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
  8468 +dnl mangled by Autoconf and run in a shell conditional statement.
  8469 +m4_define([_AC_COMPILER_EXEEXT],
  8470 +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
  8471 +
8423 8472
8424 8473 # When config.status generates a header, we must update the stamp-h file.
8425 8474 # This file resides in the same directory as the config header
@@ -8442,7 +8491,7 @@ for _am_header in $config_headers :; do
8442 8491 done
8443 8492 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
8444 8493
8445   -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
  8494 +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
8446 8495 #
8447 8496 # This file is free software; the Free Software Foundation
8448 8497 # gives unlimited permission to copy and/or distribute it,
@@ -8453,7 +8502,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
8453 8502 # Define $install_sh.
8454 8503 AC_DEFUN([AM_PROG_INSTALL_SH],
8455 8504 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
8456   -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
  8505 +if test x"${install_sh}" != xset; then
  8506 + case $am_aux_dir in
  8507 + *\ * | *\ *)
  8508 + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
  8509 + *)
  8510 + install_sh="\${SHELL} $am_aux_dir/install-sh"
  8511 + esac
  8512 +fi
8457 8513 AC_SUBST(install_sh)])
8458 8514
8459 8515 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -8479,13 +8535,13 @@ AC_SUBST([am__leading_dot])])
8479 8535
8480 8536 # Check to see how 'make' treats includes. -*- Autoconf -*-
8481 8537
8482   -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
  8538 +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
8483 8539 #
8484 8540 # This file is free software; the Free Software Foundation
8485 8541 # gives unlimited permission to copy and/or distribute it,
8486 8542 # with or without modifications, as long as this notice is preserved.
8487 8543
8488   -# serial 3
  8544 +# serial 4
8489 8545
8490 8546 # AM_MAKE_INCLUDE()
8491 8547 # -----------------
@@ -8494,7 +8550,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
8494 8550 [am_make=${MAKE-make}
8495 8551 cat > confinc << 'END'
8496 8552 am__doit:
8497   - @echo done
  8553 + @echo this is the am__doit target
8498 8554 .PHONY: am__doit
8499 8555 END
8500 8556 # If we don't find an include directive, just comment out the code.
@@ -8504,24 +8560,24 @@ am__quote=
8504 8560 _am_result=none
8505 8561 # First try GNU make style include.
8506 8562 echo "include confinc" > confmf
8507   -# We grep out `Entering directory' and `Leaving directory'
8508   -# messages which can occur if `w' ends up in MAKEFLAGS.
8509   -# In particular we don't look at `^make:' because GNU make might
8510   -# be invoked under some other name (usually "gmake"), in which
8511   -# case it prints its new name instead of `make'.
8512   -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
8513   - am__include=include
8514   - am__quote=
8515   - _am_result=GNU
8516   -fi
  8563 +# Ignore all kinds of additional output from `make'.
  8564 +case `$am_make -s -f confmf 2> /dev/null` in #(
  8565 +*the\ am__doit\ target*)
  8566 + am__include=include
  8567 + am__quote=
  8568 + _am_result=GNU
  8569 + ;;
  8570 +esac
8517 8571 # Now try BSD make style include.
8518 8572 if test "$am__include" = "#"; then
8519 8573 echo '.include "confinc"' > confmf
8520   - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
8521   - am__include=.include
8522   - am__quote="\""
8523   - _am_result=BSD
8524   - fi
  8574 + case `$am_make -s -f confmf 2> /dev/null` in #(
  8575 + *the\ am__doit\ target*)
  8576 + am__include=.include
  8577 + am__quote="\""
  8578 + _am_result=BSD
  8579 + ;;
  8580 + esac
8525 8581 fi
8526 8582 AC_SUBST([am__include])
8527 8583 AC_SUBST([am__quote])
@@ -8529,14 +8585,14 @@ AC_MSG_RESULT([$_am_result])
8529 8585 rm -f confinc confmf
8530 8586 ])
8531 8587
8532   -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
  8588 +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
8533 8589 # Free Software Foundation, Inc.
8534 8590 #
8535 8591 # This file is free software; the Free Software Foundation
8536 8592 # gives unlimited permission to copy and/or distribute it,
8537 8593 # with or without modifications, as long as this notice is preserved.
8538 8594
8539   -# serial 5
  8595 +# serial 6
8540 8596
8541 8597 # AM_PROG_CC_C_O
8542 8598 # --------------
@@ -8548,8 +8604,9 @@ AC_REQUIRE_AUX_FILE([compile])dnl
8548 8604 # FIXME: we rely on the cache variable name because
8549 8605 # there is no other way.
8550 8606 set dummy $CC
8551   -ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
8552   -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
  8607 +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
  8608 +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
  8609 +if test "$am_t" != yes; then
8553 8610 # Losing compiler, so override with the script.
8554 8611 # FIXME: It is wrong to rewrite CC.
8555 8612 # But if we don't then we get into trouble of one sort or another.
@@ -8565,14 +8622,14 @@ m4_define([AC_PROG_CC],
8565 8622
8566 8623 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
8567 8624
8568   -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
  8625 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
8569 8626 # Free Software Foundation, Inc.
8570 8627 #
8571 8628 # This file is free software; the Free Software Foundation
8572 8629 # gives unlimited permission to copy and/or distribute it,
8573 8630 # with or without modifications, as long as this notice is preserved.
8574 8631
8575   -# serial 5
  8632 +# serial 6
8576 8633
8577 8634 # AM_MISSING_PROG(NAME, PROGRAM)
8578 8635 # ------------------------------
@@ -8589,7 +8646,14 @@ AC_SUBST($1)])
8589 8646 AC_DEFUN([AM_MISSING_HAS_RUN],
8590 8647 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
8591 8648 AC_REQUIRE_AUX_FILE([missing])dnl
8592   -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
  8649 +if test x"${MISSING+set}" != xset; then
  8650 + case $am_aux_dir in
  8651 + *\ * | *\ *)
  8652 + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
  8653 + *)
  8654 + MISSING="\${SHELL} $am_aux_dir/missing" ;;
  8655 + esac
  8656 +fi
8593 8657 # Use eval to expand $SHELL
8594 8658 if eval "$MISSING --run true"; then
8595 8659 am_missing_run="$MISSING --run "
@@ -8627,13 +8691,13 @@ esac
8627 8691
8628 8692 # Helper functions for option handling. -*- Autoconf -*-
8629 8693
8630   -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
  8694 +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
8631 8695 #
8632 8696 # This file is free software; the Free Software Foundation
8633 8697 # gives unlimited permission to copy and/or distribute it,
8634 8698 # with or without modifications, as long as this notice is preserved.
8635 8699
8636   -# serial 3
  8700 +# serial 4
8637 8701
8638 8702 # _AM_MANGLE_OPTION(NAME)
8639 8703 # -----------------------
@@ -8650,7 +8714,7 @@ AC_DEFUN([_AM_SET_OPTION],
8650 8714 # ----------------------------------
8651 8715 # OPTIONS is a space-separated list of Automake options.
8652 8716 AC_DEFUN([_AM_SET_OPTIONS],
8653   -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
  8717 +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
8654 8718
8655 8719 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
8656 8720 # -------------------------------------------
@@ -8660,14 +8724,14 @@ AC_DEFUN([_AM_IF_OPTION],
8660 8724
8661 8725 # Check to make sure that the build environment is sane. -*- Autoconf -*-
8662 8726
8663   -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
  8727 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
8664 8728 # Free Software Foundation, Inc.
8665 8729 #
8666 8730 # This file is free software; the Free Software Foundation
8667 8731 # gives unlimited permission to copy and/or distribute it,
8668 8732 # with or without modifications, as long as this notice is preserved.
8669 8733
8670   -# serial 4
  8734 +# serial 5
8671 8735
8672 8736 # AM_SANITY_CHECK
8673 8737 # ---------------
@@ -8676,16 +8740,29 @@ AC_DEFUN([AM_SANITY_CHECK],
8676 8740 # Just in case
8677 8741 sleep 1
8678 8742 echo timestamp > conftest.file
  8743 +# Reject unsafe characters in $srcdir or the absolute working directory
  8744 +# name. Accept space and tab only in the latter.
  8745 +am_lf='
  8746 +'
  8747 +case `pwd` in
  8748 + *[[\\\"\#\$\&\'\`$am_lf]]*)
  8749 + AC_MSG_ERROR([unsafe absolute working directory name]);;
  8750 +esac
  8751 +case $srcdir in
  8752 + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
  8753 + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
  8754 +esac
  8755 +
8679 8756 # Do `set' in a subshell so we don't clobber the current shell's
8680 8757 # arguments. Must try -L first in case configure is actually a
8681 8758 # symlink; some systems play weird games with the mod time of symlinks
8682 8759 # (eg FreeBSD returns the mod time of the symlink's containing
8683 8760 # directory).
8684 8761 if (
8685   - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
  8762 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
8686 8763 if test "$[*]" = "X"; then
8687 8764 # -L didn't work.
8688   - set X `ls -t $srcdir/configure conftest.file`
  8765 + set X `ls -t "$srcdir/configure" conftest.file`
8689 8766 fi
8690 8767 rm -f conftest.file
8691 8768 if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -8738,18 +8815,25 @@ fi
8738 8815 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
8739 8816 AC_SUBST([INSTALL_STRIP_PROGRAM])])
8740 8817
8741   -# Copyright (C) 2006 Free Software Foundation, Inc.
  8818 +# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
8742 8819 #
8743 8820 # This file is free software; the Free Software Foundation
8744 8821 # gives unlimited permission to copy and/or distribute it,
8745 8822 # with or without modifications, as long as this notice is preserved.
8746 8823
  8824 +# serial 2
  8825 +
8747 8826 # _AM_SUBST_NOTMAKE(VARIABLE)
8748 8827 # ---------------------------
8749 8828 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
8750 8829 # This macro is traced by Automake.
8751 8830 AC_DEFUN([_AM_SUBST_NOTMAKE])
8752 8831
  8832 +# AM_SUBST_NOTMAKE(VARIABLE)
  8833 +# ---------------------------
  8834 +# Public sister of _AM_SUBST_NOTMAKE.
  8835 +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
  8836 +
8753 8837 # Check how to create a tarball. -*- Autoconf -*-
8754 8838
8755 8839 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
21 archivers/libarchive/files/build/autoconf/compile
... ... @@ -1,9 +1,10 @@
1 1 #! /bin/sh
2 2 # Wrapper for compilers which do not understand `-c -o'.
3 3
4   -scriptversion=2005-05-14.22
  4 +scriptversion=2009-10-06.20; # UTC
5 5
6   -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
  6 +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
  7 +# Foundation, Inc.
7 8 # Written by Tom Tromey <tromey@cygnus.com>.
8 9 #
9 10 # This program is free software; you can redistribute it and/or modify
@@ -17,8 +18,7 @@ scriptversion=2005-05-14.22
17 18 # GNU General Public License for more details.
18 19 #
19 20 # You should have received a copy of the GNU General Public License
20   -# along with this program; if not, write to the Free Software
21   -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  21 +# along with this program. If not, see <http://www.gnu.org/licenses/>.
22 22
23 23 # As a special exception to the GNU General Public License, if you
24 24 # distribute this file as part of a program that contains a
@@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then
103 103 fi
104 104
105 105 # Name of file we expect compiler to create.
106   -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
  106 +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
107 107
108 108 # Create the lock directory.
109   -# Note: use `[/.-]' here to ensure that we don't use the same name
  109 +# Note: use `[/\\:.-]' here to ensure that we don't use the same name
110 110 # that we are using for the .o file. Also, base the name on the expected
111 111 # object file name, since that is what matters with a parallel build.
112   -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
  112 +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
113 113 while true; do
114 114 if mkdir "$lockdir" >/dev/null 2>&1; then
115 115 break
@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
124 124 ret=$?
125 125
126 126 if test -f "$cofile"; then
127   - mv "$cofile" "$ofile"
  127 + test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
128 128 elif test -f "${cofile}bj"; then
129   - mv "${cofile}bj" "$ofile"
  129 + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
130 130 fi
131 131
132 132 rmdir "$lockdir"
@@ -138,5 +138,6 @@ exit $ret
138 138 # eval: (add-hook 'write-file-hooks 'time-stamp)
139 139 # time-stamp-start: "scriptversion="
140 140 # time-stamp-format: "%:y-%02m-%02d.%02H"
141   -# time-stamp-end: "$"
  141 +# time-stamp-time-zone: "UTC"
  142 +# time-stamp-end: "; # UTC"
142 143 # End:
859 archivers/libarchive/files/build/autoconf/config.guess
... ... @@ -1,9 +1,10 @@
1 1 #! /bin/sh
2 2 # Attempt to guess a canonical system name.
3 3 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4   -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  4 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
  5 +# Free Software Foundation, Inc.
5 6
6   -timestamp='2003-07-02'
  7 +timestamp='2009-12-30'
7 8
8 9 # This file is free software; you can redistribute it and/or modify it
9 10 # under the terms of the GNU General Public License as published by
@@ -17,23 +18,25 @@ timestamp='2003-07-02'
17 18 #
18 19 # You should have received a copy of the GNU General Public License
19 20 # along with this program; if not, write to the Free Software
20   -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  21 +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
  22 +# 02110-1301, USA.
21 23 #
22 24 # As a special exception to the GNU General Public License, if you
23 25 # distribute this file as part of a program that contains a
24 26 # configuration script generated by Autoconf, you may include it under
25 27 # the same distribution terms that you use for the rest of that program.
26 28
27   -# Originally written by Per Bothner <per@bothner.com>.
28   -# Please send patches to <config-patches@gnu.org>. Submit a context
29   -# diff and a properly formatted ChangeLog entry.
  29 +
  30 +# Originally written by Per Bothner. Please send patches (context
  31 +# diff format) to <config-patches@gnu.org> and include a ChangeLog
  32 +# entry.
30 33 #
31 34 # This script attempts to guess a canonical system name similar to
32 35 # config.sub. If it succeeds, it prints the system name on stdout, and
33 36 # exits with 0. Otherwise, it exits with 1.
34 37 #
35   -# The plan is that this can be called by configure scripts if you
36   -# don't specify an explicit build system type.
  38 +# You can get the latest version of this script from:
  39 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
37 40
38 41 me=`echo "$0" | sed -e 's,.*/,,'`
39 42
@@ -53,8 +56,9 @@ version="\
53 56 GNU config.guess ($timestamp)
54 57
55 58 Originally written by Per Bothner.
56   -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
57