Refresh patches

5 files changed, 99 insertions, 115 deletions

diff --git a/debian/patches/ahcisata-rump.diff b/debian/patches/ahcisata-rump.diff
index c5d66b42..03266c29 100644
--- a/debian/patches/ahcisata-rump.diff
+++ b/debian/patches/ahcisata-rump.diff
@@ -1,7 +1,7 @@
-diff --git a/buildrump.sh/src/sys/rump/include/sys/bus.h b/buildrump.sh/src/sys/rump/include/sys/bus.h
-index c7eedbcb5..bdc51f7f5 100644
---- a/buildrump.sh/src/sys/rump/include/sys/bus.h
-+++ b/buildrump.sh/src/sys/rump/include/sys/bus.h
+Index: rumpkernel/buildrump.sh/src/sys/rump/include/sys/bus.h
+===================================================================
+--- rumpkernel.orig/buildrump.sh/src/sys/rump/include/sys/bus.h
++++ rumpkernel/buildrump.sh/src/sys/rump/include/sys/bus.h
 @@ -68,4 +68,12 @@ typedef struct {
  
  #include <sys/bus_proto.h>
@@ -15,11 +15,11 @@ index c7eedbcb5..bdc51f7f5 100644
 +#define BUS_ADDR_LO32(a)        ((uint32_t) __SHIFTOUT(a, __BITS(0,31)))
 +
  #endif /* _SYS_RUMP_BUS_H_ */
-diff --git a/buildrump.sh/src/sys/dev/ic/ahcisata_core.c b/buildrump.sh/src/sys/dev/ic/ahcisata_core.c
-index 8910f0a08..00a701094 100644
---- a/buildrump.sh/src/sys/dev/ic/ahcisata_core.c
-+++ b/buildrump.sh/src/sys/dev/ic/ahcisata_core.c
-@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.100 2021/08/07 16:19:11 thorpej
+Index: rumpkernel/buildrump.sh/src/sys/dev/ic/ahcisata_core.c
+===================================================================
+--- rumpkernel.orig/buildrump.sh/src/sys/dev/ic/ahcisata_core.c
++++ rumpkernel/buildrump.sh/src/sys/dev/ic/ahcisata_core.c
+@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: ahcisata_cor
  #include <sys/disklabel.h>
  #include <sys/proc.h>
  #include <sys/buf.h>
@@ -27,23 +27,22 @@ index 8910f0a08..00a701094 100644
  
  #include <dev/ata/atareg.h>
  #include <dev/ata/satavar.h>
-diff --git a/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp b/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
-index 272304e3..44b607f6 100644
---- a/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
-+++ b/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
-@@ -8,6 +8,7 @@ RUMPDEVCOMP=	audio bpf cgd disk dm drvctl fss md netsmb		\
- RUMPUSBDEVS=	ubt ucom ugenhc ulpt umass usb
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
+===================================================================
+--- rumpkernel.orig/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
+@@ -8,6 +8,7 @@ RUMPDEVCOMP=	audio bpf cgd disk dm drvct
+ RUMPUSBDEVS=	ualea ubt ucom ugenhc ulpt umass usb
  
  RUMPPCIDEVS=	pci pci_if_iwn pci_if_pcn pci_if_wm
 +RUMPPCIDEVS+=	pci_ahcisata
  RUMPPCIDEVS+=	pci_piixide
  RUMPPCIDEVS+=	pci_usbhc
  RUMPPCIDEVS+=	pci_virtio virtio_if_vioif virtio_ld virtio_viornd
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf
-new file mode 100644
-index 00000000..2b7263bf
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/AHCISATA.ioconf
 @@ -0,0 +1,19 @@
 +ioconf ahcisata
 +
@@ -64,11 +63,10 @@ index 00000000..2b7263bf
 +
 +# ATAPI support
 +atapi*		at ahcisata?
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
-new file mode 100644
-index 00000000..1f6b870e
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/Makefile
 @@ -0,0 +1,21 @@
 +.PATH:	${.CURDIR}/../../../../dev/pci \
 +	${.CURDIR}/../../../../dev/ata \
@@ -91,11 +89,10 @@ index 00000000..1f6b870e
 +
 +.include <bsd.lib.mk>
 +.include <bsd.klinks.mk>
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ahcisata_component.c b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ahcisata_component.c
-new file mode 100644
-index 00000000..0cc9f481
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ahcisata_component.c
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ahcisata_component.c
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ahcisata_component.c
 @@ -0,0 +1,40 @@
 +#include <sys/param.h>
 +#include <sys/conf.h>
@@ -137,47 +134,41 @@ index 00000000..0cc9f481
 +	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/rwd3", 'a',
 +	    cmaj, 24, 8));
 +}
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wd.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wd.h
-new file mode 100644
-index 00000000..e69de29b
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wd.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wd.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wd.h
 @@ -0,0 +1 @@
 +
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ataraid.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ataraid.h
-new file mode 100644
-index 00000000..e69de29b
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ataraid.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ataraid.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/ataraid.h
 @@ -0,0 +1 @@
 +
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_ata.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_ata.h
-new file mode 100644
-index 00000000..e69de29b
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_ata.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_ata.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_ata.h
 @@ -0,0 +1 @@
 +
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wdc.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wdc.h
-new file mode 100644
-index 00000000..ad9cf43a
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wdc.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wdc.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/opt_wdc.h
 @@ -0,0 +1,3 @@
 +#define NWD	1
 +#define NSATA	1
 +#define WDC_NO_IDS
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata.h
-new file mode 100644
-index 00000000..e69de29b
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata.h
 @@ -0,0 +1 @@
 +
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata_pmp.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata_pmp.h
-new file mode 100644
-index 00000000..e69de29b
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata_pmp.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata_pmp.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_ahcisata/sata_pmp.h
 @@ -0,0 +1 @@
 +
diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff
index 3d03741e..e57d5315 100644
--- a/debian/patches/path_max.diff
+++ b/debian/patches/path_max.diff
@@ -5,7 +5,7 @@ Index: rumpkernel/buildrump.sh/src/sys/rump/include/rump/rumpuser.h
 ===================================================================
 --- rumpkernel.orig/buildrump.sh/src/sys/rump/include/rump/rumpuser.h
 +++ rumpkernel/buildrump.sh/src/sys/rump/include/rump/rumpuser.h
-@@ -251,4 +251,8 @@ int	rumpuser_sp_raise(void *, int);
+@@ -255,4 +255,8 @@ int	rumpuser_sp_raise(void *, int);
  void	rumpuser_sp_fini(void *);
  #endif /* _RUMP_SYSPROXY || LIBRUMPUSER */
  
@@ -18,8 +18,8 @@ Index: rumpkernel/buildrump.sh/src/lib/librumpuser/sp_common.c
 ===================================================================
 --- rumpkernel.orig/buildrump.sh/src/lib/librumpuser/sp_common.c
 +++ rumpkernel/buildrump.sh/src/lib/librumpuser/sp_common.c
-@@ -64,6 +64,10 @@
- #define __unused __attribute__((__unused__))
+@@ -67,6 +67,10 @@
+ #define __printflike(a,b) __attribute__((__format__(__printf__, a, b))))
  #endif
  
 +#ifndef PATH_MAX
diff --git a/debian/patches/pci-userspace-rump.diff b/debian/patches/pci-userspace-rump.diff
index 24d32cf9..76c8e8e0 100644
--- a/debian/patches/pci-userspace-rump.diff
+++ b/debian/patches/pci-userspace-rump.diff
@@ -1,6 +1,8 @@
---- a/pci-userspace/src-gnu/Makefile.inc
-+++ b/pci-userspace/src-gnu/Makefile.inc
-@@ -4,6 +4,6 @@
+Index: rumpkernel/pci-userspace/src-gnu/Makefile.inc
+===================================================================
+--- rumpkernel.orig/pci-userspace/src-gnu/Makefile.inc
++++ rumpkernel/pci-userspace/src-gnu/Makefile.inc
+@@ -4,8 +4,8 @@ PCIDIR:=	${.PARSEDIR}
  .PATH:		${PCIDIR}
  
  RUMPCOMP_USER_SRCS=	pci_user-gnu.c mach_debugUser.c
