Rebase against b5b77ed6acad6a20bd4c5bfc98cfce178eef1d0c.

patches/configure-dwarf4/0001-configure.ac-let-dwarf4-be-Wine-s-default-debug-form.patch

@@ -1,36 +0,0 @@
-From 5d62ab1fd576aa9e11a387a6b2a1b250aecc1803 Mon Sep 17 00:00:00 2001
-From: Eric Pouech <eric.pouech@gmail.com>
-Date: Fri, 5 Nov 2021 07:56:04 +1100
-Subject: [PATCH] configure.ac: let dwarf4 be Wine's default debug format
-
----
- configure.ac | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 57bd9a6f9ec..0196af56783 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1051,8 +1051,7 @@ then
-         if test "x$ac_debug_format_seen" = x
-         then
-           case $CROSSDEBUG in
--            *dwarf)  WINE_TRY_CROSSCFLAGS([-gdwarf-2])
--                     WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;;
-+            *dwarf)  WINE_TRY_CROSSCFLAGS([-gdwarf-4]) ;;
-             pdb)     WINE_TRY_CROSSCFLAGS([-gcodeview]) ;;
-           esac
-         fi
-@@ -1865,8 +1864,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
-   done
-   if test "x$ac_debug_format_seen" = xdefault
-   then
--    WINE_TRY_CFLAGS([-gdwarf-2])
--    WINE_TRY_CFLAGS([-gstrict-dwarf])
-+    WINE_TRY_CFLAGS([-gdwarf-4])
-   fi
- 
-   dnl Disable gcc builtins except for Mingw
--- 
-2.33.0
-

patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch

@@ -1,4 +1,4 @@
-From d6b29a6153e786ff7a79bdbb7c33977e19c6e267 Mon Sep 17 00:00:00 2001
+From 2cee55344dd3bef2ed548d2dff275612021e8641 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 10:44:49 -0500
 Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open().
@@ -7,15 +7,15 @@ We use ppoll() instead of poll() for the better time granularity.
 
 Although perhaps we shouldn't since the server doesn't do this.
 ---
