svn commit: r350649 - head/www/apache22
Olli Hauer
ohauer at FreeBSD.org
Tue Apr 8 23:33:58 UTC 2014
Author: ohauer
Date: Tue Apr 8 23:33:57 2014
New Revision: 350649
URL: http://svnweb.freebsd.org/changeset/ports/350649
QAT: https://qat.redports.org/buildarchive/r350649/
Log:
- 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@
Modified:
head/www/apache22/Makefile
Modified: head/www/apache22/Makefile
==============================================================================
--- head/www/apache22/Makefile Tue Apr 8 23:24:59 2014 (r350648)
+++ head/www/apache22/Makefile Tue Apr 8 23:33:57 2014 (r350649)
@@ -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
More information about the svn-ports-all
mailing list