Merge tag '1_26_2' into w32_1_26_2w32_1_26_2

4 files changed, 20 insertions, 4 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index e1eec6d4b..343aec9bd 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -9,6 +9,12 @@
 
 /* lzop_main() uses bbunpack(), need this: */
 //kbuild:lib-$(CONFIG_LZOP) += bbunzip.o
+//kbuild:lib-$(CONFIG_LZOPCAT) += bbunzip.o
+//kbuild:lib-$(CONFIG_UNLZOP) += bbunzip.o
+/* bzip2_main() too: */
+//kbuild:lib-$(CONFIG_BZIP2) += bbunzip.o
+/* gzip_main() too: */
+//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o
 
 /* Note: must be kept in sync with archival/lzop.c */
 enum {
@@ -192,7 +198,10 @@ int FAST_FUNC bbunpack(char **argv,
         return exitcode;
 }
 
-#if ENABLE_UNCOMPRESS || ENABLE_BUNZIP2 || ENABLE_UNLZMA || ENABLE_UNXZ
+#if ENABLE_UNCOMPRESS \
+ || ENABLE_BUNZIP2 || ENABLE_BZCAT \
+ || ENABLE_UNLZMA || ENABLE_LZCAT || ENABLE_LZMA \
+ || ENABLE_UNXZ || ENABLE_XZCAT || ENABLE_XZ
 static
 char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 {
diff --git a/archival/dpkg.c b/archival/dpkg.c
index df7a0db64..f133299e3 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -28,7 +28,7 @@
 
 //config:config DPKG
 //config:       bool "dpkg"
-//config:       default n
+//config:       default y
 //config:       select FEATURE_SEAMLESS_GZ
 //config:       help
 //config:         dpkg is a medium-level tool to install, build, remove and manage
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 86850469d..ebbc7f035 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -7,7 +7,7 @@
 
 //config:config DPKG_DEB
 //config:       bool "dpkg_deb"
-//config:       default n
+//config:       default y
 //config:       select FEATURE_SEAMLESS_GZ
 //config:       help
 //config:         dpkg-deb unpacks and provides information about Debian archives.
diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index b159a786a..ad5c5c42d 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -48,16 +48,23 @@ lib-$(CONFIG_CPIO)                      += get_header_cpio.o
 lib-$(CONFIG_TAR)                       += get_header_tar.o unsafe_prefix.o
 lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
 lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
+lib-$(CONFIG_UNLZOP)                    += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
+lib-$(CONFIG_LZOPCAT)                   += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
 lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
 lib-$(CONFIG_BUNZIP2)                   += open_transformer.o decompress_bunzip2.o
+lib-$(CONFIG_BZCAT)                     += open_transformer.o decompress_bunzip2.o
 lib-$(CONFIG_UNLZMA)                    += open_transformer.o decompress_unlzma.o
+lib-$(CONFIG_LZCAT)                     += open_transformer.o decompress_unlzma.o
+lib-$(CONFIG_LZMA)                      += open_transformer.o decompress_unlzma.o
 lib-$(CONFIG_UNXZ)                      += open_transformer.o decompress_unxz.o
+lib-$(CONFIG_XZCAT)                     += open_transformer.o decompress_unxz.o
+lib-$(CONFIG_XZ)                        += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
+lib-$(CONFIG_ZCAT)                      += open_transformer.o decompress_gunzip.o
 lib-$(CONFIG_UNCOMPRESS)                += open_transformer.o decompress_uncompress.o
 lib-$(CONFIG_UNZIP)                     += open_transformer.o decompress_gunzip.o unsafe_prefix.o
 lib-$(CONFIG_RPM2CPIO)                  += open_transformer.o decompress_gunzip.o get_header_cpio.o
 lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
-
 lib-$(CONFIG_GZIP)                      += open_transformer.o
 lib-$(CONFIG_BZIP2)                     += open_transformer.o
 lib-$(CONFIG_LZOP)                      += open_transformer.o