Switch to "--with-mhash" instead (to break less users)

tianon · tianon · commit 1df250181742 · 2018-04-26T13:45:14.000-07:00
diff --git a/5.6/alpine3.4/cli/Dockerfile b/5.6/alpine3.4/cli/Dockerfile
@@ -115,7 +115,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/5.6/alpine3.4/fpm/Dockerfile b/5.6/alpine3.4/fpm/Dockerfile
@@ -116,7 +116,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/5.6/alpine3.4/zts/Dockerfile b/5.6/alpine3.4/zts/Dockerfile
@@ -116,7 +116,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile
@@ -193,6 +193,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/5.6/jessie/cli/Dockerfile b/5.6/jessie/cli/Dockerfile
@@ -134,6 +134,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/5.6/jessie/fpm/Dockerfile b/5.6/jessie/fpm/Dockerfile
@@ -135,6 +135,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/5.6/jessie/zts/Dockerfile b/5.6/jessie/zts/Dockerfile
@@ -135,6 +135,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.0/alpine3.4/cli/Dockerfile b/7.0/alpine3.4/cli/Dockerfile
@@ -115,7 +115,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.0/alpine3.4/fpm/Dockerfile b/7.0/alpine3.4/fpm/Dockerfile
@@ -116,7 +116,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.0/alpine3.4/zts/Dockerfile b/7.0/alpine3.4/zts/Dockerfile
@@ -116,7 +116,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile
@@ -193,6 +193,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.0/jessie/cli/Dockerfile b/7.0/jessie/cli/Dockerfile
@@ -134,6 +134,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.0/jessie/fpm/Dockerfile b/7.0/jessie/fpm/Dockerfile
@@ -135,6 +135,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.0/jessie/zts/Dockerfile b/7.0/jessie/zts/Dockerfile
@@ -135,6 +135,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.1/alpine3.4/cli/Dockerfile b/7.1/alpine3.4/cli/Dockerfile
@@ -115,7 +115,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.1/alpine3.4/fpm/Dockerfile b/7.1/alpine3.4/fpm/Dockerfile
@@ -116,7 +116,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.1/alpine3.4/zts/Dockerfile b/7.1/alpine3.4/zts/Dockerfile
@@ -116,7 +116,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile
@@ -193,6 +193,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.1/jessie/cli/Dockerfile b/7.1/jessie/cli/Dockerfile
@@ -134,6 +134,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.1/jessie/fpm/Dockerfile b/7.1/jessie/fpm/Dockerfile
@@ -135,6 +135,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.1/jessie/zts/Dockerfile b/7.1/jessie/zts/Dockerfile
@@ -135,6 +135,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.2/alpine3.6/cli/Dockerfile b/7.2/alpine3.6/cli/Dockerfile
@@ -116,7 +116,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.2/alpine3.6/fpm/Dockerfile b/7.2/alpine3.6/fpm/Dockerfile
@@ -117,7 +117,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.2/alpine3.6/zts/Dockerfile b/7.2/alpine3.6/zts/Dockerfile
@@ -117,7 +117,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.2/alpine3.7/cli/Dockerfile b/7.2/alpine3.7/cli/Dockerfile
@@ -116,7 +116,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.2/alpine3.7/fpm/Dockerfile b/7.2/alpine3.7/fpm/Dockerfile
@@ -117,7 +117,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.2/alpine3.7/zts/Dockerfile b/7.2/alpine3.7/zts/Dockerfile
@@ -117,7 +117,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile
@@ -195,6 +195,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile
@@ -136,6 +136,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile
@@ -137,6 +137,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile
@@ -137,6 +137,9 @@ RUN set -eux; \
 		\
 		--disable-cgi \
 		\
+# https://github.com/docker-library/php/issues/439
+		--with-mhash \
+		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
 # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -110,7 +110,7 @@ RUN set -xe \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -131,7 +131,7 @@ RUN set -eux; \
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
-		--disable-hash \
+		--with-mhash \
 		\
 # --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
 		--enable-ftp \

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ RUN set -xe \`
`115`	`115`	`--disable-cgi \`
`116`	`116`	`\`
`117`	`117`	`# https://github.com/docker-library/php/issues/439`
`118`		`- --disable-hash \`
	`118`	`+ --with-mhash \`
`119`	`119`	`\`
`120`	`120`	`# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)`
`121`	`121`	`--enable-ftp \`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ RUN set -xe \`
`116`	`116`	`--disable-cgi \`
`117`	`117`	`\`
`118`	`118`	`# https://github.com/docker-library/php/issues/439`
`119`		`- --disable-hash \`
	`119`	`+ --with-mhash \`
`120`	`120`	`\`
`121`	`121`	`# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)`
`122`	`122`	`--enable-ftp \`
Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,9 @@ RUN set -eux; \`
`193`	`193`	`\`
`194`	`194`	`--disable-cgi \`
`195`	`195`	`\`
	`196`	`+# https://github.com/docker-library/php/issues/439`
	`197`	`+ --with-mhash \`
	`198`	`+ \`
`196`	`199`	`# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)`
`197`	`200`	`--enable-ftp \`
`198`	`201`	`# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,9 @@ RUN set -eux; \`
`134`	`134`	`\`
`135`	`135`	`--disable-cgi \`
`136`	`136`	`\`
	`137`	`+# https://github.com/docker-library/php/issues/439`
	`138`	`+ --with-mhash \`
	`139`	`+ \`
`137`	`140`	`# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)`
`138`	`141`	`--enable-ftp \`
`139`	`142`	`# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,9 @@ RUN set -eux; \`
`135`	`135`	`\`
`136`	`136`	`--disable-cgi \`
`137`	`137`	`\`
	`138`	`+# https://github.com/docker-library/php/issues/439`
	`139`	`+ --with-mhash \`
	`140`	`+ \`
`138`	`141`	`# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)`
`139`	`142`	`--enable-ftp \`
`140`	`143`	`# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)`