diff options
| author | clement <clement@FreeBSD.org> | 2004-01-09 18:56:12 +0000 |
|---|---|---|
| committer | clement <clement@FreeBSD.org> | 2004-01-09 18:56:12 +0000 |
| commit | a9cc2910dbdd45352a578c3e4e4a6334f4f9c46e (patch) | |
| tree | 3bad60076302dfdfe6aa2de5cfca942cbad3f387 /www/apache2 | |
| parent | 380dfe6e3981c585b044ada1b80a83e9ea700b9e (diff) | |
| download | FreeBSD-ports-a9cc2910dbdd45352a578c3e4e4a6334f4f9c46e.zip FreeBSD-ports-a9cc2910dbdd45352a578c3e4e4a6334f4f9c46e.tar.gz | |
- fix SSL detection problem on stable with base OpenSSL [1]
Force the use of SSL_EXPERIMENTAL_ENGINE *only* if the user uses
-STABLE and base OpenSSL.
This is an *apache* problem. It's not the port.
I strongly encourage users to use OpenSSL from ports.
From httpd-2.0 Status:
* mod_ssl: fix a link failure when the openssl-engine libraries are
present but the engine headers are missing.
- fix a typo in WITH_DBM, should be bdb and not db [1]
I keep db for backward compatibility
- Add WITH_APR_FROM_PORTS to use devel/apr with apache2.
!!! WARNING !!! apache-2.0.48 is designed to work with apr 0.9.5.
Noticed by: Fritz Heinrichmeyer <Fritz.Heinrichmeyer@Fernuni-Hagen.de> [1]
Approved by: erwin (mentor)
Diffstat (limited to 'www/apache2')
| -rw-r--r-- | www/apache2/Makefile | 10 | ||||
| -rw-r--r-- | www/apache2/Makefile.modules | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 016f212..ee695f8 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -74,6 +74,16 @@ USE_OPENSSL= yes CONFIGURE_ARGS+= --enable-static-support .endif +# Untested and may fail ! +.if defined(WITH_APR_FROM_PORTS) +. if defined (WITH_BDB) || defined(WITH_BERKELEYDB) +BROKEN= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined" +.endif +LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr +CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \ + --with-apr-util=${LOCALBASE}/bin/apr-config +.endif + # for slave ports .if !defined(MASTERDIR) APACHEDIR= ${.CURDIR} diff --git a/www/apache2/Makefile.modules b/www/apache2/Makefile.modules index a22e333..a0ab7fa 100644 --- a/www/apache2/Makefile.modules +++ b/www/apache2/Makefile.modules @@ -42,7 +42,7 @@ PLIST_SUB+= PREFORK="@comment " WORKER="@comment " # xDBM section # .if !defined(WITH_DBM) && defined(WITH_BERKELEYDB) -WITH_DBM=db +WITH_DBM=bdb .endif .if defined(WITH_DBM) && !defined(WITH_BERKELEYDB) WITH_BERKELEYDB= FreeBSD @@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --with-dbm=sdbm . elif ${WITH_DBM:L} == "gdbm" LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE} -. elif ${WITH_DBM:L} == "db" +. elif ${WITH_DBM:L} == "db" || ${WITH_DBM:L} == "bdb" . if ${WITH_BERKELEYDB} == "FreeBSD" CONFIGURE_ARGS+= --with-dbm=db185 \ --with-berkeley-db=/usr @@ -182,6 +182,9 @@ _APACHE_MODULES+= ${WITH_CUSTOM_THREADS} _APACHE_MODULES+= ${SSL_MODULE} CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} RC_SUB+= -e 's,@@SSL@@,ssl,g' +. if ${OPENSSLBASE} == /usr && ${OSVERSION} < 500000 +CFLAGS+= -DSSL_EXPERIMENTAL_ENGINE +. endif .else RC_SUB+= -e 's,@@SSL@@,,g' .endif |
