[arch-commits] Commit in hhvm/trunk (3 files)
Date: Friday, March 27, 2015 @ 11:38:48
Author: mtorromeo
Revision: 130028
upgpkg: hhvm 3.6.1-1
Updated to version 3.6.1
Modified:
hhvm/trunk/PKGBUILD
Deleted:
hhvm/trunk/fastcgi-https.diff
hhvm/trunk/mcrouter-chrono-fix.patch
---+
PKGBUILD | 15 ---
fastcgi-https.diff| 41 -
mcrouter-chrono-fix.patch | 25 -
3 files changed, 4 insertions(+), 77 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-27 10:12:46 UTC (rev 130027)
+++ PKGBUILD2015-03-27 10:38:48 UTC (rev 130028)
@@ -3,7 +3,7 @@
# Contributor: James Miller
pkgname=hhvm
-pkgver=3.6.0
+pkgver=3.6.1
pkgrel=1
_thirdparty_commit=3bf14f9194bff0f681ee60bc6e5f1ac60b233f5c
@@ -12,7 +12,6 @@
_proxygen_commit=d17b4e7735ab728d77266a538cef4dcfc57b5fbd
_webscalesql_commit=004b6b348fdf48f0aa4e3fe1010b891d4fdb9f70
_mcrouter_commit=addcc91aee3942f4e50760a43fdcb052482be00e
-_re2_commit=bdb5058dcf7a3e6e8fe524a6214d5a7a6e9dcba2
_squangle_commit=269cd2e30a88b16b1cdf12f1eec5a1c16cb8be10
pkgdesc="Virtual Machine, Runtime, and JIT for PHP"
@@ -36,9 +35,7 @@
'hhvm.service'
'hhvm@.service'
'php.ini'
-'server.ini'
-'mcrouter-chrono-fix.patch'
-'fastcgi-https.diff')
+'server.ini')
install=hhvm.install
backup=(etc/hhvm/{php,server}.ini)
options+=('!buildflags')
@@ -45,8 +42,6 @@
prepare() {
cd "$srcdir"/$pkgname-HHVM-$pkgver
-patch -p1 -i "$srcdir"/mcrouter-chrono-fix.patch
-patch -p1 -i "$srcdir"/fastcgi-https.diff
# Fix sendmail path
sed -r 's#/usr/lib/sendmail#/usr/bin/sendmail#g' -i \
@@ -127,7 +122,7 @@
install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini
}
-sha256sums=('5840d7caf7f8b57e35953e98fa89fa697f810c8de784950f31953cf36f9ce987'
+sha256sums=('d7af553ee149c026ded7728e68fea876806496c3e1d26e3b49c08da641e0b5db'
'67594f86a25d3c1b468b0b4255018df8442db811899b41432775f031938cbd8f'
'f09a38084cc4b8c9cc2ac70daf025d7c2f1710c2eae38fd7aec2b6c29b6e70aa'
'd58cbfc110761bd70b74b849b3eb83b3e43e066cbf1969f403d47630a22d5bef'
@@ -139,6 +134,4 @@
'8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
'59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
'3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
-'5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0'
-'5994219fe94d22f135f8cf6ea312e8096204c19da7c3a460c3c26d62e14c291d'
-'632c3e83e45fbf834415e037e7fc1555ada6d8e09063644a9d23872cb1d499de')
+'5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0')
Deleted: fastcgi-https.diff
===
--- fastcgi-https.diff 2015-03-27 10:12:46 UTC (rev 130027)
+++ fastcgi-https.diff 2015-03-27 10:38:48 UTC (rev 130028)
@@ -1,41 +0,0 @@
-diff --git a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
-+++ b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
-@@ -298,7 +298,7 @@
- }
-
- // IIS sets this value but sets it to off when SSL is off.
-- if (m_requestParams.count("HTTPS") &&
-+ if (m_requestParams.count("HTTPS") && !m_requestParams["HTTPS"].empty() &&
- strcasecmp(m_requestParams["HTTPS"].c_str(), "OFF")) {
- setSSL();
- }
-diff --git a/hphp/test/server/fastcgi/server_root/test_https.php
b/hphp/test/server/fastcgi/server_root/test_https.php
-new file mode 100644
/dev/null
-+++ b/hphp/test/server/fastcgi/server_root/test_https.php
-@@ -0,0 +1,2 @@
-+ '');
-+ var_dump(request(php_uname('n'), $serverPort, "test_https.php",
-+ [], [], $args));
-+}
-+
-+runTest("httpsTestController");
-diff --git a/hphp/test/server/fastcgi/tests/httpsTest.php.expect
b/hphp/test/server/fastcgi/tests/httpsTest.php.expect
-new file mode 100644
/dev/null
-+++ b/hphp/test/server/fastcgi/tests/httpsTest.php.expect
-@@ -0,0 +1 @@
-+string(12) "string(0) """
Deleted: mcrouter-chrono-fix.patch
===
--- mcrouter-chrono-fix.patch 2015-03-27 10:12:46 UTC (rev 130027)
+++ mcrouter-chrono-fix.patch 2015-03-27 10:38:48 UTC (rev 130028)
@@ -1,25 +0,0 @@
-diff --git a/CMake/HPHPSetup.cmake b/CMake/HPHPSetup.cmake
-index 48e7da7..7585b24 100644
a/CMake/HPHPSetup.cmake
-+++ b/CMake/HPHPSetup.cmake
-@@ -230,15 +230,16 @@ if (NOT FASTLZ_LIBRARY)
- include_directories("${TP_DIR}/fastlz")
- endif()
-
--if (ENABLE_MCROUTER)
-- include_directories("${TP_DIR}/mcrouter")
--endif()
--
- include_directories("${TP_DIR}/timelib")
- include_directories("${TP_DIR}/libafdt/src")
- include_directories("${TP_DIR}/libmbfl")
- include_direct
[arch-commits] Commit in hhvm/trunk (3 files)
Date: Thursday, March 12, 2015 @ 15:18:01
Author: mtorromeo
Revision: 129131
upgpkg: hhvm 3.6.0-1
Update to 3.6.0 and fixed #44141
Added:
hhvm/trunk/fastcgi-https.diff
hhvm/trunk/mcrouter-chrono-fix.patch
Modified:
hhvm/trunk/PKGBUILD
---+
PKGBUILD | 66 ++--
fastcgi-https.diff| 41 +++
mcrouter-chrono-fix.patch | 25
3 files changed, 118 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-12 14:01:20 UTC (rev 129130)
+++ PKGBUILD2015-03-12 14:18:01 UTC (rev 129131)
@@ -3,12 +3,18 @@
# Contributor: James Miller
pkgname=hhvm
-pkgver=3.5.1
-_thirdparty_commit=d0cad57b5427f84af8f77d60b8b53de4aaea4694
-_folly_commit=6f9b619d9ffc219296a818a83266d60628e6aedd
-_thrift_commit=bba5d4590ff71e8f34ce4f90a8d7b2cf867ca3d0
-_proxygen_commit=8a602aa40383d6dddbdcb2a951067b9923edfc74
+pkgver=3.6.0
pkgrel=1
+
+_thirdparty_commit=3bf14f9194bff0f681ee60bc6e5f1ac60b233f5c
+_folly_commit=7d2497f0e57fb14b6ea43a5a2d180604d7e1e7e5
+_thrift_commit=d30280a33ed2c67672b0295872397e5affb60f8c
+_proxygen_commit=d17b4e7735ab728d77266a538cef4dcfc57b5fbd
+_webscalesql_commit=004b6b348fdf48f0aa4e3fe1010b891d4fdb9f70
+_mcrouter_commit=addcc91aee3942f4e50760a43fdcb052482be00e
+_re2_commit=bdb5058dcf7a3e6e8fe524a6214d5a7a6e9dcba2
+_squangle_commit=269cd2e30a88b16b1cdf12f1eec5a1c16cb8be10
+
pkgdesc="Virtual Machine, Runtime, and JIT for PHP"
arch=('x86_64')
url="http://hhvm.com";
@@ -15,18 +21,24 @@
license=('PHP')
depends=('boost-libs' 'google-glog' 'libmysqlclient' 'libmemcached' 'libzip'
'libxslt' 'intel-tbb' 'libmcrypt' 'oniguruma' 'jemalloc' 'curl'
'libvpx'
- 'libdwarf' 'imagemagick' 'libedit' 'sqlite' 'libyaml' 'fribidi')
-makedepends=('git' 'cmake' 'gcc' 'boost' 'gflags' 'python2' 'pfff' 'mongodb')
+ 'libdwarf' 'imagemagick' 'libedit' 'sqlite' 'libyaml' 'fribidi' 're2')
+makedepends=('git' 'cmake' 'gcc' 'boost' 'gflags' 'python2' 'pfff' 'mongodb'
+ 'ragel' 'libmariadbclient' 'unixodbc')
source=("https://github.com/facebook/hhvm/archive/HHVM-$pkgver.tar.gz";
"hhvm-third-party-$_thirdparty_commit.tar.gz::https://github.com/hhvm/hhvm-third-party/archive/$_thirdparty_commit.tar.gz";
"folly-$_folly_commit.tar.gz::https://github.com/facebook/folly/archive/$_folly_commit.tar.gz";
"thrift-$_thrift_commit.tar.gz::https://github.com/facebook/fbthrift/archive/$_thrift_commit.tar.gz";
"proxygen-$_proxygen_commit.tar.gz::https://github.com/facebook/proxygen/archive/$_proxygen_commit.tar.gz";
+
"webscalesql-$_webscalesql_commit.tar.gz::https://github.com/webscalesql/webscalesql-5.6/archive/$_webscalesql_commit.tar.gz";
+
"mcrouter-$_mcrouter_commit.tar.gz::https://github.com/facebook/mcrouter/archive/$_mcrouter_commit.tar.gz";
+
"squangle-$_squangle_commit.tar.gz::https://github.com/facebook/squangle/archive/$_squangle_commit.tar.gz";
'hhvm.tmpfile'
'hhvm.service'
'hhvm@.service'
'php.ini'
-'server.ini')
+'server.ini'
+'mcrouter-chrono-fix.patch'
+'fastcgi-https.diff')
install=hhvm.install
backup=(etc/hhvm/{php,server}.ini)
options+=('!buildflags')
@@ -33,7 +45,13 @@
prepare() {
cd "$srcdir"/$pkgname-HHVM-$pkgver
+patch -p1 -i "$srcdir"/mcrouter-chrono-fix.patch
+patch -p1 -i "$srcdir"/fastcgi-https.diff
+# Fix sendmail path
+sed -r 's#/usr/lib/sendmail#/usr/bin/sendmail#g' -i \
+hphp/runtime/base/runtime-option.cpp
+
rm -rf third-party
ln -s "$srcdir"/hhvm-third-party-$_thirdparty_commit third-party
@@ -48,6 +66,20 @@
cd ../proxygen
rm -rf src
ln -s "$srcdir"/proxygen-$_proxygen_commit src
+
+cd ../mcrouter
+rm -rf src
+ln -s "$srcdir"/mcrouter-$_mcrouter_commit src
+
+cd ../squangle
+rm -rf src squangle
+ln -s "$srcdir"/squangle-$_squangle_commit src
+ln -s src/squangle
+
+cd ../webscalesqlclient
+rm -rf src webscalesql-5.6
+ln -s "$srcdir"/webscalesql-5.6-$_webscalesql_commit webscalesql-5.6
+ln -s "$srcdir"/webscalesql-5.6-$_webscalesql_commit src
}
build() {
@@ -60,6 +92,7 @@
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_PREFIX_PATH="$srcdir" \
-DENABLE_MONGO:BOOL=ON \
+-DMYSQL_UNIX_SOCK_ADDR=/run/mysqld/mysqld.sock \
.
make
@@ -94,13 +127,18 @@
install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini
}
-sha256sums=('b0438941a8e88c8505d78d87e008f3402133f4b253da07d2936876fb245311b8'
-'c62bc664fd96de44aedc07e2cf136b7ff712001f53d41b003c260c50c8ec9e8e'
-'00922bf8128f368fa8b3a1b0ab6d79086a77a9f95484bf020d0f06bcd4710441'
-'b5338bb0299651ccffef826348a50618c92980e619dbc9eb34f16c9ff4a6765a'
-'34fbb931fe112dca460f765d2552241914dcc
