Changeset 92e127c in freewrt


Ignore:
Timestamp:
Dec 20, 2006, 9:11:13 AM (19 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Children:
7e45202
Parents:
60bcca8
Message:

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

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@1347 afb5a338-a214-0410-bd46-81f09a774fd1

Location:
package/busybox/patches
Files:
2 deleted
1 edited

Legend:

Unmodified
Added
Removed

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

    r60bcca8 r92e127c  
    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+
    … …  
    53525351+                                      "        Y or I  : install the package maintainer's version\n"
    53535352+                                      "        N or O  : keep your currently-installed version\n"
    5354 +                                      "          D     : show the differences between the versions (if diff is installed)\n"
    53555353+                                      "     The default action is to keep your current version.\n"
    5356 +                                      "    *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name);
     5354+                                      "    *** %s (Y/I/N/O) [default=N] ? ", file_name, short_file_name);
    53575355+         if (strcmp(response, "y") == 0
    53585356+             || strcmp(response, "i") == 0
    … …  
    53605358+              free(response);
    53615359+              return 0;
    5362 +         }
    5363 +
    5364 +         if (strcmp(response, "d") == 0) {
    5365 +              char *cmd;
    5366 +
    5367 +              free(response);
    5368 +              /* XXX: BUG rewrite to use exec or busybox's internal diff */
    5369 +              sprintf_alloc(&cmd, "diff -u %s %s", backup, file_name);
    5370 +              xsystem(cmd);
    5371 +              free(cmd);
    5372 +              printf("    [Press ENTER to continue]\n");
    5373 +              response = file_read_line_alloc(stdin);
    5374 +              free(response);
    5375 +              continue;
    53765360+         }
    53775361+
    … …  
    57335717+
    57345718+#endif
    5735 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_install.h busybox-1.2.2.1/archival/libipkg/ipkg_install.h
     5719diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_install.h busybox-1.2.2.1/archival/libipkg/ipkg_install.h
    57365720--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_install.h        1970-01-01 01:00:00.000000000 +0100
    5737 +++ busybox-1.2.2.1/archival/libipkg/ipkg_install.h     2006-11-03 14:17:31.000000000 +0100
     5721+++ busybox-1.2.2.1/archival/libipkg/ipkg_install.h     2006-12-20 09:07:42.000000000 +0100
    57385722@@ -0,0 +1,35 @@
    57395723+/* ipkg_install.h - the itsy package management system
    … …  
    57725756+
    57735757+#endif
    5774 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.c busybox-1.2.2.1/archival/libipkg/ipkg_message.c
     5758diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.c busybox-1.2.2.1/archival/libipkg/ipkg_message.c
    57755759--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.c        1970-01-01 01:00:00.000000000 +0100
    5776 +++ busybox-1.2.2.1/archival/libipkg/ipkg_message.c     2006-11-03 14:17:31.000000000 +0100
     5760+++ busybox-1.2.2.1/archival/libipkg/ipkg_message.c     2006-12-20 09:07:42.000000000 +0100
    57775761@@ -0,0 +1,61 @@
    57785762+/* ipkg_message.c - the itsy package management system
    … …  
    58375821+}
    58385822+#endif
    5839 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.h busybox-1.2.2.1/archival/libipkg/ipkg_message.h
     5823diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.h busybox-1.2.2.1/archival/libipkg/ipkg_message.h
    58405824--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_message.h        1970-01-01 01:00:00.000000000 +0100
    5841 +++ busybox-1.2.2.1/archival/libipkg/ipkg_message.h     2006-11-03 14:17:31.000000000 +0100
     5825+++ busybox-1.2.2.1/archival/libipkg/ipkg_message.h     2006-12-20 09:07:42.000000000 +0100
    58425826@@ -0,0 +1,32 @@
    58435827+/* ipkg_message.h - the itsy package management system
    … …  
    58735857+
    58745858+#endif /* _IPKG_MESSAGE_H_ */
    5875 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.c busybox-1.2.2.1/archival/libipkg/ipkg_remove.c
     5859diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.c busybox-1.2.2.1/archival/libipkg/ipkg_remove.c
    58765860--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
    5877 +++ busybox-1.2.2.1/archival/libipkg/ipkg_remove.c      2006-11-03 14:17:31.000000000 +0100
     5861+++ busybox-1.2.2.1/archival/libipkg/ipkg_remove.c      2006-12-20 09:07:42.000000000 +0100
    58785862@@ -0,0 +1,383 @@
    58795863+/* ipkg_remove.c - the itsy package management system
    … …  
    62606244+    return 0;
    62616245+}
    6262 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.h busybox-1.2.2.1/archival/libipkg/ipkg_remove.h
     6246diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.h busybox-1.2.2.1/archival/libipkg/ipkg_remove.h
    62636247--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
    6264 +++ busybox-1.2.2.1/archival/libipkg/ipkg_remove.h      2006-11-03 14:17:31.000000000 +0100
     6248+++ busybox-1.2.2.1/archival/libipkg/ipkg_remove.h      2006-12-20 09:07:42.000000000 +0100
    62656249@@ -0,0 +1,33 @@
    62666250+/* ipkg_remove.h - the itsy package management system
    … …  
    62976281+
    62986282+#endif
    6299 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.c
     6283diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.c
    63006284--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.c        1970-01-01 01:00:00.000000000 +0100
    6301 +++ busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.c     2006-11-03 14:17:31.000000000 +0100
     6285+++ busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.c     2006-12-20 09:07:42.000000000 +0100
    63026286@@ -0,0 +1,77 @@
    63036287+/* ipkg_upgrade.c - the itsy package management system
    … …  
    63786362+     return ipkg_install_pkg(conf, new,1);
    63796363+}
    6380 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.h
     6364diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.h
    63816365--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_upgrade.h        1970-01-01 01:00:00.000000000 +0100
    6382 +++ busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.h     2006-11-03 14:17:31.000000000 +0100
     6366+++ busybox-1.2.2.1/archival/libipkg/ipkg_upgrade.h     2006-12-20 09:07:42.000000000 +0100
    63836367@@ -0,0 +1,18 @@
    63846368+/* ipkg_upgrade.c - the itsy package management system
    … …  
    64006384+
    64016385+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
    6402 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.c busybox-1.2.2.1/archival/libipkg/ipkg_utils.c
     6386diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.c busybox-1.2.2.1/archival/libipkg/ipkg_utils.c
    64036387--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.c  1970-01-01 01:00:00.000000000 +0100
    6404 +++ busybox-1.2.2.1/archival/libipkg/ipkg_utils.c       2006-11-03 14:17:31.000000000 +0100
     6388+++ busybox-1.2.2.1/archival/libipkg/ipkg_utils.c       2006-12-20 09:07:42.000000000 +0100
    64056389@@ -0,0 +1,181 @@
    64066390+/* ipkg_utils.c - the itsy package management system
    … …  
    65856569+
    65866570+       
    6587 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.h busybox-1.2.2.1/archival/libipkg/ipkg_utils.h
     6571diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.h busybox-1.2.2.1/archival/libipkg/ipkg_utils.h
    65886572--- busybox-1.2.2.1.orig/archival/libipkg/ipkg_utils.h  1970-01-01 01:00:00.000000000 +0100
    6589 +++ busybox-1.2.2.1/archival/libipkg/ipkg_utils.h       2006-11-03 14:17:31.000000000 +0100
     6573+++ busybox-1.2.2.1/archival/libipkg/ipkg_utils.h       2006-12-20 09:07:42.000000000 +0100
    65906574@@ -0,0 +1,29 @@
    65916575+/* ipkg_utils.h - the itsy package management system
    … …  
    66186602+
    66196603+#endif
    6620 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/libipkg.c busybox-1.2.2.1/archival/libipkg/libipkg.c
     6604diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/libipkg.c busybox-1.2.2.1/archival/libipkg/libipkg.c
    66216605--- busybox-1.2.2.1.orig/archival/libipkg/libipkg.c     1970-01-01 01:00:00.000000000 +0100
    6622 +++ busybox-1.2.2.1/archival/libipkg/libipkg.c  2006-11-03 14:17:31.000000000 +0100
     6606+++ busybox-1.2.2.1/archival/libipkg/libipkg.c  2006-12-20 09:07:48.000000000 +0100
    66236607@@ -0,0 +1,527 @@
    66246608+/* ipkglib.c - the itsy package management system
    … …  
    70697053+ipkg_op (int argc, char *argv[])
    70707054+{
    7071 +       int err, optind;
     7055+       int err, opt_index;
    70727056+       args_t args;
    70737057+       char *cmd_name;
    … …  
    70777061+       args_init (&args);
    70787062+
    7079 +       optind = args_parse (&args, argc, argv);
    7080 +       if (optind == argc || optind < 0)
     7063+       opt_index = args_parse (&args, argc, argv);
     7064+       if (opt_index == argc || opt_index < 0)
    70817065+       {
    70827066+               args_usage ("ipkg must have one sub-command argument");
    70837067+       }
    70847068+
    7085 +       cmd_name = argv[optind++];
     7069+       cmd_name = argv[opt_index++];
    70867070+/* Pigi: added a flag to disable the checking of structures if the command does not need to
    70877071+         read anything from there.
    … …  
    71337117+       }
    71347118+
    7135 +       if (cmd->requires_args && optind == argc)
     7119+       if (cmd->requires_args && opt_index == argc)
    71367120+       {
    71377121+               fprintf (stderr,
    … …  
    71417125+       }
    71427126+
    7143 +       err = ipkg_cmd_exec (cmd, &ipkg_conf, argc - optind, (const char **) (argv + optind), NULL);
     7127+       err = ipkg_cmd_exec (cmd, &ipkg_conf, argc - opt_index, (const char **) (argv + opt_index), NULL);
    71447128+
    71457129+       ipkg_conf_deinit (&ipkg_conf);
    … …  
    71497133+
    71507134+#endif /* IPKG_LIB */
    7151 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/libipkg.h busybox-1.2.2.1/archival/libipkg/libipkg.h
     7135diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/libipkg.h busybox-1.2.2.1/archival/libipkg/libipkg.h
    71527136--- busybox-1.2.2.1.orig/archival/libipkg/libipkg.h     1970-01-01 01:00:00.000000000 +0100
    7153 +++ busybox-1.2.2.1/archival/libipkg/libipkg.h  2006-11-03 14:17:31.000000000 +0100
     7137+++ busybox-1.2.2.1/archival/libipkg/libipkg.h  2006-12-20 09:07:42.000000000 +0100
    71547138@@ -0,0 +1,87 @@
    71557139+/* ipkglib.h - the itsy package management system
    … …  
    72407224+
    72417225+#endif
    7242 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/Makefile busybox-1.2.2.1/archival/libipkg/Makefile
     7226diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/Makefile busybox-1.2.2.1/archival/libipkg/Makefile
    72437227--- busybox-1.2.2.1.orig/archival/libipkg/Makefile      1970-01-01 01:00:00.000000000 +0100
    7244 +++ busybox-1.2.2.1/archival/libipkg/Makefile   2006-11-03 14:17:31.000000000 +0100
     7228+++ busybox-1.2.2.1/archival/libipkg/Makefile   2006-12-20 09:07:42.000000000 +0100
    72457229@@ -0,0 +1,32 @@
    72467230+# Makefile for busybox
    … …  
    72767260+       rm -f *.o *.a $(AR_TARGET)
    72777261+
    7278 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/Makefile.in busybox-1.2.2.1/archival/libipkg/Makefile.in
     7262diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/Makefile.in busybox-1.2.2.1/archival/libipkg/Makefile.in
    72797263--- busybox-1.2.2.1.orig/archival/libipkg/Makefile.in   1970-01-01 01:00:00.000000000 +0100
    7280 +++ busybox-1.2.2.1/archival/libipkg/Makefile.in        2006-11-03 14:17:31.000000000 +0100
     7264+++ busybox-1.2.2.1/archival/libipkg/Makefile.in        2006-12-20 09:07:42.000000000 +0100
    72817265@@ -0,0 +1,88 @@
    72827266+# Makefile for busybox
    … …  
    73687352+       $(compile.c)
    73697353+
    7370 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/md5.c busybox-1.2.2.1/archival/libipkg/md5.c
     7354diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/md5.c busybox-1.2.2.1/archival/libipkg/md5.c
    73717355--- busybox-1.2.2.1.orig/archival/libipkg/md5.c 1970-01-01 01:00:00.000000000 +0100
    7372 +++ busybox-1.2.2.1/archival/libipkg/md5.c      2006-11-03 14:17:31.000000000 +0100
    7373 @@ -0,0 +1,48 @@
     7356+++ busybox-1.2.2.1/archival/libipkg/md5.c      2006-12-20 09:07:48.000000000 +0100
     7357@@ -0,0 +1,47 @@
    73747358+/* md5.c - wrappers to busybox md5 functions
    73757359+ *
    … …  
    73997383+{
    74007384+       int fd;
    7401 +       int sum;
    74027385+       
    74037386+       if( (fd = fileno(stream)) == -1 ) {
    … …  
    74207403+}
    74217404+
    7422 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/md5.h busybox-1.2.2.1/archival/libipkg/md5.h
     7405diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/md5.h busybox-1.2.2.1/archival/libipkg/md5.h
    74237406--- busybox-1.2.2.1.orig/archival/libipkg/md5.h 1970-01-01 01:00:00.000000000 +0100
    7424 +++ busybox-1.2.2.1/archival/libipkg/md5.h      2006-11-03 14:17:31.000000000 +0100
     7407+++ busybox-1.2.2.1/archival/libipkg/md5.h      2006-12-20 09:07:42.000000000 +0100
    74257408@@ -0,0 +1,35 @@
    74267409+/* md5.h - Compute MD5 checksum of files or strings according to the
    … …  
    74597442+#endif
    74607443+
    7461 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/nv_pair.c busybox-1.2.2.1/archival/libipkg/nv_pair.c
     7444diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/nv_pair.c busybox-1.2.2.1/archival/libipkg/nv_pair.c
    74627445--- busybox-1.2.2.1.orig/archival/libipkg/nv_pair.c     1970-01-01 01:00:00.000000000 +0100
    7463 +++ busybox-1.2.2.1/archival/libipkg/nv_pair.c  2006-11-03 14:17:31.000000000 +0100
     7446+++ busybox-1.2.2.1/archival/libipkg/nv_pair.c  2006-12-20 09:07:42.000000000 +0100
    74647447@@ -0,0 +1,40 @@
    74657448+/* nv_pair.c - the itsy package management system
    … …  
    75037486+
    75047487+
    7505 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/nv_pair.h busybox-1.2.2.1/archival/libipkg/nv_pair.h
     7488diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/nv_pair.h busybox-1.2.2.1/archival/libipkg/nv_pair.h
    75067489--- busybox-1.2.2.1.orig/archival/libipkg/nv_pair.h     1970-01-01 01:00:00.000000000 +0100
    7507 +++ busybox-1.2.2.1/archival/libipkg/nv_pair.h  2006-11-03 14:17:31.000000000 +0100
     7490+++ busybox-1.2.2.1/archival/libipkg/nv_pair.h  2006-12-20 09:07:42.000000000 +0100
    75087491@@ -0,0 +1,32 @@
    75097492+/* nv_pair.h - the itsy package management system
    … …  
    75397522+#endif
    75407523+
    7541 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
     7524diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/nv_pair_list.c busybox-1.2.2.1/archival/libipkg/nv_pair_list.c
    75427525--- busybox-1.2.2.1.orig/archival/libipkg/nv_pair_list.c        1970-01-01 01:00:00.000000000 +0100
    7543 +++ busybox-1.2.2.1/archival/libipkg/nv_pair_list.c     2006-11-03 14:17:31.000000000 +0100
     7526+++ busybox-1.2.2.1/archival/libipkg/nv_pair_list.c     2006-12-20 09:07:42.000000000 +0100
    75447527@@ -0,0 +1,98 @@
    75457528+/* nv_pair_list.c - the itsy package management system
    … …  
    76417624+     return NULL;
    76427625+}
    7643 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
     7626diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/nv_pair_list.h busybox-1.2.2.1/archival/libipkg/nv_pair_list.h
    76447627--- busybox-1.2.2.1.orig/archival/libipkg/nv_pair_list.h        1970-01-01 01:00:00.000000000 +0100
    7645 +++ busybox-1.2.2.1/archival/libipkg/nv_pair_list.h     2006-11-03 14:17:31.000000000 +0100
     7628+++ busybox-1.2.2.1/archival/libipkg/nv_pair_list.h     2006-12-20 09:07:42.000000000 +0100
    76467629@@ -0,0 +1,60 @@
    76477630+/* nv_pair_list.h - the itsy package management system
    … …  
    77057688+#endif
    77067689+
    7707 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg.c busybox-1.2.2.1/archival/libipkg/pkg.c
     7690diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg.c busybox-1.2.2.1/archival/libipkg/pkg.c
    77087691--- busybox-1.2.2.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
    7709 +++ busybox-1.2.2.1/archival/libipkg/pkg.c      2006-11-03 14:17:31.000000000 +0100
    7710 @@ -0,0 +1,1754 @@
     7692+++ busybox-1.2.2.1/archival/libipkg/pkg.c      2006-12-20 09:07:55.000000000 +0100
     7693@@ -0,0 +1,1747 @@
    77117694+/* pkg.c - the itsy package management system
    77127695+
    … …  
    80708053+         oldpkg->essential = newpkg->essential;
    80718054+
     8055+     oldpkg->provided_by_hand |= newpkg->provided_by_hand;
     8056+
    80728057+     return 0;
    80738058+}
    … …  
    82398224+{
    82408225+     static size_t LINE_LEN = 128;
     8226+     char line_str[LINE_LEN];
    82418227+     char * temp = (char *)malloc(1);
    82428228+     int len = 0;
    … …  
    82788264+              /* Conffiles */
    82798265+              conffile_list_elt_t *iter;
    8280 +               char confstr[LINE_LEN];
    82818266+
    82828267+              if (pkg->conffiles.head == NULL) {
    … …  
    82998284+              for (iter = pkg->conffiles.head; iter; iter = iter->next) {
    83008285+                   if (iter->data->name && iter->data->value) {
    8301 +                         snprintf(confstr, LINE_LEN, "%s %s\n", iter->data->name, iter->data->value);
    8302 +                         strncat(temp, confstr, strlen(confstr));           
     8286+                         snprintf(line_str, LINE_LEN, "%s %s\n", iter->data->name, iter->data->value);
     8287+                         strncat(temp, line_str, strlen(line_str));           
    83038288+                   }
    83048289+              }
    … …  
    83078292+
    83088293+              if (pkg->conflicts_count) {
    8309 +                    char conflictstr[LINE_LEN];
    83108294+                    len = 14 ;
    83118295+                   for(i = 0; i < pkg->conflicts_count; i++) {
    … …  
    83208304+                    strncpy(temp, "Conflicts:", 11);
    83218305+                   for(i = 0; i < pkg->conflicts_count; i++) {
    8322 +                        snprintf(conflictstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->conflicts_str[i]);
    8323 +                        strncat(temp, conflictstr, strlen(conflictstr));           
     8306+                        snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->conflicts_str[i]);
     8307+                        strncat(temp, line_str, strlen(line_str));           
    83248308+                    }
    83258309+                    strncat(temp, "\n", strlen("\n"));
    … …  
    83368320+
    83378321+              if (pkg->depends_count) {
    8338 +                    char depstr[LINE_LEN];
    83398322+                    len = 14 ;
    83408323+                   for(i = 0; i < pkg->depends_count; i++) {
    … …  
    83498332+                    strncpy(temp, "Depends:", 10);
    83508333+                   for(i = 0; i < pkg->depends_count; i++) {
    8351 +                        snprintf(depstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->depends_str[i]);
    8352 +                        strncat(temp, depstr, strlen(depstr));           
     8334+                        snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->depends_str[i]);
     8335+                        strncat(temp, line_str, strlen(line_str));           
    83538336+                    }
    83548337+                    strncat(temp, "\n", strlen("\n"));
    … …  
    85158498+         if (strcasecmp (field, "Replaces") == 0) {
    85168499+              if (pkg->replaces_count) {
    8517 +                    char replstr[LINE_LEN];
    85188500+                    len = 14;
    85198501+                   for (i = 0; i < pkg->replaces_count; i++) {
    … …  
    85288510+                    strncpy(temp, "Replaces:", 12);
    85298511+                   for (i = 0; i < pkg->replaces_count; i++) {
    8530 +                        snprintf(replstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->replaces_str[i]);
    8531 +                        strncat(temp, replstr, strlen(replstr));           
     8512+                        snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->replaces_str[i]);
     8513+                        strncat(temp, line_str, strlen(line_str));           
    85328514+                    }
    85338515+                    strncat(temp, "\n", strlen("\n"));
    … …  
    85358517+         } else if (strcasecmp (field, "Recommends") == 0) {
    85368518+              if (pkg->recommends_count) {
    8537 +                    char recstr[LINE_LEN];
    85388519+                    len = 15;
    85398520+                   for(i = 0; i < pkg->recommends_count; i++) {
    … …  
    85488529+                    strncpy(temp, "Recommends:", 13);
    85498530+                   for(i = 0; i < pkg->recommends_count; i++) {
    8550 +                        snprintf(recstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->recommends_str[i]);
    8551 +                        strncat(temp, recstr, strlen(recstr));           
     8531+                        snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->recommends_str[i]);
     8532+                        strncat(temp, line_str, strlen(line_str));           
    85528533+                    }
    85538534+                    strncat(temp, "\n", strlen("\n"));
    … …  
    86188599+              if (pkg->suggests_count) {
    86198600+                   int i;
    8620 +                    char sugstr[LINE_LEN];
    86218601+                    len = 13;
    86228602+                   for(i = 0; i < pkg->suggests_count; i++) {
    … …  
    86318611+                    strncpy(temp, "Suggests:", 10);
    86328612+                   for(i = 0; i < pkg->suggests_count; i++) {
    8633 +                        snprintf(sugstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->suggests_str[i]);
    8634 +                        strncat(temp, sugstr, strlen(sugstr));           
     8613+                        snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->suggests_str[i]);
     8614+                        strncat(temp, line_str, strlen(line_str));           
    86358615+                    }
    86368616+                    strncat(temp, "\n", strlen("\n"));
    … …  
    88518831+}
    88528832+
    8853 +int pkg_name_version_and_architecture_compare(void *p1, void *p2)
    8854 +{
    8855 +     const pkg_t *a = *(const pkg_t **)p1;
    8856 +     const pkg_t *b = *(const pkg_t **)p2;
     8833+int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b)
     8834+{
    88578835+     int namecmp;
    88588836+     int vercmp;
    … …  
    88818859+}
    88828860+
    8883 +int abstract_pkg_name_compare(void *p1, void *p2)
    8884 +{
    8885 +     const abstract_pkg_t *a = *(const abstract_pkg_t **)p1;
    8886 +     const abstract_pkg_t *b = *(const abstract_pkg_t **)p2;
     8861+int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b)
     8862+{
    88878863+     if (!a->name || !b->name) {
    88888864+       fprintf(stderr, "abstract_pkg_name_compare: a=%p a->name=%p b=%p b->name=%p\n",
    … …  
    89048880+
    89058881+     if (pkg->epoch) {
    8906 +         sprintf_alloc(&epoch_str, "%d:", pkg->epoch);
     8882+         sprintf_alloc(&epoch_str, "%d:", (int)(pkg->epoch));
    89078883+     } else {
    89088884+         epoch_str = strdup("");
    … …  
    94639439+     return 0;
    94649440+}
    9465 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.c busybox-1.2.2.1/archival/libipkg/pkg_depends.c
     9441diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.c busybox-1.2.2.1/archival/libipkg/pkg_depends.c
    94669442--- busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
    9467 +++ busybox-1.2.2.1/archival/libipkg/pkg_depends.c      2006-11-03 14:17:31.000000000 +0100
    9468 @@ -0,0 +1,1033 @@
     9443+++ busybox-1.2.2.1/archival/libipkg/pkg_depends.c      2006-12-20 09:07:48.000000000 +0100
     9444@@ -0,0 +1,1031 @@
    94699445+/* pkg_depends.c - the itsy package management system
    94709446+
    … …  
    95379513+{
    95389514+     pkg_t * satisfier_entry_pkg;
    9539 +     register int i, j, k;
     9515+     register int i, j, k, l;
    95409516+     int count, found;
    95419517+     char ** the_lost;
    … …  
    95829558+                   int nposs = ab_provider_vec->len;
    95839559+                   abstract_pkg_t **ab_providers = ab_provider_vec->pkgs;
    9584 +                   int l;
    95859560+                   for (l = 0; l < nposs; l++) {
    95869561+                        pkg_vec_t *test_vec = ab_providers[l]->pkgs;
    … …  
    96069581+                                                                               &newstuff);
    96079582+                                  if (newstuff == NULL) {
    9608 +                                       int i;
    96099583+                                       int ok = 1;
    9610 +                                       for (i = 0; i < rc; i++) {
    9611 +                                           pkg_t *p = tmp_vec->pkgs[i];
     9584+                                       for (l = 0; l < rc; l++) {
     9585+                                           pkg_t *p = tmp_vec->pkgs[l];
    96129586+                                           if (p->state_want == SW_INSTALL)
    96139587+                                               continue;
    … …  
    1028310257+ *   [npredepends+nrecommends+nsuggests,npredepends+nrecommends+nsuggests+ndepends) -> returns depends_str[index]
    1028410258+ */
    10285 +char *pkg_depend_str(pkg_t *pkg, int index)
    10286 +{
    10287 +     if (index < pkg->pre_depends_count) {
    10288 +         return pkg->pre_depends_str[index];
    10289 +     }
    10290 +     index -= pkg->pre_depends_count;
    10291 +
    10292 +     if (index < pkg->recommends_count) {
    10293 +         return pkg->recommends_str[index];
    10294 +     }
    10295 +     index -= pkg->recommends_count;
    10296 +
    10297 +     if (index < pkg->suggests_count) {
    10298 +         return pkg->suggests_str[index];
    10299 +     }
    10300 +     index -= pkg->suggests_count;
    10301 +
    10302 +     if (index < pkg->depends_count) {
    10303 +         return pkg->depends_str[index];
    10304 +     }
    10305 +     fprintf(stderr, "pkg_depend_str: index %d out of range for pkg=%s\n", index, pkg->name);
     10259+char *pkg_depend_str(pkg_t *pkg, int pkg_index)
     10260+{
     10261+     if (pkg_index < pkg->pre_depends_count) {
     10262+         return pkg->pre_depends_str[pkg_index];
     10263+     }
     10264+     pkg_index -= pkg->pre_depends_count;
     10265+
     10266+     if (pkg_index < pkg->recommends_count) {
     10267+         return pkg->recommends_str[pkg_index];
     10268+     }
     10269+     pkg_index -= pkg->recommends_count;
     10270+
     10271+     if (pkg_index < pkg->suggests_count) {
     10272+         return pkg->suggests_str[pkg_index];
     10273+     }
     10274+     pkg_index -= pkg->suggests_count;
     10275+
     10276+     if (pkg_index < pkg->depends_count) {
     10277+         return pkg->depends_str[pkg_index];
     10278+     }
     10279+     fprintf(stderr, "pkg_depend_str: index %d out of range for pkg=%s\n", pkg_index, pkg->name);
    1030610280+     return NULL;
    1030710281+}
    … …  
    1050010474+     return 0;
    1050110475+}
    10502 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.h busybox-1.2.2.1/archival/libipkg/pkg_depends.h
     10476diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.h busybox-1.2.2.1/archival/libipkg/pkg_depends.h
    1050310477--- busybox-1.2.2.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100
    10504 +++ busybox-1.2.2.1/archival/libipkg/pkg_depends.h      2006-11-03 14:17:31.000000000 +0100
     10478+++ busybox-1.2.2.1/archival/libipkg/pkg_depends.h      2006-12-20 09:07:48.000000000 +0100
    1050510479@@ -0,0 +1,105 @@
    1050610480+/* pkg_depends.h - the itsy package management system
    … …  
    1059810572+int pkg_conflicts(pkg_t *pkg, pkg_t *conflicts);
    1059910573+
    10600 +char *pkg_depend_str(pkg_t *pkg, int index);
     10574+char *pkg_depend_str(pkg_t *pkg, int pkg_index);
    1060110575+void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg);
    1060210576+void freeDepends(pkg_t *pkg);
    … …  
    1060910583+
    1061010584+#endif
    10611 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.c busybox-1.2.2.1/archival/libipkg/pkg_dest.c
     10585diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.c busybox-1.2.2.1/archival/libipkg/pkg_dest.c
    1061210586--- busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.c    1970-01-01 01:00:00.000000000 +0100
    10613 +++ busybox-1.2.2.1/archival/libipkg/pkg_dest.c 2006-11-03 14:17:31.000000000 +0100
     10587+++ busybox-1.2.2.1/archival/libipkg/pkg_dest.c 2006-12-20 09:07:42.000000000 +0100
    1061410588@@ -0,0 +1,92 @@
    1061510589+/* pkg_dest.c - the itsy package management system
    … …  
    1070510679+    dest->root_dir = NULL;
    1070610680+}
    10707 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.h busybox-1.2.2.1/archival/libipkg/pkg_dest.h
     10681diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.h busybox-1.2.2.1/archival/libipkg/pkg_dest.h
    1070810682--- busybox-1.2.2.1.orig/archival/libipkg/pkg_dest.h    1970-01-01 01:00:00.000000000 +0100
    10709 +++ busybox-1.2.2.1/archival/libipkg/pkg_dest.h 2006-11-03 14:17:31.000000000 +0100
     10683+++ busybox-1.2.2.1/archival/libipkg/pkg_dest.h 2006-12-20 09:07:42.000000000 +0100
    1071010684@@ -0,0 +1,38 @@
    1071110685+/* pkg_dest.h - the itsy package management system
    … …  
    1074710721+#endif
    1074810722+
    10749 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
     10723diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.2.2.1/archival/libipkg/pkg_dest_list.c
    1075010724--- busybox-1.2.2.1.orig/archival/libipkg/pkg_dest_list.c       1970-01-01 01:00:00.000000000 +0100
    10751 +++ busybox-1.2.2.1/archival/libipkg/pkg_dest_list.c    2006-11-03 14:17:31.000000000 +0100
     10725+++ busybox-1.2.2.1/archival/libipkg/pkg_dest_list.c    2006-12-20 09:07:42.000000000 +0100
    1075210726@@ -0,0 +1,85 @@
    1075310727+/* pkg_dest_list.c - the itsy package management system
    … …  
    1083610810+    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
    1083710811+}
    10838 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
     10812diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.2.2.1/archival/libipkg/pkg_dest_list.h
    1083910813--- busybox-1.2.2.1.orig/archival/libipkg/pkg_dest_list.h       1970-01-01 01:00:00.000000000 +0100
    10840 +++ busybox-1.2.2.1/archival/libipkg/pkg_dest_list.h    2006-11-03 14:17:31.000000000 +0100
     10814+++ busybox-1.2.2.1/archival/libipkg/pkg_dest_list.h    2006-12-20 09:07:42.000000000 +0100
    1084110815@@ -0,0 +1,50 @@
    1084210816+/* pkg_dest_list.h - the itsy package management system
    … …  
    1089010864+#endif
    1089110865+
    10892 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.c busybox-1.2.2.1/archival/libipkg/pkg_extract.c
     10866diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.c busybox-1.2.2.1/archival/libipkg/pkg_extract.c
    1089310867--- busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100
    10894 +++ busybox-1.2.2.1/archival/libipkg/pkg_extract.c      2006-11-03 14:17:31.000000000 +0100
     10868+++ busybox-1.2.2.1/archival/libipkg/pkg_extract.c      2006-12-20 09:07:42.000000000 +0100
    1089510869@@ -0,0 +1,224 @@
    1089610870+/* pkg_extract.c - the itsy package management system
    … …  
    1111811092+       return 0;
    1111911093+}
    11120 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.h busybox-1.2.2.1/archival/libipkg/pkg_extract.h
     11094diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.h busybox-1.2.2.1/archival/libipkg/pkg_extract.h
    1112111095--- busybox-1.2.2.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100
    11122 +++ busybox-1.2.2.1/archival/libipkg/pkg_extract.h      2006-11-03 14:17:31.000000000 +0100
     11096+++ busybox-1.2.2.1/archival/libipkg/pkg_extract.h      2006-12-20 09:07:42.000000000 +0100
    1112311097@@ -0,0 +1,32 @@
    1112411098+/* pkg_extract.c - the itsy package management system
    … …  
    1115411128+
    1115511129+#endif
    11156 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg.h busybox-1.2.2.1/archival/libipkg/pkg.h
     11130diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg.h busybox-1.2.2.1/archival/libipkg/pkg.h
    1115711131--- busybox-1.2.2.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100
    11158 +++ busybox-1.2.2.1/archival/libipkg/pkg.h      2006-11-03 14:17:31.000000000 +0100
     11132+++ busybox-1.2.2.1/archival/libipkg/pkg.h      2006-12-20 09:07:48.000000000 +0100
    1115911133@@ -0,0 +1,232 @@
    1116011134+/* pkg.h - the itsy package management system
    … …  
    1135411328+
    1135511329+int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg);
    11356 +int pkg_name_version_and_architecture_compare(void *a, void *b);
    11357 +int abstract_pkg_name_compare(void *a, void *b);
     11330+int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b);
     11331+int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b);
    1135811332+
    1135911333+char * pkg_formatted_info(pkg_t *pkg );
    … …  
    1139011364+
    1139111365+#endif
    11392 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.c busybox-1.2.2.1/archival/libipkg/pkg_hash.c
     11366diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.c busybox-1.2.2.1/archival/libipkg/pkg_hash.c
    1139311367--- busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.c    1970-01-01 01:00:00.000000000 +0100
    11394 +++ busybox-1.2.2.1/archival/libipkg/pkg_hash.c 2006-11-03 14:17:31.000000000 +0100
    11395 @@ -0,0 +1,617 @@
     11368+++ busybox-1.2.2.1/archival/libipkg/pkg_hash.c 2006-12-20 09:07:48.000000000 +0100
     11369@@ -0,0 +1,616 @@
    1139611370+/* ipkg_hash.c - the itsy package management system
    1139711371+
    … …  
    1154011514+                                                 int (*constraint_fcn)(pkg_t *pkg, void *cdata), void *cdata, int quiet)
    1154111515+{
    11542 +     int i;
     11516+     int i, j;
    1154311517+     int nprovides = 0;
    1154411518+     int nmatching = 0;
    … …  
    1160611580+         {
    1160711581+              int max_count = 0;
    11608 +              int i;
    1160911582+
    1161011583+              /* count packages matching max arch priority and keep track of last one */
    11611 +              for (i = 0; i < vec->len; i++) {
    11612 +                   pkg_t *maybe = vec->pkgs[i];
     11584+              for (j = 0; j < vec->len; j++) {
     11585+                   pkg_t *maybe = vec->pkgs[j];
    1161311586+                   ipkg_message(conf, IPKG_DEBUG, "  %s arch=%s arch_priority=%d version=%s  \n",
    1161411587+                                maybe->name, maybe->architecture, maybe->arch_priority, maybe->version);
    … …  
    1201211985+
    1201311986+
    12014 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.h busybox-1.2.2.1/archival/libipkg/pkg_hash.h
     11987diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.h busybox-1.2.2.1/archival/libipkg/pkg_hash.h
    1201511988--- busybox-1.2.2.1.orig/archival/libipkg/pkg_hash.h    1970-01-01 01:00:00.000000000 +0100
    12016 +++ busybox-1.2.2.1/archival/libipkg/pkg_hash.h 2006-11-03 14:17:31.000000000 +0100
     11989+++ busybox-1.2.2.1/archival/libipkg/pkg_hash.h 2006-12-20 09:07:42.000000000 +0100
    1201711990@@ -0,0 +1,61 @@
    1201811991+/* pkg_hash.h - the itsy package management system
    … …  
    1207712050+#endif
    1207812051+
    12079 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.c busybox-1.2.2.1/archival/libipkg/pkg_parse.c
     12052diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.c busybox-1.2.2.1/archival/libipkg/pkg_parse.c
    1208012053--- busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.c   1970-01-01 01:00:00.000000000 +0100
    12081 +++ busybox-1.2.2.1/archival/libipkg/pkg_parse.c        2006-11-03 14:17:31.000000000 +0100
     12054+++ busybox-1.2.2.1/archival/libipkg/pkg_parse.c        2006-12-20 09:07:42.000000000 +0100
    1208212055@@ -0,0 +1,366 @@
    1208312056+/* pkg_parse.c - the itsy package management system
    … …  
    1244712420+    return 0;
    1244812421+}
    12449 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.h busybox-1.2.2.1/archival/libipkg/pkg_parse.h
     12422diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.h busybox-1.2.2.1/archival/libipkg/pkg_parse.h
    1245012423--- busybox-1.2.2.1.orig/archival/libipkg/pkg_parse.h   1970-01-01 01:00:00.000000000 +0100
    12451 +++ busybox-1.2.2.1/archival/libipkg/pkg_parse.h        2006-11-03 14:17:31.000000000 +0100
     12424+++ busybox-1.2.2.1/archival/libipkg/pkg_parse.h        2006-12-20 09:07:42.000000000 +0100
    1245212425@@ -0,0 +1,31 @@
    1245312426+/* pkg_parse.h - the itsy package management system
    … …  
    1248212455+
    1248312456+#endif
    12484 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_src.c busybox-1.2.2.1/archival/libipkg/pkg_src.c
     12457diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_src.c busybox-1.2.2.1/archival/libipkg/pkg_src.c
    1248512458--- busybox-1.2.2.1.orig/archival/libipkg/pkg_src.c     1970-01-01 01:00:00.000000000 +0100
    12486 +++ busybox-1.2.2.1/archival/libipkg/pkg_src.c  2006-11-03 14:17:31.000000000 +0100
     12459+++ busybox-1.2.2.1/archival/libipkg/pkg_src.c  2006-12-20 09:07:42.000000000 +0100
    1248712460@@ -0,0 +1,43 @@
    1248812461+/* pkg_src.c - the itsy package management system
    … …  
    1252912502+
    1253012503+
    12531 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_src.h busybox-1.2.2.1/archival/libipkg/pkg_src.h
     12504diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_src.h busybox-1.2.2.1/archival/libipkg/pkg_src.h
    1253212505--- busybox-1.2.2.1.orig/archival/libipkg/pkg_src.h     1970-01-01 01:00:00.000000000 +0100
    12533 +++ busybox-1.2.2.1/archival/libipkg/pkg_src.h  2006-11-03 14:17:31.000000000 +0100
     12506+++ busybox-1.2.2.1/archival/libipkg/pkg_src.h  2006-12-20 09:07:42.000000000 +0100
    1253412507@@ -0,0 +1,34 @@
    1253512508+/* pkg_src.h - the itsy package management system
    … …  
    1256712540+
    1256812541+#endif
    12569 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
     12542diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_src_list.c busybox-1.2.2.1/archival/libipkg/pkg_src_list.c
    1257012543--- busybox-1.2.2.1.orig/archival/libipkg/pkg_src_list.c        1970-01-01 01:00:00.000000000 +0100
    12571 +++ busybox-1.2.2.1/archival/libipkg/pkg_src_list.c     2006-11-03 14:17:31.000000000 +0100
     12544+++ busybox-1.2.2.1/archival/libipkg/pkg_src_list.c     2006-12-20 09:07:42.000000000 +0100
    1257212545@@ -0,0 +1,75 @@
    1257312546+/* pkg_src_list.c - the itsy package management system
    … …  
    1264612619+    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
    1264712620+}
    12648 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
     12621diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_src_list.h busybox-1.2.2.1/archival/libipkg/pkg_src_list.h
    1264912622--- busybox-1.2.2.1.orig/archival/libipkg/pkg_src_list.h        1970-01-01 01:00:00.000000000 +0100
    12650 +++ busybox-1.2.2.1/archival/libipkg/pkg_src_list.h     2006-11-03 14:17:31.000000000 +0100
     12623+++ busybox-1.2.2.1/archival/libipkg/pkg_src_list.h     2006-12-20 09:07:42.000000000 +0100
    1265112624@@ -0,0 +1,57 @@
    1265212625+/* pkg_src_list.h - the itsy package management system
    … …  
    1270712680+#endif
    1270812681+
    12709 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.c busybox-1.2.2.1/archival/libipkg/pkg_vec.c
     12682diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.c busybox-1.2.2.1/archival/libipkg/pkg_vec.c
    1271012683--- busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.c     1970-01-01 01:00:00.000000000 +0100
    12711 +++ busybox-1.2.2.1/archival/libipkg/pkg_vec.c  2006-11-03 14:17:31.000000000 +0100
     12684+++ busybox-1.2.2.1/archival/libipkg/pkg_vec.c  2006-12-20 09:07:42.000000000 +0100
    1271212685@@ -0,0 +1,230 @@
    1271312686+/* pkg_vec.c - the itsy package management system
    … …  
    1294112914+}
    1294212915+
    12943 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.h busybox-1.2.2.1/archival/libipkg/pkg_vec.h
     12916diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.h busybox-1.2.2.1/archival/libipkg/pkg_vec.h
    1294412917--- busybox-1.2.2.1.orig/archival/libipkg/pkg_vec.h     1970-01-01 01:00:00.000000000 +0100
    12945 +++ busybox-1.2.2.1/archival/libipkg/pkg_vec.h  2006-11-03 14:17:31.000000000 +0100
    12946 @@ -0,0 +1,62 @@
     12918+++ busybox-1.2.2.1/archival/libipkg/pkg_vec.h  2006-12-20 09:07:48.000000000 +0100
     12919@@ -0,0 +1,64 @@
    1294712920+/* pkg_vec.h - the itsy package management system
    1294812921+
    … …  
    1298212955+typedef struct abstract_pkg_vec abstract_pkg_vec_t;
    1298312956+
     12957+typedef int (*pkg_compar_t)(pkg_t *, pkg_t *);
     12958+typedef int (*abstract_pkg_compar_t)(abstract_pkg_t *, abstract_pkg_t *);
    1298412959+
    1298512960+pkg_vec_t * pkg_vec_alloc(void);
    … …  
    1300712982+#endif
    1300812983+
    13009 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.2.2.1/archival/libipkg/sprintf_alloc.h
     12984diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.2.2.1/archival/libipkg/sprintf_alloc.h
    1301012985--- busybox-1.2.2.1.orig/archival/libipkg/sprintf_alloc.h       1970-01-01 01:00:00.000000000 +0100
    13011 +++ busybox-1.2.2.1/archival/libipkg/sprintf_alloc.h    2006-11-03 14:17:31.000000000 +0100
     12986+++ busybox-1.2.2.1/archival/libipkg/sprintf_alloc.h    2006-12-20 09:07:42.000000000 +0100
    1301212987@@ -0,0 +1,25 @@
    1301312988+/* sprintf_alloca.c -- like sprintf with memory allocation
    … …  
    1303613011+
    1303713012+#endif
    13038 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/str_list.c busybox-1.2.2.1/archival/libipkg/str_list.c
     13013diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/str_list.c busybox-1.2.2.1/archival/libipkg/str_list.c
    1303913014--- busybox-1.2.2.1.orig/archival/libipkg/str_list.c    1970-01-01 01:00:00.000000000 +0100
    13040 +++ busybox-1.2.2.1/archival/libipkg/str_list.c 2006-11-03 14:17:31.000000000 +0100
     13015+++ busybox-1.2.2.1/archival/libipkg/str_list.c 2006-12-20 09:07:42.000000000 +0100
    1304113016@@ -0,0 +1,76 @@
    1304213017+/* str_list.c - the itsy package management system
    … …  
    1311613091+                                        (void_list_cmp_t)strcmp);
    1311713092+}
    13118 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/str_list.h busybox-1.2.2.1/archival/libipkg/str_list.h
     13093diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/str_list.h busybox-1.2.2.1/archival/libipkg/str_list.h
    1311913094--- busybox-1.2.2.1.orig/archival/libipkg/str_list.h    1970-01-01 01:00:00.000000000 +0100
    13120 +++ busybox-1.2.2.1/archival/libipkg/str_list.h 2006-11-03 14:17:31.000000000 +0100
     13095+++ busybox-1.2.2.1/archival/libipkg/str_list.h 2006-12-20 09:07:42.000000000 +0100
    1312113096@@ -0,0 +1,51 @@
    1312213097+/* str_list.h - the itsy package management system
    … …  
    1317113146+
    1317213147+#endif
    13173 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/str_util.c busybox-1.2.2.1/archival/libipkg/str_util.c
     13148diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/str_util.c busybox-1.2.2.1/archival/libipkg/str_util.c
    1317413149--- busybox-1.2.2.1.orig/archival/libipkg/str_util.c    1970-01-01 01:00:00.000000000 +0100
    13175 +++ busybox-1.2.2.1/archival/libipkg/str_util.c 2006-11-03 14:17:31.000000000 +0100
     13150+++ busybox-1.2.2.1/archival/libipkg/str_util.c 2006-12-20 09:07:42.000000000 +0100
    1317613151@@ -0,0 +1,73 @@
    1317713152+/* str_utils.c - the itsy package management system
    … …  
    1324813223+}
    1324913224+
    13250 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/str_util.h busybox-1.2.2.1/archival/libipkg/str_util.h
     13225diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/str_util.h busybox-1.2.2.1/archival/libipkg/str_util.h
    1325113226--- busybox-1.2.2.1.orig/archival/libipkg/str_util.h    1970-01-01 01:00:00.000000000 +0100
    13252 +++ busybox-1.2.2.1/archival/libipkg/str_util.h 2006-11-03 14:17:31.000000000 +0100
     13227+++ busybox-1.2.2.1/archival/libipkg/str_util.h 2006-12-20 09:07:42.000000000 +0100
    1325313228@@ -0,0 +1,28 @@
    1325413229+/* str_utils.h - the itsy package management system
    … …  
    1328013255+
    1328113256+#endif
    13282 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/user.c busybox-1.2.2.1/archival/libipkg/user.c
     13257diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/user.c busybox-1.2.2.1/archival/libipkg/user.c
    1328313258--- busybox-1.2.2.1.orig/archival/libipkg/user.c        1970-01-01 01:00:00.000000000 +0100
    13284 +++ busybox-1.2.2.1/archival/libipkg/user.c     2006-11-03 14:17:31.000000000 +0100
     13259+++ busybox-1.2.2.1/archival/libipkg/user.c     2006-12-20 09:07:42.000000000 +0100
    1328513260@@ -0,0 +1,58 @@
    1328613261+/* user.c - the itsy package management system
    … …  
    1334213317+     return response;
    1334313318+}
    13344 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/user.h busybox-1.2.2.1/archival/libipkg/user.h
     13319diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/user.h busybox-1.2.2.1/archival/libipkg/user.h
    1334513320--- busybox-1.2.2.1.orig/archival/libipkg/user.h        1970-01-01 01:00:00.000000000 +0100
    13346 +++ busybox-1.2.2.1/archival/libipkg/user.h     2006-11-03 14:17:31.000000000 +0100
     13321+++ busybox-1.2.2.1/archival/libipkg/user.h     2006-12-20 09:07:42.000000000 +0100
    1334713322@@ -0,0 +1,23 @@
    1334813323+/* user.c - the itsy package management system
    … …  
    1336913344+char *get_user_response(const char *format, ...);
    1337013345+
    13371 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/void_list.c busybox-1.2.2.1/archival/libipkg/void_list.c
     13346diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/void_list.c busybox-1.2.2.1/archival/libipkg/void_list.c
    1337213347--- busybox-1.2.2.1.orig/archival/libipkg/void_list.c   1970-01-01 01:00:00.000000000 +0100
    13373 +++ busybox-1.2.2.1/archival/libipkg/void_list.c        2006-11-03 14:17:31.000000000 +0100
     13348+++ busybox-1.2.2.1/archival/libipkg/void_list.c        2006-12-20 09:07:42.000000000 +0100
    1337413349@@ -0,0 +1,194 @@
    1337513350+/* void_list.c - the itsy package management system
    … …  
    1356713542+         return NULL;
    1356813543+}
    13569 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/void_list.h busybox-1.2.2.1/archival/libipkg/void_list.h
     13544diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/void_list.h busybox-1.2.2.1/archival/libipkg/void_list.h
    1357013545--- busybox-1.2.2.1.orig/archival/libipkg/void_list.h   1970-01-01 01:00:00.000000000 +0100
    13571 +++ busybox-1.2.2.1/archival/libipkg/void_list.h        2006-11-03 14:17:31.000000000 +0100
     13546+++ busybox-1.2.2.1/archival/libipkg/void_list.h        2006-12-20 09:07:42.000000000 +0100
    1357213547@@ -0,0 +1,59 @@
    1357313548+/* void_list.h - the itsy package management system
    … …  
    1363013605+
    1363113606+#endif
    13632 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/xsystem.c busybox-1.2.2.1/archival/libipkg/xsystem.c
     13607diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/xsystem.c busybox-1.2.2.1/archival/libipkg/xsystem.c
    1363313608--- busybox-1.2.2.1.orig/archival/libipkg/xsystem.c     1970-01-01 01:00:00.000000000 +0100
    13634 +++ busybox-1.2.2.1/archival/libipkg/xsystem.c  2006-11-03 14:17:31.000000000 +0100
     13609+++ busybox-1.2.2.1/archival/libipkg/xsystem.c  2006-12-20 09:07:42.000000000 +0100
    1363513610@@ -0,0 +1,64 @@
    1363613611+/* xsystem.c - system(3) with error messages
    … …  
    1369813673+}
    1369913674+       
    13700 diff -Nur busybox-1.2.2.1.orig/archival/libipkg/xsystem.h busybox-1.2.2.1/archival/libipkg/xsystem.h
     13675diff -Nurp busybox-1.2.2.1.orig/archival/libipkg/xsystem.h busybox-1.2.2.1/archival/libipkg/xsystem.h
    1370113676--- busybox-1.2.2.1.orig/archival/libipkg/xsystem.h     1970-01-01 01:00:00.000000000 +0100
    13702 +++ busybox-1.2.2.1/archival/libipkg/xsystem.h  2006-11-03 14:17:31.000000000 +0100
     13677+++ busybox-1.2.2.1/archival/libipkg/xsystem.h  2006-12-20 09:07:42.000000000 +0100
    1370313678@@ -0,0 +1,34 @@
    1370413679+/* xsystem.h - system(3) with error messages
    … …  
    1373613711+#endif
    1373713712+       
    13738 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
     13713diff -Nurp busybox-1.2.2.1.orig/archival/libunarchive/data_extract_all.c busybox-1.2.2.1/archival/libunarchive/data_extract_all.c
    1373913714--- busybox-1.2.2.1.orig/archival/libunarchive/data_extract_all.c       2006-07-01 00:42:04.000000000 +0200
    13740 +++ busybox-1.2.2.1/archival/libunarchive/data_extract_all.c    2006-11-03 14:17:31.000000000 +0100
    13741 @@ -126,3 +126,17 @@
     13715+++ busybox-1.2.2.1/archival/libunarchive/data_extract_all.c    2006-12-20 09:07:42.000000000 +0100
     13716@@ -126,3 +126,17 @@ void data_extract_all(archive_handle_t *
    1374213717                utime(file_header->name, &t);
    1374313718        }
    … …  
    1375713732+}
    1375813733+
    13759 diff -Nur busybox-1.2.2.1.orig/archival/libunarchive/Makefile.in busybox-1.2.2.1/archival/libunarchive/Makefile.in
     13734diff -Nurp busybox-1.2.2.1.orig/archival/libunarchive/Makefile.in busybox-1.2.2.1/archival/libunarchive/Makefile.in
    1376013735--- busybox-1.2.2.1.orig/archival/libunarchive/Makefile.in      2006-07-01 00:42:03.000000000 +0200
    13761 +++ busybox-1.2.2.1/archival/libunarchive/Makefile.in   2006-11-03 14:17:31.000000000 +0100
    13762 @@ -58,6 +58,7 @@
     13736+++ busybox-1.2.2.1/archival/libunarchive/Makefile.in   2006-12-20 09:07:42.000000000 +0100
     13737@@ -58,6 +58,7 @@ LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_BZ
    1376313738 LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
    1376413739 LIBUNARCHIVE-$(CONFIG_GUNZIP) += $(GUNZIP_FILES)
    … …  
    1376813743 LIBUNARCHIVE-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o
    1376913744 LIBUNARCHIVE-$(CONFIG_TAR) += get_header_tar.o
    13770 diff -Nur busybox-1.2.2.1.orig/archival/Makefile.in busybox-1.2.2.1/archival/Makefile.in
     13745diff -Nurp busybox-1.2.2.1.orig/archival/Makefile.in busybox-1.2.2.1/archival/Makefile.in
    1377113746--- busybox-1.2.2.1.orig/archival/Makefile.in   2006-10-24 22:21:17.000000000 +0200
    13772 +++ busybox-1.2.2.1/archival/Makefile.in        2006-11-03 14:17:31.000000000 +0100
    13773 @@ -19,6 +19,7 @@
     13747+++ busybox-1.2.2.1/archival/Makefile.in        2006-12-20 09:07:42.000000000 +0100
     13748@@ -19,6 +19,7 @@ ARCHIVAL-$(CONFIG_DPKG)               += dpkg.o
    1377413749 ARCHIVAL-$(CONFIG_DPKG_DEB)    += dpkg_deb.o
    1377513750 ARCHIVAL-$(CONFIG_GUNZIP)      += gunzip.o
    … …  
    1377913754 ARCHIVAL-$(CONFIG_RPM)         += rpm.o
    1378013755 ARCHIVAL-$(CONFIG_TAR)         += tar.o
    13781 diff -Nur busybox-1.2.2.1.orig/include/applets.h busybox-1.2.2.1/include/applets.h
    13782 --- busybox-1.2.2.1.orig/include/applets.h      2006-11-03 14:17:11.000000000 +0100
    13783 +++ busybox-1.2.2.1/include/applets.h   2006-11-03 14:17:31.000000000 +0100
    13784 @@ -152,6 +152,7 @@
     13756diff -Nurp busybox-1.2.2.1.orig/include/applets.h busybox-1.2.2.1/include/applets.h
     13757--- busybox-1.2.2.1.orig/include/applets.h      2006-07-01 00:42:10.000000000 +0200
     13758+++ busybox-1.2.2.1/include/applets.h   2006-12-20 09:07:42.000000000 +0100
     13759@@ -152,6 +152,7 @@ USE_IPADDR(APPLET(ipaddr, _BB_DIR_BIN, _
    1378513760 USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER))
    1378613761 USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))
    … …  
    1379013765 USE_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_NEVER))
    1379113766 USE_IPTUNNEL(APPLET(iptunnel, _BB_DIR_BIN, _BB_SUID_NEVER))
    13792 diff -Nur busybox-1.2.2.1.orig/include/unarchive.h busybox-1.2.2.1/include/unarchive.h
     13767diff -Nurp busybox-1.2.2.1.orig/include/unarchive.h busybox-1.2.2.1/include/unarchive.h
    1379313768--- busybox-1.2.2.1.orig/include/unarchive.h    2006-07-01 00:42:10.000000000 +0200
    13794 +++ busybox-1.2.2.1/include/unarchive.h 2006-11-03 14:17:31.000000000 +0100
    13795 @@ -77,6 +77,7 @@
     13769+++ busybox-1.2.2.1/include/unarchive.h 2006-12-20 09:07:42.000000000 +0100
     13770@@ -77,6 +77,7 @@ extern void unpack_ar_archive(archive_ha
    1379613771 
    1379713772 extern void data_skip(archive_handle_t *archive_handle);
    … …  
    1380113776 extern void data_extract_to_buffer(archive_handle_t *archive_handle);
    1380213777 
    13803 diff -Nur busybox-1.2.2.1.orig/include/usage.h busybox-1.2.2.1/include/usage.h
    13804 --- busybox-1.2.2.1.orig/include/usage.h        2006-11-03 14:18:03.000000000 +0100
    13805 +++ busybox-1.2.2.1/include/usage.h     2006-11-03 14:17:31.000000000 +0100
    13806 @@ -982,6 +982,82 @@
     13778diff -Nurp busybox-1.2.2.1.orig/include/usage.h busybox-1.2.2.1/include/usage.h
     13779--- busybox-1.2.2.1.orig/include/usage.h        2006-07-01 00:42:10.000000000 +0200
     13780+++ busybox-1.2.2.1/include/usage.h     2006-12-20 09:07:42.000000000 +0100
     13781@@ -982,6 +982,82 @@ USE_FEATURE_DATE_ISOFMT( \
    1380713782        "$ ls -la /tmp/busybox*\n" \
    1380813783        "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
    … …  
    1388713862        "[-d<delay>] [-n<nosync>] [-f<force>]"
    1388813863 #define halt_full_usage \
    13889 diff -Nur busybox-1.2.2.1.orig/Makefile busybox-1.2.2.1/Makefile
     13864diff -Nurp busybox-1.2.2.1.orig/Makefile busybox-1.2.2.1/Makefile
    1389013865--- busybox-1.2.2.1.orig/Makefile       2006-07-29 00:53:44.000000000 +0200
    13891 +++ busybox-1.2.2.1/Makefile    2006-11-03 14:17:31.000000000 +0100
    13892 @@ -31,7 +31,7 @@
     13866+++ busybox-1.2.2.1/Makefile    2006-12-20 09:07:42.000000000 +0100
     13867@@ -31,7 +31,7 @@ endif
    1389313868 export srctree=$(top_srcdir)
    1389413869 vpath %/Config.in $(srctree)
Note: See TracChangeset for help on using the changeset viewer.