diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2014-04-08 23:33:57 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2014-04-08 23:33:57 +0000 |
| commit | 9036e665643ff14f7c7fa8e56be6a9f4058f5676 (patch) | |
| tree | 8f7f1965aa4290ced8de31e88a7d8236c061a7be /www | |
| parent | - Update to 3.2 (diff) | |
- fix build on FreeBSD-10+ with OpenSSL from ports
- bump PORTVERSION because of CVE-2014-0076 / CVE-2014-0160
Special Thanks to Philip Jocks for reporting and testing!
http://lists.freebsd.org/pipermail/freebsd-apache/2014-April/003483.html
with hat apache@
Notes
Notes:
svn path=/head/; revision=350649
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache22/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 79fafe0a1591..db1cf7116a29 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -2,7 +2,7 @@ PORTNAME= apache22 PORTVERSION= 2.2.27 -#PORTREVISION?= 1 +PORTREVISION?= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} @@ -149,6 +149,15 @@ post-patch: @${RM} -rf ${WRKSRC}/srclib @${REINPLACE_CMD} -e 's/srclib//' ${WRKSRC}/Makefile.in +# Fix build on FreeBSD-10+ with OpenSSL from ports +.if ${PORT_OPTIONS:MSSL} +. if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 +. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" + ${REINPLACE_CMD} -e "s|(ALL_CFLAGS)|(ALL_CFLAGS) -L${OPENSSLLIB}|" ${WRKSRC}/build/rules.mk.in +. endif +. endif +.endif + post-configure: @FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\ ${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$${FTPUSERS}," ${WRKSRC}/docs/conf/extra/httpd-userdir.conf |