Merge remote-tracking branch 'origin/5_6_yosemite' into 7_0_yosemite

* origin/5_6_yosemite:
  curl version 7.54.0 compile against openssl openssl version 1.0.2k
  5.6.30
  5.6.29
  PHP 5.6.27
  latest libcurl

build-php.pl

@@ -15,7 +15,7 @@
 use Package::libevent;
 use Package::intl;
 use Package::memcached;
-use Package::memcache;
+#use Package::memcache;
 use Package::xhprof;
 use Package::twig;
 use Package::APC;
@@ -60,7 +60,7 @@
 			suffix       => '-apache2',
 		},
 	},
-	version              => '7.0.15',
+	version              => '7.0.18',
 	release              => 1,
 	debug                => 1,
 );
@@ -80,8 +80,8 @@
 
 #libmemcached doesn't yet compile on 10.10
 # TODO: adjust for 7.0
-#my $memcached = Package::memcached->new(config => $config, variant => 'apache2');
-#$memcached->install();
+my $memcached = Package::memcached->new(config => $config, variant => 'apache2');
+$memcached->install();
 
 # TODO: adjust for 7.0
 #my $memcache = Package::memcache->new(config => $config, variant => 'apache2');

lib/Package/curl.pm

@@ -5,7 +5,7 @@ use warnings;
 
 use base qw(Package);
 
-our $VERSION = '7.47.1';
+our $VERSION = '7.54.0';
 
 sub base_url {
 	return "http://curl.haxx.se/download";
@@ -25,7 +25,7 @@ sub configure_flags {
 		$self->SUPER::configure_flags(@_),
 		'--enable-ldaps',
 		'--disable-dependency-tracking',
-		'--with-darwinssl',
+		'--with-ssl=/usr/local/php5',
 		'--with-libidn='.$self->config()->prefix(),
 		'--disable-ares'
 	);

lib/Package/openssl.pm

@@ -5,7 +5,7 @@ use warnings;
 
 use base qw(Package);
 
-our $VERSION = '1.0.2h';
+our $VERSION = '1.0.2k';
 
 sub base_url {
 	return "https://www.openssl.org/source/";