sync with upstream packaging

3 files changed, 80 insertions, 52 deletions

diff --git a/debian/changelog b/debian/changelog
index 7573da9..5daf9f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gnumach (2:1.6-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 03 Nov 2015 21:31:18 +0000
+
+gnumach (2:1.5+git20150922-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+  * patches/70_dde.patch: Include kern/experimental.server.h to fix build with
+    newer mig.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 22 Sep 2015 17:12:19 +0000
+
 gnumach (2:1.5+git20150827-1) unstable; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/control b/debian/control
index 2c82a07..3c789e4 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Section: debug
 Priority: extra
 Architecture: any-i386
 Build-Profiles: <!stage1>
-Depends: ${misc:Depends}, gnumach-image-1.5-686-dbg
+Depends: ${misc:Depends}, gnumach-image-1.6-686-dbg
 Breaks: grub-pc (<< 1.98+20100527-1)
 Description: Dummy transition package for gnumach-image-*-dbg
  This is a dummy package to ease the transition to gnumach-image-*dbg
@@ -33,40 +33,22 @@ Description: Dummy transition package for gnumach-image-*-dbg
 Package: gnumach-image-1-686
 Architecture: any-i386
 Build-Profiles: <!stage1>
-Depends: ${misc:Depends}, gnumach-image-1.5-686
+Depends: ${misc:Depends}, gnumach-image-1.6-686
 Description: GNU version of the Mach microkernel
  This package depends on the latest GNU Mach kernel for use on PCs
  with a 686, Pentium or compatible processor.
 
-Package: gnumach-image-1-686-dbg
-Architecture: any-i386
-Build-Profiles: <!stage1>
-Depends: ${misc:Depends}, gnumach-image-1.5-686-dbg
-Description: GNU version of the Mach microkernel
- This package depends on the latest GNU Mach kernel for use on PCs
- with a 686, Pentium or compatible processor, debug version.
-
 Package: gnumach-image-1-xen-686
 Architecture: any-i386
 Build-Profiles: <!stage1>
-Depends: ${misc:Depends}, gnumach-image-1.5-xen-686
+Depends: ${misc:Depends}, gnumach-image-1.6-xen-686
 Description: GNU version of the Mach microkernel
  This package depends on the latest GNU Mach kernel for use on PCs
  with a 686, Pentium or compatible processor.
  .
  This kernel is for use in unprivileged (domU) Xen domains.
 
-Package: gnumach-image-1-xen-686-dbg
-Architecture: any-i386
-Build-Profiles: <!stage1>
-Depends: ${misc:Depends}, gnumach-image-1.5-xen-686-dbg
-Description: GNU version of the Mach microkernel
- This package depends on the latest GNU Mach kernel for use on PCs
- with a 686, Pentium or compatible processor, debug version.
- .
- This kernel is for use in unprivileged (domU) Xen domains.
-
-Package: gnumach-image-1.5-686
+Package: gnumach-image-1.6-686
 Architecture: any-i386
 Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, gnumach-common
@@ -75,7 +57,7 @@ Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1), xserver-xorg-core (<< 2:1.9
 Description: GNU version of the Mach microkernel
  This is the Utah Mach microkernel used by the Hurd.
 
-Package: gnumach-image-1.5-xen-686
+Package: gnumach-image-1.6-xen-686
 Architecture: any-i386
 Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, gnumach-common
@@ -86,8 +68,8 @@ Description: GNU version of the Mach microkernel for Xen
  .
  The version in this package is compiled with Xen support.
 
-Package: kernel-image-1.5-686-di
-XB-Kernel-Version: 1.5-686
+Package: kernel-image-1.6-686-di
+XB-Kernel-Version: 1.6-686
 Package-Type: udeb
 Provides: kernel-image, floppy-modules, ide-modules, input-modules, scsi-modules, serial-modules
 Section: debian-installer
@@ -99,8 +81,8 @@ Description: GNU version of the Mach microkernel for the Debian installer
  Installer boot images. It does _not_ provide a usable kernel for
  your full Debian system.
 
-Package: kernel-image-1.5-xen-686-di
-XB-Kernel-Version: 1.5-xen-686
+Package: kernel-image-1.6-xen-686-di
+XB-Kernel-Version: 1.6-xen-686
 Package-Type: udeb
 Provides: kernel-image, input-modules
 Section: debian-installer
@@ -112,7 +94,7 @@ Description: GNU version of the Mach microkernel for the Debian installer
  Installer boot images. It does _not_ provide a usable kernel for
  your full Debian system.
 
-Package: gnumach-image-1.5-686-dbg
+Package: gnumach-image-1.6-686-dbg
 Section: debug
 Priority: extra
 Provides: gnumach
@@ -127,7 +109,7 @@ Description: GNU version of the Mach microkernel for debugging
  gnumach package, except that it is not stripped and has the
  kernel-level debugger compiled in.
 
-Package: gnumach-image-1.5-xen-686-dbg
+Package: gnumach-image-1.6-xen-686-dbg
 Section: debug
 Priority: extra
 Provides: gnumach
diff --git a/debian/patches/70_dde.patch b/debian/patches/70_dde.patch
index 8d6a7fe..95f26df 100644
--- a/debian/patches/70_dde.patch
+++ b/debian/patches/70_dde.patch
@@ -1,5 +1,7 @@
---- a/Makefrag.am
-+++ b/Makefrag.am
+Index: gnumach/Makefrag.am
+===================================================================
+--- gnumach.orig/Makefrag.am
++++ gnumach/Makefrag.am
 @@ -220,6 +220,7 @@ EXTRA_DIST += \
  	kern/mach.srv \
  	kern/mach4.srv \
@@ -58,8 +60,10 @@
  #	kern/mach_debug.server.defs
  #	kern/mach_host.server.defs
  
---- a/device/ds_routines.c
-+++ b/device/ds_routines.c
+Index: gnumach/device/ds_routines.c
+===================================================================
+--- gnumach.orig/device/ds_routines.c
++++ gnumach/device/ds_routines.c
 @@ -318,6 +318,43 @@ ds_device_map (device_t dev, vm_prot_t p
  				offset, size, pager, unmap);
  }
@@ -129,8 +133,10 @@
  struct device_emulation_ops mach_device_emulation_ops =
  {
    (void*) mach_device_reference,
---- a/device/ds_routines.h
-+++ b/device/ds_routines.h
+Index: gnumach/device/ds_routines.h
+===================================================================
+--- gnumach.orig/device/ds_routines.h
++++ gnumach/device/ds_routines.h
 @@ -83,4 +83,7 @@ io_return_t ds_device_writev_trap(
  	io_buf_vec_t 	*iovec,
  	vm_size_t 	count);
@@ -139,8 +145,10 @@
 +extern ipc_port_t intr_rcv_ports[16];
 +
  #endif	/* DS_ROUTINES_H */
+Index: gnumach/device/intr.c
+===================================================================
 --- /dev/null
-+++ b/device/intr.c
++++ gnumach/device/intr.c
 @@ -0,0 +1,198 @@
 +#include <device/intr.h>
 +#include <device/ds_routines.h>
@@ -340,14 +348,18 @@
 +  return TRUE;
 +}
 +#endif	/* MACH_XEN */
+Index: gnumach/kern/experimental.srv
+===================================================================
 --- /dev/null
-+++ b/kern/experimental.srv
++++ gnumach/kern/experimental.srv
 @@ -0,0 +1,3 @@
 +#define KERNEL_SERVER 1
 +
 +#include <mach/experimental.defs>
+Index: gnumach/include/mach/experimental.defs
+===================================================================
 --- /dev/null
-+++ b/include/mach/experimental.defs
++++ gnumach/include/mach/experimental.defs
 @@ -0,0 +1,100 @@
 +/* 
 + * Mach Operating System
@@ -449,8 +461,10 @@
 +	out	vaddr		: vm_address_t;
 +	out	paddr		: vm_address_t;
 +		size		: vm_size_t);
+Index: gnumach/include/device/intr.h
+===================================================================
 --- /dev/null
-+++ b/include/device/intr.h
++++ gnumach/include/device/intr.h
 @@ -0,0 +1,17 @@
 +#ifndef __INTR_H__
 +
@@ -469,8 +483,10 @@
 +#define MACH_INTR_NOTIFY 424242
 +
 +#endif
---- a/kern/startup.c
-+++ b/kern/startup.c
+Index: gnumach/kern/startup.c
+===================================================================
+--- gnumach.orig/kern/startup.c
++++ gnumach/kern/startup.c
 @@ -79,6 +79,7 @@ boolean_t reboot_on_panic = TRUE;
  /* XX */
  extern vm_offset_t phys_first_addr, phys_last_addr;
@@ -489,8 +505,10 @@
  
  #if	NCPUS > 1
  	/*
---- a/linux/dev/arch/i386/kernel/irq.c
-+++ b/linux/dev/arch/i386/kernel/irq.c
+Index: gnumach/linux/dev/arch/i386/kernel/irq.c
+===================================================================
+--- gnumach.orig/linux/dev/arch/i386/kernel/irq.c
++++ gnumach/linux/dev/arch/i386/kernel/irq.c
 @@ -83,6 +83,7 @@ struct linux_action
    void *dev_id;
    struct linux_action *next;
@@ -614,9 +632,11 @@
    
    retval = setup_x86_irq (irq, action);
    if (retval)
---- a/vm/vm_user.c
-+++ b/vm/vm_user.c
-@@ -452,3 +452,117 @@ kern_return_t vm_wire(port, map, start,
+Index: gnumach/vm/vm_user.c
+===================================================================
+--- gnumach.orig/vm/vm_user.c
++++ gnumach/vm/vm_user.c
+@@ -449,3 +449,117 @@ kern_return_t vm_wire(port, map, start,
  				    round_page(start+size),
  				    access);
  }
@@ -734,8 +754,10 @@
 +	kfree ((vm_offset_t) pages, npages * sizeof (vm_page_t));
 +	return KERN_SUCCESS;
 +}
---- a/linux/dev/drivers/block/genhd.c
-+++ b/linux/dev/drivers/block/genhd.c
+Index: gnumach/linux/dev/drivers/block/genhd.c
+===================================================================
+--- gnumach.orig/linux/dev/drivers/block/genhd.c
++++ gnumach/linux/dev/drivers/block/genhd.c
 @@ -812,7 +812,9 @@ void device_setup(void)
  #ifdef MACH
  	linux_intr_pri = SPL6;
@@ -747,9 +769,19 @@
  #endif
  #ifndef MACH
  	console_map_init();
---- a/kern/ipc_kobject.c
-+++ b/kern/ipc_kobject.c
-@@ -159,6 +159,7 @@ ipc_kobject_server(request)
+Index: gnumach/kern/ipc_kobject.c
+===================================================================
+--- gnumach.orig/kern/ipc_kobject.c
++++ gnumach/kern/ipc_kobject.c
+@@ -56,6 +56,7 @@
+ #include <device/device_pager.server.h>
+ #include <kern/mach4.server.h>
+ #include <kern/gnumach.server.h>
++#include <kern/experimental.server.h>
+ 
+ #if MACH_DEBUG
+ #include <kern/mach_debug.server.h>
+@@ -159,6 +160,7 @@ ipc_kobject_server(request)
  	 * to perform the kernel function
  	 */
      {
@@ -757,7 +789,7 @@
  	check_simple_locks();
  	if ((routine = mach_server_routine(&request->ikm_header)) != 0
  	 || (routine = mach_port_server_routine(&request->ikm_header)) != 0
-@@ -170,6 +171,7 @@ ipc_kobject_server(request)
+@@ -170,6 +172,7 @@ ipc_kobject_server(request)
  #endif	/* MACH_DEBUG */
  	 || (routine = mach4_server_routine(&request->ikm_header)) != 0
  	 || (routine = gnumach_server_routine(&request->ikm_header)) != 0