refresh busybox patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9463 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/busybox/patches/000-autoconf.patch b/package/busybox/patches/000-autoconf.patch
index 52fd92a..e798b82 100644 (file)
--- a/package/busybox/patches/000-autoconf.patch
+++ b/package/busybox/patches/000-autoconf.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/applets/Kbuild
 ===================================================================
---- busybox-1.7.2.orig/applets/Kbuild  2007-10-04 14:30:23.484330073 +0200
-+++ busybox-1.7.2/applets/Kbuild       2007-10-04 14:33:47.751970627 +0200
+--- busybox-1.7.2.orig/applets/Kbuild  2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/applets/Kbuild       2007-10-30 15:35:00.000000000 -0500
 @@ -20,6 +20,6 @@
  HOSTCFLAGS_usage.o = -I$(srctree)/include
  

diff --git a/package/busybox/patches/110-wget_getopt_fix.patch b/package/busybox/patches/110-wget_getopt_fix.patch
index 657f83a..6fb7c12 100644 (file)
--- a/package/busybox/patches/110-wget_getopt_fix.patch
+++ b/package/busybox/patches/110-wget_getopt_fix.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/networking/wget.c
 ===================================================================
---- busybox-1.7.2.orig/networking/wget.c       2007-10-04 14:35:17.057059834 +0200
-+++ busybox-1.7.2/networking/wget.c    2007-10-04 14:35:27.013627222 +0200
+--- busybox-1.7.2.orig/networking/wget.c       2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/networking/wget.c    2007-10-30 15:35:00.000000000 -0500
 @@ -140,7 +140,7 @@
                "directory-prefix\0" Required_argument "P"
                "proxy\0"            Required_argument "Y"

diff --git a/package/busybox/patches/140-trylink_bash.patch b/package/busybox/patches/140-trylink_bash.patch
index 67da20d..167f14c 100644 (file)
--- a/package/busybox/patches/140-trylink_bash.patch
+++ b/package/busybox/patches/140-trylink_bash.patch
@@ -1,7 +1,7 @@
-Index: busybox-1.4.2/scripts/trylink
+Index: busybox-1.7.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
+--- busybox-1.7.2.orig/scripts/trylink 2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/scripts/trylink      2007-10-30 15:35:00.000000000 -0500
 @@ -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 49b7882..e9609bd 100644 (file)
--- a/package/busybox/patches/200-etc_crontabs.patch
+++ b/package/busybox/patches/200-etc_crontabs.patch
@@ -1,9 +1,9 @@
-Index: busybox-1.4.2/miscutils/crond.c
+Index: busybox-1.7.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]))
+--- busybox-1.7.2.orig/miscutils/crond.c       2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/miscutils/crond.c    2007-10-30 15:35:00.000000000 -0500
+@@ -15,7 +15,7 @@
+ #include "libbb.h"
  
  #ifndef CRONTABS
 -#define CRONTABS        "/var/spool/cron/crontabs"
@@ -11,12 +11,12 @@ Index: busybox-1.4.2/miscutils/crond.c
  #endif
  #ifndef TMPDIR
  #define TMPDIR          "/var/spool/cron"
-Index: busybox-1.4.2/miscutils/crontab.c
+Index: busybox-1.7.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
+--- busybox-1.7.2.orig/miscutils/crontab.c     2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/miscutils/crontab.c  2007-10-30 15:35:00.000000000 -0500
 @@ -13,7 +13,7 @@
- #include "busybox.h"
+ #include "libbb.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 4f15c42..7a65537 100644 (file)
--- a/package/busybox/patches/240-udhcpc_retries.patch
+++ b/package/busybox/patches/240-udhcpc_retries.patch
@@ -1,8 +1,8 @@
-Index: busybox-1.4.2/networking/udhcp/dhcpc.c
+Index: busybox-1.7.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 @@
+--- busybox-1.7.2.orig/networking/udhcp/dhcpc.c        2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/networking/udhcp/dhcpc.c     2007-10-30 15:35:01.000000000 -0500
+@@ -334,7 +334,7 @@
                        /* timeout dropped to zero */
                        switch (state) {
                        case INIT_SELECTING:
@@ -11,7 +11,7 @@ Index: busybox-1.4.2/networking/udhcp/dhcpc.c
                                        if (packet_num == 0)
                                                xid = random_xid();
  
-@@ -316,7 +316,7 @@
+@@ -360,7 +360,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 e10bb83..9379491 100644 (file)
--- a/package/busybox/patches/241-udhcpc-oversized_packets.patch
+++ b/package/busybox/patches/241-udhcpc-oversized_packets.patch
@@ -1,8 +1,8 @@
-Index: busybox-1.4.2/networking/udhcp/packet.c
+Index: busybox-1.7.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 @@
+--- busybox-1.7.2.orig/networking/udhcp/packet.c       2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/networking/udhcp/packet.c    2007-10-30 15:35:01.000000000 -0500
+@@ -121,6 +121,10 @@
        return ~sum;
  }
  
@@ -13,7 +13,7 @@ Index: busybox-1.4.2/networking/udhcp/packet.c
  
  /* Construct a ip/udp header for a packet, and specify the source and dest hardware address */
  void BUG_sizeof_struct_udp_dhcp_packet_must_be_576(void);
-@@ -118,6 +122,7 @@
+@@ -132,6 +136,7 @@
        int result;
        struct sockaddr_ll dest;
        struct udp_dhcp_packet packet;
@@ -21,7 +21,7 @@ Index: busybox-1.4.2/networking/udhcp/packet.c
  
        fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
        if (fd < 0) {
-@@ -127,6 +132,7 @@
+@@ -141,6 +146,7 @@
  
        memset(&dest, 0, sizeof(dest));
        memset(&packet, 0, sizeof(packet));
@@ -29,7 +29,7 @@ Index: busybox-1.4.2/networking/udhcp/packet.c
  
        dest.sll_family = AF_PACKET;
        dest.sll_protocol = htons(ETH_P_IP);
-@@ -144,12 +150,13 @@
+@@ -158,12 +164,13 @@
        packet.ip.daddr = dest_ip;
        packet.udp.source = htons(source_port);
        packet.udp.dest = htons(dest_port);
@@ -47,7 +47,7 @@ Index: busybox-1.4.2/networking/udhcp/packet.c
        packet.ip.ihl = sizeof(packet.ip) >> 2;
        packet.ip.version = IPVERSION;
        packet.ip.ttl = IPDEFTTL;
-@@ -158,7 +165,7 @@
+@@ -172,7 +179,7 @@
        if (sizeof(struct udp_dhcp_packet) != 576)
                BUG_sizeof_struct_udp_dhcp_packet_must_be_576();
  
@@ -56,7 +56,7 @@ Index: busybox-1.4.2/networking/udhcp/packet.c
                        (struct sockaddr *) &dest, sizeof(dest));
        if (result <= 0) {
                bb_perror_msg("sendto");
-@@ -205,7 +212,7 @@
+@@ -216,7 +223,7 @@
                return -1;
        }
  
@@ -65,11 +65,11 @@ Index: busybox-1.4.2/networking/udhcp/packet.c
        close(fd);
        return result;
  }
-Index: busybox-1.4.2/networking/udhcp/common.h
+Index: busybox-1.7.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 @@
+--- busybox-1.7.2.orig/networking/udhcp/common.h       2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/networking/udhcp/common.h    2007-10-30 15:35:01.000000000 -0500
+@@ -21,6 +21,8 @@
  #include <netinet/udp.h>
  #include <netinet/ip.h>
  
