summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-01-25 16:09:02 +0000
committerUlrich Müller <ulm@gentoo.org>2014-01-25 16:09:02 +0000
commit2881de4d9cba703913e5037bab5c5d693f95d1cd (patch)
tree76aecaa0d036169a965c7eac66c128ca41aca131 /app-editors/emacs
parentRaise media-libs/mutagen dependency wrt bug #499240. (diff)
downloadgentoo-2-2881de4d9cba703913e5037bab5c5d693f95d1cd.tar.gz
gentoo-2-2881de4d9cba703913e5037bab5c5d693f95d1cd.tar.bz2
gentoo-2-2881de4d9cba703913e5037bab5c5d693f95d1cd.zip
Fix build failure on hardened Linux when both PT_PAX_FLAGS and XATTR_PAX_FLAGS are enabled, bug 497498.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/ChangeLog7
-rw-r--r--app-editors/emacs/emacs-23.4-r6.ebuild4
-rw-r--r--app-editors/emacs/emacs-24.3-r2.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index e60ef964c4fe..c5b9b242c9d3 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.604 2014/01/16 17:48:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.605 2014/01/25 16:09:02 ulm Exp $
+
+ 25 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r6.ebuild,
+ emacs-24.3-r2.ebuild:
+ Fix build failure on hardened Linux when both PT_PAX_FLAGS and
+ XATTR_PAX_FLAGS are enabled, bug 497498.
16 Jan 2014; Mike Frysinger <vapier@gentoo.org> emacs-23.4-r6.ebuild,
emacs-24.2-r1.ebuild, emacs-24.3-r2.ebuild:
diff --git a/app-editors/emacs/emacs-23.4-r6.ebuild b/app-editors/emacs/emacs-23.4-r6.ebuild
index a57aa7670044..8f1f2527bf37 100644
--- a/app-editors/emacs/emacs-23.4-r6.ebuild
+++ b/app-editors/emacs/emacs-23.4-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r6.ebuild,v 1.6 2014/01/16 17:48:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r6.ebuild,v 1.7 2014/01/25 16:09:02 ulm Exp $
EAPI=5
WANT_AUTOMAKE="none"
@@ -10,7 +10,7 @@ inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
- http://dev.gentoo.org/~ulm/emacs/${P}-patches-9.tar.xz"
+ http://dev.gentoo.org/~ulm/emacs/${P}-patches-10.tar.xz"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="23"
diff --git a/app-editors/emacs/emacs-24.3-r2.ebuild b/app-editors/emacs/emacs-24.3-r2.ebuild
index 73ed32a61f5b..f9baef96ebf2 100644
--- a/app-editors/emacs/emacs-24.3-r2.ebuild
+++ b/app-editors/emacs/emacs-24.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r2.ebuild,v 1.18 2014/01/16 17:48:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r2.ebuild,v 1.19 2014/01/25 16:09:02 ulm Exp $
EAPI=5
@@ -9,7 +9,7 @@ inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
SRC_URI="mirror://gnu/emacs/${P}.tar.xz
- http://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
+ http://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"