large init script cleanup and merge of whiterussian changes, new dnsmasq config handling

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

5 files changed, 249 insertions, 2 deletions

diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index 1ffb8c653..404170188 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -209,6 +209,12 @@ config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
 	  Enables the 'hdparm -d' option to get/set using_dma flag.
 	  This is dangerous stuff, so you should probably say N.
 
+config BUSYBOX_CONFIG_LOCK
+	bool "lock"
+	default y
+	help
+	  Small utility for using locks in scripts
+
 config BUSYBOX_CONFIG_MAKEDEVS
 	bool "makedevs"
 	default n
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 14e6b5f79..7e280b76e 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -395,14 +395,14 @@ endif
 
 config BUSYBOX_CONFIG_IPCALC
 	bool "ipcalc"
-	default y
+	default n
 	help
 	  ipcalc takes an IP address and netmask and calculates the
 	  resulting broadcast, network, and host range.
 
 config BUSYBOX_CONFIG_FEATURE_IPCALC_FANCY
 	bool "  Fancy IPCALC, more options, adds 1 kbyte"
-	default y
+	default n
 	depends on BUSYBOX_CONFIG_IPCALC
 	help
 	  Adds the options hostname, prefix and silent to the output of "ipcalc".
diff --git a/package/busybox/patches/220-awk_bitops.patch b/package/busybox/patches/220-awk_bitops.patch
new file mode 100644
index 000000000..2b8572913
--- /dev/null
+++ b/package/busybox/patches/220-awk_bitops.patch
@@ -0,0 +1,61 @@
+--- busybox-1.00/editors/awk.c.orig	2004-09-24 05:24:27 -04:00
++++ busybox-1.00/editors/awk.c	2006-03-08 02:16:52 -05:00
+@@ -271,7 +271,8 @@
+ /* builtins */
+ enum {
+ 	B_a2=0,	B_ix,	B_ma,	B_sp,	B_ss,	B_ti,	B_lo,	B_up,
+-	B_ge,	B_gs,	B_su
++	B_ge,	B_gs,	B_su,
++	B_an,	B_co,	B_ls,	B_or,	B_rs,	B_xo,
+ };
+ 
+ /* tokens and their corresponding info values */
+@@ -311,6 +312,8 @@
+ 	"\5while"	NTC
+ 	"\4else"	NTC
+ 
++	"\3and"		"\5compl"	"\6lshift"	"\2or"
++	"\6rshift"	"\3xor"
+ 	"\5close"	"\6system"	"\6fflush"	"\5atan2"	/* BUILTIN */
+ 	"\3cos"		"\3exp"		"\3int"		"\3log"
+ 	"\4rand"	"\3sin"		"\4sqrt"	"\5srand"
+@@ -364,6 +367,8 @@
+ 	ST_WHILE,
+ 	0,
+ 
++	OC_B|B_an|P(0x83), OC_B|B_co|P(0x41), OC_B|B_ls|P(0x83), OC_B|B_or|P(0x83),
++	OC_B|B_rs|P(0x83), OC_B|B_xo|P(0x83),
+ 	OC_FBLTIN|Sx|F_cl, OC_FBLTIN|Sx|F_sy, OC_FBLTIN|Sx|F_ff, OC_B|B_a2|P(0x83),
+ 	OC_FBLTIN|Nx|F_co, OC_FBLTIN|Nx|F_ex, OC_FBLTIN|Nx|F_in, OC_FBLTIN|Nx|F_lg,
+ 	OC_FBLTIN|F_rn,    OC_FBLTIN|Nx|F_si, OC_FBLTIN|Nx|F_sq, OC_FBLTIN|Nx|F_sr,
+@@ -1942,6 +1947,30 @@
+ 		strncpy(s, as[0]+i, n);
+ 		s[n] = '\0';
+ 		setvar_p(res, s);
++		break;
++		
++	 case B_an:
++		setvar_i(res, (long)getvar_i(av[0]) & (long)getvar_i(av[1]));
++		break;
++		
++	 case B_co:
++		setvar_i(res, ~(long)getvar_i(av[0]));
++		break;
++
++	 case B_ls:
++		setvar_i(res, (long)getvar_i(av[0]) << (long)getvar_i(av[1]));
++		break;
++
++	 case B_or:
++		setvar_i(res, (long)getvar_i(av[0]) | (long)getvar_i(av[1]));
++		break;
++
++	 case B_rs:
++		setvar_i(res, (long)((unsigned long)getvar_i(av[0]) >> (unsigned long)getvar_i(av[1])));
++		break;
++
++	 case B_xo:
++		setvar_i(res, (long)getvar_i(av[0]) ^ (long)getvar_i(av[1]));
+ 		break;
+ 
+ 	  case B_lo:
diff --git a/package/busybox/patches/230-passwd_salt.patch b/package/busybox/patches/230-passwd_salt.patch
new file mode 100644
index 000000000..0322a9843
--- /dev/null
+++ b/package/busybox/patches/230-passwd_salt.patch
@@ -0,0 +1,13 @@
+--- busybox-1.00/loginutils/passwd.c	2006-03-26 06:07:37 -05:00
++++ busybox-1.00/loginutils/passwd.c	2006-03-26 06:09:03 -05:00
+@@ -386,7 +386,9 @@
+ 	bzero(orig, sizeof(orig));
+ 
+ 	if (algo == 1) {
+-		cp = pw_encrypt(pass, "$1$");
++		char salt[6]="$1$\0\0\0";
++		memcpy(salt+3,crypt_make_salt(),3);
++		cp = pw_encrypt(pass, salt);
+ 	} else
+ 		cp = pw_encrypt(pass, crypt_make_salt());
+ 	bzero(pass, sizeof pass);
diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch
new file mode 100644
index 000000000..f5c0c2e89
--- /dev/null
+++ b/package/busybox/patches/340-lock_util.patch
@@ -0,0 +1,167 @@
+diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h
+--- busybox.old/include/applets.h	2006-04-05 01:06:29.000000000 +0200
++++ busybox.dev/include/applets.h	2006-04-05 01:19:09.000000000 +0200
+@@ -167,6 +167,7 @@
+ USE_LN(APPLET(ln, ln_main, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_LOADFONT(APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+ USE_LOADKMAP(APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
++USE_LOCK(APPLET_NOUSAGE(lock, lock_main, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_LOGGER(APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+ USE_LOGIN(APPLET(login, login_main, _BB_DIR_BIN, _BB_SUID_ALWAYS))
+ USE_LOGNAME(APPLET(logname, logname_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+diff -urN busybox.old/miscutils/Config.in busybox.dev/miscutils/Config.in
+--- busybox.old/miscutils/Config.in	2006-03-22 22:16:24.000000000 +0100
++++ busybox.dev/miscutils/Config.in	2006-04-05 01:07:12.000000000 +0200
+@@ -209,6 +209,12 @@
+ 	  Enables the 'hdparm -d' option to get/set using_dma flag.
+ 	  This is dangerous stuff, so you should probably say N.
+ 
++config CONFIG_LOCK
++	bool "lock"
++	default y
++	help
++	  Small utility for using locks in scripts
++
+ config CONFIG_MAKEDEVS
+ 	bool "makedevs"
+ 	default n
+diff -urN busybox.old/miscutils/Makefile.in busybox.dev/miscutils/Makefile.in
+--- busybox.old/miscutils/Makefile.in	2006-03-22 22:16:24.000000000 +0100
++++ busybox.dev/miscutils/Makefile.in	2006-04-05 01:10:50.000000000 +0200
+@@ -20,6 +20,7 @@
+ MISCUTILS-$(CONFIG_EJECT)       += eject.o
+ MISCUTILS-$(CONFIG_HDPARM)      += hdparm.o
+ MISCUTILS-$(CONFIG_LAST)        += last.o
++MISCUTILS-$(CONFIG_LOCK)        += lock.o
+ MISCUTILS-${CONFIG_LESS}        += less.o
+ MISCUTILS-$(CONFIG_MAKEDEVS)    += makedevs.o
+ MISCUTILS-$(CONFIG_MOUNTPOINT)  += mountpoint.o
+diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
+--- busybox.old/miscutils/lock.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox.dev/miscutils/lock.c	2006-04-05 01:07:12.000000000 +0200
+@@ -0,0 +1,125 @@
++#include <sys/types.h>
++#include <sys/file.h>
++#include <sys/stat.h>
++#include <signal.h>
++#include <fcntl.h>
++#include <unistd.h>
++#include <stdio.h>
++#include "busybox.h" 
++
++static int unlock = 0;
++static int shared = 0;
++static int waitonly = 0;
++static int fd;
++static char *file;
++
++static void usage(char *name)
++{
++	fprintf(stderr, "Usage: %s [-suw] <filename>\n"
++	                "	-s	Use shared locking\n"
++	                "	-u	Unlock\n"
++	                "	-w	Wait for the lock to become free, don't acquire lock\n"
++					"\n", name);
++	exit(1);
++}
++
++static void exit_unlock(int sig)
++{
++	flock(fd, LOCK_UN);
++	unlink(file);
++	exit(0);
++}
++
++static int do_unlock(void)
++{
++	FILE *f;
++	int i;
++	
++	f = fopen(file, "r");
++	fscanf(f, "%d", &i);
++	if (i > 0)
++		kill(i, SIGTERM);
++	fclose(f);
++
++	return 0;
++}
++		
++static int do_lock(void)
++{
++	int pid;
++	char pidstr[8];
++
++	if ((fd = open(file, O_RDWR | O_CREAT, 0700)) < 0) {
++		fprintf(stderr, "Can't open %s\n", file);
++		return 1;
++	}
++
++	if (flock(fd, (shared ? LOCK_SH : LOCK_EX)) < 0) {
++		fprintf(stderr, "Can't lock %s\n", file);
++		return 1;
++	}
++
++	pid = fork();
++
++	if (pid < 0)
++		return -1;
++	
++	if (pid == 0) {
++		signal(SIGKILL, exit_unlock);
++		signal(SIGTERM, exit_unlock);
++		signal(SIGINT, exit_unlock);
++		if (waitonly)
++			exit_unlock(0);
++		else
++			while (1)
++				sleep(1);
++	} else {
++		if (!waitonly) {
++			lseek(fd, 0, SEEK_SET);
++			ftruncate(fd, 0);
++			sprintf(pidstr, "%d\n", pid);
++			write(fd, pidstr, strlen(pidstr));
++			close(fd);
++		}
++
++		return 0;
++	}
++}
++
++#ifndef CONFIG_LOCK
++int main(int argc, char **argv)
++#else
++int lock_main(int argc, char **argv)
++#endif
++{
++	char **args = &argv[1];
++	int c = argc - 1;
++
++	while ((*args != NULL) && (*args)[0] == '-') {
++		char *ch = *args;
++		while (*(++ch) > 0) {
++			switch(*ch) {
++				case 'w':
++					waitonly = 1;
++					break;
++				case 's':
++					shared = 1;
++					break;
++				case 'u':
++					unlock = 1;
++					break;
++			}
++		}
++		c--;
++		args++;
++	}
++
++	if (c != 1)
++		usage(argv[0]);
++
++	file = *args;
++	if (unlock)
++		return do_unlock();
++	else
++		return do_lock();
++}