English Language flag
// Log In ​
// CVSweb ​
Project: FreeWRT
// Summary ​ // Activity ​ // Search ​ // Tracker ​ // Lists ​ // News ​ // SCM ​ // Wiki ​
// Access Source Code ​ // Browse Source Code ​

SCM Repository

project home | /[freewrt]/branches/common-nfo/package/busybox/patches/911-ipkg.patch
ViewVC logotype

Diff of /branches/common-nfo/package/busybox/patches/911-ipkg.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3426 by tg, Wed Jul 18 12:45:43 2007 UTC revision 3427 by tg, Wed Aug 8 11:08:41 2007 UTC
# Line 1  Line 1 
1  diff -Nur busybox-1.4.0.orig/archival/Config.in busybox-1.4.0/archival/Config.in  $FreeWRT$
2  --- busybox-1.4.0.orig/archival/Config.in       2007-01-19 22:23:02.000000000 +0100  
3  +++ busybox-1.4.0/archival/Config.in    2007-01-30 17:43:27.000000000 +0100          This consists of the “ipkg” applet addition patch
4  @@ -121,6 +121,14 @@          and a local modification to support firmwares w/o
5            the “diff” applet.
6    
7            submitted as http://bugs.busybox.net/view.php?id=1439
8    
9    --- busybox-1.4.2.orig/Makefile Sun Mar 18 18:00:41 2007
10    +++ busybox-1.4.2/Makefile      Fri Jul 20 12:11:06 2007
11    @@ -423,6 +423,7 @@ core-y              := \
12    
13     libs-y         := \
14                    archival/ \
15    +               archival/libipkg/ \
16                    archival/libunarchive/ \
17                    console-tools/ \
18                    coreutils/ \
19    --- busybox-1.4.2.orig/archival/Config.in       Sun Mar 18 16:59:04 2007
20    +++ busybox-1.4.2/archival/Config.in    Fri Jul 20 12:11:02 2007
21    @@ -121,6 +121,14 @@ config GZIP
22            gzip is used to compress files.            gzip is used to compress files.
23            It's probably the most widely used UNIX compression program.            It's probably the most widely used UNIX compression program.
24    
# Line 16  diff -Nur busybox-1.4.0.orig/archival/Co Line 33  diff -Nur busybox-1.4.0.orig/archival/Co
33   config RPM2CPIO   config RPM2CPIO
34          bool "rpm2cpio"          bool "rpm2cpio"
35          default n          default n
36  diff -Nur busybox-1.4.0.orig/archival/dpkg.c busybox-1.4.0/archival/dpkg.c  --- busybox-1.4.2.orig/archival/Kbuild  Sun Mar 18 16:59:04 2007
37  --- busybox-1.4.0.orig/archival/dpkg.c  2007-01-19 22:23:02.000000000 +0100  +++ busybox-1.4.2/archival/Kbuild       Fri Jul 20 12:11:02 2007
38  +++ busybox-1.4.0/archival/dpkg.c       2007-01-30 17:43:27.000000000 +0100  @@ -15,6 +15,7 @@ lib-$(CONFIG_DPKG)            += dpkg.o
39  @@ -1463,6 +1463,10 @@   lib-$(CONFIG_DPKG_DEB)         += dpkg_deb.o
40     lib-$(CONFIG_GUNZIP)           += gunzip.o
41     lib-$(CONFIG_GZIP)             += gzip.o
42    +lib-$(CONFIG_IPKG)             += ipkg.o
43     lib-$(CONFIG_RPM2CPIO)         += rpm2cpio.o
44     lib-$(CONFIG_RPM)              += rpm.o
45     lib-$(CONFIG_TAR)              += tar.o
46    --- busybox-1.4.2.orig/archival/dpkg.c  Sun Mar 18 16:59:04 2007
47    +++ busybox-1.4.2/archival/dpkg.c       Fri Jul 20 12:11:02 2007
48    @@ -1463,6 +1463,10 @@ static char *deb_extract_control_file_to
49          return ar_handle->sub_archive->buffer;          return ar_handle->sub_archive->buffer;
50   }   }
51    
# Line 30  diff -Nur busybox-1.4.0.orig/archival/dp Line 56  diff -Nur busybox-1.4.0.orig/archival/dp
56   static void data_extract_all_prefix(archive_handle_t *archive_handle)   static void data_extract_all_prefix(archive_handle_t *archive_handle)
57   {   {
58          char *name_ptr = archive_handle->file_header->name;          char *name_ptr = archive_handle->file_header->name;
59  @@ -1475,6 +1479,8 @@  @@ -1474,6 +1478,8 @@ static void data_extract_all_prefix(arch
60            }
61          return;          return;
62   }   }
   
 +*/  
