snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

open-vm-tools: update to 11.3.0. 

1001-pr383-rename-poll-vm_poll.patch failed to rename a header file
after 2fd8d4df94 ("srcpkgs/o*: convert patches to -Np1")
This commit is contained in:
Piraty 2021-06-22 14:22:50 +02:00
parent 6618486f26
commit 911e4cd289
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
srcpkgs/open-vm-tools/patches/1001-pr383-rename-poll-vm_poll.patch
View File

@ -46,7 +46,7 @@ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
6 files changed, 6 insertions(+), 6 deletions(-)
rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (100%)
diff --git lib/asyncsocket/asyncsocket.c lib/asyncsocket/asyncsocket.c
diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c
index 102638cc9..01181a957 100644
--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c
+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c
@ -69,7 +69,7 @@ index 102638cc9..01181a957 100644
#include "log.h"
#include "err.h"
#include "hostinfo.h"
diff --git lib/hgfsServer/hgfsServer.c lib/hgfsServer/hgfsServer.c
diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c
index 462245511..fc6912860 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@ -82,7 +82,7 @@ index 462245511..fc6912860 100644
#include "mutexRankLib.h"
#include "vm_basic_asm.h"
#include "unicodeOperations.h"
diff --git lib/include/asyncsocket.h lib/include/asyncsocket.h
diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h
index 95a5e4643..a4b4e5aae 100644
--- a/open-vm-tools/lib/include/asyncsocket.h
+++ b/open-vm-tools/lib/include/asyncsocket.h
@ -95,7 +95,7 @@ index 95a5e4643..a4b4e5aae 100644
struct IVmdbPoll;
typedef struct AsyncSocketPollParams {
int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */
diff --git lib/include/pollImpl.h lib/include/pollImpl.h
diff --git a/open-vm-tools/lib/include/pollImpl.h b/open-vm-tools/lib/include/pollImpl.h
index 46442e556..8bc669970 100644
--- a/open-vm-tools/lib/include/pollImpl.h
+++ b/open-vm-tools/lib/include/pollImpl.h
@ -108,11 +108,11 @@ index 46442e556..8bc669970 100644
#include "vm_basic_asm.h"
#if defined(__cplusplus)
diff --git open-vm-tools/lib/include/poll.h open-vm-tools/lib/include/vm_poll.h
diff --git a/open-vm-tools/lib/include/poll.h b/open-vm-tools/lib/include/vm_poll.h
similarity index 100%
rename from open-vm-tools/lib/include/poll.h
rename to open-vm-tools/lib/include/vm_poll.h
diff --git lib/rpcIn/rpcin.c lib/rpcIn/rpcin.c
diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c
index 47a3380e4..660382c62 100644
--- a/open-vm-tools/lib/rpcIn/rpcin.c
+++ b/open-vm-tools/lib/rpcIn/rpcin.c

8
srcpkgs/open-vm-tools/template
View File

@ -1,7 +1,7 @@
# Template file for 'open-vm-tools'
pkgname=open-vm-tools
version=11.2.5
revision=2
version=11.3.0
revision=1
archs="x86_64* i686* aarch64*"
wrksrc="open-vm-tools-stable-${version}"
build_wrksrc="open-vm-tools"
@ -19,12 +19,12 @@ license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/vmware/open-vm-tools"
changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog"
distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
checksum=7c31bb8ef70a0e32b81cde6550cae390a53108e4abb28bb539b0ab5b9e4fc188
checksum=588f1b6252c36bc55581aa3451a47880290f38ef46aad493710bcf4ce3c7635e
build_options="pam x11"
build_options_default="pam x11"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
if [ "$XBPS_TARGET_LIBC" != "glibc" ]; then
configure_args+=" --disable-glibc-check"
fi