From 2442d3b2eb48f055719250cb631dc5566545ad8e Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 24 Dec 2013 02:41:12 +0000 Subject: Host binaries no longer have executable stacks. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) --- sys-boot/grub/ChangeLog | 6 +- sys-boot/grub/grub-2.02_beta1-r1.ebuild | 8 +- sys-boot/grub/grub-2.02_beta1.ebuild | 322 -------------------------------- sys-boot/grub/grub-9999-r1.ebuild | 10 +- 4 files changed, 10 insertions(+), 336 deletions(-) delete mode 100644 sys-boot/grub/grub-2.02_beta1.ebuild (limited to 'sys-boot') diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 23e67a218824..f905ff9b01b5 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.299 2013/12/23 20:56:20 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.300 2013/12/24 02:41:11 floppym Exp $ + + 24 Dec 2013; Mike Gilbert -grub-2.02_beta1.ebuild, + grub-2.02_beta1-r1.ebuild, grub-9999-r1.ebuild: + Host binaries no longer have executable stacks. *grub-2.02_beta1-r1 (23 Dec 2013) diff --git a/sys-boot/grub/grub-2.02_beta1-r1.ebuild b/sys-boot/grub/grub-2.02_beta1-r1.ebuild index d918535ed015..e30f9fe017e6 100644 --- a/sys-boot/grub/grub-2.02_beta1-r1.ebuild +++ b/sys-boot/grub/grub-2.02_beta1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta1-r1.ebuild,v 1.1 2013/12/23 20:56:20 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta1-r1.ebuild,v 1.2 2013/12/24 02:41:11 floppym Exp $ EAPI=5 @@ -115,8 +115,7 @@ STRIP_MASK="*/grub/*/*.{mod,img}" RESTRICT="test" QA_EXECSTACK=" - usr/bin/grub* - usr/sbin/grub* + usr/bin/grub*-emu* usr/lib*/grub/*/*.mod usr/lib*/grub/*/*.module usr/lib*/grub/*/kernel.exec @@ -279,9 +278,6 @@ src_install() { insinto /etc/default newins "${FILESDIR}"/grub.default-3 grub - - cd "${ED}" || die - pax-mark mpes $(scanelf -BF %F usr/{bin,sbin}) } pkg_postinst() { diff --git a/sys-boot/grub/grub-2.02_beta1.ebuild b/sys-boot/grub/grub-2.02_beta1.ebuild deleted file mode 100644 index ff4a5bee3e4e..000000000000 --- a/sys-boot/grub/grub-2.02_beta1.ebuild +++ /dev/null @@ -1,322 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta1.ebuild,v 1.2 2013/12/19 14:57:24 floppym Exp $ - -EAPI=5 - -if [[ ${PV} == 9999 ]]; then - AUTOTOOLS_AUTORECONF=1 - GRUB_AUTOGEN=1 -fi - -if [[ -n ${GRUB_AUTOGEN} ]]; then - PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) - inherit python-any-r1 -fi - -inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator - -if [[ ${PV} != 9999 ]]; then - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then - MY_P="${P/_/~}" - SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz" - S=${WORKDIR}/${MY_P} - else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${P}.tar.xz - http://dev.gentoo.org/~floppym/dist/${P}.tar.xz" - S=${WORKDIR}/${P%_*} - fi - KEYWORDS="~amd64 ~x86" - PATCHES=() -else - inherit git-r3 - EGIT_REPO_URI="git://git.sv.gnu.org/grub.git - http://git.savannah.gnu.org/r/grub.git" -fi - -DEJAVU=dejavu-sans-ttf-2.34 -UNIFONT=unifont-6.3.20131217 -SRC_URI+=" truetype? ( - mirror://sourceforge/dejavu/${DEJAVU}.zip - http://unifoundry.com/pub/${UNIFONT}/${UNIFONT}.pcf.gz -)" - -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="http://www.gnu.org/software/grub/" - -# Includes licenses for dejavu and unifont -LICENSE="GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )" -SLOT="2" -IUSE="debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs" - -GRUB_ALL_PLATFORMS=( - # everywhere: - emu - # mips only: - qemu-mips yeeloong - # amd64, x86, ppc, ppc64: - ieee1275 - # amd64, x86: - coreboot multiboot efi-32 pc qemu - # amd64, ia64: - efi-64 -) -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" - -REQUIRED_USE="grub_platforms_qemu? ( truetype ) - grub_platforms_yeeloong? ( truetype )" - -# os-prober: Used on runtime to detect other OSes -# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue -RDEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5 - debug? ( - sdl? ( media-libs/libsdl ) - ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - libzfs? ( sys-fs/zfs ) - mount? ( sys-fs/fuse ) - truetype? ( media-libs/freetype ) - ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) - ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-misc/pax-utils - sys-devel/flex - sys-devel/bison - sys-apps/help2man - sys-apps/texinfo - static? ( - app-arch/xz-utils[static-libs(+)] - truetype? ( - app-arch/bzip2[static-libs(+)] - media-libs/freetype[static-libs(+)] - sys-libs/zlib[static-libs(+)] - ) - ) - test? ( - dev-libs/libisoburn - app-emulation/qemu - ) - truetype? ( app-arch/unzip ) -" -RDEPEND+=" - kernel_linux? ( - grub_platforms_efi-32? ( sys-boot/efibootmgr ) - grub_platforms_efi-64? ( sys-boot/efibootmgr ) - ) - !multislot? ( !sys-boot/grub:0 ) -" - -STRIP_MASK="*/grub/*/*.{mod,img}" -RESTRICT="test" - -QA_EXECSTACK=" - usr/bin/grub* - usr/sbin/grub* - usr/lib*/grub/*/*.mod - usr/lib*/grub/*/*.module - usr/lib*/grub/*/kernel.exec - usr/lib*/grub/*/kernel.img -" - -QA_WX_LOAD=" - usr/lib*/grub/*/kernel.exec - usr/lib*/grub/*/kernel.img - usr/lib*/grub/*/*.image -" - -QA_PRESTRIPPED=" - usr/lib.*/grub/.*/kernel.img -" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - # Bug 439082 - if ! version_is_at_least 4.8 "$(gcc-version)" && - $(tc-getLD) --version | grep -q "GNU gold"; then - eerror "GRUB does not function correctly when built with the gold linker." - eerror "Please select the bfd linker with binutils-config." - die "GNU gold detected" - fi - fi -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi - default_src_unpack -} - -src_prepare() { - [[ ${PATCHES} ]] && epatch "${PATCHES[@]}" - sed -i -e /autoreconf/d autogen.sh || die - if use multislot; then - # fix texinfo file name, bug 416035 - sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die - fi - epatch_user - if [[ -n ${GRUB_AUTOGEN} ]]; then - python_setup - bash autogen.sh || die - fi - if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then - autopoint() { return 0; } - eautoreconf - fi -} - -setup_fonts() { - ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die - ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die -} - -grub_configure() { - local platform - - case ${MULTIBUILD_VARIANT} in - efi-32) - platform=efi - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then - local CTARGET=${CTARGET:-i386} - fi ;; - efi-64) - platform=efi - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then - local CTARGET=${CTARGET:-x86_64} - local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" - local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" - export TARGET_CFLAGS TARGET_CPPFLAGS - fi ;; - guessed) ;; - *) platform=${MULTIBUILD_VARIANT} ;; - esac - - local myeconfargs=( - --disable-werror - --program-prefix= - --libdir="${EPREFIX}"/usr/lib - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html - $(use_enable debug mm-debug) - $(use_enable debug grub-emu-usb) - $(use_enable device-mapper) - $(use_enable mount grub-mount) - $(use_enable nls) - $(use_enable truetype grub-mkfont) - $(use_enable libzfs) - $(use sdl && use_enable debug grub-emu-sdl) - ${platform:+--with-platform=}${platform} - - # Let configure detect this where supported - $(usex efiemu '' '--disable-efiemu') - ) - - if use multislot; then - myeconfargs+=( --program-transform-name="s,grub,grub2," ) - fi - - if use truetype; then - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir setup_fonts - fi - - autotools-utils_src_configure -} - -src_configure() { - # We don't want to leak flags onto boot code. - export HOST_CCASFLAGS=${CCASFLAGS} - export HOST_CFLAGS=${CFLAGS} - export HOST_CPPFLAGS=${CPPFLAGS} - export HOST_LDFLAGS=${LDFLAGS} - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - - use static && HOST_LDFLAGS+=" -static" - - if version_is_at_least 4.8 "$(gcc-version)"; then - export TARGET_LDFLAGS+=" -fuse-ld=bfd" - fi - - tc-export CC NM OBJCOPY STRIP - export TARGET_CC=${TARGET_CC:-${CC}} - tc-export BUILD_CC # Bug 485592 - - # Portage will take care of cleaning up GRUB_PLATFORMS - MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} ) - multibuild_parallel_foreach_variant grub_configure -} - -src_compile() { - # Sandbox bug 404013. - use libzfs && addpredict /etc/dfs:/dev/zfs - - multibuild_foreach_variant autotools-utils_src_compile - - use doc && multibuild_for_best_variant \ - autotools-utils_src_compile -C docs html -} - -src_test() { - # The qemu dependency is a bit complex. - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. - multibuild_foreach_variant autotools-utils_src_test -} - -src_install() { - multibuild_foreach_variant autotools-utils_src_install \ - bashcompletiondir="$(get_bashcompdir)" - - use doc && multibuild_for_best_variant run_in_build_dir \ - emake -C docs DESTDIR="${D}" install-html - - if use multislot; then - mv "${ED%/}"/usr/share/info/grub{,2}.info || die - fi - - insinto /etc/default - newins "${FILESDIR}"/grub.default-3 grub - - cd "${ED}" || die - pax-mark mpes $(scanelf -BF %F usr/{bin,sbin}) -} - -pkg_postinst() { - mount-boot_mount_boot_partition - - if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" && ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then - mkdir -p "${ROOT%/}/boot/grub" - ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg" - fi - - mount-boot_pkg_postinst - - elog "For information on how to configure GRUB2 please refer to the guide:" - elog " http://wiki.gentoo.org/wiki/GRUB2_Quick_Start" - - if has_version 'sys-boot/grub:0'; then - elog "A migration guide for GRUB Legacy users is available:" - elog " http://www.gentoo.org/doc/en/grub2-migration.xml" - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - if ! has_version sys-boot/os-prober; then - elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig." - fi - if ! has_version dev-libs/libisoburn; then - elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue." - fi - else - local v - for v in ${REPLACING_VERSIONS}; do - if use multislot && ! version_is_at_least 2.00_p5107-r1 ${v}; then - ewarn "The grub directory has changed from /boot/grub2 to /boot/grub." - ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg." - break - fi - done - fi -} diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild index 818cf209ba35..964563703efc 100644 --- a/sys-boot/grub/grub-9999-r1.ebuild +++ b/sys-boot/grub/grub-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.8 2013/12/19 14:57:24 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.9 2013/12/24 02:41:11 floppym Exp $ EAPI=5 @@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then S=${WORKDIR}/${P%_*} fi KEYWORDS="~amd64 ~x86" - PATCHES=() + PATCHES=( "${FILESDIR}/${P}-only-use-scripts-that-are-executable.patch" ) else inherit git-r3 EGIT_REPO_URI="git://git.sv.gnu.org/grub.git @@ -115,8 +115,7 @@ STRIP_MASK="*/grub/*/*.{mod,img}" RESTRICT="test" QA_EXECSTACK=" - usr/bin/grub* - usr/sbin/grub* + usr/bin/grub*-emu* usr/lib*/grub/*/*.mod usr/lib*/grub/*/*.module usr/lib*/grub/*/kernel.exec @@ -279,9 +278,6 @@ src_install() { insinto /etc/default newins "${FILESDIR}"/grub.default-3 grub - - cd "${ED}" || die - pax-mark mpes $(scanelf -BF %F usr/{bin,sbin}) } pkg_postinst() { -- cgit v1.2.3-65-gdbad