Date: Mon, 24 Jun 2013 06:07:53 +0000 (UTC) From: Bernhard Froehlich <decke@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321665 - in head/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-kmod virtualbox-ose-kmod/files virtualbox-ose/files Message-ID: <201306240607.r5O67rNT055109@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: decke Date: Mon Jun 24 06:07:53 2013 New Revision: 321665 URL: http://svnweb.freebsd.org/changeset/ports/321665 Log: - Update to 4.2.14 - Fix VLAN trunking support in vboxnetflt [1] - Fix panic in kmod when VIMAGE is disabled in the kernel and port [2] - Enable IPv6 support for VNC per default to be able to set the VRDE properties VNCPort4 and VNCPort6 [3] - Pet portlint (WWW, Created by lines) This update was mainly done by Mikhail Tsatsenko. Submitted by: Landon J Fuller <landonf at plausible.coop> [1], Gleb Kurtsou <gleb@freebsd.org> [2], Stefan Bethke <stb@FreeBSD.org> [3] Added: head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk (contents, props changed) head/emulators/virtualbox-ose/files/patch-src-VBox-ExtPacks-VNC-VBoxVNC.cpp (contents, props changed) Modified: head/emulators/virtualbox-ose-additions/Makefile head/emulators/virtualbox-ose-additions/distinfo head/emulators/virtualbox-ose-additions/pkg-descr (contents, props changed) head/emulators/virtualbox-ose-kmod/Makefile head/emulators/virtualbox-ose-kmod/distinfo head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c head/emulators/virtualbox-ose-kmod/pkg-descr (contents, props changed) head/emulators/virtualbox-ose/Makefile head/emulators/virtualbox-ose/distinfo head/emulators/virtualbox-ose/pkg-descr (contents, props changed) Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Mon Jun 24 06:02:21 2013 (r321664) +++ head/emulators/virtualbox-ose-additions/Makefile Mon Jun 24 06:07:53 2013 (r321665) @@ -1,9 +1,8 @@ -# Created by: Bernhard Froehlich <decke@bluelife.at> +# Created by: Bernhard Froehlich <decke@bluelife.at> # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.2.12 -PORTREVISION= 2 +DISTVERSION= 4.2.14 CATEGORIES= emulators kld MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: head/emulators/virtualbox-ose-additions/distinfo ============================================================================== --- head/emulators/virtualbox-ose-additions/distinfo Mon Jun 24 06:02:21 2013 (r321664) +++ head/emulators/virtualbox-ose-additions/distinfo Mon Jun 24 06:07:53 2013 (r321665) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.2.12.tar.bz2) = eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6 -SIZE (VirtualBox-4.2.12.tar.bz2) = 76876011 +SHA256 (VirtualBox-4.2.14.tar.bz2) = f8f6dc19612f3c84a5c857b8e5c452b8db2cf3c8c52a678b6a00e5dd5831130d +SIZE (VirtualBox-4.2.14.tar.bz2) = 76888627 Modified: head/emulators/virtualbox-ose-additions/pkg-descr ============================================================================== --- head/emulators/virtualbox-ose-additions/pkg-descr Mon Jun 24 06:02:21 2013 (r321664) +++ head/emulators/virtualbox-ose-additions/pkg-descr Mon Jun 24 06:07:53 2013 (r321665) @@ -6,4 +6,4 @@ feature rich, high performance product f is also the only professional solution that is freely available as Open Source Software under the terms of the GNU General Public License. -WWW: http://www.virtualbox.org/ +WWW: http://www.virtualbox.org/ Modified: head/emulators/virtualbox-ose-kmod/Makefile ============================================================================== --- head/emulators/virtualbox-ose-kmod/Makefile Mon Jun 24 06:02:21 2013 (r321664) +++ head/emulators/virtualbox-ose-kmod/Makefile Mon Jun 24 06:07:53 2013 (r321665) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.2.12 +DISTVERSION= 4.2.14 CATEGORIES= emulators kld MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: head/emulators/virtualbox-ose-kmod/distinfo ============================================================================== --- head/emulators/virtualbox-ose-kmod/distinfo Mon Jun 24 06:02:21 2013 (r321664) +++ head/emulators/virtualbox-ose-kmod/distinfo Mon Jun 24 06:07:53 2013 (r321665) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.2.12.tar.bz2) = eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6 -SIZE (VirtualBox-4.2.12.tar.bz2) = 76876011 +SHA256 (VirtualBox-4.2.14.tar.bz2) = f8f6dc19612f3c84a5c857b8e5c452b8db2cf3c8c52a678b6a00e5dd5831130d +SIZE (VirtualBox-4.2.14.tar.bz2) = 76888627 Added: head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk Mon Jun 24 06:07:53 2013 (r321665) @@ -0,0 +1,25 @@ +Fix kmod panic when VIMAGE is disabled in the kernel and port + +Submitted by: Gleb Kurtsou <gleb@freebsd.org> +--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2013-04-12 03:38:10.000000000 -0700 ++++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2013-06-11 21:24:05.000000000 -0700 +@@ -143,12 +143,15 @@ + $$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \ + | $$(dir $$@) + $(QUIET)$(RM) -f -- $@ +- ifndef VBOX_WITH_HARDENING +- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< +- else + $(QUIET)$(CP) -f $< $@ ++ ifndef VBOX_WITH_HARDENING ++ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@ ++ ${QUIET}$(MV) -f $@.tmp $@ ++ endif ++ ifndef VBOX_WITH_NETFLT_VIMAGE ++ $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@ ++ ${QUIET}$(MV) -f $@.tmp $@ + endif +- + endif # freebsd + + include $(FILE_KBUILD_SUB_FOOTER) Modified: head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c ============================================================================== --- head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c Mon Jun 24 06:02:21 2013 (r321664) +++ head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c Mon Jun 24 06:07:53 2013 (r321665) @@ -1,15 +1,36 @@ Add VLAN trunking support to vboxnetflt See: http://lists.freebsd.org/pipermail/freebsd-emulation/2012-April/009698.html +See: http://lists.freebsd.org/pipermail/freebsd-emulation/2013-May/010605.html Submitted by: Landon J Fuller <landonf at plausible.coop> ---- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c.orig 2012-04-12 17:27:56.035382846 -0400 -+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c 2012-04-12 17:30:13.038601065 -0400 -@@ -439,6 +439,16 @@ +--- ./src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c.orig 2013-04-12 06:38:11.000000000 -0400 ++++ ./src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c 2013-05-25 20:14:52.152180452 -0400 +@@ -51,6 +51,7 @@ + #include <net/if_dl.h> + #include <net/if_types.h> + #include <net/ethernet.h> ++#include <net/if_vlan_var.h> + + #include <netgraph/ng_message.h> + #include <netgraph/netgraph.h> +@@ -427,6 +428,8 @@ + struct ifnet *ifp = pThis->u.s.ifp; + unsigned int cSegs = 0; + bool fDropIt = false, fActive; ++ bool is_vl_tagged = false; ++ uint16_t vl_tag; + PINTNETSG pSG; + + VBOXCURVNET_SET(ifp->if_vnet); +@@ -439,6 +442,19 @@ if (m == NULL) break; -+ /* Preprend a VLAN header for consumption by the virtual switch */ ++ /* Prepend a VLAN header for consumption by the virtual switch */ + if (m->m_flags & M_VLANTAG) { ++ vl_tag = m->m_pkthdr.ether_vtag; ++ is_vl_tagged = true; ++ + m = ether_vlanencap(m, m->m_pkthdr.ether_vtag); + if (m == NULL) { + printf("vboxflt: unable to prepend VLAN header\n"); @@ -21,3 +42,31 @@ Submitted by: Landon J Fuller <landonf a for (m0 = m; m0 != NULL; m0 = m0->m_next) if (m0->m_len > 0) cSegs++; +@@ -453,6 +469,27 @@ + vboxNetFltFreeBSDMBufToSG(pThis, m, pSG, cSegs, 0); + fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, NULL /* pvIf */, pSG, INTNETTRUNKDIR_WIRE); + RTMemTmpFree(pSG); ++ ++ /* Restore the VLAN flags before re-injecting the packet */ ++ if (is_vl_tagged && !fDropIt) { ++ struct ether_vlan_header *vl_hdr; ++ ++ /* This shouldn't fail, as the header was just prepended */ ++ if (m->m_len < sizeof(*vl_hdr) && (m = m_pullup(m, sizeof(*vl_hdr))) == NULL) { ++ printf("vboxflt: unable to pullup VLAN header\n"); ++ m_freem(m); ++ break; ++ } ++ ++ /* Copy the MAC dhost/shost over the 802.1q field */ ++ vl_hdr = mtod(m, struct ether_vlan_header *); ++ bcopy((char *)vl_hdr, (char *)vl_hdr + ETHER_VLAN_ENCAP_LEN, ETHER_HDR_LEN - ETHER_TYPE_LEN); ++ m_adj(m, ETHER_VLAN_ENCAP_LEN); ++ ++ m->m_pkthdr.ether_vtag = vl_tag; ++ m->m_flags |= M_VLANTAG; ++ } ++ + if (fDropIt) + m_freem(m); + else Modified: head/emulators/virtualbox-ose-kmod/pkg-descr ============================================================================== --- head/emulators/virtualbox-ose-kmod/pkg-descr Mon Jun 24 06:02:21 2013 (r321664) +++ head/emulators/virtualbox-ose-kmod/pkg-descr Mon Jun 24 06:07:53 2013 (r321665) @@ -4,4 +4,4 @@ feature rich, high performance product f is also the only professional solution that is freely available as Open Source Software under the terms of the GNU General Public License. -WWW: http://www.virtualbox.org/ +WWW: http://www.virtualbox.org/ Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Mon Jun 24 06:02:21 2013 (r321664) +++ head/emulators/virtualbox-ose/Makefile Mon Jun 24 06:07:53 2013 (r321665) @@ -1,8 +1,8 @@ -# Created by: Bernhard Froehlich <decke@bluelife.at> +# Created by: Bernhard Froehlich <decke@bluelife.at> # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.2.12 +DISTVERSION= 4.2.14 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: head/emulators/virtualbox-ose/distinfo ============================================================================== --- head/emulators/virtualbox-ose/distinfo Mon Jun 24 06:02:21 2013 (r321664) +++ head/emulators/virtualbox-ose/distinfo Mon Jun 24 06:07:53 2013 (r321665) @@ -1,4 +1,4 @@ -SHA256 (VirtualBox-4.2.12.tar.bz2) = eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6 -SIZE (VirtualBox-4.2.12.tar.bz2) = 76876011 -SHA256 (VBoxGuestAdditions_4.2.12.iso) = aed4730b643aca8daa0829e1122b7c8d592b9f6cea902a98e390c4d22373dfb8 -SIZE (VBoxGuestAdditions_4.2.12.iso) = 59488256 +SHA256 (VirtualBox-4.2.14.tar.bz2) = f8f6dc19612f3c84a5c857b8e5c452b8db2cf3c8c52a678b6a00e5dd5831130d +SIZE (VirtualBox-4.2.14.tar.bz2) = 76888627 +SHA256 (VBoxGuestAdditions_4.2.14.iso) = 9f08f13bbd818fb3ef9916658542ad0999c35e11afc1f6e8ff0b944405486e8a +SIZE (VBoxGuestAdditions_4.2.14.iso) = 59633664 Added: head/emulators/virtualbox-ose/files/patch-src-VBox-ExtPacks-VNC-VBoxVNC.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-ExtPacks-VNC-VBoxVNC.cpp Mon Jun 24 06:07:53 2013 (r321665) @@ -0,0 +1,15 @@ +- Enable IPv6 support for VNC per default to be able to set +the VRDE properties VNCPort4 and VNCPort6. + +Submitted by: Stefan Bethke <stb@lassitu.de> +--- src/VBox/ExtPacks/VNC/VBoxVNC.cpp.orig 2013-04-12 12:37:47.000000000 +0200 ++++ src/VBox/ExtPacks/VNC/VBoxVNC.cpp 2013-05-02 23:57:13.543217587 +0200 +@@ -44,7 +44,7 @@ + + #ifdef LIBVNCSERVER_IPv6 + // enable manually! +-// #define VBOX_USE_IPV6 ++ #define VBOX_USE_IPV6 + #endif + + Modified: head/emulators/virtualbox-ose/pkg-descr ============================================================================== --- head/emulators/virtualbox-ose/pkg-descr Mon Jun 24 06:02:21 2013 (r321664) +++ head/emulators/virtualbox-ose/pkg-descr Mon Jun 24 06:07:53 2013 (r321665) @@ -4,4 +4,4 @@ feature rich, high performance product f is also the only professional solution that is freely available as Open Source Software under the terms of the GNU General Public License. -WWW: http://www.virtualbox.org/ +WWW: http://www.virtualbox.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306240607.r5O67rNT055109>