extra/xorg-server: mitigate race condition in "make install"

2 files changed, 23 insertions, 0 deletions

diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
new file mode 100644
index 00000000..15429901
--- /dev/null
+++ b/extra/xorg-server/PKGBUILD
@@ -0,0 +1,8 @@
+source+=('make-install-race.patch')
+sha256sums+=('6a5cbcf16f199f90428a6a2cecf05a3669f4580011cf19e90b2870d44f7e7feb')
+eval "$(
+  declare -f prepare | \
+    sed '
+      3 a patch -Np1 -i ../make-install-race.patch
+    '
+)"
diff --git a/extra/xorg-server/make-install-race.patch b/extra/xorg-server/make-install-race.patch
new file mode 100644
index 00000000..2c27c214
--- /dev/null
+++ b/extra/xorg-server/make-install-race.patch
@@ -0,0 +1,15 @@
+diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
+index b876b79..4587200 100644
+--- a/hw/xfree86/Makefile.am
++++ b/hw/xfree86/Makefile.am
+@@ -84,8 +84,8 @@ Xorg_DEPENDENCIES = $(LOCAL_LIBS)
+ Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
+ 
+ if SUID_WRAPPER
+-wrapdir = $(SUID_WRAPPER_DIR)
+-wrap_PROGRAMS = Xorg.wrap
++wrapexecdir = $(SUID_WRAPPER_DIR)
++wrapexec_PROGRAMS = Xorg.wrap
+ Xorg_wrap_SOURCES = xorg-wrapper.c
+ endif
+