reverting to old ssp behavior

4 files changed, 68 insertions, 13 deletions

diff --git a/dev-libs/uclibc/ChangeLog b/dev-libs/uclibc/ChangeLog
index 21edc02658fb..795ee86f2bc5 100644
--- a/dev-libs/uclibc/ChangeLog
+++ b/dev-libs/uclibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/uclibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.37 2004/09/28 17:25:36 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.38 2004/10/12 18:48:24 solar Exp $
+
+  12 Oct 2004; <solar@gentoo.org> files/0.9.26/ssp.c:
+  reverting to old ssp behavior
 
 *uclibc-0.9.26-r7 (28 Sep 2004)
 
diff --git a/dev-libs/uclibc/Manifest b/dev-libs/uclibc/Manifest
index 07d60d8f2196..454279b9d5fe 100644
--- a/dev-libs/uclibc/Manifest
+++ b/dev-libs/uclibc/Manifest
@@ -1,39 +1,78 @@
 MD5 08c3bf145cb5142ef315926eb321176f uclibc-0.9.26-r2.ebuild 6198
+SHA1 577b994eef9eb4f0230228e36498cf3020701ff3 uclibc-0.9.26-r2.ebuild 6198
 MD5 d19c535314aba3c7ad5956c68571886a uclibc-0.9.26-r4.ebuild 7223
+SHA1 0ad7959807c3727f333cbc1fed5800b1a098cd09 uclibc-0.9.26-r4.ebuild 7223
 MD5 d98118dbcb77466679b07fd6eb029f9f uclibc-9999.ebuild 5443
+SHA1 cfac75ff88370317cb700a5278b3ae5bb513f279 uclibc-9999.ebuild 5443
 MD5 e00c5423073ca5b75f6b38f03cc9c46e uclibc-0.9.26-r1.ebuild 2565
+SHA1 2d7a3d80933bb6b107340a2e785040abd09cc8e6 uclibc-0.9.26-r1.ebuild 2565
 MD5 b6e51a393cae9daddfda7e1eabadb679 uclibc-0.9.26-r3.ebuild 6348
+SHA1 e0dea22da01c6ae3ce3714914d495985dcf3763b uclibc-0.9.26-r3.ebuild 6348
 MD5 ed4d6b2b5413c7372255c768f51e7446 uclibc-0.9.26-r5.ebuild 7659
-MD5 ef3cf86952629220bc4510fd33623774 ChangeLog 7292
+SHA1 7c186d52132277548362e9f83a46416b157d4050 uclibc-0.9.26-r5.ebuild 7659
+MD5 169cc527c182c4aa0641d690a1ad5a2a ChangeLog 7379
+SHA1 09d069ace64ffe95c07eb47fae6fce2d119b142f ChangeLog 7379
 MD5 7fde305dfd21aeac12e0eb721e0f6a17 uclibc-0.9.21.ebuild 1096
+SHA1 79e8364b3121e5330db6ef8a7f56a4e836765ad5 uclibc-0.9.21.ebuild 1096
 MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999
+SHA1 0433f3a405603e702c155ec67f67cb95bf628a1c metadata.xml 999
 MD5 dee5a90975a1815fa8eb988c071fe38d uclibc-0.9.26-r7.ebuild 7865
+SHA1 3ab57e7ac8e71a386f8c3e429da42ec55c050a2d uclibc-0.9.26-r7.ebuild 7865
 MD5 d16f404e56abc9f0ab5c372b88a6905d files/Makefile-cp-order-fix.patch 897
+SHA1 1e28702a457b891c80b177aeae67f0d598ad6000 files/Makefile-cp-order-fix.patch 897
 MD5 0b733285f186f31c1be9ffcc42f1064e files/getent 973
+SHA1 b5ce9f5c3def76e637569c28fa071212b2dd3b6c files/getent 973
 MD5 cf4a11cd99eb78be459f253cf9c53030 files/digest-uclibc-0.9.26-r1 67
