svn commit: r429144 - in branches/2016Q4/www/apache24: . files

[Olli Hauer]

Author: ohauer
Date: Thu Dec 22 06:27:09 2016
New Revision: 429144
URL: https://svnweb.freebsd.org/changeset/ports/429144

Log:
  MFH: r425421 r429063
  
  - Add LICENSE
  - update to 2.4.25
  
  PR:		215457
  Reported by:	Apache Software Foundation
  Security:	vid 862d6ab3-c75e-11e6-9f98-20cf30e32f6d
  		CVE-2016-8743
  		CVE-2016-2161
  		CVE-2016-0736
  		CVE-2016-8740
  		CVE-2016-5387
  
  Approved by:	ports-secteam (junovitch)

Deleted:
  branches/2016Q4/www/apache24/files/patch-CVE-2016-8740
  branches/2016Q4/www/apache24/files/patch-httpoxy
Modified:
  branches/2016Q4/www/apache24/Makefile
  branches/2016Q4/www/apache24/distinfo
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/www/apache24/Makefile
==============================================================================
--- branches/2016Q4/www/apache24/Makefile	Thu Dec 22 06:24:48 2016	(r429143)
+++ branches/2016Q4/www/apache24/Makefile	Thu Dec 22 06:27:09 2016	(r429144)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	apache24
-PORTVERSION=	2.4.23
-PORTREVISION=	2
+PORTVERSION=	2.4.25
 CATEGORIES=	www ipv6
 MASTER_SITES=	APACHE_HTTPD
 DISTNAME=	httpd-${PORTVERSION}
@@ -11,6 +10,9 @@ DIST_SUBDIR=	apache24
 MAINTAINER=	apache at FreeBSD.org
 COMMENT=	Version 2.4.x of Apache web server
 
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libapr-1.so:devel/apr1 \
 		libpcre.so:devel/pcre
@@ -150,7 +152,7 @@ USE_GNOME=	libxml2
 
 post-extract:
 # remove possible leftover .svn directories in the sources
-	@${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -r
 # limit grep results ...
 	@${FIND} ${WRKSRC} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' -o -name '*.vbs' -o -name '*.wsf' \) -delete
 # make sure the configure script contains our patches, preserve the original script for comparsion
@@ -168,7 +170,7 @@ post-patch:
 		${WRKSRC}/include/httpd.h
 	${REINPLACE_CMD} -e 's|perlbin=.*|perlbin=${PERL}|' \
 		${WRKSRC}/configure.in
-	${RM} -f ${WRKSRC}/docs/docroot/*.bak
+	${RM} ${WRKSRC}/docs/docroot/*.bak
 	${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
 
 pre-configure::

Modified: branches/2016Q4/www/apache24/distinfo
==============================================================================
--- branches/2016Q4/www/apache24/distinfo	Thu Dec 22 06:24:48 2016	(r429143)
+++ branches/2016Q4/www/apache24/distinfo	Thu Dec 22 06:27:09 2016	(r429144)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467307196
-SHA256 (apache24/httpd-2.4.23.tar.bz2) = 0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58
-SIZE (apache24/httpd-2.4.23.tar.bz2) = 6351875
+TIMESTAMP = 1482168542
+SHA256 (apache24/httpd-2.4.25.tar.bz2) = f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2
+SIZE (apache24/httpd-2.4.25.tar.bz2) = 6398218