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.1 has been updated
via 43d716a168ad43e414739a14ce2d1124504596da (commit)
via 2215861e7e526715d4d6b9ef1fc46744b2140ba4 (commit)
via e5120d261db93196ae8daeb2941f73fc5543044c (commit)
via bddc9f1abe365950071096b2a7052fa9e3860b5b (commit)
from b2a212f527521080273c84143b870fbeb6a37f57 (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=43d716a168ad43e414739a14ce2d1124504596da
commit 43d716a168ad43e414739a14ce2d1124504596da
Author: Franck Villaume <[email protected]>
Date: Sat Jan 20 17:13:27 2018 +0100
use core chroot configuration value when needed by default
diff --git a/src/etc/config.ini.d/defaults.ini
b/src/etc/config.ini.d/defaults.ini
index f321025..a12822d 100644
--- a/src/etc/config.ini.d/defaults.ini
+++ b/src/etc/config.ini.d/defaults.ini
@@ -14,8 +14,8 @@ url_root = "$core/source_path/www/"
themes_root = "$core/source_path/www/themes"
; ...data
chroot = "$core/data_path/chroot"
-homedir_prefix = "/home/users"
-groupdir_prefix = "/home/groups"
+homedir_prefix = "$core/chroot/home/users"
+groupdir_prefix = "$core/chroot/home/groups"
upload_dir = "$core/data_path/download"
ftp_upload_dir = "$core/data_path/ftproot"
scm_snapshots_path = "$core/data_path/scmsnapshots"
diff --git a/src/plugins/scmbzr/etc/scmbzr.ini
b/src/plugins/scmbzr/etc/scmbzr.ini
index 9e46d4c..c6e91e6 100644
--- a/src/plugins/scmbzr/etc/scmbzr.ini
+++ b/src/plugins/scmbzr/etc/scmbzr.ini
@@ -8,6 +8,6 @@
plugin_status = valid
default_server = "$core/scm_host"
-repos_path = "/srv/bzr"
+repos_path = "$core/chroot/scmrepos/bzr"
loggerhead_user = "$core/system_user"
loggerhead_group = "$core/system_user"
diff --git a/src/plugins/scmdarcs/etc/scmdarcs.ini
b/src/plugins/scmdarcs/etc/scmdarcs.ini
index f332d72..ba60884 100644
--- a/src/plugins/scmdarcs/etc/scmdarcs.ini
+++ b/src/plugins/scmdarcs/etc/scmdarcs.ini
@@ -8,4 +8,4 @@
plugin_status = valid
default_server = "$core/scm_host"
-repos_path = "/srv/darcs"
+repos_path = "$core/chroot/scmrepos/darcs"
diff --git a/src/plugins/scmgit/etc/scmgit.ini
b/src/plugins/scmgit/etc/scmgit.ini
index e15c264..b668ee5 100644
--- a/src/plugins/scmgit/etc/scmgit.ini
+++ b/src/plugins/scmgit/etc/scmgit.ini
@@ -8,7 +8,7 @@
plugin_status = valid
default_server = "$core/scm_host"
-repos_path = "/srv/git"
+repos_path = "$core/chroot/scmrepos/git"
use_ssh = yes
use_smarthttp = yes
diff --git a/src/plugins/scmsvn/etc/scmsvn.ini
b/src/plugins/scmsvn/etc/scmsvn.ini
index ae029cb..a191fb9 100644
--- a/src/plugins/scmsvn/etc/scmsvn.ini
+++ b/src/plugins/scmsvn/etc/scmsvn.ini
@@ -13,7 +13,7 @@ use_ssh = yes
anonsvn_login = anonsvn
anonsvn_password = anonsvn
default_server = "$core/scm_host"
-repos_path = "/srv/svn"
+repos_path = "$core/chroot/scmrepos/svn"
serve_root = "$scmsvn/repos_path"
apache_auth_realm = "$core/apache_auth_realm"
; ^ note: in FF < 6.0 it was "Document repository"
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2215861e7e526715d4d6b9ef1fc46744b2140ba4
commit 2215861e7e526715d4d6b9ef1fc46744b2140ba4
Author: Franck Villaume <[email protected]>
Date: Sat Jan 20 17:09:32 2018 +0100
remove unused function htpasswd_apr1_md5
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 6d245fd..17b5f24 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -5,10 +5,9 @@
* Copyright 1999-2001, VA Linux Systems, Inc.
* Copyright 2009-2011, Roland Mas
* Copyright 2009-2011, Franck Villaume - Capgemini
- * Copyright (c) 2010, 2011, 2012
- * Thorsten Glaser <[email protected]>
+ * Copyright 2010-2012, Thorsten Glaser - Tarent
* Copyright 2010-2012, Alain Peyrat - Alcatel-Lucent
- * Copyright 2013,2016-2017, Franck Villaume - TrivialDev
+ * Copyright 2013,2016-2018, Franck Villaume - TrivialDev
* Copyright 2016, Stéphane-Eymeric Bredthauer - TrivalDev
*
* This file is part of FusionForge. FusionForge is free software;
@@ -28,53 +27,6 @@
*/
/**
- * htpasswd_apr1_md5 - generate htpasswd md5 format password
- *
- * @param string $plainpasswd the plain string password
- * @return string the apr1 string passwords
- *
- * From http://www.php.net/manual/en/function.crypt.php#73619
- */
-function htpasswd_apr1_md5($plainpasswd) {
- $salt = substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"), 0,
8);
- $len = strlen($plainpasswd);
- $text = $plainpasswd.'$apr1$'.$salt;
- $bin = pack("H32", md5($plainpasswd.$salt.$plainpasswd));
- $tmp = '';
- for ($i = $len; $i > 0; $i -= 16) {
- $text .= substr($bin, 0, min(16, $i));
- }
- for ($i = $len; $i > 0; $i >>= 1) {
- $text .= ($i & 1)? chr(0) : $plainpasswd{0};
- }
- $bin = pack("H32", md5($text));
- for ($i = 0; $i < 1000; $i++) {
- $new = ($i & 1)? $plainpasswd : $bin;
- if ($i % 3) {
- $new .= $salt;
- }
- if ($i % 7) {
- $new .= $plainpasswd;
- }
- $new .= ($i & 1)? $bin : $plainpasswd;
- $bin = pack("H32", md5($new));
- }
- for ($i = 0; $i < 5; $i++) {
- $k = $i + 6;
- $j = $i + 12;
- if ($j == 16) {
- $j = 5;
- }
- $tmp = $bin[$i].$bin[$k].$bin[$j].$tmp;
- }
- $tmp = chr(0).chr(0).$bin[11].$tmp;
- $tmp = strtr(strrev(substr(base64_encode($tmp), 2)),
-
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
-
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
- return "$"."apr1"."$".$salt."$".$tmp;
-}
-
-/**
* is_utf8 - utf-8 detection
*
* @param string $str the string to analyze
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e5120d261db93196ae8daeb2941f73fc5543044c
commit e5120d261db93196ae8daeb2941f73fc5543044c
Author: Franck Villaume <[email protected]>
Date: Sat Jan 20 17:08:55 2018 +0100
Remove obsolete INSTALL file
diff --git a/src/plugins/scmhg/INSTALL b/src/plugins/scmhg/INSTALL
deleted file mode 100644
index a438376..0000000
--- a/src/plugins/scmhg/INSTALL
+++ /dev/null
@@ -1,50 +0,0 @@
-Mercurial Plugin
-================
-
-Just put the plugin files in the rigth place:
- /opt/gforge/plugins/scmhg
-
---> /opt/gforge/www/plugins must contain a symlink to
/opt/gforge/plugins/scmhg/www
-
-Make sure you have installed Mercurial correctly. The Plugin should work with
almost any Version of it.
-Now search the hgweb.cgi of your Mercurial install or download it from
http://mercurial.selenic.com/ .
-
-The file should contain some lines like:
- application = hgweb("/path/to/repo", "repository name")
- wsgicgi.launch(application)
-This lines are needed to launch independend webpages for every mercurial
project.
-Put the hgweb.cgi into scmhg/www/cgi-bin and make sure that it is readable for
the user running fusionforges-cronjobs.
-
-Now copy the fflog.tmpl file available in etc directory into your central
mercurial path for templates. It should be something like
'/usr/lib/python2.6/site-packages/mercurial/templates/' .
-The path was correct, when you can use 'hg log --style fflog.tmpl' from any hg
repository. The template file is needed to gather statistics for the sourcecode
history.
-
-
-Your scmhg.ini (/etc/config.ini.d/) should contain the following entries:
- default_server, repos_path, use_ssh, use_ssl, use_dav, anonhg_login,
anonhg_password
-
-APACHE CONFIGURATION:
-
-Here is an example configuration for use with http and hgweb .
-
- #
- # Mercurial Repository
- #
- ScriptAliasMatch ^/hg/(.*)
/opt/gforge/www/plugins/scmhg/www/cgi-bin/$1.cgi
- <Directory "/opt/gforge/www/plugins/scmhg/www/cgi-bin">
- Options +ExecCGI FollowSymLinks Multiviews
- AddHandler cgi-script .cgi
- RewriteEngine On
- RewriteRule .* - [E=REMOTE_USER:%{ENV:REDIRECT_REMOTE_USER}]
- AllowOverride None
- Order allow,deny
- Allow from all
- </Directory>
-
- <Location /hg>
- AuthType Basic
- AuthName "Mercurial Access"
- AuthUserFile /data_path/hgroot-authfile
- Require valid-user
- </Location>
-
-
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bddc9f1abe365950071096b2a7052fa9e3860b5b
commit bddc9f1abe365950071096b2a7052fa9e3860b5b
Author: Franck Villaume <[email protected]>
Date: Sat Jan 20 17:08:21 2018 +0100
scmhg: remove unused hgroot-authfile, clean-up ini file
diff --git a/src/plugins/scmhg/common/HgPlugin.class.php
b/src/plugins/scmhg/common/HgPlugin.class.php
index bda526f..de8304c 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -4,7 +4,7 @@
*
* Copyright 2009, Roland Mas
* Copyright 2012, Denise Patzker
- * Copyright 2012-2014,2017, Franck Villaume - TrivialDev
+ * Copyright 2012-2014,2017-2018, Franck Villaume - TrivialDev
*
* This file is part of FusionForge.
*
@@ -440,18 +440,6 @@ Offer DAV or SSH access.");
system("chown $unix_user:$unix_group $path/hgrc");
system("chmod 660 $path/hgrc");
}
-
- foreach ($hgusers as $user_id => $user) {
- $password_data .=
$user->getUnixName().':'.$user->getUnixPasswd()."\n";
- }
- $password_data .= forge_get_config('anonhg_login',
'scmhg').":".htpasswd_apr1_md5(forge_get_config('anonhg_password',
'scmhg'))."\n";
-
- $fname = forge_get_config('data_path').'/hgroot-authfile';
- $f = fopen($fname.'.new', 'w');
- fwrite($f, $password_data);
- fclose($f);
- chmod($fname.'.new', 0644);
- rename($fname.'.new', $fname);
}
function generateSnapshots($params) {
diff --git a/src/plugins/scmhg/etc/scmhg.ini b/src/plugins/scmhg/etc/scmhg.ini
index 2e175e1..69b7c20 100644
--- a/src/plugins/scmhg/etc/scmhg.ini
+++ b/src/plugins/scmhg/etc/scmhg.ini
@@ -10,7 +10,5 @@ plugin_status = valid
use_ssl = "$core/use_ssl"
use_ssh = yes
use_dav = yes
-anonhg_login = guest
-anonhg_password = guest
default_server = "$core/scm_host"
-repos_path = "/srv/hg"
+repos_path = "$core/chroot/scmrepos/hg"
-----------------------------------------------------------------------
Summary of changes:
src/common/include/utils.php | 52 ++---------------------------
src/etc/config.ini.d/defaults.ini | 4 +--
src/plugins/scmbzr/etc/scmbzr.ini | 2 +-
src/plugins/scmdarcs/etc/scmdarcs.ini | 2 +-
src/plugins/scmgit/etc/scmgit.ini | 2 +-
src/plugins/scmhg/INSTALL | 50 ---------------------------
src/plugins/scmhg/common/HgPlugin.class.php | 14 +-------
src/plugins/scmhg/etc/scmhg.ini | 4 +--
src/plugins/scmsvn/etc/scmsvn.ini | 2 +-
9 files changed, 10 insertions(+), 122 deletions(-)
delete mode 100644 src/plugins/scmhg/INSTALL
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
