- Update to 4.2.22

- Remove 3D crOpenGl patches that are already included in the new release
- Convert USE_PYDISTUTILS=easy_install to USE_PYDISTUTILS=yes
- Add patch to fix building with new gsoap [1]
- Add direct dependency on qt4-opengl [2]

PR:		ports/185579 [2]
Security:	CVE-2013-5892
Submitted by:	Jung-uk Kim <jkim@FreeBSD.org> [1]
		Jimmy Olgeni <olgeni@FreeBSD.org> [2]

10 files changed, 56 insertions, 176 deletions

diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 3b0612a23975..1d4a3486d203 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.20
-PORTREVISION=	1
+DISTVERSION=	4.2.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index f3287ff8e8b3..f6a742ba3954 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.2.20.tar.bz2) = 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61
-SIZE (VirtualBox-4.2.20.tar.bz2) = 77050211
+SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
+SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk
deleted file mode 100644
index 59962fd217b3..000000000000
--- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig	2013-04-12 12:35:06.000000000 +0200
-+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-05-02 23:33:26.523212251 +0200
-@@ -42,7 +42,7 @@
- 
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  #VBoxOGL_DRI = 1
-- ifn1of ($(KBUILD_TARGET),solaris freebsd)   # No DRI on Solaris yet
-+ ifn1of ($(KBUILD_TARGET),solaris)   # No DRI on Solaris yet
-   VBoxOGL_FAKEDRI = 1
-  endif
- 
-@@ -209,8 +209,13 @@
-  	$(PATH_STAGE_LIB)/libXfixes.so \
-  	$(PATH_STAGE_LIB)/libXext.so
-  ifdef VBoxOGL_FAKEDRI
--  VBoxOGL_LIBS += \
-+  ifeq ($(KBUILD_TARGET), freebsd)
-+    VBoxOGL_LIBS += \
-+        elf
-+  else
-+    VBoxOGL_LIBS += \
-   	dl
-+  endif
-  endif
- endif
- ifdef VBOX_WITH_CRHGSMI
-@@ -368,6 +373,13 @@
- 		| $$(dir $$@)
- 	$(call MSG_GENERATE,python,$@,$<)
- 	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
-+  else ifeq ($(KBUILD_TARGET),freebsd)
-+$(VBOX_PATH_CROGL_GENFILES)/freebsd_exports.c: \
-+		$(PATH_SUB_CURRENT)/FreeBSD_exports.py \
-+		$(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
-+		| $$(dir $$@)
-+	$(call MSG_GENERATE,python,$@,$<)
-+	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
-   else
- $(VBOX_PATH_CROGL_GENFILES)/linux_exports.c: \
- 		$(PATH_SUB_CURRENT)/Linux_exports.py \
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-fakedri_drv.c b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-fakedri_drv.c
deleted file mode 100644
index 623cebfbdfac..000000000000
--- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-fakedri_drv.c
+++ /dev/null
@@ -1,120 +0,0 @@
---- src/VBox/Additions/common/crOpenGL/fakedri_drv.c.orig	2013-11-28 19:30:42.000000000 +0100
-+++ src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2013-12-06 16:03:16.000000000 +0100
-@@ -29,6 +29,15 @@
- #include <dlfcn.h>
- #include <elf.h>
- #include <unistd.h>
-+
-+#include <sys/param.h>
-+#if defined(BSD)
-+#include <fcntl.h>
-+#include <gelf.h>
-+#include <libelf.h>
-+#include <string.h>
-+#endif
-+
- /** X server message type definitions. */
- typedef enum {
-     X_PROBED,			/* Value was probed */
-@@ -50,11 +59,11 @@
- 
- //@todo this could be different...
- #ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
-+# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
- #else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
-+# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
- #endif
- 
- #ifdef DEBUG_DRI_CALLS
-@@ -209,6 +218,85 @@
- 
- #define FAKEDRI_JMP64_PATCH_SIZE 13
- 
-+#if defined(BSD)
-+/* Provide basic dladdr1 flags */
-+enum {
-+	RTLD_DL_SYMENT	= 1
-+};
-+
-+/* Provide a minimal local version of dladdr1 */
-+static int
-+dladdr1(const void *address, Dl_info *dlip, void **info, int flags)
-+{
-+	static DRI_ELFSYM desym;
-+	GElf_Sym sym;
-+	GElf_Shdr shdr;
-+	Elf *elf;
-+	Elf_Scn *scn;
-+	Elf_Data *data;
-+	int ret, fd, count, i;
-+
-+	/* Initialize variables */
-+	fd = -1;
-+	elf = NULL;
-+
-+	/* Call dladdr first */
-+	ret = dladdr(address, dlip);
-+	if (ret == 0) goto err_exit;
-+
-+	/* Check for supported flags */
-+	if (flags != RTLD_DL_SYMENT) return 1;
-+
-+	/* Open shared library's ELF file */
-+	if (elf_version(EV_CURRENT) == EV_NONE) goto err_exit;
-+	fd = open(dlip->dli_fname, O_RDONLY);
-+	if (fd < 0) goto err_exit;
-+	elf = elf_begin(fd, ELF_C_READ, NULL);
-+	if (elf == NULL) goto err_exit;
-+
-+	/* Find the '.dynsym' section */
-+	scn = elf_nextscn(elf, NULL);
-+	while (scn != NULL) {
-+		if (gelf_getshdr(scn, &shdr) == NULL) goto err_exit;
-+		if (shdr.sh_type == SHT_DYNSYM) break;
-+		scn = elf_nextscn(elf, scn);
-+	}
-+	if (scn == NULL) goto err_exit;
-+
-+	/* Search for the requested symbol by name and offset */
-+	data = elf_getdata(scn, NULL);
-+	count = shdr.sh_size / shdr.sh_entsize;
-+	for (i = 0; i < count; i++) {
-+		gelf_getsym(data, i, &sym);
-+		if ((strcmp(dlip->dli_sname,
-+		        elf_strptr(elf, shdr.sh_link, sym.st_name)) == 0) &&
-+		    (sym.st_value == (dlip->dli_saddr - dlip->dli_fbase))) {
-+			break;
-+		}
-+	}
-+
-+	/* Close ELF file */
-+	elf_end(elf);
-+	close(fd);
-+
-+	/* Return symbol entry in native format */
-+	desym.st_name = sym.st_name;
-+	desym.st_info = sym.st_info;
-+	desym.st_other = sym.st_other;
-+	desym.st_shndx = sym.st_shndx;
-+	desym.st_value = sym.st_value;
-+	desym.st_size = sym.st_size;
-+	*info = &desym;
-+	return 1;
-+
-+	/* Error handler */
-+err_exit:
-+	if (elf != NULL) elf_end(elf);
-+	if (fd >= 0) close(fd);
-+	return 0;
-+}
-+#endif
-+
- static void
- vboxPatchMesaExport(const char* psFuncName, const void *pStart, const void *pEnd)
- {
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index 98f8146fa6a0..25ec858845e9 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.20
+DISTVERSION=	4.2.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index f3287ff8e8b3..f6a742ba3954 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.2.20.tar.bz2) = 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61
-SIZE (VirtualBox-4.2.20.tar.bz2) = 77050211
+SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
+SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185
diff --git a/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile b/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
index 90efbaeb2965..67361da543f7 100644
--- a/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
+++ b/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
@@ -5,7 +5,7 @@
  KMOD = vboxdrv
  
 -CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS
-+CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DEBUG
++CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DDEBUG
  
  .if (${MACHINE_ARCH} == "i386")
   CFLAGS += -DRT_ARCH_X86
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 753c8b63ff46..64e4146a6f4f 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.20
-PORTREVISION=	2
+DISTVERSION=	4.2.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -38,7 +37,7 @@ USE_GCC=	any
 USE_GNOME=	libidl
 USE_BZIP2=	yes
 USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	vboxapi
 PYDISTUTILS_PKGVERSION=	1.0
 PYDISTUTILS_NOEGGINFO=	yes
@@ -124,7 +123,7 @@ CONFIGURE_ARGS+=--build-headless
 
 .if ${PORT_OPTIONS:MQT4}
 QT_NONSTANDARD=	yes
-USE_QT4=	gui network moc_build uic_build rcc_build linguist
+USE_QT4=	gui network moc_build opengl uic_build rcc_build linguist
 INSTALLS_ICONS=	yes
 VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
 .else
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index 28aa1dc9d1d9..c1afb8b75a1e 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,4 +1,4 @@
-SHA256 (VirtualBox-4.2.20.tar.bz2) = 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61
-SIZE (VirtualBox-4.2.20.tar.bz2) = 77050211
-SHA256 (VBoxGuestAdditions_4.2.20.iso) = 2fb3aa0f370d503b0e77725dbec76b989a251f613abee378f53c1fed9d6edf01
-SIZE (VBoxGuestAdditions_4.2.20.iso) = 59664384
+SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
+SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185
+SHA256 (VBoxGuestAdditions_4.2.22.iso) = 222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76
+SIZE (VBoxGuestAdditions_4.2.22.iso) = 59686912
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
new file mode 100644
index 000000000000..0f80ecabe040
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
@@ -0,0 +1,42 @@
+Ticket #11803: Fails to build with gSOAP 2.8.13
+https://www.virtualbox.org/ticket/11803
+
+--- src/VBox/Main/webservice/Makefile.kmk.orig	2013-12-18 11:10:26.000000000 -0500
++++ src/VBox/Main/webservice/Makefile.kmk	2014-01-09 15:56:26.000000000 -0500
+@@ -159,7 +159,6 @@
+ RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
+ 
+ PATH_TARGET_SOAPDEMOXML       := $(VBOXWEB_OUT_DIR)/demo_soapxml
+-PATH_TARGET_SOAPDEMOHEADERS   := $(VBOXWEB_OUT_DIR)/demo_headers
+ PATH_TARGET_SOAPDEMONSMAPS    := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
+ PATH_TARGET_WEBTEST           := $(VBOXWEB_OUT_DIR)/webtest
+ 
+@@ -512,8 +511,6 @@
+ 	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
+ 	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
+ 	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \
+-	$(wildcard $(PATH_TARGET_SOAPDEMOHEADERS)/*) \
+-	$(PATH_TARGET_SOAPDEMOHEADERS)/dummy_file \
+ 	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
+ 	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
+ 
+@@ -690,17 +687,14 @@
+ # want to use wildcard (all commands are expaned when the rule is evaluated).
+ $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@)
+ 	$(RM) -f $@
+-	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS)
++	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS)
+ ifdef VBOX_GSOAP_VERBOSE
+ 	$(MV) -f $(wildcard $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml) $(PATH_TARGET_SOAPDEMOXML)
+ endif
+-	$(MV) -f $(wildcard $(VBOXWEB_OUT_DIR)/soapvbox*.h) $(PATH_TARGET_SOAPDEMOHEADERS)
+ 	$(MV) -f $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)
+ 	$(APPEND) $@ done
+ 
+-$(PATH_TARGET_SOAPDEMONSMAPS) \
+-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingProxy.h \
+-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingObject.h: $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
++$(PATH_TARGET_SOAPDEMONSMAPS): $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
+ 
+ # soapcpp2 -2: generate SOAP 1.2 calls
+ # soapcpp2 -S: server-side code only