[arch-commits] Commit in xorg-server/trunk (PKGBUILD xwrap-suid-race.patch)

[Jan de Groot]

    Date: Friday, January 5, 2018 @ 22:36:51
  Author: jgc
Revision: 314109

Fix race condition when installing suid Xorg.wrap (FS#56893)

Added:
  xorg-server/trunk/xwrap-suid-race.patch
Modified:
  xorg-server/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   10 ++++++++--
 xwrap-suid-race.patch |   15 +++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-05 22:24:04 UTC (rev 314108)
+++ PKGBUILD	2018-01-05 22:36:51 UTC (rev 314109)
@@ -22,7 +22,8 @@
         xserver-autobind-hotplug.patch
         xvfb-run
         xvfb-run.1
-        revert-udev-changes.diff)
+        revert-udev-changes.diff
+        xwrap-suid-race.patch)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
@@ -33,7 +34,8 @@
             'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            'ce9b235c053ac85a9da86fba3b60fcfc48d36a8bd789b94ed79d5d571bc7b0aa')
+            'ce9b235c053ac85a9da86fba3b60fcfc48d36a8bd789b94ed79d5d571bc7b0aa'
+            'bce0e105386d75239f473b867d8ea6bc60e5302d87e03fdc720f48f43f5454f1')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
@@ -47,6 +49,10 @@
   # https://bugs.freedesktop.org/show_bug.cgi?id=104382
   patch -Rp1 -i ../revert-udev-changes.diff
 
+  # https://bugs.archlinux.org/task/56893
+  # Fixes Makefile race condition when installing Xorg.wrap
+  patch -Np1 -i ../xwrap-suid-race.patch
+
   autoreconf -vfi
 }
 

Added: xwrap-suid-race.patch
===================================================================
--- xwrap-suid-race.patch	                        (rev 0)
+++ xwrap-suid-race.patch	2018-01-05 22:36:51 UTC (rev 314109)
@@ -0,0 +1,15 @@
+diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
+index b876b79ab..458720052 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
+