Rebase against e1af2ae201c9853133ef3af1dafe15fe992fed92.

patches/ws2_32-af_unix/0001-ws2_32-Add-afunix.h-header.patch

@@ -1,72 +0,0 @@
-From 54fc933329986784bb497f24a9ced2f82e9016dd Mon Sep 17 00:00:00 2001
-From: Ally Sommers <dropbear.sh@gmail.com>
-Date: Wed, 10 May 2023 09:01:26 -0700
-Subject: [PATCH] ws2_32: Add afunix.h header.
-
-This header is needed for support of AF_UNIX sockets.
----
- include/Makefile.in |  1 +
- include/afunix.h    | 38 ++++++++++++++++++++++++++++++++++++++
- 2 files changed, 39 insertions(+)
- create mode 100644 include/afunix.h
-
-diff --git a/include/Makefile.in b/include/Makefile.in
-index 8d0139d8d21..8eea8049d3e 100644
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -12,6 +12,7 @@ SOURCES = \
- 	adshlp.h \
- 	advpub.h \
- 	af_irda.h \
-+	afunix.h \
- 	amaudio.h \
- 	amsi.idl \
- 	amstream.idl \
-diff --git a/include/afunix.h b/include/afunix.h
-new file mode 100644
-index 00000000000..8118dda271b
---- /dev/null
-+++ b/include/afunix.h
-@@ -0,0 +1,38 @@
-+/*
-+ * Copyright 2023 Ally Sommers
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#ifndef _WS2AFUNIX_
-+#define _WS2AFUNIX_
-+
-+#include "windef.h"
-+#include "ws2def.h"
-+
-+#ifdef USE_WS_PREFIX
-+# define WS(x)    WS_##x
-+#else
-+# define WS(x)    x
-+#endif
-+
-+#define UNIX_PATH_MAX 108
-+
-+typedef struct WS(sockaddr_un) {
-+    USHORT sun_family;
-+    char sun_path[UNIX_PATH_MAX];
-+} SOCKADDR_UN, *PSOCKADDR_UN;
-+
-+#endif /* _WS2AFUNIX_ */
-\ No newline at end of file
--- 
-2.47.2
-

staging/upstream-commit

@@ -1 +1 @@
-9ecae7b571f87dbef641601e66793dbcd5b40530
+e1af2ae201c9853133ef3af1dafe15fe992fed92