patches/glibc/ports-2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@2437
     1
diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
yann@2437
     2
--- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
yann@2437
     3
+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
yann@2437
     4
@@ -25,7 +25,7 @@
yann@2437
     5
 
yann@2437
     6
 
yann@2437
     7
 ssize_t
yann@2437
     8
-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
yann@2437
     9
+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
yann@2437
    10
 {
yann@2437
    11
   if (len > buflen)
yann@2437
    12
     __chk_fail ();
yann@2437
    13
diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
yann@2437
    14
--- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
yann@2437
    15
+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
yann@2437
    16
@@ -21,7 +21,7 @@
yann@2437
    17
 
yann@2437
    18
 
yann@2437
    19
 ssize_t
yann@2437
    20
-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
yann@2437
    21
+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
yann@2437
    22
 		  size_t buflen)
yann@2437
    23
 {
yann@2437
    24
   if (len > buflen)