Support lzip compressed archives in oi-userland

OpenIndiana · Jul 5, 2018 · b1b3714 · b1b3714
1 parent edbff5c
commit b1b3714
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/components/archiver/lzip/Makefile b/components/archiver/lzip/Makefile
@@ -19,12 +19,14 @@ include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		lzip
 COMPONENT_VERSION=	1.20
+COMPONENT_REVISION=	1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://lzip.nongnu.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:c93b81a5a7788ef5812423d311345ba5d3bd4f5ebf1f693911e3a13553c1290c
 COMPONENT_ARCHIVE_URL=	http://download.savannah.gnu.org/releases/lzip/$(COMPONENT_ARCHIVE)
+COMPONENT_SIG_URL=	http://download.savannah.gnu.org/releases/lzip/$(COMPONENT_ARCHIVE).sig
 COMPONENT_FMRI=		compress/lzip
 COMPONENT_SUMMARY=	'Lzip - a lossless data compressor with a user interface similar to the one of gzip or bzip2'
 COMPONENT_LICENSE=	GPLv2+
@@ -35,7 +37,6 @@ include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-
 COMPONENT_TEST_TRANSFORMER = $(NAWK)
 COMPONENT_TEST_TRANSFORMS = "'/testing|tests/'"
 

diff --git a/make-rules/prep-unpack.mk b/make-rules/prep-unpack.mk
@@ -19,6 +19,7 @@
 # CDDL HEADER END
 #
 # Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Michal Nowak
 #
 
 UNPACK =		$(WS_TOOLS)/userland-unpack
@@ -56,6 +57,7 @@ REQUIRED_PACKAGES += compress/bzip2
 REQUIRED_PACKAGES += compress/gzip
 REQUIRED_PACKAGES += compress/p7zip
 REQUIRED_PACKAGES += compress/unzip
+REQUIRED_PACKAGES += compress/lzip
 REQUIRED_PACKAGES += compress/xz
 REQUIRED_PACKAGES += compress/zip
 REQUIRED_PACKAGES += developer/java/jdk

diff --git a/tools/userland-unpack b/tools/userland-unpack
@@ -20,6 +20,7 @@
 # CDDL HEADER END
 #
 # Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
+# Copyright (c) 2018, Michal Nowak
 #
 #
 # unpack.py - an archive unpack utility
@@ -44,6 +45,8 @@ def uncompress_unpack_commands(filename, verbose=False):
 		uncompress = "/usr/bin/uncompress -c"
 	elif (re.search("(\.7z)$", filename) != None):
 		uncompress = "/usr/bin/7z --s"
+	elif (re.search("(\.lz)$", filename) != None):
+		uncompress = "/usr/bin/lzip -dc"
 	elif (re.search("(\.xz)$", filename) != None):
 		uncompress = "/usr/bin/xz -dc"
 	elif (re.search("(\.zip)$", filename) != None):