r3845 - in glibc-package/branches/multiarch/debian: . patches patches/hurd-i386 rules.d sysdeps
Author: aurel32
Date: 2009-09-15 12:56:21 +0000 (Tue, 15 Sep 2009)
New Revision: 3845
Added:
glibc-package/branches/multiarch/debian/patches/hurd-i386/submitted-null-pathname.diff
glibc-package/branches/multiarch/debian/patches/hurd-i386/submitted-sbrk.diff
Modified:
glibc-package/branches/multiarch/debian/changelog
glibc-package/branches/multiarch/debian/patches/series
glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk
Log:
Merge from unstable, revisions 3809-3844
Modified: glibc-package/branches/multiarch/debian/changelog
===================================================================
--- glibc-package/branches/multiarch/debian/changelog 2009-09-15 12:52:25 UTC (rev 3844)
+++ glibc-package/branches/multiarch/debian/changelog 2009-09-15 12:56:21 UTC (rev 3845)
@@ -27,16 +27,27 @@
- use real dependencies between the build_* and binaryinst_*
targets.
- simplify clean target.
+ * Set the minimum kernel version to 6.0.0 for biarch library on
+ kfreebsd-amd64 to match the main library.
[ Samuel Thibault ]
* debian/debhelper.in/libc.install: Install libc/*-gnu*/ instead of
libc/*-*-gnu*/, to fix FTBFS on hurd-i386 due to it now being i486-gnu/.
+ * debian/patches/hurd-i386/submitted-null-pathname.diff: New patch to fix
+ chdir("") and chroot("") into returning ENOENT.
+ * debian/patches/hurd-i386/submitted-sbrk.diff: New patch to fix sbrk beyond
+ 128MB.
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 2779 (from glibc-bsd).
- -- Aurelien Jarno <aurel32@debian.org> Mon, 07 Sep 2009 20:49:08 +0200
+ [ Clint Adams ]
+ * debian/rules.d/debhelper.mk: make sure that snippets are included
+ before doing CURRENT_VER substitution; fix thanks to Steve
+ Langasek.
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 09 Sep 2009 20:08:58 +0200
+
eglibc (2.9-26) unstable; urgency=low
[ Aurelien Jarno ]
Added: glibc-package/branches/multiarch/debian/patches/hurd-i386/submitted-null-pathname.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/hurd-i386/submitted-null-pathname.diff (rev 0)
+++ glibc-package/branches/multiarch/debian/patches/hurd-i386/submitted-null-pathname.diff 2009-09-15 12:56:21 UTC (rev 3845)
@@ -0,0 +1,46 @@
+2009-09-13 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * hurd/hurdchdir.c (_hurd_change_directory_port_from_name):
+ Return ENOENT when name is empty.
+ * sysdeps/mach/hurd/chroot.c (chroot): Return ENOENT when path
+ is empty.
+
+---
+ hurd/hurdchdir.c | 6 ++++++
+ sysdeps/mach/hurd/chroot.c | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/hurd/hurdchdir.c b/hurd/hurdchdir.c
+index 5115e4d..b1cc7a5 100644
+--- a/hurd/hurdchdir.c
++++ b/hurd/hurdchdir.c
+@@ -38,6 +38,12 @@ _hurd_change_directory_port_from_name (struct hurd_port *portcell,
+ len = strlen (name);
+ if (len >= 2 && name[len - 2] == '/' && name[len - 1] == '.')
+ lookup = name;
++ else if (len == 0)
++ {
++ /* Special-case null pathname according to POSIX */
++ errno = ENOENT;
++ return -1;
++ }
+ else
+ {
+ char *n = alloca (len + 3);
+diff --git a/sysdeps/mach/hurd/chroot.c b/sysdeps/mach/hurd/chroot.c
+index fde0164..cabeb7d 100644
+--- a/sysdeps/mach/hurd/chroot.c
++++ b/sysdeps/mach/hurd/chroot.c
+@@ -38,6 +38,12 @@ chroot (const char *path)
+ len = strlen (path);
+ if (len >= 2 && path[len - 2] == '/' && path[len - 1] == '.')
+ lookup = path;
++ else if (len == 0)
++ {
++ /* Special-case null pathname according to POSIX */
++ errno = ENOENT;
++ return -1;
++ }
+ else
+ {
+ char *n = alloca (len + 3);
Added: glibc-package/branches/multiarch/debian/patches/hurd-i386/submitted-sbrk.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/hurd-i386/submitted-sbrk.diff (rev 0)
+++ glibc-package/branches/multiarch/debian/patches/hurd-i386/submitted-sbrk.diff 2009-09-15 12:56:21 UTC (rev 3845)
@@ -0,0 +1,48 @@
+2009-09-14 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * sysdeps/mach/hurd/brk.c (_hurd_set_brk): When more space needs to be
+ allocated, call __vm_protect to finish enabling the existing space, and
+ pass a copy of _hurd_data_end instead of pagebrk to __vm_allocate to
+ allocate the remainder.
+
+---
+ brk.c | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/sysdeps/mach/hurd/brk.c b/sysdeps/mach/hurd/brk.c
+index 931b260..4a135d3 100644
+--- a/sysdeps/mach/hurd/brk.c
++++ b/sysdeps/mach/hurd/brk.c
+@@ -64,7 +64,7 @@ weak_alias (__brk, brk)
+ int
+ _hurd_set_brk (vm_address_t addr)
+ {
+- error_t err;
++ error_t err = 0;
+ vm_address_t pagend = round_page (addr);
+ vm_address_t pagebrk = round_page (_hurd_brk);
+ long int rlimit;
+@@ -101,8 +101,22 @@ _hurd_set_brk (vm_address_t addr)
+
+ if (pagend > _hurd_data_end)
+ {
++ vm_address_t alloc_start = _hurd_data_end;
++
+ /* We didn't allocate enough space! Hopefully we can get some more! */
+- err = __vm_allocate (__mach_task_self (), &pagebrk, pagend - pagebrk, 0);
++
++ if (_hurd_data_end > pagebrk)
++ /* First finish allocation */
++ err = __vm_protect (__mach_task_self (), pagebrk,
++ alloc_start - pagebrk, 0,
++ VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
++ if (! err)
++ _hurd_brk = alloc_start;
++
++ if (! err)
++ err = __vm_allocate (__mach_task_self (), &alloc_start,
++ pagend - alloc_start, 0);
++
+ if (! err)
+ _hurd_data_end = pagend;
+ }
Modified: glibc-package/branches/multiarch/debian/patches/series
===================================================================
--- glibc-package/branches/multiarch/debian/patches/series 2009-09-15 12:52:25 UTC (rev 3844)
+++ glibc-package/branches/multiarch/debian/patches/series 2009-09-15 12:56:21 UTC (rev 3845)
@@ -108,6 +108,8 @@
hurd-i386/local-pthread_types.diff
hurd-i386/cvs-strerror_l.diff
hurd-i386/cvs-rtld.diff
+hurd-i386/submitted-null-pathname.diff
+hurd-i386/submitted-sbrk.diff
i386/local-biarch.diff
i386/local-clone.diff
Modified: glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-09-15 12:52:25 UTC (rev 3844)
+++ glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-09-15 12:56:21 UTC (rev 3845)
@@ -142,11 +142,11 @@
cp $$x $$y; \
sed -e "s#BUILD-TREE#$(build-tree)#" -i $$y; \
sed -e "s#LIBC#$(libc)#" -i $$y; \
- sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$y; \
sed -e "s#EXIT_CHECK##" -i $$y; \
sed -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" -i $$y; \
sed -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" -i $$y; \
sed -e "/NOHWCAP/r debian/script.in/nohwcap.sh" -i $$y; \
+ sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$y; \
case $$y in \
*.install) \
sed -e "s/^#.*//" -i $$y ; \
Modified: glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk 2009-09-15 12:52:25 UTC (rev 3844)
+++ glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk 2009-09-15 12:56:21 UTC (rev 3845)
@@ -18,7 +18,7 @@
i386_includedir = /usr/include/i486-kfreebsd-gnu
i386_slibdir = /lib32
i386_libdir = /usr/lib32
-i386_MIN_KERNEL_SUPPORTED = 5.4.0
+i386_MIN_KERNEL_SUPPORTED = 6.0.0
define libc0.1-dev-i386_extra_pkg_install
mkdir -p debian/libc0.1-dev-i386/usr/include/gnu
Reply to: