This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via db05b619eb0a9e88dec47b6b920e40a3e0634f7c (commit)
from 39dcd34072638ddcc528ea2c0786ea7ce66d3573 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=db05b619eb0a9e88dec47b6b920e40a3e0634f7c
commit db05b619eb0a9e88dec47b6b920e40a3e0634f7c
Author: Roland Mas <[email protected]>
Date: Fri Apr 22 14:51:17 2016 +0200
More packaging fixes for php7.0 transition
diff --git a/src/common/include/env.inc.php b/src/common/include/env.inc.php
index 6139048..01bc718 100644
--- a/src/common/include/env.inc.php
+++ b/src/common/include/env.inc.php
@@ -100,6 +100,7 @@ $include_path = join(PATH_SEPARATOR,
'/usr/share/php',
'/usr/share/php/htmlpurifier',
'/usr/share/pear',
+ '/usr/share/php/PEAR',
'/usr/share/php5/PEAR',
)
);
diff --git a/src/debian/changelog b/src/debian/changelog
index b6c63df..28cc555 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,9 +1,39 @@
-fusionforge (6.0.4-0) UNRELEASED; urgency=medium
+fusionforge (6.0.4-2) unstable; urgency=medium
+
+ * More packaging fixes for php7.0:
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821486).
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821487).
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821488).
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821489).
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821490).
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821491).
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821492).
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821493).
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821494).
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821495).
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821496).
+ * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+ #821497).
+
+ -- Roland Mas <[email protected]> Fri, 22 Apr 2016 14:51:08 +0200
+
+fusionforge (6.0.4-1) unstable; urgency=medium
* New upstream release.
* Update packaging to work with php7.0 (not only php5).
- -- Roland Mas <[email protected]> Fri, 22 Apr 2016 13:17:59 +0200
+ -- Roland Mas <[email protected]> Fri, 22 Apr 2016 13:49:15 +0200
fusionforge (6.0.3+20151023-1) unstable; urgency=medium
diff --git a/src/debian/plugins b/src/debian/plugins
index 0b4f6ee..f2a4228 100644
--- a/src/debian/plugins
+++ b/src/debian/plugins
@@ -15,7 +15,7 @@ Depends:
Recommends: fusionforge-scm
Package: fusionforge-plugin-scmcvs
-Depends: php5-cli, cvs, viewvc, libphp-snoopy, openbsd-inetd |
inet-superserver, update-inetd, libipc-run-perl, liburi-perl, ${perl:Depends}
+Depends: php-cli | php5-cli, cvs, viewvc, libphp-snoopy, openbsd-inetd |
inet-superserver, update-inetd, libipc-run-perl, liburi-perl, ${perl:Depends}
Recommends: fusionforge-scm
Package: fusionforge-plugin-scmdarcs
@@ -27,10 +27,10 @@ Depends: mercurial
Recommends: fusionforge-scm
Package: fusionforge-plugin-mediawiki
-Depends: php5-cli, mediawiki (>= 1:1.19.1-2~exp2)
+Depends: php-cli | php5-cli, mediawiki (>= 1:1.19.1-2~exp2)
Package: fusionforge-plugin-moinmoin
-Depends: php5-cli, python-moinmoin, python-psycopg2, libapache2-mod-wsgi
+Depends: php-cli | php5-cli, python-moinmoin, python-psycopg2,
libapache2-mod-wsgi
Package: fusionforge-plugin-admssw
Depends: php-http, fusionforge-plugin-doaprdf, libgraphite-php
@@ -42,7 +42,7 @@ Package: fusionforge-plugin-authhttpd
Depends:
Package: fusionforge-plugin-authldap
-Depends: php5-ldap
+Depends: php-ldap | php5-ldap
Package: fusionforge-plugin-blocks
Depends:
@@ -72,7 +72,7 @@ Package: fusionforge-plugin-headermenu
Depends:
Package: fusionforge-plugin-hudson
-Depends: php5-cli
+Depends: php-cli | php5-cli
Package: fusionforge-plugin-message
Depends:
@@ -86,10 +86,10 @@ Depends:
# 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 | php5-cli, php-curl | php5-curl, mksh, ${perl:Depends}
Package: fusionforge-plugin-sysauthldap
-Depends: php5-ldap
+Depends: php-ldap | php5-ldap
Recommends: slapd, ldap-utils, ${perl:Depends}
Package: fusionforge-plugin-taskboard
diff --git a/src/etc/httpd.conf.d/disable-scripts.inc
b/src/etc/httpd.conf.d/disable-scripts.inc
index 0e50c9c..6ee4028 100644
--- a/src/etc/httpd.conf.d/disable-scripts.inc
+++ b/src/etc/httpd.conf.d/disable-scripts.inc
@@ -20,3 +20,8 @@ RequestHeader unset Cookie
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
+
+# Disable PHP7 explicitly for security (CVE-2014-0468)
+<IfModule mod_php7.c>
+ php_admin_flag engine off
+</IfModule>
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index d8054db..a6a1629 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/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 php7.0 || a2enmod php5
a2enmod ssl
a2enmod env
a2enmod headers
-----------------------------------------------------------------------
Summary of changes:
src/common/include/env.inc.php | 1 +
src/debian/changelog | 34 ++++++++++++++++++++++++++++++--
src/debian/plugins | 14 ++++++-------
src/etc/httpd.conf.d/disable-scripts.inc | 5 +++++
src/post-install.d/web/web.sh | 2 +-
5 files changed, 46 insertions(+), 10 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
