merge of 830a2ca2c9484467078002caaef98f80db84c191

     and a5073c2c09ef06e7875d4a30ddfdb0a9b8bd58f3

41 files changed, 930 insertions, 589 deletions

diff --git a/packages/elfutils/elfutils-0.108/warnings.patch b/packages/elfutils/elfutils-0.108/warnings.patch
index 1c283d8530..9de027ee26 100644
--- a/packages/elfutils/elfutils-0.108/warnings.patch
+++ b/packages/elfutils/elfutils-0.108/warnings.patch
@@ -1,7 +1,7 @@
 Index: elfutils-0.108/configure.ac
 ===================================================================
---- elfutils-0.108.orig/configure.ac	2005-05-08 19:13:45.000000000 +0100
-+++ elfutils-0.108/configure.ac	2006-04-07 11:34:17.000000000 +0100
+--- elfutils-0.108.orig/configure.ac	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/configure.ac	2006-04-10 19:19:33.000000000 +0100
 @@ -49,6 +49,10 @@
  dnl Add all the languages for which translations are available.
  ALL_LINGUAS=
@@ -15,108 +15,108 @@ Index: elfutils-0.108/configure.ac
  AC_PROG_YACC
 Index: elfutils-0.108/lib/Makefile.am
 ===================================================================
---- elfutils-0.108.orig/lib/Makefile.am	2005-05-07 00:48:02.000000000 +0100
-+++ elfutils-0.108/lib/Makefile.am	2006-04-07 11:35:38.000000000 +0100
+--- elfutils-0.108.orig/lib/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/lib/Makefile.am	2006-04-10 19:19:33.000000000 +0100
 @@ -21,7 +21,7 @@
  else
  AM_CFLAGS =
  endif
 -AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS)
-+AM_CFLAGS += -fpic -Wshadow -Wunused -Wextra $($(*F)_CFLAGS)
++AM_CFLAGS += -fpic -Wshadow -Wunused $($(*F)_CFLAGS)
  INCLUDES = -I$(srcdir)/../libelf -I..
  
  noinst_LIBRARIES = libeu.a
 Index: elfutils-0.108/libasm/Makefile.am
 ===================================================================
---- elfutils-0.108.orig/libasm/Makefile.am	2005-02-25 06:46:26.000000000 +0000
-+++ elfutils-0.108/libasm/Makefile.am	2006-04-07 11:36:09.000000000 +0100
+--- elfutils-0.108.orig/libasm/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/libasm/Makefile.am	2006-04-10 19:19:33.000000000 +0100
 @@ -18,7 +18,7 @@
  else
  AM_CFLAGS =
  endif
 -AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2
-+AM_CFLAGS += -Wshadow -Wunused -Wextra -Wformat=2
++AM_CFLAGS += -Wshadow -Wunused -Wformat=2
  INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/lib
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 Index: elfutils-0.108/libcpu/Makefile.am
 ===================================================================
---- elfutils-0.108.orig/libcpu/Makefile.am	2005-02-25 06:46:58.000000000 +0000
-+++ elfutils-0.108/libcpu/Makefile.am	2006-04-07 11:36:32.000000000 +0100
+--- elfutils-0.108.orig/libcpu/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/libcpu/Makefile.am	2006-04-10 19:19:33.000000000 +0100
 @@ -13,7 +13,7 @@
  ## 3001 King Ranch Road, Ukiah, CA 95482.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
 -AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
-+AM_CFLAGS = -Wshadow -Wextra -Wformat=2 -Wunused
++AM_CFLAGS = -Wshadow -Wformat=2 -Wunused
  INCLUDES = -I$(srcdir)
  
  noinst_LIBRARIES = libcpu_i386.a
 Index: elfutils-0.108/libdw/Makefile.am
 ===================================================================
---- elfutils-0.108.orig/libdw/Makefile.am	2005-04-04 01:29:25.000000000 +0100
-+++ elfutils-0.108/libdw/Makefile.am	2006-04-07 11:36:42.000000000 +0100
+--- elfutils-0.108.orig/libdw/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/libdw/Makefile.am	2006-04-10 19:19:33.000000000 +0100
 @@ -18,7 +18,7 @@
  else
  AM_CFLAGS =
  endif
 -AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
