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 e045f4b4274a89025434ffeb9db988028f414bc1 (commit)
via 2189b2876d1d46c86f62985138ebebc472aa7456 (commit)
via b32e44abdce8e4225a96f92ea9070256e013ab18 (commit)
via 1eed8feb9989bef3fbba3bfd04a1afabf1421c74 (commit)
from 1188e98adadc839690bcf9d5876ff055160c7529 (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 e045f4b4274a89025434ffeb9db988028f414bc1
Merge: 1188e98 2189b28
Author: Roland Mas <[email protected]>
Date: Mon Jun 8 18:29:19 2015 +0200
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 2 ++
src/db/20141106-frs-zip-per-release.php | 2 +-
src/db/20150404-scmperms.php | 4 ++--
src/etc/cron.d/fusionforge-scm | 2 ++
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/CHANGES b/src/CHANGES
index 2cc274b..ab2add4 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -2,12 +2,14 @@ FusionForge 6.0.1:
* Accounts: accept elliptic curve ssh keys (Unit 193)
* Accounts: fix project join request form (Inria)
* SCM: fix commit privileges (*_scmro group membership) (Inria)
+* SCM: kill stalled Apache processes (Inria)
* FRS: display new releases first (Roland Mas, for Inria)
* Tracker: fix description re-html-ization when editing item (Inria)
* Tracker: fix HTML entities in mail notifications (Inria)
* Widgets: MyProjects: only display active projects (Inria)
* SCM SVN: fix double-compression in ViewVC (Inria)
* SCM SVN: support files with spaces in ViewVC (Inria)
+* SCM SVN: fix permissions in migration script (Inria)
* Plugin scmhook: git commitemail: fix subject, handle special chars (Roland
Mas, for Inria)
* Plugin scmhook: fix hook deactivation (Inria)
* Doc clean-up (Inria)
diff --git a/src/db/20141106-frs-zip-per-release.php
b/src/db/20141106-frs-zip-per-release.php
index fe3a996..3680842 100644
--- a/src/db/20141106-frs-zip-per-release.php
+++ b/src/db/20141106-frs-zip-per-release.php
@@ -39,8 +39,8 @@ if (class_exists('ZipArchive')) {
$releasesRes = db_query_params('select distinct
frs_release.release_id as rid, frs_release.name as rname from
frs_release,frs_file where frs_release.package_id = $1 and frs_file.release_id
= frs_release.release_id',
array($packageArr['pid']));
$packageArr['pname'] =
util_secure_filename($packageArr['pname']);
- $releaseArr['rname'] =
util_secure_filename($releaseArr['rname']);
while ($releaseArr = db_fetch_array($releasesRes)) {
+ $releaseArr['rname'] =
util_secure_filename($releaseArr['rname']);
$filesRes = db_query_params('select filename from
frs_file where release_id = $1', array($releaseArr['rid']));
if (db_numrows($filesRes)) {
$zip = new ZipArchive();
diff --git a/src/db/20150404-scmperms.php b/src/db/20150404-scmperms.php
index 868ddfd..34e3d1a 100644
--- a/src/db/20150404-scmperms.php
+++ b/src/db/20150404-scmperms.php
@@ -50,10 +50,10 @@ foreach ($groups as $group) {
$repo = "$svnroot/$gname";
if (is_dir($repo)) {
- chmod($repo, $group['anon'] ? 02775 : 02770);
+ chmod($repo, $group['anon'] ? 02755 : 02750);
system("chown -Rh root:{$gid_rw} $repo");
system("chown -h root:{$gid_ro} $repo");
- system("find $repo -type d -print0 | xargs -r -0 chmod 2775");
+ system("find $repo/* -type d -print0 | xargs -r -0 chmod 2775");
system("chmod -R g+rwX,o+rX-w $repo/*");
}
$repo = '/nonexistent'; // for safety
diff --git a/src/etc/cron.d/fusionforge-scm b/src/etc/cron.d/fusionforge-scm
index 5a29832..baaa8a8 100644
--- a/src/etc/cron.d/fusionforge-scm
+++ b/src/etc/cron.d/fusionforge-scm
@@ -9,3 +9,5 @@
PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# Generate snapshots and tarballs from SCM repositories
0 3 * * * root forge_run_job scm/generate_scm_snapshots.php
+# Kill old Apache2 processes (excluding the main apache parent)
+1 * * * * root d=$(forge_get_config apache_service); for pid in
$(pidof $d -o $(cat /var/run/$d/$d.pid)); do etimes=$(ps -oetimes -p$pid | tail
-n+2); if [ ${etimes:-0} -gt 86400 ]; then kill -9 $pid; fi; done
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
