From a79f9b73ccc10d66ce1d671f04604546a000ac5c Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 11 Oct 2005 20:10:35 +0000
Subject: Allow mod_ssl to build with OpenSSL 0.9.8. The patch is from Georg v.
 Zezschwitz on dev@httpd.apache.org.

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

(limited to 'www/apache2')

diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index ba4b98cf67b..4a8b5421f16 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -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-aj) = 32ac362e0d67bfb208a8814b9baf70e20c22ae4b
 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
 SHA1 (patch-al) = 9af7b6c56177d971e135f0a00b3ab9ded5d1b6dd
 SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
+SHA1 (patch-ao) = c629a7563d0e555922526e26b266251144a14ff6
diff --git a/www/apache2/patches/patch-ao b/www/apache2/patches/patch-ao
new file mode 100644
index 00000000000..7c9c5e73159
--- /dev/null
+++ b/www/apache2/patches/patch-ao
@@ -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
-- 
cgit v1.2.3