-+AM_CFLAGS += -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
++AM_CFLAGS += -Wshadow -Wunused -Wformat=2 -std=gnu99
  INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
  VERSION = 1
  
 Index: elfutils-0.108/libebl/Makefile.am
 ===================================================================
---- elfutils-0.108.orig/libebl/Makefile.am	2005-05-07 00:40:23.000000000 +0100
-+++ elfutils-0.108/libebl/Makefile.am	2006-04-07 11:36:53.000000000 +0100
+--- elfutils-0.108.orig/libebl/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/libebl/Makefile.am	2006-04-10 19:19:33.000000000 +0100
 @@ -18,7 +18,7 @@
  else
  AM_CFLAGS =
  endif
 -AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \
-+AM_CFLAGS += -fpic -Wshadow -Wunused -Wextra -Wformat=2 \
++AM_CFLAGS += -fpic -Wshadow -Wunused -Wformat=2 \
  	     -std=gnu99
  
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/lib -I..
 Index: elfutils-0.108/libelf/Makefile.am
 ===================================================================
---- elfutils-0.108.orig/libelf/Makefile.am	2005-02-25 06:46:17.000000000 +0000
-+++ elfutils-0.108/libelf/Makefile.am	2006-04-07 11:37:08.000000000 +0100
+--- elfutils-0.108.orig/libelf/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/libelf/Makefile.am	2006-04-10 19:19:33.000000000 +0100
 @@ -21,7 +21,7 @@
  else
  AM_CFLAGS =
  endif
 -AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \
-+AM_CFLAGS += -Wshadow -Wunused -Wextra -Wformat=2 -std=gnu99 \
++AM_CFLAGS += -Wshadow -Wunused -Wformat=2 -std=gnu99 \
  	     $($(*F)_CFLAGS)
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I..
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 Index: elfutils-0.108/src/Makefile.am
 ===================================================================
---- elfutils-0.108.orig/src/Makefile.am	2005-05-07 21:27:58.000000000 +0100
-+++ elfutils-0.108/src/Makefile.am	2006-04-07 11:38:21.000000000 +0100
-@@ -15,14 +15,13 @@
+--- elfutils-0.108.orig/src/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/src/Makefile.am	2006-04-10 19:20:19.000000000 +0100
+@@ -15,14 +15,12 @@
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \
         -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
  if MUDFLAP
 -AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fmudflap \
-+AM_CFLAGS = -Wshadow -Wunused -Wextra -std=gnu99 -fmudflap \
++AM_CFLAGS = -Wshadow -Wunused -std=gnu99 -fmudflap \
  	    $(native_ld_cflags) $(if $($(*F)_no_Wunused),,-Wunused) \
  	    $(if $($(*F)_no_Wformat),,-Wformat=2)
  else
 -AM_CFLAGS = -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
-+AM_CFLAGS = -Wshadow -std=gnu99 $(native_ld_cflags) \
- 	    $(if $($(*F)_no_Werror),,-Werror) \
+-	    $(if $($(*F)_no_Werror),,-Werror) \
 -	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
 -	    $(if $($(*F)_no_Wformat),,-Wformat=2)
-+	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra)
++AM_CFLAGS = -Wshadow -std=gnu99 $(native_ld_cflags) \
++	    $(if $($(*F)_no_Werror),,-Werror)	    
  endif
  if MUDFLAP
  libmudflap = -lmudflap
 Index: elfutils-0.108/tests/Makefile.am
 ===================================================================
---- elfutils-0.108.orig/tests/Makefile.am	2005-05-08 18:56:19.000000000 +0100
-+++ elfutils-0.108/tests/Makefile.am	2006-04-07 11:38:36.000000000 +0100
+--- elfutils-0.108.orig/tests/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.108/tests/Makefile.am	2006-04-10 19:19:33.000000000 +0100
 @@ -14,10 +14,10 @@
  ##
  DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE
