5 files changed, 27 insertions, 20 deletions

diff --git a/archival/Config.src b/archival/Config.src
index de453bc21..3dbd3aea1 100644
--- a/archival/Config.src
+++ b/archival/Config.src
@@ -5,6 +5,8 @@
 
 menu "Archival Utilities"
 
+INSERT
+
 config FEATURE_SEAMLESS_XZ
         bool "Make tar, rpm, modprobe etc understand .xz data"
         default y
diff --git a/archival/Kbuild.src b/archival/Kbuild.src
index 3300ea90f..076e58278 100644
--- a/archival/Kbuild.src
+++ b/archival/Kbuild.src
@@ -7,6 +7,9 @@
 libs-y                          += libunarchive/
 
 lib-y:=
+
+INSERT
+
 lib-$(CONFIG_AR)                += ar.o
 lib-$(CONFIG_CPIO)              += cpio.o
 lib-$(CONFIG_DPKG)              += dpkg.o
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index cfbd78420..45a791bba 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -32,14 +32,17 @@ int dpkg_deb_main(int argc, char **argv)
         ar_archive->filter = filter_accept_list_reassign;
 
 #if ENABLE_FEATURE_SEAMLESS_GZ
-        llist_add_to(&(ar_archive->accept), (char*)"data.tar.gz");
+        llist_add_to(&ar_archive->accept, (char*)"data.tar.gz");
         llist_add_to(&control_tar_llist, (char*)"control.tar.gz");
 #endif
-
 #if ENABLE_FEATURE_SEAMLESS_BZ2
-        llist_add_to(&(ar_archive->accept), (char*)"data.tar.bz2");
+        llist_add_to(&ar_archive->accept, (char*)"data.tar.bz2");
         llist_add_to(&control_tar_llist, (char*)"control.tar.bz2");
 #endif
+#if ENABLE_FEATURE_SEAMLESS_LZMA
+        llist_add_to(&ar_archive->accept, (char*)"data.tar.lzma");
+        llist_add_to(&control_tar_llist, (char*)"control.tar.lzma");
+#endif
 
         opt_complementary = "c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
         opt = getopt32(argv, "cefXx");
diff --git a/archival/libunarchive/Kbuild.src b/archival/libunarchive/Kbuild.src
index ed8e85793..81854558b 100644
--- a/archival/libunarchive/Kbuild.src
+++ b/archival/libunarchive/Kbuild.src
@@ -33,6 +33,8 @@ DPKG_FILES:= \
         get_header_tar.o \
         filter_accept_list_reassign.o
 
+INSERT
+
 lib-$(CONFIG_AR)                        += get_header_ar.o unpack_ar_archive.o
 lib-$(CONFIG_BUNZIP2)                   += decompress_bunzip2.o
 lib-$(CONFIG_UNLZMA)                    += decompress_unlzma.o
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index 815261036..c4ffe7ef8 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -152,35 +152,32 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                 bb_error_msg_and_die("unrecognized file type");
         }
 
-        if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_OWNER)) {
-#if ENABLE_FEATURE_TAR_UNAME_GNAME
-                if (!(archive_handle->ah_flags & ARCHIVE_NUMERIC_OWNER)) {
+        if (!S_ISLNK(file_header->mode)) {
+                if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_OWNER)) {
                         uid_t uid = file_header->uid;
                         gid_t gid = file_header->gid;
-
-                        if (file_header->tar__uname) {
+#if ENABLE_FEATURE_TAR_UNAME_GNAME
+                        if (!(archive_handle->ah_flags & ARCHIVE_NUMERIC_OWNER)) {
+                                if (file_header->tar__uname) {
 //TODO: cache last name/id pair?
-                                struct passwd *pwd = getpwnam(file_header->tar__uname);
-                                if (pwd) uid = pwd->pw_uid;
-                        }
-                        if (file_header->tar__gname) {
-                                struct group *grp = getgrnam(file_header->tar__gname);
-                                if (grp) gid = grp->gr_gid;
+                                        struct passwd *pwd = getpwnam(file_header->tar__uname);
+                                        if (pwd) uid = pwd->pw_uid;
+                                }
+                                if (file_header->tar__gname) {
+                                        struct group *grp = getgrnam(file_header->tar__gname);
+                                        if (grp) gid = grp->gr_gid;
+                                }
                         }
+#endif
                         /* GNU tar 1.15.1 uses chown, not lchown */
                         chown(file_header->name, uid, gid);
-                } else
-#endif
-                        chown(file_header->name, file_header->uid, file_header->gid);
-        }
-        if (!S_ISLNK(file_header->mode)) {
+                }
                 /* uclibc has no lchmod, glibc is even stranger -
                  * it has lchmod which seems to do nothing!
                  * so we use chmod... */
                 if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_PERM)) {
                         chmod(file_header->name, file_header->mode);
                 }
-                /* same for utime */
                 if (archive_handle->ah_flags & ARCHIVE_RESTORE_DATE) {
                         struct timeval t[2];