From owner-svn-ports-head@FreeBSD.ORG  Tue Apr  8 23:33:58 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3E563816;
 Tue,  8 Apr 2014 23:33:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2B50514F5;
 Tue,  8 Apr 2014 23:33:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38NXwWm077005;
 Tue, 8 Apr 2014 23:33:58 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38NXwmr077004;
 Tue, 8 Apr 2014 23:33:58 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201404082333.s38NXwmr077004@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Tue, 8 Apr 2014 23:33:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350649 - head/www/apache22
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Apr 2014 23:33:58 -0000

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