Skip to content

Commit 1e8dc68

Browse files
shivammathurshivammathur
committed
Update formulae --build-all
1 parent 0cfe9f3 commit 1e8dc68

8 files changed

+43
-39
lines changed

‎Formula/php.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def install
184184
system "make", "install"
185185

186186
# Allow pecl to install outside of Cellar
187-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
187+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
188188
orig_ext_dir = File.basename(extension_dir)
189189
inreplace bin/"php-config", lib/"php", prefix/"pecl"
190190
inreplace "php.ini-development", %r{; ?extension_dir = "\./"},
@@ -236,7 +236,7 @@ def post_install
236236
# Custom location for extensions installed via pecl
237237
pecl_path = HOMEBREW_PREFIX/"lib/php/pecl"
238238
ln_s pecl_path, prefix/"pecl" unless (prefix/"pecl").exist?
239-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
239+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
240240
php_basename = File.basename(extension_dir)
241241
php_ext_dir = opt_prefix/"lib/php"/php_basename
242242

‎Formula/[email protected]

+9-2
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,19 @@ def install
174174
system "make", "install"
175175

176176
# Allow pecl to install outside of Cellar
177-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
177+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
178178
orig_ext_dir = File.basename(extension_dir)
179179
inreplace bin/"php-config", lib/"php", prefix/"pecl"
180180
inreplace "php.ini-development", %r{; ?extension_dir = "\./"},
181181
"extension_dir = \"#{HOMEBREW_PREFIX}/lib/php/pecl/#{orig_ext_dir}\""
182182

