summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-12-27 14:51:05 -0200
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-12-27 14:51:05 -0200
commita352754318c22ea66537e6c9831a9305d740baf1 (patch)
tree67dfe93eecd314d88951de2c4a23bf61e8ccc8c7
parentaf6b462b533e319c2bc10856f8456a9d0ded9898 (diff)
downloadabslibre-a352754318c22ea66537e6c9831a9305d740baf1.tar.gz
abslibre-a352754318c22ea66537e6c9831a9305d740baf1.tar.bz2
abslibre-a352754318c22ea66537e6c9831a9305d740baf1.zip
virtualbox-libre-4.2.6-1: removing more nonfree parts from source code
-rw-r--r--libre/virtualbox-libre/PKGBUILD2
-rw-r--r--libre/virtualbox-libre/libre.patch165
2 files changed, 155 insertions, 12 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index b47c37c78..48761e058 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -107,7 +107,7 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5'
'c7951fe6888d939f3a7d0dafe477e82b'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
- '85141ccd2621a8e004b8f55c9a1f83eb'
+ '05d166104a66ee479896c941ac27a3d0'
'c2ede303258ed763a2ed861adf537a3f')
build() {
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index 138bbd612..e93fe80e8 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -1,5 +1,5 @@
---- VirtualBox-4.2.0.orig/Config.kmk 2012-09-13 05:26:16.000000000 -0300
-+++ VirtualBox-4.2.0/Config.kmk 2012-09-18 21:35:33.118487052 -0300
+--- 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
@@ -56,9 +56,6 @@
PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES
PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES
@@ -55,7 +55,16 @@
ifdef VBOX_WITH_PCI_PASSTHROUGH
VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
endif
-@@ -609,17 +596,6 @@
+@@ -580,8 +567,6 @@
+ if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
+ VBOX_WITH_CROGL = 1
+ endif
+-# Enable the VNC server extension pack (GPL only).
+-#VBOX_WITH_EXTPACK_VNC = 1
+ # Enable S3 support (requires libcurl)
+ VBOX_WITH_S3 = 1
+ # Enable Host=>Guest Drag'n'Drop
+@@ -621,17 +606,6 @@
endif
## @}
@@ -73,7 +82,7 @@
## @name Misc
## @{
# Enable Seamless mode
-@@ -810,14 +786,6 @@
+@@ -822,14 +796,6 @@
# Skip stuff.
#
@@ -88,7 +97,7 @@
# VBOX_QUICK can be used by core developers to speed to the build
ifdef VBOX_QUICK
# undefine variables by assigning blank.
-@@ -872,7 +840,6 @@
+@@ -884,7 +850,6 @@
VBOX_WITH_TESTSUITE=
VBOX_WITH_QTGUI=
VBOX_WITH_USB=
@@ -96,7 +105,7 @@
VBOX_WITH_DOCS=
VBOX_WITH_PDM_ASYNC_COMPLETION=
VBOX_WITH_KCHMVIEWER=
-@@ -894,7 +861,6 @@
+@@ -906,7 +871,6 @@
VBOX_WITH_CROGL=
VBOX_WITH_DEBUGGER=
VBOX_WITH_DOCS=
@@ -104,7 +113,16 @@
VBOX_WITH_HARDENING=
VBOX_WITH_HEADLESS=
VBOX_WITH_HGCM=
-@@ -985,9 +951,6 @@
+@@ -979,7 +943,7 @@
+ #
+ # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set.
+ #
+-VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\
++VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS SDK TESTSUITE\
+ , $(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 @@
#
ifdef VBOX_OSE
VBOX_WITH_VRDP=
@@ -114,7 +132,7 @@
VBOX_WITH_PCI_PASSTHROUGH_IMPL=
VBOX_WITH_OS2_ADDITIONS_BIN=
VBOX_WITH_SECURELABEL=
-@@ -1118,10 +1081,6 @@
+@@ -1130,10 +1091,6 @@
VBOX_WITH_KCHMVIEWER=
endif
@@ -125,7 +143,7 @@
#
# Mark OSE builds clearly, helps figuring out limitations more easily.
#
-@@ -1744,9 +1703,6 @@
+@@ -1738,9 +1695,6 @@
# bin2c (convert binary files into C arrays)
VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
@@ -135,7 +153,7 @@
# VBoxCmp (simple /bin/cmp with more sensible output)
VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE)
-@@ -2638,13 +2594,6 @@
+@@ -2632,13 +2586,6 @@
SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)
endif
@@ -149,7 +167,7 @@
SDK_VBOX_BLD_OPENSSL = .
SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
SDK_VBOX_BLD_OPENSSL_LIBS ?= \
-@@ -4100,99 +4049,6 @@
+@@ -4099,99 +4046,6 @@
TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
@@ -249,6 +267,131 @@
#
# Qt 4
# Qt 4
+--- VirtualBox-4.2.6.orig/configure 2012-12-19 16:24:34.000000000 -0200
++++ VirtualBox-4.2.6/configure 2012-12-27 14:26:25.743442978 -0200
+@@ -90,8 +90,6 @@
+ WITH_HARDENING=1
+ WITH_UDPTUNNEL=1
+ WITH_VDE=0
+-WITH_VNC=0
+-WITH_EXTPACK=1
+ WITH_DOCS=1
+ BUILD_LIBXML2=
+ BUILD_LIBCURL=
+@@ -124,8 +122,6 @@
+ MESA="-lGL"
+ INCZ=""
+ LIBZ="-lz"
+-INCVNCSERVER=""
+-LIBVNCSERVER="-lvncserver"
+ INCDEVMAPPER=""
+ LIBDEVMAPPER="-ldevmapper"
+ CXX_FLAGS=""
+@@ -930,47 +926,6 @@
+ }
+
+ #
+-# Check for libvncserver, needed for VNC in OSE
+-#
+-check_vncserver()
+-{
+- test_header libvncserver
+- cat > $ODIR.tmp_src.cc <<EOF
+-#include <cstdio>
+-#include <rfb/rfbconfig.h>
+-
+-extern "C" int main()
+-{
+- const char* v=LIBVNCSERVER_VERSION;
+- unsigned int major = 0, minor = 0, micro = 0;
+-
+- for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0';
+- if (*v == '.') v++;
+- for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0';
+- if (*v == '.') v++;
+- for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0';
+-
+- printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION);
+- if (major*10000 + minor*100 + micro >= 900)
+- {
+- printf(", OK.\n");
+- return 0;
+- }
+- else
+- {
+- printf(", expected version 0.9 or higher\n");
+- return 1;
+- }
+-}
+-EOF
+- if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then
+- if test_execute; then
+- cnf_append "VBOX_WITH_EXTPACK_VNC" "1"
+- fi
+- fi
+-}
+-
+-#
+ # Check for libcurl, needed by S3
+ #
+ check_curl()
+@@ -2173,8 +2128,6 @@
+ [ $WITH_KMODS -eq 1 ] && echo " --disable-kmods don't build Linux kernel modules (host and guest)"
+ [ $WITH_OPENGL -eq 1 ] && echo " --disable-opengl disable OpenGL support (2D & 3D)"
+ [ $WITH_GSOAP -eq 0 ] && echo " --enable-webservice enable the webservice stuff"
+-[ $OSE -eq 1 ] && echo " --enable-vnc enable the VNC server"
+-[ $OSE -eq 0 ] && echo " --disable-extpack don't build the extpack"
+ [ $WITH_DOCS -eq 1 ] && echo " --disable-docs don't build the documentation"
+ [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking"
+ cat << EOF
+@@ -2346,15 +2299,9 @@
+ --enable-webservice)
+ [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1
+ ;;
+- --enable-vnc)
+- WITH_VNC=1
+- ;;
+ --disable-hardening)
+ WITH_HARDENING=0
+ ;;
+- --disable-extpack)
+- WITH_EXTPACK=0
+- ;;
+ --disable-docs)
+ WITH_DOCS=0
+ ;;
+@@ -2512,15 +2459,6 @@
+ echo >> $CNF
+ fi
+
+-# extpack
+-if [ $OSE -eq 0 ]; then
+- if [ $WITH_EXTPACK -eq 1 ]; then
+- BUILD_LIBSSL=1
+- else
+- cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" ""
+- fi
+-fi
+-
+ # headless
+ if [ -n "$HEADLESS" ]; then
+ cnf_append "VBOX_HEADLESS" "1"
+@@ -2646,15 +2584,6 @@
+ cnf_append "VBOX_WITH_DOCS_PACKING" ""
+ fi
+
+-# VNC server support
+-if [ $OSE -ge 1 ]; then
+- if [ $WITH_VNC = 1 ]; then
+- check_vncserver
+- else
+- cnf_append "VBOX_WITH_EXTPACK_VNC" ""
+- fi
+-fi
+-
+ # 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 @@