Changeset 3298

Timestamp:

07/20/07 14:30:18 (1 year ago)

Author:

tg

Message:

also bring this into a shape we can submit it to upstream,
merge the subsequent diff, and fix update-patches with new
files in new subdirs (for those who violate the policy, to
not patch files into existence)

Files:

• trunk/freewrt/package/busybox/patches/911-ipkg.patch (modified) (82 diffs)
• trunk/freewrt/package/busybox/patches/912-ipkg-nodiff.patch (deleted)
• trunk/freewrt/scripts/update-patches (modified) (1 diff)

trunk/freewrt/package/busybox/patches/911-ipkg.patch

@@ -1 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          gzip is used to compress files.
-          It's probably the most widely used UNIX compression program.
@@ -17 +32 @@
-        bool "rpm2cpio"
-        default n
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return ar_handle->sub_archive->buffer;
- }
@@ -31 +55 @@
- {
-        char *name_ptr = archive_handle->file_header->name;
-
+
+
-        return;
- }
++
++*/
- 
-+*/
-+
- static void unpack_package(deb_file_t *deb_file)
- {
-
-
-
-
+
+
-@@ -0,0 +1,26 @@
-+/* ipkg.c - the itsy package management system
@@ -70 +93 @@
-+       return ipkg_op(argc, argv);
-+}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-@@ -0,0 +1,242 @@
-+/* args.c - parse command-line args
@@ -327 +401 @@
-+       bb_error_msg("version %s\n", IPKG_VERSION);
-+}
-
-
-
+
+
-@@ -0,0 +1,72 @@
-+/* args.h - parse command-line args
@@ -403 +476 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,64 @@
-+/* conffile.c - the itsy package management system
@@ -471 +543 @@
-+    return ret;
-+}
-
-
-
+
+
-@@ -0,0 +1,30 @@
-+/* conffile.h - the itsy package management system
@@ -505 +576 @@
-+#endif
-+
-
-
-
+
+
-@@ -0,0 +1,47 @@
-+/* conffile_list.c - the itsy package management system
@@ -556 +626 @@
-+}
-+
-
-
-
+
+
-@@ -0,0 +1,36 @@
-+/* conffile_list.h - the itsy package management system
@@ -596 +665 @@
-+#endif
-+
-
-
-
+
+
-@@ -0,0 +1,132 @@
-+/* file_util.c - convenience routines for common stat operations
@@ -732 +800 @@
-+}
-+
-
-
-
+
+
-@@ -0,0 +1,29 @@
-+/* file_util.h - convenience routines for common file operations
@@ -765 +832 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,155 @@
-+/* hash.c - hash tables for ipkg
@@ -924 +990 @@
-+}
-+
-
-
-
+
+
-@@ -0,0 +1,44 @@
-+/* hash.h - hash tables for ipkg
@@ -972 +1037 @@
-+
-+#endif /* _HASH_TABLE_H_ */
-
-
-
+
+
-@@ -0,0 +1,1431 @@
-+/* ipkg_cmd.c - the itsy package management system
@@ -2407 +2471 @@
-+
-+
-
-
-
+
+
-@@ -0,0 +1,46 @@
-+/* ipkg_cmd.h - the itsy package management system
@@ -2457 +2520 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,711 @@
-+/* ipkg_conf.c - the itsy package management system
@@ -3172 +3234 @@
-+     return root_filename;
-+}
-
-
-
+
+
-@@ -0,0 +1,107 @@
-+/* ipkg_conf.h - the itsy package management system
@@ -3283 +3344 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,40 @@
-+/* ipkg_configure.c - the itsy package management system
@@ -3327 +3387 @@
-+}
-+
-
-
-
+
+
-@@ -0,0 +1,25 @@
-+/* ipkg_configure.h - the itsy package management system
@@ -3356 +3415 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,195 @@
-+/* ipkg_download.c - the itsy package management system
@@ -3555 +3613 @@
-+     return 0;
-+}
-
-
-
+
+
-@@ -0,0 +1,30 @@
-+/* ipkg_download.h - the itsy package management system
@@ -3589 +3646 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,74 @@
-+/* ipkg.h - the itsy package management system
@@ -3667 +3723 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,79 @@
-+#ifndef IPKG_INCLUDES_H
@@ -3750 +3805 @@
-+
-+#endif /* IPKG_INCLUDES_H */
-
-
-
-
+
+
+
-+/* ipkg_install.c - the itsy package management system
-+
@@ -5316 +5370 @@
-+                                      "        Y or I  : install the package maintainer's version\n"
-+                                      "        N or O  : keep your currently-installed version\n"
-
+
+
+
-+                                      "     The default action is to keep your current version.\n"
-
+
+
+
+
+
-+         if (strcmp(response, "y") == 0
-+             || strcmp(response, "i") == 0
@@ -5326 +5386 @@
-+         }
-+
++#ifdef CONFIG_DIFF
-+         if (strcmp(response, "d") == 0) {
-+              char *cmd;
@@ -5339 +5400 @@
-+              continue;
-+         }
++#endif
-+
-+         free(response);
@@ -5696 +5758 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,35 @@
-+/* ipkg_install.h - the itsy package management system
@@ -5735 +5796 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,61 @@
-+/* ipkg_message.c - the itsy package management system
@@ -5800 +5860 @@
-+}
-+#endif
-
-
-
+
+
-@@ -0,0 +1,32 @@
-+/* ipkg_message.h - the itsy package management system
@@ -5836 +5895 @@
-+
-+#endif /* _IPKG_MESSAGE_H_ */
-
-
-
+
+
-@@ -0,0 +1,383 @@
-+/* ipkg_remove.c - the itsy package management system
@@ -6223 +6281 @@
-+    return 0;
-+}
-
-
-
+
+
-@@ -0,0 +1,33 @@
-+/* ipkg_remove.h - the itsy package management system
@@ -6260 +6317 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,77 @@
-+/* ipkg_upgrade.c - the itsy package management system
@@ -6341 +6397 @@
-+     return ipkg_install_pkg(conf, new,1);
-+}
-
-
-
+
+
-@@ -0,0 +1,18 @@
-+/* ipkg_upgrade.c - the itsy package management system
@@ -6363 +6418 @@
-+
-+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-
-
-
+
+
-@@ -0,0 +1,181 @@
-+/* ipkg_utils.c - the itsy package management system
@@ -6548 +6602 @@
-+
-+       
-
-
-
+
+
-@@ -0,0 +1,29 @@
-+/* ipkg_utils.h - the itsy package management system
@@ -6581 +6634 @@
-+
-+#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-@@ -0,0 +1,527 @@
-+/* ipkglib.c - the itsy package management system
@@ -7176 +7164 @@
-+
-+#endif /* IPKG_LIB */
-
-
-
+
+
-@@ -0,0 +1,87 @@
-+/* ipkglib.h - the itsy package management system
@@ -7267 +7254 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,40 @@
-+/* nv_pair.c - the itsy package management system
@@ -7311 +7297 @@
-+
-+
-
-
-
+
+
-@@ -0,0 +1,32 @@
-+/* nv_pair.h - the itsy package management system
@@ -7347 +7332 @@
-+#endif
-+
-
-
-
+
+
-@@ -0,0 +1,98 @@
-+/* nv_pair_list.c - the itsy package management system
@@ -7449 +7433 @@
-+     return NULL;
-+}
-
-
-
+
+
-@@ -0,0 +1,60 @@
-+/* nv_pair_list.h - the itsy package management system
@@ -7513 +7496 @@
-+#endif
-+
-
-
-
+
+
-@@ -0,0 +1,1754 @@
-+/* pkg.c - the itsy package management system
@@ -9271 +9253 @@
-+     return 0;
-+}
-
-
-
+
+
-@@ -0,0 +1,1031 @@
-+/* pkg_depends.c - the itsy package management system
@@ -10306 +10287 @@
-+     return 0;
-+}
-
-
-
+
+
-@@ -0,0 +1,105 @@
-+/* pkg_depends.h - the itsy package management system
@@ -10415 +10395 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,92 @@
-+/* pkg_dest.c - the itsy package management system
@@ -10511 +10490 @@
-+    dest->root_dir = NULL;
-+}
-
-
-
+
+
-@@ -0,0 +1,38 @@
-+/* pkg_dest.h - the itsy package management system
@@ -10553 +10531 @@
-+#endif
-+
-
-
-
+
+
-@@ -0,0 +1,85 @@
-+/* pkg_dest_list.c - the itsy package management system
@@ -10642 +10619 @@
-+    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
-+}
-
-
-
+
+
-@@ -0,0 +1,50 @@
-+/* pkg_dest_list.h - the itsy package management system
@@ -10696 +10672 @@
-+#endif
-+
-
-
-
+
+
-@@ -0,0 +1,224 @@
-+/* pkg_extract.c - the itsy package management system
@@ -10924 +10899 @@
-+       return 0;
-+}
-
-
-
+
+
-@@ -0,0 +1,32 @@
-+/* pkg_extract.c - the itsy package management system
@@ -10960 +10934 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,232 @@
-+/* pkg.h - the itsy package management system
@@ -11196 +11169 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,617 @@
-+/* ipkg_hash.c - the itsy package management system
@@ -11817 +11789 @@
-+
-+
-
-
-
+
+
-@@ -0,0 +1,61 @@
-+/* pkg_hash.h - the itsy package management system
@@ -11882 +11853 @@
-+#endif
-+
-
-
-
+
+
-@@ -0,0 +1,366 @@
-+/* pkg_parse.c - the itsy package management system
@@ -12252 +12222 @@
-+    return 0;
-+}
-
-
-
+
+
-@@ -0,0 +1,31 @@
-+/* pkg_parse.h - the itsy package management system
@@ -12287 +12256 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,43 @@
-+/* pkg_src.c - the itsy package management system
@@ -12334 +12302 @@
-+
-+
-
-
-
+
+
-@@ -0,0 +1,34 @@
-+/* pkg_src.h - the itsy package management system
@@ -12372 +12339 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,75 @@
-+/* pkg_src_list.c - the itsy package management system
@@ -12451 +12417 @@
-+    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
-+}
-
-
-
+
+
-@@ -0,0 +1,57 @@
-+/* pkg_src_list.h - the itsy package management system
@@ -12512 +12477 @@
-+#endif
-+
-
-
-
+
+
-@@ -0,0 +1,230 @@
-+/* pkg_vec.c - the itsy package management system
@@ -12746 +12710 @@
-+}
-+
-
-
-
+
+
-@@ -0,0 +1,62 @@
-+/* pkg_vec.h - the itsy package management system
@@ -12812 +12775 @@
-+#endif
-+
-
-
-
+
+
-@@ -0,0 +1,25 @@
-+/* sprintf_alloca.c -- like sprintf with memory allocation
@@ -12841 +12803 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,76 @@
-+/* str_list.c - the itsy package management system
@@ -12921 +12882 @@
-+                                        (void_list_cmp_t)strcmp);
-+}
-
-
-
+
+
-@@ -0,0 +1,51 @@
-+/* str_list.h - the itsy package management system
@@ -12976 +12936 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,73 @@
-+/* str_utils.c - the itsy package management system
@@ -13053 +13012 @@
-+}
-+
-
-
-
+
+
-@@ -0,0 +1,28 @@
-+/* str_utils.h - the itsy package management system
@@ -13085 +13043 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,58 @@
-+/* user.c - the itsy package management system
@@ -13147 +13104 @@
-+     return response;
-+}
-
-
-
+
+
-@@ -0,0 +1,23 @@
-+/* user.c - the itsy package management system
@@ -13174 +13130 @@
-+char *get_user_response(const char *format, ...);
-+
-
-
-
+
+
-@@ -0,0 +1,194 @@
-+/* void_list.c - the itsy package management system
@@ -13372 +13327 @@
-+         return NULL;
-+}
-
-
-
+
+
-@@ -0,0 +1,59 @@
-+/* void_list.h - the itsy package management system
@@ -13435 +13389 @@
-+
-+#endif
-
-
-
+
+
-@@ -0,0 +1,64 @@
-+/* xsystem.c - system(3) with error messages
@@ -13503 +13456 @@
-+}
-+        
-
-
-
+
+
-@@ -0,0 +1,34 @@
-+/* xsystem.h - system(3) with error messages
@@ -13541 +13493 @@
-+#endif
-+        
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                utime(file_header->name, &t);
-        }
- }
-+
-