diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/gcc-default-format-security.diff | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b9b4371..e6ba153 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ gcc-4.8 (4.8.2-23) unstable; urgency=medium * Update to SVN 20140516 (r210514) from the gcc-4_8-branch. * Apply the proposed patch for PR driver/61126. * Update the libstdc++v-python3 patch. Closes: #748317. + * Update the gcc-default-format-security patch (Steve Beattie). LP: #1317305. -- Matthias Klose <doko@debian.org> Sun, 18 May 2014 13:50:27 +0200 diff --git a/debian/patches/gcc-default-format-security.diff b/debian/patches/gcc-default-format-security.diff index 22d1c55..0d11b56 100644 --- a/debian/patches/gcc-default-format-security.diff +++ b/debian/patches/gcc-default-format-security.diff @@ -23,7 +23,7 @@ Index: b/src/gcc/doc/invoke.texi #endif +/* no separate spec, just shove it into the ssp default spec */ -+#define FORMAT_SECURITY_SPEC "%{!Wno-format-security:%{!Wformat|!Wformat=2|!Wall:-Wformat} -Wformat-security}" ++#define FORMAT_SECURITY_SPEC "%{!Wformat:%{!Wformat=2:%{!Wformat=0:%{!Wall:-Wformat} %{!Wno-format-security:-Wformat-security}}}}" + #ifndef SSP_DEFAULT_SPEC #ifdef TARGET_LIBC_PROVIDES_SSP @@ -34,4 +34,4 @@ Index: b/src/gcc/doc/invoke.texi +#define SSP_DEFAULT_SPEC FORMAT_SECURITY_SPEC #endif #endif - + |