Fix silly error on sed in 2.5; commit a pending change to the patch

svn path=/; revision=157

3 files changed, 24 insertions, 35 deletions

diff --git a/hardened/toolchain/trunk/sys-libs/glibc/Manifest b/hardened/toolchain/trunk/sys-libs/glibc/Manifest
index a83e398..ae051aa 100644
--- a/hardened/toolchain/trunk/sys-libs/glibc/Manifest
+++ b/hardened/toolchain/trunk/sys-libs/glibc/Manifest
@@ -2,10 +2,10 @@ AUX 2.4/glibc-2.4-gentoo-stack_chk_fail.c 9058 RMD160 c98d7007857aeeea00e708e798
 MD5 24dfc0b6f2725063612ea5e4e346b6f3 files/2.4/glibc-2.4-gentoo-stack_chk_fail.c 9058
 RMD160 c98d7007857aeeea00e708e7989800dad9b07ae3 files/2.4/glibc-2.4-gentoo-stack_chk_fail.c 9058
 SHA256 067fba2a36d2630d50198c44395ef208cdf080508f1b716bd3d079f7b964e2df files/2.4/glibc-2.4-gentoo-stack_chk_fail.c 9058
-AUX 2.4/glibc-2.4-hardened-pie.patch 3875 RMD160 82671cc3a508a7aec307b0515a2589fa1e29a291 SHA1 39f07b444bf6eec4a99737e8377a9d3f3f215993 SHA256 1b79594506ba69a7f39dac71c96cd4a0b738caa84ac43768caa1b2aea2805c34
-MD5 ac0a186272000c10eb342bdb64043d44 files/2.4/glibc-2.4-hardened-pie.patch 3875
-RMD160 82671cc3a508a7aec307b0515a2589fa1e29a291 files/2.4/glibc-2.4-hardened-pie.patch 3875
-SHA256 1b79594506ba69a7f39dac71c96cd4a0b738caa84ac43768caa1b2aea2805c34 files/2.4/glibc-2.4-hardened-pie.patch 3875
+AUX 2.4/glibc-2.4-hardened-pie.patch 3277 RMD160 121a25f41f6cac9dabce4270e049690d2b1118be SHA1 15d3b5278c9878a869821ab2108423d3542a05a2 SHA256 69b247256877fd198d7028d00eaeab2d83b08ddf66f1176fe465561f1036aa78
+MD5 00ad489ad6faab45f7b6b1c5e670ffd3 files/2.4/glibc-2.4-hardened-pie.patch 3277
+RMD160 121a25f41f6cac9dabce4270e049690d2b1118be files/2.4/glibc-2.4-hardened-pie.patch 3277
+SHA256 69b247256877fd198d7028d00eaeab2d83b08ddf66f1176fe465561f1036aa78 files/2.4/glibc-2.4-hardened-pie.patch 3277
 AUX 2.4/glibc-2.4-linuxssp.patch 5624 RMD160 9769dd67a904488224760d7d009c05d10bdc5a81 SHA1 cdca3580ee24006c42c4ce9c31f9a79005fe625d SHA256 6a5c4cd1b7a9a10a8eac928af8e8f425a07b0ff01a12edbe6c21bcaa20a2762d
 MD5 26f0d80267aeef64b552baba9f8b869a files/2.4/glibc-2.4-linuxssp.patch 5624
 RMD160 9769dd67a904488224760d7d009c05d10bdc5a81 files/2.4/glibc-2.4-linuxssp.patch 5624
@@ -41,10 +41,10 @@ EBUILD glibc-2.4-r4.ebuild 40431 RMD160 3f058531de3f6c7eb79c98b206e2348fc71c6b69
 MD5 6206b5f4be3503779a1b63e4f7279ca2 glibc-2.4-r4.ebuild 40431
 RMD160 3f058531de3f6c7eb79c98b206e2348fc71c6b69 glibc-2.4-r4.ebuild 40431
 SHA256 079e314f625276c314ab8f3ff268f8fac67fae8cfca7923e69b251d076796389 glibc-2.4-r4.ebuild 40431
-EBUILD glibc-2.5.ebuild 38595 RMD160 d015a3acff785e4bc5ff65bcd38d488b71efb8cf SHA1 fc36621c35dfd2147be1f70c85f0cc5ebe9f4542 SHA256 cd3061e2795e4d82fbb824466bd1308a1086aaaf2e5f559a698a605c55ec324b
-MD5 1c4b9358e448f106af4bce2a625d30a5 glibc-2.5.ebuild 38595
-RMD160 d015a3acff785e4bc5ff65bcd38d488b71efb8cf glibc-2.5.ebuild 38595
-SHA256 cd3061e2795e4d82fbb824466bd1308a1086aaaf2e5f559a698a605c55ec324b glibc-2.5.ebuild 38595
+EBUILD glibc-2.5.ebuild 38595 RMD160 c06721f939f87334f6cfa33eb82ca9d31a8d4e48 SHA1 60bbcd5319a26afdb0483f4152df1cc4edd67e8f SHA256 939b7e2765e97ca25cd228678d08fb56d82cadb719b49d17253831c08aaad53b
+MD5 d1344ed5b90cb20dabaecd207fd47af8 glibc-2.5.ebuild 38595
+RMD160 c06721f939f87334f6cfa33eb82ca9d31a8d4e48 glibc-2.5.ebuild 38595
+SHA256 939b7e2765e97ca25cd228678d08fb56d82cadb719b49d17253831c08aaad53b glibc-2.5.ebuild 38595
 MD5 e6c60ddb8b06199242d294f97f01c574 files/digest-glibc-2.4-r4 1575
 RMD160 49ff56b0209067c5313646df281c408956cdaa92 files/digest-glibc-2.4-r4 1575
 SHA256 a49f96d87bda9dfbe73ac717c2a1dea7b4715c9c2e6031f404e3d7ee1209efea files/digest-glibc-2.4-r4 1575
