Package: virtualbox-ose
Version: 2.1.4-dfsg-1
Severity: normal
Tags: patch
The WineD3D guest additions are being moved to Savannah. This provides much
better bandwidth and a more persistent URL (although HTTP redirects for
backward compatibility will be provided).
Attached wined3d.diff adjusts the wined3d menu entry to use the new URL.
IMPORTANT: Savannah uses HTTP 301 redirects in its mirror network, but
VirtualBox only supports 302. Attached http_redirect.diff fixes this
(I sent this patch upstream already).
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.26-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -ur virtualbox-ose-2.1.4-dfsg.old/debian/patches/15_wined3d_guest_addition.dpatch virtualbox-ose-2.1.4-dfsg/debian/patches/15_wined3d_guest_addition.dpatch
--- virtualbox-ose-2.1.4-dfsg.old/debian/patches/15_wined3d_guest_addition.dpatch 2009-04-05 20:49:11.000000000 +0200
+++ virtualbox-ose-2.1.4-dfsg/debian/patches/15_wined3d_guest_addition.dpatch 2009-04-05 20:55:29.000000000 +0200
@@ -108,7 +108,7 @@
+
+ /* Download the required image */
+ {
-+ QString source = QString ("http://aybabtu.com/rmh/wined3d/pub/latest/wined3d.iso";);
++ QString source = QString ("http://download.savannah.nongnu.org/releases/wined3d/latest/wined3d.iso";);
+ QString target = QDir (vboxGlobal().virtualBox().GetHomeFolder())
+ .absoluteFilePath (name);
+
diff -ur virtualbox-ose-2.1.4-dfsg.old/src/VBox/Frontends/VirtualBox4/include/QIHttp.h virtualbox-ose-2.1.4-dfsg/src/VBox/Frontends/VirtualBox4/include/QIHttp.h
--- virtualbox-ose-2.1.4-dfsg.old/src/VBox/Frontends/VirtualBox4/include/QIHttp.h 2009-02-16 16:54:03.000000000 +0100
+++ virtualbox-ose-2.1.4-dfsg/src/VBox/Frontends/VirtualBox4/include/QIHttp.h 2009-04-05 20:55:39.000000000 +0200
@@ -56,6 +56,7 @@
/* Advanced QHttp errors */
TimeoutError, /* MaxWaitTime time passed with no response */
PageNotFoundError, /* Corresponds to 404 == not found header */
+ MovedPermanentlyError, /* Corresponds to 301 == moved permanently response */
MovedTemporarilyError /* Corresponds to 302 == moved temporarily response */
};
@@ -92,6 +93,7 @@
return tr ("Could not locate the file on "
"the server (response: %1)").arg (mStatusCode);
case MovedTemporarilyError:
+ case MovedPermanentlyError:
return QString::null; /* should be redirected anyway */
default:
return QHttp::errorString();
@@ -133,6 +135,9 @@
mStatusCode = aResponse.statusCode();
switch (mStatusCode)
{
+ case 301:
+ mErrorCode = MovedPermanentlyError;
+ return abort();
case 302:
mErrorCode = MovedTemporarilyError;
return abort();
diff -ur virtualbox-ose-2.1.4-dfsg.old/src/VBox/Frontends/VirtualBox4/src/VBoxDownloaderWgt.cpp virtualbox-ose-2.1.4-dfsg/src/VBox/Frontends/VirtualBox4/src/VBoxDownloaderWgt.cpp
--- virtualbox-ose-2.1.4-dfsg.old/src/VBox/Frontends/VirtualBox4/src/VBoxDownloaderWgt.cpp 2009-02-16 16:54:18.000000000 +0100
+++ virtualbox-ose-2.1.4-dfsg/src/VBox/Frontends/VirtualBox4/src/VBoxDownloaderWgt.cpp 2009-04-05 20:55:39.000000000 +0200
@@ -102,6 +102,7 @@
QTimer::singleShot (0, this, SLOT (suicide()));
break;
}
+ case QIHttp::MovedPermanentlyError:
case QIHttp::MovedTemporarilyError:
{
/* Restart downloading at new location */
