From 042633cd16f529369f47efd78becd1a9444f93f9 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Thu, 11 Jan 2007 00:25:35 +0000 Subject: [PATCH] Add openssl.cnf since openssl will not run without one (explicitly specifying this .cnf is required, either with the cmd line arg or the envvar.) Spell out the correct versions of openssl/apache. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@495057 13f79535-47bb-0310-9956-ffa450edef68 --- Makefile.win | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Makefile.win b/Makefile.win index fb0e95f5ac..8b3185f06e 100644 --- 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 @@ -517,6 +517,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 @@ -536,10 +537,10 @@ BEGIN { << copy << + srclib\openssl\NEWS "$(INSTDIR)\OPENSSL-NEWS.txt" <.y - Apache HTTP Server 2.0 Limited OpenSSL Distribution + Apache HTTP Server 2.3 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.3 (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, , or see the CHANGES file in the @@ -552,17 +553,21 @@ BEGIN { << copy << + srclib\openssl\README "$(INSTDIR)\OPENSSL-README.txt" <.y - Apache HTTP Server 2.0 Limited OpenSSL Distribution + Apache HTTP Server 2.3 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.3. No library link files, headers or sources are distributed with this binary distribution. Please refer to the site for complete source or binary distributions. -- 2.50.1