183+
# Use OpenSSL cert bundle
184+
openssl = Formula["[email protected]"]
185+
inreplace "php.ini-development", /; ?openssl\.cafile=/,
186+
"openssl.cafile = \"#{openssl.pkgetc}/cert.pem\""
187+
inreplace "php.ini-development", /; ?openssl\.capath=/,
188+
"openssl.capath = \"#{openssl.pkgetc}/certs\""
189+
183190
config_files = {
184191
"php.ini-development" => "php.ini",
185192
"sapi/fpm/php-fpm.conf" => "php-fpm.conf",
@@ -218,7 +225,7 @@ def post_install
218225
# Custom location for extensions installed via pecl
219226
pecl_path = HOMEBREW_PREFIX/"lib/php/pecl"
220227
ln_s pecl_path, prefix/"pecl" unless (prefix/"pecl").exist?
221-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
228+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
222229
php_basename = File.basename(extension_dir)
223230
php_ext_dir = opt_prefix/"lib/php"/php_basename
224231

‎Formula/[email protected]

+9-2
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,19 @@ def install
173173
system "make", "install"
174174

175175
# Allow pecl to install outside of Cellar
176-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
176+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
177177
orig_ext_dir = File.basename(extension_dir)
178178
inreplace bin/"php-config", lib/"php", prefix/"pecl"
179179
inreplace "php.ini-development", %r{; ?extension_dir = "\./"},
180180
"extension_dir = \"#{HOMEBREW_PREFIX}/lib/php/pecl/#{orig_ext_dir}\""
181181

182+
# Use OpenSSL cert bundle
183+
openssl = Formula["[email protected]"]
184+
inreplace "php.ini-development", /; ?openssl\.cafile=/,
185+
"openssl.cafile = \"#{openssl.pkgetc}/cert.pem\""
186+
inreplace "php.ini-development", /; ?openssl\.capath=/,
187+
"openssl.capath = \"#{openssl.pkgetc}/certs\""
188+
182189
config_files = {
183190
"php.ini-development" => "php.ini",
184191
"sapi/fpm/php-fpm.conf" => "php-fpm.conf",
@@ -218,7 +225,7 @@ def post_install
218225
# Custom location for extensions installed via pecl
219226
pecl_path = HOMEBREW_PREFIX/"lib/php/pecl"
220227
ln_s pecl_path, prefix/"pecl" unless (prefix/"pecl").exist?
221-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
228+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
222229
php_basename = File.basename(extension_dir)
223230
php_ext_dir = opt_prefix/"lib/php"/php_basename
224231

‎Formula/[email protected]

+5-4
Original file line numberDiff line numberDiff line change
@@ -166,17 +166,18 @@ def install
166166
system "make", "install"
167167

168168
# Allow pecl to install outside of Cellar
169-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
169+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
170170
orig_ext_dir = File.basename(extension_dir)
171171
inreplace bin/"php-config", lib/"php", prefix/"pecl"
172172
inreplace "php.ini-development", %r{; ?extension_dir = "\./"},
173173
"extension_dir = \"#{HOMEBREW_PREFIX}/lib/php/pecl/#{orig_ext_dir}\""
174174

175175
# Use OpenSSL cert bundle
176+
openssl = Formula["[email protected]"]
176177
inreplace "php.ini-development", /; ?openssl\.cafile=/,
177-
"openssl.cafile = \"#{etc}/openssl@1.1/cert.pem\""
178+
"openssl.cafile = \"#{openssl.pkgetc}/cert.pem\""
178179
inreplace "php.ini-development", /; ?openssl\.capath=/,
179-
"openssl.capath = \"#{etc}/openssl@1.1/certs\""
180+
"openssl.capath = \"#{openssl.pkgetc}/certs\""
180181

181182
config_files = {
182183
"php.ini-development" => "php.ini",
@@ -217,7 +218,7 @@ def post_install
217218
# Custom location for extensions installed via pecl
218219
pecl_path = HOMEBREW_PREFIX/"lib/php/pecl"
219220
ln_s pecl_path, prefix/"pecl" unless (prefix/"pecl").exist?
220-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
221+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
221222
php_basename = File.basename(extension_dir)
222223
php_ext_dir = opt_prefix/"lib/php"/php_basename
223224

‎Formula/[email protected]

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class PhpAT72 < Formula
1313

1414
keg_only :versioned_formula
1515

16-
deprecate! :date => "November 30, 2020"
16+
deprecate! :date => "2020-11-30"
1717

1818
depends_on "httpd" => [:build, :test]
1919
depends_on "pkg-config" => :build
@@ -178,7 +178,7 @@ def install
178178
system "make", "install"
179179

180180
# Allow pecl to install outside of Cellar
181-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
181+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
182182
orig_ext_dir = File.basename(extension_dir)
183183
inreplace bin/"php-config", lib/"php", prefix/"pecl"
184184
inreplace "php.ini-development", %r{; ?extension_dir = "\./"},
@@ -230,7 +230,7 @@ def post_install
230230
# Custom location for extensions installed via pecl
231231
pecl_path = HOMEBREW_PREFIX/"lib/php/pecl"
232232
ln_s pecl_path, prefix/"pecl" unless (prefix/"pecl").exist?
233-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
233+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
234234
php_basename = File.basename(extension_dir)
235235
php_ext_dir = opt_prefix/"lib/php"/php_basename
236236

‎Formula/[email protected]

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class PhpAT73 < Formula
1313

1414
keg_only :versioned_formula
1515

16-
deprecate! :date => "December 6, 2021"
16+
deprecate! :date => "2021-12-06"
1717

1818
depends_on "httpd" => [:build, :test]
1919
depends_on "pkg-config" => :build
@@ -178,7 +178,7 @@ def install
178178
system "make", "install"
179179

180180
# Allow pecl to install outside of Cellar
181-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
181+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
182182
orig_ext_dir = File.basename(extension_dir)
183183
inreplace bin/"php-config", lib/"php", prefix/"pecl"
184184
inreplace "php.ini-development", %r{; ?extension_dir = "\./"},
@@ -235,7 +235,7 @@ def post_install
235235
# Custom location for extensions installed via pecl
236236
pecl_path = HOMEBREW_PREFIX/"lib/php/pecl"
237237
ln_s pecl_path, prefix/"pecl" unless (prefix/"pecl").exist?
238-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
238+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
239239
php_basename = File.basename(extension_dir)
240240
php_ext_dir = opt_prefix/"lib/php"/php_basename
241241

‎Formula/[email protected]

+8-6
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ class PhpAT80 < Formula
1111

1212
keg_only :versioned_formula
1313

14+
depends_on "bison" => :build
1415
depends_on "httpd" => [:build, :test]
1516
depends_on "pkg-config" => :build
17+
depends_on "re2c" => :build
1618
depends_on "apr"
1719
depends_on "apr-util"
1820
depends_on "argon2"
1921
depends_on "aspell"
2022
depends_on "autoconf"
21-
depends_on "bison"
2223
depends_on "curl-openssl"
2324
depends_on "freetds"
2425
depends_on "freetype"
@@ -36,7 +37,7 @@ class PhpAT80 < Formula
3637
depends_on "oniguruma"
3738
depends_on "openldap"
3839
depends_on "[email protected]"
39-
depends_on "re2c"
40+
4041
depends_on "sqlite"
4142
depends_on "tidyp"
4243
depends_on "unixodbc"
@@ -183,17 +184,18 @@ def install
183184
system "make", "install"
184185

185186
# Allow pecl to install outside of Cellar
186-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
187+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
187188
orig_ext_dir = File.basename(extension_dir)
188189
inreplace bin/"php-config", lib/"php", prefix/"pecl"
189190
inreplace "php.ini-development", %r{; ?extension_dir = "\./"},
190191
"extension_dir = \"#{HOMEBREW_PREFIX}/lib/php/pecl/#{orig_ext_dir}\""
191192

192193
# Use OpenSSL cert bundle
194+
openssl = Formula["[email protected]"]
193195
inreplace "php.ini-development", /; ?openssl\.cafile=/,
194-
"openssl.cafile = \"#{etc}/openssl@1.1/cert.pem\""
196+
"openssl.cafile = \"#{openssl.pkgetc}/cert.pem\""
195197
inreplace "php.ini-development", /; ?openssl\.capath=/,
196-
"openssl.capath = \"#{etc}/openssl@1.1/certs\""
198+
"openssl.capath = \"#{openssl.pkgetc}/certs\""
197199

198200
config_files = {
199201
"php.ini-development" => "php.ini",
@@ -234,7 +236,7 @@ def post_install
234236
# Custom location for extensions installed via pecl
235237
pecl_path = HOMEBREW_PREFIX/"lib/php/pecl"
236238
ln_s pecl_path, prefix/"pecl" unless (prefix/"pecl").exist?
237-
extension_dir = Utils.popen_read("#{bin}/php-config --extension-dir").chomp
239+
extension_dir = Utils.safe_popen_read("#{bin}/php-config --extension-dir").chomp
238240
php_basename = File.basename(extension_dir)
239241
php_ext_dir = opt_prefix/"lib/php"/php_basename
240242

‎Patches/openssl.patch

+4-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
1-
Subject: [PATCH] PHP 5.6 - LibSSL 1.1 compatibility
1+
From c24860dc09845d3d2538ec7447e5edec638e029d Mon Sep 17 00:00:00 2001
2+
From: zsalab <[email protected]>
3+
Date: Tue, 1 Aug 2017 01:43:04 +0200
4+
Subject: OpenSSL 1.1.0 compatibility
25

3-
This patch does not try to backport the 7.1 openssl module, it is the
4-
improved version of the 5.6 original openssl module.
5-
6-
https://github.com/oerdnj/deb.sury.org/issues/566
7-
http://zettasystem.com/PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch
8-
9-
Upstream-Status: Deny [https://github.com/php/php-src/pull/2667]
10-
Reason: As PHP 5.6 is no longer actively supported only security fixes
11-
may land on this branch. As this change does not fall in this category,
12-
I'm closing this PR. (All higher versions of PHP already have OpenSSL
13-
1.1 support.)
14-
15-
Author: zsalab@github https://github.com/zsalab
16-
17-
Only port source modification, do not include the test case
18-
Signed-off-by: Hongxu Jia <[email protected]>
196
---
207
ext/openssl/openssl.c | 683 +++++++++++++++++++++++++++++++++++++-------------
218
ext/openssl/xp_ssl.c | 18 +-

0 commit comments

Comments
 (0)