[gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/

[Mike Gilbert]

commit:     37d1cd04fe9a69eafa7b79ae0aa76c9f18b2cad9
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 15 21:22:12 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 21:22:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37d1cd04

app-emulation/open-vm-tools: remove old patches

Package-Manager: Portage-2.3.59_p2, Repoman-2.3.12_p67
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../open-vm-tools/files/10.1.0-vgauth.patch        | 25 ------------
 .../open-vm-tools/files/10.2.5-libtirpc.patch      | 45 ----------------------
 2 files changed, 70 deletions(-)

diff --git a/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch b/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch
deleted file mode 100644
index bc91b1b141a..00000000000
--- a/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 488258effa60e293a70000338422c33ce5c73f9b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@g.o>
-Date: Fri, 25 Nov 2016 13:59:34 -0500
-Subject: [PATCH] build: Always link VGAuthService using CXX
-
----
- open-vm-tools/vgauth/service/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/open-vm-tools/vgauth/service/Makefile.am b/open-vm-tools/vgauth/service/Makefile.am
-index 8c51d9f2..8f99dad1 100644
---- a/open-vm-tools/vgauth/service/Makefile.am
-+++ b/open-vm-tools/vgauth/service/Makefile.am
-@@ -95,7 +95,7 @@ if HAVE_ICU
-                             $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-                             $(LDFLAGS) -o $@
- else
--   VGAuthService_LINK = $(LINK)
-+   VGAuthService_LINK = $(CXXLINK)
- endif
- 
- # Message catalogs.
--- 
-2.11.0.rc2
-

diff --git a/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch b/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
deleted file mode 100644
index a9dfb42b2fc..00000000000
--- a/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 75505fed193fc3779560b57c1b0d6d4209b05bf9 Mon Sep 17 00:00:00 2001
-From: Xiami <i@×××××××.com>
-Date: Thu, 14 Jun 2018 16:23:00 +0800
-Subject: [PATCH] lib/dynxdr: for libtirpc
-
-glibc-2.26 do not provide RPC support by default.
-This workaround only works for Gentoo as ebuild forces libtirpc.
----
- open-vm-tools/lib/dynxdr/dynxdr.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/open-vm-tools/lib/dynxdr/dynxdr.c b/open-vm-tools/lib/dynxdr/dynxdr.c
-index 95fdc7e2..d3182733 100644
---- a/open-vm-tools/lib/dynxdr/dynxdr.c
-+++ b/open-vm-tools/lib/dynxdr/dynxdr.c
-@@ -55,7 +55,7 @@ typedef struct DynXdrData {
-  * Mac OS X, FreeBSD and Solaris don't take a const parameter to the
-  * "x_getpostn" function.
-  */
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(_TIRPC_XDR_H)
- #  define DYNXDR_GETPOS_CONST
- #else
- #  define DYNXDR_GETPOS_CONST const
-@@ -172,7 +172,7 @@ DynXdrSetPos(XDR *xdrs, // IN
- }
- 
- 
--#if defined(__GLIBC__) || (defined(sun) && (defined(_LP64) || defined(_KERNEL)))
-+#if (defined(__GLIBC__) && !defined(_TIRPC_XDR_H)) || (defined(sun) && (defined(_LP64) || defined(_KERNEL)))
- /*
-  *-----------------------------------------------------------------------------
-  *
-@@ -322,7 +322,7 @@ DynXdr_Create(XDR *in)  // IN
-       DynXdrSetPos,     /* x_setpostn */
-       DynXdrInline,     /* x_inline */
-       NULL,             /* x_destroy */
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) && !defined(_TIRPC_XDR_H)
-       NULL,             /* x_getint32 */
-       DynXdrPutInt32,   /* x_putint32 */
- #elif defined(__APPLE__)
--- 
-2.16.4
-