sync

16 files changed, 29 insertions, 25 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index d74fe3ecf12..6cbb713dc3a 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -33,7 +33,7 @@
 ./usr/lib/gcc-lib/alpha-unknown-openbsd3.6/2.95.3/include
 ./usr/lib/gcc-lib/alpha-unknown-openbsd3.6/2.95.3/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 7bdfaa3a508..a4b60fb59b8 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -32,7 +32,7 @@
 ./usr/lib/gcc-lib/x86_64-unknown-openbsd3.6/3.3.2/collect2
 ./usr/lib/gcc-lib/x86_64-unknown-openbsd3.6/3.3.2/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
@@ -61,7 +61,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.9.0
-./usr/lib/libstdc++.so.32.0
+./usr/lib/libstdc++.so.34.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 2cfecf48212..6d6ce6c9da1 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -36,7 +36,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd3.6/3.3.2/f771
 ./usr/lib/gcc-lib/arm-unknown-openbsd3.6/3.3.2/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
@@ -65,7 +65,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.9.0
-./usr/lib/libstdc++.so.32.0
+./usr/lib/libstdc++.so.34.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 4d036b89b0a..4a69ce79b23 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -27,7 +27,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.6/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.6/2.95.3/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 32790c4e2f8..946e70eb73c 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -30,7 +30,7 @@
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.6/3.3.2/collect2
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.6/3.3.2/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
@@ -59,7 +59,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.9.0
-./usr/lib/libstdc++.so.32.0
+./usr/lib/libstdc++.so.34.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 75388f68043..7031ec3986e 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -35,7 +35,7 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/include
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 6b34cb146ed..c2870486258 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -28,7 +28,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.6/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.6/2.95.3/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 266ee36757e..053cd401d00 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -35,7 +35,7 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.6/2.95.3/include
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.6/2.95.3/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index f44babcfa2c..71305fe2a10 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -27,7 +27,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.6/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.6/2.95.3/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 4929bbeee96..8fa2abb3b41 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -31,7 +31,7 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.6/2.95.3/include
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.6/2.95.3/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 42893418ca3..93cfd17dbba 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -32,7 +32,7 @@
 ./usr/lib/gcc-lib/mips64-unknown-openbsd3.6/3.3.2/include
 ./usr/lib/gcc-lib/mips64-unknown-openbsd3.6/3.3.2/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
@@ -61,7 +61,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.9.0
-./usr/lib/libstdc++.so.32.0
+./usr/lib/libstdc++.so.34.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index e18f54f79c5..bf94d85604e 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -30,7 +30,7 @@
 ./usr/lib/gcc-lib/sparc-unknown-openbsd3.6/2.95.3/include
 ./usr/lib/gcc-lib/sparc-unknown-openbsd3.6/2.95.3/specs
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 9f7772ab4af..c18f8bb6305 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -26,7 +26,7 @@
 ./usr/lib/apache/modules/mod_vhost_alias.so
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd3.6
 ./usr/lib/libasn1.so.14.0
-./usr/lib/libc.so.34.1
+./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.14.0
 ./usr/lib/libcrypto.so.11.0
 ./usr/lib/libcurses++.so.3.0
@@ -55,7 +55,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.9.0
-./usr/lib/libstdc++.so.32.0
+./usr/lib/libstdc++.so.34.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 03f7c917aa8..5a8f563806a 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -844,6 +844,7 @@
 ./usr/libdata/perl5/OpenBSD/PackingList.pm
 ./usr/libdata/perl5/OpenBSD/PackingOld.pm
 ./usr/libdata/perl5/OpenBSD/PkgCfl.pm
+./usr/libdata/perl5/OpenBSD/PkgSpec.pm
 ./usr/libdata/perl5/OpenBSD/RequiredBy.pm
 ./usr/libdata/perl5/OpenBSD/Temp.pm
 ./usr/libdata/perl5/OpenBSD/Ustar.pm
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index ec29ee74c8c..1e60dc723a9 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -101,6 +101,7 @@
 ./usr/include/dev/ata
 ./usr/include/dev/ata/atareg.h
 ./usr/include/dev/ata/atavar.h
+./usr/include/dev/ata/satareg.h
 ./usr/include/dev/ata/wdvar.h
 ./usr/include/dev/auconv.h
 ./usr/include/dev/audio_if.h
@@ -108,8 +109,6 @@
 ./usr/include/dev/biovar.h
 ./usr/include/dev/cardbus
 ./usr/include/dev/cardbus/cardbus_exrom.h
-./usr/include/dev/cardbus/cardbusdevs.h
-./usr/include/dev/cardbus/cardbusdevs_data.h
 ./usr/include/dev/cardbus/cardbusvar.h
 ./usr/include/dev/cardbus/cardslotvar.h
 ./usr/include/dev/cardbus/rbus.h
@@ -691,6 +690,7 @@
 ./usr/include/dev/usb/if_cdcereg.h
 ./usr/include/dev/usb/if_cuereg.h
 ./usr/include/dev/usb/if_kuereg.h
+./usr/include/dev/usb/if_udavreg.h
 ./usr/include/dev/usb/if_urlreg.h
 ./usr/include/dev/usb/if_wi_usb.h
 ./usr/include/dev/usb/ohcireg.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index fa427639384..aaa2d9b640b 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1137,6 +1137,7 @@
 ./usr/share/man/cat4/fxp.0
 ./usr/share/man/cat4/gdt.0
 ./usr/share/man/cat4/gem.0
+./usr/share/man/cat4/gentbi.0
 ./usr/share/man/cat4/gif.0
 ./usr/share/man/cat4/gpio.0
 ./usr/share/man/cat4/gpr.0
@@ -1222,6 +1223,7 @@
 ./usr/share/man/cat4/i386/mms.0
 ./usr/share/man/cat4/i386/mtrr.0
 ./usr/share/man/cat4/i386/npx.0
+./usr/share/man/cat4/i386/nvram.0
 ./usr/share/man/cat4/i386/pcibios.0
 ./usr/share/man/cat4/i386/pctr.0
 ./usr/share/man/cat4/i386/pss.0
@@ -1468,6 +1470,7 @@
 ./usr/share/man/cat4/sparc/sw.0
 ./usr/share/man/cat4/sparc/tctrl.0
 ./usr/share/man/cat4/sparc/tcx.0
+./usr/share/man/cat4/sparc/timer.0
 ./usr/share/man/cat4/sparc/tslot.0
 ./usr/share/man/cat4/sparc/tvtwo.0
 ./usr/share/man/cat4/sparc/vigra.0
@@ -1518,6 +1521,7 @@
 ./usr/share/man/cat4/sparc64/sabtty.0
 ./usr/share/man/cat4/sparc64/schizo.0
 ./usr/share/man/cat4/sparc64/spif.0
+./usr/share/man/cat4/sparc64/timer.0
 ./usr/share/man/cat4/sparc64/upa.0
 ./usr/share/man/cat4/sparc64/uperf.0
 ./usr/share/man/cat4/sparc64/vgafb.0
@@ -1560,6 +1564,7 @@
 ./usr/share/man/cat4/ubsa.0
 ./usr/share/man/cat4/ubsec.0
 ./usr/share/man/cat4/ucom.0
+./usr/share/man/cat4/udav.0
 ./usr/share/man/cat4/udp.0
 ./usr/share/man/cat4/udsbr.0
 ./usr/share/man/cat4/uftdi.0
@@ -1725,6 +1730,7 @@
 ./usr/share/man/cat5/mvmeppc
 ./usr/share/man/cat5/mygate.0
 ./usr/share/man/cat5/myname.0
+./usr/share/man/cat5/named.conf.0
 ./usr/share/man/cat5/netgroup.0
 ./usr/share/man/cat5/netid.0
 ./usr/share/man/cat5/networks.0
@@ -1898,6 +1904,8 @@
 ./usr/share/man/cat8/disklabel.0
 ./usr/share/man/cat8/diskless.0
 ./usr/share/man/cat8/dmesg.0
+./usr/share/man/cat8/dnssec-keygen.0
+./usr/share/man/cat8/dnssec-signzone.0
 ./usr/share/man/cat8/dump.0
 ./usr/share/man/cat8/dumpfs.0
 ./usr/share/man/cat8/editmap.0
@@ -2461,8 +2469,3 @@
 ./usr/share/texinfo
 ./usr/share/texinfo/texinfo.dtd
 ./usr/share/texinfo/texinfo.xsl
-./usr/share/man/cat4/sparc/timer.0
-./usr/share/man/cat4/sparc64/timer.0
-./usr/share/man/cat5/named.conf.0
-./usr/share/man/cat8/dnssec-keygen.0
-./usr/share/man/cat8/dnssec-signzone.0