# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1428452457 25200
# Node ID 5ac5027dc3e354fd1b525f03d7a20ae94e400607
# Parent  5442feb5f71ab9205ee55b6ac07bef1f103e6889
20707887 xz should be updated to version 5.2.1

diff -r 5442feb5f71a -r 5ac5027dc3e3 components/xz/Makefile
--- a/components/xz/Makefile	Tue Apr 07 17:16:56 2015 -0700
+++ b/components/xz/Makefile	Tue Apr 07 17:20:57 2015 -0700
@@ -23,22 +23,23 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		xz
-COMPONENT_VERSION=	5.0.1
+COMPONENT_VERSION=	5.2.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://tukaani.org/xz/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:3770b8872a4322b9502937b4781d523303bf193962c4822899fd3a210878fc80
+    sha256:b918b6648076e74f8d7ae19db5ee663df800049e187259faf5eb997a7b974681
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/xz
 
-TPNO=			4463
+TPNO=			21937
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS +=		CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS +=		--bindir=$(USRBINDIR)
 
 COMPONENT_TEST_DIR =		$(@D)/tests
 
@@ -69,3 +70,4 @@
 
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/security/crypto
diff -r 5442feb5f71a -r 5ac5027dc3e3 components/xz/test/results-all.master
--- a/components/xz/test/results-all.master	Tue Apr 07 17:16:56 2015 -0700
+++ b/components/xz/test/results-all.master	Tue Apr 07 17:20:57 2015 -0700
@@ -1,5 +1,5 @@
 make[1]: Entering directory `$(@D)/tests'
-/usr/gnu/bin/make  create_compress_files test_check test_stream_flags test_filter_flags test_block_header test_index
+/usr/gnu/bin/make  create_compress_files test_check test_stream_flags test_filter_flags test_block_header test_index test_bcj_exact_size
 make[2]: Entering directory `$(@D)/tests'
 make[2]: Leaving directory `$(@D)/tests'
 /usr/gnu/bin/make  check-TESTS
@@ -9,6 +9,7 @@
 PASS: test_filter_flags
 PASS: test_block_header
 PASS: test_index
+PASS: test_bcj_exact_size
 PASS: test_files.sh
 test_compress.sh:
   generated_abc.............
@@ -17,8 +18,9 @@
   prepared_bcj_sparc.............
   prepared_bcj_x86.............
 PASS: test_compress.sh
+PASS: test_scripts.sh
 ==================
-All 7 tests passed
+All 9 tests passed
 ==================
 make[2]: Leaving directory `$(@D)/tests'
 make[1]: Leaving directory `$(@D)/tests'
diff -r 5442feb5f71a -r 5ac5027dc3e3 components/xz/xz.p5m
--- a/components/xz/xz.p5m	Tue Apr 07 17:16:56 2015 -0700
+++ b/components/xz/xz.p5m	Tue Apr 07 17:20:57 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -43,15 +43,15 @@
 link path=usr/bin/lzgrep target=xzgrep
 link path=usr/bin/lzless target=xzless
 link path=usr/bin/lzma target=xz
-file usr/bin/$(MACH64)/lzmadec path=usr/bin/lzmadec
-file usr/bin/$(MACH64)/lzmainfo path=usr/bin/lzmainfo
+file path=usr/bin/lzmadec
+file path=usr/bin/lzmainfo
 link path=usr/bin/lzmore target=xzmore
 link path=usr/bin/unlzma target=xz
 link path=usr/bin/unxz target=xz
-file usr/bin/$(MACH64)/xz path=usr/bin/xz
+file path=usr/bin/xz
 link path=usr/bin/xzcat target=xz
 link path=usr/bin/xzcmp target=xzdiff
-file usr/bin/$(MACH64)/xzdec path=usr/bin/xzdec
+file path=usr/bin/xzdec
 file path=usr/bin/xzdiff
 link path=usr/bin/xzegrep target=xzgrep
 link path=usr/bin/xzfgrep target=xzgrep
@@ -69,7 +69,7 @@
 file path=usr/include/lzma/hardware.h
 file path=usr/include/lzma/index.h
 file path=usr/include/lzma/index_hash.h
-file path=usr/include/lzma/lzma.h
+file path=usr/include/lzma/lzma12.h
 file path=usr/include/lzma/stream_flags.h
 file path=usr/include/lzma/version.h
 file path=usr/include/lzma/vli.h
@@ -88,15 +88,24 @@
 file path=usr/share/doc/xz/README
 file path=usr/share/doc/xz/THANKS
 file path=usr/share/doc/xz/TODO
-file path=usr/share/doc/xz/examples/xz_pipe_comp.c
-file path=usr/share/doc/xz/examples/xz_pipe_decomp.c
+file path=usr/share/doc/xz/examples/00_README.txt
+file path=usr/share/doc/xz/examples/01_compress_easy.c
+file path=usr/share/doc/xz/examples/02_decompress.c
+file path=usr/share/doc/xz/examples/03_compress_custom.c
+file path=usr/share/doc/xz/examples/04_compress_easy_mt.c
+file path=usr/share/doc/xz/examples/Makefile
+file path=usr/share/doc/xz/examples_old/xz_pipe_comp.c
+file path=usr/share/doc/xz/examples_old/xz_pipe_decomp.c
 file path=usr/share/doc/xz/faq.txt
 file path=usr/share/doc/xz/history.txt
 file path=usr/share/doc/xz/lzma-file-format.txt
 file path=usr/share/doc/xz/xz-file-format.txt
 file path=usr/share/locale/cs/LC_MESSAGES/xz.mo
 file path=usr/share/locale/de/LC_MESSAGES/xz.mo
+file path=usr/share/locale/fr/LC_MESSAGES/xz.mo
 file path=usr/share/locale/it/LC_MESSAGES/xz.mo
+file path=usr/share/locale/pl/LC_MESSAGES/xz.mo
+file path=usr/share/locale/vi/LC_MESSAGES/xz.mo
 link path=usr/share/man/man1/lzcat.1 target=xz.1
 link path=usr/share/man/man1/lzcmp.1 target=xzdiff.1
 link path=usr/share/man/man1/lzdiff.1 target=xzdiff.1