fixes regarding cert support

liip · May 5, 2017 · 02675fc · 02675fc
1 parent 359c513
commit 02675fc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/lib/Package/curl.pm b/lib/Package/curl.pm
@@ -26,6 +26,7 @@ sub configure_flags {
 		'--enable-ldaps',
 		'--disable-dependency-tracking',
 		'--with-ssl=/usr/local/php5',
+		'--with-ca-bundle=/usr/local/php5/ssl/cert.pem',
 		'--with-libidn='.$self->config()->prefix(),
 		'--disable-ares'
 	);

diff --git a/lib/Package/libiodbc.pm b/lib/Package/libiodbc.pm
@@ -33,7 +33,7 @@ sub configure_flags {
 
 
 sub subpath_for_check {
-	return "lib/libxml2.dylib";
+	return "lib/libodbc.a";
 }
 
 

diff --git a/lib/Package/php5.pm b/lib/Package/php5.pm
@@ -189,8 +189,9 @@ sub install {
 	#}
 	$self->shell({silent => 0}, "test -d $prefix/php.d || mkdir $prefix/php.d");
 	$self->shell({silent => 0}, "perl -p -i -e 's# -L\\S+c-client##' $prefix/bin/php-config");
-	$self->shell({silent => 0}, "curl -o $prefix/ssl/certs/cacert.pem https://curl.haxx.se/ca/cacert.pem");
-    $self->shell({silent => 0}, "echo 'openssl.cafile=/usr/local/php5/ssl/certs/cacert.pem' >> $prefix/php.d/40-openssl.ini");
+	$self->shell({silent => 0}, "curl -o $prefix/ssl/cert.pem https://curl.haxx.se/ca/cacert.pem");
+    $self->shell({silent => 0}, "echo 'openssl.cafile=/usr/local/php5/ssl/cert.pem' >> $prefix/php.d/40-openssl.ini");
+    $self->shell({silent => 0}, "echo 'curl.cainfo=/usr/local/php5/ssl/cert.pem' >> $prefix/php.d/40-curl.ini");
 
 	$self->create_dso_ini_files();