refresh_debian/patches/proc_set_init_task.patch

1 files changed, 11 insertions, 37 deletions

diff --git a/debian/patches/proc_set_init_task.patch b/debian/patches/proc_set_init_task.patch
index 84383fe1..5651df3e 100644
--- a/debian/patches/proc_set_init_task.patch
+++ b/debian/patches/proc_set_init_task.patch
@@ -1,5 +1,3 @@
-diff --git a/hurd/process.defs b/hurd/process.defs
-index bf90556..8c17666 100644
 --- a/hurd/process.defs
 +++ b/hurd/process.defs
 @@ -373,7 +373,11 @@ routine proc_getnports (
@@ -15,8 +13,6 @@ index bf90556..8c17666 100644
  
  /* Inform the process server that the process is important.  */
  routine proc_mark_important (
-diff --git a/hurd/process_request.defs b/hurd/process_request.defs
-index 38e7146..cb8f083 100644
 --- a/hurd/process_request.defs
 +++ b/hurd/process_request.defs
 @@ -374,7 +374,10 @@ simpleroutine proc_getnports_request (
@@ -31,8 +27,6 @@ index 38e7146..cb8f083 100644
  
  /* Inform the process server that the process is important.  */
  simpleroutine proc_mark_important_request (
-diff --git a/include/pids.h b/include/pids.h
-index 22415f4..dff7635 100644
 --- a/include/pids.h
 +++ b/include/pids.h
 @@ -22,8 +22,9 @@
@@ -48,11 +42,9 @@ index 22415f4..dff7635 100644
 +#define HURD_PID_PROC		4
  
  #endif  /* _HURD_PROCESSES_H */
-diff --git a/init/init.c b/init/init.c
-index 94f1a9b..9982558 100644
 --- a/init/init.c
 +++ b/init/init.c
-@@ -1057,7 +1057,7 @@ start_child (const char *prog, char **progargs)
+@@ -1089,7 +1089,7 @@ start_child (const char *prog, char **pr
  	       NULL, 0,	/* OSF Mach */
  #endif
  	       0, &child_task);
@@ -61,8 +53,6 @@ index 94f1a9b..9982558 100644
    proc_task2pid (procserver, child_task, &child_pid);
    proc_task2proc (procserver, child_task, &default_ports[INIT_PORT_PROC]);
  
-diff --git a/proc/main.c b/proc/main.c
-index 73abbc0..6fe2330 100644
 --- a/proc/main.c
 +++ b/proc/main.c
 @@ -1,5 +1,5 @@
@@ -72,7 +62,7 @@ index 73abbc0..6fe2330 100644
  
  This file is part of the GNU Hurd.
  
-@@ -82,7 +82,12 @@ main (int argc, char **argv, char **envp)
+@@ -88,7 +88,12 @@ main (int argc, char **argv, char **envp
    generic_port = ports_get_right (genport);
  
    /* Create the initial proc object for init (PID 1).  */
@@ -84,10 +74,8 @@ index 73abbc0..6fe2330 100644
 +  startup_proc->p_deadmsg = 1;
 +  complete_proc (startup_proc, HURD_PID_STARTUP);
  
-   /* Create our own proc object (we are PID 0).  */
+   /* Create our own proc object.  */
    self_proc = allocate_proc (mach_task_self ());
-diff --git a/proc/mgt.c b/proc/mgt.c
-index d7ad296..6d3df7e 100644
 --- a/proc/mgt.c
 +++ b/proc/mgt.c
 @@ -1,5 +1,6 @@
@@ -107,7 +95,7 @@ index d7ad296..6d3df7e 100644
    if (childp->p_sib)
      childp->p_sib->p_prevsib = childp->p_prevsib;
    *childp->p_prevsib = childp->p_sib;
-@@ -583,7 +584,7 @@ allocate_proc (task_t task)
+@@ -590,7 +591,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 *
@@ -116,7 +104,7 @@ index d7ad296..6d3df7e 100644
  {
    static const uid_t zero;
    struct proc *p;
-@@ -592,7 +593,7 @@ create_startup_proc (void)
+@@ -599,7 +600,7 @@ create_startup_proc (void)
    p = allocate_proc (MACH_PORT_NULL);
    assert (p);
  
@@ -125,7 +113,7 @@ index d7ad296..6d3df7e 100644
  
    p->p_parent = p;
    p->p_sib = 0;
-@@ -640,7 +641,7 @@ proc_death_notify (struct proc *p)
+@@ -647,7 +648,7 @@ proc_death_notify (struct proc *p)
  }
  
  /* Complete a new process that has been allocated but not entirely initialized.
@@ -134,7 +122,7 @@ index d7ad296..6d3df7e 100644
  void
  complete_proc (struct proc *p, pid_t pid)
  {
-@@ -659,30 +660,47 @@ complete_proc (struct proc *p, pid_t pid)
+@@ -666,30 +667,47 @@ complete_proc (struct proc *p, pid_t pid
  
    p->p_pid = pid;
  
@@ -191,7 +179,7 @@ index d7ad296..6d3df7e 100644
    join_pgrp (p);
  }
  
-@@ -744,7 +762,7 @@ process_has_exited (struct proc *p)
+@@ -751,7 +769,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);
@@ -200,7 +188,7 @@ index d7ad296..6d3df7e 100644
  	  if (tp->p_dead)
  	    isdead = 1;
  	}
-@@ -752,17 +770,17 @@ process_has_exited (struct proc *p)
+@@ -759,17 +777,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);
@@ -223,7 +211,7 @@ index d7ad296..6d3df7e 100644
      }
  
    /* If an operation is in progress for this process, cause it
-@@ -942,3 +960,21 @@ S_proc_get_code (struct proc *callerp,
+@@ -949,3 +967,21 @@ S_proc_get_code (struct proc *callerp,
  
    return 0;
  }
@@ -245,8 +233,6 @@ index d7ad296..6d3df7e 100644
 +
 +  return 0;
 +}
-diff --git a/proc/proc.h b/proc/proc.h
-index 80f8397..b544b8d 100644
 --- a/proc/proc.h
 +++ b/proc/proc.h
 @@ -1,5 +1,6 @@
@@ -257,17 +243,7 @@ index 80f8397..b544b8d 100644
  
  This file is part of the GNU Hurd.
  
-@@ -134,7 +135,8 @@ struct exc
- 
- mach_port_t authserver;
- struct proc *self_proc;		/* process 0 (us) */
--struct proc *startup_proc;	/* process 1 (init) */
-+struct proc *init_proc;		/* process 1 (sysvinit) */
-+struct proc *startup_proc;	/* process 2 (hurd/init) */
- 
- struct port_bucket *proc_bucket;
- struct port_class *proc_class;
-@@ -195,7 +197,7 @@ void exc_clean (void *);
+@@ -191,7 +192,7 @@ void exc_clean (void *);
  struct proc *add_tasks (task_t);
  int pidfree (pid_t);
  
@@ -276,8 +252,6 @@ index 80f8397..b544b8d 100644
  struct proc *allocate_proc (task_t);
  void proc_death_notify (struct proc *);
  void complete_proc (struct proc *, pid_t);
-diff --git a/procfs/main.c b/procfs/main.c
-index 54e9682..8727f86 100644
 --- a/procfs/main.c
 +++ b/procfs/main.c
 @@ -42,7 +42,7 @@ uid_t opt_anon_owner;