Use consistent paxctl and setfattr flags for temacs.

* Makefile.in (temacs$(EXEEXT)): Use consistent flag settings
for paxctl and setfattr. Fixes temacs startup failure with
grsecurity/PaX enabled Linux kernel (bug#19067).

diff --git a/src/ChangeLog b/src/ChangeLog
index 63ead8d9d2d5a948236cd3f90f18adaf130cfe06..b17f719ce6dc8140029e77df695b1057e43c0bfc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-25  Ulrich Müller  <ulm@gentoo.org>
+
+       * Makefile.in (temacs$(EXEEXT)): Use consistent flag settings
+       for paxctl and setfattr. Fixes temacs startup failure with
+       grsecurity/PaX enabled Linux kernel (bug#19067).
+
 2014-11-17  Oscar Fuentes  <ofv@wanadoo.es>
 
        * src/w32.c: Use MINGW_W64 instead of _W64.

diff --git a/src/Makefile.in b/src/Makefile.in
index 70e31b50946fb71c10e923a75d74c4568542c207..99f9981dfe5d589d67d93c60a648e779d309ee84 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -497,7 +497,7 @@ temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \
        test "$(CANNOT_DUMP)" = "yes" || \
          test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)
        test "$(CANNOT_DUMP)" = "yes" || test -z "$(SETFATTR)" || \
-         $(SETFATTR) -n user.pax.flags -v r $@
+         $(SETFATTR) -n user.pax.flags -v er $@
 
 ## The following oldxmenu-related rules are only (possibly) used if
 ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them.