mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Code Issues Releases Activity

- Update to 4.2.14

Browse Source 
- 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]
This commit is contained in:
Bernhard Froehlich 2013-06-24 06:07:53 +00:00
parent e758ac528f
commit 68b99e5ead
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=321665
12 changed files with 109 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emulators/virtualbox-ose-additions/Makefile
View File

@ -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/ \

4
emulators/virtualbox-ose-additions/distinfo
View File

@ -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

2
emulators/virtualbox-ose-additions/pkg-descr
View File

@ -6,4 +6,4 @@ feature rich, high performance product for enterprise customers, it
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/

2
emulators/virtualbox-ose-kmod/Makefile
View File

@ -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/ \

4
emulators/virtualbox-ose-kmod/distinfo
View File

@ -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

25
emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk Normal file
View File

@ -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)

57
emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c
View File

@ -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 at plausible.coop>
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

2
emulators/virtualbox-ose-kmod/pkg-descr
View File

@ -4,4 +4,4 @@ feature rich, high performance product for enterprise customers, it
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/

4
emulators/virtualbox-ose/Makefile
View File

@ -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/ \

8
emulators/virtualbox-ose/distinfo
View File

@ -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

15
emulators/virtualbox-ose/files/patch-src-VBox-ExtPacks-VNC-VBoxVNC.cpp Normal file
View File

@ -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

2
emulators/virtualbox-ose/pkg-descr
View File

@ -4,4 +4,4 @@ feature rich, high performance product for enterprise customers, it
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/