aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Engledew <simon.engledew@osirium.com>2020-10-05 16:40:44 +0100
committerJakub Jirutka <jakub@jirutka.cz>2020-10-05 23:25:27 +0200
commit1246ceed009077cd264c9b88873332e5da878325 (patch)
tree6527a05da03eeef7160c7ffcd982a61f5d87ea9f
parentada6f26b3552c4e60bfb13251a800967c63408a7 (diff)
downloadaports-1246ceed009077cd264c9b88873332e5da878325.tar.gz
aports-1246ceed009077cd264c9b88873332e5da878325.tar.bz2
aports-1246ceed009077cd264c9b88873332e5da878325.tar.xz
community/open-vm-tools: upgrade to 11.1.5
-rw-r--r--community/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch5
-rw-r--r--community/open-vm-tools/APKBUILD10
-rwxr-xr-xcommunity/open-vm-tools/tools.conf.patch22
3 files changed, 19 insertions, 18 deletions
diff --git a/community/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch b/community/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch
index 349d70dd57..5b4a30245c 100644
--- a/community/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch
+++ b/community/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch
@@ -23,15 +23,16 @@ diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/gu
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
-@@ -182,6 +182,7 @@
+@@ -185,6 +185,7 @@
/* KEEP SORTED! (sort -d) */
static const DistroInfo distroArray[] = {
+ { "ALT", "/etc/altlinux-release" },
+ { "Alpine", "/etc/alpine-release" },
{ "Annvix", "/etc/annvix-release" },
{ "Arch", "/etc/arch-release" },
{ "Arklinux", "/etc/arklinux-release" },
-@@ -895,6 +896,8 @@
+@@ -905,6 +906,8 @@
Str_Strcpy(distroShort, STR_OS_TURBO, distroShortSize);
} else if (strstr(distroLower, "sun")) {
Str_Strcpy(distroShort, STR_OS_SUN_DESK, distroShortSize);
diff --git a/community/open-vm-tools/APKBUILD b/community/open-vm-tools/APKBUILD
index c42a1a3f4a..f5e86bcba7 100644
--- a/community/open-vm-tools/APKBUILD
+++ b/community/open-vm-tools/APKBUILD
@@ -1,10 +1,10 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=open-vm-tools
-pkgver=11.1.0
+pkgver=11.1.5
_pkgsubver=${pkgver#*_p}
_ver=${pkgver/_p/-}
-pkgrel=3
+pkgrel=0
pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
url="https://github.com/vmware/open-vm-tools/"
arch="aarch64 x86 x86_64"
@@ -254,8 +254,8 @@ _all() {
mkdir -p "$subpkgdir"
}
-sha512sums="6bde66b5ff854d9b07439f9641b1c62a17a0bb5b31123c7b317dcbcdbfa361e95deb3865b01c6ebceb4e2ffecae1d633058fff2b17f1aa5a5a28ea0945dc88bf open-vm-tools-11.1.0.tar.gz
-fe56bb4a57f228081d28dede1f25d6de73fcdb9276a704354d24711aaf47fe2399f81202afd0a33f6eeda1117067fea0cfc9e3eb97e35a3a7fddfa54056c273f 0001-lib-misc-Recognize-Alpine-Linux.patch
+sha512sums="c88abd6c1d177aef6100dc6dfd184f1b0089f2ad1de28698a3a7bccf61817d047afeff0ce6e6303470471258896e9c19fadca3eae0b55fc2ce11f72f892e43ab open-vm-tools-11.1.5.tar.gz
+0ef1b373ae7db0d04d547cd1c4737fc6fa9e6894931090083bec0a0762efea3720b3c03ceec22033136ad3b9bd3305feb05b4ecd55192b7bf7e284ca03464ab5 0001-lib-misc-Recognize-Alpine-Linux.patch
9188161f9bbd6572ee20855e727257b2140b39f1ba19b96879eb9878fb08cbdb7c3a5c9f5f8a4f389090acea6f71ee88fb36c7d4a74c1b8b94c9124db696a7f2 0002-open-vm-tools-Add-disable-werror-configure-option.patch
1dd0cde6ee19aec77ddf803e95b0404e803569a38c7b3d001832b4bbeae95ea15ed32c59f27bffb315130bad0c7a788a7a522df13a5f265f66c4c7c302a1966d 0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch
c647561c72b3ad919502ec4dd0a1ab736e2d479d8437b882791adce5417d8c26163ecffe9e212dab633c513bce6447cdbcb610eecf7dbb0eeeb792db16301de5 0004-Use-configure-test-for-struct-timespec.patch
@@ -271,7 +271,7 @@ c18280eb3fdfe1e3ecc5aa116369908c71917bd4dd49743a9abf78e0096e8d6c7d4323057cf506ef
dbcec24beafbbe94c8ed12482f9d0c643a6bbec256198cdc898513410271a3e2c0b7e35b0997ee0e91b1567f4ed0ecf44740b8c972dd5b2fc4bf21643653153a fix-mount.vmhgfs-symlink.patch
87057ae614d34af2e5581f31b5e028363f316bce4e255b5199438bade96891e798160424aee5804314280773de98ed514fcac7a790bec1f1ae63f3daa1fbef9c change-default-log-dir.patch
6494fe94f332706a130dd12afa18b881f6b6c4e0523570ff866e1678e37af6bd6148c4cf7d957e12f8dc2a51b4f07aa849c4e947911bcbe20d0c81049a2b6974 change-statechange.subr-location.patch
-7413aa360c8b2d74ee92a95b4003f15da78a04fcefda59bc97c9200de5c008ad7fce71751f67d8e7d0301fbde5b262b99a7ea6d80b45623b646a522410207291 tools.conf.patch
+c2fc7efe84b916888296ad63b7a7539f70f4627dd0c9046ff7e61c427e95f86855a5a7619895f42416dfa1e3363869b747ab00fab9545a3b2f9a56f957cf9fa8 tools.conf.patch
0feef314fc178922f86fdb072fc46ae0932aa59085b8263beecc1ad53c9bec04967b0d7fa62ab1051e65685b03bba80ccb075fe01c0ac67591c81f38131176b2 use-libtirpc-nokrb.patch
1248234f19a29b28b6a75886b39d1579d0f94d43925db1f709b7a05907582f6650b78d39155e7da335f27b6da00586b9c3dc3ca7e4cab19dba5c84cfefd1e6cb open-vm-tools.initd
f996fc598d01ea778797674fca2a9f467d7ce7ced50e4e0343b3d53bea65770df488b1a286e42603d91e05ba85610161eb68e3fbaa5cbf1757a8aec81869a677 open-vm-tools.confd
diff --git a/community/open-vm-tools/tools.conf.patch b/community/open-vm-tools/tools.conf.patch
index 0ffbc33a79..1428199b9f 100755
--- a/community/open-vm-tools/tools.conf.patch
+++ b/community/open-vm-tools/tools.conf.patch
@@ -13,7 +13,7 @@ diff --git a/open-vm-tools/tools.conf b/open-vm-tools/tools.conf
index a697e118..4588b0be 100644
--- a/open-vm-tools/tools.conf
+++ b/open-vm-tools/tools.conf
-@@ -67,10 +67,7 @@
+@@ -65,10 +65,7 @@
# Log destinations for various services
# By default, logs go to
@@ -25,7 +25,7 @@ index a697e118..4588b0be 100644
# Possible values for handler are:
# file: logs to a file. Set *.data to the file name
-@@ -82,7 +79,6 @@
+@@ -80,7 +77,6 @@
# std: Logs to stdout for level >= 'message',
# and to stderr for more severe than 'message'.
# syslog: logs to syslog
@@ -33,7 +33,7 @@ index a697e118..4588b0be 100644
# If handler is 'syslog' and the OS is Linux, the facility
# can be set with <domain>.facility. The facility value can be one of
-@@ -99,33 +95,33 @@
+@@ -97,33 +93,33 @@
# Enable tools service logging to a file.
#vmtoolsd.level = debug
#vmtoolsd.handler = file
@@ -73,7 +73,7 @@ index a697e118..4588b0be 100644
# Enable "hgfsServer" request handling logging to the appropriate service file.
#hgfsServer.level = debug
-@@ -160,18 +156,11 @@
+@@ -158,18 +154,11 @@
#poweroff-script=poweroff-vm-default
# Runs when the virtual machine is resumed after it was suspended.
@@ -94,7 +94,7 @@ index a697e118..4588b0be 100644
#suspend-script=suspend-vm-default
[guestinfo]
-@@ -205,8 +194,6 @@
+@@ -203,8 +192,6 @@
# Interface names can use wildcards like '*' and '?'.
# Default for Linux and all non-Windows:
#exclude-nics=veth*,docker*,virbr*
@@ -103,7 +103,7 @@ index a697e118..4588b0be 100644
# max umber of IPv4 routes to gather.
#max-ipv4-routes=100
-@@ -218,25 +205,10 @@
+@@ -216,25 +203,10 @@
#diskinfo-include-reserved=false
@@ -129,7 +129,7 @@ index a697e118..4588b0be 100644
#enable=true
[guestosinfo]
-@@ -249,12 +221,8 @@
+@@ -247,12 +219,8 @@
[vmbackup]
@@ -142,7 +142,7 @@ index a697e118..4588b0be 100644
# See https://kb.vmware.com/s/article/2146204
# can be used to fallback to FS quiescing forcely when there are app quiescing
# problems for specific Windows systems
-@@ -263,7 +231,6 @@
+@@ -261,7 +229,6 @@
#execScripts=true
#scriptArg=
@@ -150,7 +150,7 @@ index a697e118..4588b0be 100644
# The value of excludedFileSystems is a comma-separated list of glob-style
# patterns specifying the file systems to be excluded from quiesced snapshots.
# The patterns may use '*' (wildcard) to represent any string of characters
-@@ -273,12 +240,8 @@
+@@ -271,12 +238,8 @@
#excludedFileSystems=
# Whether to execute scripts on quiescing.
@@ -165,7 +165,7 @@ index a697e118..4588b0be 100644
# "/usr/sbin/pre-freeze-script"
# "/usr/sbin/post-thaw-script"
#
-@@ -298,19 +261,6 @@
+@@ -298,19 +298,6 @@
# Whether to use vgauth for guest op authentication
#useVGAuth=true
@@ -186,5 +186,5 @@ index a697e118..4588b0be 100644
# to disable guest customization
--
-2.24.1
+2.26.1