diff -Nru hardening-wrapper-2.5ubuntu2/debian/changelog hardening-wrapper-2.5ubuntu3/debian/changelog --- hardening-wrapper-2.5ubuntu2/debian/changelog 2014-03-07 02:51:39.000000000 -0800 +++ hardening-wrapper-2.5ubuntu3/debian/changelog 2014-07-24 16:15:33.000000000 -0700 @@ -1,3 +1,10 @@ +hardening-wrapper (2.5ubuntu3) utopic; urgency=medium + + * hardened-cc: don't set -Wformat options if they are already set + (LP: #1347257) + + -- Steve Beattie Thu, 24 Jul 2014 15:55:40 -0700 + hardening-wrapper (2.5ubuntu2) trusty; urgency=medium * Allow -fstack-protector on arm64 now that GCC and glibc support it. diff -Nru hardening-wrapper-2.5ubuntu2/hardened-cc hardening-wrapper-2.5ubuntu3/hardened-cc --- hardening-wrapper-2.5ubuntu2/hardened-cc 2013-09-13 13:31:30.000000000 -0700 +++ hardening-wrapper-2.5ubuntu3/hardened-cc 2014-07-24 16:51:56.000000000 -0700 @@ -100,6 +100,11 @@ $arg eq "-ffreestanding") { $force_stack = 0; } + if ($arg eq "-Wno-format" || + $arg =~ /^-Wformat=/ || + $arg eq "-Wno-format-security") { + $force_format = 0; + } } # Enable SSP by default