From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 8 21:00:29 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F73E1065672 for ; Thu, 8 Dec 2011 21:00:29 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 03EC18FC0C for ; Thu, 8 Dec 2011 21:00:29 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pB8L0S40085151 for ; Thu, 8 Dec 2011 21:00:28 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pB8L0SGC085150; Thu, 8 Dec 2011 21:00:28 GMT (envelope-from gnats) Resent-Date: Thu, 8 Dec 2011 21:00:28 GMT Resent-Message-Id: <201112082100.pB8L0SGC085150@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jimmy Olgeni Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4CDB106564A for ; Thu, 8 Dec 2011 20:58:12 +0000 (UTC) (envelope-from g.olgeni@colby.it) Received: from mail.colby.tv (93-62-141-58.ip22.fastwebnet.it [93.62.141.58]) by mx1.freebsd.org (Postfix) with ESMTP id 5E8A48FC08 for ; Thu, 8 Dec 2011 20:58:11 +0000 (UTC) Received: from server.colby.local (localhost [127.0.0.1]) by server.colby.local (8.14.5/8.14.5) with ESMTP id pB8KwAqi055953; Thu, 8 Dec 2011 21:58:10 +0100 (CET) (envelope-from g.olgeni@colby.it) Received: from exchange.colby.local ([192.168.1.11] helo=exchange.colby.local) with IPv4:25 by server.colby.local; 8 Dec 2011 21:58:10 +0100 Received: from backoffice.colby.local ([192.168.1.56]) by exchange.colby.local over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 8 Dec 2011 21:58:09 +0100 Received: from backoffice.colby.local (localhost [127.0.0.1]) by backoffice.colby.local (8.14.5/8.14.5) with ESMTP id pB8Kw9u1027586; Thu, 8 Dec 2011 21:58:09 +0100 (CET) (envelope-from olgeni@backoffice.colby.local) Received: (from olgeni@localhost) by backoffice.colby.local (8.14.5/8.14.5/Submit) id pB8Kw9f4027585; Thu, 8 Dec 2011 21:58:09 +0100 (CET) (envelope-from olgeni) Message-Id: <201112082058.pB8Kw9f4027585@backoffice.colby.local> Date: Thu, 8 Dec 2011 21:58:09 +0100 (CET) From: Jimmy Olgeni To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: vbox@FreeBSD.org Subject: ports/163134: [PATCH] emulators/virtualbox-ose: fix additions ISO download path X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Dec 2011 21:00:29 -0000 >Number: 163134 >Category: ports >Synopsis: [PATCH] emulators/virtualbox-ose: fix additions ISO download path >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Dec 08 21:00:28 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jimmy Olgeni >Release: FreeBSD 9.0-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD backoffice 9.0-PRERELEASE FreeBSD 9.0-PRERELEASE #2: Mon Nov 28 18:00:16 CET 2011 >Description: VirtualBox 4.0.14 is not able to download the guest additions ISO because it appends "_OSE" to the version number. I found a patch by Thomas Backlund that fixes the filename generation: http://svnweb.mageia.org/packages/updates/1/virtualbox/current/SOURCES/VirtualBox-4.0.14_OSE-fix-GuestAdditions-download-versioning.patch?revision=157419&view=co Added file(s): - files/patch-src_VBox_Frontends_VirtualBox_src_runtime_UIMachineLogic.cpp Port maintainer (vbox@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- virtualbox-ose-4.0.14.patch begins here --- Index: files/patch-src_VBox_Frontends_VirtualBox_src_runtime_UIMachineLogic.cpp =================================================================== RCS file: files/patch-src_VBox_Frontends_VirtualBox_src_runtime_UIMachineLogic.cpp diff -N files/patch-src_VBox_Frontends_VirtualBox_src_runtime_UIMachineLogic.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src_VBox_Frontends_VirtualBox_src_runtime_UIMachineLogic.cpp 8 Dec 2011 20:44:01 -0000 @@ -0,0 +1,32 @@ + +$FreeBSD$ + +--- src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp.orig ++++ src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp +@@ -46,6 +46,8 @@ + + /* Global includes */ + #include ++/* needed for VBOX_VERSION_STRING_RAW */ ++#include + + #ifdef VBOX_WITH_DEBUGGER_GUI + # include +@@ -1590,7 +1592,7 @@ + + /* Check for the already registered image */ + CVirtualBox vbox = vboxGlobal().virtualBox(); +- const QString &name = QString("VBoxGuestAdditions_%1.iso").arg(vboxGlobal().vboxVersionStringNormalized()); ++ const QString &name = QString("VBoxGuestAdditions_") + VBOX_VERSION_STRING_RAW + QString(".iso"); + + CMediumVector vec = vbox.GetDVDImages(); + for (CMediumVector::ConstIterator it = vec.begin(); it != vec.end(); ++ it) +@@ -1606,7 +1608,7 @@ + int result = msgCenter().cannotFindGuestAdditions(QDir::toNativeSeparators(strSrc1), QDir::toNativeSeparators(strSrc2)); + if (result == QIMessageBox::Yes) + { +- const QString &source = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vboxGlobal().vboxVersionStringNormalized()) + name; ++ const QString &source = QString("http://download.virtualbox.org/virtualbox/") + VBOX_VERSION_STRING_RAW + QString("/") + name; + const QString &target = QDir(vboxGlobal().virtualBox().GetHomeFolder()).absoluteFilePath(name); + + UIDownloaderAdditions *pDl = UIDownloaderAdditions::create(); --- virtualbox-ose-4.0.14.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: