MFC r207842, r207844, r208099:

MFC r207842:
Import of liblzma, xz, xzdec, lzmainfo from vendor branch
Add support for xz and lzma to lesspipe.sh (xzless, lzless)

MFC r207844:
Add two public headers missing in r207842
Adjust CFLAGS for lzmainfo, xz, xzdec

MFC r208099:
Add versioned symbols to liblzma
Use default SHLIB_MAJOR.

Approved by:	delphij (mentor)

5 files changed, 435 insertions, 0 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 694b606..e9f4ec3 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -75,6 +75,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
 	${_libipx} \
 	libjail \
 	libkiconv \
+	liblzma \
 	libmagic \
 	libmemstat \
 	${_libmilter} \
diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile
new file mode 100644
index 0000000..f84ac93
--- /dev/null
+++ b/lib/liblzma/Makefile
@@ -0,0 +1,141 @@
+# $FreeBSD$
+
+LIB=		lzma
+LZMADIR=	${.CURDIR}/../../contrib/xz/src/liblzma
+
+.PATH: ${LZMADIR}/../common
+SRCS+=	tuklib_physmem.c
+
+.PATH: ${LZMADIR}/api/lzma
+
+MAININCS=	../lzma.h
+MAININCSDIR=	${INCLUDEDIR}
+
+LZMAINCS+=	base.h \
+		bcj.h \
+		block.h \
+		check.h \
+		container.h \
+		delta.h \
+		filter.h \
+		hardware.h \
+		index.h \
+		index_hash.h \
+		lzma.h \
+		stream_flags.h \
+		subblock.h \
+		version.h \
+		vli.h
+
+LZMAINCSDIR=	${INCLUDEDIR}/lzma
+
+INCSGROUPS=	MAININCS LZMAINCS
+
+.PATH: ${LZMADIR}/common
+SRCS+=	common.c \
+	block_util.c \
+	easy_preset.c \
+	filter_common.c \
+	hardware_physmem.c \
+	index.c \
+	stream_flags_common.c \
+	vli_size.c \
+	alone_encoder.c \
+	block_buffer_encoder.c \
+	block_encoder.c \
+	block_header_encoder.c \
+	easy_buffer_encoder.c \
+	easy_encoder.c \
+	easy_encoder_memusage.c \
+	filter_buffer_encoder.c \
+	filter_encoder.c \
+	filter_flags_encoder.c \
+	index_encoder.c \
+	stream_buffer_encoder.c \
+	stream_encoder.c \
+	stream_flags_encoder.c \
+	vli_encoder.c \
+	alone_decoder.c \
+	auto_decoder.c \
+	block_buffer_decoder.c \
+	block_decoder.c \
+	block_header_decoder.c \
+	easy_decoder_memusage.c \
+	filter_buffer_decoder.c \
+	filter_decoder.c \
+	filter_flags_decoder.c \
+	index_decoder.c \
+	index_hash.c \
+	stream_buffer_decoder.c \
+	stream_decoder.c \
+	stream_flags_decoder.c \
+	vli_decoder.c
+
+.PATH: ${LZMADIR}/check
+SRCS+=	check.c \
+	crc32_table.c \
+	crc64_table.c \
+	sha256.c
+.if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386"
+SRCS+=	crc32_x86.S \
+	crc64_x86.S
+.else
+SRCS+=	crc32_fast.c \
+	crc64_fast.c
+.endif
+
+.PATH: ${LZMADIR}/lz
+SRCS+=	lz_encoder.c \
+	lz_encoder_mf.c \
+	lz_decoder.c
+
+.PATH: ${LZMADIR}/lzma
+SRCS+=	lzma_encoder.c \
+	lzma_encoder_presets.c \
+	lzma_encoder_optimum_fast.c \
+	lzma_encoder_optimum_normal.c \
+	fastpos_table.c \
+	lzma_decoder.c \
+	lzma2_encoder.c \
+	lzma2_decoder.c
+
+.PATH: ${LZMADIR}/rangecoder
+SRCS+=	price_table.c
+
+.PATH: ${LZMADIR}/delta
+SRCS+=	delta_common.c \
+	delta_encoder.c \
+	delta_decoder.c
+
+.PATH: ${LZMADIR}/simple
+SRCS+=	simple_coder.c \
+	simple_encoder.c \
+	simple_decoder.c \
+	x86.c \
+	powerpc.c \
+	ia64.c \
+	arm.c \
+	armthumb.c \
+	sparc.c
+		
+WARNS?=	3
+
+CFLAGS+=	-DHAVE_CONFIG_H \
+		-DTUKLIB_SYMBOL_PREFIX=lzma_ \
+		-I${.CURDIR} \
+		-I${LZMADIR}/api \
+		-I${LZMADIR}/common \
+		-I${LZMADIR}/check \
+		-I${LZMADIR}/lz \
+		-I${LZMADIR}/rangecoder \
+		-I${LZMADIR}/lzma \
+		-I${LZMADIR}/subblock \
+		-I${LZMADIR}/delta \
+		-I${LZMADIR}/simple \
+		-I${LZMADIR}/../common
+
+VERSION_DEF=	${.CURDIR}/Versions.def
+SYMBOL_MAPS=	${.CURDIR}/Symbol.map
+CFLAGS+=	-DSYMBOL_VERSIONING
+
+.include <bsd.lib.mk>
diff --git a/lib/liblzma/Symbol.map b/lib/liblzma/Symbol.map
new file mode 100644
index 0000000..efefffd
--- /dev/null
+++ b/lib/liblzma/Symbol.map
@@ -0,0 +1,189 @@
+/*
+ * $FreeBSD$
+ */
+
+XZ_5.0 {
+	lzma_alone_decoder;
+	lzma_alone_encoder;
+	lzma_auto_decoder;
+	lzma_block_buffer_bound;
+	lzma_block_buffer_decode;
+	lzma_block_buffer_encode;
+	lzma_block_compressed_size;
+	lzma_block_decoder;
+	lzma_block_encoder;
+	lzma_block_header_decode;
+	lzma_block_header_encode;
+	lzma_block_header_size;
+	lzma_block_total_size;
+	lzma_block_unpadded_size;
+	lzma_check_is_supported;
+	lzma_check_size;
+	lzma_code;
+	lzma_crc32;
+	lzma_crc64;
+	lzma_easy_buffer_encode;
+	lzma_easy_decoder_memusage;
+	lzma_easy_encoder;
+	lzma_easy_encoder_memusage;
+	lzma_end;
+	lzma_filter_decoder_is_supported;
+	lzma_filter_encoder_is_supported;
+	lzma_filter_flags_decode;
+	lzma_filter_flags_encode;
+	lzma_filter_flags_size;
+	lzma_filters_copy;
+	lzma_filters_update;
+	lzma_get_check;
+	lzma_index_append;
+	lzma_index_block_count;
+	lzma_index_buffer_decode;
+	lzma_index_buffer_encode;
+	lzma_index_cat;
+	lzma_index_checks;
+	lzma_index_decoder;
+	lzma_index_dup;
+	lzma_index_encoder;
+	lzma_index_end;
+	lzma_index_file_size;
+	lzma_index_hash_append;
+	lzma_index_hash_decode;
+	lzma_index_hash_end;
+	lzma_index_hash_init;
+	lzma_index_hash_size;
+	lzma_index_init;
+	lzma_index_iter_init;
+	lzma_index_iter_locate;
+	lzma_index_iter_next;
+	lzma_index_iter_rewind;
+	lzma_index_memusage;
+	lzma_index_memused;
+	lzma_index_size;
+	lzma_index_stream_count;
+	lzma_index_stream_flags;
+	lzma_index_stream_padding;
+	lzma_index_stream_size;
+	lzma_index_total_size;
+	lzma_index_uncompressed_size;
+	lzma_lzma_preset;
+	lzma_memlimit_get;
+	lzma_memlimit_set;
+	lzma_memusage;
+	lzma_mf_is_supported;
+	lzma_mode_is_supported;
+	lzma_physmem;
+	lzma_properties_decode;
+	lzma_properties_encode;
+	lzma_properties_size;
+	lzma_raw_buffer_decode;
+	lzma_raw_buffer_encode;
+	lzma_raw_decoder;
+	lzma_raw_decoder_memusage;
+	lzma_raw_encoder;
+	lzma_raw_encoder_memusage;
+	lzma_stream_buffer_bound;
+	lzma_stream_buffer_decode;
+	lzma_stream_buffer_encode;
+	lzma_stream_decoder;
+	lzma_stream_encoder;
+	lzma_stream_flags_compare;
+	lzma_stream_footer_decode;
+	lzma_stream_footer_encode;
+	lzma_stream_header_decode;
+	lzma_stream_header_encode;
+	lzma_version_number;
+	lzma_version_string;
+	lzma_vli_decode;
+	lzma_vli_encode;
+	lzma_vli_size;
+};
+
+XZprivate_1.0 {
+	lzma_alloc;
+	lzma_alone_decoder_init;
+	lzma_block_decoder_init;
+	lzma_block_encoder_init;
+	lzma_bufcpy;
+	lzma_check_finish;
+	lzma_check_init;
+	lzma_check_update;
+	lzma_chunk_size;
+	lzma_delta_coder_init;
+	lzma_delta_coder_memusage;
+	lzma_delta_decoder_init;
+	lzma_delta_encoder_init;
+	lzma_delta_props_decode;
+	lzma_delta_props_encode;
+	lzma_easy_preset;
+	lzma_free;
+	lzma_index_encoder_init;
+	lzma_index_padding_size;
+	lzma_index_prealloc;
+	lzma_lz_decoder_init;
+	lzma_lz_decoder_memusage;
+	lzma_lz_decoder_uncompressed;
+	lzma_lz_encoder_init;
+	lzma_lz_encoder_memusage;
+	lzma_lzma2_decoder_init;
+	lzma_lzma2_decoder_memusage;
+	lzma_lzma2_encoder_init;
+	lzma_lzma2_encoder_memusage;
+	lzma_lzma2_props_decode;
+	lzma_lzma2_props_encode;
+	lzma_lzma_decoder_create;
+	lzma_lzma_decoder_init;
+	lzma_lzma_decoder_memusage;
+	lzma_lzma_decoder_memusage_nocheck;
+	lzma_lzma_encode;
+	lzma_lzma_encoder_create;
+	lzma_lzma_encoder_init;
+	lzma_lzma_encoder_memusage;
+	lzma_lzma_encoder_reset;
+	lzma_lzma_lclppb_decode;
+	lzma_lzma_lclppb_encode;
+	lzma_lzma_optimum_fast;
+	lzma_lzma_optimum_normal;
+	lzma_lzma_props_decode;
+	lzma_lzma_props_encode;
+	lzma_mf_bt2_find;
+	lzma_mf_bt2_skip;
+	lzma_mf_bt3_find;
+	lzma_mf_bt3_skip;
+	lzma_mf_bt4_find;
+	lzma_mf_bt4_skip;
+	lzma_mf_find;
+	lzma_mf_hc3_find;
+	lzma_mf_hc3_skip;
+	lzma_mf_hc4_find;
+	lzma_mf_hc4_skip;
+	lzma_next_end;
+	lzma_next_filter_init;
+	lzma_next_filter_update;
+	lzma_raw_coder_init;
+	lzma_raw_coder_memusage;
+	lzma_raw_decoder_init;
+	lzma_raw_encoder_init;
+	lzma_sha256_finish;
+	lzma_sha256_init;
+	lzma_sha256_update;
+	lzma_simple_arm_decoder_init;
+	lzma_simple_arm_encoder_init;
+	lzma_simple_armthumb_decoder_init;
+	lzma_simple_armthumb_encoder_init;
+	lzma_simple_coder_init;
+	lzma_simple_ia64_decoder_init;
+	lzma_simple_ia64_encoder_init;
+	lzma_simple_powerpc_decoder_init;
+	lzma_simple_powerpc_encoder_init;
+	lzma_simple_props_decode;
+	lzma_simple_props_encode;
+	lzma_simple_props_size;
+	lzma_simple_sparc_decoder_init;
+	lzma_simple_sparc_encoder_init;
+	lzma_simple_x86_decoder_init;
+	lzma_simple_x86_encoder_init;
+	lzma_stream_decoder_init;
+	lzma_stream_encoder_init;
+	lzma_strm_init;
+	lzma_tuklib_physmem;
+};
diff --git a/lib/liblzma/Versions.def b/lib/liblzma/Versions.def
new file mode 100644
index 0000000..1f65670
--- /dev/null
+++ b/lib/liblzma/Versions.def
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+XZ_5.0 {
+};
+
+
+XZprivate_1.0 {
+} XZ_5.0;
+
diff --git a/lib/liblzma/config.h b/lib/liblzma/config.h
new file mode 100644
index 0000000..223cb95
--- /dev/null
+++ b/lib/liblzma/config.h
@@ -0,0 +1,95 @@
+// $FreeBSD$
+#define ASSUME_RAM 128
+#define HAVE_CHECK_CRC32 1
+#define HAVE_CHECK_CRC64 1
+#define HAVE_CHECK_SHA256 1
+#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0
+#define HAVE_DECODER 1
+#define HAVE_DECODER_ARM 1
+#define HAVE_DECODER_ARMTHUMB 1
+#define HAVE_DECODER_DELTA 1
+#define HAVE_DECODER_IA64 1
+#define HAVE_DECODER_LZMA1 1
+#define HAVE_DECODER_LZMA2 1
+#define HAVE_DECODER_POWERPC 1
+#define HAVE_DECODER_SPARC 1
+#define HAVE_DECODER_X86 1
+#define HAVE_DLFCN_H 1
+#define HAVE_ENCODER 1
+#define HAVE_ENCODER_ARM 1
+#define HAVE_ENCODER_ARMTHUMB 1
+#define HAVE_ENCODER_DELTA 1
+#define HAVE_ENCODER_IA64 1
+#define HAVE_ENCODER_LZMA1 1
+#define HAVE_ENCODER_LZMA2 1
+#define HAVE_ENCODER_POWERPC 1
+#define HAVE_ENCODER_SPARC 1
+#define HAVE_ENCODER_X86 1
+#define HAVE_FCNTL_H 1
+#define HAVE_FUTIMES 1
+#define HAVE_GETOPT_H 1
+#define HAVE_GETOPT_LONG 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_MF_BT2 1
+#define HAVE_MF_BT3 1
+#define HAVE_MF_BT4 1
+#define HAVE_MF_HC3 1
+#define HAVE_MF_HC4 1
+#define HAVE_OPTRESET 1
+#define HAVE_PTHREAD 1
+#define HAVE_STDBOOL_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1
+#define HAVE_SYS_ENDIAN_H 1
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_UINTPTR_T 1
+#define HAVE_UNISTD_H 1
+#define HAVE_VISIBILITY 1
+#define HAVE__BOOL 1
+#define LT_OBJDIR ".libs/"
+#define NDEBUG 1
+#define PACKAGE "xz"
+#define PACKAGE_BUGREPORT "lasse.collin@tukaani.org"
+#define PACKAGE_NAME "XZ Utils"
+#define PACKAGE_STRING "XZ Utils 4.999.9beta"
+#define PACKAGE_TARNAME "xz"
+#define PACKAGE_URL "http://tukaani.org/xz/"
+#define PACKAGE_VERSION "4.999.9beta"
+#define SIZEOF_SIZE_T 8
+#define STDC_HEADERS 1
+#define TUKLIB_CPUCORES_SYSCONF 1
+#define TUKLIB_FAST_UNALIGNED_ACCESS 1
+#define TUKLIB_PHYSMEM_SYSCONF 1
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+#define VERSION "4.999.9beta"
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif