1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-17 03:25:46 +00:00

Upgrade devel/libphutil, devel/arcanist and devel/phabricator to 20170630

Also fix phd startup script, so that options like phd_fib actually catch on.
Run phabricator daemons as user www by default.
Shebangfix all scripts.
This commit is contained in:
Michael Gmelin 2017-07-01 12:11:17 +00:00
parent c2a905c0b6
commit 41ea11624a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=444819
12 changed files with 1414 additions and 333 deletions

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= arcanist
PORTVERSION= 20161003
PORTREVISION= 1
PORTVERSION= 20170630
CATEGORIES= devel
PKGNAMEPREFIX= php-
@ -22,7 +21,7 @@ USE_GITHUB= yes
NO_BUILD= yes
NO_ARCH= yes
GH_ACCOUNT= phacility
GH_TAGNAME= 483e985
GH_TAGNAME= c04f141
OPTIONS_DEFINE= ENCODINGS
OPTIONS_DEFAULT=ENCODINGS

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1475502561
SHA256 (phacility-arcanist-20161003-483e985_GH0.tar.gz) = e7f84613ed574d32d635af218ecbc7e066a805b587dd6b7f1c25c86b4ae7875f
SIZE (phacility-arcanist-20161003-483e985_GH0.tar.gz) = 501340
TIMESTAMP = 1498824723
SHA256 (phacility-arcanist-20170630-c04f141_GH0.tar.gz) = 8c2efeedcc635940e9fd6ace13b1af43a12afc9df3cc2dac49efbc92aa9e0272
SIZE (phacility-arcanist-20170630-c04f141_GH0.tar.gz) = 502693

View File

@ -262,7 +262,9 @@ lib/php/arcanist/src/lint/linter/__tests__/text/dos-newline.lint-test
lib/php/arcanist/src/lint/linter/__tests__/text/empty.lint-test
lib/php/arcanist/src/lint/linter/__tests__/text/eof-whitespace.lint-test
lib/php/arcanist/src/lint/linter/__tests__/text/line-wrap.lint-test
lib/php/arcanist/src/lint/linter/__tests__/text/trailing-whitespace.lint-test
lib/php/arcanist/src/lint/linter/__tests__/text/trailing-whitespace-1.lint-test
lib/php/arcanist/src/lint/linter/__tests__/text/trailing-whitespace-2.lint-test
lib/php/arcanist/src/lint/linter/__tests__/text/trailing-whitespace-3.lint-test
lib/php/arcanist/src/lint/linter/__tests__/text/variable-dividers.lint-test
lib/php/arcanist/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test
lib/php/arcanist/src/lint/linter/__tests__/xhpast/empty.lint-test

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= libphutil
PORTVERSION= 20161003
PORTREVISION= 1
PORTVERSION= 20170630
CATEGORIES= devel
PKGNAMEPREFIX= php-
@ -19,7 +18,7 @@ USE_GITHUB= yes
NO_BUILD= yes
NO_ARCH= yes
GH_ACCOUNT= phacility
GH_TAGNAME= 4b12a4f
GH_TAGNAME= 0a4487d
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1475502480
SHA256 (phacility-libphutil-20161003-4b12a4f_GH0.tar.gz) = c95aac5de17e43863403144de647993ae3a99fd31c873bff499ce8f3891e7460
SIZE (phacility-libphutil-20161003-4b12a4f_GH0.tar.gz) = 1647302
TIMESTAMP = 1498823783
SHA256 (phacility-libphutil-20170630-0a4487d_GH0.tar.gz) = 8c774c20692f55c278dbfc46afac3da01963a9c4169559b6a36f731c45e84162
SIZE (phacility-libphutil-20170630-0a4487d_GH0.tar.gz) = 1676670

View File

