old

4 files changed, 12 insertions, 100 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 3461bc589217..774f9d910c13 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,28 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 4ca73f186d45bd2e661762a92af0c427 ChangeLog 12599
 MD5 509f4ad475e3327a7977fe02afae735a busybox-1.00-r2.ebuild 6194
 MD5 e5ba0d140d82794a58fef4c0e61c0c97 busybox-1.00-r1.ebuild 6089
-MD5 5fdc9849516373f7726ca54004100706 ChangeLog 12301
 MD5 4bf69d151555c144c6942846abc818e6 busybox-1.00-r3.ebuild 6480
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
-MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
-MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r1 66
+MD5 9e54587b9ff54a3ac6a509dc76076ac5 busybox-1.00-r4.ebuild 6773
 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r2 66
 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r3 66
-MD5 9750d4004e6507d35f9aa67d2785fdd3 files/dodeps 2015
-MD5 4e80b04a6c57cb7341be774b55b7229c files/busybox-cmdedit-sparc.diff 568
-MD5 9167897ed0b558e714a92f7e2d2fe534 files/busybox-1.00-pre3.config 8804
-MD5 8eae5b311553ee77cda4524ab892468c files/busybox-1.00_rc3-amd64.patch 658
+MD5 8eca6aae55dad92090e0136b58a9fcf7 files/digest-busybox-1.00-r4 142
+MD5 b49ad424eda262076752eb3edda952f1 files/busybox-1.00-pre3.config 8883
+MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r1 66
+MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
 MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474
-MD5 4972a3b12accd80b77304ff4ff6b6a3a files/1.00/cp-posix-opts.patch 1245
-MD5 85560a8d547bfc101acf98d53dbecd45 files/1.00/more-insmod-arches.patch 1506
 MD5 1587853e73bcbda7157048299fc659fe files/1.00/busybox-read-timeout.patch 1964
 MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCg4s0ViELBEf1JB0RAs/nAJ9twOSLLBkQXNe7NsdnDQmM6z6PUACbBPfu
