The following commit has been merged in the master branch:
commit 5b28508eab5acaaa7374fc613a1f3acea6b1a7c2
Author: Guillem Jover <[email protected]>
Date: Thu Mar 28 20:08:20 2013 +0100
dpkg-buildflags(1): Move HARDENING into a new FEATURE AREAS subsection
There could be more feature areas in the future, and hardening does not
really deserve a section of its own.
diff --git a/debian/changelog b/debian/changelog
index 35ffbd0..9669ab5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
- Mark programs, variables, fields and command-line options in bold.
- Fold dpkg-architecture(1) DEBIAN/RULES section into EXAMPLES.
- Fix dpkg-architecture(1) debian/rules usage documentation.
+ - Move dpkg-buildflags(1) HARDENING into a new FEATURE AREAS subsection.
* Use colon instead of dot for user:group in dpkg debug output.
* Remove support for obsolete DM-Upload-Allowed from Dpkg::Vendor::Debian.
* Fix update-alternatives to use the current alternative link as the first
diff --git a/man/dpkg-buildflags.1 b/man/dpkg-buildflags.1
index 8ca4947..280055d 100644
--- a/man/dpkg-buildflags.1
+++ b/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 "2012-04-03" "Debian Project" "dpkg suite"
+.TH dpkg\-buildflags 1 "2013-03-28" "Debian Project" "dpkg suite"
.SH NAME
dpkg\-buildflags \- returns build flags to use during package build
.
@@ -117,8 +117,8 @@ the flag is set/modified by an environment-specific
configuration.
.TP
.BI \-\-query\-features " area"
Print the features enabled for a given area. The only currently recognized
-area is \fBhardening\fP. Exits with 0 if the area is known otherwise exits
-with 1.
+area is \fBhardening\fP, see the \fBFEATURE AREAS\fP section for more details.
+Exits with 0 if the area is known otherwise exits with 1.
.IP
The output is in RFC822 format, with one section per feature.
For example:
@@ -162,7 +162,8 @@ and
.B ,
have to be stripped from these options). Default value: empty.
.
-.SH HARDENING
+.SH FEATURE AREAS
+.SS Hardening
Several compile-time options (detailed below) can be used to help harden
a resulting binary against memory corruption attacks, or provide
additional warning messages during compilation. Except as noted below,
@@ -298,7 +299,7 @@ returned for the given \fIflag\fP.
.TP
.B DEB_BUILD_MAINT_OPTIONS
This variable can be used to disable/enable various hardening build
-flags through the \fBhardening\fP option. See the \fBHARDENING\fP section
+flags through the \fBhardening\fP option. See the \fBFEATURE AREAS\fP section
for details.
.
.SH FILES
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
