[SCM] swh-lv2/master: Enable hardening:

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Oct 9 08:37:13 UTC 2013


The following commit has been merged in the master branch:
commit 9e577754b29444503a1338507a15c525664902ba
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 9 09:36:35 2013 +0100

    Enable hardening:
    
    - Bump DH compat to 9.
    - Add patch to let buildsystem accept CPPFLAGS.

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 8f11eee..3e5221b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Alessio Treglia <alessio at debian.org>,
  Jaromír Mikeš <mira.mikes at seznam.cz>
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 9~),
  libfftw3-dev,
  libgsm1-dev,
  lv2-dev,
diff --git a/debian/patches/03-hardening.patch b/debian/patches/03-hardening.patch
new file mode 100644
index 0000000..a6ace55
--- /dev/null
+++ b/debian/patches/03-hardening.patch
@@ -0,0 +1,25 @@
+Description: Accept CPPFLAGS.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- swh-lv2.orig/Makefile
++++ swh-lv2/Makefile
+@@ -39,13 +39,13 @@ OS ?= $(shell uname -s)
+ ifdef DARWIN
+ EXT = dylib
+ CC = clang
+-PLUGIN_CFLAGS = -Wall -Wno-unused-variable -Wno-self-assign -I. -Iinclude -O3 -fomit-frame-pointer -funroll-loops -DFFTW3 -arch x86_64 -ffast-math -msse -fno-common $(CFLAGS)
++PLUGIN_CFLAGS = -Wall -Wno-unused-variable -Wno-self-assign -I. -Iinclude -O3 -fomit-frame-pointer -funroll-loops -DFFTW3 -arch x86_64 -ffast-math -msse -fno-common $(CFLAGS) $(CPPFLAGS)
+ PLUGIN_LDFLAGS = -arch x86_64 -dynamiclib $(LDFLAGS)
+ BUILD_PLUGINS = $(PLUGINS) $(FFT_PLUGINS)
+ RT =
+ else
+ EXT = so
+-PLUGIN_CFLAGS = -Wall -I. -Iinclude -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fPIC -DPIC -DFFTW3 $(CFLAGS)
++PLUGIN_CFLAGS = -Wall -I. -Iinclude -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fPIC -DPIC -DFFTW3 $(CFLAGS) $(CPPFLAGS)
+ PLUGIN_LDFLAGS = -shared -lm $(LDFLAGS)
+ BUILD_PLUGINS = $(PLUGINS) $(FFT_PLUGINS)
+ RT = -lrt
diff --git a/debian/patches/series b/debian/patches/series
index 2abdb78..c645640 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-makefile.patch
 02-gsm_plugin.patch
+03-hardening.patch

-- 
swh-lv2 packaging



More information about the pkg-multimedia-commits mailing list