sync

18 files changed, 35 insertions, 34 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 11046bfbce6..a9e3f72b490 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -123,11 +123,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 63833d9b9a7..18862f533ce 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -129,11 +129,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 3ccddea635b..855a3bd6158 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -95,11 +95,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 44a3718ce71..87a27e5221e 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -62,11 +62,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.46.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index bdedce8251b..29806188291 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -124,11 +124,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 1247e83f9be..5bc154dd36c 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -125,11 +125,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 730cd99d24f..5b2811ba27f 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -131,11 +131,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 00b8e4167cb..5921a445df7 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -85,11 +85,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 6aaa77a25b4..4e6a8b2029a 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -91,11 +91,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 2594f9f9fc2..020b1dd3f4f 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -126,11 +126,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index e70c0a9cf72..b705bae64db 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -60,11 +60,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.46.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index dd2214c3db5..82639e4603a 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -92,11 +92,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index b83eaba7989..4660eaa1cfa 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -121,11 +121,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 53c1e29a055..e967cdd4d21 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -118,11 +118,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index b1d91e2f272..8769c059b8a 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -66,11 +66,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 2e5b03cac24..35021d0ed75 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -126,11 +126,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index dc4281a7409..fb6782c85c2 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -93,11 +93,11 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libsqlite3.so.20.0
-./usr/lib/libssl.so.17.1
+./usr/lib/libssl.so.18.0
 ./usr/lib/libstdc++.so.54.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
-./usr/lib/libusbhid.so.3.0
+./usr/lib/libusbhid.so.4.0
 ./usr/lib/libutil.so.11.3
 ./usr/lib/libwrap.so.4.0
 ./usr/lib/libz.so.4.1
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 69f8716f27d..5fdfedb8829 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -4120,6 +4120,7 @@
 ./usr/share/man/man3/hid_get_data.3
 ./usr/share/man/man3/hid_get_item.3
 ./usr/share/man/man3/hid_get_report_desc.3
+./usr/share/man/man3/hid_get_report_id.3
 ./usr/share/man/man3/hid_init.3
 ./usr/share/man/man3/hid_locate.3
 ./usr/share/man/man3/hid_parse_usage_in_page.3