+SHA1 d50662d521727de3feacb549adfcce1788a21ae1 files/digest-uclibc-0.9.26-r1 67
 MD5 02ffb023d5b3be46c7e0c9aadf48d304 files/digest-uclibc-0.9.26-r2 231
+SHA1 a39219f5fe72189981566c0ba74102ffa02da12d files/digest-uclibc-0.9.26-r2 231
 MD5 469ea7f6803a9d27eadc0c9437171df6 files/digest-uclibc-0.9.26-r3 231
+SHA1 6f32e89258586a14d813650ca561e72efd83c43c files/digest-uclibc-0.9.26-r3 231
 MD5 44c3eaa7974b57f415b3acb6a30cc1e8 files/digest-uclibc-0.9.26-r4 231
+SHA1 c9fbda5d6ff757f20dd78379c0a61a994a617a43 files/digest-uclibc-0.9.26-r4 231
 MD5 6d2b5c523d34c86df9bc37747d9261dc files/digest-uclibc-0.9.26-r5 231
-MD5 6d2b5c523d34c86df9bc37747d9261dc files/digest-uclibc-0.9.26-r7 231
+SHA1 13e94ed1ce9b059f29ca3339e71ff20f0e96cadb files/digest-uclibc-0.9.26-r5 231
+MD5 9377b27a259539f04845de22f8d1bbd8 files/digest-uclibc-0.9.26-r7 489
+SHA1 bb9f7cca1ffa18fddfe49e29a8f5f4e5b0012e4a files/digest-uclibc-0.9.26-r7 489
 MD5 799adc7fb6ec9ffd653831cea1d32dd5 files/digest-uclibc-0.9.21 67
+SHA1 6b3c9905075575b8e629e3cbabc5a50f38aef401 files/digest-uclibc-0.9.21 67
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-uclibc-9999 0
+SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 files/digest-uclibc-9999 0
 MD5 df59fcf3a02c17b7dac6999bd9262d05 files/cvs/22_all_uClibc-ld-now.patch 1072
+SHA1 4abb40a89f216bfb5a27d8c7f3a9d29fa366cdd7 files/cvs/22_all_uClibc-ld-now.patch 1072
 MD5 7eea15a7a3e8d8a2a222b815e57dc221 files/cvs/13_all_uClibc-enable-ssp.patch 331
+SHA1 85962a2c8541e2a2d3130c2000ec535392a1e47f files/cvs/13_all_uClibc-enable-ssp.patch 331
 MD5 9cb04f6f038b903868f99d90f81e7e61 files/cvs/21_all_uClibc-ld-relro.patch 1040
+SHA1 afdf8ebe43376eb4f3faf216d2b4bcc39cbe3b97 files/cvs/21_all_uClibc-ld-relro.patch 1040
 MD5 4216cdf86d54f45fa04cb44a5425b3ff files/0.9.23/uClibc-0.9.23-pax.patch 3607
+SHA1 e767c97c2f48edcc43917a3eebf882e1559583cd files/0.9.23/uClibc-0.9.23-pax.patch 3607
 MD5 17ecd222df47b5253f35787097440a5a files/0.9.23/uClibc-0.9.23-etdyn.patch 5832
+SHA1 14adc6524c73826ba9d6debe01ded4ceb5f9d7dd files/0.9.23/uClibc-0.9.23-etdyn.patch 5832
 MD5 298b7b42f80e1f8ae395df81c47eb213 files/0.9.23/uClibc-0.9.23-flipturn.patch 1821
+SHA1 3c8985c05ad7f2abdc7c1934e0352b5875550a43 files/0.9.23/uClibc-0.9.23-flipturn.patch 1821
 MD5 f7c264d37687f1a32f1c6e31239f2276 files/0.9.26/uclibc-0.9.26-noexecstack.patch 15273
+SHA1 312eafbf80f65b48d6b0b2c91e87525b2b2942e8 files/0.9.26/uclibc-0.9.26-noexecstack.patch 15273
 MD5 6835449424e7a8a38e9c85ecf1b73577 files/0.9.26/arm-ucontext.patch 303
