dpkg: updaed to 1.21.9

dpkg (1.21.9) unstable; urgency=medium

  [ Guillem Jover ]
  * dpkg-deb: Add support for --threads-max and DPKG_DEB_THREADS_MAX.
    Prompted by vv221 on IRC.
  * Perl modules:
    - Dpkg::Source::Package::V2: Always fix the permissions for upstream
      tarballs.
    - Dpkg::BuildFlags: Document optimize feature area.
  * Documentation:
    - man: Clarify that statoverrides do not need to be known to dpkg.

    - man: Expand Protected and Essential field use cases.
    - doc: Rename frontend.txt to frontend-api.txt.
    - doc: Move specifications under doc/spec.
    - man: Add references to rootless-builds.txt spec.
  * Code internals:
    - libdpkg: Refactor command actions for compression.
  * Build system:
    - Split the test-runner into its own script.

  [ Helge Kreutzmann ]
  * Localization:
    - Update German man pages translation.
    - Update German scripts translation.

 -- Guillem Jover <guillem@debian.org>  Fri, 01 Jul 2022 11:25:58 +0200

dpkg (1.21.8) unstable; urgency=medium

  [ Guillem Jover ]
  * dpkg-statoverride: Add support for --force-not-root.
    Based on a patch by John Spencer <maillist-dpkg@barfooze.de>.
  * dpkg: Fix «De-configuring» message to allow configuration to use new
    version.
  * Perl modules:
    - Dpkg::Source::Archive: Prevent directory traversal for in-place extracts.
      Reported by Max Justicz <max@justi.cz>. Fixes CVE-2022-1664.
    - Dpkg::Substvars: Add support for optional substvars assigned with ?=.
  * Documentation:
    - man: Reference deb-substvar(5) from dpkg-source(1) and dpkg-shlibdeps(1).
    - man: Structure and clarify deb-substvars(5).
      Prompted by Niels Thykier <niels@thykier.net>.
  * Build system:
    - Unhook dist-cpan from make dist target.
  * Packaging:
    - Silence warning about merged-usr-via-aliased-dirs on Ubuntu.
    - Remove useless [] around tr sets.
  * Localization:
    - Update Dutch translations.
      Thanks to Frans Spiesschaert <Frans.Spiesschaert@yucom.be>.
    - Update Portuguese man pages translations.
      Thanks to Américo Monteiro <a_monteiro@gmx.com>.

  [ Helge Kreutzmann ]
  * Localization:
    - Update German man pages translation.

 -- Guillem Jover <guillem@debian.org>  Wed, 25 May 2022 10:39:29 +0200

dpkg (1.21.7) unstable; urgency=medium

  - The “Social Contract §3: We will not hide problems”
    and “Persuasion through bullying and abuse” release. -

  [ Guillem Jover ]
  * dpkg-fsys-usrunmess: Handle /lib/modules itself also being untracked.

  * Documentation:
    - man: Fix typo. Thanks to Peter Krefting <peter@softwolves.pp.se>.
  * Packaging:
    - Silence warning about merged-usr-via-aliased-dirs on Debian.
  * Localization:
    - Fix gettext parameter reordering syntax for German translation.

    - Update Swedish translations.
      Thanks to Peter Krefting <peter@softwolves.pp.se>.

  [ Helge Kreutzmann ]
  * Localization:
    - Update German man pages translation.

 -- Guillem Jover <guillem@debian.org>  Fri, 01 Apr 2022 02:27:33 +0200

dpkg (1.21.6) unstable; urgency=medium

  - This also clears a bullying NMU. -

  [ Guillem Jover ]
  * Documentation:
    - man: Document untracked kernel module files handling in
      dpkg-fsys-usrunmess(8).

 -- Guillem Jover <guillem@debian.org>  Tue, 29 Mar 2022 11:56:58 +0200

