From 18695365f6697a7b293ad3d58c54302a4d19a353 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 9 May 2013 23:45:33 -0300 Subject: virtualbox-libre-4.2.12-2.1: fix freedom issue https://labs.parabola.nu/issues/330 --- libre/virtualbox-libre/PKGBUILD | 13 +-- libre/virtualbox-libre/libre.patch | 162 +++++++++++++++++++++++++++++++------ 2 files changed, 146 insertions(+), 29 deletions(-) (limited to 'libre/virtualbox-libre') diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 2810d1266..8a578eeda 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,10 +1,11 @@ # $Id: PKGBUILD 89632 2013-04-30 16:22:22Z foutrelis $ # Maintainer: Ionut Biru # Maintainer: Sébastien Luttringer -# Maintainer (Parabola): Nicolas Reynolds -# Maintainer (Parabola): Jorge López # Maintainer (Parabola): André Silva -# Maintainer (Parabola): Márcio Silva +# Contributor (Parabola): Nicolas Reynolds +# Contributor (Parabola): Márcio Silva +# Contributor (Parabola): Jorge López +# Contributor (Parabola): Esteban Carnevale pkgbase=virtualbox-libre pkgname=('virtualbox-libre' @@ -13,7 +14,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-sdk' 'virtualbox-libre-guest-utils') pkgver=4.2.12 -pkgrel=2 +pkgrel=2.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -107,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '919277147baae235810f1858200038c0' + '5ea240a7f85a1f2e875dbd247a6982aa' '50387fba578646a9d29de3f917a199d2') prepare() { @@ -167,7 +168,7 @@ build() { } package_virtualbox-libre() { - pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets included and nonfree Oracle VM VirtualBox Extension Pack support removed)' + pkgdesc='Powerful x86 virtualization for enterprise as well as home use, with free distros presets (nonfree Extension Pack and Guest Additions ISO image support removed)' depends=('curl' 'libpng' 'libxcursor' diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index a696f9a0d..dec34abb9 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ ---- VirtualBox-4.2.6.orig/Config.kmk 2012-12-19 16:24:34.000000000 -0200 -+++ VirtualBox-4.2.6/Config.kmk 2012-12-27 14:28:22.897125304 -0200 +--- VirtualBox-4.2.12.orig/Config.kmk 2013-04-12 07:33:55.000000000 -0300 ++++ VirtualBox-4.2.12/Config.kmk 2013-05-09 22:45:16.882436950 -0300 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -10,7 +10,23 @@ # Install paths ## @todo This will change after 4.1 is branched off! # What is now 'bin' and 'lib' will be moved down under 'staged/', except on -@@ -129,9 +126,6 @@ +@@ -94,7 +91,6 @@ + INST_SYS = $(INST_BIN) + INST_TESTCASE = $(INST_BIN)testcase/ + INST_ADDITIONS = $(INST_BIN)additions/ +- INST_ADDITIONS_ISO = $(INST_BIN) + + # other paths + INST_TESTSUITE = testsuite/ +@@ -119,7 +115,6 @@ + INST_SYS = $(INST_BIN) + INST_TESTCASE = $(INST_BIN)testcase/ + INST_ADDITIONS = $(INST_BIN)additions/ +- INST_ADDITIONS_ISO = $(INST_ADDITIONS) + + INST_TESTSUITE = testsuite/ + INST_LIB = lib/ +@@ -129,18 +124,13 @@ endif INST_DOC = doc/ @@ -20,15 +36,16 @@ INST_PACKAGES = packages/ VBOX_PATH_SDK = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK)) -@@ -140,7 +134,6 @@ + VBOX_PATH_DIST = $(patsubst %/,%,$(PATH_STAGE)/$(INST_DIST)) + VBOX_PATH_TESTSUITE = $(patsubst %/,%,$(PATH_STAGE)/$(INST_TESTSUITE)) VBOX_PATH_ADDITIONS = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS)) - VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO)) +-VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO)) VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB)) -VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL)) VBOX_PATH_PACKAGES = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES)) -@@ -215,7 +208,6 @@ +@@ -215,7 +205,6 @@ export VBOX_ADDITIONS_SH_MODE = release export VBOX_DOCUMENTATION_SH_MODE = release export VBOX_EFI_SH_MODE = release @@ -36,7 +53,16 @@ endif # Some info on the vendor -@@ -368,8 +360,6 @@ +@@ -313,7 +302,7 @@ + endif + # Don't create the additions ISO. + # (Used by the additions build server, don't invert it.) +-#VBOX_WITHOUT_ADDITIONS_ISO = 1 ++ VBOX_WITHOUT_ADDITIONS_ISO = 1 + ## @} + + ## @name Documentation +@@ -368,8 +357,6 @@ VBOX_WITH_USB = 1 # Enable the USB 1.1 controller plus virtual USB HID devices. VBOX_WITH_VUSB = 1 @@ -45,7 +71,7 @@ # Enable the ISCSI feature. VBOX_WITH_ISCSI = 1 # Enable INIP support in the ISCSI feature. -@@ -439,9 +429,6 @@ +@@ -441,9 +428,6 @@ ifdef VBOX_WITH_USB VBOX_WITH_VUSB = 1 endif @@ -55,7 +81,7 @@ ifdef VBOX_WITH_PCI_PASSTHROUGH VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1 endif -@@ -580,8 +567,6 @@ +@@ -584,8 +568,6 @@ if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win) VBOX_WITH_CROGL = 1 endif @@ -64,7 +90,7 @@ # Enable S3 support (requires libcurl) VBOX_WITH_S3 = 1 # Enable Host=>Guest Drag'n'Drop -@@ -621,17 +606,6 @@ +@@ -625,17 +607,6 @@ endif ## @} @@ -82,7 +108,7 @@ ## @name Misc ## @{ # Enable Seamless mode -@@ -822,14 +796,6 @@ +@@ -826,14 +797,6 @@ # Skip stuff. # @@ -97,7 +123,7 @@ # VBOX_QUICK can be used by core developers to speed to the build ifdef VBOX_QUICK # undefine variables by assigning blank. -@@ -884,7 +850,6 @@ +@@ -888,7 +851,6 @@ VBOX_WITH_TESTSUITE= VBOX_WITH_QTGUI= VBOX_WITH_USB= @@ -105,7 +131,7 @@ VBOX_WITH_DOCS= VBOX_WITH_PDM_ASYNC_COMPLETION= VBOX_WITH_KCHMVIEWER= -@@ -906,7 +871,6 @@ +@@ -910,7 +872,6 @@ VBOX_WITH_CROGL= VBOX_WITH_DEBUGGER= VBOX_WITH_DOCS= @@ -113,7 +139,7 @@ VBOX_WITH_HARDENING= VBOX_WITH_HEADLESS= VBOX_WITH_HGCM= -@@ -979,7 +943,7 @@ +@@ -983,7 +944,7 @@ # # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set. # @@ -122,7 +148,7 @@ , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x)))) if $(words $(VBOX_ONLY_BUILD)) > 1 $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD)) -@@ -997,9 +961,6 @@ +@@ -1001,9 +962,6 @@ # ifdef VBOX_OSE VBOX_WITH_VRDP= @@ -132,7 +158,7 @@ VBOX_WITH_PCI_PASSTHROUGH_IMPL= VBOX_WITH_OS2_ADDITIONS_BIN= VBOX_WITH_SECURELABEL= -@@ -1130,10 +1091,6 @@ +@@ -1135,10 +1093,6 @@ VBOX_WITH_KCHMVIEWER= endif @@ -143,7 +169,7 @@ # # Mark OSE builds clearly, helps figuring out limitations more easily. # -@@ -1738,9 +1695,6 @@ +@@ -1743,9 +1697,6 @@ # bin2c (convert binary files into C arrays) VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE) @@ -153,7 +179,7 @@ # VBoxCmp (simple /bin/cmp with more sensible output) VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE) -@@ -2632,13 +2586,6 @@ +@@ -2633,13 +2584,6 @@ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE) endif @@ -167,7 +193,7 @@ SDK_VBOX_BLD_OPENSSL = . SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL SDK_VBOX_BLD_OPENSSL_LIBS ?= \ -@@ -4099,99 +4046,6 @@ +@@ -4100,99 +4044,6 @@ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin)) @@ -392,9 +418,70 @@ # success! echo echo "Successfully generated '$CNF' and '$ENV'." ---- VirtualBox-4.2.0.orig/Makefile.kmk 2012-08-29 11:13:46.000000000 -0300 -+++ VirtualBox-4.2.0/Makefile.kmk 2012-09-18 23:43:54.750454776 -0300 -@@ -378,7 +378,6 @@ +--- VirtualBox-4.2.12.orig/Makefile.kmk 2013-04-12 07:33:55.000000000 -0300 ++++ VirtualBox-4.2.12/Makefile.kmk 2013-05-09 23:09:45.756804164 -0300 +@@ -177,41 +177,6 @@ + INSTALLS += buildserver-additions + endif + +-# +-# Install additions iso from the build server. +-# The $(CP)/$(RM) stuff can be replaced by a simple $(TOUCH) once that has +-# been added to kBuild. +-# +-buildserver-additions_INST = $(INST_ADDITIONS_ISO) +-buildserver-additions_MODE = 0644 +-buildserver-additions_SOURCES = $(PATH_TARGET)/VBoxGuestAdditions.iso +-buildserver-additions_CLEANS = \ +- $(buildserver-additions_0_OUTDIR)/unpacked.ts \ +- $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip \ +- $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip.tmp \ +- $(PATH_TARGET)/VBoxGuestAdditions.iso +- +-$$(buildserver-additions_0_OUTDIR)/unpacked.ts +| $(PATH_TARGET)/VBoxGuestAdditions.iso: \ +- $$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip +- $(call MSG_L1,Unpacking additions archive) +- $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(PATH_TARGET) +- $(APPEND) -t $@ "done" +- +-$$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip: $(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/additions.sh | $$(dir $$@) +- $(RM) -f $@ $@.tmp +- ifneq ($(KBUILD_HOST),win) +- $(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename $@.tmp +- else +- $(KMK) --affinity 1 -f $(MAKEFILE) buildserver-additions-affinity-hack +- endif +- $(CP) -f $@.tmp $@ +- $(RM) -f $@.tmp +- +- ifeq ($(KBUILD_HOST),win) +-buildserver-additions-affinity-hack: +- $(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip.tmp +- endif +-endif # VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER + + + # +@@ -327,18 +292,6 @@ + ifn1of ($(KBUILD_TARGET), l4 linux win) + VBOX_PATH_STAGED ?= . + +- # Additions. +- ifndef VBOX_WITH_LINUX_ADDITIONS +- ifndef VBOX_WITH_WIN32_ADDITIONS +- ifneq ($(wildcard $(VBOX_PATH_STAGED)/VBoxGuestAdditions.iso),) +- INSTALLS += staged-additions +- staged-additions_INST = $(INST_ADDITIONS_ISO) +- staged-additions_MODE = 0644 +- staged-additions_SOURCES = $(VBOX_PATH_STAGED)/VBoxGuestAdditions.iso +- endif +- endif +- endif +- + # guesttool.exe + ifndef VBOX_WITH_WIN32_ADDITIONS + ifneq ($(wildcard $(VBOX_PATH_STAGED)/guesttool.exe),) +@@ -388,7 +341,6 @@ include/VBox \ include/VBox/vmm \ include/VBox/com \ @@ -402,7 +489,25 @@ include/VBox/HostServices \ include/VBox/GuestHost \ include/VBox/HGSMI \ -@@ -990,200 +989,6 @@ +@@ -983,17 +935,8 @@ + + additions-packing: + + $(KMK) VBOX_ONLY_ADDITIONS=1 \ +- VBOX_WITH_ADDITIONS_ISO.freebsd.amd64= \ +- VBOX_WITH_ADDITIONS_ISO.freebsd.x86= \ +- VBOX_WITH_ADDITIONS_ISO.linux.amd64= \ +- VBOX_WITH_ADDITIONS_ISO.linux.x86=1 \ + VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1 \ +- VBOX_WITH_ADDITIONS_ISO.os2.x86=1 \ +- VBOX_WITH_ADDITIONS_ISO.solaris.amd64=1 \ +- VBOX_WITH_ADDITIONS_ISO.solaris.x86=1 \ + VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 \ +- VBOX_WITH_ADDITIONS_ISO.win.amd64=1 \ +- VBOX_WITH_ADDITIONS_ISO.win.x86=1 \ + -C src/VBox/Additions \ + $(VBOX_PATH_ADDITIONS)/VBoxGuestAdditions.zip + +@@ -1010,200 +953,6 @@ # @@ -1001,3 +1106,14 @@ else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS # +--- VirtualBox-4.2.12.orig/src/VBox/Additions/Makefile.kmk 2013-04-12 07:34:09.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Additions/Makefile.kmk 2013-05-09 23:06:58.029922668 -0300 +@@ -42,7 +42,7 @@ + # + # ==> All we have to worry about is what to do on the target we're on. + # +-VBOX_WITH_ADDITIONS_ISO.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = 1 ++VBOX_WITH_ADDITIONS_ISO.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = 0 + + # Include sub-makefiles. + include $(PATH_SUB_CURRENT)/common/Makefile.kmk -- cgit v1.2.3