packages: VirtualBox/VirtualBox.spec, VirtualBox/VirtualBox-noorigin.patch ...

[arekm]

Author: arekm                        Date: Mon Oct 25 17:00:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; no ORIGIN on linux

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.318 -> 1.319) , VirtualBox-noorigin.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.318 packages/VirtualBox/VirtualBox.spec:1.319
--- packages/VirtualBox/VirtualBox.spec:1.318	Fri Oct 22 13:09:36 2010
+++ packages/VirtualBox/VirtualBox.spec	Mon Oct 25 19:00:33 2010
@@ -28,7 +28,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		3
+%define		rel		4
 %define		pname		VirtualBox
 
 Summary:	VirtualBox OSE - x86 hardware virtualizer
@@ -57,6 +57,7 @@
 Patch2:		%{pname}-VBoxSysInfo.patch
 Patch3:		%{pname}-warning_workaround.patch
 Patch4:		%{pname}-vnc.patch
+Patch5:		%{pname}-noorigin.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	rpmbuild(macros) >= 1.535
 %if %{with userspace}
@@ -408,6 +409,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p0
 
 %{__sed} -i -e 's,$VBOX_DOC_PATH,%{_docdir}/%{name}-%{version},' src/VBox/Installer/linux/virtualbox.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/linux/virtualbox.desktop
@@ -830,6 +832,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.319  2010/10/25 17:00:33  arekm
+- rel 4; no ORIGIN on linux
+
 Revision 1.318  2010/10/22 11:09:36  caleb
 - Update Qt version dependency
 

================================================================
Index: packages/VirtualBox/VirtualBox-noorigin.patch
diff -u /dev/null packages/VirtualBox/VirtualBox-noorigin.patch:1.1
--- /dev/null	Mon Oct 25 19:00:39 2010
+++ packages/VirtualBox/VirtualBox-noorigin.patch	Mon Oct 25 19:00:33 2010
@@ -0,0 +1,37 @@
+Index: Config.kmk
+===================================================================
+--- Config.kmk	(wersja 33269)
++++ Config.kmk	(wersja 33316)
+@@ -567,6 +567,8 @@
+ ifdef VBOX_WITH_HARDENING
+  if1of ($(KBUILD_TARGET), solaris)
+   VBOX_PATH_APP_PRIVATE      = /opt/VirtualBox/$(if-expr $(KBUILD_TARGET_ARCH) == "amd64",amd64,i386)
++ else ifeq ($(KBUILD_TARGET),linux)
++  VBOX_PATH_APP_PRIVATE      = /opt/VirtualBox
+  else ifeq ($(KBUILD_TARGET),darwin)
+   VBOX_PATH_APP_PRIVATE      = /Applications/VirtualBox.app/Contents/MacOS
+  else ifeq ($(KBUILD_TARGET),freebsd)
+@@ -599,7 +601,7 @@
+ # depending on the location of the object.)
+ #VBOX_WITH_RUNPATH = /usr/lib/virtualbox
+ ifdef VBOX_WITH_HARDENING
+- if1of ($(KBUILD_TARGET), freebsd solaris)
++ if1of ($(KBUILD_TARGET), freebsd linux solaris)
+   VBOX_WITH_RUNPATH = $(VBOX_PATH_APP_PRIVATE)
+  endif
+ endif
+@@ -607,12 +609,10 @@
+ # Because of the setuid usage on all ELF platforms when hardening the build
+ # things gets a bit complicated since the $ORIGIN+setuid policy differs.
+ #VBOX_WITH_ORIGIN=1
+-ifdef VBOX_WITH_HARDENING
+- if1of ($(KBUILD_TARGET), linux)
++ifndef VBOX_WITH_HARDENING
++ if1of ($(KBUILD_TARGET), linux solaris)
+   VBOX_WITH_ORIGIN = 1
+  endif
+-else if1of ($(KBUILD_TARGET), linux solaris)
+- VBOX_WITH_ORIGIN = 1
+ endif
+ # Enable the system wide support service/daemon.
+ # Work in progress, but required for hardening on Windows.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.318&r2=1.319&f=u