|
@@ -2,21 +2,18 @@ Subject: Enable hardened build flags
|
|
Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
|
|
Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
|
|
Bug-Debian: http://bugs.debian.org/656650
|
|
Bug-Debian: http://bugs.debian.org/656650
|
|
Forwarded: not-needed
|
|
Forwarded: not-needed
|
|
-Last-Update: 2015-08-24
|
|
|
|
|
|
+Last-Update: 2015-12-04
|
|
|
|
|
|
--- a/Makefile.am
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
+++ b/Makefile.am
|
|
-@@ -11,9 +11,10 @@
|
|
|
|
|
|
+@@ -11,7 +11,7 @@
|
|
## warning with -Wmissing-prototypes).
|
|
## warning with -Wmissing-prototypes).
|
|
## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
|
|
## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
|
|
## aren't up to it).
|
|
## aren't up to it).
|
|
-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
|
|
-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
|
|
-+#CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
|
|
|
|
|
|
++CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
|
|
#CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
|
|
#CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
|
|
#CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
|
|
#CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
|
|
-+CPPFLAGS = -DSBINDIR='"$(sbindir)"'
|
|
|
|
-
|
|
|
|
- man_MANS = pptpctrl.8 pptpd.8 pptpd.conf.5 bcrelay.8
|
|
|
|
|
|
|
|
--- a/plugins/Makefile
|
|
--- a/plugins/Makefile
|
|
+++ b/plugins/Makefile
|
|
+++ b/plugins/Makefile
|
|
@@ -25,8 +22,8 @@ Last-Update: 2015-08-24
|
|
COPTS = -O2 -g
|
|
COPTS = -O2 -g
|
|
-CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
|
-CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
|
-LDFLAGS = -shared
|
|
-LDFLAGS = -shared
|
|
-+CFLAGS += $(COPTS) -I.. -I../../include -fPIC
|
|
|
|
-+LDFLAGS += -shared
|
|
|
|
|
|
++CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(COPTS) -I.. -I../../include -fPIC
|
|
|
|
++LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -shared
|
|
LDADD = -lutil
|
|
LDADD = -lutil
|
|
INSTALL = install -o root
|
|
INSTALL = install -o root
|
|
prefix = /usr/local
|
|
prefix = /usr/local
|