[Fusionforge-commits] FusionForge branch master updated. 6f05e9b8ca695eccbc097e8ea2b7da5b92e661f5

Roland Mas lolando at fusionforge.org
Fri Jul 25 16:00:13 CEST 2014


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  6f05e9b8ca695eccbc097e8ea2b7da5b92e661f5 (commit)
       via  9642d96ab21ff2166b9b229909ce2eddaf0d0965 (commit)
       via  44cc7cd7ca204d5b42e77f741eea4291320b933e (commit)
       via  ca57a4bd80d304ad2b629669f96fb6da6d7ce359 (commit)
      from  025a09e09ea4bf0ae4a6a5f0951f18f7719a8602 (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 6f05e9b8ca695eccbc097e8ea2b7da5b92e661f5
Merge: 025a09e 9642d96
Author: Roland Mas <lolando at debian.org>
Date:   Fri Jul 25 16:00:05 2014 +0200

    Merge branch 'Branch_5_3'

diff --cc src/common/include/account.php
index 950bc1c,d128cea..3f3121e
--- a/src/common/include/account.php
+++ b/src/common/include/account.php
@@@ -215,11 -215,10 +215,11 @@@ function account_get_user_default_shell
  /**
   * account_getavailableshells - return available shells for the users
   *
 - * @return	array	Available shells
 + * @param bool $add_user_default_shell
 + * @return    array    Available shells
   */
 -function account_getavailableshells($add_user_default_shell = TRUE) {
 +function account_getavailableshells($add_user_default_shell = true) {
- 	// we'd better use the shells defined inside the 'chroot' in /var/lib/gforge/chroot/etc/shells it it exists
+ 	// we'd better use the shells defined inside the 'chroot' in {core/chroot}/etc/shells it it exists
  	$chroot = forge_get_config('chroot');
  	$shells_file = $chroot.'/etc/shells';
  	if(! file_exists($shells_file) ) {
diff --cc src/utils/one-off-scripts/tracker-import.php
index 34fc768,c349d00..43bddb7
--- a/src/utils/one-off-scripts/tracker-import.php
+++ b/src/utils/one-off-scripts/tracker-import.php
@@@ -22,15 -22,10 +22,15 @@@
   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   *-
   * Edit below; comments inline.  Imports a JSON generated by tracker-export
 - * into a tracker, although only a very small part of the data.
 + * into a tracker; I believe that all fields are imported, except assignee,
 + * which is by design; missing data is recorded still.
 + *
 + * Note: this script may require editing to adjust to the instance
 + * and version of the forge used, e.g. it uses a form of ->addHistory()
 + * whose third argument is $new_value which is not in FusionForge 5.3.
   */
  
- require '/usr/share/gforge/common/include/env.inc.php';
+ require `forge_get_config source_path`.'/common/include/env.inc.php';
  require_once $gfcommon."include/pre.php";
  require_once $gfcommon.'include/minijson.php';
  require_once $gfcommon.'tracker/Artifact.class.php';

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

Summary of changes:
 src/backend/include.pl                             |    4 +-
 src/common/frs/FRSFile.class.php                   |    2 +-
 src/common/include/account.php                     |    4 +-
 src/common/include/env.inc.php                     |    3 +
 src/cronjobs/get_news_notapproved.pl               |    5 +-
 src/cronjobs/gforge-db-backup.sh                   |   10 +-
 src/cronjobs/mail/mailing_lists_create.php         |    4 +-
 src/docs/README.Plugins                            |    4 +-
 src/docs/README.Soap                               |    4 +-
 src/docs/README.Themes                             |    2 +-
 src/etc/httpd.conf.d/40-vhosts-extra.conf          |    2 +-
 src/etc/httpd.conf.d/plugin-moinmoin.inc           |    2 +-
 src/fusionforge.spec                               |  253 ++++++++++----------
 src/install-ng                                     |   19 +-
 src/install/install3                               |    2 +-
 src/install/install4                               |    2 +-
 src/install/install5_post                          |   16 +-
 src/packaging/dirs/common                          |    2 +-
 src/packaging/dirs/web-apache2                     |    2 +-
 src/packaging/install/common                       |   18 +-
 src/packaging/install/web-apache2                  |    2 +-
 src/packaging/links/common                         |    2 +-
 src/packaging/links/web-apache2                    |    2 +-
 src/plugins/admssw/packaging/dirs/plugin-admssw    |    6 +-
 src/plugins/admssw/packaging/install/plugin-admssw |    8 +-
 src/plugins/authcas/README                         |    6 +-
 .../authcas/packaging/install/plugin-authcas       |    6 +-
 src/plugins/authhttpd/README                       |    2 +-
 .../authhttpd/packaging/install/plugin-authhttpd   |    6 +-
 src/plugins/authldap/README                        |    2 +-
 .../authldap/packaging/install/plugin-authldap     |    6 +-
 .../authopenid/packaging/dirs/plugin-authopenid    |    6 +-
 .../authopenid/packaging/install/plugin-authopenid |    8 +-
 .../authwebid/packaging/dirs/plugin-authwebid      |    6 +-
 .../authwebid/packaging/install/plugin-authwebid   |    8 +-
 src/plugins/blocks/packaging/dirs/plugin-blocks    |    6 +-
 src/plugins/blocks/packaging/install/plugin-blocks |    8 +-
 .../packaging/dirs/plugin-compactpreview           |    4 +-
 .../packaging/install/plugin-compactpreview        |    8 +-
 .../packaging/dirs/plugin-contribtracker           |    8 +-
 .../packaging/install/plugin-contribtracker        |    8 +-
 src/plugins/cvssyncmail/INSTALL                    |    2 +-
 src/plugins/cvstracker/README                      |    4 +-
 src/plugins/doaprdf/packaging/dirs/plugin-doaprdf  |    6 +-
 .../doaprdf/packaging/install/plugin-doaprdf       |    6 +-
 .../packaging/install/plugin-externalsearch        |    2 +-
 .../extsubproj/packaging/dirs/plugin-extsubproj    |    8 +-
 .../extsubproj/packaging/install/plugin-extsubproj |   14 +-
 .../packaging/dirs/plugin-foafprofiles             |    6 +-
 .../packaging/install/plugin-foafprofiles          |    6 +-
 src/plugins/forumml/README.txt                     |    2 +-
 src/plugins/forumml/bin/install.sh                 |    4 +-
 src/plugins/forumml/bin/installFF.sh               |   18 +-
 src/plugins/forumml/bin/mail_2_DBFF.pl             |   15 +-
 src/plugins/forumml/bin/ml_arch_2_DBFF.pl          |   18 +-
 src/plugins/forumml/etc/forumml.inc                |    2 +-
 src/plugins/forumml/packaging/dirs/plugin-forumml  |    6 +-
 .../forumml/packaging/install/plugin-forumml       |   12 +-
 .../packaging/dirs/plugin-globaldashboard          |    6 +-
 .../packaging/install/plugin-globaldashboard       |   10 +-
 src/plugins/globalsearch/README                    |    4 +-
 .../globalsearch/bin/get_assoc_sites_projects.pl   |    5 +-
 .../packaging/cron.d/plugin-globalsearch           |    2 +-
 .../packaging/dirs/plugin-globalsearch             |    8 +-
 .../packaging/install/plugin-globalsearch          |    8 +-
 .../gravatar/packaging/dirs/plugin-gravatar        |    2 +-
 .../gravatar/packaging/install/plugin-gravatar     |    4 +-
 .../headermenu/packaging/dirs/plugin-headermenu    |   10 +-
 .../headermenu/packaging/install/plugin-headermenu |   12 +-
 src/plugins/helloworld/bin/sayhello                |    7 +-
 .../helloworld/packaging/dirs/plugin-helloworld    |    4 +-
 .../helloworld/packaging/install/plugin-helloworld |   12 +-
 src/plugins/hudson/packaging/dirs/plugin-hudson    |    6 +-
 src/plugins/hudson/packaging/install/plugin-hudson |   16 +-
 src/plugins/mailman/bin/install.sh                 |    2 +-
 src/plugins/mailman/packaging/dirs/plugin-mailman  |    6 +-
 .../mailman/packaging/install/plugin-mailman       |   18 +-
 .../mailman/var/lib/mailman/lists/extend.py        |    4 +-
 .../mantisbt/packaging/install/plugin-mantisbt     |   16 +-
 src/plugins/mediawiki/README                       |    2 +-
 src/plugins/mediawiki/README.codendi               |    2 +-
 .../etc/cron.d/fusionforge-plugin-mediawiki        |    6 +-
 .../mediawiki/etc/httpd.d/61plugin-mediawiki       |    4 +-
 .../mediawiki/packaging/dirs/plugin-mediawiki      |    8 +-
 .../mediawiki/packaging/install/plugin-mediawiki   |   14 +-
 .../mediawiki/packaging/links/plugin-mediawiki     |   32 +--
 src/plugins/mediawiki/www/frame.php                |    2 +-
 .../message/packaging/install/plugin-message       |    8 +-
 .../moinmoin/etc/plugins/moinmoin/moinmoin.conf    |    2 +-
 src/plugins/moinmoin/lib/farmconfig.py             |    7 +-
 .../moinmoin/packaging/dirs/plugin-moinmoin        |   10 +-
 .../moinmoin/packaging/install/plugin-moinmoin     |   14 +-
 .../moinmoin/packaging/links/plugin-moinmoin       |    2 +-
 src/plugins/moinmoin/wsgi/moin.wsgi                |   13 +-
 src/plugins/moinmoin/wsgi/moin.wsgi.fg_template    |    2 +-
 src/plugins/moinmoin/www/frame.php                 |    2 +-
 .../packaging/dirs/plugin-oauthconsumer            |    4 +-
 .../packaging/install/plugin-oauthconsumer         |    8 +-
 .../packaging/dirs/plugin-oauthprovider            |    4 +-
 .../packaging/install/plugin-oauthprovider         |   12 +-
 src/plugins/oslc/INSTALL                           |    4 +-
 src/plugins/oslc/bin/sayhello                      |    7 +-
 src/plugins/oslc/etc/httpd.d/plugin-oslc.inc       |    6 +-
 src/plugins/oslc/etc/plugins/oslc/config.php       |    2 +-
 src/plugins/oslc/packaging/dirs/plugin-oslc        |    8 +-
 src/plugins/oslc/packaging/docs/README.Debian      |    4 +-
 src/plugins/oslc/packaging/install/plugin-oslc     |    8 +-
 src/plugins/oslc/tests/setup-provider-test.sh      |    2 +-
 src/plugins/projectimport/bin/install.sh           |    2 +-
 .../packaging/dirs/plugin-projectimport            |    4 +-
 .../packaging/install/plugin-projectimport         |   10 +-
 .../packaging/dirs/plugin-projectlabels            |    8 +-
 .../packaging/install/plugin-projectlabels         |    8 +-
 .../packaging/install/plugin-projects-hierarchy    |   14 +-
 src/plugins/quota_management/INSTALL               |    2 +-
 .../quota_management/cronjobs/quota_update.pl      |    5 +-
 src/plugins/scmarch/packaging/dirs/plugin-scmarch  |    2 +-
 .../scmarch/packaging/install/plugin-scmarch       |    4 +-
 src/plugins/scmbzr/bin/install.sh                  |    2 +-
 .../scmbzr/etc/plugins/scmbzr/serve-branches.conf  |    2 +-
 src/plugins/scmbzr/packaging/dirs/plugin-scmbzr    |    2 +-
 src/plugins/scmbzr/packaging/install/plugin-scmbzr |    8 +-
 src/plugins/scmccase/README                        |   14 +-
 .../scmccase/packaging/install/plugin-scmccase     |    2 +-
 .../scmcpold/packaging/dirs/plugin-scmcpold        |    2 +-
 .../scmcpold/packaging/install/plugin-scmcpold     |    4 +-
 src/plugins/scmcvs/README                          |    2 +-
 src/plugins/scmcvs/bin/install.sh                  |    2 +-
 .../scmcvs/cron.d/fusionforge-plugin-scmcvs        |    8 +-
 src/plugins/scmcvs/etc/plugins/scmcvs/cvsweb.conf  |    2 +-
 src/plugins/scmcvs/packaging/dirs/plugin-scmcvs    |    6 +-
 src/plugins/scmcvs/packaging/install/plugin-scmcvs |   12 +-
 src/plugins/scmcvs/sbin/cvs-pserver                |    2 +-
 .../scmdarcs/packaging/dirs/plugin-scmdarcs        |    8 +-
 .../scmdarcs/packaging/install/plugin-scmdarcs     |    6 +-
 .../scmdarcs/packaging/links/plugin-scmdarcs       |    2 +-
 src/plugins/scmgit/packaging/dirs/plugin-scmgit    |    6 +-
 src/plugins/scmgit/packaging/install/plugin-scmgit |    8 +-
 src/plugins/scmgit/packaging/links/plugin-scmgit   |    2 +-
 src/plugins/scmhg/packaging/dirs/plugin-scmhg      |    2 +-
 src/plugins/scmhg/packaging/install/plugin-scmhg   |    4 +-
 src/plugins/scmhook/packaging/dirs/plugin-scmhook  |    6 +-
 .../scmhook/packaging/install/plugin-scmhook       |   12 +-
 src/plugins/scmsvn/bin/install.sh                  |    7 +-
 src/plugins/scmsvn/fusionforge-plugin-scmsvn.spec  |   67 +++---
 src/plugins/scmsvn/packaging/dirs/plugin-scmsvn    |    4 +-
 src/plugins/scmsvn/packaging/install/plugin-scmsvn |    6 +-
 src/plugins/soapadmin/bin/sayhello                 |    7 +-
 .../soapadmin/packaging/dirs/plugin-soapadmin      |    6 +-
 .../soapadmin/packaging/install/plugin-soapadmin   |   16 +-
 .../soapadmin/packaging/links/plugin-soapadmin     |    2 +-
 src/plugins/sysauthldap/bin/install.sh             |   10 +-
 .../packaging/control/350plugin-sysauthldap        |    2 +-
 .../packaging/install/plugin-sysauthldap           |    8 +-
 src/plugins/twitter/packaging/dirs/plugin-twitter  |    6 +-
 .../twitter/packaging/install/plugin-twitter       |    8 +-
 src/utils/fg_dirs                                  |    6 +-
 src/utils/fg_link                                  |   10 +-
 src/utils/fg_template                              |    8 +-
 src/utils/forge_get_config_basic                   |   14 +-
 src/utils/forge_run_plugin_job                     |    4 +-
 src/utils/install-apache.sh                        |    2 +-
 src/utils/ldap/sql2ldif.pl                         |   11 +-
 src/utils/ldap/sql2ldifadd.pl                      |    9 +-
 src/utils/ldap/sql2ldifmod.pl                      |    7 +-
 src/utils/manage-apache-config.sh                  |  110 +++------
 src/utils/one-off-scripts/tracker-export.php       |    2 +-
 src/utils/one-off-scripts/tracker-import.php       |    2 +-
 src/utils/one-off-scripts/tracker-massmove.php     |    2 +-
 src/utils/underworld-dummy/dns_conf.pl             |    5 +-
 src/utils/underworld-dummy/dump_database.pl        |   54 -----
 src/utils/underworld-dummy/ia64_dump.pl            |   28 ---
 src/utils/underworld-dummy/ssh_dump.pl             |   23 --
 src/utils/update-all-in-sysauth.php                |    2 +-
 174 files changed, 769 insertions(+), 834 deletions(-)
 delete mode 100755 src/utils/underworld-dummy/dump_database.pl
 delete mode 100755 src/utils/underworld-dummy/ia64_dump.pl
 delete mode 100755 src/utils/underworld-dummy/ssh_dump.pl


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list