Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 fusionforge (6.0.5-1) unstable; urgency=medium
 .
   * New upstream release.
   * 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).
   * Fixed Lintian warning (fusionforge-web dependency on virtual package
     only).
   * Removed Olivier Berger from uploaders.  Thanks, Olivier!
Author: Roland Mas <lolando@debian.org>
Bug-Debian: https://bugs.debian.org/821486
Bug-Debian: https://bugs.debian.org/821487
Bug-Debian: https://bugs.debian.org/821488
Bug-Debian: https://bugs.debian.org/821489
Bug-Debian: https://bugs.debian.org/821490
Bug-Debian: https://bugs.debian.org/821491
Bug-Debian: https://bugs.debian.org/821492
Bug-Debian: https://bugs.debian.org/821493
Bug-Debian: https://bugs.debian.org/821494
Bug-Debian: https://bugs.debian.org/821495
Bug-Debian: https://bugs.debian.org/821496
Bug-Debian: https://bugs.debian.org/821497

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2017-11-17

--- fusionforge-6.0.5.orig/common/include/session.php
+++ fusionforge-6.0.5/common/include/session.php
@@ -146,7 +146,7 @@ function session_check_session_cookie($s
 		return false;
 	}
 	if ((forge_get_config('session_expire') > 0) &&
-	    ($time - time() >= forge_get_config('session_expire'))) {
+	    (time() - $time >= forge_get_config('session_expire'))) {
 		error_log("session_check_session_cookie failed: expired !");
 		return false;
 	}
--- fusionforge-6.0.5.orig/plugins/phpcaptcha/etc/httpd.conf.d/plugin-phpcaptcha.inc
+++ fusionforge-6.0.5/plugins/phpcaptcha/etc/httpd.conf.d/plugin-phpcaptcha.inc
@@ -1 +1,4 @@
 Alias /plugins/phpcaptcha ${FF__phpcaptcha__phpcaptcha_path}
+<Directory ${FF__phpcaptcha__phpcaptcha_path}>
+  Include ${FF__core__config_path}/httpd.conf.d/auth-main.inc
+</Directory>
