[Pkg-voip-commits] r10588 - in /dahdi-tools/trunk/debian: changelog patches/debian-cflags.patch patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Sun Oct 26 18:45:49 2014
New Revision: 10588

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10588
Log:
debian-cflags.patch: some cases where build flags were not passed 

Added:
    dahdi-tools/trunk/debian/patches/debian-cflags.patch
Modified:
    dahdi-tools/trunk/debian/changelog
    dahdi-tools/trunk/debian/patches/series

Modified: dahdi-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/changelog?rev=10588&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/changelog	(original)
+++ dahdi-tools/trunk/debian/changelog	Sun Oct 26 18:45:49 2014
@@ -3,6 +3,7 @@
   * New upstream release (Closes: #765377).
     - xpp_revert_clear_halt.patch merged upstream.
   * Compat level 9.
+  * debian-cflags.patch: some cases where build flags were not passed 
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 26 Oct 2014 15:18:23 +0200
 

Added: dahdi-tools/trunk/debian/patches/debian-cflags.patch
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/debian-cflags.patch?rev=10588&op=file
==============================================================================
--- dahdi-tools/trunk/debian/patches/debian-cflags.patch	(added)
+++ dahdi-tools/trunk/debian/patches/debian-cflags.patch	Sun Oct 26 18:45:49 2014
@@ -0,0 +1,31 @@
+From: Tzafrir Cohen <tzafrir at debian.org>
+Subject: Get hardening flags to some dahdi tools
+
+--- a/Makefile
++++ b/Makefile
+@@ -153,6 +153,7 @@ version.c: FORCE
+ tests: $(TEST_BINS)
+ 
+ $(UTILS): %: %.o
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ $(UTILS): version.o
+ 
+@@ -163,7 +164,7 @@ $(UTILS): version.o
+ 	$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
+ 
+ %: %.o
+-	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ prereq: config.status
+ 
+@@ -177,7 +178,7 @@ $(LTZ_A): $(LTZ_A_OBJS)
+ 	ranlib $@
+ 
+ $(LTZ_SO): $(LTZ_SO_OBJS)
+-	$(CC) $(CFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ -lm
+ 
+ dahdi_cfg: $(LTZ_A)
+ dahdi_cfg: LIBS+=-lm -lpthread

Modified: dahdi-tools/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/series?rev=10588&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/series	(original)
+++ dahdi-tools/trunk/debian/patches/series	Sun Oct 26 18:45:49 2014
@@ -2,3 +2,4 @@
 echocan_oslec
 init_unload_oslec
 remove_dahdi_speed
+debian-cflags.patch