[VirtualBox/f29: 13/14] Rebase and squash f29
by Sérgio M. Basto
commit da9f53064e8d50bed2a26c9832f8a622192704d3
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Mar 22 02:31:08 2019 +0000
Rebase and squash f29
.gitignore | 5 +-
...AutoMount-Change-Linux-mount-code-to-use-.patch | 63 +++++-----
VirtualBox-5.1.0-add-Mageia-support.patch | 107 ++++++++--------
VirtualBox-5.2.24-xpcom18a4-fix.patch | 12 --
VirtualBox-OSE-4.1.4-noupdate.patch | 22 ----
VirtualBox.spec | 140 ++++++++++++++-------
sources | 3 +-
update_vbox.sh | 33 +----
8 files changed, 194 insertions(+), 191 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d719926..75232ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,7 @@ VirtualBox-5.0.16.tar.bz2
/VirtualBox-5.2.18.tar.bz2
/VirtualBox-5.2.20.tar.bz2
/VirtualBox-5.2.22.tar.bz2
-/VirtualBox-5.2.24.tar.bz2
+/VirtualBox-6.0.0.tar.bz2
+/UserManual.pdf
+/VirtualBox-6.0.2.tar.bz2
+/VirtualBox-6.0.4.tar.bz2
diff --git a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
index 625d554..63447ad 100644
--- a/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
+++ b/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
@@ -10,19 +10,18 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com>
1 file changed, 8 insertions(+), 54 deletions(-)
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
-index aa15d8b1..551edd4a 100644
---- a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
-+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
-@@ -39,6 +39,7 @@
- #include <iprt/assert.h>
+--- ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp.orig 2018-11-25 02:36:31.829306539 +0000
++++ ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-11-25 02:41:41.632973288 +0000
+@@ -40,6 +40,7 @@
+ #include <iprt/ctype.h>
#include <iprt/dir.h>
#include <iprt/mem.h>
+#include <iprt/param.h>
#include <iprt/path.h>
- #include <iprt/string.h>
#include <iprt/semaphore.h>
-@@ -77,6 +78,9 @@ RT_C_DECLS_END
- # endif
+ #include <iprt/sort.h>
+@@ -117,6 +118,9 @@ RT_C_DECLS_END
+ # define VBOXSERVICE_AUTOMOUNT_MIQF SHFL_MIQF_PATH
#endif
+#ifndef MAX_MNTOPT_STR
@@ -30,31 +29,32 @@ index aa15d8b1..551edd4a 100644
+#endif
/*********************************************************************************************************************************
- * Global Variables *
-@@ -297,13 +301,13 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
- rc = vbsvcAutoMountPrepareMountPoint(pszMountPoint, pszShareName, pOpts);
- if (!fSkip && RT_SUCCESS(rc))
+ * Structures and Typedefs *
+@@ -398,13 +402,13 @@ static int vbsvcAutoMountSharedFolderOld
+ int rc = vbsvcAutoMountPrepareMountPointOld(pszMountPoint, pszShareName, &Opts);
+ if (RT_SUCCESS(rc))
{
--#ifdef RT_OS_SOLARIS
- char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
++ char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
+ RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
-+ pOpts->uid, pOpts->gid, pOpts->dmode, pOpts->fmode, pOpts->dmask, pOpts->fmask);
-+#ifdef RT_OS_SOLARIS
++ Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask);
+ # ifdef RT_OS_SOLARIS
int fFlags = 0;
- if (pOpts->ronly)
+ if (Opts.ronly)
fFlags |= MS_RDONLY;
+- char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
- RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
-- pOpts->uid, pOpts->gid, pOpts->dmode, pOpts->fmode, pOpts->dmask, pOpts->fmask);
+- Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask);
int r = mount(pszShareName,
pszMountPoint,
fFlags | MS_OPTIONSTR,
-@@ -320,32 +324,11 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
+@@ -421,34 +425,11 @@ static int vbsvcAutoMountSharedFolderOld
- #elif defined(RT_OS_LINUX)
+ # else /* RT_OS_LINUX */
unsigned long fFlags = MS_NODEV;
-
- /*const char *szOptions = { "rw" }; - ??? */
- struct vbsf_mount_info_new mntinf;
+- RT_ZERO(mntinf);
-
- mntinf.nullchar = '\0';
- mntinf.signature[0] = VBSF_MOUNT_SIGNATURE_BYTE_0;
@@ -62,13 +62,14 @@ index aa15d8b1..551edd4a 100644
- mntinf.signature[2] = VBSF_MOUNT_SIGNATURE_BYTE_2;
- mntinf.length = sizeof(mntinf);
-
-- mntinf.uid = pOpts->uid;
-- mntinf.gid = pOpts->gid;
-- mntinf.ttl = pOpts->ttl;
-- mntinf.dmode = pOpts->dmode;
-- mntinf.fmode = pOpts->fmode;
-- mntinf.dmask = pOpts->dmask;
-- mntinf.fmask = pOpts->fmask;
+- mntinf.uid = Opts.uid;
+- mntinf.gid = Opts.gid;
+- mntinf.ttl = Opts.ttl;
+- mntinf.dmode = Opts.dmode;
+- mntinf.fmode = Opts.fmode;
+- mntinf.dmask = Opts.dmask;
+- mntinf.fmask = Opts.fmask;
+- mntinf.tag[0] = '\0';
-
- strcpy(mntinf.name, pszShareName);
- strcpy(mntinf.nls_name, "\0");
@@ -82,7 +83,7 @@ index aa15d8b1..551edd4a 100644
if (r == 0)
{
VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
-@@ -378,34 +361,6 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
+@@ -481,34 +462,6 @@ static int vbsvcAutoMountSharedFolderOld
}
else /* r == -1, we got some error in errno. */
{
@@ -117,14 +118,14 @@ index aa15d8b1..551edd4a 100644
switch (errno)
{
/* If we get EINVAL here, the system already has mounted the Shared Folder to another
-@@ -424,7 +379,6 @@ static int vbsvcAutoMountSharedFolder(const char *pszShareName, const char *pszM
+@@ -527,7 +480,6 @@ static int vbsvcAutoMountSharedFolderOld
rc = RTErrConvertFromErrno(errno);
break;
}
- }
}
- #else
- # error "PORTME"
+ # endif
+ }
--
2.14.3
diff --git a/VirtualBox-5.1.0-add-Mageia-support.patch b/VirtualBox-5.1.0-add-Mageia-support.patch
index 3efb046..0b01e8b 100644
--- a/VirtualBox-5.1.0-add-Mageia-support.patch
+++ b/VirtualBox-5.1.0-add-Mageia-support.patch
@@ -1,7 +1,6 @@
-diff -rup VirtualBox-5.2.4.orig/include/VBox/ostypes.h VirtualBox-5.2.4/include/VBox/ostypes.h
---- VirtualBox-5.2.4.orig/include/VBox/ostypes.h 2017-12-19 09:21:46.000000000 +0000
-+++ VirtualBox-5.2.4/include/VBox/ostypes.h 2018-01-16 01:33:36.323052771 +0000
-@@ -107,6 +107,8 @@ typedef enum VBOXOSTYPE
+--- ./include/VBox/ostypes.h.orig 2018-12-01 15:08:30.394341093 +0000
++++ ./include/VBox/ostypes.h 2018-12-01 15:08:50.805529628 +0000
+@@ -108,6 +108,8 @@ typedef enum VBOXOSTYPE
VBOXOSTYPE_Xandros_x64 = 0x5D100,
VBOXOSTYPE_Oracle = 0x5E000,
VBOXOSTYPE_Oracle_x64 = 0x5E100,
@@ -10,9 +9,8 @@ diff -rup VirtualBox-5.2.4.orig/include/VBox/ostypes.h VirtualBox-5.2.4/include/
VBOXOSTYPE_FreeBSD = 0x60000,
VBOXOSTYPE_FreeBSD_x64 = 0x60100,
VBOXOSTYPE_OpenBSD = 0x61000,
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd-x11.sh
---- VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2017-12-19 09:22:03.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2018-01-16 01:33:36.545055031 +0000
+--- ./src/VBox/Additions/linux/installer/vboxadd-x11.sh.orig 2018-12-01 15:08:30.395341102 +0000
++++ ./src/VBox/Additions/linux/installer/vboxadd-x11.sh 2018-12-01 15:08:50.806529637 +0000
@@ -94,8 +94,14 @@ install_x11_startup_app() {
x11_autostart="/etc/xdg/autostart"
kde_autostart="/usr/share/autostart"
@@ -28,10 +26,9 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd-x11.s
if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x "$mandriva_dir" ]
then
install -m 0644 $app_src "$mandriva_dir/$app_dest"
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
---- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2017-12-19 09:27:42.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2018-01-16 01:33:36.598055571 +0000
-@@ -315,6 +315,8 @@ UIIconPoolGeneral::UIIconPoolGeneral()
+--- ./src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig 2018-12-01 15:08:30.395341102 +0000
++++ ./src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2018-12-01 15:08:50.806529637 +0000
+@@ -331,6 +331,8 @@ UIIconPoolGeneral::UIIconPoolGeneral()
m_guestOSTypeIconNames.insert("Fedora_64", ":/os_fedora_64.png");
m_guestOSTypeIconNames.insert("Gentoo", ":/os_gentoo.png");
m_guestOSTypeIconNames.insert("Gentoo_64", ":/os_gentoo_64.png");
@@ -40,22 +37,35 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIcon
m_guestOSTypeIconNames.insert("Mandriva", ":/os_mandriva.png");
m_guestOSTypeIconNames.insert("Mandriva_64", ":/os_mandriva_64.png");
m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png");
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
---- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2017-12-19 09:27:33.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2018-01-16 01:33:36.653056131 +0000
-@@ -290,6 +290,8 @@
- <file alias="os_linux26_64.png">images/os_linux26_64.png</file>
- <file alias="os_macosx.png">images/os_macosx.png</file>
+--- ./src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp.orig 2018-12-01 15:08:30.396341111 +0000
++++ ./src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2018-12-01 15:08:50.807529646 +0000
+@@ -143,8 +143,10 @@ static const osTypePattern gs_OSTypePatt
+ { QRegExp("Fe.*32", Qt::CaseInsensitive), "Fedora" },
+ { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
+ { QRegExp("((Gen)|(Sab)).*32", Qt::CaseInsensitive), "Gentoo" },
+- { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
+- { QRegExp("((Man)|(Mag)).*32", Qt::CaseInsensitive), "Mandriva" },
++ { QRegExp("Mag.*64", Qt::CaseInsensitive), "Mageia_64" },
++ { QRegExp("Mag", Qt::CaseInsensitive), "Mageia" },
++ { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" },
++ { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" },
+ { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
+ { QRegExp("((Red)|(rhel)|(cen)).*32", Qt::CaseInsensitive), "RedHat" },
+ { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
+--- ./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc.orig 2018-12-01 15:08:30.397341121 +0000
++++ ./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2018-12-01 15:08:50.807529646 +0000
+@@ -57,6 +57,8 @@
+ <file alias="os_linux.png">images/os_linux.png</file>
<file alias="os_macosx_64.png">images/os_macosx_64.png</file>
-+ <file alias="os_mageia.png">images/os_mageia.png</file>
+ <file alias="os_macosx.png">images/os_macosx.png</file>
+ <file alias="os_mageia_64.png">images/os_mageia_64.png</file>
- <file alias="os_mandriva.png">images/os_mandriva.png</file>
++ <file alias="os_mageia.png">images/os_mageia.png</file>
<file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
- <file alias="os_netbsd.png">images/os_netbsd.png</file>
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Installer/linux/distributions_rpm VirtualBox-5.2.4/src/VBox/Installer/linux/distributions_rpm
---- VirtualBox-5.2.4.orig/src/VBox/Installer/linux/distributions_rpm 2017-12-19 09:28:05.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Installer/linux/distributions_rpm 2018-01-16 01:33:36.768057301 +0000
-@@ -5,6 +5,16 @@ openSUSE114 = OPENSUSE_11_4
+ <file alias="os_mandriva.png">images/os_mandriva.png</file>
+ <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file>
+--- ./src/VBox/Installer/linux/distributions_rpm.orig 2018-12-01 15:08:30.397341121 +0000
++++ ./src/VBox/Installer/linux/distributions_rpm 2018-12-01 15:08:50.808529655 +0000
+@@ -6,6 +6,16 @@ openSUSE114 = OPENSUSE_11_4
openSUSE113 = OPENSUSE_11_3
sles11.0 = SLES_11_0
sles10.1 = SLES_10_1
@@ -72,9 +82,8 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Installer/linux/distributions_rpm Virtu
mdv2011.0 = MANDRIVA_2011_0
fedora29 = FEDORA_29
fedora26 = FEDORA_26
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-5.2.4/src/VBox/Installer/linux/VBoxSysInfo.sh
---- VirtualBox-5.2.4.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2017-12-19 09:28:04.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Installer/linux/VBoxSysInfo.sh 2018-01-16 01:33:36.786057485 +0000
+--- ./src/VBox/Installer/linux/VBoxSysInfo.sh.orig 2018-12-01 15:08:30.397341121 +0000
++++ ./src/VBox/Installer/linux/VBoxSysInfo.sh 2018-12-01 15:08:50.808529655 +0000
@@ -44,6 +44,11 @@ get_linux_info () {
# Debian-based system
release=`cat /etc/debian_version`
@@ -87,9 +96,8 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualB
elif [ -r /etc/mandriva-release ]
then
# Mandriva-based system
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h
---- VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2017-12-19 09:28:07.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2018-01-16 01:33:36.851058146 +0000
+--- ./src/VBox/Main/cbinding/VBoxCAPI_v2_2.h.orig 2018-12-01 15:08:30.399341139 +0000
++++ ./src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2018-12-01 15:08:50.809529665 +0000
@@ -921,7 +921,9 @@ enum CIMOSType
CIMOSType_CIMOS_Linux_2_6_x = 99,
CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
@@ -101,9 +109,8 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h VirtualBo
};
/* End of enum CIMOSType Declaration */
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h
---- VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2017-12-19 09:28:07.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2018-01-16 01:33:36.867058309 +0000
+--- ./src/VBox/Main/cbinding/VBoxCAPI_v3_0.h.orig 2018-12-01 15:08:30.400341148 +0000
++++ ./src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2018-12-01 15:08:50.810529674 +0000
@@ -1371,7 +1371,9 @@ enum CIMOSType
CIMOSType_CIMOS_Linux_2_6_x = 99,
CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
@@ -115,9 +122,8 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h VirtualBo
};
/* End of enum CIMOSType Declaration */
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/include/ovfreader.h VirtualBox-5.2.4/src/VBox/Main/include/ovfreader.h
---- VirtualBox-5.2.4.orig/src/VBox/Main/include/ovfreader.h 2017-12-19 09:28:09.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/include/ovfreader.h 2018-01-16 01:33:36.875058391 +0000
+--- ./src/VBox/Main/include/ovfreader.h.orig 2018-12-01 15:08:30.401341158 +0000
++++ ./src/VBox/Main/include/ovfreader.h 2018-12-01 15:08:50.811529683 +0000
@@ -175,8 +175,10 @@ enum CIMOSType_T
CIMOSType_CIMOS_CentOS_64 = 107,
CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
@@ -130,11 +136,10 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/include/ovfreader.h VirtualBox-5.2
};
enum OVFVersion_T
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-all/Global.cpp VirtualBox-5.2.4/src/VBox/Main/src-all/Global.cpp
---- VirtualBox-5.2.4.orig/src/VBox/Main/src-all/Global.cpp 2017-12-19 09:28:09.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/src-all/Global.cpp 2018-01-16 01:33:36.883058472 +0000
-@@ -250,6 +250,17 @@ const Global::OSType Global::sOSTypes[]
- 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+--- ./src/VBox/Main/src-all/Global.cpp.orig 2018-12-01 15:08:30.401341158 +0000
++++ ./src/VBox/Main/src-all/Global.cpp 2018-12-01 15:08:50.811529683 +0000
+@@ -251,6 +251,17 @@ const Global::OSType Global::sOSTypes[]
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
+ { "Linux", "Linux", "Mageia", "Mageia (32-bit)",
@@ -150,11 +155,10 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-all/Global.cpp VirtualBox-5.2.
+
{ "Linux", "Linux", "Mandriva", "Mandriva (32-bit)",
VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
- 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-5.2.4/src/VBox/Main/src-server/ApplianceImpl.cpp
---- VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2017-12-19 09:28:10.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/src-server/ApplianceImpl.cpp 2018-01-16 01:33:36.901058655 +0000
-@@ -165,6 +165,8 @@ g_osTypes[] =
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+--- ./src/VBox/Main/src-server/ApplianceImpl.cpp.orig 2018-12-01 15:08:30.402341167 +0000
++++ ./src/VBox/Main/src-server/ApplianceImpl.cpp 2018-12-01 15:08:50.812529693 +0000
+@@ -132,6 +132,8 @@ static struct
{ ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, VBOXOSTYPE_Linux },
{ ovf::CIMOSType_CIMOS_TurboLinux, VBOXOSTYPE_Turbolinux },
{ ovf::CIMOSType_CIMOS_TurboLinux_64, VBOXOSTYPE_Turbolinux_x64 },
@@ -163,7 +167,7 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp Virtu
{ ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mandriva },
{ ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mandriva_x64 },
{ ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu },
-@@ -228,6 +230,7 @@ static const osTypePattern g_osTypesPatt
+@@ -195,6 +197,7 @@ static const osTypePattern g_aOsTypesPat
{"SUSE", VBOXOSTYPE_OpenSUSE},
{"Novell", VBOXOSTYPE_OpenSUSE},
{"Red Hat", VBOXOSTYPE_RedHat},
@@ -171,7 +175,7 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp Virtu
{"Mandriva", VBOXOSTYPE_Mandriva},
{"Ubuntu", VBOXOSTYPE_Ubuntu},
{"Debian", VBOXOSTYPE_Debian},
-@@ -257,6 +260,7 @@ static const osTypePattern g_osTypesPatt
+@@ -224,6 +227,7 @@ static const osTypePattern g_aOsTypesPat
{"SUSE", VBOXOSTYPE_OpenSUSE_x64},
{"Novell", VBOXOSTYPE_OpenSUSE_x64},
{"Red Hat", VBOXOSTYPE_RedHat_x64},
@@ -179,10 +183,9 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/src-server/ApplianceImpl.cpp Virtu
{"Mandriva", VBOXOSTYPE_Mandriva_x64},
{"Ubuntu", VBOXOSTYPE_Ubuntu_x64},
{"Debian", VBOXOSTYPE_Debian_x64},
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Main/xml/Settings.cpp VirtualBox-5.2.4/src/VBox/Main/xml/Settings.cpp
---- VirtualBox-5.2.4.orig/src/VBox/Main/xml/Settings.cpp 2017-12-19 09:28:13.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Main/xml/Settings.cpp 2018-01-16 01:33:36.914058788 +0000
-@@ -5075,6 +5075,7 @@ const struct {
+--- ./src/VBox/Main/xml/Settings.cpp.orig 2018-12-01 15:08:30.403341176 +0000
++++ ./src/VBox/Main/xml/Settings.cpp 2018-12-01 15:08:50.814529711 +0000
+@@ -5387,6 +5387,7 @@ const struct {
{ "opensuse", "OpenSUSE" },
{ "fedoracore", "Fedora" },
{ "gentoo", "Gentoo" },
diff --git a/VirtualBox.spec b/VirtualBox.spec
index eb1e49a..855e468 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -13,22 +13,19 @@
# major version number, while the kernel module abi is not guaranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
-#global prerel 106108
-%global prereltag %{?prerel:-%(awk 'BEGIN {print toupper("%{prerel}")}')}
+#global prerel RC1
+%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
%ifarch x86_64
%bcond_without webservice
%else
%bcond_with webservice
%endif
-# el7 doesn't have all texlive requirements
-%if 0%{?rhel}
- %bcond_with docs
-%else
- %bcond_without docs
-%endif
+# Now we use upstream pdf
+%bcond_with docs
%bcond_without vnc
%bcond_with legacy_vboxvideo_drv
+
%if 0%{?fedora} > 27
%bcond_with guest_additions
%else
@@ -36,9 +33,8 @@
%endif
Name: VirtualBox
-Version: 5.2.24
-#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Version: 6.0.4
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -46,10 +42,12 @@ URL: http://www.virtualbox.org/wiki/VirtualBox
ExclusiveArch: i686 x86_64
+Group: System/Emulators/PC
Requires: %{name}-server%{?isa} = %{version}
Obsoletes: %{name}-qt
Source0: https://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/Virtua...
+Source1: https://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/UserMa...
Source3: VirtualBox-60-vboxdrv.rules
Source4: VirtualBox.modules
Source5: VirtualBox-60-vboxguest.rules
@@ -60,20 +58,23 @@ Source9: VBoxOGLRun.sh
Source10: vboxweb.service
Source20: os_mageia.png
Source21: os_mageia_64.png
-Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
+Patch1: VirtualBox-6.0.0-noupdate.patch
Patch2: VirtualBox-5.1.0-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch27: VirtualBox-gcc.patch
+Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch
# from Debian
Patch28: 02-gsoap-build-fix.patch
+Patch30: 37-python-3.7-support.patch
+Patch32: VBoxVNC.fix.patch
+# from ArchLinux
+Patch40: 007-python2-path.patch
# from Mageia
Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
# from Fedora
Patch60: VirtualBox-5.2.10-xclient.patch
Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
-# https://www.virtualbox.org/changeset/73153/vbox
-Patch65: VirtualBox-5.2.24-xpcom18a4-fix.patch
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -88,6 +89,7 @@ BuildRequires: libIDL-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
BuildRequires: python2-devel
+BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: desktop-file-utils
BuildRequires: libcap-devel
BuildRequires: qt5-qtbase-devel
@@ -211,6 +213,15 @@ Obsoletes: python-VirtualBox < %{version}-%{release}
Python XPCOM bindings to %{name}.
+%package -n python%{python3_pkgversion}-%{name}
+Summary: Python3 bindings for %{name}
+Group: Development/Libraries
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
+
+%description -n python%{python3_pkgversion}-%{name}
+Python3 XPCOM bindings to %{name}.
+
%package guest-additions
Summary: %{name} Guest Additions
Group: System Environment/Base
@@ -247,12 +258,14 @@ which is generated during the build of main package.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?prereltag}
# add Mageia images
cp -a %{SOURCE20} %{SOURCE21} src/VBox/Frontends/VirtualBox/images/
# Remove prebuilt binary tools
find -name '*.py[co]' -delete
+rm -r src/VBox/Additions/WINNT
+rm -r src/VBox/Additions/os2
rm -r kBuild/
rm -r tools/
# Remove bundle X11 sources and some lib sources, before patching.
@@ -277,14 +290,17 @@ rm -r src/libs/zlib-1.2.8/
%if 0%{?fedora} > 20
%patch28 -p1 -b .gsoap2
%endif
-%patch50 -p1 -b .mageia-support
+%if 0%{?fedora} < 28 || 0%{?rhel}
+%patch29 -p2 -R -b .gsoap3
+%endif
+%patch30 -p1 -b .python37
+%patch32 -p1 -b .vnc
+%patch40 -p1 -b .python2_path
+# mageia support not ready for 6.0
+#patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
%patch60 -p1 -b .xclient
%patch61 -p1 -b .automount
-%patch65 -p1 -b .xpcom18a4-fix
-
-# CRLF->LF
-sed -i 's/\r//' COPYING
%build
./configure --disable-kmods \
@@ -298,6 +314,10 @@ sed -i 's/\r//' COPYING
--disable-docs \
%endif
+%if !%{with docs}
+cp %{SOURCE1} UserManual.pdf
+%endif
+
#--enable-vde
#--build-headless --build-libxml2
#--disable-java
@@ -322,10 +342,8 @@ kmk %{_smp_mflags} \
VBOX_PATH_APP_DOCS=%{_docdir}/VirtualBox \
VBOX_WITH_TESTCASES= \
VBOX_WITH_VALIDATIONKIT= \
- VBOX_WITH_EXTPACK_VBOXDTRACE= \
VBOX_WITH_VBOX_IMG=1 \
VBOX_WITH_SYSFS_BY_DEFAULT=1 \
- VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
VBOX_USE_SYSTEM_XORG_HEADERS=1 \
VBOX_USE_SYSTEM_GL_HEADERS=1 \
%{!?legacy_vboxvideo_drv: VBOX_NO_LEGACY_XORG_X11=1 } \
@@ -335,12 +353,12 @@ kmk %{_smp_mflags} \
SDK_VBOX_OPENSSL_LIBS="ssl crypto" \
SDK_VBOX_ZLIB_INCS="" \
%{?with_docs: VBOX_WITH_DOCS=1 } \
- VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
- VBOX_WITH_UPDATE_REQUEST=0 \
+ VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
+ VBOX_WITH_UPDATE_REQUEST= \
VBOX_BUILD_PUBLISHER=%{publisher}
-# VBOX_PATH_DOCBOOK_DTD=/usr/share/sgml/docbook/xml-dtd-4.5/ \
-# VBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-stylesheets/ \
+# VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
+
# doc/manual/fr_FR/ missing man_VBoxManage-debugvm.xml and man_VBoxManage-extpack.xml
# VBOX_WITH_DOCS_TRANSLATIONS=1 \
# we can't build CHM DOCS we need hhc.exe which is not in source and we need
@@ -372,7 +390,6 @@ install -d %{buildroot}%{_datadir}/pixmaps
install -d %{buildroot}%{_datadir}/mime/packages
install -d %{buildroot}%{_datadir}/icons
install -d %{buildroot}%{_prefix}/src/%{name}-kmod-%{version}
-install -d %{buildroot}%{python2_sitelib}/virtualbox
# Libs
install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
@@ -388,9 +405,6 @@ install -p -m 0755 obj/bin/VBox.sh %{buildroot}%{_bindir}/VBox
install -p -m 0755 -t %{buildroot}%{_bindir} \
obj/bin/VBoxTunctl
-# Fixes ERROR: ambiguous python shebang in F30
-sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' obj/bin/vboxshell.py
-
# Executables
install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/VirtualBox \
@@ -415,6 +429,8 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/vboxshell.py \
obj/bin/vbox-img \
obj/bin/VBoxDTrace \
+ obj/bin/VBoxBugReport \
+ obj/bin/VirtualBoxVM \
%if %{with webservice}
obj/bin/vboxwebsrv \
obj/bin/webtest \
@@ -443,6 +459,9 @@ ln -s VBox %{buildroot}%{_bindir}/vboxwebsrv
%endif
ln -s ../..%{_libdir}/virtualbox/vbox-img %{buildroot}%{_bindir}/vbox-img
+#ln -s /usr/share/virtualbox/src/vboxhost $RPM_BUILD_ROOT/usr/src/vboxhost-%VER%
+
+
# Components, preserve symlinks
cp -a obj/bin/components/* %{buildroot}%{_libdir}/virtualbox/components/
@@ -450,11 +469,15 @@ cp -a obj/bin/components/* %{buildroot}%{_libdir}/virtualbox/components/
install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/nls \
obj/bin/nls/*
-# SDK
+# Python
pushd obj/bin/sdk/installer
VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
%{__python2} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
+VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
+ %{__python3} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
popd
+
+# SDK
cp -rp obj/bin/sdk/. %{buildroot}%{_libdir}/virtualbox/sdk
rm -rf %{buildroot}%{_libdir}/virtualbox/sdk/installer
@@ -565,12 +588,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/virtualbox.desktop
# mv ExtensionPacks/VNC $RPM_BUILD_ROOT/usr/lib/virtualbox/ExtensionPacks
#fi
#set_selinux_permissions /usr/lib/virtualbox /usr/share/virtualbox
-#for i in rdesktop-vrdp.tar.gz rdesktop-vrdp-keymaps; do
-# mv $i $RPM_BUILD_ROOT/usr/share/virtualbox; done
-#mv rdesktop-vrdp $RPM_BUILD_ROOT/usr/bin
-#
# vboxautostart-service
+install -d %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps
+install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps obj/bin/rdesktop-vrdp-keymaps/*
+install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox obj/bin/rdesktop-vrdp.tar.gz
+install -p -m 0755 -t %{buildroot}%{_bindir} obj/bin/rdesktop-vrdp
+
+
%pre
# Group for USB devices
getent group vboxusers >/dev/null || groupadd -r vboxusers
@@ -663,6 +688,8 @@ getent passwd vboxadd >/dev/null || \
%doc doc/*cpp doc/VMM
%if %{with docs}
%doc obj/bin/UserManual*.pdf
+%else
+%doc UserManual.pdf
%endif
%license COPYING*
%{_bindir}/VBoxManage
@@ -683,9 +710,9 @@ getent passwd vboxadd >/dev/null || \
%{_bindir}/vboxautostart
%{_bindir}/vbox-img
%{_bindir}/VBoxTunctl
+%{_bindir}/rdesktop-vrdp
%dir %{_libdir}/virtualbox
%{_libdir}/virtualbox/*.[^p]*
-%exclude %{_libdir}/virtualbox/VirtualBox.so
%exclude %{_libdir}/virtualbox/VBoxDbg.so
%exclude %{_libdir}/virtualbox/VBoxPython2_7.so
%{_libdir}/virtualbox/components
@@ -699,8 +726,10 @@ getent passwd vboxadd >/dev/null || \
%{_libdir}/virtualbox/SUPUninstall
%{_libdir}/virtualbox/VBoxAutostart
%{_libdir}/virtualbox/VBoxVMMPreload
+%{_libdir}/virtualbox/VBoxBugReport
%{_libdir}/virtualbox/VBoxDTrace
%{_libdir}/virtualbox/vbox-img
+%{_libdir}/virtualbox/rdesktop-vrdp-keymaps
# This permissions have to be here, before generator of debuginfo need
# permissions to read this files
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetNAT
@@ -709,7 +738,8 @@ getent passwd vboxadd >/dev/null || \
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxSDL
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetDHCP
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl
-%attr(4511,root,root) %{_libdir}/virtualbox/VirtualBox
+%attr(4511,root,root) %{_libdir}/virtualbox/VirtualBoxVM
+%{_libdir}/virtualbox/VirtualBox
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/*/mimetypes/*.png
%{_datadir}/icons/hicolor/scalable/mimetypes/virtualbox.svg
@@ -724,7 +754,6 @@ getent passwd vboxadd >/dev/null || \
%{_bindir}/VirtualBox
%{_bindir}/virtualbox
%{_libdir}/virtualbox/VBoxTestOGL
-%{_libdir}/virtualbox/VirtualBox.so
%{_libdir}/virtualbox/VBoxDbg.so
%{_libdir}/virtualbox/nls
%{_datadir}/pixmaps/*.png
@@ -740,14 +769,16 @@ getent passwd vboxadd >/dev/null || \
%files devel
%{_libdir}/virtualbox/sdk
-%exclude %{_libdir}/virtualbox/sdk/bindings/xpcom/python
%files -n python2-%{name}
%{_libdir}/virtualbox/*.py*
-%{python2_sitelib}/virtualbox
%{python2_sitelib}/vboxapi*
%{_libdir}/virtualbox/VBoxPython2_7.so
-%{_libdir}/virtualbox/sdk/bindings/xpcom/python
+
+%files -n python%{python3_pkgversion}-%{name}
+%{_libdir}/virtualbox/*.py*
+%{python3_sitelib}/vboxapi*
+%{_libdir}/virtualbox/VBoxPython3*.so
%if %{with guest_additions}
%files guest-additions
@@ -775,8 +806,31 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
-* Thu Jan 17 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 5.2.24-1
-- Update to 5.2.24
+* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 28 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.4-1
+- Update VBox to 6.0.4
+
+* Wed Jan 23 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.2-3
+- python3 on epel7
+- Fix build of webservice
+
+* Sat Jan 19 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.2-2
+- Patch 61 might be useful on el7
+
+* Thu Jan 17 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 6.0.2-1
+- Update to 6.0.2
+
+* Mon Jan 07 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.0-2
+- Enable Python3 support, move all SDK python files to devel sub-package, they
+ may be used by python2 and python 3.
+- Add patch VBoxVNC.fix.patch from Debian
+- Issue with EXTPACK_VBOXDTRACE was fix some time ago.
+
+* Sun Dec 30 2018 Sérgio Basto <sergio(a)serjux.com> - 6.0.0-1
+- VirtualBox 6.0
+- Patch23 was applied upstream.
* Fri Nov 09 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.22-1
- Update VBox to 5.2.22
diff --git a/sources b/sources
index 74770f2..0f58cce 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-798c39b9fc84b826e99a1b0b19a650dd VirtualBox-5.2.24.tar.bz2
+96e53b9e75a37cc6fd2d13d9c9f6881d VirtualBox-6.0.4.tar.bz2
+cc249f95c62a734b011ce0043fe7180d UserManual.pdf
diff --git a/update_vbox.sh b/update_vbox.sh
index 84b0113..8b9a1ea 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=5.2.22
+VERSION=6.0.4
REL=1
RAWHIDE=30
if [ -z "$1" ]
@@ -13,6 +13,7 @@ then
echo STAGE 0
git pull
rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox.spec
+rm UserManual.pdf
spectool -g VirtualBox.spec
rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-$VERSION-$REL.fc$RAWHIDE.src.rpm
echo Press enter to continue; read dummy;
@@ -21,7 +22,7 @@ fi
if test $stage -le 1
then
echo STAGE 1
-rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2
+rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf
rfpkg ci -c && git show
echo Press enter to continue; read dummy;
rfpkg push && rfpkg build --nowait
@@ -47,30 +48,4 @@ echo STAGE 5
git pull
rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox-kmod.spec
rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-kmod-$VERSION-$REL.fc$RAWHIDE.src.rpm
-rfpkg ci -c && git show
-#cp VirtualBox-kmod.spec VirtualBox-kmod.spec.new
-#git reset HEAD~1
-#git rm kernel-4.10.0-0.rc5.lnkops.v2.patch
-echo Press enter to continue; read dummy;
-rfpkg push && rfpkg build --nowait
-
-echo Press enter to continue; read dummy;
-#koji-rpmfusion watch-task
-koji-rpmfusion tag-build f27-free-override VirtualBox-$VERSION-$REL.fc27
-koji-rpmfusion wait-repo f27-free-build --build=VirtualBox-$VERSION-$REL.fc27
-git checkout f27 && git merge master && git push && rfpkg build --nowait; git checkout master
-echo Press enter to continue; read dummy;
-koji-rpmfusion tag-build f26-free-override VirtualBox-$VERSION-$REL.fc26
-
-echo "koji-rpmfusion tag-build f26-free-override VirtualBox-$VERSION-$REL.fc26
-koji-rpmfusion wait-repo f26-free-build --build=VirtualBox-$VERSION-$REL.fc26
-git checkout f26 && git merge master && git push && rfpkg build --nowait; git checkout master
-Press enter to continue; read dummy;
-koji-rpmfusion tag-build f25-free-override VirtualBox-$VERSION-$REL.fc25
-koji-rpmfusion wait-repo f25-free-build --build=VirtualBox-$VERSION-$REL.fc25
-git checkout f25 && git merge master && git push && rfpkg build --nowait; git checkout master
-Press enter to continue; read dummy;
-koji-rpmfusion tag-build el7-free-override VirtualBox-$VERSION-$REL.el7
-koji-rpmfusion wait-repo el7-free-build --build=VirtualBox-$VERSION-$REL.el7
-git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master"
-fi
+echo Continue in ..../VirtualBox-kmod/update_vbox.sh
5 years, 8 months
[VirtualBox/f29] (14 commits) ...Merge branch 'master' into f29
by Sérgio M. Basto
Summary of changes:
bc5b54d... more updates on script helper (*)
c40c422... VirtualBox 6.0 Patch23 was applied upstream. (*)
68e2dc7... git add VirtualBox-6.0.0-noupdate.patch (*)
16ead04... Enable Python3 support, move all SDK python files to devel (*)
c7b4a6a... Update to 6.0.2. (*)
6cf3564... Added asm volatile patch. (*)
abba50b... Patch 61 might be useful on el7 (*)
1bc60c9... python3 on epel7 (*)
0cb8d42... Fix build of webservice (*)
8565859... Update VBox to 6.0.4 (*)
e2ec092... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*)
b4086fc... minor changes (*)
da9f530... Rebase and squash f29
60aec8b... Merge branch 'master' into f29
(*) This commit already existed in another branch; no separate mail sent
5 years, 8 months
[VirtualBox] minor changes
by Sérgio M. Basto
commit b4086fc7c0e7b669a5b88eb82c3b0959736f2a8d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Mar 22 02:18:25 2019 +0000
minor changes
VirtualBox.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index d08390f..855e468 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -264,6 +264,8 @@ cp -a %{SOURCE20} %{SOURCE21} src/VBox/Frontends/VirtualBox/images/
# Remove prebuilt binary tools
find -name '*.py[co]' -delete
+rm -r src/VBox/Additions/WINNT
+rm -r src/VBox/Additions/os2
rm -r kBuild/
rm -r tools/
# Remove bundle X11 sources and some lib sources, before patching.
@@ -822,7 +824,7 @@ getent passwd vboxadd >/dev/null || \
* Mon Jan 07 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.0-2
- Enable Python3 support, move all SDK python files to devel sub-package, they
- may be used by python2 and 3.
+ may be used by python2 and python 3.
- Add patch VBoxVNC.fix.patch from Debian
- Issue with EXTPACK_VBOXDTRACE was fix some time ago.
5 years, 8 months
[shotcut] Update to 19.02.28
by Martin Gansser
commit 333f55c8fa266301420463829bcf40b4474a8513
Author: Martin Gansser <mgansser(a)online.de>
Date: Thu Mar 21 16:14:27 2019 +0100
Update to 19.02.28
.gitignore | 1 +
shotcut.spec | 11 +++++++++--
sources | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 85dc8d8..760d6be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/shotcut-19.01.19.tar.gz
/shotcut-19.01.24.tar.gz
/shotcut-19.01.27.tar.gz
+/shotcut-19.02.28.tar.gz
diff --git a/shotcut.spec b/shotcut.spec
index 8b36e2c..f94b12e 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -3,8 +3,8 @@
%define _vstring %(echo %{version} |tr -d ".")
Name: shotcut
-Version: 19.01.27
-Release: 2%{dist}
+Version: 19.02.28
+Release: 1%{dist}
Summary: A free, open source, cross-platform video editor
# The entire source code is GPLv3+ except mvcp/ which is LGPLv2+
License: GPLv3+ and LGPLv2+
@@ -87,13 +87,17 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
%lang_subpkg de German
%lang_subpkg el Greek
%lang_subpkg en English
+%lang_subpkg en_GB "(Great Britain)"
%lang_subpkg es Spanish
+%lang_subpkg et Estonian
+%lang_subpkg fi Finnish
%lang_subpkg fr French
%lang_subpkg gd "(Scottish Gaelic)"
%lang_subpkg hu Hungarian
%lang_subpkg it Italian
%lang_subpkg ja Japanese
%lang_subpkg nb Norwegian
+%lang_subpkg ne Nepali
%lang_subpkg nl Dutch
%lang_subpkg oc Occitan
%lang_subpkg pl Polish
@@ -183,6 +187,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.%{name}.S
%doc doc
%changelog
+* Thu Mar 21 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 19.02.28-1
+- Update to 19.02.28
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 19.01.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index e42ef62..e541ac2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b7ef08d7ad6dadbaf8b19a93923b779 shotcut-19.01.27.tar.gz
+882abf8084489315914e707c3f452041 shotcut-19.02.28.tar.gz
5 years, 8 months
[nvidia-kmod] fixup
by Nicolas Chauvet
commit ea4307d3a967491f97b3c226947c6a95e8a3c828
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Mar 21 10:13:28 2019 +0100
fixup
nvidia-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index d6a5224..6636659 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -21,7 +21,7 @@ Source11: nvidia-kmodtool-excludekernel-filterfile
ExclusiveArch: x86_64
# get the needed BuildRequires (in parts depending on what we build for)
-%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-kmodsrc >= %{epoch}:%{version}-%{release}
+%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-kmodsrc >= %{epoch}:%{version}-1
BuildRequires: %{AkmodsBuildRequires}
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
5 years, 8 months
[nvidia-kmod] Add release tag to akmod build requires and obsoletes
by Leigh Scott
commit de4591b9bf2862e8516237065376f23f3227062a
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Mar 21 09:07:10 2019 +0000
Add release tag to akmod build requires and obsoletes
nvidia-kmod.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 11810e8..d6a5224 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-kmod
Epoch: 3
Version: 418.56
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
@@ -21,12 +21,12 @@ Source11: nvidia-kmodtool-excludekernel-filterfile
ExclusiveArch: x86_64
# get the needed BuildRequires (in parts depending on what we build for)
-%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-kmodsrc >= %{epoch}:%{version}
+%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-kmodsrc >= %{epoch}:%{version}-%{release}
BuildRequires: %{AkmodsBuildRequires}
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
-%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{?epoch}:%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{?epoch}:%{version}-%{release}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
The nvidia %{version} display driver kernel module for kernel %{kversion}.
@@ -35,7 +35,7 @@ The nvidia %{version} display driver kernel module for kernel %{kversion}.
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
-kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{?epoch}:%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{?epoch}:%{version}-%{release}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
@@ -66,6 +66,9 @@ done
%changelog
+* Thu Mar 21 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:418.56-2
+- Add release tag to akmod build requires and obsoletes
+
* Thu Mar 21 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:418.56-1
- Update to 418.56 release
5 years, 8 months
[nvidia-xconfig/el7: 3/3] Merge branch 'master' into el7
by Leigh Scott
commit e1f3ddd46d0043014b997f0f76415332adaf7e11
Merge: e2881cc c80053a
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Mar 21 01:20:24 2019 +0000
Merge branch 'master' into el7
nvidia-xconfig.spec | 8 +++++++-
sources | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
5 years, 8 months
