upgrade busybox to v1.1.0-pre1
SVN-Revision: 2687
This commit is contained in:
parent
d18fb042fe
commit
a8c3b7c716
@ -13,11 +13,11 @@ PKG_SOURCE:=$(PKG_NAME)-snapshot.tar.bz2
|
||||
PKG_SOURCE_URL:=http://www.busybox.net/downloads/snapshots
|
||||
PKG_MD5SUM:=x
|
||||
else
|
||||
PKG_VERSION:=1.01
|
||||
PKG_VERSION:=1.1.0-pre1
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=http://www.busybox.net/downloads
|
||||
PKG_MD5SUM:=f250842dae2854a38470ed16a46bba66
|
||||
PKG_MD5SUM:=68298d6ae3195017216f794f46d39d8d
|
||||
endif
|
||||
PKG_CAT:=bzcat
|
||||
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -ur busybox.orig/networking/Config.in busybox/networking/Config.in
|
||||
--- busybox.orig/networking/Config.in 2004-09-23 22:08:46.000000000 +0200
|
||||
+++ busybox/networking/Config.in 2004-10-31 20:09:54.622922408 +0100
|
||||
@@ -492,7 +492,7 @@
|
||||
config CONFIG_TELNETD
|
||||
bool "telnetd"
|
||||
default n
|
||||
- select CONFIG_LOGIN
|
||||
+ #select CONFIG_LOGIN
|
||||
help
|
||||
A daemon for the TELNET protocol, allowing you to log onto the host
|
||||
running the daemon. Please keep in mind that the TELNET protocol
|
@ -1,26 +1,26 @@
|
||||
diff -Nur busybox-1.01/include/usage.h busybox-1.01.openwrt/include/usage.h
|
||||
--- busybox-1.01/include/usage.h 2005-08-17 03:29:15.000000000 +0200
|
||||
+++ busybox-1.01.openwrt/include/usage.h 2005-10-20 11:01:34.000000000 +0200
|
||||
@@ -2622,6 +2622,7 @@
|
||||
"\t-n,\t--now\tExit with failure if lease cannot be immediately negotiated.\n" \
|
||||
diff -Nur busybox-1.1.0-pre1/include/usage.h busybox-1.1.0-pre1.openwrt/include/usage.h
|
||||
--- busybox-1.1.0-pre1/include/usage.h 2005-11-01 00:55:34.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1.openwrt/include/usage.h 2005-11-30 11:10:24.000000000 +0100
|
||||
@@ -3119,6 +3119,7 @@
|
||||
"\t-n,\t--now\tExit with failure if lease cannot be immediately negotiated\n" \
|
||||
"\t-p,\t--pidfile=file\tStore process ID of daemon in file\n" \
|
||||
"\t-q,\t--quit\tQuit after obtaining lease\n" \
|
||||
+ "\t-R,\t--release\tRelease IP on quit\n" \
|
||||
"\t-r,\t--request=IP\tIP address to request (default: none)\n" \
|
||||
"\t-s,\t--script=file\tRun file at dhcp events (default: /usr/share/udhcpc/default.script)\n" \
|
||||
"\t-v,\t--version\tDisplay version"
|
||||
diff -Nur busybox-1.01/networking/udhcp/dhcpc.c busybox-1.01.openwrt/networking/udhcp/dhcpc.c
|
||||
--- busybox-1.01/networking/udhcp/dhcpc.c 2005-08-17 03:29:10.000000000 +0200
|
||||
+++ busybox-1.01.openwrt/networking/udhcp/dhcpc.c 2005-10-20 11:06:17.000000000 +0200
|
||||
diff -Nur busybox-1.1.0-pre1/networking/udhcp/dhcpc.c busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.c
|
||||
--- busybox-1.1.0-pre1/networking/udhcp/dhcpc.c 2005-11-01 00:55:15.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.c 2005-11-30 11:17:22.000000000 +0100
|
||||
@@ -61,6 +61,7 @@
|
||||
abort_if_no_lease: 0,
|
||||
foreground: 0,
|
||||
quit_after_lease: 0,
|
||||
+ release_on_quit: 0,
|
||||
background_if_no_lease: 0,
|
||||
interface: "eth0",
|
||||
pidfile: NULL,
|
||||
@@ -88,6 +89,7 @@
|
||||
.abort_if_no_lease = 0,
|
||||
.foreground = 0,
|
||||
.quit_after_lease = 0,
|
||||
+ .release_on_quit = 0,
|
||||
.background_if_no_lease = 0,
|
||||
.interface = "eth0",
|
||||
.pidfile = NULL,
|
||||
@@ -92,6 +93,7 @@
|
||||
" immediately negotiated.\n"
|
||||
" -p, --pidfile=file Store process ID of daemon in file\n"
|
||||
" -q, --quit Quit after obtaining lease\n"
|
||||
@ -28,7 +28,7 @@ diff -Nur busybox-1.01/networking/udhcp/dhcpc.c busybox-1.01.openwrt/networking/
|
||||
" -r, --request=IP IP address to request (default: none)\n"
|
||||
" -s, --script=file Run file at dhcp events (default:\n"
|
||||
" " DEFAULT_SCRIPT ")\n"
|
||||
@@ -205,6 +207,7 @@
|
||||
@@ -211,6 +213,7 @@
|
||||
{"now", no_argument, 0, 'n'},
|
||||
{"pidfile", required_argument, 0, 'p'},
|
||||
{"quit", no_argument, 0, 'q'},
|
||||
@ -36,16 +36,16 @@ diff -Nur busybox-1.01/networking/udhcp/dhcpc.c busybox-1.01.openwrt/networking/
|
||||
{"request", required_argument, 0, 'r'},
|
||||
{"script", required_argument, 0, 's'},
|
||||
{"version", no_argument, 0, 'v'},
|
||||
@@ -214,7 +217,7 @@
|
||||
@@ -220,7 +223,7 @@
|
||||
/* get options */
|
||||
while (1) {
|
||||
int option_index = 0;
|
||||
- c = getopt_long(argc, argv, "c:CfbH:h:i:np:qr:s:v", arg_options, &option_index);
|
||||
+ c = getopt_long(argc, argv, "c:CfbH:h:i:np:qRr:s:v", arg_options, &option_index);
|
||||
- c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:v", arg_options, &option_index);
|
||||
+ c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:v", arg_options, &option_index);
|
||||
if (c == -1) break;
|
||||
|
||||
switch (c) {
|
||||
@@ -259,6 +262,9 @@
|
||||
@@ -290,6 +293,9 @@
|
||||
case 'q':
|
||||
client_config.quit_after_lease = 1;
|
||||
break;
|
||||
@ -55,20 +55,20 @@ diff -Nur busybox-1.01/networking/udhcp/dhcpc.c busybox-1.01.openwrt/networking/
|
||||
case 'r':
|
||||
requested_ip = inet_addr(optarg);
|
||||
break;
|
||||
@@ -486,8 +492,11 @@
|
||||
@@ -527,8 +533,11 @@
|
||||
|
||||
state = BOUND;
|
||||
change_mode(LISTEN_NONE);
|
||||
- if (client_config.quit_after_lease)
|
||||
+ if (client_config.quit_after_lease) {
|
||||
+ if (client_config.release_on_quit)
|
||||
+ if (client_config.release_on_quit)
|
||||
+ perform_release();
|
||||
return 0;
|
||||
+ }
|
||||
if (!client_config.foreground)
|
||||
client_background();
|
||||
|
||||
@@ -512,12 +521,13 @@
|
||||
@@ -553,12 +562,13 @@
|
||||
case SIGUSR1:
|
||||
perform_renew();
|
||||
break;
|
||||
@ -85,10 +85,10 @@ diff -Nur busybox-1.01/networking/udhcp/dhcpc.c busybox-1.01.openwrt/networking/
|
||||
}
|
||||
} else if (retval == -1 && errno == EINTR) {
|
||||
/* a signal was caught */
|
||||
diff -Nur busybox-1.01/networking/udhcp/dhcpc.h busybox-1.01.openwrt/networking/udhcp/dhcpc.h
|
||||
--- busybox-1.01/networking/udhcp/dhcpc.h 2005-08-17 03:29:10.000000000 +0200
|
||||
+++ busybox-1.01.openwrt/networking/udhcp/dhcpc.h 2005-10-20 11:01:44.000000000 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
diff -Nur busybox-1.1.0-pre1/networking/udhcp/dhcpc.h busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.h
|
||||
--- busybox-1.1.0-pre1/networking/udhcp/dhcpc.h 2005-11-01 00:55:15.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1.openwrt/networking/udhcp/dhcpc.h 2005-11-30 11:18:00.000000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
struct client_config_t {
|
||||
char foreground; /* Do not fork */
|
||||
char quit_after_lease; /* Quit after obtaining lease */
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- busybox-1.00/archival/tar.c.orig 2005-08-13 12:41:09.000000000 +0200
|
||||
+++ busybox-1.00/archival/tar.c 2005-08-13 12:39:50.000000000 +0200
|
||||
@@ -798,7 +798,7 @@
|
||||
/* TODO: This is the same as in ar, separate function ? */
|
||||
while (optind < argc) {
|
||||
char *filename_ptr = last_char_is(argv[optind], '/');
|
||||
- if (filename_ptr) {
|
||||
+ if (argv[optind] != filename_ptr && filename_ptr) {
|
||||
*filename_ptr = '\0';
|
||||
}
|
||||
tar_handle->accept = llist_add_to(tar_handle->accept, argv[optind]);
|
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
diff -ruN busybox-1.00-old/archival/libipkg/file_util.c busybox-1.00-new/archival/libipkg/file_util.c
|
||||
--- busybox-1.00-old/archival/libipkg/file_util.c 2005-10-27 16:37:25.000000000 +0200
|
||||
+++ busybox-1.00-new/archival/libipkg/file_util.c 2005-10-27 16:38:03.000000000 +0200
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/file_util.c busybox-1.1.0-pre1-new/archival/libipkg/file_util.c
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/file_util.c 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/file_util.c 2005-12-08 09:04:01.000000000 +0100
|
||||
@@ -123,7 +123,7 @@
|
||||
|
||||
int file_mkdir_hier(const char *path, long mode)
|
||||
@ -10,9 +10,9 @@ diff -ruN busybox-1.00-old/archival/libipkg/file_util.c busybox-1.00-new/archiva
|
||||
}
|
||||
|
||||
char *file_md5sum_alloc(const char *file_name)
|
||||
diff -ruN busybox-1.00-old/archival/libipkg/ipkg_cmd.c busybox-1.00-new/archival/libipkg/ipkg_cmd.c
|
||||
--- busybox-1.00-old/archival/libipkg/ipkg_cmd.c 2005-10-27 16:37:25.000000000 +0200
|
||||
+++ busybox-1.00-new/archival/libipkg/ipkg_cmd.c 2005-10-27 16:38:03.000000000 +0200
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/ipkg_cmd.c busybox-1.1.0-pre1-new/archival/libipkg/ipkg_cmd.c
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/ipkg_cmd.c 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/ipkg_cmd.c 2005-12-08 09:04:01.000000000 +0100
|
||||
@@ -251,7 +251,7 @@
|
||||
in = fopen (tmp_file_name, "r");
|
||||
out = fopen (list_file_name, "w");
|
||||
@ -56,9 +56,9 @@ diff -ruN busybox-1.00-old/archival/libipkg/ipkg_cmd.c busybox-1.00-new/archival
|
||||
|
||||
global_conf = conf;
|
||||
signal(SIGINT, sigint_handler);
|
||||
diff -ruN busybox-1.00-old/archival/libipkg/ipkg_conf.c busybox-1.00-new/archival/libipkg/ipkg_conf.c
|
||||
--- busybox-1.00-old/archival/libipkg/ipkg_conf.c 2005-10-27 16:37:25.000000000 +0200
|
||||
+++ busybox-1.00-new/archival/libipkg/ipkg_conf.c 2005-10-27 16:38:03.000000000 +0200
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/ipkg_conf.c busybox-1.1.0-pre1-new/archival/libipkg/ipkg_conf.c
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/ipkg_conf.c 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/ipkg_conf.c 2005-12-08 09:04:01.000000000 +0100
|
||||
@@ -540,14 +540,14 @@
|
||||
if (strcmp(type, "option") == 0) {
|
||||
ipkg_conf_set_option(options, name, value);
|
||||
@ -76,9 +76,9 @@ diff -ruN busybox-1.00-old/archival/libipkg/ipkg_conf.c busybox-1.00-new/archiva
|
||||
pkg_src_list_append (pkg_src_list, name, value, extra, 1);
|
||||
} else {
|
||||
ipkg_message(conf, IPKG_ERROR, "ERROR: duplicate src declaration. Skipping:\n\t src %s %s\n",
|
||||
diff -ruN busybox-1.00-old/archival/libipkg/libipkg.c busybox-1.00-new/archival/libipkg/libipkg.c
|
||||
--- busybox-1.00-old/archival/libipkg/libipkg.c 2005-10-27 16:37:25.000000000 +0200
|
||||
+++ busybox-1.00-new/archival/libipkg/libipkg.c 2005-10-27 16:38:03.000000000 +0200
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/libipkg.c busybox-1.1.0-pre1-new/archival/libipkg/libipkg.c
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/libipkg.c 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/libipkg.c 2005-12-08 09:04:01.000000000 +0100
|
||||
@@ -445,7 +445,7 @@
|
||||
int
|
||||
ipkg_op (int argc, char *argv[])
|
||||
@ -123,9 +123,9 @@ diff -ruN busybox-1.00-old/archival/libipkg/libipkg.c busybox-1.00-new/archival/
|
||||
|
||||
ipkg_conf_deinit (&ipkg_conf);
|
||||
|
||||
diff -ruN busybox-1.00-old/archival/libipkg/md5.c busybox-1.00-new/archival/libipkg/md5.c
|
||||
--- busybox-1.00-old/archival/libipkg/md5.c 2005-10-27 16:37:25.000000000 +0200
|
||||
+++ busybox-1.00-new/archival/libipkg/md5.c 2005-10-27 16:38:03.000000000 +0200
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/md5.c busybox-1.1.0-pre1-new/archival/libipkg/md5.c
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/md5.c 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/md5.c 2005-12-08 09:04:01.000000000 +0100
|
||||
@@ -25,7 +25,6 @@
|
||||
int md5_stream(FILE *stream, void *resblock)
|
||||
{
|
||||
@ -134,9 +134,9 @@ diff -ruN busybox-1.00-old/archival/libipkg/md5.c busybox-1.00-new/archival/libi
|
||||
|
||||
if( (fd = fileno(stream)) == -1 ) {
|
||||
bb_error_msg("bad file descriptor");
|
||||
diff -ruN busybox-1.00-old/archival/libipkg/pkg.c busybox-1.00-new/archival/libipkg/pkg.c
|
||||
--- busybox-1.00-old/archival/libipkg/pkg.c 2005-10-27 16:37:25.000000000 +0200
|
||||
+++ busybox-1.00-new/archival/libipkg/pkg.c 2005-10-27 16:38:03.000000000 +0200
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.c busybox-1.1.0-pre1-new/archival/libipkg/pkg.c
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg.c 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg.c 2005-12-08 09:04:01.000000000 +0100
|
||||
@@ -527,6 +527,7 @@
|
||||
char * pkg_formatted_field(pkg_t *pkg, const char *field )
|
||||
{
|
||||
@ -289,9 +289,9 @@ diff -ruN busybox-1.00-old/archival/libipkg/pkg.c busybox-1.00-new/archival/libi
|
||||
} else {
|
||||
epoch_str = strdup("");
|
||||
}
|
||||
diff -ruN busybox-1.00-old/archival/libipkg/pkg.h busybox-1.00-new/archival/libipkg/pkg.h
|
||||
--- busybox-1.00-old/archival/libipkg/pkg.h 2005-10-27 16:37:25.000000000 +0200
|
||||
+++ busybox-1.00-new/archival/libipkg/pkg.h 2005-10-27 16:38:03.000000000 +0200
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg.h busybox-1.1.0-pre1-new/archival/libipkg/pkg.h
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg.h 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg.h 2005-12-08 09:04:01.000000000 +0100
|
||||
@@ -192,8 +192,8 @@
|
||||
char *pkg_version_str_alloc(pkg_t *pkg);
|
||||
|
||||
@ -303,9 +303,9 @@ diff -ruN busybox-1.00-old/archival/libipkg/pkg.h busybox-1.00-new/archival/libi
|
||||
|
||||
char * pkg_formatted_info(pkg_t *pkg );
|
||||
char * pkg_formatted_field(pkg_t *pkg, const char *field );
|
||||
diff -ruN busybox-1.00-old/archival/libipkg/pkg_depends.c busybox-1.00-new/archival/libipkg/pkg_depends.c
|
||||
--- busybox-1.00-old/archival/libipkg/pkg_depends.c 2005-10-27 16:37:26.000000000 +0200
|
||||
+++ busybox-1.00-new/archival/libipkg/pkg_depends.c 2005-10-27 16:38:03.000000000 +0200
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_depends.c busybox-1.1.0-pre1-new/archival/libipkg/pkg_depends.c
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg_depends.c 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg_depends.c 2005-12-08 09:04:01.000000000 +0100
|
||||
@@ -68,7 +68,7 @@
|
||||
pkg_vec_t *unsatisfied, char *** unresolved)
|
||||
{
|
||||
@ -377,9 +377,9 @@ diff -ruN busybox-1.00-old/archival/libipkg/pkg_depends.c busybox-1.00-new/archi
|
||||
return NULL;
|
||||
}
|
||||
|
||||
diff -ruN busybox-1.00-old/archival/libipkg/pkg_depends.h busybox-1.00-new/archival/libipkg/pkg_depends.h
|
||||
--- busybox-1.00-old/archival/libipkg/pkg_depends.h 2005-10-27 16:37:26.000000000 +0200
|
||||
+++ busybox-1.00-new/archival/libipkg/pkg_depends.h 2005-10-27 16:38:03.000000000 +0200
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_depends.h busybox-1.1.0-pre1-new/archival/libipkg/pkg_depends.h
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg_depends.h 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg_depends.h 2005-12-08 09:04:01.000000000 +0100
|
||||
@@ -92,7 +92,7 @@
|
||||
*/
|
||||
int pkg_conflicts(pkg_t *pkg, pkg_t *conflicts);
|
||||
@ -389,9 +389,9 @@ diff -ruN busybox-1.00-old/archival/libipkg/pkg_depends.h busybox-1.00-new/archi
|
||||
void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg);
|
||||
void freeDepends(pkg_t *pkg);
|
||||
void printDepends(pkg_t * pkg);
|
||||
diff -ruN busybox-1.00-old/archival/libipkg/pkg_hash.c busybox-1.00-new/archival/libipkg/pkg_hash.c
|
||||
--- busybox-1.00-old/archival/libipkg/pkg_hash.c 2005-10-27 16:37:26.000000000 +0200
|
||||
+++ busybox-1.00-new/archival/libipkg/pkg_hash.c 2005-10-27 16:38:03.000000000 +0200
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_hash.c busybox-1.1.0-pre1-new/archival/libipkg/pkg_hash.c
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg_hash.c 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg_hash.c 2005-12-08 09:04:01.000000000 +0100
|
||||
@@ -143,7 +143,7 @@
|
||||
pkg_t *pkg_hash_fetch_best_installation_candidate(ipkg_conf_t *conf, abstract_pkg_t *apkg,
|
||||
int (*constraint_fcn)(pkg_t *pkg, void *cdata), void *cdata, int quiet)
|
||||
@ -415,9 +415,9 @@ diff -ruN busybox-1.00-old/archival/libipkg/pkg_hash.c busybox-1.00-new/archival
|
||||
ipkg_message(conf, IPKG_DEBUG, " %s arch=%s arch_priority=%d \n",
|
||||
maybe->name, maybe->architecture, maybe->arch_priority);
|
||||
if (maybe->arch_priority > 0) {
|
||||
diff -ruN busybox-1.00-old/archival/libipkg/pkg_vec.h busybox-1.00-new/archival/libipkg/pkg_vec.h
|
||||
--- busybox-1.00-old/archival/libipkg/pkg_vec.h 2005-10-27 16:37:26.000000000 +0200
|
||||
+++ busybox-1.00-new/archival/libipkg/pkg_vec.h 2005-10-27 16:39:05.000000000 +0200
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/pkg_vec.h busybox-1.1.0-pre1-new/archival/libipkg/pkg_vec.h
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/pkg_vec.h 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/pkg_vec.h 2005-12-08 09:04:01.000000000 +0100
|
||||
@@ -35,6 +35,8 @@
|
||||
};
|
||||
typedef struct abstract_pkg_vec abstract_pkg_vec_t;
|
||||
@ -427,3 +427,14 @@ diff -ruN busybox-1.00-old/archival/libipkg/pkg_vec.h busybox-1.00-new/archival/
|
||||
|
||||
pkg_vec_t * pkg_vec_alloc(void);
|
||||
void pkg_vec_free(pkg_vec_t *vec);
|
||||
diff -ruN busybox-1.1.0-pre1-old/archival/libipkg/sprintf_alloc.h busybox-1.1.0-pre1-new/archival/libipkg/sprintf_alloc.h
|
||||
--- busybox-1.1.0-pre1-old/archival/libipkg/sprintf_alloc.h 2005-12-08 09:01:04.000000000 +0100
|
||||
+++ busybox-1.1.0-pre1-new/archival/libipkg/sprintf_alloc.h 2005-12-08 09:04:20.000000000 +0100
|
||||
@@ -20,6 +20,6 @@
|
||||
|
||||
#include "libbb.h"
|
||||
|
||||
-#define sprintf_alloc bb_xasprintf
|
||||
+#define sprintf_alloc(format, ...) bb_xasprintf((const char *)format, __VA_ARGS__)
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user