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 = \