Merging upstream version 1.22.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 153 insertions, 31 deletions

diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index cca2bc7..1e8d9c0 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.21\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-01-19 12:10+0100\n"
+"POT-Creation-Date: 2024-02-27 04:27+0100\n"
 "PO-Revision-Date: 2021-04-08 04:44+0200\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -5993,11 +5993,11 @@ msgid "Show the version and exit."
 msgstr ""
 
 #. type: =head1
-#: dpkg-architecture.pod dpkg-buildpackage.pod dpkg-checkbuilddeps.pod
-#: dpkg-deb.pod dpkg-distaddfile.pod dpkg-divert.pod dpkg-fsys-usrunmess.pod
-#: dpkg-genbuildinfo.pod dpkg-genchanges.pod dpkg-gencontrol.pod
-#: dpkg-gensymbols.pod dpkg-mergechangelogs.pod dpkg-name.pod
-#: dpkg-parsechangelog.pod dpkg-query.pod dpkg-realpath.pod
+#: dpkg-architecture.pod dpkg-buildapi.pod dpkg-buildpackage.pod
+#: dpkg-checkbuilddeps.pod dpkg-deb.pod dpkg-distaddfile.pod dpkg-divert.pod
+#: dpkg-fsys-usrunmess.pod dpkg-genbuildinfo.pod dpkg-genchanges.pod
+#: dpkg-gencontrol.pod dpkg-gensymbols.pod dpkg-mergechangelogs.pod
+#: dpkg-name.pod dpkg-parsechangelog.pod dpkg-query.pod dpkg-realpath.pod
 #: dpkg-scanpackages.pod dpkg-scansources.pod dpkg-shlibdeps.pod
 #: dpkg-source.pod dpkg-split.pod dpkg-statoverride.pod dpkg-trigger.pod
 #: dpkg-vendor.pod dpkg.pod dselect.pod start-stop-daemon.pod
@@ -7087,6 +7087,13 @@ msgid "This program was introduced in dpkg 1.22.0."
 msgstr ""
 
 #. type: =item
+#: dpkg-buildapi.pod dpkg-buildflags.pod dpkg-buildtree.pod
+#: dpkg-mergechangelogs.pod dpkg-scansources.pod dpkg-statoverride.pod
+#: dpkg-vendor.pod update-alternatives.pod
+msgid "B<--help>"
+msgstr ""
+
+#. type: =item
 #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod
 msgid "B<-c>I<control-file>"
 msgstr ""
@@ -7099,13 +7106,6 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: dpkg-buildapi.pod dpkg-buildflags.pod dpkg-buildtree.pod
-#: dpkg-mergechangelogs.pod dpkg-scansources.pod dpkg-statoverride.pod
-#: dpkg-vendor.pod update-alternatives.pod
-msgid "B<--help>"
-msgstr ""
-
-#. type: =item
 #: dpkg-buildapi.pod
 msgid "B<DPKG_BUILD_API>"
 msgstr ""
@@ -7539,10 +7539,8 @@ msgid ""
 "Print the features enabled for a given area (since dpkg 1.16.2).  If the "
 "feature is handled (even if only on some architectures) as a builtin default "
 "by the compiler, then a B<Builtin> field is printed (since dpkg 1.21.14).  "
-"The only currently recognized areas on Debian and derivatives are B<future>, "
-"B<qa>, B<reproducible>, B<sanitize> and B<hardening>, see the B<FEATURE "
-"AREAS> section for more details.  Exits with 0 if the area is known "
-"otherwise exits with 1."
+"See the L</FEATURE AREAS> section for more details about the currently "
+"recognized areas.  Exits with 0 if the area is known otherwise exits with 1."
 msgstr ""
 
 #. type: textblock
@@ -7879,17 +7877,37 @@ msgstr ""
 #. type: textblock
 #: dpkg-buildflags.pod
 msgid ""
