Changeset 1347

Show
Ignore:
Timestamp:
12/20/06 09:11:13 (5 years ago)
Author:
wbx
Message:

sync with branch, include smaller ipkg-fix patches into ipkg patch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1266 r1347  
    1 diff -Nur busybox-1.2.2.1.orig/archival/Config.in busybox-1.2.2.1/archival/Config.in 
     1diff -Nurp busybox-1.2.2.1.orig/archival/Config.in busybox-1.2.2.1/archival/Config.in 
    22--- busybox-1.2.2.1.orig/archival/Config.in     2006-07-01 00:42:04.000000000 +0200 
    3 +++ busybox-1.2.2.1/archival/Config.in  2006-11-03 14:17:31.000000000 +0100 
    4 @@ -121,6 +121,14 @@ 
     3+++ busybox-1.2.2.1/archival/Config.in  2006-12-20 09:07:42.000000000 +0100 
     4@@ -121,6 +121,14 @@ config CONFIG_GZIP 
    55          gzip is used to compress files. 
    66          It's probably the most widely used UNIX compression program. 
    …… 
    1717        bool "rpm2cpio" 
    1818        default n 
    19 diff -Nur busybox-1.2.2.1.orig/archival/dpkg.c busybox-1.2.2.1/archival/dpkg.c 
     19diff -Nurp busybox-1.2.2.1.orig/archival/dpkg.c busybox-1.2.2.1/archival/dpkg.c 
    2020--- busybox-1.2.2.1.orig/archival/dpkg.c        2006-07-01 00:42:04.000000000 +0200 
    21 +++ busybox-1.2.2.1/archival/dpkg.c     2006-11-03 14:17:31.000000000 +0100 
    22 @@ -1430,6 +1430,10 @@ 
     21+++ busybox-1.2.2.1/archival/dpkg.c     2006-12-20 09:07:42.000000000 +0100 
     22@@ -1430,6 +1430,10 @@ static char *deb_extract_control_file_to 
    2323        return(ar_handle->sub_archive->buffer); 
    2424 } 
    …… 
    3131 { 
    3232        char *name_ptr = archive_handle->file_header->name; 
    33 @@ -1442,6 +1446,8 @@ 
     33@@ -1442,6 +1446,8 @@ static void data_extract_all_prefix(arch 
    3434        return; 
    3535 } 
    …… 
    4040 { 
    4141        const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name]; 
    42 diff -Nur busybox-1.2.2.1.orig/archival/ipkg.c busybox-1.2.2.1/archival/ipkg.c 
     42diff -Nurp busybox-1.2.2.1.orig/archival/ipkg.c busybox-1.2.2.1/archival/ipkg.c 
    4343--- busybox-1.2.2.1.orig/archival/ipkg.c        1970-01-01 01:00:00.000000000 +0100 
    44 +++ busybox-1.2.2.1/archival/ipkg.c     2006-11-03 14:17:31.000000000 +0100 
     44+++ busybox-1.2.2.1/archival/ipkg.c     2006-12-20 09:07:42.000000000 +0100 
    4545@@ -0,0 +1,26 @@ 
    4646+/* ipkg.c - the itsy package management system 
    …… 
    7070+       return ipkg_op(argc, argv); 
    7171+} 
    72 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/args.c busybox-1.2.2.1/archival/libipkg/args.c 
     72diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/args.c busybox-1.2.2.1/archival/libipkg/args.c 
    7373--- busybox-1.2.2.1.orig/archival/libipkg/args.c        1970-01-01 01:00:00.000000000 +0100 
    74 +++ busybox-1.2.2.1/archival/libipkg/args.c     2006-11-03 14:17:31.000000000 +0100 
     74+++ busybox-1.2.2.1/archival/libipkg/args.c     2006-12-20 09:07:42.000000000 +0100 
    7575@@ -0,0 +1,242 @@ 
    7676+/* args.c - parse command-line args 
    …… 
    316316+       bb_error_msg("version %s\n", IPKG_VERSION); 
    317317+} 
    318 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/args.h busybox-1.2.2.1/archival/libipkg/args.h 
     318diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/args.h busybox-1.2.2.1/archival/libipkg/args.h 
    319319--- busybox-1.2.2.1.orig/archival/libipkg/args.h        1970-01-01 01:00:00.000000000 +0100 
    320 +++ busybox-1.2.2.1/archival/libipkg/args.h     2006-11-03 14:17:31.000000000 +0100 
     320+++ busybox-1.2.2.1/archival/libipkg/args.h     2006-12-20 09:07:42.000000000 +0100 
    321321@@ -0,0 +1,72 @@ 
    322322+/* args.h - parse command-line args 
    …… 
    392392+ 
    393393+#endif 
    394 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/conffile.c busybox-1.2.2.1/archival/libipkg/conffile.c 
     394diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/conffile.c busybox-1.2.2.1/archival/libipkg/conffile.c 
    395395--- busybox-1.2.2.1.orig/archival/libipkg/conffile.c    1970-01-01 01:00:00.000000000 +0100 
    396 +++ busybox-1.2.2.1/archival/libipkg/conffile.c 2006-11-03 14:17:31.000000000 +0100 
     396+++ busybox-1.2.2.1/archival/libipkg/conffile.c 2006-12-20 09:07:42.000000000 +0100 
    397397@@ -0,0 +1,64 @@ 
    398398+/* conffile.c - the itsy package management system 
    …… 
    460460+    return ret; 
    461461+} 
    462 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/conffile.h busybox-1.2.2.1/archival/libipkg/conffile.h 
     462diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/conffile.h busybox-1.2.2.1/archival/libipkg/conffile.h 
    463463--- busybox-1.2.2.1.orig/archival/libipkg/conffile.h    1970-01-01 01:00:00.000000000 +0100 
    464 +++ busybox-1.2.2.1/archival/libipkg/conffile.h 2006-11-03 14:17:31.000000000 +0100 
     464+++ busybox-1.2.2.1/archival/libipkg/conffile.h 2006-12-20 09:07:42.000000000 +0100 
    465465@@ -0,0 +1,30 @@ 
    466466+/* conffile.h - the itsy package management system 
    …… 
    494494+#endif 
    495495+ 
    496 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/conffile_list.c busybox-1.2.2.1/archival/libipkg/conffile_list.c 
     496diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/conffile_list.c busybox-1.2.2.1/archival/libipkg/conffile_list.c 
    497497--- busybox-1.2.2.1.orig/archival/libipkg/conffile_list.c       1970-01-01 01:00:00.000000000 +0100 
    498 +++ busybox-1.2.2.1/archival/libipkg/conffile_list.c    2006-11-03 14:17:31.000000000 +0100 
     498+++ busybox-1.2.2.1/archival/libipkg/conffile_list.c    2006-12-20 09:07:42.000000000 +0100 
    499499@@ -0,0 +1,47 @@ 
    500500+/* conffile_list.c - the itsy package management system 
    …… 
    545545+} 
    546546+ 
    547 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/conffile_list.h busybox-1.2.2.1/archival/libipkg/conffile_list.h 
     547diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/conffile_list.h busybox-1.2.2.1/archival/libipkg/conffile_list.h 
    548548--- busybox-1.2.2.1.orig/archival/libipkg/conffile_list.h       1970-01-01 01:00:00.000000000 +0100 
    549 +++ busybox-1.2.2.1/archival/libipkg/conffile_list.h    2006-11-03 14:17:31.000000000 +0100 
     549+++ busybox-1.2.2.1/archival/libipkg/conffile_list.h    2006-12-20 09:07:42.000000000 +0100 
    550550@@ -0,0 +1,36 @@ 
    551551+/* conffile_list.h - the itsy package management system 
    …… 
    585585+#endif 
    586586+ 
    587 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/file_util.c busybox-1.2.2.1/archival/libipkg/file_util.c 
     587diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/file_util.c busybox-1.2.2.1/archival/libipkg/file_util.c 
    588588--- busybox-1.2.2.1.orig/archival/libipkg/file_util.c   1970-01-01 01:00:00.000000000 +0100 
    589 +++ busybox-1.2.2.1/archival/libipkg/file_util.c        2006-11-03 14:17:31.000000000 +0100 
     589+++ busybox-1.2.2.1/archival/libipkg/file_util.c        2006-12-20 09:07:48.000000000 +0100 
    590590@@ -0,0 +1,177 @@ 
    591591+/* file_util.c - convenience routines for common stat operations 
    …… 
    714714+int file_mkdir_hier(const char *path, long mode) 
    715715+{ 
    716 +    return bb_make_directory(path, mode, FILEUTILS_RECUR); 
     716+    return bb_make_directory((char *)path, mode, FILEUTILS_RECUR); 
    717717+} 
    718718+ 
    …… 
    766766+} 
    767767+ 
    768 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/file_util.h busybox-1.2.2.1/archival/libipkg/file_util.h 
     768diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/file_util.h busybox-1.2.2.1/archival/libipkg/file_util.h 
    769769--- busybox-1.2.2.1.orig/archival/libipkg/file_util.h   1970-01-01 01:00:00.000000000 +0100 
    770 +++ busybox-1.2.2.1/archival/libipkg/file_util.h        2006-11-03 14:17:31.000000000 +0100 
     770+++ busybox-1.2.2.1/archival/libipkg/file_util.h        2006-12-20 09:07:42.000000000 +0100 
    771771@@ -0,0 +1,29 @@ 
    772772+/* file_util.h - convenience routines for common file operations 
    …… 
    799799+ 
    800800+#endif 
    801 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/hash_table.c busybox-1.2.2.1/archival/libipkg/hash_table.c 
     801diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/hash_table.c busybox-1.2.2.1/archival/libipkg/hash_table.c 
    802802--- busybox-1.2.2.1.orig/archival/libipkg/hash_table.c  1970-01-01 01:00:00.000000000 +0100 
    803 +++ busybox-1.2.2.1/archival/libipkg/hash_table.c       2006-11-03 14:17:31.000000000 +0100 
     803+++ busybox-1.2.2.1/archival/libipkg/hash_table.c       2006-12-20 09:07:42.000000000 +0100 
    804804@@ -0,0 +1,155 @@ 
    805805+/* hash.c - hash tables for ipkg 
    …… 
    958958+} 
    959959+ 
    960 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/hash_table.h busybox-1.2.2.1/archival/libipkg/hash_table.h 
     960diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/hash_table.h busybox-1.2.2.1/archival/libipkg/hash_table.h 
    961961--- busybox-1.2.2.1.orig/archival/libipkg/hash_table.h  1970-01-01 01:00:00.000000000 +0100 
    962 +++ busybox-1.2.2.1/archival/libipkg/hash_table.h       2006-11-03 14:17:31.000000000 +0100 
     962+++ busybox-1.2.2.1/archival/libipkg/hash_table.h       2006-12-20 09:07:42.000000000 +0100 
    963963@@ -0,0 +1,44 @@ 
    964964+/* hash.h - hash tables for ipkg 
    …… 
    10061006+ 
    10071007+#endif /* _HASH_TABLE_H_ */ 
    1008 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.2.2.1/archival/libipkg/ipkg_cmd.c 
     1008diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.2.2.1/archival/libipkg/ipkg_cmd.c 
    10091009--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_cmd.c    1970-01-01 01:00:00.000000000 +0100 
    1010 +++ busybox-1.2.2.1/archival/libipkg/ipkg_cmd.c 2006-11-03 14:17:31.000000000 +0100 
    1011 @@ -0,0 +1,1431 @@ 
     1010+++ busybox-1.2.2.1/archival/libipkg/ipkg_cmd.c 2006-12-20 09:07:48.000000000 +0100 
     1011@@ -0,0 +1,1430 @@ 
    10121012+/* ipkg_cmd.c - the itsy package management system 
    10131013+ 
    …… 
    12581258+                  out = fopen (list_file_name, "w"); 
    12591259+                  if (in && out) 
    1260 +                       inflate_unzip (in, out); 
     1260+                       inflate_unzip (fileno(in), fileno(out)); 
    12611261+                  else 
    12621262+                       err = 1; 
    …… 
    19061906+     } else { 
    19071907+         pkg_vec_t *installed_pkgs = pkg_vec_alloc(); 
    1908 +         int i; 
    19091908+         int flagged_pkg_count = 0; 
    19101909+         int removed; 
    …… 
    19131912+ 
    19141913+         for (i = 0; i < installed_pkgs->len; i++) { 
    1915 +              pkg_t *pkg = installed_pkgs->pkgs[i]; 
     1914+              pkg = installed_pkgs->pkgs[i]; 
    19161915+              if (pkg->state_flag & SF_USER) { 
    19171916+                   flagged_pkg_count++; 
    …… 
    19331932+              removed = 0; 
    19341933+              for (i = 0; i < installed_pkgs->len; i++) { 
    1935 +                   pkg_t *pkg = installed_pkgs->pkgs[i]; 
     1934+                   pkg = installed_pkgs->pkgs[i]; 
    19361935+                   if (!(pkg->state_flag & SF_USER) 
    19371936+                       && !pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL)) { 
    …… 
    19881987+     int i; 
    19891988+     pkg_t *pkg; 
    1990 +     const char *flags = argv[0]; 
     1989+     char *flags = argv[0]; 
    19911990+     
    19921991+     global_conf = conf; 
    …… 
    24412440+ 
    24422441+ 
    2443 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.2.2.1/archival/libipkg/ipkg_cmd.h 
     2442diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.2.2.1/archival/libipkg/ipkg_cmd.h 
    24442443--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_cmd.h    1970-01-01 01:00:00.000000000 +0100 
    2445 +++ busybox-1.2.2.1/archival/libipkg/ipkg_cmd.h 2006-11-03 14:17:31.000000000 +0100 
     2444+++ busybox-1.2.2.1/archival/libipkg/ipkg_cmd.h 2006-12-20 09:07:42.000000000 +0100 
    24462445@@ -0,0 +1,46 @@ 
    24472446+/* ipkg_cmd.h - the itsy package management system 
    …… 
    24912490+ 
    24922491+#endif 
    2493 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_conf.c busybox-1.2.2.1/archival/libipkg/ipkg_conf.c 
     2492diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_conf.c busybox-1.2.2.1/archival/libipkg/ipkg_conf.c 
    24942493--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_conf.c   1970-01-01 01:00:00.000000000 +0100 
    2495 +++ busybox-1.2.2.1/archival/libipkg/ipkg_conf.c        2006-11-03 14:17:31.000000000 +0100 
     2494+++ busybox-1.2.2.1/archival/libipkg/ipkg_conf.c        2006-12-20 09:07:48.000000000 +0100 
    24962495@@ -0,0 +1,711 @@ 
    24972496+/* ipkg_conf.c - the itsy package management system 
    …… 
    30393038+              ipkg_conf_set_option(options, name, value); 
    30403039+         } else if (strcmp(type, "src") == 0) { 
    3041 +              if (!nv_pair_list_find(pkg_src_list, name)) { 
     3040+              if (!nv_pair_list_find((nv_pair_list_t *)pkg_src_list, name)) { 
    30423041+                   pkg_src_list_append (pkg_src_list, name, value, extra, 0); 
    30433042+              } else { 
    …… 
    30463045+              } 
    30473046+         } else if (strcmp(type, "src/gz") == 0) { 
    3048 +              if (!nv_pair_list_find(pkg_src_list, name)) { 
     3047+              if (!nv_pair_list_find((nv_pair_list_t *)pkg_src_list, name)) { 
    30493048+                   pkg_src_list_append (pkg_src_list, name, value, extra, 1); 
    30503049+              } else { 
    …… 
    32063205+     return root_filename; 
    32073206+} 
    3208 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_conf.h busybox-1.2.2.1/archival/libipkg/ipkg_conf.h 
     3207diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_conf.h busybox-1.2.2.1/archival/libipkg/ipkg_conf.h 
    32093208--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_conf.h   1970-01-01 01:00:00.000000000 +0100 
    3210 +++ busybox-1.2.2.1/archival/libipkg/ipkg_conf.h        2006-11-03 14:17:31.000000000 +0100 
     3209+++ busybox-1.2.2.1/archival/libipkg/ipkg_conf.h        2006-12-20 09:07:42.000000000 +0100 
    32113210@@ -0,0 +1,107 @@ 
    32123211+/* ipkg_conf.h - the itsy package management system 
    …… 
    33173316+ 
    33183317+#endif 
    3319 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_configure.c busybox-1.2.2.1/archival/libipkg/ipkg_configure.c 
     3318diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_configure.c busybox-1.2.2.1/archival/libipkg/ipkg_configure.c 
    33203319--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_configure.c      1970-01-01 01:00:00.000000000 +0100 
    3321 +++ busybox-1.2.2.1/archival/libipkg/ipkg_configure.c   2006-11-03 14:17:31.000000000 +0100 
     3320+++ busybox-1.2.2.1/archival/libipkg/ipkg_configure.c   2006-12-20 09:07:42.000000000 +0100 
    33223321@@ -0,0 +1,40 @@ 
    33233322+/* ipkg_configure.c - the itsy package management system 
    …… 
    33613360+} 
    33623361+ 
    3363 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_configure.h busybox-1.2.2.1/archival/libipkg/ipkg_configure.h 
     3362diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_configure.h busybox-1.2.2.1/archival/libipkg/ipkg_configure.h 
    33643363--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_configure.h      1970-01-01 01:00:00.000000000 +0100 
    3365 +++ busybox-1.2.2.1/archival/libipkg/ipkg_configure.h   2006-11-03 14:17:31.000000000 +0100 
     3364+++ busybox-1.2.2.1/archival/libipkg/ipkg_configure.h   2006-12-20 09:07:42.000000000 +0100 
    33663365@@ -0,0 +1,25 @@ 
    33673366+/* ipkg_configure.h - the itsy package management system 
    …… 
    33903389+ 
    33913390+#endif 
    3392 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_download.c busybox-1.2.2.1/archival/libipkg/ipkg_download.c 
     3391diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_download.c busybox-1.2.2.1/archival/libipkg/ipkg_download.c 
    33933392--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_download.c       1970-01-01 01:00:00.000000000 +0100 
    3394 +++ busybox-1.2.2.1/archival/libipkg/ipkg_download.c    2006-11-03 14:17:31.000000000 +0100 
     3393+++ busybox-1.2.2.1/archival/libipkg/ipkg_download.c    2006-12-20 09:07:48.000000000 +0100 
    33953394@@ -0,0 +1,195 @@ 
    33963395+/* ipkg_download.c - the itsy package management system 
    …… 
    35623561+              return err; 
    35633562+         pkg->local_filename = strdup(url); 
    3564 +         ipkg_message(conf, IPKG_DEBUG2, "Package %s provided by hand \(%s\).\n", pkg->name,pkg->local_filename); 
     3563+         ipkg_message(conf, IPKG_DEBUG2, "Package %s provided by hand (%s).\n", pkg->name,pkg->local_filename); 
    35653564+          pkg->provided_by_hand = 1; 
    35663565+ 
    …… 
    35893588+     return 0; 
    35903589+} 
    3591 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_download.h busybox-1.2.2.1/archival/libipkg/ipkg_download.h 
     3590diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_download.h busybox-1.2.2.1/archival/libipkg/ipkg_download.h 
    35923591--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_download.h       1970-01-01 01:00:00.000000000 +0100 
    3593 +++ busybox-1.2.2.1/archival/libipkg/ipkg_download.h    2006-11-03 14:17:31.000000000 +0100 
     3592+++ busybox-1.2.2.1/archival/libipkg/ipkg_download.h    2006-12-20 09:07:42.000000000 +0100 
    35943593@@ -0,0 +1,30 @@ 
    35953594+/* ipkg_download.h - the itsy package management system 
    …… 
    36233622+ 
    36243623+#endif 
    3625 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg.h busybox-1.2.2.1/archival/libipkg/ipkg.h 
     3624diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg.h busybox-1.2.2.1/archival/libipkg/ipkg.h 
    36263625--- busybox-1.2.2.1.orig/archival/libipkg/ipkg.h        1970-01-01 01:00:00.000000000 +0100 
    3627 +++ busybox-1.2.2.1/archival/libipkg/ipkg.h     2006-11-03 14:17:31.000000000 +0100 
     3626+++ busybox-1.2.2.1/archival/libipkg/ipkg.h     2006-12-20 09:07:42.000000000 +0100 
    36283627@@ -0,0 +1,74 @@ 
    36293628+/* ipkg.h - the itsy package management system 
    …… 
    37013700+ 
    37023701+#endif 
    3703 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_includes.h busybox-1.2.2.1/archival/libipkg/ipkg_includes.h 
     3702diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_includes.h busybox-1.2.2.1/archival/libipkg/ipkg_includes.h 
    37043703--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_includes.h       1970-01-01 01:00:00.000000000 +0100 
    3705 +++ busybox-1.2.2.1/archival/libipkg/ipkg_includes.h    2006-11-03 14:17:31.000000000 +0100 
     3704+++ busybox-1.2.2.1/archival/libipkg/ipkg_includes.h    2006-12-20 09:07:42.000000000 +0100 
    37063705@@ -0,0 +1,79 @@ 
    37073706+#ifndef IPKG_INCLUDES_H 
    …… 
    37843783+ 
    37853784+#endif /* IPKG_INCLUDES_H */ 
    3786 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_install.c busybox-1.2.2.1/archival/libipkg/ipkg_install.c 
     3785diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_install.c busybox-1.2.2.1/archival/libipkg/ipkg_install.c 
    37873786--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_install.c        1970-01-01 01:00:00.000000000 +0100 
    3788 +++ busybox-1.2.2.1/archival/libipkg/ipkg_install.c     2006-11-03 14:17:31.000000000 +0100 
    3789 @@ -0,0 +1,1942 @@ 
     3787+++ busybox-1.2.2.1/archival/libipkg/ipkg_install.c     2006-12-20 09:08:42.000000000 +0100 
     3788@@ -0,0 +1,1927 @@ 
    37903789+/* ipkg_install.c - the itsy package management system 
    37913790+ 
    …… 
    53505349+                                      "        Y or I  : install the package maintainer's version\n" 
    53515350+                                      "        N or O  : keep your currently-installed version\n" 
    5352 +                                      "          D     : show the differences between the versions (if diff is installed)\n" 
    53535351+                                      "     The default action is to keep your current version.\n" 
    5354 +                                      "    *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name); 
     5352+                                      "    *** %s (Y/I/N/O) [default=N] ? ", file_name, short_file_name); 
    53555353+         if (strcmp(response, "y") == 0 
    53565354+             || strcmp(response, "i") == 0 
    …… 
    53585356+              free(response); 
    53595357+              return 0; 
    5360 +         } 
    5361 + 
    5362 +         if (strcmp(response, "d") == 0) { 
    5363 +              char *cmd; 
    5364 + 
    5365 +              free(response); 
    5366 +              /* XXX: BUG rewrite to use exec or busybox's internal diff */ 
    5367 +              sprintf_alloc(&cmd, "diff -u %s %s", backup, file_name); 
    5368 +              xsystem(cmd); 
    5369 +              free(cmd); 
    5370 +              printf("    [Press ENTER to continue]\n"); 
    5371 +              response = file_read_line_alloc(stdin); 
    5372 +              free(response); 
    5373 +              continue; 
    53745358+         } 
    53755359+ 
    …… 
    57305714+ 
    57315715+#endif 
    5732 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_install.h busybox-1.2.2.1/archival/libipkg/ipkg_install.h 
     5716diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_install.h busybox-1.2.2.1/archival/libipkg/ipkg_install.h 
    57335717--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_install.h        1970-01-01 01:00:00.000000000 +0100 
    5734 +++ busybox-1.2.2.1/archival/libipkg/ipkg_install.h     2006-11-03 14:17:31.000000000 +0100 
     5718+++ busybox-1.2.2.1/archival/libipkg/ipkg_install.h     2006-12-20 09:07:42.000000000 +0100 
    57355719@@ -0,0 +1,35 @@ 
    57365720+/* ipkg_install.h - the itsy package management system 
    …… 
    57695753+ 
    57705754+#endif 
    5771 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.c busybox-1.2.2.1/archival/libipkg/ipkg_message.c 
     5755diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.c busybox-1.2.2.1/archival/libipkg/ipkg_message.c 
    57725756--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.c        1970-01-01 01:00:00.000000000 +0100 
    5773 +++ busybox-1.2.2.1/archival/libipkg/ipkg_message.c     2006-11-03 14:17:31.000000000 +0100 
     5757+++ busybox-1.2.2.1/archival/libipkg/ipkg_message.c     2006-12-20 09:07:42.000000000 +0100 
    57745758@@ -0,0 +1,61 @@ 
    57755759+/* ipkg_message.c - the itsy package management system 
    …… 
    58345818+} 
    58355819+#endif 
    5836 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.h busybox-1.2.2.1/archival/libipkg/ipkg_message.h 
     5820diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.h busybox-1.2.2.1/archival/libipkg/ipkg_message.h 
    58375821--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.h        1970-01-01 01:00:00.000000000 +0100 
    5838 +++ busybox-1.2.2.1/archival/libipkg/ipkg_message.h     2006-11-03 14:17:31.000000000 +0100 
     5822+++ busybox-1.2.2.1/archival/libipkg/ipkg_message.h     2006-12-20 09:07:42.000000000 +0100 
    58395823@@ -0,0 +1,32 @@ 
    58405824+/* ipkg_message.h - the itsy package management system 
    …… 
    58705854+ 
    58715855+#endif /* _IPKG_MESSAGE_H_ */ 
    5872 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.c busybox-1.2.2.1/archival/libipkg/ipkg_remove.c 
     5856diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.c busybox-1.2.2.1/archival/libipkg/ipkg_remove.c 
    58735857--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 
    5874 +++ busybox-1.2.2.1/archival/libipkg/ipkg_remove.c      2006-11-03 14:17:31.000000000 +0100 
     5858+++ busybox-1.2.2.1/archival/libipkg/ipkg_remove.c      2006-12-20 09:07:42.000000000 +0100 
    58755859@@ -0,0 +1,383 @@ 
    58765860+/* ipkg_remove.c - the itsy package management system 
    …… 
    62576241+    return 0; 
    62586242+} 
    6259 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.h busybox-1.2.2.1/archival/libipkg/ipkg_remove.h 
     6243diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.h busybox-1.2.2.1/archival/libipkg/ipkg_remove.h 
    62606244--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 
    6261 +++ busybox-1.2.2.1/archival/libipkg/ipkg_remove.h      2006-11-03 14:17:31.000000000 +0100 
     6245+++ busybox-1.2.2.1/archival/libipkg/ipkg_remove.h      2006-12-20 09:07:42.000000000 +0100 
    62626246@@ -0,0 +1,33 @@ 
    62636247+/* ipkg_remove.h - the itsy package management system 
    …… 
    62946278+ 
    62956279+#endif 
    6296 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.c 
     6280diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.c 
    62976281--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.c        1970-01-01 01:00:00.000000000 +0100 
    6298 +++ busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.c     2006-11-03 14:17:31.000000000 +0100 
     6282+++ busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.c     2006-12-20 09:07:42.000000000 +0100 
    62996283@@ -0,0 +1,77 @@ 
    63006284+/* ipkg_upgrade.c - the itsy package management system 
    …… 
    63756359+     return ipkg_install_pkg(conf, new,1); 
    63766360+} 
    6377 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.h 
     6361diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.h 
    63786362--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.h        1970-01-01 01:00:00.000000000 +0100 
    6379 +++ busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.h     2006-11-03 14:17:31.000000000 +0100 
     6363+++ busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.h     2006-12-20 09:07:42.000000000 +0100 
    63806364@@ -0,0 +1,18 @@ 
    63816365+/* ipkg_upgrade.c - the itsy package management system 
    …… 
    63976381+ 
    63986382+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); 
    6399 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.c busybox-1.2.2.1/archival/libipkg/ipkg_utils.c 
     6383diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.c busybox-1.2.2.1/archival/libipkg/ipkg_utils.c 
    64006384--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.c  1970-01-01 01:00:00.000000000 +0100 
    6401 +++ busybox-1.2.2.1/archival/libipkg/ipkg_utils.c       2006-11-03 14:17:31.000000000 +0100 
     6385+++ busybox-1.2.2.1/archival/libipkg/ipkg_utils.c       2006-12-20 09:07:42.000000000 +0100 
    64026386@@ -0,0 +1,181 @@ 
    64036387+/* ipkg_utils.c - the itsy package management system 
    …… 
    65826566+ 
    65836567+        
    6584 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.h busybox-1.2.2.1/archival/libipkg/ipkg_utils.h 
     6568diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.h busybox-1.2.2.1/archival/libipkg/ipkg_utils.h 
    65856569--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.h  1970-01-01 01:00:00.000000000 +0100 
    6586 +++ busybox-1.2.2.1/archival/libipkg/ipkg_utils.h       2006-11-03 14:17:31.000000000 +0100 
     6570+++ busybox-1.2.2.1/archival/libipkg/ipkg_utils.h       2006-12-20 09:07:42.000000000 +0100 
    65876571@@ -0,0 +1,29 @@ 
    65886572+/* ipkg_utils.h - the itsy package management system 
    …… 
    66156599+ 
    66166600+#endif 
    6617 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/libipkg.c busybox-1.2.2.1/archival/libipkg/libipkg.c 
     6601diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/libipkg.c busybox-1.2.2.1/archival/libipkg/libipkg.c 
    66186602--- busybox-1.2.2.1.orig/archival/libipkg/libipkg.c     1970-01-01 01:00:00.000000000 +0100 
    6619 +++ busybox-1.2.2.1/archival/libipkg/libipkg.c  2006-11-03 14:17:31.000000000 +0100 
     6603+++ busybox-1.2.2.1/archival/libipkg/libipkg.c  2006-12-20 09:07:48.000000000 +0100 
    66206604@@ -0,0 +1,527 @@ 
    66216605+/* ipkglib.c - the itsy package management system 
    …… 
    70667050+ipkg_op (int argc, char *argv[]) 
    70677051+{ 
    7068 +       int err, optind; 
     7052+       int err, opt_index; 
    70697053+       args_t args; 
    70707054+       char *cmd_name; 
    …… 
    70747058+       args_init (&args); 
    70757059+ 
    7076 +       optind = args_parse (&args, argc, argv); 
    7077 +       if (optind == argc || optind < 0) 
     7060+       opt_index = args_parse (&args, argc, argv); 
     7061+       if (opt_index == argc || opt_index < 0) 
    70787062+       { 
    70797063+               args_usage ("ipkg must have one sub-command argument"); 
    70807064+       } 
    70817065+ 
    7082 +       cmd_name = argv[optind++]; 
     7066+       cmd_name = argv[opt_index++]; 
    70837067+/* Pigi: added a flag to disable the checking of structures if the command does not need to  
    70847068+         read anything from there. 
    …… 
    71307114+       } 
    71317115+ 
    7132 +       if (cmd->requires_args && optind == argc) 
     7116+       if (cmd->requires_args && opt_index == argc) 
    71337117+       { 
    71347118+               fprintf (stderr, 
    …… 
    71387122+       } 
    71397123+ 
    7140 +       err = ipkg_cmd_exec (cmd, &ipkg_conf, argc - optind, (const char **) (argv + optind), NULL); 
     7124+       err = ipkg_cmd_exec (cmd, &ipkg_conf, argc - opt_index, (const char **) (argv + opt_index), NULL); 
    71417125+ 
    71427126+       ipkg_conf_deinit (&ipkg_conf); 
    …… 
    71467130+ 
    71477131+#endif /* IPKG_LIB */ 
    7148 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/libipkg.h busybox-1.2.2.1/archival/libipkg/libipkg.h 
     7132diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/libipkg.h busybox-1.2.2.1/archival/libipkg/libipkg.h 
    71497133--- busybox-1.2.2.1.orig/archival/libipkg/libipkg.h     1970-01-01 01:00:00.000000000 +0100 
    7150 +++ busybox-1.2.2.1/archival/libipkg/libipkg.h  2006-11-03 14:17:31.000000000 +0100 
     7134+++ busybox-1.2.2.1/archival/libipkg/libipkg.h  2006-12-20 09:07:42.000000000 +0100 
    71517135@@ -0,0 +1,87 @@ 
    71527136+/* ipkglib.h - the itsy package management system 
    …… 
    72377221+ 
    72387222+#endif 
    7239 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/Makefile busybox-1.2.2.1/archival/libipkg/Makefile 
     7223diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/Makefile busybox-1.2.2.1/archival/libipkg/Makefile 
    72407224--- busybox-1.2.2.1.orig/archival/libipkg/Makefile      1970-01-01 01:00:00.000000000 +0100 
    7241 +++ busybox-1.2.2.1/archival/libipkg/Makefile   2006-11-03 14:17:31.000000000 +0100 
     7225+++ busybox-1.2.2.1/archival/libipkg/Makefile   2006-12-20 09:07:42.000000000 +0100 
    72427226@@ -0,0 +1,32 @@ 
    72437227+# Makefile for busybox 
    …… 
    72737257+       rm -f *.o *.a $(AR_TARGET) 
    72747258+ 
    7275 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/Makefile.in busybox-1.2.2.1/archival/libipkg/Makefile.in 
     7259diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/Makefile.in busybox-1.2.2.1/archival/libipkg/Makefile.in 
    72767260--- busybox-1.2.2.1.orig/archival/libipkg/Makefile.in   1970-01-01 01:00:00.000000000 +0100 
    7277 +++ busybox-1.2.2.1/archival/libipkg/Makefile.in        2006-11-03 14:17:31.000000000 +0100 
     7261+++ busybox-1.2.2.1/archival/libipkg/Makefile.in        2006-12-20 09:07:42.000000000 +0100 
    72787262@@ -0,0 +1,88 @@ 
    72797263+# Makefile for busybox 
    …… 
    73657349+       $(compile.c) 
    73667350+ 
    7367 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/md5.c busybox-1.2.2.1/archival/libipkg/md5.c 
     7351diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/md5.c busybox-1.2.2.1/archival/libipkg/md5.c 
    73687352--- busybox-1.2.2.1.orig/archival/libipkg/md5.c 1970-01-01 01:00:00.000000000 +0100 
    7369 +++ busybox-1.2.2.1/archival/libipkg/md5.c      2006-11-03 14:17:31.000000000 +0100 
    7370 @@ -0,0 +1,48 @@ 
     7353+++ busybox-1.2.2.1/archival/libipkg/md5.c      2006-12-20 09:07:48.000000000 +0100 
     7354@@ -0,0 +1,47 @@ 
    73717355+/* md5.c - wrappers to busybox md5 functions 
    73727356+ * 
    …… 
    73967380+{ 
    73977381+       int fd; 
    7398 +       int sum; 
    73997382+        
    74007383+       if( (fd = fileno(stream)) == -1 ) { 
    …… 
    74177400+} 
    74187401+ 
    7419 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/md5.h busybox-1.2.2.1/archival/libipkg/md5.h 
     7402diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/md5.h busybox-1.2.2.1/archival/libipkg/md5.h 
    74207403--- busybox-1.2.2.1.orig/archival/libipkg/md5.h 1970-01-01 01:00:00.000000000 +0100 
    7421 +++ busybox-1.2.2.1/archival/libipkg/md5.h      2006-11-03 14:17:31.000000000 +0100 
     7404+++ busybox-1.2.2.1/archival/libipkg/md5.h      2006-12-20 09:07:42.000000000 +0100 
    74227405@@ -0,0 +1,35 @@ 
    74237406+/* md5.h - Compute MD5 checksum of files or strings according to the 
    …… 
    74567439+#endif 
    74577440+ 
    7458 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/nv_pair.c busybox-1.2.2.1/archival/libipkg/nv_pair.c 
     7441diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/nv_pair.c busybox-1.2.2.1/archival/libipkg/nv_pair.c 
    74597442--- busybox-1.2.2.1.orig/archival/libipkg/nv_pair.c     1970-01-01 01:00:00.000000000 +0100 
    7460 +++ busybox-1.2.2.1/archival/libipkg/nv_pair.c  2006-11-03 14:17:31.000000000 +0100 
     7443+++ busybox-1.2.2.1/archival/libipkg/nv_pair.c  2006-12-20 09:07:42.000000000 +0100 
    74617444@@ -0,0 +1,40 @@ 
    74627445+/* nv_pair.c - the itsy package management system 
    …… 
    75007483+ 
    75017484+ 
    7502 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/nv_pair.h busybox-1.2.2.1/archival/libipkg/nv_pair.h 
     7485diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/nv_pair.h busybox-1.2.2.1/archival/libipkg/nv_pair.h 
    75037486--- busybox-1.2.2.1.orig/archival/libipkg/nv_pair.h     1970-01-01 01:00:00.000000000 +0100 
    7504 +++ busybox-1.2.2.1/archival/libipkg/nv_pair.h  2006-11-03 14:17:31.000000000 +0100 
     7487+++ busybox-1.2.2.1/archival/libipkg/nv_pair.h  2006-12-20 09:07:42.000000000 +0100 
    75057488@@ -0,0 +1,32 @@ 
    75067489+/* nv_pair.h - the itsy package management system 
    …… 
    75367519+#endif 
    75377520+ 
    7538 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/nv_pair_list.c busybox-1.2.2.1/archival/libipkg/nv_pair_list.c 
     7521diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/nv_pair_list.c busybox-1.2.2.1/archival/libipkg/nv_pair_list.c 
    75397522--- busybox-1.2.2.1.orig/archival/libipkg/nv_pair_list.c        1970-01-01 01:00:00.000000000 +0100 
    7540 +++ busybox-1.2.2.1/archival/libipkg/nv_pair_list.c     2006-11-03 14:17:31.000000000 +0100 
     7523+++ busybox-1.2.2.1/archival/libipkg/nv_pair_list.c     2006-12-20 09:07:42.000000000 +0100 
    75417524@@ -0,0 +1,98 @@ 
    75427525+/* nv_pair_list.c - the itsy package management system 
    …… 
    76387621+     return NULL; 
    76397622+} 
    7640 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/nv_pair_list.h busybox-1.2.2.1/archival/libipkg/nv_pair_list.h 
     7623diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/nv_pair_list.h busybox-1.2.2.1/archival/libipkg/nv_pair_list.h 
    76417624--- busybox-1.2.2.1.orig/archival/libipkg/nv_pair_list.h        1970-01-01 01:00:00.000000000 +0100 
    7642 +++ busybox-1.2.2.1/archival/libipkg/nv_pair_list.h     2006-11-03 14:17:31.000000000 +0100 
     7625+++ busybox-1.2.2.1/archival/libipkg/nv_pair_list.h     2006-12-20 09:07:42.000000000 +0100 
    76437626@@ -0,0 +1,60 @@ 
    76447627+/* nv_pair_list.h - the itsy package management system 
    …… 
    77027685+#endif 
    77037686+ 
    7704 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg.c busybox-1.2.2.1/archival/libipkg/pkg.c 
     7687diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg.c busybox-1.2.2.1/archival/libipkg/pkg.c 
    77057688--- busybox-1.2.2.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 
    7706 +++ busybox-1.2.2.1/archival/libipkg/pkg.c      2006-11-03 14:17:31.000000000 +0100 
    7707 @@ -0,0 +1,1754 @@ 
     7689+++ busybox-1.2.2.1/archival/libipkg/pkg.c      2006-12-20 09:07:55.000000000 +0100 
     7690@@ -0,0 +1,1747 @@ 
    77087691+/* pkg.c - the itsy package management system 
    77097692+ 
    …… 
    80678050+         oldpkg->essential = newpkg->essential; 
    80688051+ 
     8052+     oldpkg->provided_by_hand |= newpkg->provided_by_hand; 
     8053+ 
    80698054+     return 0; 
    80708055+} 
    …… 
    82368221+{ 
    82378222+     static size_t LINE_LEN = 128; 
     8223+     char line_str[LINE_LEN]; 
    82388224+     char * temp = (char *)malloc(1); 
    82398225+     int len = 0; 
    …… 
    82758261+              /* Conffiles */ 
    82768262+              conffile_list_elt_t *iter; 
    8277 +               char confstr[LINE_LEN]; 
    82788263+ 
    82798264+              if (pkg->conffiles.head == NULL) { 
    …… 
    82968281+              for (iter = pkg->conffiles.head; iter; iter = iter->next) { 
    82978282+                   if (iter->data->name && iter->data->value) { 
    8298 +                         snprintf(confstr, LINE_LEN, "%s %s\n", iter->data->name, iter->data->value); 
    8299 +                         strncat(temp, confstr, strlen(confstr));            
     8283+                         snprintf(line_str, LINE_LEN, "%s %s\n", iter->data->name, iter->data->value); 
     8284+                         strncat(temp, line_str, strlen(line_str));            
    83008285+                   } 
    83018286+              } 
    …… 
    83048289+ 
    83058290+              if (pkg->conflicts_count) { 
    8306 +                    char conflictstr[LINE_LEN]; 
    83078291+                    len = 14 ; 
    83088292+                   for(i = 0; i < pkg->conflicts_count; i++) { 
    …… 
    83178301+                    strncpy(temp, "Conflicts:", 11); 
    83188302+                   for(i = 0; i < pkg->conflicts_count; i++) { 
    8319 +                        snprintf(conflictstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->conflicts_str[i]); 
    8320 +                        strncat(temp, conflictstr, strlen(conflictstr));            
     8303+                        snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->conflicts_str[i]); 
     8304+                        strncat(temp, line_str, strlen(line_str));            
    83218305+                    } 
    83228306+                    strncat(temp, "\n", strlen("\n"));  
    …… 
    83338317+ 
    83348318+              if (pkg->depends_count) { 
    8335 +                    char depstr[LINE_LEN]; 
    83368319+                    len = 14 ; 
    83378320+                   for(i = 0; i < pkg->depends_count; i++) { 
    …… 
    83468329+                    strncpy(temp, "Depends:", 10); 
    83478330+                   for(i = 0; i < pkg->depends_count; i++) { 
    8348 +                        snprintf(depstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->depends_str[i]); 
    8349 +                        strncat(temp, depstr, strlen(depstr));            
     8331+                        snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->depends_str[i]); 
     8332+                        strncat(temp, line_str, strlen(line_str));            
    83508333+                    } 
    83518334+                    strncat(temp, "\n", strlen("\n"));  
    …… 
    85128495+         if (strcasecmp (field, "Replaces") == 0) { 
    85138496+              if (pkg->replaces_count) { 
    8514 +                    char replstr[LINE_LEN]; 
    85158497+                    len = 14; 
    85168498+                   for (i = 0; i < pkg->replaces_count; i++) { 
    …… 
    85258507+                    strncpy(temp, "Replaces:", 12); 
    85268508+                   for (i = 0; i < pkg->replaces_count; i++) { 
    8527 +                        snprintf(replstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->replaces_str[i]); 
    8528 +                        strncat(temp, replstr, strlen(replstr));            
     8509+                        snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->replaces_str[i]); 
     8510+                        strncat(temp, line_str, strlen(line_str));            
    85298511+                    } 
    85308512+                    strncat(temp, "\n", strlen("\n"));  
    …… 
    85328514+         } else if (strcasecmp (field, "Recommends") == 0) { 
    85338515+              if (pkg->recommends_count) { 
    8534 +                    char recstr[LINE_LEN]; 
    85358516+                    len = 15; 
    85368517+                   for(i = 0; i < pkg->recommends_count; i++) { 
    …… 
    85458526+                    strncpy(temp, "Recommends:", 13); 
    85468527+                   for(i = 0; i < pkg->recommends_count; i++) { 
    8547 +                        snprintf(recstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->recommends_str[i]); 
    8548 +                        strncat(temp, recstr, strlen(recstr));            
     8528+                        snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->recommends_str[i]); 
     8529+                        strncat(temp, line_str, strlen(line_str));            
    85498530+                    } 
    85508531+                    strncat(temp, "\n", strlen("\n"));  
    …… 
    86158596+              if (pkg->suggests_count) { 
    86168597+                   int i; 
    8617 +                    char sugstr[LINE_LEN]; 
    86188598+                    len = 13; 
    86198599+                   for(i = 0; i < pkg->suggests_count; i++) { 
    …… 
    86288608+                    strncpy(temp, "Suggests:", 10); 
    86298609+                   for(i = 0; i < pkg->suggests_count; i++) { 
    8630 +                        snprintf(sugstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->suggests_str[i]); 
    8631 +                        strncat(temp, sugstr, strlen(sugstr));            
     8610+                        snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->suggests_str[i]); 
     8611+                        strncat(temp, line_str, strlen(line_str));            
    86328612+                    } 
    86338613+                    strncat(temp, "\n", strlen("\n"));  
    …… 
    88488828+} 
    88498829+ 
    8850 +int pkg_name_version_and_architecture_compare(void *p1, void *p2) 
    8851 +{ 
    8852 +     const pkg_t *a = *(const pkg_t **)p1; 
    8853 +     const pkg_t *b = *(const pkg_t **)p2; 
     8830+int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b) 
     8831+{ 
    88548832+     int namecmp; 
    88558833+     int vercmp; 
    …… 
    88788856+} 
    88798857+ 
    8880 +int abstract_pkg_name_compare(void *p1, void *p2) 
    8881 +{ 
    8882 +     const abstract_pkg_t *a = *(const abstract_pkg_t **)p1; 
    8883 +     const abstract_pkg_t *b = *(const abstract_pkg_t **)p2; 
     8858+int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b) 
     8859+{ 
    88848860+     if (!a->name || !b->name) { 
    88858861+       fprintf(stderr, "abstract_pkg_name_compare: a=%p a->name=%p b=%p b->name=%p\n", 
    …… 
    89018877+ 
    89028878+     if (pkg->epoch) { 
    8903 +         sprintf_alloc(&epoch_str, "%d:", pkg->epoch); 
     8879+         sprintf_alloc(&epoch_str, "%d:", (int)(pkg->epoch)); 
    89048880+     } else { 
    89058881+         epoch_str = strdup(""); 
    …… 
    94609436+     return 0; 
    94619437+} 
    9462 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.c busybox-1.2.2.1/archival/libipkg/pkg_depends.c 
     9438diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.c busybox-1.2.2.1/archival/libipkg/pkg_depends.c 
    94639439--- busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 
    9464 +++ busybox-1.2.2.1/archival/libipkg/pkg_depends.c      2006-11-03 14:17:31.000000000 +0100 
    9465 @@ -0,0 +1,1033 @@ 
     9440+++ busybox-1.2.2.1/archival/libipkg/pkg_depends.c      2006-12-20 09:07:48.000000000 +0100 
     9441@@ -0,0 +1,1031 @@ 
    94669442+/* pkg_depends.c - the itsy package management system 
    94679443+ 
    …… 
    95349510+{ 
    95359511+     pkg_t * satisfier_entry_pkg; 
    9536 +     register int i, j, k; 
     9512+     register int i, j, k, l; 
    95379513+     int count, found; 
    95389514+     char ** the_lost; 
    …… 
    95799555+                   int nposs = ab_provider_vec->len; 
    95809556+                   abstract_pkg_t **ab_providers = ab_provider_vec->pkgs;  
    9581 +                   int l; 
    95829557+                   for (l = 0; l < nposs; l++) { 
    95839558+                        pkg_vec_t *test_vec = ab_providers[l]->pkgs; 
    …… 
    96039578+                                                                               &newstuff); 
    96049579+                                  if (newstuff == NULL) { 
    9605 +                                       int i; 
    96069580+                                       int ok = 1; 
    9607 +                                       for (i = 0; i < rc; i++) { 
    9608 +                                           pkg_t *p = tmp_vec->pkgs[i]; 
     9581+                                       for (l = 0; l < rc; l++) { 
     9582+                                           pkg_t *p = tmp_vec->pkgs[l]; 
    96099583+                                           if (p->state_want == SW_INSTALL) 
    96109584+                                               continue; 
    …… 
    1028010254+ *   [npredepends+nrecommends+nsuggests,npredepends+nrecommends+nsuggests+ndepends) -> returns depends_str[index] 
    1028110255+ */ 
    10282 +char *pkg_depend_str(pkg_t *pkg, int index) 
    10283 +{ 
    10284 +     if (index < pkg->pre_depends_count) { 
    10285 +         return pkg->pre_depends_str[index]; 
    10286 +     } 
    10287 +     index -= pkg->pre_depends_count; 
    10288 + 
    10289 +     if (index < pkg->recommends_count) { 
    10290 +         return pkg->recommends_str[index]; 
    10291 +     } 
    10292 +     index -= pkg->recommends_count; 
    10293 + 
    10294 +     if (index < pkg->suggests_count) { 
    10295 +         return pkg->suggests_str[index]; 
    10296 +     } 
    10297 +     index -= pkg->suggests_count; 
    10298 + 
    10299 +     if (index < pkg->depends_count) { 
    10300 +         return pkg->depends_str[index]; 
    10301 +     } 
    10302 +     fprintf(stderr, "pkg_depend_str: index %d out of range for pkg=%s\n", index, pkg->name); 
     10256+char *pkg_depend_str(pkg_t *pkg, int pkg_index) 
     10257+{ 
     10258+     if (pkg_index < pkg->pre_depends_count) { 
     10259+         return pkg->pre_depends_str[pkg_index]; 
     10260+     } 
     10261+     pkg_index -= pkg->pre_depends_count; 
     10262+ 
     10263+     if (pkg_index < pkg->recommends_count) { 
     10264+         return pkg->recommends_str[pkg_index]; 
     10265+     } 
     10266+     pkg_index -= pkg->recommends_count; 
     10267+ 
     10268+     if (pkg_index < pkg->suggests_count) { 
     10269+         return pkg->suggests_str[pkg_index]; 
     10270+     } 
     10271+     pkg_index -= pkg->suggests_count; 
     10272+ 
     10273+     if (pkg_index < pkg->depends_count) { 
     10274+         return pkg->depends_str[pkg_index]; 
     10275+     } 
     10276+     fprintf(stderr, "pkg_depend_str: index %d out of range for pkg=%s\n", pkg_index, pkg->name); 
    1030310277+     return NULL; 
    1030410278+} 
    …… 
    1049710471+     return 0; 
    1049810472+} 
    10499 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.h busybox-1.2.2.1/archival/libipkg/pkg_depends.h 
     10473diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.h busybox-1.2.2.1/archival/libipkg/pkg_depends.h 
    1050010474--- busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 
    10501 +++ busybox-1.2.2.1/archival/libipkg/pkg_depends.h      2006-11-03 14:17:31.000000000 +0100 
     10475+++ busybox-1.2.2.1/archival/libipkg/pkg_depends.h      2006-12-20 09:07:48.000000000 +0100 
    1050210476@@ -0,0 +1,105 @@ 
    1050310477+/* pkg_depends.h - the itsy package management system 
    …… 
    1059510569+int pkg_conflicts(pkg_t *pkg, pkg_t *conflicts); 
    1059610570+ 
    10597 +char *pkg_depend_str(pkg_t *pkg, int index); 
     10571+char *pkg_depend_str(pkg_t *pkg, int pkg_index); 
    1059810572+void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg); 
    1059910573+void freeDepends(pkg_t *pkg); 
    …… 
    1060610580+ 
    1060710581+#endif 
    10608 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.c busybox-1.2.2.1/archival/libipkg/pkg_dest.c 
     10582diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.c busybox-1.2.2.1/archival/libipkg/pkg_dest.c 
    1060910583--- busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.c    1970-01-01 01:00:00.000000000 +0100 
    10610 +++ busybox-1.2.2.1/archival/libipkg/pkg_dest.c 2006-11-03 14:17:31.000000000 +0100 
     10584+++ busybox-1.2.2.1/archival/libipkg/pkg_dest.c 2006-12-20 09:07:42.000000000 +0100 
    1061110585@@ -0,0 +1,92 @@ 
    1061210586+/* pkg_dest.c - the itsy package management system 
    …… 
    1070210676+    dest->root_dir = NULL; 
    1070310677+} 
    10704 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.h busybox-1.2.2.1/archival/libipkg/pkg_dest.h 
     10678diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.h busybox-1.2.2.1/archival/libipkg/pkg_dest.h 
    1070510679--- busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.h    1970-01-01 01:00:00.000000000 +0100 
    10706 +++ busybox-1.2.2.1/archival/libipkg/pkg_dest.h 2006-11-03 14:17:31.000000000 +0100 
     10680+++ busybox-1.2.2.1/archival/libipkg/pkg_dest.h 2006-12-20 09:07:42.000000000 +0100 
    1070710681@@ -0,0 +1,38 @@ 
    1070810682+/* pkg_dest.h - the itsy package management system 
    …… 
    1074410718+#endif 
    1074510719+ 
    10746 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.2.2.1/archival/libipkg/pkg_dest_list.c 
     10720diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.2.2.1/archival/libipkg/pkg_dest_list.c 
    1074710721--- busybox-1.2.2.1.orig/archival/libipkg/pkg_dest_list.c       1970-01-01 01:00:00.000000000 +0100 
    10748 +++ busybox-1.2.2.1/archival/libipkg/pkg_dest_list.c    2006-11-03 14:17:31.000000000 +0100 
     10722+++ busybox-1.2.2.1/archival/libipkg/pkg_dest_list.c    2006-12-20 09:07:42.000000000 +0100 
    1074910723@@ -0,0 +1,85 @@ 
    1075010724+/* pkg_dest_list.c - the itsy package management system 
    …… 
    1083310807+    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list); 
    1083410808+} 
    10835 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.2.2.1/archival/libipkg/pkg_dest_list.h 
     10809diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.2.2.1/archival/libipkg/pkg_dest_list.h 
    1083610810--- busybox-1.2.2.1.orig/archival/libipkg/pkg_dest_list.h       1970-01-01 01:00:00.000000000 +0100 
    10837 +++ busybox-1.2.2.1/archival/libipkg/pkg_dest_list.h    2006-11-03 14:17:31.000000000 +0100 
     10811+++ busybox-1.2.2.1/archival/libipkg/pkg_dest_list.h    2006-12-20 09:07:42.000000000 +0100 
    1083810812@@ -0,0 +1,50 @@ 
    1083910813+/* pkg_dest_list.h - the itsy package management system 
    …… 
    1088710861+#endif 
    1088810862+ 
    10889 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.c busybox-1.2.2.1/archival/libipkg/pkg_extract.c 
     10863diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.c busybox-1.2.2.1/archival/libipkg/pkg_extract.c 
    1089010864--- busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 
    10891 +++ busybox-1.2.2.1/archival/libipkg/pkg_extract.c      2006-11-03 14:17:31.000000000 +0100 
     10865+++ busybox-1.2.2.1/archival/libipkg/pkg_extract.c      2006-12-20 09:07:42.000000000 +0100 
    1089210866@@ -0,0 +1,224 @@ 
    1089310867+/* pkg_extract.c - the itsy package management system 
    …… 
    1111511089+       return 0; 
    1111611090+} 
    11117 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.h busybox-1.2.2.1/archival/libipkg/pkg_extract.h 
     11091diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.h busybox-1.2.2.1/archival/libipkg/pkg_extract.h 
    1111811092--- busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 
    11119 +++ busybox-1.2.2.1/archival/libipkg/pkg_extract.h      2006-11-03 14:17:31.000000000 +0100 
     11093+++ busybox-1.2.2.1/archival/libipkg/pkg_extract.h      2006-12-20 09:07:42.000000000 +0100 
    1112011094@@ -0,0 +1,32 @@ 
    1112111095+/* pkg_extract.c - the itsy package management system 
    …… 
    1115111125+ 
    1115211126+#endif 
    11153 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg.h busybox-1.2.2.1/archival/libipkg/pkg.h 
     11127diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg.h busybox-1.2.2.1/archival/libipkg/pkg.h 
    1115411128--- busybox-1.2.2.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 
    11155 +++ busybox-1.2.2.1/archival/libipkg/pkg.h      2006-11-03 14:17:31.000000000 +0100 
     11129+++ busybox-1.2.2.1/archival/libipkg/pkg.h      2006-12-20 09:07:48.000000000 +0100 
    1115611130@@ -0,0 +1,232 @@ 
    1115711131+/* pkg.h - the itsy package management system 
    …… 
    1135111325+ 
    1135211326+int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg); 
    11353 +int pkg_name_version_and_architecture_compare(void *a, void *b); 
    11354 +int abstract_pkg_name_compare(void *a, void *b); 
     11327+int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b); 
     11328+int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b); 
    1135511329+ 
    1135611330+char * pkg_formatted_info(pkg_t *pkg ); 
    …… 
    1138711361+ 
    1138811362+#endif 
    11389 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.c busybox-1.2.2.1/archival/libipkg/pkg_hash.c 
     11363diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.c busybox-1.2.2.1/archival/libipkg/pkg_hash.c 
    1139011364--- busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.c    1970-01-01 01:00:00.000000000 +0100 
    11391 +++ busybox-1.2.2.1/archival/libipkg/pkg_hash.c 2006-11-03 14:17:31.000000000 +0100 
    11392 @@ -0,0 +1,617 @@ 
     11365+++ busybox-1.2.2.1/archival/libipkg/pkg_hash.c 2006-12-20 09:07:48.000000000 +0100 
     11366@@ -0,0 +1,616 @@ 
    1139311367+/* ipkg_hash.c - the itsy package management system 
    1139411368+ 
    …… 
    1153611510+                                                 int (*constraint_fcn)(pkg_t *pkg, void *cdata), void *cdata, int quiet) 
    1153711511+{ 
    11538 +     int i;  
     11512+     int i, j; 
    1153911513+     int nprovides = 0; 
    1154011514+     int nmatching = 0; 
    …… 
    1160211576+         { 
    1160311577+              int max_count = 0; 
    11604 +              int i; 
    1160511578+ 
    1160611579+              /* count packages matching max arch priority and keep track of last one */ 
    11607 +              for (i = 0; i < vec->len; i++) { 
    11608 +                   pkg_t *maybe = vec->pkgs[i]; 
     11580+              for (j = 0; j < vec->len; j++) { 
     11581+                   pkg_t *maybe = vec->pkgs[j]; 
    1160911582+                   ipkg_message(conf, IPKG_DEBUG, "  %s arch=%s arch_priority=%d version=%s  \n", 
    1161011583+                                maybe->name, maybe->architecture, maybe->arch_priority, maybe->version); 
    …… 
    1200811981+ 
    1200911982+ 
    12010 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.h busybox-1.2.2.1/archival/libipkg/pkg_hash.h 
     11983diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.h busybox-1.2.2.1/archival/libipkg/pkg_hash.h 
    1201111984--- busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.h    1970-01-01 01:00:00.000000000 +0100 
    12012 +++ busybox-1.2.2.1/archival/libipkg/pkg_hash.h 2006-11-03 14:17:31.000000000 +0100 
     11985+++ busybox-1.2.2.1/archival/libipkg/pkg_hash.h 2006-12-20 09:07:42.000000000 +0100 
    1201311986@@ -0,0 +1,61 @@ 
    1201411987+/* pkg_hash.h - the itsy package management system 
    …… 
    1207312046+#endif 
    1207412047+ 
    12075 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.c busybox-1.2.2.1/archival/libipkg/pkg_parse.c 
     12048diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.c busybox-1.2.2.1/archival/libipkg/pkg_parse.c 
    1207612049--- busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.c   1970-01-01 01:00:00.000000000 +0100 
    12077 +++ busybox-1.2.2.1/archival/libipkg/pkg_parse.c        2006-11-03 14:17:31.000000000 +0100 
     12050+++ busybox-1.2.2.1/archival/libipkg/pkg_parse.c        2006-12-20 09:07:42.000000000 +0100 
    1207812051@@ -0,0 +1,366 @@ 
    1207912052+/* pkg_parse.c - the itsy package management system 
    …… 
    1244312416+    return 0; 
    1244412417+} 
    12445 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.h busybox-1.2.2.1/archival/libipkg/pkg_parse.h 
     12418diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.h busybox-1.2.2.1/archival/libipkg/pkg_parse.h 
    1244612419--- busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.h   1970-01-01 01:00:00.000000000 +0100 
    12447 +++ busybox-1.2.2.1/archival/libipkg/pkg_parse.h        2006-11-03 14:17:31.000000000 +0100 
     12420+++ busybox-1.2.2.1/archival/libipkg/pkg_parse.h        2006-12-20 09:07:42.000000000 +0100 
    1244812421@@ -0,0 +1,31 @@ 
    1244912422+/* pkg_parse.h - the itsy package management system 
    …… 
    1247812451+ 
    1247912452+#endif 
    12480 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_src.c busybox-1.2.2.1/archival/libipkg/pkg_src.c 
     12453diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_src.c busybox-1.2.2.1/archival/libipkg/pkg_src.c 
    1248112454--- busybox-1.2.2.1.orig/archival/libipkg/pkg_src.c     1970-01-01 01:00:00.000000000 +0100 
    12482 +++ busybox-1.2.2.1/archival/libipkg/pkg_src.c  2006-11-03 14:17:31.000000000 +0100 
     12455+++ busybox-1.2.2.1/archival/libipkg/pkg_src.c  2006-12-20 09:07:42.000000000 +0100 
    1248312456@@ -0,0 +1,43 @@ 
    1248412457+/* pkg_src.c - the itsy package management system 
    …… 
    1252512498+ 
    1252612499+ 
    12527 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_src.h busybox-1.2.2.1/archival/libipkg/pkg_src.h 
     12500diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_src.h busybox-1.2.2.1/archival/libipkg/pkg_src.h 
    1252812501--- busybox-1.2.2.1.orig/archival/libipkg/pkg_src.h     1970-01-01 01:00:00.000000000 +0100 
    12529 +++ busybox-1.2.2.1/archival/libipkg/pkg_src.h  2006-11-03 14:17:31.000000000 +0100 
     12502+++ busybox-1.2.2.1/archival/libipkg/pkg_src.h  2006-12-20 09:07:42.000000000 +0100 
    1253012503@@ -0,0 +1,34 @@ 
    1253112504+/* pkg_src.h - the itsy package management system 
    …… 
    1256312536+ 
    1256412537+#endif 
    12565 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_src_list.c busybox-1.2.2.1/archival/libipkg/pkg_src_list.c 
     12538diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_src_list.c busybox-1.2.2.1/archival/libipkg/pkg_src_list.c 
    1256612539--- busybox-1.2.2.1.orig/archival/libipkg/pkg_src_list.c        1970-01-01 01:00:00.000000000 +0100 
    12567 +++ busybox-1.2.2.1/archival/libipkg/pkg_src_list.c     2006-11-03 14:17:31.000000000 +0100 
     12540+++ busybox-1.2.2.1/archival/libipkg/pkg_src_list.c     2006-12-20 09:07:42.000000000 +0100 
    1256812541@@ -0,0 +1,75 @@ 
    1256912542+/* pkg_src_list.c - the itsy package management system 
    …… 
    1264212615+    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list); 
    1264312616+} 
    12644 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_src_list.h busybox-1.2.2.1/archival/libipkg/pkg_src_list.h 
     12617diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_src_list.h busybox-1.2.2.1/archival/libipkg/pkg_src_list.h 
    1264512618--- busybox-1.2.2.1.orig/archival/libipkg/pkg_src_list.h        1970-01-01 01:00:00.000000000 +0100 
    12646 +++ busybox-1.2.2.1/archival/libipkg/pkg_src_list.h     2006-11-03 14:17:31.000000000 +0100 
     12619+++ busybox-1.2.2.1/archival/libipkg/pkg_src_list.h     2006-12-20 09:07:42.000000000 +0100 
    1264712620@@ -0,0 +1,57 @@ 
    1264812621+/* pkg_src_list.h - the itsy package management system 
    …… 
    1270312676+#endif 
    1270412677+ 
    12705 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.c busybox-1.2.2.1/archival/libipkg/pkg_vec.c 
     12678diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.c busybox-1.2.2.1/archival/libipkg/pkg_vec.c 
    1270612679--- busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.c     1970-01-01 01:00:00.000000000 +0100 
    12707 +++ busybox-1.2.2.1/archival/libipkg/pkg_vec.c  2006-11-03 14:17:31.000000000 +0100 
     12680+++ busybox-1.2.2.1/archival/libipkg/pkg_vec.c  2006-12-20 09:07:42.000000000 +0100 
    1270812681@@ -0,0 +1,230 @@ 
    1270912682+/* pkg_vec.c - the itsy package management system 
    …… 
    1293712910+} 
    1293812911+ 
    12939 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.h busybox-1.2.2.1/archival/libipkg/pkg_vec.h 
     12912diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.h busybox-1.2.2.1/archival/libipkg/pkg_vec.h 
    1294012913--- busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.h     1970-01-01 01:00:00.000000000 +0100 
    12941 +++ busybox-1.2.2.1/archival/libipkg/pkg_vec.h  2006-11-03 14:17:31.000000000 +0100 
    12942 @@ -0,0 +1,62 @@ 
     12914+++ busybox-1.2.2.1/archival/libipkg/pkg_vec.h  2006-12-20 09:07:48.000000000 +0100 
     12915@@ -0,0 +1,64 @@ 
    1294312916+/* pkg_vec.h - the itsy package management system 
    1294412917+ 
    …… 
    1297812951+typedef struct abstract_pkg_vec abstract_pkg_vec_t; 
    1297912952+ 
     12953+typedef int (*pkg_compar_t)(pkg_t *, pkg_t *); 
     12954+typedef int (*abstract_pkg_compar_t)(abstract_pkg_t *, abstract_pkg_t *); 
    1298012955+ 
    1298112956+pkg_vec_t * pkg_vec_alloc(void); 
    …… 
    1300312978+#endif 
    1300412979+ 
    13005 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.2.2.1/archival/libipkg/sprintf_alloc.h 
     12980diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.2.2.1/archival/libipkg/sprintf_alloc.h 
    1300612981--- busybox-1.2.2.1.orig/archival/libipkg/sprintf_alloc.h       1970-01-01 01:00:00.000000000 +0100 
    13007 +++ busybox-1.2.2.1/archival/libipkg/sprintf_alloc.h    2006-11-03 14:17:31.000000000 +0100 
     12982+++ busybox-1.2.2.1/archival/libipkg/sprintf_alloc.h    2006-12-20 09:07:42.000000000 +0100 
    1300812983@@ -0,0 +1,25 @@ 
    1300912984+/* sprintf_alloca.c -- like sprintf with memory allocation 
    …… 
    1303213007+ 
    1303313008+#endif 
    13034 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/str_list.c busybox-1.2.2.1/archival/libipkg/str_list.c 
     13009diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/str_list.c busybox-1.2.2.1/archival/libipkg/str_list.c 
    1303513010--- busybox-1.2.2.1.orig/archival/libipkg/str_list.c    1970-01-01 01:00:00.000000000 +0100 
    13036 +++ busybox-1.2.2.1/archival/libipkg/str_list.c 2006-11-03 14:17:31.000000000 +0100 
     13011+++ busybox-1.2.2.1/archival/libipkg/str_list.c 2006-12-20 09:07:42.000000000 +0100 
    1303713012@@ -0,0 +1,76 @@ 
    1303813013+/* str_list.c - the itsy package management system 
    …… 
    1311213087+                                        (void_list_cmp_t)strcmp); 
    1311313088+} 
    13114 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/str_list.h busybox-1.2.2.1/archival/libipkg/str_list.h 
     13089diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/str_list.h busybox-1.2.2.1/archival/libipkg/str_list.h 
    1311513090--- busybox-1.2.2.1.orig/archival/libipkg/str_list.h    1970-01-01 01:00:00.000000000 +0100 
    13116 +++ busybox-1.2.2.1/archival/libipkg/str_list.h 2006-11-03 14:17:31.000000000 +0100 
     13091+++ busybox-1.2.2.1/archival/libipkg/str_list.h 2006-12-20 09:07:42.000000000 +0100 
    1311713092@@ -0,0 +1,51 @@ 
    1311813093+/* str_list.h - the itsy package management system 
    …… 
    1316713142+ 
    1316813143+#endif 
    13169 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/str_util.c busybox-1.2.2.1/archival/libipkg/str_util.c 
     13144diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/str_util.c busybox-1.2.2.1/archival/libipkg/str_util.c 
    1317013145--- busybox-1.2.2.1.orig/archival/libipkg/str_util.c    1970-01-01 01:00:00.000000000 +0100 
    13171 +++ busybox-1.2.2.1/archival/libipkg/str_util.c 2006-11-03 14:17:31.000000000 +0100 
     13146+++ busybox-1.2.2.1/archival/libipkg/str_util.c 2006-12-20 09:07:42.000000000 +0100 
    1317213147@@ -0,0 +1,73 @@ 
    1317313148+/* str_utils.c - the itsy package management system 
    …… 
    1324413219+} 
    1324513220+ 
    13246 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/str_util.h busybox-1.2.2.1/archival/libipkg/str_util.h 
     13221diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/str_util.h busybox-1.2.2.1/archival/libipkg/str_util.h 
    1324713222--- busybox-1.2.2.1.orig/archival/libipkg/str_util.h    1970-01-01 01:00:00.000000000 +0100 
    13248 +++ busybox-1.2.2.1/archival/libipkg/str_util.h 2006-11-03 14:17:31.000000000 +0100 
     13223+++ busybox-1.2.2.1/archival/libipkg/str_util.h 2006-12-20 09:07:42.000000000 +0100 
    1324913224@@ -0,0 +1,28 @@ 
    1325013225+/* str_utils.h - the itsy package management system 
    …… 
    1327613251+ 
    1327713252+#endif 
    13278 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/user.c busybox-1.2.2.1/archival/libipkg/user.c 
     13253diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/user.c busybox-1.2.2.1/archival/libipkg/user.c 
    1327913254--- busybox-1.2.2.1.orig/archival/libipkg/user.c        1970-01-01 01:00:00.000000000 +0100 
    13280 +++ busybox-1.2.2.1/archival/libipkg/user.c     2006-11-03 14:17:31.000000000 +0100 
     13255+++ busybox-1.2.2.1/archival/libipkg/user.c     2006-12-20 09:07:42.000000000 +0100 
    1328113256@@ -0,0 +1,58 @@ 
    1328213257+/* user.c - the itsy package management system 
    …… 
    1333813313+     return response; 
    1333913314+} 
    13340 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/user.h busybox-1.2.2.1/archival/libipkg/user.h 
     13315diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/user.h busybox-1.2.2.1/archival/libipkg/user.h 
    1334113316--- busybox-1.2.2.1.orig/archival/libipkg/user.h        1970-01-01 01:00:00.000000000 +0100 
    13342 +++ busybox-1.2.2.1/archival/libipkg/user.h     2006-11-03 14:17:31.000000000 +0100 
     13317+++ busybox-1.2.2.1/archival/libipkg/user.h     2006-12-20 09:07:42.000000000 +0100 
    1334313318@@ -0,0 +1,23 @@ 
    1334413319+/* user.c - the itsy package management system 
    …… 
    1336513340+char *get_user_response(const char *format, ...); 
    1336613341+ 
    13367 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/void_list.c busybox-1.2.2.1/archival/libipkg/void_list.c 
     13342diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/void_list.c busybox-1.2.2.1/archival/libipkg/void_list.c 
    1336813343--- busybox-1.2.2.1.orig/archival/libipkg/void_list.c   1970-01-01 01:00:00.000000000 +0100 
    13369 +++ busybox-1.2.2.1/archival/libipkg/void_list.c        2006-11-03 14:17:31.000000000 +0100 
     13344+++ busybox-1.2.2.1/archival/libipkg/void_list.c        2006-12-20 09:07:42.000000000 +0100 
    1337013345@@ -0,0 +1,194 @@ 
    1337113346+/* void_list.c - the itsy package management system 
    …… 
    1356313538+         return NULL; 
    1356413539+} 
    13565 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/void_list.h busybox-1.2.2.1/archival/libipkg/void_list.h 
     13540diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/void_list.h busybox-1.2.2.1/archival/libipkg/void_list.h 
    1356613541--- busybox-1.2.2.1.orig/archival/libipkg/void_list.h   1970-01-01 01:00:00.000000000 +0100 
    13567 +++ busybox-1.2.2.1/archival/libipkg/void_list.h        2006-11-03 14:17:31.000000000 +0100 
     13542+++ busybox-1.2.2.1/archival/libipkg/void_list.h        2006-12-20 09:07:42.000000000 +0100 
    1356813543@@ -0,0 +1,59 @@ 
    1356913544+/* void_list.h - the itsy package management system 
    …… 
    1362613601+ 
    1362713602+#endif 
    13628 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/xsystem.c busybox-1.2.2.1/archival/libipkg/xsystem.c 
     13603diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/xsystem.c busybox-1.2.2.1/archival/libipkg/xsystem.c 
    1362913604--- busybox-1.2.2.1.orig/archival/libipkg/xsystem.c     1970-01-01 01:00:00.000000000 +0100 
    13630 +++ busybox-1.2.2.1/archival/libipkg/xsystem.c  2006-11-03 14:17:31.000000000 +0100 
     13605+++ busybox-1.2.2.1/archival/libipkg/xsystem.c  2006-12-20 09:07:42.000000000 +0100 
    1363113606@@ -0,0 +1,64 @@ 
    1363213607+/* xsystem.c - system(3) with error messages 
    …… 
    1369413669+} 
    1369513670+         
    13696 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/xsystem.h busybox-1.2.2.1/archival/libipkg/xsystem.h 
     13671diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/xsystem.h busybox-1.2.2.1/archival/libipkg/xsystem.h 
    1369713672--- busybox-1.2.2.1.orig/archival/libipkg/xsystem.h     1970-01-01 01:00:00.000000000 +0100 
    13698 +++ busybox-1.2.2.1/archival/libipkg/xsystem.h  2006-11-03 14:17:31.000000000 +0100 
     13673+++ busybox-1.2.2.1/archival/libipkg/xsystem.h  2006-12-20 09:07:42.000000000 +0100 
    1369913674@@ -0,0 +1,34 @@ 
    1370013675+/* xsystem.h - system(3) with error messages 
    …… 
    1373213707+#endif 
    1373313708+         
    13734 diff -Nur busybox-1.2.2.1.orig/archival/libunarchive/data_extract_all.c busybox-1.2.2.1/archival/libunarchive/data_extract_all.c 
     13709diff -Nurp busybox-1.2.2.1.orig/archival/libunarchive/data_extract_all.c busybox-1.2.2.1/archival/libunarchive/data_extract_all.c 
    1373513710--- busybox-1.2.2.1.orig/archival/libunarchive/data_extract_all.c       2006-07-01 00:42:04.000000000 +0200 
    13736 +++ busybox-1.2.2.1/archival/libunarchive/data_extract_all.c    2006-11-03 14:17:31.000000000 +0100 
    13737 @@ -126,3 +126,17 @@ 
     13711+++ busybox-1.2.2.1/archival/libunarchive/data_extract_all.c    2006-12-20 09:07:42.000000000 +0100 
     13712@@ -126,3 +126,17 @@ void data_extract_all(archive_handle_t * 
    1373813713                utime(file_header->name, &t); 
    1373913714        } 
    …… 
    1375313728+} 
    1375413729+ 
    13755 diff -Nur busybox-1.2.2.1.orig/archival/libunarchive/Makefile.in busybox-1.2.2.1/archival/libunarchive/Makefile.in 
     13730diff -Nurp busybox-1.2.2.1.orig/archival/libunarchive/Makefile.in busybox-1.2.2.1/archival/libunarchive/Makefile.in 
    1375613731--- busybox-1.2.2.1.orig/archival/libunarchive/Makefile.in      2006-07-01 00:42:03.000000000 +0200 
    13757 +++ busybox-1.2.2.1/archival/libunarchive/Makefile.in   2006-11-03 14:17:31.000000000 +0100 
    13758 @@ -58,6 +58,7 @@ 
     13732+++ busybox-1.2.2.1/archival/libunarchive/Makefile.in   2006-12-20 09:07:42.000000000 +0100 
     13733@@ -58,6 +58,7 @@ LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_BZ 
    1375913734 LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o 
    1376013735 LIBUNARCHIVE-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) 
    …… 
    1376413739 LIBUNARCHIVE-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o 
    1376513740 LIBUNARCHIVE-$(CONFIG_TAR) += get_header_tar.o 
    13766 diff -Nur busybox-1.2.2.1.orig/archival/Makefile.in busybox-1.2.2.1/archival/Makefile.in 
     13741diff -Nurp busybox-1.2.2.1.orig/archival/Makefile.in busybox-1.2.2.1/archival/Makefile.in 
    1376713742--- busybox-1.2.2.1.orig/archival/Makefile.in   2006-10-24 22:21:17.000000000 +0200 
    13768 +++ busybox-1.2.2.1/archival/Makefile.in        2006-11-03 14:17:31.000000000 +0100 
    13769 @@ -19,6 +19,7 @@ 
     13743+++ busybox-1.2.2.1/archival/Makefile.in        2006-12-20 09:07:42.000000000 +0100 
     13744@@ -19,6 +19,7 @@ ARCHIVAL-$(CONFIG_DPKG)              += dpkg.o 
    1377013745 ARCHIVAL-$(CONFIG_DPKG_DEB)    += dpkg_deb.o 
    1377113746 ARCHIVAL-$(CONFIG_GUNZIP)      += gunzip.o 
    …… 
    1377513750 ARCHIVAL-$(CONFIG_RPM)         += rpm.o 
    1377613751 ARCHIVAL-$(CONFIG_TAR)         += tar.o 
    13777 diff -Nur busybox-1.2.2.1.orig/include/applets.h busybox-1.2.2.1/include/applets.h 
    13778 --- busybox-1.2.2.1.orig/include/applets.h      2006-11-03 14:17:11.000000000 +0100 
    13779 +++ busybox-1.2.2.1/include/applets.h   2006-11-03 14:17:31.000000000 +0100 
    13780 @@ -152,6 +152,7 @@ 
     13752diff -Nurp busybox-1.2.2.1.orig/include/applets.h busybox-1.2.2.1/include/applets.h 
     13753--- busybox-1.2.2.1.orig/include/applets.h      2006-07-01 00:42:10.000000000 +0200 
     13754+++ busybox-1.2.2.1/include/applets.h   2006-12-20 09:07:42.000000000 +0100 
     13755@@ -152,6 +152,7 @@ USE_IPADDR(APPLET(ipaddr, _BB_DIR_BIN, _ 
    1378113756 USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER)) 
    1378213757 USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS)) 
    …… 
    1378613761 USE_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_NEVER)) 
    1378713762 USE_IPTUNNEL(APPLET(iptunnel, _BB_DIR_BIN, _BB_SUID_NEVER)) 
    13788 diff -Nur busybox-1.2.2.1.orig/include/unarchive.h busybox-1.2.2.1/include/unarchive.h 
     13763diff -Nurp busybox-1.2.2.1.orig/include/unarchive.h busybox-1.2.2.1/include/unarchive.h 
    1378913764--- busybox-1.2.2.1.orig/include/unarchive.h    2006-07-01 00:42:10.000000000 +0200 
    13790 +++ busybox-1.2.2.1/include/unarchive.h 2006-11-03 14:17:31.000000000 +0100 
    13791 @@ -77,6 +77,7 @@ 
     13765+++ busybox-1.2.2.1/include/unarchive.h 2006-12-20 09:07:42.000000000 +0100 
     13766@@ -77,6 +77,7 @@ extern void unpack_ar_archive(archive_ha 
    1379213767  
    1379313768 extern void data_skip(archive_handle_t *archive_handle); 
    …… 
    1379713772 extern void data_extract_to_buffer(archive_handle_t *archive_handle); 
    1379813773  
    13799 diff -Nur busybox-1.2.2.1.orig/include/usage.h busybox-1.2.2.1/include/usage.h 
    13800 --- busybox-1.2.2.1.orig/include/usage.h        2006-11-03 14:18:03.000000000 +0100 
    13801 +++ busybox-1.2.2.1/include/usage.h     2006-11-03 14:17:31.000000000 +0100 
    13802 @@ -982,6 +982,82 @@ 
     13774diff -Nurp busybox-1.2.2.1.orig/include/usage.h busybox-1.2.2.1/include/usage.h 
     13775--- busybox-1.2.2.1.orig/include/usage.h        2006-07-01 00:42:10.000000000 +0200 
     13776+++ busybox-1.2.2.1/include/usage.h     2006-12-20 09:07:42.000000000 +0100 
     13777@@ -982,6 +982,82 @@ USE_FEATURE_DATE_ISOFMT( \ 
    1380313778        "$ ls -la /tmp/busybox*\n" \ 
    1380413779        "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" 
    …… 
    1388313858        "[-d<delay>] [-n<nosync>] [-f<force>]" 
    1388413859 #define halt_full_usage \ 
    13885 diff -Nur busybox-1.2.2.1.orig/Makefile busybox-1.2.2.1/Makefile 
     13860diff -Nurp busybox-1.2.2.1.orig/Makefile busybox-1.2.2.1/Makefile 
    1388613861--- busybox-1.2.2.1.orig/Makefile       2006-07-29 00:53:44.000000000 +0200 
    13887 +++ busybox-1.2.2.1/Makefile    2006-11-03 14:17:31.000000000 +0100 
    13888 @@ -31,7 +31,7 @@ 
     13862+++ busybox-1.2.2.1/Makefile    2006-12-20 09:07:42.000000000 +0100 
     13863@@ -31,7 +31,7 @@ endif 
    1388913864 export srctree=$(top_srcdir) 
    1389013865 vpath %/Config.in $(srctree)