diff --git a/packages/prelink/prelink-20031029/.mtn2git_empty b/packages/fakechroot/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/prelink/prelink-20031029/.mtn2git_empty
+++ b/packages/fakechroot/.mtn2git_empty
diff --git a/packages/fakechroot/fakechroot-native_2.5.bb b/packages/fakechroot/fakechroot-native_2.5.bb
new file mode 100644
index 0000000000..5af3e79467
--- /dev/null
+++ b/packages/fakechroot/fakechroot-native_2.5.bb
@@ -0,0 +1,12 @@
+SECTION = "base"
+PR = "r0"
+include fakechroot_${PV}.bb
+inherit native
+
+S = "${WORKDIR}/fakechroot-${PV}"
+
+EXTRA_OECONF = " --program-prefix="
+
+do_stage_append () {
+    oe_libinstall -so libfakechroot ${STAGING_LIBDIR}/libfakechroot/
+}
diff --git a/packages/fakechroot/fakechroot_2.5.bb b/packages/fakechroot/fakechroot_2.5.bb
new file mode 100644
index 0000000000..c791512185
--- /dev/null
+++ b/packages/fakechroot/fakechroot_2.5.bb
@@ -0,0 +1,7 @@
+SECTION = "base"
+DESCRIPTION = "Gives a fake root environment which can support chroot"
+LICENSE = "GPL"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz"
+
+inherit autotools
diff --git a/packages/gnome/orbit2-native_2.14.0.bb b/packages/gnome/orbit2-native_2.14.0.bb
index c10afb58db..2d52ab7eee 100644
--- a/packages/gnome/orbit2-native_2.14.0.bb
+++ b/packages/gnome/orbit2-native_2.14.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "CORBA ORB"
 LICENSE = "LGPL GPL"
 SECTION = "x11/gnome/libs"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.13/ORBit2-${PV}.tar.bz2 \
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
            file://configure-lossage.patch;patch=1;pnum=1 \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/README b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/README
index 9e34a42820..27dddeafbf 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/README
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/README
@@ -148,44 +148,43 @@ FIRMWARE INSTALLATION DETAILS
      Management web pages).
 
      2-a) If you are installing Unslung 6.x onto an NSLU2 unit with Linksys
-          standard firmware *or* Unslung version 1.x or version 2.x already
-	  installed, flash unslung-6.x.bin as you normally would flash new
-	  firmware (using the web interface "Upgrade Firmware" page).
-
-     2-b) If you are installing Unslung 6.x onto an NSLU2 unit with Unslung
-          version 3.x already installed, you must put the NSLU2 into
-	  maintenance mode before you can use the web interface to flash a new
-	  version. Just click the "Enter Maintenance Mode" link on the web
-          interface "Upgrade Firmware" page, wait for the NSLU2 to reboot, and
-          then flash the new firmware in the normal manner (using the web
-	  interface "Upgrade Firmware" page).
-
-     2-c) If you are installing Unslung 6.x onto an NSLU2 unit with Unslung
-	  version 4.x already installed, you must put the NSLU2 into RedBoot
-	  Upgrade Mode before you can upload new firmware.  Note that Unslung
-	  version 4.x has an "Enter Maintenance Mode" link on the web interface
-	  "Upgrade Firmware" page, but it does not work, so you will need to
-	  use the instructions at
-
-	    http://www.nslu2-linux.org/wiki/HowTo/TelnetIntoRedBoot
-
-	  to access the RedBoot command line, and then type "upgrade" to put
-	  the NSLU2 into RedBoot Upgrade Mode.  Then you will need to use the
-	  Linux UpSlug2 tool or the Windows SerComm Upgrade tool to upload the
-	  new firmware.
-
-     2-d) If you are installing Unslung 6.x onto an NSLU2 unit with version 5.x
-	  or version 6.x already installed, you must first put the NSLU2 into
-	  RedBoot Upgrade Mode.  Just click the "Enter Upgrade Mode" link on the
-	  web interface "Upgrade Firmware" page, wait for the NSLU2 to reboot,
-	  and for the Ready/Status LED to begin flashing red and green, and then
-	  use either the Linux UpSlug2 tool or the Windows SerComm Upgrade tool
-	  to upload the new firmware.
-
-     - During firmware flashing, the top LED - Ready/Status - flashes red and
-          green (approximately 5 minutes, but can be much longer).  
-
-     - The NSLU2 will reboot after the flashing is complete.
+          standard firmware already installed, flash unslung-6.x.bin as you
+          normally would flash new firmware (using the web interface
+          "Upgrade Firmware" page).  See your NSLU2 user manual for details
+          if you don't know how to do this.
+
+          - During firmware flashing, the top LED - Ready/Status - flashes
+            red and green (approximately 5 minutes, but can be much longer).  
+
+          - The NSLU2 will reboot after the flashing is complete.
+
+     2-b) If you are installing Unslung 6.x onto an NSLU2 unit with an
+	  existing version of nslu2-linux.org firmware already installed,
+          you must first put the NSLU2 into RedBoot Upgrade Mode.
+
+          - The NSLU2 should still be powered off at this point.  If not,
+            shut it down again before proceeding.
+
+          - Using a paper clip, push and hold in the reset button which is
+            located on the back of the NSLU2 near the power socket.
+
+          - While holding in the reset button, press and release the power
+            button.
+
+          - Watch the Ready/Status LED, and as soon as it turns red quickly
+            release the reset button.
+
+          - You should now be in upgrade mode which is indicated by the
+            Ready/Status LED alternating between red and green. 
+
+          - Use either the Linux UpSlug2 tool or the Windows SerComm Upgrade
+            tool to upload the new firmware - you can find download links at
+	    http://www.nslu2-linux.org/wiki/HowTo/InstallUnslungFirmware
+
+          - During firmware flashing, the top LED - Ready/Status - flashes
+            red and green (approximately 5 minutes, but can be much longer).  
+
+          - The NSLU2 will reboot after the flashing is complete.
 
 3) Shutdown the NSLU2 (again), attach disk(s), and power it back up.
 
