From 5909b90a90bc095cc99b068e050d21cd542d02d0 Mon Sep 17 00:00:00 2001 From: Beat Gaetzi Date: Wed, 9 Dec 2009 12:31:45 +0000 Subject: - Fix loading of vboxnetadp.ko kernel module without loading vboxnetflt.ko kernel module first. - Bump PORTREVISION. PR: ports/141013 Reported / tested by: Scot Hetzel Submitted by: Fredrik Lindberg --- emulators/virtualbox-ose-kmod-legacy/Makefile | 2 +- ...c-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c | 11 +++++++++++ ...c-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c | 9 +++++++++ emulators/virtualbox-ose-kmod/Makefile | 2 +- ...c-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c | 11 +++++++++++ ...c-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c | 9 +++++++++ emulators/virtualbox-ose-legacy/Makefile | 2 +- ...c-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c | 11 +++++++++++ ...c-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c | 9 +++++++++ emulators/virtualbox-ose/Makefile | 2 +- ...c-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c | 11 +++++++++++ ...c-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c | 9 +++++++++ emulators/virtualbox/Makefile | 2 +- ...c-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c | 11 +++++++++++ ...c-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c | 9 +++++++++ 15 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c create mode 100644 emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c create mode 100644 emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c create mode 100644 emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c create mode 100644 emulators/virtualbox/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c (limited to 'emulators') diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile index 635e8c3ceba8..46617a1b64b8 100644 --- a/emulators/virtualbox-ose-kmod-legacy/Makefile +++ b/emulators/virtualbox-ose-kmod-legacy/Makefile @@ -7,7 +7,7 @@ PORTNAME= virtualbox DISTVERSION= 3.0.51r22902 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c new file mode 100644 index 000000000000..0e223c4b9039 --- /dev/null +++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c @@ -0,0 +1,11 @@ +--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2009-12-07 12:20:44.000000000 +0100 ++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2009-12-07 12:21:00.000000000 +0100 +@@ -92,7 +92,7 @@ + DECLARE_MODULE(vboxnetadp, g_VBoxNetAdpFreeBSDModule, SI_SUB_PSEUDO, SI_ORDER_ANY); + MODULE_VERSION(vboxnetadp, 1); + MODULE_DEPEND(vboxnetadp, vboxdrv, 1, 1, 1); +-MODULE_DEPEND(vboxnetadp, ng_vboxnetflt, 1, 1, 1); ++MODULE_DEPEND(vboxnetadp, vboxnetflt, 1, 1, 1); + + /** + * Module event handler diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c index bc23fb14a545..f23fedbf0ec0 100644 --- a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c +++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c @@ -31,6 +31,15 @@ Index: src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c .rcvmsg = ng_vboxnetflt_rcvmsg, .shutdown = ng_vboxnetflt_shutdown, .newhook = ng_vboxnetflt_newhook, +@@ -122,7 +122,7 @@ + .cmdlist = ng_vboxnetflt_cmdlist, + }; + NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct); +-MODULE_VERSION(ng_vboxnetflt, 1); ++MODULE_VERSION(vboxnetflt, 1); + MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1); + + /** @@ -267,16 +267,12 @@ if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0) { diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index 635e8c3ceba8..46617a1b64b8 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -7,7 +7,7 @@ PORTNAME= virtualbox DISTVERSION= 3.0.51r22902 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c new file mode 100644 index 000000000000..0e223c4b9039 --- /dev/null +++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c @@ -0,0 +1,11 @@ +--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2009-12-07 12:20:44.000000000 +0100 ++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2009-12-07 12:21:00.000000000 +0100 +@@ -92,7 +92,7 @@ + DECLARE_MODULE(vboxnetadp, g_VBoxNetAdpFreeBSDModule, SI_SUB_PSEUDO, SI_ORDER_ANY); + MODULE_VERSION(vboxnetadp, 1); + MODULE_DEPEND(vboxnetadp, vboxdrv, 1, 1, 1); +-MODULE_DEPEND(vboxnetadp, ng_vboxnetflt, 1, 1, 1); ++MODULE_DEPEND(vboxnetadp, vboxnetflt, 1, 1, 1); + + /** + * Module event handler diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c index bc23fb14a545..f23fedbf0ec0 100644 --- a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c +++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c @@ -31,6 +31,15 @@ Index: src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c .rcvmsg = ng_vboxnetflt_rcvmsg, .shutdown = ng_vboxnetflt_shutdown, .newhook = ng_vboxnetflt_newhook, +@@ -122,7 +122,7 @@ + .cmdlist = ng_vboxnetflt_cmdlist, + }; + NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct); +-MODULE_VERSION(ng_vboxnetflt, 1); ++MODULE_VERSION(vboxnetflt, 1); + MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1); + + /** @@ -267,16 +267,12 @@ if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0) { diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 635e8c3ceba8..46617a1b64b8 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -7,7 +7,7 @@ PORTNAME= virtualbox DISTVERSION= 3.0.51r22902 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c new file mode 100644 index 000000000000..0e223c4b9039 --- /dev/null +++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c @@ -0,0 +1,11 @@ +--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2009-12-07 12:20:44.000000000 +0100 ++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2009-12-07 12:21:00.000000000 +0100 +@@ -92,7 +92,7 @@ + DECLARE_MODULE(vboxnetadp, g_VBoxNetAdpFreeBSDModule, SI_SUB_PSEUDO, SI_ORDER_ANY); + MODULE_VERSION(vboxnetadp, 1); + MODULE_DEPEND(vboxnetadp, vboxdrv, 1, 1, 1); +-MODULE_DEPEND(vboxnetadp, ng_vboxnetflt, 1, 1, 1); ++MODULE_DEPEND(vboxnetadp, vboxnetflt, 1, 1, 1); + + /** + * Module event handler diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c index bc23fb14a545..f23fedbf0ec0 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c +++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c @@ -31,6 +31,15 @@ Index: src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c .rcvmsg = ng_vboxnetflt_rcvmsg, .shutdown = ng_vboxnetflt_shutdown, .newhook = ng_vboxnetflt_newhook, +@@ -122,7 +122,7 @@ + .cmdlist = ng_vboxnetflt_cmdlist, + }; + NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct); +-MODULE_VERSION(ng_vboxnetflt, 1); ++MODULE_VERSION(vboxnetflt, 1); + MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1); + + /** @@ -267,16 +267,12 @@ if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0) { diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 635e8c3ceba8..46617a1b64b8 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -7,7 +7,7 @@ PORTNAME= virtualbox DISTVERSION= 3.0.51r22902 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c new file mode 100644 index 000000000000..0e223c4b9039 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c @@ -0,0 +1,11 @@ +--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2009-12-07 12:20:44.000000000 +0100 ++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2009-12-07 12:21:00.000000000 +0100 +@@ -92,7 +92,7 @@ + DECLARE_MODULE(vboxnetadp, g_VBoxNetAdpFreeBSDModule, SI_SUB_PSEUDO, SI_ORDER_ANY); + MODULE_VERSION(vboxnetadp, 1); + MODULE_DEPEND(vboxnetadp, vboxdrv, 1, 1, 1); +-MODULE_DEPEND(vboxnetadp, ng_vboxnetflt, 1, 1, 1); ++MODULE_DEPEND(vboxnetadp, vboxnetflt, 1, 1, 1); + + /** + * Module event handler diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c index bc23fb14a545..f23fedbf0ec0 100644 --- a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c +++ b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c @@ -31,6 +31,15 @@ Index: src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c .rcvmsg = ng_vboxnetflt_rcvmsg, .shutdown = ng_vboxnetflt_shutdown, .newhook = ng_vboxnetflt_newhook, +@@ -122,7 +122,7 @@ + .cmdlist = ng_vboxnetflt_cmdlist, + }; + NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct); +-MODULE_VERSION(ng_vboxnetflt, 1); ++MODULE_VERSION(vboxnetflt, 1); + MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1); + + /** @@ -267,16 +267,12 @@ if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0) { diff --git a/emulators/virtualbox/Makefile b/emulators/virtualbox/Makefile index 635e8c3ceba8..46617a1b64b8 100644 --- a/emulators/virtualbox/Makefile +++ b/emulators/virtualbox/Makefile @@ -7,7 +7,7 @@ PORTNAME= virtualbox DISTVERSION= 3.0.51r22902 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ diff --git a/emulators/virtualbox/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c b/emulators/virtualbox/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c new file mode 100644 index 000000000000..0e223c4b9039 --- /dev/null +++ b/emulators/virtualbox/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c @@ -0,0 +1,11 @@ +--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2009-12-07 12:20:44.000000000 +0100 ++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2009-12-07 12:21:00.000000000 +0100 +@@ -92,7 +92,7 @@ + DECLARE_MODULE(vboxnetadp, g_VBoxNetAdpFreeBSDModule, SI_SUB_PSEUDO, SI_ORDER_ANY); + MODULE_VERSION(vboxnetadp, 1); + MODULE_DEPEND(vboxnetadp, vboxdrv, 1, 1, 1); +-MODULE_DEPEND(vboxnetadp, ng_vboxnetflt, 1, 1, 1); ++MODULE_DEPEND(vboxnetadp, vboxnetflt, 1, 1, 1); + + /** + * Module event handler diff --git a/emulators/virtualbox/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c b/emulators/virtualbox/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c index bc23fb14a545..f23fedbf0ec0 100644 --- a/emulators/virtualbox/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c +++ b/emulators/virtualbox/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c @@ -31,6 +31,15 @@ Index: src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c .rcvmsg = ng_vboxnetflt_rcvmsg, .shutdown = ng_vboxnetflt_shutdown, .newhook = ng_vboxnetflt_newhook, +@@ -122,7 +122,7 @@ + .cmdlist = ng_vboxnetflt_cmdlist, + }; + NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct); +-MODULE_VERSION(ng_vboxnetflt, 1); ++MODULE_VERSION(vboxnetflt, 1); + MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1); + + /** @@ -267,16 +267,12 @@ if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0) { -- cgit v1.2.3