From 6887597c0465fb7ae3bbc1bb812151e6dd2eb7a7 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 28 Feb 2014 07:02:14 +0100
Subject: [PATCH 1/3] kernel: enable rts5139 driver.

---
 config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 3 ++-
 config/kernel/kernel.config.armv5tel-ipfire-multi    | 3 ++-
 config/kernel/kernel.config.armv5tel-ipfire-rpi      | 3 ++-
 config/kernel/kernel.config.i586-ipfire              | 3 ++-
 config/kernel/kernel.config.i586-ipfire-pae          | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
index c3fe526c0..5245a7f8e 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
+++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
@@ -4252,7 +4252,8 @@ CONFIG_USBIP_HOST=m
 # CONFIG_RTL8192U is not set
 # CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
-# CONFIG_RTS5139 is not set
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index d35e569d8..641ac4b15 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -4336,7 +4336,8 @@ CONFIG_USBIP_HOST=m
 # CONFIG_RTL8192U is not set
 # CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
-# CONFIG_RTS5139 is not set
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi
index a40221488..f29d5a94c 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-rpi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi
@@ -3436,7 +3436,8 @@ CONFIG_ECHO=m
 # CONFIG_PANEL is not set
 # CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
-# CONFIG_RTS5139 is not set
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_LINE6_USB is not set
 # CONFIG_USB_SERIAL_QUATECH2 is not set
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 8ac3bd246..c7fdbd1c7 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -4678,7 +4678,8 @@ CONFIG_ECHO=m
 # CONFIG_RTL8192U is not set
 # CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
-# CONFIG_RTS5139 is not set
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 44b521369..14802522d 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -4718,7 +4718,8 @@ CONFIG_ECHO=m
 # CONFIG_RTL8192U is not set
 # CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
-# CONFIG_RTS5139 is not set
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set

From 26685b07425ed4090ff7ba66f37adcccc77ae298 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 28 Feb 2014 16:09:04 +0100
Subject: [PATCH 2/3] libmad: prevent executable stack.

---
 lfs/libmad | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lfs/libmad b/lfs/libmad
index ea0491e6d..ed18f2521 100644
--- a/lfs/libmad
+++ b/lfs/libmad
@@ -32,10 +32,12 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libmad
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
+CFLAGS    += -Wa,--noexecstack
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################

From c6f96750ba3131a58f3cd998f73b5c1ad9bc903c Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 28 Feb 2014 16:09:45 +0100
Subject: [PATCH 3/3] ffmpeg: prevent executable stack.

---
 lfs/ffmpeg      | 4 ++--
 lfs/ffmpeg-libs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index e2df5cc52..74947311f 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 d12b45bad..b29c97805 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       = ""