summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortz <tz@FreeBSD.org>2017-07-11 08:38:07 +0000
committertz <tz@FreeBSD.org>2017-07-11 08:38:07 +0000
commitae7c3b4e2e84b2d3116360d1029f6bed338874c8 (patch)
tree7f6a0392609da61a2dd851eb887b8290e874df9f
parent1f73a6e865aae11d4e1a9fb3f9b0538864f1c0e4 (diff)
downloadFreeBSD-ports-ae7c3b4e2e84b2d3116360d1029f6bed338874c8.zip
FreeBSD-ports-ae7c3b4e2e84b2d3116360d1029f6bed338874c8.tar.gz
MFH: r445429
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 Approved by: ports-secteam (junovitch)
-rw-r--r--converters/php70-mbstring/Makefile2
-rw-r--r--converters/php71-mbstring/Makefile2
-rw-r--r--lang/php70/Makefile.ext2
-rw-r--r--lang/php71/Makefile.ext4
4 files changed, 9 insertions, 1 deletions
diff --git a/converters/php70-mbstring/Makefile b/converters/php70-mbstring/Makefile
index 6341203..7e099e5 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 4674db7..d9901c3 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 16b7504..bf8d576 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 39c9ab4..17323f4 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
OpenPOWER on IntegriCloud