Author: ps-guest
Date: 2011-08-01 08:28:42 +0000 (Mon, 01 Aug 2011)
New Revision: 4839
Modified:
glibc-package/branches/glibc-branch-squeeze/debian/changelog
glibc-package/branches/glibc-branch-squeeze/debian/patches/kfreebsd/local-sysdeps.diff
Log:
2.11 have slightly different internals
Modified: glibc-package/branches/glibc-branch-squeeze/debian/changelog
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/changelog
2011-08-01 07:27:42 UTC (rev 4838)
+++ glibc-package/branches/glibc-branch-squeeze/debian/changelog
2011-08-01 08:28:42 UTC (rev 4839)
@@ -4,7 +4,7 @@
optimization with gcc-4.6. Closes: #619963.
* Add patches/any/cvs-fnmatch.diff to fix an integer overflow in
fnmatch() (CVE-2011-1659). Closes: #626370.
- * kfreebsd/local-sysdeps.diff, update to r3662 (from squeeze glibc-bsd).
+ * kfreebsd/local-sysdeps.diff, update to r3663 (from squeeze glibc-bsd).
- fixes LD_PRELOAD with a kfreebsd-9 kernel. Closes: #630695.
- uses upstream RFTSIGZMB for exit signal selection when available.
- fixes a crash in if_nameindex() with more than 3 interfaces.
Modified:
glibc-package/branches/glibc-branch-squeeze/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
---
glibc-package/branches/glibc-branch-squeeze/debian/patches/kfreebsd/local-sysdeps.diff
2011-08-01 07:27:42 UTC (rev 4838)
+++
glibc-package/branches/glibc-branch-squeeze/debian/patches/kfreebsd/local-sysdeps.diff
2011-08-01 08:28:42 UTC (rev 4839)
@@ -8661,7 +8661,7 @@
+ElfW(Addr)
+_dl_sysdep_start (void **start_argptr,
+ void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phnum,
-+ ElfW(Addr) *user_entry, ElfW(auxv_t) *auxv))
++ ElfW(Addr) *user_entry))
+{
+ const ElfW(Phdr) *phdr = NULL;
+ ElfW(Word) phnum = 0;
@@ -8741,14 +8741,14 @@
+ if (GLRO(dl_platform) != NULL)
+ GLRO(dl_platformlen) = strlen (GLRO(dl_platform));
+
-+ if (__sbrk (0) == _end)
++ if (__sbrk (0) == &_end)
+ /* The dynamic linker was run as a program, and so the initial break
+ starts just after our bss, at &_end. The malloc in dl-minimal.c
+ will consume the rest of this page, so tell the kernel to move the
+ break up that far. When the user program examines its break, it
+ will see this new value and not clobber our data. */
+ __sbrk (GLRO(dl_pagesize)
-+ - ((_end - (char *) 0) & (GLRO(dl_pagesize) - 1)));
++ - ((&_end - (void *) 0) & (GLRO(dl_pagesize) - 1)));
+
+ /* If this is a SUID program we make sure that FDs 0, 1, and 2 are
+ allocated. If necessary we are doing it ourself. If it is not
@@ -8756,7 +8756,7 @@
+ if (__builtin_expect (INTUSE(__libc_enable_secure), 0))
+ __libc_check_standard_fds ();
+
-+ (*dl_main) (phdr, phnum, &user_entry, _dl_auxv);
++ (*dl_main) (phdr, phnum, &user_entry);
+ return user_entry;
+}
+
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qnnrf-0008uv...@vasks.debian.org
