Date: Tue, 30 Aug 2005 01:59:13 +0200 (CEST) From: Daniel Roethlisberger <daniel@roe.ch> To: FreeBSD-gnats-submit@FreeBSD.org Cc: clement@FreeBSD.org, Daniel Roethlisberger <daniel@roe.ch> Subject: ports/85457: [PATCH] www/apache2: fix build with openssl-beta-0.9.8 Message-ID: <200508292359.j7TNxDP8002161@aphrodite.roe> Resent-Message-ID: <200508300000.j7U00eF9024279@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85457 >Category: ports >Synopsis: [PATCH] www/apache2: fix build with openssl-beta-0.9.8 >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Aug 30 00:00:39 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Daniel Roethlisberger >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD aphrodite.roe 5.4-STABLE FreeBSD 5.4-STABLE #4: Sun Aug 28 20:49:49 CEST 2005 root@aphrodite.roe:/usr/obj/usr/src/sys/APHRODITE i386 >Description: Fix build of apache2 with openssl-beta-0.9.8 (WITH_OPENSSL_BETA=yes) while retaining compatibility with older OpenSSL releases, such as the one shipping in the RELENG_5 base system. Add: files/patch-modules:ssl:ssl_toolkit_compat.h >How-To-Repeat: >Fix: --- apache2-openssl-beta-0.9.8-fix.diff begins here --- diff -ruN apache2.orig/files/patch-modules:ssl:ssl_toolkit_compat.h apache2/files/patch-modules:ssl:ssl_toolkit_compat.h --- apache2.orig/files/patch-modules:ssl:ssl_toolkit_compat.h Thu Jan 1 01:00:00 1970 +++ apache2/files/patch-modules:ssl:ssl_toolkit_compat.h Tue Aug 30 01:48:33 2005 @@ -0,0 +1,16 @@ +--- modules/ssl/ssl_toolkit_compat.h.orig Fri Feb 4 21:21:18 2005 ++++ modules/ssl/ssl_toolkit_compat.h Tue Aug 30 01:42:51 2005 +@@ -99,6 +99,13 @@ + #define HAVE_SSL_X509V3_EXT_d2i + #endif + ++#ifndef PEM_F_DEF_CALLBACK ++#ifdef PEM_F_PEM_DEF_CALLBACK ++/* In OpenSSL 0.9.8 PEM_F_DEF_CALLBACK was renamed */ ++#define PEM_F_DEF_CALLBACK PEM_F_PEM_DEF_CALLBACK ++#endif ++#endif ++ + #elif defined (SSLC_VERSION_NUMBER) /* RSA */ + + /* sslc does not support this function, OpenSSL has since 9.5.1 */ --- apache2-openssl-beta-0.9.8-fix.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508292359.j7TNxDP8002161>