@@ -78,7 +78,7 @@ Index: busybox-1.4.2/networking/udhcp/common.h
  struct dhcpMessage {
        uint8_t op;
        uint8_t htype;
-@@ -38,7 +40,7 @@
+@@ -37,7 +39,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 4ec99af..a201620 100644 (file)
--- a/package/busybox/patches/242-udhcpc_msgs.patch
+++ b/package/busybox/patches/242-udhcpc_msgs.patch
@@ -1,16 +1,16 @@
-Index: busybox-1.4.2/networking/udhcp/clientpacket.c
+Index: busybox-1.7.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)
+--- busybox-1.7.2.orig/networking/udhcp/clientpacket.c 2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/networking/udhcp/clientpacket.c      2007-10-30 15:35:02.000000000 -0500
+@@ -74,6 +74,7 @@
+ int send_discover(uint32_t xid, uint32_t requested)
  {
        struct dhcpMessage packet;
 +      static int msgs = 0;
  
        init_packet(&packet, DHCPDISCOVER);
        packet.xid = xid;
-@@ -85,7 +86,8 @@
+@@ -81,7 +82,8 @@
                add_simple_option(packet.options, DHCP_REQUESTED_IP, requested);
  
        add_requests(&packet);

diff --git a/package/busybox/patches/243-udhcpc_changed_ifindex.patch b/package/busybox/patches/243-udhcpc_changed_ifindex.patch
index b304604..91e8ac4 100644 (file)
--- a/package/busybox/patches/243-udhcpc_changed_ifindex.patch
+++ b/package/busybox/patches/243-udhcpc_changed_ifindex.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/networking/udhcp/dhcpc.c
 ===================================================================
---- busybox-1.7.2.orig/networking/udhcp/dhcpc.c        2007-10-04 14:36:41.521873204 +0200
-+++ busybox-1.7.2/networking/udhcp/dhcpc.c     2007-10-04 14:38:28.231954268 +0200
+--- busybox-1.7.2.orig/networking/udhcp/dhcpc.c        2007-10-30 15:35:01.000000000 -0500
++++ busybox-1.7.2/networking/udhcp/dhcpc.c     2007-10-30 15:35:02.000000000 -0500
 @@ -309,6 +309,12 @@
   jump_in:
                tv.tv_usec = 0;

diff --git a/package/busybox/patches/244-socket_leak.patch b/package/busybox/patches/244-socket_leak.patch
index d5588f5..e6e7699 100644 (file)
--- a/package/busybox/patches/244-socket_leak.patch
+++ b/package/busybox/patches/244-socket_leak.patch
@@ -1,12 +1,12 @@
-Index: busybox-1.4.2/networking/udhcp/socket.c
+Index: busybox-1.7.2/networking/udhcp/socket.c
 ===================================================================
---- busybox-1.4.2.orig/networking/udhcp/socket.c       2007-07-20 02:27:30.440097649 +0200
-+++ busybox-1.4.2/networking/udhcp/socket.c    2007-07-20 02:27:54.849488669 +0200
-@@ -83,6 +83,7 @@
+--- busybox-1.7.2.orig/networking/udhcp/socket.c       2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/networking/udhcp/socket.c    2007-10-30 15:35:02.000000000 -0500
+@@ -78,6 +78,7 @@
                DEBUG("adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x",
                        arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]);
        }
 +      close(fd);
  
+       close(fd);
        return 0;
- }

diff --git a/package/busybox/patches/250-ash_export-n.patch b/package/busybox/patches/250-ash_export-n.patch
index 8ee2aee..99f4672 100644 (file)
--- a/package/busybox/patches/250-ash_export-n.patch
+++ b/package/busybox/patches/250-ash_export-n.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/shell/ash.c
 ===================================================================
---- busybox-1.7.2.orig/shell/ash.c     2007-09-03 13:48:38.000000000 +0200
-+++ busybox-1.7.2/shell/ash.c  2007-10-04 14:47:41.607489342 +0200
+--- busybox-1.7.2.orig/shell/ash.c     2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/shell/ash.c  2007-10-30 15:35:02.000000000 -0500
 @@ -11310,8 +11310,18 @@
        const char *p;
        char **aptr;

diff --git a/package/busybox/patches/300-netmsg.patch b/package/busybox/patches/300-netmsg.patch
index a400bb0..b4afa05 100644 (file)
--- a/package/busybox/patches/300-netmsg.patch
+++ b/package/busybox/patches/300-netmsg.patch
@@ -1,8 +1,8 @@
-Index: busybox-1.4.2/include/applets.h
+Index: busybox-1.7.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 @@
+--- busybox-1.7.2.orig/include/applets.h       2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/include/applets.h    2007-10-30 15:35:03.000000000 -0500
+@@ -241,6 +241,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))
@@ -10,11 +10,11 @@ Index: busybox-1.4.2/include/applets.h
  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))
-Index: busybox-1.4.2/networking/Config.in
+Index: busybox-1.7.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 @@
+--- busybox-1.7.2.orig/networking/Config.in    2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/networking/Config.in 2007-10-30 15:35:03.000000000 -0500
+@@ -508,6 +508,12 @@
        help
          A simple Unix utility which reads and writes data across network
          connections.
@@ -26,23 +26,23 @@ Index: busybox-1.4.2/networking/Config.in
 +        simple program for sending udp broadcast messages
  
  config NC_SERVER
-       bool "Netcat server options (-lp)"
-Index: busybox-1.4.2/networking/Kbuild
+       bool "Netcat server options (-l)"
+Index: busybox-1.7.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
+--- busybox-1.7.2.orig/networking/Kbuild       2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/networking/Kbuild    2007-10-30 15:35:03.000000000 -0500
+@@ -21,6 +21,7 @@
+ lib-$(CONFIG_IPCALC)       += ipcalc.o
  lib-$(CONFIG_NAMEIF)       += nameif.o
  lib-$(CONFIG_NC)           += nc.o
 +lib-$(CONFIG_NETMSG)       += netmsg.o
  lib-$(CONFIG_NETSTAT)      += netstat.o
  lib-$(CONFIG_NSLOOKUP)     += nslookup.o
  lib-$(CONFIG_PING)         += ping.o
-Index: busybox-1.4.2/networking/netmsg.c
+Index: busybox-1.7.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
++++ busybox-1.7.2/networking/netmsg.c  2007-10-30 15:35:03.000000000 -0500
 @@ -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 b8c8db7..bd0db8f 100644 (file)
--- a/package/busybox/patches/310-passwd_access.patch
+++ b/package/busybox/patches/310-passwd_access.patch
@@ -3,8 +3,8 @@
 
 Index: busybox-1.7.2/networking/httpd.c
 ===================================================================
---- busybox-1.7.2.orig/networking/httpd.c      2007-09-30 01:54:12.000000000 +0200
-+++ busybox-1.7.2/networking/httpd.c   2007-10-04 14:59:20.287304836 +0200
+--- busybox-1.7.2.orig/networking/httpd.c      2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/networking/httpd.c   2007-10-30 15:35:03.000000000 -0500
 @@ -1527,12 +1527,26 @@
                        if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
                                char *cipher;

diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch
index 5bce455..8d81275 100644 (file)
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -1,20 +1,20 @@
-Index: busybox-1.4.2/include/applets.h
+Index: busybox-1.7.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))
+--- busybox-1.7.2.orig/include/applets.h       2007-10-30 15:35:03.000000000 -0500
++++ busybox-1.7.2/include/applets.h    2007-10-30 15:35:03.000000000 -0500
+@@ -209,6 +209,7 @@
+ USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
  USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
  USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))
 +USE_LOCK(APPLET_NOUSAGE(lock, lock, _BB_DIR_BIN, _BB_SUID_NEVER))
  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))
