5 files changed, 60 insertions, 38 deletions

diff --git a/misc/rump/Makefile b/misc/rump/Makefile
index 55aae47bb350..aafe9336ab40 100644
--- a/misc/rump/Makefile
+++ b/misc/rump/Makefile
@@ -2,11 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	rump
-PORTVERSION=	20131213
-PORTREVISION=	2
+PORTVERSION=	20170822
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/stacktic/
-DISTNAME=	buildrump-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Virtualized NetBSD kernel components in userspace
@@ -16,6 +13,11 @@ LICENSE=	BSD2CLAUSE
 NOT_FOR_ARCHS=	aarch64 armv6 mips mips64 powerpc powerpc64 sparc64
 NOT_FOR_ARCHS_REASON=	not yet ported to FreeBSD on this architecture
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	rumpkernel
+GH_PROJECT=	buildrump.sh
+GH_TAGNAME=	b914579
+GH_TUPLE= 	rumpkernel:src-netbsd:82f3a69:netbsd/src
 USE_LDCONFIG=	yes
 USE_GCC=	any
 
diff --git a/misc/rump/distinfo b/misc/rump/distinfo
index e00440741eef..435489e93eee 100644
--- a/misc/rump/distinfo
+++ b/misc/rump/distinfo
@@ -1,2 +1,5 @@
-SHA256 (buildrump-20131213.tar.gz) = 340a09329c9f625534eb9cd6f525e3e2d1702c98f2b975a6fa4f4ad9e499a6f3
-SIZE (buildrump-20131213.tar.gz) = 36351647
+TIMESTAMP = 1503393441
+SHA256 (rumpkernel-buildrump.sh-20170822-b914579_GH0.tar.gz) = 4c3c8e94f6b8dee86f593dd8a52cd37077a3f3831be93a45210f5f5a4ea23093
+SIZE (rumpkernel-buildrump.sh-20170822-b914579_GH0.tar.gz) = 57072
+SHA256 (rumpkernel-src-netbsd-82f3a69_GH0.tar.gz) = 9739ca41ab47ca9697ee2471e5deddd2119e6bf8429c6974e03fba366694cc89
+SIZE (rumpkernel-src-netbsd-82f3a69_GH0.tar.gz) = 44458533
diff --git a/misc/rump/files/patch-buildrump.sh b/misc/rump/files/patch-buildrump.sh
index 43417f885f1c..573a93960b54 100644
--- a/misc/rump/files/patch-buildrump.sh
+++ b/misc/rump/files/patch-buildrump.sh
@@ -1,10 +1,10 @@
---- buildrump.sh.orig	2013-12-14 09:51:57 UTC
+--- buildrump.sh.orig	2017-03-28 02:35:28 UTC
 +++ buildrump.sh
-@@ -893,6 +893,7 @@ evaltarget ()
+@@ -1059,6 +1059,7 @@ evaltoolchain ()
  		;;
- 	"freebsd")
+ 	*-freebsd*)
  		RUMPKERN_UNDEF='-U__FreeBSD__'
 +		${KERNONLY} || EXTRA_RUMPCLIENT='-lpthread'
  		;;
