diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-06-04 11:25:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-06-04 11:25:53 +0000 |
| commit | 91142205534e135a29ceb3992708bf2ca3219021 (patch) | |
| tree | 16e69db35c7fdf48ea76876109b0b38845361209 /package/busybox/patches | |
| parent | d5b15895ef66b9a664afa72d88507060e1f0a270 (diff) | |
| download | mtk-20170518-91142205534e135a29ceb3992708bf2ca3219021.zip mtk-20170518-91142205534e135a29ceb3992708bf2ca3219021.tar.gz mtk-20170518-91142205534e135a29ceb3992708bf2ca3219021.tar.bz2 | |
refresh all package patches in the buildroot using quilt
SVN-Revision: 7490
Diffstat (limited to 'package/busybox/patches')
25 files changed, 530 insertions, 402 deletions
diff --git a/package/busybox/patches/000-autoconf.patch b/package/busybox/patches/000-autoconf.patch index 038d240..a4ca20d 100644 --- a/package/busybox/patches/000-autoconf.patch +++ b/package/busybox/patches/000-autoconf.patch @@ -1,6 +1,7 @@ -diff -ur busybox.old/applets/Kbuild busybox.dev/applets/Kbuild ---- busybox.old/applets/Kbuild 2007-04-25 15:25:30.000000000 -0700 -+++ busybox.dev/applets/Kbuild 2007-04-25 15:25:11.000000000 -0700 +Index: busybox-1.4.2/applets/Kbuild +=================================================================== +--- busybox-1.4.2.orig/applets/Kbuild 2007-06-04 13:21:32.429046704 +0200 ++++ busybox-1.4.2/applets/Kbuild 2007-06-04 13:21:32.495036672 +0200 @@ -10,7 +10,7 @@ # Generated file needs additional love diff --git a/package/busybox/patches/110-wget_getopt_fix.patch b/package/busybox/patches/110-wget_getopt_fix.patch index 8536fce..fd530df 100644 --- a/package/busybox/patches/110-wget_getopt_fix.patch +++ b/package/busybox/patches/110-wget_getopt_fix.patch @@ -1,6 +1,7 @@ -diff -ur busybox.old/networking/wget.c busybox.dev/networking/wget.c ---- busybox.old/networking/wget.c 2007-01-27 15:44:02.235530528 +0100 -+++ busybox.dev/networking/wget.c 2007-01-27 15:53:26.549741728 +0100 +Index: busybox-1.4.2/networking/wget.c +=================================================================== +--- busybox-1.4.2.orig/networking/wget.c 2007-06-04 13:21:32.408049896 +0200 ++++ busybox-1.4.2/networking/wget.c 2007-06-04 13:21:32.681008400 +0200 @@ -136,7 +136,7 @@ { "directory-prefix", required_argument, NULL, 'P' }, { "proxy", required_argument, NULL, 'Y' }, @@ -10,4 +11,3 @@ diff -ur busybox.old/networking/wget.c busybox.dev/networking/wget.c { "header", required_argument, NULL, 0xfe }, { 0, 0, 0, 0 } }; -Only in busybox.dev/networking: .wget.c.swp diff --git a/package/busybox/patches/130-drop_werror.patch b/package/busybox/patches/130-drop_werror.patch index c8269e1..cd3a67b 100644 --- a/package/busybox/patches/130-drop_werror.patch +++ b/package/busybox/patches/130-drop_werror.patch @@ -1,6 +1,7 @@ -diff -ur busybox.old/Makefile.flags busybox.dev/Makefile.flags ---- busybox.old/Makefile.flags 2006-12-27 05:57:07.000000000 +0100 -+++ busybox.dev/Makefile.flags 2007-01-06 19:53:01.000000000 +0100 +Index: busybox-1.4.2/Makefile.flags +=================================================================== +--- busybox-1.4.2.orig/Makefile.flags 2007-06-04 13:21:32.387053088 +0200 ++++ busybox-1.4.2/Makefile.flags 2007-06-04 13:21:32.871979368 +0200 @@ -16,7 +16,7 @@ -D"BB_VER=KBUILD_STR($(BB_VER))" -DBB_BT=AUTOCONF_TIMESTAMP diff --git a/package/busybox/patches/140-trylink_bash.patch b/package/busybox/patches/140-trylink_bash.patch index f5e0b7b..67da20d 100644 --- a/package/busybox/patches/140-trylink_bash.patch +++ b/package/busybox/patches/140-trylink_bash.patch @@ -1,6 +1,7 @@ -diff -ruN busybox-1.3.1-old/scripts/trylink busybox-1.3.1-new/scripts/trylink ---- busybox-1.3.1-old/scripts/trylink 2006-12-27 05:53:24.000000000 +0100 -+++ busybox-1.3.1-new/scripts/trylink 2007-01-01 21:01:08.000000000 +0100 +Index: busybox-1.4.2/scripts/trylink +=================================================================== +--- busybox-1.4.2.orig/scripts/trylink 2007-06-04 13:21:32.367056128 +0200 ++++ busybox-1.4.2/scripts/trylink 2007-06-04 13:21:33.052951856 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash diff --git a/package/busybox/patches/200-etc_crontabs.patch b/package/busybox/patches/200-etc_crontabs.patch index 5ec01c1..49b7882 100644 --- a/package/busybox/patches/200-etc_crontabs.patch +++ b/package/busybox/patches/200-etc_crontabs.patch @@ -1,7 +1,8 @@ -diff -urN busybox.old/miscutils/crond.c busybox.dev/miscutils/crond.c ---- busybox.old/miscutils/crond.c 2004-04-14 19:51:21.000000000 +0200 -+++ busybox.dev/miscutils/crond.c 2005-12-11 22:54:07.878256250 +0100 -@@ -36,7 +36,7 @@ +Index: busybox-1.4.2/miscutils/crond.c +=================================================================== +--- busybox-1.4.2.orig/miscutils/crond.c 2007-06-04 13:21:32.339060384 +0200 ++++ busybox-1.4.2/miscutils/crond.c 2007-06-04 13:21:33.235924040 +0200 +@@ -18,7 +18,7 @@ #define arysize(ary) (sizeof(ary)/sizeof((ary)[0])) #ifndef CRONTABS @@ -10,11 +11,12 @@ diff -urN busybox.old/miscutils/crond.c busybox.dev/miscutils/crond.c #endif #ifndef TMPDIR #define TMPDIR "/var/spool/cron" -diff -urN busybox.old/miscutils/crontab.c busybox.dev/miscutils/crontab.c ---- busybox.old/miscutils/crontab.c 2004-04-14 19:51:21.000000000 +0200 -+++ busybox.dev/miscutils/crontab.c 2005-12-11 22:54:28.647554250 +0100 -@@ -28,7 +28,7 @@ - #include <sys/resource.h> +Index: busybox-1.4.2/miscutils/crontab.c +=================================================================== +--- busybox-1.4.2.orig/miscutils/crontab.c 2007-06-04 13:21:32.346059320 +0200 ++++ busybox-1.4.2/miscutils/crontab.c 2007-06-04 13:21:33.236923888 +0200 +@@ -13,7 +13,7 @@ + #include "busybox.h" #ifndef CRONTABS -#define CRONTABS "/var/spool/cron/crontabs" diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/busybox/patches/240-udhcpc_retries.patch index 3142eac..4f15c42 100644 --- a/package/busybox/patches/240-udhcpc_retries.patch +++ b/package/busybox/patches/240-udhcpc_retries.patch @@ -1,7 +1,8 @@ -diff -ur busybox.old/networking/udhcp/dhcpc.c busybox.dev/networking/udhcp/dhcpc.c ---- busybox.old/networking/udhcp/dhcpc.c 2006-11-10 00:17:26.000000000 +0100 -+++ busybox.dev/networking/udhcp/dhcpc.c 2006-11-10 00:17:10.000000000 +0100 -@@ -330,7 +330,7 @@ +Index: busybox-1.4.2/networking/udhcp/dhcpc.c +=================================================================== +--- busybox-1.4.2.orig/networking/udhcp/dhcpc.c 2007-06-04 13:21:32.319063424 +0200 ++++ busybox-1.4.2/networking/udhcp/dhcpc.c 2007-06-04 13:21:33.430894400 +0200 +@@ -291,7 +291,7 @@ /* timeout dropped to zero */ switch (state) { case INIT_SELECTING: @@ -10,7 +11,7 @@ diff -ur busybox.old/networking/udhcp/dhcpc.c busybox.dev/networking/udhcp/dhcpc if (packet_num == 0) xid = random_xid(); -@@ -355,7 +355,7 @@ +@@ -316,7 +316,7 @@ break; case RENEW_REQUESTED: case REQUESTING: diff --git a/package/busybox/patches/241-udhcpc-oversized_packets.patch b/package/busybox/patches/241-udhcpc-oversized_packets.patch index d324d75..e10bb83 100644 --- a/package/busybox/patches/241-udhcpc-oversized_packets.patch +++ b/package/busybox/patches/241-udhcpc-oversized_packets.patch @@ -1,6 +1,7 @@ -diff -ruN busybox-1.3.1-old/networking/udhcp/packet.c busybox-1.3.1/networking/udhcp/packet.c ---- busybox-1.3.1-old/networking/udhcp/packet.c 2006-12-27 05:52:33.000000000 +0100 -+++ busybox-1.3.1/networking/udhcp/packet.c 2006-12-28 05:38:36.000000000 +0100 +Index: busybox-1.4.2/networking/udhcp/packet.c +=================================================================== +--- busybox-1.4.2.orig/networking/udhcp/packet.c 2007-06-04 13:21:32.289067984 +0200 ++++ busybox-1.4.2/networking/udhcp/packet.c 2007-06-04 13:21:33.619865672 +0200 @@ -107,6 +107,10 @@ return ~sum; } @@ -64,10 +65,11 @@ diff -ruN busybox-1.3.1-old/networking/udhcp/packet.c busybox-1.3.1/networking/u close(fd); return result; } -diff -ruN busybox-1.3.1-old/networking/udhcp/common.h busybox-1.3.1/networking/udhcp/common.h ---- busybox-1.3.1-old/networking/udhcp/common.h 2006-12-27 05:52:33.000000000 +0100 -+++ busybox-1.3.1/networking/udhcp/common.h 2006-12-28 05:17:06.000000000 +0100 -@@ -26,6 +26,8 @@ +Index: busybox-1.4.2/networking/udhcp/common.h +=================================================================== +--- busybox-1.4.2.orig/networking/udhcp/common.h 2007-06-04 13:21:32.297066768 +0200 ++++ busybox-1.4.2/networking/udhcp/common.h 2007-06-04 13:21:33.620865520 +0200 +@@ -22,6 +22,8 @@ #include <netinet/udp.h> #include <netinet/ip.h> @@ -76,7 +78,7 @@ diff -ruN busybox-1.3.1-old/networking/udhcp/common.h busybox-1.3.1/networking/u struct dhcpMessage { uint8_t op; uint8_t htype; -@@ -42,7 +44,7 @@ +@@ -38,7 +40,7 @@ uint8_t sname[64]; uint8_t file[128]; uint32_t cookie; diff --git a/package/busybox/patches/242-udhcpc_msgs.patch b/package/busybox/patches/242-udhcpc_msgs.patch index e8bdfeb..4ec99af 100644 --- a/package/busybox/patches/242-udhcpc_msgs.patch +++ b/package/busybox/patches/242-udhcpc_msgs.patch @@ -1,6 +1,7 @@ -diff -ur busybox.old/networking/udhcp/clientpacket.c busybox.dev/networking/udhcp/clientpacket.c ---- busybox.old/networking/udhcp/clientpacket.c 2007-03-18 17:59:24.000000000 +0100 -+++ busybox.dev/networking/udhcp/clientpacket.c 2007-05-14 16:03:26.698979472 +0200 +Index: busybox-1.4.2/networking/udhcp/clientpacket.c +=================================================================== +--- busybox-1.4.2.orig/networking/udhcp/clientpacket.c 2007-06-04 13:21:32.270070872 +0200 ++++ busybox-1.4.2/networking/udhcp/clientpacket.c 2007-06-04 13:21:33.813836184 +0200 @@ -78,6 +78,7 @@ int send_discover(unsigned long xid, unsigned long requested) { diff --git a/package/busybox/patches/250-ash_export-n.patch b/package/busybox/patches/250-ash_export-n.patch index 9823afe..b5a8794 100644 --- a/package/busybox/patches/250-ash_export-n.patch +++ b/package/busybox/patches/250-ash_export-n.patch @@ -1,6 +1,8 @@ ---- busybox.old/shell/ash.c 2006-11-22 12:02:03.000000000 -0800 -+++ busybox.dev/shell/ash.c 2006-11-22 11:05:32.000000000 -0800 -@@ -12257,9 +12257,18 @@ +Index: busybox-1.4.2/shell/ash.c +=================================================================== +--- busybox-1.4.2.orig/shell/ash.c 2007-06-04 13:21:32.248074216 +0200 ++++ busybox-1.4.2/shell/ash.c 2007-06-04 13:21:34.000807760 +0200 +@@ -12237,9 +12237,18 @@ const char *p; char **aptr; int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT; @@ -20,7 +22,7 @@ if (notp && ((name = *(aptr = argptr)))) { do { if ((p = strchr(name, '=')) != NULL) { -@@ -12267,10 +12276,11 @@ +@@ -12247,10 +12256,11 @@ } else { if ((vp = *findvar(hashvar(name), name))) { vp->flags |= flag; diff --git a/package/busybox/patches/300-netmsg.patch b/package/busybox/patches/300-netmsg.patch index e51a8bb..a400bb0 100644 --- a/package/busybox/patches/300-netmsg.patch +++ b/package/busybox/patches/300-netmsg.patch @@ -1,7 +1,8 @@ -diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1-new/include/applets.h ---- busybox-1.3.1-old/include/applets.h 2006-12-27 05:56:18.000000000 +0100 -+++ busybox-1.3.1-new/include/applets.h 2006-12-28 07:25:35.000000000 +0100 -@@ -211,6 +211,7 @@ +Index: busybox-1.4.2/include/applets.h +=================================================================== +--- busybox-1.4.2.orig/include/applets.h 2007-06-04 13:21:32.210079992 +0200 ++++ busybox-1.4.2/include/applets.h 2007-06-04 13:21:34.188779184 +0200 +@@ -209,6 +209,7 @@ USE_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) @@ -9,10 +10,11 @@ diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1-new/include/applets. USE_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -diff -ruN busybox-1.3.1-old/networking/Config.in busybox-1.3.1-new/networking/Config.in ---- busybox-1.3.1-old/networking/Config.in 2006-12-27 05:52:39.000000000 +0100 -+++ busybox-1.3.1-new/networking/Config.in 2006-12-28 07:25:35.000000000 +0100 -@@ -452,6 +452,12 @@ +Index: busybox-1.4.2/networking/Config.in +=================================================================== +--- busybox-1.4.2.orig/networking/Config.in 2007-06-04 13:21:32.216079080 +0200 ++++ busybox-1.4.2/networking/Config.in 2007-06-04 13:21:34.188779184 +0200 +@@ -458,6 +458,12 @@ help A simple Unix utility which reads and writes data across network connections. @@ -25,10 +27,11 @@ diff -ruN busybox-1.3.1-old/networking/Config.in busybox-1.3.1-new/networking/Co config NC_SERVER bool "Netcat server options (-lp)" -diff -ruN busybox-1.3.1-old/networking/Kbuild busybox-1.3.1-new/networking/Kbuild ---- busybox-1.3.1-old/networking/Kbuild 2006-12-27 05:52:39.000000000 +0100 -+++ busybox-1.3.1-new/networking/Kbuild 2006-12-28 07:28:29.000000000 +0100 -@@ -25,6 +25,7 @@ +Index: busybox-1.4.2/networking/Kbuild +=================================================================== +--- busybox-1.4.2.orig/networking/Kbuild 2007-06-04 13:21:32.221078320 +0200 ++++ busybox-1.4.2/networking/Kbuild 2007-06-04 13:21:34.188779184 +0200 +@@ -27,6 +27,7 @@ lib-$(CONFIG_IPTUNNEL) += iptunnel.o lib-$(CONFIG_NAMEIF) += nameif.o lib-$(CONFIG_NC) += nc.o @@ -36,9 +39,10 @@ diff -ruN busybox-1.3.1-old/networking/Kbuild busybox-1.3.1-new/networking/Kbuil lib-$(CONFIG_NETSTAT) += netstat.o lib-$(CONFIG_NSLOOKUP) += nslookup.o lib-$(CONFIG_PING) += ping.o -diff -ruN busybox-1.3.1-old/networking/netmsg.c busybox-1.3.1-new/networking/netmsg.c ---- busybox-1.3.1-old/networking/netmsg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.3.1-new/networking/netmsg.c 2006-12-28 07:25:52.000000000 +0100 +Index: busybox-1.4.2/networking/netmsg.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/networking/netmsg.c 2007-06-04 13:21:34.188779184 +0200 @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch index b6a06cf..22e6abc 100644 --- a/package/busybox/patches/310-passwd_access.patch +++ b/package/busybox/patches/310-passwd_access.patch @@ -1,10 +1,11 @@ Copyright (C) 2006 OpenWrt.org -diff -ruN busybox-1.3.1-old/networking/httpd.c busybox-1.3.1/networking/httpd.c ---- busybox-1.3.1-old/networking/httpd.c 2006-12-28 18:17:23.000000000 +0100 -+++ busybox-1.3.1/networking/httpd.c 2006-12-28 19:56:34.000000000 +0100 -@@ -1381,12 +1381,26 @@ +Index: busybox-1.4.2/networking/httpd.c +=================================================================== +--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:32.190083032 +0200 ++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:34.401746808 +0200 +@@ -1402,12 +1402,26 @@ if (ENABLE_FEATURE_HTTPD_AUTH_MD5) { char *cipher; char *pp; @@ -31,7 +32,7 @@ diff -ruN busybox-1.3.1-old/networking/httpd.c busybox-1.3.1/networking/httpd.c if (pp && pp[1] == '$' && pp[2] == '1' && pp[3] == '$' && pp[4]) { pp++; -@@ -1396,6 +1410,10 @@ +@@ -1417,6 +1431,10 @@ /* unauthorized */ continue; } diff --git a/package/busybox/patches/330-httpd_user_agent.patch b/package/busybox/patches/330-httpd_user_agent.patch index 316604e..d9fa874 100644 --- a/package/busybox/patches/330-httpd_user_agent.patch +++ b/package/busybox/patches/330-httpd_user_agent.patch @@ -1,6 +1,7 @@ -diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c ---- busybox.old/networking/httpd.c 2007-01-19 22:22:59.000000000 +0100 -+++ busybox.dev/networking/httpd.c 2007-01-22 13:09:03.000000000 +0100 +Index: busybox-1.4.2/networking/httpd.c +=================================================================== +--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:34.401746808 +0200 ++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:34.588718384 +0200 @@ -137,6 +137,7 @@ const char *query; @@ -17,7 +18,7 @@ diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c #if ENABLE_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV setenv_long("REMOTE_PORT", config->port); #endif -@@ -1629,6 +1631,8 @@ +@@ -1647,6 +1649,8 @@ content_type = strdup(skip_whitespace(buf + sizeof("Content-Type:")-1)); } else if ((STRNCASECMP(buf, "Referer:") == 0)) { config->referer = strdup(skip_whitespace(buf + sizeof("Referer:")-1)); diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch index c1197e2..5bce455 100644 --- a/package/busybox/patches/340-lock_util.patch +++ b/package/busybox/patches/340-lock_util.patch @@ -1,7 +1,8 @@ -diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1/include/applets.h ---- busybox-1.3.1-old/include/applets.h 2006-12-28 07:43:24.000000000 +0100 -+++ busybox-1.3.1/include/applets.h 2006-12-28 03:11:36.000000000 +0100 -@@ -180,6 +180,7 @@ +Index: busybox-1.4.2/include/applets.h +=================================================================== +--- busybox-1.4.2.orig/include/applets.h 2007-06-04 13:21:34.188779184 +0200 ++++ busybox-1.4.2/include/applets.h 2007-06-04 13:21:34.786688288 +0200 +@@ -178,6 +178,7 @@ USE_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER)) @@ -9,10 +10,11 @@ diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1/include/applets.h USE_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_ALWAYS)) USE_LOGNAME(APPLET(logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -diff -ruN busybox-1.3.1-old/miscutils/Config.in busybox-1.3.1/miscutils/Config.in ---- busybox-1.3.1-old/miscutils/Config.in 2006-12-27 05:56:09.000000000 +0100 -+++ busybox-1.3.1/miscutils/Config.in 2006-12-28 03:14:16.000000000 +0100 -@@ -232,6 +232,12 @@ +Index: busybox-1.4.2/miscutils/Config.in +=================================================================== +--- busybox-1.4.2.orig/miscutils/Config.in 2007-06-04 13:21:32.136091240 +0200 ++++ busybox-1.4.2/miscutils/Config.in 2007-06-04 13:21:34.786688288 +0200 +@@ -237,6 +237,12 @@ Enables the 'hdparm -d' option to get/set using_dma flag. This is dangerous stuff, so you should probably say N. @@ -25,9 +27,10 @@ diff -ruN busybox-1.3.1-old/miscutils/Config.in busybox-1.3.1/miscutils/Config.i config MAKEDEVS bool "makedevs" default n -diff -ruN busybox-1.3.1-old/miscutils/Kbuild busybox-1.3.1/miscutils/Kbuild ---- busybox-1.3.1-old/miscutils/Kbuild 2006-12-27 05:56:09.000000000 +0100 -+++ busybox-1.3.1/miscutils/Kbuild 2006-12-28 03:15:47.000000000 +0100 +Index: busybox-1.4.2/miscutils/Kbuild +=================================================================== +--- busybox-1.4.2.orig/miscutils/Kbuild 2007-06-04 13:21:32.142090328 +0200 ++++ busybox-1.4.2/miscutils/Kbuild 2007-06-04 13:21:34.786688288 +0200 @@ -15,6 +15,7 @@ lib-$(CONFIG_HDPARM) += hdparm.o lib-$(CONFIG_LAST) += last.o @@ -36,9 +39,10 @@ diff -ruN busybox-1.3.1-old/miscutils/Kbuild busybox-1.3.1/miscutils/Kbuild lib-$(CONFIG_MAKEDEVS) += makedevs.o lib-$(CONFIG_MOUNTPOINT) += mountpoint.o lib-$(CONFIG_MT) += mt.o -diff -ruN busybox-1.3.1-old/miscutils/lock.c busybox-1.3.1/miscutils/lock.c ---- busybox-1.3.1-old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.3.1/miscutils/lock.c 2006-12-28 03:11:36.000000000 +0100 +Index: busybox-1.4.2/miscutils/lock.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/miscutils/lock.c 2007-06-04 13:21:34.787688136 +0200 @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch index 86338aa..d8f430b 100644 --- a/package/busybox/patches/350-httpd_redir.patch +++ b/package/busybox/patches/350-httpd_redir.patch @@ -1,7 +1,8 @@ -diff -ur bb.old/include/usage.h bb.dev/include/usage.h ---- bb.old/include/usage.h 2007-03-29 13:25:55.080325000 +0200 -+++ bb.dev/include/usage.h 2007-03-29 13:31:04.241326192 +0200 -@@ -1333,7 +1333,8 @@ +Index: busybox-1.4.2/include/usage.h +=================================================================== +--- busybox-1.4.2.orig/include/usage.h 2007-06-04 13:21:32.103096256 +0200 ++++ busybox-1.4.2/include/usage.h 2007-06-04 13:21:35.005655000 +0200 +@@ -1257,7 +1257,8 @@ USE_FEATURE_HTTPD_BASIC_AUTH(" [-r <realm>]") \ USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \ " [-h home]" \ @@ -11,7 +12,7 @@ diff -ur bb.old/include/usage.h bb.dev/include/usage.h #define httpd_full_usage \ "Listen for incoming http server requests" \ "\n\nOptions:\n" \ -@@ -1349,7 +1350,9 @@ +@@ -1273,7 +1274,9 @@ " -m PASS Crypt PASS with md5 algorithm\n") \ " -h HOME Specifies http HOME directory (default ./)\n" \ " -e STRING HTML encode STRING\n" \ @@ -22,10 +23,11 @@ diff -ur bb.old/include/usage.h bb.dev/include/usage.h #define hwclock_trivial_usage \ "[-r|--show] [-s|--hctosys] [-w|--systohc] [-l|--localtime] [-u|--utc]" -diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c ---- bb.old/networking/httpd.c 2007-03-29 13:25:55.016335000 +0200 -+++ bb.dev/networking/httpd.c 2007-03-29 13:40:05.353064704 +0200 -@@ -141,6 +141,8 @@ +Index: busybox-1.4.2/networking/httpd.c +=================================================================== +--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:34.588718384 +0200 ++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:35.006654848 +0200 +@@ -140,6 +140,8 @@ USE_FEATURE_HTTPD_CGI(char *user_agent;) const char *configFile; @@ -34,7 +36,7 @@ diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c unsigned int rmt_ip; #if ENABLE_FEATURE_HTTPD_CGI || DEBUG -@@ -881,8 +883,11 @@ +@@ -880,8 +882,11 @@ } #endif if (responseNum == HTTP_MOVED_TEMPORARILY) { @@ -47,7 +49,7 @@ diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c (config->query ? "?" : ""), (config->query ? config->query : "")); } -@@ -1598,8 +1603,12 @@ +@@ -1594,8 +1599,12 @@ *++purl = '\0'; /* so keep last character */ test = purl; /* end ptr */ @@ -61,7 +63,7 @@ diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c if (is_directory(url + 1, 1, &sb)) { config->found_moved_temporarily = url; } -@@ -1901,7 +1910,9 @@ +@@ -1897,7 +1906,9 @@ #endif enum { @@ -72,7 +74,7 @@ diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c d_opt_decode_url, h_opt_home_httpd, USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) -@@ -1923,7 +1934,7 @@ +@@ -1919,7 +1930,7 @@ OPT_FOREGROUND = 1 << p_opt_foreground, }; @@ -81,7 +83,7 @@ diff -ur bb.old/networking/httpd.c bb.dev/networking/httpd.c USE_FEATURE_HTTPD_ENCODE_URL_STR("e:") USE_FEATURE_HTTPD_BASIC_AUTH("r:") USE_FEATURE_HTTPD_AUTH_MD5("m:") -@@ -1954,6 +1965,7 @@ +@@ -1951,6 +1962,7 @@ config->ContentLength = -1; opt = getopt32(argc, argv, httpd_opts, diff --git a/package/busybox/patches/400-revert_awk_getopt.patch b/package/busybox/patches/400-revert_awk_getopt.patch index 9aa747b..d9c7cfb 100644 --- a/package/busybox/patches/400-revert_awk_getopt.patch +++ b/package/busybox/patches/400-revert_awk_getopt.patch @@ -1,6 +1,7 @@ -diff -ur busybox.old/editors/awk.c busybox.dev/editors/awk.c ---- busybox.old/editors/awk.c 2007-01-19 22:23:12.000000000 +0100 -+++ busybox.dev/editors/awk.c 2007-01-26 20:09:45.000000000 +0100 +Index: busybox-1.4.2/editors/awk.c +=================================================================== +--- busybox-1.4.2.orig/editors/awk.c 2007-06-04 13:21:32.083099296 +0200 ++++ busybox-1.4.2/editors/awk.c 2007-06-04 13:21:35.202625056 +0200 @@ -2639,14 +2639,13 @@ int awk_main(int argc, char **argv) diff --git a/package/busybox/patches/401-darwin_includes.patch b/package/busybox/patches/401-darwin_includes.patch index a5602d9..f563e10 100644 --- a/package/busybox/patches/401-darwin_includes.patch +++ b/package/busybox/patches/401-darwin_includes.patch @@ -1,5 +1,7 @@ ---- busybox-1.3.1/include/platform.h 2006-12-27 05:56:18.000000000 +0100 -+++ busybox-1.3.1.new/include/platform.h 2007-01-02 18:28:25.000000000 +0100 +Index: busybox-1.4.2/include/platform.h +=================================================================== +--- busybox-1.4.2.orig/include/platform.h 2007-06-04 13:21:32.055103552 +0200 ++++ busybox-1.4.2/include/platform.h 2007-06-04 13:21:35.387596936 +0200 @@ -128,9 +128,11 @@ # include <netinet/in.h> #endif @@ -11,8 +13,8 @@ +#endif /* ---- Compiler dependent settings ------------------------- */ - #ifndef __GNUC__ -@@ -168,7 +170,7 @@ + #if (defined __digital__ && defined __unix__) +@@ -161,7 +163,7 @@ #define HAVE_STDINT_H #else /* Largest integral types. */ @@ -21,8 +23,10 @@ typedef long int intmax_t; typedef unsigned long int uintmax_t; #else ---- busybox-1.3.1/include/libbb.h 2006-12-27 05:56:18.000000000 +0100 -+++ busybox-1.3.1.new/include/libbb.h 2007-01-02 18:29:13.000000000 +0100 +Index: busybox-1.4.2/include/libbb.h +=================================================================== +--- busybox-1.4.2.orig/include/libbb.h 2007-06-04 13:21:32.062102488 +0200 ++++ busybox-1.4.2/include/libbb.h 2007-06-04 13:21:35.388596784 +0200 @@ -17,7 +17,9 @@ #include <errno.h> #include <fcntl.h> diff --git a/package/busybox/patches/410-httpd_cgi_headers.patch b/package/busybox/patches/410-httpd_cgi_headers.patch index b0f5636..98f094e 100644 --- a/package/busybox/patches/410-httpd_cgi_headers.patch +++ b/package/busybox/patches/410-httpd_cgi_headers.patch @@ -1,7 +1,8 @@ -diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c ---- busybox.old/networking/httpd.c 2007-01-19 22:22:59.000000000 +0100 -+++ busybox.dev/networking/httpd.c 2007-02-10 16:36:50.950661760 +0100 -@@ -1224,7 +1224,7 @@ +Index: busybox-1.4.2/networking/httpd.c +=================================================================== +--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:35.006654848 +0200 ++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:35.585566840 +0200 +@@ -1231,7 +1231,7 @@ * "chopped up into small chunks" syndrome here */ rbuf[count] = '\0'; /* check to see if the user script added headers */ @@ -10,7 +11,7 @@ diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c if (memcmp(rbuf, HTTP_200, 4) != 0) { /* there is no "HTTP", do it ourself */ full_write(s, HTTP_200, sizeof(HTTP_200)-1); -@@ -1235,9 +1235,9 @@ +@@ -1242,9 +1242,9 @@ * echo -en "Location: http://www.busybox.net\r\n" * echo -en "\r\n" */ diff --git a/package/busybox/patches/420-httpd_sendcgi_fix.patch b/package/busybox/patches/420-httpd_sendcgi_fix.patch index f2ed2f3..9998cc2 100644 --- a/package/busybox/patches/420-httpd_sendcgi_fix.patch +++ b/package/busybox/patches/420-httpd_sendcgi_fix.patch @@ -1,7 +1,8 @@ -diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c ---- busybox.old/networking/httpd.c 2007-02-10 16:36:50.950661000 +0100 -+++ busybox.dev/networking/httpd.c 2007-02-11 21:24:52.026742384 +0100 -@@ -1211,9 +1211,10 @@ +Index: busybox-1.4.2/networking/httpd.c +=================================================================== +--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:35.585566840 +0200 ++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:35.775537960 +0200 +@@ -1218,9 +1218,10 @@ #if PIPESIZE >= MAX_MEMORY_BUFF # error "PIPESIZE >= MAX_MEMORY_BUFF" #endif diff --git a/package/busybox/patches/430-uniq_memleak.patch b/package/busybox/patches/430-uniq_memleak.patch index 10f464b..d43806f 100644 --- a/package/busybox/patches/430-uniq_memleak.patch +++ b/package/busybox/patches/430-uniq_memleak.patch @@ -1,6 +1,7 @@ -diff -ur bb.old/coreutils/uniq.c bb.dev/coreutils/uniq.c ---- bb.old/coreutils/uniq.c 2007-01-24 22:34:43.000000000 +0100 -+++ bb.dev/coreutils/uniq.c 2007-02-16 20:04:19.245454368 +0100 +Index: busybox-1.4.2/coreutils/uniq.c +=================================================================== +--- busybox-1.4.2.orig/coreutils/uniq.c 2007-06-04 13:21:31.993112976 +0200 ++++ busybox-1.4.2/coreutils/uniq.c 2007-06-04 13:21:35.960509840 +0200 @@ -83,6 +83,8 @@ if (!s0 || strcmp(e0, e1)) { diff --git a/package/busybox/patches/440-httpd_chdir.patch b/package/busybox/patches/440-httpd_chdir.patch index fcd2689..8ef70b8 100644 --- a/package/busybox/patches/440-httpd_chdir.patch +++ b/package/busybox/patches/440-httpd_chdir.patch @@ -1,6 +1,7 @@ -diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c ---- busybox.old/networking/httpd.c 2007-02-27 23:15:20.611300000 +0100 -+++ busybox.dev/networking/httpd.c 2007-02-27 23:18:10.022546112 +0100 +Index: busybox-1.4.2/networking/httpd.c +=================================================================== +--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:35.775537960 +0200 ++++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:36.144481872 +0200 @@ -102,6 +102,7 @@ static const char default_path_httpd_conf[] = "/etc"; static const char httpd_conf[] = "httpd.conf"; @@ -9,7 +10,7 @@ diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c #define TIMEOUT 60 -@@ -1500,6 +1501,8 @@ +@@ -1505,6 +1506,8 @@ #if ENABLE_FEATURE_HTTPD_BASIC_AUTH int credentials = -1; /* if not required this is Ok */ #endif @@ -18,7 +19,7 @@ diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c sa.sa_handler = handle_sigalrm; sigemptyset(&sa.sa_mask); -@@ -1931,7 +1934,6 @@ +@@ -1942,7 +1945,6 @@ int httpd_main(int argc, char *argv[]) { unsigned opt; diff --git a/package/busybox/patches/440-usage_compressed_fix.patch b/package/busybox/patches/440-usage_compressed_fix.patch index 9bf4d4c..c9e29ce 100644 --- a/package/busybox/patches/440-usage_compressed_fix.patch +++ b/package/busybox/patches/440-usage_compressed_fix.patch @@ -1,6 +1,7 @@ -diff -urN busybox-1.4.1/applets/usage_compressed busybox-1.4.1.new/applets/usage_compressed ---- busybox-1.4.1/applets/usage_compressed 2007-01-24 22:34:50.000000000 +0100 -+++ busybox-1.4.1.new/applets/usage_compressed 2007-02-26 22:28:56.000000000 +0100 +Index: busybox-1.4.2/applets/usage_compressed +=================================================================== +--- busybox-1.4.2.orig/applets/usage_compressed 2007-06-04 13:21:31.952119208 +0200 ++++ busybox-1.4.2/applets/usage_compressed 2007-06-04 13:21:36.331453448 +0200 @@ -14,6 +14,6 @@ echo 'static const char packed_usage[] = ' diff --git a/package/busybox/patches/450-truncated_ping_results.patch b/package/busybox/patches/450-truncated_ping_results.patch index f60a1a9..34582c2 100644 --- a/package/busybox/patches/450-truncated_ping_results.patch +++ b/package/busybox/patches/450-truncated_ping_results.patch @@ -1,5 +1,7 @@ ---- busybox-1.4.1/networking/ping.c 2007-01-24 22:34:34.000000000 +0100 -+++ busybox-1.4.1.new/networking/ping.c 2007-02-28 20:35:59.000000000 +0100 +Index: busybox-1.4.2/networking/ping.c +=================================================================== +--- busybox-1.4.2.orig/networking/ping.c 2007-06-04 13:21:31.931122400 +0200 ++++ busybox-1.4.2/networking/ping.c 2007-06-04 13:21:36.518425024 +0200 @@ -70,7 +70,7 @@ struct sockaddr_in pingaddr; struct icmp *pkt; diff --git a/package/busybox/patches/911-ipkg.patch b/package/busybox/patches/911-ipkg.patch index 8f482eb..d96063b 100644 --- a/package/busybox/patches/911-ipkg.patch +++ b/package/busybox/patches/911-ipkg.patch @@ -1,6 +1,7 @@ -diff -urN busybox.old/archival/Config.in busybox.dev/archival/Config.in ---- busybox.old/archival/Config.in 2007-01-19 22:23:02.000000000 +0100 -+++ busybox.dev/archival/Config.in 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/Config.in +=================================================================== +--- busybox-1.4.2.orig/archival/Config.in 2007-06-04 13:21:31.573176816 +0200 ++++ busybox-1.4.2/archival/Config.in 2007-06-04 13:21:36.706396448 +0200 @@ -121,6 +121,14 @@ gzip is used to compress files. It's probably the most widely used UNIX compression program. @@ -16,9 +17,10 @@ diff -urN busybox.old/archival/Config.in busybox.dev/archival/Config.in config RPM2CPIO bool "rpm2cpio" default n -diff -urN busybox.old/archival/dpkg.c busybox.dev/archival/dpkg.c ---- busybox.old/archival/dpkg.c 2007-01-19 22:23:02.000000000 +0100 -+++ busybox.dev/archival/dpkg.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/dpkg.c +=================================================================== +--- busybox-1.4.2.orig/archival/dpkg.c 2007-06-04 13:21:31.579175904 +0200 ++++ busybox-1.4.2/archival/dpkg.c 2007-06-04 13:21:36.706396448 +0200 @@ -1463,6 +1463,10 @@ return ar_handle->sub_archive->buffer; } @@ -39,9 +41,10 @@ diff -urN busybox.old/archival/dpkg.c busybox.dev/archival/dpkg.c static void unpack_package(deb_file_t *deb_file) { const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name]; -diff -urN busybox.old/archival/ipkg.c busybox.dev/archival/ipkg.c ---- busybox.old/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/ipkg.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/ipkg.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/ipkg.c 2007-06-04 13:21:36.707396296 +0200 @@ -0,0 +1,26 @@ +/* ipkg.c - the itsy package management system + @@ -69,9 +72,10 @@ diff -urN busybox.old/archival/ipkg.c busybox.dev/archival/ipkg.c +{ + return ipkg_op(argc, argv); +} -diff -urN busybox.old/archival/Kbuild busybox.dev/archival/Kbuild ---- busybox.old/archival/Kbuild 2007-01-19 22:23:02.000000000 +0100 -+++ busybox.dev/archival/Kbuild 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/Kbuild +=================================================================== +--- busybox-1.4.2.orig/archival/Kbuild 2007-06-04 13:21:31.588174536 +0200 ++++ busybox-1.4.2/archival/Kbuild 2007-06-04 13:21:36.707396296 +0200 @@ -15,6 +15,7 @@ lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o lib-$(CONFIG_GUNZIP) += gunzip.o @@ -80,9 +84,10 @@ diff -urN busybox.old/archival/Kbuild busybox.dev/archival/Kbuild lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o lib-$(CONFIG_RPM) += rpm.o lib-$(CONFIG_TAR) += tar.o -diff -urN busybox.old/archival/libipkg/args.c busybox.dev/archival/libipkg/args.c ---- busybox.old/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/args.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/args.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/args.c 2007-06-04 13:21:36.707396296 +0200 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -326,9 +331,10 @@ diff -urN busybox.old/archival/libipkg/args.c busybox.dev/archival/libipkg/args. +{ + bb_error_msg("version %s\n", IPKG_VERSION); +} -diff -urN busybox.old/archival/libipkg/args.h busybox.dev/archival/libipkg/args.h ---- busybox.old/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/args.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/args.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/args.h 2007-06-04 13:21:36.707396296 +0200 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -402,9 +408,10 @@ diff -urN busybox.old/archival/libipkg/args.h busybox.dev/archival/libipkg/args. +void args_usage(char *complaint); + +#endif -diff -urN busybox.old/archival/libipkg/conffile.c busybox.dev/archival/libipkg/conffile.c ---- busybox.old/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/conffile.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/conffile.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/conffile.c 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,64 @@ +/* conffile.c - the itsy package management system + @@ -470,9 +477,10 @@ diff -urN busybox.old/archival/libipkg/conffile.c busybox.dev/archival/libipkg/c + + return ret; +} -diff -urN busybox.old/archival/libipkg/conffile.h busybox.dev/archival/libipkg/conffile.h ---- busybox.old/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/conffile.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/conffile.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/conffile.h 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -504,9 +512,10 @@ diff -urN busybox.old/archival/libipkg/conffile.h busybox.dev/archival/libipkg/c + +#endif + -diff -urN busybox.old/archival/libipkg/conffile_list.c busybox.dev/archival/libipkg/conffile_list.c ---- busybox.old/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/conffile_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/conffile_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/conffile_list.c 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -555,9 +564,10 @@ diff -urN busybox.old/archival/libipkg/conffile_list.c busybox.dev/archival/libi + return nv_pair_list_pop(list); +} + -diff -urN busybox.old/archival/libipkg/conffile_list.h busybox.dev/archival/libipkg/conffile_list.h ---- busybox.old/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/conffile_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/conffile_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/conffile_list.h 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -595,9 +605,10 @@ diff -urN busybox.old/archival/libipkg/conffile_list.h busybox.dev/archival/libi + +#endif + -diff -urN busybox.old/archival/libipkg/file_util.c busybox.dev/archival/libipkg/file_util.c ---- busybox.old/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/file_util.c 2007-01-22 14:00:52.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/file_util.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/file_util.c 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,132 @@ +/* file_util.c - convenience routines for common stat operations + @@ -731,9 +742,10 @@ diff -urN busybox.old/archival/libipkg/file_util.c busybox.dev/archival/libipkg/ + return hash_file(file_name, HASH_MD5); +} + -diff -urN busybox.old/archival/libipkg/file_util.h busybox.dev/archival/libipkg/file_util.h ---- busybox.old/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/file_util.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/file_util.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/file_util.h 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -764,9 +776,10 @@ diff -urN busybox.old/archival/libipkg/file_util.h busybox.dev/archival/libipkg/ +char *file_md5sum_alloc(const char *file_name); + +#endif -diff -urN busybox.old/archival/libipkg/hash_table.c busybox.dev/archival/libipkg/hash_table.c ---- busybox.old/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/hash_table.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/hash_table.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/hash_table.c 2007-06-04 13:21:36.709395992 +0200 @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -923,9 +936,10 @@ diff -urN busybox.old/archival/libipkg/hash_table.c busybox.dev/archival/libipkg + } +} + -diff -urN busybox.old/archival/libipkg/hash_table.h busybox.dev/archival/libipkg/hash_table.h ---- busybox.old/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/hash_table.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/hash_table.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/hash_table.h 2007-06-04 13:21:36.709395992 +0200 @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -971,9 +985,10 @@ diff -urN busybox.old/archival/libipkg/hash_table.h busybox.dev/archival/libipkg +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data); + +#endif /* _HASH_TABLE_H_ */ -diff -urN busybox.old/archival/libipkg/ipkg_cmd.c busybox.dev/archival/libipkg/ipkg_cmd.c ---- busybox.old/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_cmd.c 2007-01-22 13:47:47.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_cmd.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_cmd.c 2007-06-04 13:21:36.710395840 +0200 @@ -0,0 +1,1431 @@ +/* ipkg_cmd.c - the itsy package management system + @@ -2406,9 +2421,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_cmd.c busybox.dev/archival/libipkg/i +} + + -diff -urN busybox.old/archival/libipkg/ipkg_cmd.h busybox.dev/archival/libipkg/ipkg_cmd.h ---- busybox.old/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_cmd.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_cmd.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_cmd.h 2007-06-04 13:21:36.710395840 +0200 @@ -0,0 +1,46 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2456,9 +2472,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_cmd.h busybox.dev/archival/libipkg/i +int pkg_mark_provides(pkg_t *pkg); + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_conf.c busybox.dev/archival/libipkg/ipkg_conf.c ---- busybox.old/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_conf.c 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_conf.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_conf.c 2007-06-04 13:21:36.711395688 +0200 @@ -0,0 +1,711 @@ +/* ipkg_conf.c - the itsy package management system + @@ -3171,9 +3188,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_conf.c busybox.dev/archival/libipkg/ + sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename); + return root_filename; +} -diff -urN busybox.old/archival/libipkg/ipkg_conf.h busybox.dev/archival/libipkg/ipkg_conf.h ---- busybox.old/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_conf.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_conf.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_conf.h 2007-06-04 13:21:36.711395688 +0200 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3282,9 +3300,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_conf.h busybox.dev/archival/libipkg/ +char *root_filename_alloc(ipkg_conf_t *conf, char *filename); + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_configure.c busybox.dev/archival/libipkg/ipkg_configure.c ---- busybox.old/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_configure.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_configure.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_configure.c 2007-06-04 13:21:36.712395536 +0200 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3326,9 +3345,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_configure.c busybox.dev/archival/lib + return 0; +} + -diff -urN busybox.old/archival/libipkg/ipkg_configure.h busybox.dev/archival/libipkg/ipkg_configure.h ---- busybox.old/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_configure.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_configure.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_configure.h 2007-06-04 13:21:36.712395536 +0200 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3355,9 +3375,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_configure.h busybox.dev/archival/lib +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg); + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_download.c busybox.dev/archival/libipkg/ipkg_download.c ---- busybox.old/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_download.c 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_download.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_download.c 2007-06-04 13:21:36.712395536 +0200 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3554,9 +3575,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_download.c busybox.dev/archival/libi + } + return 0; +} -diff -urN busybox.old/archival/libipkg/ipkg_download.h busybox.dev/archival/libipkg/ipkg_download.h ---- busybox.old/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_download.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_download.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_download.h 2007-06-04 13:21:36.712395536 +0200 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3588,9 +3610,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_download.h busybox.dev/archival/libi +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep); + +#endif -diff -urN busybox.old/archival/libipkg/ipkg.h busybox.dev/archival/libipkg/ipkg.h ---- busybox.old/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg.h 2007-06-04 13:21:36.712395536 +0200 @@ -0,0 +1,74 @@ +/* ipkg.h - the itsy package management system + @@ -3666,9 +3689,10 @@ diff -urN busybox.old/archival/libipkg/ipkg.h busybox.dev/archival/libipkg/ipkg. +extern ipkg_conf_t *global_conf; + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_includes.h busybox.dev/archival/libipkg/ipkg_includes.h ---- busybox.old/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_includes.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_includes.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_includes.h 2007-06-04 13:21:36.713395384 +0200 @@ -0,0 +1,79 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3749,9 +3773,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_includes.h busybox.dev/archival/libi +#endif + +#endif /* IPKG_INCLUDES_H */ -diff -urN busybox.old/archival/libipkg/ipkg_install.c busybox.dev/archival/libipkg/ipkg_install.c ---- busybox.old/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_install.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_install.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_install.c 2007-06-04 13:21:36.714395232 +0200 @@ -0,0 +1,1942 @@ +/* ipkg_install.c - the itsy package management system + @@ -5695,9 +5720,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_install.c busybox.dev/archival/libip +} + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_install.h busybox.dev/archival/libipkg/ipkg_install.h ---- busybox.old/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_install.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_install.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_install.h 2007-06-04 13:21:36.715395080 +0200 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5734,9 +5760,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_install.h busybox.dev/archival/libip +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed); + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_message.c busybox.dev/archival/libipkg/ipkg_message.c ---- busybox.old/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_message.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_message.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_message.c 2007-06-04 13:21:36.715395080 +0200 @@ -0,0 +1,61 @@ +/* ipkg_message.c - the itsy package management system + @@ -5799,9 +5826,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_message.c busybox.dev/archival/libip + } +} +#endif -diff -urN busybox.old/archival/libipkg/ipkg_message.h busybox.dev/archival/libipkg/ipkg_message.h ---- busybox.old/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_message.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_message.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_message.h 2007-06-04 13:21:36.715395080 +0200 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5835,9 +5863,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_message.h busybox.dev/archival/libip +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, char *fmt, ...); + +#endif /* _IPKG_MESSAGE_H_ */ -diff -urN busybox.old/archival/libipkg/ipkg_remove.c busybox.dev/archival/libipkg/ipkg_remove.c ---- busybox.old/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_remove.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_remove.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_remove.c 2007-06-04 13:21:36.716394928 +0200 @@ -0,0 +1,383 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6222,9 +6251,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_remove.c busybox.dev/archival/libipk + + return 0; +} -diff -urN busybox.old/archival/libipkg/ipkg_remove.h busybox.dev/archival/libipkg/ipkg_remove.h ---- busybox.old/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_remove.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_remove.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_remove.h 2007-06-04 13:21:36.716394928 +0200 @@ -0,0 +1,33 @@ +/* ipkg_remove.h - the itsy package management system + @@ -6259,9 +6289,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_remove.h busybox.dev/archival/libipk + + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_upgrade.c busybox.dev/archival/libipkg/ipkg_upgrade.c ---- busybox.old/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_upgrade.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_upgrade.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_upgrade.c 2007-06-04 13:21:36.716394928 +0200 @@ -0,0 +1,77 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6340,9 +6371,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_upgrade.c busybox.dev/archival/libip + new->state_flag |= SF_USER; + return ipkg_install_pkg(conf, new,1); +} -diff -urN busybox.old/archival/libipkg/ipkg_upgrade.h busybox.dev/archival/libipkg/ipkg_upgrade.h ---- busybox.old/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_upgrade.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_upgrade.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_upgrade.h 2007-06-04 13:21:36.716394928 +0200 @@ -0,0 +1,18 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6362,9 +6394,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_upgrade.h busybox.dev/archival/libip +#include "ipkg.h" + +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); -diff -urN busybox.old/archival/libipkg/ipkg_utils.c busybox.dev/archival/libipkg/ipkg_utils.c ---- busybox.old/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_utils.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_utils.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_utils.c 2007-06-04 13:21:36.716394928 +0200 @@ -0,0 +1,181 @@ +/* ipkg_utils.c - the itsy package management system + @@ -6547,9 +6580,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_utils.c busybox.dev/archival/libipkg +} + + -diff -urN busybox.old/archival/libipkg/ipkg_utils.h busybox.dev/archival/libipkg/ipkg_utils.h ---- busybox.old/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_utils.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_utils.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_utils.h 2007-06-04 13:21:36.717394776 +0200 @@ -0,0 +1,29 @@ +/* ipkg_utils.h - the itsy package management system + @@ -6580,9 +6614,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_utils.h busybox.dev/archival/libipkg +int line_is_blank(const char *line); + +#endif -diff -urN busybox.old/archival/libipkg/Kbuild busybox.dev/archival/libipkg/Kbuild ---- busybox.old/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/Kbuild 2007-01-22 14:01:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/Kbuild +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/Kbuild 2007-06-04 13:21:36.717394776 +0200 @@ -0,0 +1,60 @@ +# Makefile for busybox +# @@ -6644,9 +6679,10 @@ diff -urN busybox.old/archival/libipkg/Kbuild busybox.dev/archival/libipkg/Kbuil +IPKG_ARCH:=$(TARGET_ARCH) +endif +CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" -diff -urN busybox.old/archival/libipkg/libipkg.c busybox.dev/archival/libipkg/libipkg.c ---- busybox.old/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/libipkg.c 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/libipkg.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/libipkg.c 2007-06-04 13:21:36.717394776 +0200 @@ -0,0 +1,527 @@ +/* ipkglib.c - the itsy package management system + @@ -7175,9 +7211,10 @@ diff -urN busybox.old/archival/libipkg/libipkg.c busybox.dev/archival/libipkg/li +} + +#endif /* IPKG_LIB */ -diff -urN busybox.old/archival/libipkg/libipkg.h busybox.dev/archival/libipkg/libipkg.h ---- busybox.old/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/libipkg.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/libipkg.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/libipkg.h 2007-06-04 13:21:36.718394624 +0200 @@ -0,0 +1,87 @@ +/* ipkglib.h - the itsy package management system + @@ -7266,9 +7303,10 @@ diff -urN busybox.old/archival/libipkg/libipkg.h busybox.dev/archival/libipkg/li + + +#endif -diff -urN busybox.old/archival/libipkg/nv_pair.c busybox.dev/archival/libipkg/nv_pair.c ---- busybox.old/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/nv_pair.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/nv_pair.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/nv_pair.c 2007-06-04 13:21:36.718394624 +0200 @@ -0,0 +1,40 @@ +/* nv_pair.c - the itsy package management system + @@ -7310,9 +7348,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair.c busybox.dev/archival/libipkg/nv +} + + -diff -urN busybox.old/archival/libipkg/nv_pair.h busybox.dev/archival/libipkg/nv_pair.h ---- busybox.old/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/nv_pair.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/nv_pair.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/nv_pair.h 2007-06-04 13:21:36.718394624 +0200 @@ -0,0 +1,32 @@ +/* nv_pair.h - the itsy package management system + @@ -7346,9 +7385,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair.h busybox.dev/archival/libipkg/nv + +#endif + -diff -urN busybox.old/archival/libipkg/nv_pair_list.c busybox.dev/archival/libipkg/nv_pair_list.c ---- busybox.old/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/nv_pair_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/nv_pair_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/nv_pair_list.c 2007-06-04 13:21:36.718394624 +0200 @@ -0,0 +1,98 @@ +/* nv_pair_list.c - the itsy package management system + @@ -7448,9 +7488,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair_list.c busybox.dev/archival/libip + } + return NULL; +} -diff -urN busybox.old/archival/libipkg/nv_pair_list.h busybox.dev/archival/libipkg/nv_pair_list.h ---- busybox.old/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/nv_pair_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/nv_pair_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/nv_pair_list.h 2007-06-04 13:21:36.718394624 +0200 @@ -0,0 +1,60 @@ +/* nv_pair_list.h - the itsy package management system + @@ -7512,9 +7553,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair_list.h busybox.dev/archival/libip + +#endif + -diff -urN busybox.old/archival/libipkg/pkg.c busybox.dev/archival/libipkg/pkg.c ---- busybox.old/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg.c 2007-01-22 13:41:10.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg.c 2007-06-04 13:21:36.720394320 +0200 @@ -0,0 +1,1747 @@ +/* pkg.c - the itsy package management system + @@ -9263,9 +9305,10 @@ diff -urN busybox.old/archival/libipkg/pkg.c busybox.dev/archival/libipkg/pkg.c + } + return 0; +} -diff -urN busybox.old/archival/libipkg/pkg_depends.c busybox.dev/archival/libipkg/pkg_depends.c ---- busybox.old/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_depends.c 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_depends.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_depends.c 2007-06-04 13:21:36.724393712 +0200 @@ -0,0 +1,1031 @@ +/* pkg_depends.c - the itsy package management system + @@ -10298,9 +10341,10 @@ diff -urN busybox.old/archival/libipkg/pkg_depends.c busybox.dev/archival/libipk + + return 0; +} -diff -urN busybox.old/archival/libipkg/pkg_depends.h busybox.dev/archival/libipkg/pkg_depends.h ---- busybox.old/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_depends.h 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_depends.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_depends.h 2007-06-04 13:21:36.724393712 +0200 @@ -0,0 +1,105 @@ +/* pkg_depends.h - the itsy package management system + @@ -10407,9 +10451,10 @@ diff -urN busybox.old/archival/libipkg/pkg_depends.h busybox.dev/archival/libipk +int pkg_dependence_satisfied(ipkg_conf_t *conf, depend_t *depend); + +#endif -diff -urN busybox.old/archival/libipkg/pkg_dest.c busybox.dev/archival/libipkg/pkg_dest.c ---- busybox.old/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_dest.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_dest.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_dest.c 2007-06-04 13:21:36.725393560 +0200 @@ -0,0 +1,92 @@ +/* pkg_dest.c - the itsy package management system + @@ -10503,9 +10548,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest.c busybox.dev/archival/libipkg/p + + dest->root_dir = NULL; +} -diff -urN busybox.old/archival/libipkg/pkg_dest.h busybox.dev/archival/libipkg/pkg_dest.h ---- busybox.old/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_dest.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_dest.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_dest.h 2007-06-04 13:21:36.725393560 +0200 @@ -0,0 +1,38 @@ +/* pkg_dest.h - the itsy package management system + @@ -10545,9 +10591,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest.h busybox.dev/archival/libipkg/p + +#endif + -diff -urN busybox.old/archival/libipkg/pkg_dest_list.c busybox.dev/archival/libipkg/pkg_dest_list.c ---- busybox.old/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_dest_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_dest_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_dest_list.c 2007-06-04 13:21:36.725393560 +0200 @@ -0,0 +1,85 @@ +/* pkg_dest_list.c - the itsy package management system + @@ -10634,9 +10681,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest_list.c busybox.dev/archival/libi +{ + return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -urN busybox.old/archival/libipkg/pkg_dest_list.h busybox.dev/archival/libipkg/pkg_dest_list.h ---- busybox.old/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_dest_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_dest_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_dest_list.h 2007-06-04 13:21:36.725393560 +0200 @@ -0,0 +1,50 @@ +/* pkg_dest_list.h - the itsy package management system + @@ -10688,9 +10736,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest_list.h busybox.dev/archival/libi + +#endif + -diff -urN busybox.old/archival/libipkg/pkg_extract.c busybox.dev/archival/libipkg/pkg_extract.c ---- busybox.old/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_extract.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_extract.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_extract.c 2007-06-04 13:21:36.726393408 +0200 @@ -0,0 +1,224 @@ +/* pkg_extract.c - the itsy package management system + @@ -10916,9 +10965,10 @@ diff -urN busybox.old/archival/libipkg/pkg_extract.c busybox.dev/archival/libipk + + return 0; +} -diff -urN busybox.old/archival/libipkg/pkg_extract.h busybox.dev/archival/libipkg/pkg_extract.h ---- busybox.old/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_extract.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_extract.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_extract.h 2007-06-04 13:21:36.726393408 +0200 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -10952,9 +11002,10 @@ diff -urN busybox.old/archival/libipkg/pkg_extract.h busybox.dev/archival/libipk +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file); + +#endif -diff -urN busybox.old/archival/libipkg/pkg.h busybox.dev/archival/libipkg/pkg.h ---- busybox.old/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg.h 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg.h 2007-06-04 13:21:36.726393408 +0200 @@ -0,0 +1,232 @@ +/* pkg.h - the itsy package management system + @@ -11188,9 +11239,10 @@ diff -urN busybox.old/archival/libipkg/pkg.h busybox.dev/archival/libipkg/pkg.h +int pkg_write_changed_filelists(ipkg_conf_t *conf); + +#endif -diff -urN busybox.old/archival/libipkg/pkg_hash.c busybox.dev/archival/libipkg/pkg_hash.c ---- busybox.old/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_hash.c 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_hash.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_hash.c 2007-06-04 13:21:36.727393256 +0200 @@ -0,0 +1,616 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11808,9 +11860,10 @@ diff -urN busybox.old/archival/libipkg/pkg_hash.c busybox.dev/archival/libipkg/p +} + + -diff -urN busybox.old/archival/libipkg/pkg_hash.h busybox.dev/archival/libipkg/pkg_hash.h ---- busybox.old/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_hash.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_hash.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_hash.h 2007-06-04 13:21:36.727393256 +0200 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11873,9 +11926,10 @@ diff -urN busybox.old/archival/libipkg/pkg_hash.h busybox.dev/archival/libipkg/p + +#endif + -diff -urN busybox.old/archival/libipkg/pkg_parse.c busybox.dev/archival/libipkg/pkg_parse.c ---- busybox.old/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_parse.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_parse.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_parse.c 2007-06-04 13:21:36.727393256 +0200 @@ -0,0 +1,366 @@ +/* pkg_parse.c - the itsy package management system + @@ -12243,9 +12297,10 @@ diff -urN busybox.old/archival/libipkg/pkg_parse.c busybox.dev/archival/libipkg/ + + return 0; +} -diff -urN busybox.old/archival/libipkg/pkg_parse.h busybox.dev/archival/libipkg/pkg_parse.h ---- busybox.old/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_parse.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_parse.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_parse.h 2007-06-04 13:21:36.728393104 +0200 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12278,9 +12333,10 @@ diff -urN busybox.old/archival/libipkg/pkg_parse.h busybox.dev/archival/libipkg/ +int pkg_valorize_other_field(pkg_t *pkg, char ***raw); + +#endif -diff -urN busybox.old/archival/libipkg/pkg_src.c busybox.dev/archival/libipkg/pkg_src.c ---- busybox.old/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_src.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_src.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_src.c 2007-06-04 13:21:36.728393104 +0200 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12325,9 +12381,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src.c busybox.dev/archival/libipkg/pk +} + + -diff -urN busybox.old/archival/libipkg/pkg_src.h busybox.dev/archival/libipkg/pkg_src.h ---- busybox.old/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_src.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_src.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_src.h 2007-06-04 13:21:36.728393104 +0200 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12363,9 +12420,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src.h busybox.dev/archival/libipkg/pk +void pkg_src_deinit(pkg_src_t *src); + +#endif -diff -urN busybox.old/archival/libipkg/pkg_src_list.c busybox.dev/archival/libipkg/pkg_src_list.c ---- busybox.old/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_src_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_src_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_src_list.c 2007-06-04 13:21:36.728393104 +0200 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12442,9 +12500,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src_list.c busybox.dev/archival/libip +{ + return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -urN busybox.old/archival/libipkg/pkg_src_list.h busybox.dev/archival/libipkg/pkg_src_list.h ---- busybox.old/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_src_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_src_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_src_list.h 2007-06-04 13:21:36.728393104 +0200 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12503,9 +12562,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src_list.h busybox.dev/archival/libip + +#endif + -diff -urN busybox.old/archival/libipkg/pkg_vec.c busybox.dev/archival/libipkg/pkg_vec.c ---- busybox.old/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_vec.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_vec.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_vec.c 2007-06-04 13:21:36.729392952 +0200 @@ -0,0 +1,230 @@ +/* pkg_vec.c - the itsy package management system + @@ -12737,9 +12797,10 @@ diff -urN busybox.old/archival/libipkg/pkg_vec.c busybox.dev/archival/libipkg/pk + qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar); +} + -diff -urN busybox.old/archival/libipkg/pkg_vec.h busybox.dev/archival/libipkg/pkg_vec.h ---- busybox.old/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_vec.h 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_vec.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_vec.h 2007-06-04 13:21:36.729392952 +0200 @@ -0,0 +1,64 @@ +/* pkg_vec.h - the itsy package management system + @@ -12805,9 +12866,10 @@ diff -urN busybox.old/archival/libipkg/pkg_vec.h busybox.dev/archival/libipkg/pk +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *)); +#endif + -diff -urN busybox.old/archival/libipkg/sprintf_alloc.h busybox.dev/archival/libipkg/sprintf_alloc.h ---- busybox.old/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/sprintf_alloc.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/sprintf_alloc.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/sprintf_alloc.h 2007-06-04 13:21:36.729392952 +0200 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12834,9 +12896,10 @@ diff -urN busybox.old/archival/libipkg/sprintf_alloc.h busybox.dev/archival/libi +#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args) + +#endif -diff -urN busybox.old/archival/libipkg/str_list.c busybox.dev/archival/libipkg/str_list.c ---- busybox.old/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/str_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/str_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/str_list.c 2007-06-04 13:21:36.729392952 +0200 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -12914,9 +12977,10 @@ diff -urN busybox.old/archival/libipkg/str_list.c busybox.dev/archival/libipkg/s + (void *)target_str, + (void_list_cmp_t)strcmp); +} -diff -urN busybox.old/archival/libipkg/str_list.h busybox.dev/archival/libipkg/str_list.h ---- busybox.old/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/str_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/str_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/str_list.h 2007-06-04 13:21:36.729392952 +0200 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -12969,9 +13033,10 @@ diff -urN busybox.old/archival/libipkg/str_list.h busybox.dev/archival/libipkg/s +char *str_list_remove_elt(str_list_t *list, const char *target_str); + +#endif -diff -urN busybox.old/archival/libipkg/str_util.c busybox.dev/archival/libipkg/str_util.c ---- busybox.old/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/str_util.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/str_util.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/str_util.c 2007-06-04 13:21:36.730392800 +0200 @@ -0,0 +1,73 @@ +/* str_utils.c - the itsy package management system + @@ -13046,9 +13111,10 @@ diff -urN busybox.old/archival/libipkg/str_util.c busybox.dev/archival/libipkg/s + return str ? strdup(str) : NULL; +} + -diff -urN busybox.old/archival/libipkg/str_util.h busybox.dev/archival/libipkg/str_util.h ---- busybox.old/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/str_util.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/str_util.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/str_util.h 2007-06-04 13:21:36.730392800 +0200 @@ -0,0 +1,28 @@ +/* str_utils.h - the itsy package management system + @@ -13078,9 +13144,10 @@ diff -urN busybox.old/archival/libipkg/str_util.h busybox.dev/archival/libipkg/s +char *str_dup_safe(const char *str); + +#endif -diff -urN busybox.old/archival/libipkg/user.c busybox.dev/archival/libipkg/user.c ---- busybox.old/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/user.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/user.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/user.c 2007-06-04 13:21:36.730392800 +0200 @@ -0,0 +1,58 @@ +/* user.c - the itsy package management system + @@ -13140,9 +13207,10 @@ diff -urN busybox.old/archival/libipkg/user.c busybox.dev/archival/libipkg/user. + + return response; +} -diff -urN busybox.old/archival/libipkg/user.h busybox.dev/archival/libipkg/user.h ---- busybox.old/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/user.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/user.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/user.h 2007-06-04 13:21:36.730392800 +0200 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13167,9 +13235,10 @@ diff -urN busybox.old/archival/libipkg/user.h busybox.dev/archival/libipkg/user. + +char *get_user_response(const char *format, ...); + -diff -urN busybox.old/archival/libipkg/void_list.c busybox.dev/archival/libipkg/void_list.c ---- busybox.old/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/void_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/void_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/void_list.c 2007-06-04 13:21:36.731392648 +0200 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13365,9 +13434,10 @@ diff -urN busybox.old/archival/libipkg/void_list.c busybox.dev/archival/libipkg/ + else + return NULL; +} -diff -urN busybox.old/archival/libipkg/void_list.h busybox.dev/archival/libipkg/void_list.h ---- busybox.old/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/void_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/void_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/void_list.h 2007-06-04 13:21:36.731392648 +0200 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13428,9 +13498,10 @@ diff -urN busybox.old/archival/libipkg/void_list.h busybox.dev/archival/libipkg/ +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp); + +#endif -diff -urN busybox.old/archival/libipkg/xsystem.c busybox.dev/archival/libipkg/xsystem.c ---- busybox.old/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/xsystem.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/xsystem.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/xsystem.c 2007-06-04 13:21:36.731392648 +0200 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13496,9 +13567,10 @@ diff -urN busybox.old/archival/libipkg/xsystem.c busybox.dev/archival/libipkg/xs + return -1; +} + -diff -urN busybox.old/archival/libipkg/xsystem.h busybox.dev/archival/libipkg/xsystem.h ---- busybox.old/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/xsystem.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/xsystem.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/xsystem.h 2007-06-04 13:21:36.731392648 +0200 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13534,9 +13606,10 @@ diff -urN busybox.old/archival/libipkg/xsystem.h busybox.dev/archival/libipkg/xs + +#endif + -diff -urN busybox.old/archival/libunarchive/data_extract_all.c busybox.dev/archival/libunarchive/data_extract_all.c ---- busybox.old/archival/libunarchive/data_extract_all.c 2007-01-19 22:23:02.000000000 +0100 -+++ busybox.dev/archival/libunarchive/data_extract_all.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libunarchive/data_extract_all.c +=================================================================== +--- busybox-1.4.2.orig/archival/libunarchive/data_extract_all.c 2007-06-04 13:21:31.879130304 +0200 ++++ busybox-1.4.2/archival/libunarchive/data_extract_all.c 2007-06-04 13:21:36.731392648 +0200 @@ -117,3 +117,17 @@ utime(file_header->name, &t); } @@ -13555,9 +13628,10 @@ diff -urN busybox.old/archival/libunarchive/data_extract_all.c busybox.dev/archi + } +} + -diff -urN busybox.old/archival/libunarchive/Kbuild busybox.dev/archival/libunarchive/Kbuild ---- busybox.old/archival/libunarchive/Kbuild 2007-01-19 22:23:02.000000000 +0100 -+++ busybox.dev/archival/libunarchive/Kbuild 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libunarchive/Kbuild +=================================================================== +--- busybox-1.4.2.orig/archival/libunarchive/Kbuild 2007-06-04 13:21:31.886129240 +0200 ++++ busybox-1.4.2/archival/libunarchive/Kbuild 2007-06-04 13:21:36.732392496 +0200 @@ -47,6 +47,7 @@ lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) @@ -13566,9 +13640,10 @@ diff -urN busybox.old/archival/libunarchive/Kbuild busybox.dev/archival/libunarc 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 -urN busybox.old/include/applets.h busybox.dev/include/applets.h ---- busybox.old/include/applets.h 2007-01-20 16:34:47.000000000 +0100 -+++ busybox.dev/include/applets.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/include/applets.h +=================================================================== +--- busybox-1.4.2.orig/include/applets.h 2007-06-04 13:21:34.786688288 +0200 ++++ busybox-1.4.2/include/applets.h 2007-06-04 13:21:36.732392496 +0200 @@ -160,6 +160,7 @@ USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS)) @@ -13577,9 +13652,10 @@ diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h USE_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_NEVER)) -diff -urN busybox.old/include/unarchive.h busybox.dev/include/unarchive.h ---- busybox.old/include/unarchive.h 2007-01-19 22:23:10.000000000 +0100 -+++ busybox.dev/include/unarchive.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/include/unarchive.h +=================================================================== +--- busybox-1.4.2.orig/include/unarchive.h 2007-06-04 13:21:31.897127568 +0200 ++++ busybox-1.4.2/include/unarchive.h 2007-06-04 13:21:36.732392496 +0200 @@ -76,6 +76,7 @@ extern void data_skip(archive_handle_t *archive_handle); @@ -13588,9 +13664,10 @@ diff -urN busybox.old/include/unarchive.h busybox.dev/include/unarchive.h extern void data_extract_to_stdout(archive_handle_t *archive_handle); extern void data_extract_to_buffer(archive_handle_t *archive_handle); -diff -urN busybox.old/include/usage.h busybox.dev/include/usage.h ---- busybox.old/include/usage.h 2007-01-19 22:23:10.000000000 +0100 -+++ busybox.dev/include/usage.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/include/usage.h +=================================================================== +--- busybox-1.4.2.orig/include/usage.h 2007-06-04 13:21:35.005655000 +0200 ++++ busybox-1.4.2/include/usage.h 2007-06-04 13:21:36.734392192 +0200 @@ -1133,6 +1133,82 @@ "$ ls -la /tmp/busybox*\n" \ "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" @@ -13674,9 +13751,10 @@ diff -urN busybox.old/include/usage.h busybox.dev/include/usage.h #define halt_trivial_usage \ "[-d<delay>] [-n<nosync>] [-f<force>]" #define halt_full_usage \ -diff -urN busybox.old/Makefile busybox.dev/Makefile ---- busybox.old/Makefile 2007-01-20 21:21:39.000000000 +0100 -+++ busybox.dev/Makefile 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/Makefile +=================================================================== +--- busybox-1.4.2.orig/Makefile 2007-06-04 13:21:31.910125592 +0200 ++++ busybox-1.4.2/Makefile 2007-06-04 13:21:36.734392192 +0200 @@ -423,6 +423,7 @@ libs-y := \ diff --git a/package/busybox/patches/913-libbb_hash.patch b/package/busybox/patches/913-libbb_hash.patch index a9cb239..e371b32 100644 --- a/package/busybox/patches/913-libbb_hash.patch +++ b/package/busybox/patches/913-libbb_hash.patch @@ -1,6 +1,7 @@ -diff -ur busybox.old/coreutils/md5_sha1_sum.c busybox.dev/coreutils/md5_sha1_sum.c ---- busybox.old/coreutils/md5_sha1_sum.c 2007-01-19 22:23:05.000000000 +0100 -+++ busybox.dev/coreutils/md5_sha1_sum.c 2007-01-22 13:24:51.000000000 +0100 +Index: busybox-1.4.2/coreutils/md5_sha1_sum.c +=================================================================== +--- busybox-1.4.2.orig/coreutils/md5_sha1_sum.c 2007-06-04 13:21:31.536182440 +0200 ++++ busybox-1.4.2/coreutils/md5_sha1_sum.c 2007-06-04 13:21:37.709243992 +0200 @@ -8,76 +8,10 @@ #include "busybox.h" @@ -78,10 +79,11 @@ diff -ur busybox.old/coreutils/md5_sha1_sum.c busybox.dev/coreutils/md5_sha1_sum int md5_sha1_sum_main(int argc, char **argv) { int return_value = EXIT_SUCCESS; -diff -ur busybox.old/include/libbb.h busybox.dev/include/libbb.h ---- busybox.old/include/libbb.h 2007-01-19 22:23:10.000000000 +0100 -+++ busybox.dev/include/libbb.h 2007-01-22 13:28:56.000000000 +0100 -@@ -637,6 +637,7 @@ +Index: busybox-1.4.2/include/libbb.h +=================================================================== +--- busybox-1.4.2.orig/include/libbb.h 2007-06-04 13:21:35.388596784 +0200 ++++ busybox-1.4.2/include/libbb.h 2007-06-04 13:21:37.709243992 +0200 +@@ -641,6 +641,7 @@ extern const char bb_uuenc_tbl_std[]; void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl); @@ -89,7 +91,7 @@ diff -ur busybox.old/include/libbb.h busybox.dev/include/libbb.h typedef struct sha1_ctx_t { uint32_t count[2]; uint32_t hash[5]; -@@ -658,6 +659,8 @@ +@@ -662,6 +663,8 @@ void md5_begin(md5_ctx_t *ctx); void md5_hash(const void *data, size_t length, md5_ctx_t *ctx); void *md5_end(void *resbuf, md5_ctx_t *ctx); @@ -98,9 +100,10 @@ diff -ur busybox.old/include/libbb.h busybox.dev/include/libbb.h uint32_t *crc32_filltable(int endian); -diff -ur busybox.old/libbb/Kbuild busybox.dev/libbb/Kbuild ---- busybox.old/libbb/Kbuild 2007-01-19 22:23:06.000000000 +0100 -+++ busybox.dev/libbb/Kbuild 2007-01-22 13:29:24.000000000 +0100 +Index: busybox-1.4.2/libbb/Kbuild +=================================================================== +--- busybox-1.4.2.orig/libbb/Kbuild 2007-06-04 13:21:31.548180616 +0200 ++++ busybox-1.4.2/libbb/Kbuild 2007-06-04 13:21:37.710243840 +0200 @@ -37,6 +37,7 @@ lib-y += get_last_path_component.o lib-y += get_line_from_file.o @@ -109,8 +112,10 @@ diff -ur busybox.old/libbb/Kbuild busybox.dev/libbb/Kbuild lib-y += herror_msg.o lib-y += herror_msg_and_die.o lib-y += human_readable.o ---- busybox.old/libbb/hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/libbb/hash.c 2007-01-22 13:52:41.000000000 +0100 +Index: busybox-1.4.2/libbb/hash.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/libbb/hash.c 2007-06-04 13:21:37.710243840 +0200 @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2003 Glenn L. McGrath diff --git a/package/busybox/patches/920-awx.patch b/package/busybox/patches/920-awx.patch index 27a8534..2abab32 100644 --- a/package/busybox/patches/920-awx.patch +++ b/package/busybox/patches/920-awx.patch @@ -1,6 +1,7 @@ -diff -urN bb.old/editors/awk.c bb.dev/editors/awk.c ---- bb.old/editors/awk.c 2007-05-20 04:17:05.002197784 +0200 -+++ bb.dev/editors/awk.c 2007-05-20 22:40:48.183743936 +0200 +Index: busybox-1.4.2/editors/awk.c +=================================================================== +--- busybox-1.4.2.orig/editors/awk.c 2007-06-04 13:21:35.202625056 +0200 ++++ busybox-1.4.2/editors/awk.c 2007-06-04 13:21:37.927210856 +0200 @@ -30,6 +30,11 @@ /* these flags are static, don't change them when value is changed */ #define VF_DONTTOUCH (VF_ARRAY | VF_SPECIAL | VF_WALK | VF_CHILD | VF_DIRTY) @@ -95,9 +96,10 @@ diff -urN bb.old/editors/awk.c bb.dev/editors/awk.c programname = NULL; while((c = getopt(argc, argv, "F:v:f:W:")) != EOF) { switch (c) { -diff -urN bb.old/editors/awx.c bb.dev/editors/awx.c ---- bb.old/editors/awx.c 1970-01-01 01:00:00.000000000 +0100 -+++ bb.dev/editors/awx.c 2007-05-23 22:37:38.547183608 +0200 +Index: busybox-1.4.2/editors/awx.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/editors/awx.c 2007-06-04 13:21:37.928210704 +0200 @@ -0,0 +1,633 @@ +/* + * awk web extension @@ -732,9 +734,10 @@ diff -urN bb.old/editors/awx.c bb.dev/editors/awx.c + return awk_main(argc, argv); +} + -diff -urN bb.old/editors/awx_parser.h bb.dev/editors/awx_parser.h ---- bb.old/editors/awx_parser.h 1970-01-01 01:00:00.000000000 +0100 -+++ bb.dev/editors/awx_parser.h 2007-05-20 22:30:31.380512280 +0200 +Index: busybox-1.4.2/editors/awx_parser.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/editors/awx_parser.h 2007-06-04 13:21:37.928210704 +0200 @@ -0,0 +1,38 @@ +#ifndef __TEMPLATE_PARSER_H +#define __TEMPLATE_PARSER_H @@ -774,9 +777,10 @@ diff -urN bb.old/editors/awx_parser.h bb.dev/editors/awx_parser.h +void free_template(struct template_cb *cb, struct template_element *e); + +#endif -diff -urN bb.old/editors/awx_parser.l bb.dev/editors/awx_parser.l ---- bb.old/editors/awx_parser.l 1970-01-01 01:00:00.000000000 +0100 -+++ bb.dev/editors/awx_parser.l 2007-05-23 19:13:40.459655704 +0200 +Index: busybox-1.4.2/editors/awx_parser.l +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/editors/awx_parser.l 2007-06-04 13:21:37.929210552 +0200 @@ -0,0 +1,302 @@ +%{ +#include <stdio.h> @@ -1080,9 +1084,10 @@ diff -urN bb.old/editors/awx_parser.l bb.dev/editors/awx_parser.l + free(e); + return free_template(cb, next); +} -diff -urN bb.old/editors/Config.in bb.dev/editors/Config.in ---- bb.old/editors/Config.in 2007-05-20 04:17:05.003197632 +0200 -+++ bb.dev/editors/Config.in 2007-05-20 22:30:31.380512280 +0200 +Index: busybox-1.4.2/editors/Config.in +=================================================================== +--- busybox-1.4.2.orig/editors/Config.in 2007-06-04 13:21:31.486190040 +0200 ++++ busybox-1.4.2/editors/Config.in 2007-06-04 13:21:37.929210552 +0200 @@ -12,6 +12,13 @@ Awk is used as a pattern scanning and processing language. This is the BusyBox implementation of that programming language. @@ -1097,9 +1102,10 @@ diff -urN bb.old/editors/Config.in bb.dev/editors/Config.in config FEATURE_AWK_MATH bool "Enable math functions (requires libm)" default y -diff -urN bb.old/editors/Kbuild bb.dev/editors/Kbuild ---- bb.old/editors/Kbuild 2007-03-18 17:59:37.000000000 +0100 -+++ bb.dev/editors/Kbuild 2007-05-20 22:30:31.381512128 +0200 +Index: busybox-1.4.2/editors/Kbuild +=================================================================== +--- busybox-1.4.2.orig/editors/Kbuild 2007-06-04 13:21:31.492189128 +0200 ++++ busybox-1.4.2/editors/Kbuild 2007-06-04 13:21:37.929210552 +0200 @@ -10,3 +10,12 @@ lib-$(CONFIG_PATCH) += patch.o lib-$(CONFIG_SED) += sed.o @@ -1113,9 +1119,10 @@ diff -urN bb.old/editors/Kbuild bb.dev/editors/Kbuild +editors/awx_parser.o: editors/awx_parser.c FORCE + $(call cmd,force_checksrc) + $(call if_changed_rule,cc_o_c) -diff -urN bb.old/include/applets.h bb.dev/include/applets.h ---- bb.old/include/applets.h 2007-05-20 04:17:05.003197632 +0200 -+++ bb.dev/include/applets.h 2007-05-20 22:30:31.381512128 +0200 +Index: busybox-1.4.2/include/applets.h +=================================================================== +--- busybox-1.4.2.orig/include/applets.h 2007-06-04 13:21:36.732392496 +0200 ++++ busybox-1.4.2/include/applets.h 2007-06-04 13:21:37.929210552 +0200 @@ -60,6 +60,7 @@ USE_ARPING(APPLET(arping, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_ASH(APPLET_NOUSAGE(ash, ash, _BB_DIR_BIN, _BB_SUID_NEVER)) @@ -1124,9 +1131,10 @@ diff -urN bb.old/include/applets.h bb.dev/include/applets.h USE_BASENAME(APPLET(basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER)) //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER)) -diff -urN bb.old/include/cgi.h bb.dev/include/cgi.h ---- bb.old/include/cgi.h 1970-01-01 01:00:00.000000000 +0100 -+++ bb.dev/include/cgi.h 2007-05-20 22:30:31.381512128 +0200 +Index: busybox-1.4.2/include/cgi.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/include/cgi.h 2007-06-04 13:21:37.929210552 +0200 @@ -0,0 +1,8 @@ +#ifndef CGI_H +#define CGI_H @@ -1136,9 +1144,10 @@ diff -urN bb.old/include/cgi.h bb.dev/include/cgi.h +int cgi_init(var_handler); + +#endif -diff -urN bb.old/libbb/cgi.c bb.dev/libbb/cgi.c ---- bb.old/libbb/cgi.c 1970-01-01 01:00:00.000000000 +0100 -+++ bb.dev/libbb/cgi.c 2007-05-20 22:30:31.382511976 +0200 +Index: busybox-1.4.2/libbb/cgi.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/libbb/cgi.c 2007-06-04 13:21:37.930210400 +0200 @@ -0,0 +1,457 @@ +/* -------------------------------------------------------------------------- + * functions for processing cgi form data @@ -1597,9 +1606,10 @@ diff -urN bb.old/libbb/cgi.c bb.dev/libbb/cgi.c + + return retval; +} -diff -urN bb.old/libbb/Kbuild bb.dev/libbb/Kbuild ---- bb.old/libbb/Kbuild 2007-05-20 04:17:05.004197480 +0200 -+++ bb.dev/libbb/Kbuild 2007-05-20 22:30:31.382511976 +0200 +Index: busybox-1.4.2/libbb/Kbuild +=================================================================== +--- busybox-1.4.2.orig/libbb/Kbuild 2007-06-04 13:21:37.710243840 +0200 ++++ busybox-1.4.2/libbb/Kbuild 2007-06-04 13:21:37.930210400 +0200 @@ -118,3 +118,6 @@ lib-$(CONFIG_MDEV) += xregcomp.o lib-$(CONFIG_LESS) += xregcomp.o |