-Index: busybox-1.4.2/miscutils/Config.in
+ USE_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER, logname))
+Index: busybox-1.7.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 @@
+--- busybox-1.7.2.orig/miscutils/Config.in     2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/miscutils/Config.in  2007-10-30 15:35:03.000000000 -0500
+@@ -244,6 +244,12 @@
          Enables the 'hdparm -d' option to get/set using_dma flag.
          This is dangerous stuff, so you should probably say N.
  
@@ -27,11 +27,11 @@ Index: busybox-1.4.2/miscutils/Config.in
  config MAKEDEVS
        bool "makedevs"
        default n
-Index: busybox-1.4.2/miscutils/Kbuild
+Index: busybox-1.7.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 @@
+--- busybox-1.7.2.orig/miscutils/Kbuild        2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/miscutils/Kbuild     2007-10-30 15:35:03.000000000 -0500
+@@ -16,6 +16,7 @@
  lib-$(CONFIG_HDPARM)      += hdparm.o
  lib-$(CONFIG_LAST)        += last.o
  lib-$(CONFIG_LESS)        += less.o
@@ -39,10 +39,10 @@ Index: busybox-1.4.2/miscutils/Kbuild
  lib-$(CONFIG_MAKEDEVS)    += makedevs.o
  lib-$(CONFIG_MOUNTPOINT)  += mountpoint.o
  lib-$(CONFIG_MT)          += mt.o
-Index: busybox-1.4.2/miscutils/lock.c
+Index: busybox-1.7.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
++++ busybox-1.7.2/miscutils/lock.c     2007-10-30 15:35:03.000000000 -0500
 @@ -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 7cb8246..bc34c3b 100644 (file)
--- a/package/busybox/patches/350-httpd_redir.patch
+++ b/package/busybox/patches/350-httpd_redir.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/include/usage.h
 ===================================================================
---- busybox-1.7.2.orig/include/usage.h 2007-10-04 17:12:35.230910708 +0200
-+++ busybox-1.7.2/include/usage.h      2007-10-04 17:32:12.994027602 +0200
+--- busybox-1.7.2.orig/include/usage.h 2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/include/usage.h      2007-10-30 15:35:03.000000000 -0500
 @@ -1350,7 +1350,8 @@
        USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \
        USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
@@ -23,8 +23,8 @@ Index: busybox-1.7.2/include/usage.h
         "[-r|--show] [-s|--hctosys] [-w|--systohc]" \
 Index: busybox-1.7.2/networking/httpd.c
 ===================================================================
---- busybox-1.7.2.orig/networking/httpd.c      2007-10-04 17:13:12.509035065 +0200
-+++ busybox-1.7.2/networking/httpd.c   2007-10-04 17:32:33.711208213 +0200
+--- busybox-1.7.2.orig/networking/httpd.c      2007-10-30 15:35:03.000000000 -0500
++++ busybox-1.7.2/networking/httpd.c   2007-10-30 15:35:03.000000000 -0500
 @@ -230,6 +230,8 @@
  
        const char *found_mime_type;

diff --git a/package/busybox/patches/360-awk_multi_f.patch b/package/busybox/patches/360-awk_multi_f.patch
index 8f738a6..ab753c1 100644 (file)
--- a/package/busybox/patches/360-awk_multi_f.patch
+++ b/package/busybox/patches/360-awk_multi_f.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/editors/awk.c
 ===================================================================
---- busybox-1.7.2.orig/editors/awk.c   2007-10-04 19:57:46.859742242 +0200
-+++ busybox-1.7.2/editors/awk.c        2007-10-05 02:20:02.910793305 +0200
+--- busybox-1.7.2.orig/editors/awk.c   2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/editors/awk.c        2007-10-30 15:35:03.000000000 -0500
 @@ -2757,6 +2757,7 @@
  {
        unsigned opt;

diff --git a/package/busybox/patches/401-darwin_includes.patch b/package/busybox/patches/401-darwin_includes.patch
index 6506f27..1ee7ea7 100644 (file)
--- a/package/busybox/patches/401-darwin_includes.patch
+++ b/package/busybox/patches/401-darwin_includes.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/include/platform.h
 ===================================================================
---- busybox-1.7.2.orig/include/platform.h      2007-09-03 13:48:46.000000000 +0200
-+++ busybox-1.7.2/include/platform.h   2007-10-04 15:20:58.301274440 +0200
+--- busybox-1.7.2.orig/include/platform.h      2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/include/platform.h   2007-10-30 15:35:04.000000000 -0500
 @@ -137,9 +137,11 @@
  # include <netinet/in.h>
  #endif
@@ -25,8 +25,8 @@ Index: busybox-1.7.2/include/platform.h
  #else
 Index: busybox-1.7.2/include/libbb.h
 ===================================================================
---- busybox-1.7.2.orig/include/libbb.h 2007-09-16 20:48:10.000000000 +0200
-+++ busybox-1.7.2/include/libbb.h      2007-10-04 15:20:22.275221430 +0200
+--- busybox-1.7.2.orig/include/libbb.h 2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/include/libbb.h      2007-10-30 15:35:04.000000000 -0500
 @@ -31,7 +31,9 @@
  #include <sys/mman.h>
  #include <sys/socket.h>

diff --git a/package/busybox/patches/410-httpd_cgi_headers.patch b/package/busybox/patches/410-httpd_cgi_headers.patch
index cfbbed6..97f2a3c 100644 (file)
--- a/package/busybox/patches/410-httpd_cgi_headers.patch
+++ b/package/busybox/patches/410-httpd_cgi_headers.patch
@@ -1,8 +1,8 @@
 Index: busybox-1.7.2/networking/httpd.c
 ===================================================================
---- busybox-1.7.2.orig/networking/httpd.c      2007-10-04 15:06:51.993046080 +0200
-+++ busybox-1.7.2/networking/httpd.c   2007-10-04 15:25:10.815664410 +0200
-@@ -1314,10 +1314,10 @@
+--- busybox-1.7.2.orig/networking/httpd.c      2007-10-30 15:35:03.000000000 -0500
++++ busybox-1.7.2/networking/httpd.c   2007-10-30 15:35:04.000000000 -0500
+@@ -1316,10 +1316,10 @@
                                                if (full_write(1, HTTP_200, sizeof(HTTP_200)-1) != sizeof(HTTP_200)-1)
                                                        break;
                                        }

diff --git a/package/busybox/patches/430-uniq_memleak.patch b/package/busybox/patches/430-uniq_memleak.patch
index d43806f..15a7a35 100644 (file)
--- a/package/busybox/patches/430-uniq_memleak.patch
+++ b/package/busybox/patches/430-uniq_memleak.patch
@@ -1,7 +1,7 @@
-Index: busybox-1.4.2/coreutils/uniq.c
+Index: busybox-1.7.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
+--- busybox-1.7.2.orig/coreutils/uniq.c        2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/coreutils/uniq.c     2007-10-30 15:35:04.000000000 -0500
 @@ -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 b3eb308..e7ae3bc 100644 (file)
--- a/package/busybox/patches/440-httpd_chdir.patch
+++ b/package/busybox/patches/440-httpd_chdir.patch
@@ -1,8 +1,8 @@
 Index: busybox-1.7.2/networking/httpd.c
 ===================================================================
---- busybox-1.7.2.orig/networking/httpd.c      2007-10-04 15:25:10.815664410 +0200
-+++ busybox-1.7.2/networking/httpd.c   2007-10-04 15:31:22.936870392 +0200
-@@ -1616,6 +1616,7 @@
+--- busybox-1.7.2.orig/networking/httpd.c      2007-10-30 15:35:04.000000000 -0500
++++ busybox-1.7.2/networking/httpd.c   2007-10-30 15:35:04.000000000 -0500
+@@ -1618,6 +1618,7 @@
  #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
        int credentials = -1;  /* if not required this is Ok */
  #endif

diff --git a/package/busybox/patches/450-usage_compressed_fix.patch b/package/busybox/patches/450-usage_compressed_fix.patch
index 3a9d2ad..8df14be 100644 (file)
--- a/package/busybox/patches/450-usage_compressed_fix.patch
+++ b/package/busybox/patches/450-usage_compressed_fix.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/applets/usage_compressed
 ===================================================================
---- busybox-1.7.2.orig/applets/usage_compressed        2007-09-03 13:48:55.000000000 +0200
-+++ busybox-1.7.2/applets/usage_compressed     2007-10-04 15:32:54.578092727 +0200
+--- busybox-1.7.2.orig/applets/usage_compressed        2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/applets/usage_compressed     2007-10-30 15:35:04.000000000 -0500
 @@ -14,6 +14,6 @@
  
  echo 'static const char packed_usage[] ALIGN1 = '

diff --git a/package/busybox/patches/460-truncated_ping_results.patch b/package/busybox/patches/460-truncated_ping_results.patch
index e655acf..5479886 100644 (file)
--- a/package/busybox/patches/460-truncated_ping_results.patch
+++ b/package/busybox/patches/460-truncated_ping_results.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/networking/ping.c
 ===================================================================
---- busybox-1.7.2.orig/networking/ping.c       2007-09-03 13:48:27.000000000 +0200
-+++ busybox-1.7.2/networking/ping.c    2007-10-04 15:38:15.424376713 +0200
+--- busybox-1.7.2.orig/networking/ping.c       2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/networking/ping.c    2007-10-30 15:35:05.000000000 -0500
 @@ -91,7 +91,7 @@
        struct sockaddr_in pingaddr;
        struct icmp *pkt;

diff --git a/package/busybox/patches/470-insmod_search.patch b/package/busybox/patches/470-insmod_search.patch
index 29f1527..d36d93d 100644 (file)
--- a/package/busybox/patches/470-insmod_search.patch
+++ b/package/busybox/patches/470-insmod_search.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/modutils/insmod.c
 ===================================================================
---- busybox-1.7.2.orig/modutils/insmod.c       2007-10-24 18:20:56.857757117 +0200
-+++ busybox-1.7.2/modutils/insmod.c    2007-10-24 18:38:27.701641299 +0200
+--- busybox-1.7.2.orig/modutils/insmod.c       2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/modutils/insmod.c    2007-10-30 15:35:05.000000000 -0500
 @@ -61,19 +61,114 @@
  #include "libbb.h"
  #include <libgen.h>

diff --git a/package/busybox/patches/500-ipkg.patch b/package/busybox/patches/500-ipkg.patch
index a186162..6a4c16a 100644 (file)
--- a/package/busybox/patches/500-ipkg.patch
+++ b/package/busybox/patches/500-ipkg.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/archival/Config.in
 ===================================================================
---- busybox-1.7.2.orig/archival/Config.in      2007-10-04 17:12:34.094845964 +0200
-+++ busybox-1.7.2/archival/Config.in   2007-10-04 17:14:22.056998379 +0200
+--- busybox-1.7.2.orig/archival/Config.in      2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/archival/Config.in   2007-10-30 15:35:05.000000000 -0500
 @@ -121,6 +121,15 @@
          gzip is used to compress files.
          It's probably the most widely used UNIX compression program.
@@ -20,8 +20,8 @@ Index: busybox-1.7.2/archival/Config.in
        default n
 Index: busybox-1.7.2/archival/dpkg.c
 ===================================================================
---- busybox-1.7.2.orig/archival/dpkg.c 2007-10-04 17:12:34.102846422 +0200
-+++ busybox-1.7.2/archival/dpkg.c      2007-10-04 17:14:22.060998604 +0200
+--- busybox-1.7.2.orig/archival/dpkg.c 2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/archival/dpkg.c      2007-10-30 15:35:05.000000000 -0500
 @@ -1455,6 +1455,10 @@
        return ar_handle->sub_archive->buffer;
  }
@@ -45,7 +45,7 @@ Index: busybox-1.7.2/archival/dpkg.c
 Index: busybox-1.7.2/archival/ipkg.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/ipkg.c      2007-10-04 17:14:22.084999973 +0200
++++ busybox-1.7.2/archival/ipkg.c      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,26 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -75,8 +75,8 @@ Index: busybox-1.7.2/archival/ipkg.c
 +}
 Index: busybox-1.7.2/archival/Kbuild
 ===================================================================
---- busybox-1.7.2.orig/archival/Kbuild 2007-10-04 17:12:34.110846879 +0200
-+++ busybox-1.7.2/archival/Kbuild      2007-10-04 17:14:22.109001341 +0200
+--- busybox-1.7.2.orig/archival/Kbuild 2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/archival/Kbuild      2007-10-30 15:35:05.000000000 -0500
 @@ -15,6 +15,7 @@
  lib-$(CONFIG_DPKG_DEB)                += dpkg_deb.o
  lib-$(CONFIG_GUNZIP)          += bbunzip.o
@@ -88,7 +88,7 @@ Index: busybox-1.7.2/archival/Kbuild
 Index: busybox-1.7.2/archival/libipkg/args.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/args.c      2007-10-04 17:14:22.145003392 +0200
++++ busybox-1.7.2/archival/libipkg/args.c      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -335,7 +335,7 @@ Index: busybox-1.7.2/archival/libipkg/args.c
 Index: busybox-1.7.2/archival/libipkg/args.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/args.h      2007-10-04 17:14:22.173004992 +0200
++++ busybox-1.7.2/archival/libipkg/args.h      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -412,7 +412,7 @@ Index: busybox-1.7.2/archival/libipkg/args.h
 Index: busybox-1.7.2/archival/libipkg/conffile.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/conffile.c  2007-10-04 17:14:22.249009320 +0200
