r1111 - in trunk: . httpd

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sat Sep 10 22:06:27 PDT 2005


Author: jim
Date: 2005-09-10 23:06:26 -0600 (Sat, 10 Sep 2005)
New Revision: 1111

Added:
   trunk/httpd/httpd-2.0.54-openssl_0.9.8-1.patch
Modified:
   trunk/
Log:
 r1233 at server:  jim | 2005-09-10 22:04:35 -0700
 Added: httpd-2.0.54-openssl_0.9.8-1.patch



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1206
   + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1233

Added: trunk/httpd/httpd-2.0.54-openssl_0.9.8-1.patch
===================================================================
--- trunk/httpd/httpd-2.0.54-openssl_0.9.8-1.patch	2005-09-11 03:56:24 UTC (rev 1110)
+++ trunk/httpd/httpd-2.0.54-openssl_0.9.8-1.patch	2005-09-11 05:06:26 UTC (rev 1111)
@@ -0,0 +1,23 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2005-09-06
+Initial Package Version: 2.0.54
+Origin: http://forums.devside.net/viewtopic.php?t=740
+Upstream Status: Fixed
+Description: Allows Apache 2 to be compiled with OpenSSL 0.9.8
+ 
+diff -Naur httpd-2.0.54.orig/modules/ssl/ssl_toolkit_compat.h httpd-2.0.54/modules/ssl/ssl_toolkit_compat.h
+--- httpd-2.0.54.orig/modules/ssl/ssl_toolkit_compat.h	2005-02-04 20:21:18.000000000 +0000
++++ httpd-2.0.54/modules/ssl/ssl_toolkit_compat.h	2005-09-07 02:26:08.000000000 +0000
+@@ -24,6 +24,12 @@
+ 
+ #ifdef OPENSSL_VERSION_NUMBER
+ 
++#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
++#ifndef PEM_F_DEF_CALLBACK
++#define PEM_F_DEF_CALLBACK PEM_F_PEM_DEF_CALLBACK 
++#endif
++#endif
++
+ /*
+  * rsa sslc uses incomplete types for most structures
+  * so we macroize for OpenSSL those which cannot be dereferenced




More information about the patches mailing list