Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/dpkg.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/archival/dpkg.c (modified) (7 diffs)

branches/3.3/mindi-busybox/archival/dpkg.c

@@ -15 +15 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /*
  * known difference between busybox dpkg and the official dpkg that i don't
@@ -26 +25 @@
  * bugs that need to be fixed
  *  - (unknown, please let me know when you find any)
- *
  */
+
+//config:config DPKG
+//config:   bool "dpkg"
+//config:   default n
+//config:   select FEATURE_SEAMLESS_GZ
+//config:   help
+//config:     dpkg is a medium-level tool to install, build, remove and manage
+//config:     Debian packages.
+//config:
+//config:     This implementation of dpkg has a number of limitations,
+//config:     you should use the official dpkg if possible.
+
+//applet:IF_DPKG(APPLET(dpkg, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_DPKG) += dpkg.o
 
 //usage:#define dpkg_trivial_usage
@@ -1140 +1152 @@
                     if (root_of_alternatives)
                         bb_error_msg_and_die(
-                            "package %s %sdepends on %s, "
-                            "which cannot be satisfied",
+                            "package %s %sdepends on %s, which %s",
                             name_hashtable[package_node->name],
                             package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
-                            name_hashtable[root_of_alternatives->name]);
+                            name_hashtable[root_of_alternatives->name],
+                            "cannot be satisfied");
                     bb_error_msg_and_die(
-                        "package %s %sdepends on %s, which %s\n",
+                        "package %s %sdepends on %s, which %s",
                         name_hashtable[package_node->name],
                         package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
@@ -1461 +1473 @@
 
     /* We don't care about data.tar.* or debian-binary, just control.tar.* */
+    llist_add_to(&(ar_handle->accept), (char*)"control.tar");
 #if ENABLE_FEATURE_SEAMLESS_GZ
     llist_add_to(&(ar_handle->accept), (char*)"control.tar.gz");
@@ -1467 +1480 @@
     llist_add_to(&(ar_handle->accept), (char*)"control.tar.bz2");
 #endif
+#if ENABLE_FEATURE_SEAMLESS_XZ
+    llist_add_to(&(ar_handle->accept), (char*)"control.tar.xz");
+#endif
 
     /* Assign the tar handle as a subarchive of the ar handle */
@@ -1481 +1497 @@
 
     /* We don't care about control.tar.* or debian-binary, just data.tar.* */
+    llist_add_to(&(ar_handle->accept), (char*)"data.tar");
 #if ENABLE_FEATURE_SEAMLESS_GZ
     llist_add_to(&(ar_handle->accept), (char*)"data.tar.gz");
@@ -1486 +1503 @@
 #if ENABLE_FEATURE_SEAMLESS_BZ2
     llist_add_to(&(ar_handle->accept), (char*)"data.tar.bz2");
+#endif
+#if ENABLE_FEATURE_SEAMLESS_LZMA
+    llist_add_to(&(ar_handle->accept), (char*)"data.tar.lzma");
+#endif
+#if ENABLE_FEATURE_SEAMLESS_XZ
+    llist_add_to(&(ar_handle->accept), (char*)"data.tar.xz");
 #endif