From 71396bb948f74a61619d05325280fa3830f5c13f Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Sun, 12 Feb 2012 20:45:53 +1100
Subject: [PATCH 1/2] Add missing <cstring> include.

Patch from Cyril Brulebois <cyril.brulebois@enst-bretagne.fr> via
Debian. Closes Debian bug #455304.
---
 examples/cpp/encode/file/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/cpp/encode/file/main.cpp b/examples/cpp/encode/file/main.cpp
index 1dc5750e..a6eeaa4e 100644
--- a/examples/cpp/encode/file/main.cpp
+++ b/examples/cpp/encode/file/main.cpp
@@ -34,6 +34,8 @@
 #include "FLAC++/metadata.h"
 #include "FLAC++/encoder.h"
 
+#include <cstring>
+
 class OurEncoder: public FLAC::Encoder::File {
 public:
 	OurEncoder(): FLAC::Encoder::File() { }

From 34de69aeddad98382505e6b894e9bbf83b302560 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Sun, 12 Feb 2012 20:49:17 +1100
Subject: [PATCH 2/2] Disable executable stack in libFLAC.so.

This allows programs using it to run correctly on SE Linux systems, and
with exec-shield.

Patch from Russell Coker <russell@coker.com.au> via Debian.
---
 src/libFLAC/ia32/nasm.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libFLAC/ia32/nasm.h b/src/libFLAC/ia32/nasm.h
index a0fb7247..afc3e12a 100644
--- a/src/libFLAC/ia32/nasm.h
+++ b/src/libFLAC/ia32/nasm.h
@@ -73,3 +73,6 @@
 _%1:
 %1:
 %endmacro
+
+section .note.GNU-stack progbits noalloc noexec nowrite align=1
+