diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 18:40:28 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 18:40:28 +0000 |
| commit | 774e54c8927088c60617dc9345f55eaabb23256a (patch) | |
| tree | 7d82ddb667eaec624064c430b57818c78184e3c7 | |
| parent | Adding upstream version 1.22.4. (diff) | |
| download | dpkg-774e54c8927088c60617dc9345f55eaabb23256a.tar.xz dpkg-774e54c8927088c60617dc9345f55eaabb23256a.zip | |
Adding upstream version 1.22.5.upstream/1.22.5
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
188 files changed, 5110 insertions, 2776 deletions
diff --git a/.dist-version b/.dist-version index 2a0ba77..da9594f 100644 --- a/.dist-version +++ b/.dist-version @@ -1 +1 @@ -1.22.4 +1.22.5 @@ -1,3 +1,697 @@ +commit 1c92a4a8bfbeea30ceb0109b096c4ec845e3c6ce +Author: Guillem Jover <guillem@debian.org> +Date: Tue Feb 27 04:32:30 2024 +0100 + + Release 1.22.5 + + debian/changelog | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 58 insertions(+), 3 deletions(-) + +commit 546e929bd8b06806d3c0c0276815f7573d1ab4b5 +Author: Guillem Jover <guillem@debian.org> +Date: Tue Feb 27 04:28:02 2024 +0100 + + po: Regenerate .pot files and merge .po files with them + + dselect/po/bs.po | 2 +- + dselect/po/ca.po | 2 +- + dselect/po/cs.po | 2 +- + dselect/po/da.po | 2 +- + dselect/po/de.po | 2 +- + dselect/po/dselect.pot | 4 +- + dselect/po/el.po | 2 +- + dselect/po/es.po | 2 +- + dselect/po/et.po | 2 +- + dselect/po/eu.po | 2 +- + dselect/po/fr.po | 2 +- + dselect/po/gl.po | 2 +- + dselect/po/hu.po | 2 +- + dselect/po/id.po | 2 +- + dselect/po/it.po | 2 +- + dselect/po/ja.po | 2 +- + dselect/po/ko.po | 2 +- + dselect/po/nb.po | 2 +- + dselect/po/nl.po | 2 +- + dselect/po/nn.po | 2 +- + dselect/po/pl.po | 2 +- + dselect/po/pt.po | 2 +- + dselect/po/pt_BR.po | 2 +- + dselect/po/ro.po | 2 +- + dselect/po/ru.po | 2 +- + dselect/po/sk.po | 2 +- + dselect/po/sv.po | 2 +- + dselect/po/tl.po | 2 +- + dselect/po/vi.po | 2 +- + dselect/po/zh_CN.po | 2 +- + dselect/po/zh_TW.po | 2 +- + man/po/de.po | 64 +++++++++--- + man/po/dpkg-man.pot | 184 ++++++++++++++++++++++++++++------ + man/po/es.po | 220 ++++++++++++++++++++++++++++++++-------- + man/po/fr.po | 245 ++++++++++++++++++++++++++++++++++++++------- + man/po/hu.po | 190 +++++++++++++++++++++++++++++------ + man/po/it.po | 189 +++++++++++++++++++++++++++++------ + man/po/ja.po | 218 ++++++++++++++++++++++++++++++++-------- + man/po/nl.po | 258 +++++++++++++++++++++++++++++++++++++++-------- + man/po/pl.po | 220 ++++++++++++++++++++++++++++++++-------- + man/po/pt.po | 259 ++++++++++++++++++++++++++++++++++++++++-------- + man/po/pt_BR.po | 186 ++++++++++++++++++++++++++++------ + man/po/ru.po | 186 ++++++++++++++++++++++++++++------ + man/po/sv.po | 258 +++++++++++++++++++++++++++++++++++++++-------- + man/po/zh_CN.po | 184 ++++++++++++++++++++++++++++------ + po/ast.po | 2 +- + po/bs.po | 2 +- + po/ca.po | 2 +- + po/cs.po | 2 +- + po/da.po | 2 +- + po/de.po | 2 +- + po/dpkg.pot | 4 +- + po/dz.po | 2 +- + po/el.po | 2 +- + po/eo.po | 2 +- + po/es.po | 2 +- + po/et.po | 2 +- + po/eu.po | 2 +- + po/fr.po | 2 +- + po/gl.po | 2 +- + po/hu.po | 2 +- + po/id.po | 2 +- + po/it.po | 2 +- + po/ja.po | 2 +- + po/km.po | 2 +- + po/ko.po | 2 +- + po/ku.po | 2 +- + po/lt.po | 2 +- + po/mr.po | 2 +- + po/nb.po | 2 +- + po/ne.po | 2 +- + po/nl.po | 2 +- + po/nn.po | 2 +- + po/oc.po | 2 +- + po/pa.po | 2 +- + po/pl.po | 2 +- + po/pt.po | 2 +- + po/pt_BR.po | 2 +- + po/ro.po | 2 +- + po/ru.po | 2 +- + po/sk.po | 2 +- + po/sv.po | 2 +- + po/th.po | 2 +- + po/tl.po | 2 +- + po/tr.po | 2 +- + po/vi.po | 2 +- + po/zh_CN.po | 2 +- + po/zh_TW.po | 2 +- + scripts/po/ca.po | 36 ++++--- + scripts/po/de.po | 2 +- + scripts/po/dpkg-dev.pot | 26 +++-- + scripts/po/es.po | 30 +++--- + scripts/po/fr.po | 30 +++--- + scripts/po/nl.po | 30 +++--- + scripts/po/pl.po | 30 +++--- + scripts/po/pt.po | 30 +++--- + scripts/po/ru.po | 30 +++--- + scripts/po/sv.po | 36 ++++--- + 98 files changed, 2617 insertions(+), 676 deletions(-) + +commit ef90821fe45b99fa8c8c4279b9a74c30f59f491d +Author: Guillem Jover <guillem@debian.org> +Date: Tue Feb 27 04:19:59 2024 +0100 + + Dpkg::Vendor::Debian: Enable qa=+bug-implicit-func for abi=+time64 feature + + Per https://lists.debian.org/debian-devel/2023/05/msg00262.html et al., + missing glibc includes can cause packages to link to the wrong symbols, + potentially causing crashes or misbehavior. Since functions that use + time_t are fairly ubiquitous, there's a high risk of this happening for + *some* package in Debian and derivatives. Better to make all software + with missing function declarations fail to build now, than to spend + all cycle tracking down runtime bugs. + + Based-on-patch-by: Steve Langasek <steve.langasek@ubuntu.com> + + man/dpkg-buildflags.pod | 5 ++++- + scripts/Dpkg/Vendor/Debian.pm | 4 ++++ + scripts/t/Dpkg_BuildFlags.t | 14 +++++++++++++- + 3 files changed, 21 insertions(+), 2 deletions(-) + +commit 1f0ebe1945724fd57fd3984af0031ce9bf55b524 +Author: Guillem Jover <guillem@debian.org> +Date: Tue Feb 27 04:19:53 2024 +0100 + + Dpkg::Vendor::Debian: Enable time64 feature by default except on <some>-i386 + + On Debian the plan is to switch all architectures to default to time64, + except for i386 (which is left to use time32 for backwards binary + compatibility reasons), and hurd-i386 and kfreebsd-i386 (which do not + have time64 support). + + In addition, the default compiler (gcc) also emits the necessary + pre-processor flags on armel, armhf, hppa, m68k, mips, mipsel, powerpc + and sh4, so for those if the user has explicitly requested abi=-time64 + we need to emit options to unset the macros. + + If the user explicitly requests abi=+time64, then it will be enabled + everywhere (except for hurd-i386 and kfreebsd-i386 where the kernel does + not support it), so that it can be requested explicitly on packages that + want or need to be time64 aware regardless of the default exception, and + so that we do not break any ABI with packages that might have already + opted in. + + Based-on-patch-by: Steve Langasek <steve.langasek@ubuntu.com> + Closes: #1037136 + + man/dpkg-buildflags.pod | 26 +++++++++-- + scripts/Dpkg/Vendor/Debian.pm | 35 +++++++++++++- + scripts/t/Dpkg_BuildFlags.t | 105 +++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 161 insertions(+), 5 deletions(-) + +commit 5822b37460127d772f06a09b0acceaf87a1fec66 +Author: Guillem Jover <guillem@debian.org> +Date: Mon Feb 26 23:22:36 2024 +0100 + + test: Pass -T+1 to xz to workaround spurious warning with xz 5.6.0 + + This new xz version will automatically emit a warning when it reduces + the amount of threads to use if it exceeds the soft memory limit, even + when the user has not specified a number of threads to use. This is + making the test fail. Add an explicit -T+1 for now to force parallel + mode with a single thread until the warning problem gets sorted out in + xz upstream. + + Closes: #1064856 + + src/at/deb-format.at | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit feb804df14cabdefd9cb89bb96c4c20049254c7e +Author: Guillem Jover <guillem@debian.org> +Date: Thu Feb 22 19:01:19 2024 +0100 + + Dpkg::Vendor::Ubuntu: Pass compiler flags to disable features + + These are enabled by the compiler, so when the features are disabled we + need to pass appropriate compiler flags to disable them. + + Based-on-patch-by: Matthias Klose <doko@ubuntu.com> + + scripts/Dpkg/Vendor/Ubuntu.pm | 47 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) + +commit 732bd89cd234260fddb99b11691ea785945ce356 +Author: Guillem Jover <guillem@debian.org> +Date: Thu Feb 22 18:52:11 2024 +0100 + + Dpkg::Vendor: Make the add_build_flags() a non-private method + + Making it possible to override this method makes the code for the + derivative modules shorter and more clear. + + scripts/Dpkg/Vendor/Debian.pm | 4 ++-- + scripts/Dpkg/Vendor/Default.pm | 13 +++++++++++++ + scripts/Dpkg/Vendor/Ubuntu.pm | 19 +++++++++++-------- + 3 files changed, 26 insertions(+), 10 deletions(-) + +commit 2447e83868efe8c14ba3c560b675ed781c1fe220 +Author: Guillem Jover <guillem@debian.org> +Date: Thu Feb 22 18:17:35 2024 +0100 + + Dpkg::Vendor::Debian: Only append branch compiler flags if $flag is set + + This should always be the case on Debian, as we make sure to only enable + the feature on the CPUs we are checking in the conditionals setting + $flag. But let's make the code more robust, against changes in + derivatives or in case this code gets copy & pasted into something else + that might not be guaranteed to have $flag set. + + scripts/Dpkg/Vendor/Debian.pm | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit e8549c459ded424d0376c8acba0006cda1c885a7 +Author: Guillem Jover <guillem@debian.org> +Date: Mon Feb 26 02:53:17 2024 +0100 + + man: Mention Build-Depends-Packages in dpkg-shlibdeps(1) + + The manual page had a mention for Build-Depends-Package but not for + Build-Depends-Packages. + + man/dpkg-shlibdeps.pod | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 971aa61131e03fa75144436d400945a8605fce0d +Author: Guillem Jover <guillem@debian.org> +Date: Thu Feb 22 02:07:09 2024 +0100 + + man: Use L</> markup for inter link reference + + This was missed in the previous conversion. + + man/dpkg-parsechangelog.pod | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 9c72dc7aed1ddc2b9aa9d7d2ca391fc905168894 +Author: Helge Kreutzmann <debian@helgefjell.de> +Date: Thu Feb 22 21:26:18 2024 +0100 + + po: Update German man pages translation + + man/po/de.po | 225 ++++++++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 183 insertions(+), 42 deletions(-) + +commit 111226c9c5f1d04c304418fa5db627852ca2a166 +Author: Guillem Jover <guillem@debian.org> +Date: Thu Feb 22 01:31:17 2024 +0100 + + dpkg-query: Rename failures variables tracking no matches to misses + + This makes it more clear what the variable is tracking, and what kind + of failure this is about, specifically the amount of missed matches. + + Changelog: internal + + src/query/main.c | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +commit edb7f6a197ff0c206b17e2e922611c0a0714f266 +Author: Guillem Jover <guillem@debian.org> +Date: Thu Feb 22 00:57:09 2024 +0100 + + dpkg-query: Rename rc variables tracking no matches to misses + + This makes it more clear what the variable is tracking, as we are not + returning a return code but the actual amount of missed matches. + + Changelog: internal + + src/query/main.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 8fcf649f9c8bd5bbc58ccd1527eca22892447045 +Author: Guillem Jover <guillem@debian.org> +Date: Fri Feb 16 05:15:02 2024 +0100 + + dpkg-query: Fix exit codes for --show + + The manual page states that (most) dpkg-query commands will return 0 for + success, 1 for files or packages not being found, and 2 for fatal errors. + But the code was coercing the return values from each function into a + boolean, which meant that the --show command would not return 2 on parse + errors for the --showformat. + + Move the coercion into each command function, and map the format error + in --show into a proper 2. + + Closes: #1064036 + + src/query/main.c | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +commit 759883b03e517922f0a0a78b22fc7d7f174c589c +Author: Guillem Jover <guillem@debian.org> +Date: Sat Feb 10 18:28:00 2024 +0100 + + man: Improve build flags feature specification in environment variables + + Add information about the format of the feature areas and the feature + specification, how the values get parsed and how they override each + other. Add few examples to showcase the various scenarios. + + Closes: #1063641 + + man/dpkg-buildflags.pod | 28 ++++++++++++++++++++++++++++ + man/dpkg-buildpackage.pod | 5 +++++ + 2 files changed, 33 insertions(+) + +commit ffb1714f336689560e2c34d17b35e03000465de5 +Author: Guillem Jover <guillem@debian.org> +Date: Sat Feb 10 18:28:00 2024 +0100 + + man: Document known feature areas in DEB_BUILD_OPTIONS for dpkg-buildpackage + + The entry for DEB_BUILD_OPTIONS has a list of known options but not for + the known feature areas that dpkg-buildflags handles. + + man/dpkg-buildpackage.pod | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 442b01e9c68f29fbc8ef4bbfb33aa6ecad942cd5 +Author: Guillem Jover <guillem@debian.org> +Date: Thu Feb 22 01:47:29 2024 +0100 + + man: Do not duplicate list of known feature areas in dpkg-buildflags + + This requires keeping them in sync, which we have clearly failed to do + in the past. Instead use a reference to the section listing them all, + so that only one place in this manual page needs to be updated. + + man/dpkg-buildflags.pod | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 63ab47f774d1e29a02a6ee9813905737c3f5bc4c +Author: Guillem Jover <guillem@debian.org> +Date: Sat Feb 10 20:03:11 2024 +0100 + + man: Add spaces around make variable assignments + + This makes it more clear that these are not shell variables, but make + variables which accept spaces around variable assignments. + + man/dpkg-buildflags.pod | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f241d067a5b9ccba6fc947eb2127de1c37f5c485 +Author: Guillem Jover <guillem@debian.org> +Date: Wed Dec 28 01:10:57 2022 +0100 + + dpkg-mergechangelogs: Refactor merge_tail() sub from anonymous sub + + Changelog: internal + + scripts/dpkg-mergechangelogs.pl | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit 6419e5f30baa1efb432ac918f316e38ef360fb07 +Author: Guillem Jover <guillem@debian.org> +Date: Sun Jan 1 04:25:46 2023 +0100 + + perl: Fold if into previous else + + This simplifies the code and reduces the indentation levels. + + dselect/methods/ftp/install.pl | 30 +++++++++++++----------------- + scripts/Dpkg/BuildOptions.pm | 10 ++++------ + scripts/Dpkg/Changelog/Entry.pm | 16 +++++++--------- + scripts/Dpkg/Deps/Simple.pm | 8 +++----- + scripts/Dpkg/Shlibs/Symbol.pm | 28 +++++++++++----------------- + scripts/Dpkg/Source/Package/V1.pm | 22 ++++++++++------------ + scripts/dpkg-shlibdeps.pl | 14 ++++++-------- + scripts/dpkg-source.pl | 8 +++----- + 8 files changed, 57 insertions(+), 79 deletions(-) + +commit 96ae2e533e8ebdc23ca6a4078057a34d1700b971 +Author: Guillem Jover <guillem@debian.org> +Date: Sun Jan 1 04:11:17 2023 +0100 + + lib, src: Fold if with last previous else + + This simplifies the code and reduces the indentation levels. + + Changelog: internal + + lib/dpkg/parse.c | 7 +++---- + src/deb/build.c | 7 +++---- + src/main/archives.c | 24 +++++++++++------------- + src/main/script.c | 12 +++++------- + 4 files changed, 22 insertions(+), 28 deletions(-) + +commit 17abf9229e6edf4e71fd3496238bff8be992cd1f +Author: Guillem Jover <guillem@debian.org> +Date: Thu Jan 6 22:38:33 2022 +0100 + + libdpkg: Deindent an else clause + + lib/dpkg/version.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 779bb95d52ac54bc7c431663de55b8ebcdb4e352 +Author: Guillem Jover <guillem@debian.org> +Date: Tue Nov 21 01:43:18 2023 +0100 + + libdpkg: Refactor file_readlink() function + + This function will read a symlink target into a varbuf. + + lib/dpkg/file.c | 19 +++++++++++++++++++ + lib/dpkg/file.h | 3 +++ + lib/dpkg/libdpkg.map | 1 + + src/main/archives.c | 21 +++++++-------------- + src/main/configure.c | 6 +----- + 5 files changed, 31 insertions(+), 19 deletions(-) + +commit eea6717cb234d6fff1d80770eee7df9be00ae4af +Author: Guillem Jover <guillem@debian.org> +Date: Tue Feb 6 03:15:59 2024 +0100 + + dpkg: Reduce variable scope in conffderef() + + Changelog: internal + + src/main/configure.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit dca905e326a810286caab5ab8bc1dd2f511114d8 +Author: Guillem Jover <guillem@debian.org> +Date: Tue Feb 6 03:09:31 2024 +0100 + + dpkg: Rename r variable for readlink() return value to linksize + + This uses the same variable name as other instances in the codebase. + + Changelog: internal + + src/main/configure.c | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +commit 06b88796d442b3cce917846feca3e70d0e2a5467 +Author: Guillem Jover <guillem@debian.org> +Date: Tue Feb 6 03:05:02 2024 +0100 + + dpkg: Rename symlink_len to linksize + + This uses the same variable name as other instances in the codebase. + + Changelog: internal + + src/main/archives.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 640daee2954fb456b970be48ba8adc39eed9b21d +Author: Guillem Jover <guillem@debian.org> +Date: Tue Nov 21 22:40:20 2023 +0100 + + libdpkg: Use an intermediate mode variable in secure_unlink_statted() + + lib/dpkg/path-remove.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit c39305ca72f5142fcb774b99ceb025e35e6e77ce +Author: Guillem Jover <guillem@debian.org> +Date: Wed Feb 21 18:08:03 2024 +0100 + + Dpkg::OpenPGP::Backend::GnuPG: Add support for Sequoia gpg Chameleon + + This program implements the most used parts of the GnuPG CLI, + which covers our needs, but using the Sequoia-PGP as its underlying + implementation. + + If present, we prefer the Chameleon over the original GnuPG. + + README | 2 +- + debian/control | 8 ++++---- + scripts/Dpkg/OpenPGP/Backend/GnuPG.pm | 4 ++-- + scripts/Test/Dpkg.pm | 1 + + scripts/t/Dpkg_OpenPGP.t | 1 + + 5 files changed, 9 insertions(+), 7 deletions(-) + +commit 32206f2e00a6412b03bc4e6e4ee7f94a0ba3b058 +Author: Guillem Jover <guillem@debian.org> +Date: Sun Jan 28 18:37:44 2024 +0100 + + build: Add infrastructure for bash-completions + + This is the scaffolding to then be able to add the actual support into + the source tree. + + configure.ac | 3 +++ + dselect/Makefile.am | 3 +++ + scripts/Makefile.am | 3 +++ + src/Makefile.am | 3 +++ + utils/Makefile.am | 5 +++++ + 5 files changed, 17 insertions(+) + +commit aa37e818a53fcee8af4b61d2162f778f6be01dfa +Author: Guillem Jover <guillem@debian.org> +Date: Sun Jan 28 23:12:26 2024 +0100 + + build: Fix libdpkg library flags for static and dynamic linking + + We should always add the library dependencies to the LIBADD variable, + regardless of whether we are building the library as static or shared, + so that libtool can track them and use them on users, and so that we + do not need to specify them for the programs linking against libdpkg. + + lib/dpkg/Makefile.am | 11 +++-------- + m4/dpkg-build.m4 | 1 - + src/Makefile.am | 8 -------- + 3 files changed, 3 insertions(+), 17 deletions(-) + +commit ebb442a46a490da4d81e272c3c5e8565b63e36a7 +Author: Guillem Jover <guillem@debian.org> +Date: Sun Jan 28 23:12:26 2024 +0100 + + build: Move MD_LIBS from LDFLAGS to LDADD for libdpkg + + The correct place to add the library link flags is LDADD, not LDFLAGS. + + lib/dpkg/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 50f46e6bed37bf82cd1485c189e62849c1f85ff4 +Author: Guillem Jover <guillem@debian.org> +Date: Sun Jan 28 23:02:55 2024 +0100 + + build: Move u-a rules within automake conditional + + This follows the same pattern as the s-s-d build rules. + + utils/Makefile.am | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +commit 519118e24a626e27d53493e7c261473c9bd8f059 +Author: Guillem Jover <guillem@debian.org> +Date: Sun Jan 28 20:07:07 2024 +0100 + + build: Reorder automake variables + + Place library files or modules first before the programs that uses them. + Split and move EXTRA_DIST and CLEANFILES closer to the sections related + to the listed files. Add blank lines between variables. + + Makefile.am | 9 ++-- + dselect/methods/Makefile.am | 10 ++-- + lib/dpkg/Makefile.am | 25 ++++++--- + man/Makefile.am | 9 ++-- + scripts/Makefile.am | 129 +++++++++++++++++++++++--------------------- + utils/Makefile.am | 32 ++++++----- + 6 files changed, 122 insertions(+), 92 deletions(-) + +commit d7c0992402a936304d408933959b79e811aede83 +Author: Guillem Jover <guillem@debian.org> +Date: Sun Jan 28 20:07:07 2024 +0100 + + build: Split each automake variable value into its own line + + This makes it easier to sort, and modify with minimal diffs. + + dselect/Makefile.am | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 0bc71ec07778bf4cb2019efcce825e63239f1d0f +Author: Guillem Jover <guillem@debian.org> +Date: Wed Jan 31 03:40:52 2024 +0100 + + build: Use PACKAGE_TARNAME for pathname components in directories + + While currently PACKAGE_NAME and PACKAGE_TARNAME are the same, they + are not necessarily intended to be, so use the appropriate variable + to be future proof. + + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e896e9ec388633cf2031a7180bd2b7d37e9ad51e +Author: Guillem Jover <guillem@debian.org> +Date: Wed Jan 31 03:39:47 2024 +0100 + + build: Move directory definitions to configure + + This makes it possible to set them using --with-<some>dir options, + and we list them on the summary for better visibility, and avoid having + to define them multiple times in different automake files. + + Makefile.am | 4 ---- + configure.ac | 16 ++++++++++++++++ + dselect/methods/Makefile.am | 3 --- + lib/dpkg/Makefile.am | 1 - + m4/dpkg-progs.m4 | 2 ++ + scripts/Makefile.am | 1 - + utils/Makefile.am | 1 - + 7 files changed, 18 insertions(+), 10 deletions(-) + +commit 9caac129d0c3df15f781c83c8e00865eb27a61c9 +Author: Guillem Jover <guillem@debian.org> +Date: Wed Jan 31 02:56:32 2024 +0100 + + build: Rename pkexec variables to polkitactions + + The variable is for the polkit actions directory, which can contain not + only files for pkexec policies, but any actions in general. + + utils/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5efa4e6ded295b766244c3b047d30fb4215b9d61 +Author: Guillem Jover <guillem@debian.org> +Date: Tue Jan 23 11:50:18 2024 +0100 + + Dpkg::OpenPGP::Backend::Sequoia: Update to new CLI API changes + + The sq CLI is still not declared stable, and it gets improved from + time to time. We need to adapt the Sequoia-PGP backend to use the + new subcommand structure. + + debian/control | 4 ++-- + scripts/Dpkg/OpenPGP/Backend/Sequoia.pm | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 3e8fbeac09366e7fbfce51251351c5650e323a14 +Author: Guillem Jover <guillem@debian.org> +Date: Sat Jan 27 23:57:49 2024 +0100 + + libdpkg: Add comment clarifying GNU long name format expectations + + We have fixed the portability issues with the terminating NUL character, + but we should make it explicit in the comment describing the GNU long + names format. + + lib/dpkg/tarfn.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit ebf943c7b1b980edffbaa68851f4a2a87cffad58 +Author: Helge Kreutzmann <debian@helgefjell.de> +Date: Thu Jan 25 17:47:08 2024 +0100 + + po: Update German scripts translation + + scripts/po/de.po | 37 +++++++++++++++++++++---------------- + 1 file changed, 21 insertions(+), 16 deletions(-) + +commit 3727ab2475fdf27bf70e9a72182ca5eef52341b6 +Author: Guillem Jover <guillem@debian.org> +Date: Wed Jan 24 22:58:50 2024 +0100 + + dpkg-buildapi: Remove -v alias for --version + + This is not documented in the manual page, and diverges from almost + every other script in the project. While strictly speaking this is an + API break, the command is quite new and the option is no essential + for operation and expected to be mostly used by users. + + scripts/dpkg-buildapi.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 96e6f04fe2bdd1122e7bebadc44e63d8bdd8fe75 +Author: Guillem Jover <guillem@debian.org> +Date: Wed Jan 24 22:52:23 2024 +0100 + + man, doc: Fix dpkg-buildapi option and command grouping in descriptions + + The --help output did not have a Commands section nor included it in its + usage blurb. The manual page did not have an OPTIONS section. + + man/dpkg-buildapi.pod | 16 +++++++++++----- + scripts/dpkg-buildapi.pl | 8 +++++--- + 2 files changed, 16 insertions(+), 8 deletions(-) + +commit 8231bd3bf1d80780698b9a1238eae5df367e158a +Author: Guillem Jover <guillem@debian.org> +Date: Wed Jan 24 13:35:07 2024 +0100 + + Bump version to 1.22.5 + + debian/changelog | 6 ++++++ + 1 file changed, 6 insertions(+) + commit 4baf1e5485b6eaf4eb4347bfb9c4923fd2737488 Author: Guillem Jover <guillem@debian.org> Date: Wed Jan 24 13:12:56 2024 +0100 diff --git a/Makefile.am b/Makefile.am index 5e824cf..7186045 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,8 +16,6 @@ SUBDIRS = \ ACLOCAL_AMFLAGS = -I m4 -aclocaldir = $(datadir)/aclocal - dist_aclocal_DATA = \ m4/dpkg-arch.m4 \ m4/dpkg-build.m4 \ @@ -48,8 +46,6 @@ dist_doc_DATA = \ doc/README.feature-removal-schedule \ # EOL -docspecdir = $(docdir)/spec - dist_docspec_DATA = \ doc/spec/frontend-api.txt \ doc/spec/protected-field.txt \ @@ -111,9 +107,6 @@ EXTRA_DIST = \ debian/tests/test-root \ po/its/polkit.its \ po/its/polkit.loc \ - tests \ - $(test_scripts) \ - $(test_data) \ # EOL .PHONY: doc @@ -214,6 +207,12 @@ test_data = \ t/critic/perlcriticrc \ # EOL +EXTRA_DIST += \ + tests \ + $(test_scripts) \ + $(test_data) \ + # EOL + # We need to use absolute paths here due to strict.t invoking a sub-perl, # while changing dir to source dir on out-of-tree builds. TEST_ENV_VARS = \ diff --git a/Makefile.in b/Makefile.in index 57e02bf..0bbe0f9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -415,6 +415,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aclocaldir = @aclocaldir@ admindir = @admindir@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -422,6 +423,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ backupsdir = @backupsdir@ +bashcompletionsdir = @bashcompletionsdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -433,6 +435,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ devlibdir = @devlibdir@ docdir = @docdir@ +docspecdir = @docspecdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -450,10 +453,14 @@ localedir = @localedir@ localstatedir = @localstatedir@ logdir = @logdir@ mandir = @mandir@ +methodsdir = @methodsdir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +perllibdir = @perllibdir@ pkgconfdir = @pkgconfdir@ +pkgconfigdir = @pkgconfigdir@ +polkitactionsdir = @polkitactionsdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -479,7 +486,6 @@ SUBDIRS = \ # EOL ACLOCAL_AMFLAGS = -I m4 -aclocaldir = $(datadir)/aclocal dist_aclocal_DATA = \ m4/dpkg-arch.m4 \ m4/dpkg-build.m4 \ @@ -510,7 +516,6 @@ dist_doc_DATA = \ doc/README.feature-removal-schedule \ # EOL -docspecdir = $(docdir)/spec dist_docspec_DATA = \ doc/spec/frontend-api.txt \ doc/spec/protected-field.txt \ @@ -518,65 +523,30 @@ dist_docspec_DATA = \ doc/spec/triggers.txt \ # EOL -EXTRA_DIST = \ - .gitlab-ci.yml \ - .mailmap \ - ChangeLog.old \ - README.l10n \ - autogen \ - build-aux/gen-changelog \ - build-aux/get-version \ - build-aux/lcov-inject \ - build-aux/run-script \ - build-aux/test-runner \ - doc/coding-style.txt \ - debian/README.bug-usertags \ - debian/bug-script \ - debian/changelog \ - debian/control \ - debian/copyright \ - debian/dpkg-dev.docs \ - debian/dpkg-dev.install \ - debian/dpkg-dev.manpages \ - debian/dpkg.alternatives.logrotate \ - debian/dpkg.cfg \ - debian/dpkg.cron.daily \ - debian/dpkg.docs \ +EXTRA_DIST = .gitlab-ci.yml .mailmap ChangeLog.old README.l10n autogen \ + build-aux/gen-changelog build-aux/get-version \ + build-aux/lcov-inject build-aux/run-script \ + build-aux/test-runner doc/coding-style.txt \ + debian/README.bug-usertags debian/bug-script debian/changelog \ + debian/control debian/copyright debian/dpkg-dev.docs \ + debian/dpkg-dev.install debian/dpkg-dev.manpages \ + debian/dpkg.alternatives.logrotate debian/dpkg.cfg \ + debian/dpkg.cron.daily debian/dpkg.docs \ debian/dpkg.dpkg-db-backup.service \ - debian/dpkg.dpkg-db-backup.timer \ - debian/dpkg.install \ - debian/dpkg.manpages \ - debian/dpkg.postinst \ - debian/dpkg.postrm \ - debian/dpkg.logrotate \ - debian/dpkg.lintian-overrides \ - debian/dpkg.lintian-profile \ - debian/dselect.cfg \ - debian/dselect.docs \ - debian/dselect.install \ - debian/dselect.lintian-overrides \ - debian/dselect.manpages \ - debian/dselect.postrm \ - debian/libdpkg-dev.install \ - debian/libdpkg-perl.install \ - debian/source/format \ - debian/source/lintian-overrides \ - debian/not-installed \ - debian/rules \ - debian/shlibs.default \ - debian/shlibs.override \ - debian/tests/control \ - debian/tests/test-func \ - debian/tests/test-func-root \ - debian/tests/test-not-root \ - debian/tests/test-root \ - po/its/polkit.its \ - po/its/polkit.loc \ - tests \ - $(test_scripts) \ - $(test_data) \ - # EOL - + debian/dpkg.dpkg-db-backup.timer debian/dpkg.install \ + debian/dpkg.manpages debian/dpkg.postinst debian/dpkg.postrm \ + debian/dpkg.logrotate debian/dpkg.lintian-overrides \ + debian/dpkg.lintian-profile debian/dselect.cfg \ + debian/dselect.docs debian/dselect.install \ + debian/dselect.lintian-overrides debian/dselect.manpages \ + debian/dselect.postrm debian/libdpkg-dev.install \ + debian/libdpkg-perl.install debian/source/format \ + debian/source/lintian-overrides debian/not-installed \ + debian/rules debian/shlibs.default debian/shlibs.override \ + debian/tests/control debian/tests/test-func \ + debian/tests/test-func-root debian/tests/test-not-root \ + debian/tests/test-root po/its/polkit.its po/its/polkit.loc \ + tests $(test_scripts) $(test_data) # EOL @COVERAGE_ENABLED_TRUE@LCOV_OPTS = --quiet --rc geninfo_checksum=1 --rc lcov_branch_coverage=1 @COVERAGE_ENABLED_TRUE@LCOV_CAPTURE_OPTS = $(LCOV_OPTS) --no-recursion \ @COVERAGE_ENABLED_TRUE@ --directory $(top_builddir)/lib/dpkg \ @@ -109,7 +109,7 @@ software might be needed: fakeroot (optional) sop [sqop (from Sequoia-PGP), pgpainless-cli] (optional) sq (from Sequoia-PGP, optional) - gpg (optional) + gpg-sq (from Sequoia-PGP, optional), gpg (optional) i18nspector (optional, author) shellcheck (optional, author) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for dpkg 1.22.4. +# Generated by GNU Autoconf 2.71 for dpkg 1.22.5. # # Report bugs to <debian-dpkg@lists.debian.org>. # @@ -681,8 +681,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dpkg' PACKAGE_TARNAME='dpkg' -PACKAGE_VERSION='1.22.4' -PACKAGE_STRING='dpkg 1.22.4' +PACKAGE_VERSION='1.22.5' +PACKAGE_STRING='dpkg 1.22.5' PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org' PACKAGE_URL='https://wiki.debian.org/Teams/Dpkg' @@ -801,13 +801,20 @@ DPKG_DEFAULT_SHELL DPKG_SHELL DEB_DEFAULT_COMPRESSOR zshcompletionsdir +bashcompletionsdir +polkitactionsdir +aclocaldir +pkgconfigdir logdir backupsdir admindir +methodsdir +docspecdir pkgconfdir devlibdir BUILD_DEVEL_DOCS PACKAGE_RELEASE_DATE +perllibdir PERL_LIBDIR PERL_MIN_VERSION PERL @@ -821,8 +828,6 @@ HAVE_LINKER_VERSION_SCRIPT_FALSE HAVE_LINKER_VERSION_SCRIPT_TRUE HAVE_LINKER_AS_NEEDED_FALSE HAVE_LINKER_AS_NEEDED_TRUE -BUILD_SHARED_FALSE -BUILD_SHARED_TRUE LT_SYS_LIBRARY_PATH OTOOL64 OTOOL @@ -987,12 +992,19 @@ enable_libtool_lock enable_dselect enable_start_stop_daemon enable_update_alternatives +with_perllibdir enable_devel_docs with_devlibdir with_pkgconfdir +with_docspecdir +with_methodsdir with_admindir with_backupsdir with_logdir +with_pkgconfigdir +with_aclocaldir +with_polkitactionsdir +with_bashcompletionsdir with_zshcompletionsdir with_deb_compressor enable_coverage @@ -1598,7 +1610,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dpkg 1.22.4 to adapt to many kinds of systems. +\`configure' configures dpkg 1.22.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1669,7 +1681,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dpkg 1.22.4:";; + short | recursive ) echo "Configuration of dpkg 1.22.5:";; esac cat <<\_ACEOF @@ -1729,12 +1741,26 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). + --with-perllibdir=DIR perl modules directory --with-devlibdir=DIR dpkg development library directory [LIBDIR] --with-pkgconfdir=DIR dpkg configuration directory [SYSCONFDIR/dpkg] + --with-docspecdir=DIR dpkg specifications directory [DOCDIR/spec] + --with-methodsdir=DIR dpkg download methods directory + [LIBEXECDIR/dpkg/methods] --with-admindir=DIR dpkg database directory [LOCALSTATEDIR/lib/dpkg] --with-backupsdir=DIR dpkg database backups directory [LOCALSTATEDIR/backups] --with-logdir=DIR system logging directory [LOCALSTATEDIR/log] + --with-pkgconfigdir=DIR pkg-config .pc fragments directory + [DEVLIBDIR/pkgconfig] + --with-aclocaldir=DIR aclocal m4 fragments files directory + [DATADIR/aclocal] + --with-polkitactionsdir=DIR + polkit .policy actions directory + [DATADIR/polkit-1/actions] + --with-bashcompletionsdir=DIR + bash completions directory + [DATADIR/bash-completion/completions] --with-zshcompletionsdir=DIR zsh vendor completions directory [DATADIR/zsh/vendor-completions] @@ -1858,7 +1884,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dpkg configure 1.22.4 +dpkg configure 1.22.5 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2674,7 +2700,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dpkg $as_me 1.22.4, which was +It was created by dpkg $as_me 1.22.5, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -5492,7 +5518,7 @@ fi # Define the identity of the package. PACKAGE='dpkg' - VERSION='1.22.4' + VERSION='1.22.5' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -17054,14 +17080,6 @@ then : as_fn_error $? "building libdpkg as a shared library is not supported" "$LINENO" 5 fi - if test "$enable_shared" = "yes"; then - BUILD_SHARED_TRUE= - BUILD_SHARED_FALSE='#' -else - BUILD_SHARED_TRUE='#' - BUILD_SHARED_FALSE= -fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker flag" >&5 @@ -17346,6 +17364,24 @@ then : fi + perllibdir="${PERL_LIBDIR}" + +# Check whether --with-perllibdir was given. +if test ${with_perllibdir+y} +then : + withval=$with_perllibdir; + case $with_perllibdir in #( + "") : + as_fn_error $? "invalid perllibdir specified" "$LINENO" 5 ;; #( + *) : + perllibdir="$with_perllibdir" ;; +esac + +fi + + + + TIMESTAMP=$(PERL=$PERL ${CONFIG_SHELL-/bin/sh} "$srcdir/build-aux/run-script" scripts/dpkg-parsechangelog.pl -l"$srcdir/debian/changelog" -STimestamp) @@ -17396,7 +17432,7 @@ fi - pkgconfdir="${sysconfdir}/${PACKAGE_NAME}" + pkgconfdir="${sysconfdir}/${PACKAGE_TARNAME}" # Check whether --with-pkgconfdir was given. if test ${with_pkgconfdir+y} @@ -17414,7 +17450,43 @@ fi - admindir="${localstatedir}/lib/${PACKAGE_NAME}" + docspecdir="${docdir}/spec" + +# Check whether --with-docspecdir was given. +if test ${with_docspecdir+y} +then : + withval=$with_docspecdir; + case $with_docspecdir in #( + "") : + as_fn_error $? "invalid docspecdir specified" "$LINENO" 5 ;; #( + *) : + docspecdir="$with_docspecdir" ;; +esac + +fi + + + + + methodsdir="${libexecdir}/${PACKAGE_TARNAME}/methods" + +# Check whether --with-methodsdir was given. +if test ${with_methodsdir+y} +then : + withval=$with_methodsdir; + case $with_methodsdir in #( + "") : + as_fn_error $? "invalid methodsdir specified" "$LINENO" 5 ;; #( + *) : + methodsdir="$with_methodsdir" ;; +esac + +fi + + + + + admindir="${localstatedir}/lib/${PACKAGE_TARNAME}" # Check whether --with-admindir was given. if test ${with_admindir+y} @@ -17468,6 +17540,78 @@ fi + pkgconfigdir="${devlibdir}/pkgconfig" + +# Check whether --with-pkgconfigdir was given. +if test ${with_pkgconfigdir+y} +then : + withval=$with_pkgconfigdir; + case $with_pkgconfigdir in #( + "") : + as_fn_error $? "invalid pkgconfigdir specified" "$LINENO" 5 ;; #( + *) : + pkgconfigdir="$with_pkgconfigdir" ;; +esac + +fi + + + + + aclocaldir="${datadir}/aclocal" + +# Check whether --with-aclocaldir was given. +if test ${with_aclocaldir+y} +then : + withval=$with_aclocaldir; + case $with_aclocaldir in #( + "") : + as_fn_error $? "invalid aclocaldir specified" "$LINENO" 5 ;; #( + *) : + aclocaldir="$with_aclocaldir" ;; +esac + +fi + + + + + polkitactionsdir="${datadir}/polkit-1/actions" + +# Check whether --with-polkitactionsdir was given. +if test ${with_polkitactionsdir+y} +then : + withval=$with_polkitactionsdir; + case $with_polkitactionsdir in #( + "") : + as_fn_error $? "invalid polkitactionsdir specified" "$LINENO" 5 ;; #( + *) : + polkitactionsdir="$with_polkitactionsdir" ;; +esac + +fi + + + + + bashcompletionsdir="${datadir}/bash-completion/completions" + +# Check whether --with-bashcompletionsdir was given. +if test ${with_bashcompletionsdir+y} +then : + withval=$with_bashcompletionsdir; + case $with_bashcompletionsdir in #( + "") : + as_fn_error $? "invalid bashcompletionsdir specified" "$LINENO" 5 ;; #( + *) : + bashcompletionsdir="$with_bashcompletionsdir" ;; +esac + +fi + + + + zshcompletionsdir="${datadir}/zsh/vendor-completions" # Check whether --with-zshcompletionsdir was given. @@ -23196,6 +23340,24 @@ then : fi + perllibdir="${PERL_LIBDIR}" + +# Check whether --with-perllibdir was given. +if test ${with_perllibdir+y} +then : + withval=$with_perllibdir; + case $with_perllibdir in #( + "") : + as_fn_error $? "invalid perllibdir specified" "$LINENO" 5 ;; #( + *) : + perllibdir="$with_perllibdir" ;; +esac + +fi + + + + for ac_prog in pod2man @@ -33804,10 +33966,6 @@ else am__EXEEXT_FALSE= fi -if test -z "${BUILD_SHARED_TRUE}" && test -z "${BUILD_SHARED_FALSE}"; then - as_fn_error $? "conditional \"BUILD_SHARED\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${HAVE_LINKER_AS_NEEDED_TRUE}" && test -z "${HAVE_LINKER_AS_NEEDED_FALSE}"; then as_fn_error $? "conditional \"HAVE_LINKER_AS_NEEDED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -34291,7 +34449,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dpkg $as_me 1.22.4, which was +This file was extended by dpkg $as_me 1.22.5, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -34360,7 +34518,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -dpkg config.status 1.22.4 +dpkg config.status 1.22.5 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" @@ -36525,9 +36683,16 @@ Configuration: Paths: devlibdir . . . . . . . . . . : $devlibdir pkgconfdir . . . . . . . . . : $pkgconfdir + docspecdir . . . . . . . . . : $docspecdir + methodsdir . . . . . . . . . : $methodsdir admindir . . . . . . . . . . : $admindir backupsdir . . . . . . . . . : $backupsdir logdir . . . . . . . . . . . : $logdir + pkg-config dir . . . . . . . : $pkgconfigdir + aclocal dir . . . . . . . . : $aclocaldir + polkit actions dir . . . . . : $polkitactionsdir + bash completions dir . . . . : $bashcompletionsdir + zsh completions dir . . . . . : $zshcompletionsdir perl interpreter . . . . . . : $PERL perl libdir . . . . . . . . . : $PERL_LIBDIR diff --git a/configure.ac b/configure.ac index 568c712..b084ade 100644 --- a/configure.ac +++ b/configure.ac @@ -60,14 +60,26 @@ DPKG_BUILD_DEVEL_DOCS # Allow alternate directories DPKG_WITH_DIR([devlibdir], [${libdir}], [dpkg development library directory [LIBDIR]]) -DPKG_WITH_DIR([pkgconfdir], [${sysconfdir}/${PACKAGE_NAME}], +DPKG_WITH_DIR([pkgconfdir], [${sysconfdir}/${PACKAGE_TARNAME}], [dpkg configuration directory [SYSCONFDIR/dpkg]]) -DPKG_WITH_DIR([admindir], [${localstatedir}/lib/${PACKAGE_NAME}], +DPKG_WITH_DIR([docspecdir], [${docdir}/spec], + [dpkg specifications directory [DOCDIR/spec]]) +DPKG_WITH_DIR([methodsdir], [${libexecdir}/${PACKAGE_TARNAME}/methods], + [dpkg download methods directory [LIBEXECDIR/dpkg/methods]]) +DPKG_WITH_DIR([admindir], [${localstatedir}/lib/${PACKAGE_TARNAME}], [dpkg database directory [LOCALSTATEDIR/lib/dpkg]]) DPKG_WITH_DIR([backupsdir], [${localstatedir}/backups], [dpkg database backups directory [LOCALSTATEDIR/backups]]) DPKG_WITH_DIR([logdir], [${localstatedir}/log], [system logging directory [LOCALSTATEDIR/log]]) +DPKG_WITH_DIR([pkgconfigdir], [${devlibdir}/pkgconfig], + [pkg-config .pc fragments directory [DEVLIBDIR/pkgconfig]]) +DPKG_WITH_DIR([aclocaldir], [${datadir}/aclocal], + [aclocal m4 fragments files directory [DATADIR/aclocal]]) +DPKG_WITH_DIR([polkitactionsdir], [${datadir}/polkit-1/actions], + [polkit .policy actions directory [DATADIR/polkit-1/actions]]) +DPKG_WITH_DIR([bashcompletionsdir], [${datadir}/bash-completion/completions], + [bash completions directory [DATADIR/bash-completion/completions]]) DPKG_WITH_DIR([zshcompletionsdir], [${datadir}/zsh/vendor-completions], [zsh vendor completions directory [DATADIR/zsh/vendor-completions]]) @@ -298,9 +310,16 @@ Configuration: Paths: devlibdir . . . . . . . . . . : $devlibdir pkgconfdir . . . . . . . . . : $pkgconfdir + docspecdir . . . . . . . . . : $docspecdir + methodsdir . . . . . . . . . : $methodsdir admindir . . . . . . . . . . : $admindir backupsdir . . . . . . . . . : $backupsdir logdir . . . . . . . . . . . : $logdir + pkg-config dir . . . . . . . : $pkgconfigdir + aclocal dir . . . . . . . . : $aclocaldir + polkit actions dir . . . . . : $polkitactionsdir + bash completions dir . . . . : $bashcompletionsdir + zsh completions dir . . . . . : $zshcompletionsdir perl interpreter . . . . . . : $PERL perl libdir . . . . . . . . . : $PERL_LIBDIR diff --git a/dselect/Makefile.am b/dselect/Makefile.am index ebf8c76..261eff7 100644 --- a/dselect/Makefile.am +++ b/dselect/Makefile.am @@ -57,9 +57,18 @@ dselect_LDADD = \ ../lib/compat/libcompat.la \ # EOL +dist_bashcompletions_DATA = \ + # EOL + +EXTRA_DIST = \ + keyoverride \ + mkcurkeys.pl \ + # EOL -EXTRA_DIST = keyoverride mkcurkeys.pl -CLEANFILES = curkeys.hpp curkeys.h +CLEANFILES = \ + curkeys.hpp \ + curkeys.h \ + # EOL curkeys.$(OBJEXT): curkeys.h curkeys.hpp: dselect-curses.h diff --git a/dselect/Makefile.in b/dselect/Makefile.in index c7d5da5..45631e3 100644 --- a/dselect/Makefile.in +++ b/dselect/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -110,12 +111,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_bashcompletions_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" +am__installdirs = "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(bashcompletionsdir)" PROGRAMS = $(bin_PROGRAMS) am_dselect_OBJECTS = cxx-support.$(OBJEXT) basecmds.$(OBJEXT) \ baselist.$(OBJEXT) basetop.$(OBJEXT) bindings.$(OBJEXT) \ @@ -209,6 +212,34 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +DATA = $(dist_bashcompletions_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -406,6 +437,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aclocaldir = @aclocaldir@ admindir = @admindir@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -413,6 +445,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ backupsdir = @backupsdir@ +bashcompletionsdir = @bashcompletionsdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -424,6 +457,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ devlibdir = @devlibdir@ docdir = @docdir@ +docspecdir = @docspecdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -441,10 +475,14 @@ localedir = @localedir@ localstatedir = @localstatedir@ logdir = @logdir@ mandir = @mandir@ +methodsdir = @methodsdir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +perllibdir = @perllibdir@ pkgconfdir = @pkgconfdir@ +pkgconfigdir = @pkgconfigdir@ +polkitactionsdir = @polkitactionsdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -511,8 +549,19 @@ dselect_LDADD = \ ../lib/compat/libcompat.la \ # EOL -EXTRA_DIST = keyoverride mkcurkeys.pl -CLEANFILES = curkeys.hpp curkeys.h +dist_bashcompletions_DATA = \ + # EOL + +EXTRA_DIST = \ + keyoverride \ + mkcurkeys.pl \ + # EOL + +CLEANFILES = \ + curkeys.hpp \ + curkeys.h \ + # EOL + all: all-recursive .SUFFIXES: @@ -662,6 +711,27 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_bashcompletionsDATA: $(dist_bashcompletions_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bashcompletionsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bashcompletionsdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bashcompletionsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(bashcompletionsdir)" || exit $$?; \ + done + +uninstall-dist_bashcompletionsDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(bashcompletionsdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -821,10 +891,10 @@ distdir-am: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile $(PROGRAMS) +all-am: Makefile $(PROGRAMS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bashcompletionsdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -899,7 +969,7 @@ info: info-recursive info-am: -install-data-am: install-data-local +install-data-am: install-data-local install-dist_bashcompletionsDATA install-dvi: install-dvi-recursive @@ -964,7 +1034,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-binPROGRAMS +uninstall-am: uninstall-binPROGRAMS uninstall-dist_bashcompletionsDATA .MAKE: $(am__recursive_targets) install-am install-strip @@ -974,15 +1044,16 @@ uninstall-am: uninstall-binPROGRAMS distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-binPROGRAMS + install-data install-data-am install-data-local \ + install-dist_bashcompletionsDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-dist_bashcompletionsDATA .PRECIOUS: Makefile diff --git a/dselect/methods/Makefile.am b/dselect/methods/Makefile.am index 15c9cab..d123977 100644 --- a/dselect/methods/Makefile.am +++ b/dselect/methods/Makefile.am @@ -1,6 +1,9 @@ ## Process this file with automake to produce Makefile.in -methodsdir = $(pkglibexecdir)/methods +nobase_dist_perllib_DATA = \ + Dselect/Method.pm \ + Dselect/Method/Ftp.pm \ + # EOL nobase_dist_methods_DATA = \ file/names \ @@ -23,12 +26,6 @@ nobase_methods_SCRIPTS = \ media/update \ # EOL -perllibdir = $(PERL_LIBDIR) -nobase_dist_perllib_DATA = \ - Dselect/Method.pm \ - Dselect/Method/Ftp.pm \ - # EOL - EXTRA_DIST = \ file/setup.sh \ file/update.sh \ diff --git a/dselect/methods/Makefile.in b/dselect/methods/Makefile.in index 7dfe739..956af07 100644 --- a/dselect/methods/Makefile.in +++ b/dselect/methods/Makefile.in @@ -319,6 +319,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aclocaldir = @aclocaldir@ admindir = @admindir@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -326,6 +327,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ backupsdir = @backupsdir@ +bashcompletionsdir = @bashcompletionsdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -337,6 +339,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ devlibdir = @devlibdir@ docdir = @docdir@ +docspecdir = @docspecdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -354,10 +357,14 @@ localedir = @localedir@ localstatedir = @localstatedir@ logdir = @logdir@ mandir = @mandir@ +methodsdir = @methodsdir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +perllibdir = @perllibdir@ pkgconfdir = @pkgconfdir@ +pkgconfigdir = @pkgconfigdir@ +polkitactionsdir = @polkitactionsdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -371,7 +378,11 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zshcompletionsdir = @zshcompletionsdir@ -methodsdir = $(pkglibexecdir)/methods +nobase_dist_perllib_DATA = \ + Dselect/Method.pm \ + Dselect/Method/Ftp.pm \ + # EOL + nobase_dist_methods_DATA = \ file/names \ file/desc.file \ @@ -393,12 +404,6 @@ nobase_methods_SCRIPTS = \ media/update \ # EOL -perllibdir = $(PERL_LIBDIR) -nobase_dist_perllib_DATA = \ - Dselect/Method.pm \ - Dselect/Method/Ftp.pm \ - # EOL - EXTRA_DIST = \ file/setup.sh \ file/update.sh \ diff --git a/dselect/methods/ftp/install.pl b/dselect/methods/ftp/install.pl index ea6ea71..75647bd 100755 --- a/dselect/methods/ftp/install.pl +++ b/dselect/methods/ftp/install.pl @@ -297,16 +297,14 @@ if($totsize == 0) { if ($rsize + $totsize > $avsp) { print "no room for: $fn\n"; delete $downloads{$fn}; - } else { - if(yesno($def, $downloads{$fn} - ? "download: $fn ${rsize}k/${csize}k (total = ${totsize}k)" - : "download: $fn ${rsize}k (total = ${totsize}k)")) { - $def = 'y'; - $totsize += $rsize; - } else { - $def = 'n'; - delete $downloads{$fn}; - } + } elsif (yesno($def, $downloads{$fn} + ? "download: $fn ${rsize}k/${csize}k (total = ${totsize}k)" + : "download: $fn ${rsize}k (total = ${totsize}k)")) { + $def = 'y'; + $totsize += $rsize; + } else { + $def = 'n'; + delete $downloads{$fn}; } } } @@ -588,13 +586,11 @@ sub removeinstalled { my($pkg, $ver) = getdebinfo($fn); if(!defined($pkg) || !defined($ver)) { print "Could not get info for: $dir/$fn\n"; - } else { - if ($curpkgs{$pkg} and dcmpvers($ver, 'le', $curpkgs{$pkg})) { - print "deleting: $dir/$fn\n"; - unlink $fn; - } else { - print "leaving: $dir/$fn\n"; - } + } elsif ($curpkgs{$pkg} and dcmpvers($ver, 'le', $curpkgs{$pkg})) { + print "deleting: $dir/$fn\n"; + unlink $fn; + } else { + print "leaving: $dir/$fn\n"; } } else { print "non-debian: $dir/$fn\n"; diff --git a/dselect/po/bs.po b/dselect/po/bs.po index d099547..7a47dd9 100644 --- a/dselect/po/bs.po +++ b/dselect/po/bs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2006-02-17 08:55+0200\n" "Last-Translator: Safir Å ećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@linux.org.ba>\n" diff --git a/dselect/po/ca.po b/dselect/po/ca.po index 35da1ae..8889494 100644 --- a/dselect/po/ca.po +++ b/dselect/po/ca.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.10\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-12-17 19:34+0100\n" "Last-Translator: Guillem Jover <guillem@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" diff --git a/dselect/po/cs.po b/dselect/po/cs.po index ea9114e..5baa387 100644 --- a/dselect/po/cs.po +++ b/dselect/po/cs.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-01-26 13:52+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" diff --git a/dselect/po/da.po b/dselect/po/da.po index 2d41631..e678c04 100644 --- a/dselect/po/da.po +++ b/dselect/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2014-11-27 02:33+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" diff --git a/dselect/po/de.po b/dselect/po/de.po index 7181552..7b850ef 100644 --- a/dselect/po/de.po +++ b/dselect/po/de.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.22.0~\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-04-25 20:26+0200\n" "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot index c144dbf..7a0ae57 100644 --- a/dselect/po/dselect.pot +++ b/dselect/po/dselect.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: dpkg 1.22.4\n" +"Project-Id-Version: dpkg 1.22.5\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/dselect/po/el.po b/dselect/po/el.po index 05f9419..a200e49 100644 --- a/dselect/po/el.po +++ b/dselect/po/el.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2006-02-17 08:56+0200\n" "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" diff --git a/dselect/po/es.po b/dselect/po/es.po index 0fe405f..df6867b 100644 --- a/dselect/po/es.po +++ b/dselect/po/es.po @@ -40,7 +40,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-01-27 22:48+0100\n" "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" diff --git a/dselect/po/et.po b/dselect/po/et.po index ec4d54b..191e343 100644 --- a/dselect/po/et.po +++ b/dselect/po/et.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.14.5\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2007-07-13 08:22+0300\n" "Last-Translator: Ivar Smolin <okul@linux.ee>\n" "Language-Team: Estonian <et@li.org>\n" diff --git a/dselect/po/eu.po b/dselect/po/eu.po index 9bee4b2..28878df 100644 --- a/dselect/po/eu.po +++ b/dselect/po/eu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.16.8\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2012-09-01 12:21+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n" "Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n" diff --git a/dselect/po/fr.po b/dselect/po/fr.po index a829568..6220d3b 100644 --- a/dselect/po/fr.po +++ b/dselect/po/fr.po @@ -49,7 +49,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-02-05 23:47+0100\n" "Last-Translator: Sébastien Poher <sebastien@volted.net>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" diff --git a/dselect/po/gl.po b/dselect/po/gl.po index 0fcf965..c0c71c3 100644 --- a/dselect/po/gl.po +++ b/dselect/po/gl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2008-12-27 15:56+0100\n" "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n" "Language-Team: Galician <proxecto@trasno.net>\n" diff --git a/dselect/po/hu.po b/dselect/po/hu.po index 201531e..1dcb67c 100644 --- a/dselect/po/hu.po +++ b/dselect/po/hu.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2006-10-06 03:48+0100\n" "Last-Translator: SZERVÃC Attila <sas@321.hu>\n" "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n" diff --git a/dselect/po/id.po b/dselect/po/id.po index 0420aa6..701da41 100644 --- a/dselect/po/id.po +++ b/dselect/po/id.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2006-10-06 20:20+0700\n" "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n" "Language-Team: Indonesian <debian-l10n-indonesian@lists.debian.org>\n" diff --git a/dselect/po/it.po b/dselect/po/it.po index cbf8cee..793bf91 100644 --- a/dselect/po/it.po +++ b/dselect/po/it.po @@ -42,7 +42,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.10.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2006-10-06 22:01+0200\n" "Last-Translator: Stefano Canepa <sc@linux.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" diff --git a/dselect/po/ja.po b/dselect/po/ja.po index 6902094..4ebeb23 100644 --- a/dselect/po/ja.po +++ b/dselect/po/ja.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2016-03-31 12:44+0900\n" "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" diff --git a/dselect/po/ko.po b/dselect/po/ko.po index 941d9e1..c40d1fd 100644 --- a/dselect/po/ko.po +++ b/dselect/po/ko.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-01-29 11:18+0100\n" "Last-Translator: Sangdo Jun <sebuls@gmail.com>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" diff --git a/dselect/po/nb.po b/dselect/po/nb.po index 191aa7a..bfa8a76 100644 --- a/dselect/po/nb.po +++ b/dselect/po/nb.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2014-12-05 13:25+0200\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian BokmÃ¥l <i18n-nb@lister.ping.uio.no>\n" diff --git a/dselect/po/nl.po b/dselect/po/nl.po index e44ccc2..ce2ac89 100644 --- a/dselect/po/nl.po +++ b/dselect/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.22.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-09-11 21:13+0200\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" diff --git a/dselect/po/nn.po b/dselect/po/nn.po index 10dfd91..54d2239 100644 --- a/dselect/po/nn.po +++ b/dselect/po/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2006-02-17 08:57+0200\n" "Last-Translator: HÃ¥vard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" diff --git a/dselect/po/pl.po b/dselect/po/pl.po index 80c8e10..3b86f7a 100644 --- a/dselect/po/pl.po +++ b/dselect/po/pl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.15.4\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2014-12-21 20:58+0100\n" "Last-Translator: Åukasz Dulny <bartekchom@poczta.onet.pl>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" diff --git a/dselect/po/pt.po b/dselect/po/pt.po index d7dcbfb..3b3c051 100644 --- a/dselect/po/pt.po +++ b/dselect/po/pt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2014-11-30 13:28+0000\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po index 99a09a7..50a5222 100644 --- a/dselect/po/pt_BR.po +++ b/dselect/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2008-06-09 02:53-0300\n" "Last-Translator: Felipe Augusto van de Wiel <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." diff --git a/dselect/po/ro.po b/dselect/po/ro.po index ba8b7be..53f98ce 100644 --- a/dselect/po/ro.po +++ b/dselect/po/ro.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.22.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-09-13 20:15+0200\n" "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" diff --git a/dselect/po/ru.po b/dselect/po/ru.po index 7b22c1b..e997c97 100644 --- a/dselect/po/ru.po +++ b/dselect/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-01-31 22:38+0100\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" diff --git a/dselect/po/sk.po b/dselect/po/sk.po index 943485d..6649a46 100644 --- a/dselect/po/sk.po +++ b/dselect/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2012-07-03 01:09+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n" diff --git a/dselect/po/sv.po b/dselect/po/sv.po index d35d324..df4d071 100644 --- a/dselect/po/sv.po +++ b/dselect/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.22.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-10-24 18:29+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" diff --git a/dselect/po/tl.po b/dselect/po/tl.po index d10ad82..8f6e7c3 100644 --- a/dselect/po/tl.po +++ b/dselect/po/tl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2006-02-17 08:58+0200\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" diff --git a/dselect/po/vi.po b/dselect/po/vi.po index b29d262..b568758 100644 --- a/dselect/po/vi.po +++ b/dselect/po/vi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2014-12-01 08:20+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n" diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po index d76d5e1..4b76967 100644 --- a/dselect/po/zh_CN.po +++ b/dselect/po/zh_CN.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-01-27 15:29-0500\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n" diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po index ec7d512..af0e83b 100644 --- a/dselect/po/zh_TW.po +++ b/dselect/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-01-28 15:57+0800\n" "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n" "Language-Team: Chinese (traditional) <debian-l10n-chinese@lists.debian.org>\n" diff --git a/lib/Makefile.in b/lib/Makefile.in index e0644ac..a1a17a6 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -336,6 +336,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aclocaldir = @aclocaldir@ admindir = @admindir@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -343,6 +344,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ backupsdir = @backupsdir@ +bashcompletionsdir = @bashcompletionsdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -354,6 +356,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ devlibdir = @devlibdir@ docdir = @docdir@ +docspecdir = @docspecdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -371,10 +374,14 @@ localedir = @localedir@ localstatedir = @localstatedir@ logdir = @logdir@ mandir = @mandir@ +methodsdir = @methodsdir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +perllibdir = @perllibdir@ pkgconfdir = @pkgconfdir@ +pkgconfigdir = @pkgconfigdir@ +polkitactionsdir = @polkitactionsdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/lib/compat/Makefile.in b/lib/compat/Makefile.in index 05e090b..9b3c41c 100644 --- a/lib/compat/Makefile.in +++ b/lib/compat/Makefile.in @@ -399,6 +399,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aclocaldir = @aclocaldir@ admindir = @admindir@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -406,6 +407,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ backupsdir = @backupsdir@ +bashcompletionsdir = @bashcompletionsdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -417,6 +419,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ devlibdir = @devlibdir@ docdir = @docdir@ +docspecdir = @docspecdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -434,10 +437,14 @@ localedir = @localedir@ localstatedir = @localstatedir@ logdir = @logdir@ mandir = @mandir@ +methodsdir = @methodsdir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +perllibdir = @perllibdir@ pkgconfdir = @pkgconfdir@ +pkgconfigdir = @pkgconfigdir@ +polkitactionsdir = @polkitactionsdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index 9482e32..9ef3a37 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -17,16 +17,10 @@ LDADD = \ ../compat/libcompat.la \ # EOL -DISTCLEANFILES = -EXTRA_DIST = \ - $(test_scripts) \ - $(test_data) \ - libdpkg.map \ - libdpkg.pc.in \ - # EOL +EXTRA_DIST = +DISTCLEANFILES = -pkgconfigdir = $(devlibdir)/pkgconfig pkgconfig_DATA = libdpkg.pc devlib_LTLIBRARIES = libdpkg.la @@ -38,6 +32,7 @@ EXTRA_libdpkg_la_DEPENDENCIES = \ libdpkg_la_LDFLAGS = \ -no-undefined \ # EOL + if HAVE_LINKER_VERSION_SCRIPT libdpkg_la_LDFLAGS += \ -Wl,--version-script=$(srcdir)/libdpkg.map \ @@ -46,23 +41,22 @@ else libdpkg_la_LDFLAGS += \ -export-symbols libdpkg.sym \ # EOL + EXTRA_libdpkg_la_DEPENDENCIES += \ libdpkg.sym \ # EOL endif -libdpkg_la_LDFLAGS += $(MD_LIBS) + libdpkg_la_LIBADD = \ - ../compat/libcompat.la \ - # EOL -if BUILD_SHARED -libdpkg_la_LIBADD += \ - $(LIBINTL) \ $(Z_LIBS) \ $(LZMA_LIBS) \ $(ZSTD_LIBS) \ $(BZ2_LIBS) \ + $(MD_LIBS) \ + $(LIBINTL) \ + ../compat/libcompat.la \ # EOL -endif + libdpkg_la_SOURCES = \ dlist.h \ ar.c \ @@ -193,6 +187,11 @@ pkginclude_HEADERS = \ version.h \ # EOL +EXTRA_DIST += \ + libdpkg.map \ + libdpkg.pc.in \ + # EOL + DISTCLEANFILES += \ libdpkg.sym \ # EOL @@ -266,6 +265,11 @@ test_data = \ t/data/meminfo-ok \ # EOL +EXTRA_DIST += \ + $(test_scripts) \ + $(test_data) \ + # EOL + BENCHMARK_LDADD_FLAGS = \ $(RT_LIBS) \ $(LDADD) \ diff --git a/lib/dpkg/Makefile.in b/lib/dpkg/Makefile.in index a03e3d3..07f9005 100644 --- a/lib/dpkg/Makefile.in +++ b/lib/dpkg/Makefile.in @@ -113,14 +113,6 @@ host_triplet = @host@ @HAVE_LINKER_VERSION_SCRIPT_FALSE@ libdpkg.sym \ @HAVE_LINKER_VERSION_SCRIPT_FALSE@ # EOL -@BUILD_SHARED_TRUE@am__append_4 = \ -@BUILD_SHARED_TRUE@ $(LIBINTL) \ -@BUILD_SHARED_TRUE@ $(Z_LIBS) \ -@BUILD_SHARED_TRUE@ $(LZMA_LIBS) \ -@BUILD_SHARED_TRUE@ $(ZSTD_LIBS) \ -@BUILD_SHARED_TRUE@ $(BZ2_LIBS) \ -@BUILD_SHARED_TRUE@ # EOL - check_PROGRAMS = $(am__EXEEXT_1) t/b-fsys-hash$(EXEEXT) \ t/b-pkg-hash$(EXEEXT) t/c-tarextract$(EXEEXT) \ t/c-treewalk$(EXEEXT) t/c-trigdeferred$(EXEEXT) @@ -196,10 +188,10 @@ am__installdirs = "$(DESTDIR)$(devlibdir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(pkgincludedir)" LTLIBRARIES = $(devlib_LTLIBRARIES) am__DEPENDENCIES_1 = -@BUILD_SHARED_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ -@BUILD_SHARED_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -@BUILD_SHARED_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -libdpkg_la_DEPENDENCIES = ../compat/libcompat.la $(am__DEPENDENCIES_2) +libdpkg_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + ../compat/libcompat.la am_libdpkg_la_OBJECTS = ar.lo arch.lo atomic-file.lo buffer.lo \ c-ctype.lo cleanup.lo color.lo command.lo compress.lo dbdir.lo \ dbmodify.lo db-ctrl-access.lo db-ctrl-format.lo \ @@ -227,13 +219,13 @@ libdpkg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ t_b_fsys_hash_SOURCES = t/b-fsys-hash.c am__dirstamp = $(am__leading_dot)dirstamp t_b_fsys_hash_OBJECTS = t/b-fsys-hash.$(OBJEXT) -am__DEPENDENCIES_3 = libdpkg.la $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_2 = libdpkg.la $(am__DEPENDENCIES_1) \ ../compat/libcompat.la -am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) -t_b_fsys_hash_DEPENDENCIES = $(am__DEPENDENCIES_4) +am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +t_b_fsys_hash_DEPENDENCIES = $(am__DEPENDENCIES_3) t_b_pkg_hash_SOURCES = t/b-pkg-hash.c t_b_pkg_hash_OBJECTS = t/b-pkg-hash.$(OBJEXT) -t_b_pkg_hash_DEPENDENCIES = $(am__DEPENDENCIES_4) +t_b_pkg_hash_DEPENDENCIES = $(am__DEPENDENCIES_3) t_c_tarextract_SOURCES = t/c-tarextract.c t_c_tarextract_OBJECTS = t/c-tarextract.$(OBJEXT) t_c_tarextract_LDADD = $(LDADD) @@ -712,6 +704,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aclocaldir = @aclocaldir@ admindir = @admindir@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -719,6 +712,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ backupsdir = @backupsdir@ +bashcompletionsdir = @bashcompletionsdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -730,6 +724,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ devlibdir = @devlibdir@ docdir = @docdir@ +docspecdir = @docspecdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -747,10 +742,14 @@ localedir = @localedir@ localstatedir = @localstatedir@ logdir = @logdir@ mandir = @mandir@ +methodsdir = @methodsdir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +perllibdir = @perllibdir@ pkgconfdir = @pkgconfdir@ +pkgconfigdir = @pkgconfigdir@ +polkitactionsdir = @polkitactionsdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -782,21 +781,23 @@ LDADD = \ ../compat/libcompat.la \ # EOL +EXTRA_DIST = libdpkg.map libdpkg.pc.in $(test_scripts) $(test_data) # \ + EOL DISTCLEANFILES = libdpkg.sym # EOL -EXTRA_DIST = \ - $(test_scripts) \ - $(test_data) \ - libdpkg.map \ - libdpkg.pc.in \ - # EOL - -pkgconfigdir = $(devlibdir)/pkgconfig pkgconfig_DATA = libdpkg.pc devlib_LTLIBRARIES = libdpkg.la EXTRA_libdpkg_la_DEPENDENCIES = libdpkg.map $(am__append_3) -libdpkg_la_LDFLAGS = -no-undefined $(am__append_1) $(am__append_2) \ - $(MD_LIBS) -libdpkg_la_LIBADD = ../compat/libcompat.la $(am__append_4) +libdpkg_la_LDFLAGS = -no-undefined $(am__append_1) $(am__append_2) +libdpkg_la_LIBADD = \ + $(Z_LIBS) \ + $(LZMA_LIBS) \ + $(ZSTD_LIBS) \ + $(BZ2_LIBS) \ + $(MD_LIBS) \ + $(LIBINTL) \ + ../compat/libcompat.la \ + # EOL + libdpkg_la_SOURCES = \ dlist.h \ ar.c \ diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index 4d02520..0da51d6 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -37,6 +37,25 @@ #include <dpkg/file.h> /** + * Read the symlink content into a varbuf. + * + */ +ssize_t +file_readlink(const char *slink, struct varbuf *content, size_t content_len) +{ + ssize_t linksize; + + varbuf_reset(content); + varbuf_grow(content, content_len + 1); + + linksize = readlink(slink, content->buf, content->size); + varbuf_trunc(content, linksize); + varbuf_end_str(content); + + return linksize; +} + +/** * Check whether a filename is executable. * * @param filename The filename to check. diff --git a/lib/dpkg/file.h b/lib/dpkg/file.h index 0136f69..c1c25fa 100644 --- a/lib/dpkg/file.h +++ b/lib/dpkg/file.h @@ -48,6 +48,9 @@ struct file_stat { char *gname; }; +ssize_t +file_readlink(const char *slink, struct varbuf *content, size_t content_len); + bool file_is_exec(const char *filename); void file_copy_perms(const char *src, const char *dst); diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index e0b1152..b7bedef 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -161,6 +161,7 @@ LIBDPKG_PRIVATE { treewalk_close; treewalk; + file_readlink; file_is_exec; file_copy_perms; file_show; diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index a28983e..96af147 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -896,11 +896,10 @@ void copy_dependency_links(struct pkginfo *pkg, for (dop= dyp->list; dop; dop= dop->next) { if (dop->rev_prev) dop->rev_prev->rev_next = dop->rev_next; + else if (available) + dop->ed->depended.available = dop->rev_next; else - if (available) - dop->ed->depended.available = dop->rev_next; - else - dop->ed->depended.installed = dop->rev_next; + dop->ed->depended.installed = dop->rev_next; if (dop->rev_next) dop->rev_next->rev_prev = dop->rev_prev; } diff --git a/lib/dpkg/path-remove.c b/lib/dpkg/path-remove.c index 6afb376..e4d6ebe 100644 --- a/lib/dpkg/path-remove.c +++ b/lib/dpkg/path-remove.c @@ -37,9 +37,11 @@ int secure_unlink_statted(const char *pathname, const struct stat *stab) { - if (S_ISREG(stab->st_mode) ? (stab->st_mode & 07000) : - !(S_ISLNK(stab->st_mode) || S_ISDIR(stab->st_mode) || - S_ISFIFO(stab->st_mode) || S_ISSOCK(stab->st_mode))) { + mode_t mode = stab->st_mode; + + if (S_ISREG(mode) ? (mode & 07000) : + !(S_ISLNK(mode) || S_ISDIR(mode) || + S_ISFIFO(mode) || S_ISSOCK(mode))) { if (chmod(pathname, 0600)) return -1; } diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c index d999db6..48e3c38 100644 --- a/lib/dpkg/tarfn.c +++ b/lib/dpkg/tarfn.c @@ -348,10 +348,15 @@ tar_header_decode(struct tar_header *h, struct tar_entry *d, struct dpkg_error * * The way the GNU long{link,name} stuff works is like this: * * - The first header is a “dummy†header that contains the size of the - * filename. - * - The next N headers contain the filename. + * filename (GNU tar includes the terminating NUL character in the size, + * but other implementations do not). + * - The next N headers contain the filename (GNU tar terminates the string + * with a NUL character, but other implementations do not). * - After the headers with the filename comes the “real†header with a * bogus name or link. + * + * To be robust against any input, we need to always terminate the filename + * with a NUL character. */ static int tar_gnu_long(struct tar_archive *tar, struct tar_entry *te, char **longp) diff --git a/lib/dpkg/version.c b/lib/dpkg/version.c index e9bc4bb..f29c520 100644 --- a/lib/dpkg/version.c +++ b/lib/dpkg/version.c @@ -74,8 +74,8 @@ order(int c) return -1; else if (c) return c + 256; - else - return 0; + + return 0; } static int diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4 index 860d0d4..74897f5 100644 --- a/m4/dpkg-build.m4 +++ b/m4/dpkg-build.m4 @@ -7,7 +7,6 @@ AC_DEFUN([DPKG_BUILD_SHARED_LIBS], [ AS_IF([test "$enable_shared" = "yes" && test -z "$AUTHOR_TESTING"], [ AC_MSG_ERROR([building libdpkg as a shared library is not supported]) ]) - AM_CONDITIONAL([BUILD_SHARED], [test "$enable_shared" = "yes"]) ])# DPKG_BUILD_SHARED_LIBS # DPKG_BUILD_RELEASE_DATE() diff --git a/m4/dpkg-progs.m4 b/m4/dpkg-progs.m4 index c4af8db..cd18ba1 100644 --- a/m4/dpkg-progs.m4 +++ b/m4/dpkg-progs.m4 @@ -79,6 +79,8 @@ AC_DEFUN([DPKG_PROG_PERL], [ $r =~ s/$Config{vendorprefixexp}/\$(prefix)/; print $r') ]) + DPKG_WITH_DIR([perllibdir], [${PERL_LIBDIR}], + [perl modules directory]) ])# DPKG_PROG_PERL # DPKG_PROG_PO4A diff --git a/man/Makefile.am b/man/Makefile.am index 5b437a3..4f4e462 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +EXTRA_DIST = +CLEANFILES = + man_MANS = \ deb-buildinfo.5 \ deb-changelog.5 \ @@ -80,9 +83,7 @@ man_MANS += \ # EOL endif -CLEANFILES = $(man_MANS) - -EXTRA_DIST = \ +EXTRA_DIST += \ po/ChangeLog.old \ po/dpkg-man.pot \ po/po4a.cfg \ @@ -155,6 +156,8 @@ EXTRA_DIST += \ update-alternatives.pod \ # EOL +CLEANFILES += $(man_MANS) + # Extract the list of languages from the po4a config file. LINGUAS_DIST = `$(SED) -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg` diff --git a/man/Makefile.in b/man/Makefile.in index e4e2506..989e7cf 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -326,6 +326,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aclocaldir = @aclocaldir@ admindir = @admindir@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -333,6 +334,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ backupsdir = @backupsdir@ +bashcompletionsdir = @bashcompletionsdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -344,6 +346,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ devlibdir = @devlibdir@ docdir = @docdir@ +docspecdir = @docspecdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -361,10 +364,14 @@ localedir = @localedir@ localstatedir = @localstatedir@ logdir = @logdir@ mandir = @mandir@ +methodsdir = @methodsdir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +perllibdir = @perllibdir@ pkgconfdir = @pkgconfdir@ +pkgconfigdir = @pkgconfigdir@ +polkitactionsdir = @polkitactionsdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -378,25 +385,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zshcompletionsdir = @zshcompletionsdir@ -man_MANS = deb-buildinfo.5 deb-changelog.5 deb-changes.5 \ - deb-conffiles.5 deb-control.5 deb-extra-override.5 \ - deb-md5sums.5 deb-old.5 deb-origin.5 deb-override.5 \ - deb-postinst.5 deb-postrm.5 deb-preinst.5 deb-prerm.5 \ - deb-shlibs.5 deb-split.5 deb-src-control.5 deb-src-files.5 \ - deb-src-rules.5 deb-src-symbols.5 deb-substvars.5 \ - deb-symbols.5 deb-triggers.5 deb-version.7 deb.5 deb822.5 \ - dpkg-architecture.1 dpkg-build-api.7 dpkg-buildapi.1 \ - dpkg-buildflags.1 dpkg-buildpackage.1 dpkg-buildtree.1 \ - dpkg-checkbuilddeps.1 dpkg-deb.1 dpkg-distaddfile.1 \ - dpkg-divert.1 dpkg-fsys-usrunmess.8 dpkg-genbuildinfo.1 \ - dpkg-genchanges.1 dpkg-gencontrol.1 dpkg-gensymbols.1 \ - dpkg-maintscript-helper.1 dpkg-mergechangelogs.1 dpkg-name.1 \ - dpkg-parsechangelog.1 dpkg-query.1 dpkg-realpath.1 \ - dpkg-scanpackages.1 dpkg-scansources.1 dpkg-shlibdeps.1 \ - dpkg-source.1 dpkg-split.1 dpkg-statoverride.1 dpkg-trigger.1 \ - dpkg-vendor.1 dpkg.1 dpkg.cfg.5 dsc.5 $(am__append_1) \ - $(am__append_2) $(am__append_3) -CLEANFILES = $(man_MANS) # Man page sources. EXTRA_DIST = po/ChangeLog.old po/dpkg-man.pot po/po4a.cfg \ @@ -421,6 +409,25 @@ EXTRA_DIST = po/ChangeLog.old po/dpkg-man.pot po/po4a.cfg \ dpkg-vendor.pod dpkg.cfg.pod dpkg.pod dsc.pod dselect.cfg.pod \ dselect.pod start-stop-daemon.pod update-alternatives.pod # \ EOL +CLEANFILES = $(man_MANS) +man_MANS = deb-buildinfo.5 deb-changelog.5 deb-changes.5 \ + deb-conffiles.5 deb-control.5 deb-extra-override.5 \ + deb-md5sums.5 deb-old.5 deb-origin.5 deb-override.5 \ + deb-postinst.5 deb-postrm.5 deb-preinst.5 deb-prerm.5 \ + deb-shlibs.5 deb-split.5 deb-src-control.5 deb-src-files.5 \ + deb-src-rules.5 deb-src-symbols.5 deb-substvars.5 \ + deb-symbols.5 deb-triggers.5 deb-version.7 deb.5 deb822.5 \ + dpkg-architecture.1 dpkg-build-api.7 dpkg-buildapi.1 \ + dpkg-buildflags.1 dpkg-buildpackage.1 dpkg-buildtree.1 \ + dpkg-checkbuilddeps.1 dpkg-deb.1 dpkg-distaddfile.1 \ + dpkg-divert.1 dpkg-fsys-usrunmess.8 dpkg-genbuildinfo.1 \ + dpkg-genchanges.1 dpkg-gencontrol.1 dpkg-gensymbols.1 \ + dpkg-maintscript-helper.1 dpkg-mergechangelogs.1 dpkg-name.1 \ + dpkg-parsechangelog.1 dpkg-query.1 dpkg-realpath.1 \ + dpkg-scanpackages.1 dpkg-scansources.1 dpkg-shlibdeps.1 \ + dpkg-source.1 dpkg-split.1 dpkg-statoverride.1 dpkg-trigger.1 \ + dpkg-vendor.1 dpkg.1 dpkg.cfg.5 dsc.5 $(am__append_1) \ + $(am__append_2) $(am__append_3) # Extract the list of languages from the po4a config file. LINGUAS_DIST = `$(SED) -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg` diff --git a/man/de/dpkg-buildapi.pod b/man/de/dpkg-buildapi.pod index e0abae5..f4fdf45 100644 --- a/man/de/dpkg-buildapi.pod +++ b/man/de/dpkg-buildapi.pod @@ -30,10 +30,6 @@ Dieses Programm wurde in Dpkg 1.22.0 hinzugefügt. =over -=item B<-c>I<Steuerdatei> - -Gibt die Haupt-B<control>-Datei an, aus der Informationen gelesen werden sollen. Standardmäßig F<debian/control>. - =item B<--help> Zeigt einen Hinweis zum Aufruf und beendet das Programm. @@ -44,6 +40,16 @@ Gibt die Version aus und beendet das Programm. =back +=head1 OPTIONEN + +=over + +=item B<-c>I<Steuerdatei> + +Gibt die Haupt-B<control>-Datei an, aus der Informationen gelesen werden sollen. Standardmäßig F<debian/control>. + +=back + =head1 UMGEBUNG =over diff --git a/man/de/dpkg-buildflags.pod b/man/de/dpkg-buildflags.pod index 6cd6f0c..091cece 100644 --- a/man/de/dpkg-buildflags.pod +++ b/man/de/dpkg-buildflags.pod @@ -179,7 +179,7 @@ Zum Beispiel: =item B<--query-features> I<Bereich> -Gibt die Funktionalitäten, die für den übergebenen Bereich aktiviert sind, aus (seit Dpkg 1.16.2). Falls die Funktionalität als eingebaute Vorgabe durch den Compiler gehandhabt wird (selbst wenn nur für einige Architekturen), dann wird das Feld B<Builtin> ausgegeben (seit Dpkg 1.21.14). Die einzigen unter Debian und abgeleiteten Distributionen derzeit erkannten Bereiche sind B<future>, B<qa>, B<reproducible>, B<sanitize> und B<hardening>. Lesen Sie den Abschnitt B<FUNKTIONALITÄTSBEREICHE> für weitere Details. Beendet sich mit 0, falls der Bereich bekannt ist, andernfalls mit 1. +Gibt die Funktionalitäten, die für den übergebenen Bereich aktiviert sind, aus (seit Dpkg 1.16.2). Falls die Funktionalität als eingebaute Vorgabe durch den Compiler gehandhabt wird (selbst wenn nur für einige Architekturen), dann wird das Feld B<Builtin> ausgegeben (seit Dpkg 1.21.14). Lesen Sie den Abschnitt B<FUNKTIONALITÄTSBEREICHE> für weitere Details zu den aktuell erkannten Bereichen. Beendet sich mit 0, falls der Bereich bekannt ist, andernfalls mit 1. Die Ausgabe ist im RFC822-Format, mit einem Abschnitt pro Funktionalität. Beispiel: @@ -290,13 +290,30 @@ Neue Schalter können in Zukunft hinzugefügt werden, falls die Notwendigkeit au =head1 FUNKTIONALITÄTSBEREICHE -Jede Bereichsfunktionalität kann durch den entsprechenden Bereichswert in den Umgebungsvariablen B<DEB_BUILD_OPTIONS> und B<DEB_BUILD_MAINT_OPTIONS> mit den ‚B<+>’- und ‚B<->’-Schaltern aktiviert und deaktiviert werden. Soll beispielsweise für B<hardening> die „pie“-Funktionalität aktiviert und die „fortify“-Funktionalität deaktiviert werden, können Sie Folgendes in B<debian/rules> verwenden: +Funktionalitätsbereiche sind derzeit Lieferanten-spezifisch und die nachfolgend beschriebenen werden nur unter Debian und abgeleiteten Distributionen erkannt. - export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify +Jeder Funktionalitätsbereich kann in dem Bereichswert der Umgebungsvariablen B<DEB_BUILD_OPTIONS> und B<DEB_BUILD_MAINT_OPTIONS> durch die Wandler »B<+>« und »B<->« aktiviert oder deaktiviert werden. Gemäß der allgemeine Syntax dieser Variablen (in L<dpkg-buildpackage(1)> beschrieben) können mehrere Funktionalitätsbereiche getrennt durch Leerzeichen angegeben werden, wobei jede die Funktionalitätskennzeichner als verpflichtende Parameter nach einem Gleichzeichen (»B<=>«) erhält. Die Funktionalitätskennzeichner werden durch Kommata getrennt und von links nach rechts ausgewertet, wobei die Einstellungen innerhalb des gleichen Funktionalitätskennzeichners die vorhergehenden außer Kraft setzen, selbst falls die Funktionalitätskennzeichner über mehrere, durch Leerzeichen getrennte Funktionalitätsbereichseinstellungen für den gleichen Bereich verteilt sind. + +Um beispielsweise die B<hardening>-Funktionalität »pie« zu aktivieren und die Funktionalität »fortify« zu deaktivieren, können Sie folgendes in B<debian/rules> verwenden: + + export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify Die spezielle Funktionalität B<all> (in allen Bereichen gültig) kann dazu verwandt werden, alle Bereichsfunktionalitäten auf einmal zu aktivieren oder zu deaktivieren. Um daher alles im Bereich B<hardening> zu deaktivieren und nur „format“ und „fortify“ zu aktiveren, kann Folgendes eingesetzt werden: - export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify + export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify + +Es können mehrere Funktionalitätsbereiche gesetzt werden: + + export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs + +Das Außerkraftsetzenverhalten gilt auch für die besondere Funktionalität B<all>, sowie bestimmten Funktionalitäten, wodurch Zusammensetzungen ermöglicht werden sollten. Um daher »lfs« im Bereich B<abi> zu aktivieren und nur »pie« und »fortify« in dem Bereich B<hardening>, aber »format« nur, wenn CONDITION definiert ist, könnte dies wie folgt passieren: + + export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+pie,+format abi=+lfs + … + DEB_BUILD_MAINT_OPTIONS += hardening=+fortify + ifdef CONDITION + DEB_BUILD_MAINT_OPTIONS += hardening=-format + endif =head2 abi @@ -312,7 +329,11 @@ Wenn diese Funktionalität aktiviert ist, wird sie den Wert aus der gleichen Fun =item B<time64> -Diese Einstellung (seit Dpkg 1.22.0; standardmäßig deaktiviert) aktiviert die Unterstützung von 64-bit time_t auf 32-bit-Architekturen bei denen das ABI dies nicht standardmäßig enthält, indem B<-D_TIME_BITS=64> zu B<CPPFLAGS> hinzugefügt wird. Diese Einstellung aktiviert automatisch die Funktionalität B<lfs>, da sie diese benötigt. +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. + +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. + +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>. =back diff --git a/man/de/dpkg-buildpackage.pod b/man/de/dpkg-buildpackage.pod index 214843c..4ba26b6 100644 --- a/man/de/dpkg-buildpackage.pod +++ b/man/de/dpkg-buildpackage.pod @@ -514,7 +514,7 @@ Falls gesetzt, wird er zum Signieren der B<.changes>-, B<.buildinfo>- und B<.dsc =item B<DEB_BUILD_OPTIONS> -Falls gesetzt, wird sie eine durch Leerraumzeichen getrennte Liste von Optionen enthalten, die das Verhalten einiger im Paketbau beteiligter Dpkg-Werkzeuge beeinflusst und möglicherweise den Paketbauprozess beeinflusst, falls der Code in F<debian/rules> sie berücksichtigt. +Falls gesetzt, wird sie eine durch Leerraumzeichen getrennte Liste von Optionen enthalten, die das Verhalten einiger im Paketbau beteiligter Dpkg-Werkzeuge beeinflusst und möglicherweise den Paketbauprozess beeinflusst, falls der Code in F<debian/rules> sie berücksichtigt. Bei diesen Optionen können Parameter direkt nach einem Gleichzeichen (»B<=>«) gesetzt werden. Für Optionen, die mehrere Parameter akzeptieren, werden diese nicht durch Leerzeichen getrennt, da diese für separate Optionen reserviert sind. Die folgenden Optionen sind den Dpkg-Werkzeugen bekannt und werden von ihnen unterstützt, andere von F<debian/rules> berücksichtigte Optionen könnnten in Distributions-spezifischen Richtlinien definiert sein. @@ -540,6 +540,22 @@ Das F<debian/rules> in der Paketierung sollte sicherstellen, dass die Fehlersuch B<dpkg-buildpackage> wird den Schalter B<--no-print-directory> von L<make(1)> an die Umgebungsvariable B<MAKEFLAGS> anhängen. Das F<debian/rules> in der Paketierung sollte die Ausführlichkeit reduzieren, aber nicht komplett still sein. +=item B<hardening=>I<Funktionalitätspezi> + +=item B<reproducible=>I<Funktionalitätspezi> + +=item B<abi=>I<Funktionalitätspezi> + +=item B<future=>I<Funktionalitätspezi> + +=item B<qa=>I<Funktionalitätspezi> + +=item B<optimize=>I<Funktionalitätspezi> + +=item B<sanitize=>I<Funktionalitätspezi> + +Dies sind die Funktionalitätsbereiche, die die Bauschalter-Funktionalitäten steuern. Lesen Sie L<dpkg-buildflags(1)> zu weiteren Details. + =back =item B<DEB_BUILD_PROFILES> diff --git a/man/de/dpkg-parsechangelog.pod b/man/de/dpkg-parsechangelog.pod index 442c18f..2b275b8 100644 --- a/man/de/dpkg-parsechangelog.pod +++ b/man/de/dpkg-parsechangelog.pod @@ -34,7 +34,7 @@ Gibt die Changelog-Datei an, aus der Informationen gelesen werden sollen. Ein †=item B<-F> I<Changelog-Format> -Gibt das Format der Changelog-Datei an. Standardmäßig wird das Format aus einer speziellen Zeile in der Nähe des Endes der Changelogs gelesen oder, falls dies fehlschlägt, wird das B<debian>-Standardformat angenommen. Siehe auch B<CHANGELOG-FORMATE>. +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 L</CHANGELOG FORMATS>. =item B<-L> I<libverzeichnis> diff --git a/man/de/dpkg-shlibdeps.pod b/man/de/dpkg-shlibdeps.pod index ddd633f..5ad5b22 100644 --- a/man/de/dpkg-shlibdeps.pod +++ b/man/de/dpkg-shlibdeps.pod @@ -50,7 +50,7 @@ Vom Paket bereitgestellte Abhängigkeitsinformationen für Laufzeitbibliotheken. Während des Durchsuchens aller vom Programm verwendeten Symbole erinnert sich B<dpkg-shlibdeps> an die (höchste) Minimalversion, die von jeder Bibliothek benötigt wird. Am Ende des Prozesses ist es in der Lage, die minimale Abhängigkeit für jede eingesetzte Bibliothek zu schreiben (vorausgesetzt, die Informationen in den I<Symbol>-Dateien sind korrekt). -Als Sicherheitsmaßnahme kann eine Symbols-Datei ein Meta-Informationsfeld B<Build-Depends-Package> enthalten. B<dpkg-shlibdeps> entnimmt dann die minimale Version, die von dem korrespondierenden Paket im Feld B<Build-Depends> benötigt wird, und verwendet diese Version, falls sie höher ist als die minimale Version, die beim Durchsuchen der Symbole ermittelt wurde. +As a safe-guard measure, a symbols file can provide a B<Build-Depends-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. =head2 Shlibs-Dateien diff --git a/man/dpkg-buildapi.pod b/man/dpkg-buildapi.pod index de26701..49c8d47 100644 --- a/man/dpkg-buildapi.pod +++ b/man/dpkg-buildapi.pod @@ -36,11 +36,6 @@ This program was introduced in dpkg 1.22.0. =over -=item B<-c>I<control-file> - -Specifies the main source control file to read information from. -The default is F<debian/control>. - =item B<--help> Show the usage message and exit. @@ -51,6 +46,17 @@ Show the version and exit. =back +=head1 OPTIONS + +=over + +=item B<-c>I<control-file> + +Specifies the main source control file to read information from. +The default is F<debian/control>. + +=back + =head1 ENVIRONMENT =over diff --git a/man/dpkg-buildflags.pod b/man/dpkg-buildflags.pod index 6673a65..7b31238 100644 --- a/man/dpkg-buildflags.pod +++ b/man/dpkg-buildflags.pod @@ -239,10 +239,8 @@ 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. +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. The output is in RFC822 format, with one section per feature. @@ -401,20 +399,51 @@ to support other languages). =head1 FEATURE AREAS +Feature areas are currently vendor specific, +and the ones described below are only recognized on Debian and derivatives. + 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. +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. + For example, to enable the B<hardening> “pie†feature and disable the “fortify†feature you can do this in B<debian/rules>: - export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify + export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify The special feature B<all> (valid in any area) can be used to enable or disable all area features at the same time. Thus disabling everything in the B<hardening> area and enabling only “format†and “fortify†can be achieved with: - export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify + export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify + +Multiple feature areas can be set: + + export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs + +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: + + export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+pie,+format abi=+lfs + … + DEB_BUILD_MAINT_OPTIONS += hardening=+fortify + ifdef CONDITION + DEB_BUILD_MAINT_OPTIONS += hardening=-format + endif =head2 abi @@ -436,10 +465,33 @@ feature in the B<future> feature area. =item B<time64> -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. + +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. + +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>. =back diff --git a/man/dpkg-buildpackage.pod b/man/dpkg-buildpackage.pod index a145d12..f90471d 100644 --- a/man/dpkg-buildpackage.pod +++ b/man/dpkg-buildpackage.pod @@ -753,6 +753,11 @@ 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. +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. The following are the options known and supported by dpkg tools, other options honored by F<debian/rules> might be defined by distribution @@ -791,6 +796,23 @@ flag to the B<MAKEFLAGS> environment variable. The F<debian/rules> in the packaging should reduce verbosity, while not being completely quiet. +=item B<hardening=>I<feature-spec> + +=item B<reproducible=>I<feature-spec> + +=item B<abi=>I<feature-spec> + +=item B<future=>I<feature-spec> + +=item B<qa=>I<feature-spec> + +=item B<optimize=>I<feature-spec> + +=item B<sanitize=>I<feature-spec> + +These are feature areas that control build flag features. +See L<dpkg-buildflags(1)> for further details. + =back =item B<DEB_BUILD_PROFILES> diff --git a/man/dpkg-parsechangelog.pod b/man/dpkg-parsechangelog.pod index d2d3e09..beed51a 100644 --- a/man/dpkg-parsechangelog.pod +++ b/man/dpkg-parsechangelog.pod @@ -54,8 +54,7 @@ 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>. +See also L</CHANGELOG FORMATS>. =item B<-L> I<libdir> diff --git a/man/dpkg-shlibdeps.pod b/man/dpkg-shlibdeps.pod index 0988775..3d04e79 100644 --- a/man/dpkg-shlibdeps.pod +++ b/man/dpkg-shlibdeps.pod @@ -120,8 +120,8 @@ library used (provided that the information of the I<symbols> files are accurate). As a safe-guard measure, a symbols file can provide a -B<Build-Depends-Package> meta-information field and -B<dpkg-shlibdeps> +B<Build-Depends-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. diff --git a/man/fr/dpkg-buildpackage.pod b/man/fr/dpkg-buildpackage.pod deleted file mode 100644 index cbce09a..0000000 --- a/man/fr/dpkg-buildpackage.pod +++ /dev/null @@ -1,631 +0,0 @@ - - ***************************************************** - * GENERATED FILE, DO NOT EDIT * - * THIS IS NO SOURCE FILE, BUT RESULT OF COMPILATION * - ***************************************************** - -This file was generated by po4a(7). Do not store it (in VCS, for example), -but store the PO file used as source file by po4a-translate. - -In fact, consider this as a binary, and the PO file as a regular .c file: -If the PO get lost, keeping this translation up-to-date will be harder. - -=encoding UTF-8 - -=head1 NOM - -dpkg-buildpackage - Construire depuis les sources des paquets binaires ou sources - -=head1 SYNOPSIS - -B<dpkg-buildpackage> [I<option>...] - -=head1 DESCRIPTION - -B<dpkg-buildpackage> est un programme qui permet d'automatiser la construction d'un paquet Debian. Il comporte les étapes S<suivantes :> - -=over - -=item B<1.> - -It runs the B<preinit> hook before reading any source file. It prepares the build environment by setting various environment variables (see B<ENVIRONMENT>), runs the B<init> hook, and calls B<dpkg-source --before-build> (unless B<-T> or B<--target> has been used). - -=item B<2.> - -Contrôle des dépendances de construction et des conflits de construction (non effectué si B<-d> ou B<--no-check-builddeps> sont utilisés). - -=item B<3.> - -Si une ou plusieurs cibles particulières ont été indiquées avec les options B<-T> ou B<--target>, appel de ces cibles et arrêt. Dans le cas contraire, exécution du point d'entrée B<preclean> et appel de B<fakeroot debian/rules clean> pour nettoyage de l'arborescence source (sauf si B<-nc> ou B<--no-pre-clean> ont été utilisés). - -=item B<4.> - -Exécution du point d'entrée B<source> et appel de B<dpkg-source -b> pour créer le paquet source (si une construction B<source> a été demandée avec B<--build> ou des options équivalentes). - -=item B<5.> - -Exécution du point d'entrée B<build> et appel de B<debian/rules> I<build-target>, puis exécution du point d'entrée B<binary> suivie de B<fakeroot debian/rules> I<binary-target> (sauf si une construction source seule a été demandée avec B<--build=source> ou des options équivalentes). Noter que I<build-target> et I<binary-target> sont soit B<build> et B<binary> (cas par défaut, ou si une construction B<any> et B<all> a été demandée avec B<--build> ou des options équivalentes), soit B<build-arch> et B<binary-arch> (si une construction B<any> et pas B<all> a été demandée avec B<--build> ou des options équivalentes), soit B<build-indep> et B<binary-indep> (si une construction B<all> et pas B<any> a été demandée avec B<--build> ou des options équivalentes). - -=item B<6.> - -Exécution du point d'entrée B<buildinfo> et appel de B<dpkg-genbuildinfo> pour créer un fichier B<.buildinfo>. De nombreuses options de B<dpkg-buildpackage> sont passées à B<dpkg-genbuildinfo>. - -=item B<7.> - -It runs the B<changes> hook and calls B<dpkg-genchanges> to generate a B<.changes> file. The name of the B<.changes> file will depend on the type of build and will be as specific as necessary but not more; the name will be: - -=over - -=item I<source-name>B<_>I<binary-version>B<_>I<arch>B<.changes> - -for a build that includes B<any> - -=item I<source-name>B<_>I<binary-version>B<_>B<all.changes> - -otherwise for a build that includes B<all> - -=item I<source-name>B<_>I<source-version>B<_>B<source.changes>. - -otherwise for a build that includes B<source> - -=back - -Many B<dpkg-buildpackage> options are forwarded to B<dpkg-genchanges>. - -=item B<8.> - -Exécution du point d'entrée B<postclean> et si B<-tc> ou B<--post-clean> sont utilisés, appel de B<fakeroot debian/rules clean> à nouveau. - -=item B<9.> - -Appel de B<dpkg-source --after-build>. - -=item B<10.> - -Exécution du point d'entrée B<check> et appel d'un contrôleur de paquet pour le fichier B<.changes> (dans le cas où une commande est spécifiée dans B<DEB_CHECK_COMMAND> ou avec B<--check-command>). - -=item B<11.> - -Exécution du point d'entrée B<sign> et signature avec le dorsal OpenPGP (à condition que ce ne soit pas une construction pour UNRELEASED, ou si B<--no-sign> est spécifié), pour signature des fichiers B<.dsc> (sauf si B<-us> ou si B<--unsigned-source> sont spécifiés), B<.buildinfo> (sauf si B<-ui>, B<--unsigned-buildinfo>, B<-uc> ou B<--unsigned-changes> sont spécifiés) et B<.changes> (sauf si B<-uc> ou B<--unsigned-changes> sont spécifiés). - -=item B<12.> - -Exécution du point d'entrée B<done>. - -=back - -=head1 OPTIONS - -Toutes les options longues peuvent être spécifiées à la fois sur la ligne de commande et dans les fichiers de configuration utilisateur et de système B<dpkg-buildpackage>. Chaque ligne du fichier de configuration est soit une option (identique à une option en ligne de commande mais sans tiret), soit un commentaire (si elle commence par S<« B<#> »).> - -=over - -=item B<--build=>I<type> - -Indique le I<type> de construction à partir d'une liste de composants séparés par des virgules (depuis S<dpkg 1.18.5).> Tous les composants indiqués sont combinés pour choisir l'unique type de construction à utiliser, ce qui implique qu'une seule construction est exécuté avec la génération d'un seul fichier F<.changes>. Passé à B<dpkg-genchanges>. - -Les valeurs autorisées S<sont :> - -=over - -=item B<source> - -Construit le paquet source. - -B<Note>: When using this value standalone and if what you want is simply to (re-)build the source package from a clean source tree, using B<dpkg-source> directly is always a better option as it does not require any build dependencies to be installed which are otherwise needed to be able to call the B<clean> target. - -=item B<any> - -Construit les paquets binaires spécifiques à l'architecture. - -=item B<all> - -Construit les paquets binaires indépendants de l'architecture. - -=item B<binary> - -Construit les paquets binaires particuliers et indépendants de l'architecture. C'est un alias de B<any,all>. - -=item B<full> - -Construction complète. C'est un alias de B<source,any,all>, et il est identique au cas par défaut où aucune option de construction n'est indiquée. - -=back - -=item B<-g> - -Équivalent de B<--build=source,all> (depuis S<dpkg 1.17.11).> - -=item B<-G> - -Équivalent de B<--build=source,any> (depuis S<dpkg 1.17.11).> - -=item B<-b> - -Équivalent de B<--build=binary> ou B<--build=any,all>. - -=item B<-B> - -Équivalent de B<--build=any> - -=item B<-A> - -Équivalent de B<--build=all>. - -=item B<-S> - -Équivalent à B<--build=source>. - -=item B<-F> - -Équivalent de B<--build=full>, B<--build=source,binary> ou B<--build=source,any,all> (depuis S<dpkg 1.15.8).> - -=item B<--target=>I<cible>[,...] - -=item B<--target> I<cible>[,...] - -=item B<-T>, B<--rules-target=>I<cible>[,...] - -Appelle B<debian/rules> I<cible> une fois par cible spécifiée, après avoir mis en place l'environnement de construction (sauf pour appeler B<dpkg-source --before-build>), puis interrompt le processus de construction (depuis S<dpkg 1.15.0,> option longue depuis S<dpkg 1.18.8,> pris en charge de multiples cibles depuis S<dpkg 1.18.16).> Si B<--as-root> est également utilisé, la commande sera exécutée avec les privilèges du superutilisateur (voir B<--root-command>). Noter que les cibles connues dont l'exécution par root est imposée n'ont pas besoin de cette option (c'est-à -dire les cibles B<clean>, B<binary>, B<binary-arch> et B<binary-indep>). - -=item B<--as-root> - -N'est utile qu'avec B<--target> (depuis S<dpkg 1.15.0).> Impose d'exécuter la cible avec les privilèges du superutilisateur. - -=item B<-si> - -=item B<-sa> - -=item B<-sd> - -=item B<-v>I<version> - -=item B<-C>I<description-des-changements> - -=item B<-m>I<adresse-du-responsable> - -=item B<-e>I<adresse-du-responsable> - -Passé tel quel à B<dpkg-genchanges>. Voir sa page de manuel. - -=item B<--build-by=>I<adresse-du-responsable> - -=item B<--source-by=>I<adresse-du-responsable> (depuis S<dpkg 1.21.10)> - -Passé comme B<-m> à B<dpkg-genchanges>. Voir sa page de manuel. - -=item B<--release-by=>I<adresse-du-responsable> - -=item B<--changed-by=>I<adresse-du-responsable> (depuis S<dpkg 1.21.10)> - -Passé comme B<-e> à B<dpkg-genchanges>. Voir sa page de manuel. - -=item B<-a>, B<--host-arch> I<architecture> - -Précise l'architecture Debian pour laquelle on construit (option longue depuis S<dpkg 1.17.17).> L'architecture de la machine sur laquelle on construit est automatiquement déterminée ; c'est aussi l'architecture par défaut de la machine hôte. - -=item B<-t>, B<--host-type> I<type-de-système-gnu> - -Précise le type de système GNU pour lequel on construit (option longue depuis S<dpkg 1.17.17).> Il peut être utilisé à la place de B<--host-arch> ou en tant que complément afin de remplacer le type de système GNU par défaut de l'architecture Debian hôte. - -=item B<--target-arch> I<architecture> - -Précise l'architecture Debian pour laquelle les binaires compilés vont construire (depuis S<dpkg 1.17.17).> La valeur par défaut est l'architecture de la machine hôte. - -=item B<--target-type> I<type-de-système-gnu> - -Précise le type de système GNU pour lequel les binaires compilés vont construire (depuis S<dpkg 1.17.17).> Il peut être utilisé à la place de B<--target-arch> ou en tant que complément afin de remplacer le type de système GNU par défaut de l'architecture Debian cible. - -=item B<-P>, B<--build-profiles=>I<profil>[B<,>...] - -Précise le ou les profils que l'on construit, sous forme d'une liste séparée par des virgules (depuis S<dpkg 1.17.2,> option longue depuis S<dpkg 1.18.8).> Le comportement par défaut est de construire pour un profil non spécifique. Cela les définit également (sous la forme d'une liste séparée par des espaces) en tant que variable d'environnement B<DEB_BUILD_PROFILES>, ce qui permet, par exemple, au fichiers B<debian/rules> d'utiliser cette information pour des constructions conditionnelles. - -=item B<-j>, B<--jobs>[I<tâches>|B<auto>] - -Spécifier le nombre de processus simultanés qui peuvent être exécutés (option longue depuis S<dpkg 1.18.8).> Le nombre de tâches correspondant au nombre de processeurs en ligne si B<auto> est indiquée (depuis S<dpkg 1.17.10),> ou un nombre illimité si I<jobs> n'est pas indiqué. Le comportement par défaut est B<auto> S<(depuis dpkg> 1.18.11) en mode non forcé (depuis S<dpkg 1.21.10)> et, à ce titre, il est plus sûr de l'utiliser avec tous les paquets y compris ceux qui ne sont pas sécurisés pour une construction parallèle. Fixer le nombre de tâches à B<1> rétablira une exécution sérielle. - -L'option ajoutera B<parallel=>I<tâches> ou B<parallel> à la variable d'environnement B<DEB_BUILD_OPTIONS> ce qui permet aux fichiers debian/rules de choisir d'utiliser cette information pour leurs propres besoins. La valeur I<jobs> remplacera les options B<parallel=>I<tâches> ou B<parallel> dans la variable d'environnement B<DEB_BUILD_OPTIONS>. Notez que la valeur B<auto> sera remplacée par le nombre réel de processeurs actuellement actifs, et par conséquent ne sera pas transmise à aucun processus enfant. Si le nombre de processeurs en ligne ne peut pas être déduit, alors le code utilisera par défaut une exécution sérielle (depuis S<dpkg 1.18.15),> même si cela ne devrait arriver que sur des systèmes exotiques et non pris en charge. - -=item B<-J>, B<--jobs-try>[=I<tâches>|B<auto>] - -Cette option (depuis S<dpkg 1.18.2,> option longue depuis S<dpkg 1.18.8)> est équivalente à l'option B<-j> ci-dessus. - -Dans la mesure où le comportement de B<-j> a changé dans S<dpkg 1.21.10> pour le mode S<« opt-in »,> vous pouvez utiliser cette option à la place si vous devez garantir des sémantiques dans toutes les versions de dpkg. - -=item B<--jobs-force>[=I<tâches>|B<auto>] - -Cette option (depuis S<dpkg 1.21.10)> est équivalente à l'option B<--jobs> sauf qu'elle active le mode parallèle forcé en ajoutant l'option B<make> B<-j> avec le nombre calculé de tâches parallèles à la variable d'environnement B<MAKEFLAGS>. - -Cela devrait faire que les invocations ultérieures de make héritent de cette option, forçant donc une configuration parallèle de l'empaquetage (et potentiellement le système de construction amont s'il utilise L<make(1)>), sans tenir compte de la prise en compte des constructions parallèles, ce qui pourrait provoquer des échecs de constructions. - -B<Note>: Any Makefile that is not parallel-safe should be considered to be buggy. These should either be made parallel-safe, or marked as not being safe with the L<make(1)> B<.NOTPARALLEL> target. - -=item B<-D>, B<--check-builddeps> - -Vérification des dépendances de constructions et des conflits ; se termine en cas de problèmes (option longue depuis S<dpkg 1.18.8).> C'est le comportement par défaut. - -=item B<-d>, B<--no-check-builddeps> - -Pas de vérification des dépendances de constructions et des conflits (option longue depuis S<dpkg 1.18.8).> - -=item B<--ignore-builtin-builddeps> - -Pas de vérification des dépendances de constructions internes et des conflits (depuis S<dpkg 1.18.2).> Il s'agit des dépendances de construction implicites spécifiques à la distribution habituellement requises dans un environnement de construction, c'est l'ensemble de paquets appelé Build-Essential. - -=item B<--rules-requires-root> - -Pas de prise en compte du champ B<Rules-Requires-Root>, retour à l'ancienne valeur par défaut (depuis S<dpkg 1.19.1).> - -=item B<-nc>, B<--no-pre-clean> - -Pas de nettoyage de l'arborescence des sources avant la construction (option longue depuis S<dpkg 1.18.8).> Implique B<-b> si aucune des options B<-F>, B<-g>, B<-G>, B<-B>, B<-A> ou B<-S> n'est utilisée). Implique B<-d> avec B<-S> (depuis S<dpkg 1.18.0).> - -=item B<--pre-clean> - -Nettoyage de l'arborescence des sources avant la construction (depuis dpkg 1.18.8). C'est le comportement par défaut. - -=item B<-tc>, B<--post-clean> - -Nettoyage de l'arborescence des sources (en utilisant I<commande-pour-obtenir-privilèges-de-root> B<debian/rules clean>) après la construction du paquet (option longue depuis S<dpkg 1.18.8).> - -=item B<--no-post-clean> - -Pas de nettoyage de l'arborescence des sources après la construction du paquet (depuis S<dpkg 1.19.1).> C'est le comportement par défaut. - -=item B<--sanitize-env> - -Nettoyage de l'environnement de construction (depuis S<dpkg 1.20.0).> Cela remet à zéro ou supprime les variables d'environnement, umask et tous les autres attributs de processus qui pourrait autrement affecter défavorablement la construction des paquets. Parce que le point d'entrée officiel pour la construction des paquets est B<debian/rules>, les paquets ne peuvent pas dépendre du fait que ces réglages sont présents et donc devraient fonctionner même quand ils ne le sont pas. Ce qu'il faut nettoyer est propre au fabricant. - -=item B<-r>, B<--root-command=>I<commande-pour-obtenir-privilèges-de-root> - -Quand B<dpkg-buildpackage> doit exécuter une partie du processus de construction en tant que root, il préfixe la commande exécutée par I<commande-pour-obtenir-privilèges-de-root>, si une a été spécifiée (option longue depuis S<dpkg 1.18.8).> Si ce n'est pas le cas alors B<fakeroot> est utilisé par défaut. I<commande-pour-obtenir-privilèges-de-root> doit débuter par le nom d'un programme accessible depuis B<PATH> et avoir comme arguments le nom de la commande réelle avec les arguments qu'elle doit prendre. I<commande-pour-obtenir-privilèges-de-root> peut recevoir des paramètres (ils doivent être séparés par des espaces) mais aucun métacaractère de l'interpréteur de commandes. Classiquement I<commande-pour-obtenir-privilèges-de-root> devrait être B<fakeroot>, B<sudo>, B<super> ou B<really>. B<su> ne va pas, puisque ce programme peut uniquement utiliser l'interpréteur de commandes de l'utilisateur avec l'option B<-c> au lieu de passer directement les arguments à la commande qui doit être exécutée. - -=item B<-R>, B<--rules-file=>I<fichier-rules> - -Construire un paquet Debian implique généralement l'invocation de B<debian/rules> comme une commande avec de nombreux paramètres standard (depuis dpkg 1.14.17, option longue depuis S<dpkg 1.18.8).> Avec cette option, il est possible d'utiliser un autre programme à utiliser pour la construction de paquet (ainsi que ses paramètres séparés par des espaces). Une autre utilisation possible est d'exécuter le fichier rules standard avec un autre programme make (par exemple en utilisant B</usr/local/bin/make -f debian/rules> comme I<fichier-rules>). - -=item B<--check-command=>I<commande-contrôleur> - -Commande utilisée pour vérifier le fichier B<.changes> lui-même et tout objet construit référencé dans le fichier (depuis S<dpkg 1.17.6).> La commande peut recevoir comme argument le nom de chemin de B<.changes>. Cette commande est en général B<lintian>. - -=item B<--check-option=>I<opt> - -Passer l'option I<opt> à I<commande-contrôleur> indiquée par B<DEB_CHECK_COMMAND> ou B<--check-command> (depuis S<dpkg 1.17.6).> Peut être utilisé plusieurs fois. - -=item B<--hook->I<nom-de-point-d'entrée>B<=>I<commande-de-point-d'entrée> - -Définir le code spécifié de l'interpréteur de commandes I<commande-de-point-d'entrée> comme point d'entrée I<nom-de-point-d'entré> qui sera exécuté aux moments spécifiés par les étapes d'exécution (depuis S<dpkg 1.17.6).> Les points d'entrée seront toujours exécutés même si l'action suivante n'est pas effectuée (sauf pour le point d'entrée B<binary>). Tous les points d'entrée seront exécutés dans le répertoire source dépaqueté. - -Some hooks can receive addition information through environment variables (since dpkg 1.22.0). All hooks get the hook name in the B<DPKG_BUILDPACKAGE_HOOK_NAME> environment variable (since dpkg 1.22.0). - -B<Note>: Hooks can affect the build process, and cause build failures if their commands fail, so watch out for unintended consequences. - -Les I<nom-de-point-d'entrée> actuellement pris en charge S<sont :> - -=over - -=item B<preinit> - -=item B<init> - -=item B<preclean> - -=item B<source> - -Gets B<DPKG_BUILDPACKAGE_HOOK_SOURCE_OPTIONS> with the space-separated lists of options that will passed to the B<dpkg-source> call. - -=item B<build> - -Gets B<DPKG_BUILDPACKAGE_HOOK_BUILD_TARGET> with the name of the B<debian/rules> build target called, but only if called. - -=item B<binary> - -Gets B<DPKG_BUILDPACKAGE_HOOK_BINARY_TARGET> with the name of the B<debian/rules> binary target called, but only if called. - -=item B<buildinfo> - -Gets B<DPKG_BUILDPACKAGE_HOOK_BUILDINFO_OPTIONS> with the space-separated lists of options that will passed to the B<dpkg-genbuildinfo> call. - -=item B<changes> - -Gets B<DPKG_BUILDPACKAGE_HOOK_CHANGES_OPTIONS> with the space-separated lists of options that will passed to the B<dpkg-genchanges> call. - -=item B<postclean> - -=item B<check> - -Gets B<DPKG_BUILDPACKAGE_HOOK_CHECK_OPTIONS> with the space-separated lists of options that will passed to the check command call. - -=item B<sign> - -=item B<done> - -=back - -La I<commande-point-d'entrée> gère les chaînes de formatage de substitution suivantes, qui lui sont appliquées avant S<exécution :> - -=over - -=item B<%%> - -Un caractère % seul. - -=item B<%a> - -Une valeur booléenne (0 ou 1) qui indique si l'action suivante est effectuée. - -=item B<%p> - -Nom du paquet source. - -=item B<%v> - -La version du paquet source. - -=item B<%s> - -La version du paquet source (sans S<l'« epoch »).> - -=item B<%u> - -La version amont. - -=back - -=item B<--buildinfo-file=>I<fichier> - -Définir le I<fichier> pour le fichier B<.buildinfo> généré (depuis S<dpkg 1.21.0).> - -=item B<--buildinfo-option=>I<opt> - -Passer l'option I<opt> à B<dpkg-genbuildinfo> (depuis S<dpkg 1.18.11).> Peut être utilisé plusieurs fois. - -=item B<--sign-backend=>I<dorsal-de-signature> - -Préciser une interface de dorsal OpenPGP à utiliser lors de l'invocation de la commande I<sign-command> (depuis S<dpkg 1.21.10).> - -C'est B<auto> par défaut, où le meilleur dorsal présent disponible sera utilisé. Les dorsaux spécifiques à OpenPGP pris en charge sont par ordre de S<préférence :> - -=over 4 - -=item B<sop> - -(any conforming Stateless OpenPGP implementation) - -=item B<sq> - -(from Sequoia-PGP) - -=item B<gpg> - -(from GnuPG) - -=back - -=item B<-p>, B<--sign-command=>I<commande-de-signature> - -When B<dpkg-buildpackage> needs to execute an OpenPGP backend command to sign a source control (B<.dsc>) file, a B<.buildinfo> file or a B<.changes> file it will run I<sign-command> (searching the B<PATH> if necessary) instead of the default or auto-detected backend command (long option since dpkg 1.18.8). I<sign-command> will get all the backend specific arguments according to the B<--sign-backend> selected. I<sign-command> should not contain spaces or any other shell metacharacters. - -=item B<-k>, B<--sign-keyid=>I<identifiant-clé> - -=item B<--sign-key=>I<identifiant-clé> - -Préciser un identifiant de clé OpenPGP (soit une empreinte soit un identifiant d'utilisateur) pour la clé secrète à utiliser lors de la signature des paquets (B<--sign-key> depuis S<dpkg 1.18.8,> B<--sign-keyid> depuis S<dpkg 1.21.10).> - -=item B<--sign-key=>I<fichier-de-clé> - -Préciser un I<fichier-de-clé> OpenPGP contenant la clé secrète à utiliser pour la signature des paquets (depuis S<dpkg 1.21.10).> - -B<Note>: For security reasons the I<key-file> is best kept locked with a password. - -=item B<-us>, B<--unsigned-source> - -Ne pas signer le paquet source (option longue depuis S<dpkg 1.18.8).> - -=item B<-ui>, B<--unsigned-buildinfo> - -Ne pas signer le fichier B<.buildinfo> (depuis S<dpkg 1.18.19).> - -=item B<-uc>, B<--unsigned-changes> - -Ne signer ni le fichier B<.buildinfo>, ni le fichier B<.changes> (option longue depuis S<dpkg 1.18.8).> - -=item B<--no-sign> - -Aucune signature de fichier, y compris du paquet source, du fichier B<.buildinfo> et du fichier B<.changes> (depuis S<dpkg 1.18.20).> - -=item B<--force-sign> - -Forcer la signature des fichiers produits (depuis S<dpkg 1.17.0)> indépendamment de B<-us>, B<--unsigned-source>, B<-ui>, B<--unsigned-buildinfo>, B<-uc>, B<--unsigned-changes> ou d'autres heuristiques internes. - -=item B<-sn> - -=item B<-ss> - -=item B<-sA> - -=item B<-sk> - -=item B<-su> - -=item B<-sr> - -=item B<-sK> - -=item B<-sU> - -=item B<-sR> - -=item B<-i>, B<--diff-ignore>[=I<expression-rationnelle>] - -=item B<-I>, B<--tar-ignore>[=I<motif>] - -=item B<-z>, B<--compression-level>=I<niveau> - -=item B<-Z>, B<--compression>=I<compression> - -Chaîne passée telle quelle à B<dpkg-source>. Voir la page de manuel correspondante. - -=item B<--source-option=>I<opt> - -Passer l'option I<opt> à B<dpkg-source> (depuis S<dpkg 1.15.6).> Peut être utilisé plusieurs fois. - -=item B<--changes-file=>I<fichier> - -Définir le I<fichier> pour le fichier B<.changes> généré (depuis S<dpkg 1.21.0).> - -=item B<--changes-option=>I<opt> - -Passer l'option I<opt> à B<dpkg-genchanges> (depuis S<dpkg 1.15.6).> Peut être utilisé plusieurs fois. - -=item B<--admindir>=I<répertoire> - -=item B<--admindir> I<rép> - -Changer l'endroit où se trouve la base de données de B<dpkg> (depuis dpkg 1.14.0). Par défaut, c'est I<%ADMINDIR%>. - -=item B<-?>, B<--help> - -Afficher un message d'aide puis quitter. - -=item B<--version> - -Afficher le numéro de version puis quitter. - -=back - -=head1 ENVIRONNEMENT - -=head2 Environnement externe - -=over - -=item B<DEB_CHECK_COMMAND> - -Si cette option est utilisée, elle le sera comme commande pour contrôler le fichier B<.changes> (depuis S<dpkg 1.17.6).> Remplacée par l'option B<--check-command>. - -=item B<DEB_SIGN_KEYID> - -Si cette option est utilisée, elle le sera pour la signature des fichiers B<.changes>, B<.buildinfo> et B<.dsc> (depuis S<dpkg 1.17.2).> Remplacée par l'option B<--sign-key>. - -=item B<DEB_SIGN_KEYFILE> - -Si cette option est utilisée, elle le sera pour la signature des fichiers B<.changes>, B<.buildinfo> et B<.dsc> (depuis S<dpkg 1.21.10).> Remplacée par l'option B<--sign-keyfile>. - -=item B<DEB_BUILD_OPTIONS> - -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 following are the options known and supported by dpkg tools, other options honored by F<debian/rules> might be defined by distribution specific policies. - -=over - -=item B<parallel=>I<N> - -The F<debian/rules> in the packaging might use this option to set up the build process to use I<N> parallel jobs. It is overridden by the B<--jobs> and B<--jobs-force> options. - -=item B<nocheck> - -B<dpkg-buildpackage> will ignore the B<DEB_CHECK_COMMAND> variable. The F<debian/rules> in the packaging is not expected to run test suites during the build. - -=item B<noopt> - -If F<debian/rules> calls B<dpkg-buildflags> to set up the build flags, those will be set to not enable any optimizations. - -=item B<nostrip> - -The F<debian/rules> in the packaging should ensure that objects do not get the debugging information stripped. If F<debian/rules> includes the B<mk/buildtools.mk> make fragment the B<STRIP> make variable will respect this option. - -=item B<terse> - -B<dpkg-buildpackage> will append the B<--no-print-directory> L<make(1)> flag to the B<MAKEFLAGS> environment variable. The F<debian/rules> in the packaging should reduce verbosity, while not being completely quiet. - -=back - -=item B<DEB_BUILD_PROFILES> - -Si cette option est utilisée, elle sera utilisée comme profil(s) de construction actif(s) pour le paquet à construire (depuis S<dpkg 1.17.2).> C'est une liste séparée par des espaces de noms de profil. Cette option est outrepassée par l'option B<-P>. - -=item B<DPKG_COLORS> - -Définit le mode de couleur (depuis S<dpkg 1.18.5).> Les valeurs actuellement acceptées sont B<auto> (par défaut), B<always> et B<never>. - -=item B<DPKG_NLS> - -Si cette variable est définie, elle sera utilisée pour décider l'activation de la prise en charge des langues (NLS – Native Language Support), connu aussi comme la gestion de l'internationalisation (ou i18n) (depuis S<dpkg 1.19.0).> Les valeurs permises S<sont :> B<0> et B<1> (par défaut). - -=back - -=head2 Environnement interne - -Même si B<dpkg-buildpackage> exporte certaines variables, B<debian/rules> ne doit pas dépendre de leur présence, mais doit préférablement utiliser l'interface correspondante pour retrouver les valeurs nécessaires, parce que ce fichier est le point d'entrée principal pour la construction des paquets et son exécution autonome devrait être prise en charge. - -=over - -=item B<DEB_BUILD_*> - -=item B<DEB_HOST_*> - -=item B<DEB_TARGET_*> - -B<dpkg-architecture> est lancé avec les paramètres de B<-a> et B<-t>. Toute variable retournée par l'option B<-s> est intégrée dans l'environnement de construction. - -=item B<DEB_RULES_REQUIRES_ROOT> - -This variable is set to the value obtained from the B<Rules-Requires-Root> field, the dpkg-build-api level or from the command-line. When set, it will be a valid value for the B<Rules-Requires-Root> field. It is used to notify B<debian/rules> whether the B<rootless-builds.txt> specification is supported. - -=item B<DEB_GAIN_ROOT_CMD> - -Cette valeur est fixée à I<commande-pour-obtenir-privilèges-de-root> si le champ B<Rules-Requires-Root> est fixé à une valeur différente de B<no> ou B<binary-targets>. - -=item B<SOURCE_DATE_EPOCH> - -Cette valeur est fixée à l'horodatage d'Unix depuis S<« l'epoch »> de la dernière entrée de I<debian/changelog>, si elle n'a pas déjà été définie. - -=back - -=head1 FICHIERS - -=over - -=item I<%PKGCONFDIR%/buildpackage.conf> - -Fichier de configuration pour l'ensemble du système - -=item I<$XDG_CONFIG_HOME/dpkg/buildpackage.conf> ou - -=item I<$HOME/.config/dpkg/buildpackage.conf> - -Fichier de configuration propre à l'utilisateur - -=back - -=head1 NOTES - -=head2 Les drapeaux de compilation ne sont plus exportés. - -Entre les versions 1.14.17 et 1.16.1, B<dpkg-buildpackage> exportait les drapeaux de compilation (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> et B<LDFLAGS>) avec les valeurs que renvoyait B<dpkg-buildflags>. Cela n'est plus le cas. - -=head2 Cibles construites par défaut - -B<dpkg-buildpackage> utilise les cibles B<build-arch> et B<build-indep> depuis S<dpkg 1.16.2.> Ces cibles sont donc obligatoires. Cependant, pour éviter de casser les paquets existants et faciliter la transition, si le paquet source ne construit pas à la fois les paquets binaires indépendants et dépendants de l'architecture (depuis S<dpkg 1.18.8),> la cible B<build> sera utilisée par défaut si B<make -f debian/rules -qn> I<build-target> renvoie B<2> comme code de retour. - -=head1 SECURITY - -Building binary or source packages should only be performed over trusted source data. - -=head1 BOGUES - -On devrait pouvoir mettre des espaces et des métacaractères du shell et les arguments initiaux de I<commande-pour-obtenir-privilèges-de-root> et I<commande-de-signature>. - -=head1 VOIR AUSSI - -I<%PKGDOCDIR%/spec/rootless-builds.txt>, L<dpkg-source(1)>, L<dpkg-architecture(1)>, L<dpkg-buildflags(1)>, L<dpkg-genbuildinfo(1)>, L<dpkg-genchanges(1)>, L<fakeroot(1)>, L<lintian(1)>, L<https://datatracker.ietf.org/doc/draft-dkg-openpgp-stateless-cli/>, L<sq(1)>, L<gpg(1)>. - - -=head1 TRADUCTION - -Ariel VARDI <ariel.vardi@freesbee.fr>, 2002. -Philippe Batailler, 2006. -Nicolas François, 2006. -Veuillez signaler toute erreur à <debian-l10n-french@lists.debian.org>. diff --git a/man/fr/dpkg-parsechangelog.pod b/man/fr/dpkg-parsechangelog.pod index 87365c9..5bbdcd7 100644 --- a/man/fr/dpkg-parsechangelog.pod +++ b/man/fr/dpkg-parsechangelog.pod @@ -34,7 +34,7 @@ Indique le fichier des changements où trouver des renseignements. Un S<« - »> =item B<-F> I<format-du-fichier-des-changements> -Indique le format du fichier changelog. Par défaut, c'est une ligne spéciale, près de la fin du fichier, qui l'indique ; sinon, on utilise le format classique B<debian>. Voir aussi B<FORMATS DES FICHIERS DE CHANGEMENTS>. +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 L</CHANGELOG FORMATS>. =item B<-L> I<rep_lib> diff --git a/man/fr/dpkg-shlibdeps.pod b/man/fr/dpkg-shlibdeps.pod index 727a1cb..74a47bb 100644 --- a/man/fr/dpkg-shlibdeps.pod +++ b/man/fr/dpkg-shlibdeps.pod @@ -50,7 +50,7 @@ Les informations de dépendance de bibliothèque partagée fournies par le paque Lors de l'analyse des symboles utilisés par tous les binaires, B<dpkg-shlibdeps> retient la (plus grande) version minimale nécessaire pour chaque bibliothèque. À la fin du processus, il est capable d'écrire la dépendance minimale pour toutes les bibliothèques utilisées (à condition que l'information des fichiers I<symbols> soit exacte). -Comme garde-fou, un fichier de symboles peut fournir un champ B<Build-Depends-Package> de méta-information et B<dpkg-shlibdeps> en extraira la version minimale requise par le paquet correspondant depuis ce champ B<Build-Depends> et utilisera cette version si elle est supérieure à la version minimale calculée par l'examen des symboles. +As a safe-guard measure, a symbols file can provide a B<Build-Depends-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. =head2 Fichiers Shlibs diff --git a/man/nl/dpkg-buildapi.pod b/man/nl/dpkg-buildapi.pod index b2da9a7..c3f5a07 100644 --- a/man/nl/dpkg-buildapi.pod +++ b/man/nl/dpkg-buildapi.pod @@ -30,10 +30,6 @@ Dit programma werd geïntroduceerd in dpkg 1.22.0. =over -=item B<-c>I<control-bestand> - -Geeft aan wat het hoofdcontrolebestand van de broncode is waaruit informatie gehaald moet worden. Standaard is dat F<debian/control>. - =item B<--help> Info tonen over het gebruik en afsluiten. @@ -44,6 +40,16 @@ De versie tonen en afsluiten. =back +=head1 OPTIES + +=over + +=item B<-c>I<control-bestand> + +Geeft aan wat het hoofdcontrolebestand van de broncode is waaruit informatie gehaald moet worden. Standaard is dat F<debian/control>. + +=back + =head1 OMGEVING =over diff --git a/man/nl/dpkg-buildflags.pod b/man/nl/dpkg-buildflags.pod index ce173d7..d2b768a 100644 --- a/man/nl/dpkg-buildflags.pod +++ b/man/nl/dpkg-buildflags.pod @@ -180,7 +180,7 @@ Bijvoorbeeld: =item B<--query-features> I<gebied> -De functies weergeven die voor een opgegeven gebied geactiveerd zijn (sinds dpkg 1.16.2). Als de functie door de compiler als een ingebouwde standaard wordt behandeld (al is het maar op sommige architecturen), dan wordt een veld B<Builtin> weergegeven (sinds dpkg 1.21.14). Momenteel worden door Debian en zijn derivaten enkel de gebieden B<future>, B<qa>, B<reproducible>, B<sanitize> en B<hardening> herkend. Zie het onderdeel B<FUNCTIEGEBIEDEN> voor meer details. Sluit af met 0 als het gebied gekend is, anders met 1. +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). 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. De uitvoer is in RFC822-indeling met één sectie per functie. Bijvoorbeeld: @@ -291,13 +291,30 @@ In de toekomst kunnen nog andere vlaggen toegevoegd worden als daar behoefte aan =head1 FUNCTIEGEBIEDEN -Elke gebiedsfunctie kan in de gebiedswaarde van de omgevingsvariabelen B<DEB_BUILD_OPTIONS> en B<DEB_BUILD_MAINT_OPTIONS> ingeschakeld en uitgeschakeld worden met de schakelaars ‘B<+>’ en ‘B<->’. Om bijvoorbeeld de B<hardening>-functionaliteit “pie†te activeren en de functionaliteit “fortify†uit te schakelen, kunt u in B<debian/rules> het volgende doen: +Feature areas are currently vendor specific, and the ones described below are only recognized on Debian and derivatives. - export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify +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. 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. + +For example, to enable the B<hardening> “pie†feature and disable the “fortify†feature you can do this in B<debian/rules>: + + export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify De bijzondere functie B<all> (geldig in elk gebied) kan gebruikt worden om gelijktijdig alle gebiedsfunctionaliteit te activeren of uit te schakelen. Alles uitschakelen in het gebied B<hardening> en enkel “format†en “fortify†activeren kunt u dus doen met: - export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify + export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify + +Multiple feature areas can be set: + + export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs + +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: + + export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+pie,+format abi=+lfs + … + DEB_BUILD_MAINT_OPTIONS += hardening=+fortify + ifdef CONDITION + DEB_BUILD_MAINT_OPTIONS += hardening=-format + endif =head2 abi @@ -313,7 +330,11 @@ Wanneer deze functie is ingeschakeld, wordt de waarde van dezelfde functie in he =item B<time64> -Deze instelling (sinds dpkg 1.22.0; standaard uitgezet) activeert ondersteuning voor 64-bits time_t op 32-bits architecturen waar hun ABI dit standaard niet bevat, door B<-D_TIME_BITS=64> toe te voegen aan B<CPPFLAGS>. Deze instelling schakelt automatisch de B<lfs>-functie in aangezien ze deze nodig heeft. +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. + +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. + +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>. =back diff --git a/man/nl/dpkg-buildpackage.pod b/man/nl/dpkg-buildpackage.pod index 310db97..0201be9 100644 --- a/man/nl/dpkg-buildpackage.pod +++ b/man/nl/dpkg-buildpackage.pod @@ -514,7 +514,7 @@ Indien dit ingesteld werd, zal het gebruikt worden om de bestanden B<.changes>, =item B<DEB_BUILD_OPTIONS> -Indien dit ingesteld werd, zal het een door spaties gescheiden lijst met opties bevatten die het gedrag beïnvloeden van sommige dpkg-gereedschappen die betrokken zijn bij het bouwen van pakketten, en die het bouwproces van pakketten kunnen beïnvloeden als de code in F<debian/rules> deze opties erkent. +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. 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. Hieronder volgen de opties die bekend zijn en worden ondersteund door dpkg-gereedschappen; andere opties die worden erkend door F<debian/rules> kunnen worden gedefinieerd door distributiespecifiek beleid. @@ -540,6 +540,22 @@ In het verpakkingsproces moet F<debian/rules> ervoor zorgen dat geen foutopspori B<dpkg-buildpackage> zal de L<make(1)>-vlag B<--no-print-directory> toevoegen aan de omgevingsvariabele B<MAKEFLAGS>. In het verpakkingsproces moet F<debian/rules> de breedsprakigheid beperken, maar niet helemaal stil zijn. +=item B<hardening=>I<feature-spec> + +=item B<reproducible=>I<feature-spec> + +=item B<abi=>I<feature-spec> + +=item B<future=>I<feature-spec> + +=item B<qa=>I<feature-spec> + +=item B<optimize=>I<feature-spec> + +=item B<sanitize=>I<feature-spec> + +These are feature areas that control build flag features. See L<dpkg-buildflags(1)> for further details. + =back =item B<DEB_BUILD_PROFILES> diff --git a/man/nl/dpkg-parsechangelog.pod b/man/nl/dpkg-parsechangelog.pod index 577747a..8c4c2c5 100644 --- a/man/nl/dpkg-parsechangelog.pod +++ b/man/nl/dpkg-parsechangelog.pod @@ -34,7 +34,7 @@ Geeft het changelog-bestand op waaruit gelezen moet worden. Een ‘-’ kan gebr =item B<-F> I<changelog-indeling> -Geeft de indeling van het changelog-bestand aan. Standaard wordt die indeling gelezen van een bijzondere regel dicht bij het einde van het changelog-bestand en als dat mislukt, wordt er teruggevallen op de standaardindeling van B<debian>. Zie ook B<CHANGELOG FORMATS>. +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 L</CHANGELOG FORMATS>. =item B<-L> I<bibliotheekmap> diff --git a/man/nl/dpkg-shlibdeps.pod b/man/nl/dpkg-shlibdeps.pod index 9e9dac8..d61eaed 100644 --- a/man/nl/dpkg-shlibdeps.pod +++ b/man/nl/dpkg-shlibdeps.pod @@ -50,7 +50,7 @@ Door een pakket verstrekte informatie over afhankelijkheidsrelaties tot gedeelde Tijdens het doorzoeken van de door al de programma's gebruikte symbolen, onthoudt B<dpkg-shlibdeps> van elke bibliotheek de (hoogste) minimale versie die nodig is. Op het eind van het proces is het in staat voor elke gebruikte bibliotheek uit te schrijven wat de minimale vereiste is (in de veronderstelling dat de informatie uit de I<symbols>-bestanden accuraat is). -Bij wijze van beschermende maatregel kan een symbols-bestand een meta-informatieveld B<Build-Depends-Pakket> bevatten. Dan zal B<dpkg-shlibdeps> de door het corresponderende pakket vereiste minimale versie halen uit het veld B<Build-Depends> en deze versie gebruiken als ze hoger is dan de minimale versie die berekend werd via het doorzoeken van symbolen. +As a safe-guard measure, a symbols file can provide a B<Build-Depends-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. =head2 Shlibs-bestanden diff --git a/man/po/de.po b/man/po/de.po index 91e523e..1cd047e 100644 --- a/man/po/de.po +++ b/man/po/de.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-man 1.22.3\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-06 17:37+0100\n" -"PO-Revision-Date: 2024-01-06 18:34+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" +"PO-Revision-Date: 2024-02-22 21:19+0100\n" "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -7558,11 +7558,11 @@ msgid "Show the version and exit." msgstr "Gibt die Version aus und beendet das Programm." #. 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 @@ -8793,6 +8793,13 @@ msgid "This program was introduced in dpkg 1.22.0." msgstr "Dieses Programm wurde in Dpkg 1.22.0 hinzugefügt." #. 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 "B<--help>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod msgid "B<-c>I<control-file>" msgstr "B<-c>I<Steuerdatei>" @@ -8807,13 +8814,6 @@ msgstr "" "sollen. Standardmäßig F<debian/control>." #. 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 "B<--help>" - -#. type: =item #: dpkg-buildapi.pod msgid "B<DPKG_BUILD_API>" msgstr "B<DPKG_BUILD_API>" @@ -9347,20 +9347,16 @@ 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 "" "Gibt die Funktionalitäten, die für den übergebenen Bereich aktiviert sind, " "aus (seit Dpkg 1.16.2). Falls die Funktionalität als eingebaute Vorgabe " "durch den Compiler gehandhabt wird (selbst wenn nur für einige " "Architekturen), dann wird das Feld B<Builtin> ausgegeben (seit Dpkg " -"1.21.14). Die einzigen unter Debian und abgeleiteten Distributionen derzeit " -"erkannten Bereiche sind B<future>, B<qa>, B<reproducible>, B<sanitize> und " -"B<hardening>. Lesen Sie den Abschnitt B<FUNKTIONALITÄTSBEREICHE> für weitere " -"Details. Beendet sich mit 0, falls der Bereich bekannt ist, andernfalls mit " -"1." +"1.21.14). Lesen Sie den Abschnitt B<FUNKTIONALITÄTSBEREICHE> für weitere " +"Details zu den aktuell erkannten Bereichen. Beendet sich mit 0, falls der " +"Bereich bekannt ist, andernfalls mit 1." #. type: textblock #: dpkg-buildflags.pod @@ -9692,26 +9688,58 @@ msgstr "FUNKTIONALITÄTSBEREICHE" #. 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 "" +"Funktionalitätsbereiche sind derzeit Lieferanten-spezifisch und die " +"nachfolgend beschriebenen werden nur unter Debian und abgeleiteten " +"Distributionen erkannt." + +#. 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>:" -msgstr "" -"Jede Bereichsfunktionalität kann durch den entsprechenden Bereichswert in " -"den Umgebungsvariablen B<DEB_BUILD_OPTIONS> und B<DEB_BUILD_MAINT_OPTIONS> " -"mit den ‚B<+>’- und ‚B<->’-Schaltern aktiviert und deaktiviert werden. Soll " -"beispielsweise für B<hardening> die „pie“-Funktionalität aktiviert und die " -"„fortify“-Funktionalität deaktiviert werden, können Sie Folgendes in " +"‘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 "" +"Jeder Funktionalitätsbereich kann in dem Bereichswert der Umgebungsvariablen " +"B<DEB_BUILD_OPTIONS> und B<DEB_BUILD_MAINT_OPTIONS> durch die Wandler »B<+>« " +"und »B<->« aktiviert oder deaktiviert werden. Gemäß der allgemeine Syntax " +"dieser Variablen (in L<dpkg-buildpackage(1)> beschrieben) können mehrere " +"Funktionalitätsbereiche getrennt durch Leerzeichen angegeben werden, wobei " +"jede die Funktionalitätskennzeichner als verpflichtende Parameter nach einem " +"Gleichzeichen (»B<=>«) erhält. Die Funktionalitätskennzeichner werden durch " +"Kommata getrennt und von links nach rechts ausgewertet, wobei die " +"Einstellungen innerhalb des gleichen Funktionalitätskennzeichners die " +"vorhergehenden außer Kraft setzen, selbst falls die " +"Funktionalitätskennzeichner über mehrere, durch Leerzeichen getrennte " +"Funktionalitätsbereichseinstellungen für den gleichen Bereich verteilt sind." + +#. 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 "" +"Um beispielsweise die B<hardening>-Funktionalität »pie« zu aktivieren und " +"die Funktionalität »fortify« zu deaktivieren, können Sie folgendes in " "B<debian/rules> verwenden:" #. 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 "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify\n" "\n" #. type: textblock @@ -9731,10 +9759,59 @@ 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 "" +" export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify\n" +"\n" + +#. type: textblock +#: dpkg-buildflags.pod +msgid "Multiple feature areas can be set:" +msgstr "Es können mehrere Funktionalitätsbereiche gesetzt werden:" + +#. type: verbatim +#: dpkg-buildflags.pod +#, no-wrap +msgid "" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs\n" +"\n" +msgstr "" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs\n" +"\n" + +#. 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 "" +"Das Außerkraftsetzenverhalten gilt auch für die besondere Funktionalität " +"B<all>, sowie bestimmten Funktionalitäten, wodurch Zusammensetzungen " +"ermöglicht werden sollten. Um daher »lfs« im Bereich B<abi> zu aktivieren " +"und nur »pie« und »fortify« in dem Bereich B<hardening>, aber »format« nur, " +"wenn CONDITION definiert ist, könnte dies wie folgt passieren:" + +#. 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 "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +" 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" #. type: =head2 @@ -9790,11 +9867,19 @@ msgstr "B<time64>" #. 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." +#, fuzzy +#| 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." +msgid "" +"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 "" "Diese Einstellung (seit Dpkg 1.22.0; standardmäßig deaktiviert) aktiviert " "die Unterstützung von 64-bit time_t auf 32-bit-Architekturen bei denen das " @@ -9802,6 +9887,24 @@ msgstr "" "B<CPPFLAGS> hinzugefügt wird. Diese Einstellung aktiviert automatisch die " "Funktionalität B<lfs>, da sie diese benötigt." +#. 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 #: dpkg-buildflags.pod msgid "future" @@ -12528,12 +12631,18 @@ 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 "" "Falls gesetzt, wird sie eine durch Leerraumzeichen getrennte Liste von " "Optionen enthalten, die das Verhalten einiger im Paketbau beteiligter Dpkg-" "Werkzeuge beeinflusst und möglicherweise den Paketbauprozess beeinflusst, " -"falls der Code in F<debian/rules> sie berücksichtigt." +"falls der Code in F<debian/rules> sie berücksichtigt. Bei diesen Optionen " +"können Parameter direkt nach einem Gleichzeichen (»B<=>«) gesetzt werden. " +"Für Optionen, die mehrere Parameter akzeptieren, werden diese nicht durch " +"Leerzeichen getrennt, da diese für separate Optionen reserviert sind." #. type: textblock #: dpkg-buildpackage.pod @@ -12628,6 +12737,50 @@ msgstr "" "komplett still sein." #. type: =item +#: dpkg-buildpackage.pod +msgid "B<hardening=>I<feature-spec>" +msgstr "B<hardening=>I<Funktionalitätspezi>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "B<reproducible=>I<Funktionalitätspezi>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<abi=>I<feature-spec>" +msgstr "B<abi=>I<Funktionalitätspezi>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "B<future=>I<Funktionalitätspezi>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<qa=>I<feature-spec>" +msgstr "B<qa=>I<Funktionalitätspezi>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "B<optimize=>I<Funktionalitätspezi>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<sanitize=>I<Funktionalitätspezi>" + +#. type: textblock +#: dpkg-buildpackage.pod +msgid "" +"These are feature areas that control build flag features. See L<dpkg-" +"buildflags(1)> for further details." +msgstr "" +"Dies sind die Funktionalitätsbereiche, die die Bauschalter-Funktionalitäten " +"steuern. Lesen Sie L<dpkg-buildflags(1)> zu weiteren Details." + +#. type: =item #: dpkg-buildpackage.pod dpkg-checkbuilddeps.pod msgid "B<DEB_BUILD_PROFILES>" msgstr "B<DEB_BUILD_PROFILES>" @@ -13949,12 +14102,12 @@ msgstr "" "Datei-I<Diversionen> (Umleitungen) sind eine Möglichkeit, L<dpkg(1)> dazu zu " "zwingen, eine Datei nicht an ihren Standardplatz, sondern an einem " "I<umgeleiteten> Ort zu installieren. Umleitungen können innerhalb der " -"Paketbetreuerskripte verwendet werden, um eine Datei beiseitezuschieben, wenn sie " -"einen Konflikt auslöst. Systemadministratoren können sie auch verwenden, um " -"sich über die Konfigurationsdateien einiger Pakete hinwegzusetzen, oder wann " -"immer einige Dateien (die nicht als „Conffiles“ markiert sind) von B<dpkg> " -"erhalten werden müssen, wenn eine neuere Version eines Paketes, die diese " -"Dateien enthält, installiert wird." +"Paketbetreuerskripte verwendet werden, um eine Datei beiseitezuschieben, " +"wenn sie einen Konflikt auslöst. Systemadministratoren können sie auch " +"verwenden, um sich über die Konfigurationsdateien einiger Pakete " +"hinwegzusetzen, oder wann immer einige Dateien (die nicht als „Conffiles“ " +"markiert sind) von B<dpkg> erhalten werden müssen, wenn eine neuere Version " +"eines Paketes, die diese Dateien enthält, installiert wird." #. type: =item #: dpkg-divert.pod @@ -17071,10 +17224,15 @@ msgstr "B<-F> I<Changelog-Format>" #. type: textblock #: dpkg-parsechangelog.pod +#, fuzzy +#| 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>." 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 "" "Gibt das Format der Changelog-Datei an. Standardmäßig wird das Format aus " "einer speziellen Zeile in der Nähe des Endes der Changelogs gelesen oder, " @@ -19262,12 +19420,19 @@ msgstr "" #. type: textblock #: dpkg-shlibdeps.pod +#, fuzzy +#| 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." 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 "" "Als Sicherheitsmaßnahme kann eine Symbols-Datei ein Meta-Informationsfeld " "B<Build-Depends-Package> enthalten. B<dpkg-shlibdeps> entnimmt dann die " @@ -30164,6 +30329,20 @@ msgstr "" "Standard)." #~ 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>:" +#~ msgstr "" +#~ "Jede Bereichsfunktionalität kann durch den entsprechenden Bereichswert in " +#~ "den Umgebungsvariablen B<DEB_BUILD_OPTIONS> und " +#~ "B<DEB_BUILD_MAINT_OPTIONS> mit den ‚B<+>’- und ‚B<->’-Schaltern aktiviert " +#~ "und deaktiviert werden. Soll beispielsweise für B<hardening> die „pie“-" +#~ "Funktionalität aktiviert und die „fortify“-Funktionalität deaktiviert " +#~ "werden, können Sie Folgendes in B<debian/rules> verwenden:" + +#~ msgid "" #~ "Typically, this is the original package's version number in whatever form " #~ "the program's author uses. It may also include a Debian revision number " #~ "(for non-native packages). The exact format and sorting algorithm are " diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot index 555dd79..7f30a39 100644 --- a/man/po/dpkg-man.pot +++ b/man/po/dpkg-man.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: dpkg-man 1.22.4\n" +"Project-Id-Version: dpkg-man 1.22.5\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -5780,11 +5780,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 @@ -6846,6 +6846,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 "" @@ -6858,13 +6865,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 "" @@ -7296,10 +7296,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 @@ -7577,18 +7575,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 "" @@ -7605,7 +7622,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 "" @@ -7652,10 +7704,31 @@ 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 @@ -9819,7 +9892,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 @@ -9896,6 +9972,48 @@ 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 +msgid "B<abi=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<qa=>I<feature-spec>" +msgstr "" + +#. 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 "" @@ -13339,7 +13457,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 @@ -15096,10 +15214,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." +"B<Build-Depends-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 diff --git a/man/po/es.po b/man/po/es.po index 2e0f39d..f57123c 100644 --- a/man/po/es.po +++ b/man/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-man 1.16.8\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:42+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -8160,11 +8160,11 @@ msgid "Show the version and exit." msgstr "Muestra la versión y termina." #. 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 @@ -9563,6 +9563,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 "B<--help>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod msgid "B<-c>I<control-file>" msgstr "B<-c>I<fichero-de-control>" @@ -9581,13 +9588,6 @@ msgstr "" "información. Por omisión es B<debian/control>." #. 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 "B<--help>" - -#. type: =item #: dpkg-buildapi.pod #, fuzzy #| msgid "\\s-1DEB_BUILD_ARCH\\s0" @@ -10147,10 +10147,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 "" "Muestra las funcionalidades activas para el área dada. La única sección " "actualmente admitida es B<hardening>. Cierra con un valor de cero si el área " @@ -10545,30 +10543,39 @@ msgstr "" #. type: textblock #: dpkg-buildflags.pod -#, fuzzy -#| msgid "" -#| "Each hardening feature can be enabled and disabled in the " -#| "B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with " -#| "the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature " -#| "and disable the \"fortify\" feature you can do this in B<debian/rules>:" +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 "" -"Cada opción de seguridad se puede activar o desactivar incluyendo el valor " -"B<hardening> en la variable de entorno B<DEB_BUILD_MAINT_OPTIONS> con los " -"modificadores «+» y «-». Por ejemplo, para activar la funcionalidad «pie» y " -"desactivar la funcionalidad «fortify», puede utilizar lo siguiente en " -"B<debian/rules>:" #. type: verbatim #: dpkg-buildflags.pod #, fuzzy, no-wrap #| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify\n" "\n" msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" @@ -10594,10 +10601,46 @@ msgstr "" #, fuzzy, no-wrap #| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify\n" "\n" msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +#. type: textblock +#: dpkg-buildflags.pod +msgid "Multiple feature areas can be set:" +msgstr "" + +#. type: verbatim +#: dpkg-buildflags.pod +#, fuzzy, no-wrap +#| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +msgid "" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs\n" +"\n" +msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" + +#. 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 "" + #. type: =head2 #: dpkg-buildflags.pod msgid "abi" @@ -10643,10 +10686,30 @@ msgstr "B<title>" #. 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 @@ -13594,7 +13657,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 @@ -13675,6 +13741,56 @@ msgid "" msgstr "" #. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--warnings=>I<value>" +msgid "B<hardening=>I<feature-spec>" +msgstr "B<--warnings=>I<valor>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<abi=>I<feature-spec>" +msgstr "B<--export=>I<formato>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<qa=>I<feature-spec>" +msgstr "B<--export=>I<formato>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<--export=>I<formato>" + +#. 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 #, fuzzy #| msgid "\\s-1DEB_BUILD_ARCH_OS\\s0" @@ -18511,7 +18627,7 @@ msgstr "B<-F>I<formato-fichero-de-cambios>" 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 "" "Define el formato del registro de cambios. Por omisión, el formato se lee de " "una lÃnea especial cerca del final del registro de cambios o, en caso de " @@ -20957,10 +21073,10 @@ msgstr "" #| "version computed by scanning symbols." 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 "" "Como medida de precaución, un fichero de sÃmbolos puede proporcionar un " "campo de meta información I<Build-Depends-Package> para que B<dpkg-" @@ -33244,6 +33360,26 @@ msgstr "B<ln>(1), FHS, el estándar de la jerarquÃa del sistema de ficheros." #, fuzzy #~| msgid "" +#~| "Each hardening feature can be enabled and disabled in the " +#~| "B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value " +#~| "with the \"+\" and \"-\" modifier. For example, to enable the \"pie\" " +#~| "feature and disable the \"fortify\" feature you can do this in B<debian/" +#~| "rules>:" +#~ 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>:" +#~ msgstr "" +#~ "Cada opción de seguridad se puede activar o desactivar incluyendo el " +#~ "valor B<hardening> en la variable de entorno B<DEB_BUILD_MAINT_OPTIONS> " +#~ "con los modificadores «+» y «-». Por ejemplo, para activar la " +#~ "funcionalidad «pie» y desactivar la funcionalidad «fortify», puede " +#~ "utilizar lo siguiente en B<debian/rules>:" + +#, fuzzy +#~| msgid "" #~| "Typically, this is the original package's version number in whatever " #~| "form the program's author uses. It may also include a Debian revision " #~| "number (for non-native packages). The exact format and sorting algorithm " diff --git a/man/po/fr.po b/man/po/fr.po index 94d078c..fefe1af 100644 --- a/man/po/fr.po +++ b/man/po/fr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-man 1.21.20\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: 2023-02-05 23:52+0100\n" "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -7988,11 +7988,11 @@ msgid "Show the version and exit." msgstr "Afficher le numéro de version puis quitter." #. 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 @@ -9230,6 +9230,13 @@ msgid "This program was introduced in dpkg 1.22.0." msgstr "Cette commande a été introduite dans dpkg 1.18.11." #. 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 "B<--help>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod msgid "B<-c>I<control-file>" msgstr "B<-c>I<fichier-de-contrôle>" @@ -9248,13 +9255,6 @@ msgstr "" "renseignements. Par défaut, c'est le fichier B<debian/control>." #. 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 "B<--help>" - -#. type: =item #: dpkg-buildapi.pod #, fuzzy #| msgid "B<DEB_BUILD_*>" @@ -9818,14 +9818,21 @@ msgstr "B<--query-features> I<domaine>" #. type: textblock #: dpkg-buildflags.pod +#, fuzzy +#| 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." 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 "" "Affiche les fonctionnalités activées pour un domaine donné (depuis " "dpkg 1.16.2). Si la fonctionnalité est gérée par le compilateur (même " @@ -10214,22 +10221,40 @@ msgstr "ZONES D'OPTION" #. 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 "" -"Chaque option de zone peut être activée ou désactivée avec les valeurs " -"B<DEB_BUILD_OPTIONS> et B<DEB_BUIL_MAINT_OPTIONS> de l'espace de variables " -"d'environnement grâce aux modificateurs « B<+> » et « B<-> ». Par exemple, " -"pour activer l'option B<hardening> « pie » et désactiver l'option " -"« fortify », il est possible d'indiquer cela dans B<debian/rules> :" #. type: verbatim #: dpkg-buildflags.pod -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +#| "\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify\n" "\n" msgstr "" " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" @@ -10250,14 +10275,59 @@ msgstr "" #. type: verbatim #: dpkg-buildflags.pod -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +#| "\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify\n" "\n" msgstr "" " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" "\n" +#. type: textblock +#: dpkg-buildflags.pod +#, fuzzy +#| msgid "Multiple restrictions can be chained." +msgid "Multiple feature areas can be set:" +msgstr "Plusieurs restrictions peuvent être chaînées." + +#. type: verbatim +#: dpkg-buildflags.pod +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +#| "\n" +msgid "" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs\n" +"\n" +msgstr "" +" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +"\n" + +#. 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 "" + #. type: =head2 #: dpkg-buildflags.pod msgid "abi" @@ -10326,16 +10396,36 @@ msgstr "B<title>" #| "architectures where their ABI does not include LFS by default, by adding " #| "B<-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>." 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 "" "Ce paramètre (désactivé par défaut) active la prise en charge des gros " "fichiers (LFS) sur les architectures 32 bits où l'ABI n'inclut pas LFS par " "défaut, en ajoutant B<-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> à " "B<CPPFLAGS>." +#. 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 #: dpkg-buildflags.pod msgid "future" @@ -13277,7 +13367,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 "" "Si cette option est utilisée, elle contiendra une liste séparée par des " "espaces d'options qui pourraient affecter le processus de construction dans " @@ -13365,6 +13458,56 @@ msgid "" msgstr "" #. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--warnings=>I<value>" +msgid "B<hardening=>I<feature-spec>" +msgstr "B<--warnings=>I<valeur>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<abi=>I<feature-spec>" +msgstr "B<--assert=>I<fonction>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<qa=>I<feature-spec>" +msgstr "B<--assert=>I<fonction>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<--assert=>I<fonction>" + +#. 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 "B<DEB_BUILD_PROFILES>" @@ -18019,10 +18162,15 @@ msgstr "B<-F> I<format-du-fichier-des-changements>" #. type: textblock #: dpkg-parsechangelog.pod +#, fuzzy +#| 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>." 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 "" "Indique le format du fichier changelog. Par défaut, c'est une ligne " "spéciale, près de la fin du fichier, qui l'indique ; sinon, on utilise le " @@ -20326,12 +20474,19 @@ msgstr "" #. type: textblock #: dpkg-shlibdeps.pod +#, fuzzy +#| 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." 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 "" "Comme garde-fou, un fichier de symboles peut fournir un champ B<Build-" "Depends-Package> de méta-information et B<dpkg-shlibdeps> en extraira la " @@ -31956,6 +32111,20 @@ msgid "L<ln(1)>, FHS (the Filesystem Hierarchy Standard)." msgstr "" "B<ln>(1), FHS (le standard pour l'organisation du système de fichiers)." +#~ 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>:" +#~ msgstr "" +#~ "Chaque option de zone peut être activée ou désactivée avec les valeurs " +#~ "B<DEB_BUILD_OPTIONS> et B<DEB_BUIL_MAINT_OPTIONS> de l'espace de " +#~ "variables d'environnement grâce aux modificateurs « B<+> » et « B<-> ». " +#~ "Par exemple, pour activer l'option B<hardening> « pie » et désactiver " +#~ "l'option « fortify », il est possible d'indiquer cela dans B<debian/" +#~ "rules> :" + #, fuzzy #~| msgid "" #~| "Typically, this is the original package's version number in whatever " diff --git a/man/po/hu.po b/man/po/hu.po index 96fdef7..4b2f6d0 100644 --- a/man/po/hu.po +++ b/man/po/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-man 1.17.0\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:42+0200\n" "Last-Translator: SZERVÃC Attila <sas@321.hu>\n" "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n" @@ -6376,11 +6376,11 @@ msgid "Show the version and exit." msgstr "KiÃrja a B<dpkg-deb> verziószámát." #. 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 @@ -7484,6 +7484,14 @@ 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 +#, fuzzy +msgid "B<--help>" +msgstr "B<--help>, B<-h>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod #, fuzzy msgid "B<-c>I<control-file>" @@ -7497,14 +7505,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 -#, fuzzy -msgid "B<--help>" -msgstr "B<--help>, B<-h>" - -#. type: =item #: dpkg-buildapi.pod #, fuzzy #| msgid "I<%PKGCONFDIR%/dpkg.cfg>" @@ -7956,10 +7956,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 @@ -8242,17 +8240,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 "" @@ -8269,7 +8287,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 "" @@ -8316,10 +8369,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 @@ -10610,7 +10683,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 @@ -10690,6 +10766,56 @@ msgid "" msgstr "" #. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--showformat=>I<format>" +msgid "B<hardening=>I<feature-spec>" +msgstr "B<--showformat=>I<formátum>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--showformat=>I<format>" +msgid "B<abi=>I<feature-spec>" +msgstr "B<--showformat=>I<formátum>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--showformat=>I<format>" +msgid "B<qa=>I<feature-spec>" +msgstr "B<--showformat=>I<formátum>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--showformat=>I<format>" +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<--showformat=>I<formátum>" + +#. 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 "" @@ -14415,7 +14541,7 @@ msgstr "B<Package:> E<lt>csomag névE<gt>" 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 @@ -16270,10 +16396,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 diff --git a/man/po/it.po b/man/po/it.po index 5717c2f..a8b2c71 100644 --- a/man/po/it.po +++ b/man/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.16.10\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:43+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -7669,11 +7669,11 @@ msgid "Show the version and exit." msgstr "Mostra la versione ed esce." #. 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 @@ -8987,6 +8987,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 "B<--help>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod msgid "B<-c>I<control-file>" msgstr "B<-c>I<file-controllo>" @@ -9005,13 +9012,6 @@ msgstr "" "informazioni. Il valore predefinito è B<debian/control>." #. 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 "B<--help>" - -#. type: =item #: dpkg-buildapi.pod #, fuzzy #| msgid "B<DEB_BUILD_ARCH>" @@ -9477,10 +9477,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 @@ -9827,10 +9825,30 @@ 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 @@ -9838,7 +9856,7 @@ msgstr "" #, fuzzy, no-wrap #| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify\n" "\n" msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" @@ -9856,10 +9874,46 @@ msgstr "" #, fuzzy, no-wrap #| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify\n" "\n" msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +#. type: textblock +#: dpkg-buildflags.pod +msgid "Multiple feature areas can be set:" +msgstr "" + +#. type: verbatim +#: dpkg-buildflags.pod +#, fuzzy, no-wrap +#| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +msgid "" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs\n" +"\n" +msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" + +#. 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 "" + #. type: =head2 #: dpkg-buildflags.pod msgid "abi" @@ -9905,10 +9959,30 @@ msgstr "B<title>" #. 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 @@ -12645,7 +12719,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 @@ -12726,6 +12803,56 @@ msgid "" msgstr "" #. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--warnings=>I<value>" +msgid "B<hardening=>I<feature-spec>" +msgstr "B<--warnings=>I<valore>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<abi=>I<feature-spec>" +msgstr "B<--export=>I<formato>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<qa=>I<feature-spec>" +msgstr "B<--export=>I<formato>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<--export=>I<formato>" + +#. 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 "B<DEB_BUILD_PROFILES>" @@ -17114,7 +17241,7 @@ msgstr "B<-F>I<formato-changelog>" 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 "" "Specifica il formato del file changelog. In modo predefinito, il formato " "viene letto da una riga speciale vicino alla fine del file changelog o, se " @@ -19516,10 +19643,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 diff --git a/man/po/ja.po b/man/po/ja.po index 4578b0d..30b4498 100644 --- a/man/po/ja.po +++ b/man/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-man 1.17.0\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:43+0200\n" "Last-Translator: TAKAHASHI Motonobu <monyo@monyo.com>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -7976,11 +7976,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 @@ -9370,6 +9370,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 "B<--help>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod msgid "B<-c>I<control-file>" msgstr "B<-c>I<control-file>" @@ -9388,13 +9395,6 @@ msgstr "" "B<debian/control>。" #. 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 "B<--help>" - -#. type: =item #: dpkg-buildapi.pod #, fuzzy #| msgid "\\s-1DEB_BUILD_ARCH\\s0" @@ -9940,10 +9940,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 "" "指定ã•ã‚ŒãŸé ˜åŸŸ (area) ã§æœ‰åŠ¹åŒ–ã•ã‚ŒãŸæ©Ÿèƒ½ (Feature) を出力ã™ã‚‹ã€‚ç¾åœ¨èªè˜ã•ã‚Œã‚‹" "é ˜åŸŸã¯ B<hardening> ã®ã¿ã§ã‚ã‚‹ã€‚é ˜åŸŸãŒèªè˜ã•ã‚Œã¦ã„ã‚‹å ´åˆã¯ 0 ã‚’ã€ãれ以外ã®å ´" @@ -10332,29 +10330,39 @@ msgstr "" #. type: textblock #: dpkg-buildflags.pod -#, fuzzy -#| msgid "" -#| "Each hardening feature can be enabled and disabled in the " -#| "B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with " -#| "the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature " -#| "and disable the \"fortify\" feature you can do this in B<debian/rules>:" +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 "" -"å„è¦å¡žåŒ–機能ã¯ã€B<DEB_BUILD_MAINT_OPTIONS> 環境変数㮠B<hardening> 値ã«ãŠã„" -"㦠\"+\" ã‚„ \"-\" ã‚’ã¤ã‘ã‚‹ã“ã¨ã§æœ‰åŠ¹åŒ–/無効化ã§ãる。例ãˆã°ã€\"pie\" 機能を有" -"効化ã—㦠\"fortify\" 機能を無効化ã™ã‚‹å ´åˆã€B<debian/rules> ã§æ¬¡ã®ã‚ˆã†ã«è¨å®šã™" -"ã‚‹:" #. type: verbatim #: dpkg-buildflags.pod #, fuzzy, no-wrap #| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify\n" "\n" msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" @@ -10380,10 +10388,46 @@ msgstr "" #, fuzzy, no-wrap #| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify\n" "\n" msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +#. type: textblock +#: dpkg-buildflags.pod +msgid "Multiple feature areas can be set:" +msgstr "" + +#. type: verbatim +#: dpkg-buildflags.pod +#, fuzzy, no-wrap +#| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +msgid "" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs\n" +"\n" +msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" + +#. 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 "" + #. type: =head2 #: dpkg-buildflags.pod msgid "abi" @@ -10429,10 +10473,30 @@ msgstr "B<title>" #. 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 @@ -13339,7 +13403,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 @@ -13420,6 +13487,56 @@ msgid "" msgstr "" #. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--warnings=>I<value>" +msgid "B<hardening=>I<feature-spec>" +msgstr "B<--warnings=>I<value>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<abi=>I<feature-spec>" +msgstr "B<--export=>I<format>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<qa=>I<feature-spec>" +msgstr "B<--export=>I<format>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<--export=>I<format>" + +#. 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 #, fuzzy #| msgid "\\s-1DEB_BUILD_ARCH_OS\\s0" @@ -18140,7 +18257,7 @@ msgstr "B<-F>I<changelog-format>" 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 "" "changelog ファイルã®å½¢å¼ã‚’指定ã™ã‚‹ã€‚デフォルトã§ã¯ã€changelog ã®æœ«å°¾ã®è¿‘辺ã«" "ã‚る特別ãªè¡Œã‹ã‚‰èªã¿å–られるã‹ã€ã‚‚ã—ã㯠I<debian> 標準形å¼ãŒç”¨ã„られる。" @@ -20544,10 +20661,10 @@ msgstr "" #| "version computed by scanning symbols." 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 "" "安全を確ä¿ã™ã‚‹ãŸã‚ã®æ‰‹æ®µã¨ã—ã¦ã€ã‚·ãƒ³ãƒœãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã¯ I<Build-Depends-Package> " "ã¨ã„ã†ãƒ¡ã‚¿æƒ…å ±ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’æä¾›ã™ã‚‹ã“ã¨ãŒã§ãる。B<dpkg-shlibdeps> ã¯ã€ã“ã“ã‹" @@ -32537,6 +32654,25 @@ msgstr "B<ln>(1), FHS, the Filesystem Hierarchy Standard." #, fuzzy #~| msgid "" +#~| "Each hardening feature can be enabled and disabled in the " +#~| "B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value " +#~| "with the \"+\" and \"-\" modifier. For example, to enable the \"pie\" " +#~| "feature and disable the \"fortify\" feature you can do this in B<debian/" +#~| "rules>:" +#~ 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>:" +#~ msgstr "" +#~ "å„è¦å¡žåŒ–機能ã¯ã€B<DEB_BUILD_MAINT_OPTIONS> 環境変数㮠B<hardening> 値ã«ãŠ" +#~ "ã„㦠\"+\" ã‚„ \"-\" ã‚’ã¤ã‘ã‚‹ã“ã¨ã§æœ‰åŠ¹åŒ–/無効化ã§ãる。例ãˆã°ã€\"pie\" æ©Ÿ" +#~ "能を有効化ã—㦠\"fortify\" 機能を無効化ã™ã‚‹å ´åˆã€B<debian/rules> ã§æ¬¡ã®ã‚ˆ" +#~ "ã†ã«è¨å®šã™ã‚‹:" + +#, fuzzy +#~| msgid "" #~| "Typically, this is the original package's version number in whatever " #~| "form the program's author uses. It may also include a Debian revision " #~| "number (for non-native packages). The exact format and sorting algorithm " diff --git a/man/po/nl.po b/man/po/nl.po index f74edc8..50ee572 100644 --- a/man/po/nl.po +++ b/man/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-man 1.22.2\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-18 02:04+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2024-01-08 12:36+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -7657,11 +7657,11 @@ msgid "Show the version and exit." msgstr "De versie tonen en afsluiten." #. 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 @@ -8899,6 +8899,13 @@ msgid "This program was introduced in dpkg 1.22.0." msgstr "Dit programma werd geïntroduceerd in dpkg 1.22.0." #. 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 "B<--help>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod msgid "B<-c>I<control-file>" msgstr "B<-c>I<control-bestand>" @@ -8913,13 +8920,6 @@ msgstr "" "gehaald moet worden. Standaard is dat F<debian/control>." #. 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 "B<--help>" - -#. type: =item #: dpkg-buildapi.pod msgid "B<DPKG_BUILD_API>" msgstr "B<DPKG_BUILD_API>" @@ -9449,14 +9449,21 @@ msgstr "B<--query-features> I<gebied>" #. type: textblock #: dpkg-buildflags.pod +#, fuzzy +#| 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." 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 "" "De functies weergeven die voor een opgegeven gebied geactiveerd zijn (sinds " "dpkg 1.16.2). Als de functie door de compiler als een ingebouwde standaard " @@ -9790,22 +9797,40 @@ msgstr "FUNCTIEGEBIEDEN" #. 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 "" -"Elke gebiedsfunctie kan in de gebiedswaarde van de omgevingsvariabelen " -"B<DEB_BUILD_OPTIONS> en B<DEB_BUILD_MAINT_OPTIONS> ingeschakeld en " -"uitgeschakeld worden met de schakelaars ‘B<+>’ en ‘B<->’. Om bijvoorbeeld de " -"B<hardening>-functionaliteit “pie†te activeren en de functionaliteit " -"“fortify†uit te schakelen, kunt u in B<debian/rules> het volgende doen:" #. type: verbatim #: dpkg-buildflags.pod -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +#| "\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify\n" "\n" msgstr "" " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" @@ -9826,14 +9851,59 @@ msgstr "" #. type: verbatim #: dpkg-buildflags.pod -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +#| "\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify\n" "\n" msgstr "" " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" "\n" +#. type: textblock +#: dpkg-buildflags.pod +#, fuzzy +#| msgid "Multiple restrictions can be chained." +msgid "Multiple feature areas can be set:" +msgstr "Meerdere beperkingen kunnen aaneengeregen worden." + +#. type: verbatim +#: dpkg-buildflags.pod +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +#| "\n" +msgid "" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs\n" +"\n" +msgstr "" +" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +"\n" + +#. 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 "" + #. type: =head2 #: dpkg-buildflags.pod msgid "abi" @@ -9886,11 +9956,19 @@ msgstr "B<time64>" #. 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." +#, fuzzy +#| 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." +msgid "" +"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 "" "Deze instelling (sinds dpkg 1.22.0; standaard uitgezet) activeert " "ondersteuning voor 64-bits time_t op 32-bits architecturen waar hun ABI dit " @@ -9898,6 +9976,24 @@ msgstr "" "Deze instelling schakelt automatisch de B<lfs>-functie in aangezien ze deze " "nodig heeft." +#. 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 #: dpkg-buildflags.pod msgid "future" @@ -12640,10 +12736,19 @@ msgstr "" #. type: textblock #: dpkg-buildpackage.pod +#, fuzzy +#| 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." 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 "" "Indien dit ingesteld werd, zal het een door spaties gescheiden lijst met " "opties bevatten die het gedrag beïnvloeden van sommige dpkg-gereedschappen " @@ -12746,6 +12851,56 @@ msgstr "" "zijn." #. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--warnings=>I<value>" +msgid "B<hardening=>I<feature-spec>" +msgstr "B<--warnings=>I<waarde>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<abi=>I<feature-spec>" +msgstr "B<--assert->I<functionaliteit>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<qa=>I<feature-spec>" +msgstr "B<--assert->I<functionaliteit>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<--assert->I<functionaliteit>" + +#. 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 "B<DEB_BUILD_PROFILES>" @@ -17264,10 +17419,15 @@ msgstr "B<-F> I<changelog-indeling>" #. type: textblock #: dpkg-parsechangelog.pod +#, fuzzy +#| 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>." 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 "" "Geeft de indeling van het changelog-bestand aan. Standaard wordt die " "indeling gelezen van een bijzondere regel dicht bij het einde van het " @@ -19486,12 +19646,19 @@ msgstr "" #. type: textblock #: dpkg-shlibdeps.pod +#, fuzzy +#| 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." 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 "" "Bij wijze van beschermende maatregel kan een symbols-bestand een meta-" "informatieveld B<Build-Depends-Pakket> bevatten. Dan zal B<dpkg-shlibdeps> " @@ -30496,6 +30663,19 @@ msgstr "" "bestandsorganisatie en mappenstructuur op unix-achtige systemen)." #~ 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>:" +#~ msgstr "" +#~ "Elke gebiedsfunctie kan in de gebiedswaarde van de omgevingsvariabelen " +#~ "B<DEB_BUILD_OPTIONS> en B<DEB_BUILD_MAINT_OPTIONS> ingeschakeld en " +#~ "uitgeschakeld worden met de schakelaars ‘B<+>’ en ‘B<->’. Om bijvoorbeeld " +#~ "de B<hardening>-functionaliteit “pie†te activeren en de functionaliteit " +#~ "“fortify†uit te schakelen, kunt u in B<debian/rules> het volgende doen:" + +#~ msgid "" #~ "Typically, this is the original package's version number in whatever form " #~ "the program's author uses. It may also include a Debian revision number " #~ "(for non-native packages). The exact format and sorting algorithm are " diff --git a/man/po/pl.po b/man/po/pl.po index c817d42..207f6fb 100644 --- a/man/po/pl.po +++ b/man/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-man 1.15.4\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:43+0200\n" "Last-Translator: MichaÅ‚ KuÅ‚ach <michal.kulach@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -8071,11 +8071,11 @@ msgid "Show the version and exit." msgstr "WyÅ›wietla informacjÄ™ o wersji i pomyÅ›lnie koÅ„czy dziaÅ‚anie." #. 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 @@ -9473,6 +9473,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 "B<--help>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod msgid "B<-c>I<control-file>" msgstr "B<-c>I<plik-kontrolny>" @@ -9491,13 +9498,6 @@ msgstr "" "jest to B<debian/control>." #. 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 "B<--help>" - -#. type: =item #: dpkg-buildapi.pod #, fuzzy #| msgid "\\s-1DEB_BUILD_ARCH\\s0" @@ -10048,10 +10048,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 "" "Wypisuje funkcje wÅ‚Ä…czone w danym obszarze. Jedynym obecnie rozpoznawanym " "jest B<hardening>. Wychodzi z 0 jeÅ›li obszar jest znany i z 1 w przeciwnym " @@ -10444,30 +10442,39 @@ msgstr "" #. type: textblock #: dpkg-buildflags.pod -#, fuzzy -#| msgid "" -#| "Each hardening feature can be enabled and disabled in the " -#| "B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value with " -#| "the \"+\" and \"-\" modifier. For example, to enable the \"pie\" feature " -#| "and disable the \"fortify\" feature you can do this in B<debian/rules>:" +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 "" -"Każda funkcja hartowania może zostać wÅ‚Ä…czona lub wyÅ‚Ä…czona za pomocÄ… " -"wartoÅ›ci B<hardening> zmiennej Å›rodowiskowej B<DEB_BUILD_MAINT_OPTIONS>, za " -"pomocÄ… modyfikatora \"+\" lub \"-\". Na przykÅ‚ad, aby wÅ‚Ä…czyć funkcjÄ™ " -"\"pie\" i wyÅ‚Ä…czyć \"fortify\" można umieÅ›cić nastÄ™pujÄ…cy wpis w B<debian/" -"rules>:" #. type: verbatim #: dpkg-buildflags.pod #, fuzzy, no-wrap #| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify\n" "\n" msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" @@ -10493,10 +10500,46 @@ msgstr "" #, fuzzy, no-wrap #| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify\n" "\n" msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +#. type: textblock +#: dpkg-buildflags.pod +msgid "Multiple feature areas can be set:" +msgstr "" + +#. type: verbatim +#: dpkg-buildflags.pod +#, fuzzy, no-wrap +#| msgid " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +msgid "" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs\n" +"\n" +msgstr " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" + +#. 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 "" + #. type: =head2 #: dpkg-buildflags.pod msgid "abi" @@ -10542,10 +10585,30 @@ msgstr "B<title>" #. 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 @@ -13490,7 +13553,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 @@ -13571,6 +13637,56 @@ msgid "" msgstr "" #. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--warnings=>I<value>" +msgid "B<hardening=>I<feature-spec>" +msgstr "B<--warnings=>I<wartość>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<abi=>I<feature-spec>" +msgstr "B<--export=>I<format>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<qa=>I<feature-spec>" +msgstr "B<--export=>I<format>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--export=>I<format>" +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<--export=>I<format>" + +#. 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 #, fuzzy #| msgid "\\s-1DEB_BUILD_ARCH_OS\\s0" @@ -18345,7 +18461,7 @@ msgstr "B<-F>I<format-dziennika-zmian>" 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 "" "OkreÅ›la format dziennika zmian. DomyÅ›lnie format jest czytany ze specjalnej " "linii znajdujÄ…cej siÄ™ przy koÅ„cu pliku lub - jeÅ›li taka linia nie istnieje - " @@ -20777,10 +20893,10 @@ msgstr "" #| "version computed by scanning symbols." 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 "" "Jako zabezpieczenie plik symboli może zawierać pole metainformacji I<Build-" "Depends-Package>, zaÅ› B<dpkg-shlibdeps> okreÅ›lajÄ…c minimalnÄ… wersjÄ™ wymaganÄ… " @@ -33019,6 +33135,26 @@ msgstr "B<ln>(1), FHS - standard hierarchii systemu plików." #, fuzzy #~| msgid "" +#~| "Each hardening feature can be enabled and disabled in the " +#~| "B<DEB_BUILD_MAINT_OPTIONS> environment variable's B<hardening> value " +#~| "with the \"+\" and \"-\" modifier. For example, to enable the \"pie\" " +#~| "feature and disable the \"fortify\" feature you can do this in B<debian/" +#~| "rules>:" +#~ 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>:" +#~ msgstr "" +#~ "Każda funkcja hartowania może zostać wÅ‚Ä…czona lub wyÅ‚Ä…czona za pomocÄ… " +#~ "wartoÅ›ci B<hardening> zmiennej Å›rodowiskowej B<DEB_BUILD_MAINT_OPTIONS>, " +#~ "za pomocÄ… modyfikatora \"+\" lub \"-\". Na przykÅ‚ad, aby wÅ‚Ä…czyć funkcjÄ™ " +#~ "\"pie\" i wyÅ‚Ä…czyć \"fortify\" można umieÅ›cić nastÄ™pujÄ…cy wpis w B<debian/" +#~ "rules>:" + +#, fuzzy +#~| msgid "" #~| "Typically, this is the original package's version number in whatever " #~| "form the program's author uses. It may also include a Debian revision " #~| "number (for non-native packages). The exact format and sorting algorithm " diff --git a/man/po/pt.po b/man/po/pt.po index 285c8a0..3d4b25b 100644 --- a/man/po/pt.po +++ b/man/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-man 1.22.0\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: 2023-09-10 20:25+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n" "Language-Team: Portuguese <>\n" @@ -7828,11 +7828,11 @@ msgid "Show the version and exit." msgstr "Mostra a versão e termina." #. 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 @@ -9084,6 +9084,13 @@ msgid "This program was introduced in dpkg 1.22.0." msgstr "Este programa foi introduzido no dpkg 1.22.0." #. 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 "B<--help>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod msgid "B<-c>I<control-file>" msgstr "B<-c>I<control-file>" @@ -9098,13 +9105,6 @@ msgstr "" "predefinição é F<debian/control>." #. 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 "B<--help>" - -#. type: =item #: dpkg-buildapi.pod msgid "B<DPKG_BUILD_API>" msgstr "B<DPKG_BUILD_API>" @@ -9640,14 +9640,21 @@ msgstr "B<--query-features> I<area>" #. type: textblock #: dpkg-buildflags.pod +#, fuzzy +#| 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." 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 "" "Escreve as funcionalidades activadas para uma dada área (desde dpkg 1.16.2). " "Se a funcionalidade é lidada (mesmo que apenas em algumas arquitecturas) " @@ -10061,22 +10068,40 @@ msgstr "ÃREAS DE CARACTERÃSTICAS" #. 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 "" -"Cada funcionalidade de área pode ser activada ou desactivada no valor da " -"área das variáveis de ambiente B<DEB_BUILD_OPTIONS> e " -"B<DEB_BUILD_MAINT_OPTIONS> com o modificador ‘B<+>’ e ‘B<->’. Por exemplo, " -"par activar a funcionalidade \"pie\" de B<hardening> e desactivar a " -"funcionalidade “fortify†você pode fazer isto em B<debian/rules>:" #. type: verbatim #: dpkg-buildflags.pod -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +#| "\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify\n" "\n" msgstr "" " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" @@ -10097,14 +10122,59 @@ msgstr "" #. type: verbatim #: dpkg-buildflags.pod -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +#| "\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify\n" "\n" msgstr "" " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" "\n" +#. type: textblock +#: dpkg-buildflags.pod +#, fuzzy +#| msgid "Multiple restrictions can be chained." +msgid "Multiple feature areas can be set:" +msgstr "Múltiplas restrições podem ser ligadas em corrente." + +#. type: verbatim +#: dpkg-buildflags.pod +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +#| "\n" +msgid "" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs\n" +"\n" +msgstr "" +" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +"\n" + +#. 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 "" + #. type: =head2 #: dpkg-buildflags.pod msgid "abi" @@ -10158,17 +10228,43 @@ msgstr "B<time64>" #. 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." +#, fuzzy +#| 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." +msgid "" +"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 "" "Esta definição (desde dpkg 1.22.0; desactivada por predefinição) activa " "suporte time_t de 64bit em arquitecturas de 32-bit onde o seu ABI não a " "inclui por predefinição, ao adicionar B<-D_TIME_BITS=64> a B<CPPFLAGS>. Esta " "definição activa automaticamente a funcionalidade B<lfs> porque a requer." +#. 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 #: dpkg-buildflags.pod msgid "future" @@ -12933,10 +13029,19 @@ msgstr "" #. type: textblock #: dpkg-buildpackage.pod +#, fuzzy +#| 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." 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 "" "Se definido, irá conter uma lista de opções separadas por espaços que " "afectam o comportamento de algumas ferramentas do dpkg envolvidas na " @@ -13035,6 +13140,56 @@ msgstr "" "empacotamento deve reduzir nos detalhes, não sendo completamente silencioso." #. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--warnings=>I<value>" +msgid "B<hardening=>I<feature-spec>" +msgstr "B<--warnings=>I<value>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<abi=>I<feature-spec>" +msgstr "B<--assert->I<feature>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<qa=>I<feature-spec>" +msgstr "B<--assert->I<feature>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<--assert->I<feature>" + +#. 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 "B<DEB_BUILD_PROFILES>" @@ -17561,10 +17716,15 @@ msgstr "B<-F> I<changelog-format>" #. type: textblock #: dpkg-parsechangelog.pod +#, fuzzy +#| 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>." 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 "" "Especifica o formato do changelog. Por predefinição o formato é lido a " "partir de uma linha especial perto do fundo do changelog ou falhando isto " @@ -19814,12 +19974,19 @@ msgstr "" #. type: textblock #: dpkg-shlibdeps.pod +#, fuzzy +#| 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." 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 "" "Como medida de salva-guarda, um ficheiro de sÃmbolos pode fornecer um campo " "de meta-informação B<Build-Depends-Package> e B<dpkg-shlibdeps> irá extrair " @@ -30886,6 +31053,20 @@ msgstr "" msgid "L<ln(1)>, FHS (the Filesystem Hierarchy Standard)." msgstr "B<ln>(1), FHS (o Standard de Hierarquia de Sistema de Ficheiros)." +#~ 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>:" +#~ msgstr "" +#~ "Cada funcionalidade de área pode ser activada ou desactivada no valor da " +#~ "área das variáveis de ambiente B<DEB_BUILD_OPTIONS> e " +#~ "B<DEB_BUILD_MAINT_OPTIONS> com o modificador ‘B<+>’ e ‘B<->’. Por " +#~ "exemplo, par activar a funcionalidade \"pie\" de B<hardening> e " +#~ "desactivar a funcionalidade “fortify†você pode fazer isto em B<debian/" +#~ "rules>:" + #, fuzzy #~| msgid "" #~| "Typically, this is the original package's version number in whatever " diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po index 66d5db9..0fe8930 100644 --- a/man/po/pt_BR.po +++ b/man/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-man 1.17.0\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: Andre Luis Lopes <andrelop@debian.org>\n" "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n" @@ -6051,11 +6051,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 @@ -7188,6 +7188,14 @@ 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 +#, fuzzy +msgid "B<--help>" +msgstr "B<--help>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod #, fuzzy msgid "B<-c>I<control-file>" @@ -7204,14 +7212,6 @@ msgstr "" "algo diferente do padrão." #. 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 -#, fuzzy -msgid "B<--help>" -msgstr "B<--help>" - -#. type: =item #: dpkg-buildapi.pod #, fuzzy #| msgid "B<DPKG_NO_TSTP>" @@ -7667,10 +7667,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 @@ -7967,17 +7965,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 "" @@ -7994,7 +8012,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 "" @@ -8042,10 +8095,30 @@ msgstr "B<installed>" #. 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 @@ -10341,7 +10414,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 @@ -10421,6 +10497,52 @@ msgid "" msgstr "" #. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +msgid "B<hardening=>I<feature-spec>" +msgstr "B<--admindir> I<diretório>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +msgid "B<abi=>I<feature-spec>" +msgstr "B<--admindir> I<diretório>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +msgid "B<qa=>I<feature-spec>" +msgstr "B<--admindir> I<diretório>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<--admindir> I<diretório>" + +#. 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 "" @@ -14036,7 +14158,7 @@ msgstr "I<control>" 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 @@ -15891,10 +16013,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 diff --git a/man/po/ru.po b/man/po/ru.po index b844ff2..0935efc 100644 --- a/man/po/ru.po +++ b/man/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-man 1.17.0\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: Yuri Kozlov <kozlov.y@gmail.com>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -6391,11 +6391,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 @@ -7529,6 +7529,14 @@ 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 +#, fuzzy +msgid "B<--help>" +msgstr "B<dpkg --help>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod #, fuzzy msgid "B<-c>I<control-file>" @@ -7542,14 +7550,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 -#, fuzzy -msgid "B<--help>" -msgstr "B<dpkg --help>" - -#. type: =item #: dpkg-buildapi.pod #, fuzzy #| msgid "B<DPKG_NO_TSTP>" @@ -8004,10 +8004,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 @@ -8304,17 +8302,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 "" @@ -8331,7 +8349,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 "" @@ -8379,10 +8432,30 @@ msgstr "B<installed>" #. 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 @@ -10686,7 +10759,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 @@ -10766,6 +10842,52 @@ msgid "" msgstr "" #. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +msgid "B<hardening=>I<feature-spec>" +msgstr "B<-r>|B<--chroot> I<root>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +msgid "B<abi=>I<feature-spec>" +msgstr "B<-r>|B<--chroot> I<root>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +msgid "B<qa=>I<feature-spec>" +msgstr "B<-r>|B<--chroot> I<root>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<-r>|B<--chroot> I<root>" + +#. 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 "" @@ -14386,7 +14508,7 @@ msgstr "B<Package:> E<lt>Ð¸Ð¼Ñ Ð¿Ð°ÐºÐµÑ‚Ð°E<gt>" 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 @@ -16244,10 +16366,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 diff --git a/man/po/sv.po b/man/po/sv.po index 2a0e28e..48b4265 100644 --- a/man/po/sv.po +++ b/man/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-man 1.22.0\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: 2024-01-14 01:22+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" @@ -7366,11 +7366,11 @@ msgid "Show the version and exit." msgstr "Visar version och avslutar." #. 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 @@ -8586,6 +8586,13 @@ msgid "This program was introduced in dpkg 1.22.0." msgstr "Kommandot introducerades i dpkg 1.22.0." #. 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 "B<--help>" + +#. type: =item #: dpkg-buildapi.pod dpkg-gencontrol.pod dpkg-source.pod msgid "B<-c>I<control-file>" msgstr "B<-c>I<control-fil>" @@ -8600,13 +8607,6 @@ msgstr "" "är B<debian/control>." #. 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 "B<--help>" - -#. type: =item #: dpkg-buildapi.pod msgid "B<DPKG_BUILD_API>" msgstr "B<DPKG_BUILD_API>" @@ -9121,14 +9121,21 @@ msgstr "B<--query-features> I<omrÃ¥de>" #. type: textblock #: dpkg-buildflags.pod +#, fuzzy +#| 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." 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 "" "Skriv ut funktioner aktiverade för ett givet omrÃ¥de (sedan dpkg 1.16.2). Om " "funktionen hanteras (även om bara av nÃ¥gra arkitekturer) som ett inbyggt " @@ -9456,22 +9463,40 @@ msgstr "FUNKTIONSOMRÃ…DEN" #. 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 "" -"Varje omrÃ¥desfunktion kan aktiveras och inaktiveras i omrÃ¥desvärdet i " -"miljövariablerna B<DEB_BUILD_OPTIONS> och B<DEB_BUILD_MAINT_OPTIONS> " -"modifierarna â€B<+>†och â€B<->â€. Till exempel, för att aktivera B<hardening>-" -"funktionen â€pie†och inaktivera funktionen â€fortify†genom att ange detta i " -"B<debian/rules>:" #. type: verbatim #: dpkg-buildflags.pod -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +#| "\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify\n" "\n" msgstr "" " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" @@ -9491,14 +9516,59 @@ msgstr "" #. type: verbatim #: dpkg-buildflags.pod -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +#| "\n" msgid "" -" export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" +" export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify\n" "\n" msgstr "" " export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n" "\n" +#. type: textblock +#: dpkg-buildflags.pod +#, fuzzy +#| msgid "Multiple restrictions can be chained." +msgid "Multiple feature areas can be set:" +msgstr "Flera begränsningar kan kedjas samman" + +#. type: verbatim +#: dpkg-buildflags.pod +#, fuzzy, no-wrap +#| msgid "" +#| " export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +#| "\n" +msgid "" +" export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs\n" +"\n" +msgstr "" +" export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n" +"\n" + +#. 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 "" + #. type: =head2 #: dpkg-buildflags.pod msgid "abi" @@ -9551,11 +9621,19 @@ msgstr "B<time64>" #. 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." +#, fuzzy +#| 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." +msgid "" +"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 "" "Den här inställningen (sedan dpkg 1.22.0; inaktiverad som förval) aktiverar " "stöd för 64-bitars time_t pÃ¥ 32-bitars-arkitekturer där deras ABI inte som " @@ -9563,6 +9641,24 @@ msgstr "" "B<CPPFLAGS>. Inställningen aktiverar automatiskt L<lfs>-funktionerna " "eftersom den behövs för att den ska fungera." +#. 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 #: dpkg-buildflags.pod msgid "future" @@ -12220,10 +12316,19 @@ msgstr "" #. type: textblock #: dpkg-buildpackage.pod +#, fuzzy +#| 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." 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 "" "Om satt, innehÃ¥ller en blankstegsavdelad lista med flaggor som pÃ¥verkar " "beteendet för nÃ¥gra dpkg-verktyg som används i paketbyggandet, och kan " @@ -12319,6 +12424,56 @@ msgstr "" "pratsamheten, utan att bli helt tyst." #. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--warnings=>I<value>" +msgid "B<hardening=>I<feature-spec>" +msgstr "B<--warnings=>I<värde>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<reproducible=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<abi=>I<feature-spec>" +msgstr "B<--assert->I<funktion>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<future=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<qa=>I<feature-spec>" +msgstr "B<--assert->I<funktion>" + +#. type: =item +#: dpkg-buildpackage.pod +msgid "B<optimize=>I<feature-spec>" +msgstr "" + +#. type: =item +#: dpkg-buildpackage.pod +#, fuzzy +#| msgid "B<--assert->I<feature>" +msgid "B<sanitize=>I<feature-spec>" +msgstr "B<--assert->I<funktion>" + +#. 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 "B<DEB_BUILD_PROFILES>" @@ -16661,10 +16816,15 @@ msgstr "B<-F> I<ändringsloggformat>" #. type: textblock #: dpkg-parsechangelog.pod +#, fuzzy +#| 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>." 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 "" "Anger format pÃ¥ ändringsloggen. Som standard läses formatet frÃ¥n en speciell " "rad nära slutet av ändringsloggen, om det misslyckas används formatet " @@ -18795,12 +18955,19 @@ msgstr "" #. type: textblock #: dpkg-shlibdeps.pod +#, fuzzy +#| 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." 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 "" "Som en säkerhetsÃ¥tgärd kan en symbols-fil innehÃ¥lla metainformationsfältet " "I<Build-Depends-Package>, varpÃ¥ B<dpkg-shlibdeps> hämtar vilken minsta " @@ -29331,6 +29498,19 @@ msgid "L<ln(1)>, FHS (the Filesystem Hierarchy Standard)." msgstr "L<ln(1)>, FHS (the Filesystem Hierarchy Standard)." #~ 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>:" +#~ msgstr "" +#~ "Varje omrÃ¥desfunktion kan aktiveras och inaktiveras i omrÃ¥desvärdet i " +#~ "miljövariablerna B<DEB_BUILD_OPTIONS> och B<DEB_BUILD_MAINT_OPTIONS> " +#~ "modifierarna â€B<+>†och â€B<->â€. Till exempel, för att aktivera " +#~ "B<hardening>-funktionen â€pie†och inaktivera funktionen â€fortify†genom " +#~ "att ange detta i B<debian/rules>:" + +#~ msgid "" #~ "Typically, this is the original package's version number in whatever form " #~ "the program's author uses. It may also include a Debian revision number " #~ "(for non-native packages). The exact format and sorting algorithm are " 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 diff --git a/man/pt/dpkg-buildapi.pod b/man/pt/dpkg-buildapi.pod index 81c8626..8d2e7c2 100644 --- a/man/pt/dpkg-buildapi.pod +++ b/man/pt/dpkg-buildapi.pod @@ -30,10 +30,6 @@ Este programa foi introduzido no dpkg 1.22.0. =over -=item B<-c>I<control-file> - -Especifica o ficheiro de controle fonte principal de onde ler informação. A predefinição é F<debian/control>. - =item B<--help> Mostra a mensagem de utilização e termina. @@ -44,6 +40,16 @@ Mostra a versão e termina. =back +=head1 OPÇÕES + +=over + +=item B<-c>I<control-file> + +Especifica o ficheiro de controle fonte principal de onde ler informação. A predefinição é F<debian/control>. + +=back + =head1 AMBIENTE =over diff --git a/man/pt/dpkg-buildflags.pod b/man/pt/dpkg-buildflags.pod deleted file mode 100644 index e630c4f..0000000 --- a/man/pt/dpkg-buildflags.pod +++ /dev/null @@ -1,646 +0,0 @@ - - ***************************************************** - * GENERATED FILE, DO NOT EDIT * - * THIS IS NO SOURCE FILE, BUT RESULT OF COMPILATION * - ***************************************************** - -This file was generated by po4a(7). Do not store it (in VCS, for example), -but store the PO file used as source file by po4a-translate. - -In fact, consider this as a binary, and the PO file as a regular .c file: -If the PO get lost, keeping this translation up-to-date will be harder. - -=encoding UTF-8 - -=head1 NOME - -dpkg-buildflags - retorna flags de compilação para usar durante a compilação de pacotes - -=head1 RESUMO - -B<dpkg-buildflags> [I<option>...] [I<command>] - -=head1 DESCRIÇÃO - -B<dpkg-buildflags> é uma ferramenta para obter flags de compilação para usar durante a compilação de pacotes Debian. - -As flags predefinidas são definidas pelo fornecedor mas podem ser estendidas/sobrepostas de várias maneiras: - -=over - -=item 1. - -de todo o sistema com B<%PKGCONFDIR%/buildflags.conf>; - -=item 2. - -para o utilizador actual com B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> onde B<$XDG_CONFIG_HOME> usa por predefinição B<$HOME/.config>; - -=item 3. - -temporarily by the user with environment variables (see section L</ENVIRONMENT>); - -=item 4. - -dynamically by the package maintainer with environment variables set via B<debian/rules> (see section L</ENVIRONMENT>). - -=back - -Os ficheiros de configuração podem conter quatro tipos de directivas: - -=over - -=item B<SET> I<flag> I<value> - -Sobrescreve a flag chamada I<flag> para ter o valor I<valor>. - -=item B<STRIP> I<flag> I<value> - -Despoja da flag chamada I<flag> todas as flags de compilação listadas em I<valor>. Desde dpkg 1.16.1. - -=item B<APPEND> I<flag> I<value> - -Estende a flag chamada I<flag> ao acrescentar as opções dadas em I<valor>. É usado um espaço a preceder o valor acrescentado se o valor da flag actual não estiver vazio. - -=item B<PREPEND> I<flag> I<value> - -Estende a flag chamada I<flag> ao precede-la com as opções dadas em I<valor>. É acrescentado um espaço ao valor precedido se o valor da flag actual não estiver vazio. Desde dpkg 1.16.1. - -=back - -Os ficheiros de configuração podem conter comentários nas linhas que começam com um cardinal (#). As linhas vazias também são ignoradas. - -Este programa foi introduzido no dpkg 1.15.7. - -=head1 COMANDOS - -=over - -=item B<--dump> - -Escreve na saÃda standard todas as bandeiras de compilação e os seus valores. Escreve uma bandeira por linha separada do seu valor por um sinal de igual ("I<flag>=I<value>"). Esta é a acção predefinida. - -=item B<--list> - -Print the list of flags supported by the current vendor (one per line). See the L</SUPPORTED FLAGS> section for more information about them. - -=item B<--status> - -Mostra qualquer informação que possa ser útil para explicar o comportamento de B<dpkg-buildflags> (desde dpkg 1.16.5): variáveis de ambiente relevantes, fornecedor actual, estado de todas as bandeiras de funcionalidades. Também escreve as bandeira de compilação resultantes com as suas origens. - -Isto destina-se a ser corrido a partir de B<debian/rules>, para que os relatórios de compilação mantenham um rasto claro das bandeiras de compilação usadas. Isto pode ser útil para diagnosticar problemas relacionados com elas. - -=item B<--export=>I<format> - -Escreve na saÃda standard comandos que podem ser usados para exportar todas as bandeiras de compilação para alguma ferramenta particular. Se o valor I<format> não for fornecido, é assumido B<sh>. Apenas são incluÃdas bandeiras que comecem com um caractere maiúsculo, as outras são assumidas como não apropriadas para o ambiente. Formatos suportados: - -=over - -=item B<sh> - -Comandos de shell para definir e exportar todas as bandeiras de compilação no ambiente. Os valores das bandeiras são citados para que o resultado esteja pronto para avaliação pela shell. - -=item B<cmdline> - -Argumentos a passar para a linha de comandos dos programas de compilação para se usar todas as bandeiras de compilação (desde dpkg 1.17.0). Os valores das bandeiras são citados na sintaxe da shell. - -=item B<configure> - -Este é um nome alternativo antigo para B<cmdline>. - -=item B<make> - -Faz as directivas definir e exportar todas as bandeiras de compilação no ambiente. O resultado pode ser escrito para o fragmento do Makefile e avaliado usando uma directiva B<include>. - -=back - -=item B<--get> I<flag> - -Escreve o valor da flag na saÃda standard. Termina com 0 se a flag for conhecida, caso contrário termina com 1. - -=item B<--origin> I<flag> - -Escreve a origem do valor que é devolvido por B<--get>. Termina com 0 se a flag for conhecida, caso contrário termina com 1. A origem pode ser um dos seguintes valores: - -=over - -=item B<vendor> - -é devolvida a flag origina definida pelo fornecedor; - -=item B<system> - -a flag é definida/modifica por uma configuração de todo o sistema; - -=item B<user> - -a flag é definida/modifica por uma configuração especÃfica do utilizador; - -=item B<env> - -a flag é definida/modifica por uma configuração especÃfica do ambiente; - -=back - -=item B<--query> - -Escreve qualquer informação que possa ser útil para explicar o comportamento do programa: fornecedor actual, variáveis de ambiente relevantes, áreas de funcionalidades, estado de todas as bandeiras de funcionalidades, se uma funcionalidade é lidada como uma predefinição de compilação pelo compilador (desde dpkg 1.21.14), a as bandeiras de compilação com as suas origens (desde dpkg 1.19.0). - -Por exemplo: - - Vendor: Debian - Environment: - DEB_CFLAGS_SET=-O0 -Wall - - Area: qa - Features: - bug=no - canary=no - Builtins: - - Area: hardening - Features: - pie=no - Builtins: - pie=yes - - Area: reproducible - Features: - timeless=no - Builtins: - - Flag: CFLAGS - Value: -O0 -Wall - Origin: env - - Flag: CPPFLAGS - Value: -D_FORTIFY_SOURCE=2 - Origin: vendor - -=item B<--query-features> I<area> - -Escreve as funcionalidades activadas para uma dada área (desde dpkg 1.16.2). Se a funcionalidade é lidada (mesmo que apenas em algumas arquitecturas) como predefinição de compilação pelo compilador, então é escrito um campo B<Builtin> (desde dpkg 1.21.14). As únicas áreas actualmente reconhecidas em Debian e derivados são B<future>, B<qa>, B<reproducible>, B<sanitize> e B<hardening>, veja a secção B<ÃREAS DE CARACTERÃSTICAS> para mais detalhes. Termina com 0 se a área é conhecida caso contrário termina com 1. - -O resultado está em formato RFC822, com uma secção por caracterÃstica. Por exemplo: - - Feature: pie - Enabled: yes - Builtin: yes - - Feature: stackprotector - Enabled: yes - -=item B<--help> - -Mostra a mensagem de utilização e termina. - -=item B<--version> - -Mostra a versão e termina. - -=back - -=head1 FLAGS SUPORTADAS - -=over - -=item B<ASFLAGS> - -Options for the host assembler. Default value: empty. Since dpkg 1.21.0. - -=item B<CFLAGS> - -Options for the host C compiler. The default value set by the vendor includes B<-g> and the default optimization level (B<-O2> usually, or B<-O0> if the B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>). - -=item B<CPPFLAGS> - -Options for the host C preprocessor. Default value: empty. - -=item B<CXXFLAGS> - -Options for the host C++ compiler. Same as B<CFLAGS>. - -=item B<OBJCFLAGS> - -Options for the host Objective C compiler. Same as B<CFLAGS>. Since dpkg 1.17.7. - -=item B<OBJCXXFLAGS> - -Options for the host Objective C++ compiler. Same as B<CXXFLAGS>. Since dpkg 1.17.7. - -=item B<DFLAGS> - -Options for the host D compiler (ldc or gdc). Since dpkg 1.20.6. - -=item B<FFLAGS> - -Options for the host Fortran 77 compiler. A subset of B<CFLAGS>. - -=item B<FCFLAGS> - -Options for the host Fortran 9x compiler. Same as B<FFLAGS>. Since dpkg 1.17.7. - -=item B<LDFLAGS> - -Options passed to the host compiler when linking executables or shared objects (if the linker is called directly, then B<-Wl> and B<,> have to be stripped from these options). Default value: empty. - -=item B<ASFLAGS_FOR_BUILD> - -Options for the build assembler. Default value: empty. Since dpkg 1.22.1. - -=item B<CFLAGS_FOR_BUILD> - -Options for the build C compiler. The default value set by the vendor includes B<-g> and the default optimization level (B<-O2> usually, or B<-O0> if the B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>). Since dpkg 1.22.1. - -=item B<CPPFLAGS_FOR_BUILD> - -Options for the build C preprocessor. Default value: empty. Since dpkg 1.22.1. - -=item B<CXXFLAGS_FOR_BUILD> - -Options for the build C++ compiler. Same as B<CFLAGS_FOR_BUILD>. Since dpkg 1.22.1. - -=item B<OBJCFLAGS_FOR_BUILD> - -Options for the build Objective C compiler. Same as B<CFLAGS_FOR_BUILD>. Since dpkg 1.22.1. - -=item B<OBJCXXFLAGS_FOR_BUILD> - -Options for the build Objective C++ compiler. Same as B<CXXFLAGS_FOR_BUILD>. Since dpkg 1.22.1. - -=item B<DFLAGS_FOR_BUILD> - -Options for the build D compiler (ldc or gdc). Since dpkg 1.22.1. - -=item B<FFLAGS_FOR_BUILD> - -Options for the build Fortran 77 compiler. A subset of B<CFLAGS_FOR_BUILD>. Since dpkg 1.22.1. - -=item B<FCFLAGS_FOR_BUILD> - -Options for the build Fortran 9x compiler. Same as B<FFLAGS_FOR_BUILD>. Since dpkg 1.22.1. - -=item B<LDFLAGS_FOR_BUILD> - -Options passed to the build compiler when linking executables or shared objects (if the linker is called directly, then B<-Wl> and B<,> have to be stripped from these options). Default value: empty. Since dpkg 1.22.1. - -=back - -Podem ser adicionadas novas bandeiras no futuro se a necessidade surgir (por exemplo para suportar outras linguagens). - -=head1 ÃREAS DE CARACTERÃSTICAS - -Cada funcionalidade de área pode ser activada ou desactivada no valor da área das variáveis de ambiente B<DEB_BUILD_OPTIONS> e B<DEB_BUILD_MAINT_OPTIONS> com o modificador ‘B<+>’ e ‘B<->’. Por exemplo, par activar a funcionalidade "pie" de B<hardening> e desactivar a funcionalidade “fortify†você pode fazer isto em B<debian/rules>: - - export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify - -A funcionalidade especial B<all> (válida em qualquer área) pode ser usada para activar ou desactivar todas as funcionalidades de área ao mesmo tempo. Assim desactivar tudo na área B<hardening> e activar apenas apenas “format†e “fortify†pode ser obtido com: - - export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify - -=head2 abi - -Várias opções de tempo de compilação (detalhado em baixo) podem ser usadas para activar funcionalidades que podem modificar o ABI dum pacote, mas não podem estar activas por predefinição devido a razões de compatibilidade com versões anteriores, a menos que sejam coordenadas ou verificadas individualmente. - -=over - -=item B<lfs> - -Esta definição (desde dpkg 1.22.00; desactivada por predefinição) activa Suporte Ficheiros Longos em arquitecturas de 32-bit onde o seu ABI não inclui LFS (Large File Support) por predefinição, ao adicionar B<-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> a B<CPPFLAGS>. - -Quando esta funcionalidade é activa irá sobrepor o valor da mesma funcionalidade na área de funcionalidades B<future>. - -=item B<time64> - -Esta definição (desde dpkg 1.22.0; desactivada por predefinição) activa suporte time_t de 64bit em arquitecturas de 32-bit onde o seu ABI não a inclui por predefinição, ao adicionar B<-D_TIME_BITS=64> a B<CPPFLAGS>. Esta definição activa automaticamente a funcionalidade B<lfs> porque a requer. - -=back - -=head2 future - -Várias opções de tempo de compilação (detalhado em baixo) podem ser usadas para activar funcionalidades que deveria estar activadas por predefinição, mas não podem estar por razões de compatibilidade com versões anteriores. - -=over - -=item B<lfs> - -Esta definição (desde dpkg 1.19.0; desactivada por predefinição) é agora um nome alternativo para a funcionalidade B<lfs> na área B<abi>, use esta em vez da anterior. A funcionalidade da ária B<abi> sobrepõe esta definição. - -=back - -=head2 qa - -Várias opções de tempo de compilação (detalhado em baixo) podem ser usadas para ajudar a detectar no código fonte ou no sistema de compilação. - -=over - -=item B<bug-implicit-func> - -This setting (since dpkg 1.22.3; disabled by default) adds B<-Werror=implicit-function-declaration> to B<CFLAGS>. - -=item B<bug> - -Esta definição (desde dpkg 1.17.4; desactivada por predefinição) adiciona qualquer opção de aviso de detecção de fiabilidade problemática no código fonte. Os avisos são fatais. As únicas bandeiras presentemente suportadas são B<CFLAGS> e B<CXXFLAGS> com bandeiras definidas para B<-Werror=array-bounds>, B<-Werror=clobbered>, B<-Werror=implicit-function-declaration> e B<-Werror=volatile-register-var>. - -This feature handles B<-Werror=implicit-function-declaration> via the B<bug-implicit-func> feature, if that has not been specified. - -=item B<canary> - -Esta definição (desde dpkg 1.17.14; desactivada por predefinição) adiciona opções canary fantoches à s bandeiras de compilação, para que os relatórios de compilação possam ser verificados em como as bandeiras de compilação se propagam e para permitir encontrar qualquer omissão de definições normais de bandeiras de compilação. As únicas bandeiras actualmente suportadas são B<CPPFLAGS>, B<CFLAGS>, B<OBJCFLAGS>, B<CXXFLAGS> e B<OBJCXXFLAGS> com bandeiras definidas para B<-D__DEB_CANARY_>I<flag>_I<random-id>B<__>, e B<LDFLAGS> definida para B<-Wl,-z,deb-canary->I<random-id>. - -=back - -=head2 optimize - -Várias opções de tempo de compilação (detalhado em baixo) podem ser usadas para ajudar a optimizar um binário resultante (desde dpkg 1.21.0). B<Nota>: ativador B<todas> estas opções pode resultar em artefactos binários não reproduzÃveis. - -=over - -=item B<lto> - -This setting (since dpkg 1.21.0; disabled by default) enables Link Time Optimization by adding B<-flto=auto -ffat-lto-objects> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<FFLAGS>, B<FCFLAGS> and B<LDFLAGS>. - -=back - -=head2 sanitize - -Várias opções de tempo de compilação (detalhado em baixo) podem ser usadas para ajudar a higienizar um binário resultante contra corrupções de memória, fugas de memória, utilização após livre, segmentação de dados e bugs de comportamento indefinido. B<Nota>: estas opções B<não> devem ser usadas para compilações de produção pois elas podem reduzir a confiança na conformidade do código, reduzir a segurança ou mesmo a funcionalidade. - -=over - -=item B<address> - -Esta definição (desde dpkg 1.18.0; desactivada por predefinição) adiciona B<-fsanitize=address> a B<LDFLAGS> e B<-fsanitize=address -fno-omit-frame-pointer> a B<CFLAGS> e B<CXXFLAGS>. - -=item B<thread> - -Esta definição (desde dpkg 1.18.0; desactivada por predefinição) adiciona B<-fsanitize=thread> a B<CFLAGS>, B<CXXFLAGS> e B<LDFLAGS>. - -=item B<leak> - -Esta definição (desde dpkg 1.18.0; desactivada por predefinição) adiciona B<-fsanitize=leak> a B<LDFLAGS>. Fica automaticamente desactivada se as funcionalidades B<address> ou B<thread> estiverem activas, pois elas já implicam isto. - -=item B<undefined> - -Esta definição (desde dpkg 1.18.0; desactivada por predefinição) adiciona B<-fsanitize=undefined> a B<CFLAGS>, B<CXXFLAGS> e B<LDFLAGS>. - -=back - -=head2 endurecimento - -Várias opções de tempo de compilação (detalhado em baixo) podem ser usadas para ajudar a endurecer um binário resultante contra ataques de corrupção de memória, ou disponibilizar mensagens de aviso adicionais durante a compilação. Excepto como notado em baixo, estas estão activadas por predefinição para as arquitecturas que as suportam. - -=over - -=item B<format> - -Esta definição (desde dpkg 1.16.1; activada por predefinição) adiciona B<-Wformat -Werror=format-security> a B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS> e B<OBJCXXFLAGS>. Isto irá avisar sobre uso de strings de formato impróprias, e irá falhar quando funções de formato forem usadas em modo que representem possÃveis problemas de segurança. Presentemente, isto avisa sobre chamadas a funções B<printf> e B<scanf> onde a string de formato não é uma string literal e não existem argumentos de formato, como em B<printf(foo);> em vez de B<printf("%s", foo);> Isto pode ser um buraco de segurança se a string de formato vier de uma entrada não confiável e conter ‘%n’. - -=item B<fortify> - -Esta definição (desde dpkg 1.16.1; activada por predefinição) adiciona B<-D_FORTIFY_SOURCE=2> a B<CPPFLAGS>. Durante a geração de código o compilador sabe muita informação sobre tamanhos de buffer (onde possÃvel), e tenta substituir chamadas de função buffer de comprimento ilimitadas e inseguras por umas limitadas em comprimento. Isto é especialmente útil para código antigo, desnecessariamente complicado. Adicionalmente, as strings de formato em memória gravável que contêm ‘%n’ são bloqueadas. Se uma aplicação depender de tal string de formato, isso terá que ser contornado. - -Note que para esta opção ter algum efeito, a fonte tem de também ser compilada com B<-O1> ou superior. Se a variável de ambiente B<DEB_BUILD_OPTIONS> conter I<noopt>, então o suporte a B<fortify> será desactivado, devido a novos avisos serem emitidos pelo glibc 2.16 e posterior. - -=item B<stackprotector> - -This setting (since dpkg 1.16.1; enabled by default if stackprotectorstrong is not in use) adds B<-fstack-protector --param=ssp-buffer-size=4> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<FFLAGS> and B<FCFLAGS>. This adds safety checks against stack overwrites. This renders many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application). - -Esta funcionalidade requer ligação (link) a glibc (ou outro fornecedor de B<__stack_chk_fail>), portanto precisa de ser desactivada quando se compila com B<-nostdlib> ou B<-ffreestanding> ou semelhante. - -=item B<stackprotectorstrong> - -This setting (since dpkg 1.17.11; enabled by default) adds B<-fstack-protector-strong> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<FFLAGS> and B<FCFLAGS>. This is a stronger variant of B<stackprotector>, but without significant performance penalties. - -Desactivar B<stackprotector> irá também desactivar esta definição. - -Esta funcionalidade tem os mesmos requerimentos que B<stackprotector>, e adicionalmente também requer gcc 4.9 e posterior. - -=item B<stackclash> - -This setting (since dpkg 1.22.0; enabled by default) adds B<-fstack-clash-protection> on B<amd64>, B<arm64>, B<armhf> and B<armel> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<FFLAGS> and B<FCFLAGS>. This adds code to prevent stack clash style attacks. - -=item B<branch> - -This setting (since dpkg 1.22.0; enabled by default) adds B<-fcf-protection> on B<amd64> and B<-mbranch-protection=standard> on B<arm64> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<FFLAGS> and B<FCFLAGS>. This adds branch protection to indirect calls, jumps and returns to check whether these are valid at run-time. - -=item B<relro> - -Esta definição (desde dpkg 1.16.1; activada por predefinição) adiciona B<-Wl,-z,relro> a B<LDFLAGS>. Durante o carregamento do programa, várias secções de memória ELF precisam de ser escritas pelo vinculador. Isto sinaliza ao carregador para tornar estas secções só-leitura antes de entregar o controlo ao programa. Mais notavelmente isto previne ataques de sobrescrita GOT. Se esta opção for desactivada, B<bindnow> irá ficar também desactivado. - -=item B<bindnow> - -Esta definição (desde dpkg 1.16.1; desactivada por predefinição) adiciona B<-Wl,-z,now> a B<LDFLAGS>. Durante o carregamento do programa, todos os sÃmbolos dinâmicos são resolvidos, permitindo que todo o PLT seja marcado só-leitura (devido ao B<relro> em cima). A opção pode ser activada se B<relro> não for activado. - -=item B<pie> - -This setting (since dpkg 1.16.1; with no global default since dpkg 1.18.23, as it is enabled by default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the required options to enable or disable PIE via gcc specs files, if needed, depending on whether gcc injects on that architecture the flags by itself or not. When the setting is enabled and gcc injects the flags, it adds nothing. When the setting is enabled and gcc does not inject the flags, it adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to B<LDFLAGS>. When the setting is disabled and gcc injects the flags, it adds B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) to B<LDFLAGS>. - -Position Independent Executable (PIE) é necessário para tirar vantagem de Address Space Layout Randomization (ASLR), suportado por algumas versões de kernel. Enquanto ASLR já pode ser aplicada para áreas de dados na stack e heap (brk e mmap), as áreas de código têm de ser compiladas como independente-de-posição. As bibliotecas partilhadas já fazem isto (B<-fPIC>), assim elas ganham ASLR automaticamente, mas as regiões de texto binários precisam de ser compiladas como PIE para ganhar ASLR. Quando isto acontece, os ataques ROP (Return Oriented Programming) são mais difÃceis pois não são localizações estáticas para ressaltar durante um ataque de corrupção de memória. - -PIE não é compatÃvel com B<-fPIC>, assim em geral é preciso cuidado ao compilar objectos partilhados. Mas porque as bandeiras PIE emitidas são injetadas via ficheiros specs de gcc, deverá ser sempre seguro defini-las incondicionalmente independentemente do tipo de objecto a ser compilado ou ligado em link. - -Bibliotecas estáticas pode ser usadas por programas ou outras bibliotecas partilhadas. Dependendo das bandeiras usadas para compilar todos os objectos dentro de uma biblioteca estática, estas bibliotecas serão utilizáveis por conjuntos diferentes de objectos: - -=over - -=item none - -Não pode ser vinculado a um programa PIE, não é uma biblioteca partilhada. - -=item B<-fPIE> - -Pode ser vinculado a qualquer programa, mas não a uma biblioteca partilhada (recomendado). - -=item B<-fPIC> - -Pode ser vinculado a qualquer programa e biblioteca partilhada. - -=back - -Se existir a necessidade de definir estas bandeiras manualmente, fazendo bypass à injeção de spec gcc, há varias coisas a ter em conta. Passar incondicionalmente e explicitamente B<-fPIE>, B<-fpie> ou B<-pie> a um sistema de compilação usando libtool é seguro pois estas bandeiras irão ser despojadas quando se compila bibliotecas partilhadas. Caso contrário em projetos que compilam ambos programas e bibliotecas partilhadas você pode precisar de certificar que quando compila as bibliotecas partilhadas, B<-fPIC> seja sempre passado em último (para que sobreponha qualquer B<-PIE> anterior) à s bandeiras de compilação tais como B<CFLAGS>, e B<-shared> é passado em último (para que sobreponha qualquer B<-pie> anterior) para ligar em link bandeiras tais como B<LDFLAGS>. B<Nota>: Isto não deve ser necessário com a maquinaria de specs gcc predefinida. - -Adicionalmente, como PIE é implementado via registo geral, algumas arquitecturas com falta de registo (mas não incluindo mais a i386 desde as optimizações implementadas no gcc E<gt>= 5) podem ver perdas de performance até aos 15% em grandes cargas de aplicações de segmentos de texto pesados; a maioria das cargas vêm menos de 1%. Arquitecturas com registos mais gerais (ex. amd64) não vêm mais alto que uma penalidade de pior caso. - -=back - -=head2 reproducible - -As opções de tempo de compilação detalhadas em baixo podem ser usadas para ajudar a melhorar a reprodutibilidade de compilação ou fornecer mensagens de aviso adicionais durante a compilação. Excepto como notado em baixo, estas estão activadas por predefinição para as arquitecturas que as suportam. - -=over - -=item B<timeless> - -Esta definição (desde dpkg 1.17.14; activada por predefinição) adiciona B<-Wdate-time> a B<CPPFLAGS>. Isto irá causar avisos quando as macros B<__TIME__>, B<__DATE__> e B<__TIMESTAMP__> são usadas. - -=item B<fixfilepath> - -This setting (since dpkg 1.19.1; enabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=.> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level directory of the package being built. This has the effect of removing the build path from any generated file. - -Se ambas B<fixdebugpath> e B<fixfilepath> forem definidas, esta opção toma precedência, porque é um superconjunto do anterior. - -B<Nota>: Se o processo de compilação capturar as bandeiras de compilação para os objectos de compilação resultantes, isso irá tornar o pacote não-reproduzÃvel. E ao desactivar esta opção poderá tornar alguns dos objectos reproduzÃveis de novo isto irá também requerer desactivar B<fixdebugpath>, o que poderá tornar quaisquer sÃmbolos de depuração gerados não-reproduzÃveis. A correção ideal é parar de capturar bandeiras de compilação. - -=item B<fixdebugpath> - -This setting (since dpkg 1.18.5; enabled by default) adds B<-fdebug-prefix-map=>I<BUILDPATH>B<=.> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level directory of the package being built. This has the effect of removing the build path from any generated debug symbols. - -B<Nota>: Esta funcionalidade tem propriedades de reprodução semelhantes a B<fixfilepath>. - -=back - -=head1 AMBIENTE - -Existem 2 conjuntos de variáveis de ambiente a fazer as mesmas operações, O primeiro (DEB_I<flag>_I<op>) nunca deve ser usada dentro de B<debian/rules>. Destina-se a qualquer utilizador que queria recompilar o pacote fonte com bandeiras de compilação diferentes. O segundo conjunto (DEB_I<flag>_MAINT_I<op>) só deve ser usado em B<debian/rules> pelos maintainers de pacotes para alterar as bandeiras de compilação resultantes. - -=over - -=item B<DEB_>I<flag>B<_SET> - -=item B<DEB_>I<flag>B<_MAINT_SET> (desde dpkg 1.16.1) - -Esta variável pode ser usada para forçar o valor retornado para a <flag> fornecida. - -=item B<DEB_>I<flag>B<_STRIP> (desde dpkg 1.16.1) - -=item B<DEB_>I<flag>B<_MAINT_STRIP> (desde dpkg 1.16.1) - -Esta variável pode ser usada para disponibilizar uma lista separada por espaços das opções que irão ser despojadas do conjunto de flags retornado para a I<flag> fornecida. - -=item B<DEB_>I<flag>B<_APPEND> - -=item B<DEB_>I<flag>B<_MAINT_APPEND> (desde dpkg 1.16.1) - -Esta variável pode ser usada para acrescentar opções suplementares ao valor retornado para a I<flag> fornecida. - -=item B<DEB_>I<flag>B<_PREPEND> (desde dpkg 1.16.1) - -=item B<DEB_>I<flag>B<_MAINT_PREPEND> (desde dpkg 1.16.1) - -Esta variável pode ser usada para adicionar opções suplementares ao inicio do valor retornado para a I<flag> fornecida. - -=item B<DEB_BUILD_OPTIONS> - -=item B<DEB_BUILD_MAINT_OPTIONS> (desde dpkg 1.16.1) - -These variables can be used by a user or maintainer to disable/enable various area features that affect build flags. The B<DEB_BUILD_MAINT_OPTIONS> variable overrides any setting in the B<DEB_BUILD_OPTIONS> feature areas. See the L</FEATURE AREAS> section for details. - -=item B<DEB_VENDOR> - -Esta definição define o fornecedor actual. Se não definida, irá descobrir o fornecedor actual ao ler B<%PKGCONFDIR%/origins/default>. - -=item B<DEB_BUILD_PATH> - -Esta variável define o caminho de compilação (desde dpkg 1.18.8) a usar em funcionalidades como B<fixdebugpath> para que possam ser controladas pelo chamador. Esta variável é actualmente especÃfica de Debian e derivados. - -=item B<DPKG_COLORS> - -Define o modo de cor (desde dpkg 1.18.5). Os valores actualmente aceites são: B<auto> (predefinido), B<always> e B<never>. - -=item B<DPKG_NLS> - -Se definida, será usada para decidir se deve activar o Suporte a Linguagem Nativa. Também como conhecido como suporte de internacionalização (ou i18n) (desde dpkg 1.19.0). Os valores aceites são B<0> e B<1> (predefinição). - -=back - -=head1 FICHEIROS - -=head2 Ficheiros de configuração - -=over - -=item B<%PKGCONFDIR%/buildflags.conf> - -Ficheiro de configuração geral do sistema. - -=item B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> ou - -=item B<$HOME/.config/dpkg/buildflags.conf> - -Ficheiro de configuração do utilizador. - -=back - -=head2 Suporte a empacotamento - -=over - -=item B<%PKGDATADIR%/buildflags.mk> - -trecho do Makefile que irá carregar (e opcionalmente exportar) todas as bandeiras suportadas pelo B<dpkg-buildflags> em variáveis (desde dpkg 1.16.1). - -=back - -=head1 EXEMPLOS - -Para passar flags de compilação a um comando de compilação dentro de um Makefile: - -=over - - $(MAKE) $(shell dpkg-buildflags --export=cmdline) - - ./configure $(shell dpkg-buildflags --export=cmdline) - -=back - -Para definir bandeiras de compilação num script de shell ou num fragmento de shell, por ser usado o B<eval> para interpretar o resultado e para exportar as bandeiras no ambiente: - -=over - - eval "$(dpkg-buildflags --export=sh)" && make - -=back - -ou para definir os parâmetros posicionais a passar a um comando: - -=over - - eval "set -- $(dpkg-buildflags --export=cmdline)" - for dir in a b c; do (cd $dir && ./configure "$@" && make); done - -=back - -=head2 Utilização em debian/rules - -Você deve chamar B<dpkg-buildflags> ou incluir B<buildflags.mk> do ficheiro B<debian/rules> para obter as bandeiras de compilação necessárias para passar ao sistema de compilação. Note que versões antigas do B<dpkg-buildpackage> (antes do dpkg 1.16.1) exportavam estas bandeiras automaticamente. No entanto, você não deve confiar nisto, pois isto quebra a invocação manual de B<debian/rules>. - -For packages with autoconf-like build systems, you can pass the relevant options to configure or L<make(1)> directly, as shown above. - -Para outros sistemas de compilação, ou quando precisa de um controle mais afinado acerca de quais bandeiras são passadas para onde, você pode usar B<--get>. Ou você pode incluir B<buildflags.mk> em vez disto, o que toma conta de chamar B<dpkg-buildflags> e guardar as bandeiras de compilação em variáveis do make. - -Se você quiser exportar todas as bandeiras de compilação para o ambiente (onde elas pode ser colhidas pelo seu sistema de compilação): - -=over - - DPKG_EXPORT_BUILDFLAGS = 1 - include %PKGDATADIR%/buildflags.mk - -=back - -Para algum controle extra sobre o que é exportado, você pode exportar manualmente as variáveis (pois nenhuma é exportada por predefinição). - -=over - - include %PKGDATADIR%/buildflags.mk - export CPPFLAGS CFLAGS LDFLAGS - -=back - -E claro que você pode passar as bandeiras aos comandos manualmente: - -=over - - include %PKGDATADIR%/buildflags.mk - build-arch: - $(CC) -o hello hello.c $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) - -=back - - -=head1 TRADUÇÃO - -Américo Monteiro - -Se encontrar algum erro na tradução deste documento, por favor comunique para -Américo Monteiro <a_monteiro@gmx.com>. diff --git a/man/pt/dpkg-buildpackage.pod b/man/pt/dpkg-buildpackage.pod index f193e87..ce485c1 100644 --- a/man/pt/dpkg-buildpackage.pod +++ b/man/pt/dpkg-buildpackage.pod @@ -514,7 +514,7 @@ Se definido, será usado para assinar os ficheiros B<.changes>, B<.buildinfo> e =item B<DEB_BUILD_OPTIONS> -Se definido, irá conter uma lista de opções separadas por espaços que afectam o comportamento de algumas ferramentas do dpkg envolvidas na compilação de pacote, e pode afectar o processo de compilação se o código em I<debian/rules> as honrar. +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. 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. O seguinte são opções conhecidas e suportadas pelas ferramentas do dpkg, outras opções honradas por F<debian/rules> podem ser definidas por polÃticas especÃficas da distribuição. @@ -540,6 +540,22 @@ O F<debian/rules> no empacotamento deve assegurar que os objectos não ficam com B<dpkg-buildpackage> irá acrescentar a bandeira B<--no-print-directory> L<make(1)> à variável de ambiente B<MAKEFLAGS>. O F<debian/rules> no empacotamento deve reduzir nos detalhes, não sendo completamente silencioso. +=item B<hardening=>I<feature-spec> + +=item B<reproducible=>I<feature-spec> + +=item B<abi=>I<feature-spec> + +=item B<future=>I<feature-spec> + +=item B<qa=>I<feature-spec> + +=item B<optimize=>I<feature-spec> + +=item B<sanitize=>I<feature-spec> + +These are feature areas that control build flag features. See L<dpkg-buildflags(1)> for further details. + =back =item B<DEB_BUILD_PROFILES> diff --git a/man/pt/dpkg-parsechangelog.pod b/man/pt/dpkg-parsechangelog.pod index c555e14..77f60f8 100644 --- a/man/pt/dpkg-parsechangelog.pod +++ b/man/pt/dpkg-parsechangelog.pod @@ -34,7 +34,7 @@ Especifica o ficheiro de registo de alterações de onde ler informação. Pode =item B<-F> I<changelog-format> -Especifica o formato do changelog. Por predefinição o formato é lido a partir de uma linha especial perto do fundo do changelog ou falhando isto cai para o formato standard B<debian>. Veja também B<CHANGELOG FORMATS>. +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 L</CHANGELOG FORMATS>. =item B<-L> I<libdir> diff --git a/man/pt/dpkg-shlibdeps.pod b/man/pt/dpkg-shlibdeps.pod index 8d8464a..85e8cf8 100644 --- a/man/pt/dpkg-shlibdeps.pod +++ b/man/pt/dpkg-shlibdeps.pod @@ -50,7 +50,7 @@ Informação de dependências de bibliotecas partilhadas fornecidas pelo pacote. Enquanto sonda os sÃmbolos usados por todos os binários, o B<dpkg-shlibdeps> lembra-se da versão mÃnima (mais alta) necessária para cada biblioteca. No final do processo, é capaz de escrever a dependência mÃnima para cada biblioteca usada (desde que a informação dos ficheiros I<symbols> esteja exacta). -Como medida de salva-guarda, um ficheiro de sÃmbolos pode fornecer um campo de meta-informação B<Build-Depends-Package> e B<dpkg-shlibdeps> irá extrair a versão mÃnima requerida pelo pacote correspondente no campo B<Build-Depends> e usa esta versão se for maior que a versão mÃnima computada pela sondagem dos sÃmbolos. +As a safe-guard measure, a symbols file can provide a B<Build-Depends-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. =head2 Ficheiros shlibs diff --git a/man/sv/dpkg-buildapi.pod b/man/sv/dpkg-buildapi.pod index 2c40542..cf02e43 100644 --- a/man/sv/dpkg-buildapi.pod +++ b/man/sv/dpkg-buildapi.pod @@ -30,10 +30,6 @@ Kommandot introducerades i dpkg 1.22.0. =over -=item B<-c>I<control-fil> - -Anger huvudkällkodsstyrfilen som information ska läsas frÃ¥n. Standardvärdet är B<debian/control>. - =item B<--help> Visar hjälpskärm och avslutar. @@ -44,6 +40,16 @@ Visar version och avslutar. =back +=head1 FLAGGOR + +=over + +=item B<-c>I<control-fil> + +Anger huvudkällkodsstyrfilen som information ska läsas frÃ¥n. Standardvärdet är B<debian/control>. + +=back + =head1 MILJÖVARIABLER =over diff --git a/man/sv/dpkg-buildflags.pod b/man/sv/dpkg-buildflags.pod index 4c8e4ff..e49cece 100644 --- a/man/sv/dpkg-buildflags.pod +++ b/man/sv/dpkg-buildflags.pod @@ -179,7 +179,7 @@ Till exempel: =item B<--query-features> I<omrÃ¥de> -Skriv ut funktioner aktiverade för ett givet omrÃ¥de (sedan dpkg 1.16.2). Om funktionen hanteras (även om bara av nÃ¥gra arkitekturer) som ett inbyggt förval av kompilatorn visas fältet B<Bultin> (sedan dpkg 1.21.14). De enda för närvarande kända omrÃ¥dena pÃ¥ Debian och dess derivat är B<future>, B<qa>, B<reproducible>, B<sanitize> och B<hardening>, se avsnittet B<FUNKTIONSOMRÃ…DEN> för fler detaljer. Avslutar med 0 om omrÃ¥det är känt, avslutar annars med 1. +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). 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. Utdata är pÃ¥ RFC822-headerformat, med en sektion per funktion. Till exempel: @@ -290,13 +290,30 @@ Nya flaggor kan komma att läggas till i framtiden om behovet uppstÃ¥r (till exe =head1 FUNKTIONSOMRÃ…DEN -Varje omrÃ¥desfunktion kan aktiveras och inaktiveras i omrÃ¥desvärdet i miljövariablerna B<DEB_BUILD_OPTIONS> och B<DEB_BUILD_MAINT_OPTIONS> modifierarna â€B<+>†och â€B<->â€. Till exempel, för att aktivera B<hardening>-funktionen â€pie†och inaktivera funktionen â€fortify†genom att ange detta i B<debian/rules>: +Feature areas are currently vendor specific, and the ones described below are only recognized on Debian and derivatives. - export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify +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. 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. + +For example, to enable the B<hardening> “pie†feature and disable the “fortify†feature you can do this in B<debian/rules>: + + export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify Den speciella funktionen B<all> kan användas för att aktivera eller inaktivera alla omrÃ¥desfunktioner samtidigt. Du kan till exempel inaktivera allt i omrÃ¥det B<hardening> och endast aktivera â€format†och â€fortify†med: - export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify + export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+format,+fortify + +Multiple feature areas can be set: + + export DEB_BUILD_MAINT_OPTIONS = hardening=+pie abi=+lfs + +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: + + export DEB_BUILD_MAINT_OPTIONS = hardening=-all,+pie,+format abi=+lfs + … + DEB_BUILD_MAINT_OPTIONS += hardening=+fortify + ifdef CONDITION + DEB_BUILD_MAINT_OPTIONS += hardening=-format + endif =head2 abi @@ -312,7 +329,11 @@ När funktionen är aktiverad kommer den överstyra värdet frÃ¥n samma funktion =item B<time64> -Den här inställningen (sedan dpkg 1.22.0; inaktiverad som förval) aktiverar stöd för 64-bitars time_t pÃ¥ 32-bitars-arkitekturer där deras ABI inte som förval inkluderar det, genom att lägga till B<-D_TIME_BITS=64> till B<CPPFLAGS>. Inställningen aktiverar automatiskt L<lfs>-funktionerna eftersom den behövs för att den ska fungera. +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. + +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. + +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>. =back diff --git a/man/sv/dpkg-buildpackage.pod b/man/sv/dpkg-buildpackage.pod index cab0f7c..8834116 100644 --- a/man/sv/dpkg-buildpackage.pod +++ b/man/sv/dpkg-buildpackage.pod @@ -514,7 +514,7 @@ Används för att signera filerna B<.changes>, B<.buildinfo> och B<.dsc>-filerna =item B<DEB_BUILD_OPTIONS> -Om satt, innehÃ¥ller en blankstegsavdelad lista med flaggor som pÃ¥verkar beteendet för nÃ¥gra dpkg-verktyg som används i paketbyggandet, och kan pÃ¥verka paketbyggprocessen om koden i F<debian/rules> stöder dem. +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. 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. Följande flaggor känns och stöds av dpkg-verktygen, andra flaggor som stöds av F<debian/rules> kan anges av distributionsspecifika policydokument. @@ -540,6 +540,22 @@ Paketets F<debian/rules> bör se till att objekt inte fÃ¥r felsökningsinformati B<dpkg-buildpackage> lägger till L<make(1)>-flaggan B<--no-print-directory> till miljövariabeln B<MAKEFLAGS>. Paketets F<debian/rules> bör minska pratsamheten, utan att bli helt tyst. +=item B<hardening=>I<feature-spec> + +=item B<reproducible=>I<feature-spec> + +=item B<abi=>I<feature-spec> + +=item B<future=>I<feature-spec> + +=item B<qa=>I<feature-spec> + +=item B<optimize=>I<feature-spec> + +=item B<sanitize=>I<feature-spec> + +These are feature areas that control build flag features. See L<dpkg-buildflags(1)> for further details. + =back =item B<DEB_BUILD_PROFILES> diff --git a/man/sv/dpkg-parsechangelog.pod b/man/sv/dpkg-parsechangelog.pod index 9479a4e..f463821 100644 --- a/man/sv/dpkg-parsechangelog.pod +++ b/man/sv/dpkg-parsechangelog.pod @@ -34,7 +34,7 @@ Anger ändringsloggfilen som information ska läsas frÃ¥n. Ett â€-†kan anvä =item B<-F> I<ändringsloggformat> -Anger format pÃ¥ ändringsloggen. Som standard läses formatet frÃ¥n en speciell rad nära slutet av ändringsloggen, om det misslyckas används formatet B<debian> som standard. Se även B<FORMAT PÃ… ÄNDRINGSLOGGEN>. +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 L</CHANGELOG FORMATS>. =item B<-L> I<bibliotekskatalog> diff --git a/man/sv/dpkg-shlibdeps.pod b/man/sv/dpkg-shlibdeps.pod index 67c89b7..47305b3 100644 --- a/man/sv/dpkg-shlibdeps.pod +++ b/man/sv/dpkg-shlibdeps.pod @@ -50,7 +50,7 @@ Paketlokal överstyrande beroendeinformation för delade bibliotek. Filerna befi B<dpkg-shlibs> kommer ihÃ¥g den (största) minimala version som behövs av varje bibliotek när den söker genom de symboler som används av alla binärfilerna. När proceduren är avslutad kan den visa det minsta beroende som behövs av alla bibliotek som används (sÃ¥ tillvida informationen i I<symbols>-filerna är korrekt). -Som en säkerhetsÃ¥tgärd kan en symbols-fil innehÃ¥lla metainformationsfältet I<Build-Depends-Package>, varpÃ¥ B<dpkg-shlibdeps> hämtar vilken minsta version som behövs för paketet ur B<Build-Depends>-fältet och använder denna version om den är högre än den minsta version som beräknats genom att söka genom symbolerna. +As a safe-guard measure, a symbols file can provide a B<Build-Depends-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. =head2 Shlibs-filer @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.14.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:47+0200\n" "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail." "com>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 10:02+0200\n" "Last-Translator: Safir Å ećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@linux.org.ba>\n" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.18\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-12-17 20:02+0100\n" "Last-Translator: Guillem Jover <guillem@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-02-01 23:14+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:48+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.22.1~\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-10-27 18:31+0200\n" "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" diff --git a/po/dpkg.pot b/po/dpkg.pot index 8aecf4d..5a5ba7f 100644 --- a/po/dpkg.pot +++ b/po/dpkg.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: dpkg 1.22.4\n" +"Project-Id-Version: dpkg 1.22.5\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:48+0200\n" "Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n" "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:48+0200\n" "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:49+0200\n" "Last-Translator: Felipe Castro <fefcas@gmail.com>\n" "Language-Team: Esperanto <debian-l10n-esperanto@lists.debian.org>\n" @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.16.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2017-11-08 00:59+0100\n" "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.14.5\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:49+0200\n" "Last-Translator: Ivar Smolin <okul@linux.ee>\n" "Language-Team: Estonian <et@li.org>\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:49+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n" "Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-02-05 23:47+0100\n" "Last-Translator: Sébastien Poher <sebastien@volted.net>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:49+0200\n" "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-02-05 23:44+0100\n" "Last-Translator: Nagy Elemér Károly <nagy.elemer.karoly@gmail.com>\n" "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.15\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-06-26 16:12+0200\n" "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n" "Language-Team: Indonesian <debian-l10n-indonesian@lists.debian.org>\n" @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.19.3\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2018-12-04 12:15+0100\n" "Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.18.3\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2022-11-03 20:08+0100\n" "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:50+0200\n" "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n" "Language-Team: Khmer <support@khmeros.info>\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-06-26 16:12+0200\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:50+0200\n" "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n" "Language-Team: Kurdish <ku@li.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:50+0200\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:51+0200\n" "Last-Translator: Priti Patil <prithisd@gmail.com>\n" "Language-Team: Marathi <janabhaaratii@cdacmumbai.in>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:51+0200\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian BokmÃ¥l <i18n-nb@lister.ping.uio.no>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:51+0200\n" "Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.22.1\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-12-03 17:45+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:51+0200\n" "Last-Translator: HÃ¥vard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-02-05 23:42+0100\n" "Last-Translator: Quentin PAGÈS <quentinantonin@free.fr>\n" "Language-Team: Occitan\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:51+0200\n" "Last-Translator: A S Alam <apbrar@gmail.com>\n" "Language-Team: Punjabi <punjabi-users@lists.sf.net>\n" @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.20.7\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2021-04-24 19:50+0200\n" "Last-Translator: Åukasz Dulny <bartekchom@poczta.onet.pl>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-02-04 14:11+0000\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index c06c7e9..195694c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:52+0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.22.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-10-04 11:08+0200\n" "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-02-06 00:01+0100\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 10:01+0200\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.22.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-12-27 14:41+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-02-05 23:45+0100\n" "Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 09:53+0200\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.10\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2018-01-03 16:44+0300\n" "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n" "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.18.2\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2016-01-14 08:22+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 4f72115..e71aaa2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-01-27 15:39-0500\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index dd2155d..83cfcbb 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2018-04-15 07:06+0800\n" "Last-Translator: æž—åšä» <Buo.Ren.Lin@gmail.com>\n" "Language-Team: Chinese (traditional) <debian-l10n-chinese@lists.debian.org>\n" diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm index 5b53655..6c2a189 100644 --- a/scripts/Dpkg/BuildOptions.pm +++ b/scripts/Dpkg/BuildOptions.pm @@ -180,13 +180,11 @@ sub parse_features { my $value = ($1 eq '+') ? 1 : 0; if ($feature eq 'all') { $use_feature->{$_} = $value foreach keys %{$use_feature}; + } elsif (exists $use_feature->{$feature}) { + $use_feature->{$feature} = $value; } else { - if (exists $use_feature->{$feature}) { - $use_feature->{$feature} = $value; - } else { - warning(g_('unknown %s feature in %s variable: %s'), - $option, $self->{envvar}, $feature); - } + warning(g_('unknown %s feature in %s variable: %s'), + $option, $self->{envvar}, $feature); } } else { warning(g_('incorrect value in %s option of %s variable: %s'), diff --git a/scripts/Dpkg/Changelog/Entry.pm b/scripts/Dpkg/Changelog/Entry.pm index e572909..d55e5fd 100644 --- a/scripts/Dpkg/Changelog/Entry.pm +++ b/scripts/Dpkg/Changelog/Entry.pm @@ -154,16 +154,14 @@ sub extend_part { } else { push @{$self->{$part}}, $value; } + } elsif (defined $self->{$part}) { + if (ref($value)) { + $self->{$part} = [ $self->{$part}, @$value ]; + } else { + $self->{$part} .= $value; + } } else { - if (defined($self->{$part})) { - if (ref($value)) { - $self->{$part} = [ $self->{$part}, @$value ]; - } else { - $self->{$part} .= $value; - } - } else { - $self->{$part} = $value; - } + $self->{$part} = $value; } } diff --git a/scripts/Dpkg/Deps/Simple.pm b/scripts/Dpkg/Deps/Simple.pm index a2ab2b1..e4888ed 100644 --- a/scripts/Dpkg/Deps/Simple.pm +++ b/scripts/Dpkg/Deps/Simple.pm @@ -438,12 +438,10 @@ sub implies { if (defined $implication) { if (not defined $res) { $res = $implication; + } elsif ($implication) { + $res = 1; } else { - if ($implication) { - $res = 1; - } else { - $res = 0; - } + $res = 0; } last if defined $res and $res == 1; } diff --git a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm index 9c53ef1..6c834be 100644 --- a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm +++ b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm @@ -46,7 +46,7 @@ use Dpkg::OpenPGP::ErrorCodes; use parent qw(Dpkg::OpenPGP::Backend); sub DEFAULT_CMDV { - return [ qw(gpgv) ]; + return [ qw(gpgv-sq gpgv) ]; } sub DEFAULT_CMDSTORE { @@ -54,7 +54,7 @@ sub DEFAULT_CMDSTORE { } sub DEFAULT_CMD { - return [ qw(gpg) ]; + return [ qw(gpg-sq gpg) ]; } sub has_backend_cmd { diff --git a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm index ae4acc1..36801c9 100644 --- a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm +++ b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm @@ -69,7 +69,7 @@ sub armor return OPENPGP_MISSING_CMD unless $self->{cmd}; # We ignore the $type, and let "sq" handle this automatically. - my $rc = $self->_sq_exec(qw(armor --output), $out, $in); + my $rc = $self->_sq_exec(qw(toolbox armor --output), $out, $in); return OPENPGP_BAD_DATA if $rc; return OPENPGP_OK; } @@ -81,7 +81,7 @@ sub dearmor return OPENPGP_MISSING_CMD unless $self->{cmd}; # We ignore the $type, and let "sq" handle this automatically. - my $rc = $self->_sq_exec(qw(dearmor --output), $out, $in); + my $rc = $self->_sq_exec(qw(toolbox dearmor --output), $out, $in); return OPENPGP_BAD_DATA if $rc; return OPENPGP_OK; } diff --git a/scripts/Dpkg/Shlibs/Symbol.pm b/scripts/Dpkg/Shlibs/Symbol.pm index f4955bb..3b38a8c 100644 --- a/scripts/Dpkg/Shlibs/Symbol.pm +++ b/scripts/Dpkg/Shlibs/Symbol.pm @@ -115,23 +115,19 @@ sub parse_symbolspec { $symbol_templ = $2; $symbol = $2; $rest = $3; - } else { - if ($symbol =~ m/^(\S+)(.*)$/) { - $symbol_templ = $1; - $symbol = $1; - $rest = $2; - } + } elsif ($symbol =~ m/^(\S+)(.*)$/) { + $symbol_templ = $1; + $symbol = $1; + $rest = $2; } error(g_('symbol name unspecified: %s'), $symbolspec) if (!$symbol); - } else { + } elsif ($symbolspec =~ m/^(\S+)(.*)$/) { # No tag specification. Symbol name is up to the first space # foobarsymbol@Base 1.0 1 - if ($symbolspec =~ m/^(\S+)(.*)$/) { - $symbol = $1; - $rest = $2; - } else { - return 0; - } + $symbol = $1; + $rest = $2; + } else { + return 0; } $self->{symbol} = $symbol; $self->{symbol_templ} = $symbol_templ; @@ -463,12 +459,10 @@ sub mark_found_in_library { # Symbol reappeared somehow $self->{deprecated} = 0; $self->{minver} = $minver if (not $self->is_optional()); - } else { + } elsif (version_compare($minver, $self->{minver}) < 0) { # We assume that the right dependency information is already # there. - if (version_compare($minver, $self->{minver}) < 0) { - $self->{minver} = $minver; - } + $self->{minver} = $minver; } # Never remove arch tags from patterns if (not $self->is_pattern()) { diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm index 170ffe1..bdf2c87 100644 --- a/scripts/Dpkg/Source/Package/V1.pm +++ b/scripts/Dpkg/Source/Package/V1.pm @@ -347,18 +347,16 @@ sub do_build { # creating a native .tar.gz if ($origtargz) { $sourcestyle =~ y/aA/pP/; # .orig.tar.<ext> - } else { - if (stat($origdir)) { - unless (-d _) { - error(g_("unpacked orig '%s' exists but is not a directory"), - $origdir); - } - $sourcestyle =~ y/aA/rR/; # .orig directory - } elsif ($! != ENOENT) { - syserr(g_("unable to stat putative unpacked orig '%s'"), $origdir); - } else { - $sourcestyle =~ y/aA/nn/; # Native tar.gz - } + } elsif (stat($origdir)) { + unless (-d _) { + error(g_("unpacked orig '%s' exists but is not a directory"), + $origdir); + } + $sourcestyle =~ y/aA/rR/; # .orig directory + } elsif ($! != ENOENT) { + syserr(g_("unable to stat putative unpacked orig '%s'"), $origdir); + } else { + $sourcestyle =~ y/aA/nn/; # Native tar.gz } } diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index 2d07794..fcf5b1e 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -79,7 +79,7 @@ sub run_hook { } } elsif ($hook eq 'update-buildflags') { $self->set_build_features(@params); - $self->_add_build_flags(@params); + $self->add_build_flags(@params); } elsif ($hook eq 'builtin-system-build-paths') { return qw(/build/); } elsif ($hook eq 'build-tainted-by') { @@ -113,7 +113,8 @@ sub set_build_features { # XXX: This is set to undef so that we can handle the alias from # the future feature area. lfs => undef, - time64 => 0, + # XXX: This is set to undef to handle mask on the default setting. + time64 => undef, }, qa => { bug => 0, @@ -270,9 +271,36 @@ sub set_build_features { ## Area: abi + if (any { $arch eq $_ } qw(hurd-i386 kfreebsd-i386)) { + # Mask time64 on hurd-i386 and kfreebsd-i386, as their kernel lacks + # support for that arch and it will not be implemented. + $use_feature{abi}{time64} = 0; + } elsif (not defined $use_feature{abi}{time64}) { + # If the user has not requested a specific setting, by default only + # enable time64 everywhere except for i386, where we preserve it for + # binary backwards compatibility. + if ($arch eq 'i386') { + $use_feature{abi}{time64} = 0; + } else { + $use_feature{abi}{time64} = 1; + } + } + + # In Debian gcc enables time64 (and lfs) for the following architectures + # by injecting pre-processor flags, though the libc ABI has not changed. + if (any { $arch eq $_ } qw(armel armhf hppa m68k mips mipsel powerpc sh4)) { + $flags->set_option_value('cc-abi-time64', 1); + } else { + $flags->set_option_value('cc-abi-time64', 0); + } + if ($use_feature{abi}{time64} && ! $builtin_feature{abi}{time64}) { # On glibc 64-bit time_t support requires LFS. $use_feature{abi}{lfs} = 1 if $libc eq 'gnu'; + + # Require -Werror=implicit-function-declaration, to avoid linking + # against the wrong symbol. + $use_feature{qa}{'bug-implicit-func'} = 1; } # XXX: Handle lfs alias from future abi feature area. @@ -392,7 +420,7 @@ sub set_build_features { } } -sub _add_build_flags { +sub add_build_flags { my ($self, $flags) = @_; ## Global default flags @@ -425,13 +453,22 @@ sub _add_build_flags { ## Area: abi my %abi_builtins = $flags->get_builtins('abi'); + my $cc_abi_time64 = $flags->get_option_value('cc-abi-time64'); + if ($flags->use_feature('abi', 'lfs') && ! $abi_builtins{lfs}) { $flags->append('CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); + } elsif (! $flags->use_feature('abi', 'lfs') && + ! $abi_builtins{lfs} && $cc_abi_time64) { + $flags->append('CPPFLAGS', + '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); } if ($flags->use_feature('abi', 'time64') && ! $abi_builtins{time64}) { $flags->append('CPPFLAGS', '-D_TIME_BITS=64'); + } elsif (! $flags->use_feature('abi', 'time64') && + ! $abi_builtins{time64} && $cc_abi_time64) { + $flags->append('CPPFLAGS', '-U_TIME_BITS'); } ## Area: qa @@ -586,7 +623,11 @@ sub _add_build_flags { } elsif ($cpu eq 'amd64') { $flag = '-fcf-protection'; } - $flags->append($_, $flag) foreach @compile_flags; + # The following should always be true on Debian, but it might not + # be on derivatives. + if (defined $flag) { + $flags->append($_, $flag) foreach @compile_flags; + } } } diff --git a/scripts/Dpkg/Vendor/Default.pm b/scripts/Dpkg/Vendor/Default.pm index fc0e6be..934953f 100644 --- a/scripts/Dpkg/Vendor/Default.pm +++ b/scripts/Dpkg/Vendor/Default.pm @@ -218,6 +218,19 @@ sub set_build_features { return; } +=item $vendor->add_build_flags($flags) + +Adds the vendor build flags to the compiler flag variables based on the +vendor defaults and previously set build features. + +=cut + +sub add_build_flags { + my ($self, $flags) = @_; + + return; +} + =back =head1 CHANGES diff --git a/scripts/Dpkg/Vendor/Ubuntu.pm b/scripts/Dpkg/Vendor/Ubuntu.pm index b50da37..f907fa9 100644 --- a/scripts/Dpkg/Vendor/Ubuntu.pm +++ b/scripts/Dpkg/Vendor/Ubuntu.pm @@ -95,14 +95,6 @@ sub run_hook { if (scalar(@$bugs)) { $fields->{'Launchpad-Bugs-Fixed'} = join(' ', @$bugs); } - } elsif ($hook eq 'update-buildflags') { - my $flags = shift @params; - - # Run the Debian hook to add hardening flags - $self->SUPER::run_hook($hook, $flags); - - # Per https://wiki.ubuntu.com/DistCompilerFlags - $flags->prepend('LDFLAGS', '-Wl,-Bsymbolic-functions'); } else { return $self->SUPER::run_hook($hook, @params); } @@ -137,6 +129,64 @@ sub set_build_features { $flags->set_option_value('fortify-level', 3); } +sub add_build_flags { + my ($self, $flags) = @_; + + my @compile_flags = qw( + CFLAGS + CXXFLAGS + OBJCFLAGS + OBJCXXFLAGS + FFLAGS + FCFLAGS + ); + + $self->SUPER::add_build_flags($flags); + + # Per https://wiki.ubuntu.com/DistCompilerFlags + $flags->prepend('LDFLAGS', '-Wl,-Bsymbolic-functions'); + + # In Ubuntu these flags are set by the compiler, so when disabling the + # features we need to pass appropriate flags to disable them. + if (!$flags->use_feature('hardening', 'stackprotectorstrong') && + !$flags->use_feature('hardening', 'stackprotector')) { + my $flag = '-fno-stack-protector'; + $flags->append($_, $flag) foreach @compile_flags; + } + + if (!$flags->use_feature('hardening', 'stackclash')) { + my $flag = '-fno-stack-clash-protection'; + $flags->append($_, $flag) foreach @compile_flags; + } + + if (!$flags->use_feature('hardening', 'fortify')) { + $flags->append('CPPFLAGS', '-D_FORTIFY_SOURCE=0'); + } + + if (!$flags->use_feature('hardening', 'format')) { + my $flag = '-Wno-format -Wno-error=format-security'; + $flags->append('CFLAGS', $flag); + $flags->append('CXXFLAGS', $flag); + $flags->append('OBJCFLAGS', $flag); + $flags->append('OBJCXXFLAGS', $flag); + } + + if (!$flags->use_feature('hardening', 'branch')) { + my $cpu = $flags->get_option_value('hardening-branch-cpu'); + my $flag; + if ($cpu eq 'arm64') { + $flag = '-mbranch-protection=none'; + } elsif ($cpu eq 'amd64') { + $flag = '-fno-cf-protection'; + } + if (defined $flag) { + $flags->append($_, $flag) foreach @compile_flags; + } + } + + return; +} + =head1 PUBLIC FUNCTIONS =over diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 1cec205..8d39d24 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -2,68 +2,9 @@ SUBDIRS = mk po -sbin_SCRIPTS = \ - dpkg-fsys-usrunmess \ - # EOL - -bin_SCRIPTS = \ - dpkg-architecture \ - dpkg-buildflags \ - dpkg-buildapi \ - dpkg-buildpackage \ - dpkg-buildtree \ - dpkg-checkbuilddeps \ - dpkg-distaddfile \ - dpkg-genbuildinfo \ - dpkg-genchanges \ - dpkg-gencontrol \ - dpkg-gensymbols \ - dpkg-mergechangelogs \ - dpkg-name \ - dpkg-parsechangelog \ - dpkg-scanpackages \ - dpkg-scansources \ - dpkg-shlibdeps \ - dpkg-source \ - dpkg-vendor \ - # EOL +EXTRA_DIST = +CLEANFILES = -EXTRA_DIST = \ - dpkg-architecture.pl \ - dpkg-buildapi.pl \ - dpkg-buildflags.pl \ - dpkg-buildpackage.pl \ - dpkg-buildtree.pl \ - dpkg-checkbuilddeps.pl \ - dpkg-distaddfile.pl \ - dpkg-fsys-usrunmess.pl \ - dpkg-genbuildinfo.pl \ - dpkg-genchanges.pl \ - dpkg-gencontrol.pl \ - dpkg-gensymbols.pl \ - dpkg-mergechangelogs.pl \ - dpkg-name.pl \ - dpkg-parsechangelog.pl \ - dpkg-scanpackages.pl \ - dpkg-scansources.pl \ - dpkg-shlibdeps.pl \ - dpkg-source.pl \ - dpkg-vendor.pl \ - $(test_scripts) \ - $(test_data) \ - # EOL - -dist_zshcompletions_DATA = \ - completion/zsh/_dpkg-parsechangelog \ - # EOL - -CLEANFILES = \ - $(test_data_objects) \ - $(sbin_SCRIPTS) \ - $(bin_SCRIPTS) \ - # EOL - -perllibdir = $(PERL_LIBDIR) nobase_dist_perllib_DATA = \ Dpkg/Arch.pm \ Dpkg/BuildAPI.pm \ @@ -156,6 +97,67 @@ EXTRA_DIST += \ Test/Dpkg.pm \ # EOL +sbin_SCRIPTS = \ + dpkg-fsys-usrunmess \ + # EOL + +bin_SCRIPTS = \ + dpkg-architecture \ + dpkg-buildflags \ + dpkg-buildapi \ + dpkg-buildpackage \ + dpkg-buildtree \ + dpkg-checkbuilddeps \ + dpkg-distaddfile \ + dpkg-genbuildinfo \ + dpkg-genchanges \ + dpkg-gencontrol \ + dpkg-gensymbols \ + dpkg-mergechangelogs \ + dpkg-name \ + dpkg-parsechangelog \ + dpkg-scanpackages \ + dpkg-scansources \ + dpkg-shlibdeps \ + dpkg-source \ + dpkg-vendor \ + # EOL + +EXTRA_DIST += \ + dpkg-architecture.pl \ + dpkg-buildapi.pl \ + dpkg-buildflags.pl \ + dpkg-buildpackage.pl \ + dpkg-buildtree.pl \ + dpkg-checkbuilddeps.pl \ + dpkg-distaddfile.pl \ + dpkg-fsys-usrunmess.pl \ + dpkg-genbuildinfo.pl \ + dpkg-genchanges.pl \ + dpkg-gencontrol.pl \ + dpkg-gensymbols.pl \ + dpkg-mergechangelogs.pl \ + dpkg-name.pl \ + dpkg-parsechangelog.pl \ + dpkg-scanpackages.pl \ + dpkg-scansources.pl \ + dpkg-shlibdeps.pl \ + dpkg-source.pl \ + dpkg-vendor.pl \ + # EOL + +CLEANFILES += \ + $(sbin_SCRIPTS) \ + $(bin_SCRIPTS) \ + # EOL + +dist_bashcompletions_DATA = \ + # EOL + +dist_zshcompletions_DATA = \ + completion/zsh/_dpkg-parsechangelog \ + # EOL + # Keep it even if empty to have man3dir correctly set man3_MANS = @@ -422,6 +424,11 @@ test_data = \ t/origins/ubuntu \ # EOL +EXTRA_DIST += \ + $(test_scripts) \ + $(test_data) \ + # EOL + test_data_objects = \ t/Dpkg_Shlibs/libobjdump.basictags-amd64.so \ t/Dpkg_Shlibs/libobjdump.basictags-i386.so \ @@ -430,6 +437,10 @@ test_data_objects = \ t/Dpkg_Shlibs/libobjdump.spacesyms.so \ # EOL +CLEANFILES += \ + $(test_data_objects) \ + # EOL + $(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-amd64.so: $(srcdir)/t/Dpkg_Shlibs/basictags.c $(CC) $(CFLAGS) -shared -fPIC -Wl,-soname -Wl,libbasictags.so.1 $< \ -DAMD64 -o $@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index c0d7c6d..8b0a61f 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -127,8 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(dist_zshcompletions_DATA) \ - $(nobase_dist_perllib_DATA) $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_bashcompletions_DATA) \ + $(dist_zshcompletions_DATA) $(nobase_dist_perllib_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = Build.PL README.cpan @@ -161,8 +162,8 @@ am__uninstall_files_from_dir = { \ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \ - "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(zshcompletionsdir)" \ - "$(DESTDIR)$(perllibdir)" + "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(bashcompletionsdir)" \ + "$(DESTDIR)$(zshcompletionsdir)" "$(DESTDIR)$(perllibdir)" SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -194,7 +195,8 @@ am__can_run_installinfo = \ man3dir = $(mandir)/man3 NROFF = nroff MANS = $(man3_MANS) -DATA = $(dist_zshcompletions_DATA) $(nobase_dist_perllib_DATA) +DATA = $(dist_bashcompletions_DATA) $(dist_zshcompletions_DATA) \ + $(nobase_dist_perllib_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -393,6 +395,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aclocaldir = @aclocaldir@ admindir = @admindir@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -400,6 +403,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ backupsdir = @backupsdir@ +bashcompletionsdir = @bashcompletionsdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -411,6 +415,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ devlibdir = @devlibdir@ docdir = @docdir@ +docspecdir = @docspecdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -428,10 +433,14 @@ localedir = @localedir@ localstatedir = @localstatedir@ logdir = @logdir@ mandir = @mandir@ +methodsdir = @methodsdir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +perllibdir = @perllibdir@ pkgconfdir = @pkgconfdir@ +pkgconfigdir = @pkgconfigdir@ +polkitactionsdir = @polkitactionsdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -446,51 +455,15 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zshcompletionsdir = @zshcompletionsdir@ SUBDIRS = mk po -sbin_SCRIPTS = \ - dpkg-fsys-usrunmess \ - # EOL - -bin_SCRIPTS = \ - dpkg-architecture \ - dpkg-buildflags \ - dpkg-buildapi \ - dpkg-buildpackage \ - dpkg-buildtree \ - dpkg-checkbuilddeps \ - dpkg-distaddfile \ - dpkg-genbuildinfo \ - dpkg-genchanges \ - dpkg-gencontrol \ - dpkg-gensymbols \ - dpkg-mergechangelogs \ - dpkg-name \ - dpkg-parsechangelog \ - dpkg-scanpackages \ - dpkg-scansources \ - dpkg-shlibdeps \ - dpkg-source \ - dpkg-vendor \ - # EOL - -EXTRA_DIST = dpkg-architecture.pl dpkg-buildapi.pl dpkg-buildflags.pl \ - dpkg-buildpackage.pl dpkg-buildtree.pl dpkg-checkbuilddeps.pl \ - dpkg-distaddfile.pl dpkg-fsys-usrunmess.pl \ - dpkg-genbuildinfo.pl dpkg-genchanges.pl dpkg-gencontrol.pl \ - dpkg-gensymbols.pl dpkg-mergechangelogs.pl dpkg-name.pl \ - dpkg-parsechangelog.pl dpkg-scanpackages.pl \ +EXTRA_DIST = Test/Dpkg.pm dpkg-architecture.pl dpkg-buildapi.pl \ + dpkg-buildflags.pl dpkg-buildpackage.pl dpkg-buildtree.pl \ + dpkg-checkbuilddeps.pl dpkg-distaddfile.pl \ + dpkg-fsys-usrunmess.pl dpkg-genbuildinfo.pl dpkg-genchanges.pl \ + dpkg-gencontrol.pl dpkg-gensymbols.pl dpkg-mergechangelogs.pl \ + dpkg-name.pl dpkg-parsechangelog.pl dpkg-scanpackages.pl \ dpkg-scansources.pl dpkg-shlibdeps.pl dpkg-source.pl \ - dpkg-vendor.pl $(test_scripts) $(test_data) Test/Dpkg.pm # EOL -dist_zshcompletions_DATA = \ - completion/zsh/_dpkg-parsechangelog \ - # EOL - -CLEANFILES = \ - $(test_data_objects) \ - $(sbin_SCRIPTS) \ - $(bin_SCRIPTS) \ - # EOL - -perllibdir = $(PERL_LIBDIR) + dpkg-vendor.pl $(test_scripts) $(test_data) # EOL +CLEANFILES = $(sbin_SCRIPTS) $(bin_SCRIPTS) $(test_data_objects) # EOL nobase_dist_perllib_DATA = \ Dpkg/Arch.pm \ Dpkg/BuildAPI.pm \ @@ -579,6 +552,39 @@ nobase_dist_perllib_DATA = \ Dpkg.pm \ # EOL +sbin_SCRIPTS = \ + dpkg-fsys-usrunmess \ + # EOL + +bin_SCRIPTS = \ + dpkg-architecture \ + dpkg-buildflags \ + dpkg-buildapi \ + dpkg-buildpackage \ + dpkg-buildtree \ + dpkg-checkbuilddeps \ + dpkg-distaddfile \ + dpkg-genbuildinfo \ + dpkg-genchanges \ + dpkg-gencontrol \ + dpkg-gensymbols \ + dpkg-mergechangelogs \ + dpkg-name \ + dpkg-parsechangelog \ + dpkg-scanpackages \ + dpkg-scansources \ + dpkg-shlibdeps \ + dpkg-source \ + dpkg-vendor \ + # EOL + +dist_bashcompletions_DATA = \ + # EOL + +dist_zshcompletions_DATA = \ + completion/zsh/_dpkg-parsechangelog \ + # EOL + # Keep it even if empty to have man3dir correctly set man3_MANS = @@ -988,6 +994,27 @@ uninstall-man3: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir) +install-dist_bashcompletionsDATA: $(dist_bashcompletions_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bashcompletionsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bashcompletionsdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bashcompletionsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(bashcompletionsdir)" || exit $$?; \ + done + +uninstall-dist_bashcompletionsDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(bashcompletionsdir)'; $(am__uninstall_files_from_dir) install-dist_zshcompletionsDATA: $(dist_zshcompletions_DATA) @$(NORMAL_INSTALL) @list='$(dist_zshcompletions_DATA)'; test -n "$(zshcompletionsdir)" || list=; \ @@ -1196,7 +1223,7 @@ check: check-recursive all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(zshcompletionsdir)" "$(DESTDIR)$(perllibdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(bashcompletionsdir)" "$(DESTDIR)$(zshcompletionsdir)" "$(DESTDIR)$(perllibdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1250,8 +1277,9 @@ info: info-recursive info-am: -install-data-am: install-data-local install-dist_zshcompletionsDATA \ - install-man install-nobase_dist_perllibDATA +install-data-am: install-data-local install-dist_bashcompletionsDATA \ + install-dist_zshcompletionsDATA install-man \ + install-nobase_dist_perllibDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive @@ -1296,9 +1324,10 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-binSCRIPTS uninstall-dist_zshcompletionsDATA \ - uninstall-local uninstall-man \ - uninstall-nobase_dist_perllibDATA uninstall-sbinSCRIPTS +uninstall-am: uninstall-binSCRIPTS uninstall-dist_bashcompletionsDATA \ + uninstall-dist_zshcompletionsDATA uninstall-local \ + uninstall-man uninstall-nobase_dist_perllibDATA \ + uninstall-sbinSCRIPTS uninstall-man: uninstall-man3 @@ -1312,6 +1341,7 @@ uninstall-man: uninstall-man3 dvi-am html html-am info info-am install install-am \ install-binSCRIPTS install-data install-data-am \ install-data-hook install-data-local \ + install-dist_bashcompletionsDATA \ install-dist_zshcompletionsDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-man3 \ @@ -1321,6 +1351,7 @@ uninstall-man: uninstall-man3 maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \ + uninstall-dist_bashcompletionsDATA \ uninstall-dist_zshcompletionsDATA uninstall-local \ uninstall-man uninstall-man3 uninstall-nobase_dist_perllibDATA \ uninstall-sbinSCRIPTS diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm index 54f494c..1632ad8 100644 --- a/scripts/Test/Dpkg.pm +++ b/scripts/Test/Dpkg.pm @@ -200,6 +200,7 @@ sub test_needs_command sub test_needs_openpgp_backend { my @backends = qw( + gpg-sq gpg sq sqop diff --git a/scripts/dpkg-buildapi.pl b/scripts/dpkg-buildapi.pl index b34bcf5..2981eeb 100755 --- a/scripts/dpkg-buildapi.pl +++ b/scripts/dpkg-buildapi.pl @@ -36,12 +36,14 @@ sub version() sub usage() { printf g_( -'Usage: %s [<option>...]') +'Usage: %s [<option>...] [<command>]') + . "\n\n" . g_( +'Commands: + -?, --help show this help message. + --version show the version.') . "\n\n" . g_( 'Options: -c<control-file> get control info from this file. - -?, --help show this help message. - -v, --version show the version. '), $Dpkg::PROGNAME; } @@ -52,7 +54,7 @@ while (@ARGV) { if (m/^-\?|--help$/) { usage(); exit 0; - } elsif (m/^-v|--version$/) { + } elsif (m/^--version$/) { version(); exit 0; } elsif (m/-c(.*)$/) { diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl index 5c75014..f6d7879 100755 --- a/scripts/dpkg-mergechangelogs.pl +++ b/scripts/dpkg-mergechangelogs.pl @@ -116,13 +116,14 @@ my @b = reverse @$chb; my @result; # Lines to output my $exitcode = 0; # 1 if conflict encountered -unless (merge_block($cho, $cha, $chb, sub { - my $changes = shift; - my $tail = $changes->get_unparsed_tail(); - chomp $tail if defined $tail; - return $tail; - })) -{ +sub merge_tail { + my $changes = shift; + my $tail = $changes->get_unparsed_tail(); + chomp $tail if defined $tail; + return $tail; +}; + +unless (merge_block($cho, $cha, $chb, \&merge_tail)) { merge_conflict($cha->get_unparsed_tail(), $chb->get_unparsed_tail()); } diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index 96c0b0b..240b0bc 100755 --- a/scripts/dpkg-shlibdeps.pl +++ b/scripts/dpkg-shlibdeps.pl @@ -133,15 +133,13 @@ foreach (@ARGV) { push @exclude, $1; } elsif (m/^-/) { usageerr(g_("unknown option '%s'"), $_); + } elsif (exists $exec{$_}) { + # Affect the binary to the most important field + if ($depstrength{$dependencyfield} > $depstrength{$exec{$_}}) { + $exec{$_} = $dependencyfield; + } } else { - if (exists $exec{$_}) { - # Affect the binary to the most important field - if ($depstrength{$dependencyfield} > $depstrength{$exec{$_}}) { - $exec{$_} = $dependencyfield; - } - } else { - $exec{$_} = $dependencyfield; - } + $exec{$_} = $dependencyfield; } } usageerr(g_('need at least one executable')) unless scalar keys %exec; diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 664f39c..c27a954 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -482,12 +482,10 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) { unless ($options{no_check}) { if ($srcpkg->is_signed()) { $srcpkg->check_signature(); + } elsif ($options{require_valid_signature}) { + error(g_("%s doesn't contain a valid OpenPGP signature"), $dsc); } else { - if ($options{require_valid_signature}) { - error(g_("%s doesn't contain a valid OpenPGP signature"), $dsc); - } else { - warning(g_('extracting unsigned source package (%s)'), $dsc); - } + warning(g_('extracting unsigned source package (%s)'), $dsc); } $srcpkg->check_checksums(); } diff --git a/scripts/mk/Makefile.in b/scripts/mk/Makefile.in index 9860f84..65e8fd5 100644 --- a/scripts/mk/Makefile.in +++ b/scripts/mk/Makefile.in @@ -316,6 +316,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aclocaldir = @aclocaldir@ admindir = @admindir@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -323,6 +324,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ backupsdir = @backupsdir@ +bashcompletionsdir = @bashcompletionsdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -334,6 +336,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ devlibdir = @devlibdir@ docdir = @docdir@ +docspecdir = @docspecdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -351,10 +354,14 @@ localedir = @localedir@ localstatedir = @localstatedir@ logdir = @logdir@ mandir = @mandir@ +methodsdir = @methodsdir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +perllibdir = @perllibdir@ pkgconfdir = @pkgconfdir@ +pkgconfigdir = @pkgconfigdir@ +polkitactionsdir = @polkitactionsdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ diff --git a/scripts/po/ca.gmo b/scripts/po/ca.gmo Binary files differindex ea32c18..5a91b73 100644 --- a/scripts/po/ca.gmo +++ b/scripts/po/ca.gmo diff --git a/scripts/po/ca.po b/scripts/po/ca.po index dbb2140..6338f4a 100644 --- a/scripts/po/ca.po +++ b/scripts/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-dev 1.21.18\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-12-17 20:30+0100\n" "Last-Translator: Guillem Jover <guillem@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -47,7 +47,7 @@ msgstr "" "Aquest és programari lliure; vegeu la Llicència Pública General GNU versió 2 " "o posterior per a les condicions de còpia. NO hi ha garantia.\n" -#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl +#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl #, perl-format msgid "Usage: %s [<option>...] [<command>]" msgstr "Forma d'ús: %s [<opció>…] [<ordre>]" @@ -193,20 +193,17 @@ msgstr "" msgid "unable to execute %s" msgstr "no es pot executar %s" -#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl -#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl -#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl -#: scripts/dpkg-parsechangelog.pl -#, perl-format -msgid "Usage: %s [<option>...]" -msgstr "Forma d'ús: %s [<opció>…]" - #: scripts/dpkg-buildapi.pl +#, fuzzy +#| msgid "" +#| "Options:\n" +#| " -c<control-file> get control info from this file.\n" +#| " -?, --help show this help message.\n" +#| " -v, --version show the version.\n" msgid "" -"Options:\n" -" -c<control-file> get control info from this file.\n" +"Commands:\n" " -?, --help show this help message.\n" -" -v, --version show the version.\n" +" --version show the version." msgstr "" "Opcions:\n" " -c<fitxer-control> fitxer d'informació de control.\n" @@ -214,6 +211,12 @@ msgstr "" " -v, --version mostra la versió.\n" #: scripts/dpkg-buildapi.pl +msgid "" +"Options:\n" +" -c<control-file> get control info from this file.\n" +msgstr "" + +#: scripts/dpkg-buildapi.pl msgid "no arguments accepted" msgstr "no s'accepten arguments" @@ -278,6 +281,13 @@ msgstr "s'ha especificat dos ordres: --%s i --%s" msgid "%s needs a parameter" msgstr "%s requereix un parà metre" +#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl +#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl +#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl +#, perl-format +msgid "Usage: %s [<option>...]" +msgstr "Forma d'ús: %s [<opció>…]" + #: scripts/dpkg-buildpackage.pl msgid "" "Options:\n" diff --git a/scripts/po/de.gmo b/scripts/po/de.gmo Binary files differindex 45d753c..7784da5 100644 --- a/scripts/po/de.gmo +++ b/scripts/po/de.gmo diff --git a/scripts/po/de.po b/scripts/po/de.po index e896bdb..6cbd867 100644 --- a/scripts/po/de.po +++ b/scripts/po/de.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dpkg-dev 1.22.3\n" +"Project-Id-Version: dpkg-dev 1.22.5\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" -"PO-Revision-Date: 2024-01-06 18:27+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" +"PO-Revision-Date: 2024-01-25 17:45+0100\n" "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -44,7 +44,7 @@ msgstr "" "Dies ist freie Software. Lesen Sie die GNU General Public License Version 2\n" "oder neuer für die Kopierbedingungen. Es gibt KEINE Haftung.\n" -#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl +#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl #, perl-format msgid "Usage: %s [<option>...] [<command>]" msgstr "Aufruf: %s [<Option> …] [<Befehl>]" @@ -186,25 +186,23 @@ msgstr "" msgid "unable to execute %s" msgstr "%s konnte nicht ausgeführt werden" -#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl -#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl -#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl -#: scripts/dpkg-parsechangelog.pl -#, perl-format -msgid "Usage: %s [<option>...]" -msgstr "Aufruf: %s [<Option> …]" +#: scripts/dpkg-buildapi.pl +msgid "" +"Commands:\n" +" -?, --help show this help message.\n" +" --version show the version." +msgstr "" +"Befehle:\n" +" -?, --help diese Hilfemeldung anzeigen\n" +" --version die Version anzeigen" #: scripts/dpkg-buildapi.pl msgid "" "Options:\n" " -c<control-file> get control info from this file.\n" -" -?, --help show this help message.\n" -" -v, --version show the version.\n" msgstr "" -"Optionen:\n" +"Options:\n" " -c<Steuerdatei> Steuerinformationen aus dieser Datei erhalten\n" -" -?, --help diese Hilfemeldung anzeigen\n" -" -v, --version die Version anzeigen\n" #: scripts/dpkg-buildapi.pl msgid "no arguments accepted" @@ -269,6 +267,13 @@ msgstr "zwei Befehle angegeben: --%s und --%s" msgid "%s needs a parameter" msgstr "%s benötigt einen Parameter" +#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl +#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl +#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl +#, perl-format +msgid "Usage: %s [<option>...]" +msgstr "Aufruf: %s [<Option> …]" + #: scripts/dpkg-buildpackage.pl msgid "" "Options:\n" diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot index 98f840c..7b03361 100644 --- a/scripts/po/dpkg-dev.pot +++ b/scripts/po/dpkg-dev.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: dpkg 1.22.4\n" +"Project-Id-Version: dpkg 1.22.5\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -43,7 +43,7 @@ msgid "" "later for copying conditions. There is NO warranty.\n" msgstr "" -#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl +#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl #, perl-format msgid "Usage: %s [<option>...] [<command>]" msgstr "" @@ -143,20 +143,17 @@ msgstr "" msgid "unable to execute %s" msgstr "" -#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl -#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl -#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl -#: scripts/dpkg-parsechangelog.pl -#, perl-format -msgid "Usage: %s [<option>...]" +#: scripts/dpkg-buildapi.pl +msgid "" +"Commands:\n" +" -?, --help show this help message.\n" +" --version show the version." msgstr "" #: scripts/dpkg-buildapi.pl msgid "" "Options:\n" " -c<control-file> get control info from this file.\n" -" -?, --help show this help message.\n" -" -v, --version show the version.\n" msgstr "" #: scripts/dpkg-buildapi.pl @@ -201,6 +198,13 @@ msgstr "" msgid "%s needs a parameter" msgstr "" +#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl +#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl +#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl +#, perl-format +msgid "Usage: %s [<option>...]" +msgstr "" + #: scripts/dpkg-buildpackage.pl msgid "" "Options:\n" diff --git a/scripts/po/es.po b/scripts/po/es.po index 6268b1b..1c92dd9 100644 --- a/scripts/po/es.po +++ b/scripts/po/es.po @@ -31,7 +31,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-dev 1.16.8\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2014-12-02 20:24+0100\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -70,7 +70,7 @@ msgstr "" "Esto es software libre; vea la versión 2 o posterior de la Licencia Pública\n" "General GNU para condiciones de copia. NO hay ninguna garantÃa.\n" -#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl +#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl #, perl-format msgid "Usage: %s [<option>...] [<command>]" msgstr "Uso: %s [<opción>...] [<orden>]" @@ -233,14 +233,6 @@ msgstr "" msgid "unable to execute %s" msgstr "no se pudo ejecutar %s" -#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl -#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl -#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl -#: scripts/dpkg-parsechangelog.pl -#, perl-format -msgid "Usage: %s [<option>...]" -msgstr "Uso: %s [<opción>...]" - #: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "" @@ -251,10 +243,9 @@ msgstr "Uso: %s [<opción>...]" #| " -?, --help show this help message.\n" #| " --version show the version.\n" msgid "" -"Options:\n" -" -c<control-file> get control info from this file.\n" +"Commands:\n" " -?, --help show this help message.\n" -" -v, --version show the version.\n" +" --version show the version." msgstr "" "Uso: %s [<opción>...] <nombre-fichero> <sección> <prioridad>\n" "\n" @@ -265,6 +256,12 @@ msgstr "" " --version Muestra la versión.\n" #: scripts/dpkg-buildapi.pl +msgid "" +"Options:\n" +" -c<control-file> get control info from this file.\n" +msgstr "" + +#: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "one to three arguments expected" msgid "no arguments accepted" @@ -353,6 +350,13 @@ msgstr "se han definido dos órdenes: «--%s» y «--%s»" msgid "%s needs a parameter" msgstr "%s requiere un parámetro" +#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl +#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl +#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl +#, perl-format +msgid "Usage: %s [<option>...]" +msgstr "Uso: %s [<opción>...]" + #: scripts/dpkg-buildpackage.pl #, fuzzy #| msgid "" diff --git a/scripts/po/fr.po b/scripts/po/fr.po index d0bd724..a690156 100644 --- a/scripts/po/fr.po +++ b/scripts/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-dev 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-02-10 02:16+0100\n" "Last-Translator: Sébastien Poher <sebastien@volted.net>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -52,7 +52,7 @@ msgstr "" "dans la version 2 ou une version supérieure pour les conditions de copie. Il " "n'y a PAS de garantie.\n" -#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl +#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl #, perl-format msgid "Usage: %s [<option>...] [<command>]" msgstr "Usage: %s [<option>...] [<commande>]" @@ -199,14 +199,6 @@ msgstr "" msgid "unable to execute %s" msgstr "impossible d'exécuter %s" -#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl -#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl -#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl -#: scripts/dpkg-parsechangelog.pl -#, perl-format -msgid "Usage: %s [<option>...]" -msgstr "Utilisation : %s [<option>...]" - #: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "" @@ -217,10 +209,9 @@ msgstr "Utilisation : %s [<option>...]" #| " -?, --help show this help message.\n" #| " --version show the version.\n" msgid "" -"Options:\n" -" -c<control-file> get control info from this file.\n" +"Commands:\n" " -?, --help show this help message.\n" -" -v, --version show the version.\n" +" --version show the version." msgstr "" "Syntaxe : %s [<option>...] <fichier> <section> <priorité>\n" "\n" @@ -231,6 +222,12 @@ msgstr "" " --version afficher la version.\n" #: scripts/dpkg-buildapi.pl +msgid "" +"Options:\n" +" -c<control-file> get control info from this file.\n" +msgstr "" + +#: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "one to three arguments expected" msgid "no arguments accepted" @@ -319,6 +316,13 @@ msgstr "deux commandes indiquées : --%s et --%s" msgid "%s needs a parameter" msgstr "paramètre nécessaire pour %s" +#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl +#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl +#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl +#, perl-format +msgid "Usage: %s [<option>...]" +msgstr "Utilisation : %s [<option>...]" + #: scripts/dpkg-buildpackage.pl #, fuzzy #| msgid "" diff --git a/scripts/po/nl.po b/scripts/po/nl.po index e3cc4f4..3d16f22 100644 --- a/scripts/po/nl.po +++ b/scripts/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-dev 1.21.19\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-02-02 17:51+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: \n" @@ -47,7 +47,7 @@ msgstr "" "Dit is vrije software; zie de GNU General Public-licentie versie 2 of\n" "later voor kopieervoorwaarden. Er is GEEN garantie.\n" -#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl +#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl #, perl-format msgid "Usage: %s [<option>...] [<command>]" msgstr "Gebruik: %s [<optie>...] [<commando>]" @@ -186,14 +186,6 @@ msgstr "" msgid "unable to execute %s" msgstr "kan %s niet uitvoeren" -#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl -#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl -#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl -#: scripts/dpkg-parsechangelog.pl -#, perl-format -msgid "Usage: %s [<option>...]" -msgstr "Gebruik: %s [<optie>...]" - #: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "" @@ -204,10 +196,9 @@ msgstr "Gebruik: %s [<optie>...]" #| " -?, --help show this help message.\n" #| " --version show the version.\n" msgid "" -"Options:\n" -" -c<control-file> get control info from this file.\n" +"Commands:\n" " -?, --help show this help message.\n" -" -v, --version show the version.\n" +" --version show the version." msgstr "" "Gebruik: %s [<optie>...] <bestandsnaam> <sectie> <prioriteit>\n" "\n" @@ -218,6 +209,12 @@ msgstr "" " --version de versie tonen.\n" #: scripts/dpkg-buildapi.pl +msgid "" +"Options:\n" +" -c<control-file> get control info from this file.\n" +msgstr "" + +#: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "one to three arguments expected" msgid "no arguments accepted" @@ -304,6 +301,13 @@ msgstr "twee commando's opgegeven: --%s en --%s" msgid "%s needs a parameter" msgstr "%s heeft een parameter nodig" +#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl +#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl +#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl +#, perl-format +msgid "Usage: %s [<option>...]" +msgstr "Gebruik: %s [<optie>...]" + #: scripts/dpkg-buildpackage.pl #, fuzzy #| msgid "" diff --git a/scripts/po/pl.po b/scripts/po/pl.po index 948277f..3b04a9e 100644 --- a/scripts/po/pl.po +++ b/scripts/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-dev 1.15.4\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 07:05+0200\n" "Last-Translator: Åukasz Dulny <BartekChom@poczta.onet.pl>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -51,7 +51,7 @@ msgstr "" "licencji GNU w wersji drugiej lub późniejszej. Brak JAKIEJKOLWIEK " "gwarancji.\n" -#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl +#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl #, perl-format msgid "Usage: %s [<option>...] [<command>]" msgstr "Użycie: %s [<opcja>...] [<polecenie>]" @@ -205,14 +205,6 @@ msgstr "" msgid "unable to execute %s" msgstr "nie można wykonać %s" -#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl -#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl -#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl -#: scripts/dpkg-parsechangelog.pl -#, perl-format -msgid "Usage: %s [<option>...]" -msgstr "Użycie: %s [<opcja>...]" - #: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "" @@ -223,10 +215,9 @@ msgstr "Użycie: %s [<opcja>...]" #| " -?, --help show this help message.\n" #| " --version show the version.\n" msgid "" -"Options:\n" -" -c<control-file> get control info from this file.\n" +"Commands:\n" " -?, --help show this help message.\n" -" -v, --version show the version.\n" +" --version show the version." msgstr "" "Użycie: %s [<opcja> ...] <nazwa-pliku> <sekcja> <priorytet>\n" "\n" @@ -237,6 +228,12 @@ msgstr "" " --version wyÅ›wietla wersjÄ™.\n" #: scripts/dpkg-buildapi.pl +msgid "" +"Options:\n" +" -c<control-file> get control info from this file.\n" +msgstr "" + +#: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "one to three arguments expected" msgid "no arguments accepted" @@ -321,6 +318,13 @@ msgstr "podano dwa polecenia: --%s i --%s" msgid "%s needs a parameter" msgstr "%s wymaga podania parametru" +#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl +#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl +#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl +#, perl-format +msgid "Usage: %s [<option>...]" +msgstr "Użycie: %s [<opcja>...]" + #: scripts/dpkg-buildpackage.pl #, fuzzy #| msgid "" diff --git a/scripts/po/pt.po b/scripts/po/pt.po index 027cd3f..9d63df4 100644 --- a/scripts/po/pt.po +++ b/scripts/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-dev 1.22.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-03-08 22:31+0000\n" "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n" "Language-Team: Portuguese <>\n" @@ -46,7 +46,7 @@ msgstr "" "Isto é software livre; veja a GNU General Public License versão 2 ou\n" "posterior para condições de cópia. NÃO há garantia.\n" -#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl +#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl #, perl-format msgid "Usage: %s [<option>...] [<command>]" msgstr "Utilização: %s [<opção>...] [<comando>]" @@ -190,14 +190,6 @@ msgstr "" msgid "unable to execute %s" msgstr "incapaz de executar %s" -#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl -#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl -#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl -#: scripts/dpkg-parsechangelog.pl -#, perl-format -msgid "Usage: %s [<option>...]" -msgstr "Utilização: %s [<opção>...]" - #: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "" @@ -208,10 +200,9 @@ msgstr "Utilização: %s [<opção>...]" #| " -?, --help show this help message.\n" #| " --version show the version.\n" msgid "" -"Options:\n" -" -c<control-file> get control info from this file.\n" +"Commands:\n" " -?, --help show this help message.\n" -" -v, --version show the version.\n" +" --version show the version." msgstr "" "Utilização: %s [<opção>...] <nome-ficheiro> <secção> <prioridade>\n" "\n" @@ -222,6 +213,12 @@ msgstr "" " --version mostra a versão.\n" #: scripts/dpkg-buildapi.pl +msgid "" +"Options:\n" +" -c<control-file> get control info from this file.\n" +msgstr "" + +#: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "one to three arguments expected" msgid "no arguments accepted" @@ -307,6 +304,13 @@ msgstr "dois comandos especificados: --%s e --%s" msgid "%s needs a parameter" msgstr "%s precisa dum parâmetro" +#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl +#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl +#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl +#, perl-format +msgid "Usage: %s [<option>...]" +msgstr "Utilização: %s [<opção>...]" + #: scripts/dpkg-buildpackage.pl #, fuzzy #| msgid "" diff --git a/scripts/po/ru.po b/scripts/po/ru.po index 8b79b16..c4350d9 100644 --- a/scripts/po/ru.po +++ b/scripts/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-dev 1.17.23\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2015-04-07 07:02+0200\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -48,7 +48,7 @@ msgstr "" "УниверÑальной общеÑтвенной лицензии GNU верÑии 2 или более поздней.\n" "ÐИКÐКИЕ гарантии не предоÑтавлÑÑŽÑ‚ÑÑ.\n" -#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl +#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl #, perl-format msgid "Usage: %s [<option>...] [<command>]" msgstr "ИÑпользование: %s [<параметр>...] <команда>" @@ -208,14 +208,6 @@ msgstr "" msgid "unable to execute %s" msgstr "невозможно выполнить %s" -#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl -#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl -#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl -#: scripts/dpkg-parsechangelog.pl -#, perl-format -msgid "Usage: %s [<option>...]" -msgstr "ИÑпользование: %s [<параметр>...]" - #: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "" @@ -226,10 +218,9 @@ msgstr "ИÑпользование: %s [<параметр>...]" #| " -?, --help show this help message.\n" #| " --version show the version.\n" msgid "" -"Options:\n" -" -c<control-file> get control info from this file.\n" +"Commands:\n" " -?, --help show this help message.\n" -" -v, --version show the version.\n" +" --version show the version." msgstr "" "ИÑпользование: %s [<параметр>...] <имÑ_файла> <ÑекциÑ> <приоритет>\n" "\n" @@ -239,6 +230,12 @@ msgstr "" " --version показать верÑию\n" #: scripts/dpkg-buildapi.pl +msgid "" +"Options:\n" +" -c<control-file> get control info from this file.\n" +msgstr "" + +#: scripts/dpkg-buildapi.pl #, fuzzy #| msgid "one to three arguments expected" msgid "no arguments accepted" @@ -321,6 +318,13 @@ msgstr "указаны две команды: --%s и --%s" msgid "%s needs a parameter" msgstr "Ð´Ð»Ñ %s требуетÑÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€" +#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl +#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl +#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl +#, perl-format +msgid "Usage: %s [<option>...]" +msgstr "ИÑпользование: %s [<параметр>...]" + #: scripts/dpkg-buildpackage.pl #, fuzzy #| msgid "" diff --git a/scripts/po/sv.gmo b/scripts/po/sv.gmo Binary files differindex d835fe8..d92acdc 100644 --- a/scripts/po/sv.gmo +++ b/scripts/po/sv.gmo diff --git a/scripts/po/sv.po b/scripts/po/sv.po index eacf9db..166b1e8 100644 --- a/scripts/po/sv.po +++ b/scripts/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-dev 1.22.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-01-24 13:12+0100\n" +"POT-Creation-Date: 2024-02-27 04:27+0100\n" "PO-Revision-Date: 2023-12-27 14:43+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" @@ -47,7 +47,7 @@ msgstr "" "Detta program är fri programvara. Se GNU General Public License version 2\n" "eller senare för kopieringsvillkor. Det finns INGEN garanti.\n" -#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl +#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl #, perl-format msgid "Usage: %s [<option>...] [<command>]" msgstr "Användning: %s [<flagga>...] [<Ã¥tgärd>]" @@ -180,20 +180,17 @@ msgstr "" msgid "unable to execute %s" msgstr "kan inte exekvera %s" -#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl -#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl -#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl -#: scripts/dpkg-parsechangelog.pl -#, perl-format -msgid "Usage: %s [<option>...]" -msgstr "Användning: %s [<flagga>...]" - #: scripts/dpkg-buildapi.pl +#, fuzzy +#| msgid "" +#| "Options:\n" +#| " -c<control-file> get control info from this file.\n" +#| " -?, --help show this help message.\n" +#| " -v, --version show the version.\n" msgid "" -"Options:\n" -" -c<control-file> get control info from this file.\n" +"Commands:\n" " -?, --help show this help message.\n" -" -v, --version show the version.\n" +" --version show the version." msgstr "" "Flaggor:\n" " -c<control-fil> hämta styrinfo frÃ¥n denna fil.\n" @@ -201,6 +198,12 @@ msgstr "" " --version visa versionsnummer.\n" #: scripts/dpkg-buildapi.pl +msgid "" +"Options:\n" +" -c<control-file> get control info from this file.\n" +msgstr "" + +#: scripts/dpkg-buildapi.pl msgid "no arguments accepted" msgstr "inga argument godtas" @@ -262,6 +265,13 @@ msgstr "tvÃ¥ kommandon angavs: --%s och --%s" msgid "%s needs a parameter" msgstr "%s behöver en parameter" +#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl +#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl +#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl +#, perl-format +msgid "Usage: %s [<option>...]" +msgstr "Användning: %s [<flagga>...]" + #: scripts/dpkg-buildpackage.pl msgid "" "Options:\n" diff --git a/scripts/t/Dpkg_BuildFlags.t b/scripts/t/Dpkg_BuildFlags.t index 530871c..515ed15 100644 --- a/scripts/t/Dpkg_BuildFlags.t +++ b/scripts/t/Dpkg_BuildFlags.t @@ -16,7 +16,7 @@ use strict; use warnings; -use Test::More tests => 40; +use Test::More tests => 100; BEGIN { $ENV{DEB_BUILD_ARCH} = 'amd64'; @@ -171,4 +171,119 @@ $ENV{DEB_BUILD_MAINT_OPTIONS} = 'future=+lfs abi=-lfs'; $bf = Dpkg::BuildFlags->new(); test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +# Test time64 abi features, for a 64-bit system, a 32-bit system with time64 +# and a 32-bit system with time32. + +# 32-bit system with time32, time64 not enabled by default. +$ENV{DEB_BUILD_ARCH} = 'i386'; +$ENV{DEB_HOST_ARCH} = 'i386'; + +undef $ENV{DEB_BUILD_MAINT_OPTIONS}; +$bf = Dpkg::BuildFlags->new(); +test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + +$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=+time64'; +$bf = Dpkg::BuildFlags->new(); +test_has_flag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_flag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_flag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + +$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=-time64'; +$bf = Dpkg::BuildFlags->new(); +test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + +# 32-bit system with time32 and no time64. +$ENV{DEB_BUILD_ARCH} = 'hurd-i386'; +$ENV{DEB_HOST_ARCH} = 'hurd-i386'; + +undef $ENV{DEB_BUILD_MAINT_OPTIONS}; +$bf = Dpkg::BuildFlags->new(); +test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + +$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=+time64'; +$bf = Dpkg::BuildFlags->new(); +test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + +$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=-time64'; +$bf = Dpkg::BuildFlags->new(); +test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + +# 32-bit system with time32, time64 enabled by default. +$ENV{DEB_BUILD_ARCH} = 'armhf'; +$ENV{DEB_HOST_ARCH} = 'armhf'; + +undef $ENV{DEB_BUILD_MAINT_OPTIONS}; +$bf = Dpkg::BuildFlags->new(); +test_has_flag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_flag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_flag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + +$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=+time64'; +$bf = Dpkg::BuildFlags->new(); +test_has_flag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_flag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_flag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + +$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=-time64'; +$bf = Dpkg::BuildFlags->new(); +test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_flag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_flag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + +# 64-bit system with built-in time64. +$ENV{DEB_BUILD_ARCH} = 'amd64'; +$ENV{DEB_HOST_ARCH} = 'amd64'; + +undef $ENV{DEB_BUILD_MAINT_OPTIONS}; +$bf = Dpkg::BuildFlags->new(); +test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + +$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=+time64'; +$bf = Dpkg::BuildFlags->new(); +test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + +$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=-time64'; +$bf = Dpkg::BuildFlags->new(); +test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS'); +test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64'); +test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS'); +test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration'); + # TODO: Add more test cases. diff --git a/scripts/t/Dpkg_OpenPGP.t b/scripts/t/Dpkg_OpenPGP.t index c3cd724..d409082 100644 --- a/scripts/t/Dpkg_OpenPGP.t +++ b/scripts/t/Dpkg_OpenPGP.t @@ -27,6 +27,7 @@ use Dpkg::OpenPGP::KeyHandle; my %backend_cmd = ( auto => 'auto', + 'gpg-sq' => 'gpg', gpg => 'gpg', sq => 'sq', sqop => 'sop', diff --git a/src/Makefile.am b/src/Makefile.am index 31d1a9e..6d0f2f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -98,14 +98,6 @@ dpkg_deb_SOURCES = \ deb/main.c \ # EOL -dpkg_deb_LDADD = \ - $(LDADD) \ - $(Z_LIBS) \ - $(LZMA_LIBS) \ - $(ZSTD_LIBS) \ - $(BZ2_LIBS) \ - # EOL - dpkg_divert_SOURCES = \ divert/main.c \ # EOL @@ -142,6 +134,9 @@ dpkg_trigger_SOURCES = \ trigger/main.c \ # EOL +dist_bashcompletions_DATA = \ + # EOL + SUFFIXES = include $(top_srcdir)/build-aux/subst.am diff --git a/src/Makefile.in b/src/Makefile.in index 88b2456..cbabcd6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -120,14 +120,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(nobase_dist_pkgdata_DATA) \ - $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_bashcompletions_DATA) \ + $(nobase_dist_pkgdata_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(pkgdatadir)" + "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bashcompletionsdir)" \ + "$(DESTDIR)$(pkgdatadir)" PROGRAMS = $(bin_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp am_dpkg_OBJECTS = common/force.$(OBJEXT) common/selinux.$(OBJEXT) \ @@ -153,9 +154,9 @@ am__v_lt_1 = am_dpkg_deb_OBJECTS = deb/build.$(OBJEXT) deb/extract.$(OBJEXT) \ deb/info.$(OBJEXT) deb/main.$(OBJEXT) dpkg_deb_OBJECTS = $(am_dpkg_deb_OBJECTS) -dpkg_deb_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +dpkg_deb_LDADD = $(LDADD) +dpkg_deb_DEPENDENCIES = ../lib/dpkg/libdpkg.la $(am__DEPENDENCIES_1) \ + ../lib/compat/libcompat.la am_dpkg_divert_OBJECTS = divert/main.$(OBJEXT) dpkg_divert_OBJECTS = $(am_dpkg_divert_OBJECTS) dpkg_divert_LDADD = $(LDADD) @@ -275,7 +276,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -DATA = $(nobase_dist_pkgdata_DATA) +DATA = $(dist_bashcompletions_DATA) $(nobase_dist_pkgdata_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -441,6 +442,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aclocaldir = @aclocaldir@ admindir = @admindir@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -448,6 +450,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ backupsdir = @backupsdir@ +bashcompletionsdir = @bashcompletionsdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -459,6 +462,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ devlibdir = @devlibdir@ docdir = @docdir@ +docspecdir = @docspecdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -476,10 +480,14 @@ localedir = @localedir@ localstatedir = @localstatedir@ logdir = @logdir@ mandir = @mandir@ +methodsdir = @methodsdir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +perllibdir = @perllibdir@ pkgconfdir = @pkgconfdir@ +pkgconfigdir = @pkgconfigdir@ +polkitactionsdir = @polkitactionsdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -572,14 +580,6 @@ dpkg_deb_SOURCES = \ deb/main.c \ # EOL -dpkg_deb_LDADD = \ - $(LDADD) \ - $(Z_LIBS) \ - $(LZMA_LIBS) \ - $(ZSTD_LIBS) \ - $(BZ2_LIBS) \ - # EOL - dpkg_divert_SOURCES = \ divert/main.c \ # EOL @@ -616,6 +616,9 @@ dpkg_trigger_SOURCES = \ trigger/main.c \ # EOL +dist_bashcompletions_DATA = \ + # EOL + SUFFIXES = .sh .pl do_shell_subst = $(AM_V_GEN) $(SED) \ -e "s:^ADMINDIR=.*$$:ADMINDIR='$(admindir)':" \ @@ -1032,6 +1035,27 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-dist_bashcompletionsDATA: $(dist_bashcompletions_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bashcompletionsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bashcompletionsdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bashcompletionsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(bashcompletionsdir)" || exit $$?; \ + done + +uninstall-dist_bashcompletionsDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(bashcompletionsdir)'; $(am__uninstall_files_from_dir) install-nobase_dist_pkgdataDATA: $(nobase_dist_pkgdata_DATA) @$(NORMAL_INSTALL) @list='$(nobase_dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ @@ -1146,7 +1170,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bashcompletionsdir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1253,7 +1277,8 @@ info: info-am info-am: -install-data-am: install-data-local install-nobase_dist_pkgdataDATA +install-data-am: install-data-local install-dist_bashcompletionsDATA \ + install-nobase_dist_pkgdataDATA install-dvi: install-dvi-am @@ -1334,6 +1359,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-dist_bashcompletionsDATA \ uninstall-nobase_dist_pkgdataDATA uninstall-pkglibexecSCRIPTS .MAKE: check-am install-am install-strip @@ -1345,16 +1371,17 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-binSCRIPTS install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-nobase_dist_pkgdataDATA \ - install-pdf install-pdf-am install-pkglibexecSCRIPTS \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installcheck-local installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-binSCRIPTS \ + install-data-local install-dist_bashcompletionsDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-nobase_dist_pkgdataDATA install-pdf \ + install-pdf-am install-pkglibexecSCRIPTS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installcheck-local installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-binSCRIPTS uninstall-dist_bashcompletionsDATA \ uninstall-nobase_dist_pkgdataDATA uninstall-pkglibexecSCRIPTS .PRECIOUS: Makefile diff --git a/src/at/deb-format.at b/src/at/deb-format.at index e67ee10..13654d4 100644 --- a/src/at/deb-format.at +++ b/src/at/deb-format.at @@ -517,8 +517,11 @@ AT_SKIP_IF([! command -v xz >/dev/null]) DPKG_GEN_PKG_DEB_FORMAT_TEMPL() AT_CHECK([ # Extract the base members -xz -c control.tar >control.tar.xz -xz -c data.tar >data.tar.xz +# XXX: Due to a new behavior in xz 5.6.0, when it automatically reduces the +# amount of threads it prints a warning on stderr, even w/o -T. We pass an +# explicit -T+1 to force parallel mode but only use one thread as a workaround. +xz -T+1 -c control.tar >control.tar.xz +xz -T+1 -c data.tar >data.tar.xz ]) AT_CHECK([ diff --git a/src/at/package.m4 b/src/at/package.m4 index ca9daa9..e36d505 100644 --- a/src/at/package.m4 +++ b/src/at/package.m4 @@ -1,7 +1,7 @@ # Signature of the current package. m4_define([AT_PACKAGE_NAME], [dpkg]) m4_define([AT_PACKAGE_TARNAME], [dpkg]) -m4_define([AT_PACKAGE_VERSION], [1.22.4]) -m4_define([AT_PACKAGE_STRING], [dpkg 1.22.4]) +m4_define([AT_PACKAGE_VERSION], [1.22.5]) +m4_define([AT_PACKAGE_STRING], [dpkg 1.22.5]) m4_define([AT_PACKAGE_URL], [https://wiki.debian.org/Teams/Dpkg]) m4_define([AT_PACKAGE_BUGREPORT], [debian-dpkg@lists.debian.org]) diff --git a/src/at/testsuite b/src/at/testsuite index aea9493..2bdc028 100755 --- a/src/at/testsuite +++ b/src/at/testsuite @@ -614,9 +614,9 @@ at_help_all="1;deb-format.at:1;dpkg-deb options;dpkg-deb command-line; 2;deb-format.at:10;dpkg-deb .deb format 0.93x;dpkg-deb deb-old; 3;deb-format.at:208;dpkg-deb .deb format 2.x (core);dpkg-deb deb; 4;deb-format.at:511;dpkg-deb .deb format 2.x (xz);dpkg-deb deb; -5;deb-format.at:562;dpkg-deb .deb format 2.x (zstd);dpkg-deb deb; -6;deb-format.at:613;dpkg-deb .deb format 2.x (bzip2);dpkg-deb deb; -7;deb-format.at:641;dpkg-deb .deb format 2.x (lzma);dpkg-deb deb; +5;deb-format.at:565;dpkg-deb .deb format 2.x (zstd);dpkg-deb deb; +6;deb-format.at:616;dpkg-deb .deb format 2.x (bzip2);dpkg-deb deb; +7;deb-format.at:644;dpkg-deb .deb format 2.x (lzma);dpkg-deb deb; 8;deb-content.at:1;dpkg-deb .deb conffiles;dpkg-deb deb conffiles; 9;deb-fields.at:1;dpkg-deb .deb fields;dpkg-deb deb fields; 10;deb-split.at:1;dpkg-split options;dpkg-split command-line; @@ -1000,7 +1000,7 @@ fi # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -dpkg 1.22.4 test suite: dpkg tools functional test suite test groups: +dpkg 1.22.5 test suite: dpkg tools functional test suite test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -1041,7 +1041,7 @@ _ATEOF exit $at_write_fail fi if $at_version_p; then - printf "%s\n" "$as_me (dpkg 1.22.4)" && + printf "%s\n" "$as_me (dpkg 1.22.5)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1241,11 +1241,11 @@ exec 5>>"$at_suite_log" # Banners and logs. printf "%s\n" "## --------------------------------------------------------- ## -## dpkg 1.22.4 test suite: dpkg tools functional test suite. ## +## dpkg 1.22.5 test suite: dpkg tools functional test suite. ## ## --------------------------------------------------------- ##" { printf "%s\n" "## --------------------------------------------------------- ## -## dpkg 1.22.4 test suite: dpkg tools functional test suite. ## +## dpkg 1.22.5 test suite: dpkg tools functional test suite. ## ## --------------------------------------------------------- ##" echo @@ -2105,7 +2105,7 @@ _ASBOX printf "%s\n" "Please send $at_msg and all information you think might help: To: <debian-dpkg@lists.debian.org> - Subject: [dpkg 1.22.4] $as_me: $at_msg1$at_msg2 + Subject: [dpkg 1.22.5] $as_me: $at_msg1$at_msg2 You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may @@ -3426,14 +3426,20 @@ $at_traceon; } { set +x printf "%s\n" "$at_srcdir/deb-format.at:518: # Extract the base members -xz -c control.tar >control.tar.xz -xz -c data.tar >data.tar.xz +# XXX: Due to a new behavior in xz 5.6.0, when it automatically reduces the +# amount of threads it prints a warning on stderr, even w/o -T. We pass an +# explicit -T+1 to force parallel mode but only use one thread as a workaround. +xz -T+1 -c control.tar >control.tar.xz +xz -T+1 -c data.tar >data.tar.xz " at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:518" ( $at_check_trace; # Extract the base members -xz -c control.tar >control.tar.xz -xz -c data.tar >data.tar.xz +# XXX: Due to a new behavior in xz 5.6.0, when it automatically reduces the +# amount of threads it prints a warning on stderr, even w/o -T. We pass an +# explicit -T+1 to force parallel mode but only use one thread as a workaround. +xz -T+1 -c control.tar >control.tar.xz +xz -T+1 -c data.tar >data.tar.xz ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false @@ -3446,13 +3452,13 @@ $at_traceon; } { set +x -printf "%s\n" "$at_srcdir/deb-format.at:524: +printf "%s\n" "$at_srcdir/deb-format.at:527: # Test control.tar.xz member ar qSc pkg-control-xz.deb debian-binary control.tar.xz data.tar.xz ar t pkg-control-xz.deb dpkg-deb -c pkg-control-xz.deb " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:524" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:527" ( $at_check_trace; # Test control.tar.xz member ar qSc pkg-control-xz.deb debian-binary control.tar.xz data.tar.xz @@ -3471,19 +3477,19 @@ drwxr-xr-x root/root 0 1970-01-01 00:00 ./ -rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:524" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:527" $at_failed && at_fn_log_failure $at_traceon; } { set +x -printf "%s\n" "$at_srcdir/deb-format.at:537: +printf "%s\n" "$at_srcdir/deb-format.at:540: # Test data.tar.xz member ar qSc pkg-data-xz.deb debian-binary control.tar.gz data.tar.xz ar t pkg-data-xz.deb dpkg-deb -c pkg-data-xz.deb " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:537" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:540" ( $at_check_trace; # Test data.tar.xz member ar qSc pkg-data-xz.deb debian-binary control.tar.gz data.tar.xz @@ -3502,13 +3508,13 @@ drwxr-xr-x root/root 0 1970-01-01 00:00 ./ -rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:537" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:540" $at_failed && at_fn_log_failure $at_traceon; } { set +x -printf "%s\n" "$at_srcdir/deb-format.at:550: +printf "%s\n" "$at_srcdir/deb-format.at:553: # Test building and extracting xz compressed archive dpkg-deb --uniform-compression --root-owner-group -Zxz -b pkg-templ pkg-comp-xz.deb >/dev/null dpkg-deb --ctrl-tarfile pkg-comp-xz.deb >ctrl-xz.tar @@ -3516,7 +3522,7 @@ dpkg-deb --fsys-tarfile pkg-comp-xz.deb >fsys-xz.tar cmp ctrl-xz.tar control.tar cmp fsys-xz.tar data.tar " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:550" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:553" ( $at_check_trace; # Test building and extracting xz compressed archive dpkg-deb --uniform-compression --root-owner-group -Zxz -b pkg-templ pkg-comp-xz.deb >/dev/null @@ -3530,7 +3536,7 @@ at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:550" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:553" $at_failed && at_fn_log_failure $at_traceon; } @@ -3541,7 +3547,7 @@ $at_traceon; } read at_status <"$at_status_file" #AT_STOP_4 #AT_START_5 -at_fn_group_banner 5 'deb-format.at:562' \ +at_fn_group_banner 5 'deb-format.at:565' \ "dpkg-deb .deb format 2.x (zstd)" " " 1 at_xfail=no ( @@ -3550,12 +3556,12 @@ at_xfail=no -printf "%s\n" "deb-format.at:565" >"$at_check_line_file" +printf "%s\n" "deb-format.at:568" >"$at_check_line_file" (! command -v gzip >/dev/null) \ - && at_fn_check_skip 77 "$at_srcdir/deb-format.at:565" -printf "%s\n" "deb-format.at:566" >"$at_check_line_file" + && at_fn_check_skip 77 "$at_srcdir/deb-format.at:568" +printf "%s\n" "deb-format.at:569" >"$at_check_line_file" (! command -v zstd >/dev/null) \ - && at_fn_check_skip 77 "$at_srcdir/deb-format.at:566" + && at_fn_check_skip 77 "$at_srcdir/deb-format.at:569" @@ -3581,7 +3587,7 @@ test _ATEOF { set +x -printf "%s\n" "$at_srcdir/deb-format.at:568: +printf "%s\n" "$at_srcdir/deb-format.at:571: # Initialize the template package mv pkg-deb-format pkg-templ cp \$top_srcdir/ChangeLog.old pkg-templ/ @@ -3595,7 +3601,7 @@ printf "%s\n" "$at_srcdir/deb-format.at:568: gzip -cn control.tar >control.tar.gz gzip -cn data.tar >data.tar.gz " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:568" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:571" ( $at_check_trace; # Initialize the template package mv pkg-deb-format pkg-templ @@ -3615,18 +3621,18 @@ at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:568" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:571" $at_failed && at_fn_log_failure $at_traceon; } { set +x -printf "%s\n" "$at_srcdir/deb-format.at:569: +printf "%s\n" "$at_srcdir/deb-format.at:572: # Extract the base members zstd -c control.tar >control.tar.zst zstd -c data.tar >data.tar.zst " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:569" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:572" ( $at_check_trace; # Extract the base members zstd -c control.tar >control.tar.zst @@ -3637,19 +3643,19 @@ at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:569" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:572" $at_failed && at_fn_log_failure $at_traceon; } { set +x -printf "%s\n" "$at_srcdir/deb-format.at:575: +printf "%s\n" "$at_srcdir/deb-format.at:578: # Test control.tar.zst member ar qSc pkg-control-zst.deb debian-binary control.tar.zst data.tar.zst ar t pkg-control-zst.deb dpkg-deb -c pkg-control-zst.deb " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:575" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:578" ( $at_check_trace; # Test control.tar.zst member ar qSc pkg-control-zst.deb debian-binary control.tar.zst data.tar.zst @@ -3668,19 +3674,19 @@ drwxr-xr-x root/root 0 1970-01-01 00:00 ./ -rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:575" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:578" $at_failed && at_fn_log_failure $at_traceon; } { set +x -printf "%s\n" "$at_srcdir/deb-format.at:588: +printf "%s\n" "$at_srcdir/deb-format.at:591: # Test data.tar.zst member ar qSc pkg-data-zst.deb debian-binary control.tar.gz data.tar.zst ar t pkg-data-zst.deb dpkg-deb -c pkg-data-zst.deb " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:588" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:591" ( $at_check_trace; # Test data.tar.zst member ar qSc pkg-data-zst.deb debian-binary control.tar.gz data.tar.zst @@ -3699,13 +3705,13 @@ drwxr-xr-x root/root 0 1970-01-01 00:00 ./ -rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:588" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:591" $at_failed && at_fn_log_failure $at_traceon; } { set +x -printf "%s\n" "$at_srcdir/deb-format.at:601: +printf "%s\n" "$at_srcdir/deb-format.at:604: # Test building and extracting zstd compressed archive dpkg-deb --uniform-compression --root-owner-group -Zzstd -b pkg-templ pkg-comp-zstd.deb >/dev/null dpkg-deb --ctrl-tarfile pkg-comp-zstd.deb >ctrl-zstd.tar @@ -3713,7 +3719,7 @@ dpkg-deb --fsys-tarfile pkg-comp-zstd.deb >fsys-zstd.tar cmp ctrl-zstd.tar control.tar cmp fsys-zstd.tar data.tar " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:601" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:604" ( $at_check_trace; # Test building and extracting zstd compressed archive dpkg-deb --uniform-compression --root-owner-group -Zzstd -b pkg-templ pkg-comp-zstd.deb >/dev/null @@ -3727,7 +3733,7 @@ at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:601" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:604" $at_failed && at_fn_log_failure $at_traceon; } @@ -3738,7 +3744,7 @@ $at_traceon; } read at_status <"$at_status_file" #AT_STOP_5 #AT_START_6 -at_fn_group_banner 6 'deb-format.at:613' \ +at_fn_group_banner 6 'deb-format.at:616' \ "dpkg-deb .deb format 2.x (bzip2)" " " 1 at_xfail=no ( @@ -3747,12 +3753,12 @@ at_xfail=no -printf "%s\n" "deb-format.at:616" >"$at_check_line_file" +printf "%s\n" "deb-format.at:619" >"$at_check_line_file" (! command -v gzip >/dev/null) \ - && at_fn_check_skip 77 "$at_srcdir/deb-format.at:616" -printf "%s\n" "deb-format.at:617" >"$at_check_line_file" + && at_fn_check_skip 77 "$at_srcdir/deb-format.at:619" +printf "%s\n" "deb-format.at:620" >"$at_check_line_file" (! command -v bzip2 >/dev/null) \ - && at_fn_check_skip 77 "$at_srcdir/deb-format.at:617" + && at_fn_check_skip 77 "$at_srcdir/deb-format.at:620" @@ -3778,7 +3784,7 @@ test _ATEOF { set +x -printf "%s\n" "$at_srcdir/deb-format.at:619: +printf "%s\n" "$at_srcdir/deb-format.at:622: # Initialize the template package mv pkg-deb-format pkg-templ cp \$top_srcdir/ChangeLog.old pkg-templ/ @@ -3792,7 +3798,7 @@ printf "%s\n" "$at_srcdir/deb-format.at:619: gzip -cn control.tar >control.tar.gz gzip -cn data.tar >data.tar.gz " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:619" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:622" ( $at_check_trace; # Initialize the template package mv pkg-deb-format pkg-templ @@ -3812,17 +3818,17 @@ at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:619" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:622" $at_failed && at_fn_log_failure $at_traceon; } { set +x -printf "%s\n" "$at_srcdir/deb-format.at:620: +printf "%s\n" "$at_srcdir/deb-format.at:623: # Extract the base members bzip2 -c data.tar >data.tar.bz2 " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:620" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:623" ( $at_check_trace; # Extract the base members bzip2 -c data.tar >data.tar.bz2 @@ -3832,19 +3838,19 @@ at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:620" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:623" $at_failed && at_fn_log_failure $at_traceon; } { set +x -printf "%s\n" "$at_srcdir/deb-format.at:625: +printf "%s\n" "$at_srcdir/deb-format.at:628: # Test data.tar.bz2 member ar qSc pkg-data-bz2.deb debian-binary control.tar.gz data.tar.bz2 ar t pkg-data-bz2.deb dpkg-deb -c pkg-data-bz2.deb " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:625" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:628" ( $at_check_trace; # Test data.tar.bz2 member ar qSc pkg-data-bz2.deb debian-binary control.tar.gz data.tar.bz2 @@ -3863,7 +3869,7 @@ drwxr-xr-x root/root 0 1970-01-01 00:00 ./ -rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:625" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:628" $at_failed && at_fn_log_failure $at_traceon; } @@ -3874,7 +3880,7 @@ $at_traceon; } read at_status <"$at_status_file" #AT_STOP_6 #AT_START_7 -at_fn_group_banner 7 'deb-format.at:641' \ +at_fn_group_banner 7 'deb-format.at:644' \ "dpkg-deb .deb format 2.x (lzma)" " " 1 at_xfail=no ( @@ -3883,12 +3889,12 @@ at_xfail=no -printf "%s\n" "deb-format.at:644" >"$at_check_line_file" +printf "%s\n" "deb-format.at:647" >"$at_check_line_file" (! command -v gzip >/dev/null) \ - && at_fn_check_skip 77 "$at_srcdir/deb-format.at:644" -printf "%s\n" "deb-format.at:645" >"$at_check_line_file" + && at_fn_check_skip 77 "$at_srcdir/deb-format.at:647" +printf "%s\n" "deb-format.at:648" >"$at_check_line_file" (! command -v lzma >/dev/null) \ - && at_fn_check_skip 77 "$at_srcdir/deb-format.at:645" + && at_fn_check_skip 77 "$at_srcdir/deb-format.at:648" @@ -3914,7 +3920,7 @@ test _ATEOF { set +x -printf "%s\n" "$at_srcdir/deb-format.at:647: +printf "%s\n" "$at_srcdir/deb-format.at:650: # Initialize the template package mv pkg-deb-format pkg-templ cp \$top_srcdir/ChangeLog.old pkg-templ/ @@ -3928,7 +3934,7 @@ printf "%s\n" "$at_srcdir/deb-format.at:647: gzip -cn control.tar >control.tar.gz gzip -cn data.tar >data.tar.gz " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:647" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:650" ( $at_check_trace; # Initialize the template package mv pkg-deb-format pkg-templ @@ -3948,17 +3954,17 @@ at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:647" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:650" $at_failed && at_fn_log_failure $at_traceon; } { set +x -printf "%s\n" "$at_srcdir/deb-format.at:648: +printf "%s\n" "$at_srcdir/deb-format.at:651: # Extract the base members lzma -c data.tar >data.tar.lzma " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:648" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:651" ( $at_check_trace; # Extract the base members lzma -c data.tar >data.tar.lzma @@ -3968,19 +3974,19 @@ at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:648" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:651" $at_failed && at_fn_log_failure $at_traceon; } { set +x -printf "%s\n" "$at_srcdir/deb-format.at:653: +printf "%s\n" "$at_srcdir/deb-format.at:656: # Test data.tar.lzma member ar qSc pkg-data-lzma.deb debian-binary control.tar.gz data.tar.lzma ar t pkg-data-lzma.deb dpkg-deb -c pkg-data-lzma.deb " -at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:653" +at_fn_check_prepare_notrace 'an embedded newline' "deb-format.at:656" ( $at_check_trace; # Test data.tar.lzma member ar qSc pkg-data-lzma.deb debian-binary control.tar.gz data.tar.lzma @@ -3999,7 +4005,7 @@ drwxr-xr-x root/root 0 1970-01-01 00:00 ./ -rw-r--r-- root/root 5 1970-01-01 00:00 ./file-templ " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:653" +at_fn_check_status 0 $at_status "$at_srcdir/deb-format.at:656" $at_failed && at_fn_log_failure $at_traceon; } diff --git a/src/deb/build.c b/src/deb/build.c index 597872b..1f0c050 100644 --- a/src/deb/build.c +++ b/src/deb/build.c @@ -177,10 +177,9 @@ file_treewalk_feed(const char *dir, int fd_out) if (S_ISLNK(treenode_get_mode(node))) { fi = file_info_new(nodename); file_info_list_append(&symlist, &symlist_end, fi); - } else { - if (fd_write(fd_out, nodename, strlen(nodename) + 1) < 0) - ohshite(_("failed to write filename to tar pipe (%s)"), - _("data member")); + } else if (fd_write(fd_out, nodename, strlen(nodename) + 1) < 0) { + ohshite(_("failed to write filename to tar pipe (%s)"), + _("data member")); } free(nodename); diff --git a/src/main/archives.c b/src/main/archives.c index 015bb23..7e399f9 100644 --- a/src/main/archives.c +++ b/src/main/archives.c @@ -534,8 +534,9 @@ tarobject_matches(struct tarcontext *tc, const char *fn_new, struct tar_entry *te, struct fsys_namenode *namenode) { - char *linkname; + struct varbuf linkname = VARBUF_INIT; ssize_t linksize; + bool linkmatch; debug(dbg_eachfiledetail, "tarobject matches on-disk object?"); @@ -548,8 +549,7 @@ tarobject_matches(struct tarcontext *tc, * remain real symlinks where we can compare the target. */ if (!S_ISLNK(stab->st_mode)) break; - linkname = m_malloc(stab->st_size + 1); - linksize = readlink(fn_old, linkname, stab->st_size + 1); + linksize = file_readlink(fn_old, &linkname, stab->st_size); if (linksize < 0) ohshite(_("unable to read link '%.255s'"), fn_old); else if (linksize > stab->st_size) @@ -558,13 +558,10 @@ tarobject_matches(struct tarcontext *tc, else if (linksize < stab->st_size) warning(_("symbolic link '%.250s' size has changed from %jd to %zd"), fn_old, (intmax_t)stab->st_size, linksize); - linkname[linksize] = '\0'; - if (strcmp(linkname, te->linkname) == 0) { - free(linkname); + linkmatch = strcmp(linkname.buf, te->linkname) == 0; + varbuf_destroy(&linkname); + if (linkmatch) return; - } else { - free(linkname); - } break; case TAR_FILETYPE_CHARDEV: if (S_ISCHR(stab->st_mode) && stab->st_rdev == te->dev) @@ -1044,25 +1041,21 @@ tarobject(struct tar_archive *tar, struct tar_entry *ti) ohshite(_("unable to move aside '%.255s' to install new version"), ti->name); } else if (S_ISLNK(stab.st_mode)) { - ssize_t symlink_len; + ssize_t linksize; int rc; /* We can't make a symlink with two hardlinks, so we'll have to * copy it. (Pretend that making a copy of a symlink is the same * as linking to it.) */ - varbuf_reset(&symlinkfn); - varbuf_grow(&symlinkfn, stab.st_size + 1); - symlink_len = readlink(fnamevb.buf, symlinkfn.buf, symlinkfn.size); - if (symlink_len < 0) + linksize = file_readlink(fnamevb.buf, &symlinkfn, stab.st_size); + if (linksize < 0) ohshite(_("unable to read link '%.255s'"), ti->name); - else if (symlink_len > stab.st_size) + else if (linksize > stab.st_size) ohshit(_("symbolic link '%.250s' size has changed from %jd to %zd"), - fnamevb.buf, (intmax_t)stab.st_size, symlink_len); - else if (symlink_len < stab.st_size) + fnamevb.buf, (intmax_t)stab.st_size, linksize); + else if (linksize < stab.st_size) warning(_("symbolic link '%.250s' size has changed from %jd to %zd"), - fnamevb.buf, (intmax_t)stab.st_size, symlink_len); - varbuf_trunc(&symlinkfn, symlink_len); - varbuf_end_str(&symlinkfn); + fnamevb.buf, (intmax_t)stab.st_size, linksize); if (symlink(symlinkfn.buf,fnametmpvb.buf)) ohshite(_("unable to make backup symlink for '%.255s'"), ti->name); rc = lchown(fnametmpvb.buf, stab.st_uid, stab.st_gid); @@ -1693,19 +1686,17 @@ wanttoinstall(struct pkginfo *pkg) } else { return true; } + } else if (in_force(FORCE_DOWNGRADE)) { + warning(_("downgrading %.250s from %.250s to %.250s"), + pkg_name(pkg, pnaw_nonambig), + versiondescribe(&pkg->installed.version, vdew_nonambig), + versiondescribe(&pkg->available.version, vdew_nonambig)); + return true; } else { - if (in_force(FORCE_DOWNGRADE)) { - warning(_("downgrading %.250s from %.250s to %.250s"), - pkg_name(pkg, pnaw_nonambig), - versiondescribe(&pkg->installed.version, vdew_nonambig), - versiondescribe(&pkg->available.version, vdew_nonambig)); - return true; - } else { - notice(_("will not downgrade %.250s from %.250s to %.250s, skipping"), - pkg_name(pkg, pnaw_nonambig), - versiondescribe(&pkg->installed.version, vdew_nonambig), - versiondescribe(&pkg->available.version, vdew_nonambig)); - return false; - } + notice(_("will not downgrade %.250s from %.250s to %.250s, skipping"), + pkg_name(pkg, pnaw_nonambig), + versiondescribe(&pkg->installed.version, vdew_nonambig), + versiondescribe(&pkg->available.version, vdew_nonambig)); + return false; } } diff --git a/src/main/configure.c b/src/main/configure.c index c2d58c7..f2c9227 100644 --- a/src/main/configure.c +++ b/src/main/configure.c @@ -699,7 +699,6 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in) { static struct varbuf target = VARBUF_INIT; struct stat stab; - ssize_t r; int loopprotect; varbuf_set_str(result, dpkg_fsys_get_dir()); @@ -724,6 +723,8 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in) in, result->buf); return 0; } else if (S_ISLNK(stab.st_mode)) { + ssize_t linksize; + debug(dbg_conffdetail, "conffderef symlink loopprotect=%d", loopprotect); if (loopprotect++ >= 25) { @@ -734,36 +735,35 @@ conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in) return -1; } - varbuf_reset(&target); - varbuf_grow(&target, stab.st_size + 1); - r = readlink(result->buf, target.buf, target.size); - if (r < 0) { + linksize = file_readlink(result->buf, &target, stab.st_size); + if (linksize < 0) { warning(_("%s: unable to readlink conffile '%s'\n" " (= '%s'): %s"), pkg_name(pkg, pnaw_nonambig), in, result->buf, strerror(errno)); return -1; - } else if (r != stab.st_size) { + } else if (linksize != stab.st_size) { warning(_("symbolic link '%.250s' size has " "changed from %jd to %zd"), - result->buf, (intmax_t)stab.st_size, r); + result->buf, (intmax_t)stab.st_size, + linksize); /* If the returned size is smaller, let's * proceed, otherwise error out. */ - if (r > stab.st_size) + if (linksize > stab.st_size) return -1; } - varbuf_trunc(&target, r); - varbuf_end_str(&target); debug(dbg_conffdetail, "conffderef readlink gave %zd, '%s'", - r, target.buf); + linksize, target.buf); if (target.buf[0] == '/') { varbuf_set_str(result, dpkg_fsys_get_dir()); debug(dbg_conffdetail, "conffderef readlink absolute"); } else { + ssize_t r; + for (r = result->used - 1; r > 0 && result->buf[r] != '/'; r--) ; if (r < 0) { diff --git a/src/main/script.c b/src/main/script.c index b4f369d..017d92e 100644 --- a/src/main/script.c +++ b/src/main/script.c @@ -358,13 +358,11 @@ maintscript_fallback(struct pkginfo *pkg, } warning(_("unable to stat %s '%.250s': %s"), cmd.name, oldscriptpath, strerror(errno)); - } else { - if (!maintscript_exec(pkg, &pkg->installed, &cmd, &stab, SUBPROC_WARN)) { - command_destroy(&cmd); - free(buf); - post_script_tasks(); - return 1; - } + } else if (!maintscript_exec(pkg, &pkg->installed, &cmd, &stab, SUBPROC_WARN)) { + command_destroy(&cmd); + free(buf); + post_script_tasks(); + return 1; } notice(_("trying script from the new package instead ...")); diff --git a/src/query/main.c b/src/query/main.c index 7f8de59..6674896 100644 --- a/src/query/main.c +++ b/src/query/main.c @@ -69,7 +69,7 @@ pkg_array_match_patterns(struct pkg_array *array, const char *const *argv) { int argc, i, ip, *found; - int rc = 0; + int misses = 0; struct pkg_spec *ps; for (argc = 0; argv[argc]; argc++); @@ -101,7 +101,7 @@ pkg_array_match_patterns(struct pkg_array *array, for (ip = 0; ip < argc; ip++) { if (!found[ip]) { notice(_("no packages found matching %s"), argv[ip]); - rc++; + misses++; } pkg_spec_destroy(&ps[ip]); } @@ -109,7 +109,7 @@ pkg_array_match_patterns(struct pkg_array *array, free(ps); free(found); - return rc; + return misses; } struct list_format { @@ -250,7 +250,7 @@ static int listpackages(const char *const *argv) { struct pkg_array array; - int rc = 0; + int misses = 0; struct list_format fmt; struct pager *pager; @@ -279,7 +279,7 @@ listpackages(const char *const *argv) pkg_array_foreach(&array, pkg_array_list_item, &fmt); } else { - rc = pkg_array_match_patterns(&array, pkg_array_list_item, &fmt, argv); + misses = pkg_array_match_patterns(&array, pkg_array_list_item, &fmt, argv); } m_output(stdout, _("<standard output>")); @@ -290,7 +290,7 @@ listpackages(const char *const *argv) pkg_array_destroy(&array); modstatdb_shutdown(); - return rc; + return !!misses; } static int @@ -335,7 +335,7 @@ static int searchfiles(const char *const *argv) { const char *thisarg; - int failures = 0; + int misses = 0; struct varbuf path = VARBUF_INIT; static struct varbuf vb; @@ -378,7 +378,7 @@ searchfiles(const char *const *argv) } if (!found) { notice(_("no path found matching pattern %s"), thisarg); - failures++; + misses++; m_output(stderr, _("<standard error>")); } else { m_output(stdout, _("<standard output>")); @@ -388,13 +388,13 @@ searchfiles(const char *const *argv) varbuf_destroy(&path); - return failures; + return !!misses; } static int print_status(const char *const *argv) { - int failures = 0; + int misses = 0; modstatdb_open(msdbrw_readonly); @@ -416,7 +416,7 @@ print_status(const char *const *argv) !pkg_is_informative(pkg, &pkg->installed)) { notice(_("package '%s' is not installed and no information is available"), pkg_name(pkg, pnaw_nonambig)); - failures++; + misses++; } else { write_stanza(stdout, _("<standard output>"), pkg, &pkg->installed); } @@ -427,7 +427,7 @@ print_status(const char *const *argv) } m_output(stdout, _("<standard output>")); - if (failures) { + if (misses) { fputs(_("Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"), stderr); m_output(stderr, _("<standard error>")); @@ -435,13 +435,13 @@ print_status(const char *const *argv) modstatdb_shutdown(); - return failures; + return !!misses; } static int print_avail(const char *const *argv) { - int failures = 0; + int misses = 0; modstatdb_open(msdbrw_readonly | msdbrw_available_readonly); @@ -458,7 +458,7 @@ print_avail(const char *const *argv) if (!pkg_is_informative(pkg, &pkg->available)) { notice(_("package '%s' is not available"), pkgbin_name(pkg, &pkg->available, pnaw_nonambig)); - failures++; + misses++; } else { write_stanza(stdout, _("<standard output>"), pkg, &pkg->available); } @@ -469,12 +469,12 @@ print_avail(const char *const *argv) } m_output(stdout, _("<standard output>")); - if (failures) + if (misses) m_output(stderr, _("<standard error>")); modstatdb_shutdown(); - return failures; + return !!misses; } static int @@ -484,7 +484,7 @@ list_files(const char *const *argv) struct fsys_namenode_list *file; struct pkginfo *pkg; struct fsys_namenode *namenode; - int failures = 0; + int misses = 0; if (!*argv) badusage(_("--%s needs at least one package name argument"), cipaction->olong); @@ -498,7 +498,7 @@ list_files(const char *const *argv) case PKG_STAT_NOTINSTALLED: notice(_("package '%s' is not installed"), pkg_name(pkg, pnaw_nonambig)); - failures++; + misses++; break; default: ensure_packagefiles_available(pkg); @@ -534,7 +534,7 @@ list_files(const char *const *argv) } m_output(stdout, _("<standard output>")); - if (failures) { + if (misses) { fputs(_("Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"), stderr); m_output(stderr, _("<standard error>")); @@ -542,7 +542,7 @@ list_files(const char *const *argv) modstatdb_shutdown(); - return failures; + return !!misses; } static void @@ -566,14 +566,13 @@ showpackages(const char *const *argv) struct pkg_array array; struct pkg_format_node *fmt; bool fmt_needs_db_fsys; - int rc = 0; + int misses = 0; fmt = pkg_format_parse(opt_showformat, &err); if (!fmt) { notice(_("error in show format: %s"), err.str); dpkg_error_destroy(&err); - rc++; - return rc; + return 2; } fmt_needs_db_fsys = pkg_format_needs_db_fsys(fmt); @@ -602,7 +601,7 @@ showpackages(const char *const *argv) } else { if (fmt_needs_db_fsys) pkg_array_foreach(&array, pkg_array_load_db_fsys, NULL); - rc = pkg_array_match_patterns(&array, pkg_array_show_item, fmt, argv); + misses = pkg_array_match_patterns(&array, pkg_array_show_item, fmt, argv); } m_output(stdout, _("<standard output>")); @@ -612,7 +611,7 @@ showpackages(const char *const *argv) pkg_format_free(fmt); modstatdb_shutdown(); - return rc; + return !!misses; } static bool @@ -883,5 +882,5 @@ int main(int argc, const char *const *argv) { dpkg_program_done(); dpkg_locales_done(); - return !!ret; + return ret; } diff --git a/utils/Makefile.am b/utils/Makefile.am index 71873a5..2ce3bce 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -11,24 +11,35 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ # EOL -CLEANFILES = \ - org.dpkg.pkexec.update-alternatives.policy \ +sbin_PROGRAMS = +bin_PROGRAMS = +dist_bashcompletions_DATA = +polkitactions_DATA = +EXTRA_DIST = +CLEANFILES = + +if BUILD_UPDATE_ALTERNATIVES +bin_PROGRAMS += update-alternatives + +update_alternatives_CPPFLAGS = \ + -DALT_TMP_EXT=\".dpkg-tmp\" \ + -DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \ + -DINSTDIR_ENVVAR=\"DPKG_ROOT\" \ + $(AM_CPPFLAGS) \ # EOL -EXTRA_DIST = \ - README.alternatives \ - update-alternatives.polkit.in \ - $(test_scripts) \ +update_alternatives_SOURCES = \ + update-alternatives.c \ # EOL -pkexecdir = $(datadir)/polkit-1/actions -pkexec_DATA = +update_alternatives_LDADD = \ + ../lib/compat/libcompat.la \ + $(LIBINTL) \ + # EOL -bin_PROGRAMS = +dist_bashcompletions_DATA += -if BUILD_UPDATE_ALTERNATIVES -pkexec_DATA += org.dpkg.pkexec.update-alternatives.policy -bin_PROGRAMS += update-alternatives +polkitactions_DATA += org.dpkg.pkexec.update-alternatives.policy endif do_polkit_subst = $(SED) \ @@ -41,24 +52,15 @@ org.dpkg.pkexec.update-alternatives.policy: update-alternatives.polkit.in Makefi $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o - \ | $(do_polkit_subst) >$@ -update_alternatives_SOURCES = \ - update-alternatives.c \ - # EOL - -update_alternatives_CPPFLAGS = \ - -DALT_TMP_EXT=\".dpkg-tmp\" \ - -DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \ - -DINSTDIR_ENVVAR=\"DPKG_ROOT\" \ - $(AM_CPPFLAGS) \ +EXTRA_DIST += \ + README.alternatives \ + update-alternatives.polkit.in \ # EOL -update_alternatives_LDADD = \ - ../lib/compat/libcompat.la \ - $(LIBINTL) \ +CLEANFILES += \ + org.dpkg.pkexec.update-alternatives.policy \ # EOL -sbin_PROGRAMS = - if BUILD_START_STOP_DAEMON sbin_PROGRAMS += start-stop-daemon @@ -72,6 +74,8 @@ start_stop_daemon_LDADD = \ $(PS_LIBS) \ $(KVM_LIBS) \ # EOL + +dist_bashcompletions_DATA += endif install-data-local: @@ -96,6 +100,10 @@ test_scripts = \ t/update_alternatives.t \ # EOL +EXTRA_DIST += \ + $(test_scripts) \ + # EOL + include $(top_srcdir)/build-aux/tap.am check-local: tap-check diff --git a/utils/Makefile.in b/utils/Makefile.in index f58aeb0..93f8aeb 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -100,11 +100,13 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = $(am__EXEEXT_1) -@BUILD_UPDATE_ALTERNATIVES_TRUE@am__append_1 = org.dpkg.pkexec.update-alternatives.policy -@BUILD_UPDATE_ALTERNATIVES_TRUE@am__append_2 = update-alternatives sbin_PROGRAMS = $(am__EXEEXT_2) -@BUILD_START_STOP_DAEMON_TRUE@am__append_3 = start-stop-daemon +bin_PROGRAMS = $(am__EXEEXT_1) +@BUILD_UPDATE_ALTERNATIVES_TRUE@am__append_1 = update-alternatives +@BUILD_UPDATE_ALTERNATIVES_TRUE@am__append_2 = +@BUILD_UPDATE_ALTERNATIVES_TRUE@am__append_3 = org.dpkg.pkexec.update-alternatives.policy +@BUILD_START_STOP_DAEMON_TRUE@am__append_4 = start-stop-daemon +@BUILD_START_STOP_DAEMON_TRUE@am__append_5 = subdir = utils ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \ @@ -126,7 +128,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_bashcompletions_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -134,7 +137,8 @@ CONFIG_CLEAN_VPATH_FILES = @BUILD_UPDATE_ALTERNATIVES_TRUE@am__EXEEXT_1 = \ @BUILD_UPDATE_ALTERNATIVES_TRUE@ update-alternatives$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \ - "$(DESTDIR)$(pkexecdir)" + "$(DESTDIR)$(bashcompletionsdir)" \ + "$(DESTDIR)$(polkitactionsdir)" @BUILD_START_STOP_DAEMON_TRUE@am__EXEEXT_2 = \ @BUILD_START_STOP_DAEMON_TRUE@ start-stop-daemon$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) @@ -152,11 +156,12 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -am_update_alternatives_OBJECTS = \ - update_alternatives-update-alternatives.$(OBJEXT) +am__update_alternatives_SOURCES_DIST = update-alternatives.c +@BUILD_UPDATE_ALTERNATIVES_TRUE@am_update_alternatives_OBJECTS = update_alternatives-update-alternatives.$(OBJEXT) update_alternatives_OBJECTS = $(am_update_alternatives_OBJECTS) -update_alternatives_DEPENDENCIES = ../lib/compat/libcompat.la \ - $(am__DEPENDENCIES_1) +@BUILD_UPDATE_ALTERNATIVES_TRUE@update_alternatives_DEPENDENCIES = \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ ../lib/compat/libcompat.la \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -195,7 +200,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(start_stop_daemon_SOURCES) $(update_alternatives_SOURCES) DIST_SOURCES = $(am__start_stop_daemon_SOURCES_DIST) \ - $(update_alternatives_SOURCES) + $(am__update_alternatives_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -228,7 +233,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -DATA = $(pkexec_DATA) +DATA = $(dist_bashcompletions_DATA) $(polkitactions_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -392,6 +397,7 @@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aclocaldir = @aclocaldir@ admindir = @admindir@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -399,6 +405,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ backupsdir = @backupsdir@ +bashcompletionsdir = @bashcompletionsdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -410,6 +417,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ devlibdir = @devlibdir@ docdir = @docdir@ +docspecdir = @docspecdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -427,10 +435,14 @@ localedir = @localedir@ localstatedir = @localstatedir@ logdir = @logdir@ mandir = @mandir@ +methodsdir = @methodsdir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +perllibdir = @perllibdir@ pkgconfdir = @pkgconfdir@ +pkgconfigdir = @pkgconfigdir@ +polkitactionsdir = @polkitactionsdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -455,38 +467,31 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ # EOL -CLEANFILES = \ - org.dpkg.pkexec.update-alternatives.policy \ - # EOL - -EXTRA_DIST = \ - README.alternatives \ - update-alternatives.polkit.in \ - $(test_scripts) \ - # EOL +dist_bashcompletions_DATA = $(am__append_2) $(am__append_5) +polkitactions_DATA = $(am__append_3) +EXTRA_DIST = README.alternatives update-alternatives.polkit.in \ + $(test_scripts) # EOL +CLEANFILES = org.dpkg.pkexec.update-alternatives.policy # EOL +@BUILD_UPDATE_ALTERNATIVES_TRUE@update_alternatives_CPPFLAGS = \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ -DALT_TMP_EXT=\".dpkg-tmp\" \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ -DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ -DINSTDIR_ENVVAR=\"DPKG_ROOT\" \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ $(AM_CPPFLAGS) \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ # EOL + +@BUILD_UPDATE_ALTERNATIVES_TRUE@update_alternatives_SOURCES = \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ update-alternatives.c \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ # EOL + +@BUILD_UPDATE_ALTERNATIVES_TRUE@update_alternatives_LDADD = \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ ../lib/compat/libcompat.la \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ $(LIBINTL) \ +@BUILD_UPDATE_ALTERNATIVES_TRUE@ # EOL -pkexecdir = $(datadir)/polkit-1/actions -pkexec_DATA = $(am__append_1) do_polkit_subst = $(SED) \ -e 's,[@]bindir[@],$(bindir),g' \ # EOL -update_alternatives_SOURCES = \ - update-alternatives.c \ - # EOL - -update_alternatives_CPPFLAGS = \ - -DALT_TMP_EXT=\".dpkg-tmp\" \ - -DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \ - -DINSTDIR_ENVVAR=\"DPKG_ROOT\" \ - $(AM_CPPFLAGS) \ - # EOL - -update_alternatives_LDADD = \ - ../lib/compat/libcompat.la \ - $(LIBINTL) \ - # EOL - @BUILD_START_STOP_DAEMON_TRUE@start_stop_daemon_SOURCES = \ @BUILD_START_STOP_DAEMON_TRUE@ start-stop-daemon.c \ @BUILD_START_STOP_DAEMON_TRUE@ # EOL @@ -709,27 +714,48 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-pkexecDATA: $(pkexec_DATA) +install-dist_bashcompletionsDATA: $(dist_bashcompletions_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bashcompletionsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bashcompletionsdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bashcompletionsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(bashcompletionsdir)" || exit $$?; \ + done + +uninstall-dist_bashcompletionsDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(bashcompletionsdir)'; $(am__uninstall_files_from_dir) +install-polkitactionsDATA: $(polkitactions_DATA) @$(NORMAL_INSTALL) - @list='$(pkexec_DATA)'; test -n "$(pkexecdir)" || list=; \ + @list='$(polkitactions_DATA)'; test -n "$(polkitactionsdir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkexecdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkexecdir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(polkitactionsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(polkitactionsdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkexecdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkexecdir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(polkitactionsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(polkitactionsdir)" || exit $$?; \ done -uninstall-pkexecDATA: +uninstall-polkitactionsDATA: @$(NORMAL_UNINSTALL) - @list='$(pkexec_DATA)'; test -n "$(pkexecdir)" || list=; \ + @list='$(polkitactions_DATA)'; test -n "$(polkitactionsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkexecdir)'; $(am__uninstall_files_from_dir) + dir='$(DESTDIR)$(polkitactionsdir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -820,7 +846,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkexecdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bashcompletionsdir)" "$(DESTDIR)$(polkitactionsdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -878,14 +904,14 @@ info: info-am info-am: -install-data-am: install-data-local +install-data-am: install-data-local install-dist_bashcompletionsDATA \ + install-polkitactionsDATA install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-binPROGRAMS install-pkexecDATA \ - install-sbinPROGRAMS +install-exec-am: install-binPROGRAMS install-sbinPROGRAMS install-html: install-html-am @@ -926,8 +952,9 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-local \ - uninstall-pkexecDATA uninstall-sbinPROGRAMS +uninstall-am: uninstall-binPROGRAMS uninstall-dist_bashcompletionsDATA \ + uninstall-local uninstall-polkitactionsDATA \ + uninstall-sbinPROGRAMS .MAKE: check-am install-am install-strip @@ -937,16 +964,18 @@ uninstall-am: uninstall-binPROGRAMS uninstall-local \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkexecDATA install-ps \ + install-data install-data-am install-data-local \ + install-dist_bashcompletionsDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-polkitactionsDATA install-ps \ install-ps-am install-sbinPROGRAMS install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-local uninstall-pkexecDATA uninstall-sbinPROGRAMS + uninstall-dist_bashcompletionsDATA uninstall-local \ + uninstall-polkitactionsDATA uninstall-sbinPROGRAMS .PRECIOUS: Makefile |