dpkg (1.21.5) unstable; urgency=medium

  [ Guillem Jover ]
  * dpkg-fsys-usrunmess: Explicitly set user/group and mode for created dirs.

  * dpkg-fsys-usrunmess: Set a known umask before starting.
  * dpkg-fsys-usrunmess: Special case untracked kernel module files.

  * Perl modules:
    - Dpkg::Control::Types: Use bit shifts instead of literals in enum.
    - Dpkg::Control::Fields: Fix field_register() to return nothing.
    - Dpkg::Control::Fields: Refactor manifest types into new
      ALL_FILE_MANIFEST.
    - Dpkg::Control::Fields: Fix POD to end sentences with a dot.
    - Dpkg::Control::Fields: Fix POD to add missing spaces and blank lines.
    - Dpkg::Control::Fields: Document and clarify return types and values in
      POD.
  * Code internals:
    - libdpkg: Rename f_revision() to f_obs_revision().
    - libdpkg: Warn when parsing obsolete Recommended/Optional/Class fields.
      Prompted by David Kalnischkies <donkult@debian.org>.
    - libdpkg: Add missing dependency type to obsolete dependency fields.
    - libdpkg: Update code comment for obsolete fields.
  * Test suite:
    - Add test cases for obsolete fields.

  [ Helge Kreutzmann ]
  * Localization:
    - Update German man pages translation.

 -- Guillem Jover <guillem@debian.org>  Tue, 29 Mar 2022 02:52:14 +0200

dpkg (1.21.4) unstable; urgency=medium

  [ Guillem Jover ]
  * dpkg-shlibdeps: Require non-empty name and version in SONAME formats.
  * Perl modules:
    - Dpkg::Control::Fields: Remove duplicate *Built-Using from field order
      lists. Reported by David Kalnischkies <donkult@debian.org>.
  * Documentation:
    - man: Clarify uses cases for Static-Built-Using.
      Prompted by Shengjing Zhu <zhsj@debian.org>.
  * Test suite:
    - Use actual octal numbers for chmod() calls.
    - Do not use non-POSIX shell syntax for arithmetic expressions.
      Based on a patch by Sören Tempel <soeren@soeren-tempel.net>.

  [ Helge Kreutzmann ]
  * Localization:
    - Update German man pages translation.

 -- Guillem Jover <guillem@debian.org>  Sat, 26 Mar 2022 13:38:44 +0100

dpkg (1.21.3) unstable; urgency=medium

  [ Helge Kreutzmann ]
  * Localization:
    - Update German man pages translation.
    - Update German scripts translation.

  [ Guillem Jover ]
  * dpkg-db-backup: Check for required commands before starting.
  * dpkg: Allow absolute pathnames for configurable external run-time tools.
    Based on a patch by Adrian Ho <the.gromgit@gmail.com>.
  * dpkg-fsys-usrunmess: Add options and prompt about regression prevention
    package. Prompted by Paul Wise <pabs@debian.org>.
  * dpkg-deb: Move duped control member check inside the detection conditional.
  * dpkg-deb: Fix movecontrol() to take a directory argument.
  * dselect: Remove non-multi-cd code from multi_cd method.
  * dselect: Rename multicd method to media.
  * dselect: Remove left overs for mount support from disk method.
  * dselect: Remove bogus quote escaping from method setup scripts.
  * dselect: Rename disk method to file.
  * scripts: Use backport-version-regex vendor hook instead of hardcoding the
    marker.
  * Perl modules:
    - Dpkg::Source::Package::V3::Git: Name bundle remote as bundle.
    - Dpkg::Source::Package::V3::Git: Set origin remote to Vcs-Git if present.
    - Dpkg::Path: Resolve /dev/null before comparing canonicalized pathnames.
    - Dpkg::Compression: Conditionally use the gzip --rsyncable option.
    - Dpkg::Compression: Use gzip -n instead of --no-name.
    - Dpkg::Vendor: Add a new backport-version-regex hook.
    - Dpkg::Control::Fields: Add Static-Built-Using field support.
  * Documentation:
    - man: Clarify Built-Using field purpose and format.
  * Code internals:
    - libdpkg: Refactor file_is_exec().
    - libdpkg: Check that executables are regular files.
    - dpkg-fsys-usrunmess: Refactor prompting into a new function.
    - dpkg: Rename r variable to remainder.
  * Packaging:
    - Clarify the merged-usr-via-aliased-dirs warning.
      Prompted by Paul Wise <pabs@debian.org>.
    - Sync original bug-script merged-usr warning with postinst updates.
  * Test suite:
    - Check deb format with duplicate debian-binary and control.tar members.
    - Add further deb-split format checks.
    - Place deb-old and deb checks on their own test groups.
    - Check all currently supported deb-old formats.
  * Localization:
    - Update Portuguese man pages translation.
      Thanks to Américo Monteiro <a_monteiro@gmx.com>.

 -- Guillem Jover <guillem@debian.org>  Thu, 24 Mar 2022 21:00:24 +0100

dpkg (1.21.2) unstable; urgency=medium

  [ Guillem Jover ]
  * dpkg: Fix memory leak in remove-on-upgrade handling.
  * dpkg-deb: Fix unexpected end of file conditions on .deb extract.
  * Use anchor links for the dpkg FAQ URLs.
  * update-alternatives: Do not skip --config with a single entry.
    Reported by David Kalnischkies <donkult@debian.org>.
  * update-alternatives: Refactor alternative_install().
  * update-alternatives: Use intermediate variables when parsing actions.
  * update-alternatives: Clarify option parse errors by printing the wrong
    values.
  * update-alternatives: Clarify bad usage message by enclosing in angles and
    quoting arguments.
  * dpkg-buildpackage: Switch terse make from -s to --no-print-directory.

  * scripts: Unify deprecated command-line option warnings.
  * dpkg-source: Fix alternate changelog file usage with 2.0 and 3.0 formats.
    Reported by Umut <ue16@gmx.de> (on IRC).
  * update-alternatives: Use the target timestamp when the symlink does not
    exist.
  * dselect: Handle window resizes in help and menu screens.
  * dselect: Do not beep on key press errors in method and package list
    windows.
  * dselect: Add support for --instdir.
  * Perl modules:
    - Dpkg::Control::FieldsCore: Sort control type entries in %FIELD_ORDER.
    - Dpkg::Control::FieldsCore: Refactor Vcs fields into a common variable.
    - Dpkg::Control::FieldsCore: Refactor testsuite fields into a common
      variable.
    - Dpkg::Control::FieldsCore: Accept Architecture as a debian/tests/control
      field.
    - Dpkg::Control::FieldsCore: Add missing allowed fields for (In)Release
      files.
    - Dpkg::Control::FieldsCore: Add field order for all control types.
    - Dpkg::Index: Switch key function for control tests to be a stanza index.
      Reported by Paul Gevers <elbrus@debian.org>.
    - Dpkg::Source::Package: Only generate the patch header if needed.
      Prompted by Umut <ue16@gmx.de> (on IRC).
    - Dpkg::Source::Package: Use File::Spec instead of ad-hoc concatenation.
  * Documentation:
    - man: Mention on what actions triggers get processed in dpkg(1).

    - man: Clarify that dpkg-divert --list pattern is optional.
      Thanks to наб <nabijaczleweli@nabijaczleweli.xyz>.
    - man: Use «main» git branch in examples.
    - man: Markup each individual element independently.
    - man: Refer to the relevant maintscript actions explicitly.
    - man: Add a missing preposition to deb-preinst(5).
    - man: Do not hardcode DPKG_ADMINDIR in update-alternatives.
    - man: Document that update-alternatives honors DPKG_ROOT.
    - man: Clarify --admindir and --instdir default values.
      Reported by Johannes Schauer Marin Rodrigues <josch@debian.org>.
  * Code internals:
    - libdpkg: Check that cip is not NULL before dereferencing it.
    - libdpkg: Add missing symbols to the version map.
    - libdpkg: Use the amount of available memory instead phys_mem/2.
      Thanks to Sebastian Andrzej Siewior <sebastian@breakpoint.cc>.
    - libdpkg: Refactor liblzma memlimit and cputhreads getters.
    - libdpkg: Dynamically allocate the buffers for de/compression I/O.
    - libdpkg: Increase I/O memory buffers from 4 to 32 KiB.
    - libdpkg: Pass struct compress_params as the first argument.
    - libdpkg: Pass struct compress_params to decompressors.
    - libdpkg: Refactor pkg_format_print() out from pkg_format_show().
    - libdpkg: Do not restrict source:* virtual fields to installed packages.

    - libdpkg: Do not allow argv with no arguments.
    - update-alternatives: Refactor alternative_has_broken_symlink().
    - update-alternatives: Move symlink removal inside fsys_symlink().
    - update-alternatives: Move filename generation outside alternative setup.
    - dselect: Rework windows resize to be signal safe.
    - scripts: Expand long word list into one entry per line.
    - scripts/mk: Remove unneeded conditionals.
      Thanks to Nicolas Boulenguez <nicolas@debian.org>.
    - scripts/mk: Indent code in Makefile fragments.
      Thanks to Nicolas Boulenguez <nicolas.boulenguez@free.fr>.
  * Build system:
    - Terminate lists in variables with «# EOL».
    - Move build helper tools into build-aux/.
    - Reorganize dpkg programs source code under src/.
    - Move autotest suite under src/.
    - Move C test suite machinery into lib/dpkg/.
    - Fix relocated autotest test suite runner.
    - Fix gitignore for build-aux/ directory.
    - Namespace Config variable usage.
      Reported by Павловец Сергей Николаевич
      <s.pavlovets@ivcmf.by>.
    - Add gitlab CI test for shared library building.
    - Link all programs against libcompat.
      Prompted by Jörg Sonnenberger <joerg@NetBSD.org>.
    - Remove unused TESTDATA variable from autotest suite.
    - Rework TAP check hooking into the autotools machinery.
    - Move EXTRA_DIST close to the files it is acting on.
    - Refactor autotest dependencies into a new variable.
    - Refactor autotest machinery into an automake include file.
    - Fold autotest test suite machinery into src/ from src/at/.
    - Rename do_path_subst to do_make_subst.
    - Factor out installation variable substitution into a new subst.am file.
    - Move shell scripts into src/.
    - Make AS_TR_* calls more clear.
    - Support compression library names with dashes.
    - Add zlib-ng support.
    - Rename HAVE_LZMA_MT to HAVE_LZMA_MT_ENCODER.
    - Move zsh completion under a subdirectory.
    - Switch sed pseudo-in-place replace invocations with copy then move.
    - Add comment about «sed -i» not being portable.
      Prompted by Nicolas Boulenguez <nicolas@debian.org>.
    - Mark libcompat and libdpkg as internal components in changelog.
    - Support specifying previous and next tags to gen-changelog.
    - Use non-capturing groups in regex in gen-changelog.
    - Do not hardcode «main» section for title check in gen-changelog.
    - Use sort flag instead of hardcoding the section in gen-changelog.
    - Do not put localization entries on their own changelog group.
  * Packaging:
    - Ignore directories for the alternatives state fixup.
    - Update bug-script to clarify usrmerge systems are unsupported.
    - Install aclocal m4 files into libdpkg-dev.
    - Install optional localized man pages with dh_installman.
    - Add a new not-installed file.
    - Switch to use the dh sequencer.
    - Make TESTSUITEFLAGS extensible.
    - Pass -jN to autotools autotest test suite via TESTSUITEFLAGS.
    - Update lintian overrides.
    - Use dpkg-error.sh in postinst.
    - Warn in postinst about merged-/usr-via-aliased-dirs breakage.
  * Test suite:
    - Move AT_TESTED to testsuite.at.
    - Run the tools with --version.
    - Rename DPKG_GEN_FILE to DPKG_GEN_CTRL_FILE.
    - Refactor control file template generation.
    - Rewrite dpkg-realpath test from TAP to autotest.
    - Rewrite dpkg-divert test from TAP to autotest.
    - Remove now unused TAP tests support from src/.
    - Print field type name instead of id in test case description.
    - Add new pkg-format unit tests.
    - Fix test_command_exec program invocation.
      Thanks to Sören Tempel <soeren+git@soeren-tempel.net>.
    - Use a temporary file instead of unportable «sed -i».
      Prompted by Nicolas Boulenguez <nicolas@debian.org>.
    - Add test case for SOURCE_DATE_EPOCH.
      Thanks to Nicolas Boulenguez <nicolas@debian.org>.
    - Use «each» instead of «keys» and value fetching.
      Thanks to Nicolas Boulenguez <nicolas@debian.org>.
  * Localization:
    - Remove previous msgid for non-fuzzy translations.
    - Update Catalan translations.
    - Update Dutch translation.
      Thanks to Frans Spiesschaert <Frans.Spiesschaert@yucom.be>.
    - Update Swedish translations.
      Thanks to Peter Krefting <peter@softwolves.pp.se>.

  [ Sven Joachim ]
  * Localization:
    - Update German dselect translation.
    - Update German programs translation.

  [ Helge Kreutzmann ]
  * Localization:
    - Update German man pages translation.
    - Update German scripts translation.