-575XaxO1KwtvHxSwLAwOOq4=
-=Q7V5
------END PGP SIGNATURE-----
+MD5 85560a8d547bfc101acf98d53dbecd45 files/1.00/more-insmod-arches.patch 1506
+MD5 4972a3b12accd80b77304ff4ff6b6a3a files/1.00/cp-posix-opts.patch 1245
+MD5 e4391db361a2ab2985811ec466f08cdc files/1.00/standalone.patch 1007
+MD5 6209b38225ac1d7cc77f84799acbe3ca files/1.00/nice.patch 4571
+MD5 0e50cd0ad938a8c15f1af8b59028c959 files/1.00/printenv.patch 3365
+MD5 593c8f8e26c0a381db171d9be08076c0 files/1.00/sum.patch 6723
diff --git a/sys-apps/busybox/files/busybox-1.00_rc3-amd64.patch b/sys-apps/busybox/files/busybox-1.00_rc3-amd64.patch
deleted file mode 100644
index d596f5815273..000000000000
--- a/sys-apps/busybox/files/busybox-1.00_rc3-amd64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur busybox-1.00-rc3.orig/modutils/insmod.c busybox-1.00-rc3/modutils/insmod.c
---- busybox-1.00-rc3.orig/modutils/insmod.c	2004-07-20 08:43:57.000000000 -0700
-+++ busybox-1.00-rc3/modutils/insmod.c	2004-09-20 07:47:17.818776178 -0700
-@@ -148,6 +148,18 @@
- #define ELFCLASSM	ELFCLASS32
- #endif
- 
-+#if defined(__x86_64__)
-+#define BB_USE_GOT_ENTRIES
-+#define BB_GOT_ENTRY_SIZE 8
-+#define BB_USE_SINGLE
-+
-+#define MATCH_MACHINE(x) (x == EM_X86_64)
-+
-+#define SHT_RELM       SHT_RELA
-+#define Elf64_RelM     Elf64_Rela
-+#define ELFCLASSM      ELFCLASS64
-+#endif
-+
- #if defined(__mc68000__)
- #define CONFIG_USE_GOT_ENTRIES
- #define CONFIG_GOT_ENTRY_SIZE 4
diff --git a/sys-apps/busybox/files/busybox-cmdedit-sparc.diff b/sys-apps/busybox/files/busybox-cmdedit-sparc.diff
deleted file mode 100644
index 299161cf179f..000000000000
--- a/sys-apps/busybox/files/busybox-cmdedit-sparc.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru busybox-0.60.5-orig/cmdedit.c busybox-0.60.5/cmdedit.c
---- busybox-0.60.5-orig/cmdedit.c	Thu Apr 25 01:07:03 2002
-+++ busybox-0.60.5/cmdedit.c	Fri Apr  4 19:55:30 2003
-@@ -1177,7 +1177,7 @@
- 	new_settings.c_lflag &= ~ICANON;        /* unbuffered input */
- 	/* Turn off echoing and CTRL-C, so we can trap it */
- 	new_settings.c_lflag &= ~(ECHO | ECHONL | ISIG);
--#ifndef linux
-+#if (defined(__sparc__) && defined(linux)) || ! defined(linux)
- 	/* Hmm, in linux c_cc[] not parsed if set ~ICANON */
- 	new_settings.c_cc[VMIN] = 1;
- 	new_settings.c_cc[VTIME] = 0;
diff --git a/sys-apps/busybox/files/dodeps b/sys-apps/busybox/files/dodeps
deleted file mode 100644
index 898e5b367cf2..000000000000
--- a/sys-apps/busybox/files/dodeps
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-# dodeps: find dependencies in busybox applets.
-# v0.1
-# Comments/ideas are welcome: wmertens@gentoo.org
-
-[ ! -f Config.h ] && echo you need to run this from the main source && exit
-if [ ! -f deps ]; then
-	cat <<EOF
-	
-This program will compile all applets with the BB_FEATURE definitions you gave.
-Then, it will find the dependencies in them, and save them in the file "deps".
-Then, it will calculate the applets you can activate with the same set of
-function dependencies. It will also give an estimate of the added code size.
-
-This can then be used to make more informed decisions about what you want in
-the busybox.
-
-If you don't like this, press ctrl-c now, otherwise press enter.
-EOF
-	read a
-	
-	# Compile everything
-	mv Config.h Config.h.orig
-	awk '{if ($0~/^\/\/#define BB_/ && $0!~/FEATURE/){print substr($0,3)}else{print}}' Config.h.orig > Config.h
-	make -j2
-	
-	# Get dependencies and sizes
-	export CC=gcc
-	for i in `./busybox.sh Config.h|sed 's/\.c/.o/g'`; do echo -n ${i%%.o} \(`size $i|awk /$i'/{print $(NF-2)}'`\):\ ; nm -p $i|awk '$1=="U"{a[i++]=$2}END{n=asort(a);for(i=1;i<=n;i++){printf a[i] " "}}'; echo; done > deps
-	mv Config.h.orig Config.h
-fi
-
-# Calculate suggestions
-my_apps=`gcc -E -dM Config.h | awk '{if ($0~/^#define BB_/ && $0!~/FEATURE/){if(t==1){printf "|"}; printf "^" tolower(substr($2,4)) " "; t=1}}'`
-egrep "$my_apps" deps | awk '{for(i=3;i<=NF;i++){print $i}}'|sort -u > used_funcs
-egrep -v "$my_apps" deps | awk '{for(i=3;i<=NF;i++){print $i}}'|sort -u > used_funcs_other
-join -v2 used_funcs used_funcs_other > new_funcs
-rm used_funcs used_funcs_other
-
-# Show results
-echo "These applets share the same functions (code sizes are estimates)"
-egrep -v "$my_apps" deps | egrep -v -f new_funcs | sed 's/^\([^ ]*\) (\([0-9]*\)).*/\2\t\1/' | sort -n
-echo
-echo You can find the temporary results in:
-echo deps: all dependencies, new_funcs: unused functions
-echo If you run this script again, it will use the previous calculations,
-echo instead of compiling all applets again.