- 	"linux")
- 		RUMPKERN_UNDEF='-Ulinux -U__linux -U__linux__ -U__gnu_linux__'
+ 	*-sun-solaris*|*-pc-solaris*)
+ 		RUMPKERN_UNDEF='-U__sun__ -U__sun -Usun'
diff --git a/misc/rump/files/patch-src_sys_uvm_uvm__aobj.c b/misc/rump/files/patch-src_sys_uvm_uvm__aobj.c
deleted file mode 100644
index cd0b413603e2..000000000000
--- a/misc/rump/files/patch-src_sys_uvm_uvm__aobj.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sys/uvm/uvm_aobj.c.orig	2017-07-25 14:56:13 UTC
-+++ src/sys/uvm/uvm_aobj.c
-@@ -883,7 +883,7 @@ uao_get(struct uvm_object *uobj, voff_t 
- 				    (flags & PGO_ALLPAGES) != 0)
- 					/* need to do a wait or I/O! */
- 					done = false;
--					continue;
-+				continue;
- 			}
- 
- 			/*
diff --git a/misc/rump/pkg-plist b/misc/rump/pkg-plist
index 77d9d0976d33..bd30ecb87078 100644
--- a/misc/rump/pkg-plist
+++ b/misc/rump/pkg-plist
@@ -3,8 +3,12 @@ include/rump/rump.h
 include/rump/rump_namei.h
 include/rump/rump_syscalls.h
 include/rump/rump_syscalls_compat.h
+include/rump/rump_syscallshotgun.h
 include/rump/rumpclient.h
 include/rump/rumpdefs.h
+include/rump/rumperr.h
+include/rump/rumperrno2host.h
+include/rump/rumpfs.h
 include/rump/rumpkern_if_pub.h
 include/rump/rumpnet_if_pub.h
 include/rump/rumpuser.h
@@ -12,7 +16,6 @@ include/rump/rumpuser_component.h
 include/rump/rumpuser_port.h
 include/rump/rumpvfs_if_pub.h
 include/rump/rumpvnode_if.h
-include/rump/scsitest.h
 lib/librump.a
 lib/librump.so
 lib/librump.so.0
@@ -72,6 +75,11 @@ lib/librumpdev_netsmb.so
 lib/librumpdev_netsmb.so.0
 lib/librumpdev_netsmb.so.0.0
 lib/librumpdev_netsmb_pic.a
+lib/librumpdev_opencrypto.a
+lib/librumpdev_opencrypto.so
+lib/librumpdev_opencrypto.so.0
+lib/librumpdev_opencrypto.so.0.0
+lib/librumpdev_opencrypto_pic.a
 lib/librumpdev_pad.a
 lib/librumpdev_pad.so
 lib/librumpdev_pad.so.0
@@ -103,11 +111,6 @@ lib/librumpdev_scsipi.so
 lib/librumpdev_scsipi.so.0
 lib/librumpdev_scsipi.so.0.0
 lib/librumpdev_scsipi_pic.a
-lib/librumpdev_scsitest.a
-lib/librumpdev_scsitest.so
-lib/librumpdev_scsitest.so.0
-lib/librumpdev_scsitest.so.0.0
-lib/librumpdev_scsitest_pic.a
 lib/librumpdev_sysmon.a
 lib/librumpdev_sysmon.so
 lib/librumpdev_sysmon.so.0
@@ -143,6 +146,11 @@ lib/librumpdev_usb.so
 lib/librumpdev_usb.so.0
 lib/librumpdev_usb.so.0.0
 lib/librumpdev_usb_pic.a
+lib/librumpdev_vnd.a
+lib/librumpdev_vnd.so
+lib/librumpdev_vnd.so.0
+lib/librumpdev_vnd.so.0.0
+lib/librumpdev_vnd_pic.a
 lib/librumpdev_wscons.a
 lib/librumpdev_wscons.so
 lib/librumpdev_wscons.so.0
@@ -268,11 +276,6 @@ lib/librumpfs_v7fs.so
 lib/librumpfs_v7fs.so.0
 lib/librumpfs_v7fs.so.0.0
 lib/librumpfs_v7fs_pic.a
-lib/librumpfs_zfs.a
-lib/librumpfs_zfs.so
-lib/librumpfs_zfs.so.0
-lib/librumpfs_zfs.so.0.0
-lib/librumpfs_zfs_pic.a
 lib/librumpkern_crypto.a
 lib/librumpkern_crypto.so
 lib/librumpkern_crypto.so.0
@@ -283,11 +286,16 @@ lib/librumpkern_sljit.so
 lib/librumpkern_sljit.so.0
 lib/librumpkern_sljit.so.0.0
 lib/librumpkern_sljit_pic.a
-lib/librumpkern_solaris.a
-lib/librumpkern_solaris.so
-lib/librumpkern_solaris.so.0
-lib/librumpkern_solaris.so.0.0
-lib/librumpkern_solaris_pic.a
+lib/librumpkern_sys_linux.a
+lib/librumpkern_sys_linux.so
+lib/librumpkern_sys_linux.so.0
+lib/librumpkern_sys_linux.so.0.0
+lib/librumpkern_sys_linux_pic.a
+lib/librumpkern_sysproxy.a
+lib/librumpkern_sysproxy.so
+lib/librumpkern_sysproxy.so.0
+lib/librumpkern_sysproxy.so.0.0
+lib/librumpkern_sysproxy_pic.a
 lib/librumpkern_tty.a
 lib/librumpkern_tty.so
 lib/librumpkern_tty.so.0
@@ -322,6 +330,11 @@ lib/librumpnet_config.so
 lib/librumpnet_config.so.0
 lib/librumpnet_config.so.0.0
 lib/librumpnet_config_pic.a
+lib/librumpnet_gif.a
+lib/librumpnet_gif.so
+lib/librumpnet_gif.so.0
+lib/librumpnet_gif.so.0.0
+lib/librumpnet_gif_pic.a
 lib/librumpnet_local.a
 lib/librumpnet_local.so
 lib/librumpnet_local.so.0
@@ -363,6 +376,11 @@ lib/librumpnet_npf.so.0
 lib/librumpnet_npf.so.0.0
 lib/librumpnet_npf_pic.a
 lib/librumpnet_pic.a
+lib/librumpnet_pppoe.a
+lib/librumpnet_pppoe.so
+lib/librumpnet_pppoe.so.0
+lib/librumpnet_pppoe.so.0.0
+lib/librumpnet_pppoe_pic.a
 lib/librumpnet_shmif.a
 lib/librumpnet_shmif.so
 lib/librumpnet_shmif.so.0
@@ -373,6 +391,11 @@ lib/librumpnet_sockin.so
 lib/librumpnet_sockin.so.0
 lib/librumpnet_sockin.so.0.0
 lib/librumpnet_sockin_pic.a
+lib/librumpnet_tap.a
+lib/librumpnet_tap.so
+lib/librumpnet_tap.so.0
+lib/librumpnet_tap.so.0.0
+lib/librumpnet_tap_pic.a
 lib/librumpuser.a
 lib/librumpuser.so
 lib/librumpuser.so.0
@@ -382,6 +405,11 @@ lib/librumpvfs.a
 lib/librumpvfs.so
 lib/librumpvfs.so.0
 lib/librumpvfs.so.0.0
+lib/librumpvfs_aio.a
+lib/librumpvfs_aio.so
+lib/librumpvfs_aio.so.0
+lib/librumpvfs_aio.so.0.0
+lib/librumpvfs_aio_pic.a
 lib/librumpvfs_fifofs.a
 lib/librumpvfs_fifofs.so
 lib/librumpvfs_fifofs.so.0