63  +  +
64    +*/
65    
66   static void unpack_package(deb_file_t *deb_file)   static void unpack_package(deb_file_t *deb_file)
67   {   {
68          const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name];  --- busybox-1.4.2.orig/archival/ipkg.c  Thu Jan  1 00:00:00 1970
69  diff -Nur busybox-1.4.0.orig/archival/ipkg.c busybox-1.4.0/archival/ipkg.c  +++ busybox-1.4.2/archival/ipkg.c       Fri Jul 20 12:11:02 2007
 --- busybox-1.4.0.orig/archival/ipkg.c  1970-01-01 01:00:00.000000000 +0100  
 +++ busybox-1.4.0/archival/ipkg.c       2007-01-30 17:43:27.000000000 +0100  
70  @@ -0,0 +1,26 @@  @@ -0,0 +1,26 @@
71  +/* ipkg.c - the itsy package management system  +/* ipkg.c - the itsy package management system
72  +  +
# Line 69  diff -Nur busybox-1.4.0.orig/archival/ip Line 94  diff -Nur busybox-1.4.0.orig/archival/ip
94  +{  +{
95  +       return ipkg_op(argc, argv);  +       return ipkg_op(argc, argv);
96  +}  +}
97  diff -Nur busybox-1.4.0.orig/archival/Kbuild busybox-1.4.0/archival/Kbuild  --- busybox-1.4.2.orig/archival/libipkg/Kbuild  Thu Jan  1 00:00:00 1970
98  --- busybox-1.4.0.orig/archival/Kbuild  2007-01-19 22:23:02.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/Kbuild       Fri Jul 20 12:11:03 2007
99  +++ busybox-1.4.0/archival/Kbuild       2007-01-30 17:43:27.000000000 +0100  @@ -0,0 +1,60 @@
100  @@ -15,6 +15,7 @@  +# Makefile for busybox
101   lib-$(CONFIG_DPKG_DEB)         += dpkg_deb.o  +#
102   lib-$(CONFIG_GUNZIP)           += gunzip.o  +# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
103   lib-$(CONFIG_GZIP)             += gzip.o  +# Copyright (C) 2006 OpenWrt.org
104  +lib-$(CONFIG_IPKG)             += ipkg.o  +#
105   lib-$(CONFIG_RPM2CPIO)         += rpm2cpio.o  +# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
106   lib-$(CONFIG_RPM)              += rpm.o  +
107   lib-$(CONFIG_TAR)              += tar.o  +LIBIPKG_CORE_OBJS:= \
108  diff -Nur busybox-1.4.0.orig/archival/libipkg/args.c busybox-1.4.0/archival/libipkg/args.c  +       args.o \
109  --- busybox-1.4.0.orig/archival/libipkg/args.c  1970-01-01 01:00:00.000000000 +0100  +       libipkg.o \
110  +++ busybox-1.4.0/archival/libipkg/args.c       2007-01-30 17:43:27.000000000 +0100  +       user.o \
111    +
112    +LIBIPKG_CMD_OBJS:= \
113    +       ipkg_cmd.o \
114    +       ipkg_configure.o \
115    +       ipkg_download.o \
116    +       ipkg_install.o \
117    +       ipkg_remove.o \
118    +       ipkg_upgrade.o \
119    +
120    +LIBIPKG_DB_OBJS:= \
121    +       hash_table.o \
122    +       ipkg_conf.o \
123    +       ipkg_utils.o \
124    +       pkg.o \
125    +       pkg_depends.o \
126    +       pkg_extract.o \
127    +       pkg_hash.o \
128    +       pkg_parse.o \
129    +       pkg_vec.o \
130    +
131    +LIBIPKG_LIST_OBJS:= \
132    +       conffile.o \
133    +       conffile_list.o \
134    +       nv_pair.o \
135    +       nv_pair_list.o \
136    +       pkg_dest.o \
137    +       pkg_dest_list.o \
138    +       pkg_src.o \
139    +       pkg_src_list.o \
140    +       str_list.o \
141    +       void_list.o \
142    +
143    +LIBIPKG_UTIL_OBJS:= \
144    +       file_util.o \
145    +       ipkg_message.o \
146    +       str_util.o \
147    +       xsystem.o \
148    +
149    +lib-y :=
150    +lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS)
151    +lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS)
152    +lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS)
153    +lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS)
154    +lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS)
155    +
156    +ifeq ($(strip $(IPKG_ARCH)),)
157    +IPKG_ARCH:=$(TARGET_ARCH)
158    +endif
159    +CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
160    --- busybox-1.4.2.orig/archival/libipkg/args.c  Thu Jan  1 00:00:00 1970
161    +++ busybox-1.4.2/archival/libipkg/args.c       Fri Jul 20 12:11:02 2007
162  @@ -0,0 +1,242 @@  @@ -0,0 +1,242 @@
163  +/* args.c - parse command-line args  +/* args.c - parse command-line args
164  +  +
# Line 326  diff -Nur busybox-1.4.0.orig/archival/li Line 402  diff -Nur busybox-1.4.0.orig/archival/li
402  +{  +{
403  +       bb_error_msg("version %s\n", IPKG_VERSION);  +       bb_error_msg("version %s\n", IPKG_VERSION);
404  +}  +}
405  diff -Nur busybox-1.4.0.orig/archival/libipkg/args.h busybox-1.4.0/archival/libipkg/args.h  --- busybox-1.4.2.orig/archival/libipkg/args.h  Thu Jan  1 00:00:00 1970
406  --- busybox-1.4.0.orig/archival/libipkg/args.h  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/args.h       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/args.h       2007-01-30 17:43:27.000000000 +0100  
407  @@ -0,0 +1,72 @@  @@ -0,0 +1,72 @@
408  +/* args.h - parse command-line args  +/* args.h - parse command-line args
409  +  +
# Line 402  diff -Nur busybox-1.4.0.orig/archival/li Line 477  diff -Nur busybox-1.4.0.orig/archival/li
477  +void args_usage(char *complaint);  +void args_usage(char *complaint);
478  +  +
479  +#endif  +#endif
480  diff -Nur busybox-1.4.0.orig/archival/libipkg/conffile.c busybox-1.4.0/archival/libipkg/conffile.c  --- busybox-1.4.2.orig/archival/libipkg/conffile.c      Thu Jan  1 00:00:00 1970
481  --- busybox-1.4.0.orig/archival/libipkg/conffile.c      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/conffile.c   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/conffile.c   2007-01-30 17:43:27.000000000 +0100  
482  @@ -0,0 +1,64 @@  @@ -0,0 +1,64 @@
483  +/* conffile.c - the itsy package management system  +/* conffile.c - the itsy package management system
484  +  +
# Line 470  diff -Nur busybox-1.4.0.orig/archival/li Line 544  diff -Nur busybox-1.4.0.orig/archival/li
544  +  +
545  +    return ret;  +    return ret;
546  +}  +}
547  diff -Nur busybox-1.4.0.orig/archival/libipkg/conffile.h busybox-1.4.0/archival/libipkg/conffile.h  --- busybox-1.4.2.orig/archival/libipkg/conffile.h      Thu Jan  1 00:00:00 1970
548  --- busybox-1.4.0.orig/archival/libipkg/conffile.h      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/conffile.h   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/conffile.h   2007-01-30 17:43:27.000000000 +0100  
549  @@ -0,0 +1,30 @@  @@ -0,0 +1,30 @@
550  +/* conffile.h - the itsy package management system  +/* conffile.h - the itsy package management system
551  +  +
# Line 504  diff -Nur busybox-1.4.0.orig/archival/li Line 577  diff -Nur busybox-1.4.0.orig/archival/li
577  +  +
578  +#endif  +#endif
579  +  +
580  diff -Nur busybox-1.4.0.orig/archival/libipkg/conffile_list.c busybox-1.4.0/archival/libipkg/conffile_list.c  --- busybox-1.4.2.orig/archival/libipkg/conffile_list.c Thu Jan  1 00:00:00 1970
581  --- busybox-1.4.0.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/conffile_list.c      Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/conffile_list.c      2007-01-30 17:43:27.000000000 +0100  
582  @@ -0,0 +1,47 @@  @@ -0,0 +1,47 @@
583  +/* conffile_list.c - the itsy package management system  +/* conffile_list.c - the itsy package management system
584  +  +
# Line 555  diff -Nur busybox-1.4.0.orig/archival/li Line 627  diff -Nur busybox-1.4.0.orig/archival/li
627  +    return nv_pair_list_pop(list);  +    return nv_pair_list_pop(list);
628  +}  +}
629  +  +
630  diff -Nur busybox-1.4.0.orig/archival/libipkg/conffile_list.h busybox-1.4.0/archival/libipkg/conffile_list.h  --- busybox-1.4.2.orig/archival/libipkg/conffile_list.h Thu Jan  1 00:00:00 1970
631  --- busybox-1.4.0.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/conffile_list.h      Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/conffile_list.h      2007-01-30 17:43:27.000000000 +0100  
632  @@ -0,0 +1,36 @@  @@ -0,0 +1,36 @@
633  +/* conffile_list.h - the itsy package management system  +/* conffile_list.h - the itsy package management system
634  +  +
# Line 595  diff -Nur busybox-1.4.0.orig/archival/li Line 666  diff -Nur busybox-1.4.0.orig/archival/li
666  +  +
667  +#endif  +#endif
668  +  +
669  diff -Nur busybox-1.4.0.orig/archival/libipkg/file_util.c busybox-1.4.0/archival/libipkg/file_util.c  --- busybox-1.4.2.orig/archival/libipkg/file_util.c     Thu Jan  1 00:00:00 1970
670  --- busybox-1.4.0.orig/archival/libipkg/file_util.c     1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/file_util.c  Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/file_util.c  2007-01-30 17:43:27.000000000 +0100  
671  @@ -0,0 +1,132 @@  @@ -0,0 +1,132 @@
672  +/* file_util.c - convenience routines for common stat operations  +/* file_util.c - convenience routines for common stat operations
673  +  +
# Line 731  diff -Nur busybox-1.4.0.orig/archival/li Line 801  diff -Nur busybox-1.4.0.orig/archival/li
801  +    return hash_file(file_name, HASH_MD5);  +    return hash_file(file_name, HASH_MD5);
802  +}  +}
803  +  +
804  diff -Nur busybox-1.4.0.orig/archival/libipkg/file_util.h busybox-1.4.0/archival/libipkg/file_util.h  --- busybox-1.4.2.orig/archival/libipkg/file_util.h     Thu Jan  1 00:00:00 1970
805  --- busybox-1.4.0.orig/archival/libipkg/file_util.h     1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/file_util.h  Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/file_util.h  2007-01-30 17:43:27.000000000 +0100  
806  @@ -0,0 +1,29 @@  @@ -0,0 +1,29 @@
807  +/* file_util.h - convenience routines for common file operations  +/* file_util.h - convenience routines for common file operations
808  +  +
# Line 764  diff -Nur busybox-1.4.0.orig/archival/li Line 833  diff -Nur busybox-1.4.0.orig/archival/li
833  +char *file_md5sum_alloc(const char *file_name);  +char *file_md5sum_alloc(const char *file_name);
834  +  +
835  +#endif  +#endif
836  diff -Nur busybox-1.4.0.orig/archival/libipkg/hash_table.c busybox-1.4.0/archival/libipkg/hash_table.c  --- busybox-1.4.2.orig/archival/libipkg/hash_table.c    Thu Jan  1 00:00:00 1970
837  --- busybox-1.4.0.orig/archival/libipkg/hash_table.c    1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/hash_table.c Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/hash_table.c 2007-01-30 17:43:27.000000000 +0100  
838  @@ -0,0 +1,155 @@  @@ -0,0 +1,155 @@
839  +/* hash.c - hash tables for ipkg  +/* hash.c - hash tables for ipkg
840  +  +
# Line 923  diff -Nur busybox-1.4.0.orig/archival/li Line 991  diff -Nur busybox-1.4.0.orig/archival/li
991  +    }  +    }
992  +}  +}
993  +  +
994  diff -Nur busybox-1.4.0.orig/archival/libipkg/hash_table.h busybox-1.4.0/archival/libipkg/hash_table.h  --- busybox-1.4.2.orig/archival/libipkg/hash_table.h    Thu Jan  1 00:00:00 1970
995  --- busybox-1.4.0.orig/archival/libipkg/hash_table.h    1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/hash_table.h Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/hash_table.h 2007-01-30 17:43:27.000000000 +0100  
996  @@ -0,0 +1,44 @@  @@ -0,0 +1,44 @@
997  +/* hash.h - hash tables for ipkg  +/* hash.h - hash tables for ipkg
998  +  +
# Line 971  diff -Nur busybox-1.4.0.orig/archival/li Line 1038  diff -Nur busybox-1.4.0.orig/archival/li
1038  +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);  +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);
1039  +  +
1040  +#endif /* _HASH_TABLE_H_ */  +#endif /* _HASH_TABLE_H_ */
1041  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.4.0/archival/libipkg/ipkg_cmd.c  --- busybox-1.4.2.orig/archival/libipkg/ipkg_cmd.c      Thu Jan  1 00:00:00 1970
1042  --- busybox-1.4.0.orig/archival/libipkg/ipkg_cmd.c      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_cmd.c   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_cmd.c   2007-01-30 18:21:14.000000000 +0100  
1043  @@ -0,0 +1,1431 @@  @@ -0,0 +1,1431 @@
1044  +/* ipkg_cmd.c - the itsy package management system  +/* ipkg_cmd.c - the itsy package management system
1045  +  +
# Line 2406  diff -Nur busybox-1.4.0.orig/archival/li Line 2472  diff -Nur busybox-1.4.0.orig/archival/li
2472  +}  +}
2473  +  +
2474  +  +
2475  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.4.0/archival/libipkg/ipkg_cmd.h  --- busybox-1.4.2.orig/archival/libipkg/ipkg_cmd.h      Thu Jan  1 00:00:00 1970
2476  --- busybox-1.4.0.orig/archival/libipkg/ipkg_cmd.h      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_cmd.h   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_cmd.h   2007-01-30 17:43:27.000000000 +0100  
2477  @@ -0,0 +1,46 @@  @@ -0,0 +1,46 @@
2478  +/* ipkg_cmd.h - the itsy package management system  +/* ipkg_cmd.h - the itsy package management system
2479  +  +
# Line 2456  diff -Nur busybox-1.4.0.orig/archival/li Line 2521  diff -Nur busybox-1.4.0.orig/archival/li
2521  +int pkg_mark_provides(pkg_t *pkg);  +int pkg_mark_provides(pkg_t *pkg);
2522  +  +
2523  +#endif  +#endif
2524  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_conf.c busybox-1.4.0/archival/libipkg/ipkg_conf.c  --- busybox-1.4.2.orig/archival/libipkg/ipkg_conf.c     Thu Jan  1 00:00:00 1970
2525  --- busybox-1.4.0.orig/archival/libipkg/ipkg_conf.c     1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_conf.c  Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_conf.c  2007-01-30 17:43:27.000000000 +0100  
2526  @@ -0,0 +1,711 @@  @@ -0,0 +1,711 @@
2527  +/* ipkg_conf.c - the itsy package management system  +/* ipkg_conf.c - the itsy package management system
2528  +  +
# Line 3171  diff -Nur busybox-1.4.0.orig/archival/li Line 3235  diff -Nur busybox-1.4.0.orig/archival/li
3235  +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);  +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
3236  +     return root_filename;  +     return root_filename;
3237  +}  +}
3238  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_conf.h busybox-1.4.0/archival/libipkg/ipkg_conf.h  --- busybox-1.4.2.orig/archival/libipkg/ipkg_conf.h     Thu Jan  1 00:00:00 1970
3239  --- busybox-1.4.0.orig/archival/libipkg/ipkg_conf.h     1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_conf.h  Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_conf.h  2007-01-30 17:43:27.000000000 +0100  
3240  @@ -0,0 +1,107 @@  @@ -0,0 +1,107 @@
3241  +/* ipkg_conf.h - the itsy package management system  +/* ipkg_conf.h - the itsy package management system
3242  +  +
# Line 3282  diff -Nur busybox-1.4.0.orig/archival/li Line 3345  diff -Nur busybox-1.4.0.orig/archival/li
3345  +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);  +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
3346  +  +
3347  +#endif  +#endif
3348  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_configure.c busybox-1.4.0/archival/libipkg/ipkg_configure.c  --- busybox-1.4.2.orig/archival/libipkg/ipkg_configure.c        Thu Jan  1 00:00:00 1970
3349  --- busybox-1.4.0.orig/archival/libipkg/ipkg_configure.c        1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_configure.c     Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_configure.c     2007-01-30 17:43:27.000000000 +0100  
3350  @@ -0,0 +1,40 @@  @@ -0,0 +1,40 @@
3351  +/* ipkg_configure.c - the itsy package management system  +/* ipkg_configure.c - the itsy package management system
3352  +  +
# Line 3326  diff -Nur busybox-1.4.0.orig/archival/li Line 3388  diff -Nur busybox-1.4.0.orig/archival/li
3388  +    return 0;  +    return 0;
3389  +}  +}
3390  +  +
3391  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_configure.h busybox-1.4.0/archival/libipkg/ipkg_configure.h  --- busybox-1.4.2.orig/archival/libipkg/ipkg_configure.h        Thu Jan  1 00:00:00 1970
3392  --- busybox-1.4.0.orig/archival/libipkg/ipkg_configure.h        1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_configure.h     Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_configure.h     2007-01-30 17:43:27.000000000 +0100  
3393  @@ -0,0 +1,25 @@  @@ -0,0 +1,25 @@
3394  +/* ipkg_configure.h - the itsy package management system  +/* ipkg_configure.h - the itsy package management system
3395  +  +
# Line 3355  diff -Nur busybox-1.4.0.orig/archival/li Line 3416  diff -Nur busybox-1.4.0.orig/archival/li
3416  +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);  +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
3417  +  +
3418  +#endif  +#endif
3419  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_download.c busybox-1.4.0/archival/libipkg/ipkg_download.c  --- busybox-1.4.2.orig/archival/libipkg/ipkg_download.c Thu Jan  1 00:00:00 1970
3420  --- busybox-1.4.0.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_download.c      Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_download.c      2007-01-30 17:43:27.000000000 +0100  
3421  @@ -0,0 +1,195 @@  @@ -0,0 +1,195 @@
3422  +/* ipkg_download.c - the itsy package management system  +/* ipkg_download.c - the itsy package management system
3423  +  +
# Line 3554  diff -Nur busybox-1.4.0.orig/archival/li Line 3614  diff -Nur busybox-1.4.0.orig/archival/li
3614  +     }  +     }
3615  +     return 0;  +     return 0;
3616  +}  +}
3617  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_download.h busybox-1.4.0/archival/libipkg/ipkg_download.h  --- busybox-1.4.2.orig/archival/libipkg/ipkg_download.h Thu Jan  1 00:00:00 1970
3618  --- busybox-1.4.0.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_download.h      Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_download.h      2007-01-30 17:43:27.000000000 +0100  
3619  @@ -0,0 +1,30 @@  @@ -0,0 +1,30 @@
3620  +/* ipkg_download.h - the itsy package management system  +/* ipkg_download.h - the itsy package management system
3621  +  +
# Line 3588  diff -Nur busybox-1.4.0.orig/archival/li Line 3647  diff -Nur busybox-1.4.0.orig/archival/li
3647  +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);  +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
3648  +  +
3649  +#endif  +#endif
3650  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg.h busybox-1.4.0/archival/libipkg/ipkg.h  --- busybox-1.4.2.orig/archival/libipkg/ipkg.h  Thu Jan  1 00:00:00 1970
3651  --- busybox-1.4.0.orig/archival/libipkg/ipkg.h  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg.h       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg.h       2007-01-30 17:43:27.000000000 +0100  
3652  @@ -0,0 +1,74 @@  @@ -0,0 +1,74 @@
3653  +/* ipkg.h - the itsy package management system  +/* ipkg.h - the itsy package management system
3654  +  +
# Line 3666  diff -Nur busybox-1.4.0.orig/archival/li Line 3724  diff -Nur busybox-1.4.0.orig/archival/li
3724  +extern ipkg_conf_t *global_conf;  +extern ipkg_conf_t *global_conf;
3725  +  +
3726  +#endif  +#endif
3727  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_includes.h busybox-1.4.0/archival/libipkg/ipkg_includes.h  --- busybox-1.4.2.orig/archival/libipkg/ipkg_includes.h Thu Jan  1 00:00:00 1970
3728  --- busybox-1.4.0.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_includes.h      Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_includes.h      2007-01-30 17:43:27.000000000 +0100  
3729  @@ -0,0 +1,79 @@  @@ -0,0 +1,79 @@
3730  +#ifndef IPKG_INCLUDES_H  +#ifndef IPKG_INCLUDES_H
3731  +#define IPKG_INCLUDES_H  +#define IPKG_INCLUDES_H
# Line 3749  diff -Nur busybox-1.4.0.orig/archival/li Line 3806  diff -Nur busybox-1.4.0.orig/archival/li
3806  +#endif  +#endif
3807  +  +
3808  +#endif /* IPKG_INCLUDES_H */  +#endif /* IPKG_INCLUDES_H */
3809  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_install.c busybox-1.4.0/archival/libipkg/ipkg_install.c  --- busybox-1.4.2.orig/archival/libipkg/ipkg_install.c  Thu Jan  1 00:00:00 1970
3810  --- busybox-1.4.0.orig/archival/libipkg/ipkg_install.c  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_install.c       Fri Jul 20 12:11:07 2007
3811  +++ busybox-1.4.0/archival/libipkg/ipkg_install.c       2007-01-30 17:43:27.000000000 +0100  @@ -0,0 +1,1950 @@
 @@ -0,0 +1,1942 @@  
3812  +/* ipkg_install.c - the itsy package management system  +/* ipkg_install.c - the itsy package management system
3813  +  +
3814  +   Carl D. Worth  +   Carl D. Worth
# Line 5315  diff -Nur busybox-1.4.0.orig/archival/li Line 5371  diff -Nur busybox-1.4.0.orig/archival/li
5371  +                                      "       What would you like to do about it ?  Your options are:\n"  +                                      "       What would you like to do about it ?  Your options are:\n"
5372  +                                      "        Y or I  : install the package maintainer's version\n"  +                                      "        Y or I  : install the package maintainer's version\n"
5373  +                                      "        N or O  : keep your currently-installed version\n"  +                                      "        N or O  : keep your currently-installed version\n"
5374  +                                      "          D     : show the differences between the versions (if diff is installed)\n"  +#ifdef CONFIG_DIFF
5375    +                                      "          D     : show the differences between the versions\n"
5376    +#endif
5377  +                                      "     The default action is to keep your current version.\n"  +                                      "     The default action is to keep your current version.\n"
5378  +                                      "    *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name);  +                                      "    *** %s (Y/I/N/O"
5379    +#ifdef CONFIG_DIFF
5380    +                                                          "/D"
5381    +#endif
5382    +                                                             ") [default=N] ? ", file_name, short_file_name);
5383  +         if (strcmp(response, "y") == 0  +         if (strcmp(response, "y") == 0
5384  +             || strcmp(response, "i") == 0  +             || strcmp(response, "i") == 0
5385  +             || strcmp(response, "yes") == 0) {  +             || strcmp(response, "yes") == 0) {
# Line 5325  diff -Nur busybox-1.4.0.orig/archival/li Line 5387  diff -Nur busybox-1.4.0.orig/archival/li
5387  +              return 0;  +              return 0;
5388  +         }  +         }
5389  +  +
5390    +#ifdef CONFIG_DIFF
5391  +         if (strcmp(response, "d") == 0) {  +         if (strcmp(response, "d") == 0) {
5392  +              char *cmd;  +              char *cmd;
5393  +  +
# Line 5338  diff -Nur busybox-1.4.0.orig/archival/li Line 5401  diff -Nur busybox-1.4.0.orig/archival/li
5401  +              free(response);  +              free(response);
5402  +              continue;  +              continue;
5403  +         }  +         }
5404    +#endif
5405  +  +
5406  +         free(response);  +         free(response);
5407  +         return 1;  +         return 1;
# Line 5695  diff -Nur busybox-1.4.0.orig/archival/li Line 5759  diff -Nur busybox-1.4.0.orig/archival/li
5759  +}  +}
5760  +  +
5761  +#endif  +#endif
5762  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_install.h busybox-1.4.0/archival/libipkg/ipkg_install.h  --- busybox-1.4.2.orig/archival/libipkg/ipkg_install.h  Thu Jan  1 00:00:00 1970
5763  --- busybox-1.4.0.orig/archival/libipkg/ipkg_install.h  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_install.h       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_install.h       2007-01-30 17:43:27.000000000 +0100  
5764  @@ -0,0 +1,35 @@  @@ -0,0 +1,35 @@
5765  +/* ipkg_install.h - the itsy package management system  +/* ipkg_install.h - the itsy package management system
5766  +  +
# Line 5734  diff -Nur busybox-1.4.0.orig/archival/li Line 5797  diff -Nur busybox-1.4.0.orig/archival/li
5797  +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);  +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);
5798  +  +
5799  +#endif  +#endif
5800  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_message.c busybox-1.4.0/archival/libipkg/ipkg_message.c  --- busybox-1.4.2.orig/archival/libipkg/ipkg_message.c  Thu Jan  1 00:00:00 1970
5801  --- busybox-1.4.0.orig/archival/libipkg/ipkg_message.c  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_message.c       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_message.c       2007-01-30 17:43:27.000000000 +0100  
5802  @@ -0,0 +1,61 @@  @@ -0,0 +1,61 @@
5803  +/* ipkg_message.c - the itsy package management system  +/* ipkg_message.c - the itsy package management system
5804  +  +
# Line 5799  diff -Nur busybox-1.4.0.orig/archival/li Line 5861  diff -Nur busybox-1.4.0.orig/archival/li
5861  +       }  +       }
5862  +}  +}
5863  +#endif  +#endif
5864  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_message.h busybox-1.4.0/archival/libipkg/ipkg_message.h  --- busybox-1.4.2.orig/archival/libipkg/ipkg_message.h  Thu Jan  1 00:00:00 1970
5865  --- busybox-1.4.0.orig/archival/libipkg/ipkg_message.h  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_message.h       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_message.h       2007-01-30 17:43:27.000000000 +0100  
5866  @@ -0,0 +1,32 @@  @@ -0,0 +1,32 @@
5867  +/* ipkg_message.h - the itsy package management system  +/* ipkg_message.h - the itsy package management system
5868  +  +
# Line 5835  diff -Nur busybox-1.4.0.orig/archival/li Line 5896  diff -Nur busybox-1.4.0.orig/archival/li
5896  +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, char *fmt, ...);  +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, char *fmt, ...);
5897  +  +
5898  +#endif /* _IPKG_MESSAGE_H_ */  +#endif /* _IPKG_MESSAGE_H_ */
5899  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_remove.c busybox-1.4.0/archival/libipkg/ipkg_remove.c  --- busybox-1.4.2.orig/archival/libipkg/ipkg_remove.c   Thu Jan  1 00:00:00 1970
5900  --- busybox-1.4.0.orig/archival/libipkg/ipkg_remove.c   1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_remove.c        Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_remove.c        2007-01-30 17:43:27.000000000 +0100  
5901  @@ -0,0 +1,383 @@  @@ -0,0 +1,383 @@
5902  +/* ipkg_remove.c - the itsy package management system  +/* ipkg_remove.c - the itsy package management system
5903  +  +
# Line 6222  diff -Nur busybox-1.4.0.orig/archival/li Line 6282  diff -Nur busybox-1.4.0.orig/archival/li
6282  +  +
6283  +    return 0;  +    return 0;
6284  +}  +}
6285  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_remove.h busybox-1.4.0/archival/libipkg/ipkg_remove.h  --- busybox-1.4.2.orig/archival/libipkg/ipkg_remove.h   Thu Jan  1 00:00:00 1970
6286  --- busybox-1.4.0.orig/archival/libipkg/ipkg_remove.h   1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_remove.h        Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_remove.h        2007-01-30 17:43:27.000000000 +0100  
6287  @@ -0,0 +1,33 @@  @@ -0,0 +1,33 @@
6288  +/* ipkg_remove.h - the itsy package management system  +/* ipkg_remove.h - the itsy package management system
6289  +  +
# Line 6259  diff -Nur busybox-1.4.0.orig/archival/li Line 6318  diff -Nur busybox-1.4.0.orig/archival/li
6318  +  +
6319  +  +
6320  +#endif  +#endif
6321  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_upgrade.c busybox-1.4.0/archival/libipkg/ipkg_upgrade.c  --- busybox-1.4.2.orig/archival/libipkg/ipkg_upgrade.c  Thu Jan  1 00:00:00 1970
6322  --- busybox-1.4.0.orig/archival/libipkg/ipkg_upgrade.c  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_upgrade.c       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_upgrade.c       2007-01-30 17:43:27.000000000 +0100  
6323  @@ -0,0 +1,77 @@  @@ -0,0 +1,77 @@
6324  +/* ipkg_upgrade.c - the itsy package management system  +/* ipkg_upgrade.c - the itsy package management system
6325  +  +
# Line 6340  diff -Nur busybox-1.4.0.orig/archival/li Line 6398  diff -Nur busybox-1.4.0.orig/archival/li
6398  +     new->state_flag |= SF_USER;  +     new->state_flag |= SF_USER;
6399  +     return ipkg_install_pkg(conf, new,1);  +     return ipkg_install_pkg(conf, new,1);
6400  +}  +}
6401  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_upgrade.h busybox-1.4.0/archival/libipkg/ipkg_upgrade.h  --- busybox-1.4.2.orig/archival/libipkg/ipkg_upgrade.h  Thu Jan  1 00:00:00 1970
6402  --- busybox-1.4.0.orig/archival/libipkg/ipkg_upgrade.h  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_upgrade.h       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_upgrade.h       2007-01-30 17:43:27.000000000 +0100  
6403  @@ -0,0 +1,18 @@  @@ -0,0 +1,18 @@
6404  +/* ipkg_upgrade.c - the itsy package management system  +/* ipkg_upgrade.c - the itsy package management system
6405  +  +
# Line 6362  diff -Nur busybox-1.4.0.orig/archival/li Line 6419  diff -Nur busybox-1.4.0.orig/archival/li
6419  +#include "ipkg.h"  +#include "ipkg.h"
6420  +  +
6421  +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);  +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
6422  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_utils.c busybox-1.4.0/archival/libipkg/ipkg_utils.c  --- busybox-1.4.2.orig/archival/libipkg/ipkg_utils.c    Thu Jan  1 00:00:00 1970
6423  --- busybox-1.4.0.orig/archival/libipkg/ipkg_utils.c    1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_utils.c Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_utils.c 2007-01-30 17:43:27.000000000 +0100  
6424  @@ -0,0 +1,181 @@  @@ -0,0 +1,181 @@
6425  +/* ipkg_utils.c - the itsy package management system  +/* ipkg_utils.c - the itsy package management system
6426  +  +
# Line 6547  diff -Nur busybox-1.4.0.orig/archival/li Line 6603  diff -Nur busybox-1.4.0.orig/archival/li
6603  +}  +}
6604  +  +
6605  +        +      
6606  diff -Nur busybox-1.4.0.orig/archival/libipkg/ipkg_utils.h busybox-1.4.0/archival/libipkg/ipkg_utils.h  --- busybox-1.4.2.orig/archival/libipkg/ipkg_utils.h    Thu Jan  1 00:00:00 1970
6607  --- busybox-1.4.0.orig/archival/libipkg/ipkg_utils.h    1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/ipkg_utils.h Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/ipkg_utils.h 2007-01-30 17:43:27.000000000 +0100  
6608  @@ -0,0 +1,29 @@  @@ -0,0 +1,29 @@
6609  +/* ipkg_utils.h - the itsy package management system  +/* ipkg_utils.h - the itsy package management system
6610  +  +
# Line 6580  diff -Nur busybox-1.4.0.orig/archival/li Line 6635  diff -Nur busybox-1.4.0.orig/archival/li
6635  +int line_is_blank(const char *line);  +int line_is_blank(const char *line);
6636  +  +
6637  +#endif  +#endif
6638  diff -Nur busybox-1.4.0.orig/archival/libipkg/Kbuild busybox-1.4.0/archival/libipkg/Kbuild  --- busybox-1.4.2.orig/archival/libipkg/libipkg.c       Thu Jan  1 00:00:00 1970
6639  --- busybox-1.4.0.orig/archival/libipkg/Kbuild  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/libipkg.c    Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/Kbuild       2007-01-30 17:43:27.000000000 +0100  
 @@ -0,0 +1,60 @@  
 +# Makefile for busybox  
 +#  
 +# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>  
 +# Copyright (C) 2006 OpenWrt.org  
 +#  
 +# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.  
 +  
 +LIBIPKG_CORE_OBJS:= \  
 +       args.o \  
 +       libipkg.o \  
 +       user.o \  
 +  
 +LIBIPKG_CMD_OBJS:= \  
 +       ipkg_cmd.o \  
 +       ipkg_configure.o \  
 +       ipkg_download.o \  
 +       ipkg_install.o \  
 +       ipkg_remove.o \  
 +       ipkg_upgrade.o \  
 +  
 +LIBIPKG_DB_OBJS:= \  
 +       hash_table.o \  
 +       ipkg_conf.o \  
 +       ipkg_utils.o \  
 +       pkg.o \  
 +       pkg_depends.o \  
 +       pkg_extract.o \  
 +       pkg_hash.o \  
 +       pkg_parse.o \  
 +       pkg_vec.o \  
 +  
 +LIBIPKG_LIST_OBJS:= \  
 +       conffile.o \  
 +       conffile_list.o \  
 +       nv_pair.o \  
 +       nv_pair_list.o \  
 +       pkg_dest.o \  
 +       pkg_dest_list.o \  
 +       pkg_src.o \  
 +       pkg_src_list.o \  
 +       str_list.o \  
 +       void_list.o \  
 +  
 +LIBIPKG_UTIL_OBJS:= \  
 +       file_util.o \  
 +       ipkg_message.o \  
 +       str_util.o \  
 +       xsystem.o \  
 +  
 +lib-y :=  
 +lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS)  
 +lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS)  
 +lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS)  
 +lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS)  
 +lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS)  
 +  
 +ifeq ($(strip $(IPKG_ARCH)),)  
 +IPKG_ARCH:=$(TARGET_ARCH)  
 +endif  
 +CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""  
 diff -Nur busybox-1.4.0.orig/archival/libipkg/libipkg.c busybox-1.4.0/archival/libipkg/libipkg.c  
 --- busybox-1.4.0.orig/archival/libipkg/libipkg.c       1970-01-01 01:00:00.000000000 +0100  
 +++ busybox-1.4.0/archival/libipkg/libipkg.c    2007-01-30 18:22:30.000000000 +0100  
6640  @@ -0,0 +1,527 @@  @@ -0,0 +1,527 @@
6641  +/* ipkglib.c - the itsy package management system  +/* ipkglib.c - the itsy package management system
6642  +  +
# Line 7175  diff -Nur busybox-1.4.0.orig/archival/li Line 7165  diff -Nur busybox-1.4.0.orig/archival/li
7165  +}  +}
7166  +  +
7167  +#endif /* IPKG_LIB */  +#endif /* IPKG_LIB */
7168  diff -Nur busybox-1.4.0.orig/archival/libipkg/libipkg.h busybox-1.4.0/archival/libipkg/libipkg.h  --- busybox-1.4.2.orig/archival/libipkg/libipkg.h       Thu Jan  1 00:00:00 1970
7169  --- busybox-1.4.0.orig/archival/libipkg/libipkg.h       1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/libipkg.h    Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/libipkg.h    2007-01-30 17:43:27.000000000 +0100  
7170  @@ -0,0 +1,87 @@  @@ -0,0 +1,87 @@
7171  +/* ipkglib.h - the itsy package management system  +/* ipkglib.h - the itsy package management system
7172  +  +
# Line 7266  diff -Nur busybox-1.4.0.orig/archival/li Line 7255  diff -Nur busybox-1.4.0.orig/archival/li
7255  +  +
7256  +  +
7257  +#endif  +#endif
7258  diff -Nur busybox-1.4.0.orig/archival/libipkg/nv_pair.c busybox-1.4.0/archival/libipkg/nv_pair.c  --- busybox-1.4.2.orig/archival/libipkg/nv_pair.c       Thu Jan  1 00:00:00 1970
7259  --- busybox-1.4.0.orig/archival/libipkg/nv_pair.c       1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/nv_pair.c    Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/nv_pair.c    2007-01-30 17:43:27.000000000 +0100  
7260  @@ -0,0 +1,40 @@  @@ -0,0 +1,40 @@
7261  +/* nv_pair.c - the itsy package management system  +/* nv_pair.c - the itsy package management system
7262  +  +
# Line 7310  diff -Nur busybox-1.4.0.orig/archival/li Line 7298  diff -Nur busybox-1.4.0.orig/archival/li
7298  +}  +}
7299  +  +
7300  +  +
7301  diff -Nur busybox-1.4.0.orig/archival/libipkg/nv_pair.h busybox-1.4.0/archival/libipkg/nv_pair.h  --- busybox-1.4.2.orig/archival/libipkg/nv_pair.h       Thu Jan  1 00:00:00 1970
7302  --- busybox-1.4.0.orig/archival/libipkg/nv_pair.h       1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/nv_pair.h    Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/nv_pair.h    2007-01-30 17:43:27.000000000 +0100  
7303  @@ -0,0 +1,32 @@  @@ -0,0 +1,32 @@
7304  +/* nv_pair.h - the itsy package management system  +/* nv_pair.h - the itsy package management system
7305  +  +
# Line 7346  diff -Nur busybox-1.4.0.orig/archival/li Line 7333  diff -Nur busybox-1.4.0.orig/archival/li
7333  +  +
7334  +#endif  +#endif
7335  +  +
7336  diff -Nur busybox-1.4.0.orig/archival/libipkg/nv_pair_list.c busybox-1.4.0/archival/libipkg/nv_pair_list.c  --- busybox-1.4.2.orig/archival/libipkg/nv_pair_list.c  Thu Jan  1 00:00:00 1970
7337  --- busybox-1.4.0.orig/archival/libipkg/nv_pair_list.c  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/nv_pair_list.c       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/nv_pair_list.c       2007-01-30 17:43:27.000000000 +0100  
7338  @@ -0,0 +1,98 @@  @@ -0,0 +1,98 @@
7339  +/* nv_pair_list.c - the itsy package management system  +/* nv_pair_list.c - the itsy package management system
7340  +  +
# Line 7448  diff -Nur busybox-1.4.0.orig/archival/li Line 7434  diff -Nur busybox-1.4.0.orig/archival/li
7434  +     }      +     }    
7435  +     return NULL;  +     return NULL;
7436  +}  +}
7437  diff -Nur busybox-1.4.0.orig/archival/libipkg/nv_pair_list.h busybox-1.4.0/archival/libipkg/nv_pair_list.h  --- busybox-1.4.2.orig/archival/libipkg/nv_pair_list.h  Thu Jan  1 00:00:00 1970
7438  --- busybox-1.4.0.orig/archival/libipkg/nv_pair_list.h  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/nv_pair_list.h       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/nv_pair_list.h       2007-01-30 17:43:27.000000000 +0100  
7439  @@ -0,0 +1,60 @@  @@ -0,0 +1,60 @@
7440  +/* nv_pair_list.h - the itsy package management system  +/* nv_pair_list.h - the itsy package management system
7441  +  +
# Line 7512  diff -Nur busybox-1.4.0.orig/archival/li Line 7497  diff -Nur busybox-1.4.0.orig/archival/li
7497  +  +
7498  +#endif  +#endif
7499  +  +
7500  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg.c busybox-1.4.0/archival/libipkg/pkg.c  --- busybox-1.4.2.orig/archival/libipkg/pkg.c   Thu Jan  1 00:00:00 1970
7501  --- busybox-1.4.0.orig/archival/libipkg/pkg.c   1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg.c        Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg.c        2007-01-30 19:06:04.000000000 +0100  
7502  @@ -0,0 +1,1754 @@  @@ -0,0 +1,1754 @@
7503  +/* pkg.c - the itsy package management system  +/* pkg.c - the itsy package management system
7504  +  +
# Line 9270  diff -Nur busybox-1.4.0.orig/archival/li Line 9254  diff -Nur busybox-1.4.0.orig/archival/li
9254  +     }  +     }
9255  +     return 0;  +     return 0;
9256  +}  +}
9257  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_depends.c busybox-1.4.0/archival/libipkg/pkg_depends.c  --- busybox-1.4.2.orig/archival/libipkg/pkg_depends.c   Thu Jan  1 00:00:00 1970
9258  --- busybox-1.4.0.orig/archival/libipkg/pkg_depends.c   1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_depends.c        Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_depends.c        2007-01-30 18:50:32.000000000 +0100  
9259  @@ -0,0 +1,1031 @@  @@ -0,0 +1,1031 @@
9260  +/* pkg_depends.c - the itsy package management system  +/* pkg_depends.c - the itsy package management system
9261  +  +
# Line 10305  diff -Nur busybox-1.4.0.orig/archival/li Line 10288  diff -Nur busybox-1.4.0.orig/archival/li
10288  +  +
10289  +     return 0;  +     return 0;
10290  +}  +}
10291  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_depends.h busybox-1.4.0/archival/libipkg/pkg_depends.h  --- busybox-1.4.2.orig/archival/libipkg/pkg_depends.h   Thu Jan  1 00:00:00 1970
10292  --- busybox-1.4.0.orig/archival/libipkg/pkg_depends.h   1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_depends.h        Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_depends.h        2007-01-30 17:43:27.000000000 +0100  
10293  @@ -0,0 +1,105 @@  @@ -0,0 +1,105 @@
10294  +/* pkg_depends.h - the itsy package management system  +/* pkg_depends.h - the itsy package management system
10295  +  +
# Line 10414  diff -Nur busybox-1.4.0.orig/archival/li Line 10396  diff -Nur busybox-1.4.0.orig/archival/li
10396  +int pkg_dependence_satisfied(ipkg_conf_t *conf, depend_t *depend);  +int pkg_dependence_satisfied(ipkg_conf_t *conf, depend_t *depend);
10397  +  +
10398  +#endif  +#endif
10399  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_dest.c busybox-1.4.0/archival/libipkg/pkg_dest.c  --- busybox-1.4.2.orig/archival/libipkg/pkg_dest.c      Thu Jan  1 00:00:00 1970
10400  --- busybox-1.4.0.orig/archival/libipkg/pkg_dest.c      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_dest.c   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_dest.c   2007-01-30 17:43:27.000000000 +0100  
10401  @@ -0,0 +1,92 @@  @@ -0,0 +1,92 @@
10402  +/* pkg_dest.c - the itsy package management system  +/* pkg_dest.c - the itsy package management system
10403  +  +
# Line 10510  diff -Nur busybox-1.4.0.orig/archival/li Line 10491  diff -Nur busybox-1.4.0.orig/archival/li
10491  +  +
10492  +    dest->root_dir = NULL;  +    dest->root_dir = NULL;
10493  +}  +}
10494  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_dest.h busybox-1.4.0/archival/libipkg/pkg_dest.h  --- busybox-1.4.2.orig/archival/libipkg/pkg_dest.h      Thu Jan  1 00:00:00 1970
10495  --- busybox-1.4.0.orig/archival/libipkg/pkg_dest.h      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_dest.h   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_dest.h   2007-01-30 17:43:27.000000000 +0100  
10496  @@ -0,0 +1,38 @@  @@ -0,0 +1,38 @@
10497  +/* pkg_dest.h - the itsy package management system  +/* pkg_dest.h - the itsy package management system
10498  +  +
# Line 10552  diff -Nur busybox-1.4.0.orig/archival/li Line 10532  diff -Nur busybox-1.4.0.orig/archival/li
10532  +  +
10533  +#endif  +#endif
10534  +  +
10535  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_dest_list.c busybox-1.4.0/archival/libipkg/pkg_dest_list.c  --- busybox-1.4.2.orig/archival/libipkg/pkg_dest_list.c Thu Jan  1 00:00:00 1970
10536  --- busybox-1.4.0.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_dest_list.c      Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_dest_list.c      2007-01-30 17:43:27.000000000 +0100  
10537  @@ -0,0 +1,85 @@  @@ -0,0 +1,85 @@
10538  +/* pkg_dest_list.c - the itsy package management system  +/* pkg_dest_list.c - the itsy package management system
10539  +  +
# Line 10641  diff -Nur busybox-1.4.0.orig/archival/li Line 10620  diff -Nur busybox-1.4.0.orig/archival/li
10620  +{  +{
10621  +    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);  +    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
10622  +}  +}
10623  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_dest_list.h busybox-1.4.0/archival/libipkg/pkg_dest_list.h  --- busybox-1.4.2.orig/archival/libipkg/pkg_dest_list.h Thu Jan  1 00:00:00 1970
10624  --- busybox-1.4.0.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_dest_list.h      Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_dest_list.h      2007-01-30 17:43:27.000000000 +0100  
10625  @@ -0,0 +1,50 @@  @@ -0,0 +1,50 @@
10626  +/* pkg_dest_list.h - the itsy package management system  +/* pkg_dest_list.h - the itsy package management system
10627  +  +
# Line 10695  diff -Nur busybox-1.4.0.orig/archival/li Line 10673  diff -Nur busybox-1.4.0.orig/archival/li
10673  +  +
10674  +#endif  +#endif
10675  +  +
10676  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_extract.c busybox-1.4.0/archival/libipkg/pkg_extract.c  --- busybox-1.4.2.orig/archival/libipkg/pkg_extract.c   Thu Jan  1 00:00:00 1970
10677  --- busybox-1.4.0.orig/archival/libipkg/pkg_extract.c   1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_extract.c        Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_extract.c        2007-01-30 17:43:27.000000000 +0100  
10678  @@ -0,0 +1,224 @@  @@ -0,0 +1,224 @@
10679  +/* pkg_extract.c - the itsy package management system  +/* pkg_extract.c - the itsy package management system
10680  +  +
# Line 10923  diff -Nur busybox-1.4.0.orig/archival/li Line 10900  diff -Nur busybox-1.4.0.orig/archival/li
10900  +        +      
10901  +       return 0;  +       return 0;
10902  +}  +}
10903  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_extract.h busybox-1.4.0/archival/libipkg/pkg_extract.h  --- busybox-1.4.2.orig/archival/libipkg/pkg_extract.h   Thu Jan  1 00:00:00 1970
10904  --- busybox-1.4.0.orig/archival/libipkg/pkg_extract.h   1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_extract.h        Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_extract.h        2007-01-30 17:43:27.000000000 +0100  
10905  @@ -0,0 +1,32 @@  @@ -0,0 +1,32 @@
10906  +/* pkg_extract.c - the itsy package management system  +/* pkg_extract.c - the itsy package management system
10907  +  +
# Line 10959  diff -Nur busybox-1.4.0.orig/archival/li Line 10935  diff -Nur busybox-1.4.0.orig/archival/li
10935  +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);  +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
10936  +  +
10937  +#endif  +#endif
10938  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg.h busybox-1.4.0/archival/libipkg/pkg.h  --- busybox-1.4.2.orig/archival/libipkg/pkg.h   Thu Jan  1 00:00:00 1970
10939  --- busybox-1.4.0.orig/archival/libipkg/pkg.h   1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg.h        Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg.h        2007-01-30 19:05:56.000000000 +0100  
10940  @@ -0,0 +1,232 @@  @@ -0,0 +1,232 @@
10941  +/* pkg.h - the itsy package management system  +/* pkg.h - the itsy package management system
10942  +  +
# Line 11195  diff -Nur busybox-1.4.0.orig/archival/li Line 11170  diff -Nur busybox-1.4.0.orig/archival/li
11170  +int pkg_write_changed_filelists(ipkg_conf_t *conf);  +int pkg_write_changed_filelists(ipkg_conf_t *conf);
11171  +  +
11172  +#endif  +#endif
11173  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_hash.c busybox-1.4.0/archival/libipkg/pkg_hash.c  --- busybox-1.4.2.orig/archival/libipkg/pkg_hash.c      Thu Jan  1 00:00:00 1970
11174  --- busybox-1.4.0.orig/archival/libipkg/pkg_hash.c      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_hash.c   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_hash.c   2007-01-30 18:54:10.000000000 +0100  
11175  @@ -0,0 +1,617 @@  @@ -0,0 +1,617 @@
11176  +/* ipkg_hash.c - the itsy package management system  +/* ipkg_hash.c - the itsy package management system
11177  +  +
# Line 11816  diff -Nur busybox-1.4.0.orig/archival/li Line 11790  diff -Nur busybox-1.4.0.orig/archival/li
11790  +}  +}
11791  +  +
11792  +  +
11793  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_hash.h busybox-1.4.0/archival/libipkg/pkg_hash.h  --- busybox-1.4.2.orig/archival/libipkg/pkg_hash.h      Thu Jan  1 00:00:00 1970
11794  --- busybox-1.4.0.orig/archival/libipkg/pkg_hash.h      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_hash.h   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_hash.h   2007-01-30 17:43:27.000000000 +0100  
11795  @@ -0,0 +1,61 @@  @@ -0,0 +1,61 @@
11796  +/* pkg_hash.h - the itsy package management system  +/* pkg_hash.h - the itsy package management system
11797  +  +
# Line 11881  diff -Nur busybox-1.4.0.orig/archival/li Line 11854  diff -Nur busybox-1.4.0.orig/archival/li
11854  +  +
11855  +#endif  +#endif
11856  +  +
11857  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_parse.c busybox-1.4.0/archival/libipkg/pkg_parse.c  --- busybox-1.4.2.orig/archival/libipkg/pkg_parse.c     Thu Jan  1 00:00:00 1970
11858  --- busybox-1.4.0.orig/archival/libipkg/pkg_parse.c     1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_parse.c  Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_parse.c  2007-01-30 17:43:27.000000000 +0100  
11859  @@ -0,0 +1,366 @@  @@ -0,0 +1,366 @@
11860  +/* pkg_parse.c - the itsy package management system  +/* pkg_parse.c - the itsy package management system
11861  +  +
# Line 12251  diff -Nur busybox-1.4.0.orig/archival/li Line 12223  diff -Nur busybox-1.4.0.orig/archival/li
12223  +  +
12224  +    return 0;  +    return 0;
12225  +}  +}
12226  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_parse.h busybox-1.4.0/archival/libipkg/pkg_parse.h  --- busybox-1.4.2.orig/archival/libipkg/pkg_parse.h     Thu Jan  1 00:00:00 1970
12227  --- busybox-1.4.0.orig/archival/libipkg/pkg_parse.h     1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_parse.h  Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_parse.h  2007-01-30 17:43:27.000000000 +0100  
12228  @@ -0,0 +1,31 @@  @@ -0,0 +1,31 @@
12229  +/* pkg_parse.h - the itsy package management system  +/* pkg_parse.h - the itsy package management system
12230  +  +
# Line 12286  diff -Nur busybox-1.4.0.orig/archival/li Line 12257  diff -Nur busybox-1.4.0.orig/archival/li
12257  +int pkg_valorize_other_field(pkg_t *pkg, char ***raw);  +int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
12258  +  +
12259  +#endif  +#endif
12260  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_src.c busybox-1.4.0/archival/libipkg/pkg_src.c  --- busybox-1.4.2.orig/archival/libipkg/pkg_src.c       Thu Jan  1 00:00:00 1970
12261  --- busybox-1.4.0.orig/archival/libipkg/pkg_src.c       1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_src.c    Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_src.c    2007-01-30 17:43:27.000000000 +0100  
12262  @@ -0,0 +1,43 @@  @@ -0,0 +1,43 @@
12263  +/* pkg_src.c - the itsy package management system  +/* pkg_src.c - the itsy package management system
12264  +  +
# Line 12333  diff -Nur busybox-1.4.0.orig/archival/li Line 12303  diff -Nur busybox-1.4.0.orig/archival/li
12303  +}  +}
12304  +  +
12305  +  +
12306  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_src.h busybox-1.4.0/archival/libipkg/pkg_src.h  --- busybox-1.4.2.orig/archival/libipkg/pkg_src.h       Thu Jan  1 00:00:00 1970
12307  --- busybox-1.4.0.orig/archival/libipkg/pkg_src.h       1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_src.h    Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_src.h    2007-01-30 17:43:27.000000000 +0100  
12308  @@ -0,0 +1,34 @@  @@ -0,0 +1,34 @@
12309  +/* pkg_src.h - the itsy package management system  +/* pkg_src.h - the itsy package management system
12310  +  +
# Line 12371  diff -Nur busybox-1.4.0.orig/archival/li Line 12340  diff -Nur busybox-1.4.0.orig/archival/li
12340  +void pkg_src_deinit(pkg_src_t *src);  +void pkg_src_deinit(pkg_src_t *src);
12341  +  +
12342  +#endif  +#endif
12343  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_src_list.c busybox-1.4.0/archival/libipkg/pkg_src_list.c  --- busybox-1.4.2.orig/archival/libipkg/pkg_src_list.c  Thu Jan  1 00:00:00 1970
12344  --- busybox-1.4.0.orig/archival/libipkg/pkg_src_list.c  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_src_list.c       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_src_list.c       2007-01-30 17:43:27.000000000 +0100  
12345  @@ -0,0 +1,75 @@  @@ -0,0 +1,75 @@
12346  +/* pkg_src_list.c - the itsy package management system  +/* pkg_src_list.c - the itsy package management system
12347  +  +
# Line 12450  diff -Nur busybox-1.4.0.orig/archival/li Line 12418  diff -Nur busybox-1.4.0.orig/archival/li
12418  +{  +{
12419  +    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);  +    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
12420  +}  +}
12421  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_src_list.h busybox-1.4.0/archival/libipkg/pkg_src_list.h  --- busybox-1.4.2.orig/archival/libipkg/pkg_src_list.h  Thu Jan  1 00:00:00 1970
12422  --- busybox-1.4.0.orig/archival/libipkg/pkg_src_list.h  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_src_list.h       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_src_list.h       2007-01-30 17:43:27.000000000 +0100  
12423  @@ -0,0 +1,57 @@  @@ -0,0 +1,57 @@
12424  +/* pkg_src_list.h - the itsy package management system  +/* pkg_src_list.h - the itsy package management system
12425  +  +
# Line 12511  diff -Nur busybox-1.4.0.orig/archival/li Line 12478  diff -Nur busybox-1.4.0.orig/archival/li
12478  +  +
12479  +#endif  +#endif
12480  +  +
12481  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_vec.c busybox-1.4.0/archival/libipkg/pkg_vec.c  --- busybox-1.4.2.orig/archival/libipkg/pkg_vec.c       Thu Jan  1 00:00:00 1970
12482  --- busybox-1.4.0.orig/archival/libipkg/pkg_vec.c       1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_vec.c    Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_vec.c    2007-01-30 17:43:27.000000000 +0100  
12483  @@ -0,0 +1,230 @@  @@ -0,0 +1,230 @@
12484  +/* pkg_vec.c - the itsy package management system  +/* pkg_vec.c - the itsy package management system
12485  +  +
# Line 12745  diff -Nur busybox-1.4.0.orig/archival/li Line 12711  diff -Nur busybox-1.4.0.orig/archival/li
12711  +     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);  +     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
12712  +}  +}
12713  +  +
12714  diff -Nur busybox-1.4.0.orig/archival/libipkg/pkg_vec.h busybox-1.4.0/archival/libipkg/pkg_vec.h  --- busybox-1.4.2.orig/archival/libipkg/pkg_vec.h       Thu Jan  1 00:00:00 1970
12715  --- busybox-1.4.0.orig/archival/libipkg/pkg_vec.h       1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/pkg_vec.h    Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/pkg_vec.h    2007-01-30 17:43:27.000000000 +0100  
12716  @@ -0,0 +1,62 @@  @@ -0,0 +1,62 @@
12717  +/* pkg_vec.h - the itsy package management system  +/* pkg_vec.h - the itsy package management system
12718  +  +
# Line 12811  diff -Nur busybox-1.4.0.orig/archival/li Line 12776  diff -Nur busybox-1.4.0.orig/archival/li
12776  +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));  +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
12777  +#endif  +#endif
12778  +  +
12779  diff -Nur busybox-1.4.0.orig/archival/libipkg/sprintf_alloc.h busybox-1.4.0/archival/libipkg/sprintf_alloc.h  --- busybox-1.4.2.orig/archival/libipkg/sprintf_alloc.h Thu Jan  1 00:00:00 1970
12780  --- busybox-1.4.0.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/sprintf_alloc.h      Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/sprintf_alloc.h      2007-01-30 17:43:27.000000000 +0100  
12781  @@ -0,0 +1,25 @@  @@ -0,0 +1,25 @@
12782  +/* sprintf_alloca.c -- like sprintf with memory allocation  +/* sprintf_alloca.c -- like sprintf with memory allocation
12783  +  +
# Line 12840  diff -Nur busybox-1.4.0.orig/archival/li Line 12804  diff -Nur busybox-1.4.0.orig/archival/li
12804  +#define sprintf_alloc(str, fmt, args...)  *str = xasprintf(fmt, ## args)  +#define sprintf_alloc(str, fmt, args...)  *str = xasprintf(fmt, ## args)
12805  +  +
12806  +#endif  +#endif
12807  diff -Nur busybox-1.4.0.orig/archival/libipkg/str_list.c busybox-1.4.0/archival/libipkg/str_list.c  --- busybox-1.4.2.orig/archival/libipkg/str_list.c      Thu Jan  1 00:00:00 1970
12808  --- busybox-1.4.0.orig/archival/libipkg/str_list.c      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/str_list.c   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/str_list.c   2007-01-30 17:43:27.000000000 +0100  
12809  @@ -0,0 +1,76 @@  @@ -0,0 +1,76 @@
12810  +/* str_list.c - the itsy package management system  +/* str_list.c - the itsy package management system
12811  +  +
# Line 12920  diff -Nur busybox-1.4.0.orig/archival/li Line 12883  diff -Nur busybox-1.4.0.orig/archival/li
12883  +                                        (void *)target_str,  +                                        (void *)target_str,
12884  +                                        (void_list_cmp_t)strcmp);  +                                        (void_list_cmp_t)strcmp);
12885  +}  +}
12886  diff -Nur busybox-1.4.0.orig/archival/libipkg/str_list.h busybox-1.4.0/archival/libipkg/str_list.h  --- busybox-1.4.2.orig/archival/libipkg/str_list.h      Thu Jan  1 00:00:00 1970
12887  --- busybox-1.4.0.orig/archival/libipkg/str_list.h      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/str_list.h   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/str_list.h   2007-01-30 17:43:27.000000000 +0100  
12888  @@ -0,0 +1,51 @@  @@ -0,0 +1,51 @@
12889  +/* str_list.h - the itsy package management system  +/* str_list.h - the itsy package management system
12890  +  +
# Line 12975  diff -Nur busybox-1.4.0.orig/archival/li Line 12937  diff -Nur busybox-1.4.0.orig/archival/li
12937  +char *str_list_remove_elt(str_list_t *list, const char *target_str);  +char *str_list_remove_elt(str_list_t *list, const char *target_str);
12938  +  +
12939  +#endif  +#endif
12940  diff -Nur busybox-1.4.0.orig/archival/libipkg/str_util.c busybox-1.4.0/archival/libipkg/str_util.c  --- busybox-1.4.2.orig/archival/libipkg/str_util.c      Thu Jan  1 00:00:00 1970
12941  --- busybox-1.4.0.orig/archival/libipkg/str_util.c      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/str_util.c   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/str_util.c   2007-01-30 17:43:27.000000000 +0100  
12942  @@ -0,0 +1,73 @@  @@ -0,0 +1,73 @@
12943  +/* str_utils.c - the itsy package management system  +/* str_utils.c - the itsy package management system
12944  +  +
# Line 13052  diff -Nur busybox-1.4.0.orig/archival/li Line 13013  diff -Nur busybox-1.4.0.orig/archival/li
13013  +    return str ? strdup(str) : NULL;  +    return str ? strdup(str) : NULL;
13014  +}  +}
13015  +  +
13016  diff -Nur busybox-1.4.0.orig/archival/libipkg/str_util.h busybox-1.4.0/archival/libipkg/str_util.h  --- busybox-1.4.2.orig/archival/libipkg/str_util.h      Thu Jan  1 00:00:00 1970
13017  --- busybox-1.4.0.orig/archival/libipkg/str_util.h      1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/str_util.h   Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/str_util.h   2007-01-30 17:43:27.000000000 +0100  
13018  @@ -0,0 +1,28 @@  @@ -0,0 +1,28 @@
13019  +/* str_utils.h - the itsy package management system  +/* str_utils.h - the itsy package management system
13020  +  +
# Line 13084  diff -Nur busybox-1.4.0.orig/archival/li Line 13044  diff -Nur busybox-1.4.0.orig/archival/li
13044  +char *str_dup_safe(const char *str);  +char *str_dup_safe(const char *str);
13045  +  +
13046  +#endif  +#endif
13047  diff -Nur busybox-1.4.0.orig/archival/libipkg/user.c busybox-1.4.0/archival/libipkg/user.c  --- busybox-1.4.2.orig/archival/libipkg/user.c  Thu Jan  1 00:00:00 1970
13048  --- busybox-1.4.0.orig/archival/libipkg/user.c  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/user.c       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/user.c       2007-01-30 17:43:27.000000000 +0100  
13049  @@ -0,0 +1,58 @@  @@ -0,0 +1,58 @@
13050  +/* user.c - the itsy package management system  +/* user.c - the itsy package management system
13051  +  +
# Line 13146  diff -Nur busybox-1.4.0.orig/archival/li Line 13105  diff -Nur busybox-1.4.0.orig/archival/li
13105  +  +
13106  +     return response;  +     return response;
13107  +}  +}
13108  diff -Nur busybox-1.4.0.orig/archival/libipkg/user.h busybox-1.4.0/archival/libipkg/user.h  --- busybox-1.4.2.orig/archival/libipkg/user.h  Thu Jan  1 00:00:00 1970
13109  --- busybox-1.4.0.orig/archival/libipkg/user.h  1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/user.h       Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/user.h       2007-01-30 17:43:27.000000000 +0100  
13110  @@ -0,0 +1,23 @@  @@ -0,0 +1,23 @@
13111  +/* user.c - the itsy package management system  +/* user.c - the itsy package management system
13112  +  +
# Line 13173  diff -Nur busybox-1.4.0.orig/archival/li Line 13131  diff -Nur busybox-1.4.0.orig/archival/li
13131  +  +
13132  +char *get_user_response(const char *format, ...);  +char *get_user_response(const char *format, ...);
13133  +  +
13134  diff -Nur busybox-1.4.0.orig/archival/libipkg/void_list.c busybox-1.4.0/archival/libipkg/void_list.c  --- busybox-1.4.2.orig/archival/libipkg/void_list.c     Thu Jan  1 00:00:00 1970
13135  --- busybox-1.4.0.orig/archival/libipkg/void_list.c     1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/void_list.c  Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/void_list.c  2007-01-30 17:43:27.000000000 +0100  
13136  @@ -0,0 +1,194 @@  @@ -0,0 +1,194 @@
13137  +/* void_list.c - the itsy package management system  +/* void_list.c - the itsy package management system
13138  +  +
# Line 13371  diff -Nur busybox-1.4.0.orig/archival/li Line 13328  diff -Nur busybox-1.4.0.orig/archival/li
13328  +     else  +     else
13329  +         return NULL;  +         return NULL;
13330  +}  +}
13331  diff -Nur busybox-1.4.0.orig/archival/libipkg/void_list.h busybox-1.4.0/archival/libipkg/void_list.h  --- busybox-1.4.2.orig/archival/libipkg/void_list.h     Thu Jan  1 00:00:00 1970
13332  --- busybox-1.4.0.orig/archival/libipkg/void_list.h     1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/void_list.h  Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/void_list.h  2007-01-30 17:43:27.000000000 +0100  
13333  @@ -0,0 +1,59 @@  @@ -0,0 +1,59 @@
13334  +/* void_list.h - the itsy package management system  +/* void_list.h - the itsy package management system
13335  +  +
# Line 13434  diff -Nur busybox-1.4.0.orig/archival/li Line 13390  diff -Nur busybox-1.4.0.orig/archival/li
13390  +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);  +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
13391  +  +
13392  +#endif  +#endif
13393  diff -Nur busybox-1.4.0.orig/archival/libipkg/xsystem.c busybox-1.4.0/archival/libipkg/xsystem.c  --- busybox-1.4.2.orig/archival/libipkg/xsystem.c       Thu Jan  1 00:00:00 1970
13394  --- busybox-1.4.0.orig/archival/libipkg/xsystem.c       1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/xsystem.c    Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/xsystem.c    2007-01-30 17:43:27.000000000 +0100  
13395  @@ -0,0 +1,64 @@  @@ -0,0 +1,64 @@
13396  +/* xsystem.c - system(3) with error messages  +/* xsystem.c - system(3) with error messages
13397  +  +
# Line 13502  diff -Nur busybox-1.4.0.orig/archival/li Line 13457  diff -Nur busybox-1.4.0.orig/archival/li
13457  +    return -1;  +    return -1;
13458  +}  +}
13459  +          +        
13460  diff -Nur busybox-1.4.0.orig/archival/libipkg/xsystem.h busybox-1.4.0/archival/libipkg/xsystem.h  --- busybox-1.4.2.orig/archival/libipkg/xsystem.h       Thu Jan  1 00:00:00 1970
13461  --- busybox-1.4.0.orig/archival/libipkg/xsystem.h       1970-01-01 01:00:00.000000000 +0100  +++ busybox-1.4.2/archival/libipkg/xsystem.h    Fri Jul 20 12:11:03 2007
 +++ busybox-1.4.0/archival/libipkg/xsystem.h    2007-01-30 17:43:27.000000000 +0100  
13462  @@ -0,0 +1,34 @@  @@ -0,0 +1,34 @@
13463  +/* xsystem.h - system(3) with error messages  +/* xsystem.h - system(3) with error messages
13464  +  +
# Line 13540  diff -Nur busybox-1.4.0.orig/archival/li Line 13494  diff -Nur busybox-1.4.0.orig/archival/li
13494  +  +
13495  +#endif  +#endif
13496  +          +        
13497  diff -Nur busybox-1.4.0.orig/archival/libunarchive/data_extract_all.c busybox-1.4.0/archival/libunarchive/data_extract_all.c  --- busybox-1.4.2.orig/archival/libunarchive/Kbuild     Sun Mar 18 16:59:04 2007
13498  --- busybox-1.4.0.orig/archival/libunarchive/data_extract_all.c 2007-01-19 22:23:02.000000000 +0100  +++ busybox-1.4.2/archival/libunarchive/Kbuild  Fri Jul 20 12:11:03 2007
13499  +++ busybox-1.4.0/archival/libunarchive/data_extract_all.c      2007-01-30 17:43:27.000000000 +0100  @@ -47,6 +47,7 @@ lib-$(CONFIG_FEATURE_DEB_TAR_BZ2)     += dec
13500  @@ -117,3 +117,17 @@   lib-$(CONFIG_FEATURE_DEB_TAR_LZMA)     += decompress_unlzma.o get_header_tar_lzma.o
13501     lib-$(CONFIG_GUNZIP)                   += $(GUNZIP_FILES)
13502     lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS)        += decompress_uncompress.o
13503    +lib-$(CONFIG_IPKG)                     += $(GUNZIP_FILES) get_header_tar.o get_header_tar_gz.o
13504     lib-$(CONFIG_RPM2CPIO)                 += $(GUNZIP_FILES) get_header_cpio.o
13505     lib-$(CONFIG_RPM)                      += $(GUNZIP_FILES) get_header_cpio.o
13506     lib-$(CONFIG_TAR)                      += get_header_tar.o
13507    --- busybox-1.4.2.orig/archival/libunarchive/data_extract_all.c Sun Mar 18 16:59:04 2007
13508    +++ busybox-1.4.2/archival/libunarchive/data_extract_all.c      Fri Jul 20 12:11:03 2007
13509    @@ -117,3 +117,17 @@ void data_extract_all(archive_handle_t *
13510                  utime(file_header->name, &t);                  utime(file_header->name, &t);
13511          }          }
13512   }   }
13513  +  +
13514  +extern void data_extract_all_prefix(archive_handle_t *archive_handle)  +extern void
13515    +data_extract_all_prefix(archive_handle_t *archive_handle)
13516  +{  +{
13517  +       char *name_ptr = archive_handle->file_header->name;  +       char *name_ptr = archive_handle->file_header->name;
13518  +  +
# Line 13560  diff -Nur busybox-1.4.0.orig/archival/li Line 13524  diff -Nur busybox-1.4.0.orig/archival/li
13524  +               data_extract_all(archive_handle);  +               data_extract_all(archive_handle);
13525  +       }  +       }
13526  +}  +}
13527  +  --- busybox-1.4.2.orig/coreutils/md5_sha1_sum.c Sun Mar 18 16:59:07 2007
13528  diff -Nur busybox-1.4.0.orig/archival/libunarchive/Kbuild busybox-1.4.0/archival/libunarchive/Kbuild  +++ busybox-1.4.2/coreutils/md5_sha1_sum.c      Fri Jul 20 12:11:03 2007
 --- busybox-1.4.0.orig/archival/libunarchive/Kbuild     2007-01-19 22:23:02.000000000 +0100  
 +++ busybox-1.4.0/archival/libunarchive/Kbuild  2007-01-30 17:43:27.000000000 +0100  
 @@ -47,6 +47,7 @@  
  lib-$(CONFIG_FEATURE_DEB_TAR_LZMA)     += decompress_unlzma.o get_header_tar_lzma.o  
  lib-$(CONFIG_GUNZIP)                   += $(GUNZIP_FILES)  
  lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS)        += decompress_uncompress.o  
 +lib-$(CONFIG_IPKG)                     += $(GUNZIP_FILES) get_header_tar.o get_header_tar_gz.o  
  lib-$(CONFIG_RPM2CPIO)                 += $(GUNZIP_FILES) get_header_cpio.o  
  lib-$(CONFIG_RPM)                      += $(GUNZIP_FILES) get_header_cpio.o  
  lib-$(CONFIG_TAR)                      += get_header_tar.o  
 diff -Nur busybox-1.4.0.orig/coreutils/md5_sha1_sum.c busybox-1.4.0/coreutils/md5_sha1_sum.c  
 --- busybox-1.4.0.orig/coreutils/md5_sha1_sum.c 2007-01-19 22:23:05.000000000 +0100  
 +++ busybox-1.4.0/coreutils/md5_sha1_sum.c      2007-01-30 19:11:42.000000000 +0100  
13529  @@ -8,14 +8,12 @@  @@ -8,14 +8,12 @@
13530    
13531   #include "busybox.h"   #include "busybox.h"
# Line 13591  diff -Nur busybox-1.4.0.orig/coreutils/m Line 13542  diff -Nur busybox-1.4.0.orig/coreutils/m
13542                                  unsigned hash_length)                                  unsigned hash_length)
13543   {   {
13544          /* xzalloc zero-terminates */          /* xzalloc zero-terminates */
13545  @@ -24,7 +22,7 @@  @@ -24,7 +22,7 @@ static unsigned char *hash_bin_to_hex(un
13546          return hex_value;          return hex_value;
13547   }   }
13548    
# Line 13600  diff -Nur busybox-1.4.0.orig/coreutils/m Line 13551  diff -Nur busybox-1.4.0.orig/coreutils/m
13551   {   {
13552          int src_fd, hash_len, count;          int src_fd, hash_len, count;
13553          union _ctx_ {          union _ctx_ {
13554  diff -Nur busybox-1.4.0.orig/include/applets.h busybox-1.4.0/include/applets.h  --- busybox-1.4.2.orig/include/applets.h        Sun Mar 18 16:59:11 2007
13555  --- busybox-1.4.0.orig/include/applets.h        2007-01-20 16:34:47.000000000 +0100  +++ busybox-1.4.2/include/applets.h     Fri Jul 20 12:11:03 2007
13556  +++ busybox-1.4.0/include/applets.h     2007-01-30 17:43:27.000000000 +0100  @@ -160,6 +160,7 @@ USE_IPADDR(APPLET(ipaddr, _BB_DIR_BIN, _
 @@ -160,6 +160,7 @@  
13557   USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER))   USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER))
13558   USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))   USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))
13559   USE_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))   USE_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))
# Line 13611  diff -Nur busybox-1.4.0.orig/include/app Line 13561  diff -Nur busybox-1.4.0.orig/include/app
13561   USE_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_NEVER))   USE_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_NEVER))
13562   USE_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_NEVER))   USE_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_NEVER))
13563   USE_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_NEVER))   USE_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_NEVER))
13564  diff -Nur busybox-1.4.0.orig/include/libbb.h busybox-1.4.0/include/libbb.h  --- busybox-1.4.2.orig/include/libbb.h  Sun Mar 18 17:58:18 2007
13565  --- busybox-1.4.0.orig/include/libbb.h  2007-01-19 22:23:10.000000000 +0100  +++ busybox-1.4.2/include/libbb.h       Fri Jul 20 12:11:04 2007
13566  +++ busybox-1.4.0/include/libbb.h       2007-01-30 19:11:48.000000000 +0100  @@ -637,6 +637,7 @@ extern const char bb_uuenc_tbl_base64[];
 @@ -637,6 +637,7 @@  
