diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-03-29 16:18:37 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-03-29 16:18:37 +0000 |
| commit | 4bff38401a75141f47f5bee3b2be3b9d7dd188d8 (patch) | |
| tree | be4e1846338b4be510b18ba21b29ceaf1a1fa71f /media-tv | |
| parent | Add missing DEP in net-libs/rest, #410161 (diff) | |
| download | gentoo-2-4bff38401a75141f47f5bee3b2be3b9d7dd188d8.tar.gz gentoo-2-4bff38401a75141f47f5bee3b2be3b9d7dd188d8.tar.bz2 gentoo-2-4bff38401a75141f47f5bee3b2be3b9d7dd188d8.zip | |
Drop patch merged into upstream git.
Diffstat (limited to 'media-tv')
| -rw-r--r-- | media-tv/xbmc/files/xbmc-9999-no-exec-stack.patch | 28 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-9999.ebuild | 3 |
2 files changed, 1 insertions, 30 deletions
diff --git a/media-tv/xbmc/files/xbmc-9999-no-exec-stack.patch b/media-tv/xbmc/files/xbmc-9999-no-exec-stack.patch deleted file mode 100644 index 67b20b7bd392..000000000000 --- a/media-tv/xbmc/files/xbmc-9999-no-exec-stack.patch +++ /dev/null @@ -1,28 +0,0 @@ -http://trac.xbmc.org/ticket/12735 - -From f0e33eefa4b5d46f26811db2f5e943dcd7f2870e Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Thu, 1 Mar 2012 00:04:49 -0500 -Subject: [PATCH] mark stack as non-executable - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - xbmc/utils/fastmemcpy-arm.S | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/xbmc/utils/fastmemcpy-arm.S b/xbmc/utils/fastmemcpy-arm.S -index 0e810a7..3d77c68 100644 ---- a/xbmc/utils/fastmemcpy-arm.S -+++ b/xbmc/utils/fastmemcpy-arm.S -@@ -527,3 +527,8 @@ copy_last_3_and_return: - - #endif /* __ARM_ARCH__ < 7 */ - #endif -+ -+#if defined(__linux__) && defined(__ELF__) -+/* we don't need an executable stack */ -+.section .note.GNU-stack,"",%progbits -+#endif --- -1.7.8.4 - diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild index 2daf913766e7..2bf91188406d 100644 --- a/media-tv/xbmc/xbmc-9999.ebuild +++ b/media-tv/xbmc/xbmc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.105 2012/03/27 18:37:13 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.106 2012/03/29 16:18:37 vapier Exp $ EAPI="4" @@ -123,7 +123,6 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617 - epatch "${FILESDIR}"/${PN}-9999-no-exec-stack.patch # some dirs ship generated autotools, some dont local d |