@ -2,16 +2,21 @@ lib/php/libphutil/LICENSE
lib/php/libphutil/NOTICE
lib/php/libphutil/README.md
lib/php/libphutil/bin/aws-s3
lib/php/libphutil/externals/cldr/cldr_windows_timezones.xml
lib/php/libphutil/externals/includes/README
lib/php/libphutil/externals/jsonlint/LICENSE
lib/php/libphutil/externals/jsonlint/src/Seld/JsonLint/JsonParser.php
lib/php/libphutil/externals/jsonlint/src/Seld/JsonLint/Lexer.php
lib/php/libphutil/externals/jsonlint/src/Seld/JsonLint/ParsingException.php
lib/php/libphutil/externals/jsonlint/src/Seld/JsonLint/Undefined.php
lib/php/libphutil/externals/porter-stemmer/LICENSE
lib/php/libphutil/externals/porter-stemmer/README.md
lib/php/libphutil/externals/porter-stemmer/src/Porter.php
lib/php/libphutil/resources/php_compat_info.json
lib/php/libphutil/resources/ssl/README
lib/php/libphutil/resources/ssl/default.pem
lib/php/libphutil/resources/test/diverse_symbols.php
lib/php/libphutil/resources/timezones/windows_timezones.json
lib/php/libphutil/scripts/__init_script__.php
lib/php/libphutil/scripts/build_xhpast.php
lib/php/libphutil/scripts/daemon/exec/exec_daemon.php
@ -33,6 +38,7 @@ lib/php/libphutil/scripts/test/paypal.php
lib/php/libphutil/scripts/test/progress_bar.php
lib/php/libphutil/scripts/test/prompt.php
lib/php/libphutil/scripts/test/service_profiler.php
lib/php/libphutil/scripts/timezones/generate_windows_timezone_map.php
lib/php/libphutil/scripts/update_compat_info.php
lib/php/libphutil/scripts/utils/aws-s3.php
lib/php/libphutil/scripts/utils/directory_fixture.php
@ -80,7 +86,6 @@ lib/php/libphutil/src/auth/PhutilJIRAAuthAdapter.php
lib/php/libphutil/src/auth/PhutilLDAPAuthAdapter.php
lib/php/libphutil/src/auth/PhutilOAuth1AuthAdapter.php
lib/php/libphutil/src/auth/PhutilOAuthAuthAdapter.php
lib/php/libphutil/src/auth/PhutilPersonaAuthAdapter.php
lib/php/libphutil/src/auth/PhutilPhabricatorAuthAdapter.php
lib/php/libphutil/src/auth/PhutilSlackAuthAdapter.php
lib/php/libphutil/src/auth/PhutilTwitchAuthAdapter.php
@ -138,7 +143,6 @@ lib/php/libphutil/src/console/__tests__/wrap/utf8.txt
lib/php/libphutil/src/console/__tests__/wrap/utf8.txt.expect
lib/php/libphutil/src/console/format.php
lib/php/libphutil/src/console/view/PhutilConsoleBlock.php
lib/php/libphutil/src/console/view/PhutilConsoleConcatenatedView.php
lib/php/libphutil/src/console/view/PhutilConsoleList.php
lib/php/libphutil/src/console/view/PhutilConsoleTable.php
lib/php/libphutil/src/console/view/PhutilConsoleView.php
@ -146,6 +150,7 @@ lib/php/libphutil/src/daemon/PhutilDaemon.php
lib/php/libphutil/src/daemon/PhutilDaemonHandle.php
lib/php/libphutil/src/daemon/PhutilDaemonOverseer.php
lib/php/libphutil/src/daemon/PhutilDaemonOverseerModule.php
lib/php/libphutil/src/daemon/PhutilDaemonPool.php
lib/php/libphutil/src/daemon/torture/PhutilExcessiveServiceCallsDaemon.php
lib/php/libphutil/src/daemon/torture/PhutilFatalDaemon.php
lib/php/libphutil/src/daemon/torture/PhutilHangForeverDaemon.php
@ -295,6 +300,8 @@ lib/php/libphutil/src/internationalization/translation/LibphutilUSEnglishTransla
lib/php/libphutil/src/ip/PhutilCIDRBlock.php
lib/php/libphutil/src/ip/PhutilCIDRList.php
lib/php/libphutil/src/ip/PhutilIPAddress.php
lib/php/libphutil/src/ip/PhutilIPv4Address.php
lib/php/libphutil/src/ip/PhutilIPv6Address.php
lib/php/libphutil/src/ip/__tests__/PhutilIPAddressTestCase.php
lib/php/libphutil/src/lexer/PhutilJSONFragmentLexer.php
lib/php/libphutil/src/lexer/PhutilLexer.php
@ -387,12 +394,14 @@ lib/php/libphutil/src/markup/engine/__tests__/remarkup/ordered-list-with-numbers
lib/php/libphutil/src/markup/engine/__tests__/remarkup/percent-block-adjacent.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/percent-block-multiline.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/percent-block-oneline.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/percent-block-solo.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/quoted-angry.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/quoted-code-block.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/quotes.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/raw-escape.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/reply-basic.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/reply-nested.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/simple-table-with-empty-row.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/simple-table-with-leading-space.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/simple-table-with-link.txt
lib/php/libphutil/src/markup/engine/__tests__/remarkup/simple-table.txt
@ -570,6 +579,7 @@ lib/php/libphutil/src/parser/calendar/data/PhutilCalendarRecurrenceSource.php
lib/php/libphutil/src/parser/calendar/data/PhutilCalendarRelativeDateTime.php
lib/php/libphutil/src/parser/calendar/data/PhutilCalendarRootNode.php
lib/php/libphutil/src/parser/calendar/data/PhutilCalendarUserNode.php
lib/php/libphutil/src/parser/calendar/data/__tests__/PhutilCalendarDateTimeTestCase.php
lib/php/libphutil/src/parser/calendar/data/__tests__/PhutilCalendarRecurrenceRuleTestCase.php
lib/php/libphutil/src/parser/calendar/data/__tests__/PhutilCalendarRecurrenceTestCase.php
lib/php/libphutil/src/parser/calendar/ics/PhutilICSParser.php
@ -582,7 +592,6 @@ lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-bad-base64.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-bad-boolean.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-bad-datetime.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-bad-duration.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-bad-tzid.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-empty-datetime.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-empty-duration.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-extra-end.ics
@ -598,15 +607,18 @@ lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-mixmatched-sections
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-multiple-parameters.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-root-property.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-unescaped-backslash.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-unexpected-child.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/err-unexpected-text.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/floating.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/good-boolean.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/multiple-vcalendars.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/simple.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/valarm.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/weekly.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/writer-christmas.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/writer-office-party.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/writer-recurring-christmas.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/writer-tea-time.ics
lib/php/libphutil/src/parser/calendar/ics/__tests__/data/zimbra-timezone.ics
lib/php/libphutil/src/parser/exception/PhutilINIParserException.php
lib/php/libphutil/src/parser/exception/PhutilJSONParserException.php
lib/php/libphutil/src/parser/exception/PhutilTypeCheckException.php
@ -671,12 +683,23 @@ lib/php/libphutil/src/parser/xhpast/bin/xhpast.exe
lib/php/libphutil/src/parser/xhpast/parser_nodes.php
lib/php/libphutil/src/parser/xhpast/parser_tokens.php
lib/php/libphutil/src/phage/__tests__/PhageAgentTestCase.php
lib/php/libphutil/src/phage/action/PhageAction.php
lib/php/libphutil/src/phage/action/PhageAgentAction.php
lib/php/libphutil/src/phage/action/PhageExecuteAction.php
lib/php/libphutil/src/phage/action/PhageLocalAction.php
lib/php/libphutil/src/phage/action/PhagePlanAction.php
lib/php/libphutil/src/phage/agent/PhagePHPAgent.php
lib/php/libphutil/src/phage/bootloader/PhageAgentBootloader.php
lib/php/libphutil/src/phage/bootloader/PhagePHPAgentBootloader.php
lib/php/libphutil/src/phage/util/PhutilBallOfPHP.php
lib/php/libphutil/src/readableserializer/PhutilReadableSerializer.php
lib/php/libphutil/src/readableserializer/__tests__/PhutilReadableSerializerTestCase.php
lib/php/libphutil/src/search/PhutilSearchQueryCompiler.php
lib/php/libphutil/src/search/PhutilSearchQueryCompilerSyntaxException.php
lib/php/libphutil/src/search/PhutilSearchQueryToken.php
lib/php/libphutil/src/search/PhutilSearchStemmer.php
lib/php/libphutil/src/search/__tests__/PhutilSearchQueryCompilerTestCase.php
lib/php/libphutil/src/search/__tests__/PhutilSearchStemmerTestCase.php
lib/php/libphutil/src/serviceprofiler/PhutilServiceProfiler.php
lib/php/libphutil/src/sprites/PhutilSprite.php
lib/php/libphutil/src/sprites/PhutilSpriteSheet.php

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= phabricator
PORTVERSION= 20161003
PORTREVISION= 2
PORTVERSION= 20170630
CATEGORIES= devel
PKGNAMEPREFIX= php-
@ -21,10 +20,33 @@ OPTIONS_DEFAULT=OPCACHE
OPCACHE_DESC?= Use OPcache to improve performance
USES= php shebangfix
SHEBANG_FILES= externals/httpful/build \
SHEBANG_FILES= bin/* \
externals/httpful/build \
externals/restful/build-phar \
scripts/almanac/*.php \
scripts/cache/*.php \
scripts/celerity/*.php \
scripts/daemon/*.php \
scripts/daemon/phd-daemon \
scripts/diviner/*.php \
scripts/drydock/*.php \
scripts/fact/*.php \
scripts/files/*.php \
scripts/install/install_rhel-derivs.sh \
scripts/install/install_ubuntu.sh
scripts/install/install_ubuntu.sh \
scripts/lipsum/*.php \
scripts/mail/*.php \
scripts/people/*.php \
scripts/repository/*.php \
scripts/search/*.php \
scripts/setup/*.php \
scripts/sms/*.php \
scripts/sql/*.php \
scripts/ssh/*.php \
scripts/symbols/*.php \
scripts/user/*.php \
scripts/util/*.php \
support/aphlict/server/*.php
USE_PHP= ctype curl fileinfo filter hash iconv mbstring mysqli openssl \
pcntl posix
@ -46,7 +68,7 @@ NO_BUILD= yes
USE_RC_SUBR= phd
SUB_FILES= pkg-message
GH_ACCOUNT= phacility
GH_TAGNAME= 55a56c0
GH_TAGNAME= 83266e8
PHP_DESTDIR= lib/php/phabricator

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1475502668
SHA256 (phabricator-20161003_GH0.tar.gz) = 8757c24d22b90e86e408a49729e4f0c43306f612ef9301873fa14135cfc0dff6
SIZE (phabricator-20161003_GH0.tar.gz) = 10277182
TIMESTAMP = 1498825038
SHA256 (phabricator-20170630_GH0.tar.gz) = 2b478ef7fe9312fec49c798ead888f1ab971dd82cce92339b551376e065c84f3
SIZE (phabricator-20170630_GH0.tar.gz) = 9117104

View File

@ -0,0 +1,407 @@
--- bin/accountadmin~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/accountadmin 2017-07-01 13:51:34.930544995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$table = new PhabricatorUser();
--- bin/almanac~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/almanac 2017-07-01 13:51:35.214537995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/aphlict~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/aphlict 2017-07-01 13:51:35.370541995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(dirname(__FILE__))));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/init/init-aphlict.php';
PhabricatorAphlictManagementWorkflow::requireExtensions();
--- bin/audit~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/audit 2017-07-01 13:51:35.538578995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/auth~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/auth 2017-07-01 13:51:35.724540995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/cache~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/cache 2017-07-01 13:51:35.922542995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/calendar~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/calendar 2017-07-01 13:51:36.106546995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/celerity~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/celerity 2017-07-01 13:51:36.298540995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/commit-hook~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/commit-hook 2017-07-01 13:51:36.481559995 +0200
@@ -28,7 +28,7 @@
}
}
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
if ($argc < 2) {
--- bin/config~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/config 2017-07-01 13:51:36.681699995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/init/init-setup.php';
$args = new PhutilArgumentParser($argv);
--- bin/differential~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/differential 2017-07-01 13:51:36.890540995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/diviner~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/diviner 2017-07-01 13:51:37.090565995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/drydock~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/drydock 2017-07-01 13:51:37.298538995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/fact~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/fact 2017-07-01 13:51:37.529571995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/feed~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/feed 2017-07-01 13:51:37.754542995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/files~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/files 2017-07-01 13:51:38.170547995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/garbage~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/garbage 2017-07-01 13:51:38.570546995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/harbormaster~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/harbormaster 2017-07-01 13:51:38.866553995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/i18n~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/i18n 2017-07-01 13:51:39.161574995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/lipsum~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/lipsum 2017-07-01 13:51:39.474566995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/mail~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/mail 2017-07-01 13:51:39.770547995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/nuance~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/nuance 2017-07-01 13:51:40.058544995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/people~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/people 2017-07-01 13:51:40.386542995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/phd~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/phd 2017-07-01 13:51:40.722541995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
PhabricatorDaemonManagementWorkflow::requireExtensions();
--- bin/phortune~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/phortune 2017-07-01 13:51:41.082540995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/policy~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/policy 2017-07-01 13:51:41.361589995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/remove~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/remove 2017-07-01 13:51:41.723540995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/repository~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/repository 2017-07-01 13:51:41.994545995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/search~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/search 2017-07-01 13:51:42.313685995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/sms~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/sms 2017-07-01 13:51:42.650562995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/ssh-auth-key~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/ssh-auth-key 2017-07-01 13:51:43.361588995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
try {
--- bin/ssh-auth~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/ssh-auth 2017-07-01 13:51:42.994553995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$cache = PhabricatorCaches::getMutableCache();
--- bin/ssh-connect~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/ssh-connect 2017-07-01 13:51:44.730535995 +0200
@@ -13,7 +13,7 @@
declare(ticks = 1);
}
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
// Contrary to the documentation, Git may pass a "-p" flag. If it does, respect
--- bin/ssh-exec~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/ssh-exec 2017-07-01 13:51:45.105561995 +0200
@@ -3,7 +3,7 @@
$ssh_start_time = microtime(true);
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$ssh_log = PhabricatorSSHLog::getLog();
--- bin/storage~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/storage 2017-07-01 13:51:45.595548995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/init/init-setup.php';
$args = new PhutilArgumentParser($argv);
--- bin/trigger~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/trigger 2017-07-01 13:51:46.089539995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);
--- bin/worker~ 2017-06-28 17:47:20.000000000 +0200
+++ bin/worker 2017-07-01 13:51:46.593537995 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
-$root = dirname(dirname(dirname(__FILE__)));
+$root = dirname(dirname(__FILE__));
require_once $root.'/scripts/__init_script__.php';
$args = new PhutilArgumentParser($argv);

View File

@ -12,6 +12,7 @@
# phd_enable (bool): Set to "NO" by default
# Set it to "YES" to enable phd
# phd_fib (str): Set an altered default network view for phd
# phd_user (str): User to run phabricator daemons as
. /etc/rc.subr
@ -21,54 +22,35 @@ rcvar=phd_enable
load_rc_config "$name"
: ${phd_enable="NO"}
: ${phd_user="www"}
command="%%PREFIX%%/lib/php/phabricator/bin/phd"
extra_commands="launch list log"
start_cmd="${command} start"
poll_cmd="phd_poll"
stop_cmd="${command} stop"
status_cmd="${command} status"
restart_cmd="${command} restart"
poll_cmd="phd_poll"
restart_cmd="phd_restart"
launch_cmd="${command} launch"
list_cmd="${command} list"
log_cmd="${command} log"
start_precmd="phd_precmd"
stop_precmd="phd_precmd"
status_precmd="phd_precmd"
restart_precmd="phd_precmd"
launch_precmd="phd_precmd"
list_precmd="phd_precmd"
log_precmd="phd_precmd"
start_precmd="eval command_args=start"
required_files="%%PREFIX%%/lib/php/phabricator/conf/local/local.json"
PATH="${PATH}:%%PREFIX%%/bin"
phd_precmd()
{
if command -v check_namevarlist > /dev/null 2>&1; then
check_namevarlist fib && return 0
fi
${SYSCTL} net.fibs >/dev/null 2>&1 || return 0
phd_fib=${phd_fib:-"NONE"}
case "$phd_fib" in
[Nn][Oo][Nn][Ee])
;;
*)
command="setfib -F ${phd_fib} ${command}"
;;
esac
}
phd_poll()
{
pids=`${status_cmd} 2>/dev/null | awk '{ print $3 }' | egrep "^[0-9]+$"`
pids=`${status_cmd} 2>/dev/null | awk '{ print $4 }' | egrep "^[0-9]+$" | sort | uniq`
wait_for_pids $pids
}
run_rc_command $*
phd_restart()
{
run_rc_command stop
run_rc_command start
}
run_rc_command "$*"

View File

@ -1,5 +1,5 @@
To run the phabricator daemons from startup, add phd_enable="YES"
in your /etc/rc.conf. You can control the daemons using
to /etc/rc.conf. You can control the daemons using
service start
service stop
@ -20,3 +20,12 @@ so if the documentation refers to ./bin, this means
if it refers to webroot, this means
%%PREFIX%%/lib/php/phabricator/webroot.
You might want to install textproc/py-pygments to improve syntax
highlighting.
Starting with version 20170630, phabricator daemons run as user www
by default. If you're updating from a version before 20170630 you will need
to fix permissions of /var/tmp/phd and repositories. Alternatively
you can continue to run phabricator daemons as root by adding
phd_user="root" to /etc/rc.conf.

File diff suppressed because it is too large Load Diff