From 409b7f50fa2b8974db95851d11495fa7703ad78f Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Sun, 23 Sep 2007 17:44:36 +0000 Subject: Updating busybox to version 1.7.1 which simplifies the patching (only the SLX specific switch root patch has to be applied) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1345 95ad53e4-c205-0410-b2fa-d234c58c8868 --- tools/README.busybox | 2 +- tools/busybox-patches/bzip2-payload-1.6.0.diff | 63 ---------------------- tools/busybox-patches/bzip2-payload.diff | 72 ------------------------- tools/busybox-patches/series | 1 - tools/busybox.config | 21 ++++++-- tools/busybox.i586 | Bin 311380 -> 319704 bytes 6 files changed, 18 insertions(+), 141 deletions(-) delete mode 100644 tools/busybox-patches/bzip2-payload-1.6.0.diff delete mode 100644 tools/busybox-patches/bzip2-payload.diff (limited to 'tools') diff --git a/tools/README.busybox b/tools/README.busybox index 55cf25f6..5d6d8d74 100644 --- a/tools/README.busybox +++ b/tools/README.busybox @@ -1,4 +1,4 @@ -How busybox is created +How busybox (version 1.7.1) is created: 1. Get the current sources from busybox.net and untar them. 2. Change to the busybox- dir and create a sym link named patches diff --git a/tools/busybox-patches/bzip2-payload-1.6.0.diff b/tools/busybox-patches/bzip2-payload-1.6.0.diff deleted file mode 100644 index 1815b285..00000000 --- a/tools/busybox-patches/bzip2-payload-1.6.0.diff +++ /dev/null @@ -1,63 +0,0 @@ -diff -ru ./archival/Config.in ../busybox-1.6.0/archival/Config.in ---- ./archival/Config.in 2007-06-01 13:48:31.000000000 +0200 -+++ ../busybox-1.6.0/archival/Config.in 2007-06-15 12:22:16.000000000 +0200 -@@ -127,6 +127,14 @@ - help - Converts an RPM file into a CPIO archive. - -+config FEATURE_RPM2CPIO_BZIP2 -+ bool " Support bzip2 decompression" -+ default n -+ depends on RPM2CPIO -+ help -+ If you enable this option you'll be able to extract -+ rpms compressed with bzip2. -+ - config RPM - bool "rpm" - default n -diff -ru ./archival/libunarchive/Kbuild ../busybox-1.6.0/archival/libunarchive/Kbuild ---- ./archival/libunarchive/Kbuild 2007-06-01 13:48:31.000000000 +0200 -+++ ../busybox-1.6.0/archival/libunarchive/Kbuild 2007-06-15 12:22:46.000000000 +0200 -@@ -57,6 +57,7 @@ - lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) - lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o - lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o -+lib-$(CONFIG_FEATURE_RPM2CPIO_BZIP2) += $(GUNZIP_FILES) decompress_bunzip2.o - lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o - lib-$(CONFIG_TAR) += get_header_tar.o - lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o -diff -ru ./archival/rpm2cpio.c ../busybox-1.6.0/archival/rpm2cpio.c ---- ./archival/rpm2cpio.c 2007-06-01 13:48:31.000000000 +0200 -+++ ../busybox-1.6.0/archival/rpm2cpio.c 2007-06-15 12:22:24.000000000 +0200 -@@ -75,14 +75,24 @@ - skip_header(rpm_fd); - - xread(rpm_fd, &magic, 2); -- if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { -- bb_error_msg_and_die("invalid gzip magic"); -+ if ((magic[0] == 0x1f) && (magic[1] == 0x8b)) { -+ check_header_gzip_or_die(rpm_fd); -+ if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) { -+ bb_error_msg("error inflating (gzip)"); -+ } - } -- -- check_header_gzip_or_die(rpm_fd); -- if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) { -- bb_error_msg("error inflating"); -+ else if ((magic[0] == 'B') && (magic[1] == 'Z')) { -+#ifdef CONFIG_FEATURE_RPM2CPIO_BZIP2 -+ /* return to position before magic (eek..!) */ -+ lseek(rpm_fd, -2, SEEK_CUR); -+ if (unpack_bz2_stream(rpm_fd, fileno(stdout)) != 0) -+ bb_error_msg("error inflating (bzip2)"); -+#else -+ bb_error_msg_and_die("bzip2 not supported"); -+#endif - } -+ else -+ bb_error_msg_and_die("not gzip or bzip2 compressed"); - - close(rpm_fd); - diff --git a/tools/busybox-patches/bzip2-payload.diff b/tools/busybox-patches/bzip2-payload.diff deleted file mode 100644 index 3f0aebc5..00000000 --- a/tools/busybox-patches/bzip2-payload.diff +++ /dev/null @@ -1,72 +0,0 @@ -Author: Adam Slattery slattery at students.missouri.edu -Subject: [BusyBox] rpm2cpio bzip2 decompression (patch included) -URL: http://www.busybox.net/lists/busybox/2004-May/011669.html -CVS: http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/patches/rpm2cpio_bzip2.patch?rev=9001 -BugID: 1141 - -Index: busybox-1.4.2/archival/Config.in -=================================================================== ---- busybox-1.4.2.orig/archival/Config.in -+++ busybox-1.4.2/archival/Config.in -@@ -127,6 +127,14 @@ config RPM2CPIO - help - Converts an RPM file into a CPIO archive. - -+config FEATURE_RPM2CPIO_BZIP2 -+ bool " Support bzip2 decompression" -+ default n -+ depends on RPM2CPIO -+ help -+ If you enable this option you'll be able to extract -+ rpms compressed with bzip2. -+ - config RPM - bool "rpm" - default n -Index: busybox-1.4.2/archival/libunarchive/Kbuild -=================================================================== ---- busybox-1.4.2.orig/archival/libunarchive/Kbuild -+++ busybox-1.4.2/archival/libunarchive/Kbuild -@@ -48,6 +48,7 @@ lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += de - lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) - lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o - lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o -+lib-$(CONFIG_FEATURE_RPM2CPIO_BZIP2) += $(GUNZIP_FILES) decompress_bunzip2.o - lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o - lib-$(CONFIG_TAR) += get_header_tar.o - lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o -Index: busybox-1.4.2/archival/rpm2cpio.c -=================================================================== ---- busybox-1.4.2.orig/archival/rpm2cpio.c -+++ busybox-1.4.2/archival/rpm2cpio.c -@@ -74,14 +74,24 @@ int rpm2cpio_main(int argc, char **argv) - skip_header(rpm_fd); - - xread(rpm_fd, &magic, 2); -- if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { -- bb_error_msg_and_die("invalid gzip magic"); -+ if ((magic[0] == 0x1f) && (magic[1] == 0x8b)) { -+ check_header_gzip(rpm_fd); -+ if (inflate_gunzip(rpm_fd, STDOUT_FILENO) < 0) { -+ bb_error_msg("error inflating (gzip)"); -+ } - } -- -- check_header_gzip(rpm_fd); -- if (inflate_gunzip(rpm_fd, STDOUT_FILENO) < 0) { -- bb_error_msg("error inflating"); -+ else if ((magic[0] == 'B') && (magic[1] == 'Z')) { -+#ifdef CONFIG_FEATURE_RPM2CPIO_BZIP2 -+ /* return to position before magic (eek..!) */ -+ lseek(rpm_fd, -2, SEEK_CUR); -+ if (uncompressStream(rpm_fd, fileno(stdout)) != 0) -+ bb_error_msg("error inflating (bzip2)"); -+#else -+ bb_error_msg_and_die("bzip2 not supported"); -+#endif - } -+ else -+ bb_error_msg_and_die("not gzip or bzip2 compressed"); - - close(rpm_fd); - diff --git a/tools/busybox-patches/series b/tools/busybox-patches/series index 87dc1896..cefbae71 100644 --- a/tools/busybox-patches/series +++ b/tools/busybox-patches/series @@ -1,3 +1,2 @@ # series file useable by quilt -bzip2-payload.diff unionfs-run-init.diff diff --git a/tools/busybox.config b/tools/busybox.config index 2d68c8da..7944c61f 100644 --- a/tools/busybox.config +++ b/tools/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.7.0.svn -# Fri Jun 22 18:00:22 2007 +# Busybox version: 1.7.1 +# Thu Sep 20 22:46:06 2007 # CONFIG_HAVE_DOT_CONFIG=y @@ -81,6 +81,7 @@ CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y # # Applets @@ -100,7 +101,6 @@ CONFIG_GUNZIP=y CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y CONFIG_GZIP=y CONFIG_RPM2CPIO=y -CONFIG_FEATURE_RPM2CPIO_BZIP2=y # CONFIG_RPM is not set # CONFIG_FEATURE_RPM_BZ2 is not set CONFIG_TAR=y @@ -157,6 +157,8 @@ CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y # CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set CONFIG_EXPR=y # CONFIG_EXPR_MATH_SUPPORT_64 is not set CONFIG_FALSE=y @@ -223,6 +225,8 @@ CONFIG_TR=y CONFIG_TRUE=y # CONFIG_TTY is not set CONFIG_UNAME=y +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set CONFIG_UNIQ=y CONFIG_USLEEP=y # CONFIG_UUDECODE is not set @@ -376,12 +380,14 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set # CONFIG_LOGIN is not set +# CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set # CONFIG_PASSWD is not set # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set CONFIG_CRYPTPW=y +# CONFIG_CHPASSWD is not set # CONFIG_SU is not set # CONFIG_FEATURE_SU_SYSLOG is not set # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set @@ -523,6 +529,7 @@ CONFIG_STRINGS=y # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_TIME=y +# CONFIG_TTYSIZE is not set # CONFIG_WATCHDOG is not set # @@ -540,6 +547,7 @@ CONFIG_ARPING=y # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set # CONFIG_HOSTNAME is not set CONFIG_HTTPD=y +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set # CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set @@ -549,6 +557,7 @@ CONFIG_HTTPD=y # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set # CONFIG_IFCONFIG is not set # CONFIG_FEATURE_IFCONFIG_STATUS is not set # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -556,6 +565,7 @@ CONFIG_HTTPD=y # CONFIG_FEATURE_IFCONFIG_HW is not set # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set # CONFIG_IFUPDOWN is not set +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" # CONFIG_FEATURE_IFUPDOWN_IP is not set # CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set @@ -615,8 +625,8 @@ CONFIG_FEATURE_TFTP_GET=y # CONFIG_APP_UDHCPD is not set # CONFIG_APP_DHCPRELAY is not set # CONFIG_APP_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set CONFIG_APP_UDHCPC=y -# CONFIG_FEATURE_UDHCP_SYSLOG is not set # CONFIG_FEATURE_UDHCP_DEBUG is not set CONFIG_FEATURE_RFC3397=y CONFIG_VCONFIG=y @@ -724,10 +734,13 @@ CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE= # CONFIG_GETSEBOOL is not set # CONFIG_LOAD_POLICY is not set # CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set # CONFIG_RUNCON is not set # CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set # CONFIG_SELINUXENABLED is not set # CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set # # ipsvd utilities diff --git a/tools/busybox.i586 b/tools/busybox.i586 index 5cefcff9..2a9f2b73 100755 Binary files a/tools/busybox.i586 and b/tools/busybox.i586 differ -- cgit v1.2.3-55-g7522