[SCM] ir.lv2/master: Fix hardening.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Sat Dec 17 11:57:29 UTC 2016


The following commit has been merged in the master branch:
commit 7f40685f86f380a540d8a19812103eb9a767a850
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Dec 17 12:18:37 2016 +0100

    Fix hardening.

diff --git a/debian/patches/03-fix_covert4chan_hardening.patch b/debian/patches/03-fix_covert4chan_hardening.patch
index 660bfc2..59de1d4 100644
--- a/debian/patches/03-fix_covert4chan_hardening.patch
+++ b/debian/patches/03-fix_covert4chan_hardening.patch
@@ -4,14 +4,14 @@ Forwarded: no
 
 Index: ir.lv2/Makefile
 ===================================================================
---- ir.lv2.orig/Makefile	2012-09-27 00:14:44.679979153 +0200
-+++ ir.lv2/Makefile	2012-09-27 00:15:30.208204914 +0200
-@@ -21,7 +21,7 @@
-    CPPFLAGS += -D_HAVE_GTK_ATLEAST_2_20
- endif
+--- ir.lv2.orig/Makefile
++++ ir.lv2/Makefile
+@@ -51,7 +51,7 @@ ir_gui.so: ir_gui.o ir_utils.o ir_meter.
+ 	g++ $(LDFLAGS) ir_gui.o ir_utils.o ir_meter.o ir_modeind.o ir_wavedisplay.o $(LIBS) -shared -z nodelete -o ir_gui.so
  
--C4CFLAGS = -Wall -I. -I/usr/include `pkg-config --cflags gthread-2.0` -O2 -ffast-math
-+C4CFLAGS = -Wall -I. -I/usr/include `pkg-config --cflags gthread-2.0` -D_FORTIFY_SOURCE=2 -O2 -ffast-math
- C4LIBS = -lsndfile `pkg-config --libs gthread-2.0`
+ convert4chan: convert4chan.c
+-	gcc $(C4CFLAGS) $(LDFLAGS) convert4chan.c $(C4LIBS) -o convert4chan
++	gcc $(C4CFLAGS) $(CPPFLAGS) $(LDFLAGS) convert4chan.c $(C4LIBS) -o convert4chan
  
- all: ir.so ir_gui.so
+ install: all
+ 	mkdir -p $(INSTDIR)
diff --git a/debian/rules b/debian/rules
index d6ce2d6..9ef970f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
 LDFLAGS+=-Wl,--as-needed
 export REPACK_SH=$(CURDIR)/debian/repack.sh
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@
 

-- 
ir.lv2 packaging



More information about the pkg-multimedia-commits mailing list