13567   extern const char bb_uuenc_tbl_std[];   extern const char bb_uuenc_tbl_std[];
13568   void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl);   void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl);
13569    
# Line 13622  diff -Nur busybox-1.4.0.orig/include/lib Line 13571  diff -Nur busybox-1.4.0.orig/include/lib
13571   typedef struct sha1_ctx_t {   typedef struct sha1_ctx_t {
13572          uint32_t count[2];          uint32_t count[2];
13573          uint32_t hash[5];          uint32_t hash[5];
13574  @@ -645,6 +646,8 @@  @@ -645,6 +646,8 @@ typedef struct sha1_ctx_t {
13575   void sha1_begin(sha1_ctx_t *ctx);   void sha1_begin(sha1_ctx_t *ctx);
13576   void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx);   void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx);
13577   void *sha1_end(void *resbuf, sha1_ctx_t *ctx);   void *sha1_end(void *resbuf, sha1_ctx_t *ctx);
# Line 13631  diff -Nur busybox-1.4.0.orig/include/lib Line 13580  diff -Nur busybox-1.4.0.orig/include/lib
13580    
13581   typedef struct md5_ctx_t {   typedef struct md5_ctx_t {
13582          uint32_t A;          uint32_t A;
13583  diff -Nur busybox-1.4.0.orig/include/unarchive.h busybox-1.4.0/include/unarchive.h  --- busybox-1.4.2.orig/include/unarchive.h      Sun Mar 18 16:59:11 2007
13584  --- busybox-1.4.0.orig/include/unarchive.h      2007-01-19 22:23:10.000000000 +0100  +++ busybox-1.4.2/include/unarchive.h   Fri Jul 20 12:11:04 2007
13585  +++ busybox-1.4.0/include/unarchive.h   2007-01-30 17:43:27.000000000 +0100  @@ -76,6 +76,7 @@ extern void unpack_ar_archive(archive_ha
 @@ -76,6 +76,7 @@  
13586    
13587   extern void data_skip(archive_handle_t *archive_handle);   extern void data_skip(archive_handle_t *archive_handle);
13588   extern void data_extract_all(archive_handle_t *archive_handle);   extern void data_extract_all(archive_handle_t *archive_handle);
# Line 13642  diff -Nur busybox-1.4.0.orig/include/una Line 13590  diff -Nur busybox-1.4.0.orig/include/una
13590   extern void data_extract_to_stdout(archive_handle_t *archive_handle);   extern void data_extract_to_stdout(archive_handle_t *archive_handle);
13591   extern void data_extract_to_buffer(archive_handle_t *archive_handle);   extern void data_extract_to_buffer(archive_handle_t *archive_handle);
13592    
13593  diff -Nur busybox-1.4.0.orig/include/usage.h busybox-1.4.0/include/usage.h  --- busybox-1.4.2.orig/include/usage.h  Sun Mar 18 16:59:11 2007
13594  --- busybox-1.4.0.orig/include/usage.h  2007-01-19 22:23:10.000000000 +0100  +++ busybox-1.4.2/include/usage.h       Fri Jul 20 12:11:06 2007
 +++ busybox-1.4.0/include/usage.h       2007-01-30 17:43:27.000000000 +0100  
13595  @@ -1133,6 +1133,82 @@  @@ -1133,6 +1133,82 @@
13596          "$ ls -la /tmp/busybox*\n" \          "$ ls -la /tmp/busybox*\n" \
13597          "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"          "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
# Line 13728  diff -Nur busybox-1.4.0.orig/include/usa Line 13675  diff -Nur busybox-1.4.0.orig/include/usa
13675   #define halt_trivial_usage \   #define halt_trivial_usage \
13676          "[-d<delay>] [-n<nosync>] [-f<force>]"          "[-d<delay>] [-n<nosync>] [-f<force>]"
13677   #define halt_full_usage \   #define halt_full_usage \
 diff -Nur busybox-1.4.0.orig/Makefile busybox-1.4.0/Makefile  
 --- busybox-1.4.0.orig/Makefile 2007-01-20 21:21:39.000000000 +0100  
 +++ busybox-1.4.0/Makefile      2007-01-30 17:43:27.000000000 +0100  
 @@ -423,6 +423,7 @@  
   
  libs-y         := \  
                 archival/ \  
 +               archival/libipkg/ \  
                 archival/libunarchive/ \  
                 console-tools/ \  
                 coreutils/ \  
Legend:
Removed from v.3426  
changed lines
  Added in v.3427
root@freewrt.org:443
 ViewVC Help
Powered by ViewVC 1.1.20