svn commit: r208258 - in stable/8: contrib/top etc/mtree lib
lib/liblzma lib/libusb share/mk usr.bin usr.bin/less
usr.bin/lzmainfo usr.bin/xz usr.bin/xzdec
Martin Matuska
mm at FreeBSD.org
Tue May 18 09:59:10 UTC 2010
Author: mm
Date: Tue May 18 09:59:09 2010
New Revision: 208258
URL: http://svn.freebsd.org/changeset/base/208258
Log:
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)
Added:
- copied from r207842, head/contrib/xz/
- copied from r207842, head/lib/liblzma/
stable/8/lib/liblzma/Symbol.map
- copied unchanged from r208099, head/lib/liblzma/Symbol.map
stable/8/lib/liblzma/Versions.def
- copied unchanged from r208099, head/lib/liblzma/Versions.def
stable/8/usr.bin/lzmainfo/
- copied from r207842, head/usr.bin/lzmainfo/
stable/8/usr.bin/xz/
- copied from r207842, head/usr.bin/xz/
stable/8/usr.bin/xzdec/
- copied from r207842, head/usr.bin/xzdec/
Directory Properties:
stable/8/contrib/xz/ (props changed)
stable/8/lib/liblzma/ (props changed)
Modified:
stable/8/etc/mtree/BSD.include.dist
stable/8/lib/Makefile
stable/8/lib/liblzma/Makefile
stable/8/share/mk/bsd.libnames.mk
stable/8/usr.bin/Makefile
stable/8/usr.bin/less/Makefile
stable/8/usr.bin/less/lesspipe.sh
stable/8/usr.bin/lzmainfo/Makefile
stable/8/usr.bin/xz/Makefile
stable/8/usr.bin/xzdec/Makefile
Directory Properties:
stable/8/contrib/ (props changed)
stable/8/contrib/bind9/ (props changed)
stable/8/contrib/bsnmp/ (props changed)
stable/8/contrib/bzip2/ (props changed)
stable/8/contrib/csup/ (props changed)
stable/8/contrib/ee/ (props changed)
stable/8/contrib/expat/ (props changed)
stable/8/contrib/file/ (props changed)
stable/8/contrib/gcc/ (props changed)
stable/8/contrib/gdb/ (props changed)
stable/8/contrib/gdtoa/ (props changed)
stable/8/contrib/groff/ (props changed)
stable/8/contrib/less/ (props changed)
stable/8/contrib/libpcap/ (props changed)
stable/8/contrib/ncurses/ (props changed)
stable/8/contrib/netcat/ (props changed)
stable/8/contrib/ntp/ (props changed)
stable/8/contrib/one-true-awk/ (props changed)
stable/8/contrib/openbsm/ (props changed)
stable/8/contrib/openpam/ (props changed)
stable/8/contrib/pf/ (props changed)
stable/8/contrib/sendmail/ (props changed)
stable/8/contrib/tcp_wrappers/ (props changed)
stable/8/contrib/tcpdump/ (props changed)
stable/8/contrib/tcsh/ (props changed)
stable/8/contrib/telnet/ (props changed)
stable/8/contrib/top/ (props changed)
stable/8/contrib/top/install-sh (props changed)
stable/8/contrib/traceroute/ (props changed)
stable/8/contrib/wpa/ (props changed)
stable/8/etc/ (props changed)
stable/8/lib/ (props changed)
stable/8/lib/bind/ (props changed)
stable/8/lib/csu/ (props changed)
stable/8/lib/libarchive/ (props changed)
stable/8/lib/libbluetooth/ (props changed)
stable/8/lib/libc/ (props changed)
stable/8/lib/libc/stdtime/ (props changed)
stable/8/lib/libc_r/ (props changed)
stable/8/lib/libdevinfo/ (props changed)
stable/8/lib/libdisk/ (props changed)
stable/8/lib/libelf/ (props changed)
stable/8/lib/libexpat/ (props changed)
stable/8/lib/libfetch/ (props changed)
stable/8/lib/libgpib/ (props changed)
stable/8/lib/libgssapi/ (props changed)
stable/8/lib/libjail/ (props changed)
stable/8/lib/libkse/ (props changed)
stable/8/lib/libkvm/ (props changed)
stable/8/lib/libpam/ (props changed)
stable/8/lib/libpmc/ (props changed)
stable/8/lib/libradius/ (props changed)
stable/8/lib/librpcsec_gss/ (props changed)
stable/8/lib/libsm/ (props changed)
stable/8/lib/libstand/ (props changed)
stable/8/lib/libtacplus/ (props changed)
stable/8/lib/libthr/ (props changed)
stable/8/lib/libufs/ (props changed)
stable/8/lib/libusb/ (props changed)
stable/8/lib/libusb/usb.h (props changed)
stable/8/lib/libusbhid/ (props changed)
stable/8/lib/libutil/ (props changed)
stable/8/lib/libz/ (props changed)
stable/8/lib/libz/contrib/ (props changed)
stable/8/lib/msun/ (props changed)
stable/8/share/mk/ (props changed)
stable/8/usr.bin/ (props changed)
stable/8/usr.bin/awk/ (props changed)
stable/8/usr.bin/biff/ (props changed)
stable/8/usr.bin/calendar/ (props changed)
stable/8/usr.bin/catman/ (props changed)
stable/8/usr.bin/comm/ (props changed)
stable/8/usr.bin/cpio/ (props changed)
stable/8/usr.bin/csup/ (props changed)
stable/8/usr.bin/fetch/ (props changed)
stable/8/usr.bin/find/ (props changed)
stable/8/usr.bin/finger/ (props changed)
stable/8/usr.bin/fstat/ (props changed)
stable/8/usr.bin/gcore/ (props changed)
stable/8/usr.bin/gzip/ (props changed)
stable/8/usr.bin/hexdump/ (props changed)
stable/8/usr.bin/indent/ (props changed)
stable/8/usr.bin/kdump/ (props changed)
stable/8/usr.bin/locale/ (props changed)
stable/8/usr.bin/look/ (props changed)
stable/8/usr.bin/makewhatis/ (props changed)
stable/8/usr.bin/minigzip/ (props changed)
stable/8/usr.bin/netstat/ (props changed)
stable/8/usr.bin/pathchk/ (props changed)
stable/8/usr.bin/perror/ (props changed)
stable/8/usr.bin/procstat/ (props changed)
stable/8/usr.bin/script/ (props changed)
stable/8/usr.bin/sockstat/ (props changed)
stable/8/usr.bin/stat/ (props changed)
stable/8/usr.bin/systat/ (props changed)
stable/8/usr.bin/tftp/ (props changed)
stable/8/usr.bin/touch/ (props changed)
stable/8/usr.bin/truss/ (props changed)
stable/8/usr.bin/unifdef/ (props changed)
stable/8/usr.bin/uniq/ (props changed)
stable/8/usr.bin/unzip/ (props changed)
stable/8/usr.bin/vmstat/ (props changed)
stable/8/usr.bin/w/ (props changed)
stable/8/usr.bin/whois/ (props changed)
stable/8/usr.bin/xlint/ (props changed)
Modified: stable/8/etc/mtree/BSD.include.dist
==============================================================================
--- stable/8/etc/mtree/BSD.include.dist Tue May 18 09:15:26 2010 (r208257)
+++ stable/8/etc/mtree/BSD.include.dist Tue May 18 09:59:09 2010 (r208258)
@@ -205,6 +205,8 @@
..
lwres
..
+ lzma
+ ..
machine
pc
..
Modified: stable/8/lib/Makefile
==============================================================================
--- stable/8/lib/Makefile Tue May 18 09:15:26 2010 (r208257)
+++ stable/8/lib/Makefile Tue May 18 09:59:09 2010 (r208258)
@@ -75,6 +75,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
${_libipx} \
libjail \
libkiconv \
+ liblzma \
libmagic \
libmemstat \
${_libmilter} \
Modified: stable/8/lib/liblzma/Makefile
==============================================================================
--- head/lib/liblzma/Makefile Mon May 10 06:59:50 2010 (r207842)
+++ stable/8/lib/liblzma/Makefile Tue May 18 09:59:09 2010 (r208258)
@@ -1,7 +1,6 @@
# $FreeBSD$
-LIB= lzma
-SHLIB_MAJOR= 0
+LIB= lzma
LZMADIR= ${.CURDIR}/../../contrib/xz/src/liblzma
.PATH: ${LZMADIR}/../common
@@ -19,6 +18,8 @@ LZMAINCS+= base.h \
container.h \
delta.h \
filter.h \
+ hardware.h \
+ index.h \
index_hash.h \
lzma.h \
stream_flags.h \
@@ -120,6 +121,7 @@ SRCS+= simple_coder.c \
WARNS?= 3
CFLAGS+= -DHAVE_CONFIG_H \
+ -DTUKLIB_SYMBOL_PREFIX=lzma_ \
-I${.CURDIR} \
-I${LZMADIR}/api \
-I${LZMADIR}/common \
@@ -132,4 +134,8 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMADIR}/simple \
-I${LZMADIR}/../common
+VERSION_DEF= ${.CURDIR}/Versions.def
+SYMBOL_MAPS= ${.CURDIR}/Symbol.map
+CFLAGS+= -DSYMBOL_VERSIONING
+
.include <bsd.lib.mk>
Copied: stable/8/lib/liblzma/Symbol.map (from r208099, head/lib/liblzma/Symbol.map)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/8/lib/liblzma/Symbol.map Tue May 18 09:59:09 2010 (r208258, copy of r208099, head/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;
+};
Copied: stable/8/lib/liblzma/Versions.def (from r208099, head/lib/liblzma/Versions.def)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/8/lib/liblzma/Versions.def Tue May 18 09:59:09 2010 (r208258, copy of r208099, head/lib/liblzma/Versions.def)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+XZ_5.0 {
+};
+
+
+XZprivate_1.0 {
+} XZ_5.0;
+
Modified: stable/8/share/mk/bsd.libnames.mk
==============================================================================
--- stable/8/share/mk/bsd.libnames.mk Tue May 18 09:15:26 2010 (r208257)
+++ stable/8/share/mk/bsd.libnames.mk Tue May 18 09:59:09 2010 (r208258)
@@ -82,6 +82,7 @@ LIBLN?= "don't use LIBLN, use LIBL"
.if ${MK_BIND} != "no"
LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
.endif
+LIBLZMA?= ${DESTDIR}${LIBDIR}/liblzma.a
LIBM?= ${DESTDIR}${LIBDIR}/libm.a
LIBMAGIC?= ${DESTDIR}${LIBDIR}/libmagic.a
LIBMD?= ${DESTDIR}${LIBDIR}/libmd.a
Modified: stable/8/usr.bin/Makefile
==============================================================================
--- stable/8/usr.bin/Makefile Tue May 18 09:15:26 2010 (r208257)
+++ stable/8/usr.bin/Makefile Tue May 18 09:59:09 2010 (r208258)
@@ -114,6 +114,7 @@ SUBDIR= alias \
look \
lorder \
lsvfs \
+ lzmainfo \
m4 \
${_mail} \
${_make} \
@@ -228,6 +229,8 @@ SUBDIR= alias \
xinstall \
${_xlint} \
${_xstr} \
+ xz \
+ xzdec \
${_yacc} \
yes \
${_ypcat} \
Modified: stable/8/usr.bin/less/Makefile
==============================================================================
--- stable/8/usr.bin/less/Makefile Tue May 18 09:15:26 2010 (r208257)
+++ stable/8/usr.bin/less/Makefile Tue May 18 09:59:09 2010 (r208258)
@@ -11,7 +11,9 @@ SCRIPTSNAME_lesspipe.sh=lesspipe.sh
DPADD= ${LIBTERMCAP}
LDADD= -ltermcap
LINKS= ${BINDIR}/less ${BINDIR}/more \
- ${BINDIR}/zless ${BINDIR}/bzless
+ ${BINDIR}/zless ${BINDIR}/bzless \
+ ${BINDIR}/zless ${BINDIR}/xzless \
+ ${BINDIR}/zless ${BINDIR}/lzless
MLINKS= less.1 more.1
CLEANFILES= less.1
Modified: stable/8/usr.bin/less/lesspipe.sh
==============================================================================
--- stable/8/usr.bin/less/lesspipe.sh Tue May 18 09:15:26 2010 (r208257)
+++ stable/8/usr.bin/less/lesspipe.sh Tue May 18 09:59:09 2010 (r208258)
@@ -13,4 +13,10 @@ case "$1" in
*.bz2)
exec bzip2 -d -c "$1" 2>/dev/null
;;
+ *.xz)
+ exec xz -d -c "$1" 2>/dev/null
+ ;;
+ *.lzma)
+ exec lzma -d -c "$1" 2>/dev/null
+ ;;
esac
Modified: stable/8/usr.bin/lzmainfo/Makefile
==============================================================================
--- head/usr.bin/lzmainfo/Makefile Mon May 10 06:59:50 2010 (r207842)
+++ stable/8/usr.bin/lzmainfo/Makefile Tue May 18 09:59:09 2010 (r208258)
@@ -16,8 +16,7 @@ WARNS?= 3
CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMALIBDIR} \
- -I${XZDIR}/common \
- -I${XZDIR}/liblzma/api
+ -I${XZDIR}/common
DPADD= ${LIBLZMA}
LDADD= -llzma
Modified: stable/8/usr.bin/xz/Makefile
==============================================================================
--- head/usr.bin/xz/Makefile Mon May 10 06:59:50 2010 (r207842)
+++ stable/8/usr.bin/xz/Makefile Tue May 18 09:59:09 2010 (r208258)
@@ -38,8 +38,7 @@ WARNS?= 3
CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMALIBDIR} \
- -I${XZDIR}/common \
- -I${XZDIR}/liblzma/api
+ -I${XZDIR}/common
DPADD= ${LIBLZMA}
LDADD= -llzma
Modified: stable/8/usr.bin/xzdec/Makefile
==============================================================================
--- head/usr.bin/xzdec/Makefile Mon May 10 06:59:50 2010 (r207842)
+++ stable/8/usr.bin/xzdec/Makefile Tue May 18 09:59:09 2010 (r208258)
@@ -22,8 +22,7 @@ WARNS?= 3
CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMALIBDIR} \
- -I${XZDIR}/common \
- -I${XZDIR}/liblzma/api
+ -I${XZDIR}/common
DPADD= ${LIBLZMA}
LDADD= -llzma
More information about the svn-src-all
mailing list