Andreas Wacknitz
2022-08-15 0769a1c49a343c351f5f086617b95d6e27056f35
xz: update to 5.2.6 and drop 32 bit apps

4 files modified
212 ■■■■■ changed files
components/archiver/xz/Makefile 19 ●●●●● patch | view | raw | blame | history
components/archiver/xz/manifests/sample-manifest.p5m 83 ●●●●● patch | view | raw | blame | history
components/archiver/xz/pkg5 1 ●●●● patch | view | raw | blame | history
components/archiver/xz/xz.p5m 109 ●●●●● patch | view | raw | blame | history
components/archiver/xz/Makefile
@@ -20,16 +20,15 @@
#
# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
BUILD_BITS=            32_and_64
BUILD_BITS=            64_and_32
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        xz
COMPONENT_VERSION=    5.2.5
COMPONENT_VERSION=    5.2.6
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL=    https://tukaani.org/xz/
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    \
    sha256:f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10
COMPONENT_ARCHIVE_HASH= sha256:a2105abee17bcd2ebd15ced31b4f5eda6e17efd6b10f921a01cda4a44c91b3a0
COMPONENT_ARCHIVE_URL=    $(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=        compress/xz
COMPONENT_SUMMARY=    'XZ Utils - loss-less file compression application and library.'
@@ -39,15 +38,12 @@
include $(WS_MAKE_RULES)/common.mk
CONFIGURE_OPTIONS +=            --disable-rpath
CONFIGURE_OPTIONS += --disable-static
CONFIGURE_OPTIONS += --disable-rpath
CONFIGURE_ENV.64 +=             LT_SYS_LIBRARY_PATH="/lib/$(MACH64):/usr/lib/$(MACH64)"
CONFIGURE_ENV.64 += LT_SYS_LIBRARY_PATH="/lib/$(MACH64):/usr/lib/$(MACH64)"
COMPONENT_TEST_DIR =            $(@D)/tests
# Master test results are the same for 32-bit and 64-bit, so override
# here, rather than create multiple identical master files.
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
COMPONENT_TEST_DIR = $(@D)/tests
# The additional xz specific set of transforms to be applied to the
# test results to try to normalize them.
@@ -61,5 +57,6 @@
# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/xopen/xcu4
components/archiver/xz/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2020 <contributor>
# Copyright 2022 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,29 +23,29 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
link path=usr/bin/$(MACH64)/lzcat target=xz
link path=usr/bin/$(MACH64)/lzcmp target=xzdiff
link path=usr/bin/$(MACH64)/lzdiff target=xzdiff
link path=usr/bin/$(MACH64)/lzegrep target=xzgrep
link path=usr/bin/$(MACH64)/lzfgrep target=xzgrep
link path=usr/bin/$(MACH64)/lzgrep target=xzgrep
link path=usr/bin/$(MACH64)/lzless target=xzless
link path=usr/bin/$(MACH64)/lzma target=xz
file path=usr/bin/$(MACH64)/lzmadec
file path=usr/bin/$(MACH64)/lzmainfo
link path=usr/bin/$(MACH64)/lzmore target=xzmore
link path=usr/bin/$(MACH64)/unlzma target=xz
link path=usr/bin/$(MACH64)/unxz target=xz
file path=usr/bin/$(MACH64)/xz
link path=usr/bin/$(MACH64)/xzcat target=xz
link path=usr/bin/$(MACH64)/xzcmp target=xzdiff
file path=usr/bin/$(MACH64)/xzdec
file path=usr/bin/$(MACH64)/xzdiff
link path=usr/bin/$(MACH64)/xzegrep target=xzgrep
link path=usr/bin/$(MACH64)/xzfgrep target=xzgrep
file path=usr/bin/$(MACH64)/xzgrep
file path=usr/bin/$(MACH64)/xzless
file path=usr/bin/$(MACH64)/xzmore
link path=usr/bin/$(MACH32)/lzcat target=xz
link path=usr/bin/$(MACH32)/lzcmp target=xzdiff
link path=usr/bin/$(MACH32)/lzdiff target=xzdiff
link path=usr/bin/$(MACH32)/lzegrep target=xzgrep
link path=usr/bin/$(MACH32)/lzfgrep target=xzgrep
link path=usr/bin/$(MACH32)/lzgrep target=xzgrep
link path=usr/bin/$(MACH32)/lzless target=xzless
link path=usr/bin/$(MACH32)/lzma target=xz
file path=usr/bin/$(MACH32)/lzmadec
file path=usr/bin/$(MACH32)/lzmainfo
link path=usr/bin/$(MACH32)/lzmore target=xzmore
link path=usr/bin/$(MACH32)/unlzma target=xz
link path=usr/bin/$(MACH32)/unxz target=xz
file path=usr/bin/$(MACH32)/xz
link path=usr/bin/$(MACH32)/xzcat target=xz
link path=usr/bin/$(MACH32)/xzcmp target=xzdiff
file path=usr/bin/$(MACH32)/xzdec
file path=usr/bin/$(MACH32)/xzdiff
link path=usr/bin/$(MACH32)/xzegrep target=xzgrep
link path=usr/bin/$(MACH32)/xzfgrep target=xzgrep
file path=usr/bin/$(MACH32)/xzgrep
file path=usr/bin/$(MACH32)/xzless
file path=usr/bin/$(MACH32)/xzmore
link path=usr/bin/lzcat target=xz
link path=usr/bin/lzcmp target=xzdiff
link path=usr/bin/lzdiff target=xzdiff
@@ -83,12 +84,10 @@
file path=usr/include/lzma/stream_flags.h
file path=usr/include/lzma/version.h
file path=usr/include/lzma/vli.h
file path=usr/lib/$(MACH64)/liblzma.a
link path=usr/lib/$(MACH64)/liblzma.so target=liblzma.so.$(COMPONENT_VERSION)
file path=usr/lib/$(MACH64)/liblzma.so.$(COMPONENT_VERSION)
link path=usr/lib/$(MACH64)/liblzma.so.5 target=liblzma.so.$(COMPONENT_VERSION)
file path=usr/lib/$(MACH64)/pkgconfig/liblzma.pc
file path=usr/lib/liblzma.a
link path=usr/lib/liblzma.so target=liblzma.so.$(COMPONENT_VERSION)
file path=usr/lib/liblzma.so.$(COMPONENT_VERSION)
link path=usr/lib/liblzma.so.5 target=liblzma.so.$(COMPONENT_VERSION)
@@ -112,24 +111,31 @@
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/ca/LC_MESSAGES/xz.mo
file path=usr/share/locale/cs/LC_MESSAGES/xz.mo
file path=usr/share/locale/da/LC_MESSAGES/xz.mo
file path=usr/share/locale/de/LC_MESSAGES/xz.mo
file path=usr/share/locale/eo/LC_MESSAGES/xz.mo
file path=usr/share/locale/es/LC_MESSAGES/xz.mo
file path=usr/share/locale/fi/LC_MESSAGES/xz.mo
file path=usr/share/locale/fr/LC_MESSAGES/xz.mo
file path=usr/share/locale/hr/LC_MESSAGES/xz.mo
file path=usr/share/locale/hu/LC_MESSAGES/xz.mo
file path=usr/share/locale/it/LC_MESSAGES/xz.mo
file path=usr/share/locale/ko/LC_MESSAGES/xz.mo
file path=usr/share/locale/pl/LC_MESSAGES/xz.mo
file path=usr/share/locale/pt/LC_MESSAGES/xz.mo
file path=usr/share/locale/pt_BR/LC_MESSAGES/xz.mo
file path=usr/share/locale/ro/LC_MESSAGES/xz.mo
file path=usr/share/locale/sr/LC_MESSAGES/xz.mo
file path=usr/share/locale/sv/LC_MESSAGES/xz.mo
file path=usr/share/locale/uk/LC_MESSAGES/xz.mo
file path=usr/share/locale/vi/LC_MESSAGES/xz.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/xz.mo
file path=usr/share/locale/zh_TW/LC_MESSAGES/xz.mo
link path=usr/share/man/de/man1/lzcat.1 target=xz.1
link path=usr/share/man/de/man1/lzcmp.1 target=xzdiff.1
link path=usr/share/man/de/man1/lzdiff.1 target=xzdiff.1
link path=usr/share/man/de/man1/lzegrep.1 target=xzgrep.1
link path=usr/share/man/de/man1/lzfgrep.1 target=xzgrep.1
link path=usr/share/man/de/man1/lzgrep.1 target=xzgrep.1
link path=usr/share/man/de/man1/lzless.1 target=xzless.1
link path=usr/share/man/de/man1/lzma.1 target=xz.1
link path=usr/share/man/de/man1/lzmadec.1 target=xzdec.1
@@ -141,11 +147,24 @@
link path=usr/share/man/de/man1/xzcmp.1 target=xzdiff.1
file path=usr/share/man/de/man1/xzdec.1
file path=usr/share/man/de/man1/xzdiff.1
link path=usr/share/man/de/man1/xzegrep.1 target=xzgrep.1
link path=usr/share/man/de/man1/xzfgrep.1 target=xzgrep.1
file path=usr/share/man/de/man1/xzgrep.1
file path=usr/share/man/de/man1/xzless.1
file path=usr/share/man/de/man1/xzmore.1
link path=usr/share/man/fr_FR/man1/lzcat.1 target=xz.1
link path=usr/share/man/fr_FR/man1/lzcmp.1 target=xzdiff.1
link path=usr/share/man/fr_FR/man1/lzdiff.1 target=xzdiff.1
link path=usr/share/man/fr_FR/man1/lzless.1 target=xzless.1
link path=usr/share/man/fr_FR/man1/lzma.1 target=xz.1
link path=usr/share/man/fr_FR/man1/lzmadec.1 target=xzdec.1
link path=usr/share/man/fr_FR/man1/lzmore.1 target=xzmore.1
link path=usr/share/man/fr_FR/man1/unlzma.1 target=xz.1
link path=usr/share/man/fr_FR/man1/unxz.1 target=xz.1
file path=usr/share/man/fr_FR/man1/xz.1
link path=usr/share/man/fr_FR/man1/xzcat.1 target=xz.1
link path=usr/share/man/fr_FR/man1/xzcmp.1 target=xzdiff.1
file path=usr/share/man/fr_FR/man1/xzdec.1
file path=usr/share/man/fr_FR/man1/xzdiff.1
file path=usr/share/man/fr_FR/man1/xzless.1
file path=usr/share/man/fr_FR/man1/xzmore.1
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
components/archiver/xz/pkg5
@@ -1,6 +1,7 @@
{
    "dependencies": [
        "SUNWcs",
        "shell/ksh93",
        "system/library",
        "system/xopen/xcu4"
    ],
components/archiver/xz/xz.p5m
@@ -11,10 +11,11 @@
#
# Copyright 2016 Alexander Pyhalov
# Copyright 2020 Andreas Wacknitz
# Copyright 2022 Andreas Wacknitz
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -23,47 +24,33 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file usr/bin/lzmadec path=usr/bin/$(MACH32)/lzmadec
file usr/bin/lzmainfo path=usr/bin/$(MACH32)/lzmainfo
file usr/bin/xz path=usr/bin/$(MACH32)/xz
file usr/bin/xzdec path=usr/bin/$(MACH32)/xzdec
file usr/bin/xzdiff path=usr/bin/$(MACH32)/xzdiff
file usr/bin/xzgrep path=usr/bin/$(MACH32)/xzgrep
file usr/bin/xzless path=usr/bin/$(MACH32)/xzless
file usr/bin/xzmore path=usr/bin/$(MACH32)/xzmore
# Drop 32 bit applications:
<transform file path=.*/bin/$(MACH32)/.+ -> drop>
<transform link path=.*/bin/$(MACH32)/.+ -> drop>
hardlink path=usr/bin/lzmadec target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/lzmainfo target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/xz target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/xzdec target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/xzdiff target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/xzgrep target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/xzless target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/xzmore target=../lib/isaexec pkg.linted.userland.action002.0=true
link path=usr/bin/$(MACH64)/lzcat target=xz
link path=usr/bin/$(MACH64)/lzcmp target=xzdiff
link path=usr/bin/$(MACH64)/lzdiff target=xzdiff
link path=usr/bin/$(MACH64)/lzegrep target=xzgrep
link path=usr/bin/$(MACH64)/lzfgrep target=xzgrep
link path=usr/bin/$(MACH64)/lzgrep target=xzgrep
link path=usr/bin/$(MACH64)/lzless target=xzless
link path=usr/bin/$(MACH64)/lzma target=xz
file path=usr/bin/$(MACH64)/lzmadec
file path=usr/bin/$(MACH64)/lzmainfo
link path=usr/bin/$(MACH64)/lzmore target=xzmore
link path=usr/bin/$(MACH64)/unlzma target=xz
link path=usr/bin/$(MACH64)/unxz target=xz
file path=usr/bin/$(MACH64)/xz
link path=usr/bin/$(MACH64)/xzcat target=xz
link path=usr/bin/$(MACH64)/xzcmp target=xzdiff
file path=usr/bin/$(MACH64)/xzdec
file path=usr/bin/$(MACH64)/xzdiff
link path=usr/bin/$(MACH64)/xzegrep target=xzgrep
link path=usr/bin/$(MACH64)/xzfgrep target=xzgrep
file path=usr/bin/$(MACH64)/xzgrep
file path=usr/bin/$(MACH64)/xzless
file path=usr/bin/$(MACH64)/xzmore
link path=usr/bin/$(MACH32)/lzcat target=xz
link path=usr/bin/$(MACH32)/lzcmp target=xzdiff
link path=usr/bin/$(MACH32)/lzdiff target=xzdiff
link path=usr/bin/$(MACH32)/lzegrep target=xzgrep
link path=usr/bin/$(MACH32)/lzfgrep target=xzgrep
link path=usr/bin/$(MACH32)/lzgrep target=xzgrep
link path=usr/bin/$(MACH32)/lzless target=xzless
link path=usr/bin/$(MACH32)/lzma target=xz
file path=usr/bin/$(MACH32)/lzmadec
file path=usr/bin/$(MACH32)/lzmainfo
link path=usr/bin/$(MACH32)/lzmore target=xzmore
link path=usr/bin/$(MACH32)/unlzma target=xz
link path=usr/bin/$(MACH32)/unxz target=xz
file path=usr/bin/$(MACH32)/xz
link path=usr/bin/$(MACH32)/xzcat target=xz
link path=usr/bin/$(MACH32)/xzcmp target=xzdiff
file path=usr/bin/$(MACH32)/xzdec
file path=usr/bin/$(MACH32)/xzdiff
link path=usr/bin/$(MACH32)/xzegrep target=xzgrep
link path=usr/bin/$(MACH32)/xzfgrep target=xzgrep
file path=usr/bin/$(MACH32)/xzgrep
file path=usr/bin/$(MACH32)/xzless
file path=usr/bin/$(MACH32)/xzmore
link path=usr/bin/lzcat target=xz
link path=usr/bin/lzcmp target=xzdiff
link path=usr/bin/lzdiff target=xzdiff
@@ -72,13 +59,21 @@
link path=usr/bin/lzgrep target=xzgrep
link path=usr/bin/lzless target=xzless
link path=usr/bin/lzma target=xz
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 path=usr/bin/xz
link path=usr/bin/xzcat target=xz
link path=usr/bin/xzcmp target=xzdiff
file path=usr/bin/xzdec
file path=usr/bin/xzdiff
link path=usr/bin/xzegrep target=xzgrep
link path=usr/bin/xzfgrep target=xzgrep
file path=usr/bin/xzgrep
file path=usr/bin/xzless
file path=usr/bin/xzmore
file path=usr/include/lzma.h
file path=usr/include/lzma/base.h
file path=usr/include/lzma/bcj.h
@@ -121,24 +116,31 @@
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/ca/LC_MESSAGES/xz.mo
file path=usr/share/locale/cs/LC_MESSAGES/xz.mo
file path=usr/share/locale/da/LC_MESSAGES/xz.mo
file path=usr/share/locale/de/LC_MESSAGES/xz.mo
file path=usr/share/locale/eo/LC_MESSAGES/xz.mo
file path=usr/share/locale/es/LC_MESSAGES/xz.mo
file path=usr/share/locale/fi/LC_MESSAGES/xz.mo
file path=usr/share/locale/fr/LC_MESSAGES/xz.mo
file path=usr/share/locale/hr/LC_MESSAGES/xz.mo
file path=usr/share/locale/hu/LC_MESSAGES/xz.mo
file path=usr/share/locale/it/LC_MESSAGES/xz.mo
file path=usr/share/locale/ko/LC_MESSAGES/xz.mo
file path=usr/share/locale/pl/LC_MESSAGES/xz.mo
file path=usr/share/locale/pt/LC_MESSAGES/xz.mo
file path=usr/share/locale/pt_BR/LC_MESSAGES/xz.mo
file path=usr/share/locale/ro/LC_MESSAGES/xz.mo
file path=usr/share/locale/sr/LC_MESSAGES/xz.mo
file path=usr/share/locale/sv/LC_MESSAGES/xz.mo
file path=usr/share/locale/uk/LC_MESSAGES/xz.mo
file path=usr/share/locale/vi/LC_MESSAGES/xz.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/xz.mo
file path=usr/share/locale/zh_TW/LC_MESSAGES/xz.mo
link path=usr/share/man/de/man1/lzcat.1 target=xz.1
link path=usr/share/man/de/man1/lzcmp.1 target=xzdiff.1
link path=usr/share/man/de/man1/lzdiff.1 target=xzdiff.1
link path=usr/share/man/de/man1/lzegrep.1 target=xzgrep.1
link path=usr/share/man/de/man1/lzfgrep.1 target=xzgrep.1
link path=usr/share/man/de/man1/lzgrep.1 target=xzgrep.1
link path=usr/share/man/de/man1/lzless.1 target=xzless.1
link path=usr/share/man/de/man1/lzma.1 target=xz.1
link path=usr/share/man/de/man1/lzmadec.1 target=xzdec.1
@@ -150,11 +152,24 @@
link path=usr/share/man/de/man1/xzcmp.1 target=xzdiff.1
file path=usr/share/man/de/man1/xzdec.1
file path=usr/share/man/de/man1/xzdiff.1
link path=usr/share/man/de/man1/xzegrep.1 target=xzgrep.1
link path=usr/share/man/de/man1/xzfgrep.1 target=xzgrep.1
file path=usr/share/man/de/man1/xzgrep.1
file path=usr/share/man/de/man1/xzless.1
file path=usr/share/man/de/man1/xzmore.1
link path=usr/share/man/fr_FR/man1/lzcat.1 target=xz.1
link path=usr/share/man/fr_FR/man1/lzcmp.1 target=xzdiff.1
link path=usr/share/man/fr_FR/man1/lzdiff.1 target=xzdiff.1
link path=usr/share/man/fr_FR/man1/lzless.1 target=xzless.1
link path=usr/share/man/fr_FR/man1/lzma.1 target=xz.1
link path=usr/share/man/fr_FR/man1/lzmadec.1 target=xzdec.1
link path=usr/share/man/fr_FR/man1/lzmore.1 target=xzmore.1
link path=usr/share/man/fr_FR/man1/unlzma.1 target=xz.1
link path=usr/share/man/fr_FR/man1/unxz.1 target=xz.1
file path=usr/share/man/fr_FR/man1/xz.1
link path=usr/share/man/fr_FR/man1/xzcat.1 target=xz.1
link path=usr/share/man/fr_FR/man1/xzcmp.1 target=xzdiff.1
file path=usr/share/man/fr_FR/man1/xzdec.1
file path=usr/share/man/fr_FR/man1/xzdiff.1
file path=usr/share/man/fr_FR/man1/xzless.1
file path=usr/share/man/fr_FR/man1/xzmore.1
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