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, feature/twig-template-engine has been updated
via 6939f2496247f928a924cf05be2c45f82c7211fb (commit)
via 708a47cd8df42d76bbbd235c148cc6c818c5df81 (commit)
via 3253817f2fc66db7b02b2120e8891a4cf2a25fec (commit)
via 40cde68c23fa03fa6149abe8efa543b6004312b3 (commit)
via 4eb2986b921967672c97db7a132fb2f1584721b7 (commit)
via 63c77fb2f8c514902dbeefb9cadd5ef6106c2da0 (commit)
via 3fc56a446f10dc70626bad73aed6030a09326a64 (commit)
via c21cd804308a12deb6922c43e043f609869f6eda (commit)
via 4eb2fa496497f445ee84e13b6b6876af43c3c555 (commit)
via 21747e2feff26153a723964b3ec527bd59be2564 (commit)
via 9c2db5ad92dd6b3eedafa9bdb2706ed660ef071d (commit)
via ae110f532e31c22e94b1758d6f0b4747782ba634 (commit)
via 31cbb5c9e86dd396df940f8ffab87359804b2dd5 (commit)
via 12241660eeeba9d2c9d541b734ae12c4de7b4525 (commit)
via 76f60cdc06dd1a7defdaa8faec51170c69293d00 (commit)
via 447fc0f16fefec8d8b91041a1cb6c3143ec2f9d8 (commit)
via 6ee6928fdd7721ecc086aae477eb6a8a2a4f654c (commit)
via e36a4c7fb12bd42e743720165d89b8ab05c6b5e4 (commit)
via ee8d4868ce56a8c787d8595c042d07e77ef76b2f (commit)
via 9068fefc2b1c6e7f3903df0de71a78096b8ea879 (commit)
via cb34f2f14a67b40644a81cb8ddb4c541c6004cc4 (commit)
via 4573bbc4c89b8cc8505d94fec14748ec35be322c (commit)
via 5bf66f046c94224d7699dde42c03ca5bb2f5cc43 (commit)
via e2c16ec549c3915b428785fac6301176679e4ab1 (commit)
via ecb207e113b33eab6e3706a0cfe0bc3ff1cc0126 (commit)
via 47aa32310af56c47df31937adbb87e14ee0c7dfa (commit)
via 2d2ca69b0f4b841b31c1ac21a80346ff7d891bec (commit)
via 7352b92b1763c72c680eac25d15992bc5d0bf469 (commit)
via a67964142eb3c5af2453351e0fdb4c411fffad20 (commit)
via ab3bcf69dfd80c56fb7f161c05dcf82854833754 (commit)
via 3e5223dd4cc69cc556a10ce9937d826f5ee69b91 (commit)
via df612ce2c112c54c6b99f4e9ee7ac7bb397d316e (commit)
via e070fe97ed37faa539d9d7bb4f703b7e95fe1637 (commit)
via cfdcf5ae4286a309a978010b2b575c1c80d7991f (commit)
via 9369b8d233bf14c64b53d9d110a356381423065e (commit)
via 7675546c6152cde58f576e08c4494a4d2d2ef395 (commit)
via b20542504063848d4f397f207832760b68d51d67 (commit)
via 7641cef095d1624c073e24ca96d22edc11371ef5 (commit)
via 86410c442e1aeeb2aeb7332606a13f23c7cb4527 (commit)
via 12f2a4aab7acfd9a952b44acf79b28065f59415a (commit)
via b6a6610cc3b39c25c206f373ba095cffe95de898 (commit)
via 7a0f12269a0f7f1415ddd64dd0d6592b4a2f43f9 (commit)
from 02d7c6cb80036ee9ff81e8f8db3ff3513bfb4e82 (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 6939f2496247f928a924cf05be2c45f82c7211fb
Merge: 02d7c6c 708a47c
Author: Roland Mas <[email protected]>
Date: Tue Jun 2 09:19:01 2015 +0200
Merge branch 'master' into feature/twig-template-engine
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 3 +
src/AUTHORS | 1 +
src/CHANGES | 2 +-
src/INSTALL.TXT | 367 +-----------------------
src/NEWS | 198 -------------
src/VERSION | 2 +-
src/common/include/account.php | 2 +-
src/debian/changelog | 12 +
src/debian/fusionforge-common.docs | 1 +
src/locale/fusionforge.pot | 14 +-
src/rpm/fusionforge.spec.in | 11 +-
src/www/account/editsshkeys.php | 4 +-
tests/buildbot/common-functions | 12 +-
tests/buildbot/fusionforge-build-and-test.sh | 11 +
tests/buildbot/push-packages-to-repositories.sh | 48 ++++
15 files changed, 99 insertions(+), 589 deletions(-)
delete mode 100644 src/NEWS
create mode 100755 tests/buildbot/push-packages-to-repositories.sh
diff --git a/.gitignore b/.gitignore
index 0ab4f75..aa82379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,9 @@ src/www/scm/viewvc/viewvc.org/*.zip
/.pc
src/.pc
fusionforge*.orig.tar.bz2
+fusionforge-*.tar.bz2
+src/fusionforge-*.tar.bz2
+# Debian packaging
src/debian/control
# RPM packaging:
build/
diff --git a/src/AUTHORS b/src/AUTHORS
index d0d1944..d139ac1 100644
--- a/src/AUTHORS
+++ b/src/AUTHORS
@@ -39,6 +39,7 @@ Philip Schwartz
Guillaume Smet
Reinhard Spisser
Franck Villaume
+Sylvain Beucler
See also AUTHORS.gforge and AUTHORS.sourceforge for prior contributors.
diff --git a/src/CHANGES b/src/CHANGES
index 4747d28..0b44099 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,4 +1,4 @@
-FusionForge 6.0rc4:
+FusionForge 6.0:
* New install system [#710] (Inria)
* Reactivity: system replication is now performed immediately (rather than
waiting for cron jobs) [#147] (Inria)
* SCM: Concurrent SSH and HTTPS access, relying on Apache mod_itk [#519]
(Roland Mas and Inria)
diff --git a/src/INSTALL.TXT b/src/INSTALL.TXT
index c1bd273..8cde9d4 100644
--- a/src/INSTALL.TXT
+++ b/src/INSTALL.TXT
@@ -1,365 +1,2 @@
-Installation of FusionForge is a non-trivial undertaking, since it integrates
-with so many different components across your system. A skilled sysadmin
-is required to pull it off, or at the least a great deal of patience.
-
-The result of a complete installation means automatic creation of CVS
-and Subversion repositories, and having access to them controlled by
-FusionForge and stats gathered from them. ViewCVS (used for CVS and
-Subversion browsing) are two additional integration points.
-
-BASICS OF INSTALLATION
-----------------------
-
-
-For Ubuntu/Debian system, you should use the debian packaging, see
-the fusionforge.org website for the correct instructions.
-
-For an installation on CentOS or Red Hat, use the following command.
-
-install.sh <hostname with domain>
-
-That will install the bulk of the system and even set up a site admin
-user account for you.
-
-
-****
-The information below may not be necessary if you succeeded installing
-using the above method. However this info may give you an overview
-of how the installation is done.
-****
-
-
-
-
-OVERVIEW
---------
-
-FusionForge has a lot of different pieces touching a lot of different
components
-in the system. Cronjobs are required to maintain the system, touching lots
-of files on a daily and hourly basis, including /etc/* system files.
-
-The plugins that now manage the CVS and SVN functionality have made
-installation slightly harder because even more files have to be moved into
-place during installation.
-
-The manual installation of fusionforge is documented below. Be sure to follow
-each step carefully, check the forums for frequently asked questions,
-and ask your Apache, mailman, and postgresql installation questions in the
-corresponding mailing lists rather than on the gforge forums where little
-help is available.
-
-
- CVS Overview
- ------------
- CVS is now managed via the scmcvs plugin which is included in the
-plugins/ directory in the tarball downloaded from gforge.org. Most
-of the files in scmcvs are intended for auto-installation on debian
-systems and DO NOT APPLY to the majority of users. The scmcvs plugin
-is activated by default in the gforge.sql database.
-
- Cronjobs for CVS are included in cronjobs/crontab.in, but are commented
-out by default for your security. cronjobs/cvs-cron/* contains the files
-that are executed hourly to build permissions and create blank cvs trees.
-Make sure these files are executed as root, and have proper execution bits
-set. Each of these cronjobs has configuration parameters which you may
-have to edit manually the paths in those files for your specific system.
-
-
- SVN Overview
- ------------
-
- If you want to use GForge's svn-over-DAV support and apache2 are
-required.
-
- SVN is also managed via plugin - the scmsvn plugin is included and
-activated by default in gforge.
-
- The sample etc/gforge-httpd.conf.example file in this tarball contains
-a COMPLETE AND WORKING vhost for subversion-over-dav. The gforge-install.sh
-script will copy this to /etc/gforge/httpd.conf You may have to
-alter the passwords and any other config options, but the sample config
-shown has been used in dozens or even hundreds of installs and DOES WORK.
-
-
- CVSTracker Overview
- -------------------
- The cvstracker plugin allows for some integration between CVS
-commits and the bug tracker and task manager. So, for example,
-when you commit, you can reference bug and task IDs in your
-commit message and have the commit linked to the corresponding
-bug and task.
-
- This works by having a script in the cvs server issue a POST
-to the main website ( /plugins/cvstracker/newcommit.php )
-
- See the plugins/cvstracker/README file for details. This
-plugin is enabled by default in the gforge.sql database file.
-As with the other plugins, you may manually place the config
-files in /etc/gforge/plugins/cvstracker/ and uncomment the
-cronjob in crontab.in.
-
-
- PHP
- ---
- The cronjobs require the PHP CGI to be installed and the php.ini
-file to be properly configured with your include_path OR edit the
-crontab.in file to set your include path.
-
- Mailman
- -------
-
- Mailman is needed to create and use mailing lists with gforge.
-Mailman is frequently installed in /var/mailman/ and the sample
-vhost shown below will work with this setup without any changes.
-
- Cronjobs for mailman are located in cronjobs/mail/*
-
- cronjobs/mail/mailing_lists_create.php is used obviously to
-create new mailing lists. You may have to edit /etc/gforge/local.inc
-to change the location of the mailman bin/ directory.
-
- For all problems with mailman installation and use, contact
-the mailman mailing lists for help.
-
-
-UPGRADING DATABASE - EXISTING INSTALL
--------------------------------------
-
-To migrate to a newer version of GForge, you must import
-your old database, FRS files, mailing lists, cvs and svn trees
-into your new installation.
-
-1) Completely install your new system
-2) Move the mentioned files into place
-3) Import your old database
-4) go into the gforge/db directory and choose 'startpoint.php 4.0.2'
-as the starting point of the installation (4.0.2 is an example)
-5) ./upgrade-db.php - this script will run the updates in order.
-If any of them fail, it will prompt you to continue. Generally,
-you should always continue. Most are minor or informational errors.
-
-
-WEB SETUP - MANUAL INSTALLATION
--------------------------------
-
-The following are sample commands commonly issued for a manual installation:
-
-tar -xjf gforge-X.X.tar.bz2
-cd gforge-X.X
-
-#
-# BEFORE RUNNING THIS, determine your apacheuser/group
-# and pass it as an argument as shown below.
-#
-# Argument 1: the main hostname you want to use.
-# Argument 2: the apache user
-# Argument 3: the apache group
-# Argument 3: the IP address that you are listening on
-#
-./gforge-install.sh gforge.company.com apacheuser apachegroup
-
-Apache will need to have a line added to its httpd.conf:
-
-Include /etc/gforge/httpd.conf
-
-Restart apache when you are done editing the file so the
-changes can be picked up.
-
-
-PHP setup
----------
-
-You may also add the include_path to the php.ini, as it will be
-necessary for your php cgi to run the cron jobs.
-
-register_globals = Off
-magic_quotes_gpc = Off
-file_uploads = On
-include_path =
".:/opt/gforge/gforge/:/opt/gforge/gforge/www/include/:/etc/gforge/"
-
-PHP CLI that is used by crontab.in may use different php.ini. Find
-it by running the following command and add the above include_path
-directive there:
-
-$ /usr/bin/php -i | fgrep php.ini
-
-
-FRS - File Release System
--------------------------
-
-FRS has been radically simplified. Simply create a directory and make
-it owned by the webserver-user. Usually "chown -R apache:apache mydir"
-will do the trick.
-
-This directory will be referenced in the GForge Config File as $sys_upload_dir
-
-
-GForge Config File
---------------
-
-Edit the /etc/gforge/local.inc and set any specific variables
-like sys_default_domain and any paths to files that are not right
-
-
-Site Admin
-----------
-
-Site admins are anyone who is an admin of group_id=1
-
-To give the first user "Site Admin" privileges, register a new user,
-and confirm it via the email link. Then enter the postgres command
-line and issue these commands:
-
-[gforge]# psql gforge
-
-psql> SELECT user_id FROM users WHERE user_name='******MY NEW
USERNAME*********';
-
-The result of that query will be put into this next query:
-
-psql> insert into user_group (user_id,group_id,admin_flags) values (*****YOUR
NEW NUMERIC USER ID*****,1,'A');
-
-
-Mail Aliases
-------------
-
-This alias was already added by the gforge-install script:
-
-noreply: /dev/null
-
-
-PEER RATINGS
-------------
-
-Add yourself, and any others you wish, to the "Peer Ratings" project,
-which should be at /projects/peerrating/ on the website. Make yourself
-an "admin" of the project, and then proceed to "rate" other users on
-the website.
-
-Members of the "Peer Ratings" project, who are "admins" of the project
-become the first trusted users. This is the only way to prime the pump
-for the peer ratings system.
-
-
-CRON JOBS
----------
-
-Cron jobs are in the cronjobs/ directory and the README file contains
-a sample crontab. This gives you the basic cronjobs for updating
-certain statistics and data on the site.
-
-/cronjobs/cvs-cron/ contains scripts useful for creating blank cvs
-trees and managing the /etc/groups /etc/passwd and /etc/shadow files.
-See /cronjobs/README.root for more info.
-
-/cronjobs/mail/ contains files useful for the creation of new mailing
-lists in mailman and creating the /etc/aliases file.
-
-**************************************************************************
-WARNING!!! the following command will blow away any existing root crontab.
-**************************************************************************
-
-[root]# crontab cronjobs/crontab.in
-
-Now edit the paths to the cron scripts:
-
-[root]# crontab -e
-
-IMPORTANT!!!! - the cvs-cron/usergroup.php cron script will meddle
-with your /etc/passwd, /etc/group, and /etc/shadow files. By default,
-this cron will save these files with a .new extension. You will have
-to edit the cron script to remove the .new extension, but you must
-make sure that it is properly generating your files or your server
-could be unusable.
-
-Once you have manually run the usergroup.php file, look at the
-/etc/*.new files and verify that they contain sensisble information.
-When you are confident they are right, you can edit usergroup.php
-to remove the .new extension and uncomment the cronjobs.
-
-
-ADDITIONAL FILES
-----------------
-
-For XHTML validation against the DTD, the following files must be
-placed under the gforge/common/include/ directory:
-* xhtml-lat1.ent
-* xhtml-special.ent
-* xhtml-symbol.ent
-* xhtml1-strict.dtd
-* xhtml1-transitional.dtd
-They can be downloaded from http://www.w3.org/TR/xhtml1/dtds.html
-as tarball (xhtml1.tgz).
-
-Installation of xmlstarlet is also required.
-
-MOST COMMON PROBLEMS
---------------------
-
-Q: I get a blank page when I visit http://gforge.company.com/
-
-A: Most often you are missing the php-pgsql library that lets PHP
-talk to the postgres database. Find a php-pgsql RPM or recompile
-php to have pgql support.
-
-If you're sure you have php-pgsql support, you can edit
-common/include/database-pgsql.php and remove the @ symbol from
-this line:
-
- $conn = @pg_connect(
-
-So that it looks like:
-
- $conn = pg_connect(
-
-This will let debug output dump to the screen and may let you find
-the problem. Search the forums for more solutions.
-
-
-Q: "Error Occurred In the Logger" or other database permission problems
-
-A: As stated in the installation instructions, the database must be created,
-owned, and accessed by the gforge user. This user is the only one who will
-have total acess to all the tables. Any other user would have to be
specifically
-granted permissions with the GRANT commands in postgres.
-
-
-Q: Reporting or time tracking doesn't work
-
-A: Go to the reporting tab and scroll down so you can choose
-"Initialize/Rebuild Reporting Tables"
-
-Q: How do I upgrade my database?
-
-A: As stated above, you must apply the changes that are listed in date order
-in the db/ directory to your database. Only the changes that are not already
-in your old db/ directory should be applied, and they should be applied and
-checked IN ORDER.
-
-
-Q: I'm getting an error about BaseLanguage.class not being found.
-
-A: Make sure your localization path is correctly specified in the local.inc
-file and that it is readable AND writable by the apache user.
-
-
-Q: When I click on "/projects/" or "/users/" links, I get the source code
-instead of the page I expected.
-
-A: As shown in the example httpd.conf files above, you may have to switch
-to using the <Files> or <Location> directives depending on your server
-version.
-
-
-Q: How do I backup GForge?
-
-A: The only proper way to backup the gforge database is with pg_dump.
-Any attempt to backup the filesystem while pgsql is running will result
-in a useless and corrupt backup. You can backup CVS trees using tar as
-long as they are not actively and heavily used during the backup.
-Mailman and the FRS uploads dir can also be backed up with tar.
-
-
-Q: Large uploads into FRS or the doc manager fail.
-
-A: Apache and the php.ini file need to have upload limits and possibly
-memory limits increased.
+Please check
+https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Installing
diff --git a/src/NEWS b/src/NEWS
deleted file mode 100644
index f2548f7..0000000
--- a/src/NEWS
+++ /dev/null
@@ -1,198 +0,0 @@
-Release notes for FusionForge 5.2
----------------------------------
-
-FusionForge 5.2 is another incremental step over 5.1, with about 2600
-commits.
-
-There have been no in-depth rewrites this time, only a number of
-improvements to various parts of the code. The document manager
-steadily grows in functionality, new widgets are available for users'
-personal pages, the SCM plugins grew new features for hooks (on
-supported systems), the trackers now offer a new view for roadmaps.
-New plugins include a Message plugin allowing to display a global
-message on the forge, and a MoinMoinWiki plugin.
-
-Many bugs were of course fixed during the course of this development
-cycle.
-
-As before, this release comes with packages for Red Hat and Debian
-systems (and derived distributions), as well as a rewritten installer
-script for users of other systems (and those who prefer more manual
-installations). This release provides scripts to migrate what needs
-to be migrated to the new schemes (for the database schema). Care
-should still be taken to check the results of these migrations, as a
-safety net.
-
-Release notes for FusionForge 5.1
----------------------------------
-
-FusionForge 5.1 is another incremental step over 5.0, although it's a
-large step in some regards, with about 3000 commits since version 5.0.
-
-The FusionForge team would like to dedicate this release to the memory
-of Alexandre Neymann, who passed away in March 2011. Alexandre was
-one of the founding members of the FusionForge project in 2009, and
-one of its most active developers. His death has meant a great loss
-to us all.
-
-On the user interface front, the project summary pages and users'
-personal pages are now built out of blocks called "widgets" that can
-be rearranged at will; these widgets (taken from Codendi) allow
-greater flexibility on how the pages look. A new theme, called Funky,
-is now available, with a more modern feel (contributed by Capgemini).
-In the same field, the old help window has been replaced with a new
-unobtrusive tooltip system (Alcatel-Lucent). A less visible aspect is
-that the generated webpages are now much closer to full XHTML
-compliance.
-
-Among the improvements in features, the document manager has been
-vastly rewritten (by Capgemini again), with more features and an
-improved usability; more improvements are planned for the next
-release, but this should bring the docman to something we're no longer
-ashamed of :-)
-
-Many improvements in the trackers have been contributed (by
-Alcatel-Lucent), including a progress bar and improvements in sorting.
-
-The permissions system has been enhanced and made more flexible, with
-the new ability to have several roles at once in the same project and
-to share roles across projects (contributed by Roland Mas as part of
-the Coclico project).
-
-New projects can now cloned from one of a set of configurable
-templates, thus allowing forges to have standard shapes for their
-common project organizations (Roland Mas, Coclico).
-
-New plugins have been written or merged from Codendi as part of the
-Coclico project: Mailman, Forumml, Hudson and SoapAdmin. Not all are
-production-ready yet, but they're made available for the adventurous.
-Other new plugins include a gravatar plugin (Alain Peyrat) and a
-"blocks" plugin allowing to add free descriptions in several places
-(Alcatel-Lucent).
-
-Behind the scenes, the configuration system has also been made
-simpler, it now uses standard *.ini files that are taken into account
-immediately; the Apache configuration files are also splitted out into
-independent components, rather than a large generated file. (Both by
-Roland Mas.)
-
-Another improvement making installation easier is the availability
-packages in RPM format for Red Hat Enterprise Linux and CentOS, in
-addition to the *.deb packages for Debian-based distributions.
-Installation from source is still supported, of course.
-
-As usual, this release provides scripts to migrate what needs to be
-migrated to the new schemes (in this case, for the database schema,
-the configuration variables and the existing permissions). Care
-should still be taken to check the results of these migrations, as a
-safety net.
-
-Release notes for FusionForge 5.0
----------------------------------
-
-FusionForge 5.0 is still an incremental step over 4.8, but many
-changes have been made, some of which may require caution when
-upgrading.
-
-In particular, the rewriting of the version control subsystem created
-the possibility for many new VCS tools to be integrated, and indeed
-several new plugins were implemented (Arch, Bazaar, Darcs, Git and
-Mercurial). To avoid crowding the chroot, all repositories are now
-hosted under a two-level subdirectory structure. For instance, where
-you had a CVS repositories stored under
-/var/lib/gforge/chroot/cvsroot/<project>, you'll now have it under
-.../chroot/scmrepos/cvs/<project>. As a consequence, you need to move
-the repositories by hand and/or add symlinks. Previously existing
-symlinks will also have to be updated, as well as previously existing
-working copies obtained by users.
-
-Also, the Mediawiki plugin was rewritten to allow for each project to
-get their own independent wiki. The wiki for project foo-bar is now
-stored in the plugin_mediakiki_foo_bar in the same database as the
-rest of the forge. This means the data should be migrated from the
-existing database to this new location. Depending on your setup and
-the amount of data involved, it might make sense to either cut and
-paste by hand or dump the tables and reload them in the new schema.
-
-On the internal side of things, access to the database has been
-converted from the db_query() abstraction layer to the
-db_query_params() one. This means SQL queries are no longer built as
-strings with unwieldy and fragile escaping code, while ensuring no
-data coming from the user can be used for SQL injection attacks. The
-db_query() function, while deprecated, is still present for the
-benefit of out-of-tree code that might use it. It might be removed at
-some point in the future, so maintainers of local plugins or
-enhancements are encouraged to migrate their code to
-db_query_params(). For really complex queries that need to be built
-dynamically, there's also a db_query_qpa() abstraction, with a
-db_construct_qpa() method to manipulate "QPA" (query+params array)
-objects.
-
-On a more visible note, the default theme has been reworked to
-increase the accessibility of the web pages; this rewrite also brings
-better maintainability, easier customisation by CSS and more
-conformant XHTML.
-
-
-Release notes for FusionForge 4.8
----------------------------------
-
-FusionForge 4.8 is an incremental step from 4.7, and the changes are
-less far-reaching than the ones in 4.7. Most notably, they include:
-- A new project classification system based on tags (with a tag cloud).
-- A new reporting page on the FRS displaying the number of downloads
- per package.
-- The “Project List” can now display a list of all projects.
-- The “wiki” plugin now uses the latest PHPwiki code.
-
-The upgrade from 4.7 should be straightforward.
-
-
-Release notes for FusionForge 4.7
----------------------------------
-
-This is the first public release of FusionForge. FusionForge is based
-on GForge, and started as an identical copy, with only a name change
-to avoid confusion with the proprietary versions of GForge (known as
-GForge Advanced Server or GForge AS). As such, it benefits from
-mature code and known-good infrastructure, and builds on it for the
-future.
-
-This 4.7 release is focused on bringing the recent evolutions out to
-the community in an official stable release. This should provide a
-solid base as a starting point for community-based development, making
-it easier for enhancements to be maintained. The FusionForge name was
-chosen to reflect this: this is a community effort, and we hope to
-hear about your improvements. Contributing these improvements would
-make their future long-term maintenance easier for everyone.
-
-Major changes since previous versions (of GForge) include:
-- Support for PHP5.
-- Support for PostgreSQL 8.x.
-- Translations are now managed by gettext.
-- Support for several configurations running on the same code.
-- Improved security, no need for PHP register_globals.
-- Available as full install CD.
-- New wiki plugins (using MediaWiki or phpWiki).
-- New online_help plugin.
-- New phpwebcalendar plugin.
-- New project hierarchy plugin.
-
-Things to keep in mind when installing:
-- FusionForge is based on GForge, and the renaming is quite recent.
- So the code still contains lots of references to GForge. This will
- be fixed as time passes.
-- Full text search using the primitives provided by PostgreSQL 8.3
- isn't quite complete yet.
-- Not all plugins are packaged for all distributions yet.
-
-Things to keep in mind when upgrading:
-- Since internationalisation was changed from a hand-made system to
- standard gettext, locally customised translations will no longer
- override standard ones. This will be addressed in a future release.
-
-For more up-to-date information, please visit http://fusionforge.org/
-or http://fusionforge.fusionforge.org/ -- you can even join us on IRC
-from there!
-
- -- The FusionForge development team
diff --git a/src/VERSION b/src/VERSION
index 031062d..cc94f6b 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-6.0rc4
+6.0.50
diff --git a/src/common/include/account.php b/src/common/include/account.php
index ce5dded..9a83ab2 100644
--- a/src/common/include/account.php
+++ b/src/common/include/account.php
@@ -321,7 +321,7 @@ function checkKeys($keys) {
/* The encoded key is made of 0-9, A-Z ,a-z, +, / (base
64) characters,
ends with zero or up to three '=' and the length must
be >= 512 bits (157 base64 characters).
The whole key ends with an optional comment. */
- if (
preg_match("@^(((no-port-forwarding|no-X11-forwarding|no-agent-forwarding|no-pty|command=\"[^\"]+\"|from=\"?[A-Za-z0-9\.-]+\"?),?)*\s+)?ssh-(rsa|dss)\s+[A-Za-z0-9+/]{157,}={0,2}(\s+.*)?$@",
$key) === 0 ) { // Warning: we must use === for the test
+ if (
preg_match("@^(((no-port-forwarding|no-X11-forwarding|no-agent-forwarding|no-pty|command=\"[^\"]+\"|from=\"?[A-Za-z0-9\.-]+\"?),?)*\s+)?ssh-(ed25519|ecdsa|rsa|dss)\s+[A-Za-z0-9+/]{157,}={0,2}(\s+.*)?$@",
$key) === 0 ) { // Warning: we must use === for the test
$error_msg = sprintf(_('The following key has a
wrong format: |%s|. Please, correct it by going back to the previous page.'),
htmlspecialchars($key));
session_redirect('/account/');
diff --git a/src/debian/changelog b/src/debian/changelog
index b0cf20e..2289790 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,3 +1,15 @@
+fusionforge (6.0.50-0) UNRELEASED; urgency=medium
+
+ * New snapshot from master branch.
+
+ -- Roland Mas <[email protected]> Fri, 29 May 2015 17:05:37 +0200
+
+fusionforge (6.0-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Roland Mas <[email protected]> Fri, 29 May 2015 14:22:29 +0200
+
fusionforge (6.0~rc4-1) unstable; urgency=high
[ Sylvain Beucler ]
diff --git a/src/debian/fusionforge-common.docs
b/src/debian/fusionforge-common.docs
index 02e838e..93e40c4 100644
--- a/src/debian/fusionforge-common.docs
+++ b/src/debian/fusionforge-common.docs
@@ -2,3 +2,4 @@ README
AUTHORS
docs/README.Themes
docs/README.Plugins
+# CHANGES -> automatically installed as changelog.gz
diff --git a/src/locale/fusionforge.pot b/src/locale/fusionforge.pot
index e1b5adc..5303e86 100644
--- a/src/locale/fusionforge.pot
+++ b/src/locale/fusionforge.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-28 11:39+0200\n"
+"POT-Creation-Date: 2015-05-29 13:52+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -1470,8 +1470,8 @@ msgstr ""
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:73
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:75
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:79
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:214
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:216
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:215
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:217
#: plugins/blocks/common/blocks_Widget_ProjectSummary.class.php:55
#: plugins/blocks/common/blocks_Widget_ProjectSummary.class.php:57
#: plugins/contribtracker/www/global_admin.php:379
@@ -5582,7 +5582,7 @@ msgstr ""
#: common/include/user_profile.php:85
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:75
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:214
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:215
#: www/account/index.php:146 www/account/lostpw.php:89
msgid "Login Name"
msgstr ""
@@ -9343,7 +9343,7 @@ msgstr ""
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:67
#: plugins/authcas/common/AuthCASPlugin.class.php:92
#: plugins/authhttpd/common/AuthHTTPDPlugin.class.php:65
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:210
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:211
#: plugins/authopenid/include/AuthOpenIDPlugin.class.php:78
#: plugins/authwebid/include/AuthWebIDPlugin.class.php:103
msgid "Cookies must be enabled past this point."
@@ -9355,13 +9355,13 @@ msgid "Login name or email address"
msgstr ""
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:79
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:216
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:217
#: www/account/verify.php:80
msgid "Password"
msgstr ""
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:82
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:218
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:219
#: www/account/verify.php:83 www/admin/userlist.php:81
#: www/include/login-form.php:64
msgid "Login"
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index a12e12b..a8d0b44 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -1,6 +1,6 @@
Name: fusionforge
Version: @rpm_version@
-Release: 0.2@rpm_snapshot@%{?dist}
+Release: 1@rpm_snapshot@%{?dist}
Summary: Collaborative development tool
Group: Development/Tools
@@ -8,7 +8,7 @@ BuildArch: noarch
# FusionForge is GPLv2+ and JQuery is MIT
License: GPLv2+ and MIT
URL: http://www.fusionforge.org/
-Source0:
http://fusionforge.org/frs/download.php/file/XX/%{name}-@[email protected]
+Source0:
http://fusionforge.org/frs/download.php/latestfile/2/%{name}-@[email protected]
Requires: %{name}-db-local = %{version}-%{release}, %{name}-web =
%{version}-%{release}, %{name}-scm = %{version}-%{release}
Provides: bundled(jquery) = 1.10.2, bundled(jquery-ui) = 1.10.4
@@ -95,7 +95,7 @@ integrated into one web site and managed through a web
interface.
This package contains files and programs used by several other
subpackages.
%files common -f common.rpmfiles -f %{name}.lang
-%doc AUTHORS* CHANGES COPYING INSTALL.TXT NEWS README
+%doc AUTHORS* CHANGES COPYING README
%doc docs/*
%doc rpm/README.fedora
%post common
@@ -278,9 +278,12 @@ This package controls the interaction between FusionForge
and Mailman.
%changelog
-* Thu May 28 2015 Sylvain Beucler <[email protected]> -
@[email protected]@rpm_snapshot@
+* Fri May 29 2015 Sylvain Beucler <[email protected]> -
@rpm_version@-1@rpm_snapshot@
- New upstream snapshot following the stable branch
+* Fri May 29 2015 Sylvain Beucler <[email protected]> - 6.0-1
+- New upstream release
+
* Thu May 28 2015 Sylvain Beucler <[email protected]> - 6.0-0.2.rc4
- New upstream release candidate
- CVE-2015-0850: Prevent arbitrary command execution via clone URL
diff --git a/src/www/account/editsshkeys.php b/src/www/account/editsshkeys.php
index 1e2a184..b400c51 100644
--- a/src/www/account/editsshkeys.php
+++ b/src/www/account/editsshkeys.php
@@ -65,10 +65,10 @@ if (count($sshKeysArray)) {
echo $HTML->openForm(array('action' =>
util_make_uri('/account/?action=addsshkey'), 'method' => 'post', 'enctype' =>
'multipart/form-data'));
echo html_e('h2', array(), _('Add a new ssh key'));
echo html_e('p', array(), _('To avoid having to type your password every time
for your SSH developer account, you may upload your public key(s) here and they
will be placed on the server in your ~/.ssh/authorized_keys file. Uploaded SSH
keys are effective <em>immediately</em>.'));
-echo html_e('p', array(), _('To generate a public key, run the program
\'ssh-keygen\' (you can use both protocol 1 or 2). The public key will be
placed at \'~/.ssh/identity.pub\' (protocol version 1) and
\'~/.ssh/id_dsa.pub\' or \'~/.ssh/id_rsa.pub\' (protocol version 2). Read the
ssh documentation for further information on sharing keys.'));
+echo html_e('p', array(), _('To generate a public key, run the program
\'ssh-keygen\' (you can use both protocol 1 or 2). The public key will be
placed at \'~/.ssh/identity.pub\' (protocol version 1) and
\'~/.ssh/id_dsa.pub\', \'~/.ssh/id_rsa.pub\', \'~/.ssh/id_ecdsa.pub\' or
\'~/.ssh/id_ed25519.pub\' (protocol version 2). Read the ssh documentation for
further information on sharing keys.'));
echo html_e('p', array(), html_e('em', array(), _('Important: Make sure there
are no line breaks. After submitting, verify that the number of keys in your
file is what you expected.')));
echo html_e('textarea', array('rows' => 10, 'cols' => 80, 'name' =>
'authorized_key', 'style' => 'width:90%;'), '', false);
-echo html_e('p', array(), _('Or upload your \'~/.ssh/identity.pub\' (protocol
version 1) or \'~/.ssh/id_dsa.pub\' or \'~/.ssh/id_rsa.pub\' (protocol version
2)'));
+echo html_e('p', array(), _('Or upload your \'~/.ssh/identity.pub\' (protocol
version 1) or \'~/.ssh/id_dsa.pub\', \'~/.ssh/id_rsa.pub\',
\'~/.ssh/id_ecdsa.pub\' or \'~/.ssh/id_ed25519.pub\' (protocol version 2)'));
echo html_e('input', array('type' => 'file', 'name' => 'uploaded_filekey'));
echo html_e('p', array(), html_e('input', array('type' => 'submit', 'name' =>
'submit', 'value' => _('Add'))));
echo $HTML->closeForm();
diff --git a/tests/buildbot/common-functions b/tests/buildbot/common-functions
index e4d91e6..c9ea983 100644
--- a/tests/buildbot/common-functions
+++ b/tests/buildbot/common-functions
@@ -24,16 +24,8 @@ prepare_workspace()
export BUILDRESULT=$WORKSPACE/build/packages
mkdir -p $BUILDRESULT
export BUILDERDIR=${BUILDERDIR:-$HOME/builder}
- # Delete existing packages
- if [ -d $WORKSPACE/build/packages ]
- then
- rm -fr $WORKSPACE/build/packages/*
- fi
- # Create place to build package if necessary
- [ ! -d $WORKSPACE/build/packages ] || mkdir -p $WORKSPACE/build/packages
- # Erase config
- [ ! -d $WORKSPACE/build/config ] || rm -fr $WORKSPACE/build/config
- mkdir -p $WORKSPACE/build/config
+ # Create place to store built packages
+ [ ! -d $WORKSPACE/packages ] || mkdir -p $WORKSPACE/packages
# Erase reports
[ ! -d $WORKSPACE/reports ] || rm -fr $WORKSPACE/reports
mkdir -p $WORKSPACE/reports/coverage
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index 0ed402a..80dc556 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -98,5 +98,16 @@ ssh root@$HOST
"/usr/src/fusionforge/autoinstall/vnc-run-testsuite.sh /usr/src/f
copy_logs
+if [ $retcode = 0 ] ; then
+ case $INSTALL_METHOD in
+ deb)
+ rsync -av --delete root@$HOST:/usr/src/debian-repository/local/
$WORKSPACE/packages/
+ ;;
+ rpm)
+ rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/
$WORKSPACE/packages/
+ ;;
+ esac
+fi
+
stop_vm_if_not_kept $HOST
exit $retcode
diff --git a/tests/buildbot/push-packages-to-repositories.sh
b/tests/buildbot/push-packages-to-repositories.sh
new file mode 100755
index 0000000..f0f68c9
--- /dev/null
+++ b/tests/buildbot/push-packages-to-repositories.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+set -ex
+
+os=$1
+method=$2
+branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,remotes_,, -e s,remotes/,,
-e s,/,_,g)
+
+case $os in
+ debian7)
+ dist=wheezy
+ ;;
+ debian8)
+ dist=jessie
+ ;;
+ debian9)
+ dist=stretch
+ ;;
+ debian10)
+ dist=buster
+ ;;
+ centos*)
+ dist=$os
+ ;;
+ *)
+ echo "Unknown OS"
+ exit 1
+ ;;
+esac
+
+case $method in
+ src)
+ echo "No packages to handle"
+ exit 0
+ ;;
+ deb)
+ cd $WORKSPACE/packages/
+ sed -i -e "s/^Distribution:.*/Distribution: $dist-$branch/"
fusionforge*changes
+ dput fforg fusionforge*changes
+ ;;
+ rpm)
+ rsync -av --delete $WORKSPACE/packages/
[email protected]:/home/groups/fusionforge/htdocs/rpm/$dist-$branch/
+ ;;
+ *)
+ echo "Unknown install method"
+ exit 1
+ ;;
+esac
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
