Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26497 Modified Files: .cvsignore VirtualBox-4.3.0-VBoxGuestLib.patch VirtualBox.spec sources Log Message: * Sat Oct 11 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.18-1 - New upstream release . - Removed trailing whitespaces . - Refactor VirtualBox-4.3.0-VBoxGuestLib.patch to try upstreaming . Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 11 Sep 2014 15:59:16 -0000 1.57 +++ .cvsignore 11 Oct 2014 23:40:01 -0000 1.58 @@ -1 +1 @@ -VirtualBox-4.3.16.tar.bz2 +VirtualBox-4.3.18.tar.bz2 VirtualBox-4.3.0-VBoxGuestLib.patch: Makefile.kmk | 2 ++ 1 file changed, 2 insertions(+) Index: VirtualBox-4.3.0-VBoxGuestLib.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.3.0-VBoxGuestLib.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- VirtualBox-4.3.0-VBoxGuestLib.patch 11 Sep 2014 15:59:16 -0000 1.4 +++ VirtualBox-4.3.0-VBoxGuestLib.patch 11 Oct 2014 23:40:01 -0000 1.5 @@ -1,15 +1,16 @@ when we use VBOX_USE_SYSTEM_XORG_HEADERS , we don't need compile the very old libXFree86 (from xfree86.org) Sérgio Basto <sergio(a)serjux.com&gt; ---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2014-09-11 15:31:56.706906433 +0100 -+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-09-11 15:32:24.737206867 +0100 -@@ -39,10 +39,6 @@ LIBRARIES += \ - VBoxGuestR3Lib \ +--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2014-10-11 13:03:35.000000000 +0100 ++++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-10-12 00:11:00.925507543 +0100 +@@ -40,9 +40,11 @@ LIBRARIES += \ VBoxGuestR3LibShared ifndef VBOX_ONLY_TESTSUITE -- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) -- LIBRARIES += \ -- VBoxGuestR3LibXFree86 -- endif + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) ++ ifndef VBOX_USE_SYSTEM_XORG_HEADERS + LIBRARIES += \ + VBoxGuestR3LibXFree86 + endif ++ endif if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) LIBRARIES += \ VBoxGuestR3LibXOrg Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- VirtualBox.spec 11 Sep 2014 15:59:17 -0000 1.66 +++ VirtualBox.spec 11 Oct 2014 23:40:01 -0000 1.67 @@ -26,7 +26,7 @@ #endif Name: VirtualBox -Version: 4.3.16 +Version: 4.3.18 Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -52,7 +52,7 @@ Patch23: VirtualBox-4.3.10-xserver_guest.patch Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch Patch26: VirtualBox-4.3.0-no-bundles.patch -Patch27: VirtualBox-4.3.10-gcc.patch +#Patch27: VirtualBox-4.3.10-gcc.patch BuildRequires: kBuild >= 0.1.9998 BuildRequires: SDL-devel xalan-c-devel @@ -90,7 +90,7 @@ #BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32) #BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686 #BuildRequires: /usr/lib/libc.so -#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 +#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 # For the X11 module BuildRequires: libdrm-devel @@ -199,7 +199,7 @@ %setup -qn %{name}-%{version}%{prereltag} find -name '*.py[co]' -delete -# Remove prebuilt binary tools +# Remove prebuilt binary tools rm -rf kBuild rm -rf tools # Remove bundle X11 sources and some lib sources, before patching. @@ -209,11 +209,11 @@ rm -rf src/VBox/Additions/x11/x11stubs rm -rf src/VBox/GuestHost/OpenGL/include/GL -rm -rf src/libs/boost-1.37.0/ -#rm -rf src/libs/liblzf-3.4/ -rm -rf src/libs/libxml2-2.6.31/ -rm -rf src/libs/libpng-1.2.8/ -rm -rf src/libs/zlib-1.2.6/ +rm -rf src/libs/boost-1.37.0/ +#rm -rf src/libs/liblzf-3.4/ +rm -rf src/libs/libxml2-2.6.31/ +rm -rf src/libs/libpng-1.2.8/ +rm -rf src/libs/zlib-1.2.6/ %patch1 -p1 -b .noupdates %patch2 -p1 -b .strings @@ -349,7 +349,7 @@ obj/bin/webtest \ %endif -install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh +install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh # Language files install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \ @@ -378,15 +378,15 @@ install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages # Guest X.Org drivers -# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you -# can build with VBOX_USE_SYSTEM_XORG_HEADERS=1 set in future to only +# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you +# can build with VBOX_USE_SYSTEM_XORG_HEADERS=1 set in future to only # build the X.Org drivers against the installed system headers. # also wrote: # As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not # build it in this case. # and # Build using local X.Org headers. We assume X.Org Server 1.7 or later. -# +# # [1] https://www.virtualbox.org/changeset/43588/vbox install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \ @@ -413,7 +413,7 @@ install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh -#/usr/bin/VBoxClient-all does not exits +#/usr/bin/VBoxClient-all does not exits #install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \ # $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop #desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop @@ -501,7 +501,7 @@ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : # Guest additions install -%post guest +%post guest /sbin/ldconfig /bin/systemctl daemon-reload >/dev/null 2>&1 || : # should be in kmod package, not here @@ -616,6 +616,11 @@ %changelog +* Sat Oct 11 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.18-1 +- New upstream release . +- Removed trailing whitespaces . +- Refactor VirtualBox-4.3.0-VBoxGuestLib.patch to try upstreaming . + * Wed Sep 10 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.16-1 - New upstream release . - Fixed VirtualBox-4.3.0-VBoxGuestLib.patch . @@ -651,7 +656,7 @@ - small adjustments in others patches. * Wed Dec 25 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.6-4 -- Update VirtualBox-4.3-mesa.patch, for guest drives and for Xorg-x11-server-1.14.99 in rawhide, glx internals "fixes" completely removed, eliminating BuildRequires of xorg-x11-server-source. +- Update VirtualBox-4.3-mesa.patch, for guest drives and for Xorg-x11-server-1.14.99 in rawhide, glx internals "fixes" completely removed, eliminating BuildRequires of xorg-x11-server-source. Also add to VBoxOGL_LIBS libXcomposite, libXdamage etc of the system. - Disable webservice for rawhide, problems reported upstream with new gsoap version. @@ -674,30 +679,30 @@ * Mon Oct 28 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.0-1 - New upstream release. -- Refactor patches VirtualBox-4.3.0-32bit.patch, VirtualBox-4.3.0-libcxx.patch, VirtualBox-4.3.0-mesa.patch, +- Refactor patches VirtualBox-4.3.0-32bit.patch, VirtualBox-4.3.0-libcxx.patch, VirtualBox-4.3.0-mesa.patch, VirtualBox-4.3.0-no-bundles.patch, VirtualBox-4.3.0-testmangle.patch and VirtualBox-4.3.0-VBoxGuestLib.patch - Took the opportunity to do a review: add some new binaries, need to review it again . * Sun Sep 29 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.18-2 -- Additions/linux: fix shared folders for Linux 3.11 +- Additions/linux: fix shared folders for Linux 3.11 * Fri Sep 20 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.18-1 - New upstream release. * Sun Sep 01 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.16-2 -- fixes for Kernel 3.11: +- fixes for Kernel 3.11: https://www.virtualbox.org/changeset/47484/vbox/trunk and - https://www.virtualbox.org/changeset/47588/vbox/trunk + https://www.virtualbox.org/changeset/47588/vbox/trunk * Fri Jul 05 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.16-1 - New upstream release. * Sun Jun 30 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.14-2 -- Bugfix, forgot rename *.modules to *.conf, as defined in modules-load.d(5) . +- Bugfix, forgot rename *.modules to *.conf, as defined in modules-load.d(5) . * Sat Jun 29 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.14-1 -- Change strings instructions to load modules. +- Change strings instructions to load modules. - New upstream release. - Drop gcc-4.8 patch. @@ -717,7 +722,7 @@ * Thu Mar 07 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.8-2 - Added upstreamed patch for kernels 3.9, "That fix will be part of the next maintenance - release". + release". * Sat Mar 02 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.8-1 - New upstream release. @@ -760,7 +765,7 @@ * Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.4-1 - New upstream release. -- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588, +- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588, https://www.virtualbox.org/changeset/43588/vbox , allow compile vboxvideo with system headers, and "As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not build it". - enable-webservice on F17 and lower (stables) and disable-docs on F18 and rawhide, can't buid it @@ -770,8 +775,8 @@ - On F16, need add one xorg header for xorg-x11-server 1.11.x * Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-3 -- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on -VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch +- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on +VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch * Sat Sep 15 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-2 - Disable websrv because fails to build on rawhide, temporarily I hope. @@ -779,18 +784,18 @@ * Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-1 - 4.2.0 released - Rebase and rework VirtualBox-4.2.0-xorg17.patch, add 2 new Definitions: XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000 -- Rename and rework VirtualBox-OSE-4.1.10-mesa.patch +- Rename and rework VirtualBox-OSE-4.1.10-mesa.patch - Reorganize last 2 patches. - Revert attempt to remove 32-bits patch. -* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.7.RC4 +* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.7.RC4 - Another try to compile with 32-bits suport on x86_64. * Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.6.RC4 -- Update to RC4. +- Update to RC4. - Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch - Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 ! -- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp. +- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp. - Removes X11 includes from sources (src/VBox/Additions/x11/x11include). * Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.5.RC3 @@ -808,7 +813,7 @@ - add BR # libstdc++.i686 and libc-devel.i686 for 32-bits BuildRequires: /usr/lib/libc.so BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6 -- drop 32-bit patch and testmangle patch, no fails. +- drop 32-bit patch and testmangle patch, no fails. - rename and remove some patches cvs diff: VirtualBox-4.1.20-libcxx.patch was removed, no comparison available cvs diff: VirtualBox-4.1.20-x113.patch is a new entry, no comparison available @@ -858,8 +863,8 @@ * Tue May 22 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.16-1 - New upstream release. -* Mon May 21 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.14-7 -- Customize VBOX_VERSION_STRING. +* Mon May 21 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.14-7 +- Customize VBOX_VERSION_STRING. * Wed May 16 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.14-6 - Bump a release, to build a new tag, one more try. @@ -871,15 +876,15 @@ - Rename to VirtualBox, rfbz #1826 * Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.14-3 -- Review spec with fedora-review +- Review spec with fedora-review - Remove requirement for hal for F15 - .desktop, .service and xorg.conf.d/vboxvideo.conf are text files, put chmod 644 - don't try start vboxservice.service, because vboxservice.service depends on kmods, maybe start when - modules are loaded. + modules are loaded. * Sun Apr 29 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.14-2 -- Migrating vboxweb-service to a systemd unit file from a SysV initscript -- Add vboxservice.service systemd unit file in guest package, rfbz #2274. +- Migrating vboxweb-service to a systemd unit file from a SysV initscript +- Add vboxservice.service systemd unit file in guest package, rfbz #2274. * Thu Apr 26 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.14-1 - new release @@ -903,7 +908,7 @@ - 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 + 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 Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 11 Sep 2014 15:59:17 -0000 1.57 +++ sources 11 Oct 2014 23:40:02 -0000 1.58 @@ -1 +1 @@ -16f8f3e5fea2677da7456bc8b6aff458 VirtualBox-4.3.16.tar.bz2 +0e6e345a5bc4321bc5014258c6e9a5bb VirtualBox-4.3.18.tar.bz2