- configure.ac        | 12 ++++++++
- include/config.h.in |  9 ++++++
- 3 files changed, 89 insertions(+)
+ configure.ac        | 12 ++++++++++++
+ include/config.h.in |  9 +++++++++
+ 2 files changed, 21 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 718ab1ca50e..d5f82ad2af4 100644
+index 4d3c2fab566..2b26e892b08 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -496,6 +496,7 @@ AC_CHECK_HEADERS(\
+@@ -481,6 +481,7 @@ AC_CHECK_HEADERS(\
  	sys/cdio.h \
  	sys/epoll.h \
  	sys/event.h \
@@ -23,15 +23,15 @@ index 718ab1ca50e..d5f82ad2af4 100644
  	sys/filio.h \
  	sys/ioctl.h \
  	sys/ipc.h \
-@@ -2158,6 +2159,7 @@ AC_CHECK_FUNCS(\
+@@ -1959,6 +1960,7 @@ AC_CHECK_FUNCS(\
  	port_create \
  	posix_fadvise \
  	posix_fallocate \
 +	ppoll \
  	prctl \
  	proc_pidinfo \
- 	renameat \
-@@ -2199,6 +2201,16 @@ case $host_os in
+ 	sched_yield \
+@@ -2001,6 +2003,16 @@ case $host_os in
      ;;
  esac
  
@@ -49,10 +49,10 @@ index 718ab1ca50e..d5f82ad2af4 100644
  if test "x$with_ldap" != "xno"
  then
 diff --git a/include/config.h.in b/include/config.h.in
-index e975ca8a55d..a19789dad8c 100644
+index 0fe50e8ce7c..48dae80850d 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -474,6 +474,9 @@
+@@ -398,6 +398,9 @@
  /* Define to 1 if you have the `posix_fallocate' function. */
  #undef HAVE_POSIX_FALLOCATE
  
@@ -62,7 +62,7 @@ index e975ca8a55d..a19789dad8c 100644
  /* Define to 1 if you have the `prctl' function. */
  #undef HAVE_PRCTL
  
-@@ -546,6 +549,9 @@
+@@ -473,6 +476,9 @@
  /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
  #undef HAVE_SG_IO_HDR_T_INTERFACE_ID
  
@@ -72,7 +72,7 @@ index e975ca8a55d..a19789dad8c 100644
  /* Define if sigaddset is supported */
  #undef HAVE_SIGADDSET
  
-@@ -695,6 +701,9 @@
+@@ -625,6 +631,9 @@
  /* Define to 1 if you have the <sys/epoll.h> header file. */
  #undef HAVE_SYS_EPOLL_H
  

patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch

@@ -1,4 +1,4 @@
-From d823f033345ad18f5deea7530f1b3ad359616eb8 Mon Sep 17 00:00:00 2001
+From 763a8ab7171aebda0db3024e956aaa365b4446b4 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 16 Jan 2014 20:56:49 -0700
 Subject: [PATCH] ntdll: Add support for junction point creation.
@@ -14,13 +14,13 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  create mode 100644 include/ntifs.h
 
 diff --git a/configure.ac b/configure.ac
-index f030099941a..dbabb4d5a78 100644
+index 97555befb4c..14fb5679a82 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2060,6 +2060,8 @@ AC_CHECK_FUNCS(\
- 	posix_fallocate \
+@@ -1962,6 +1962,8 @@ AC_CHECK_FUNCS(\
  	prctl \
  	proc_pidinfo \
+ 	sched_yield \
 +	renameat \
 +	renameat2 \
  	setproctitle \
@@ -152,7 +152,7 @@ index 46037546e6e..7a01e947e13 100644
      test_mailslot_name();
  }
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index eb5c6846a10..9d371f57969 100644
+index 689b943a5b1..dd7ab59de67 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
 @@ -35,6 +35,7 @@
@@ -357,10 +357,10 @@ index eb5c6846a10..9d371f57969 100644
          TRACE("FSCTL_SET_SPARSE: Ignoring request\n");
          io->Information = 0;
 diff --git a/include/Makefile.in b/include/Makefile.in
-index a9a478e5433..3d5c88c041e 100644
+index 756e25dcc82..5a0929633f3 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -548,6 +548,7 @@ SOURCES = \
+@@ -549,6 +549,7 @@ SOURCES = \
  	ntdef.h \
  	ntdsapi.h \
  	ntgdi.h \

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "986254d6c17ee1e5fb3aed6effcf2766bf1e787e"
+	echo "b5b77ed6acad6a20bd4c5bfc98cfce178eef1d0c"
 }
 
 # Show version information
@@ -91,7 +91,6 @@ patch_enable_all ()
 	enable_comctl32_rebar_capture="$1"
 	enable_comctl32_version_6="$1"
 	enable_comdlg32_lpstrFileTitle="$1"
-	enable_configure_dwarf4="$1"
 	enable_crypt32_CMS_Certificates="$1"
 	enable_cryptext_CryptExtOpenCER="$1"
 	enable_d3drm_IDirect3D3_support="$1"
@@ -303,9 +302,6 @@ patch_enable ()
 		comdlg32-lpstrFileTitle)
 			enable_comdlg32_lpstrFileTitle="$2"
 			;;
-		configure-dwarf4)
-			enable_configure_dwarf4="$2"
-			;;
 		crypt32-CMS_Certificates)
 			enable_crypt32_CMS_Certificates="$2"
 			;;
@@ -1501,15 +1497,6 @@ if test "$enable_comdlg32_lpstrFileTitle" -eq 1; then
 	patch_apply comdlg32-lpstrFileTitle/0001-comdlg32-Postpone-setting-ofn-lpstrFileTitle-to-work.patch
 fi
 
-# Patchset configure-dwarf4
-# |
-# | Modified files:
-# |   *	configure.ac
-# |
-if test "$enable_configure_dwarf4" -eq 1; then
-	patch_apply configure-dwarf4/0001-configure.ac-let-dwarf4-be-Wine-s-default-debug-form.patch
-fi
-
 # Patchset crypt32-CMS_Certificates
 # |
 # | This patchset fixes the following Wine bugs:

staging/upstream-commit

@@ -1 +1 @@
-986254d6c17ee1e5fb3aed6effcf2766bf1e787e
+b5b77ed6acad6a20bd4c5bfc98cfce178eef1d0c