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 87a909275fa230e35e779512ff0f2c91dc6a579b (commit)
via d1baeacc7abf265b270d03338e53b29d7d39e3cc (commit)
via 320aa2044a0fd5e8c3a2a95fe37c9fd09724f6ef (commit)
via 341452892e6474c7c0bbd56a234250c079d08059 (commit)
via b2770ab1271e43af8bbf510602de380529409f58 (commit)
via 82823f9c5bdb911090feb76c25cf1f4c5ca7e359 (commit)
via 7771000f1f78e854823ce054ac6a90eae313815e (commit)
via 08a898fbff888da1d44a786b056f53c2e8c6f75d (commit)
via 264f16515ae258d39dc61fe641fcd975c27c74bc (commit)
via e3b676534b6a5c87aeaadf0e10fe425e27a5cd52 (commit)
via 001789e34c8b03a46b719c4f427364e7cda51d04 (commit)
via a06ca1085c49da99a9dc988af2254df21f4b3f38 (commit)
via 9bb58dc8ea375c42b8fe32adcde27c97e71915d2 (commit)
via cec32f593ab274213e0e0907ee672ba11d1be37f (commit)
via 9c9b0867d24475ed90f4c5eda1ca9038067822aa (commit)
via d51dc71de442041afe83b18443d9a18166ade581 (commit)
via 374878c765e85f1c0509ea0309da875476a0b564 (commit)
via 47f7c9bf97f911694600a320c5596af8a3979549 (commit)
via c5a26fd16764e9cde1fb782552dcae0d13838b97 (commit)
via 3b6055febe88a40098e16e6ac25f2d563da64a47 (commit)
via 2cd29b057028e4b2f6710745d4f620950f3f7106 (commit)
via 250cfeec84e08e5f1c437012cf44516fd7e5f35e (commit)
via 2914f3eaf3c347bcf43b10bc2d6eebb341aa3a6d (commit)
via faac8a40d8293399a11b42dad1df577372ddd7ce (commit)
via c330909cdf48a4dae7fe084c0afd55e0ad34cb95 (commit)
from 6939f2496247f928a924cf05be2c45f82c7211fb (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 87a909275fa230e35e779512ff0f2c91dc6a579b
Merge: 6939f24 d1baeac
Author: Roland Mas <[email protected]>
Date: Thu Jun 4 22:48:00 2015 +0200
Merge branch 'master' into feature/twig-template-engine
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 12 ++++++++++++
src/common/frs/FRSPackage.class.php | 2 +-
src/common/include/database-pgsql.php | 3 +++
src/common/include/system/pgsql.class.php | 2 +-
src/common/tracker/include/ArtifactHtml.class.php | 6 +++---
src/common/widget/Widget_MyProjects.class.php | 1 +
src/plugins/scmhook/common/scmhookPlugin.class.php | 17 -----------------
.../scmgit/hooks/postreceiveemail/post-receive-email | 13 +++++++------
src/www/project/request.php | 2 +-
src/www/scm/viewvc.php | 1 -
src/www/scm/viewvc/viewvc.cgi | 1 +
tests/buildbot/push-packages-to-repositories.sh | 9 +++++++--
12 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/src/CHANGES b/src/CHANGES
index 0b44099..de52f65 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,3 +1,15 @@
+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)
+* FRS: display new releases first (Roland Mas, for Inria)
+* Tracker: fix description re-html-ization when editing item (Inria)
+* Widgets: MyProjects: only display active projects (Inria)
+* SCM SVN: fix double-compression in ViewVC (Inria)
+* Plugin scmhook: git commitemail: fix subject, handle special chars (Roland
Mas, for Inria)
+* Plugin scmhook: fix hook deactivation (Inria)
+* Doc clean-up (Inria)
+
FusionForge 6.0:
* New install system [#710] (Inria)
* Reactivity: system replication is now performed immediately (rather than
waiting for cron jobs) [#147] (Inria)
diff --git a/src/common/frs/FRSPackage.class.php
b/src/common/frs/FRSPackage.class.php
index 86467a2..2c51fe1 100644
--- a/src/common/frs/FRSPackage.class.php
+++ b/src/common/frs/FRSPackage.class.php
@@ -477,7 +477,7 @@ class FRSPackage extends Error {
function &getReleases() {
if (!is_array($this->package_releases) ||
count($this->package_releases) < 1) {
$this->package_releases=array();
- $res = db_query_params('SELECT * FROM frs_release WHERE
package_id=$1',
+ $res = db_query_params('SELECT * FROM frs_release WHERE
package_id=$1 ORDER BY release_date DESC',
array($this->getID()));
while ($arr = db_fetch_array($res)) {
$this->package_releases[] =
$this->newFRSRelease($arr['release_id'], $arr);
diff --git a/src/common/include/database-pgsql.php
b/src/common/include/database-pgsql.php
index cfafd6d..47a1aa4 100644
--- a/src/common/include/database-pgsql.php
+++ b/src/common/include/database-pgsql.php
@@ -57,6 +57,9 @@ function pg_connectstring($dbname, $user, $password = "",
$host = "", $port = ""
if ($port != "") {
$string .= " port=$port";
}
+ # using SSL breaks util_sudo_effective_user
+ # ("SSL error: decryption failed or bad record mac" for parent's new
queries)
+ $string .= " sslmode=disable";
return $string;
}
diff --git a/src/common/include/system/pgsql.class.php
b/src/common/include/system/pgsql.class.php
index 11c2924..c45f54d 100644
--- a/src/common/include/system/pgsql.class.php
+++ b/src/common/include/system/pgsql.class.php
@@ -503,7 +503,7 @@ FROM users
JOIN pfo_role ON (pfo_user_role.role_id=pfo_role.role_id)
LEFT JOIN role_project_refs ON
(pfo_user_role.role_id=role_project_refs.role_id)
JOIN nss_groups ON (pfo_role.home_group_id=nss_groups.group_id OR
role_project_refs.group_id=nss_groups.group_id)
- JOIN pfo_role_setting ON (pfo_user_role.role_id=pfo_role_setting.role_id AND
(pfo_role_setting.ref_id=nss_groups.group_id) AND
((section_name='project_admin' AND perm_val=1) OR (section_name='scm' AND
perm_val=1)))
+ JOIN pfo_role_setting ON (pfo_user_role.role_id=pfo_role_setting.role_id AND
(pfo_role_setting.ref_id=nss_groups.group_id) AND
((section_name='project_admin' AND perm_val=1) OR (section_name='scm' AND
perm_val>=1)))
WHERE users.unix_status='A' AND nss_groups.gid > $2
UNION
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index eb3473d..d40f359 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -36,9 +36,9 @@ class ArtifactHtml extends Artifact {
function showDetails($editable = false) {
global $HTML;
$result = $this->getDetails();
- $result = util_gen_cross_ref($result,
$this->ArtifactType->Group->getID());
+ $result_html = util_gen_cross_ref($result,
$this->ArtifactType->Group->getID());
//$result = util_line_wrap( $result, 120,"\n");
- $result = nl2br($result);
+ $result_html = nl2br($result_html);
$title_arr = array();
if ($editable === true) {
@@ -51,7 +51,7 @@ class ArtifactHtml extends Artifact {
}
echo $HTML->listTableTop($title_arr);
echo $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle(0, true), 'id' => 'editdescription', 'style' =>
'display:none'), array(array(html_e('textarea', array('id' =>
'tracker-description', 'required' => 'required', 'name' => 'description',
'rows' => 20, 'cols' => 79, 'title' =>
util_html_secure(html_get_tooltip_description('description'))), $result))));
- echo $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle(0, true), 'id' => 'showdescription'),
array(array($result)));
+ echo $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle(0, true), 'id' => 'showdescription'),
array(array($result_html)));
echo $HTML->listTableBottom();
}
diff --git a/src/common/widget/Widget_MyProjects.class.php
b/src/common/widget/Widget_MyProjects.class.php
index 64f01f0..171d367 100644
--- a/src/common/widget/Widget_MyProjects.class.php
+++ b/src/common/widget/Widget_MyProjects.class.php
@@ -55,6 +55,7 @@ class Widget_MyProjects extends Widget {
$i = 0;
$ra = RoleAnonymous::getInstance();
foreach ($groups as $g) {
+ if ($g->getStatus() != 'A') continue;
$i++;
$html_my_projects .= '
<tr '. $HTML->boxGetAltRowStyle($i) .'><td
style="width:99%">'.
diff --git a/src/plugins/scmhook/common/scmhookPlugin.class.php
b/src/plugins/scmhook/common/scmhookPlugin.class.php
index b7f4159..e5ef7ba 100644
--- a/src/plugins/scmhook/common/scmhookPlugin.class.php
+++ b/src/plugins/scmhook/common/scmhookPlugin.class.php
@@ -345,11 +345,6 @@ project independently.");
echo ' disabled="disabled"';
echo ' />';
- if (in_array($hook->getClassname(),
$hooksEnabled)) {
- echo '<input type="hidden" ';
- echo
'name="'.$hook->getLabel().'_'.$hook->getClassname().'" ';
- echo 'value="on" />';
- }
echo '</td><td';
if (!$hook->isAvailable())
echo '
title="'.$hook->getDisabledMessage().'"';
@@ -416,12 +411,6 @@ project independently.");
echo ' disabled="disabled"';
echo ' />';
- if
(in_array($hookServePushPullBundle->getClassname(), $hooksEnabled)) {
- echo '<input type="hidden" ';
- echo
'name="'.$hookServePushPullBundle->getLabel().'_'.$hookServePushPullBundle->getClassname().'"
';
- echo 'value="on" />';
- }
-
echo '</td><td';
if (!$hookServePushPullBundle->isAvailable())
echo '
title="'.$hookServePushPullBundle->getDisabledMessage().'"';
@@ -471,12 +460,6 @@ project independently.");
echo ' disabled="disabled"';
echo ' />';
- if (in_array($hookPostReceive->getClassname(),
$hooksEnabled)) {
- echo '<input type="hidden" ';
- echo
'name="'.$hookPostReceive->getLabel().'_'.$hookPostReceive->getClassname().'" ';
- echo 'value="on" />';
- }
-
echo '</td><td';
if (!$hookPostReceive->isAvailable())
echo '
title="'.$hookPostReceive->getDisabledMessage().'"';
diff --git
a/src/plugins/scmhook/library/scmgit/hooks/postreceiveemail/post-receive-email
b/src/plugins/scmhook/library/scmgit/hooks/postreceiveemail/post-receive-email
index ac6c64c..91836b1 100755
---
a/src/plugins/scmhook/library/scmgit/hooks/postreceiveemail/post-receive-email
+++
b/src/plugins/scmhook/library/scmgit/hooks/postreceiveemail/post-receive-email
@@ -251,11 +251,6 @@ generate_email()
# Email parameters
# The email subject will contain the best description of the ref
# that we can build from the parameters
- describe=$(git describe $rev 2>/dev/null)
- if [ -z "$describe" ]; then
- describe=$rev
- fi
-
generate_email_header
# Call the correct body generation function
@@ -287,6 +282,12 @@ generate_email_header()
test -n "$envelopesender" && routing_headers="From:
$envelopesender${nl}$routing_headers"
test -n "$replyto" && routing_headers="$routing_headers${nl}Reply-To:
$replyto"
+ subj="Subject: ${emailprefix}$shortdesc $refname_type $short_refname
${change_type}d. $(git show --no-patch --format='%h %s' $newrev)"
+ subj=$(print -nr -- "$subj" | php -r '
+mb_internal_encoding("UTF-8");
+echo mb_encode_mimeheader(file_get_contents("php://stdin"),
+"UTF-8", "Q", "\012");')
+
cat <<-EOF
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -296,7 +297,7 @@ generate_email_header()
X-Git-Reftype: $refname_type
X-Git-Oldrev: $oldrev
X-Git-Newrev: $newrev
- $(perl -Mutf8 -MEncode -e "print encode('MIME-Q', 'Subject:
${emailprefix}$shortdesc $refname_type $short_refname ${change_type}d.
$describe');")
+ $subj
Auto-Submitted: auto-generated
This is an automated email from the git hooks/post-receive script. It
was
diff --git a/src/www/project/request.php b/src/www/project/request.php
index ce8d7a9..3b01557 100644
--- a/src/www/project/request.php
+++ b/src/www/project/request.php
@@ -61,7 +61,7 @@ $nbadmins = count($group->getAdmins());
echo html_e('p', array(), ngettext('You can request to join a project by
clicking the submit button. The administrator will be emailed to approve or
deny your request.', 'You can request to join a project by clicking the submit
button. The administrators will be emailed to approve or deny your request.',
$nbadmins));
echo $HTML->openForm(array('action' =>
getStringFromServer('PHP_SELF').'?group_id='.$group_id, 'method' => 'post'));
echo html_e('p', array(), ngettext('You must send a comment to the
administrator:', 'You must send a comment to the
administrators:',$nbadmins).utils_requiredField());
-echo html_e('textarea', array('name' => 'comments', 'required' => 'required',
'rows' => 15, 'cols' => 60), $comments);
+echo html_e('textarea', array('name' => 'comments', 'required' => 'required',
'rows' => 15, 'cols' => 60), $comments, false);
echo html_e('p', array(), html_e('input', array('type' => 'submit', 'name' =>
'submit', 'value' => _('Submit'))));
echo $HTML->closeForm();
echo $HTML->addRequiredFieldsInfoBox();
diff --git a/src/www/scm/viewvc.php b/src/www/scm/viewvc.php
index 2822119..52f620b 100644
--- a/src/www/scm/viewvc.php
+++ b/src/www/scm/viewvc.php
@@ -113,7 +113,6 @@ if ($external_scm) {
curl_setopt($ch, CURLOPT_USERAGENT,
$_SERVER['HTTP_USER_AGENT']); // for session validation
curl_setopt($ch, CURLOPT_HTTPHEADER,
array('Accept-Language:
'.$_SERVER['HTTP_ACCEPT_LANGUAGE'], // for i18n
- 'Accept-Encoding:
'.$_SERVER['HTTP_ACCEPT_ENCODING'], // for compression
'X-Forwarded-For:
'.$_SERVER['REMOTE_ADDR'])); // for session validation
$content = curl_exec($ch);
if ($content === false) {
diff --git a/src/www/scm/viewvc/viewvc.cgi b/src/www/scm/viewvc/viewvc.cgi
index 40e9d18..1a25283 100755
--- a/src/www/scm/viewvc/viewvc.cgi
+++ b/src/www/scm/viewvc/viewvc.cgi
@@ -1,5 +1,6 @@
#!/usr/bin/env python
# Locate ViewVC and run it
+# (local CGI version, see also plugins/scmsvn/libexec/viewvc.cgi)
import sys
import os
diff --git a/tests/buildbot/push-packages-to-repositories.sh
b/tests/buildbot/push-packages-to-repositories.sh
index f0f68c9..8a1d3ae 100755
--- a/tests/buildbot/push-packages-to-repositories.sh
+++ b/tests/buildbot/push-packages-to-repositories.sh
@@ -36,10 +36,15 @@ case $method in
deb)
cd $WORKSPACE/packages/
sed -i -e "s/^Distribution:.*/Distribution: $dist-$branch/"
fusionforge*changes
- dput fforg fusionforge*changes
+ debsign -m"FusionForge buildbot" *changes
+ dput buildbot fusionforge*changes
+ rsync -av --delete-after --exclude=/mini-dinstall --exclude=/*.db
--delete-excluded /var/lib/jenkins/deb/
[email protected]:/home/groups/fusionforge/htdocs/deb/
;;
rpm)
- rsync -av --delete $WORKSPACE/packages/
[email protected]:/home/groups/fusionforge/htdocs/rpm/$dist-$branch/
+ rpmsign --addsign $WORKSPACE/packages/noarch/*.rpm
+ gpg --detach-sign --armor $WORKSPACE/packages/repodata/repomd.xml
+ rsync -av --delete $WORKSPACE/packages/
/var/lib/jenkins/rpm/$dist-$branch/
+ rsync -av --delete-after /var/lib/jenkins/rpm/
[email protected]:/home/groups/fusionforge/htdocs/rpm/
;;
*)
echo "Unknown install method"
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
