[pkgsrc/trunk]: pkgsrc/www/apache2 Allow mod_ssl to build with OpenSSL 0.9.8....

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa3fb7c13034
branches:  trunk
changeset: 500692:aa3fb7c13034
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Oct 11 20:10:35 2005 +0000

description:
Allow mod_ssl to build with OpenSSL 0.9.8. The patch is from
Georg v. Zezschwitz on dev%httpd.apache.org@localhost.

diffstat:

 www/apache2/distinfo         |   3 ++-
 www/apache2/patches/patch-ao |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r fc0473200ec9 -r aa3fb7c13034 www/apache2/distinfo
--- a/www/apache2/distinfo      Tue Oct 11 20:08:44 2005 +0000
+++ b/www/apache2/distinfo      Tue Oct 11 20:10:35 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2005/09/26 17:21:21 tv Exp $
+$NetBSD: distinfo,v 1.43 2005/10/11 20:10:35 joerg Exp $
 
 SHA1 (httpd-2.0.54.tar.bz2) = 15b4fc3024cceea6562fb03383fd624e84e5e35a
 RMD160 (httpd-2.0.54.tar.bz2) = c511cb2fa396ba04caf77bfc6ca03413df48ea08
@@ -16,3 +16,4 @@
 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
 SHA1 (patch-al) = 9af7b6c56177d971e135f0a00b3ab9ded5d1b6dd
 SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
+SHA1 (patch-ao) = c629a7563d0e555922526e26b266251144a14ff6
diff -r fc0473200ec9 -r aa3fb7c13034 www/apache2/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache2/patches/patch-ao      Tue Oct 11 20:10:35 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.7 2005/10/11 20:10:35 joerg Exp $
+
+--- modules/ssl/ssl_toolkit_compat.h.orig      2005-10-11 18:24:59.000000000 +0000
++++ modules/ssl/ssl_toolkit_compat.h
+@@ -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