[Fusionforge-commits] FusionForge branch master updated. 3a37d20d9e6db9d22fb101e6b08cca3a68b45c2e

Roland Mas lolando at fusionforge.org
Thu Jul 18 14:54:16 CEST 2013


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, master has been updated
       via  3a37d20d9e6db9d22fb101e6b08cca3a68b45c2e (commit)
       via  46431d2fc8a7f4e36c555a9453d75a58e786bf4b (commit)
       via  f719c903472cd3ebc927ee0ba79bfbe4cddb9da0 (commit)
       via  49e11e6fa429b88ee13d0d87466943d59906758f (commit)
       via  da132864e0d88c4182e7cdd39fec36ef39422396 (commit)
      from  10b05574564e8209c727793c42849ef13a9fefbb (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 -----------------------------------------------------------------
commit 3a37d20d9e6db9d22fb101e6b08cca3a68b45c2e
Merge: 10b0557 46431d2
Author: Roland Mas <lolando at debian.org>
Date:   Thu Jul 18 14:54:04 2013 +0200

    Merged from 5.2

diff --cc src/common/include/session.php
index c329730,d6eee4c..23dcde8
--- a/src/common/include/session.php
+++ b/src/common/include/session.php
@@@ -53,9 -53,10 +53,12 @@@ function session_build_session_token($u
  	}
  	return session_build_session_cookie($user_id);
  }
 +
  function session_build_session_cookie($user_id) {
 +	$nonce = md5(util_randbytes());
+ 	if (strlen(forge_get_config('session_key')) < 4) {
+ 		exit_error('ATTN sysadmin: upgrade your session_key; hint: locate secrets.inc');
+ 	}
  	$session_cookie_data = array(
  		$user_id,
  		getStringFromServer('REMOTE_ADDR'),
diff --cc tests/scripts/fusionforge-build-and-test-deb.sh
index e7e22d5,5092034..ef783fa
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@@ -47,6 -40,10 +47,8 @@@ dch -b -v $MAJOR$MINOR -D UNRELEASED "T
  sed -i -e "1s/UNRELEASED/$DIST/" debian/changelog
  pdebuild --configfile $COWBUILDERCONFIG --buildresult $BUILDRESULT
  
 -CHANGEFILE=${PKGNAME}_$SMAJOR${MINOR}_$ARCH.changes
 -
+ lintian -i $CHANGEFILE || true
+ 
  cd $BUILDRESULT
  REPOPATH=$WORKSPACE/build/debian
  

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/pre.php                      |    2 ++
 src/common/include/session.php                  |    3 +++
 src/packaging/control/080mta-courier            |    6 ------
 src/packaging/control/080mta-courier.shortdesc  |    2 --
 tests/scripts/fusionforge-build-and-test-deb.sh |    2 ++
 5 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 src/packaging/control/080mta-courier
 delete mode 100644 src/packaging/control/080mta-courier.shortdesc


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list