sync

3 files changed, 46 insertions, 5 deletions

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 3e68402972c..ee7a0d7708a 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -964,7 +964,7 @@
 ./usr/sbin/smrsh
 ./usr/sbin/spray
 ./usr/sbin/sshd
-./usr/sbin/ssleay
+./usr/sbin/openssl
 ./usr/sbin/stdethers
 ./usr/sbin/stdhosts
 ./usr/sbin/supfilesrv
@@ -2361,7 +2361,6 @@
 ./var/www/htdocs/manual/images/mod_rewrite_fig2.fig
 ./var/www/htdocs/manual/images/mod_rewrite_fig2.gif
 ./var/www/htdocs/manual/images/mod_ssl_sb.gif
-./var/www/htdocs/manual/images/ssleay.gif
 ./var/www/htdocs/manual/images/sub.gif
 ./var/www/htdocs/manual/index.html
 ./var/www/htdocs/manual/install-tpf.html
@@ -2443,7 +2442,6 @@
 ./var/www/htdocs/manual/mod/mod_ssl/ssl_compat.gfont000.gif
 ./var/www/htdocs/manual/mod/mod_ssl/ssl_compat.html
 ./var/www/htdocs/manual/mod/mod_ssl/ssl_cover_logo.jpg
-./var/www/htdocs/manual/mod/mod_ssl/ssl_cover_title.gif
 ./var/www/htdocs/manual/mod/mod_ssl/ssl_faq.gfont000.gif
 ./var/www/htdocs/manual/mod/mod_ssl/ssl_faq.html
 ./var/www/htdocs/manual/mod/mod_ssl/ssl_glossary.html
@@ -2634,4 +2632,36 @@
 ./var/yp/Makefile.yp.dist
 ./var/yp/README
 ./usr/bin/scp
+./var/www/htdocs/manual/mod/mod_ssl/ssl_compat.wml
+./var/www/htdocs/manual/mod/mod_ssl/ssl_cover.wml
+./var/www/htdocs/manual/mod/mod_define.html
+./var/www/htdocs/manual/mod/mod_auth_digest.html
+./var/www/htdocs/manual/images/openssl_ics.gif
+./var/www/conf/magic
 ./usr/bin/slogin
+./var/www/htdocs/manual/mod/mod_ssl/ssl_cover_title.jpg
+./var/www/htdocs/manual/mod/mod_ssl/ssl_faq.wml
+./var/www/htdocs/manual/mod/mod_ssl/ssl_glossary.wml
+./var/www/htdocs/manual/mod/mod_ssl/ssl_howto.wml
+./var/www/htdocs/manual/mod/mod_ssl/ssl_intro.wml
+./var/www/htdocs/manual/mod/mod_ssl/ssl_overview.wml
+./var/www/htdocs/manual/mod/mod_ssl/ssl_reference.wml
+./var/www/htdocs/manual/mod/mod_ssl/ssl_template.inc
+./var/www/htdocs/manual/mod/mod_vhost_alias.html
+./var/www/htdocs/manual/search
+./var/www/htdocs/manual/search/manual-index.cgi
+./var/www/htdocs/manual/vhosts/mass.html
+./var/www/icons/small/doc.gif
+./var/www/icons/small/patch.gif
+./var/www/icons/small/ps.gif
+./usr/bin/dbmmanage
+./usr/bin/htdigest
+./usr/bin/htpasswd
+./usr/lib/apache
+./usr/lib/apache/include
+./usr/lib/apache/modules
+./usr/sbin/ab
+./usr/sbin/apachectl
+./usr/sbin/apxs
+./usr/sbin/logresolve
+./usr/sbin/rotatelogs
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index fcb2b173ad5..de8391aad8d 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -926,7 +926,6 @@
 ./usr/include/ssl/buffer.h
 ./usr/include/ssl/cast.h
 ./usr/include/ssl/conf.h
-./usr/include/ssl/cryptall.h
 ./usr/include/ssl/crypto.h
 ./usr/include/ssl/des.h
 ./usr/include/ssl/dh.h
@@ -2867,3 +2866,15 @@
 ./usr/include/dev/ic/i82596var.h
 ./usr/include/dev/usb/usbcdc.h
 ./usr/include/dev/ic/ac97.h
+./usr/include/ssl/opensslconf.h
+./usr/include/ssl/opensslv.h
+./usr/include/ssl/pem2.h
+./usr/include/ssl/pkcs12.h
+./usr/include/ssl/rsaref.h
+./usr/include/ssl/safestack.h
+./usr/include/ssl/comp.h
+./usr/include/ssl/e_os2.h
+./usr/include/ssl/ebcdic.h
+./usr/include/ssl/ssl_locl.h
+./usr/include/ssl/tmdiff.h
+./usr/include/ssl/x509v3.h
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index 5679365a620..592c192b783 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -103,7 +103,7 @@
 ./etc/sshd_config
 ./etc/ssl
 ./etc/ssl/lib
-./etc/ssl/lib/ssleay.cnf
+./etc/ssl/openssl.cnf
 ./etc/ssl/private
 ./etc/sysctl.conf
 ./etc/syslog.conf