Browse Source

Refresh patches

Christoph Biedl 2 months ago
parent
commit
474af2c3f1

+ 7 - 3
debian/patches/local.hardening-build.patch

@@ -5,11 +5,11 @@ Last-Update: 2016-12-06
 
 --- a/makefile
 +++ b/makefile
-@@ -9,23 +9,21 @@
+@@ -9,26 +9,24 @@
  mandir = ${sharedir}/man
  
- O=aoe.o bpf.o ${PLATFORM}.o ata.o
--CFLAGS += -Wall -g -O2
+ O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o
+-CFLAGS += -Wall -g -O2 -fno-common
 -CC = gcc
  
  vblade: $O
@@ -32,5 +32,9 @@ Last-Update: 2016-12-06
 -	${CC} ${CFLAGS} -c $<
 +	${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $<
  
+ dat.o : dat.c
+-	${CC} ${CFLAGS} -c $<
++	${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $<
+ 
  config.h : config/config.h.in makefile
  	@if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \

+ 1 - 1
debian/patches/local.makefile-additional-commands.patch

@@ -4,7 +4,7 @@ Date: 2007-04-08
 
 --- a/makefile
 +++ b/makefile
-@@ -36,8 +36,11 @@
+@@ -39,8 +39,11 @@
  
  clean :
  	rm -f $O vblade