From d2632f2deb717f4f175c027d14de050b4351a5da Mon Sep 17 00:00:00 2001 From: Ned Ludd Date: Sat, 9 Oct 2004 18:28:26 +0000 Subject: [PATCH] update herds.xml and a few ssp symbol names to use internal __libc_ functions --- dev-libs/uclibc/Manifest | 14 ++------------ dev-libs/uclibc/files/0.9.26/ssp.c | 18 +++++++++--------- dev-libs/uclibc/metadata.xml | 2 +- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dev-libs/uclibc/Manifest b/dev-libs/uclibc/Manifest index 4c7c05e34ad0..07d60d8f2196 100644 --- a/dev-libs/uclibc/Manifest +++ b/dev-libs/uclibc/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 08c3bf145cb5142ef315926eb321176f uclibc-0.9.26-r2.ebuild 6198 MD5 d19c535314aba3c7ad5956c68571886a uclibc-0.9.26-r4.ebuild 7223 MD5 d98118dbcb77466679b07fd6eb029f9f uclibc-9999.ebuild 5443 @@ -9,7 +6,7 @@ MD5 b6e51a393cae9daddfda7e1eabadb679 uclibc-0.9.26-r3.ebuild 6348 MD5 ed4d6b2b5413c7372255c768f51e7446 uclibc-0.9.26-r5.ebuild 7659 MD5 ef3cf86952629220bc4510fd33623774 ChangeLog 7292 MD5 7fde305dfd21aeac12e0eb721e0f6a17 uclibc-0.9.21.ebuild 1096 -MD5 f694d40cf09e6c5511ae52f755a5ffe5 metadata.xml 998 +MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999 MD5 dee5a90975a1815fa8eb988c071fe38d uclibc-0.9.26-r7.ebuild 7865 MD5 d16f404e56abc9f0ab5c372b88a6905d files/Makefile-cp-order-fix.patch 897 MD5 0b733285f186f31c1be9ffcc42f1064e files/getent 973 @@ -29,7 +26,7 @@ MD5 17ecd222df47b5253f35787097440a5a files/0.9.23/uClibc-0.9.23-etdyn.patch 5832 MD5 298b7b42f80e1f8ae395df81c47eb213 files/0.9.23/uClibc-0.9.23-flipturn.patch 1821 MD5 f7c264d37687f1a32f1c6e31239f2276 files/0.9.26/uclibc-0.9.26-noexecstack.patch 15273 MD5 6835449424e7a8a38e9c85ecf1b73577 files/0.9.26/arm-ucontext.patch 303 -MD5 ef7fa60d23c46f41d0e9748372cfc7dd files/0.9.26/ssp.c 3937 +MD5 25cac2f3d255fb16a6641f87dfc0f1c3 files/0.9.26/ssp.c 3993 MD5 7ff9f1e05cdfbbe0e156ea81bf8b55ee files/0.9.26/uClibc-20040921-ldso-unsecvars.patch 1024 MD5 a503ef49001f5f67d61cd40b0809fb76 files/0.9.26/unsecvars.h 682 MD5 49671ccbdf2c8055efc6cde0003cb6c5 files/0.9.26/arm-fix-missing-syscalls.patch 2264 @@ -40,10 +37,3 @@ MD5 bdd1e91ee48fb8be0d28cabdfcfdf3ff files/0.9.26/uClibc-0.9.26-pie-option.patch MD5 7157f784ba7672c9904d289712131a52 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 MD5 b9df87c681aa3a1ef3033cb195e516df files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch 795 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.4 (GNU/Linux) - -iD8DBQFBWZ5X94CCfB4KcwwRAjREAKCUHxSaPKsUarn+j9BzBLJtC4i7QACfUCt8 -5BsieG/zwcabECkfWT/20Zg= -=66Na ------END PGP SIGNATURE----- diff --git a/dev-libs/uclibc/files/0.9.26/ssp.c b/dev-libs/uclibc/files/0.9.26/ssp.c index cabde2ad0282..869db133aa13 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.1 2004/06/23 02:14:08 solar Exp $ + * $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 $ * * This is a modified version of Hiroaki Etoh's stack smashing routines * implemented for glibc. @@ -76,13 +76,13 @@ __guard_setup (void) { int fd; #ifdef HAVE_DEV_ERANDOM - if ((fd = open ("/dev/erandom", O_RDONLY)) == (-1)) + if ((fd = __libc_open ("/dev/erandom", O_RDONLY)) == (-1)) #endif - fd = open ("/dev/urandom", O_RDONLY); + fd = __libc_open ("/dev/urandom", O_RDONLY); if (fd != (-1)) { - size = read (fd, (char *) &__guard, sizeof (__guard)); - close (fd); + size = __libc_read (fd, (char *) &__guard, sizeof (__guard)); + __libc_close (fd); if (size == sizeof (__guard)) return; } @@ -137,15 +137,15 @@ __stack_smash_handler (char func[], int damaged) } /* print error message */ - write (STDERR_FILENO, buf + 3, len - 3); - write (STDERR_FILENO, "()\n", 3); + __libc_write (STDERR_FILENO, buf + 3, len - 3); + __libc_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'; - sendto (log, buf, len, 0, (struct sockaddr *) &sock, sizeof (sock)); + __libc_sendto (log, buf, len, 0, (struct sockaddr *) &sock, sizeof (sock)); } /* Make sure the default handler is associated with the our signal handler */ @@ -154,7 +154,7 @@ __stack_smash_handler (char func[], int damaged) sigfillset (&sa.sa_mask); /* Block all signals */ sa.sa_flags = 0; sa.sa_handler = SIG_DFL; - sigaction (SSP_SIGTYPE, &sa, NULL); + __libc_sigaction (SSP_SIGTYPE, &sa, NULL); (void) kill (getpid (), SSP_SIGTYPE); _exit (127); } diff --git a/dev-libs/uclibc/metadata.xml b/dev-libs/uclibc/metadata.xml index 8b2f8f90a489..0d08e066b126 100644 --- a/dev-libs/uclibc/metadata.xml +++ b/dev-libs/uclibc/metadata.xml @@ -1,7 +1,7 @@ - no-herd + embedded vapier@gentoo.org Primary Maintainer -- 2.26.2