dpkg-buildflags: Remove redundant -Wformat-security from default flags

This option is already implied by -Werror=format-security.

Closes: #664964

Suggested-by: Peter Eisentraut <petere@debian.org>

debian/changelog

@@ -11,6 +11,9 @@ dpkg (1.16.3) UNRELEASED; urgency=low
   * Document in dpkg-source(1) that patches for source format “3.0 (quilt)”
     are expected to apply without any fuzz. Closes: #666752
     Based on a patch by Luca Capello <gismo@debian.org>.
+  * Remove redundant -Wformat-security from default dpkg-buildflags, which
+    is already implied by -Werror=format-security. Closes: #664964
+    Suggested by Peter Eisentraut <petere@debian.org>.
 
   [ Updated dpkg translations ]
   * French (Christian Perrier)

man/dpkg-buildflags.1

@@ -16,7 +16,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .
-.TH dpkg\-buildflags 1 "2011-09-13" "Debian Project" "dpkg suite"
+.TH dpkg\-buildflags 1 "2012-04-03" "Debian Project" "dpkg suite"
 .SH NAME
 dpkg\-buildflags \- returns build flags to use during package build
 .
@@ -220,7 +220,7 @@ enabling only "format" and "fortify" can be achieved with:
 .TP
 .B format
 This setting (enabled by default) adds
-.B \-Wformat \-Wformat\-security \-Werror=format\-security
+.B \-Wformat \-Werror=format\-security
 to \fBCFLAGS\fP and \fBCXXFLAGS\fP. This will warn about improper format
 string uses, and will fail when format functions are used in a way that
 that represent possible security problems. At present, this warns about

scripts/Dpkg/Vendor/Debian.pm

@@ -166,8 +166,8 @@ sub add_hardening_flags {
 
     # Format Security
     if ($use_feature{"format"}) {
-	$flags->append("CFLAGS", "-Wformat -Wformat-security -Werror=format-security");
-	$flags->append("CXXFLAGS", "-Wformat -Wformat-security -Werror=format-security");
+	$flags->append("CFLAGS", "-Wformat -Werror=format-security");
+	$flags->append("CXXFLAGS", "-Wformat -Werror=format-security");
     }
 
     # Read-only Relocations