[SCM] brutefir/master: Added patch partially fix hardening.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Mon Feb 24 00:34:40 UTC 2014


The following commit has been merged in the master branch:
commit 3fcc011ad5e2cc5d56cf541a04f0be0407ca8821
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Feb 24 01:34:32 2014 +0100

    Added patch partially fix hardening.

diff --git a/debian/patches/30-pass_hardening_flags.patch b/debian/patches/30-pass_hardening_flags.patch
new file mode 100644
index 0000000..135df40
--- /dev/null
+++ b/debian/patches/30-pass_hardening_flags.patch
@@ -0,0 +1,58 @@
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Description: Partially fix hardening.
+Forwarded: no
+
+Index: brutefir/Makefile
+===================================================================
+--- brutefir.orig/Makefile	2014-02-24 00:48:51.753697539 +0100
++++ brutefir/Makefile	2014-02-24 00:50:57.342069177 +0100
+@@ -1,4 +1,9 @@
+ ###################################
++CFLAGS +=
++CPPFLAGS +=
++LDFLAGS +=
++
++###################################
+ # Where to install
+ INSTALL_PREFIX	= $(DESTDIR)/usr
+ 
+@@ -27,9 +32,9 @@
+ CC_WARN		= -Wall -Wpointer-arith -Wshadow \
+ -Wcast-align -Wwrite-strings -Wstrict-prototypes \
+ -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
+-CC_FLAGS	= $(DEFINE) -O2
+-CC_FPIC		= -fPIC
+-LD_SHARED	= -shared
++CC_FLAGS	+= $(DEFINE) -O2 $(CFLAGS) $(CPPFLAGS)
++CC_FPIC		+= -fPIC
++LD_SHARED	+= -shared 
+ 
+ ###################################
+ # Objects and libs for targets
+@@ -119,14 +124,14 @@
+ 	$(AS) -o $@			$<
+ 
+ %.fpic.o: %.c
+-	$(CC) -o $@			-c $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
++	$(CC) -o $@			-c $(LDFLAGS) $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
+ 
+ %.o: %.c
+-	$(CC) -o $@			-c $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
++	$(CC) -o $@			-c $(LDFLAGS) $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
+ 
+ # special rule to avoid to get warnings from code generated by flex
+ bfconf_lexical.o: bfconf_lexical.c
+-	$(CC) -o $@			-c $(INCLUDE) $(CC_FLAGS) $<
++	$(CC) -o $@			-c $(LDFLAGS) $(INCLUDE) $(CC_FLAGS) $<
+ 
+ %.c: %.lex
+ 	$(FLEX) -o$@ $<
+@@ -135,7 +140,7 @@
+ 	$(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
+ 
+ alsa.bfio: $(BFIO_ALSA_OBJS)
+-	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
++	$(LD) $(LD_SHARED) $(CC_FPIC) $(LDFLAGS) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
+ 
+ oss.bfio: $(BFIO_OSS_OBJS)
+ 	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
diff --git a/debian/patches/series b/debian/patches/series
index a082512..54c1046 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 10-makefile.patch
 11-sparc_v8.patch
 12-spelling_errors.patch
+30-pass_hardening_flags.patch

-- 
brutefir packaging



More information about the pkg-multimedia-commits mailing list