diff --git a/hardened/toolchain/trunk/sys-libs/glibc/files/2.4/glibc-2.4-hardened-pie.patch b/hardened/toolchain/trunk/sys-libs/glibc/files/2.4/glibc-2.4-hardened-pie.patch
index 1fc6be8..a25ab55 100644
--- a/hardened/toolchain/trunk/sys-libs/glibc/files/2.4/glibc-2.4-hardened-pie.patch
+++ b/hardened/toolchain/trunk/sys-libs/glibc/files/2.4/glibc-2.4-hardened-pie.patch
@@ -3,8 +3,8 @@
 	versions of crtbegin, crtend and crt1 objects.
 	Kevin F. Quinn <kevquinn@gentoo.org> 15 Dec 2006
 
---- Makeconfig.orig	2006-12-15 19:58:56.000000000 +0100
-+++ Makeconfig	2006-12-15 20:12:11.000000000 +0100
+--- Makeconfig.orig	2006-12-19 21:40:06.000000000 +0100
++++ Makeconfig	2006-12-19 21:40:20.000000000 +0100
 @@ -415,6 +415,19 @@
  
  # Command for linking programs with the C library.
@@ -46,37 +46,15 @@
  +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \
  	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
  	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-@@ -438,8 +463,21 @@
+@@ -438,6 +463,7 @@
  			   $(common-objpfx)libc% $(+postinit),$^) \
  	      $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit)
  endif
 +endif
  # Command for statically linking bounded-pointer programs with the C library.
  ifndef +link-bounded
-+ifeq (yes,$(build-pic-default))
-+# This will probably fail somewhere - since there's no Sbcrt1.o
-++link-bounded = $(CC) -nostdlib -nostartfiles -static -fbounded-pointers -o $@ \
-+	      $(sysdep-LDFLAGS) $(LDFLAGS) \
-+	      $(addprefix $(csu-objpfx),b$(+static-starts)) \
-+	      $(+preinit) $(+prectors) \
-+	      $(filter-out $(addprefix $(csu-objpfx),start.ob \
-+						     $(+starts))\
-+			   $(+preinit) $(link-extra-libs-bounded) \
-+			   $(common-objpfx)libc% $(+postinit),$^) \
-+	      $(link-extra-libs-bounded) $(link-libc-bounded) $(+postctors) $(+postinit)
-+else
  +link-bounded = $(CC) -nostdlib -nostartfiles -static -fbounded-pointers -o $@ \
- 	      $(sysdep-LDFLAGS) $(LDFLAGS)  \
- 	      $(addprefix $(csu-objpfx),b$(static-start-installed-name)) \
-@@ -450,6 +488,7 @@
- 			   $(common-objpfx)libc% $(+postinit),$^) \
- 	      $(link-extra-libs-bounded) $(link-libc-bounded) $(+postctor) $(+postinit)
- endif
-+endif
- ifndef config-LDFLAGS
- ifeq (yesyes,$(build-shared)$(elf))
- config-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name)
-@@ -530,6 +569,12 @@
+@@ -530,6 +556,12 @@
  +postinit = $(addprefix $(csu-objpfx),crtn.o)
  +prector = `$(CC) --print-file-name=crtbegin.o`
  +postctor = `$(CC) --print-file-name=crtend.o`
@@ -89,3 +67,14 @@
  +interp = $(addprefix $(elf-objpfx),interp.os)
  endif
  csu-objpfx = $(common-objpfx)csu/
+--- configure.in.orig	2006-12-19 22:53:25.000000000 +0100
++++ configure.in	2006-12-19 22:53:41.000000000 +0100
+@@ -2145,7 +2145,7 @@
+ # error PIC is default.
+ #endif
+ EOF
+-if eval "${CC-cc} -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
++if eval "${CC-cc} -fno-PIE -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
+   pic_default=no
+ fi
+ rm -f conftest.*])
diff --git a/hardened/toolchain/trunk/sys-libs/glibc/glibc-2.5.ebuild b/hardened/toolchain/trunk/sys-libs/glibc/glibc-2.5.ebuild
index ae28828..e7e9fde 100644
--- a/hardened/toolchain/trunk/sys-libs/glibc/glibc-2.5.ebuild
+++ b/hardened/toolchain/trunk/sys-libs/glibc/glibc-2.5.ebuild
@@ -239,7 +239,7 @@ toolchain-glibc_src_unpack() {
 		fi
 
 		# Build nscd with ssp-all
-		sed -e -i 's:-fstack-protector$:-fstack-protector-all:' ${S}/nscd/Makefile
+		sed -i -e 's:-fstack-protector$:-fstack-protector-all:' ${S}/nscd/Makefile
 	fi
 
 	gnuconfig_update