Signed-off-by: Cristian Greco <cristian@regolo.cc>
---
debian/patches/blockdev.patch | 2 -
...otchartd-mounting-tmpfs-is-Linux-specific.patch | 9 +--
...erial-console-detection-is-Linux-specific.patch | 12 +--
debian/patches/init-console-CRTSCTS.patch | 4 +-
debian/patches/init-console.patch | 2 +-
.../init-halt-portability-improvements.patch | 24 ++---
...init-loginutils-termios-portability-fixes.patch | 39 +++-----
...-make-the-initial-TERM-value-configurable.patch | 11 +--
.../klogd-make-it-work-on-non-linux-systems.patch | 17 +--
...ve-misguided-dependency-on-PLATFORM_LINUX.patch | 6 +-
...nditionalize-AF_-usage-in-error-reporting.patch | 11 +--
...b.h-add-device-names-for-Hurd-and-FreeBSD.patch | 6 +-
.../patches/make_gen_build_files_skip_quilt.patch | 6 +-
...mark-Linux-specific-configuration-options.patch | 114 +++++++-------------
debian/patches/mkdir-fix-p-on-FreeBSD.patch | 7 +-
debian/patches/readlink-use-xmalloc_realpath.patch | 11 +--
debian/patches/strip.patch | 2 +-
.../stty-sort-out-preprocessor-conditionals.patch | 45 ++++-----
debian/patches/swaponoff-FreeBSD-support.patch | 19 +---
...vd-conditionalize-usage-of-SO_ORIGINAL_DS.patch | 15 +--
debian/patches/u-mount-FreeBSD-support.patch | 35 ++-----
.../patches/update-scripts-kconfig-_shipped.patch | 4 +-
...able-linux-console-calls-on-other-systems.patch | 19 +---
23 files changed, 132 insertions(+), 288 deletions(-)
diff --git a/debian/patches/blockdev.patch b/debian/patches/blockdev.patch
index 46f57b7..45df1d8 100644
--- a/debian/patches/blockdev.patch
+++ b/debian/patches/blockdev.patch
@@ -8,8 +8,6 @@ Author: Denys Vlasenko <dvlasenk@redhat.com>
Forwarded: not-needed
Last-Update: 2010-11-09
-Index: b/util-linux/blockdev.c
-===================================================================
--- /dev/null
+++ b/util-linux/blockdev.c
@@ -0,0 +1,195 @@
diff --git a/debian/patches/bootchartd-mounting-tmpfs-is-Linux-specific.patch b/debian/patches/bootchartd-mounting-tmpfs-is-Linux-specific.patch
index aafbed2..91c02c1 100644
--- a/debian/patches/bootchartd-mounting-tmpfs-is-Linux-specific.patch
+++ b/debian/patches/bootchartd-mounting-tmpfs-is-Linux-specific.patch
@@ -9,8 +9,6 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
init/bootchartd.c | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
-diff --git a/init/bootchartd.c b/init/bootchartd.c
-index a1c0164..465a349 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -6,7 +6,6 @@
@@ -43,7 +41,7 @@ index a1c0164..465a349 100644
#endif
#define BC_VERSION_STR "0.8"
-@@ -175,6 +177,7 @@ static char *make_tempdir(void)
+@@ -175,6 +177,7 @@
char template[] = "/tmp/bootchart.XXXXXX";
char *tempdir = xstrdup(mkdtemp(template));
if (!tempdir) {
@@ -51,7 +49,7 @@ index a1c0164..465a349 100644
/* /tmp is not writable (happens when we are used as init).
* Try to mount a tmpfs, them cd and lazily unmount it.
* Since we unmount it at once, we can mount it anywhere.
-@@ -192,6 +195,9 @@ static char *make_tempdir(void)
+@@ -192,6 +195,9 @@
if (umount2(try_dir, MNT_DETACH) != 0) {
bb_perror_msg_and_die("can't %smount tmpfs", "un");
}
@@ -61,6 +59,3 @@ index a1c0164..465a349 100644
} else {
xchdir(tempdir);
}
---
-1.7.1
-
diff --git a/debian/patches/cttyhack-serial-console-detection-is-Linux-specific.patch b/debian/patches/cttyhack-serial-console-detection-is-Linux-specific.patch
index 7228615..fe95bc0 100644
--- a/debian/patches/cttyhack-serial-console-detection-is-Linux-specific.patch
+++ b/debian/patches/cttyhack-serial-console-detection-is-Linux-specific.patch
@@ -9,10 +9,8 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
shell/cttyhack.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
-Index: busybox-1.17.1/shell/cttyhack.c
-===================================================================
---- busybox-1.17.1.orig/shell/cttyhack.c 2010-08-01 05:38:31.000000000 +0200
-+++ busybox-1.17.1/shell/cttyhack.c 2010-08-01 05:39:26.000000000 +0200
+--- a/shell/cttyhack.c
++++ b/shell/cttyhack.c
@@ -6,6 +6,10 @@
*/
#include "libbb.h"
@@ -46,10 +44,8 @@ Index: busybox-1.17.1/shell/cttyhack.c
if (console[8]) {
fd = xopen(console, O_RDWR);
//bb_error_msg("switching to '%s'", console);
-Index: busybox-1.17.1/shell/Config.src
-===================================================================
---- busybox-1.17.1.orig/shell/Config.src 2010-08-01 05:39:44.000000000 +0200
-+++ busybox-1.17.1/shell/Config.src 2010-08-01 05:39:49.000000000 +0200
+--- a/shell/Config.src
++++ b/shell/Config.src
@@ -370,7 +370,6 @@
config CTTYHACK
bool "cttyhack"
diff --git a/debian/patches/init-console-CRTSCTS.patch b/debian/patches/init-console-CRTSCTS.patch
index ddc06fb..47e413f 100644
--- a/debian/patches/init-console-CRTSCTS.patch
+++ b/debian/patches/init-console-CRTSCTS.patch
@@ -1,5 +1,5 @@
---- a/init/init.c.original 2010-10-17 20:12:02.000000000 +0200
-+++ b/init/init.c 2010-10-17 20:12:17.000000000 +0200
+--- a/init/init.c
++++ b/init/init.c
@@ -232,7 +232,11 @@
#endif
diff --git a/debian/patches/init-console.patch b/debian/patches/init-console.patch
index 6845950..6b2ee4f 100644
--- a/debian/patches/init-console.patch
+++ b/debian/patches/init-console.patch
@@ -1,6 +1,6 @@
--- a/init/init.c
+++ b/init/init.c
-@@ -441,6 +441,8 @@
+@@ -450,6 +450,8 @@
for (a = init_action_list; a; a = a->next) {
if (!(a->action_type & action_type))
continue;
diff --git a/debian/patches/init-halt-portability-improvements.patch b/debian/patches/init-halt-portability-improvements.patch
index 94618c3..1e48549 100644
--- a/debian/patches/init-halt-portability-improvements.patch
+++ b/debian/patches/init-halt-portability-improvements.patch
@@ -19,10 +19,8 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
4 files changed, 40 insertions(+), 23 deletions(-)
create mode 100644 init/reboot.h
-Index: busybox-1.17.1/init/Config.src
-===================================================================
---- busybox-1.17.1.orig/init/Config.src 2010-08-01 05:32:43.000000000 +0200
-+++ busybox-1.17.1/init/Config.src 2010-08-01 05:36:47.000000000 +0200
+--- a/init/Config.src
++++ b/init/Config.src
@@ -10,7 +10,6 @@
config INIT
bool "init"
@@ -39,10 +37,8 @@ Index: busybox-1.17.1/init/Config.src
help
Stop all processes and either halt, reboot, or power off the system.
-Index: busybox-1.17.1/init/halt.c
-===================================================================
---- busybox-1.17.1.orig/init/halt.c 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/init/halt.c 2010-08-01 05:36:47.000000000 +0200
+--- a/init/halt.c
++++ b/init/halt.c
@@ -8,7 +8,7 @@
*/
@@ -71,10 +67,8 @@ Index: busybox-1.17.1/init/halt.c
int halt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int halt_main(int argc UNUSED_PARAM, char **argv)
-Index: busybox-1.17.1/init/init.c
-===================================================================
---- busybox-1.17.1.orig/init/init.c 2010-08-01 05:36:45.000000000 +0200
-+++ busybox-1.17.1/init/init.c 2010-08-01 05:36:47.000000000 +0200
+--- a/init/init.c
++++ b/init/init.c
@@ -12,7 +12,6 @@
#include "libbb.h"
#include <syslog.h>
@@ -147,10 +141,8 @@ Index: busybox-1.17.1/init/init.c
/* Check if we are supposed to be in single user mode */
if (argv[1]
-Index: busybox-1.17.1/init/reboot.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.17.1/init/reboot.h 2010-08-01 05:36:47.000000000 +0200
+--- /dev/null
++++ b/init/reboot.h
@@ -0,0 +1,31 @@
+/*
+ * Definitions related to the reboot() system call,
diff --git a/debian/patches/init-loginutils-termios-portability-fixes.patch b/debian/patches/init-loginutils-termios-portability-fixes.patch
index c612263..ccd8826 100644
--- a/debian/patches/init-loginutils-termios-portability-fixes.patch
+++ b/debian/patches/init-loginutils-termios-portability-fixes.patch
@@ -12,8 +12,6 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
loginutils/login.c | 2 +-
4 files changed, 31 insertions(+), 17 deletions(-)
-diff --git a/init/init.c b/init/init.c
-index 2eb8f1a..1388c75 100644
--- a/init/init.c
+++ b/init/init.c
@@ -14,11 +14,19 @@
@@ -36,7 +34,7 @@ index 2eb8f1a..1388c75 100644
/* Was a CONFIG_xxx option. A lot of people were building
* not fully functional init by switching it on! */
-@@ -166,7 +174,9 @@ static void message(int where, const char *fmt, ...)
+@@ -166,7 +174,9 @@
static void console_init(void)
{
@@ -46,7 +44,7 @@ index 2eb8f1a..1388c75 100644
char *s;
s = getenv("CONSOLE");
-@@ -190,6 +200,7 @@ static void console_init(void)
+@@ -190,6 +200,7 @@
}
s = getenv("TERM");
@@ -54,7 +52,7 @@ index 2eb8f1a..1388c75 100644
if (ioctl(STDIN_FILENO, VT_OPENQRY, &vtno) != 0) {
/* Not a linux terminal, probably serial console.
* Force the TERM setting to vt102
-@@ -198,7 +209,9 @@ static void console_init(void)
+@@ -198,7 +209,9 @@
putenv((char*)"TERM=vt102");
if (!ENABLE_FEATURE_INIT_SYSLOG)
log_console = NULL;
@@ -65,7 +63,7 @@ index 2eb8f1a..1388c75 100644
putenv((char*)"TERM=linux");
}
-@@ -220,8 +233,10 @@ static void set_sane_term(void)
+@@ -220,8 +233,10 @@
tty.c_cc[VSTOP] = 19; /* C-s */
tty.c_cc[VSUSP] = 26; /* C-z */
@@ -76,11 +74,9 @@ index 2eb8f1a..1388c75 100644
/* Make it be sane */
tty.c_cflag &= CBAUD | CBAUDEX | CSIZE | CSTOPB | PARENB | PARODD;
-diff --git a/loginutils/Config.src b/loginutils/Config.src
-index 425d041..6ec2893 100644
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
-@@ -179,7 +179,6 @@ config DELUSER
+@@ -179,7 +179,6 @@
config GETTY
bool "getty"
default y
@@ -88,7 +84,7 @@ index 425d041..6ec2893 100644
select FEATURE_SYSLOG
help
getty lets you log in on a tty, it is normally invoked by init.
-@@ -187,7 +186,6 @@ config GETTY
+@@ -187,7 +186,6 @@
config LOGIN
bool "login"
default y
@@ -96,11 +92,9 @@ index 425d041..6ec2893 100644
select FEATURE_SUID
select FEATURE_SYSLOG
help
-diff --git a/loginutils/getty.c b/loginutils/getty.c
-index a5e8e90..7f04d33 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
-@@ -282,10 +282,8 @@ static void termios_init(struct termios *tp, int speed, struct options *op)
+@@ -282,10 +282,8 @@
* reads will be done in raw mode anyway. Errors will be dealt with
* later on.
*/
@@ -112,7 +106,7 @@ index a5e8e90..7f04d33 100644
ispeed = ospeed = speed;
if (speed == B0) {
/* Speed was specified as "0" on command line.
-@@ -299,10 +297,13 @@ static void termios_init(struct termios *tp, int speed, struct options *op)
+@@ -299,10 +297,13 @@
cfsetispeed(tp, ispeed);
cfsetospeed(tp, ospeed);
@@ -127,7 +121,7 @@ index a5e8e90..7f04d33 100644
/* Optionally enable hardware flow control */
#ifdef CRTSCTS
-@@ -360,10 +361,8 @@ static void auto_baud(char *buf, unsigned size_buf, struct termios *tp)
+@@ -360,10 +361,8 @@
for (bp = buf; bp < buf + nread; bp++) {
if (isdigit(*bp)) {
speed = bcode(bp);
@@ -140,7 +134,7 @@ index a5e8e90..7f04d33 100644
break;
}
}
-@@ -417,7 +416,7 @@ static char *get_logname(char *logname, unsigned size_logname,
+@@ -417,7 +416,7 @@
/* Flush pending input (esp. after parsing or switching the baud rate). */
sleep(1);
@@ -149,7 +143,7 @@ index a5e8e90..7f04d33 100644
/* Prompt for and read a login name. */
logname[0] = '\0';
-@@ -526,7 +525,9 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat
+@@ -526,7 +525,9 @@
tp->c_cc[VQUIT] = DEF_QUIT; /* default quit */
tp->c_cc[VEOF] = DEF_EOF; /* default EOF character */
tp->c_cc[VEOL] = DEF_EOL;
@@ -159,7 +153,7 @@ index a5e8e90..7f04d33 100644
/* Account for special characters seen in input. */
if (cp->eol == CR) {
-@@ -572,8 +573,8 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat
+@@ -572,8 +573,8 @@
#endif
/* Finally, make the new settings effective */
@@ -170,7 +164,7 @@ index a5e8e90..7f04d33 100644
}
int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-@@ -650,8 +651,8 @@ int getty_main(int argc UNUSED_PARAM, char **argv)
+@@ -650,8 +651,8 @@
* by patching the SunOS kernel variable "zsadtrlow" to a larger value;
* 5 seconds seems to be a good value.
*/
@@ -181,11 +175,9 @@ index a5e8e90..7f04d33 100644
pid = getpid();
#ifdef __linux__
-diff --git a/loginutils/login.c b/loginutils/login.c
-index 88ed0af..1001248 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
-@@ -264,7 +264,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
+@@ -264,7 +264,7 @@
while (1) {
/* flush away any type-ahead (as getty does) */
@@ -194,6 +186,3 @@ index 88ed0af..1001248 100644
if (!username[0])
get_username_or_die(username, sizeof(username));
---
-1.7.1
-
diff --git a/debian/patches/init-make-the-initial-TERM-value-configurable.patch b/debian/patches/init-make-the-initial-TERM-value-configurable.patch
index fb04a1e..f0fab56 100644
--- a/debian/patches/init-make-the-initial-TERM-value-configurable.patch
+++ b/debian/patches/init-make-the-initial-TERM-value-configurable.patch
@@ -10,11 +10,9 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
init/init.c | 2 +-
2 files changed, 13 insertions(+), 1 deletions(-)
-diff --git a/init/Config.src b/init/Config.src
-index 590e298..2cac357 100644
--- a/init/Config.src
+++ b/init/Config.src
-@@ -89,6 +89,18 @@ config FEATURE_INITRD
+@@ -89,6 +89,18 @@
This does not apply to initramfs, which runs /init as PID 1 and
requires no special support.
@@ -33,11 +31,9 @@ index 590e298..2cac357 100644
config HALT
bool "poweroff, halt, and reboot"
default y
-diff --git a/init/init.c b/init/init.c
-index d8bf158..fa1af6d 100644
--- a/init/init.c
+++ b/init/init.c
-@@ -205,7 +205,7 @@ static void console_init(void)
+@@ -205,7 +205,7 @@
} else
#endif
if (!s)
@@ -46,6 +42,3 @@ index d8bf158..fa1af6d 100644
}
/* Set terminal settings to reasonable defaults.
---
-1.7.1
-
diff --git a/debian/patches/klogd-make-it-work-on-non-linux-systems.patch b/debian/patches/klogd-make-it-work-on-non-linux-systems.patch
index 033617f..c8def63 100644
--- a/debian/patches/klogd-make-it-work-on-non-linux-systems.patch
+++ b/debian/patches/klogd-make-it-work-on-non-linux-systems.patch
@@ -17,11 +17,9 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
sysklogd/klogd.c | 128 +++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 126 insertions(+), 19 deletions(-)
-diff --git a/sysklogd/Config.src b/sysklogd/Config.src
-index 41c0d28..1e59872 100644
--- a/sysklogd/Config.src
+++ b/sysklogd/Config.src
-@@ -109,7 +109,6 @@ config FEATURE_LOGREAD_REDUCED_LOCKING
+@@ -109,7 +109,6 @@
config KLOGD
bool "klogd"
default y
@@ -29,7 +27,7 @@ index 41c0d28..1e59872 100644
help
klogd is a utility which intercepts and logs all
messages from the Linux kernel and sends the messages
-@@ -117,6 +116,22 @@ config KLOGD
+@@ -117,6 +116,22 @@
you wish to record the messages produced by the kernel,
you should enable this option.
@@ -52,8 +50,6 @@ index 41c0d28..1e59872 100644
config LOGGER
bool "logger"
default y
-diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
-index c54e80a..3468656 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -4,7 +4,7 @@
@@ -163,7 +159,7 @@ index c54e80a..3468656 100644
#define log_buffer bb_common_bufsiz1
enum {
KLOGD_LOGBUF_SIZE = sizeof(log_buffer),
-@@ -38,6 +113,19 @@ enum {
+@@ -38,6 +113,19 @@
OPT_FOREGROUND = (1 << 1),
};
@@ -183,7 +179,7 @@ index c54e80a..3468656 100644
int klogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int klogd_main(int argc UNUSED_PARAM, char **argv)
{
-@@ -55,34 +143,34 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
+@@ -55,34 +143,34 @@
bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
}
@@ -231,7 +227,7 @@ index c54e80a..3468656 100644
break;
}
start[n] = '\0';
-@@ -131,5 +219,9 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
+@@ -131,5 +219,9 @@
}
}
@@ -241,6 +237,3 @@ index c54e80a..3468656 100644
+ kill_myself_with_sig(bb_got_signal);
return EXIT_FAILURE;
}
---
-1.7.1
-
diff --git a/debian/patches/less-remove-misguided-dependency-on-PLATFORM_LINUX.patch b/debian/patches/less-remove-misguided-dependency-on-PLATFORM_LINUX.patch
index 5bec32f..f64b0cd 100644
--- a/debian/patches/less-remove-misguided-dependency-on-PLATFORM_LINUX.patch
+++ b/debian/patches/less-remove-misguided-dependency-on-PLATFORM_LINUX.patch
@@ -9,10 +9,8 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
miscutils/Config.src | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
-Index: busybox-1.17.1/miscutils/Config.src
-===================================================================
---- busybox-1.17.1.orig/miscutils/Config.src 2010-08-01 07:33:11.000000000 +0200
-+++ busybox-1.17.1/miscutils/Config.src 2010-08-02 00:45:01.000000000 +0200
+--- a/miscutils/Config.src
++++ b/miscutils/Config.src
@@ -351,11 +351,6 @@
config LESS
bool "less"
diff --git a/debian/patches/libbb-conditionalize-AF_-usage-in-error-reporting.patch b/debian/patches/libbb-conditionalize-AF_-usage-in-error-reporting.patch
index 73c9c32..a358487 100644
--- a/debian/patches/libbb-conditionalize-AF_-usage-in-error-reporting.patch
+++ b/debian/patches/libbb-conditionalize-AF_-usage-in-error-reporting.patch
@@ -10,11 +10,9 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
networking/Config.src | 1 -
2 files changed, 4 insertions(+), 1 deletions(-)
-diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
-index 7069a7c..91f7ba2 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
-@@ -387,8 +387,12 @@ int FAST_FUNC xsocket(int domain, int type, int protocol)
+@@ -387,8 +387,12 @@
/* Hijack vaguely related config option */
#if ENABLE_VERBOSE_RESOLUTION_ERRORS
const char *s = "INET";
@@ -27,11 +25,9 @@ index 7069a7c..91f7ba2 100644
IF_FEATURE_IPV6(if (domain == AF_INET6) s = "INET6";)
bb_perror_msg_and_die("socket(AF_%s,%d,%d)", s, type, protocol);
#else
-diff --git a/networking/Config.src b/networking/Config.src
-index 26c59e7..fc613e8 100644
--- a/networking/Config.src
+++ b/networking/Config.src
-@@ -43,7 +43,6 @@ config FEATURE_PREFER_IPV4_ADDRESS
+@@ -43,7 +43,6 @@
config VERBOSE_RESOLUTION_ERRORS
bool "Verbose resolution errors"
default n
@@ -39,6 +35,3 @@ index 26c59e7..fc613e8 100644
help
Enable if you are not satisfied with simplistic
"can't resolve 'hostname.com'" and want to know more.
---
-1.7.1
-
diff --git a/debian/patches/libbb.h-add-device-names-for-Hurd-and-FreeBSD.patch b/debian/patches/libbb.h-add-device-names-for-Hurd-and-FreeBSD.patch
index 91ac9bf..6cfddfa 100644
--- a/debian/patches/libbb.h-add-device-names-for-Hurd-and-FreeBSD.patch
+++ b/debian/patches/libbb.h-add-device-names-for-Hurd-and-FreeBSD.patch
@@ -12,10 +12,8 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
include/libbb.h | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
-Index: busybox-1.17.1/include/libbb.h
-===================================================================
---- busybox-1.17.1.orig/include/libbb.h 2010-08-01 05:24:36.000000000 +0200
-+++ busybox-1.17.1/include/libbb.h 2010-08-01 05:36:59.000000000 +0200
+--- a/include/libbb.h
++++ b/include/libbb.h
@@ -1614,7 +1614,27 @@
/* "sh" */
#define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6)
diff --git a/debian/patches/make_gen_build_files_skip_quilt.patch b/debian/patches/make_gen_build_files_skip_quilt.patch
index d654468..565739c 100644
--- a/debian/patches/make_gen_build_files_skip_quilt.patch
+++ b/debian/patches/make_gen_build_files_skip_quilt.patch
@@ -1,7 +1,5 @@
-Index: busybox-1.17.1/scripts/gen_build_files.sh
-===================================================================
---- busybox-1.17.1.orig/scripts/gen_build_files.sh 2010-08-01 07:28:13.000000000 +0200
-+++ busybox-1.17.1/scripts/gen_build_files.sh 2010-08-01 07:31:03.000000000 +0200
+--- a/scripts/gen_build_files.sh
++++ b/scripts/gen_build_files.sh
@@ -48,7 +48,7 @@
fi
diff --git a/debian/patches/mark-Linux-specific-configuration-options.patch b/debian/patches/mark-Linux-specific-configuration-options.patch
index 8f89c3e..dcddb21 100644
--- a/debian/patches/mark-Linux-specific-configuration-options.patch
+++ b/debian/patches/mark-Linux-specific-configuration-options.patch
@@ -30,10 +30,8 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
util-linux/Config.src | 27 +++++++++++++++++++++++++++
19 files changed, 114 insertions(+), 4 deletions(-)
-Index: busybox-1.17.1/Config.in
-===================================================================
---- busybox-1.17.1.orig/Config.in 2010-08-01 05:24:36.000000000 +0200
-+++ busybox-1.17.1/Config.in 2010-08-01 05:32:43.000000000 +0200
+--- a/Config.in
++++ b/Config.in
@@ -47,6 +47,17 @@
compiler other than gcc.
If you do use gcc, this option may needlessly increase code size.
@@ -60,10 +58,8 @@ Index: busybox-1.17.1/Config.in
help
Enable support for SELinux in applets ls, ps, and id. Also provide
the option of compiling in SELinux applets.
-Index: busybox-1.17.1/console-tools/Config.src
-===================================================================
---- busybox-1.17.1.orig/console-tools/Config.src 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/console-tools/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/console-tools/Config.src
++++ b/console-tools/Config.src
@@ -10,6 +10,7 @@
config CHVT
bool "chvt"
@@ -164,10 +160,8 @@ Index: busybox-1.17.1/console-tools/Config.src
help
Shows keys pressed.
-Index: busybox-1.17.1/coreutils/Config.src
-===================================================================
---- busybox-1.17.1.orig/coreutils/Config.src 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/coreutils/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/coreutils/Config.src
++++ b/coreutils/Config.src
@@ -591,6 +591,7 @@
config STAT
bool "stat"
@@ -184,10 +178,8 @@ Index: busybox-1.17.1/coreutils/Config.src
help
stty is used to change and print terminal line settings.
-Index: busybox-1.17.1/coreutils/date.c
-===================================================================
---- busybox-1.17.1.orig/coreutils/date.c 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/coreutils/date.c 2010-08-01 05:32:43.000000000 +0200
+--- a/coreutils/date.c
++++ b/coreutils/date.c
@@ -72,7 +72,7 @@
//config:config FEATURE_DATE_NANO
//config: bool "Support %[num]N nanosecond format specifier"
@@ -197,10 +189,8 @@ Index: busybox-1.17.1/coreutils/date.c
//config: help
//config: Support %[num]N format specifier. Adds ~250 bytes of code.
//config:
-Index: busybox-1.17.1/e2fsprogs/Config.src
-===================================================================
---- busybox-1.17.1.orig/e2fsprogs/Config.src 2010-07-25 00:12:56.000000000 +0200
-+++ busybox-1.17.1/e2fsprogs/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/e2fsprogs/Config.src
++++ b/e2fsprogs/Config.src
@@ -33,6 +33,7 @@
config LSATTR
bool "lsattr"
@@ -209,10 +199,8 @@ Index: busybox-1.17.1/e2fsprogs/Config.src
help
lsattr lists the file attributes on a second extended file system.
-Index: busybox-1.17.1/init/Config.src
-===================================================================
---- busybox-1.17.1.orig/init/Config.src 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/init/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/init/Config.src
++++ b/init/Config.src
@@ -10,6 +10,7 @@
config INIT
bool "init"
@@ -229,10 +217,8 @@ Index: busybox-1.17.1/init/Config.src
help
Stop all processes and either halt, reboot, or power off the system.
-Index: busybox-1.17.1/init/bootchartd.c
-===================================================================
---- busybox-1.17.1.orig/init/bootchartd.c 2010-07-25 00:12:56.000000000 +0200
-+++ busybox-1.17.1/init/bootchartd.c 2010-08-01 05:32:43.000000000 +0200
+--- a/init/bootchartd.c
++++ b/init/bootchartd.c
@@ -6,6 +6,7 @@
//config:config BOOTCHARTD
//config: bool "bootchartd"
@@ -241,10 +227,8 @@ Index: busybox-1.17.1/init/bootchartd.c
//config: help
//config: bootchartd is commonly used to profile the boot process
//config: for the purpose of speeding it up. In this case, it is started
-Index: busybox-1.17.1/libbb/Config.src
-===================================================================
---- busybox-1.17.1.orig/libbb/Config.src 2010-07-25 00:12:56.000000000 +0200
-+++ busybox-1.17.1/libbb/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/libbb/Config.src
++++ b/libbb/Config.src
@@ -153,6 +153,7 @@
config MONOTONIC_SYSCALL
bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
@@ -253,10 +237,8 @@ Index: busybox-1.17.1/libbb/Config.src
help
Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
time intervals (time, ping, traceroute etc need this).
-Index: busybox-1.17.1/loginutils/Config.src
-===================================================================
---- busybox-1.17.1.orig/loginutils/Config.src 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/loginutils/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/loginutils/Config.src
++++ b/loginutils/Config.src
@@ -179,6 +179,7 @@
config GETTY
bool "getty"
@@ -281,10 +263,8 @@ Index: busybox-1.17.1/loginutils/Config.src
select FEATURE_SUID
help
Build the "vlock" applet which allows you to lock (virtual) terminals.
-Index: busybox-1.17.1/miscutils/Config.src
-===================================================================
---- busybox-1.17.1.orig/miscutils/Config.src 2010-07-25 00:12:56.000000000 +0200
-+++ busybox-1.17.1/miscutils/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/miscutils/Config.src
++++ b/miscutils/Config.src
@@ -10,6 +10,7 @@
config ADJTIMEX
bool "adjtimex"
@@ -402,10 +382,8 @@ Index: busybox-1.17.1/miscutils/Config.src
help
The watchdog utility is used with hardware or software watchdog
device drivers. It opens the specified watchdog device special file
-Index: busybox-1.17.1/miscutils/conspy.c
-===================================================================
---- busybox-1.17.1.orig/miscutils/conspy.c 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/miscutils/conspy.c 2010-08-01 05:32:43.000000000 +0200
+--- a/miscutils/conspy.c
++++ b/miscutils/conspy.c
@@ -17,6 +17,7 @@
//config:config CONSPY
//config: bool "conspy"
@@ -414,10 +392,8 @@ Index: busybox-1.17.1/miscutils/conspy.c
//config: help
//config: A text-mode VNC like program for Linux virtual terminals.
//config: example: conspy NUM shared access to console num
-Index: busybox-1.17.1/miscutils/ubi_attach_detach.c
-===================================================================
---- busybox-1.17.1.orig/miscutils/ubi_attach_detach.c 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/miscutils/ubi_attach_detach.c 2010-08-01 05:32:43.000000000 +0200
+--- a/miscutils/ubi_attach_detach.c
++++ b/miscutils/ubi_attach_detach.c
@@ -12,12 +12,14 @@
//config:config UBIATTACH
//config: bool "ubiattach"
@@ -433,10 +409,8 @@ Index: busybox-1.17.1/miscutils/ubi_attach_detach.c
//config: help
//config: Detach MTD device from an UBI device.
-Index: busybox-1.17.1/modutils/Config.src
-===================================================================
---- busybox-1.17.1.orig/modutils/Config.src 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/modutils/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/modutils/Config.src
++++ b/modutils/Config.src
@@ -4,6 +4,7 @@
#
@@ -445,10 +419,8 @@ Index: busybox-1.17.1/modutils/Config.src
INSERT
-Index: busybox-1.17.1/networking/Config.src
-===================================================================
---- busybox-1.17.1.orig/networking/Config.src 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/networking/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/networking/Config.src
++++ b/networking/Config.src
@@ -43,6 +43,7 @@
config VERBOSE_RESOLUTION_ERRORS
bool "Verbose resolution errors"
@@ -623,10 +595,8 @@ Index: busybox-1.17.1/networking/Config.src
select FEATURE_SYSLOG
help
ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
-Index: busybox-1.17.1/networking/udhcp/Config.src
-===================================================================
---- busybox-1.17.1.orig/networking/udhcp/Config.src 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/networking/udhcp/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/networking/udhcp/Config.src
++++ b/networking/udhcp/Config.src
@@ -8,6 +8,7 @@
config UDHCPD
bool "udhcp server (udhcpd)"
@@ -643,10 +613,8 @@ Index: busybox-1.17.1/networking/udhcp/Config.src
help
udhcpc is a DHCP client geared primarily toward embedded systems,
while striving to be fully functional and RFC compliant.
-Index: busybox-1.17.1/procps/Config.src
-===================================================================
---- busybox-1.17.1.orig/procps/Config.src 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/procps/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/procps/Config.src
++++ b/procps/Config.src
@@ -10,6 +10,7 @@
config FREE
bool "free"
@@ -672,10 +640,8 @@ Index: busybox-1.17.1/procps/Config.src
help
uptime gives a one line display of the current time, how long
the system has been running, how many users are currently logged
-Index: busybox-1.17.1/sysklogd/Config.src
-===================================================================
---- busybox-1.17.1.orig/sysklogd/Config.src 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/sysklogd/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/sysklogd/Config.src
++++ b/sysklogd/Config.src
@@ -109,6 +109,7 @@
config KLOGD
bool "klogd"
@@ -684,10 +650,8 @@ Index: busybox-1.17.1/sysklogd/Config.src
help
klogd is a utility which intercepts and logs all
messages from the Linux kernel and sends the messages
-Index: busybox-1.17.1/util-linux/Config.src
-===================================================================
---- busybox-1.17.1.orig/util-linux/Config.src 2010-07-25 00:12:56.000000000 +0200
-+++ busybox-1.17.1/util-linux/Config.src 2010-08-01 05:32:43.000000000 +0200
+--- a/util-linux/Config.src
++++ b/util-linux/Config.src
@@ -10,6 +10,7 @@
config ACPID
bool "acpid"
@@ -901,10 +865,8 @@ Index: busybox-1.17.1/util-linux/Config.src
help
When you want to remove a mounted filesystem from its current mount
point, for example when you are shutting down the system, the
-Index: busybox-1.17.1/shell/Config.src
-===================================================================
---- busybox-1.17.1.orig/shell/Config.src 2010-08-01 05:33:24.000000000 +0200
-+++ busybox-1.17.1/shell/Config.src 2010-08-01 05:33:34.000000000 +0200
+--- a/shell/Config.src
++++ b/shell/Config.src
@@ -370,6 +370,7 @@
config CTTYHACK
bool "cttyhack"
diff --git a/debian/patches/mkdir-fix-p-on-FreeBSD.patch b/debian/patches/mkdir-fix-p-on-FreeBSD.patch
index fc5bf7f..41e5bed 100644
--- a/debian/patches/mkdir-fix-p-on-FreeBSD.patch
+++ b/debian/patches/mkdir-fix-p-on-FreeBSD.patch
@@ -12,11 +12,9 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
libbb/make_directory.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/libbb/make_directory.c b/libbb/make_directory.c
-index 4486eb1..6dd04cf 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
-@@ -86,7 +86,7 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
+@@ -86,7 +86,7 @@
if (mkdir(path, 0777) < 0) {
/* If we failed for any other reason than the directory
* already exists, output a diagnostic and return -1 */
@@ -25,6 +23,3 @@ index 4486eb1..6dd04cf 100644
|| !(flags & FILEUTILS_RECUR)
|| ((stat(path, &st) < 0) || !S_ISDIR(st.st_mode))
) {
---
-1.7.1
-
diff --git a/debian/patches/readlink-use-xmalloc_realpath.patch b/debian/patches/readlink-use-xmalloc_realpath.patch
index e1103ec..a6abc2e 100644
--- a/debian/patches/readlink-use-xmalloc_realpath.patch
+++ b/debian/patches/readlink-use-xmalloc_realpath.patch
@@ -15,11 +15,9 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
coreutils/readlink.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
-diff --git a/coreutils/readlink.c b/coreutils/readlink.c
-index 20df38b..2ed5e2c 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
-@@ -36,7 +36,6 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
+@@ -36,7 +36,6 @@
{
char *buf;
char *fname;
@@ -27,7 +25,7 @@ index 20df38b..2ed5e2c 100644
IF_FEATURE_READLINK_FOLLOW(
unsigned opt;
-@@ -56,7 +55,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
+@@ -56,7 +55,7 @@
logmode = LOGMODE_NONE;
if (opt & 1) { /* -f */
@@ -36,7 +34,7 @@ index 20df38b..2ed5e2c 100644
} else {
buf = xmalloc_readlink_or_warn(fname);
}
-@@ -65,7 +64,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
+@@ -65,7 +64,7 @@
return EXIT_FAILURE;
printf((opt & 2) ? "%s" : "%s\n", buf);
@@ -45,6 +43,3 @@ index 20df38b..2ed5e2c 100644
free(buf);
fflush_stdout_and_exit(EXIT_SUCCESS);
---
-1.7.1
-
diff --git a/debian/patches/strip.patch b/debian/patches/strip.patch
index 1188e67..f5bc6d3 100644
--- a/debian/patches/strip.patch
+++ b/debian/patches/strip.patch
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -690,20 +690,10 @@
+@@ -706,20 +706,10 @@
endif # ifdef CONFIG_KALLSYMS
# busybox image - including updated kernel symbols
diff --git a/debian/patches/stty-sort-out-preprocessor-conditionals.patch b/debian/patches/stty-sort-out-preprocessor-conditionals.patch
index e078f3d..0055371 100644
--- a/debian/patches/stty-sort-out-preprocessor-conditionals.patch
+++ b/debian/patches/stty-sort-out-preprocessor-conditionals.patch
@@ -15,11 +15,9 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
coreutils/stty.c | 339 +++++++++++++++++++++++++++++++------------------
2 files changed, 214 insertions(+), 126 deletions(-)
-diff --git a/coreutils/Config.src b/coreutils/Config.src
-index 780b73f..0eb70af 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
-@@ -607,7 +607,6 @@ config FEATURE_STAT_FORMAT
+@@ -607,7 +607,6 @@
config STTY
bool "stty"
default y
@@ -27,8 +25,6 @@ index 780b73f..0eb70af 100644
help
stty is used to change and print terminal line settings.
-diff --git a/coreutils/stty.c b/coreutils/stty.c
-index c40d718..33f7b21 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -115,6 +115,113 @@
@@ -145,7 +141,7 @@ index c40d718..33f7b21 100644
/* Which speeds to set */
enum speed_setting {
input_speed, output_speed, both_speeds
-@@ -167,13 +274,13 @@ enum {
+@@ -167,13 +274,13 @@
IDX_cbreak,
IDX_crt,
IDX_dec,
@@ -162,7 +158,7 @@ index c40d718..33f7b21 100644
IDX_lcase,
IDX_LCASE,
#endif
-@@ -196,13 +303,13 @@ static const char mode_name[] =
+@@ -196,13 +303,13 @@
MI_ENTRY("cbreak", combination, REV | OMIT, 0, 0 )
MI_ENTRY("crt", combination, OMIT, 0, 0 )
MI_ENTRY("dec", combination, OMIT, 0, 0 )
@@ -179,7 +175,7 @@ index c40d718..33f7b21 100644
MI_ENTRY("lcase", combination, REV | OMIT, 0, 0 )
MI_ENTRY("LCASE", combination, REV | OMIT, 0, 0 )
#endif
-@@ -217,7 +324,7 @@ static const char mode_name[] =
+@@ -217,7 +324,7 @@
MI_ENTRY("cstopb", control, REV, CSTOPB, 0 )
MI_ENTRY("cread", control, SANE_SET | REV, CREAD, 0 )
MI_ENTRY("clocal", control, REV, CLOCAL, 0 )
@@ -188,7 +184,7 @@ index c40d718..33f7b21 100644
MI_ENTRY("crtscts", control, REV, CRTSCTS, 0 )
#endif
MI_ENTRY("ignbrk", input, SANE_UNSET | REV, IGNBRK, 0 )
-@@ -232,74 +339,78 @@ static const char mode_name[] =
+@@ -232,74 +339,78 @@
MI_ENTRY("ixon", input, REV, IXON, 0 )
MI_ENTRY("ixoff", input, SANE_UNSET | REV, IXOFF, 0 )
MI_ENTRY("tandem", input, REV | OMIT, IXOFF, 0 )
@@ -285,7 +281,7 @@ index c40d718..33f7b21 100644
MI_ENTRY("iexten", local, SANE_SET | REV, IEXTEN, 0 )
#endif
MI_ENTRY("echo", local, SANE_SET | REV, ECHO, 0 )
-@@ -308,21 +419,21 @@ static const char mode_name[] =
+@@ -308,21 +419,21 @@
MI_ENTRY("echok", local, SANE_SET | REV, ECHOK, 0 )
MI_ENTRY("echonl", local, SANE_UNSET | REV, ECHONL, 0 )
MI_ENTRY("noflsh", local, SANE_UNSET | REV, NOFLSH, 0 )
@@ -312,7 +308,7 @@ index c40d718..33f7b21 100644
MI_ENTRY("echoke", local, SANE_SET | REV, ECHOKE, 0 )
MI_ENTRY("crtkill", local, REV | OMIT, ECHOKE, 0 )
#endif
-@@ -346,13 +457,13 @@ static const struct mode_info mode_info[] = {
+@@ -346,13 +457,13 @@
MI_ENTRY("cbreak", combination, REV | OMIT, 0, 0 )
MI_ENTRY("crt", combination, OMIT, 0, 0 )
MI_ENTRY("dec", combination, OMIT, 0, 0 )
@@ -329,7 +325,7 @@ index c40d718..33f7b21 100644
MI_ENTRY("lcase", combination, REV | OMIT, 0, 0 )
MI_ENTRY("LCASE", combination, REV | OMIT, 0, 0 )
#endif
-@@ -367,7 +478,7 @@ static const struct mode_info mode_info[] = {
+@@ -367,7 +478,7 @@
MI_ENTRY("cstopb", control, REV, CSTOPB, 0 )
MI_ENTRY("cread", control, SANE_SET | REV, CREAD, 0 )
MI_ENTRY("clocal", control, REV, CLOCAL, 0 )
@@ -338,7 +334,7 @@ index c40d718..33f7b21 100644
MI_ENTRY("crtscts", control, REV, CRTSCTS, 0 )
#endif
MI_ENTRY("ignbrk", input, SANE_UNSET | REV, IGNBRK, 0 )
-@@ -382,74 +493,78 @@ static const struct mode_info mode_info[] = {
+@@ -382,74 +493,78 @@
MI_ENTRY("ixon", input, REV, IXON, 0 )
MI_ENTRY("ixoff", input, SANE_UNSET | REV, IXOFF, 0 )
MI_ENTRY("tandem", input, REV | OMIT, IXOFF, 0 )
@@ -435,7 +431,7 @@ index c40d718..33f7b21 100644
MI_ENTRY("iexten", local, SANE_SET | REV, IEXTEN, 0 )
#endif
MI_ENTRY("echo", local, SANE_SET | REV, ECHO, 0 )
-@@ -458,21 +573,21 @@ static const struct mode_info mode_info[] = {
+@@ -458,21 +573,21 @@
MI_ENTRY("echok", local, SANE_SET | REV, ECHOK, 0 )
MI_ENTRY("echonl", local, SANE_UNSET | REV, ECHONL, 0 )
MI_ENTRY("noflsh", local, SANE_UNSET | REV, NOFLSH, 0 )
@@ -462,7 +458,7 @@ index c40d718..33f7b21 100644
MI_ENTRY("echoke", local, SANE_SET | REV, ECHOKE, 0 )
MI_ENTRY("crtkill", local, REV | OMIT, ECHOKE, 0 )
#endif
-@@ -497,31 +612,31 @@ enum {
+@@ -497,31 +612,31 @@
CIDX_kill,
CIDX_eof,
CIDX_eol,
@@ -502,7 +498,7 @@ index c40d718..33f7b21 100644
CIDX_status,
#endif
CIDX_min,
-@@ -538,31 +653,31 @@ static const char control_name[] =
+@@ -538,31 +653,31 @@
CI_ENTRY("kill", CKILL, VKILL )
CI_ENTRY("eof", CEOF, VEOF )
CI_ENTRY("eol", CEOL, VEOL )
@@ -542,7 +538,7 @@ index c40d718..33f7b21 100644
CI_ENTRY("status", CSTATUS, VSTATUS )
#endif
/* These must be last because of the display routines */
-@@ -581,31 +696,31 @@ static const struct control_info control_info[] = {
+@@ -581,31 +696,31 @@
CI_ENTRY("kill", CKILL, VKILL )
CI_ENTRY("eof", CEOF, VEOF )
CI_ENTRY("eol", CEOL, VEOL )
@@ -582,7 +578,7 @@ index c40d718..33f7b21 100644
CI_ENTRY("status", CSTATUS, VSTATUS )
#endif
/* These must be last because of the display routines */
-@@ -740,6 +855,7 @@ static void newline(void)
+@@ -740,6 +855,7 @@
wrapf("\n");
}
@@ -590,7 +586,7 @@ index c40d718..33f7b21 100644
static void set_window_size(int rows, int cols)
{
struct winsize win = { 0, 0, 0, 0 };
-@@ -760,6 +876,7 @@ static void set_window_size(int rows, int cols)
+@@ -760,6 +876,7 @@
bail:
perror_on_device("%s");
}
@@ -598,7 +594,7 @@ index c40d718..33f7b21 100644
static void display_window_size(int fancy)
{
-@@ -973,41 +1090,6 @@ static void sane_mode(struct termios *mode)
+@@ -973,41 +1090,6 @@
}
}
@@ -640,7 +636,7 @@ index c40d718..33f7b21 100644
static void set_mode(const struct mode_info *info, int reversed,
struct termios *mode)
{
-@@ -1093,27 +1175,32 @@ static void set_mode(const struct mode_info *info, int reversed,
+@@ -1093,27 +1175,32 @@
mode->c_cc[VTIME] = 0;
}
}
@@ -680,7 +676,7 @@ index c40d718..33f7b21 100644
if (reversed) {
mode->c_lflag &= ~XCASE;
mode->c_iflag &= ~IUCLC;
-@@ -1123,7 +1210,9 @@ static void set_mode(const struct mode_info *info, int reversed,
+@@ -1123,7 +1210,9 @@
mode->c_iflag |= IUCLC;
mode->c_oflag |= OLCUC;
}
@@ -691,7 +687,7 @@ index c40d718..33f7b21 100644
mode->c_lflag |= ECHOE | ECHOCTL | ECHOKE;
} else if (info == &mode_info[IDX_dec]) {
mode->c_cc[VINTR] = 3; /* ^C */
-@@ -1419,7 +1508,7 @@ int stty_main(int argc UNUSED_PARAM, char **argv)
+@@ -1419,7 +1508,7 @@
perror_on_device_and_die("%s");
if (memcmp(&mode, &new_mode, sizeof(mode)) != 0) {
@@ -700,6 +696,3 @@ index c40d718..33f7b21 100644
/* SunOS 4.1.3 (at least) has the problem that after this sequence,
tcgetattr (&m1); tcsetattr (&m1); tcgetattr (&m2);
sometimes (m1 != m2). The only difference is in the four bits
---
-1.7.1
-
diff --git a/debian/patches/swaponoff-FreeBSD-support.patch b/debian/patches/swaponoff-FreeBSD-support.patch
index da273f5..0cb1db3 100644
--- a/debian/patches/swaponoff-FreeBSD-support.patch
+++ b/debian/patches/swaponoff-FreeBSD-support.patch
@@ -12,11 +12,9 @@ Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org>
util-linux/xmount.h | 16 ++++++++++------
4 files changed, 24 insertions(+), 11 deletions(-)
-diff --git a/util-linux/Config.src b/util-linux/Config.src
-index 99a6fbe..cb4de95 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
-@@ -639,7 +639,6 @@ config SETARCH
+@@ -639,7 +639,6 @@
config SWAPONOFF
bool "swaponoff"
default y
@@ -24,7 +22,7 @@ index 99a6fbe..cb4de95 100644
help
This option enables both the 'swapon' and the 'swapoff' utilities.
Once you have created some swap space using 'mkswap', you also need
-@@ -651,7 +650,7 @@ config SWAPONOFF
+@@ -651,7 +650,7 @@
config FEATURE_SWAPON_PRI
bool "Support priority option -p"
default y
@@ -33,8 +31,6 @@ index 99a6fbe..cb4de95 100644
help
Enable support for setting swap device priority in swapon.
-diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
-index f2f52fb..d13c37e 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -8,8 +8,8 @@
@@ -47,7 +43,7 @@ index f2f52fb..d13c37e 100644
#if ENABLE_FEATURE_MOUNT_LABEL
# include "volume_id.h"
-@@ -43,9 +43,9 @@ static int swap_enable_disable(char *device)
+@@ -43,9 +43,9 @@
#endif
if (applet_name[5] == 'n')
@@ -59,11 +55,9 @@ index f2f52fb..d13c37e 100644
if (status != 0) {
bb_simple_perror_msg(device);
-diff --git a/util-linux/xmount.c b/util-linux/xmount.c
-index 3f322b8..16543f1 100644
--- a/util-linux/xmount.c
+++ b/util-linux/xmount.c
-@@ -63,4 +63,14 @@ int FAST_FUNC xumount(const char *target, int flags)
+@@ -67,4 +67,14 @@
return unmount(target, flags);
}
@@ -78,8 +72,6 @@ index 3f322b8..16543f1 100644
+}
+
#endif
-diff --git a/util-linux/xmount.h b/util-linux/xmount.h
-index caef564..bcd6d18 100644
--- a/util-linux/xmount.h
+++ b/util-linux/xmount.h
@@ -5,9 +5,9 @@
@@ -133,6 +125,3 @@ index caef564..bcd6d18 100644
+int xswapon(const char *path, int swapflags) FAST_FUNC;
+int xswapoff(const char *path) FAST_FUNC;
#endif
---
-1.7.1
-
diff --git a/debian/patches/tcpsvd-udpsvd-conditionalize-usage-of-SO_ORIGINAL_DS.patch b/debian/patches/tcpsvd-udpsvd-conditionalize-usage-of-SO_ORIGINAL_DS.patch
index eb797bc..4470be1 100644
--- a/debian/patches/tcpsvd-udpsvd-conditionalize-usage-of-SO_ORIGINAL_DS.patch
+++ b/debian/patches/tcpsvd-udpsvd-conditionalize-usage-of-SO_ORIGINAL_DS.patch
@@ -12,11 +12,9 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
networking/tcpudp.c | 5 +++++
2 files changed, 5 insertions(+), 2 deletions(-)
-diff --git a/networking/Config.src b/networking/Config.src
-index fc613e8..2d29c42 100644
--- a/networking/Config.src
+++ b/networking/Config.src
-@@ -733,7 +733,6 @@ config SLATTACH
+@@ -733,7 +733,6 @@
config TCPSVD
bool "tcpsvd"
default y
@@ -24,7 +22,7 @@ index fc613e8..2d29c42 100644
help
tcpsvd listens on a TCP port and runs a program for each new
connection.
-@@ -966,7 +965,6 @@ config IFUPDOWN_UDHCPC_CMD_OPTIONS
+@@ -966,7 +965,6 @@
config UDPSVD
bool "udpsvd"
default y
@@ -32,8 +30,6 @@ index fc613e8..2d29c42 100644
help
udpsvd listens on an UDP port and runs a program for each new
connection.
-diff --git a/networking/tcpudp.c b/networking/tcpudp.c
-index 53e622b..40f6825 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -30,9 +30,12 @@
@@ -49,7 +45,7 @@ index 53e622b..40f6825 100644
// TODO: move into this file:
#include "tcpudp_perhost.h"
-@@ -464,6 +467,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
+@@ -464,6 +467,7 @@
/* setup ucspi env */
const char *proto = tcp ? "TCP" : "UDP";
@@ -57,7 +53,7 @@ index 53e622b..40f6825 100644
/* Extract "original" destination addr:port
* from Linux firewall. Useful when you redirect
* an outbond connection to local handler, and it needs
-@@ -473,6 +477,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
+@@ -473,6 +477,7 @@
xsetenv_plain("TCPORIGDSTADDR", addr);
free(addr);
}
@@ -65,6 +61,3 @@ index 53e622b..40f6825 100644
xsetenv_plain("PROTO", proto);
xsetenv_proto(proto, "LOCALADDR", local_addr);
xsetenv_proto(proto, "REMOTEADDR", remote_addr);
---
-1.7.1
-
diff --git a/debian/patches/u-mount-FreeBSD-support.patch b/debian/patches/u-mount-FreeBSD-support.patch
index 702c051..df67af8 100644
--- a/debian/patches/u-mount-FreeBSD-support.patch
+++ b/debian/patches/u-mount-FreeBSD-support.patch
@@ -16,11 +16,9 @@ Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org>
create mode 100644 util-linux/xmount.c
create mode 100644 util-linux/xmount.h
-diff --git a/util-linux/Config.src b/util-linux/Config.src
-index 98953c1..99a6fbe 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
-@@ -492,7 +492,6 @@ config FEATURE_USE_TERMIOS
+@@ -492,7 +492,6 @@
config MOUNT
bool "mount"
default y
@@ -28,7 +26,7 @@ index 98953c1..99a6fbe 100644
help
All files and filesystems in Unix are arranged into one big directory
tree. The 'mount' utility is used to graft a filesystem onto a
-@@ -679,7 +678,6 @@ config SWITCH_ROOT
+@@ -679,7 +678,6 @@
config UMOUNT
bool "umount"
default y
@@ -36,7 +34,7 @@ index 98953c1..99a6fbe 100644
help
When you want to remove a mounted filesystem from its current mount
point, for example when you are shutting down the system, the
-@@ -699,7 +697,7 @@ comment "Common options for mount/umount"
+@@ -699,7 +697,7 @@
config FEATURE_MOUNT_LOOP
bool "Support loopback mounts"
default y
@@ -45,11 +43,9 @@ index 98953c1..99a6fbe 100644
help
Enabling this feature allows automatic mounting of files (containing
filesystem images) via the linux kernel's loopback devices.
-diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src
-index afc0db5..312fc9e 100644
--- a/util-linux/Kbuild.src
+++ b/util-linux/Kbuild.src
-@@ -33,7 +33,7 @@ lib-$(CONFIG_MKFS_REISER) += mkfs_reiser.o
+@@ -33,7 +33,7 @@
lib-$(CONFIG_MKFS_VFAT) += mkfs_vfat.o
lib-$(CONFIG_MKSWAP) += mkswap.o
lib-$(CONFIG_MORE) += more.o
@@ -58,14 +54,12 @@ index afc0db5..312fc9e 100644
lib-$(CONFIG_PIVOT_ROOT) += pivot_root.o
lib-$(CONFIG_RDATE) += rdate.o
lib-$(CONFIG_RDEV) += rdev.o
-@@ -44,4 +44,4 @@ lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o
+@@ -44,4 +44,4 @@
lib-$(CONFIG_SETARCH) += setarch.o
lib-$(CONFIG_SWAPONOFF) += swaponoff.o
lib-$(CONFIG_SWITCH_ROOT) += switch_root.o
-lib-$(CONFIG_UMOUNT) += umount.o
+lib-$(CONFIG_UMOUNT) += umount.o xmount.o
-diff --git a/util-linux/mount.c b/util-linux/mount.c
-index 9107e43..a62c4e8 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -18,44 +18,9 @@
@@ -114,7 +108,7 @@ index 9107e43..a62c4e8 100644
#if ENABLE_FEATURE_MOUNT_LABEL
# include "volume_id.h"
#else
-@@ -288,7 +253,7 @@ static int verbose_mount(const char *source, const char *target,
+@@ -288,7 +253,7 @@
int rc;
errno = 0;
@@ -123,7 +117,7 @@ index 9107e43..a62c4e8 100644
if (verbose >= 2)
bb_perror_msg("mount('%s','%s','%s',0x%08lx,'%s'):%d",
source, target, filesystemtype,
-@@ -296,7 +261,7 @@ static int verbose_mount(const char *source, const char *target,
+@@ -296,7 +261,7 @@
return rc;
}
#else
@@ -132,8 +126,6 @@ index 9107e43..a62c4e8 100644
#endif
// Append mount options to string
-diff --git a/util-linux/umount.c b/util-linux/umount.c
-index a19f86c..781e019 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -8,40 +8,9 @@
@@ -179,7 +171,7 @@ index a19f86c..781e019 100644
#if defined(__dietlibc__)
-@@ -154,11 +123,11 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
+@@ -154,11 +123,11 @@
if (m) zapit = m->dir;
// Let's ask the thing nicely to unmount.
@@ -193,7 +185,7 @@ index a19f86c..781e019 100644
// If still can't umount, maybe remount read-only?
if (curstat) {
-@@ -166,7 +135,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
+@@ -166,7 +135,7 @@
// Note! Even if we succeed here, later we should not
// free loop device or erase mtab entry!
const char *msg = "%s busy - remounted read-only";
@@ -202,9 +194,6 @@ index a19f86c..781e019 100644
if (curstat) {
msg = "can't remount %s read-only";
status = EXIT_FAILURE;
-diff --git a/util-linux/xmount.c b/util-linux/xmount.c
-new file mode 100644
-index 0000000..3f322b8
--- /dev/null
+++ b/util-linux/xmount.c
@@ -0,0 +1,70 @@
@@ -278,9 +267,6 @@ index 0000000..3f322b8
+}
+
+#endif
-diff --git a/util-linux/xmount.h b/util-linux/xmount.h
-new file mode 100644
-index 0000000..caef564
--- /dev/null
+++ b/util-linux/xmount.h
@@ -0,0 +1,97 @@
@@ -381,6 +367,3 @@ index 0000000..caef564
+ unsigned long mountflags, const void *data) FAST_FUNC;
+int xumount(const char *target, int flags) FAST_FUNC;
+#endif
---
-1.7.1
-
diff --git a/debian/patches/update-scripts-kconfig-_shipped.patch b/debian/patches/update-scripts-kconfig-_shipped.patch
index 52cc64e..3ad6f36 100644
--- a/debian/patches/update-scripts-kconfig-_shipped.patch
+++ b/debian/patches/update-scripts-kconfig-_shipped.patch
@@ -6,11 +6,9 @@ Date: Mon Aug 2 02:17:25 2010 +0200
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
-index 4837bbf..51f15e1 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
-@@ -2235,13 +2235,14 @@ static void zconf_endhelp(void)
+@@ -2235,13 +2235,14 @@
*/
FILE *zconf_fopen(const char *name)
{
diff --git a/debian/patches/vlock-disable-linux-console-calls-on-other-systems.patch b/debian/patches/vlock-disable-linux-console-calls-on-other-systems.patch
index f717473..033899a 100644
--- a/debian/patches/vlock-disable-linux-console-calls-on-other-systems.patch
+++ b/debian/patches/vlock-disable-linux-console-calls-on-other-systems.patch
@@ -10,11 +10,9 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
loginutils/vlock.c | 15 +++++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
-diff --git a/loginutils/Config.src b/loginutils/Config.src
-index 6ec2893..5d497c4 100644
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
-@@ -295,7 +295,6 @@ config SULOGIN
+@@ -295,7 +295,6 @@
config VLOCK
bool "vlock"
default y
@@ -22,8 +20,6 @@ index 6ec2893..5d497c4 100644
select FEATURE_SUID
help
Build the "vlock" applet which allows you to lock (virtual) terminals.
-diff --git a/loginutils/vlock.c b/loginutils/vlock.c
-index 85f489c..59aeb54 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -15,9 +15,11 @@
@@ -39,7 +35,7 @@ index 85f489c..59aeb54 100644
static void release_vt(int signo UNUSED_PARAM)
{
/* If -a, param is 0, which means:
-@@ -30,14 +32,17 @@ static void acquire_vt(int signo UNUSED_PARAM)
+@@ -30,14 +32,17 @@
/* ACK to kernel that switch to console is successful */
ioctl(STDIN_FILENO, VT_RELDISP, VT_ACKACQ);
}
@@ -58,7 +54,7 @@ index 85f489c..59aeb54 100644
struct passwd *pw;
pw = xgetpwuid(getuid());
-@@ -55,6 +60,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
+@@ -55,6 +60,7 @@
+ (1 << SIGINT )
, SIG_IGN);
@@ -66,7 +62,7 @@ index 85f489c..59aeb54 100644
/* We will use SIGUSRx for console switch control: */
/* 1: set handlers */
signal_SA_RESTART_empty_mask(SIGUSR1, release_vt);
-@@ -62,12 +68,14 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
+@@ -62,12 +68,14 @@
/* 2: unmask them */
sig_unblock(SIGUSR1);
sig_unblock(SIGUSR2);
@@ -81,7 +77,7 @@ index 85f489c..59aeb54 100644
xioctl(STDIN_FILENO, VT_GETMODE, &vtm);
ovtm = vtm;
/* "console switches are controlled by us, not kernel!" */
-@@ -75,6 +83,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
+@@ -75,6 +83,7 @@
vtm.relsig = SIGUSR1;
vtm.acqsig = SIGUSR2;
ioctl(STDIN_FILENO, VT_SETMODE, &vtm);
@@ -89,7 +85,7 @@ index 85f489c..59aeb54 100644
tcgetattr(STDIN_FILENO, &oterm);
term = oterm;
-@@ -95,7 +104,9 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
+@@ -95,7 +104,9 @@
puts("Password incorrect");
} while (1);
@@ -99,6 +95,3 @@ index 85f489c..59aeb54 100644
tcsetattr_stdin_TCSANOW(&oterm);
fflush_stdout_and_exit(EXIT_SUCCESS);
}
---
-1.7.1
-
Thanks,
--
Cristian Greco
GPG key ID: 0xCF4D32E4
Attachment:
signature.asc
Description: PGP signature