vapier 15/04/15 08:37:14 Modified: kexec-tools-9999.ebuild ChangeLog Added: kexec-tools-2.0.9-r1.ebuild Log: Improve handling of hardened toolchains by only disabling PIE/etc... in the purgatory subdir. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.13 sys-apps/kexec-tools/kexec-tools-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/kexec-tools-9999.ebuild?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/kexec-tools-9999.ebuild?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/kexec-tools-9999.ebuild?r1=1.12&r2=1.13 Index: kexec-tools-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-9999.ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kexec-tools-9999.ebuild 28 Dec 2013 20:27:31 -0000 1.12 +++ kexec-tools-9999.ebuild 15 Apr 2015 08:37:14 -0000 1.13 @@ -1,12 +1,12 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-9999.ebuild,v 1.12 2013/12/28 20:27:31 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-9999.ebuild,v 1.13 2015/04/15 08:37:14 vapier Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=true -inherit autotools-utils flag-o-matic git-r3 linux-info systemd +inherit autotools-utils linux-info systemd git-r3 DESCRIPTION="Load another kernel from the currently executing Linux kernel" HOMEPAGE="http://kernel.org/pub/linux/utils/kernel/kexec/"; @@ -30,16 +30,12 @@ PATCHES=( "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch - ) + "${FILESDIR}"/${PN}-2.0.9-hardened.patch +) pkg_setup() { # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) export ASFLAGS="${CCASFLAGS}" - # to disable the -fPIE -pie in the hardened compiler - if gcc-specs-pie ; then - filter-flags -fPIE - append-ldflags -nopie - fi } src_configure() { @@ -48,7 +44,7 @@ $(use_with lzma) $(use_with xen) $(use_with zlib) - ) + ) autotools-utils_src_configure } 1.66 sys-apps/kexec-tools/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/ChangeLog?rev=1.66&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/ChangeLog?rev=1.66&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/ChangeLog?r1=1.65&r2=1.66 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- ChangeLog 7 Apr 2015 14:45:57 -0000 1.65 +++ ChangeLog 15 Apr 2015 08:37:14 -0000 1.66 @@ -1,6 +1,14 @@ # ChangeLog for sys-apps/kexec-tools # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.65 2015/04/07 14:45:57 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.66 2015/04/15 08:37:14 vapier Exp $ + +*kexec-tools-2.0.9-r1 (15 Apr 2015) + + 15 Apr 2015; Mike Frysinger <[email protected]> + +files/kexec-tools-2.0.9-hardened.patch, +kexec-tools-2.0.9-r1.ebuild, + kexec-tools-9999.ebuild: + Improve handling of hardened toolchains by only disabling PIE/etc... in the + purgatory subdir. *kexec-tools-2.0.9 (11 Feb 2015) 1.1 sys-apps/kexec-tools/kexec-tools-2.0.9-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/kexec-tools-2.0.9-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/kexec-tools-2.0.9-r1.ebuild?rev=1.1&content-type=text/plain Index: kexec-tools-2.0.9-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-2.0.9-r1.ebuild,v 1.1 2015/04/15 08:37:14 vapier Exp $ EAPI=5 inherit autotools-utils linux-info systemd DESCRIPTION="Load another kernel from the currently executing Linux kernel" HOMEPAGE="http://kernel.org/pub/linux/utils/kernel/kexec/"; SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="booke lzma xen zlib" REQUIRED_USE="lzma? ( zlib )" DEPEND=" lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )" RDEPEND="${DEPEND}" CONFIG_CHECK="~KEXEC" PATCHES=( "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch "${FILESDIR}"/${PN}-2.0.9-hardened.patch ) pkg_setup() { # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) export ASFLAGS="${CCASFLAGS}" } src_configure() { local myeconfargs=( $(use_with booke) $(use_with lzma) $(use_with xen) $(use_with zlib) ) autotools-utils_src_configure } src_install() { autotools-utils_src_install dodoc "${FILESDIR}"/README.Gentoo newinitd "${FILESDIR}"/kexec.init-2.0.4-r2 kexec newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec insinto /etc doins "${FILESDIR}"/kexec.conf insinto /etc/kernel/postinst.d doins "${FILESDIR}"/90_kexec systemd_dounit "${FILESDIR}"/kexec.service } pkg_postinst() { if systemd_is_booted || has_version sys-apps/systemd; then elog "For systemd support the new config file is" elog " /etc/kexec.conf" elog "Please adopt it to your needs as there is no autoconfig anymore" fi }