+"Feature areas are currently vendor specific, and the ones described below "
+"are only recognized on Debian and derivatives."
+msgstr ""
+
+#. type: textblock
+#: dpkg-buildflags.pod
+msgid ""
 "Each area feature can be enabled and disabled in the B<DEB_BUILD_OPTIONS> "
 "and B<DEB_BUILD_MAINT_OPTIONS> environment variable's area value with the "
-"‘B<+>’ and ‘B<->’ modifier.  For example, to enable the B<hardening> “pie” "
-"feature and disable the “fortify” feature you can do this in B<debian/rules>:"
+"‘B<+>’ and ‘B<->’ modifier.  Following the general syntax of these variables "
+"(described in L<dpkg-buildpackage(1)>), multiple feature areas can be "
+"specified separated by spaces, where each get feature specifiers as "
+"mandatory parameters after an equal sign (‘B<=>’).  The feature specifiers "
+"are comma-separated and parsed from left to right, where the settings within "
+"the same feature specifier override previous ones, even if the feature "
+"specifiers are split across multiple space-separated feature area settings "
+"for the same area."
+msgstr ""
+
+#. type: textblock
+#: dpkg-buildflags.pod
+msgid ""
+"For example, to enable the B<hardening> “pie” feature and disable the "
+"“fortify” feature you can do this in B<debian/rules>:"
 msgstr ""
 
 #. type: verbatim
 #: dpkg-buildflags.pod
 #, no-wrap
 msgid ""
-"    export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n"
+"    export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify\n"
 "\n"
 msgstr ""
 
@@ -7906,7 +7924,42 @@ msgstr ""
 #: dpkg-buildflags.pod
 #, no-wrap
 msgid ""
-"    export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
+"    export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: dpkg-buildflags.pod
+msgid "Multiple feature areas can be set:"
+msgstr ""
+
+#. type: verbatim
+#: dpkg-buildflags.pod
+#, no-wrap
+msgid ""
+"    export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: dpkg-buildflags.pod
+msgid ""
+"The override behavior applies as much to the B<all> special feature, as to "
+"specific features, which should allow for composition.  Thus to enable “lfs” "
+"in the B<abi> area, and only “pie” and “fortify” in the B<hardening> area, "
+"but “format” only when CONDITION is defined, this could be done with:"
+msgstr ""
+
+#. type: verbatim
+#: dpkg-buildflags.pod
+#, no-wrap
+msgid ""
+"    export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+pie,+format abi=+lfs\n"
+"    …\n"
+"    DEB_BUILD_MAINT_OPTIONS += hardening=+fortify\n"
+"    ifdef CONDITION\n"
+"    DEB_BUILD_MAINT_OPTIONS += hardening=-format\n"
+"    endif\n"
 "\n"
 msgstr ""
 
@@ -7953,10 +8006,30 @@ msgstr ""
 #. type: textblock
 #: dpkg-buildflags.pod
 msgid ""
-"This setting (since dpkg 1.22.0; disabled by default) enables 64-bit time_t "
-"support on 32-bit architectures where their ABI does not include it by "
-"default, by adding B<-D_TIME_BITS=64> to B<CPPFLAGS>.  This setting "
-"automatically enables the B<lfs> feature as it requires it."
+"This setting (since dpkg 1.22.0; enabled by default except for i386, hurd-"
+"i386 and kfreebsd-i386 since dpkg 1.22.5) enables 64-bit time_t support on "
+"32-bit architectures where their ABI does not include it by default, by "
+"adding B<-D_TIME_BITS=64> to B<CPPFLAGS>.  This setting automatically "
+"enables the B<lfs> feature from the B<abi> feature area, and the B<bug-"
+"implicit-func> feature from the B<qa> feature area as it requires them."
+msgstr ""
+
+#. type: textblock
+#: dpkg-buildflags.pod
+msgid ""
+"If the setting is enabled explicitly then it gets enabled on all "
+"architectures including i386 but not hurd-i386 nor kfreebsd-i386 (where the "
+"kernel does not have time64 interfaces), ignoring the binary backwards "
+"compatibility default."
+msgstr ""
+
+#. type: textblock
+#: dpkg-buildflags.pod
+msgid ""
+"It is also enabled by default by gcc on the armel, armhf, hppa, m68k, mips, "
+"mipsel, powerpc and sh4 Debian architectures, where disabling the feature "
+"will add instead B<-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS -U_TIME_BITS> to "
+"B<CPPFLAGS>."
 msgstr ""
 
 #. type: =head2
