ulm 14/10/28 13:03:48 Modified: ChangeLog emacs-23.4-r11.ebuild emacs-24.4.ebuild Log: Filter -pie from CFLAGS. Make sure that PT_PAX and XATTR_PAX flags for temacs are identical. Fixes build failure on hardened Linux, bug 526948. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Revision Changes Path 1.643 app-editors/emacs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.643&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.643&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.642&r2=1.643 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v retrieving revision 1.642 retrieving revision 1.643 diff -u -r1.642 -r1.643 --- ChangeLog 20 Oct 2014 22:13:02 -0000 1.642 +++ ChangeLog 28 Oct 2014 13:03:48 -0000 1.643 @@ -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.642 2014/10/20 22:13:02 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.643 2014/10/28 13:03:48 ulm Exp $ + + 28 Oct 2014; Ulrich Müller <[email protected]> emacs-23.4-r11.ebuild, + emacs-24.4.ebuild: + Filter -pie from CFLAGS. Make sure that PT_PAX and XATTR_PAX flags for + temacs are identical. Fixes build failure on hardened Linux, bug 526948. *emacs-24.4 (20 Oct 2014) 1.12 app-editors/emacs/emacs-23.4-r11.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild?r1=1.11&r2=1.12 Index: emacs-23.4-r11.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- emacs-23.4-r11.ebuild 19 Jun 2014 18:14:23 -0000 1.11 +++ emacs-23.4-r11.ebuild 28 Oct 2014 13:03:48 -0000 1.12 @@ -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-r11.ebuild,v 1.11 2014/06/19 18:14:23 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild,v 1.12 2014/10/28 13:03:48 ulm Exp $ EAPI=5 WANT_AUTOMAKE="none" @@ -104,7 +104,7 @@ src_configure() { strip-flags - filter-flags -fstrict-aliasing + filter-flags -fstrict-aliasing -pie append-flags $(test-flags -fno-strict-aliasing) if use sh; then 1.2 app-editors/emacs/emacs-24.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-24.4.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-24.4.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-24.4.ebuild?r1=1.1&r2=1.2 Index: emacs-24.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emacs-24.4.ebuild 20 Oct 2014 22:13:02 -0000 1.1 +++ emacs-24.4.ebuild 28 Oct 2014 13:03:48 -0000 1.2 @@ -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.4.ebuild,v 1.1 2014/10/20 22:13:02 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4.ebuild,v 1.2 2014/10/28 13:03:48 ulm Exp $ EAPI=5 @@ -8,7 +8,8 @@ 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" +SRC_URI="mirror://gnu/emacs/${P}.tar.xz + http://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="24" @@ -86,7 +87,7 @@ S="${WORKDIR}/emacs-${FULL_VERSION}" src_prepare() { - #EPATCH_SUFFIX=patch epatch + EPATCH_SUFFIX=patch epatch epatch_user # Fix filename reference in redirected man page @@ -98,6 +99,7 @@ src_configure() { strip-flags + filter-flags -pie #526948 if use sh; then replace-flags "-O[1-9]" -O0 #262359
