diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2005-09-10 14:26:48 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2005-09-10 14:26:48 +0000 |
| commit | 8404a38b4a8b1298e401394c8b7200fe60d96a48 (patch) | |
| tree | 4c9456b9cc616e3963bc355cecc8b53724a1f80e /www/apache2 | |
| parent | Fix a problem (variable declararions in the middle of a function) with non (diff) | |
- Fix build if WITH_OPENSSL_BETA is defined.
PR: ports/85457
Submitted by: Daniel Roethlisberger <daniel@roe.ch>
Notes
Notes:
svn path=/head/; revision=142344
Diffstat (limited to 'www/apache2')
| -rw-r--r-- | www/apache2/Makefile | 4 | ||||
| -rw-r--r-- | www/apache2/files/build-fix-openssl_beta | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 44c46a7bae65..f5d159ad90b7 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -45,6 +45,10 @@ IGNORE= : Please define WITH_KQUEUE_SUPPORT instead EXTRA_PATCHES+= ${FILESDIR}/exp-apr-kqueue.patch .endif +.if defined(WITH_OPENSSL_BETA) +EXTRA_PATCHES+= ${FILESDIR}/build-fix-openssl_beta +.endif + SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \ LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \ diff --git a/www/apache2/files/build-fix-openssl_beta b/www/apache2/files/build-fix-openssl_beta new file mode 100644 index 000000000000..04f018790793 --- /dev/null +++ b/www/apache2/files/build-fix-openssl_beta @@ -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 */ |