FreeBSD 6.2-STABLE and Flash 7 patch

[Alexandre Vasconcelos]

Hello,

Working setup:
- FreeBSD 6.2-PRERELEASE, firefox 2 and flash 7 patched with 
rtld_dlsym_hack.diff, like suggested on Handbook.

After 6.2-STABLE upgrade reaplying the rtld_dlsym_hack.diff fails:

root at alex src]# patch < rtld_dlsym_hack.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- libexec/rtld-elf/rtld.c.orig       Fri Sep 24 08:04:52 2004
|+++ libexec/rtld-elf/rtld.c    Sun Oct 17 03:37:44 2004
--------------------------
Patching file libexec/rtld-elf/rtld.c using Plan A...
Hunk #1 failed at 129.
Hunk #2 succeeded at 187 (offset 9 lines).
Hunk #3 succeeded at 1820 (offset 82 lines).
1 out of 3 hunks failed--saving rejects to libexec/rtld-elf/rtld.c.rej
done

And make fails:

[root at alex rtld-elf]# make
cc -O2 -fno-strict-aliasing -pipe  -Wall -DFREEBSD_ELF -DIN_RTLD 
-I/usr/src/libexec/rtld-elf/i386 -I/usr/src/libexec/rtld-elf -elf -fpic 
-DPIC -std=gnu99 -Wformat=2 -Wno-format-extra-args -Werror -c 
/usr/src/libexec/rtld-elf/i386/rtld_start.S
cc -O2 -fno-strict-aliasing -pipe  -Wall -DFREEBSD_ELF -DIN_RTLD 
-I/usr/src/libexec/rtld-elf/i386 -I/usr/src/libexec/rtld-elf -elf -fpic 
-DPIC -std=gnu99 -Wformat=2 -Wno-format-extra-args -Werror -c 
/usr/src/libexec/rtld-elf/i386/reloc.c
cc -O2 -fno-strict-aliasing -pipe  -Wall -DFREEBSD_ELF -DIN_RTLD 
-I/usr/src/libexec/rtld-elf/i386 -I/usr/src/libexec/rtld-elf -elf -fpic 
-DPIC -std=gnu99 -Wformat=2 -Wno-format-extra-args -Werror -c 
/usr/src/libexec/rtld-elf/rtld.c
/usr/src/libexec/rtld-elf/rtld.c:189: error: `_dlsym' undeclared here 
(not in a function)
/usr/src/libexec/rtld-elf/rtld.c:189: error: initializer element is not 
constant
/usr/src/libexec/rtld-elf/rtld.c:189: error: (near initialization for 
`exports[4]')
*** Error code 1

Stop in /usr/src/libexec/rtld-elf.


How to fix this?
Thanks,
Alex