[oe-commits] org.oe.dev busybox 1.00: Incorporate fixes from familiar 0.8.4 release
erik commit
openembedded-commits at lists.openembedded.org
Fri Sep 1 18:32:18 UTC 2006
busybox 1.00: Incorporate fixes from familiar 0.8.4 release
* Add --oknodo argument to start-stop-daemon
* df fixes
* unzip and libuncompress fixes backported from 1.1.0
* bump rev to r37 since familiar 0.8.4 shipped with r36
Author: erik at openembedded.org
Branch: org.openembedded.dev
Revision: 50e56b8c22addca1df22de0bb241b0f2d413e14e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=50e56b8c22addca1df22de0bb241b0f2d413e14e
Files:
1
packages/busybox/busybox-1.00/df.patch
packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch
packages/busybox/busybox-1.00/unzip-endian-fixes.patch
packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch
packages/busybox/busybox_1.00.bb
Diffs:
#
# mt diff -r73327fd806ebb8c58bdd3330eab4685bd0435869 -r50e56b8c22addca1df22de0bb241b0f2d413e14e
#
#
#
# add_file "packages/busybox/busybox-1.00/df.patch"
# content [f5e5d3293ab647ec67e5e1d2d95e8e27a5a7f0d9]
#
# add_file "packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch"
# content [89af6f7404e05bf8181de503fb4f21633b0ace2c]
#
# add_file "packages/busybox/busybox-1.00/unzip-endian-fixes.patch"
# content [08715e545813e4e5d2dc8ebec819b3acc565c723]
#
# add_file "packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch"
# content [29540f29f7a83e47e7c48f6d88508dd682bc805a]
#
# patch "packages/busybox/busybox_1.00.bb"
# from [6b20de6e920a3e3a8c9d5db2d83ab1f58dbf5777]
# to [0f912abc773757534529a9341f8fc0c26ec77115]
#
============================================================
--- packages/busybox/busybox-1.00/df.patch f5e5d3293ab647ec67e5e1d2d95e8e27a5a7f0d9
+++ packages/busybox/busybox-1.00/df.patch f5e5d3293ab647ec67e5e1d2d95e8e27a5a7f0d9
@@ -0,0 +1,28 @@
+--- busybox-1.00/coreutils/df.c.orig 2006-07-14 09:50:47.914912750 -0400
++++ busybox-1.00/coreutils/df.c 2006-07-14 09:52:32.613456000 -0400
+@@ -60,6 +60,7 @@
+ struct statfs s;
+ static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */
+ const char *disp_units_hdr = hdr_1k;
++ int root_done = 0;
+
+ #ifdef CONFIG_FEATURE_HUMAN_READABLE
+ bb_opt_complementaly = "h-km:k-hm:m-hk";
+@@ -125,14 +126,14 @@
+ ) / (blocks_used + s.f_bavail);
+ }
+
+- if (strcmp(device, "rootfs") == 0) {
+- continue;
+- } else if (strcmp(device, "/dev/root") == 0) {
++ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) {
++ if (root_done) continue;
+ /* Adjusts device to be the real root device,
+ * or leaves device alone if it can't find it */
+ if ((device = find_real_root_device_name()) == NULL) {
+ goto SET_ERROR;
+ }
++ root_done = 1;
+ }
+
+ #ifdef CONFIG_FEATURE_HUMAN_READABLE
============================================================
--- packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch 89af6f7404e05bf8181de503fb4f21633b0ace2c
+++ packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch 89af6f7404e05bf8181de503fb4f21633b0ace2c
@@ -0,0 +1,73 @@
+--- busybox-1.00/debianutils/start_stop_daemon.c.orig 2006-07-23 00:06:14.000000000 +0200
++++ busybox-1.00/debianutils/start_stop_daemon.c 2006-07-23 00:21:39.000000000 +0200
+@@ -160,7 +160,7 @@
+ }
+
+
+-static void
++static int
+ do_stop(void)
+ {
+ char what[1024];
+@@ -183,7 +183,7 @@
+ if (!found) {
+ if (!quiet)
+ printf("no %s found; none killed.\n", what);
+- return;
++ return -1;
+ }
+ for (p = found; p; p = p->next) {
+ if (kill(p->pid, signal_nr) == 0) {
+@@ -200,6 +200,7 @@
+ printf(" %d", -p->pid);
+ printf(").\n");
+ }
++ return killed;
+ }
+
+
+@@ -209,6 +210,7 @@
+ { "background", 0, NULL, 'b' },
+ { "quiet", 0, NULL, 'q' },
+ { "make-pidfile", 0, NULL, 'm' },
++ { "oknodo", 0, NULL, 'o' },
+ { "startas", 1, NULL, 'a' },
+ { "name", 1, NULL, 'n' },
+ { "signal", 1, NULL, 's' },
+@@ -223,6 +225,7 @@
+ #define SSD_OPT_BACKGROUND 4
+ #define SSD_OPT_QUIET 8
+ #define SSD_OPT_MAKEPID 16
++#define SSD_OPT_OKNODO 32
+
+ int
+ start_stop_daemon_main(int argc, char **argv)
+@@ -234,7 +237,7 @@
+ bb_applet_long_options = ssd_long_options;
+
+ bb_opt_complementaly = "K~S:S~K";
+- opt = bb_getopt_ulflags(argc, argv, "KSbqma:n:s:u:x:p:",
++ opt = bb_getopt_ulflags(argc, argv, "KSbqmoa:n:s:u:x:p:",
+ &startas, &cmdname, &signame, &userspec, &execname, &pidfile);
+
+ /* Check one and only one context option was given */
+@@ -265,8 +268,8 @@
+ user_id = my_getpwnam(userspec);
+
+ if (opt & SSD_CTX_STOP) {
+- do_stop();
+- return EXIT_SUCCESS;
++ int i = do_stop();
++ return (opt & SSD_OPT_OKNODO) ? 0 : (i <= 0);
+ }
+
+ do_procinit();
+@@ -274,7 +277,7 @@
+ if (found) {
+ if (!quiet)
+ printf("%s already running.\n%d\n", execname ,found->pid);
+- return EXIT_SUCCESS;
++ return (opt & SSD_OPT_OKNODO) ? EXIT_SUCCESS : EXIT_FAILURE;
+ }
+ *--argv = startas;
+ if (opt & SSD_OPT_BACKGROUND) {
============================================================
--- packages/busybox/busybox-1.00/unzip-endian-fixes.patch 08715e545813e4e5d2dc8ebec819b3acc565c723
+++ packages/busybox/busybox-1.00/unzip-endian-fixes.patch 08715e545813e4e5d2dc8ebec819b3acc565c723
@@ -0,0 +1,54 @@
+--- archival/unzip.c.orig 2005-03-17 18:42:45.000000000 -0500
++++ archival/unzip.c 2005-03-17 17:46:45.000000000 -0500
+@@ -46,10 +46,28 @@
+ #include "unarchive.h"
+ #include "busybox.h"
+
+-#define ZIP_FILEHEADER_MAGIC 0x04034b50
+-#define ZIP_CDS_MAGIC 0x02014b50
+-#define ZIP_CDS_END_MAGIC 0x06054b50
+-#define ZIP_DD_MAGIC 0x08074b50
++#if (BYTE_ORDER == BIG_ENDIAN)
++static inline unsigned short
++__swap16(unsigned short x) {
++ return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8);
++}
++
++static inline uint32_t
++__swap32(uint32_t x) {
++ return (((x & 0xFF) << 24) |
++ ((x & 0xFF00) << 8) |
++ ((x & 0xFF0000) >> 8) |
++ ((x & 0xFF000000) >> 24));
++}
++#else
++#define __swap16(x) (x)
++#define __swap32(x) (x)
++#endif
++
++#define ZIP_FILEHEADER_MAGIC __swap32(0x04034b50)
++#define ZIP_CDS_MAGIC __swap32(0x02014b50)
++#define ZIP_CDS_END_MAGIC __swap32(0x06054b50)
++#define ZIP_DD_MAGIC __swap32(0x08074b50)
+
+ extern unsigned int gunzip_crc;
+ extern unsigned int gunzip_bytes_out;
+@@ -249,6 +267,18 @@
+
+ /* Read the file header */
+ unzip_read(src_fd, zip_header.raw, 26);
++#if (BYTE_ORDER == BIG_ENDIAN)
++ zip_header.formated.version = __swap16(zip_header.formated.version);
++ zip_header.formated.flags = __swap16(zip_header.formated.flags);
++ zip_header.formated.method = __swap16(zip_header.formated.method);
++ zip_header.formated.modtime = __swap16(zip_header.formated.modtime);
++ zip_header.formated.moddate = __swap16(zip_header.formated.moddate);
++ zip_header.formated.crc32 = __swap32(zip_header.formated.crc32);
++ zip_header.formated.cmpsize = __swap32(zip_header.formated.cmpsize);
++ zip_header.formated.ucmpsize = __swap32(zip_header.formated.ucmpsize);
++ zip_header.formated.filename_len = __swap16(zip_header.formated.filename_len);
++ zip_header.formated.extra_len = __swap16(zip_header.formated.extra_len);
++#endif
+ if ((zip_header.formated.method != 0) && (zip_header.formated.method != 8)) {
+ bb_error_msg_and_die("Unsupported compression method %d", zip_header.formated.method);
+ }
============================================================
--- packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch 29540f29f7a83e47e7c48f6d88508dd682bc805a
+++ packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch 29540f29f7a83e47e7c48f6d88508dd682bc805a
@@ -0,0 +1,878 @@
+
+Index: archival/unzip.c
+===================================================================
+RCS file: /var/cvs/busybox/archival/unzip.c,v
+retrieving revision 1.8
+diff -u -r1.8 unzip.c
+--- archival/unzip.c 6 Jun 2004 10:22:43 -0000 1.8
++++ archival/unzip.c 18 Oct 2004 01:32:25 -0000
+@@ -2,7 +2,10 @@
+ /*
+ * Mini unzip implementation for busybox
+ *
+- * Copyright (C) 2001 by Laurence Anderson
++ * Copyright (C) 2004 by Ed Clark
++ *
++ * Loosely based on original busybox unzip applet by Laurence Anderson.
++ * All options and features should work in this version.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -21,17 +24,25 @@
+ */
+
+ /* For reference see
+- * http://www.pkware.com/products/enterprise/white_papers/appnote.txt
++ * http://www.pkware.com/company/standards/appnote/
+ * http://www.info-zip.org/pub/infozip/doc/appnote-iz-latest.zip
+ */
+
+-/* TODO Endian issues, exclude, should we accept input from stdin ? */
++/* TODO
++ * Endian issues
++ * Zip64 + other methods
++ * Improve handling of zip format, ie.
++ * - deferred CRC, comp. & uncomp. lengths (zip header flags bit 3)
++ * - unix file permissions, etc.
++ * - central directory
++ */
+
+ #include <fcntl.h>
+ #include <getopt.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <errno.h>
+ #include "unarchive.h"
+ #include "busybox.h"
+
+@@ -43,205 +54,353 @@
+ extern unsigned int gunzip_crc;
+ extern unsigned int gunzip_bytes_out;
+
+-static void header_list_unzip(const file_header_t *file_header)
++typedef union {
++ unsigned char raw[26];
++ struct {
++ unsigned short version; /* 0-1 */
++ unsigned short flags; /* 2-3 */
++ unsigned short method; /* 4-5 */
++ unsigned short modtime; /* 6-7 */
++ unsigned short moddate; /* 8-9 */
++ unsigned int crc32 __attribute__ ((packed)); /* 10-13 */
++ unsigned int cmpsize __attribute__ ((packed)); /* 14-17 */
++ unsigned int ucmpsize __attribute__ ((packed)); /* 18-21 */
++ unsigned short filename_len; /* 22-23 */
++ unsigned short extra_len; /* 24-25 */
++ } formated __attribute__ ((packed));
++} zip_header_t;
++
++static void unzip_skip(int fd, off_t skip)
+ {
+- printf(" inflating: %s\n", file_header->name);
++ if (lseek(fd, skip, SEEK_CUR) == (off_t)-1) {
++ if ((errno != ESPIPE) || (bb_copyfd_size(fd, -1, skip) != skip)) {
++ bb_error_msg_and_die("Seek failure");
++ }
++ }
+ }
+
+-static void header_verbose_list_unzip(const file_header_t *file_header)
++static void unzip_read(int fd, void *buf, size_t count)
+ {
+- unsigned int dostime = (unsigned int) file_header->mtime;
++ if (bb_xread(fd, buf, count) != count) {
++ bb_error_msg_and_die("Read failure");
++ }
++}
+
+- /* can printf arguments cut of the decade component ? */
+- unsigned short year = 1980 + ((dostime & 0xfe000000) >> 25);
+- while (year >= 100) {
+- year -= 100;
+- }
+-
+- printf("%9u %02u-%02u-%02u %02u:%02u %s\n",
+- (unsigned int) file_header->size,
+- (dostime & 0x01e00000) >> 21,
+- (dostime & 0x001f0000) >> 16,
+- year,
+- (dostime & 0x0000f800) >> 11,
+- (dostime & 0x000007e0) >> 5,
+- file_header->name);
++static void unzip_create_leading_dirs(char *fn)
++{
++ /* Create all leading directories */
++ char *name = bb_xstrdup(fn);
++ if (bb_make_directory(dirname(name), 0777, FILEUTILS_RECUR)) {
++ bb_error_msg_and_die("Failed to create directory");
++ }
++ free(name);
+ }
+
+-extern int unzip_main(int argc, char **argv)
++static void unzip_extract(zip_header_t *zip_header, int src_fd, int dst_fd)
+ {
+- union {
+- unsigned char raw[26];
+- struct {
+- unsigned short version; /* 0-1 */
+- unsigned short flags; /* 2-3 */
+- unsigned short method; /* 4-5 */
+- unsigned short modtime; /* 6-7 */
+- unsigned short moddate; /* 8-9 */
+- unsigned int crc32 __attribute__ ((packed)); /* 10-13 */
+- unsigned int cmpsize __attribute__ ((packed));; /* 14-17 */
+- unsigned int ucmpsize __attribute__ ((packed));; /* 18-21 */
+- unsigned short filename_len; /* 22-23 */
+- unsigned short extra_len; /* 24-25 */
+- } formated __attribute__ ((packed));
+- } zip_header;
++ if (zip_header->formated.method == 0) {
++ /* Method 0 - stored (not compressed) */
++ int size = zip_header->formated.ucmpsize;
++ if (size && (bb_copyfd_size(src_fd, dst_fd, size) != size)) {
++ bb_error_msg_and_die("Cannot complete extraction");
++ }
++
++ } else {
++ /* Method 8 - inflate */
++ inflate_init(zip_header->formated.cmpsize);
++ inflate_unzip(src_fd, dst_fd);
++ inflate_cleanup();
++ /* Validate decompression - crc */
++ if (zip_header->formated.crc32 != (gunzip_crc ^ 0xffffffffL)) {
++ bb_error_msg("Invalid compressed data--crc error");
++ }
++ /* Validate decompression - size */
++ if (zip_header->formated.ucmpsize != gunzip_bytes_out) {
++ bb_error_msg("Invalid compressed data--length error");
++ }
++ }
++}
+
+- archive_handle_t *archive_handle;
++extern int unzip_main(int argc, char **argv)
++{
++ zip_header_t zip_header;
++ enum {v_silent, v_normal, v_list} verbosity = v_normal;
++ enum {o_prompt, o_never, o_always} overwrite = o_prompt;
+ unsigned int total_size = 0;
+ unsigned int total_entries = 0;
++ int src_fd = -1, dst_fd = -1;
++ char *src_fn = NULL, *dst_fn = NULL;
++ llist_t *accept = NULL;
++ llist_t *reject = NULL;
+ char *base_dir = NULL;
+- int opt = 0;
+-
+- /* Initialise */
+- archive_handle = init_handle();
+- archive_handle->action_data = NULL;
+- archive_handle->action_header = header_list_unzip;
+-
+- while ((opt = getopt(argc, argv, "lnopqd:")) != -1) {
+- switch (opt) {
+- case 'l': /* list */
+- archive_handle->action_header = header_verbose_list_unzip;
+- archive_handle->action_data = data_skip;
+- break;
+- case 'n': /* never overwright existing files */
++ int i, opt, opt_range = 0, list_header_done = 0;
++ char key_buf[512];
++ struct stat stat_buf;
++
++ while((opt = getopt(argc, argv, "-d:lnopqx")) != -1) {
++ switch(opt_range) {
++ case 0: /* Options */
++ switch(opt) {
++ case 'l': /* List */
++ verbosity = v_list;
+ break;
+- case 'o':
+- archive_handle->flags = ARCHIVE_EXTRACT_UNCONDITIONAL;
++
++ case 'n': /* Never overwrite existing files */
++ overwrite = o_never;
+ break;
+- case 'p': /* extract files to stdout */
+- archive_handle->action_data = data_extract_to_stdout;
++
++ case 'o': /* Always overwrite existing files */
++ overwrite = o_always;
+ break;
+- case 'q': /* Extract files quietly */
+- archive_handle->action_header = header_skip;
++
++ case 'p': /* Extract files to stdout and fall through to set verbosity */
++ dst_fd = STDOUT_FILENO;
++
++ case 'q': /* Be quiet */
++ verbosity = (verbosity == v_normal) ? v_silent : verbosity;
+ break;
+- case 'd': /* Extract files to specified base directory*/
+- base_dir = optarg;
+- break;
+-#if 0
+- case 'x': /* Exclude the specified files */
+- archive_handle->filter = filter_accept_reject_list;
++
++ case 1 : /* The zip file */
++ src_fn = bb_xstrndup(optarg, strlen(optarg)+4);
++ opt_range++;
+ break;
+-#endif
++
+ default:
+ bb_show_usage();
++
++ }
++ break;
++
++ case 1: /* Include files */
++ if (opt == 1) {
++ accept = llist_add_to(accept, optarg);
++
++ } else if (opt == 'd') {
++ base_dir = optarg;
++ opt_range += 2;
++
++ } else if (opt == 'x') {
++ opt_range++;
++
++ } else {
++ bb_show_usage();
++ }
++ break;
++
++ case 2 : /* Exclude files */
++ if (opt == 1) {
++ reject = llist_add_to(reject, optarg);
++
++ } else if (opt == 'd') { /* Extract to base directory */
++ base_dir = optarg;
++ opt_range++;
++
++ } else {
++ bb_show_usage();
++ }
++ break;
++
++ default:
++ bb_show_usage();
+ }
+ }
+-
+- if (argc == optind) {
++
++ if (src_fn == NULL) {
+ bb_show_usage();
+ }
+
+- printf("Archive: %s\n", argv[optind]);
+- if (archive_handle->action_header == header_verbose_list_unzip) {
+- printf(" Length Date Time Name\n");
+- printf(" -------- ---- ---- ----\n");
+- }
+-
+- if (*argv[optind] == '-') {
+- archive_handle->src_fd = STDIN_FILENO;
+- archive_handle->seek = seek_by_char;
++ /* Open input file */
++ if (strcmp("-", src_fn) == 0) {
++ src_fd = STDIN_FILENO;
++ /* Cannot use prompt mode since zip data is arriving on STDIN */
++ overwrite = (overwrite == o_prompt) ? o_never : overwrite;
++
+ } else {
+- archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY);
++ char *extn[] = {"", ".zip", ".ZIP"};
++ int orig_src_fn_len = strlen(src_fn);
++ for(i = 0; (i < 3) && (src_fd == -1); i++) {
++ strcpy(src_fn + orig_src_fn_len, extn[i]);
++ src_fd = open(src_fn, O_RDONLY);
++ }
++ if (src_fd == -1) {
++ src_fn[orig_src_fn_len] = 0;
++ bb_error_msg_and_die("Cannot open %s, %s.zip, %s.ZIP", src_fn, src_fn, src_fn);
++ }
+ }
+
+- if ((base_dir) && (chdir(base_dir))) {
+- bb_perror_msg_and_die("Couldnt chdir");
++ /* Change dir if necessary */
++ if (base_dir && chdir(base_dir)) {
++ bb_perror_msg_and_die("Cannot chdir");
+ }
+
+- while (optind < argc) {
+- archive_handle->filter = filter_accept_list;
+- archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind]);
+- optind++;
+- }
++ if (verbosity != v_silent)
++ printf("Archive: %s\n", src_fn);
+
+ while (1) {
+ unsigned int magic;
+- int dst_fd;
+-
+- /* TODO Endian issues */
+- archive_xread_all(archive_handle, &magic, 4);
+- archive_handle->offset += 4;
+
++ /* Ch%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list