Package: tree Version: 1.7.0-1 Severity: normal Tags: patch User: hardening-disc...@lists.alioth.debian.org Usertags: goal-hardening
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hello, Your package doesn't use CPPFLAGS (as upstream Makefile) at build time. Please find attached a patch that fix that. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJUDGFnAAoJEJmGUYuaqqCl8kUP/iaTkj++QLOeLQzNe7xykRp9 dY9Zyer+BweOmyOVfRqgCdU+c0G6RuythWFpcb0K6RLxC//theITenLvEJkiyKgU mfq16CNtITKQ3PKBMu42yIYG2oz74RwGDARWtpaSAW/i+0SZdQLvp/L+U53ZKbUJ dnsdA63b+ooots7YtXYv+XNYMUx+afb0BxZ6XxXV8L+eKUHMQQrsEVubCGnmPMfB YeMIcBAH75+1V3gmdgzobkY5/0v9upkkktBEJrkcmDDeJZvfCwxo60iyRXdF99S2 PPQw43zxbQ2f8WSWrkTPEDNeV0HEmgNbQtUzWOq/rqC3Vz69Ie2Ayi304hjv+bUa AKpT73ZJcukkJd0cjUS7p9jhpZT/z3qdFqLhORKdDTANEQTWWOwFlkbdnWJFBrdA G2DVb5qSumDwwfsPCFZGPiIq8NFT5PVMpErAKg+GnYWHrVqwZWtNv4VZPNn5YEob w77fMHFh5YA3TuLPq3meoF0xP8p6D42nm0GpsUoV2mbJP8MZXE4Ky4XKZP9VbW3R CUc41AouKenzdshXzRT5aYYq3DhZSaHfSCWFu6UlnacUasVDGM5IsCnnnI8NsKzl b6Ff5lgrNtDzNLgZVrZ3SBKIMIPia/ftTnJNzT++3+9LbAngEh2SbK3DkBMoRl4G 9Ma5dFwjvgjJfxcuMqEq =siJ/ -----END PGP SIGNATURE-----
diff -Nru tree-1.7.0/debian/changelog tree-1.7.0/debian/changelog --- tree-1.7.0/debian/changelog 2014-04-27 10:34:34.000000000 +0200 +++ tree-1.7.0/debian/changelog 2014-09-07 15:24:21.000000000 +0200 @@ -1,3 +1,11 @@ +tree (1.7.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Pass CPPFLAGS at build time (enable D_FORTIFY_SOURCE), patch upstream Makefile + * Remove generated binary in clean + + -- Guillaume Delacour <g...@iroqwa.org> Sun, 07 Sep 2014 15:11:27 +0200 + tree (1.7.0-1) unstable; urgency=medium * [63b3dfd] Imported Upstream version 1.7.0 (Closes: #745776) diff -Nru tree-1.7.0/debian/patches/cppflags.diff tree-1.7.0/debian/patches/cppflags.diff --- tree-1.7.0/debian/patches/cppflags.diff 1970-01-01 01:00:00.000000000 +0100 +++ tree-1.7.0/debian/patches/cppflags.diff 2014-09-07 15:18:02.000000000 +0200 @@ -0,0 +1,17 @@ +Author: Guillaume Delacour <g...@iroqwa.org> +Subject: Use CPPFLAGS in upstream Makefile +Last-Update: 2014-09-07 + +Index: tree-1.7.0/Makefile +=================================================================== +--- tree-1.7.0.orig/Makefile ++++ tree-1.7.0/Makefile +@@ -87,7 +87,7 @@ tree: $(OBJS) + $(CC) $(LDFLAGS) -o $(TREE_DEST) $(OBJS) + + $(OBJS): %.o: %.c tree.h +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + clean: + if [ -x $(TREE_DEST) ]; then rm $(TREE_DEST); fi diff -Nru tree-1.7.0/debian/patches/series tree-1.7.0/debian/patches/series --- tree-1.7.0/debian/patches/series 2014-04-27 10:34:34.000000000 +0200 +++ tree-1.7.0/debian/patches/series 2014-09-07 15:12:45.000000000 +0200 @@ -1 +1,2 @@ PATH_MAX +cppflags.diff diff -Nru tree-1.7.0/debian/rules tree-1.7.0/debian/rules --- tree-1.7.0/debian/rules 2014-04-27 10:34:34.000000000 +0200 +++ tree-1.7.0/debian/rules 2014-09-07 15:23:01.000000000 +0200 @@ -17,10 +17,14 @@ CFLAGS += -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 override_dh_auto_build: - $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" override_dh_auto_install: $(MAKE) install prefix="$(prefix)" MANDIR="$(MANDIR)" +override_dh_clean: + dh_clean + rm -f tree + %: dh $@
