[patch] Revert to paxctl/setfattr logic of Emacs 24.5.

emacs-25.1-paxctl.patch (text/plain), 3.44 KB, created by Ulrich Müller on 2017-02-07 12:00:09 UTC

Revert to paxctl/setfattr logic of Emacs 24.5.
This reverts upstream commit 734fb3ac6c3e5708ed05b6c5b1d8af92838ee3f5.
https://bugs.gentoo.org/show_bug.cgi?id=607990

--- emacs-25.1-orig/configure.ac
+++ emacs-25.1/configure.ac
@@ -1140,9 +1140,16 @@
 test $with_compress_install != yes && test -n "$GZIP_PROG" && \
    GZIP_PROG=" # $GZIP_PROG # (disabled by configure --without-compress-install)"
 
-PAXCTL_dumped=
-PAXCTL_notdumped=
 if test $opsys = gnu-linux; then
+  AC_PATH_PROG(PAXCTL, paxctl,,
+    [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
+  if test "X$PAXCTL" != X; then
+    AC_MSG_CHECKING([whether binaries have a PT_PAX_FLAGS header])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+      [if $PAXCTL -v conftest$EXEEXT >/dev/null 2>&1; then AC_MSG_RESULT(yes)
+      else AC_MSG_RESULT(no); PAXCTL=""; fi])
+  fi
+
   if test "${SETFATTR+set}" != set; then
     AC_CACHE_CHECK([for setfattr],
       [emacs_cv_prog_setfattr],
@@ -1153,7 +1160,6 @@
 	 emacs_cv_prog_setfattr=no
        fi])
     if test "$emacs_cv_prog_setfattr" = yes; then
-      PAXCTL_notdumped='$(SETFATTR) -n user.pax.flags -v er'
       SETFATTR=setfattr
     else
       SETFATTR=
@@ -1162,32 +1168,6 @@
     AC_SUBST([SETFATTR])
   fi
 fi
-case $opsys,$PAXCTL_notdumped in
-  gnu-linux, | netbsd,)
-    AC_PATH_PROG([PAXCTL], [paxctl], [],
-      [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
-    if test -n "$PAXCTL"; then
-      if test "$opsys" = netbsd; then
-	PAXCTL_dumped='$(PAXCTL) +a'
-	PAXCTL_notdumped=$PAXCTL_dumped
-      else
-	AC_MSG_CHECKING([whether binaries have a PT_PAX_FLAGS header])
-	AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-	  [if $PAXCTL -v conftest$EXEEXT >/dev/null 2>&1; then
-	     AC_MSG_RESULT([yes])
-	   else
-	     AC_MSG_RESULT([no])
-	     PAXCTL=
-	   fi])
-	if test -n "$PAXCTL"; then
-	  PAXCTL_dumped='$(PAXCTL) -zex'
-	  PAXCTL_notdumped='$(PAXCTL) -r'
-	fi
-      fi
-    fi;;
-esac
-AC_SUBST([PAXCTL_dumped])
-AC_SUBST([PAXCTL_notdumped])
 
 ## Need makeinfo >= 4.7 (?) to build the manuals.
 if test "$MAKEINFO" != "no"; then
--- emacs-25.1-orig/src/Makefile.in
+++ emacs-25.1/src/Makefile.in
@@ -114,9 +114,8 @@
 ## around this, newer ones setfattr.  See Bug#11398 and Bug#16343.
 PAXCTL = @PAXCTL@
 SETFATTR = @SETFATTR@
-## Commands to set PaX flags on dumped and not-dumped instances of Emacs.
-PAXCTL_dumped = @PAXCTL_dumped@
-PAXCTL_notdumped = @PAXCTL_notdumped@
+PAXCTL_if_present = $(or $(PAXCTL),: paxctl)
+SETFATTR_if_present = $(or $(SETFATTR),: setfattr)
 
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM=@LIBS_SYSTEM@
@@ -533,9 +532,7 @@
 	ln -f temacs$(EXEEXT) $@
 else
 	LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
-  ifneq ($(PAXCTL_dumped),)
-	$(PAXCTL_dumped) $@
-  endif
+	$(PAXCTL_if_present) -zex $@
 	ln -f $@ bootstrap-emacs$(EXEEXT)
 endif
 
@@ -597,9 +594,8 @@
 	  -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES)
 	$(MKDIR_P) $(etc)
 ifneq ($(CANNOT_DUMP),yes)
-  ifneq ($(PAXCTL_notdumped),)
-	$(PAXCTL_notdumped) $@
-  endif
+	$(PAXCTL_if_present) -r $@
+	$(SETFATTR_if_present) -n user.pax.flags -v er $@
 endif
 
 ## The following oldxmenu-related rules are only (possibly) used if
@@ -738,9 +734,7 @@
 	ln -f temacs$(EXEEXT) $@
 else
 	$(RUN_TEMACS) --batch --load loadup bootstrap
-  ifneq ($(PAXCTL_dumped),)
-	$(PAXCTL_dumped) emacs$(EXEEXT)
-  endif
+	$(PAXCTL_if_present) -zex emacs$(EXEEXT)
 	mv -f emacs$(EXEEXT) $@
 endif
 	@: Compile some files earlier to speed up further compilation.