Added a few patches that should of been there originally

4 files changed, 72 insertions, 2 deletions

diff --git a/sys-devel/uclibc-buildroot/ChangeLog b/sys-devel/uclibc-buildroot/ChangeLog
index d611d11167ef..30df12b31aec 100644
--- a/sys-devel/uclibc-buildroot/ChangeLog
+++ b/sys-devel/uclibc-buildroot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/uclibc-buildroot
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/uclibc-buildroot/ChangeLog,v 1.2 2004/02/03 01:10:20 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/uclibc-buildroot/ChangeLog,v 1.3 2004/02/03 03:44:15 dragonheart Exp $
+
+  03 Feb 2004; Daniel Black <dragonheart@gentoo.org>
+  files/0.9.26/uClibc-0.9.26-Makefile.patch,
+  files/0.9.26/uClibc-0.9.26-pie-option.patch:
+  Missed a few patches.
 
   03 Feb 2004; Daniel Black <dragonheart@gentoo.org>
   uclibc-buildroot-20040131.ebuild, files/Makefile-buildroot-helpers.patch,
diff --git a/sys-devel/uclibc-buildroot/Manifest b/sys-devel/uclibc-buildroot/Manifest
index 243e44d7bfa7..f70a4345ac81 100644
--- a/sys-devel/uclibc-buildroot/Manifest
+++ b/sys-devel/uclibc-buildroot/Manifest
@@ -1,7 +1,9 @@
-MD5 84b57c16d3f3c8094984d9dc97e68fdd ChangeLog 765
+MD5 4c2d8a07aabde1dbb1ca763a84e04276 ChangeLog 935
 MD5 bebf5ce8bd6516ef42239ea5b8de3e0b metadata.xml 262
 MD5 6a6de920677688dee08676ffb48da417 uclibc-buildroot-20040131.ebuild 13331
 MD5 b8ec0025f826b1c01cbcb1b1cc018c18 files/digest-uclibc-buildroot-20040131 766
 MD5 fed0ccb5a3b2aefd4671c2e470dadeeb files/uClibc-0.9.26-Makefile.patch 1764
 MD5 4f9f87ac7690d24d225c32d6804894a8 files/uClibc-0.9.26-pie-option.patch 863
 MD5 57ccd7c3d467bafb128bee068a4925de files/Makefile-buildroot-helpers.patch 859
+MD5 fed0ccb5a3b2aefd4671c2e470dadeeb files/0.9.26/uClibc-0.9.26-Makefile.patch 1764
+MD5 4f9f87ac7690d24d225c32d6804894a8 files/0.9.26/uClibc-0.9.26-pie-option.patch 863
diff --git a/sys-devel/uclibc-buildroot/files/0.9.26/uClibc-0.9.26-Makefile.patch b/sys-devel/uclibc-buildroot/files/0.9.26/uClibc-0.9.26-Makefile.patch
new file mode 100644
index 000000000000..9da8d79ee6d2
--- /dev/null
+++ b/sys-devel/uclibc-buildroot/files/0.9.26/uClibc-0.9.26-Makefile.patch
@@ -0,0 +1,45 @@
+--- extra/scripts/fix_includes.sh.orig	2004-01-15 17:50:48.474188032 +0930
++++ extra/scripts/fix_includes.sh	2004-01-15 18:45:51.451059224 +0930
+@@ -59,10 +59,10 @@
+     esac;
+ done;
+ 
+-if [ ! -f "$KERNEL_SOURCE/Makefile" ]; then
++if [ ! -f "$KERNEL_SOURCE/Makefile" -a ! -f "$KERNEL_SOURCE/include/linux/version.h" ]; then
+     echo "";
+     echo "";
+-    echo "The file $KERNEL_SOURCE/Makefile is missing!";
++    echo "The file $KERNEL_SOURCE/Makefile  or $KERNEL_SOURCE/include/linux/version.h is missing!";
+     echo "Perhaps your kernel source is broken?"
+     echo "";
+     echo "";
+@@ -79,12 +79,26 @@
+ fi;
+ 
+ # set current VERSION, PATCHLEVEL, SUBLEVEL, EXTERVERSION
+-eval `sed -n -e 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' -e 's/^\([A-Z]*\) = \(-[-a-z0-9]*\)$/\1=\2/p' $KERNEL_SOURCE/Makefile`
++
++if [ -f "$KERNEL_SOURCE/Makefile" ] ; then
++    eval `sed -n -e 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' -e 's/^\([A-Z]*\) = \(-[-a-z0-9]*\)$/\1=\2/p' $KERNEL_SOURCE/Makefile`
++else
++    ver=`grep UTS_RELEASE $KERNEL_SOURCE/include/linux/version.h | cut -d '"' -f 2`
++    VERSION=`echo "$ver" | cut -d '.' -f 1`
++    PATCHLEVEL=`echo "$ver" | cut -d '.' -f 2`
++    if echo "$ver" | grep -q '-' ; then
++        SUBLEVEL=`echo "$ver" | sed "s/${VERSION}.${PATCHLEVEL}.//" | cut -d '-' -f 1`
++        EXTRAVERSION=`echo "$ver" | sed "s/${VERSION}.${PATCHLEVEL}.${SUBLEVEL}-//"`
++    else
++        SUBLEVEL=`echo "$ver" | cut -d '.' -f 3`
++        #EXTRAVERSION=
++    fi
++fi
++
+ if [ -z "$VERSION" -o -z "$PATCHLEVEL" -o -z "$SUBLEVEL" ]
+ then
+     echo "Unable to determine version for kernel headers"
+-    echo -e "\tprovided in directory $KERNEL_SOURCE"
+-    exit 1
++    exit 1;
+ fi
+ 
+ echo "Current kernel version is $VERSION.$PATCHLEVEL.$SUBLEVEL${EXTRAVERSION}"
diff --git a/sys-devel/uclibc-buildroot/files/0.9.26/uClibc-0.9.26-pie-option.patch b/sys-devel/uclibc-buildroot/files/0.9.26/uClibc-0.9.26-pie-option.patch
new file mode 100644
index 000000000000..ff539bc0ffb4
--- /dev/null
+++ b/sys-devel/uclibc-buildroot/files/0.9.26/uClibc-0.9.26-pie-option.patch
@@ -0,0 +1,18 @@
+--- extra/Configs/Config.in.orig	2004-01-03 09:04:12.000000000 +0930
++++ extra/Configs/Config.in	2004-01-16 02:17:58.226162576 +0930
+@@ -180,13 +180,14 @@
+ config UCLIBC_PIE_SUPPORT
+ 	bool "Support ET_DYN in shared library loader"
+ 	select FORCE_SHAREABLE_TEXT_SEGMENTS
++	select UCLIBC_COMPLETELY_PIC
+ 	default n
+ 	help
+ 	  If you answer Y here, the uClibc native shared library loader will
+ 	  support ET_DYN/PIE executables.
+ 	  It requires binutils-2.14.90.0.6 or later and the usage of the
+ 	  -pie option.
+-	  More about ET_DYN/PIE binaries on <http://pageexec.virtualave.net/> .
++	  More about ET_DYN/PIE binaries on <http://pax.grsecurity.net/>.
+ 	  WARNING: This option also enables FORCE_SHAREABLE_TEXT_SEGMENTS, so all
+ 		libraries have to be built with -fPIC or -fpic, and all assembler
+ 		functions must be written as position independent code (PIC).