From cabd780cae125bed23f70d57db05ae0f32d8df4c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 20:40:37 +0200 Subject: Merging upstream version 1.22.5. Signed-off-by: Daniel Baumann --- .dist-version | 2 +- ChangeLog | 694 ++++++++++++++++++++++++++++++++ Makefile.am | 13 +- Makefile.in | 90 ++--- README | 2 +- configure | 217 ++++++++-- configure.ac | 23 +- dselect/Makefile.am | 13 +- dselect/Makefile.in | 105 ++++- dselect/methods/Makefile.am | 11 +- dselect/methods/Makefile.in | 19 +- dselect/methods/ftp/install.pl | 30 +- 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 +- lib/Makefile.in | 7 + lib/compat/Makefile.in | 7 + lib/dpkg/Makefile.am | 34 +- lib/dpkg/Makefile.in | 55 +-- lib/dpkg/file.c | 19 + lib/dpkg/file.h | 3 + lib/dpkg/libdpkg.map | 1 + lib/dpkg/parse.c | 7 +- lib/dpkg/path-remove.c | 8 +- lib/dpkg/tarfn.c | 9 +- lib/dpkg/version.c | 4 +- m4/dpkg-build.m4 | 1 - m4/dpkg-progs.m4 | 2 + man/Makefile.am | 9 +- man/Makefile.in | 45 ++- man/de/dpkg-buildapi.pod | 14 +- man/de/dpkg-buildflags.pod | 31 +- man/de/dpkg-buildpackage.pod | 18 +- man/de/dpkg-parsechangelog.pod | 2 +- man/de/dpkg-shlibdeps.pod | 2 +- man/dpkg-buildapi.pod | 16 +- man/dpkg-buildflags.pod | 72 +++- man/dpkg-buildpackage.pod | 22 + man/dpkg-parsechangelog.pod | 3 +- man/dpkg-shlibdeps.pod | 4 +- man/fr/dpkg-buildpackage.pod | 631 ----------------------------- man/fr/dpkg-parsechangelog.pod | 2 +- man/fr/dpkg-shlibdeps.pod | 2 +- man/nl/dpkg-buildapi.pod | 14 +- man/nl/dpkg-buildflags.pod | 31 +- man/nl/dpkg-buildpackage.pod | 18 +- man/nl/dpkg-parsechangelog.pod | 2 +- man/nl/dpkg-shlibdeps.pod | 2 +- man/po/de.po | 285 ++++++++++--- 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 +++++++-- man/pt/dpkg-buildapi.pod | 14 +- man/pt/dpkg-buildflags.pod | 646 ----------------------------- man/pt/dpkg-buildpackage.pod | 18 +- man/pt/dpkg-parsechangelog.pod | 2 +- man/pt/dpkg-shlibdeps.pod | 2 +- man/sv/dpkg-buildapi.pod | 14 +- man/sv/dpkg-buildflags.pod | 31 +- man/sv/dpkg-buildpackage.pod | 18 +- man/sv/dpkg-parsechangelog.pod | 2 +- man/sv/dpkg-shlibdeps.pod | 2 +- 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/Dpkg/BuildOptions.pm | 10 +- scripts/Dpkg/Changelog/Entry.pm | 16 +- scripts/Dpkg/Deps/Simple.pm | 8 +- scripts/Dpkg/OpenPGP/Backend/GnuPG.pm | 4 +- scripts/Dpkg/OpenPGP/Backend/Sequoia.pm | 4 +- scripts/Dpkg/Shlibs/Symbol.pm | 28 +- scripts/Dpkg/Source/Package/V1.pm | 22 +- scripts/Dpkg/Vendor/Debian.pm | 49 ++- scripts/Dpkg/Vendor/Default.pm | 13 + scripts/Dpkg/Vendor/Ubuntu.pm | 66 ++- scripts/Makefile.am | 133 +++--- scripts/Makefile.in | 141 ++++--- scripts/Test/Dpkg.pm | 1 + scripts/dpkg-buildapi.pl | 10 +- scripts/dpkg-mergechangelogs.pl | 15 +- scripts/dpkg-shlibdeps.pl | 14 +- scripts/dpkg-source.pl | 8 +- scripts/mk/Makefile.in | 7 + scripts/po/ca.gmo | Bin 122008 -> 121651 bytes scripts/po/ca.po | 36 +- scripts/po/de.gmo | Bin 121176 -> 121226 bytes scripts/po/de.po | 37 +- 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.gmo | Bin 115613 -> 115257 bytes scripts/po/sv.po | 36 +- scripts/t/Dpkg_BuildFlags.t | 117 +++++- scripts/t/Dpkg_OpenPGP.t | 1 + src/Makefile.am | 11 +- src/Makefile.in | 81 ++-- src/at/deb-format.at | 7 +- src/at/package.m4 | 4 +- src/at/testsuite | 144 +++---- src/deb/build.c | 7 +- src/main/archives.c | 57 ++- src/main/configure.c | 22 +- src/main/script.c | 12 +- src/query/main.c | 53 ++- utils/Makefile.am | 60 +-- utils/Makefile.in | 147 ++++--- 188 files changed, 5110 insertions(+), 2776 deletions(-) delete mode 100644 man/fr/dpkg-buildpackage.pod delete mode 100644 man/pt/dpkg-buildflags.pod 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 diff --git a/ChangeLog b/ChangeLog index 28b9158..2a87c91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,697 @@ +commit 1c92a4a8bfbeea30ceb0109b096c4ec845e3c6ce +Author: Guillem Jover +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 +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 +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 + + 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 +Date: Tue Feb 27 04:19:53 2024 +0100 + + Dpkg::Vendor::Debian: Enable time64 feature by default except on -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 + 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 +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 +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 + + scripts/Dpkg/Vendor/Ubuntu.pm | 47 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) + +commit 732bd89cd234260fddb99b11691ea785945ce356 +Author: Guillem Jover +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +Date: Wed Jan 31 03:39:47 2024 +0100 + + build: Move directory definitions to configure + + This makes it possible to set them using --with-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 +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 +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 +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 +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 +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 +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 +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 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 \ diff --git a/README b/README index 2fec9e4..a07c60c 100644 --- a/README +++ b/README @@ -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) diff --git a/configure b/configure index a1f02d1..271deeb 100755 --- a/configure +++ b/configure @@ -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 . # @@ -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ć \n" "Language-Team: Bosnian \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 \n" "Language-Team: Catalan \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 \n" "Language-Team: Czech \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 \n" "Language-Team: Danish \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 \n" "Language-Team: German \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 \n" "Language-Team: LANGUAGE \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 \n" "Language-Team: Greek \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 \n" "Language-Team: Spanish \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 \n" "Language-Team: Estonian \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 \n" "Language-Team: Basque \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 \n" "Language-Team: French \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 \n" "Language-Team: Galician \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 \n" "Language-Team: Hungarian \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 \n" "Language-Team: Indonesian \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 \n" "Language-Team: Italian \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 \n" "Language-Team: Japanese \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 \n" "Language-Team: Korean \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 \n" "Language-Team: Norwegian Bokmål \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 \n" "Language-Team: Debian Dutch l10n Team \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 \n" "Language-Team: Norwegian Nynorsk \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 \n" "Language-Team: Polish \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 \n" "Language-Team: Portuguese \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 \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: Romanian \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 \n" "Language-Team: Russian \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 \n" "Language-Team: Slovak \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 \n" "Language-Team: Swedish \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 \n" "Language-Team: Tagalog \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 \n" "Language-Team: Vietnamese \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) \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 \n" "Language-Team: Chinese (traditional) \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 @@ -36,6 +36,25 @@ #include #include +/** + * 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. * 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 - -Gibt die Haupt-B-Datei an, aus der Informationen gelesen werden sollen. Standardmäßig F. - =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 + +Gibt die Haupt-B-Datei an, aus der Informationen gelesen werden sollen. Standardmäßig F. + +=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 -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 ausgegeben (seit Dpkg 1.21.14). Die einzigen unter Debian und abgeleiteten Distributionen derzeit erkannten Bereiche sind B, B, B, B und B. Lesen Sie den Abschnitt B 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 ausgegeben (seit Dpkg 1.21.14). Lesen Sie den Abschnitt B 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 und B mit den ‚B<+>’- und ‚B<->’-Schaltern aktiviert und deaktiviert werden. Soll beispielsweise für B die „pie“-Funktionalität aktiviert und die „fortify“-Funktionalität deaktiviert werden, können Sie Folgendes in B 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 und B durch die Wandler »B<+>« und »B<->« aktiviert oder deaktiviert werden. Gemäß der allgemeine Syntax dieser Variablen (in L 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-Funktionalität »pie« zu aktivieren und die Funktionalität »fortify« zu deaktivieren, können Sie folgendes in B verwenden: + + export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify Die spezielle Funktionalität B (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 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, sowie bestimmten Funktionalitäten, wodurch Zusammensetzungen ermöglicht werden sollten. Um daher »lfs« im Bereich B zu aktivieren und nur »pie« und »fortify« in dem Bereich B, 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 -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 hinzugefügt wird. Diese Einstellung aktiviert automatisch die Funktionalität B, 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. This setting automatically enables the B feature from the B feature area, and the B feature from the B 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. =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 -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 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 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 berücksichtigte Optionen könnnten in Distributions-spezifischen Richtlinien definiert sein. @@ -540,6 +540,22 @@ Das F in der Paketierung sollte sicherstellen, dass die Fehlersuch B wird den Schalter B<--no-print-directory> von L an die Umgebungsvariable B anhängen. Das F in der Paketierung sollte die Ausführlichkeit reduzieren, aber nicht komplett still sein. +=item BI + +=item BI + +=item BI + +=item BI + +=item BI + +=item BI + +=item BI + +Dies sind die Funktionalitätsbereiche, die die Bauschalter-Funktionalitäten steuern. Lesen Sie L zu weiteren Details. + =back =item B 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 -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-Standardformat angenommen. Siehe auch B. +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 standard format. See also L. =item B<-L> I 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 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-Dateien sind korrekt). -Als Sicherheitsmaßnahme kann eine Symbols-Datei ein Meta-Informationsfeld B enthalten. B entnimmt dann die minimale Version, die von dem korrespondierenden Paket im Feld B 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 or B meta-information field and B will extract the minimal version required by the corresponding package in the B 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 - -Specifies the main source control file to read information from. -The default is F. - =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 + +Specifies the main source control file to read information from. +The default is F. + +=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 field is printed (since dpkg 1.21.14). -The only currently recognized -areas on Debian and derivatives are B, B, B, -B and B, see the B -section for more details. +See the L 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 and B environment variable's area value with the ‘B<+>’ and ‘B<->’ modifier. +Following the general syntax of these variables +(described in L), +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 “pie” feature and disable the “fortify” feature you can do this in B: - export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify + export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,-fortify The special feature B (valid in any area) can be used to enable or disable all area features at the same time. Thus disabling everything in the B 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 special feature, +as to specific features, +which should allow for composition. +Thus to enable “lfs” in the B area, and only “pie” and “fortify” +in the B 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 feature area. =item B -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. -This setting automatically enables the B 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. +This setting automatically enables the B feature from the B +feature area, +and the B feature from the B 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. =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 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 might be defined by distribution @@ -791,6 +796,23 @@ flag to the B environment variable. The F in the packaging should reduce verbosity, while not being completely quiet. +=item BI + +=item BI + +=item BI + +=item BI + +=item BI + +=item BI + +=item BI + +These are feature areas that control build flag features. +See L for further details. + =back =item B 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 standard format. -See also -B. +See also L. =item B<-L> I 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 files are accurate). As a safe-guard measure, a symbols file can provide a -B meta-information field and -B +B or B meta-information +field and B will extract the minimal version required by the corresponding package in the B 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 [I