diff --git a/packages/prelink/prelink-20031029/Makefile.in.patch b/packages/prelink/prelink-20031029/Makefile.in.patch
deleted file mode 100644
index 930ea5f9c4..0000000000
--- a/packages/prelink/prelink-20031029/Makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prelink-0.0.20030902.orig/src/Makefile.in	2003-07-01 14:38:41.000000000 +0000
-+++ prelink-0.0.20030902/src/Makefile.in	2003-09-16 23:26:16.000000000 +0000
-@@ -108,7 +108,7 @@
- 		  $(prelink_SYSDEPS)
- 
- prelink_LDADD = @LIBGELF@
--prelink_LDFLAGS = -all-static
-+#prelink_LDFLAGS = -all-static
- 
- extra_DIST = makecrc.c
- subdir = src
diff --git a/packages/prelink/prelink-20031029/dso.c.patch b/packages/prelink/prelink-20031029/dso.c.patch
deleted file mode 100644
index 1be2f52961..0000000000
--- a/packages/prelink/prelink-20031029/dso.c.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- prelink-0.0.20030902.orig/src/dso.c	2003-08-11 11:55:11.000000000 +0000
-+++ prelink-0.0.20030902/src/dso.c	2003-09-16 23:26:16.000000000 +0000
-@@ -334,7 +334,13 @@
-       }
-     else
-       sections[--k] = i;
-+/* this fails for the statically linked upx executable
-   assert (j == k);
-+*/
-+  if (j != k) {
-+      printf("assert(j == k) at dso.c:311 has failed for file %s\n", name);
-+      goto error_out;
-+  }
- 
-   section_cmp_dso = dso;
-   qsort (sections + k, dso->ehdr.e_shnum - k, sizeof (*sections), section_cmp);
diff --git a/packages/prelink/prelink-20031029/layout.c.patch b/packages/prelink/prelink-20031029/layout.c.patch
deleted file mode 100644
index 3961d84d0b..0000000000
--- a/packages/prelink/prelink-20031029/layout.c.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- prelink-0.0.20030902.orig/src/layout.c	2003-06-13 15:12:26.000000000 +0000
-+++ prelink-0.0.20030902/src/layout.c	2003-09-16 23:26:16.000000000 +0000
-@@ -614,7 +614,23 @@
- 		< ((deps[j - 1]->end + max_page_size - 1)
- 		   & ~(max_page_size - 1))
- 		&& (deps[j]->type == ET_DYN || deps[j - 1]->type == ET_DYN))
-+{ /* XXX some binaries cause a segfault but I do not know why -- Md*/
-+    fprintf(stderr,
-+	"Unknown fatal error at src/layout.c:538\n"
-+	"l.binlibs[i]->filename: %s\n"
-+	"deps[j]->base: %lx\n"
-+	"(deps[j - 1]->end + max_page_size - 1) & ~(max_page_size - 1): %ld\n"
-+	"[deps[j - 1]->end: %lx  max_page_size: %lu]\n"
-+	"deps[j]->type: %x  deps[j - 1]->type: %x\n"
-+	,
-+	l.binlibs[i]->filename,
-+	deps[j]->base,
-+	((deps[j - 1]->end + max_page_size - 1) & ~(max_page_size - 1)),
-+	deps[j - 1]->end, max_page_size,
-+	deps[j]->type, deps[j - 1]->type
-+	);
- 	      abort ();
-+}
- 	}
- #endif
-     }
diff --git a/packages/prelink/prelink-20031029/prelink.conf b/packages/prelink/prelink-20031029/prelink.conf
deleted file mode 100644
index 1777aa849e..0000000000
--- a/packages/prelink/prelink-20031029/prelink.conf
+++ /dev/null
@@ -1,21 +0,0 @@
---- prelink-0.0.20040115.orig/debian/prelink.conf
-+++ prelink-0.0.20040115/debian/prelink.conf
-@@ -0,0 +1,18 @@
-+# This config file contains a list of directories both with binaries
-+# and libraries prelink should consider by default.
-+# If a directory name is prefixed with `-l ', the directory hierarchy
-+# will be walked as long as filesystem boundaries are not crossed.
-+# If a directory name is prefixed with `-h ', symbolic links in a
-+# directory hierarchy are followed.
-+-l /usr/local/sbin
-+-l /sbin
-+-l /usr/sbin
-+-l /usr/local/bin
-+-l /bin
-+-l /usr/bin
-+-l /usr/X11R6/bin
-+-l /usr/games
-+-l /usr/local/lib
-+-l /lib
-+-l /usr/lib
-+-l /usr/X11R6/lib
diff --git a/packages/prelink/prelink-20031029/prelink.cron.daily b/packages/prelink/prelink-20031029/prelink.cron.daily
deleted file mode 100644
index 91983ee18b..0000000000
--- a/packages/prelink/prelink-20031029/prelink.cron.daily
+++ /dev/null
@@ -1,43 +0,0 @@
---- prelink-0.0.20040115.orig/debian/prelink.cron.daily
-+++ prelink-0.0.20040115/debian/prelink.cron.daily
-@@ -0,0 +1,40 @@
-+#!/bin/sh
-+
-+. /etc/default/prelink
-+
-+renice +19 -p $$ >/dev/null 2>&1
-+
-+if [ "$PRELINKING" != yes ]; then
-+  if [ -f /etc/prelink.cache ]; then
-+    echo /usr/sbin/prelink -uav > /var/log/prelink.log
-+    /usr/sbin/prelink -uav >> /var/log/prelink.log 2>&1
-+    rm -f /etc/prelink.cache
-+    # Restart init if needed
-+    [ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
-+  fi
-+  exit 0
-+fi
-+
-+if [ ! -f /etc/prelink.cache -o -f /var/lib/misc/prelink.force ] \
-+   || grep -q '^prelink-ELF0.[0-2]' /etc/prelink.cache; then
-+  # If cache does not exist or is from older prelink versions or
-+  # if we were asked to explicitely, force full prelinking
-+  rm -f /etc/prelink.cache /var/lib/misc/prelink.force
-+  PRELINK_OPTS="$PRELINK_OPTS -f"
-+  date > /var/lib/misc/prelink.full
-+elif [ -n "$PRELINK_FULL_TIME_INTERVAL" \
-+       -a "`find /var/lib/misc/prelink.full -mtime -${PRELINK_FULL_TIME_INTERVAL} 2>/dev/null`" \
-+	  = /var/lib/misc/prelink.full ]; then
-+  # If prelink without -q has been run in the last
-+  # PRELINK_FULL_TIME_INTERVAL days, just use quick mode
-+  PRELINK_OPTS="$PRELINK_OPTS -q"
-+else
-+  date > /var/lib/misc/prelink.full
-+fi
-+
-+echo /usr/sbin/prelink -av $PRELINK_OPTS > /var/log/prelink.log
-+/usr/sbin/prelink -av $PRELINK_OPTS >> /var/log/prelink.log 2>&1
-+# Restart init if needed
-+[ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
-+
-+exit 0
diff --git a/packages/prelink/prelink-20031029/prelink.default b/packages/prelink/prelink-20031029/prelink.default
deleted file mode 100644
index d89649e49b..0000000000
--- a/packages/prelink/prelink-20031029/prelink.default
+++ /dev/null
@@ -1,25 +0,0 @@
---- prelink-0.0.20040115.orig/debian/prelink.default
-+++ prelink-0.0.20040115/debian/prelink.default
-@@ -0,0 +1,22 @@
-+# Set this to no to disable prelinking altogether
-+# or to yes to enable it.
-+# (if you change this from yes to no prelink -ua
-+# will be run next night to undo prelinking)
-+PRELINKING=unknown
-+
-+# Options to pass to prelink
-+# -m	Try to conserve virtual memory by allowing overlapping
-+#	assigned virtual memory slots for libraries which
-+#	never appear together in one binary
-+# -R	Randomize virtual memory slot assignments for libraries.
-+#	This makes it slightly harder for various buffer overflow
-+#	attacks, since library addresses will be different on each
-+#	host using -R.
-+PRELINK_OPTS=-mR
-+
-+# How often should full prelink be run (in days)
-+# Normally, prelink will be run in quick mode, every
-+# $PRELINK_FULL_TIME_INTERVAL days it will be run
-+# in normal mode.  Comment this line out if prelink 
-+# should be run in normal mode always.
-+PRELINK_FULL_TIME_INTERVAL=14
diff --git a/packages/prelink/prelink-20031029/prelink.h.patch b/packages/prelink/prelink-20031029/prelink.h.patch
deleted file mode 100644
index 3ca2930d3a..0000000000
--- a/packages/prelink/prelink-20031029/prelink.h.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- prelink-0.0.20030902.orig/src/prelink.h	2003-08-11 11:54:01.000000000 +0000
-+++ prelink-0.0.20030902/src/prelink.h	2003-09-16 23:26:16.000000000 +0000
-@@ -26,6 +26,45 @@
- #include <stdio.h>
- #include <sys/stat.h>
- 
-+/* http://gcc.gnu.org/ml/gcc/2003-01/msg00922.html */
-+#ifndef R_390_TLS_DTPMOD
-+#define R_390_TLS_DTPMOD 54
-+#define R_390_TLS_DTPOFF 55
-+#define R_390_TLS_TPOFF  56
-+#endif
-+
-+/* from http://www.cygwin.com/ml/libc-alpha/2003-02/msg00241.html */
-+#ifndef R_PPC_TLS
-+#define R_PPC_TLS		67
-+#define R_PPC_DTPMOD32		68
-+#define R_PPC_TPREL16		69
-+#define R_PPC_TPREL16_LO	70
-+#define R_PPC_TPREL16_HI	71
-+#define R_PPC_TPREL16_HA	72
-+#define R_PPC_TPREL32		73
-+#define R_PPC_DTPREL16		74
-+#define R_PPC_DTPREL16_LO	75
-+#define R_PPC_DTPREL16_HI	76
-+#define R_PPC_DTPREL16_HA	77
-+#define R_PPC_DTPREL32		78
-+#define R_PPC_GOT_TLSGD16	79
-+#define R_PPC_GOT_TLSGD16_LO	80
-+#define R_PPC_GOT_TLSGD16_HI	81
-+#define R_PPC_GOT_TLSGD16_HA	82
-+#define R_PPC_GOT_TLSLD16	83
-+#define R_PPC_GOT_TLSLD16_LO	84
-+#define R_PPC_GOT_TLSLD16_HI	85
-+#define R_PPC_GOT_TLSLD16_HA	86
-+#define R_PPC_GOT_TPREL16	87
-+#define R_PPC_GOT_TPREL16_LO	88
-+#define R_PPC_GOT_TPREL16_HI	89
-+#define R_PPC_GOT_TPREL16_HA	90
-+#define R_PPC_GOT_DTPREL16	91
-+#define R_PPC_GOT_DTPREL16_LO	92
-+#define R_PPC_GOT_DTPREL16_HI	93
-+#define R_PPC_GOT_DTPREL16_HA	94
-+#endif
-+
- #ifndef DT_GNU_LIBLIST
- #define DT_GNU_LIBLIST		0x6ffffef9
- #define DT_GNU_LIBLISTSZ	0x6ffffdf7
diff --git a/packages/prelink/prelink-20031029/ts.Makefile.am.patch b/packages/prelink/prelink-20031029/ts.Makefile.am.patch
deleted file mode 100644
index 6b8c3c5c38..0000000000
--- a/packages/prelink/prelink-20031029/ts.Makefile.am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prelink-0.0.20031029.orig/testsuite/Makefile.am	2003-09-02 21:44:23.000000000 +0000
-+++ prelink-0.0.20031029/testsuite/Makefile.am	2003-10-31 20:28:02.000000000 +0000
-@@ -11,7 +11,7 @@
- 	shuffle1.sh shuffle2.sh shuffle3.sh shuffle4.sh shuffle5.sh \
- 	shuffle6.sh shuffle7.sh \
- 	layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh tls4.sh \
--	cxx1.sh quick1.sh cycle1.sh cycle2.sh \
-+	cxx1.sh cycle1.sh cycle2.sh \
- 	undosyslibs.sh
- TESTS_ENVIRONMENT = \
- 	PRELINK="../src/prelink -c ./prelink.conf -C ./prelink.cache --ld-library-path=. --dynamic-linker=`echo ./ld*.so.*[0-9]`" \
diff --git a/packages/prelink/prelink-20031029/ts.Makefile.in.patch b/packages/prelink/prelink-20031029/ts.Makefile.in.patch
deleted file mode 100644
index 4253badb65..0000000000
--- a/packages/prelink/prelink-20031029/ts.Makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prelink-0.0.20031029.orig/testsuite/Makefile.in	2003-10-28 20:01:56.000000000 +0000
-+++ prelink-0.0.20031029/testsuite/Makefile.in	2003-10-31 20:28:10.000000000 +0000
-@@ -106,7 +106,7 @@
- 	shuffle1.sh shuffle2.sh shuffle3.sh shuffle4.sh shuffle5.sh \
- 	shuffle6.sh shuffle7.sh \
- 	layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh tls4.sh \
--	cxx1.sh quick1.sh cycle1.sh cycle2.sh \
-+	cxx1.sh cycle1.sh cycle2.sh \
- 	undosyslibs.sh
- 
- TESTS_ENVIRONMENT = \
diff --git a/packages/prelink/prelink-20040304/prelink.conf b/packages/prelink/prelink-20040304/prelink.conf
deleted file mode 100644
index 1777aa849e..0000000000
--- a/packages/prelink/prelink-20040304/prelink.conf
+++ /dev/null
@@ -1,21 +0,0 @@
---- prelink-0.0.20040115.orig/debian/prelink.conf
-+++ prelink-0.0.20040115/debian/prelink.conf
-@@ -0,0 +1,18 @@
-+# This config file contains a list of directories both with binaries
-+# and libraries prelink should consider by default.
-+# If a directory name is prefixed with `-l ', the directory hierarchy
-+# will be walked as long as filesystem boundaries are not crossed.
-+# If a directory name is prefixed with `-h ', symbolic links in a
-+# directory hierarchy are followed.
-+-l /usr/local/sbin
-+-l /sbin
-+-l /usr/sbin
-+-l /usr/local/bin