X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/e8b81c92e78dc781a9569d7d51bd4f98d89237f8..ba43ecdcd5b3c047e9722b5b29c8aa1357e3f218:/package/busybox/patches/510-awx.patch

diff --git a/package/busybox/patches/510-awx.patch b/package/busybox/patches/510-awx.patch
index 571b32397..6ae1b9cc0 100644
--- 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
+Index: busybox-1.8.1/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.8.1.orig/editors/awk.c	2007-11-10 16:55:07.032260312 +0100
++++ busybox-1.8.1/editors/awk.c	2007-11-10 17:07:04.493146078 +0100
 @@ -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)
@@ -71,21 +71,20 @@ Index: busybox-1.7.2/editors/awk.c
  			g_progname = L.s;
  
  			nvfree(fnargs);
-@@ -2753,6 +2768,13 @@
+@@ -2753,6 +2768,12 @@
  }
  
- int awk_main(int argc, char **argv);
+ int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 +int awx_main(int argc, char **argv);
 +
 +#ifdef CONFIG_AWX
 +static int is_awx = 0;
 +#include "awx.c"
 +#endif
-+
  int awk_main(int argc, char **argv)
  {
  	unsigned opt;
-@@ -2817,6 +2839,11 @@
+@@ -2817,6 +2838,11 @@
  			*s1 = '=';
  		}
  	}
@@ -97,10 +96,10 @@ Index: busybox-1.7.2/editors/awk.c
  	opt_complementary = "v::f::";
  	opt = getopt32(argv, "F:v:f:W:", &opt_F, &opt_v, &opt_f, &opt_W);
  	argv += optind;
-Index: busybox-1.7.2/editors/awx.c
+Index: busybox-1.8.1/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.8.1/editors/awx.c	2007-11-10 17:06:19.258568308 +0100
 @@ -0,0 +1,636 @@
 +/*
 + * awk web extension
@@ -738,10 +737,10 @@ Index: busybox-1.7.2/editors/awx.c
 +	return awk_main(argc, argv);
 +}
 +
-Index: busybox-1.7.2/editors/awx_parser.h
+Index: busybox-1.8.1/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.8.1/editors/awx_parser.h	2007-11-10 17:06:19.266568760 +0100
 @@ -0,0 +1,38 @@
 +#ifndef __TEMPLATE_PARSER_H
 +#define __TEMPLATE_PARSER_H
@@ -781,10 +780,10 @@ Index: busybox-1.7.2/editors/awx_parser.h
 +void free_template(struct template_cb *cb, struct template_element *e);
 +
 +#endif
-Index: busybox-1.7.2/editors/awx_parser.l
+Index: busybox-1.8.1/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.8.1/editors/awx_parser.l	2007-11-10 17:06:19.270568989 +0100
 @@ -0,0 +1,302 @@
 +%{
 +#include <stdio.h>
@@ -1088,10 +1087,10 @@ Index: busybox-1.7.2/editors/awx_parser.l
 +	free(e);
 +	return free_template(cb, next);
 +}
-Index: busybox-1.7.2/editors/Config.in
+Index: busybox-1.8.1/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.8.1.orig/editors/Config.in	2007-11-10 02:40:54.000000000 +0100
++++ busybox-1.8.1/editors/Config.in	2007-11-10 17:06:19.274569218 +0100
 @@ -12,6 +12,13 @@
  	  Awk is used as a pattern scanning and processing language.  This is
  	  the BusyBox implementation of that programming language.
@@ -1106,10 +1105,10 @@ Index: busybox-1.7.2/editors/Config.in
  config FEATURE_AWK_MATH
  	bool "Enable math functions (requires libm)"
  	default y
-Index: busybox-1.7.2/editors/Kbuild
+Index: busybox-1.8.1/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.8.1.orig/editors/Kbuild	2007-11-10 02:40:54.000000000 +0100
++++ busybox-1.8.1/editors/Kbuild	2007-11-10 17:06:19.278569448 +0100
 @@ -12,3 +12,12 @@
  lib-$(CONFIG_PATCH)     += patch.o
  lib-$(CONFIG_SED)       += sed.o
@@ -1123,11 +1122,11 @@ Index: busybox-1.7.2/editors/Kbuild
 +editors/awx_parser.o: editors/awx_parser.c FORCE
 +	$(call cmd,force_checksrc)
 +	$(call if_changed_rule,cc_o_c)
-Index: busybox-1.7.2/include/applets.h
+Index: busybox-1.8.1/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
-@@ -76,6 +76,7 @@
+--- busybox-1.8.1.orig/include/applets.h	2007-11-10 17:03:38.957433264 +0100
++++ busybox-1.8.1/include/applets.h	2007-11-10 17:06:19.282569674 +0100
+@@ -83,6 +83,7 @@
  USE_ARPING(APPLET(arping, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
  USE_ASH(APPLET_NOUSAGE(ash, ash, _BB_DIR_BIN, _BB_SUID_NEVER))
  USE_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER, awk))
@@ -1135,10 +1134,10 @@ Index: busybox-1.7.2/include/applets.h
  USE_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER, basename))
  USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
  //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))
-Index: busybox-1.7.2/include/cgi.h
+Index: busybox-1.8.1/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.8.1/include/cgi.h	2007-11-10 17:06:19.282569674 +0100
 @@ -0,0 +1,8 @@
 +#ifndef CGI_H
 +#define CGI_H
@@ -1148,10 +1147,10 @@ Index: busybox-1.7.2/include/cgi.h
 +int cgi_init(var_handler);
 +
 +#endif
-Index: busybox-1.7.2/libbb/cgi.c
+Index: busybox-1.8.1/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.8.1/libbb/cgi.c	2007-11-10 17:06:19.282569674 +0100
 @@ -0,0 +1,457 @@
 +/* --------------------------------------------------------------------------
 + * functions for processing cgi form data
@@ -1610,11 +1609,11 @@ Index: busybox-1.7.2/libbb/cgi.c
 +
 +	return retval;
 +} 
-Index: busybox-1.7.2/libbb/Kbuild
+Index: busybox-1.8.1/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
-@@ -99,6 +99,7 @@
+--- busybox-1.8.1.orig/libbb/Kbuild	2007-11-10 17:04:07.547062497 +0100
++++ busybox-1.8.1/libbb/Kbuild	2007-11-10 17:06:19.282569674 +0100
+@@ -101,6 +101,7 @@
  lib-y += xreadlink.o
  
  # conditionally compiled objects: