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 e3b676534b6a5c87aeaadf0e10fe425e27a5cd52 (commit)
via 001789e34c8b03a46b719c4f427364e7cda51d04 (commit)
via a06ca1085c49da99a9dc988af2254df21f4b3f38 (commit)
from 9bb58dc8ea375c42b8fe32adcde27c97e71915d2 (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 e3b676534b6a5c87aeaadf0e10fe425e27a5cd52
Merge: 9bb58dc 001789e
Author: Roland Mas <[email protected]>
Date: Wed Jun 3 11:04:55 2015 +0200
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
src/common/include/database-pgsql.php | 3 +++
tests/buildbot/push-packages-to-repositories.sh | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
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/tests/buildbot/push-packages-to-repositories.sh
b/tests/buildbot/push-packages-to-repositories.sh
index 0f96867..252527d 100755
--- a/tests/buildbot/push-packages-to-repositories.sh
+++ b/tests/buildbot/push-packages-to-repositories.sh
@@ -38,7 +38,7 @@ case $method in
sed -i -e "s/^Distribution:.*/Distribution: $dist-$branch/"
fusionforge*changes
debsign -m"FusionForge buildbot" *changes
dput buildbot fusionforge*changes
- rsync -av --delete-after /var/lib/jenkins/deb/
[email protected]:/home/groups/fusionforge/htdocs/deb/
+ rsync -av --delete-after --exclude=/mini-dinstall --exclude=/*.db
--delete-excluded /var/lib/jenkins/deb/
[email protected]:/home/groups/fusionforge/htdocs/deb/
;;
rpm)
rpmsign --addsign $WORKSPACE/packages/noarch/*.rpm
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
