[SCM] brutefir/master: Refresh patches.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 58a534f2899a95909760e6818f07ba76b6474e19
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Aug 9 13:39:41 2016 +0200

    Refresh patches.

diff --git a/debian/patches/30-pass_hardening_flags.patch b/debian/patches/30-pass_hardening_flags.patch
index 6dbddbf..1a90771 100644
--- a/debian/patches/30-pass_hardening_flags.patch
+++ b/debian/patches/30-pass_hardening_flags.patch
@@ -2,8 +2,10 @@ Author: Jaromír Mikeš <mira.mikes at seznam.cz>, Felipe Sateler <fsateler at debian.
 Description: Fix hardening. Flags are passed correctly now.
 Forwarded: yes
 
---- a/Makefile
-+++ b/Makefile
+Index: brutefir/Makefile
+===================================================================
+--- brutefir.orig/Makefile
++++ brutefir/Makefile
 @@ -1,4 +1,9 @@
  ###################################
 +CFLAGS +=
@@ -21,23 +23,19 @@ Forwarded: yes
 -LD	= ld
 +LD	= gcc
  CC	= gcc
- AS	= as
+ CHMOD	= chmod
  
-@@ -27,9 +32,9 @@ AS	= as
+@@ -27,7 +32,7 @@ CHMOD	= chmod
  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,38 +124,38 @@ all: $(TARGETS)
- 	$(AS) -o $@			$<
++CC_FLAGS	= $(DEFINE) -O2 $(CFLAGS) $(CPPFLAGS)
+ CC_FPIC		= -fPIC
+ LD_SHARED	= -shared
+ CHMOD_REMOVEX	= -x
+@@ -106,43 +111,43 @@ TARGETS		= $(BIN_TARGETS) $(LIB_TARGETS)
+ all: $(TARGETS)
  
  %.fpic.o: %.c
 -	$(CC) -o $@			-c $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
@@ -62,26 +60,31 @@ Forwarded: yes
  alsa.bfio: $(BFIO_ALSA_OBJS)
 -	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
 +	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS)
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
  
  oss.bfio: $(BFIO_OSS_OBJS)
 -	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
 +	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS)
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
  
  jack.bfio: $(BFIO_JACK_OBJS)
 -	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
 +	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS)
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
  
  file.bfio: $(BFIO_FILE_OBJS)
 -	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
 +	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS)
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
  
  cli.bflogic: $(BFLOGIC_CLI_OBJS)
 -	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
 +	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS)
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
  
  eq.bflogic: $(BFLOGIC_EQ_OBJS)
 -	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
 +	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS)
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
  
  install: $(BIN_TARGETS) $(LIB_TARGETS)
- 	install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir

-- 
brutefir packaging