5 files changed, 73 insertions, 59 deletions

diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile
index f2281732d59..ea74adb6804 100644
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2022/06/28 11:34:47 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2022/11/02 10:47:32 adam Exp $
 
-DISTNAME=	dpkg_1.21.1
+DISTNAME=	dpkg_1.21.9
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/dpkg/PLIST b/misc/dpkg/PLIST
index a0b04eff265..d7b577b92f0 100644
--- a/misc/dpkg/PLIST
+++ b/misc/dpkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2021/12/07 18:15:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2022/11/02 10:47:32 adam Exp $
 bin/dpkg
 bin/dpkg-architecture
 bin/dpkg-buildflags
@@ -152,21 +152,21 @@ ${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Version.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Dselect/Ftp.pm
 lib/pkgconfig/libdpkg.pc
 libexec/dpkg/dpkg-db-backup
-libexec/dpkg/methods/disk/desc.mounted
-libexec/dpkg/methods/disk/install
-libexec/dpkg/methods/disk/names
-libexec/dpkg/methods/disk/setup
-libexec/dpkg/methods/disk/update
+libexec/dpkg/methods/file/desc.file
+libexec/dpkg/methods/file/install
+libexec/dpkg/methods/file/names
+libexec/dpkg/methods/file/setup
+libexec/dpkg/methods/file/update
 libexec/dpkg/methods/ftp/desc.ftp
 libexec/dpkg/methods/ftp/install
 libexec/dpkg/methods/ftp/names
 libexec/dpkg/methods/ftp/setup
 libexec/dpkg/methods/ftp/update
-libexec/dpkg/methods/multicd/desc.multi_cd
-libexec/dpkg/methods/multicd/install
-libexec/dpkg/methods/multicd/names
-libexec/dpkg/methods/multicd/setup
-libexec/dpkg/methods/multicd/update
+libexec/dpkg/methods/media/desc.media
+libexec/dpkg/methods/media/install
+libexec/dpkg/methods/media/names
+libexec/dpkg/methods/media/setup
+libexec/dpkg/methods/media/update
 man/de/man1/dpkg-architecture.1
 man/de/man1/dpkg-buildflags.1
 man/de/man1/dpkg-buildpackage.1
@@ -228,7 +228,6 @@ man/de/man8/dpkg-fsys-usrunmess.8
 man/de/man8/start-stop-daemon.8
 man/es/man1/dpkg-distaddfile.1
 man/es/man1/dpkg-split.1
-man/es/man1/update-alternatives.1
 man/es/man5/deb-old.5
 man/es/man5/dpkg.cfg.5
 man/es/man5/dselect.cfg.5
@@ -260,14 +259,9 @@ man/fr/man5/deb-changes.5
 man/fr/man5/deb-control.5
 man/fr/man5/deb-old.5
 man/fr/man5/deb-origin.5
-man/fr/man5/deb-postinst.5
-man/fr/man5/deb-postrm.5
-man/fr/man5/deb-preinst.5
-man/fr/man5/deb-prerm.5
 man/fr/man5/deb-src-control.5
 man/fr/man5/deb-src-files.5
 man/fr/man5/deb-src-rules.5
-man/fr/man5/deb-substvars.5
 man/fr/man5/deb-triggers.5
 man/fr/man5/deb.5
 man/fr/man5/deb822.5
@@ -281,14 +275,12 @@ man/hu/man5/dselect.cfg.5
 man/it/man1/dpkg-distaddfile.1
 man/it/man1/dpkg-maintscript-helper.1
 man/it/man1/dpkg-split.1
-man/it/man1/update-alternatives.1
 man/it/man5/deb-old.5
 man/it/man5/deb.5
 man/it/man5/dpkg.cfg.5
 man/it/man5/dselect.cfg.5
 man/ja/man1/dpkg-distaddfile.1
 man/ja/man1/dpkg-split.1
-man/ja/man1/update-alternatives.1
 man/ja/man5/deb-old.5
 man/ja/man5/dpkg.cfg.5
 man/ja/man5/dselect.cfg.5
@@ -434,6 +426,7 @@ man/nl/man5/deb-changes.5
 man/nl/man5/deb-conffiles.5
 man/nl/man5/deb-control.5
 man/nl/man5/deb-extra-override.5
+man/nl/man5/deb-md5sums.5
 man/nl/man5/deb-old.5
 man/nl/man5/deb-origin.5
 man/nl/man5/deb-override.5
@@ -460,7 +453,6 @@ man/nl/man8/dpkg-fsys-usrunmess.8
 man/nl/man8/start-stop-daemon.8
 man/pl/man1/dpkg-distaddfile.1
 man/pl/man1/dpkg-split.1
-man/pl/man1/update-alternatives.1
 man/pl/man5/deb-old.5
 man/pl/man5/dpkg.cfg.5
 man/pl/man5/dselect.cfg.5
@@ -498,6 +490,7 @@ man/pt/man5/deb-changes.5
 man/pt/man5/deb-conffiles.5
 man/pt/man5/deb-control.5
 man/pt/man5/deb-extra-override.5
+man/pt/man5/deb-md5sums.5
 man/pt/man5/deb-old.5
 man/pt/man5/deb-origin.5
 man/pt/man5/deb-override.5
@@ -522,15 +515,65 @@ man/pt/man5/dselect.cfg.5
 man/pt/man7/deb-version.7
 man/pt/man8/dpkg-fsys-usrunmess.8
 man/pt/man8/start-stop-daemon.8
+man/sv/man1/dpkg-architecture.1
+man/sv/man1/dpkg-buildflags.1
+man/sv/man1/dpkg-buildpackage.1
+man/sv/man1/dpkg-checkbuilddeps.1
+man/sv/man1/dpkg-deb.1
 man/sv/man1/dpkg-distaddfile.1
+man/sv/man1/dpkg-divert.1
+man/sv/man1/dpkg-genbuildinfo.1
+man/sv/man1/dpkg-genchanges.1
 man/sv/man1/dpkg-gencontrol.1
+man/sv/man1/dpkg-gensymbols.1
 man/sv/man1/dpkg-maintscript-helper.1
+man/sv/man1/dpkg-mergechangelogs.1
+man/sv/man1/dpkg-name.1
+man/sv/man1/dpkg-parsechangelog.1
+man/sv/man1/dpkg-query.1
+man/sv/man1/dpkg-realpath.1
+man/sv/man1/dpkg-scanpackages.1
+man/sv/man1/dpkg-scansources.1
+man/sv/man1/dpkg-shlibdeps.1
+man/sv/man1/dpkg-source.1
 man/sv/man1/dpkg-split.1
+man/sv/man1/dpkg-statoverride.1
+man/sv/man1/dpkg-trigger.1
+man/sv/man1/dpkg-vendor.1
+man/sv/man1/dpkg.1
+man/sv/man1/dselect.1
 man/sv/man1/update-alternatives.1
+man/sv/man5/deb-buildinfo.5
+man/sv/man5/deb-changelog.5
+man/sv/man5/deb-changes.5
+man/sv/man5/deb-conffiles.5
+man/sv/man5/deb-control.5
+man/sv/man5/deb-extra-override.5
+man/sv/man5/deb-md5sums.5
 man/sv/man5/deb-old.5
+man/sv/man5/deb-origin.5
+man/sv/man5/deb-override.5
+man/sv/man5/deb-postinst.5
+man/sv/man5/deb-postrm.5
+man/sv/man5/deb-preinst.5
+man/sv/man5/deb-prerm.5
+man/sv/man5/deb-shlibs.5
+man/sv/man5/deb-split.5
+man/sv/man5/deb-src-control.5
+man/sv/man5/deb-src-files.5
+man/sv/man5/deb-src-rules.5
+man/sv/man5/deb-src-symbols.5
+man/sv/man5/deb-substvars.5
+man/sv/man5/deb-symbols.5
+man/sv/man5/deb-triggers.5
 man/sv/man5/deb.5
+man/sv/man5/deb822.5
 man/sv/man5/dpkg.cfg.5
+man/sv/man5/dsc.5
 man/sv/man5/dselect.cfg.5
+man/sv/man7/deb-version.7
+man/sv/man8/dpkg-fsys-usrunmess.8
+man/sv/man8/start-stop-daemon.8
 sbin/dpkg-fsys-usrunmess
 sbin/start-stop-daemon
 share/aclocal/dpkg-arch.m4
@@ -545,10 +588,10 @@ share/aclocal/dpkg-types.m4
 share/aclocal/dpkg-unicode.m4
 share/doc/dpkg/README.api
 share/doc/dpkg/README.feature-removal-schedule
-share/doc/dpkg/frontend.txt
-share/doc/dpkg/protected-field.txt
-share/doc/dpkg/rootless-builds.txt
-share/doc/dpkg/triggers.txt
+share/doc/dpkg/spec/frontend-api.txt
+share/doc/dpkg/spec/protected-field.txt
+share/doc/dpkg/spec/rootless-builds.txt
+share/doc/dpkg/spec/triggers.txt
 share/dpkg/abitable
 share/dpkg/alternatives/README
 share/dpkg/architecture.mk
diff --git a/misc/dpkg/distinfo b/misc/dpkg/distinfo
index 8be8f3e77f7..bfe3673b759 100644
--- a/misc/dpkg/distinfo
+++ b/misc/dpkg/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.19 2021/12/07 18:15:17 adam Exp $
+$NetBSD: distinfo,v 1.20 2022/11/02 10:47:32 adam Exp $
 
-BLAKE2s (dpkg_1.21.1.tar.xz) = bd207493354eb7a8a086e0ecc302f474540cfadebd9010d8f4674d0886b8c84c
-SHA512 (dpkg_1.21.1.tar.xz) = 3f3f263e1300f3e4b55e84521847703dcfe465aa54829a69c31c174a2ad5e8b6a8a251da7c6020d31a38e9e6744113924a71e9579469e32289328e91a48db07f
-Size (dpkg_1.21.1.tar.xz) = 4986936 bytes
-SHA1 (patch-lib_dpkg_libdpkg.map) = f2cf79ab4aa0bbe834a1d8d7183d08b7f6829fb3
-SHA1 (patch-src_Makefile.in) = 24e1ab4dcb73268ba84eec1072d813b5f0b7adf9
+BLAKE2s (dpkg_1.21.9.tar.xz) = c77dcd713a1f368b17ef44df5b2005ef0222b0e8cda6871d1e96dc4db12387ef
+SHA512 (dpkg_1.21.9.tar.xz) = 0f0b9b936a025f9d905dc35c030293d9a1bdcbed640187691ae2319d99d04dac954102b1270301b12b633c48f08d6c6af0f6f21df4afb2e34a0f0a37127fd238
+Size (dpkg_1.21.9.tar.xz) = 5084044 bytes
 SHA1 (patch-utils_start-stop-daemon.c) = 7927b364851b039e44279157aa783afde4508af9
diff --git a/misc/dpkg/patches/patch-lib_dpkg_libdpkg.map b/misc/dpkg/patches/patch-lib_dpkg_libdpkg.map
deleted file mode 100644
index bea7b82c069..00000000000
--- a/misc/dpkg/patches/patch-lib_dpkg_libdpkg.map
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-lib_dpkg_libdpkg.map,v 1.1 2020/05/22 01:24:36 joerg Exp $
-
---- lib/dpkg/libdpkg.map.orig	2020-05-22 00:11:43.620737999 +0000
-+++ lib/dpkg/libdpkg.map
-@@ -353,6 +353,7 @@ LIBDPKG_PRIVATE {
- 	pkg_format_parse;
- 	pkg_format_show;
- 	pkg_format_free;
-+	pkg_format_needs_db_fsys;
- 
- 	# Package specifiers
- 	pkg_spec_is_illegal;
diff --git a/misc/dpkg/patches/patch-src_Makefile.in b/misc/dpkg/patches/patch-src_Makefile.in
deleted file mode 100644
index c9e38883a15..00000000000
--- a/misc/dpkg/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2020/05/22 01:24:36 joerg Exp $
-
-For the obstack support
-
---- src/Makefile.in.orig	2020-05-22 00:13:15.779186497 +0000
-+++ src/Makefile.in
-@@ -430,6 +430,7 @@ AM_CPPFLAGS = \
- 
- LDADD = \
- 	../lib/dpkg/libdpkg.la \
-+	../lib/compat/libcompat.la \
- 	$(LIBINTL)
- 
- EXTRA_DIST = \