Rebase against 9f6e39e8b945466180080d470e1272ba4f807b3a.

patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-fd_-get.patch

@@ -1,4 +1,4 @@
-From 80247bc4566977f67a1851f46facba226fbd93df Mon Sep 17 00:00:00 2001
+From 88941e9247f9311f978c60c98f93a149aa9bf0e2 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Tue, 19 Aug 2014 22:10:49 -0600
 Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
  2 files changed, 50 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index f60cd593549..cca97ee403b 100644
+index f0762e107f3..714af889bc6 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -89,6 +89,7 @@ AC_ARG_WITH(usb,       AS_HELP_STRING([--without-usb],[do not use the libusb lib
+@@ -90,6 +90,7 @@ AC_ARG_WITH(usb,       AS_HELP_STRING([--without-usb],[do not use the libusb lib
  AC_ARG_WITH(v4l2,      AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)]))
  AC_ARG_WITH(vkd3d,     AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)]))
  AC_ARG_WITH(vulkan,    AS_HELP_STRING([--without-vulkan],[do not use Vulkan]))
@@ -21,7 +21,7 @@ index f60cd593549..cca97ee403b 100644
  AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
              [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
  AC_ARG_WITH(xcursor,   AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
-@@ -698,6 +699,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
+@@ -697,6 +698,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
  #include <sys/socket.h>
  #endif])
  
@@ -38,12 +38,12 @@ index f60cd593549..cca97ee403b 100644
 +
  dnl **** Check for working dll ****
  
- AC_SUBST(DLLFLAGS,"-D_REENTRANT")
+ AC_SUBST(DLLFLAGS,"")
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index 03e92a5c59e..da8f65af7b3 100644
+index e6f813966a5..9addefe92f4 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
-@@ -105,6 +105,9 @@
+@@ -108,6 +108,9 @@
  #ifdef HAVE_SYS_STATFS_H
  #include <sys/statfs.h>
  #endif
@@ -53,7 +53,7 @@ index 03e92a5c59e..da8f65af7b3 100644
  #include <time.h>
  #ifdef HAVE_UNISTD_H
  # include <unistd.h>
-@@ -369,6 +372,20 @@ NTSTATUS errno_to_status( int err )
+@@ -367,6 +370,20 @@ NTSTATUS errno_to_status( int err )
      }
  }
  
@@ -118,5 +118,5 @@ index 03e92a5c59e..da8f65af7b3 100644
  }
  
 -- 
-2.28.0
+2.33.0
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "e482605548b124a7863f6b09395b3a850ae741cc"
+	echo "9f6e39e8b945466180080d470e1272ba4f807b3a"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-e482605548b124a7863f6b09395b3a850ae741cc
+9f6e39e8b945466180080d470e1272ba4f807b3a