From owner-svn-ports-branches@FreeBSD.ORG Fri Jan 17 15:43:03 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 36F2FF0D; Fri, 17 Jan 2014 15:43:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 200E61F70; Fri, 17 Jan 2014 15:43:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HFh2i0046756; Fri, 17 Jan 2014 15:43:02 GMT (envelope-from decke@svn.freebsd.org) Received: (from decke@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HFh19w046745; Fri, 17 Jan 2014 15:43:01 GMT (envelope-from decke@svn.freebsd.org) Message-Id: <201401171543.s0HFh19w046745@svn.freebsd.org> From: Bernhard Froehlich Date: Fri, 17 Jan 2014 15:43:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340058 - in branches/2014Q1/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-additions/files virtualbox-ose-kmod virtualbox-ose-kmod/files virtualbox-ose/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 15:43:03 -0000 Author: decke Date: Fri Jan 17 15:43:01 2014 New Revision: 340058 URL: http://svnweb.freebsd.org/changeset/ports/340058 QAT: https://qat.redports.org/buildarchive/r340058/ Log: MFH: r339930 - 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 [1] Jimmy Olgeni [2] Added: branches/2014Q1/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk - copied unchanged from r339930, head/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk Deleted: branches/2014Q1/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk branches/2014Q1/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-fakedri_drv.c Modified: branches/2014Q1/emulators/virtualbox-ose-additions/Makefile branches/2014Q1/emulators/virtualbox-ose-additions/distinfo branches/2014Q1/emulators/virtualbox-ose-kmod/Makefile branches/2014Q1/emulators/virtualbox-ose-kmod/distinfo branches/2014Q1/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile branches/2014Q1/emulators/virtualbox-ose/Makefile branches/2014Q1/emulators/virtualbox-ose/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- branches/2014Q1/emulators/virtualbox-ose-additions/Makefile Fri Jan 17 15:40:10 2014 (r340057) +++ branches/2014Q1/emulators/virtualbox-ose-additions/Makefile Fri Jan 17 15:43:01 2014 (r340058) @@ -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/ \ Modified: branches/2014Q1/emulators/virtualbox-ose-additions/distinfo ============================================================================== --- branches/2014Q1/emulators/virtualbox-ose-additions/distinfo Fri Jan 17 15:40:10 2014 (r340057) +++ branches/2014Q1/emulators/virtualbox-ose-additions/distinfo Fri Jan 17 15:43:01 2014 (r340058) @@ -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 Modified: branches/2014Q1/emulators/virtualbox-ose-kmod/Makefile ============================================================================== --- branches/2014Q1/emulators/virtualbox-ose-kmod/Makefile Fri Jan 17 15:40:10 2014 (r340057) +++ branches/2014Q1/emulators/virtualbox-ose-kmod/Makefile Fri Jan 17 15:43:01 2014 (r340058) @@ -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/ \ Modified: branches/2014Q1/emulators/virtualbox-ose-kmod/distinfo ============================================================================== --- branches/2014Q1/emulators/virtualbox-ose-kmod/distinfo Fri Jan 17 15:40:10 2014 (r340057) +++ branches/2014Q1/emulators/virtualbox-ose-kmod/distinfo Fri Jan 17 15:43:01 2014 (r340058) @@ -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 Modified: branches/2014Q1/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile ============================================================================== --- branches/2014Q1/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile Fri Jan 17 15:40:10 2014 (r340057) +++ branches/2014Q1/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile Fri Jan 17 15:43:01 2014 (r340058) @@ -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 Modified: branches/2014Q1/emulators/virtualbox-ose/Makefile ============================================================================== --- branches/2014Q1/emulators/virtualbox-ose/Makefile Fri Jan 17 15:40:10 2014 (r340057) +++ branches/2014Q1/emulators/virtualbox-ose/Makefile Fri Jan 17 15:43:01 2014 (r340058) @@ -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/ \ @@ -39,7 +38,7 @@ USE_GCC= any USE_GNOME= libidl USE_BZIP2= yes USE_PYTHON= -2.7 -USE_PYDISTUTILS= easy_install +USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= vboxapi PYDISTUTILS_PKGVERSION= 1.0 PYDISTUTILS_NOEGGINFO= yes @@ -125,7 +124,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 Modified: branches/2014Q1/emulators/virtualbox-ose/distinfo ============================================================================== --- branches/2014Q1/emulators/virtualbox-ose/distinfo Fri Jan 17 15:40:10 2014 (r340057) +++ branches/2014Q1/emulators/virtualbox-ose/distinfo Fri Jan 17 15:43:01 2014 (r340058) @@ -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 Copied: branches/2014Q1/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk (from r339930, head/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk Fri Jan 17 15:43:01 2014 (r340058, copy of r339930, head/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