[arch-commits] Commit in hhvm/repos/community-x86_64 (16 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Fri Mar 27 10:39:11 UTC 2015
Date: Friday, March 27, 2015 @ 11:39:11
Author: mtorromeo
Revision: 130029
archrelease: copy trunk to community-x86_64
Added:
hhvm/repos/community-x86_64/PKGBUILD
(from rev 130028, hhvm/trunk/PKGBUILD)
hhvm/repos/community-x86_64/hhvm.install
(from rev 130028, hhvm/trunk/hhvm.install)
hhvm/repos/community-x86_64/hhvm.service
(from rev 130028, hhvm/trunk/hhvm.service)
hhvm/repos/community-x86_64/hhvm.tmpfile
(from rev 130028, hhvm/trunk/hhvm.tmpfile)
hhvm/repos/community-x86_64/hhvm at .service
(from rev 130028, hhvm/trunk/hhvm at .service)
hhvm/repos/community-x86_64/php.ini
(from rev 130028, hhvm/trunk/php.ini)
hhvm/repos/community-x86_64/server.ini
(from rev 130028, hhvm/trunk/server.ini)
Deleted:
hhvm/repos/community-x86_64/PKGBUILD
hhvm/repos/community-x86_64/fastcgi-https.diff
hhvm/repos/community-x86_64/hhvm.install
hhvm/repos/community-x86_64/hhvm.service
hhvm/repos/community-x86_64/hhvm.tmpfile
hhvm/repos/community-x86_64/hhvm at .service
hhvm/repos/community-x86_64/mcrouter-chrono-fix.patch
hhvm/repos/community-x86_64/php.ini
hhvm/repos/community-x86_64/server.ini
---------------------------+
PKGBUILD | 281 +++++++++++++++++++++-----------------------
fastcgi-https.diff | 41 ------
hhvm.install | 18 +-
hhvm.service | 30 ++--
hhvm.tmpfile | 4
hhvm at .service | 30 ++--
mcrouter-chrono-fix.patch | 25 ---
php.ini | 20 +--
server.ini | 12 -
9 files changed, 194 insertions(+), 267 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-03-27 10:38:48 UTC (rev 130028)
+++ PKGBUILD 2015-03-27 10:39:11 UTC (rev 130029)
@@ -1,144 +0,0 @@
-# $Id$
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: James Miller <james at pocketrent.com>
-
-pkgname=hhvm
-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"
-license=('PHP')
-depends=('boost-libs' 'google-glog' 'libmysqlclient' 'libmemcached' 'libzip'
- 'libxslt' 'intel-tbb' 'libmcrypt' 'oniguruma' 'jemalloc' 'curl' 'libvpx'
- '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 at .service'
- 'php.ini'
- 'server.ini'
- 'mcrouter-chrono-fix.patch'
- 'fastcgi-https.diff')
-install=hhvm.install
-backup=(etc/hhvm/{php,server}.ini)
-options+=('!buildflags')
-
-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
-
- cd third-party/folly
- rm -rf src
- ln -s "$srcdir"/folly-$_folly_commit src
-
- cd ../thrift
- rm -rf src
- ln -s "$srcdir"/fbthrift-$_thrift_commit src
-
- 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() {
- cd "$srcdir"/$pkgname-HHVM-$pkgver
- msg2 "Building hhvm"
-
- cmake -Wno-dev \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_PREFIX_PATH="$srcdir" \
- -DENABLE_MONGO:BOOL=ON \
- -DMYSQL_UNIX_SOCK_ADDR=/run/mysqld/mysqld.sock \
- .
-
- make
-
- for hacktool in hackificator remove_soft_types; do
- cd "$srcdir"/$pkgname-HHVM-$pkgver/hphp/hack/tools/$hacktool
- make depend
- make
- done
-}
-
-# check() {
-# cd "$srcdir"/$pkgname-HHVM-$pkgver/hphp/test
-# ./run --threads 8 quick
-# }
-
-package() {
- cd "$srcdir"/$pkgname-HHVM-$pkgver
- make DESTDIR="$pkgdir/" install
-
- cd hphp/hack/bin
- for bin in hh_* tools/*; do
- install -Dm755 $bin "$pkgdir"/usr/bin/$(basename $bin)
- done
-
- cd "$srcdir"
- install -Dm644 hhvm.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/hhvm.conf
- install -Dm644 hhvm.service "$pkgdir"/usr/lib/systemd/system/hhvm.service
- install -Dm644 hhvm at .service "$pkgdir"/usr/lib/systemd/system/hhvm at .service
-
- install -Dm644 php.ini "$pkgdir"/etc/hhvm/php.ini
- install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini
-}
-
-sha256sums=('5840d7caf7f8b57e35953e98fa89fa697f810c8de784950f31953cf36f9ce987'
- '67594f86a25d3c1b468b0b4255018df8442db811899b41432775f031938cbd8f'
- 'f09a38084cc4b8c9cc2ac70daf025d7c2f1710c2eae38fd7aec2b6c29b6e70aa'
- 'd58cbfc110761bd70b74b849b3eb83b3e43e066cbf1969f403d47630a22d5bef'
- '81f61f6585b04eced0d1ff2b9ab77e3adfcf4c6e90be1ad37c7ae51bdc582f7e'
- 'd2bd5475aaffbd8804736f8e13fdcb8f370d99d6c20b571561f5a065f4faa73f'
- '8d95cf74147271fcff3aa2bc867241046bc97aa7705fd678d227db77276c6bf7'
- 'c7ad48ff41343d1b0354c8afb6778d7c4bcfcb3d6f7264afcbcabfcfb75c47b8'
- 'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc'
- '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
- '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
- '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
- '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0'
- '5994219fe94d22f135f8cf6ea312e8096204c19da7c3a460c3c26d62e14c291d'
- '632c3e83e45fbf834415e037e7fc1555ada6d8e09063644a9d23872cb1d499de')
Copied: hhvm/repos/community-x86_64/PKGBUILD (from rev 130028, hhvm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-03-27 10:39:11 UTC (rev 130029)
@@ -0,0 +1,137 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: James Miller <james at pocketrent.com>
+
+pkgname=hhvm
+pkgver=3.6.1
+pkgrel=1
+
+_thirdparty_commit=3bf14f9194bff0f681ee60bc6e5f1ac60b233f5c
+_folly_commit=7d2497f0e57fb14b6ea43a5a2d180604d7e1e7e5
+_thrift_commit=d30280a33ed2c67672b0295872397e5affb60f8c
+_proxygen_commit=d17b4e7735ab728d77266a538cef4dcfc57b5fbd
+_webscalesql_commit=004b6b348fdf48f0aa4e3fe1010b891d4fdb9f70
+_mcrouter_commit=addcc91aee3942f4e50760a43fdcb052482be00e
+_squangle_commit=269cd2e30a88b16b1cdf12f1eec5a1c16cb8be10
+
+pkgdesc="Virtual Machine, Runtime, and JIT for PHP"
+arch=('x86_64')
+url="http://hhvm.com"
+license=('PHP')
+depends=('boost-libs' 'google-glog' 'libmysqlclient' 'libmemcached' 'libzip'
+ 'libxslt' 'intel-tbb' 'libmcrypt' 'oniguruma' 'jemalloc' 'curl' 'libvpx'
+ '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 at .service'
+ 'php.ini'
+ 'server.ini')
+install=hhvm.install
+backup=(etc/hhvm/{php,server}.ini)
+options+=('!buildflags')
+
+prepare() {
+ cd "$srcdir"/$pkgname-HHVM-$pkgver
+
+ # 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
+
+ cd third-party/folly
+ rm -rf src
+ ln -s "$srcdir"/folly-$_folly_commit src
+
+ cd ../thrift
+ rm -rf src
+ ln -s "$srcdir"/fbthrift-$_thrift_commit src
+
+ 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() {
+ cd "$srcdir"/$pkgname-HHVM-$pkgver
+ msg2 "Building hhvm"
+
+ cmake -Wno-dev \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_PREFIX_PATH="$srcdir" \
+ -DENABLE_MONGO:BOOL=ON \
+ -DMYSQL_UNIX_SOCK_ADDR=/run/mysqld/mysqld.sock \
+ .
+
+ make
+
+ for hacktool in hackificator remove_soft_types; do
+ cd "$srcdir"/$pkgname-HHVM-$pkgver/hphp/hack/tools/$hacktool
+ make depend
+ make
+ done
+}
+
+# check() {
+# cd "$srcdir"/$pkgname-HHVM-$pkgver/hphp/test
+# ./run --threads 8 quick
+# }
+
+package() {
+ cd "$srcdir"/$pkgname-HHVM-$pkgver
+ make DESTDIR="$pkgdir/" install
+
+ cd hphp/hack/bin
+ for bin in hh_* tools/*; do
+ install -Dm755 $bin "$pkgdir"/usr/bin/$(basename $bin)
+ done
+
+ cd "$srcdir"
+ install -Dm644 hhvm.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/hhvm.conf
+ install -Dm644 hhvm.service "$pkgdir"/usr/lib/systemd/system/hhvm.service
+ install -Dm644 hhvm at .service "$pkgdir"/usr/lib/systemd/system/hhvm at .service
+
+ install -Dm644 php.ini "$pkgdir"/etc/hhvm/php.ini
+ install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini
+}
+
+sha256sums=('d7af553ee149c026ded7728e68fea876806496c3e1d26e3b49c08da641e0b5db'
+ '67594f86a25d3c1b468b0b4255018df8442db811899b41432775f031938cbd8f'
+ 'f09a38084cc4b8c9cc2ac70daf025d7c2f1710c2eae38fd7aec2b6c29b6e70aa'
+ 'd58cbfc110761bd70b74b849b3eb83b3e43e066cbf1969f403d47630a22d5bef'
+ '81f61f6585b04eced0d1ff2b9ab77e3adfcf4c6e90be1ad37c7ae51bdc582f7e'
+ 'd2bd5475aaffbd8804736f8e13fdcb8f370d99d6c20b571561f5a065f4faa73f'
+ '8d95cf74147271fcff3aa2bc867241046bc97aa7705fd678d227db77276c6bf7'
+ 'c7ad48ff41343d1b0354c8afb6778d7c4bcfcb3d6f7264afcbcabfcfb75c47b8'
+ 'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc'
+ '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
+ '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
+ '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
+ '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0')
Deleted: fastcgi-https.diff
===================================================================
--- fastcgi-https.diff 2015-03-27 10:38:48 UTC (rev 130028)
+++ fastcgi-https.diff 2015-03-27 10:39:11 UTC (rev 130029)
@@ -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 @@
-+<?php
-+var_dump($_SERVER['HTTPS']);
-diff --git a/hphp/test/server/fastcgi/tests/httpsTest.php b/hphp/test/server/fastcgi/tests/httpsTest.php
-new file mode 100644
---- /dev/null
-+++ b/hphp/test/server/fastcgi/tests/httpsTest.php
-@@ -0,0 +1,11 @@
-+<?php
-+
-+require_once('test_base.inc');
-+
-+function httpsTestController($serverPort) {
-+ $args = array('HTTPS' => '');
-+ 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: hhvm.install
===================================================================
--- hhvm.install 2015-03-27 10:38:48 UTC (rev 130028)
+++ hhvm.install 2015-03-27 10:39:11 UTC (rev 130029)
@@ -1,9 +0,0 @@
-post_install() {
- if [[ ! -d run/hhvm ]]; then
- usr/bin/systemd-tmpfiles --create hhvm.conf
- fi
-}
-
-post_upgrade() {
- post_install
-}
Copied: hhvm/repos/community-x86_64/hhvm.install (from rev 130028, hhvm/trunk/hhvm.install)
===================================================================
--- hhvm.install (rev 0)
+++ hhvm.install 2015-03-27 10:39:11 UTC (rev 130029)
@@ -0,0 +1,9 @@
+post_install() {
+ if [[ ! -d run/hhvm ]]; then
+ usr/bin/systemd-tmpfiles --create hhvm.conf
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
Deleted: hhvm.service
===================================================================
--- hhvm.service 2015-03-27 10:38:48 UTC (rev 130028)
+++ hhvm.service 2015-03-27 10:39:11 UTC (rev 130029)
@@ -1,15 +0,0 @@
-[Unit]
-Description=HHVM FastCGI application server
-After=syslog.target network.target
-
-[Service]
-PIDFile=/run/hhvm/server.pid
-PrivateTmp=true
-User=http
-Group=http
-ExecStart=/usr/bin/hhvm --config=/etc/hhvm/php.ini --config=/etc/hhvm/server.ini --mode=daemon -vServer.Type=fastcgi -vPidFile=/run/hhvm/server.pid
-Restart=on-failure
-RuntimeDirectory=hhvm
-
-[Install]
-WantedBy=multi-user.target
Copied: hhvm/repos/community-x86_64/hhvm.service (from rev 130028, hhvm/trunk/hhvm.service)
===================================================================
--- hhvm.service (rev 0)
+++ hhvm.service 2015-03-27 10:39:11 UTC (rev 130029)
@@ -0,0 +1,15 @@
+[Unit]
+Description=HHVM FastCGI application server
+After=syslog.target network.target
+
+[Service]
+PIDFile=/run/hhvm/server.pid
+PrivateTmp=true
+User=http
+Group=http
+ExecStart=/usr/bin/hhvm --config=/etc/hhvm/php.ini --config=/etc/hhvm/server.ini --mode=daemon -vServer.Type=fastcgi -vPidFile=/run/hhvm/server.pid
+Restart=on-failure
+RuntimeDirectory=hhvm
+
+[Install]
+WantedBy=multi-user.target
Deleted: hhvm.tmpfile
===================================================================
--- hhvm.tmpfile 2015-03-27 10:38:48 UTC (rev 130028)
+++ hhvm.tmpfile 2015-03-27 10:39:11 UTC (rev 130029)
@@ -1,2 +0,0 @@
-d /var/run/hhvm 755 http http
-d /var/log/hhvm 755 http http
Copied: hhvm/repos/community-x86_64/hhvm.tmpfile (from rev 130028, hhvm/trunk/hhvm.tmpfile)
===================================================================
--- hhvm.tmpfile (rev 0)
+++ hhvm.tmpfile 2015-03-27 10:39:11 UTC (rev 130029)
@@ -0,0 +1,2 @@
+d /var/run/hhvm 755 http http
+d /var/log/hhvm 755 http http
Deleted: hhvm at .service
===================================================================
--- hhvm at .service 2015-03-27 10:38:48 UTC (rev 130028)
+++ hhvm at .service 2015-03-27 10:39:11 UTC (rev 130029)
@@ -1,15 +0,0 @@
-[Unit]
-Description=HHVM FastCGI application server
-After=syslog.target network.target
-
-[Service]
-PIDFile=/run/hhvm/%I.pid
-PrivateTmp=true
-User=http
-Group=http
-ExecStart=/usr/bin/hhvm --config=/etc/hhvm/php.ini --config=/etc/hhvm/%I.ini --mode=daemon -vServer.Type=fastcgi -vPidFile=/run/hhvm/%I.pid
-Restart=on-failure
-RuntimeDirectory=hhvm
-
-[Install]
-WantedBy=multi-user.target
Copied: hhvm/repos/community-x86_64/hhvm at .service (from rev 130028, hhvm/trunk/hhvm at .service)
===================================================================
--- hhvm at .service (rev 0)
+++ hhvm at .service 2015-03-27 10:39:11 UTC (rev 130029)
@@ -0,0 +1,15 @@
+[Unit]
+Description=HHVM FastCGI application server
+After=syslog.target network.target
+
+[Service]
+PIDFile=/run/hhvm/%I.pid
+PrivateTmp=true
+User=http
+Group=http
+ExecStart=/usr/bin/hhvm --config=/etc/hhvm/php.ini --config=/etc/hhvm/%I.ini --mode=daemon -vServer.Type=fastcgi -vPidFile=/run/hhvm/%I.pid
+Restart=on-failure
+RuntimeDirectory=hhvm
+
+[Install]
+WantedBy=multi-user.target
Deleted: mcrouter-chrono-fix.patch
===================================================================
--- mcrouter-chrono-fix.patch 2015-03-27 10:38:48 UTC (rev 130028)
+++ mcrouter-chrono-fix.patch 2015-03-27 10:39:11 UTC (rev 130029)
@@ -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_directories("${TP_DIR}/libmbfl/mbfl")
- include_directories("${TP_DIR}/libmbfl/filter")
-+
-+if (ENABLE_MCROUTER)
-+ include_directories("${TP_DIR}/mcrouter")
-+endif()
-+
- add_definitions(-DNO_LIB_GFLAGS)
- include_directories("${TP_DIR}/folly")
- include_directories("${TP_DIR}/thrift")
Deleted: php.ini
===================================================================
--- php.ini 2015-03-27 10:38:48 UTC (rev 130028)
+++ php.ini 2015-03-27 10:39:11 UTC (rev 130029)
@@ -1,10 +0,0 @@
-; php options
-session.save_handler = files
-;session.save_path = /var/lib/php5
-session.gc_maxlifetime = 1440
-
-; hhvm specific
-hhvm.log.level = Warning
-hhvm.log.always_log_unhandled_exceptions = true
-hhvm.log.runtime_error_reporting_level = 8191
-hhvm.mysql.typed_results = false
Copied: hhvm/repos/community-x86_64/php.ini (from rev 130028, hhvm/trunk/php.ini)
===================================================================
--- php.ini (rev 0)
+++ php.ini 2015-03-27 10:39:11 UTC (rev 130029)
@@ -0,0 +1,10 @@
+; php options
+session.save_handler = files
+;session.save_path = /var/lib/php5
+session.gc_maxlifetime = 1440
+
+; hhvm specific
+hhvm.log.level = Warning
+hhvm.log.always_log_unhandled_exceptions = true
+hhvm.log.runtime_error_reporting_level = 8191
+hhvm.mysql.typed_results = false
Deleted: server.ini
===================================================================
--- server.ini 2015-03-27 10:38:48 UTC (rev 130028)
+++ server.ini 2015-03-27 10:39:11 UTC (rev 130029)
@@ -1,6 +0,0 @@
-hhvm.server.port = 9000
-hhvm.server.type = fastcgi
-hhvm.server.default_document = index.php
-hhvm.log.use_log_file = true
-hhvm.log.file = /var/log/hhvm/error.log
-hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc
Copied: hhvm/repos/community-x86_64/server.ini (from rev 130028, hhvm/trunk/server.ini)
===================================================================
--- server.ini (rev 0)
+++ server.ini 2015-03-27 10:39:11 UTC (rev 130029)
@@ -0,0 +1,6 @@
+hhvm.server.port = 9000
+hhvm.server.type = fastcgi
+hhvm.server.default_document = index.php
+hhvm.log.use_log_file = true
+hhvm.log.file = /var/log/hhvm/error.log
+hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc
More information about the arch-commits
mailing list