From 177b60b48139f873dd8f7b841f2655a985d9806d Mon Sep 17 00:00:00 2001
From: Rich Salz <rsalz@akamai.com>
Date: Mon, 13 Jan 2020 13:48:08 -0500
Subject: [PATCH] Add missing files to generated

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10256)
---
 .gitignore          |  1 +
 doc/man1/build.info | 27 +++++++++++++++++++++++++++
 doc/perlvars.pm     |  3 +--
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 26bba646d7..691e88a13e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@
 /include/openssl/opensslv.h
 
 # Auto generated doc files
+# If you add to this list, make sure doc/man1/build.info is sync'd!
 doc/man1/openssl-ca.pod
 doc/man1/openssl-cms.pod
 doc/man1/openssl-crl.pod
diff --git a/doc/man1/build.info b/doc/man1/build.info
index aed1f948d5..2fbbb258b4 100644
--- a/doc/man1/build.info
+++ b/doc/man1/build.info
@@ -5,24 +5,33 @@ DEPEND[]= \
          openssl-crl.pod \
          openssl-dgst.pod \
          openssl-dhparam.pod \
+         openssl-dsa.pod \
          openssl-dsaparam.pod \
          openssl-ecparam.pod \
+         openssl-ec.pod \
          openssl-enc.pod \
          openssl-gendsa.pod \
+         openssl-genpkey.pod \
          openssl-genrsa.pod \
          openssl-ocsp.pod \
          openssl-passwd.pod \
          openssl-pkcs12.pod \
          openssl-pkcs8.pod \
+         openssl-pkcs7.pod \
+         openssl-pkey.pod \
+         openssl-pkeyparam.pod \
          openssl-pkeyutl.pod \
          openssl-rand.pod \
          openssl-req.pod \
+         openssl-rsa.pod \
          openssl-rsautl.pod \
          openssl-s_client.pod \
          openssl-s_server.pod \
          openssl-s_time.pod \
          openssl-smime.pod \
          openssl-speed.pod \
+         openssl-spkac.pod \
+         openssl-storeutl.pod \
          openssl-srp.pod \
          openssl-ts.pod \
          openssl-verify.pod \
@@ -38,30 +47,44 @@ DEPEND[openssl-dgst.pod]=../perlvars.pm
 GENERATE[openssl-dgst.pod]=openssl-dgst.pod.in
 DEPEND[openssl-dhparam.pod]=../perlvars.pm
 GENERATE[openssl-dhparam.pod]=openssl-dhparam.pod.in
+DEPEND[openssl-dsa.pod]=../perlvars.pm
+GENERATE[openssl-dsa.pod]=openssl-dsa.pod.in
 DEPEND[openssl-dsaparam.pod]=../perlvars.pm
 GENERATE[openssl-dsaparam.pod]=openssl-dsaparam.pod.in
 DEPEND[openssl-ecparam.pod]=../perlvars.pm
 GENERATE[openssl-ecparam.pod]=openssl-ecparam.pod.in
+DEPEND[openssl-ec.pod]=../perlvars.pm
+GENERATE[openssl-ec.pod]=openssl-ec.pod.in
 DEPEND[openssl-enc.pod]=../perlvars.pm
 GENERATE[openssl-enc.pod]=openssl-enc.pod.in
 DEPEND[openssl-gendsa.pod]=../perlvars.pm
 GENERATE[openssl-gendsa.pod]=openssl-gendsa.pod.in
+DEPEND[openssl-genpkey.pod]=../perlvars.pm
+GENERATE[openssl-genpkey.pod]=openssl-genpkey.pod.in
 DEPEND[openssl-genrsa.pod]=../perlvars.pm
 GENERATE[openssl-genrsa.pod]=openssl-genrsa.pod.in
 DEPEND[openssl-ocsp.pod]=../perlvars.pm
 GENERATE[openssl-ocsp.pod]=openssl-ocsp.pod.in
 DEPEND[openssl-passwd.pod]=../perlvars.pm
 GENERATE[openssl-passwd.pod]=openssl-passwd.pod.in
+DEPEND[openssl-pkcs7.pod]=../perlvars.pm
+GENERATE[openssl-pkcs7.pod]=openssl-pkcs7.pod.in
 DEPEND[openssl-pkcs8.pod]=../perlvars.pm
 GENERATE[openssl-pkcs8.pod]=openssl-pkcs8.pod.in
 DEPEND[openssl-pkcs12.pod]=../perlvars.pm
 GENERATE[openssl-pkcs12.pod]=openssl-pkcs12.pod.in
+DEPEND[openssl-pkey.pod]=../perlvars.pm
+GENERATE[openssl-pkey.pod]=openssl-pkey.pod.in
+DEPEND[openssl-pkeyparam.pod]=../perlvars.pm
+GENERATE[openssl-pkeyparam.pod]=openssl-pkeyparam.pod.in
 DEPEND[openssl-pkeyutl.pod]=../perlvars.pm
 GENERATE[openssl-pkeyutl.pod]=openssl-pkeyutl.pod.in
 DEPEND[openssl-rand.pod]=../perlvars.pm
 GENERATE[openssl-rand.pod]=openssl-rand.pod.in
 DEPEND[openssl-req.pod]=../perlvars.pm
 GENERATE[openssl-req.pod]=openssl-req.pod.in
+DEPEND[openssl-rsa.pod]=../perlvars.pm
+GENERATE[openssl-rsa.pod]=openssl-rsa.pod.in
 DEPEND[openssl-rsautl.pod]=../perlvars.pm
 GENERATE[openssl-rsautl.pod]=openssl-rsautl.pod.in
 DEPEND[openssl-s_client.pod]=../perlvars.pm
@@ -74,6 +97,10 @@ DEPEND[openssl-smime.pod]=../perlvars.pm
 GENERATE[openssl-smime.pod]=openssl-smime.pod.in
 DEPEND[openssl-speed.pod]=../perlvars.pm
 GENERATE[openssl-speed.pod]=openssl-speed.pod.in
+DEPEND[openssl-spkac.pod]=../perlvars.pm
+GENERATE[openssl-spkac.pod]=openssl-spkac.pod.in
+DEPEND[openssl-storeutl.pod]=../perlvars.pm
+GENERATE[openssl-storeutl.pod]=openssl-storeutl.pod.in
 DEPEND[openssl-srp.pod]=../perlvars.pm
 GENERATE[openssl-srp.pod]=openssl-srp.pod.in
 DEPEND[openssl-ts.pod]=../perlvars.pm
diff --git a/doc/perlvars.pm b/doc/perlvars.pm
index 7f0cf167d3..09e5000b7a 100644
--- a/doc/perlvars.pm
+++ b/doc/perlvars.pm
@@ -140,8 +140,7 @@ $OpenSSL::safe::opt_version_item = "\n"
 . "See L<openssl(1)/TLS Version Options>.";
 
 # SSL connection options.
-# TODO(3.0) Not currently used.  The refactoring needs to be done, and
-# the options will probably be re-ordered.
+# TODO options will probably be re-ordered.
 $OpenSSL::safe::opt_s_synopsis = ""
 . "[B<-bugs>]\n"
 . "[B<-no_comp>]\n"
-- 
2.25.1