diff -Nru fusionforge-6.0.3+20151023/debian/changelog fusionforge-6.0.3+20151023/debian/changelog --- fusionforge-6.0.3+20151023/debian/changelog 2015-10-23 08:03:48.000000000 -0700 +++ fusionforge-6.0.3+20151023/debian/changelog 2016-03-23 16:09:00.000000000 -0700 @@ -1,3 +1,9 @@ +fusionforge (6.0.3+20151023-1ubuntu1) xenial; urgency=medium + + * Update to PHP7.0 dependencies (LP: #1544352). + + -- Nishanth Aravamudan Wed, 23 Mar 2016 16:08:52 -0700 + fusionforge (6.0.3+20151023-1) unstable; urgency=medium * New upstream snapshot following the 6.0 stable branch diff -Nru fusionforge-6.0.3+20151023/debian/control fusionforge-6.0.3+20151023/debian/control --- fusionforge-6.0.3+20151023/debian/control 2015-10-23 08:06:07.000000000 -0700 +++ fusionforge-6.0.3+20151023/debian/control 2016-03-23 16:09:09.000000000 -0700 @@ -2,7 +2,8 @@ Source: fusionforge Section: devel Priority: optional -Maintainer: Roland Mas +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Roland Mas Uploaders: Christian Bayle , Olivier Berger , Sylvain Beucler Build-Depends: debhelper (>= 9) Standards-Version: 3.9.6 @@ -29,7 +30,7 @@ Package: fusionforge-common Architecture: all -Depends: php5-cli, php5-pgsql, php-htmlpurifier, cron, ucf, ${misc:Depends} +Depends: php-cli, php-pgsql, php-htmlpurifier, cron, ucf, ${misc:Depends} # Handle conflicts with files in old packages: # gforge-common -> /usr/share/locale/XX/LC_MESSAGES/fusionforge.mo # gforge-db-postgresql -> /usr/bin/forge_make_admin & forge_set_password @@ -49,7 +50,7 @@ Package: fusionforge-db-local Architecture: all Provides: fusionforge-db -Depends: fusionforge-common (=${source:Version}), postgresql, php5-cli, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), postgresql, php-cli, ${misc:Depends} Description: collaborative development tool - database (using PostgreSQL) FusionForge provides many tools to aid collaboration in a development project, such as bug-tracking, task management, @@ -80,7 +81,7 @@ Package: fusionforge-web Architecture: all -Depends: fusionforge-common (=${source:Version}), fusionforge-db, libapache2-mpm-itk | apache2-mpm-itk, php5-cli, libapache2-mod-php5, libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery, python, poppler-utils, openssl, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), fusionforge-db, libapache2-mpm-itk | apache2-mpm-itk, php-cli, libapache2-mod-php, libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery, python, poppler-utils, openssl, ${misc:Depends} Recommends: locales-all, unoconv Description: collaborative development tool - web part (using Apache) FusionForge provides many tools to aid collaboration in a @@ -95,7 +96,7 @@ Package: fusionforge-web-vhosts Architecture: all -Depends: fusionforge-common (=${source:Version}), php5-cli, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), php-cli, ${misc:Depends} Description: collaborative development tool - web vhosts (using Apache) FusionForge provides many tools to aid collaboration in a development project, such as bug-tracking, task management, @@ -109,7 +110,7 @@ Package: fusionforge-shell Architecture: all -Depends: fusionforge-common (=${source:Version}), php5-cli, libnss-pgsql2, openssh-server, unscd | nscd, libpam-modules, ucf, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), php-cli, libnss-pgsql2, openssh-server, unscd | nscd, libpam-modules, ucf, ${misc:Depends} Description: collaborative development tool - shell accounts (using PostgreSQL) FusionForge provides many tools to aid collaboration in a development project, such as bug-tracking, task management, @@ -123,7 +124,7 @@ Package: fusionforge-scm Architecture: all -Depends: fusionforge-common (=${source:Version}), fusionforge-shell (=${source:Version}), xinetd, rsync, php5-cli, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), fusionforge-shell (=${source:Version}), xinetd, rsync, php-cli, ${misc:Depends} Description: collaborative development tool - shell accounts (using PostgreSQL) FusionForge provides many tools to aid collaboration in a development project, such as bug-tracking, task management, @@ -169,7 +170,7 @@ Package: fusionforge-lists Architecture: all -Depends: fusionforge-common (=${source:Version}), php5-cli, fusionforge-mta-postfix | fusionforge-mta, mailman, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), php-cli, fusionforge-mta-postfix | fusionforge-mta, mailman, ${misc:Depends} Description: collaborative development tool - mailing-lists (using Mailman) FusionForge provides many tools to aid collaboration in a development project, such as bug-tracking, task management, @@ -327,7 +328,7 @@ Offer DAV or SSH access. Package: fusionforge-plugin-moinmoin -Depends: fusionforge-web (=${source:Version}), php5-cli, python-moinmoin, python-psycopg2, libapache2-mod-wsgi, ${misc:Depends} +Depends: fusionforge-web (=${source:Version}), php-cli, python-moinmoin, python-psycopg2, libapache2-mod-wsgi, ${misc:Depends} Architecture: all Description: FusionForge plugin - MoinMoinWiki FusionForge provides many tools to aid collaboration in a @@ -381,7 +382,7 @@ FusionForge, for instance where Kerberos is used. Package: fusionforge-plugin-authldap -Depends: fusionforge-web (=${source:Version}), php5-ldap, ${misc:Depends} +Depends: fusionforge-web (=${source:Version}), php-ldap, ${misc:Depends} Architecture: all Description: FusionForge plugin - LDAP authentication FusionForge provides many tools to aid collaboration in a @@ -517,7 +518,7 @@ in the main menu (outermenu) or in the project menu (groupmenu). Package: fusionforge-plugin-hudson -Depends: fusionforge-web (=${source:Version}), php5-cli, ${misc:Depends} +Depends: fusionforge-web (=${source:Version}), php-cli, ${misc:Depends} Architecture: all Description: FusionForge plugin - Hudson/Jenkins FusionForge provides many tools to aid collaboration in a @@ -569,7 +570,7 @@ Organise projects hierarchicaly, relation type 1-n Package: fusionforge-plugin-scmhook -Depends: fusionforge-web (=${source:Version}), php5-cli, php5-curl, mksh, ${perl:Depends}, ${misc:Depends} +Depends: fusionforge-web (=${source:Version}), php-cli, php-curl, mksh, ${perl:Depends}, ${misc:Depends} Architecture: all Description: FusionForge plugin - Scmhook FusionForge provides many tools to aid collaboration in a @@ -583,7 +584,7 @@ project independently. Package: fusionforge-plugin-sysauthldap -Depends: fusionforge-web (=${source:Version}), php5-ldap, ${misc:Depends} +Depends: fusionforge-web (=${source:Version}), php-ldap, ${misc:Depends} Recommends: slapd, ldap-utils, ${perl:Depends} Architecture: all Description: FusionForge plugin - System authentication via LDAP diff -Nru fusionforge-6.0.3+20151023/debian/control.in fusionforge-6.0.3+20151023/debian/control.in --- fusionforge-6.0.3+20151023/debian/control.in 2015-09-18 06:27:43.000000000 -0700 +++ fusionforge-6.0.3+20151023/debian/control.in 2016-03-23 16:09:27.000000000 -0700 @@ -1,7 +1,8 @@ Source: fusionforge Section: devel Priority: optional -Maintainer: Roland Mas +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Roland Mas Uploaders: Christian Bayle , Olivier Berger , Sylvain Beucler Build-Depends: debhelper (>= 9) Standards-Version: 3.9.6 @@ -28,7 +29,7 @@ Package: fusionforge-common Architecture: all -Depends: php5-cli, php5-pgsql, php-htmlpurifier, cron, ucf, ${misc:Depends} +Depends: php-cli, php-pgsql, php-htmlpurifier, cron, ucf, ${misc:Depends} # Handle conflicts with files in old packages: # gforge-common -> /usr/share/locale/XX/LC_MESSAGES/fusionforge.mo # gforge-db-postgresql -> /usr/bin/forge_make_admin & forge_set_password @@ -48,7 +49,7 @@ Package: fusionforge-db-local Architecture: all Provides: fusionforge-db -Depends: fusionforge-common (=${source:Version}), postgresql, php5-cli, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), postgresql, php-cli, ${misc:Depends} Description: collaborative development tool - database (using PostgreSQL) FusionForge provides many tools to aid collaboration in a development project, such as bug-tracking, task management, @@ -79,7 +80,7 @@ Package: fusionforge-web Architecture: all -Depends: fusionforge-common (=${source:Version}), fusionforge-db, libapache2-mpm-itk | apache2-mpm-itk, php5-cli, libapache2-mod-php5, libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery, python, poppler-utils, openssl, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), fusionforge-db, libapache2-mpm-itk | apache2-mpm-itk, php-cli, libapache2-mod-php, libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery, python, poppler-utils, openssl, ${misc:Depends} Recommends: locales-all, unoconv Description: collaborative development tool - web part (using Apache) FusionForge provides many tools to aid collaboration in a @@ -94,7 +95,7 @@ Package: fusionforge-web-vhosts Architecture: all -Depends: fusionforge-common (=${source:Version}), php5-cli, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), php-cli, ${misc:Depends} Description: collaborative development tool - web vhosts (using Apache) FusionForge provides many tools to aid collaboration in a development project, such as bug-tracking, task management, @@ -108,7 +109,7 @@ Package: fusionforge-shell Architecture: all -Depends: fusionforge-common (=${source:Version}), php5-cli, libnss-pgsql2, openssh-server, unscd | nscd, libpam-modules, ucf, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), php-cli, libnss-pgsql2, openssh-server, unscd | nscd, libpam-modules, ucf, ${misc:Depends} Description: collaborative development tool - shell accounts (using PostgreSQL) FusionForge provides many tools to aid collaboration in a development project, such as bug-tracking, task management, @@ -122,7 +123,7 @@ Package: fusionforge-scm Architecture: all -Depends: fusionforge-common (=${source:Version}), fusionforge-shell (=${source:Version}), xinetd, rsync, php5-cli, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), fusionforge-shell (=${source:Version}), xinetd, rsync, php-cli, ${misc:Depends} Description: collaborative development tool - shell accounts (using PostgreSQL) FusionForge provides many tools to aid collaboration in a development project, such as bug-tracking, task management, @@ -168,7 +169,7 @@ Package: fusionforge-lists Architecture: all -Depends: fusionforge-common (=${source:Version}), php5-cli, fusionforge-mta-postfix | fusionforge-mta, mailman, ${misc:Depends} +Depends: fusionforge-common (=${source:Version}), php-cli, fusionforge-mta-postfix | fusionforge-mta, mailman, ${misc:Depends} Description: collaborative development tool - mailing-lists (using Mailman) FusionForge provides many tools to aid collaboration in a development project, such as bug-tracking, task management, diff -Nru fusionforge-6.0.3+20151023/debian/patches/series fusionforge-6.0.3+20151023/debian/patches/series --- fusionforge-6.0.3+20151023/debian/patches/series 1969-12-31 16:00:00.000000000 -0800 +++ fusionforge-6.0.3+20151023/debian/patches/series 2016-03-23 16:07:21.000000000 -0700 @@ -0,0 +1 @@ +update-for-php7.patch diff -Nru fusionforge-6.0.3+20151023/debian/patches/update-for-php7.patch fusionforge-6.0.3+20151023/debian/patches/update-for-php7.patch --- fusionforge-6.0.3+20151023/debian/patches/update-for-php7.patch 1969-12-31 16:00:00.000000000 -0800 +++ fusionforge-6.0.3+20151023/debian/patches/update-for-php7.patch 2016-03-23 16:08:03.000000000 -0700 @@ -0,0 +1,36 @@ +Description: Update references to php files and packages +Author: Nishanth Aravamudan +Bug-Ubuntu: https://launchpad.net/bugs/1544352 + +--- fusionforge-6.0.3+20151023.orig/common/include/env.inc.php ++++ fusionforge-6.0.3+20151023/common/include/env.inc.php +@@ -100,7 +100,7 @@ $include_path = join(PATH_SEPARATOR, + '/usr/share/php', + '/usr/share/php/htmlpurifier', + '/usr/share/pear', +- '/usr/share/php5/PEAR', ++ '/usr/share/php/PEAR', + ) + ); + +--- fusionforge-6.0.3+20151023.orig/etc/httpd.conf.d/disable-scripts.inc ++++ fusionforge-6.0.3+20151023/etc/httpd.conf.d/disable-scripts.inc +@@ -17,6 +17,6 @@ RequestHeader unset Cookie + + + # Disable PHP5 explicitly for security (CVE-2014-0468) +- ++ + php_admin_flag engine off + +--- fusionforge-6.0.3+20151023.orig/post-install.d/web/web.sh ++++ fusionforge-6.0.3+20151023/post-install.d/web/web.sh +@@ -108,7 +108,7 @@ case "$1" in + if [ -x /usr/sbin/a2enmod ]; then + a2enmod version 2>/dev/null || true # opensuse.. + a2enmod macro +- a2enmod php5 ++ a2enmod php + a2enmod ssl + a2enmod env + a2enmod headers diff -Nru fusionforge-6.0.3+20151023/debian/plugins fusionforge-6.0.3+20151023/debian/plugins --- fusionforge-6.0.3+20151023/debian/plugins 2015-10-23 08:06:06.000000000 -0700 +++ fusionforge-6.0.3+20151023/debian/plugins 2016-03-23 15:37:51.000000000 -0700 @@ -19,7 +19,7 @@ Recommends: fusionforge-scm Package: fusionforge-plugin-moinmoin -Depends: php5-cli, python-moinmoin, python-psycopg2, libapache2-mod-wsgi +Depends: php-cli, python-moinmoin, python-psycopg2, libapache2-mod-wsgi Package: fusionforge-plugin-admssw Depends: php-http, fusionforge-plugin-doaprdf, libgraphite-php @@ -31,7 +31,7 @@ Depends: Package: fusionforge-plugin-authldap -Depends: php5-ldap +Depends: php-ldap Package: fusionforge-plugin-blocks Depends: @@ -61,7 +61,7 @@ Depends: Package: fusionforge-plugin-hudson -Depends: php5-cli +Depends: php-cli Package: fusionforge-plugin-message Depends: @@ -75,10 +75,10 @@ # Note: scmhook might need to be manually packaged to allow installing # the commit hooks on a separate SCM server Package: fusionforge-plugin-scmhook -Depends: php5-cli, php5-curl, mksh, ${perl:Depends} +Depends: php-cli, php-curl, mksh, ${perl:Depends} Package: fusionforge-plugin-sysauthldap -Depends: php5-ldap +Depends: php-ldap Recommends: slapd, ldap-utils, ${perl:Depends} Package: fusionforge-plugin-taskboard