[arch-commits] Commit in virtualbox/trunk (4 files)
Christian Hesse
eworm at archlinux.org
Wed Dec 26 23:02:41 UTC 2018
Date: Wednesday, December 26, 2018 @ 23:02:40
Author: eworm
Revision: 418179
upgpkg: virtualbox 6.0.0-1
new upstream release
Modified:
virtualbox/trunk/011-python-3-7.patch
virtualbox/trunk/LocalConfig.kmk
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/012-linux-4-20.patch
----------------------+
011-python-3-7.patch | 13 ----
012-linux-4-20.patch | 131 -------------------------------------------------
LocalConfig.kmk | 3 +
PKGBUILD | 130 +++++++++++++++++++++++-------------------------
4 files changed, 67 insertions(+), 210 deletions(-)
Modified: 011-python-3-7.patch
===================================================================
--- 011-python-3-7.patch 2018-12-26 22:35:10 UTC (rev 418178)
+++ 011-python-3-7.patch 2018-12-26 23:02:40 UTC (rev 418179)
@@ -11,16 +11,3 @@
for p in $PYTHONDIR; do
for d in $SUPPYTHONLIBS; do
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
-diff --git a/src/libs/xpcom18a4/python/src/ErrorUtils.cpp b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-index f211c7a9..fd6811c0 100644
---- a/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-+++ b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-@@ -440,7 +440,7 @@ char *PyTraceback_AsString(PyObject *exc_tb)
- #if PY_MAJOR_VERSION <= 2
- char *tempResult = PyString_AsString(obResult);
- #else
-- char *tempResult = PyUnicode_AsUTF8(obResult);
-+ const char *tempResult = PyUnicode_AsUTF8(obResult);
- #endif
- result = (char *)PyMem_Malloc(strlen(tempResult)+1);
- if (result==NULL)
Deleted: 012-linux-4-20.patch
===================================================================
--- 012-linux-4-20.patch 2018-12-26 22:35:10 UTC (rev 418178)
+++ 012-linux-4-20.patch 2018-12-26 23:02:40 UTC (rev 418179)
@@ -1,131 +0,0 @@
-From f37b5b726afbac660c60260b6b4cddc34da73226 Mon Sep 17 00:00:00 2001
-From: vboxsync <vboxsync at cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date: Thu, 22 Nov 2018 14:08:09 +0000
-Subject: [PATCH] iprt: adjust time-r0drv-linux.c for Linux 4.20. bugref:4567:
- Linux kernel driver maintainance. Routine ktime_get_real_ts() must be
- replaced by ktime_get_real_ts64(). Thank you Larry Finger for the patch.
- (Adjusted before applying.)
-
-git-svn-id: http://www.virtualbox.org/svn/vbox@75665 cfe28804-0f27-0410-a406-dd0f0b0b656f
----
- include/iprt/time.h | 8 ++++++++
- src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c | 11 ++++++++++-
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/include/iprt/time.h b/include/iprt/time.h
-index 080accf968..44b5f4f73b 100644
---- a/include/iprt/time.h
-+++ b/include/iprt/time.h
-@@ -428,6 +428,14 @@ DECLINLINE(PRTTIMESPEC) RTTimeSpecSetTimespec(PRTTIMESPEC pTime, const struct ti
- {
- return RTTimeSpecAddNano(RTTimeSpecSetSeconds(pTime, pTimespec->tv_sec), pTimespec->tv_nsec);
- }
-+
-+
-+# ifdef _LINUX_TIME64_H
-+DECLINLINE(PRTTIMESPEC) RTTimeSpecSetTimespec64(PRTTIMESPEC pTime, const struct timespec64 *pTimeval)
-+{
-+ return RTTimeSpecAddNano(RTTimeSpecSetSeconds(pTime, pTimeval->tv_sec), pTimeval->tv_nsec);
-+}
-+# endif
- #endif /* various ways of detecting struct timespec */
-
-
-diff --git a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
-index 5b1baadcdd..1a9b56d339 100644
---- a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
-@@ -171,11 +171,20 @@ RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime)
- {
- IPRT_LINUX_SAVE_EFL_AC();
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
-+/* On Linux 4.20, time.h includes time64.h and we have to use 64-bit times. */
-+# ifdef _LINUX_TIME64_H
-+ struct timespec64 Ts;
-+ ktime_get_real_ts64(&Ts);
-+# else
- struct timespec Ts;
- ktime_get_real_ts(&Ts);
-+# endif
- IPRT_LINUX_RESTORE_EFL_AC();
-+# ifdef _LINUX_TIME64_H
-+ return RTTimeSpecSetTimespec64(pTime, &Ts);
-+#else
- return RTTimeSpecSetTimespec(pTime, &Ts);
--
-+#endif
- #else /* < 2.6.16 */
- struct timeval Tv;
- do_gettimeofday(&Tv);
-From ffc1396e3e550960da9944488e173bd0049b4825 Mon Sep 17 00:00:00 2001
-From: vboxsync <vboxsync at cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date: Fri, 23 Nov 2018 11:17:22 +0000
-Subject: [PATCH] NetAdp: Linux 4.20 compatibility fix (bugref:4567) In struct
- ethtool_ops, the get_settings member is renamed get_link_ksettings. Inspired
- by Larry Finger's patch. Thank you Larry Finger
-
-git-svn-id: http://www.virtualbox.org/svn/vbox@75684 cfe28804-0f27-0410-a406-dd0f0b0b656f
----
- .../VBoxNetAdp/linux/VBoxNetAdp-linux.c | 26 +++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
-index 881103a12f..16d8996623 100644
---- a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
-+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
-@@ -84,7 +84,11 @@ static long VBoxNetAdpLinuxIOCtlUnlocked(struct file *pFilp,
- #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
-
- static void vboxNetAdpEthGetDrvinfo(struct net_device *dev, struct ethtool_drvinfo *info);
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+static int vboxNetAdpEthGetLinkSettings(struct net_device *pNetDev, struct ethtool_link_ksettings *pLinkSettings);
-+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
- static int vboxNetAdpEthGetSettings(struct net_device *dev, struct ethtool_cmd *cmd);
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
-
-
- /*********************************************************************************************************************************
-@@ -133,7 +137,11 @@ static struct ethtool_ops gEthToolOpsVBoxNetAdp =
- # endif
- {
- .get_drvinfo = vboxNetAdpEthGetDrvinfo,
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+ .get_link_ksettings = vboxNetAdpEthGetLinkSettings,
-+# else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
- .get_settings = vboxNetAdpEthGetSettings,
-+# endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
- .get_link = ethtool_op_get_link,
- };
-
-@@ -205,6 +213,23 @@ static void vboxNetAdpEthGetDrvinfo(struct net_device *pNetDev, struct ethtool_d
- }
-
-
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)
-+/* ethtool_ops::get_link_ksettings */
-+static int vboxNetAdpEthGetLinkSettings(struct net_device *pNetDev, struct ethtool_link_ksettings *pLinkSettings)
-+{
-+ /* We just need to set field we care for, the rest is done by ethtool_get_link_ksettings() helper in ethtool. */
-+ ethtool_link_ksettings_zero_link_mode(pLinkSettings, supported);
-+ ethtool_link_ksettings_zero_link_mode(pLinkSettings, advertising);
-+ ethtool_link_ksettings_zero_link_mode(pLinkSettings, lp_advertising);
-+ pLinkSettings->base.speed = SPEED_10;
-+ pLinkSettings->base.duplex = DUPLEX_FULL;
-+ pLinkSettings->base.port = PORT_TP;
-+ pLinkSettings->base.phy_address = 0;
-+ pLinkSettings->base.transceiver = XCVR_INTERNAL;
-+ pLinkSettings->base.autoneg = AUTONEG_DISABLE;
-+ return 0;
-+}
-+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
- /* ethtool_ops::get_settings */
- static int vboxNetAdpEthGetSettings(struct net_device *pNetDev, struct ethtool_cmd *cmd)
- {
-@@ -224,6 +249,7 @@ static int vboxNetAdpEthGetSettings(struct net_device *pNetDev, struct ethtool_c
- cmd->maxrxpkt = 0;
- return 0;
- }
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) */
-
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
Modified: LocalConfig.kmk
===================================================================
--- LocalConfig.kmk 2018-12-26 22:35:10 UTC (rev 418178)
+++ LocalConfig.kmk 2018-12-26 23:02:40 UTC (rev 418179)
@@ -30,3 +30,6 @@
# no update request. update are handled via pacman
VBOX_WITH_UPDATE_REQUEST := 0
+
+# build shared library
+VBOX_GUI_WITH_SHARED_LIBRARY = 1
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-12-26 22:35:10 UTC (rev 418178)
+++ PKGBUILD 2018-12-26 23:02:40 UTC (rev 418179)
@@ -9,8 +9,8 @@
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
-pkgver=5.2.22
-pkgrel=3
+pkgver=6.0.0
+pkgrel=1
_vboxsf_commit='9451f61e6787e95aa51e42b6381db6b059bc49da'
arch=('x86_64')
url='http://virtualbox.org'
@@ -76,12 +76,11 @@
'009-include-path.patch'
'010-qt-5.11.patch'
'011-python-3-7.patch'
- '012-linux-4-20.patch'
# The following patch and mount.vboxsf wrapper should be removed
# once support for mainline-style options string gets upstreamed
'101-vboxsf-automount.patch'
'mount.vboxsf')
-sha256sums=('5580e875349341a1aabc6d5d2f697d242f277487316faaf1fbe68d9014f788d4'
+sha256sums=('de47ce3ba599e0c5ef24eb44728fcf4abdecb0f0bb60e8560d03cfbf41283bfb'
'SKIP'
'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
@@ -90,7 +89,7 @@
'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
'9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
'033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
- '918fe3ae7d60550181bcefedb55621f2c824087062c0df6ad03d148ed3f2ba01'
+ '4cf3fd12d364a126693a9c90873362701be0bf3b3a9bdca586da67ab1adeb03e'
'94a808f46909a51b2d0cf2c6e0a6c9dea792034943e6413bf9649a036c921b21'
'01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
@@ -101,8 +100,7 @@
'8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
'1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
'c6ef35e6893d557c7c2269ff79bc299fe9058cfb2c933a7efdc7a8a7b6d9c5da'
- '9535774f1858c0ad92f0edee99875dcf683e41a4c7c95494c8aeb81591426e5a'
- 'c9057b9846737044d2eadd7bc52c74e3a0b3598941eb3c8b06511f58227ae5bf'
+ '55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d'
'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'
'f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947')
@@ -173,50 +171,50 @@
cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
# binaries
- install -dm755 "$pkgdir/usr/bin"
- install -m755 VBox.sh "$pkgdir/usr/bin/VBox"
+ install -dm0755 "$pkgdir/usr/bin"
+ install -m0755 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 -m755 VBoxTunctl "$pkgdir/usr/bin"
- install -m755 rdesktop-vrdp "$pkgdir/usr/bin"
+ install -m0755 VBoxTunctl "$pkgdir/usr/bin"
+ install -m0755 rdesktop-vrdp "$pkgdir/usr/bin"
# libraries
- install -dm755 "$pkgdir/usr/lib/virtualbox"
- install -m755 *.so "$pkgdir/usr/lib/virtualbox"
- install -m644 *.rc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
+ install -dm0755 "$pkgdir/usr/lib/virtualbox"
+ install -m0755 *.so "$pkgdir/usr/lib/virtualbox"
+ install -m0644 *.rc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
## setuid root binaries
- install -m4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox"
+ install -m4755 VBoxSDL VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox"
## other binaries
- install -m755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
+ install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
# components
- install -dm755 "$pkgdir/usr/lib/virtualbox/components"
- install -m755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
+ install -dm0755 "$pkgdir/usr/lib/virtualbox/components"
+ install -m0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
# extensions packs
## as virtualbox install itself stuff in this directory, move it to /var and
## trick it with a symlink
## FIXME: trick is disabled for now
- #install -dm755 "$pkgdir/var/lib/virtualbox/extensions"
- #install -dm755 "$pkgdir/usr/share/virtualbox/extensions"
+ #install -dm0755 "$pkgdir/var/lib/virtualbox/extensions"
+ #install -dm0755 "$pkgdir/usr/share/virtualbox/extensions"
#ln -s ../../../var/lib/virtualbox/extensions "$pkgdir/usr/lib/virtualbox/ExtensionPacks"
- install -dm755 "$pkgdir/usr/lib/virtualbox/ExtensionPacks"
+ install -dm0755 "$pkgdir/usr/lib/virtualbox/ExtensionPacks"
# languages
- install -dm755 "$pkgdir/usr/share/virtualbox/nls"
- install -m755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
+ install -dm0755 "$pkgdir/usr/share/virtualbox/nls"
+ install -m0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
# rdesktop keymaps
- install -dm755 "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
- install -m644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
+ install -dm0755 "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
+ install -m0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
# useless scripts
- install -m755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
+ install -m0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
# icons
- install -Dm644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
+ install -Dm0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
pushd icons >/dev/null
for i in *; do
@@ -226,11 +224,11 @@
popd >/dev/null
#desktop
- install -Dm644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
- install -Dm644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
+ install -Dm0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
+ install -Dm0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
#install configuration
- install -dm755 "$pkgdir/etc/vbox"
+ install -dm0755 "$pkgdir/etc/vbox"
echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
# back to srcdir
@@ -237,15 +235,15 @@
cd "$srcdir"
#licence
- install -Dm644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm0644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
# install systemd stuff
- install -Dm644 60-vboxdrv.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules"
- install -Dm644 vboxweb.service "$pkgdir/usr/lib/systemd/system/vboxweb.service"
- install -Dm644 virtualbox.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox.conf"
+ install -Dm0644 60-vboxdrv.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules"
+ install -Dm0644 vboxweb.service "$pkgdir/usr/lib/systemd/system/vboxweb.service"
+ install -Dm0644 virtualbox.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox.conf"
# install module reloading shortcut (with a symlink with default helper)
- install -Dm755 vboxreload "$pkgdir/usr/bin"
+ install -Dm0755 vboxreload "$pkgdir/usr/bin"
ln -s vboxreload "$pkgdir/usr/bin/rcvboxdrv"
}
@@ -253,12 +251,12 @@
pkgdesc='VirtualBox Software Developer Kit (SDK)'
depends=('python')
- install -dm755 "$pkgdir/usr/lib/virtualbox"
+ install -dm0755 "$pkgdir/usr/lib/virtualbox"
source "VirtualBox-$pkgver/env.sh"
cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
- install -Dm755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
+ install -Dm0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
# python sdk
pushd sdk/installer
VBOX_INSTALL_PATH="/usr/lib/virtualbox" python vboxapisetup.py install --root "$pkgdir"
@@ -266,7 +264,7 @@
cp -r sdk "$pkgdir/usr/lib/virtualbox"
rm -r "$pkgdir/usr/lib/virtualbox/sdk/installer"
# licence
- install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
@@ -283,20 +281,20 @@
'linux-zen-headers: build modules against ZEN kernel')
install=virtualbox-host-dkms.install
- install -dm755 "$pkgdir/usr/src"
+ install -dm0755 "$pkgdir/usr/src"
source "VirtualBox-$pkgver/env.sh"
cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
cp -r src "$pkgdir/usr/src/vboxhost-${pkgver}_OSE"
# licence
- install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
# module loading
local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
- install -Dm644 /dev/null "$_p"
+ install -Dm0644 /dev/null "$_p"
printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" > "$_p"
# starting vbox 5.1, dkms.conf file was dropped
local _p="$pkgdir/usr/src/vboxhost-${pkgver}_OSE/dkms.conf"
- install -Dm644 "$srcdir/$pkgname.conf" "$_p"
+ install -Dm0644 "$srcdir/$pkgname.conf" "$_p"
sed -i "s, at VERSION@,$pkgver," "$_p"
}
@@ -313,20 +311,20 @@
'linux-zen-headers: build modules against ZEN kernel')
install=virtualbox-guest-dkms.install
- install -dm755 "$pkgdir/usr/src"
+ install -dm0755 "$pkgdir/usr/src"
source "VirtualBox-$pkgver/env.sh"
cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
cp -r src "$pkgdir/usr/src/vboxguest-${pkgver}_OSE"
# licence
- install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
# module loading
local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
- install -Dm644 /dev/null "$_p"
+ install -Dm0644 /dev/null "$_p"
printf "vboxguest\nvboxsf\nvboxvideo\n" > "$_p"
# starting vbox 5.1, dkms.conf file was dropped
local _p="$pkgdir/usr/src/vboxguest-${pkgver}_OSE/dkms.conf"
- install -Dm644 "$srcdir/$pkgname.conf" "$_p"
+ install -Dm0644 "$srcdir/$pkgname.conf" "$_p"
sed -i "s, at VERSION@,$pkgver," "$_p"
# vboxsf module for Linux 4.16 and later
@@ -335,7 +333,7 @@
rm -rf "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf/.git"
echo "obj-m = vboxsf/" >"$pkgdir/usr/src/vboxsf-${pkgver}_OSE/Makefile"
local _p="$pkgdir/usr/src/vboxsf-${pkgver}_OSE/dkms.conf"
- install -Dm644 "$srcdir/virtualbox-vboxsf-dkms.conf" "$_p"
+ install -Dm0644 "$srcdir/virtualbox-vboxsf-dkms.conf" "$_p"
sed -i "s, at VERSION@,$pkgver," "$_p"
}
@@ -350,23 +348,23 @@
source "VirtualBox-$pkgver/env.sh"
pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
install -d "$pkgdir/usr/bin"
- install -m755 VBoxClient VBoxControl VBoxService "$srcdir/mount.vboxsf" "$pkgdir/usr/bin"
- install -Dm755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
- install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+ install -m0755 VBoxClient VBoxControl VBoxService "$srcdir/mount.vboxsf" "$pkgdir/usr/bin"
+ install -Dm0755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
+ install -m0755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
"$pkgdir"/usr/bin/VBoxClient-all
- install -m644 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
+ install -m0644 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
"$pkgdir"/etc/xdg/autostart/vboxclient.desktop
install -d "$pkgdir/usr/lib/xorg/modules/dri"
- install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
+ install -m0755 VBoxOGL*.so "$pkgdir/usr/lib"
ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
- install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
+ install -m0755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
popd
# systemd stuff
- install -Dm644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
- install -Dm644 vboxservice.service "$pkgdir/usr/lib/systemd/system/vboxservice.service"
- install -Dm644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
+ install -Dm0644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
+ install -Dm0644 vboxservice.service "$pkgdir/usr/lib/systemd/system/vboxservice.service"
+ install -Dm0644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
# licence
- install -Dm644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm0644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
package_virtualbox-guest-utils-nox() {
@@ -377,16 +375,16 @@
source "VirtualBox-$pkgver/env.sh"
pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
install -d "$pkgdir/usr/bin"
- install -m755 VBoxControl VBoxService "$srcdir/mount.vboxsf" "$pkgdir/usr/bin"
- install -Dm755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
- install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
+ install -m0755 VBoxControl VBoxService "$srcdir/mount.vboxsf" "$pkgdir/usr/bin"
+ install -Dm0755 mount.vboxsf "$pkgdir/usr/lib/virtualbox/mount.vboxsf"
+ install -m0755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
popd
# systemd stuff
- install -Dm644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
- install -Dm644 vboxservice-nox.service "$pkgdir/usr/lib/systemd/system/vboxservice.service"
- install -Dm644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
+ install -Dm0644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
+ install -Dm0644 vboxservice-nox.service "$pkgdir/usr/lib/systemd/system/vboxservice.service"
+ install -Dm0644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
# licence
- install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
@@ -398,9 +396,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"
+ install -Dm0644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack"
# licence
- install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
More information about the arch-commits
mailing list