# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1439477490 -7200
# Node ID 61caa39d7426562882c6bed1c62a46728720f049
# Parent  fbf763bb1fa35f02652ebcf8281bb0ee2ad64433
fix patch binaries

diff -r fbf763bb1fa3 -r 61caa39d7426 Resources/ThirdParty/patch/NOTES.txt
--- a/Resources/ThirdParty/patch/NOTES.txt	Thu Aug 13 15:25:38 2015 +0200
+++ b/Resources/ThirdParty/patch/NOTES.txt	Thu Aug 13 16:51:30 2015 +0200
@@ -1,14 +1,15 @@
 This is a precompiled version of the "patch" standard tool for Windows
-(version 2.5.9). It was cross-compiled as follows under Linux thanks
+(version 2.6.1). It was cross-compiled as follows under Linux thanks
 to MinGW32:
 
-# wget ftp://ftp.gnu.org/gnu/patch/patch-2.5.9.tar.gz
-# tar xvfz patch-2.5.9.tar.gz
-# cd patch-2.5.9
+# wget ftp://ftp.gnu.org/gnu/patch/patch-2.6.1.tar.gz
+# tar xvfz patch-2.6.1.tar.gz
+# patch -p0 < fix-sources.patch 
+# cd patch-2.6.1
 # ./configure --host=i586-mingw32msvc
 # make
 # cd ..
-# cp patch-2.5.9/patch.exe .
+# cp patch-2.6.1/src/patch.exe .
 # i586-mingw32msvc-strip ./patch.exe 
 
 
diff -r fbf763bb1fa3 -r 61caa39d7426 Resources/ThirdParty/patch/fix-sources.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/ThirdParty/patch/fix-sources.patch	Thu Aug 13 16:51:30 2015 +0200
@@ -0,0 +1,13 @@
+--- patch-2.6.1.orig/src/patch.c	2009-12-30 13:56:30.000000000 +0100
++++ patch-2.6.1/src/patch.c	2015-08-13 16:46:23.886129878 +0200
+@@ -415,8 +415,10 @@
+ 				    quotearg (outname));
+ 			  if (geteuid () != instat.st_gid)
+ 			    {
++#if !defined(_WIN32)
+ 			      /* Fails if we are not in group instat.st_gid.  */
+ 			      chown (outname, -1, instat.st_gid);
++#endif
+ 			    }
+ 			  /* FIXME: There may be other attributes to preserve.  */
+ 			}
diff -r fbf763bb1fa3 -r 61caa39d7426 Resources/ThirdParty/patch/patch.exe
Binary file Resources/ThirdParty/patch/patch.exe has changed
diff -r fbf763bb1fa3 -r 61caa39d7426 Resources/ThirdParty/patch/patch.exe.manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/ThirdParty/patch/patch.exe.manifest	Thu Aug 13 16:51:30 2015 +0200
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="7.95.0.0"
+     processorArchitecture="X86"
+     name="patch.exe"
+     type="win32"/>
+
+  <!-- Identify the application security requirements. -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"/>
+        </requestedPrivileges>
+       </security>
+  </trustInfo>
+</assembly>
+