reorder patches, refresh newRPC.patch proc_set_init_task.patch

3 files changed, 14 insertions, 18 deletions

diff --git a/debian/patches/newRPC.patch b/debian/patches/newRPC.patch
index 000f0e46..7d26737d 100644
--- a/debian/patches/newRPC.patch
+++ b/debian/patches/newRPC.patch
@@ -1,5 +1,3 @@
-diff --git a/init/Makefile b/init/Makefile
-index ffb82ff..5ae3b50 100644
 --- a/init/Makefile
 +++ b/init/Makefile
 @@ -21,7 +21,7 @@ makemode := server
@@ -11,16 +9,14 @@ index ffb82ff..5ae3b50 100644
  target = init
  HURDLIBS = shouldbeinlibc
  
-diff --git a/proc/Makefile b/proc/Makefile
-index 2eed13c..dc768d3 100644
 --- a/proc/Makefile
 +++ b/proc/Makefile
-@@ -29,7 +29,7 @@ MIGSFLAGS="-DPROCESS_INTRAN=pstruct_t reqport_find (process_t)" \
+@@ -29,7 +29,7 @@ MIGSFLAGS="-DPROCESS_INTRAN=pstruct_t re
  	"-DPROCESS_IMPORTS=import \"proc.h\";"
  
  MIGSTUBS = processServer.o notifyServer.o \
--	ourmsgUser.o proc_excUser.o proc_excServer.o
-+	ourmsgUser.o proc_excUser.o proc_excServer.o processUser.o
+-	ourmsgUser.o proc_excUser.o proc_excServer.o gnumachUser.o
++	ourmsgUser.o proc_excUser.o proc_excServer.o gnumachUser.o processUser.o
  OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
  HURDLIBS = ihash ports shouldbeinlibc
  OTHERLIBS = -lpthread
diff --git a/debian/patches/proc_set_init_task.patch b/debian/patches/proc_set_init_task.patch
index 45f2c284..ae29d914 100644
--- a/debian/patches/proc_set_init_task.patch
+++ b/debian/patches/proc_set_init_task.patch
@@ -95,7 +95,7 @@
    if (childp->p_sib)
      childp->p_sib->p_prevsib = childp->p_prevsib;
    *childp->p_prevsib = childp->p_sib;
-@@ -590,7 +591,7 @@ allocate_proc (task_t task)
+@@ -587,7 +588,7 @@ allocate_proc (task_t task)
  /* Allocate and initialize the proc structure for init (PID 1),
     the original parent of all other procs.  */
  struct proc *
@@ -104,7 +104,7 @@
  {
    static const uid_t zero;
    struct proc *p;
-@@ -599,7 +600,7 @@ create_startup_proc (void)
+@@ -596,7 +597,7 @@ create_startup_proc (void)
    p = allocate_proc (MACH_PORT_NULL);
    assert (p);
  
@@ -113,7 +113,7 @@
  
    p->p_parent = p;
    p->p_sib = 0;
-@@ -647,7 +648,7 @@ proc_death_notify (struct proc *p)
+@@ -644,7 +645,7 @@ proc_death_notify (struct proc *p)
  }
  
  /* Complete a new process that has been allocated but not entirely initialized.
@@ -122,9 +122,9 @@
  void
  complete_proc (struct proc *p, pid_t pid)
  {
-@@ -666,30 +667,47 @@ complete_proc (struct proc *p, pid_t pid
- 
-   p->p_pid = pid;
+@@ -667,30 +668,47 @@ complete_proc (struct proc *p, pid_t pid
+   snprintf (name, sizeof name, "with pid %i", pid);
+   task_set_name (p->p_task, name);
  
 -  ids_ref (&nullids);
 -  p->p_id = &nullids;
@@ -179,7 +179,7 @@
    join_pgrp (p);
  }
  
-@@ -751,7 +769,7 @@ process_has_exited (struct proc *p)
+@@ -752,7 +770,7 @@ process_has_exited (struct proc *p)
  	    nowait_msg_proc_newids (tp->p_msgport, tp->p_task,
  				    1, tp->p_pgrp->pg_pgid,
  				    !tp->p_pgrp->pg_orphcnt);
@@ -188,7 +188,7 @@
  	  if (tp->p_dead)
  	    isdead = 1;
  	}
-@@ -759,17 +777,17 @@ process_has_exited (struct proc *p)
+@@ -760,17 +778,17 @@ process_has_exited (struct proc *p)
  	nowait_msg_proc_newids (tp->p_msgport, tp->p_task,
  				1, tp->p_pgrp->pg_pgid,
  				!tp->p_pgrp->pg_orphcnt);
@@ -211,7 +211,7 @@
      }
  
    /* If an operation is in progress for this process, cause it
-@@ -949,3 +967,21 @@ S_proc_get_code (struct proc *callerp,
+@@ -950,3 +968,21 @@ S_proc_get_code (struct proc *callerp,
  
    return 0;
  }
@@ -253,7 +253,7 @@
  
  struct port_bucket *proc_bucket;
  struct port_class *proc_class;
-@@ -190,7 +192,7 @@ void exc_clean (void *);
+@@ -190,27 +192,7 @@ void exc_clean (void *);
  struct proc *add_tasks (task_t);
  int pidfree (pid_t);
  
diff --git a/debian/patches/series b/debian/patches/series
index ecc5d505..ec9edb8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+feature-proc-set-task-name-to-pid.patch
 diskfs_no_inherit_dir_group.patch
 init_try_runsystem.gnu.patch
 makedev.diff
@@ -45,4 +46,3 @@ newRPC.patch
 revert-remove-threadvars-hack.patch
 xkb-compat.patch
 fix-get-children-source.patch
-feature-proc-set-task-name-to-pid.patch