From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 28 Feb 2014 15:09:45 +0000 (+0100)
Subject: ffmpeg: prevent executable stack.
X-Git-Tag: v2.15-rc1~82^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6f96750ba3131a58f3cd998f73b5c1ad9bc903c;p=people%2Fms%2Fipfire-2.x.git

ffmpeg: prevent executable stack.
---

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index e2df5cc524..74947311fc 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -31,12 +31,12 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = "ffmpeg-libs sdl lame libvorbis xvid"
 
 # Don't use PIC for libavcodec
-CFLAGS    += -fno-PIC -fno-strict-aliasing
+CFLAGS    += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/ffmpeg-libs b/lfs/ffmpeg-libs
index d12b45bad3..b29c978055 100644
--- a/lfs/ffmpeg-libs
+++ b/lfs/ffmpeg-libs
@@ -27,7 +27,7 @@ include Config
 VER        = 2008-04-13
 THISAPP    = ffmpeg-export-$(VER)
 PROG       = ffmpeg-libs
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""