* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/files/
@ 2016-03-11 17:31 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2016-03-11 17:31 UTC (permalink / raw
To: gentoo-commits
commit: 1e8ce0d2a434b923d31a46c9198c4a73575e4e5e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 13:33:52 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 17:31:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e8ce0d2
app-emulation/virtualbox: Removed unused patches.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/virtualbox-5.0.4-x86_buildfix_1.patch | 17 -----------------
.../files/virtualbox-5.0.4-x86_buildfix_2.patch | 12 ------------
2 files changed, 29 deletions(-)
diff --git a/app-emulation/virtualbox/files/virtualbox-5.0.4-x86_buildfix_1.patch b/app-emulation/virtualbox/files/virtualbox-5.0.4-x86_buildfix_1.patch
deleted file mode 100644
index 3e5b5a5..0000000
--- a/app-emulation/virtualbox/files/virtualbox-5.0.4-x86_buildfix_1.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-fix VirtualBox-5.0.4/src/VBox/ExtPacks/VNC/VBoxVNC.cpp:339:30: error: invalid conversion from 'rfbNewClientAction (__attribute__((regparm(0), cdecl)) *)(rfbClientPtr) {aka rfbNewClientAction (__attribute__((regparm(0), cdecl)) *)(_rfbClientRec*)}' to 'rfbNewClientHookPtr {aka rfbNewClientAction (*)(_rfbClientRec*)}' [-fpermissive]
-error for 32-bit build
-
-See:
-https://www.virtualbox.org/ticket/14564
-
---- VirtualBox-5.0.4/src/VBox/ExtPacks/VNC/VBoxVNC.cpp
-+++ VirtualBox-5.0.4/src/VBox/ExtPacks/VNC/VBoxVNC.cpp
-@@ -104,6 +104,6 @@
- unsigned char *mFrameBuffer;
- uint32_t uClients;
-- static DECLCALLBACK(enum rfbNewClientAction) rfbNewClientEvent(rfbClientPtr cl);
-- static DECLCALLBACK(void) vncMouseEvent(int buttonMask, int x, int y, rfbClientPtr cl);
-+ static enum rfbNewClientAction rfbNewClientEvent(rfbClientPtr cl);
-+ static void vncMouseEvent(int buttonMask, int x, int y, rfbClientPtr cl);
- static void vncKeyboardEvent(rfbBool down, rfbKeySym keySym, rfbClientPtr cl);
- static void clientGoneHook(rfbClientPtr cl);
diff --git a/app-emulation/virtualbox/files/virtualbox-5.0.4-x86_buildfix_2.patch b/app-emulation/virtualbox/files/virtualbox-5.0.4-x86_buildfix_2.patch
deleted file mode 100644
index 191862e..0000000
--- a/app-emulation/virtualbox/files/virtualbox-5.0.4-x86_buildfix_2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-fix VirtualBox-5.0.4/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp:929:64: error: invalid conversion from 'void (*)(PRTLOGGER, RTLOGPHASE, PFNRTLOGPHASEMSG) {aka void (*)(RTLOGGER*, RTLOGPHASE, void (__attribute__((regparm(0), cdecl)) *)(RTLOGGER*, const char*, ...))}' to 'PFNRTLOGPHASE {aka void (__attribute__((regparm(0), cdecl)) *)(RTLOGGER*, RTLOGPHASE, void (__attribute__((regparm(0), cdecl)) *)(RTLOGGER*, const char*, ...))}' [-fpermissive]
-for 32-bit build
-
---- VirtualBox-5.0.4/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
-+++ VirtualBox-5.0.4/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
-@@ -843,5 +843,5 @@
- * @param pfnLog
- */
--static void vboxGreeterLogHeaderFooter(PRTLOGGER pLoggerRelease, RTLOGPHASE enmPhase, PFNRTLOGPHASEMSG pfnLog)
-+static DECLCALLBACK(void) vboxGreeterLogHeaderFooter(PRTLOGGER pLoggerRelease, RTLOGPHASE enmPhase, PFNRTLOGPHASEMSG pfnLog)
- {
- /* Some introductory information. */
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/files/
@ 2016-05-04 8:21 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2016-05-04 8:21 UTC (permalink / raw
To: gentoo-commits
commit: d563d72ef81b189d41d0b4a62fa1dce45468df8e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 08:17:54 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May 4 08:20:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d563d72e
app-emulation/virtualbox: Fixed openrc init script shebang.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-emulation/virtualbox/files/vboxwebsrv-initd | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/app-emulation/virtualbox/files/vboxwebsrv-initd b/app-emulation/virtualbox/files/vboxwebsrv-initd
index e736df0..d954496 100644
--- a/app-emulation/virtualbox/files/vboxwebsrv-initd
+++ b/app-emulation/virtualbox/files/vboxwebsrv-initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,8 +8,6 @@ depend() {
}
start() {
- #checkconfig || return $?
-
ebegin "Starting VirtualBox WebService"
start-stop-daemon --start --quiet --user ${VBOXWEBSRV_USER} --pidfile /var/run/vboxwebsrv.pid \
--background --make-pidfile --exec /usr/bin/vboxwebsrv \
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/files/
@ 2017-09-02 14:27 Michael Palimaka
0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2017-09-02 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 630cbe9315843b64226503bff34ba80f6e2208b6
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug 29 08:57:31 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 14:27:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=630cbe93
app-emulation/virtualbox: remove unused patch/files
.../virtualbox/files/virtualbox-4-localconfig | 45 ------
.../virtualbox-5.1.22-opengl_dlopen_fix.patch | 167 ---------------------
.../virtualbox/files/virtualbox-ose-3-wrapper | 104 -------------
3 files changed, 316 deletions(-)
diff --git a/app-emulation/virtualbox/files/virtualbox-4-localconfig b/app-emulation/virtualbox/files/virtualbox-4-localconfig
deleted file mode 100644
index 5138d925269..00000000000
--- a/app-emulation/virtualbox/files/virtualbox-4-localconfig
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- Makefile -*-
-#
-# Overwrite some default kBuild settings
-#
-
-#
-# Copyright (C) 2006-2008 Sun Microsystems, Inc.
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation,
-# in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
-# distribution. VirtualBox OSE is distributed in the hope that it will
-# be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-# shut up wine complaining about unknown locale
-EXEC_X86_WIN32 := wine
-
-# don't build testcases to save time, they are not needed for the package
-VBOX_WITH_TESTCASES :=
-VBOX_WITH_TESTSUITE :=
-VBOX_DOCBOOK_WITH_LATEX := 1
-
-KBUILD_MSG_STYLE := brief
-
-## paths, origin, hardening
-VBOX_WITH_HARDENING := 1
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/MY_LIBDIR/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS)
-
-## don't build unwanted/splitted stuff
-VBOX_WITHOUT_ADDITIONS := 1
-VBOX_WITH_VBOXDRV :=
-VBOX_WITH_VBOXBFE :=
-VBOX_WITH_KCHMVIEWER :=
-
-## don't build with -Werror
-VBOX_WITH_WARNINGS_AS_ERRORS :=
-
diff --git a/app-emulation/virtualbox/files/virtualbox-5.1.22-opengl_dlopen_fix.patch b/app-emulation/virtualbox/files/virtualbox-5.1.22-opengl_dlopen_fix.patch
deleted file mode 100644
index 71fa978ca6e..00000000000
--- a/app-emulation/virtualbox/files/virtualbox-5.1.22-opengl_dlopen_fix.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-Index: VirtualBox-5.1.22/src/VBox/HostDrivers/Support/posix/SUPR3HardenedMain-posix.cpp
-===================================================================
---- VirtualBox-5.1.22/src/VBox/HostDrivers/Support/posix/SUPR3HardenedMain-posix.cpp (revision 115126)
-+++ VirtualBox-5.1.22/src/VBox/HostDrivers/Support/posix/SUPR3HardenedMain-posix.cpp (revision 115307)
-@@ -341,6 +341,7 @@
- * Patch 64-bit hosts.
- */
- uint32_t cRipRelMovs = 0;
-+ uint32_t cRelCalls = 0;
-
- /* Just use the disassembler to skip 12 bytes or more, we might need to
- rewrite mov instructions using RIP relative addressing. */
-@@ -349,7 +350,8 @@
- cbInstr = 1;
- int rc = DISInstr(pbTarget + offJmpBack, DISCPUMODE_64BIT, &Dis, &cbInstr);
- if ( RT_FAILURE(rc)
-- || (Dis.pCurInstr->fOpType & DISOPTYPE_CONTROLFLOW)
-+ || ( Dis.pCurInstr->fOpType & DISOPTYPE_CONTROLFLOW
-+ && Dis.pCurInstr->uOpcode != OP_CALL)
- || ( Dis.ModRM.Bits.Mod == 0
- && Dis.ModRM.Bits.Rm == 5 /* wrt RIP */
- && Dis.pCurInstr->uOpcode != OP_MOV))
-@@ -357,15 +359,23 @@
-
- if (Dis.ModRM.Bits.Mod == 0 && Dis.ModRM.Bits.Rm == 5 /* wrt RIP */)
- cRipRelMovs++;
-+ if ( Dis.pCurInstr->uOpcode == OP_CALL
-+ && (Dis.pCurInstr->fOpType & DISOPTYPE_RELATIVE_CONTROLFLOW))
-+ cRelCalls++;
-
- offJmpBack += cbInstr;
- cbPatchMem += cbInstr;
- }
-
-+ /*
-+ * Each relative call requires extra bytes as it is converted to a pushq imm32
-+ * + mov [RSP+4], imm32 + a jmp qword [$+8 wrt RIP] to avoid clobbering registers.
-+ */
-+ cbPatchMem += cRelCalls * RT_ALIGN_32(13 + 6 + 8, 8);
- cbPatchMem += 14; /* jmp qword [$+8 wrt RIP] + 8 byte address to jump to. */
- cbPatchMem = RT_ALIGN_32(cbPatchMem, 8);
-
-- /* Allocate suitable exectuable memory available. */
-+ /* Allocate suitable executable memory available. */
- bool fConvRipRelMovs = false;
- uint8_t *pbPatchMem = supR3HardenedMainPosixExecMemAlloc(cbPatchMem, pbTarget, cRipRelMovs > 0);
- if (!pbPatchMem)
-@@ -396,7 +406,8 @@
- cbInstr = 1;
- int rc = DISInstr(pbTarget + offInsn, DISCPUMODE_64BIT, &Dis, &cbInstr);
- if ( RT_FAILURE(rc)
-- || (Dis.pCurInstr->fOpType & DISOPTYPE_CONTROLFLOW))
-+ || ( Dis.pCurInstr->fOpType & DISOPTYPE_CONTROLFLOW
-+ && Dis.pCurInstr->uOpcode != OP_CALL))
- return VERR_SUPLIB_UNEXPECTED_INSTRUCTION;
-
- if ( Dis.ModRM.Bits.Mod == 0
-@@ -439,6 +450,34 @@
- pbPatchMem += sizeof(int32_t);
- }
- }
-+ else if ( Dis.pCurInstr->uOpcode == OP_CALL
-+ && (Dis.pCurInstr->fOpType & DISOPTYPE_RELATIVE_CONTROLFLOW))
-+ {
-+ /* Convert to absolute jump. */
-+ uintptr_t uAddr = (uintptr_t)&pbTarget[offInsn + cbInstr] + (intptr_t)Dis.Param1.uValue;
-+
-+ /* Skip the push instructions till the return address is known. */
-+ uint8_t *pbPatchMemPush = pbPatchMem;
-+ pbPatchMem += 13;
-+
-+ *pbPatchMem++ = 0xff; /* jmp qword [$+8 wrt RIP] */
-+ *pbPatchMem++ = 0x25;
-+ *(uint32_t *)pbPatchMem = (uint32_t)(RT_ALIGN_PT(pbPatchMem + 4, 8, uint8_t *) - (pbPatchMem + 4));
-+ pbPatchMem = RT_ALIGN_PT(pbPatchMem + 4, 8, uint8_t *);
-+ *(uint64_t *)pbPatchMem = uAddr;
-+ pbPatchMem += sizeof(uint64_t);
-+
-+ /* Push the return address onto stack. Difficult on amd64 without clobbering registers... */
-+ uintptr_t uAddrReturn = (uintptr_t)pbPatchMem;
-+ *pbPatchMemPush++ = 0x68; /* push imm32 sign-extended as 64-bit*/
-+ *(uint32_t *)pbPatchMemPush = RT_LO_U32(uAddrReturn);
-+ pbPatchMemPush += sizeof(uint32_t);
-+ *pbPatchMemPush++ = 0xc7;
-+ *pbPatchMemPush++ = 0x44;
-+ *pbPatchMemPush++ = 0x24;
-+ *pbPatchMemPush++ = 0x04; /* movl [RSP+4], imm32 */
-+ *(uint32_t *)pbPatchMemPush = RT_HI_U32(uAddrReturn);
-+ }
- else
- {
- memcpy(pbPatchMem, pbTarget + offInsn, cbInstr);
-Index: VirtualBox-5.1.22/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
-===================================================================
---- VirtualBox-5.1.22/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp (revision 115126)
-+++ VirtualBox-5.1.22/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp (revision 115307)
-@@ -86,6 +86,9 @@
- /** The max path length acceptable for a trusted path. */
- #define SUPR3HARDENED_MAX_PATH 260U
-
-+/** Enable to resolve symlinks using realpath() instead of cooking our own stuff. */
-+#define SUP_HARDENED_VERIFY_FOLLOW_SYMLINKS_USE_REALPATH 1
-+
- #ifdef RT_OS_SOLARIS
- # define dirfd(d) ((d)->d_fd)
- #endif
-@@ -1091,7 +1094,8 @@
- #endif
-
-
--#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)
-+#ifndef SUP_HARDENED_VERIFY_FOLLOW_SYMLINKS_USE_REALPATH
-+# if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)
- /**
- * Copies the error message to the error buffer and returns @a rc.
- *
-@@ -1104,6 +1108,7 @@
- {
- return supR3HardenedSetErrorN(rc, pErrInfo, 1, pszMsg);
- }
-+# endif
- #endif
-
-
-@@ -1893,7 +1898,9 @@
- /*
- * Verify each component from the root up.
- */
-+#ifndef SUP_HARDENED_VERIFY_FOLLOW_SYMLINKS_USE_REALPATH
- uint32_t iLoops = 0;
-+#endif
- SUPR3HARDENEDFSOBJSTATE FsObjState;
- uint32_t iComponent = 0;
- while (iComponent < Info.cComponents)
-@@ -1915,6 +1922,24 @@
- if ( RT_SUCCESS(rc)
- && S_ISLNK(FsObjState.Stat.st_mode))
- {
-+#if SUP_HARDENED_VERIFY_FOLLOW_SYMLINKS_USE_REALPATH /* Another approach using realpath() and verifying the result when encountering a symlink. */
-+ char *pszFilenameResolved = realpath(pszFilename, NULL);
-+ if (pszFilenameResolved)
-+ {
-+ rc = supR3HardenedVerifyFile(pszFilenameResolved, hNativeFile, fMaybe3rdParty, pErrInfo);
-+ free(pszFilenameResolved);
-+ return rc;
-+ }
-+ else
-+ {
-+ int iErr = errno;
-+ supR3HardenedError(VERR_ACCESS_DENIED, false /*fFatal*/,
-+ "supR3HardenedVerifyFileFollowSymlinks: Failed to resolve the real path '%s': %s (%d)\n",
-+ pszFilename, strerror(iErr), iErr);
-+ return supR3HardenedSetError4(VERR_ACCESS_DENIED, pErrInfo,
-+ "realpath failed for '", pszFilename, "': ", strerror(iErr));
-+ }
-+#else
- /* Don't loop forever. */
- iLoops++;
- if (iLoops < 8)
-@@ -1989,6 +2014,7 @@
- else
- return supR3HardenedSetError3(VERR_TOO_MANY_SYMLINKS, pErrInfo,
- "Too many symbolic links: '", pszFilename, "'");
-+#endif
- }
- }
- if (RT_FAILURE(rc))
diff --git a/app-emulation/virtualbox/files/virtualbox-ose-3-wrapper b/app-emulation/virtualbox/files/virtualbox-ose-3-wrapper
deleted file mode 100644
index 6f2da490065..00000000000
--- a/app-emulation/virtualbox/files/virtualbox-ose-3-wrapper
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-#
-# Sun VirtualBox
-#
-# Copyright (C) 2006-2009 Sun Microsystems, Inc.
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License (GPL) as published by the Free Software
-# Foundation, in version 2 as it comes in the "COPYING" file of the
-# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
-# Clara, CA 95054 USA or visit http://www.sun.com if you need
-# additional information or have any questions.
-#
-
-PATH="/usr/bin:/bin:/usr/sbin:/sbin"
-CONFIG="/etc/vbox/vbox.cfg"
-
-if [ ! -r "$CONFIG" ]; then
- echo "Could not find VirtualBox installation. Please reinstall."
- exit 1
-fi
-
-. "$CONFIG"
-
-# Note: This script must not fail if the module was not successfully installed
-# because the user might not want to run a VM but only change VM params!
-
-if [ "$1" = "shutdown" ]; then
- SHUTDOWN="true"
-elif ! lsmod|grep -q vboxdrv; then
- cat << EOF
-WARNING: The VirtualBox kernel modules are not loaded.
- Please load all the needed kernel modules by:
-
- for m in vbox{drv,netadp,netflt}; do modprobe \$m; done
-
- You will not be able to start VMs until this problem is fixed.
-EOF
-elif [ ! -c /dev/vboxdrv ]; then
- cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist.
- Please try to reload all the needed kernel modules by:
-
- for m in vbox{netflt,netadp,drv}; do rmmod \$m; done
- for m in vbox{drv,netadp,netflt}; do modprobe \$m; done
-
- and if that is not successful, try to re-install the package by:
-
- emerge -1av app-emulation/virtualbox-modules
-
- You will not be able to start VMs until this problem is fixed.
-EOF
-fi
-
-SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
-if [ -z "$SERVER_PID" ]; then
- # Server not running yet/anymore, cleanup socket path.
- # See IPC_GetDefaultSocketPath()!
- if [ -n "$LOGNAME" ]; then
- rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1
- else
- rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1
- fi
-fi
-
-if [ "$SHUTDOWN" = "true" ]; then
- if [ -n "$SERVER_PID" ]; then
- kill -TERM $SERVER_PID
- sleep 2
- fi
- exit 0
-fi
-
-APP=`which $0`
-APP=`basename $APP`
-APP=${APP##/*/}
-case "$APP" in
- VirtualBox)
- exec "$INSTALL_DIR/VirtualBox" "$@"
- ;;
- VBoxManage)
- exec "$INSTALL_DIR/VBoxManage" "$@"
- ;;
- VBoxSDL)
- exec "$INSTALL_DIR/VBoxSDL" "$@"
- ;;
- VBoxVRDP)
- exec "$INSTALL_DIR/VBoxHeadless" "$@"
- ;;
- VBoxHeadless)
- exec "$INSTALL_DIR/VBoxHeadless" "$@"
- ;;
- vboxwebsrv)
- exec "$INSTALL_DIR/vboxwebsrv" "$@"
- ;;
- *)
- echo "Unknown application - $APP"
- ;;
-esac
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/files/
@ 2019-07-20 19:39 Aaron Bauman
0 siblings, 0 replies; 7+ messages in thread
From: Aaron Bauman @ 2019-07-20 19:39 UTC (permalink / raw
To: gentoo-commits
commit: 4a1fff35c55799988f43d1ab3a2d147dd159720f
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jun 21 17:40:39 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 19:38:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1fff35
app-emulation/virtualbox: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12302
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/virtualbox-6.0.0-libressl.patch | 24 ----------------------
1 file changed, 24 deletions(-)
diff --git a/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch b/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch
deleted file mode 100644
index a79ae1ddf68..00000000000
--- a/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/673800
-
-diff --git a/src/VBox/Runtime/common/crypto/ssl-openssl.cpp b/src/VBox/Runtime/common/crypto/ssl-openssl.cpp
-index e6d58b75..b2422983 100644
---- a/src/VBox/Runtime/common/crypto/ssl-openssl.cpp
-+++ b/src/VBox/Runtime/common/crypto/ssl-openssl.cpp
-@@ -271,7 +271,7 @@ RTDECL(int) RTCrSslCreateSessionForNativeSocket(RTCRSSL hSsl, RTHCINTPTR hNative
- pSession->pBio = BIO_new_socket(hNativeSocket, BIO_NOCLOSE);
- if (pSession->pBio)
- {
--# if OPENSSL_VERSION_NUMBER >= 0x10100000
-+# if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)) || LIBRESSL_VERSION_NUMBER >= 0x2070000f
- BIO_up_ref(pSession->pBio); /* our reference. */
- # endif
- SSL_set_bio(pSession->pSsl, pSession->pBio, pSession->pBio);
-@@ -319,7 +319,7 @@ static int rtCrSslSessionDestroy(RTCRSSLSESSIONINT *pThis)
- ASMAtomicWriteU32(&pThis->u32Magic, ~RTCRSSLSESSIONINT_MAGIC);
- SSL_free(pThis->pSsl);
- pThis->pSsl = NULL;
--# if OPENSSL_VERSION_NUMBER >= 0x10100000
-+# if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)) || LIBRESSL_VERSION_NUMBER >= 0x2070000f
- BIO_free(pThis->pBio);
- # endif
- pThis->pBio = NULL;
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/files/
@ 2020-07-27 20:06 Aaron Bauman
0 siblings, 0 replies; 7+ messages in thread
From: Aaron Bauman @ 2020-07-27 20:06 UTC (permalink / raw
To: gentoo-commits
commit: 3ed7f7fe560c749e61be1712f64dfc4ef8b1956f
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jul 21 14:04:27 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 20:06:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ed7f7fe
app-emulation/virtualbox: remove unused patches
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16761
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/virtualbox-6.0.20-qt-5.15.patch | 82 ----------------------
.../files/virtualbox-6.1.6-qt-5.15.patch | 10 ---
2 files changed, 92 deletions(-)
diff --git a/app-emulation/virtualbox/files/virtualbox-6.0.20-qt-5.15.patch b/app-emulation/virtualbox/files/virtualbox-6.0.20-qt-5.15.patch
deleted file mode 100644
index 7ba03f02259..00000000000
--- a/app-emulation/virtualbox/files/virtualbox-6.0.20-qt-5.15.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-29 23:51:41.504432532 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-29 23:49:26.943858460 +0300
-@@ -17,6 +17,8 @@
-
- /* Qt includes: */
- #include <QPainter>
-+#include <QPainterPath>
-+#include <QPainterPathStroker>
-
- /* GUI include */
- #include "UIImageTools.h"
-
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-30 00:09:50.369275092 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-30 00:01:14.152354690 +0300
-@@ -24,6 +24,7 @@
- /* Qt includes: */
- #include <QIcon>
- #include <QWidget>
-+#include <QPainterPath>
-
- /* GUI includes: */
- #include "UILibraryDefs.h"
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-30 00:39:54.773447224 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-30 00:41:36.274371761 +0300
-@@ -21,6 +21,7 @@
- #include <QPainter>
- #include <QStyle>
- #include <QToolButton>
-+#include <QPainterPath>
-
- /* GUI includes: */
- #include "UIMenuToolBar.h"
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp 2020-05-30 00:39:47.613523134 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp 2020-05-30 00:41:29.655441857 +0300
-@@ -29,6 +29,7 @@
- #include <QMouseEvent>
- #include <QStyleOption>
- #include <QPainter>
-+#include <QPainterPath>
- #ifdef VBOX_WS_MAC
- # include <QStackedLayout>
- #endif
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp 2020-05-30 00:40:01.624374596 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp 2020-05-30 00:41:40.654325376 +0300
-@@ -23,6 +23,7 @@
- #include <QScrollBar>
- #include <QStyle>
- #include <QVBoxLayout>
-+#include <QPainterPath>
-
- /* GUI includes: */
- #include "UIFilmContainer.h"
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-30 00:40:08.844298062 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-30 00:41:44.594283652 +0300
-@@ -22,6 +22,7 @@
- #include <QPaintEvent>
- #include <QStyle>
- #include <QVBoxLayout>
-+#include <QPainterPath>
-
- /* GUI includes: */
- #include "UIPopupBox.h"
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-30 00:40:16.064221530 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-30 00:41:52.014205079 +0300
-@@ -27,6 +27,7 @@
- #include <QToolButton>
- #include <QVBoxLayout>
- #include <QWindow>
-+#include <QPainterPath>
- #ifdef VBOX_WS_X11
- # include <QWindowStateChangeEvent>
- #endif
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:40:34.375027462 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp 2020-05-30 00:42:01.244107347 +0300
-@@ -18,6 +18,7 @@
- /* Qt includes: */
- #include <QPainter>
- #include <QTextEdit>
-+#include <QPainterPath>
-
- /* GUI includes: */
- #include "UIPopupPane.h"
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch b/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch
deleted file mode 100644
index 6518f60d080..00000000000
--- a/app-emulation/virtualbox/files/virtualbox-6.1.6-qt-5.15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:40:22.314155286 +0300
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp 2020-05-30 00:41:56.544157111 +0300
-@@ -28,6 +28,7 @@
- #include <QStyleOptionGraphicsItem>
- #include <QTimer>
- #include <QTimerEvent>
-+#include <QPainterPath>
-
- /* GUI includes: */
- #include "UIGraphicsButton.h"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/files/
@ 2020-09-21 21:48 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2020-09-21 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 1da81d975921e53f6944a19bfe694bedb2151756
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Sep 14 17:11:04 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 21:48:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da81d97
app-emulation/virtualbox: remove unused file
Closes: https://github.com/gentoo/gentoo/pull/17537
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-emulation/virtualbox/files/virtualbox-ose.desktop-2 | 8 --------
1 file changed, 8 deletions(-)
diff --git a/app-emulation/virtualbox/files/virtualbox-ose.desktop-2 b/app-emulation/virtualbox/files/virtualbox-ose.desktop-2
deleted file mode 100644
index ce798dacbdf..00000000000
--- a/app-emulation/virtualbox/files/virtualbox-ose.desktop-2
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Oracle xVM VirtualBox
-Type=Application
-Comment=Run several virtual systems on a single host computer
-Exec=VirtualBox
-TryExec=VirtualBox
-Icon=virtualbox
-Categories=System;Emulator;
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/files/
@ 2021-07-25 21:32 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2021-07-25 21:32 UTC (permalink / raw
To: gentoo-commits
commit: 36376bd99491780f5b5c0c04e69edc10d7fa3fd0
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 21:19:57 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 21:32:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36376bd9
app-emulation/virtualbox: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/21766
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../virtualbox-6.1.20-lsilogicsas_crash_fix.patch | 41 ----------------------
1 file changed, 41 deletions(-)
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch b/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch
deleted file mode 100644
index 7f1e4b17983..00000000000
--- a/app-emulation/virtualbox/files/virtualbox-6.1.20-lsilogicsas_crash_fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: /trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
-===================================================================
---- trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (revision 88530)
-+++ trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (revision 88643)
-@@ -3678,8 +3678,6 @@
- LogFlowFunc(("pThis=%#p\n", pThis));
-
-- /* Clear everything first. */
- AssertPtrReturnVoid(pThisCC->pConfigurationPages);
- PMptConfigurationPagesSupported pPages = pThisCC->pConfigurationPages;
-- memset(pPages, 0, sizeof(MptConfigurationPagesSupported));
-
- /* Manufacturing Page 0. */
-Index: /trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h
-===================================================================
---- trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h (revision 82968)
-+++ trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h (revision 88643)
-@@ -3327,13 +3327,17 @@
-
- #define MPT_CONFIG_PAGE_HEADER_INIT_MANUFACTURING(pg, type, nr, flags) \
-+ RT_ZERO(*pg); \
- MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_MANUFACTURING)
-
- #define MPT_CONFIG_PAGE_HEADER_INIT_IO_UNIT(pg, type, nr, flags) \
-+ RT_ZERO(*pg); \
- MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_IO_UNIT)
-
- #define MPT_CONFIG_PAGE_HEADER_INIT_IOC(pg, type, nr, flags) \
-+ RT_ZERO(*pg); \
- MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_IOC)
-
- #define MPT_CONFIG_PAGE_HEADER_INIT_BIOS(pg, type, nr, flags) \
-+ RT_ZERO(*pg); \
- MPT_CONFIG_PAGE_HEADER_INIT(pg, type, nr, flags | MPT_CONFIGURATION_PAGE_TYPE_BIOS)
-
-@@ -3342,4 +3346,5 @@
- */
- #define MPT_CONFIG_EXTENDED_PAGE_HEADER_INIT(pg, cb, nr, flags, exttype) \
-+ RT_BZERO(pg, cb); \
- (pg)->u.fields.ExtHeader.u8PageType = (flags) | MPT_CONFIGURATION_PAGE_TYPE_EXTENDED; \
- (pg)->u.fields.ExtHeader.u8PageNumber = (nr); \
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-07-25 21:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-02 14:27 [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2021-07-25 21:32 Conrad Kostecki
2020-09-21 21:48 Conrad Kostecki
2020-07-27 20:06 Aaron Bauman
2019-07-20 19:39 Aaron Bauman
2016-05-04 8:21 Lars Wendler
2016-03-11 17:31 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox