Author: sthibault Date: 2015-09-20 21:17:28 +0000 (Sun, 20 Sep 2015) New Revision: 6607
Modified: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-cache-mach_host_self.diff glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-exec_filename.diff Log: fix more fuzz Modified: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-cache-mach_host_self.diff =================================================================== --- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-cache-mach_host_self.diff 2015-09-20 21:17:04 UTC (rev 6606) +++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-cache-mach_host_self.diff 2015-09-20 21:17:28 UTC (rev 6607) @@ -21,10 +21,8 @@ sysdeps/mach/hurd/dl-sysdep.c | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) -Index: glibc-2.19/mach/mach/mach_traps.h -=================================================================== ---- glibc-2.19.orig/mach/mach/mach_traps.h -+++ glibc-2.19/mach/mach/mach_traps.h +--- a/mach/mach/mach_traps.h ++++ b/mach/mach/mach_traps.h @@ -41,9 +41,10 @@ extern mach_port_t __mach_thread_self (v extern mach_port_t (mach_task_self) (void); extern mach_port_t (__mach_task_self) (void); @@ -39,10 +37,8 @@ /* Attempt to context switch the current thread off the processor. Returns true if there are other threads that can be run and false if not. */ -Index: glibc-2.19/mach/mach_init.c -=================================================================== ---- glibc-2.19.orig/mach/mach_init.c -+++ glibc-2.19/mach/mach_init.c +--- a/mach/mach_init.c ++++ b/mach/mach_init.c @@ -20,6 +20,7 @@ #include <unistd.h> @@ -58,11 +54,9 @@ + __mach_host_self_ = (__mach_host_self) (); __mig_init (0); - #if HAVE_HOST_PAGE_SIZE -Index: glibc-2.19/mach/mach_init.h -=================================================================== ---- glibc-2.19.orig/mach/mach_init.h -+++ glibc-2.19/mach/mach_init.h + #ifdef HAVE_HOST_PAGE_SIZE +--- a/mach/mach_init.h ++++ b/mach/mach_init.h @@ -31,6 +31,11 @@ extern mach_port_t __mach_task_self_; #define __mach_task_self() (__mach_task_self_ + 0) /* Not an lvalue. */ #define mach_task_self() (__mach_task_self ()) @@ -75,10 +69,8 @@ /* Kernel page size. */ extern vm_size_t __vm_page_size; extern vm_size_t vm_page_size; -Index: glibc-2.19/sysdeps/mach/hurd/dl-sysdep.c -=================================================================== ---- glibc-2.19.orig/sysdeps/mach/hurd/dl-sysdep.c -+++ glibc-2.19/sysdeps/mach/hurd/dl-sysdep.c +--- a/sysdeps/mach/hurd/dl-sysdep.c ++++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -278,6 +278,7 @@ _dl_sysdep_start_cleanup (void) __mach_init. We are done with them now, and the user will reacquire them for himself when he wants them. */ Modified: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-exec_filename.diff =================================================================== --- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-exec_filename.diff 2015-09-20 21:17:04 UTC (rev 6606) +++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-exec_filename.diff 2015-09-20 21:17:28 UTC (rev 6607) @@ -33,10 +33,8 @@ sysdeps/mach/hurd/spawni.c | 59 ++++++++++++++++++++++++++------------------ 8 files changed, 102 insertions(+), 43 deletions(-) -Index: glibc-2.21/hurd/Versions -=================================================================== ---- glibc-2.21.orig/hurd/Versions -+++ glibc-2.21/hurd/Versions +--- a/hurd/Versions ++++ b/hurd/Versions @@ -140,6 +140,14 @@ libc { _hurd_sigstate_unlock; _hurd_sigstate_delete; @@ -52,12 +50,10 @@ HURD_CTHREADS_0.3 { # weak refs to libthreads functions that libc calls iff libthreads in use -Index: glibc-2.21/hurd/Makefile -=================================================================== ---- glibc-2.21.orig/hurd/Makefile -+++ glibc-2.21/hurd/Makefile +--- a/hurd/Makefile ++++ b/hurd/Makefile @@ -32,8 +32,8 @@ user-interfaces := $(addprefix hurd/,\ - auth startup \ + auth auth_request auth_reply startup \ process process_request \ msg msg_reply msg_request \ - exec exec_startup crash interrupt \ @@ -67,10 +63,8 @@ login password pfinet \ ) server-interfaces := hurd/msg faultexc -Index: glibc-2.21/hurd/hurd.h -=================================================================== ---- glibc-2.21.orig/hurd/hurd.h -+++ glibc-2.21/hurd/hurd.h +--- a/hurd/hurd.h ++++ b/hurd/hurd.h @@ -245,12 +245,20 @@ extern FILE *fopenport (io_t port, const extern FILE *__fopenport (io_t port, const char *mode); @@ -94,10 +88,8 @@ /* Inform the proc server we have exited with STATUS, and kill the -Index: glibc-2.21/hurd/hurdexec.c -=================================================================== ---- glibc-2.21.orig/hurd/hurdexec.c -+++ glibc-2.21/hurd/hurdexec.c +--- a/hurd/hurdexec.c ++++ b/hurd/hurdexec.c @@ -28,13 +28,33 @@ #include <assert.h> #include <argz.h> @@ -191,10 +183,8 @@ +} +compat_symbol (libc, __hurd_exec_file_name_2_13, _hurd_exec_file_name, GLIBC_2_13_DEBIAN_33); +#endif -Index: glibc-2.21/sysdeps/mach/hurd/execve.c -=================================================================== ---- glibc-2.21.orig/sysdeps/mach/hurd/execve.c -+++ glibc-2.21/sysdeps/mach/hurd/execve.c +--- a/sysdeps/mach/hurd/execve.c ++++ b/sysdeps/mach/hurd/execve.c @@ -34,7 +34,8 @@ __execve (file_name, argv, envp) return -1; @@ -205,10 +195,8 @@ /* Oh well. Might as well be tidy. */ __mach_port_deallocate (__mach_task_self (), file); -Index: glibc-2.21/sysdeps/mach/hurd/fexecve.c -=================================================================== ---- glibc-2.21.orig/sysdeps/mach/hurd/fexecve.c -+++ glibc-2.21/sysdeps/mach/hurd/fexecve.c +--- a/sysdeps/mach/hurd/fexecve.c ++++ b/sysdeps/mach/hurd/fexecve.c @@ -25,8 +25,9 @@ int fexecve (int fd, char *const argv[], char *const envp[]) @@ -221,10 +209,8 @@ if (! err) err = EGRATUITOUS; return __hurd_fail (err); -Index: glibc-2.21/sysdeps/mach/hurd/spawni.c -=================================================================== ---- glibc-2.21.orig/sysdeps/mach/hurd/spawni.c -+++ glibc-2.21/sysdeps/mach/hurd/spawni.c +--- a/sysdeps/mach/hurd/spawni.c ++++ b/sysdeps/mach/hurd/spawni.c @@ -43,7 +43,7 @@ __spawni (pid_t *pid, const char *file, int xflags) {