diff -Nru phabricator-0~git20160124/debian/changelog phabricator-0~git20160124/debian/changelog --- phabricator-0~git20160124/debian/changelog 2016-01-24 07:10:15.000000000 +0000 +++ phabricator-0~git20160124/debian/changelog 2016-03-24 07:48:56.000000000 +0000 @@ -1,3 +1,9 @@ +phabricator (0~git20160124-1ubuntu1) xenial; urgency=medium + + * Update references to php7.0 packages (LP: #1544352). + + -- Nishanth Aravamudan Fri, 12 Feb 2016 15:31:33 -0800 + phabricator (0~git20160124-1) unstable; urgency=medium * New snapshot release diff -Nru phabricator-0~git20160124/debian/control phabricator-0~git20160124/debian/control --- phabricator-0~git20160124/debian/control 2015-08-04 09:32:06.000000000 +0000 +++ phabricator-0~git20160124/debian/control 2016-03-24 07:48:56.000000000 +0000 @@ -1,7 +1,8 @@ Source: phabricator Section: web Priority: optional -Maintainer: Richard Sellam +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Richard Sellam Uploaders: Sylvestre Ledru Build-Depends: debhelper (>= 9), po-debconf Standards-Version: 3.9.6 @@ -12,7 +13,7 @@ Package: libphutil Architecture: all Depends: ${misc:Depends} -Recommends: php5-cli +Recommends: php-cli Description: Shared library for Arcanist and Phabricator libphutil (pronounced as "lib-futile", like the English word futile) is principally the shared library for Arcanist and Phabricator, @@ -23,7 +24,7 @@ Package: arcanist Architecture: all -Depends: libphutil (= ${source:Version}), php5-cli, php5-curl, ${misc:Depends} +Depends: libphutil (= ${source:Version}), php-cli, php-curl, ${misc:Depends} Conflicts: arc Suggests: python Description: Command line interface for Phabricator (review platform) @@ -37,16 +38,16 @@ dbconfig-common (>= 1.8.8), fonts-font-awesome, jq, - libapache2-mod-php5 | libapache2-mod-php5filter | php5-fpm | php5, + libapache2-mod-php | libapache2-mod-phpfilter | php-fpm | php, libjs-raphael, libphutil (= ${source:Version}), - php5-cli, - php5-curl, - php5-mysql | php5-mysqli | php5-mysqlnd, + php-cli, + php-curl, + php-mysql | php-mysqli | php-mysqlnd, po-debconf, ucf, ${misc:Depends} -Recommends: apache2 (>= 2.2.7) | lighttpd | nginx | httpd, php5-apcu, php5-gd, mariadb-server | mysql-server +Recommends: apache2 (>= 2.2.7) | lighttpd | nginx | httpd, php-apcu, php-gd, mariadb-server | mysql-server Suggests: python, npm Description: Software engineering platform Phabricator is an open source collection of web applications which make it diff -Nru phabricator-0~git20160124/debian/patches/series phabricator-0~git20160124/debian/patches/series --- phabricator-0~git20160124/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ phabricator-0~git20160124/debian/patches/series 2016-03-24 07:48:56.000000000 +0000 @@ -0,0 +1 @@ +update-references-to-php5.patch diff -Nru phabricator-0~git20160124/debian/patches/update-references-to-php5.patch phabricator-0~git20160124/debian/patches/update-references-to-php5.patch --- phabricator-0~git20160124/debian/patches/update-references-to-php5.patch 1970-01-01 00:00:00.000000000 +0000 +++ phabricator-0~git20160124/debian/patches/update-references-to-php5.patch 2016-03-24 07:48:56.000000000 +0000 @@ -0,0 +1,99 @@ +Description: Refer to php-* named packages rather than php5-* +Author: Nishanth Aravamudan +Bug-Ubuntu: https://launchpad.net/bugs/1544352 + +--- phabricator-0~git20160124.orig/arcanist/scripts/arcanist.php ++++ phabricator-0~git20160124/arcanist/scripts/arcanist.php +@@ -468,9 +468,8 @@ function sanity_check_environment() { + $need_functions = array( + 'curl_init' => array( + 'text', +- "You need to install the cURL PHP extension, maybe with ". +- "'apt-get install php5-curl' or 'yum install php53-curl' or ". +- "something similar.", ++ "You need to install the cURL PHP extension, with ". ++ "'apt-get install php-curl'.", + ), + 'json_decode' => array('flag', '--without-json'), + ); +--- phabricator-0~git20160124.orig/phabricator/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php ++++ phabricator-0~git20160124/phabricator/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php +@@ -260,7 +260,7 @@ final class PhabricatorLDAPAuthProvider + 'talk to LDAP. Usually you can install it with '. + '`%s`, `%s`, or a similar package manager command.', + 'yum install php-ldap', +- 'apt-get install php5-ldap')); ++ 'apt-get install php-ldap')); + } + } + +--- phabricator-0~git20160124.orig/phabricator/src/applications/config/view/PhabricatorSetupIssueView.php ++++ phabricator-0~git20160124/phabricator/src/applications/config/view/PhabricatorSetupIssueView.php +@@ -65,20 +65,16 @@ final class PhabricatorSetupIssueView ex + 'Install these %d PHP extension(s):', count($extensions)); + + $install_info = pht( +- 'You can usually install a PHP extension using %s or %s. Common '. +- 'package names are %s or %s. Try commands like these:', ++ 'You can usually install a PHP extension using %s. Common '. ++ 'package names are %s. Try commands like these:', + phutil_tag('tt', array(), 'apt-get'), +- phutil_tag('tt', array(), 'yum'), +- hsprintf('php-%s', pht('extname')), +- hsprintf('php5-%s', pht('extname'))); ++ hsprintf('php-%s', pht('extname'))); + + // TODO: We should do a better job of detecting how to install extensions + // on the current system. + $install_commands = hsprintf( +- "\$ sudo apt-get install php5-extname ". +- "# Debian / Ubuntu\n". +- "\$ sudo yum install php-extname ". +- "# Red Hat / Derivatives"); ++ "\$ sudo apt-get install php-extname ". ++ "# Debian / Ubuntu\n"); + + $fallback_info = pht( + "If those commands don't work, try Google. The process of installing ". +--- phabricator-0~git20160124.orig/phabricator/src/applications/phragment/storage/PhragmentFragment.php ++++ phabricator-0~git20160124/phabricator/src/applications/phragment/storage/PhragmentFragment.php +@@ -154,7 +154,7 @@ final class PhragmentFragment extends Ph + try { + $zip = new ZipArchive(); + } catch (Exception $e) { +- // The server doesn't have php5-zip, so we can't do recursive updates. ++ // The server doesn't have php-zip, so we can't do recursive updates. + return; + } + +--- phabricator-0~git20160124.orig/phabricator/src/docs/user/configuration/configuration_guide.diviner ++++ phabricator-0~git20160124/phabricator/src/docs/user/configuration/configuration_guide.diviner +@@ -146,7 +146,7 @@ server.modules list: + + Finally, you should run the following commands to enable php support: + +- $ sudo apt-get install php5-cgi # for ubuntu; other distros should be similar ++ $ sudo apt-get install php-cgi # for ubuntu; other distros should be similar + $ sudo lighty-enable-mod fastcgi-php + + Restart lighttpd after making your edits, then continue below. +--- phabricator-0~git20160124.orig/phabricator/src/docs/user/field/restarting.diviner ++++ phabricator-0~git20160124/phabricator/src/docs/user/field/restarting.diviner +@@ -112,5 +112,5 @@ like one of these on your system, or a d + + ``` + $ sudo /etc/init.d/php-fpm restart +-$ sudo service php5-fpm reload ++$ sudo service php-fpm reload + ``` +--- phabricator-0~git20160124.orig/phabricator/src/docs/user/installation_guide.diviner ++++ phabricator-0~git20160124/phabricator/src/docs/user/installation_guide.diviner +@@ -123,7 +123,7 @@ Otherwise, here's a general description + - MySQL Server (usually "mysqld" or "mysql-server") + - PHP (usually "php") + - Required PHP extensions: mbstring, iconv, mysql (or mysqli), curl, pcntl +- (these might be something like "php-mysql" or "php5-mysql") ++ (these might be something like "php-mysql") + - Optional PHP extensions: gd, apc (special instructions for APC are available + below if you have difficulty installing it), xhprof (instructions below, + you only need this if you are developing Phabricator) diff -Nru phabricator-0~git20160124/debian/phabricator.apache.conf phabricator-0~git20160124/debian/phabricator.apache.conf --- phabricator-0~git20160124/debian/phabricator.apache.conf 2015-09-08 12:08:51.000000000 +0000 +++ phabricator-0~git20160124/debian/phabricator.apache.conf 2016-03-24 07:48:56.000000000 +0000 @@ -11,7 +11,7 @@ RewriteEngine on RewriteRule ^/rsrc/(.*) - [L,QSA] RewriteRule ^/favicon.ico - [L,QSA] -RewriteRule ^/php5-fcgi - [L] +RewriteRule ^/php-fcgi - [L] RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA] diff -Nru phabricator-0~git20160124/debian/phabricator.nginx.conf phabricator-0~git20160124/debian/phabricator.nginx.conf --- phabricator-0~git20160124/debian/phabricator.nginx.conf 2015-05-03 17:26:06.000000000 +0000 +++ phabricator-0~git20160124/debian/phabricator.nginx.conf 2016-03-24 07:48:56.000000000 +0000 @@ -15,7 +15,7 @@ } location /index.php { - fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_pass unix:/var/run/php-fpm.sock; fastcgi_index index.php; #required if PHP was built with --enable-force-cgi-redirect diff -Nru phabricator-0~git20160124/debian/README.Debian phabricator-0~git20160124/debian/README.Debian --- phabricator-0~git20160124/debian/README.Debian 2015-01-31 10:09:34.000000000 +0000 +++ phabricator-0~git20160124/debian/README.Debian 2016-03-24 07:48:56.000000000 +0000 @@ -2,7 +2,7 @@ ----------------- * According to phabricator developers, everything in phabricator/externals is external code highly customized for phabricator. It cannot be packaged otherwise. For an example of what was modified and links for further details, see the lintian override for php mailer. * __tests__ directories are packaged on purpose. Do not remove them if you don't want your phabricator instance to FATAL at runtime -* if you are affected by bug 720434 (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720434), daemons won't be able to start properly. This is unfortunate but has nothing to do with phabricator. Get the correct php.ini (cp /usr/share/php5/php.ini-production.cli /etc/php5/cli/php.ini) and the daemons will work as expected. +* if you are affected by bug 720434 (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720434), daemons won't be able to start properly. This is unfortunate but has nothing to do with phabricator. Get the correct php.ini (cp /usr/share/php/php.ini-production.cli /etc/php/cli/php.ini) and the daemons will work as expected. * Debian does not allow us to ship the most used passwords list compiled by openwall, so phabricator won't be able to tell you if your password is vulnerable to bruteforce. The openwall list is 3500+ passwords long, but only 634 are 8+ chars long (the minimum password length with phabricator default settings) and only one (winniethepooh) is 12+ chars long. So ensure your users use a long enough password and you won't miss this file. * phabricator needs the php mailparse extension for inbound emails with local MTA. Unfortunately this is not (yet?) packaged for debian due to licensing reasons. See #754977 (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=754977) for more infos. Please use "sudo pecl install mailparse" if you need to install it.