From: Tim Yamin Date: Sat, 20 Mar 2004 22:39:02 +0000 (+0000) Subject: Removing broken 1.00-pre8 busybox. X-Git-Tag: v3.4.10.902~655 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55ec28a03ba3172d33237c4111c4a77d033eb64f;p=genkernel.git Removing broken 1.00-pre8 busybox. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@97 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- diff --git a/pkg/busybox-1.00-pre8-alpha.patch b/pkg/busybox-1.00-pre8-alpha.patch deleted file mode 100644 index 2d8e5b1..0000000 --- a/pkg/busybox-1.00-pre8-alpha.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN busybox-1.00-pre8/include/applets.h busybox-1.00-pre8-alpha/include/applets.h ---- busybox-1.00-pre8/include/applets.h 2004-01-27 04:22:20.000000000 -0500 -+++ busybox-1.00-pre8-alpha/include/applets.h 2004-02-25 15:20:25.443610456 -0500 -@@ -557,7 +557,7 @@ - APPLET(sync, sync_main, _BB_DIR_BIN, _BB_SUID_NEVER) - #endif - #ifdef CONFIG_SYSCTL -- APPLET(sysctl, sysctl_main, _BB_DIR_SBIN, _BB_SUID_NEVER) -+ //APPLET(sysctl, sysctl_main, _BB_DIR_SBIN, _BB_SUID_NEVER) - #endif - #ifdef CONFIG_SYSLOGD - APPLET(syslogd, syslogd_main, _BB_DIR_SBIN, _BB_SUID_NEVER) diff --git a/pkg/busybox-1.00-pre8-crypto-losetup.patch b/pkg/busybox-1.00-pre8-crypto-losetup.patch deleted file mode 100644 index 2060efc..0000000 --- a/pkg/busybox-1.00-pre8-crypto-losetup.patch +++ /dev/null @@ -1,388 +0,0 @@ -diff -ruN busybox-1.00-pre8/Makefile busybox-1.00-pre8-losetup/Makefile ---- busybox-1.00-pre8/Makefile 2003-11-17 05:26:43.000000000 -0500 -+++ busybox-1.00-pre8-losetup/Makefile 2004-02-25 15:22:32.149348256 -0500 -@@ -216,7 +216,7 @@ - docs/busybox.pdf docs/busybox.pod docs/busybox.net/busybox.html \ - docs/busybox pod2htm* *.gdb *.elf *~ core .*config.log \ - docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \ -- docs/busybox.net/BusyBox.html busybox.links libbb/loop.h \ -+ docs/busybox.net/BusyBox.html busybox.links \ - .config.old .hdepend busybox - - rm -rf _install - - find . -name .\*.flags -exec rm -f {} \; -diff -ruN busybox-1.00-pre8/archival/libunarchive/filter_accept_reject_list.c busybox-1.00-pre8-losetup/archival/libunarchive/filter_accept_reject_list.c ---- busybox-1.00-pre8/archival/libunarchive/filter_accept_reject_list.c 2002-11-04 20:52:22.000000000 -0500 -+++ busybox-1.00-pre8-losetup/archival/libunarchive/filter_accept_reject_list.c 1969-12-31 19:00:00.000000000 -0500 -@@ -1,45 +0,0 @@ --/* -- * Copyright (C) 2002 by Glenn McGrath -- * -- * 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 -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- */ -- --#include --#include -- --#include "unarchive.h" -- --/* -- * Accept names that are in the accept list and not in the reject list -- */ --extern char filter_accept_reject_list(archive_handle_t *archive_handle) --{ -- const char *key = archive_handle->file_header->name; -- const llist_t *accept_entry = find_list_entry(archive_handle->accept, key); -- const llist_t *reject_entry = find_list_entry(archive_handle->reject, key); -- -- /* If the key is in a reject list fail */ -- if (reject_entry) { -- return(EXIT_FAILURE); -- } -- -- /* Fail if an accept list was specified and the key wasnt in there */ -- if (archive_handle->accept && (accept_entry == NULL)) { -- return(EXIT_FAILURE); -- } -- -- /* Accepted */ -- return(EXIT_SUCCESS); --} -diff -ruN busybox-1.00-pre8/include/libbb.h busybox-1.00-pre8-losetup/include/libbb.h ---- busybox-1.00-pre8/include/libbb.h 2004-02-21 04:20:56.000000000 -0500 -+++ busybox-1.00-pre8-losetup/include/libbb.h 2004-02-25 15:22:32.149348256 -0500 -@@ -233,7 +233,9 @@ - extern int device_open(const char *device, int mode); - - extern int del_loop(const char *device); --extern int set_loop(const char *device, const char *file, int offset, int *loopro); -+extern int set_loop(const char *device, const char *file, int offset, -+ const char *encnum, const char *encryption, -+ int pfd, int *loopro); - extern char *find_unused_loop_device (void); - - -diff -ruN busybox-1.00-pre8/libbb/loop.c busybox-1.00-pre8-losetup/libbb/loop.c ---- busybox-1.00-pre8/libbb/loop.c 2004-02-06 02:16:36.000000000 -0500 -+++ busybox-1.00-pre8-losetup/libbb/loop.c 2004-02-25 15:24:02.085675856 -0500 -@@ -20,11 +20,14 @@ - */ - - #include -+#include -+#include - #include - #include - #include - #include - #include -+#include - #include "libbb.h" - - /* Grumble... The 2.6.x kernel breaks asm/posix_types.h -@@ -78,11 +81,23 @@ - return (TRUE); - } - -+static int -+digits_only(const char *s) { -+ while (*s) -+ if (!isdigit(*s++)) -+ return 0; -+ return 1; -+} -+ - extern int set_loop(const char *device, const char *file, int offset, -- int *loopro) -+ const char *encnumber, -+ const char *encryption, -+ int pfd, int *loopro) - { -- struct loop_info loopinfo; -+// struct loop_info loopinfo; -+ struct loop_info64 loopinfo64; - int fd, ffd, mode; -+ char *pass; - - mode = *loopro ? O_RDONLY : O_RDWR; - if ((ffd = open(file, mode)) < 0 && !*loopro -@@ -97,19 +112,68 @@ - } - *loopro = (mode == O_RDONLY); - -- memset(&loopinfo, 0, sizeof(loopinfo)); -- safe_strncpy(loopinfo.lo_name, file, LO_NAME_SIZE); -- -- loopinfo.lo_offset = offset; -+ memset(&loopinfo64, 0, sizeof(loopinfo64)); -+ safe_strncpy(loopinfo64.lo_file_name, file, LO_NAME_SIZE); -+ -+ if (encryption && *encryption) { -+ if (digits_only(encryption)) { -+ loopinfo64.lo_encrypt_type = atoi(encryption); -+ } else { -+ char *mark=strrchr(encryption,'-'); -+ loopinfo64.lo_encrypt_type = LO_CRYPT_CRYPTOAPI; -+ if (mark && digits_only(mark+1)) -+ loopinfo64.lo_encrypt_key_size = -+ atoi(mark)/8; -+ else { -+ fprintf(stderr, -+ "You must specify a key size (in bits)" -+ "for use with CryptoAPI encryption.\n"); -+ return -1; -+ } -+ *mark='\0'; -+ snprintf(loopinfo64.lo_crypt_name, LO_NAME_SIZE, -+ "%s", encryption); -+ } -+ } -+ -+ if (encnumber && *encnumber) { -+ if (digits_only(encnumber)) -+ loopinfo64.lo_encrypt_type = atoi(encnumber); -+ } -+ -+ loopinfo64.lo_offset = offset; -+ -+ if (loopinfo64.lo_encrypt_type==LO_CRYPT_NONE) -+ loopinfo64.lo_encrypt_key_size = 0; -+ else { -+ if (pfd == -1) { -+ pass = getpass("Password: "); -+ safe_strncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE); -+ } else { -+ /* If we're reading from an extenral program, * -+ * odds are good that a SIGCHLD will interrupt * -+ * this read(), and ruin our whole day. So we * -+ * must block it. */ -+ sigset_t ss, oss; -+ sigemptyset(&ss); -+ sigaddset(&ss, SIGCHLD); -+ sigprocmask(SIG_BLOCK, &ss, &oss); -+ if (read(pfd, loopinfo64.lo_encrypt_key, -+ LO_KEY_SIZE) == -1) { -+ bb_perror_msg("read"); -+ fprintf(stderr, "Error reading encryption key, exiting\n"); -+ } -+ sigprocmask(SIG_SETMASK, &oss, NULL); -+ } -+ } - -- loopinfo.lo_encrypt_key_size = 0; - if (ioctl(fd, LOOP_SET_FD, ffd) < 0) { - bb_perror_msg("ioctl: LOOP_SET_FD"); - close(fd); - close(ffd); - return 1; - } -- if (ioctl(fd, LOOP_SET_STATUS, &loopinfo) < 0) { -+ if (ioctl(fd, LOOP_SET_STATUS64, &loopinfo64) < 0) { - (void) ioctl(fd, LOOP_CLR_FD, 0); - bb_perror_msg("ioctl: LOOP_SET_STATUS"); - close(fd); -diff -ruN busybox-1.00-pre8/libbb/loop.h busybox-1.00-pre8-losetup/libbb/loop.h ---- busybox-1.00-pre8/libbb/loop.h 1969-12-31 19:00:00.000000000 -0500 -+++ busybox-1.00-pre8-losetup/libbb/loop.h 2004-02-25 15:24:02.086675704 -0500 -@@ -0,0 +1,52 @@ -+#define LO_CRYPT_NONE 0 -+#define LO_CRYPT_XOR 1 -+#define LO_CRYPT_DES 2 -+#define LO_CRYPT_CRYPTOAPI 18 -+#define LO_CRYPT_COMPRESS 19 -+ -+#define LOOP_SET_FD 0x4C00 -+#define LOOP_CLR_FD 0x4C01 -+#define LOOP_SET_STATUS 0x4C02 -+#define LOOP_GET_STATUS 0x4C03 -+#define LOOP_SET_STATUS64 0x4C04 -+#define LOOP_GET_STATUS64 0x4C05 -+ -+#define LO_NAME_SIZE 64 -+#define LO_KEY_SIZE 32 -+ -+#include "my_dev_t.h" -+ -+struct loop_info { -+ int lo_number; -+ my_dev_t lo_device; -+ unsigned long lo_inode; -+ my_dev_t lo_rdevice; -+ int lo_offset; -+ int lo_encrypt_type; -+ int lo_encrypt_key_size; -+ int lo_flags; -+ char lo_name[LO_NAME_SIZE]; -+ unsigned char lo_encrypt_key[LO_KEY_SIZE]; -+ unsigned long lo_init[2]; -+ char reserved[4]; -+}; -+ -+/* -+ * Where to get __u8, __u32, __u64? Let us use unsigned char/int/long long -+ * and get punished when someone comes with 128-bit long longs. -+ */ -+struct loop_info64 { -+ unsigned long long lo_device; -+ unsigned long long lo_inode; -+ unsigned long long lo_rdevice; -+ unsigned long long lo_offset; -+ unsigned long long lo_sizelimit; /* bytes, 0 == max available */ -+ unsigned int lo_number; -+ unsigned int lo_encrypt_type; -+ unsigned int lo_encrypt_key_size; -+ unsigned int lo_flags; -+ unsigned char lo_file_name[LO_NAME_SIZE]; -+ unsigned char lo_crypt_name[LO_NAME_SIZE]; -+ unsigned char lo_encrypt_key[LO_KEY_SIZE]; -+ unsigned long long lo_init[2]; -+}; -diff -ruN busybox-1.00-pre8/libbb/my_dev_t.h busybox-1.00-pre8-losetup/libbb/my_dev_t.h ---- busybox-1.00-pre8/libbb/my_dev_t.h 1969-12-31 19:00:00.000000000 -0500 -+++ busybox-1.00-pre8-losetup/libbb/my_dev_t.h 2004-02-25 15:24:06.989930296 -0500 -@@ -0,0 +1,13 @@ -+/* silliness to get dev_t defined as the kernel defines it */ -+/* glibc uses a different dev_t */ -+/* maybe we need __kernel_old_dev_t -- later */ -+/* for ancient systems use "unsigned short" */ -+ -+#include -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) -+#define my_dev_t __kernel_dev_t -+#else -+#define my_dev_t int -+#endif -diff -ruN busybox-1.00-pre8/libbb/new_loop.h busybox-1.00-pre8-losetup/libbb/new_loop.h ---- busybox-1.00-pre8/libbb/new_loop.h 1969-12-31 19:00:00.000000000 -0500 -+++ busybox-1.00-pre8-losetup/libbb/new_loop.h 2004-02-25 15:24:06.989930296 -0500 -@@ -0,0 +1,51 @@ -+#define LO_CRYPT_NONE 0 -+#define LO_CRYPT_XOR 1 -+#define LO_CRYPT_DES 2 -+#define LO_CRYPT_CRYPTOAPI 18 -+ -+#define LOOP_SET_FD 0x4C00 -+#define LOOP_CLR_FD 0x4C01 -+#define LOOP_SET_STATUS 0x4C02 -+#define LOOP_GET_STATUS 0x4C03 -+#define LOOP_SET_STATUS64 0x4C04 -+#define LOOP_GET_STATUS64 0x4C05 -+ -+#define LO_NAME_SIZE 64 -+#define LO_KEY_SIZE 32 -+ -+#include "my_dev_t.h" -+ -+struct loop_info { -+ int lo_number; -+ my_dev_t lo_device; -+ unsigned long lo_inode; -+ my_dev_t lo_rdevice; -+ int lo_offset; -+ int lo_encrypt_type; -+ int lo_encrypt_key_size; -+ int lo_flags; -+ char lo_name[LO_NAME_SIZE]; -+ unsigned char lo_encrypt_key[LO_KEY_SIZE]; -+ unsigned long lo_init[2]; -+ char reserved[4]; -+}; -+ -+/* -+ * Where to get __u8, __u32, __u64? Let us use unsigned char/int/long long -+ * and get punished when someone comes with 128-bit long longs. -+ */ -+struct loop_info64 { -+ unsigned long long lo_device; -+ unsigned long long lo_inode; -+ unsigned long long lo_rdevice; -+ unsigned long long lo_offset; -+ unsigned long long lo_sizelimit; /* bytes, 0 == max available */ -+ unsigned int lo_number; -+ unsigned int lo_encrypt_type; -+ unsigned int lo_encrypt_key_size; -+ unsigned int lo_flags; -+ unsigned char lo_file_name[LO_NAME_SIZE]; -+ unsigned char lo_crypt_name[LO_NAME_SIZE]; -+ unsigned char lo_encrypt_key[LO_KEY_SIZE]; -+ unsigned long long lo_init[2]; -+}; -diff -ruN busybox-1.00-pre8/testsuite/gzip/gzip-removes-original-file busybox-1.00-pre8-losetup/testsuite/gzip/gzip-removes-original-file ---- busybox-1.00-pre8/testsuite/gzip/gzip-removes-original-file 2002-02-05 17:31:48.000000000 -0500 -+++ busybox-1.00-pre8-losetup/testsuite/gzip/gzip-removes-original-file 1969-12-31 19:00:00.000000000 -0500 -@@ -1,3 +0,0 @@ --touch foo --busybox gzip foo --test ! -f foo -diff -ruN busybox-1.00-pre8/util-linux/losetup.c busybox-1.00-pre8-losetup/util-linux/losetup.c ---- busybox-1.00-pre8/util-linux/losetup.c 2003-07-30 04:55:59.000000000 -0400 -+++ busybox-1.00-pre8-losetup/util-linux/losetup.c 2004-02-25 15:24:06.989930296 -0500 -@@ -29,19 +29,31 @@ - { - int delete = 0; - int offset = 0; -- int opt; -+ int opt, pfd = -1; -+ char *encryption=NULL, *encnum=NULL; - -- while ((opt = getopt (argc, argv, "do:")) != -1) -+ while ((opt = getopt (argc, argv, "do:E:e:p:")) != -1) - switch (opt) - { - case 'd': - delete = 1; - break; - -- case 'o': -+ case 'o': - offset = bb_xparse_number (optarg, NULL); - break; - -+ case 'E': -+ encnum = optarg; -+ break; -+ case 'e': -+ encryption = optarg; -+ break; -+ -+ case 'p': -+ pfd = bb_xparse_number (optarg,NULL); -+ break; -+ - default: - bb_show_usage(); - } -@@ -54,6 +66,7 @@ - if (delete) - return del_loop (argv[optind]) ? EXIT_SUCCESS : EXIT_FAILURE; - else -- return set_loop (argv[optind], argv[optind + 1], offset, &opt) -+ return set_loop (argv[optind], argv[optind + 1], offset, encnum, -+ encryption, pfd, &opt) - ? EXIT_FAILURE : EXIT_SUCCESS; - } -diff -ruN busybox-1.00-pre8/util-linux/mount.c busybox-1.00-pre8-losetup/util-linux/mount.c ---- busybox-1.00-pre8/util-linux/mount.c 2003-12-12 02:01:14.000000000 -0500 -+++ busybox-1.00-pre8-losetup/util-linux/mount.c 2004-02-25 15:24:06.990930144 -0500 -@@ -142,7 +142,7 @@ - if (specialfile == NULL) { - bb_error_msg_and_die("Could not find a spare loop device"); - } -- if (set_loop(specialfile, lofile, 0, &loro)) { -+ if (set_loop(specialfile, lofile, 0,NULL,NULL,-1, &loro)) { - bb_error_msg_and_die("Could not setup loop device"); - } - if (!(flags & MS_RDONLY) && loro) { /* loop is ro, but wanted rw */ diff --git a/pkg/busybox-1.00-pre8-losetup-alpha.tar.bz2 b/pkg/busybox-1.00-pre8-losetup-alpha.tar.bz2 deleted file mode 100644 index 9a4b2fe..0000000 Binary files a/pkg/busybox-1.00-pre8-losetup-alpha.tar.bz2 and /dev/null differ