You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2007/12/31 19:18:05 UTC
svn commit: r607762 - in /httpd/httpd/branches/2.2.x:
docs/manual/platform/netware.xml modules/NWGNUmakefile
Author: fuankg
Date: Mon Dec 31 10:18:03 2007
New Revision: 607762
URL: http://svn.apache.org/viewvc?rev=607762&view=rev
Log:
fixed comment, added comment, added logic to build mod_ssl by default if USE_STDSOCKETS is defined;
updated manual NetWare OpenSSL build section.
Modified:
httpd/httpd/branches/2.2.x/docs/manual/platform/netware.xml
httpd/httpd/branches/2.2.x/modules/NWGNUmakefile
Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/netware.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/netware.xml?rev=607762&r1=607761&r2=607762&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/netware.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/netware.xml Mon Dec 31 10:18:03 2007
@@ -615,17 +615,10 @@
steps:</p>
<ul>
- <li>Download the latest NetWare patch for OpenSSL from the
- <a href="http://www.openssl.org/contrib/">OpenSSL Contribution</a>
- page.</li>
-
- <li>Download the corresponding OpenSSL source code from the
+ <li>Download the recent OpenSSL 0.9.8 release source code from the
<a href="http://www.openssl.org/source/">OpenSSL Source</a>
- page.</li>
-
- <li>At the root of the OpenSSL source directory, apply the NetWare
- patch using the "patch" utility, for example:
- <example>patch -p 1 -i netwarepatch-0.9.7g.diff</example></li>
+ page (older 0.9.7 versions need to be patched and are therefore not
+ recommended).</li>
<li>Edit the file <code>NetWare/set_env.bat</code> and modify any
tools and utilities paths so that they correspond to your build
@@ -634,14 +627,25 @@
<li>From the root of the OpenSSL source directory, run the following
scripts:
<example>
- Netware/set_env netware-libc<br />
- Netware/build netware-libc
- </example></li>
+ Netware\set_env netware-libc<br />
+ Netware\build netware-libc
+ </example>
+ For performance reasons you should enable to build with ASM code.
+ Download NASM from the <a href="http://nasm.sourceforge.net/">SF site</a>.
+ Then configure OpenSSL to use ASM code:
+ <example>
+ Netware\build netware-libc nw-nasm enable-mdc2 enable-md5
+ </example>
+ Warning: dont use the CodeWarrior Assembler - it produces broken code!
+ </li>
<li>Before building Apache, set the environment variable
<code>OSSLSDK</code> to the full path to the root of the openssl
- source code directory.
- <example>Set OSSLSDK=d:\openssl-0.9.7x</example></li>
+ source code directory, and set WITH_MOD_SSL to 1.
+ <example>
+ Set OSSLSDK=d:\openssl-0.9.8x<br />
+ Set WITH_MOD_SSL=1
+ </example></li>
</ul>
Modified: httpd/httpd/branches/2.2.x/modules/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/NWGNUmakefile?rev=607762&r1=607761&r2=607762&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/NWGNUmakefile Mon Dec 31 10:18:03 2007
@@ -3,6 +3,13 @@
#
# To build with exerimental modules set the environment
# variable EXPERIMENTAL=1
+# To build with the mod_ssl module set the environment
+# variable WITH_MOD_SSL=1
+
+# If USE_STDSOCKETS is defined we allways build mod_ssl
+ifdef USE_STDSOCKETS
+WITH_MOD_SSL=1
+endif
SUBDIRS = \
aaa \
@@ -26,8 +33,8 @@
$(EOLIST)
endif
-# If OSSLSDK has been defined then build the mod_ssl module
-ifndef USE_STDSOCKETS
+# If WITH_MOD_SSL and OSSLSDK have been defined then build the mod_ssl module
+ifdef WITH_MOD_SSL
ifneq "$(OSSLSDK)" ""
SUBDIRS += ssl \
$(EOLIST)