-MD5 25cac2f3d255fb16a6641f87dfc0f1c3 files/0.9.26/ssp.c 3993
+SHA1 d55b17abe035d41536e188d694a84ebd1f974460 files/0.9.26/arm-ucontext.patch 303
+MD5 d956cd230d95d601108d8a8aba9b016c files/0.9.26/ssp.c 4150
+SHA1 7f16aca5f5f3b4be31511d0f9ff61cc7cf7a4897 files/0.9.26/ssp.c 4150
 MD5 7ff9f1e05cdfbbe0e156ea81bf8b55ee files/0.9.26/uClibc-20040921-ldso-unsecvars.patch 1024
+SHA1 e979dcc6d00a0a1bdfbd86a55ada46b7b09ccd80 files/0.9.26/uClibc-20040921-ldso-unsecvars.patch 1024
 MD5 a503ef49001f5f67d61cd40b0809fb76 files/0.9.26/unsecvars.h 682
+SHA1 200591e48b5c82140343640e607928ad68a73f59 files/0.9.26/unsecvars.h 682
 MD5 49671ccbdf2c8055efc6cde0003cb6c5 files/0.9.26/arm-fix-missing-syscalls.patch 2264
+SHA1 5dc9ef79795dade23ab35e5403b057bd2790028d files/0.9.26/arm-fix-missing-syscalls.patch 2264
 MD5 efd96414f3be520f07eabd1c02be1ecb files/0.9.26/uclibc-0.9.26-resolve-segfault.patch 1227
+SHA1 df8c7bbd52e1b7ac40e2493635ae0eeaa1dc0357 files/0.9.26/uclibc-0.9.26-resolve-segfault.patch 1227
 MD5 874260fc77637deccf7588cfc1c76674 files/0.9.26/uClibc-20040613-do_rem.patch 391
+SHA1 20d97b41679fd9bed616b6c92f2f13dd1a3327be files/0.9.26/uClibc-20040613-do_rem.patch 391
 MD5 d35beaf332590fed8c619483d4598dc6 files/0.9.26/uclibc-0.9.26-ssp-gcc34-after-frandom.patch 542
+SHA1 0b623ad87c2b5c112028553cda7ededdb864ed84 files/0.9.26/uclibc-0.9.26-ssp-gcc34-after-frandom.patch 542
 MD5 bdd1e91ee48fb8be0d28cabdfcfdf3ff files/0.9.26/uClibc-0.9.26-pie-option.patch 863
+SHA1 0b716924c36662b9a680517b0679b01aea7599df files/0.9.26/uClibc-0.9.26-pie-option.patch 863
 MD5 7157f784ba7672c9904d289712131a52 files/0.9.26/uclibc-0.9.26-ldso-cache.patch 410
+SHA1 920d36eab745c3e81970a634a8682f9f116adab0 files/0.9.26/uclibc-0.9.26-ldso-cache.patch 410
 MD5 2416f5e954ccb8b39b1c0d6a3cf5e827 files/0.9.26/uClibc-0.9.26-Makefile.patch 1478
+SHA1 27e093bccd5b98f9ce7b9cd4e6b83bcd72241b36 files/0.9.26/uClibc-0.9.26-Makefile.patch 1478
 MD5 b9df87c681aa3a1ef3033cb195e516df files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch 795
