[PC-BSD Commits] r17257 - in pbi/modules/emulators/virtualbox-ose: . resources/bin scripts xdg-desktop xdg-menu

[svn at pcbsd.org]

Author: kris
Date: 2012-06-12 14:03:33 +0000 (Tue, 12 Jun 2012)
New Revision: 17257

Added:
   pbi/modules/emulators/virtualbox-ose/resources/bin/VirtualBox-wrapper
Modified:
   pbi/modules/emulators/virtualbox-ose/pbi.conf
   pbi/modules/emulators/virtualbox-ose/scripts/post-install.sh
   pbi/modules/emulators/virtualbox-ose/xdg-desktop/VirtualBox.desktop
   pbi/modules/emulators/virtualbox-ose/xdg-menu/VirtualBox.desktop
Log:

Fix the virtualbox-ose build, use pc-su again, looks like setuid still has
some funky issues



Modified: pbi/modules/emulators/virtualbox-ose/pbi.conf
===================================================================
--- pbi/modules/emulators/virtualbox-ose/pbi.conf	2012-06-12 09:16:21 UTC (rev 17256)
+++ pbi/modules/emulators/virtualbox-ose/pbi.conf	2012-06-12 14:03:33 UTC (rev 17257)
@@ -31,7 +31,7 @@
 PBI_MKPORTAFTER="devel/qt4"
 
 # Set the build key
-PBI_BUILDKEY="17"
+PBI_BUILDKEY="18"
 
 # This app needs to install as root
 PBI_REQUIRESROOT="YES"

Modified: pbi/modules/emulators/virtualbox-ose/scripts/post-install.sh
===================================================================
--- pbi/modules/emulators/virtualbox-ose/scripts/post-install.sh	2012-06-12 09:16:21 UTC (rev 17256)
+++ pbi/modules/emulators/virtualbox-ose/scripts/post-install.sh	2012-06-12 14:03:33 UTC (rev 17257)
@@ -7,10 +7,19 @@
 echo 'vboxdrv_load="YES"' >> /tmp/loader.conf
 mv /tmp/loader.conf /boot/loader.conf
 
+sed -i.bak "s,CHANGEME,${PBI_PROGDIRPATH},g" ${PBI_PROGDIRPATH}/bin/VirtualBox-wrapper 
+chmod 755 ${PBI_PROGDIRPATH}/bin/VirtualBox-wrapper 
+rm ${PBI_PROGDIRPATH}/bin/VirtualBox-wrapper.bak 
+
 GROUP=vboxusers
-GID=919
+GID=920
 PW=/usr/sbin/pw
 
+# Remove old legacy vboxusers group
+if ${PW} group show "${GROUP}" | grep ':919:' 2>/dev/null; then
+  ${PW} groupdel ${GROUP}
+fi
+
 if ${PW} group show "${GROUP}" 2>/dev/null; then
   echo "You already have a group \"${GROUP}\", so I will use it."
 else
@@ -21,39 +30,6 @@
   fi
 fi
 
-
-# Set permissions on VB files
-for dir in lib/virtualbox .sbin
-do
-  cd ${PBI_PROGDIRPATH}/${dir}
-  chmod 4511 VBoxNetAdpCtl
-  chmod 4511 VBoxNetDHCP
-  chmod 4511 VBoxSDL
-  chmod 4511 VBoxHeadless
-  chmod 4511 VBoxTestOGL
-  chmod 4511 VirtualBox
-  chmod 0711 VBoxManage
-  chmod 0711 VBoxSVC
-  chmod 0711 VBoxXPCOMIPCD
-  chown root:vboxusers VBoxManage
-  chown root:vboxusers VBoxNetDHCP
-  chown root:vboxusers VBoxSVC
-  chown root:vboxusers VBoxXPCOMIPCD
-  chown root:vboxusers VirtualBox
-  chown root:vboxusers VBoxSDL
-  chown root:vboxusers VBoxHeadless
-  chown root:vboxusers VBoxTestOGL
-done
-
-# Fix for old root:<usr> files
-cd /home
-for usr in `ls`
-do
-  if [ ! -e "${usr}/.VirtualBox" ] ; then continue ; fi
-  chown -R ${usr}:${usr} "${usr}/.VirtualBox"
-  chown -R ${usr}:${usr} "${usr}/VirtualBox VMs/"
-done
-
 ln -fs ${PBI_PROGDIRPATH}/etc/rc.d/vboxnet /usr/local/etc/rc.d/vboxnet
 
 grep '^vboxnet_enable="YES"' /etc/rc.conf >/dev/null 2>/dev/null

Modified: pbi/modules/emulators/virtualbox-ose/xdg-desktop/VirtualBox.desktop
===================================================================
--- pbi/modules/emulators/virtualbox-ose/xdg-desktop/VirtualBox.desktop	2012-06-12 09:16:21 UTC (rev 17256)
+++ pbi/modules/emulators/virtualbox-ose/xdg-desktop/VirtualBox.desktop	2012-06-12 14:03:33 UTC (rev 17257)
@@ -4,7 +4,7 @@
 Type=Application
 Name= Oracle VM VirtualBox
 GenericName=Oracle VM VirtualBox
-Exec=%%PBI_EXEDIR%%/VirtualBox
+Exec=pc-su %%PBI_EXEDIR%%/VirtualBox
 Path=%%PBI_APPDIR%%
 Icon=%%PBI_APPDIR%%/virtualbox.png
 StartupNotify=true

Modified: pbi/modules/emulators/virtualbox-ose/xdg-menu/VirtualBox.desktop
===================================================================
--- pbi/modules/emulators/virtualbox-ose/xdg-menu/VirtualBox.desktop	2012-06-12 09:16:21 UTC (rev 17256)
+++ pbi/modules/emulators/virtualbox-ose/xdg-menu/VirtualBox.desktop	2012-06-12 14:03:33 UTC (rev 17257)
@@ -4,7 +4,7 @@
 Type=Application
 Name=Oracle VM VirtualBox
 GenericName=Oracle VM VirtualBox
-Exec=%%PBI_EXEDIR%%/VirtualBox
+Exec=pc-su %%PBI_EXEDIR%%/VirtualBox
 Path=%%PBI_APPDIR%%
 Icon=%%PBI_APPDIR%%/virtualbox.png
 StartupNotify=true