From 82a1457e250772b93f3e63ce6c44e9a21f0077d6 Mon Sep 17 00:00:00 2001 From: tz Date: Mon, 10 Jul 2017 11:40:48 +0000 Subject: PHP 7.0 and 7.1: switch to devel/oniguruma6 For mbstring extensions switch from devel/oniguruma5 to devel/oniguruma6 to fix security issues covert in Oniguruma 6.4. PHP bundles oniguruma 6.3 but i did some more tests, to make sure nothing breaks. Also add $FreeBSD$ header to Makefile.ext PR: 220598 Submitted by: Trond.Endrestol@ximalas.info MFH: 2017Q3 --- converters/php70-mbstring/Makefile | 2 ++ converters/php71-mbstring/Makefile | 2 ++ lang/php70/Makefile.ext | 2 ++ lang/php71/Makefile.ext | 4 +++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/converters/php70-mbstring/Makefile b/converters/php70-mbstring/Makefile index 634120319c67..7e099e5ffc22 100644 --- a/converters/php70-mbstring/Makefile +++ b/converters/php70-mbstring/Makefile @@ -3,6 +3,8 @@ CATEGORIES= converters +PORTREVISION= 1 + MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -mbstring diff --git a/converters/php71-mbstring/Makefile b/converters/php71-mbstring/Makefile index 4674db771e06..d9901c3faa2a 100644 --- a/converters/php71-mbstring/Makefile +++ b/converters/php71-mbstring/Makefile @@ -2,6 +2,8 @@ CATEGORIES= converters +PORTREVISION= 1 + MASTERDIR= ${.CURDIR}/../../lang/php71 PKGNAMESUFFIX= -mbstring diff --git a/lang/php70/Makefile.ext b/lang/php70/Makefile.ext index 16b7504c903b..bf8d57699a64 100644 --- a/lang/php70/Makefile.ext +++ b/lang/php70/Makefile.ext @@ -1,3 +1,5 @@ +# $FreeBSD$ + COMMENT= The ${PHP_MODNAME} shared extension for php USES+= php:ext diff --git a/lang/php71/Makefile.ext b/lang/php71/Makefile.ext index 39c9ab4c0c4d..17323f4ec79a 100644 --- a/lang/php71/Makefile.ext +++ b/lang/php71/Makefile.ext @@ -1,3 +1,5 @@ +# $FreeBSD$ + COMMENT= The ${PHP_MODNAME} shared extension for php USES+= php:ext @@ -532,7 +534,7 @@ LIB_DEPENDS+= libc-client4.so.9:mail/cclient .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} -LIB_DEPENDS+= libonig.so:devel/oniguruma5 +LIB_DEPENDS+= libonig.so:devel/oniguruma6 CONFIGURE_ARGS+=--with-onig=${LOCALBASE} . else CONFIGURE_ARGS+=--disable-mbregex -- cgit