+SHA1 7f1280a65ad54932ab4bf0857158e0aec488530f files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch 795
diff --git a/dev-libs/uclibc/files/0.9.26/ssp.c b/dev-libs/uclibc/files/0.9.26/ssp.c
index 869db133aa13..9a62751d48bc 100644
--- a/dev-libs/uclibc/files/0.9.26/ssp.c
+++ b/dev-libs/uclibc/files/0.9.26/ssp.c
@@ -1,6 +1,6 @@
 /*
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/files/0.9.26/ssp.c,v 1.2 2004/10/09 18:28:26 solar Exp $
+ * $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/files/0.9.26/ssp.c,v 1.3 2004/10/12 18:48:24 solar Exp $
  *
  * This is a modified version of Hiroaki Etoh's stack smashing routines
  * implemented for glibc.
@@ -46,6 +46,16 @@
 
 unsigned long __guard = 0UL;
 
+#if 1
+ #define SSP_open  open
+ #define SSP_close close
+ #define SSP_write write
+#else
+ #define SSP_open  __libc_open
+ #define SSP_close __libc_close
+ #define SSP_write __libc_write
+#endif
+
 void
 __guard_setup (void)
 {
@@ -76,13 +86,13 @@ __guard_setup (void)
   {
     int fd;
 #ifdef HAVE_DEV_ERANDOM
-    if ((fd = __libc_open ("/dev/erandom", O_RDONLY)) == (-1))
+    if ((fd = SSP_open ("/dev/erandom", O_RDONLY)) == (-1))
 #endif
-      fd = __libc_open ("/dev/urandom", O_RDONLY);
+      fd = SSP_open ("/dev/urandom", O_RDONLY);
     if (fd != (-1))
       {
-	size = __libc_read (fd, (char *) &__guard, sizeof (__guard));
-	__libc_close (fd);
+	size = SSP_read (fd, (char *) &__guard, sizeof (__guard));
+	SSP_close (fd);
 	if (size == sizeof (__guard))
 	  return;
       }
@@ -137,15 +147,15 @@ __stack_smash_handler (char func[], int damaged)
     }
 
   /* print error message */
-  __libc_write (STDERR_FILENO, buf + 3, len - 3);
-  __libc_write (STDERR_FILENO, "()\n", 3);
+  SSP_write (STDERR_FILENO, buf + 3, len - 3);
+  SSP_write (STDERR_FILENO, "()\n", 3);
   if ((log = socket (AF_UNIX, SOCK_DGRAM, 0)) != -1)
     {
       /* Send "found" message to the "/dev/log" path */
       sock.sun_family = AF_UNIX;
       (void) strncpy (sock.sun_path, _PATH_LOG, sizeof (sock.sun_path) - 1);
       sock.sun_path[sizeof (sock.sun_path) - 1] = '\0';
-      __libc_sendto (log, buf, len, 0, (struct sockaddr *) &sock, sizeof (sock));
+      sendto (log, buf, len, 0, (struct sockaddr *) &sock, sizeof (sock));
     }
 
   /* Make sure the default handler is associated with the our signal handler */
@@ -154,7 +164,7 @@ __stack_smash_handler (char func[], int damaged)
   sigfillset (&sa.sa_mask);	/* Block all signals */
   sa.sa_flags = 0;
   sa.sa_handler = SIG_DFL;
-  __libc_sigaction (SSP_SIGTYPE, &sa, NULL);
+  sigaction (SSP_SIGTYPE, &sa, NULL);
   (void) kill (getpid (), SSP_SIGTYPE);
   _exit (127);
 }
diff --git a/dev-libs/uclibc/files/digest-uclibc-0.9.26-r7 b/dev-libs/uclibc/files/digest-uclibc-0.9.26-r7
index 355f8d702bae..3b83c2b3464c 100644
--- a/dev-libs/uclibc/files/digest-uclibc-0.9.26-r7
+++ b/dev-libs/uclibc/files/digest-uclibc-0.9.26-r7
@@ -1,3 +1,6 @@
 MD5 7212713c432dd0de6ec2140c2a6212e4 uClibc-0.9.26.tar.bz2 1604543
+SHA1 713186e25c23a07c923f711317a3e8df3dd2b608 uClibc-0.9.26.tar.bz2 1604543
 MD5 1c082d43f02e7fa199fe724469111d88 uClibc-0.9.26-cvs-update-20040808.patch.bz2 345344
+SHA1 7406a5734413539277692ff213bc1b6c31b77bc2 uClibc-0.9.26-cvs-update-20040808.patch.bz2 345344
 MD5 b7820c6b79f02d2d07a7ac75abfe90a5 uClibc-0.9.26-patches-1.1.tar.bz2 7162
+SHA1 1af3278334e3370da50b0f598c7c4978d92642a4 uClibc-0.9.26-patches-1.1.tar.bz2 7162