-
-
Save anonymous/34e34a8a6a77342c5efca35336e015d7 to your computer and use it in GitHub Desktop.
Xorg server race condition patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- xorg-server_orig/PKGBUILD 2017-12-28 10:54:42.000000000 +0100 | |
+++ xorg-server_built/PKGBUILD 2017-12-30 07:51:56.126549802 +0100 | |
@@ -22,7 +22,8 @@ | |
xserver-autobind-hotplug.patch | |
xvfb-run | |
xvfb-run.1 | |
- revert-udev-changes.diff) | |
+ revert-udev-changes.diff | |
+ make-install-race.patch) | |
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' | |
'C383B778255613DFDB409D91DB221A6900000011' | |
'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3' | |
@@ -33,7 +34,8 @@ | |
'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57' | |
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' | |
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' | |
- 'ce9b235c053ac85a9da86fba3b60fcfc48d36a8bd789b94ed79d5d571bc7b0aa') | |
+ 'ce9b235c053ac85a9da86fba3b60fcfc48d36a8bd789b94ed79d5d571bc7b0aa' | |
+ '6a5cbcf16f199f90428a6a2cecf05a3669f4580011cf19e90b2870d44f7e7feb') | |
prepare() { | |
cd "${pkgbase}-${pkgver}" | |
@@ -46,6 +48,8 @@ | |
# https://bugs.archlinux.org/task/56804 | |
# https://bugs.freedesktop.org/show_bug.cgi?id=104382 | |
patch -Rp1 -i ../revert-udev-changes.diff | |
+ | |
+ patch -Np1 -i ../make-install-race.patch | |
autoreconf -vfi | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment