sync

18 files changed, 60 insertions, 15 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 31596d3d74b..30a3b0086c4 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -654,3 +654,5 @@
 ./usr/share/info/ld.info-2
 ./usr/share/info/ld.info-3
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_sppp.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index b483e600874..c8461fb49e8 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -32,7 +32,7 @@
 ./usr/lib/libossaudio.so.0.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.1
-./usr/lib/libpcap.so.0.2
+./usr/lib/libpcap.so.1.0
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.1.0
 ./usr/lib/libstdc++.so.29.0
@@ -664,3 +664,5 @@
 ./usr/share/keymaps/amiga/fr.map
 ./usr/share/keymaps/amiga/sw.map
 ./usr/share/keymaps/amiga/us.map
+./usr/libdata/perl5/site_perl/m68k-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index 5d2234b2385..c3778b1b355 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -28,7 +28,7 @@
 ./usr/lib/libocurses.so.3.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.1
-./usr/lib/libpcap.so.0.2
+./usr/lib/libpcap.so.1.0
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.1.0
 ./usr/lib/libtermcap.so.5.0
@@ -418,3 +418,5 @@
 ./usr/mipsel-unknown-openbsd2.5/bin
 ./usr/mipsel-unknown-openbsd2.5/lib
 ./usr/mipsel-unknown-openbsd2.5/lib/ldscripts
+./usr/libdata/perl5/site_perl/mips-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.atari b/distrib/sets/lists/base/md.atari
index dfd04071d65..72b600520ac 100644
--- a/distrib/sets/lists/base/md.atari
+++ b/distrib/sets/lists/base/md.atari
@@ -19,7 +19,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libocurses.so.2.1
 ./usr/lib/libpanel.so.1.1
-./usr/lib/libpcap.so.0.2
+./usr/lib/libpcap.so.1.0
 ./usr/lib/libskey.so.0.4
 ./usr/lib/libstdc++.so.27.1
 ./usr/lib/libtermcap.so.0.0
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index ee331ff4e6f..92d65cf5930 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -29,7 +29,7 @@
 ./usr/lib/libossaudio.so.0.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.1
-./usr/lib/libpcap.so.0.2
+./usr/lib/libpcap.so.1.0
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.1.0
 ./usr/lib/libstdc++.so.29.0
@@ -661,3 +661,5 @@
 ./usr/sbin/grfinfo
 ./usr/sbin/hilinfo
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_sppp.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 973097dfec8..b1bdc527737 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -31,7 +31,7 @@
 ./usr/lib/libossaudio.so.0.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.1
-./usr/lib/libpcap.so.0.2
+./usr/lib/libpcap.so.1.0
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.1.0
 ./usr/lib/libstdc++.so.29.0
@@ -704,3 +704,5 @@
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/if_sppp.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index eeec6f7746b..96044e6bed3 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -29,7 +29,7 @@
 ./usr/lib/libossaudio.so.0.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.1
-./usr/lib/libpcap.so.0.2
+./usr/lib/libpcap.so.1.0
 ./usr/lib/librx.so.0.1
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.1.0
@@ -597,4 +597,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/swap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/termcap.ph
 ./usr/libexec/ld.so
-./usr/libdata/perl5/site_perl/i386-openbsd/net/if_sppp.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_sppp.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index d33d27a4677..cdf9369579b 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -25,7 +25,7 @@
 ./usr/lib/libossaudio.so.0.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.1
-./usr/lib/libpcap.so.0.2
+./usr/lib/libpcap.so.1.0
 ./usr/lib/librx.so.0.1
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.1.0
@@ -615,3 +615,7 @@
 ./usr/mdec/rboot
 ./usr/mdec/sboot
 ./usr/mdec/stboot
+./usr/libdata/perl5/site_perl/m68k-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ataio.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index d4cab432523..02fd5835a9f 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -409,3 +409,5 @@
 ./usr/share/man/cat3/kvm_dump_inval.0
 ./usr/share/man/cat3/kvm_dump_mkheader.0
 ./usr/share/man/cat3/kvm_dump_wrtheader.0
+./usr/libdata/perl5/site_perl/m88k-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.pc532 b/distrib/sets/lists/base/md.pc532
index 675fc655ae0..2915b2df9de 100644
--- a/distrib/sets/lists/base/md.pc532
+++ b/distrib/sets/lists/base/md.pc532
@@ -19,7 +19,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libocurses.so.2.1
 ./usr/lib/libpanel.so.1.1
-./usr/lib/libpcap.so.0.2
+./usr/lib/libpcap.so.1.0
 ./usr/lib/libskey.so.0.4
 ./usr/lib/libstdc++.so.27.1
 ./usr/lib/libtermcap.so.0.0
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index f2409041347..e722c6a4caf 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -27,7 +27,7 @@
 ./usr/lib/libossaudio.so.0.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.1
-./usr/lib/libpcap.so.0.2
+./usr/lib/libpcap.so.1.0
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.1.0
 ./usr/lib/libtermcap.so.5.1
@@ -426,3 +426,5 @@
 ./usr/mipsel-unknown-openbsd2.5/lib
 ./usr/mipsel-unknown-openbsd2.5/lib/ldscripts
 ./usr/libdata/perl5/site_perl/mips-openbsd/net/if_sppp.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index 38cfbbb49ee..00e0f013ff7 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -382,3 +382,5 @@
 ./usr/powerpc-unknown-openbsd2.5/bin
 ./usr/powerpc-unknown-openbsd2.5/lib
 ./usr/powerpc-unknown-openbsd2.5/lib/ldscripts
+./usr/libdata/perl5/site_perl/powerpc-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 3796a96a1c0..00e388410c8 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -35,7 +35,7 @@
 ./usr/lib/libossaudio.so.0.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.1
-./usr/lib/libpcap.so.0.2
+./usr/lib/libpcap.so.1.0
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.1.0
 ./usr/lib/libstdc++.so.29.0
@@ -679,3 +679,5 @@
 ./usr/sbin/fdformat
 ./usr/sbin/screenblank
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_sppp.p
+./usr/libdata/perl5/site_perl/sparc-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 229231f4408..152e390428f 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -22,7 +22,7 @@
 ./usr/lib/libocurses.so.2.1
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.1
-./usr/lib/libpcap.so.0.2
+./usr/lib/libpcap.so.1.0
 ./usr/lib/libskey.so.0.4
 ./usr/lib/libssl.so.1.0
 ./usr/lib/libstdc++.so.27.1
@@ -42,3 +42,5 @@
 ./usr/mdec/ufsboot
 ./usr/sbin/eeprom
 ./usr/sbin/screenblank
+./usr/libdata/perl5/site_perl/m68k-openbsd/pcap-int.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 16d676453bd..316814c5b37 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -2619,3 +2619,8 @@
 ./usr/share/zoneinfo/America/Belem
 ./usr/share/zoneinfo/America/Porto_Velho
 ./usr/share/zoneinfo/Antarctica/Syowa
+./usr/sbin/certpatch
+./etc/isakmpd
+./etc/isakmpd/ca
+./etc/isakmpd/certs
+./etc/isakmpd/private
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 137b25d55fa..53e5ab89dff 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -109,9 +109,6 @@
 ./usr/lib/libkeynote_pic.a
 ./usr/lib/libkrb_pic.a
 ./usr/lib/libkvm_pic.a
-./usr/lib/libm_i387.a
-./usr/lib/libm_i387_p.a
-./usr/lib/libm_i387_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
 ./usr/lib/libmmalloc.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 88111f9ab0c..f21fe6e319e 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -2820,3 +2820,19 @@
 ./var/db/libc.tags
 ./usr/include/dev/pcmcia/if_wavelan_ieee.h
 ./usr/include/dev/pcmcia/if_wireg.h
+./usr/include/dev/ata
+./usr/include/dev/ata/atareg.h
+./usr/include/dev/ata/atavar.h
+./usr/include/dev/ata/wdvar.h
+./usr/include/dev/atapiscsi
+./usr/include/dev/atapiscsi/atapiconf.h
+./usr/include/dev/ic/wdcreg.h
+./usr/include/dev/ic/wdcvar.h
+./usr/include/dev/pci/pciide_acer_reg.h
+./usr/include/dev/pci/pciide_apollo_reg.h
+./usr/include/dev/pci/pciide_cmd_reg.h
+./usr/include/dev/pci/pciide_cy693_reg.h
+./usr/include/dev/pci/pciide_piix_reg.h
+./usr/include/dev/pci/pciide_sis_reg.h
+./usr/include/pcap-int.h
+./usr/include/sys/ataio.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index db0be954d69..60384dc9900 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1591,3 +1591,4 @@
 ./usr/share/man/cat4/lmc.0
 ./usr/share/man/cat4/sppp.0
 ./usr/share/man/cat8/dhcp.0
+./usr/share/man/cat8/certpatch.0