[Pkg-wmaker-commits] [wmdrawer] 18/23: debian/patches/hardening.patch: New patch to correctly harden binary.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmdrawer.

commit 9ea0d0b9539a1318e897349a5c962b80e5749b57
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Fri Dec 16 23:13:20 2016 -0500

    debian/patches/hardening.patch: New patch to correctly harden binary.
---
 debian/patches/hardening.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..c3e79af
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,26 @@
+Description: Honor CPPFLAGS and don't overwrite CFLAGS/LDFLAGS for hardening.
+Author: Doug Torrance <dtorrance at piedmont.edu>
+Last-Update: 2016-12-16
+
+--- a/Makefile
++++ b/Makefile
+@@ -30,8 +30,8 @@
+ 
+ ifdef USE_GDKPIXBUF2
+ IMGLIB_DEF = -DUSE_GDKPIXBUF2
+-CFLAGS = -O3 -Wall `pkg-config --cflags gdk-pixbuf-xlib-2.0` -I/usr/X11R6/include
+-LDFLAGS = `pkg-config --libs gdk-pixbuf-xlib-2.0` -rdynamic -lX11 -lXi -lXext -L/usr/X11R6/lib
++CFLAGS += -O3 -Wall `pkg-config --cflags gdk-pixbuf-xlib-2.0` -I/usr/X11R6/include
++LDFLAGS += `pkg-config --libs gdk-pixbuf-xlib-2.0` -rdynamic -lX11 -lXi -lXext -L/usr/X11R6/lib
+ endif
+ 
+ ifdef USE_IMLIB
+@@ -58,7 +58,7 @@
+ all : $(PRGS)
+ 
+ .c.o :
+-	$(CC) $(CFLAGS) $(DEFS) -c $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c $<
+ 
+ wmdrawer : $(OBJS)
+ 	$(CC) $(OBJS) $(LDFLAGS) -o $@
diff --git a/debian/patches/series b/debian/patches/series
index a29dbbb..c9f4ce8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 makefile.patch
 fix-641336.patch
 fix-599382.patch
+hardening.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmdrawer.git