[arch-commits] Commit in virtualbox/trunk (3 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Fri Sep 6 22:00:04 UTC 2013
Date: Saturday, September 7, 2013 @ 00:00:04
Author: seblu
Revision: 96859
upgpkg: virtualbox 4.2.18-1
Modified:
virtualbox/trunk/LocalConfig.kmk
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/005-linux-3.11.patch
----------------------+
005-linux-3.11.patch | 71 ----------------------------------------------
LocalConfig.kmk | 2 -
PKGBUILD | 75 +++++++++++++++++++++++++++++--------------------
3 files changed, 46 insertions(+), 102 deletions(-)
Deleted: 005-linux-3.11.patch
===================================================================
--- 005-linux-3.11.patch 2013-09-06 21:25:20 UTC (rev 96858)
+++ 005-linux-3.11.patch 2013-09-06 22:00:04 UTC (rev 96859)
@@ -1,71 +0,0 @@
-diff -Nur VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c
---- VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c 2013-07-04 13:59:34.000000000 +0000
-+++ VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c 2013-09-03 13:21:25.314389481 +0000
-@@ -233,7 +233,11 @@
- * b. failure to compute fake inode number
- * c. filldir returns an error (see comment on that)
- */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+static int sf_dir_iterate(struct file *dir, struct dir_context *ctx)
-+#else
- static int sf_dir_read (struct file *dir, void *opaque, filldir_t filldir)
-+#endif
- {
- TRACE();
- for (;;)
-@@ -257,12 +261,18 @@
- /* skip erroneous entry and proceed */
- LogFunc(("sf_getdent error %d\n", err));
- dir->f_pos += 1;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ ctx->pos += 1;
-+#endif
- continue;
- }
-
- /* d_name now contains a valid entry name */
--
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ sanity = ctx->pos + 0xbeef;
-+#else
- sanity = dir->f_pos + 0xbeef;
-+#endif
- fake_ino = sanity;
- if (sanity - fake_ino)
- {
-@@ -270,8 +280,12 @@
- return -EINVAL;
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ err = dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN);
-+#else
- err = filldir(opaque, d_name, strlen(d_name),
- dir->f_pos, fake_ino, DT_UNKNOWN);
-+#endif
- if (err)
- {
- LogFunc(("filldir returned error %d\n", err));
-@@ -289,7 +303,11 @@
- struct file_operations sf_dir_fops =
- {
- .open = sf_dir_open,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ .iterate = sf_dir_iterate,
-+#else
- .readdir = sf_dir_read,
-+#endif
- .release = sf_dir_release,
- .read = generic_read_dir
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-@@ -1805,5 +1805,9 @@
- {
- PVBOXNETFLTINS pThis = VBOX_FLT_NB_TO_INST(self);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+ struct net_device *pDev = netdev_notifier_info_to_dev(ptr);
-+#else
- struct net_device *pDev = (struct net_device *)ptr;
-+#endif
- int rc = NOTIFY_OK;
Modified: LocalConfig.kmk
===================================================================
--- LocalConfig.kmk 2013-09-06 21:25:20 UTC (rev 96858)
+++ LocalConfig.kmk 2013-09-06 22:00:04 UTC (rev 96859)
@@ -18,5 +18,5 @@
VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
VBOX_GCC_WERR =
VBOX_GCC_WARN =
-VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
+#VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
#INST_EXTPACK = /var/lib/virtualbox/extensionpacks/
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-09-06 21:25:20 UTC (rev 96858)
+++ PKGBUILD 2013-09-06 22:00:04 UTC (rev 96859)
@@ -9,8 +9,8 @@
'virtualbox-sdk'
'virtualbox-guest-utils'
'virtualbox-ext-vnc')
-pkgver=4.2.16
-pkgrel=3
+pkgver=4.2.18
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -55,18 +55,16 @@
'vboxweb.service'
'001-vboxdrv-reference.patch'
'002-change_default_driver_dir.patch'
- '004-system-xorg.patch'
- '005-linux-3.11.patch')
-md5sums=('c4a36e2099a317f4715cd3861cdae238'
+ '004-system-xorg.patch')
+md5sums=('99cdf054b5e36aa83b60bd49fb50f943'
'5f85710e0b8606de967716ded7b2d351'
'ed1341881437455d9735875ddf455fbe'
- 'b87d721ce403b0191245fe844f5d9f7c'
+ '43862d1e25a5c63b5c195b806759c7cf'
'07c5f6d86c4b7839d719c8ee0c53653b'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
'6dbd16b9d1530fc42ff6904cd80be91d'
'97e193f050574dd272a38e5ee5ebe62b'
- '4da461f8c90caa123b47c62479f426b4'
- '647ce4b328004497a9f4e81010fb3884')
+ '4da461f8c90caa123b47c62479f426b4')
prepare() {
cd "VirtualBox-$pkgver"
@@ -136,38 +134,38 @@
install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps}
#Binaries and Wrapper with Launchers
- install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
+ install -m755 VBox.sh "$pkgdir/usr/bin/VBox"
for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do
ln -sf VBox "$pkgdir/usr/bin/$i"
ln -sf VBox "$pkgdir/usr/bin/${i,,}"
done
- install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
- install -m 0755 rdesktop-vrdp "$pkgdir/usr/bin"
+ install -m755 VBoxTunctl "$pkgdir/usr/bin"
+ install -m755 rdesktop-vrdp "$pkgdir/usr/bin"
#components
- install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
+ install -m755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
#lib
- install -m 0755 *.so "$pkgdir/usr/lib/virtualbox"
- install -m 0644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
+ install -m755 *.so "$pkgdir/usr/lib/virtualbox"
+ install -m644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
#setuid root binaries
- install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
+ install -m4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
#other binaries
- install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
+ install -m755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
#language
- install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
+ install -m755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
#rdesktop keymaps
- install -m 0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
+ install -m644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
#useless scripts
- install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
+ install -m755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
#icons
- install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
+ install -Dm644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
pushd icons
for i in *; do
@@ -177,21 +175,23 @@
popd
#desktop
- install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
- install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
+ install -Dm644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
+ install -Dm644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
#install configuration
mkdir -p "$pkgdir/etc/vbox"
echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
- #udev and licence
- install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \
- "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
- install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
+ #licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # udev usb rules
+ install -Dm644 "$srcdir/10-vboxdrv.rules" \
"$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
# install systemd service
- install -D -m644 "$srcdir/vboxweb.service" \
+ install -Dm644 "$srcdir/vboxweb.service" \
"$pkgdir/usr/lib/systemd/system/vboxweb.service"
}
@@ -204,7 +204,7 @@
source "VirtualBox-$pkgver/env.sh"
cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
- install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
+ install -Dm755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
#python sdk
pushd sdk/installer
VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir"
@@ -211,6 +211,9 @@
popd
rm -rf sdk/installer
mv sdk "$pkgdir/usr/lib/virtualbox"
+ #licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
package_virtualbox-host-dkms() {
@@ -227,6 +230,9 @@
source "VirtualBox-$pkgver/env.sh"
cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
+ #licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
package_virtualbox-guest-dkms() {
@@ -243,6 +249,9 @@
source "VirtualBox-$pkgver/env.sh"
cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
cp -r src "$pkgdir/usr/src/vboxguest-$pkgver"
+ #licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
package_virtualbox-guest-utils() {
@@ -269,11 +278,14 @@
install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
popd
# install udev rules
- install -D -m 0644 60-vboxguest.rules \
+ install -Dm644 60-vboxguest.rules \
"$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
# install systemd service file
- install -D -m644 vboxservice.service \
+ install -Dm644 vboxservice.service \
"$pkgdir/usr/lib/systemd/system/vboxservice.service"
+ #licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
package_virtualbox-ext-vnc() {
@@ -285,6 +297,9 @@
source "VirtualBox-$pkgver/env.sh"
cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages"
install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack"
+ #licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
# vim:set ts=4 sw=4 et:
More information about the arch-commits
mailing list