From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 65ACE138247 for ; Mon, 30 Dec 2013 23:37:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27456E0AD9; Mon, 30 Dec 2013 23:37:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8AB78E0AD9 for ; Mon, 30 Dec 2013 23:37:44 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07C7033F723 for ; Mon, 30 Dec 2013 23:37:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7915DE545E for ; Mon, 30 Dec 2013 23:37:41 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1388445264.88a257278a1a85b82884b84d634f73f65c40b9c2.ulm@gentoo> Subject: [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.3/, emacs/23.4/ X-VCS-Repository: proj/emacs-tools X-VCS-Files: emacs/23.4/15_all_pax-xattr.patch emacs/24.3/04_all_pax-xattr.patch X-VCS-Directories: emacs/24.3/ emacs/23.4/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 88a257278a1a85b82884b84d634f73f65c40b9c2 X-VCS-Branch: patchsets Date: Mon, 30 Dec 2013 23:37:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c03c9f07-8d20-4a01-b53d-b7753287196d X-Archives-Hash: 9a8f4e0166f1e48166d4b9ba8b8be6f4 commit: 88a257278a1a85b82884b84d634f73f65c40b9c2 Author: Ulrich Müller gentoo org> AuthorDate: Mon Dec 30 23:14:24 2013 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Dec 30 23:14:24 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=88a25727 Fix failure in unexec with hardened kernel, bug 456970. --- emacs/23.4/15_all_pax-xattr.patch | 45 +++++++++++++++++++++++++++++++++++++++ emacs/24.3/04_all_pax-xattr.patch | 45 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/emacs/23.4/15_all_pax-xattr.patch b/emacs/23.4/15_all_pax-xattr.patch new file mode 100644 index 0000000..53d97c3 --- /dev/null +++ b/emacs/23.4/15_all_pax-xattr.patch @@ -0,0 +1,45 @@ +Fix failure in unexec with hardened Linux kernel and XATTR_PAX_FLAGS=y. +https://bugs.gentoo.org/456970 + +--- emacs-23.4-orig/configure.in ++++ emacs-23.4/configure.in +@@ -812,6 +812,18 @@ + fi + fi + ++AC_PATH_PROG(SETFATTR, setfattr) ++if test "X$SETFATTR" != X; then ++ AC_MSG_CHECKING([whether extended attributes are supported]) ++ touch conftest.tmp ++ if $SETFATTR -n user.pax.flags conftest.tmp >/dev/null 2>&1; then ++ AC_MSG_RESULT(yes) ++ else ++ AC_MSG_RESULT(no); SETFATTR="" ++ fi ++ rm -f conftest.tmp ++fi ++ + ## Need makeinfo >= 4.6 (?) to build the manuals. + AC_PATH_PROG(MAKEINFO, makeinfo, no) + dnl By this stage, configure has already checked for egrep and set EGREP, +--- emacs-23.4-orig/src/Makefile.in ++++ emacs-23.4/src/Makefile.in +@@ -514,6 +514,9 @@ + memory randomization in temacs with "paxctl -r". See bug#11398. */ + PAXCTL = @PAXCTL@ + ++/* If available, the full path to the setfattr program. */ ++SETFATTR = @SETFATTR@ ++ + /* A macro which other sections of Makefile can redefine to munge the + flags before they are passed to LD. This is helpful if you have + redefined LD to something odd, like "gcc". +@@ -983,6 +986,8 @@ + #endif + #ifndef CANNOT_DUMP + test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT) ++ test "X$(SETFATTR)" = X \ ++ || $(SETFATTR) -n user.pax.flags -v r 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 new file mode 100644 index 0000000..90346ba --- /dev/null +++ b/emacs/24.3/04_all_pax-xattr.patch @@ -0,0 +1,45 @@ +Fix failure in unexec with hardened Linux kernel and XATTR_PAX_FLAGS=y. +https://bugs.gentoo.org/456970 + +--- emacs-24.3-orig/configure.ac ++++ emacs-24.3/configure.ac +@@ -790,6 +790,18 @@ + fi + fi + ++AC_PATH_PROG(SETFATTR, setfattr) ++if test "X$SETFATTR" != X; then ++ AC_MSG_CHECKING([whether extended attributes are supported]) ++ touch conftest.tmp ++ if $SETFATTR -n user.pax.flags conftest.tmp >/dev/null 2>&1; then ++ AC_MSG_RESULT(yes) ++ else ++ AC_MSG_RESULT(no); SETFATTR="" ++ fi ++ rm -f conftest.tmp ++fi ++ + ## Need makeinfo >= 4.7 (?) to build the manuals. + AC_PATH_PROG(MAKEINFO, makeinfo, no) + dnl By this stage, configure has already checked for egrep and set EGREP, +--- emacs-24.3-orig/src/Makefile.in ++++ emacs-24.3/src/Makefile.in +@@ -115,6 +115,9 @@ + ## memory randomization in temacs with "paxctl -r". See bug#11398. + PAXCTL = @PAXCTL@ + ++## If available, the full path to the setfattr program. ++SETFATTR = @SETFATTR@ ++ + ## Some systems define this to request special libraries. + LIBS_SYSTEM=@LIBS_SYSTEM@ + +@@ -467,6 +470,8 @@ + -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES) + 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) + + ## The following oldxmenu-related rules are only (possibly) used if + ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them