Author: sergiomb Update of /cvs/free/rpms/VirtualBox-OSE/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv11193 Modified Files: .cvsignore VirtualBox-OSE-4.1.2-libcxx.patch VirtualBox-OSE.spec sources Added Files: VirtualBox-OSE-4.1.10-gsoap.patch Log Message: * Fri Mar 23 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.10-1 - New release. - Upsteam says that java stuff is fiexd , https://www.virtualbox.org/ticket/9848#comment:5 - Upsteam says that have compile fixes for kernel 3.3-rc1 (in changelog). - backport fix for web-service with newer versions of GSOAP, Changeset 40476 and 40477 in vbox, kindly fixed from Frank Mehnert "The real fix can be found in r40476 and r40477. You should be able to apply these fixes to VBox 4.1.10 as well." and add -lssl and -lcrypto by my self. - drop Patch to allow to build with GCC 4.7 VirtualBox-OSE-4.1.10-gsoap.patch: configure | 2 +- src/VBox/Main/webservice/Makefile.kmk | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) --- NEW FILE VirtualBox-OSE-4.1.10-gsoap.patch --- Index: /trunk/configure =================================================================== --- trunk/configure (revision 40412) +++ trunk/configure (revision 40476) @@ -1961,5 +1961,5 @@ cnf_append "VBOX_GSOAP_CXX_SOURCES" "" fi - cnf_append "VBOX_GSOAP_CXX_LIBS" "libgsoap++" + cnf_append "VBOX_GSOAP_CXX_LIBS" "libgsoapssl++ ssl crypto" log_success "found" else Index: /trunk/src/VBox/Main/webservice/Makefile.kmk =================================================================== --- trunk/src/VBox/Main/webservice/Makefile.kmk (revision 40400) +++ trunk/src/VBox/Main/webservice/Makefile.kmk (revision 40476) @@ -194,4 +194,9 @@ +# disable -fvisibility=hidden as the SOAP stuff does not properly set the visibility attributes +TEMPLATE_VBOXWEBR3EXE = Webservices without -fvisibility +TEMPLATE_VBOXWEBR3EXE_EXTENDS = VBOXR3EXE +TEMPLATE_VBOXWEBR3EXE_CXXFLAGS = $(filter-out $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden),\ + $(TEMPLATE_VBOXR3EXE_CXXFLAGS)) ifdef VBOX_GSOAP_INSTALLED @@ -201,5 +206,5 @@ # LIBRARIES += vboxsoap - vboxsoap_TEMPLATE = VBOXR3EXE + vboxsoap_TEMPLATE = VBOXWEBR3EXE ifdef VBOX_USE_VCC80 vboxsoap_CXXFLAGS.win += -bigobj @@ -430,5 +435,5 @@ # PROGRAMS += webtest - webtest_TEMPLATE = VBOXR3EXE + webtest_TEMPLATE = VBOXWEBR3EXE ifdef VBOX_USE_VCC80 webtest_CXXFLAGS.win += -bigobj Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 24 Dec 2011 13:33:58 -0000 1.31 +++ .cvsignore 23 Mar 2012 15:41:13 -0000 1.32 @@ -1 +1 @@ -VirtualBox-4.1.8.tar.bz2 +VirtualBox-4.1.10.tar.bz2 VirtualBox-OSE-4.1.2-libcxx.patch: Config.kmk | 4 ++-- configure | 2 +- src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +---- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.6/Makefile.kmk | 3 +-- 14 files changed, 20 insertions(+), 24 deletions(-) Index: VirtualBox-OSE-4.1.2-libcxx.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/VirtualBox-OSE-4.1.2-libcxx.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-OSE-4.1.2-libcxx.patch 22 Sep 2011 10:04:38 -0000 1.1 +++ VirtualBox-OSE-4.1.2-libcxx.patch 23 Mar 2012 15:41:13 -0000 1.2 @@ -251,8 +251,8 @@ VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86) diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk index fde8b7c..405d354 100644 ---- a/src/libs/zlib-1.2.1/Makefile.kmk -+++ b/src/libs/zlib-1.2.1/Makefile.kmk +--- a/src/libs/zlib-1.2.6/Makefile.kmk ++++ b/src/libs/zlib-1.2.6/Makefile.kmk @@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \ inftrees.c \ inffast.c Index: VirtualBox-OSE.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/VirtualBox-OSE.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- VirtualBox-OSE.spec 15 Jan 2012 00:45:58 -0000 1.81 +++ VirtualBox-OSE.spec 23 Mar 2012 15:41:13 -0000 1.82 @@ -14,8 +14,8 @@ %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} Name: VirtualBox-OSE -Version: 4.1.8 -Release: 2%{?prerel:.%{prerel}}%{?dist} +Version: 4.1.10 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -42,6 +42,7 @@ Patch17: VirtualBox-OSE-4.0.0-beramono.patch Patch18: VirtualBox-OSE-4.0.2-aiobug.patch Patch20: VirtualBox-OSE-4.1.2-testmangle.patch +Patch22: VirtualBox-OSE-4.1.10-gsoap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,10 +53,9 @@ %endif BuildRequires: openssl-devel BuildRequires: libcurl-devel -BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel libXcomposite-devel +BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel BuildRequires: yasm BuildRequires: pulseaudio-libs-devel -BuildRequires: libXmu-devel BuildRequires: python-devel BuildRequires: desktop-file-utils BuildRequires: libcap-devel @@ -77,6 +77,9 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-server-source BuildRequires: xorg-x11-server-devel +BuildRequires: libXcursor-devel +BuildRequires: libXcomposite-devel +BuildRequires: libXmu-devel # Plague-specific weirdness %if 0%{?fedora} > 11 || 0%{?rhel} > 5 @@ -89,6 +92,7 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils +Requires(post): systemd-units Requires: %{name}-kmod = %{version}%{?prereltag} Provides: %{name}-kmod-common = %{version}%{?prereltag} @@ -154,7 +158,7 @@ %prep -%setup -q -n VirtualBox-%{version}_OSE +%setup -q -n VirtualBox-%{version} find -name '*.py[co]' -delete %patch1 -p1 -b .noupdates @@ -170,6 +174,7 @@ %patch17 -p1 -b .beramono %patch18 -p1 -b .aiobug %patch20 -p1 -b .testmangle +%patch22 -p1 -b .gsoap # Remove prebuilt binary tools rm -rf kBuild @@ -180,7 +185,7 @@ %build -./configure --disable-kmods --enable-webservice --disable-java +./configure --disable-kmods --enable-webservice . ./env.sh # VirtualBox build system installs and builds in the same step, @@ -498,6 +503,15 @@ %changelog +* Fri Mar 23 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.10-1 +- New release. +- Upsteam says that java stuff is fiexd , https://www.virtualbox.org/ticket/9848#comment:5 +- Upsteam says that have compile fixes for kernel 3.3-rc1 (in changelog). +- backport fix for web-service with newer versions of GSOAP, Changeset 40476 and 40477 in vbox, kindly + fixed from Frank Mehnert "The real fix can be found in r40476 and r40477. You should be able to + apply these fixes to VBox 4.1.10 as well." and add -lssl and -lcrypto by my self. +- drop Patch to allow to build with GCC 4.7 + * Tue Jan 15 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.8-2 - Try fix usb/udev problem on updates without reboot computer. - Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!. @@ -505,25 +519,25 @@ * Sun Jan 01 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 4.1.8-1.1 - Fix vboxweb-service installation -* Sat Dec 24 2011 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.8-1 -- New release. -- merge spec 4.0.4 from Lubomir Rintel <lkundrak(a)v3.sk&gt;, which re-add BuildRequires: hal-devel on - F-15 - -* Mon Dec 12 2011 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.6-4 -- complete list of commands of VBox command line based on - src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec, revert some cleanups. -- add source vboxweb-service to package. +* Sat Dec 24 2011 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.8-1 +- New release. +- merge spec 4.0.4 from Lubomir Rintel <lkundrak(a)v3.sk&gt;, which re-add BuildRequires: hal-devel on + F-15 + +* Mon Dec 12 2011 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.6-4 +- complete list of commands of VBox command line based on + src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec, revert some cleanups. +- add source vboxweb-service to package. * Sat Dec 3 2011 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.6-3 - New release - fix strings patch -- redo xorg17 patch (still need some improvements, I will wait for a new change that break the patch) +- redo xorg17 patch (still need some improvements, I will wait for a new change that break the patch) - redo noupdate patch. - some cleanups. -- drop upstream patch VirtualBox-OSE-4.1.2-vboxpci.patch +- drop upstream patch VirtualBox-OSE-4.1.2-vboxpci.patch - bug #1656 add VirtualBox-OSE-add-VBoxExtPackHelperApp.patch -- disable java binding, seems non maintained and doesn't compile with java-1.7.0-openjdk-devel. +- disable java binding, seems non maintained and doesn't compile with java-1.7.0-openjdk-devel. - bug #2052, drop requirement of HAL in Fedora >= 16. - bug #2040, is also fixed (update to 4.1.6). - Now rawhide needs explicit BuildRequires libpng-devel Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 24 Dec 2011 13:33:58 -0000 1.31 +++ sources 23 Mar 2012 15:41:13 -0000 1.32 @@ -1 +1 @@ -2092bba46baa62fab5520d67dee2ece8 VirtualBox-4.1.8.tar.bz2 +263e495ef3a7ab75943af28d446ee702 VirtualBox-4.1.10.tar.bz2