diff --git a/debian/patches/piixide-rump.diff b/debian/patches/piixide-rump.diff
index a6e7304d..716fe19f 100644
--- a/debian/patches/piixide-rump.diff
+++ b/debian/patches/piixide-rump.diff
@@ -1,20 +1,19 @@
-diff --git a/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp b/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
-index d59783d1..272304e3 100644
---- a/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
-+++ b/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
-@@ -8,6 +8,7 @@ RUMPDEVCOMP=	audio bpf cgd disk dm drvctl fss md netsmb		\
- RUMPUSBDEVS=	ubt ucom ugenhc ulpt umass usb
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
+===================================================================
+--- rumpkernel.orig/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/Makefile.rumpdevcomp
+@@ -8,6 +8,7 @@ RUMPDEVCOMP=	audio bpf cgd disk dm drvct
+ RUMPUSBDEVS=	ualea ubt ucom ugenhc ulpt umass usb
  
  RUMPPCIDEVS=	pci pci_if_iwn pci_if_pcn pci_if_wm
 +RUMPPCIDEVS+=	pci_piixide
  RUMPPCIDEVS+=	pci_usbhc
  RUMPPCIDEVS+=	pci_virtio virtio_if_vioif virtio_ld virtio_viornd
  RUMPPCIDEVS+=	virtio_vioscsi
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/Makefile b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/Makefile
-new file mode 100644
-index 00000000..cc46c8f2
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/Makefile
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/Makefile
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/Makefile
 @@ -0,0 +1,19 @@
 +.PATH:	${.CURDIR}/../../../../dev/pci \
 +	${.CURDIR}/../../../../dev/ata \
@@ -35,11 +34,10 @@ index 00000000..cc46c8f2
 +
 +.include <bsd.lib.mk>
 +.include <bsd.klinks.mk>
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/PIIXIDE.ioconf b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/PIIXIDE.ioconf
-new file mode 100644
-index 00000000..110fc0ce
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/PIIXIDE.ioconf
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/PIIXIDE.ioconf
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/PIIXIDE.ioconf
 @@ -0,0 +1,20 @@
 +ioconf piixide
 +
@@ -61,40 +59,35 @@ index 00000000..110fc0ce
 +# ATAPI support
 +atapibus*	at piixide? channel ?
 +cd*		at atapibus? drive ? flags 0x0000
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wd.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wd.h
-new file mode 100644
-index 00000000..e69de29b
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wd.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wd.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wd.h
 @@ -0,0 +1 @@
 +
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/ataraid.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/ataraid.h
-new file mode 100644
-index 00000000..e69de29b
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/ataraid.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/ataraid.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/ataraid.h
 @@ -0,0 +1 @@
 +
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_ata.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_ata.h
-new file mode 100644
-index 00000000..74ab5ee2
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_ata.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_ata.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_ata.h
 @@ -0,0 +1 @@
 +#define ATADEBUG
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wdc.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wdc.h
-new file mode 100644
-index 00000000..8bdf3d5b
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wdc.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wdc.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/opt_wdc.h
 @@ -0,0 +1,2 @@
 +#define NWD	1
 +#define WDC_NO_IDS
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/piixide_component.c b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/piixide_component.c
-new file mode 100644
-index 00000000..fde63636
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/piixide_component.c
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/piixide_component.c
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/piixide_component.c
 @@ -0,0 +1,49 @@
 +#include <sys/param.h>
 +#include <sys/conf.h>
@@ -145,17 +138,15 @@ index 00000000..fde63636
 +	    cmaj, 0, 1));
 +*/
 +}
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata.h
-new file mode 100644
-index 00000000..e69de29b
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata.h
 @@ -0,0 +1 @@
 +
-diff --git a/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata_pmp.h b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata_pmp.h
-new file mode 100644
-index 00000000..e69de29b
+Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata_pmp.h
+===================================================================
 --- /dev/null
-+++ b/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata_pmp.h
++++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci_piixide/sata_pmp.h
 @@ -0,0 +1 @@
 +
diff --git a/debian/patches/rumpuser-evcnt.diff b/debian/patches/rumpuser-evcnt.diff
index 41b81ab7..5e183dce 100644
--- a/debian/patches/rumpuser-evcnt.diff
+++ b/debian/patches/rumpuser-evcnt.diff
@@ -1,8 +1,8 @@
-diff --git a/buildrump.sh/src/lib/librumpuser/rumpuser_dl.c b/buildrump.sh/src/lib/librumpuser/rumpuser_dl.c
-index 5d3a1c438..6ce2ff35e 100644
---- a/buildrump.sh/src/lib/librumpuser/rumpuser_dl.c
-+++ b/buildrump.sh/src/lib/librumpuser/rumpuser_dl.c
-@@ -45,7 +45,9 @@ __RCSID("$NetBSD: rumpuser_dl.c,v 1.33 2020/03/22 13:30:10 pgoyette Exp $");
+Index: rumpkernel/buildrump.sh/src/lib/librumpuser/rumpuser_dl.c
+===================================================================
+--- rumpkernel.orig/buildrump.sh/src/lib/librumpuser/rumpuser_dl.c
++++ rumpkernel/buildrump.sh/src/lib/librumpuser/rumpuser_dl.c
+@@ -45,7 +45,9 @@ __RCSID("$NetBSD: rumpuser_dl.c,v 1.33 2
  
  #include <sys/types.h>
  #include <sys/time.h>
@@ -13,7 +13,7 @@ index 5d3a1c438..6ce2ff35e 100644
  #include <assert.h>
  
 @@ -384,6 +386,7 @@ process_object(void *handle,
- 			assert(sfp == sfp_end);
+ 		assert(sfp == sfp_end);
  	}
  
 +#if defined(HAVE_SYS_EVCNT)
@@ -21,17 +21,17 @@ index 5d3a1c438..6ce2ff35e 100644
  	evp = dlsym(handle, "__start_link_set_evcnts");
  	evp_end = dlsym(handle, "__stop_link_set_evcnts");
 @@ -392,6 +395,7 @@ process_object(void *handle,
- 					doevcntattach(*evp);
- 			assert(evp == evp_end);
+ 			doevcntattach(*evp);
+ 		assert(evp == evp_end);
  	}
 +#endif
  }
  
  /*
-diff --git a/buildrump.sh/src/lib/librumpuser/rumpuser_config.h.in b/buildrump.sh/src/lib/librumpuser/rumpuser_config.h.in
-index b008c0621..f4c9615d5 100644
---- a/buildrump.sh/src/lib/librumpuser/rumpuser_config.h.in
-+++ b/buildrump.sh/src/lib/librumpuser/rumpuser_config.h.in
+Index: rumpkernel/buildrump.sh/src/lib/librumpuser/rumpuser_config.h.in
+===================================================================
+--- rumpkernel.orig/buildrump.sh/src/lib/librumpuser/rumpuser_config.h.in
++++ rumpkernel/buildrump.sh/src/lib/librumpuser/rumpuser_config.h.in
 @@ -102,6 +102,9 @@
  /* Define to 1 if you have the <sys/dkio.h> header file. */
  #undef HAVE_SYS_DKIO_H
@@ -42,10 +42,10 @@ index b008c0621..f4c9615d5 100644
  /* Define to 1 if you have the <sys/param.h> header file. */
  #undef HAVE_SYS_PARAM_H
  
-diff --git a/buildrump.sh/src/lib/librumpuser/rumpuser_port.h b/buildrump.sh/src/lib/librumpuser/rumpuser_port.h
-index 5c5cc8f83..fa4ed2e55 100644
---- a/buildrump.sh/src/lib/librumpuser/rumpuser_port.h
-+++ b/buildrump.sh/src/lib/librumpuser/rumpuser_port.h
+Index: rumpkernel/buildrump.sh/src/lib/librumpuser/rumpuser_port.h
+===================================================================
+--- rumpkernel.orig/buildrump.sh/src/lib/librumpuser/rumpuser_port.h
++++ rumpkernel/buildrump.sh/src/lib/librumpuser/rumpuser_port.h
 @@ -41,6 +41,7 @@
  #define HAVE_SYS_DISKLABEL_H 1
  #define HAVE_SYS_DISK_H 1