@@ -10208,7 +10281,10 @@ msgstr ""
 msgid ""
 "If set, it will contain a space-separated list of options that affect the "
 "behavior of some dpkg tools involved in package building, and might affect "
-"the package build process if the code in F<debian/rules> honors them."
+"the package build process if the code in F<debian/rules> honors them.  These "
+"options can have parameters specified immediately after an equal sign "
+"(‘B<=>‘).  For options that support multiple parameters, these will not be "
+"separated by spaces, as these are reserved to separate options."
 msgstr ""
 
 #. type: textblock
@@ -10287,6 +10363,52 @@ msgid ""
 msgstr ""
 
 #. type: =item
+#: dpkg-buildpackage.pod
+msgid "B<hardening=>I<feature-spec>"
+msgstr ""
+
+#. type: =item
+#: dpkg-buildpackage.pod
+msgid "B<reproducible=>I<feature-spec>"
+msgstr ""
+
+#. type: =item
+#: dpkg-buildpackage.pod
+#, fuzzy
+#| msgid "B<--add-architecture> I<architecture>"
+msgid "B<abi=>I<feature-spec>"
+msgstr "B<--add-architecture> I<architectur>"
+
+#. type: =item
+#: dpkg-buildpackage.pod
+msgid "B<future=>I<feature-spec>"
+msgstr ""
+
+#. type: =item
+#: dpkg-buildpackage.pod
+#, fuzzy
+#| msgid "B<--add-architecture> I<architecture>"
+msgid "B<qa=>I<feature-spec>"
+msgstr "B<--add-architecture> I<architectur>"
+
+#. type: =item
+#: dpkg-buildpackage.pod
+msgid "B<optimize=>I<feature-spec>"
+msgstr ""
+
+#. type: =item
+#: dpkg-buildpackage.pod
+msgid "B<sanitize=>I<feature-spec>"
+msgstr ""
+
+#. type: textblock
+#: dpkg-buildpackage.pod
+msgid ""
+"These are feature areas that control build flag features.  See L<dpkg-"
+"buildflags(1)> for further details."
+msgstr ""
+
+#. type: =item
 #: dpkg-buildpackage.pod dpkg-checkbuilddeps.pod
 msgid "B<DEB_BUILD_PROFILES>"
 msgstr ""
@@ -13805,7 +13927,7 @@ msgstr ""
 msgid ""
 "Specifies the format of the changelog.  By default the format is read from a "
 "special line near the bottom of the changelog or failing that defaults to "
-"the B<debian> standard format.  See also B<CHANGELOG FORMATS>."
+"the B<debian> standard format.  See also L</CHANGELOG FORMATS>."
 msgstr ""
 
 #. type: =item
@@ -15665,10 +15787,10 @@ msgstr ""
 #: dpkg-shlibdeps.pod
 msgid ""
 "As a safe-guard measure, a symbols file can provide a B<Build-Depends-"
-"Package> meta-information field and B<dpkg-shlibdeps> will extract the "
-"minimal version required by the corresponding package in the B<Build-"
-"Depends> field and use this version if it's higher than the minimal version "
-"computed by scanning symbols."
+"Package> or B<Build-Depends-Packages> meta-information field and B<dpkg-"
+"shlibdeps> will extract the minimal version required by the corresponding "
+"package in the B<Build-Depends> field and use this version if it's higher "
+"than the minimal version computed by scanning symbols."
 msgstr ""
 
 #. type: =head2