summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-03-01 05:12:53 +0000
committerMike Frysinger <vapier@gentoo.org>2012-03-01 05:12:53 +0000
commit737d5752ed9eb5687d4e8e9de0139a197d1202c8 (patch)
treec7202cf14f49a5895985ce4970ae801d81c890c5 /media-tv/xbmc
parentDepend on dev-python/python-dateutil. (diff)
downloadgentoo-2-737d5752ed9eb5687d4e8e9de0139a197d1202c8.tar.gz
gentoo-2-737d5752ed9eb5687d4e8e9de0139a197d1202c8.tar.bz2
gentoo-2-737d5752ed9eb5687d4e8e9de0139a197d1202c8.zip
Fix exec stack warnings.
Diffstat (limited to 'media-tv/xbmc')
-rw-r--r--media-tv/xbmc/ChangeLog6
-rw-r--r--media-tv/xbmc/files/xbmc-9999-no-exec-stack.patch28
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild3
3 files changed, 35 insertions, 2 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index ff6a1dd6392a..650aedde8154 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-tv/xbmc
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.116 2012/02/26 23:47:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.117 2012/03/01 05:12:53 vapier Exp $
+
+ 01 Mar 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+ +files/xbmc-9999-no-exec-stack.patch:
+ Fix exec stack warnings.
26 Feb 2012; Mike Frysinger <vapier@gentoo.org> xbmc-11.0_beta3.ebuild,
xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/files/xbmc-9999-no-exec-stack.patch b/media-tv/xbmc/files/xbmc-9999-no-exec-stack.patch
new file mode 100644
index 000000000000..67b20b7bd392
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-9999-no-exec-stack.patch
@@ -0,0 +1,28 @@
+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 49db105b18a5..2dd9e902f0fa 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.101 2012/02/26 23:47:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.102 2012/03/01 05:12:53 vapier Exp $
EAPI="4"
@@ -115,6 +115,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-11.0-libpng-1.5.patch #380127
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