From: Ulrich Müller <ulm@gentoo.org>
Date: Sun, 16 Nov 2014 11:37:54 +0000 (+0100)
Subject: Use consistent paxctl and setfattr flags for temacs.
X-Git-Tag: emacs-24.4.90~175
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ed54567c7cf958bb5658f4b6da1b0b7decc1d31a;p=emacs.git

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 63ead8d9d2d..b17f719ce6d 100644
--- 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 70e31b50946..99f9981dfe5 100644
--- 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.