++++ busybox-1.7.2/archival/libipkg/conffile.c  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,64 @@
 +/* conffile.c - the itsy package management system
 +
@@ -481,7 +481,7 @@ Index: busybox-1.7.2/archival/libipkg/conffile.c
 Index: busybox-1.7.2/archival/libipkg/conffile.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/conffile.h  2007-10-04 17:14:22.277010917 +0200
++++ busybox-1.7.2/archival/libipkg/conffile.h  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -516,7 +516,7 @@ Index: busybox-1.7.2/archival/libipkg/conffile.h
 Index: busybox-1.7.2/archival/libipkg/conffile_list.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/conffile_list.c     2007-10-04 17:14:22.301012282 +0200
++++ busybox-1.7.2/archival/libipkg/conffile_list.c     2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -568,7 +568,7 @@ Index: busybox-1.7.2/archival/libipkg/conffile_list.c
 Index: busybox-1.7.2/archival/libipkg/conffile_list.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/conffile_list.h     2007-10-04 17:14:22.325013650 +0200
++++ busybox-1.7.2/archival/libipkg/conffile_list.h     2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -609,7 +609,7 @@ Index: busybox-1.7.2/archival/libipkg/conffile_list.h
 Index: busybox-1.7.2/archival/libipkg/file_util.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/file_util.c 2007-10-04 17:14:22.353015250 +0200
++++ busybox-1.7.2/archival/libipkg/file_util.c 2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,132 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -746,7 +746,7 @@ Index: busybox-1.7.2/archival/libipkg/file_util.c
 Index: busybox-1.7.2/archival/libipkg/file_util.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/file_util.h 2007-10-04 17:14:22.377016616 +0200
++++ busybox-1.7.2/archival/libipkg/file_util.h 2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -780,7 +780,7 @@ Index: busybox-1.7.2/archival/libipkg/file_util.h
 Index: busybox-1.7.2/archival/libipkg/hash_table.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/hash_table.c        2007-10-04 17:14:22.397017756 +0200
++++ busybox-1.7.2/archival/libipkg/hash_table.c        2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -940,7 +940,7 @@ Index: busybox-1.7.2/archival/libipkg/hash_table.c
 Index: busybox-1.7.2/archival/libipkg/hash_table.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/hash_table.h        2007-10-04 17:14:22.425019349 +0200
++++ busybox-1.7.2/archival/libipkg/hash_table.h        2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -989,7 +989,7 @@ Index: busybox-1.7.2/archival/libipkg/hash_table.h
 Index: busybox-1.7.2/archival/libipkg/ipkg_cmd.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_cmd.c  2007-10-04 17:14:22.449020718 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_cmd.c  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,1431 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2425,7 +2425,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_cmd.c
 Index: busybox-1.7.2/archival/libipkg/ipkg_cmd.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_cmd.h  2007-10-04 17:14:22.493023228 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_cmd.h  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,46 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2476,7 +2476,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_cmd.h
 Index: busybox-1.7.2/archival/libipkg/ipkg_conf.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_conf.c 2007-10-04 17:14:22.513024368 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_conf.c 2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3192,7 +3192,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_conf.c
 Index: busybox-1.7.2/archival/libipkg/ipkg_conf.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_conf.h 2007-10-04 17:14:22.545026188 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_conf.h 2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3304,7 +3304,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_conf.h
 Index: busybox-1.7.2/archival/libipkg/ipkg_configure.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_configure.c    2007-10-04 17:14:22.569027557 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_configure.c    2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3349,7 +3349,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_configure.c
 Index: busybox-1.7.2/archival/libipkg/ipkg_configure.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_configure.h    2007-10-04 17:14:22.593028927 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_configure.h    2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3379,7 +3379,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_configure.h
 Index: busybox-1.7.2/archival/libipkg/ipkg_download.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_download.c     2007-10-04 17:14:22.617030294 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_download.c     2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3579,7 +3579,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_download.c
 Index: busybox-1.7.2/archival/libipkg/ipkg_download.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_download.h     2007-10-04 17:14:22.645031887 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_download.h     2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3614,7 +3614,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_download.h
 Index: busybox-1.7.2/archival/libipkg/ipkg.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg.h      2007-10-04 17:14:22.669033256 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg.h      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,74 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -3693,7 +3693,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg.h
 Index: busybox-1.7.2/archival/libipkg/ipkg_includes.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_includes.h     2007-10-04 17:14:22.685034167 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_includes.h     2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,79 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3777,7 +3777,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_includes.h
 Index: busybox-1.7.2/archival/libipkg/ipkg_install.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_install.c      2007-10-04 17:14:22.725036446 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_install.c      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,1942 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5724,7 +5724,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_install.c
 Index: busybox-1.7.2/archival/libipkg/ipkg_install.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_install.h      2007-10-04 17:14:22.753038046 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_install.h      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5764,7 +5764,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_install.h
 Index: busybox-1.7.2/archival/libipkg/ipkg_message.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_message.c      2007-10-04 17:24:58.037240829 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_message.c      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,61 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5830,7 +5830,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_message.c
 Index: busybox-1.7.2/archival/libipkg/ipkg_message.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_message.h      2007-10-04 17:23:42.072911866 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_message.h      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5867,7 +5867,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_message.h
 Index: busybox-1.7.2/archival/libipkg/ipkg_remove.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_remove.c       2007-10-04 17:14:22.801040776 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_remove.c       2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,383 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6255,7 +6255,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_remove.c
 Index: busybox-1.7.2/archival/libipkg/ipkg_remove.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_remove.h       2007-10-04 17:14:22.821041916 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_remove.h       2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6293,7 +6293,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_remove.h
 Index: busybox-1.7.2/archival/libipkg/ipkg_upgrade.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_upgrade.c      2007-10-04 17:14:22.837042832 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_upgrade.c      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,77 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6375,7 +6375,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_upgrade.c
 Index: busybox-1.7.2/archival/libipkg/ipkg_upgrade.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_upgrade.h      2007-10-04 17:14:22.877045111 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_upgrade.h      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6398,7 +6398,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_upgrade.h
 Index: busybox-1.7.2/archival/libipkg/ipkg_utils.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_utils.c        2007-10-04 17:14:22.897046251 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_utils.c        2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,181 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6584,7 +6584,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_utils.c
 Index: busybox-1.7.2/archival/libipkg/ipkg_utils.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/ipkg_utils.h        2007-10-04 17:14:22.921047615 +0200
++++ busybox-1.7.2/archival/libipkg/ipkg_utils.h        2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6618,7 +6618,7 @@ Index: busybox-1.7.2/archival/libipkg/ipkg_utils.h
 Index: busybox-1.7.2/archival/libipkg/Kbuild
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/Kbuild      2007-10-04 17:14:22.937048531 +0200
++++ busybox-1.7.2/archival/libipkg/Kbuild      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -6683,7 +6683,7 @@ Index: busybox-1.7.2/archival/libipkg/Kbuild
 Index: busybox-1.7.2/archival/libipkg/libipkg.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/libipkg.c   2007-10-04 17:14:22.949049213 +0200
++++ busybox-1.7.2/archival/libipkg/libipkg.c   2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,527 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7215,7 +7215,7 @@ Index: busybox-1.7.2/archival/libipkg/libipkg.c
 Index: busybox-1.7.2/archival/libipkg/libipkg.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/libipkg.h   2007-10-04 17:20:55.967446056 +0200
++++ busybox-1.7.2/archival/libipkg/libipkg.h   2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,88 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7308,7 +7308,7 @@ Index: busybox-1.7.2/archival/libipkg/libipkg.h
 Index: busybox-1.7.2/archival/libipkg/nv_pair.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/nv_pair.c   2007-10-04 17:14:22.989051492 +0200
++++ busybox-1.7.2/archival/libipkg/nv_pair.c   2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7353,7 +7353,7 @@ Index: busybox-1.7.2/archival/libipkg/nv_pair.c
 Index: busybox-1.7.2/archival/libipkg/nv_pair.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/nv_pair.h   2007-10-04 17:14:23.037054223 +0200
++++ busybox-1.7.2/archival/libipkg/nv_pair.h   2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7390,7 +7390,7 @@ Index: busybox-1.7.2/archival/libipkg/nv_pair.h
 Index: busybox-1.7.2/archival/libipkg/nv_pair_list.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/nv_pair_list.c      2007-10-04 17:14:23.053055147 +0200
++++ busybox-1.7.2/archival/libipkg/nv_pair_list.c      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7493,7 +7493,7 @@ Index: busybox-1.7.2/archival/libipkg/nv_pair_list.c
 Index: busybox-1.7.2/archival/libipkg/nv_pair_list.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/nv_pair_list.h      2007-10-04 17:14:23.073056281 +0200
++++ busybox-1.7.2/archival/libipkg/nv_pair_list.h      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7558,7 +7558,7 @@ Index: busybox-1.7.2/archival/libipkg/nv_pair_list.h
 Index: busybox-1.7.2/archival/libipkg/pkg.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg.c       2007-10-04 17:14:23.093057411 +0200
++++ busybox-1.7.2/archival/libipkg/pkg.c       2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,1747 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9310,7 +9310,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg.c
 Index: busybox-1.7.2/archival/libipkg/pkg_depends.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_depends.c       2007-10-04 17:14:23.109058340 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_depends.c       2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,1031 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10346,7 +10346,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_depends.c
 Index: busybox-1.7.2/archival/libipkg/pkg_depends.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_depends.h       2007-10-04 17:14:23.129059469 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_depends.h       2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10456,7 +10456,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_depends.h
 Index: busybox-1.7.2/archival/libipkg/pkg_dest.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_dest.c  2007-10-04 17:14:23.173061979 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_dest.c  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10553,7 +10553,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_dest.c
 Index: busybox-1.7.2/archival/libipkg/pkg_dest.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_dest.h  2007-10-04 17:14:23.197063348 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_dest.h  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10596,7 +10596,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_dest.h
 Index: busybox-1.7.2/archival/libipkg/pkg_dest_list.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_dest_list.c     2007-10-04 17:14:23.213064259 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_dest_list.c     2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10686,7 +10686,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_dest_list.c
 Index: busybox-1.7.2/archival/libipkg/pkg_dest_list.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_dest_list.h     2007-10-04 17:14:23.229065168 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_dest_list.h     2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10741,7 +10741,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_dest_list.h
 Index: busybox-1.7.2/archival/libipkg/pkg_extract.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_extract.c       2007-10-04 17:14:23.245066087 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_extract.c       2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,224 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -10970,7 +10970,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_extract.c
 Index: busybox-1.7.2/archival/libipkg/pkg_extract.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_extract.h       2007-10-04 17:14:23.265067225 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_extract.h       2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11007,7 +11007,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_extract.h
 Index: busybox-1.7.2/archival/libipkg/pkg.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg.h       2007-10-04 17:22:15.623985424 +0200
++++ busybox-1.7.2/archival/libipkg/pkg.h       2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -11241,7 +11241,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg.h
 Index: busybox-1.7.2/archival/libipkg/pkg_hash.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_hash.c  2007-10-04 17:14:23.329070878 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_hash.c  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,616 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11862,7 +11862,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_hash.c
 Index: busybox-1.7.2/archival/libipkg/pkg_hash.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_hash.h  2007-10-04 17:14:23.349072007 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_hash.h  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11928,7 +11928,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_hash.h
 Index: busybox-1.7.2/archival/libipkg/pkg_parse.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_parse.c 2007-10-04 17:14:23.369073144 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_parse.c 2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,366 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12299,7 +12299,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_parse.c
 Index: busybox-1.7.2/archival/libipkg/pkg_parse.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_parse.h 2007-10-04 17:14:23.389074295 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_parse.h 2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12335,7 +12335,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_parse.h
 Index: busybox-1.7.2/archival/libipkg/pkg_src.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_src.c   2007-10-04 17:14:23.433076797 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_src.c   2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12383,7 +12383,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_src.c
 Index: busybox-1.7.2/archival/libipkg/pkg_src.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_src.h   2007-10-04 17:14:23.457078165 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_src.h   2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12422,7 +12422,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_src.h
 Index: busybox-1.7.2/archival/libipkg/pkg_src_list.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_src_list.c      2007-10-04 17:14:23.481079530 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_src_list.c      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12502,7 +12502,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_src_list.c
 Index: busybox-1.7.2/archival/libipkg/pkg_src_list.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_src_list.h      2007-10-04 17:14:23.497080447 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_src_list.h      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12564,7 +12564,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_src_list.h
 Index: busybox-1.7.2/archival/libipkg/pkg_vec.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_vec.c   2007-10-04 17:14:23.513081356 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_vec.c   2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,230 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12799,7 +12799,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_vec.c
 Index: busybox-1.7.2/archival/libipkg/pkg_vec.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/pkg_vec.h   2007-10-04 17:14:23.565084313 +0200
++++ busybox-1.7.2/archival/libipkg/pkg_vec.h   2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,64 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12868,7 +12868,7 @@ Index: busybox-1.7.2/archival/libipkg/pkg_vec.h
 Index: busybox-1.7.2/archival/libipkg/sprintf_alloc.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/sprintf_alloc.h     2007-10-04 17:14:23.589085682 +0200
++++ busybox-1.7.2/archival/libipkg/sprintf_alloc.h     2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12898,7 +12898,7 @@ Index: busybox-1.7.2/archival/libipkg/sprintf_alloc.h
 Index: busybox-1.7.2/archival/libipkg/str_list.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/str_list.c  2007-10-04 17:14:23.609086833 +0200
++++ busybox-1.7.2/archival/libipkg/str_list.c  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -12979,7 +12979,7 @@ Index: busybox-1.7.2/archival/libipkg/str_list.c
 Index: busybox-1.7.2/archival/libipkg/str_list.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/str_list.h  2007-10-04 17:14:23.673090470 +0200
++++ busybox-1.7.2/archival/libipkg/str_list.h  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -13035,7 +13035,7 @@ Index: busybox-1.7.2/archival/libipkg/str_list.h
 Index: busybox-1.7.2/archival/libipkg/str_util.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/str_util.c  2007-10-04 17:20:30.425990533 +0200
++++ busybox-1.7.2/archival/libipkg/str_util.c  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,63 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13103,7 +13103,7 @@ Index: busybox-1.7.2/archival/libipkg/str_util.c
 Index: busybox-1.7.2/archival/libipkg/str_util.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/str_util.h  2007-10-04 17:20:40.670574336 +0200
++++ busybox-1.7.2/archival/libipkg/str_util.h  2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13135,7 +13135,7 @@ Index: busybox-1.7.2/archival/libipkg/str_util.h
 Index: busybox-1.7.2/archival/libipkg/user.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/user.c      2007-10-04 17:14:23.757095256 +0200
++++ busybox-1.7.2/archival/libipkg/user.c      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,58 @@
 +/* user.c - the itsy package management system
 +
@@ -13198,7 +13198,7 @@ Index: busybox-1.7.2/archival/libipkg/user.c
 Index: busybox-1.7.2/archival/libipkg/user.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/user.h      2007-10-04 17:14:23.785096849 +0200
++++ busybox-1.7.2/archival/libipkg/user.h      2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13226,7 +13226,7 @@ Index: busybox-1.7.2/archival/libipkg/user.h
 Index: busybox-1.7.2/archival/libipkg/void_list.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/void_list.c 2007-10-04 17:14:23.805098002 +0200
++++ busybox-1.7.2/archival/libipkg/void_list.c 2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13425,7 +13425,7 @@ Index: busybox-1.7.2/archival/libipkg/void_list.c
 Index: busybox-1.7.2/archival/libipkg/void_list.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/void_list.h 2007-10-04 17:14:23.841100046 +0200
++++ busybox-1.7.2/archival/libipkg/void_list.h 2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13489,7 +13489,7 @@ Index: busybox-1.7.2/archival/libipkg/void_list.h
 Index: busybox-1.7.2/archival/libipkg/xsystem.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/xsystem.c   2007-10-04 17:14:23.865101421 +0200
++++ busybox-1.7.2/archival/libipkg/xsystem.c   2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13558,7 +13558,7 @@ Index: busybox-1.7.2/archival/libipkg/xsystem.c
 Index: busybox-1.7.2/archival/libipkg/xsystem.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/archival/libipkg/xsystem.h   2007-10-04 17:14:23.885102559 +0200
++++ busybox-1.7.2/archival/libipkg/xsystem.h   2007-10-30 15:35:05.000000000 -0500
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13596,8 +13596,8 @@ Index: busybox-1.7.2/archival/libipkg/xsystem.h
 +       
 Index: busybox-1.7.2/archival/libunarchive/data_extract_all.c
 ===================================================================
---- busybox-1.7.2.orig/archival/libunarchive/data_extract_all.c        2007-10-04 17:12:34.462866938 +0200
-+++ busybox-1.7.2/archival/libunarchive/data_extract_all.c     2007-10-04 17:14:23.905103687 +0200
+--- busybox-1.7.2.orig/archival/libunarchive/data_extract_all.c        2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/archival/libunarchive/data_extract_all.c     2007-10-30 15:35:05.000000000 -0500
 @@ -129,3 +129,17 @@
                }
        }
@@ -13618,8 +13618,8 @@ Index: busybox-1.7.2/archival/libunarchive/data_extract_all.c
 +
 Index: busybox-1.7.2/archival/libunarchive/Kbuild
 ===================================================================
---- busybox-1.7.2.orig/archival/libunarchive/Kbuild    2007-10-04 17:12:34.474867620 +0200
-+++ busybox-1.7.2/archival/libunarchive/Kbuild 2007-10-04 17:14:23.925104840 +0200
+--- busybox-1.7.2.orig/archival/libunarchive/Kbuild    2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/archival/libunarchive/Kbuild 2007-10-30 15:35:05.000000000 -0500
 @@ -55,6 +55,7 @@
  lib-$(CONFIG_FEATURE_DEB_TAR_LZMA)      += decompress_unlzma.o get_header_tar_lzma.o
  lib-$(CONFIG_GUNZIP)                    += $(GUNZIP_FILES)
@@ -13630,8 +13630,8 @@ Index: busybox-1.7.2/archival/libunarchive/Kbuild
  lib-$(CONFIG_FEATURE_RPM_BZ2)           += decompress_bunzip2.o
 Index: busybox-1.7.2/include/applets.h
 ===================================================================
---- busybox-1.7.2.orig/include/applets.h       2007-10-04 17:13:12.525035978 +0200
-+++ busybox-1.7.2/include/applets.h    2007-10-04 17:24:51.052842811 +0200
+--- busybox-1.7.2.orig/include/applets.h       2007-10-30 15:35:03.000000000 -0500
++++ busybox-1.7.2/include/applets.h    2007-10-30 15:35:05.000000000 -0500
 @@ -190,6 +190,7 @@
  USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER))
  USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))
@@ -13642,8 +13642,8 @@ Index: busybox-1.7.2/include/applets.h
  USE_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_NEVER))
 Index: busybox-1.7.2/include/unarchive.h
 ===================================================================
---- busybox-1.7.2.orig/include/unarchive.h     2007-10-04 17:12:34.486868309 +0200
-+++ busybox-1.7.2/include/unarchive.h  2007-10-04 17:14:23.989108482 +0200
+--- busybox-1.7.2.orig/include/unarchive.h     2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/include/unarchive.h  2007-10-30 15:35:05.000000000 -0500
 @@ -74,6 +74,7 @@
  
  extern void data_skip(archive_handle_t *archive_handle);
@@ -13654,8 +13654,8 @@ Index: busybox-1.7.2/include/unarchive.h
  
 Index: busybox-1.7.2/include/usage.h
 ===================================================================
---- busybox-1.7.2.orig/include/usage.h 2007-10-04 17:13:12.629041904 +0200
-+++ busybox-1.7.2/include/usage.h      2007-10-04 17:14:23.993108707 +0200
+--- busybox-1.7.2.orig/include/usage.h 2007-10-30 15:35:03.000000000 -0500
++++ busybox-1.7.2/include/usage.h      2007-10-30 15:35:05.000000000 -0500
 @@ -1226,6 +1226,82 @@
         "$ ls -la /tmp/busybox*\n" \
         "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
@@ -13741,8 +13741,8 @@ Index: busybox-1.7.2/include/usage.h
  #define halt_full_usage \
 Index: busybox-1.7.2/Makefile
 ===================================================================
---- busybox-1.7.2.orig/Makefile        2007-10-04 17:12:34.502869218 +0200
-+++ busybox-1.7.2/Makefile     2007-10-04 17:14:24.021110304 +0200
+--- busybox-1.7.2.orig/Makefile        2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/Makefile     2007-10-30 15:35:05.000000000 -0500
 @@ -428,6 +428,7 @@
  
  libs-y                := \

diff --git a/package/busybox/patches/501-libbb_hash.patch b/package/busybox/patches/501-libbb_hash.patch
index c6c36fc..53e3fd8 100644 (file)
--- a/package/busybox/patches/501-libbb_hash.patch
+++ b/package/busybox/patches/501-libbb_hash.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/coreutils/md5_sha1_sum.c
 ===================================================================
---- busybox-1.7.2.orig/coreutils/md5_sha1_sum.c        2007-09-03 13:48:39.000000000 +0200
-+++ busybox-1.7.2/coreutils/md5_sha1_sum.c     2007-10-04 15:45:02.423570273 +0200
+--- busybox-1.7.2.orig/coreutils/md5_sha1_sum.c        2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/coreutils/md5_sha1_sum.c     2007-10-30 15:35:06.000000000 -0500
 @@ -8,75 +8,10 @@
  
  #include "libbb.h"
@@ -80,8 +80,8 @@ Index: busybox-1.7.2/coreutils/md5_sha1_sum.c
  {
 Index: busybox-1.7.2/include/libbb.h
 ===================================================================
---- busybox-1.7.2.orig/include/libbb.h 2007-10-04 15:20:22.275221430 +0200
-+++ busybox-1.7.2/include/libbb.h      2007-10-04 15:42:10.585777803 +0200
+--- busybox-1.7.2.orig/include/libbb.h 2007-10-30 15:35:04.000000000 -0500
++++ busybox-1.7.2/include/libbb.h      2007-10-30 15:35:06.000000000 -0500
 @@ -947,6 +947,7 @@
  extern const char bb_uuenc_tbl_std[];
  void bb_uuencode(char *store, const void *s, int length, const char *tbl);
@@ -101,8 +101,8 @@ Index: busybox-1.7.2/include/libbb.h
  
 Index: busybox-1.7.2/libbb/Kbuild
 ===================================================================
---- busybox-1.7.2.orig/libbb/Kbuild    2007-09-03 13:48:41.000000000 +0200
-+++ busybox-1.7.2/libbb/Kbuild 2007-10-04 15:42:10.613779401 +0200
+--- busybox-1.7.2.orig/libbb/Kbuild    2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/libbb/Kbuild 2007-10-30 15:35:06.000000000 -0500
 @@ -38,6 +38,7 @@
  lib-y += get_last_path_component.o
  lib-y += get_line_from_file.o
@@ -114,7 +114,7 @@ Index: busybox-1.7.2/libbb/Kbuild
 Index: busybox-1.7.2/libbb/hash.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/libbb/hash.c 2007-10-04 15:45:08.279904000 +0200
++++ busybox-1.7.2/libbb/hash.c 2007-10-30 15:35:06.000000000 -0500
 @@ -0,0 +1,81 @@
 +/*
 + *  Copyright (C) 2003 Glenn L. McGrath

diff --git a/package/busybox/patches/510-awx.patch b/package/busybox/patches/510-awx.patch
index 571b323..f6fe78d 100644 (file)
--- a/package/busybox/patches/510-awx.patch
+++ b/package/busybox/patches/510-awx.patch
@@ -1,7 +1,7 @@
 Index: busybox-1.7.2/editors/awk.c
 ===================================================================
---- busybox-1.7.2.orig/editors/awk.c   2007-10-05 01:39:50.073293533 +0200
-+++ busybox-1.7.2/editors/awk.c        2007-10-05 02:16:42.539374788 +0200
+--- busybox-1.7.2.orig/editors/awk.c   2007-10-30 15:35:03.000000000 -0500
++++ busybox-1.7.2/editors/awk.c        2007-10-30 15:35:06.000000000 -0500
 @@ -33,6 +33,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)
@@ -100,7 +100,7 @@ Index: busybox-1.7.2/editors/awk.c
 Index: busybox-1.7.2/editors/awx.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/editors/awx.c        2007-10-05 02:10:16.393369582 +0200
++++ busybox-1.7.2/editors/awx.c        2007-10-30 15:35:06.000000000 -0500
 @@ -0,0 +1,636 @@
 +/*
 + * awk web extension
@@ -741,7 +741,7 @@ Index: busybox-1.7.2/editors/awx.c
 Index: busybox-1.7.2/editors/awx_parser.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/editors/awx_parser.h 2007-10-05 01:43:59.487506840 +0200
++++ busybox-1.7.2/editors/awx_parser.h 2007-10-30 15:35:06.000000000 -0500
 @@ -0,0 +1,38 @@
 +#ifndef __TEMPLATE_PARSER_H
 +#define __TEMPLATE_PARSER_H
@@ -784,7 +784,7 @@ Index: busybox-1.7.2/editors/awx_parser.h
 Index: busybox-1.7.2/editors/awx_parser.l
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/editors/awx_parser.l 2007-10-05 01:43:59.547510259 +0200
++++ busybox-1.7.2/editors/awx_parser.l 2007-10-30 15:35:06.000000000 -0500
 @@ -0,0 +1,302 @@
 +%{
 +#include <stdio.h>
@@ -1090,8 +1090,8 @@ Index: busybox-1.7.2/editors/awx_parser.l
 +}
 Index: busybox-1.7.2/editors/Config.in
 ===================================================================
---- busybox-1.7.2.orig/editors/Config.in       2007-10-05 01:39:50.097294897 +0200
-+++ busybox-1.7.2/editors/Config.in    2007-10-05 01:43:59.583512308 +0200
+--- busybox-1.7.2.orig/editors/Config.in       2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/editors/Config.in    2007-10-30 15:35:06.000000000 -0500
 @@ -12,6 +12,13 @@
          Awk is used as a pattern scanning and processing language.  This is
          the BusyBox implementation of that programming language.
@@ -1108,8 +1108,8 @@ Index: busybox-1.7.2/editors/Config.in
        default y
 Index: busybox-1.7.2/editors/Kbuild
 ===================================================================
---- busybox-1.7.2.orig/editors/Kbuild  2007-10-05 01:39:50.105295361 +0200
-+++ busybox-1.7.2/editors/Kbuild       2007-10-05 01:43:59.627514818 +0200
+--- busybox-1.7.2.orig/editors/Kbuild  2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/editors/Kbuild       2007-10-30 15:35:06.000000000 -0500
 @@ -12,3 +12,12 @@
  lib-$(CONFIG_PATCH)     += patch.o
  lib-$(CONFIG_SED)       += sed.o
@@ -1125,8 +1125,8 @@ Index: busybox-1.7.2/editors/Kbuild
 +      $(call if_changed_rule,cc_o_c)
 Index: busybox-1.7.2/include/applets.h
 ===================================================================
---- busybox-1.7.2.orig/include/applets.h       2007-10-05 01:43:59.203490652 +0200
-+++ busybox-1.7.2/include/applets.h    2007-10-05 01:43:59.647515958 +0200
+--- busybox-1.7.2.orig/include/applets.h       2007-10-30 15:35:05.000000000 -0500
++++ busybox-1.7.2/include/applets.h    2007-10-30 15:35:06.000000000 -0500
 @@ -76,6 +76,7 @@
  USE_ARPING(APPLET(arping, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
  USE_ASH(APPLET_NOUSAGE(ash, ash, _BB_DIR_BIN, _BB_SUID_NEVER))
@@ -1138,7 +1138,7 @@ Index: busybox-1.7.2/include/applets.h
 Index: busybox-1.7.2/include/cgi.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/include/cgi.h        2007-10-05 01:43:59.667517098 +0200
++++ busybox-1.7.2/include/cgi.h        2007-10-30 15:35:06.000000000 -0500
 @@ -0,0 +1,8 @@
 +#ifndef CGI_H
 +#define CGI_H
@@ -1151,7 +1151,7 @@ Index: busybox-1.7.2/include/cgi.h
 Index: busybox-1.7.2/libbb/cgi.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.7.2/libbb/cgi.c  2007-10-05 01:43:59.707519378 +0200
++++ busybox-1.7.2/libbb/cgi.c  2007-10-30 15:35:06.000000000 -0500
 @@ -0,0 +1,457 @@
 +/* --------------------------------------------------------------------------
 + * functions for processing cgi form data
@@ -1612,8 +1612,8 @@ Index: busybox-1.7.2/libbb/cgi.c
 +} 
 Index: busybox-1.7.2/libbb/Kbuild
 ===================================================================
---- busybox-1.7.2.orig/libbb/Kbuild    2007-10-05 01:43:59.387501141 +0200
-+++ busybox-1.7.2/libbb/Kbuild 2007-10-05 01:43:59.751521884 +0200
+--- busybox-1.7.2.orig/libbb/Kbuild    2007-10-30 15:35:06.000000000 -0500
++++ busybox-1.7.2/libbb/Kbuild 2007-10-30 15:35:06.000000000 -0500
 @@ -99,6 +99,7 @@
  lib-y += xreadlink.o
  

diff --git a/package/busybox/patches/990-upstream_tail_fix.patch b/package/busybox/patches/990-upstream_tail_fix.patch
index ffae223..17ca435 100644 (file)
--- a/package/busybox/patches/990-upstream_tail_fix.patch
+++ b/package/busybox/patches/990-upstream_tail_fix.patch
@@ -1,6 +1,7 @@
-diff -urN busybox-1.7.2/coreutils/tail.c busybox-1.7.2-tail/coreutils/tail.c
---- busybox-1.7.2/coreutils/tail.c     2007-09-03 12:48:40.000000000 +0100
-+++ busybox-1.7.2-tail/coreutils/tail.c        2007-10-02 11:16:28.000000000 +0100
+Index: busybox-1.7.2/coreutils/tail.c
+===================================================================
+--- busybox-1.7.2.orig/coreutils/tail.c        2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/coreutils/tail.c     2007-10-30 15:35:06.000000000 -0500
 @@ -47,13 +47,16 @@
  static ssize_t tail_read(int fd, char *buf, size_t count)
  {

diff --git a/package/busybox/patches/991-upstream_logger_fix.patch b/package/busybox/patches/991-upstream_logger_fix.patch
index e02123b..f225a1b 100644 (file)
--- a/package/busybox/patches/991-upstream_logger_fix.patch
+++ b/package/busybox/patches/991-upstream_logger_fix.patch
@@ -1,6 +1,7 @@
-diff -urN busybox-1.7.2/sysklogd/logger.c busybox-1.7.2-logger/sysklogd/logger.c
---- busybox-1.7.2/sysklogd/logger.c    2007-09-03 12:48:35.000000000 +0100
-+++ busybox-1.7.2-logger/sysklogd/logger.c     2007-10-02 10:56:53.000000000 +0100
+Index: busybox-1.7.2/sysklogd/logger.c
+===================================================================
+--- busybox-1.7.2.orig/sysklogd/logger.c       2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/sysklogd/logger.c    2007-10-30 15:35:07.000000000 -0500
 @@ -107,7 +107,7 @@
        argv += optind;
        if (!argc) {