[SCM] brutefir/master: Pass LDFLAGS to brutefir link. Change _init functions to use constructor attributes instead

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4c2a49c06da5da442ad14e5d5e1023d1efb0ca1d
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Feb 25 17:47:15 2014 -0300

    Pass LDFLAGS to brutefir link. Change _init functions to use constructor
    attributes instead

diff --git a/debian/patches/30-pass_hardening_flags.patch b/debian/patches/30-pass_hardening_flags.patch
index 5feeb82..7b58140 100644
--- a/debian/patches/30-pass_hardening_flags.patch
+++ b/debian/patches/30-pass_hardening_flags.patch
@@ -2,10 +2,8 @@ Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Description: Partially fix hardening.
 Forwarded: no
 
-Index: brutefir/Makefile
-===================================================================
---- brutefir.orig/Makefile	2014-02-24 01:54:27.079339562 +0100
-+++ brutefir/Makefile	2014-02-24 01:54:49.270689622 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -1,4 +1,9 @@
  ###################################
 +CFLAGS +=
@@ -16,7 +14,16 @@ Index: brutefir/Makefile
  # Where to install
  INSTALL_PREFIX	= $(DESTDIR)/usr
  
-@@ -27,9 +32,9 @@
+@@ -18,7 +23,7 @@ FFTW_LIB	= -lfftw3 -lfftw3f
+ ###################################
+ # Binaries
+ FLEX	= flex
+-LD	= ld
++LD	= gcc
+ CC	= gcc
+ AS	= as
+ 
+@@ -27,9 +32,9 @@ AS	= as
  CC_WARN		= -Wall -Wpointer-arith -Wshadow \
  -Wcast-align -Wwrite-strings -Wstrict-prototypes \
  -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
@@ -29,7 +36,7 @@ Index: brutefir/Makefile
  
  ###################################
  # Objects and libs for targets
-@@ -119,14 +124,14 @@
+@@ -119,38 +124,38 @@ all: $(TARGETS)
  	$(AS) -o $@			$<
  
  %.fpic.o: %.c
@@ -47,3 +54,34 @@ Index: brutefir/Makefile
  
  %.c: %.lex
  	$(FLEX) -o$@ $<
+ 
+ brutefir: $(BRUTEFIR_OBJS)
+-	$(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
++	$(CC) $(LDFLAGS) $(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) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS)
+ 
+ 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)
+ 
+ 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)
+ 
+ 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)
+ 
+ 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)
+ 
+ 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)
+ 
+ install: $(BIN_TARGETS) $(LIB_TARGETS)
+ 	install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir
diff --git a/debian/patches/50-no-_init.patch b/debian/patches/50-no-_init.patch
new file mode 100644
index 0000000..8e4d1fc
--- /dev/null
+++ b/debian/patches/50-no-_init.patch
@@ -0,0 +1,46 @@
+--- a/bfio_alsa.c
++++ b/bfio_alsa.c
+@@ -655,9 +655,10 @@ bfio_write(int fd,
+ }
+ 
+ void
+-_init(void);
+-void
+-_init(void)
++do_init(void);
++
++void __attribute__((constructor))
++do_init(void)
+ {
+     memset(handles, 0, sizeof(handles));
+     memset(n_handles, 0, sizeof(n_handles));
+--- a/bfio_file.c
++++ b/bfio_file.c
+@@ -604,9 +604,9 @@ bfio_stop(int io)
+ }
+ 
+ void
+-_init(void);
+-void
+-_init(void)
++do_init(void);
++void __attribute__((constructor))
++do_init(void)
+ {
+     char s[1024];
+     
+--- a/bfio_jack.c
++++ b/bfio_jack.c
+@@ -569,9 +569,9 @@ bfio_synch_stop(void)
+ }    
+ 
+ void
+-_init(void);
+-void
+-_init(void)
++do_init(void);
++void __attribute__((constructor))
++do_init(void)
+ {
+     memset(hasio, 0, sizeof(hasio));
+     memset(handles, 0, sizeof(handles));
diff --git a/debian/patches/series b/debian/patches/series
index 50c4a28..7d12ca7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 12-spelling_errors.patch
 30-pass_hardening_flags.patch
 40-brutefir-no-sse.patch
+50-no-_init.patch

-- 
brutefir packaging