Correct openssl-related version numbers and schema to include

openssl.cnf (required to invoke openssl.exe, even if the path
must be explicitly given.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@495129 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.win b/Makefile.win
index b3a2898bc3803f5c69e9d31c101c941ee97abc01..9c716165ee09247af41427b3b291f008e39fa21c 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -75,7 +75,7 @@ _tryssl:
        @echo mod_ssl and ab/ssl will not build unless openssl is installed
        @echo in srclib\openssl.  They must be precompiled using the 
        @echo ms/ntdll.mak file, see srclib\openssl\INSTALL.W32.  The most
-       @echo recent version confirmed to build with mod_ssl and ab is 0.9.6h.
+       @echo recent version confirmed to build with mod_ssl and ab is 0.9.8d.
        @echo Available from http://www.openssl.org/
 !ENDIF
 
@@ -508,6 +508,7 @@ _install:
        copy NOTICE       "$(INSTDIR)\NOTICE.txt" <.y
        copy README       "$(INSTDIR)\README.txt" <.y
 !IF EXIST("srclib\openssl")
+       copy srclib\openssl\apps\openssl.cnf "$(INSTDIR)\conf\openssl.cnf" <.y
        type << >> "$(INSTDIR)\NOTICE.txt"
 
   This binary distribution includes cryptographic software written by
@@ -527,10 +528,10 @@ BEGIN {
 <<
        copy << + srclib\openssl\NEWS "$(INSTDIR)\OPENSSL-NEWS.txt" <.y
 
- Apache HTTP Server 2.0 Limited OpenSSL Distribution
+ Apache HTTP Server 2.2 Limited OpenSSL Distribution
 
  This binary distribution includes the minimal components of OpenSSL required
- to support mod_ssl for Apache HTTP Server version 2.0 (details are listed 
+ to support mod_ssl for Apache HTTP Server version 2.2 (details are listed 
  in OPENSSL-README.txt.)  For the complete list of CHANGES to this and later 
  versions of OpenSSL, please refer to the definative source,
  <http://www.openssl.org/news/changelog.html>, or see the CHANGES file in the
@@ -543,17 +544,21 @@ BEGIN {
 <<
        copy << + srclib\openssl\README "$(INSTDIR)\OPENSSL-README.txt" <.y
 
- Apache HTTP Server 2.0 Limited OpenSSL Distribution
+ Apache HTTP Server 2.2 Limited OpenSSL Distribution
 
- This binary installation of OpenSSL is a limited distribution of the documents
- OPENSSL-LICENSE.txt, OPENSSL-NEWS.txt and OPENSSL-README.txt, and the binaries
+ This binary installation of OpenSSL is a limited distribution of the
+ files derived from the OpenSSL project:
 
-   libeay32.dll
-   ssleay32.dll
-   openssl.exe
+   OPENSSL-LICENSE.txt
+   OPENSSL-NEWS.txt
+   OPENSSL-README.txt
+   conf\openssl.cnf
+   bin\libeay32.dll
+   bin\ssleay32.dll
+   bin\openssl.exe
 
  These are the minimal libraries and tools required to use mod_ssl as 
- distributed with Apache HTTP Server version 2.0.  No library link files, 
+ distributed with Apache HTTP Server version 2.2.  No library link files, 
  headers or sources are distributed with this binary distribution.  Please 
  refer to the <http://www.openssl.org/> site for complete source or binary 
  distributions.