- rediff patches

diff --git a/iopl.patch b/iopl.patch
index bd6cfe7b43a067ab92d41ba1706433c0d3c36917..1de0b3b187080fb2e11cb9d45c33e298641c03a4 100644 (file)
--- a/iopl.patch
+++ b/iopl.patch
@@ -1,11 +1,11 @@
---- open-vm-tools-stable-11.0.5/open-vm-tools/lib/misc/hostinfoPosix.c.orig    2020-01-15 23:24:15.000000000 +0100
-+++ open-vm-tools-stable-11.0.5/open-vm-tools/lib/misc/hostinfoPosix.c 2020-05-11 11:30:05.938853674 +0200
-@@ -2498,7 +2498,7 @@
+--- open-vm-tools-stable-11.3.0/open-vm-tools/lib/misc/hostinfoPosix.c~        2021-06-19 04:15:09.000000000 +0000
++++ open-vm-tools-stable-11.3.0/open-vm-tools/lib/misc/hostinfoPosix.c 2021-06-28 11:13:28.014418113 +0000
+@@ -2878,7 +2878,7 @@
+       Id_SetEUid(0);
        err = iopl(0);
- #endif
        Id_SetEUid(euid);
 -      VERIFY(err == 0);
 +      VERIFY(err == 0 || (err == -1 && errno == ENOSYS));
     }
  #endif
- }
+ #endif

diff --git a/open-vm-tools-dnd.patch b/open-vm-tools-dnd.patch
index 0576abca6d2d797fe56e849ba0f89b19573ff48e..ec9d32ab11d52381b5e11293ce6ff68c5e726562 100644 (file)
--- a/open-vm-tools-dnd.patch
+++ b/open-vm-tools-dnd.patch
@@ -1,11 +1,11 @@
---- open-vm-tools-stable-10.0.7.orig/open-vm-tools/services/plugins/dndcp/Makefile.am  2016-10-27 23:47:54.876016950 +0200
-+++ open-vm-tools-stable-10.0.7/open-vm-tools/services/plugins/dndcp/Makefile.am       2016-10-28 00:00:07.528761831 +0200
-@@ -18,7 +18,7 @@
+--- open-vm-tools-stable-11.3.0/open-vm-tools/services/plugins/dndcp/Makefile.am~      2021-06-19 04:15:09.000000000 +0000
++++ open-vm-tools-stable-11.3.0/open-vm-tools/services/plugins/dndcp/Makefile.am       2021-06-28 11:09:39.454594438 +0000
+@@ -20,7 +20,7 @@
  plugindir = @VMUSR_PLUGIN_INSTALLDIR@
  plugin_LTLIBRARIES = libdndcp.la
  
 -libdndcp_la_CPPFLAGS =
 +libdndcp_la_CPPFLAGS = -Dvmblock_fuse
  libdndcp_la_CPPFLAGS += @GTK_CPPFLAGS@
- libdndcp_la_CPPFLAGS += @GTKMM_CPPFLAGS@
  libdndcp_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
+ libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dnd