qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

refresh all package patches in the buildroot using quilt

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7490 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2007-06-04 11:25:53 +00:00
parent cca016f893
commit b5cb1795de
184 changed files with 3022 additions and 2289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/busybox/patches/000-autoconf.patch
View File

@@ -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

8
package/busybox/patches/110-wget_getopt_fix.patch
View File

@@ -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

7
package/busybox/patches/130-drop_werror.patch
View File

@@ -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

7
package/busybox/patches/140-trylink_bash.patch
View File

@@ -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

20
package/busybox/patches/200-etc_crontabs.patch
View File

@@ -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"

11
package/busybox/patches/240-udhcpc_retries.patch
View File

@@ -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:

18
package/busybox/patches/241-udhcpc-oversized_packets.patch
View File

@@ -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;

7
package/busybox/patches/242-udhcpc_msgs.patch
View File

@@ -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)
{

10
package/busybox/patches/250-ash_export-n.patch
View File

@@ -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;

34
package/busybox/patches/300-netmsg.patch
View File

@@ -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>

11
package/busybox/patches/310-passwd_access.patch
View File

@@ -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;
}

9
package/busybox/patches/330-httpd_user_agent.patch
View File

@@ -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));

32
package/busybox/patches/340-lock_util.patch
View File

@@ -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>

30
package/busybox/patches/350-httpd_redir.patch
View File

@@ -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,

7
package/busybox/patches/400-revert_awk_getopt.patch
View File

@@ -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)

16
package/busybox/patches/401-darwin_includes.patch
View File

@@ -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>

11
package/busybox/patches/410-httpd_cgi_headers.patch
View File

@@ -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"
*/

9
package/busybox/patches/420-httpd_sendcgi_fix.patch
View File

@@ -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

7
package/busybox/patches/430-uniq_memleak.patch
View File

@@ -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)) {

11
package/busybox/patches/440-httpd_chdir.patch
View File

@@ -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;

7
package/busybox/patches/440-usage_compressed_fix.patch
View File

@@ -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[] = '

6
package/busybox/patches/450-truncated_ping_results.patch
View File

@@ -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;

546
package/busybox/patches/911-ipkg.patch
View File

File diff suppressed because it is too large Load Diff

31
package/busybox/patches/913-libbb_hash.patch
View File

@@ -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

70
package/busybox/patches/920-awx.patch
View File

@@ -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