diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-01-25 15:48:36 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-01-25 15:48:36 +0100 |
| commit | f7e6317411b1453aa4876c69985c7a21e9186ced (patch) | |
| tree | 0edebda64e1849669a60b1c80adc44f0a2eafee5 | |
| parent | Fix failure in unexec with hardened kernel, bug 456970. (diff) | |
| download | emacs-patches-emacs-23.4-patches-10.tar.gz emacs-patches-emacs-23.4-patches-10.tar.bz2 emacs-patches-emacs-23.4-patches-10.zip | |
Update PaX/xattr patch, bug 497498.emacs-24.3-patches-5emacs-23.4-patches-10
| -rw-r--r-- | emacs/23.4/15_all_pax-xattr.patch | 3 | ||||
| -rw-r--r-- | emacs/24.3/04_all_pax-xattr.patch | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/emacs/23.4/15_all_pax-xattr.patch b/emacs/23.4/15_all_pax-xattr.patch index 53d97c3..040dacf 100644 --- a/emacs/23.4/15_all_pax-xattr.patch +++ b/emacs/23.4/15_all_pax-xattr.patch @@ -1,5 +1,6 @@ Fix failure in unexec with hardened Linux kernel and XATTR_PAX_FLAGS=y. https://bugs.gentoo.org/456970 +https://bugs.gentoo.org/497498 --- emacs-23.4-orig/configure.in +++ emacs-23.4/configure.in @@ -39,7 +40,7 @@ https://bugs.gentoo.org/456970 #ifndef CANNOT_DUMP test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT) + test "X$(SETFATTR)" = X \ -+ || $(SETFATTR) -n user.pax.flags -v r temacs$(EXEEXT) ++ || $(SETFATTR) -n user.pax.flags -v er temacs$(EXEEXT) #endif /* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE diff --git a/emacs/24.3/04_all_pax-xattr.patch b/emacs/24.3/04_all_pax-xattr.patch index 90346ba..06396c3 100644 --- a/emacs/24.3/04_all_pax-xattr.patch +++ b/emacs/24.3/04_all_pax-xattr.patch @@ -1,5 +1,6 @@ Fix failure in unexec with hardened Linux kernel and XATTR_PAX_FLAGS=y. https://bugs.gentoo.org/456970 +https://bugs.gentoo.org/497498 --- emacs-24.3-orig/configure.ac +++ emacs-24.3/configure.ac @@ -39,7 +40,7 @@ https://bugs.gentoo.org/456970 test "$(CANNOT_DUMP)" = "yes" || \ test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT) + test "$(CANNOT_DUMP)" = "yes" || test "X$(SETFATTR)" = X || \ -+ $(SETFATTR) -n user.pax.flags -v r temacs$(EXEEXT) ++ $(SETFATTR) -n user.pax.flags -v er temacs$(EXEEXT) ## The following oldxmenu-related rules are only (possibly) used if ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them |